From f37381ea8aa3ad48c9d0540286347d8603f08359 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 6 May 2020 05:22:03 -0400
Subject: [PATCH] Optimize Network Manager to not need synchronization

Removes synchronization from sending packets
Makes normal packet sends no longer need to be wrapped and queued like it use to work.
Adds more packet queue immunities on top of keep alive to let the following scenarios go out
without delay:
  - Keep Alive
  - Chat
  - Kick
  - All of the packets during the Player Joined World event

Hoping that latter one helps join timeout issues more too for slow connections.

Removes processing packet queue off of main thread
  - for the few cases where it is allowed, order is not necessary nor
    should it even be happening concurrently in first place (handshaking/login/status)

Ensures packets sent asynchronously are dispatched on main thread

This helps ensure safety for ProtocolLib as packet listeners
are commonly accessing world state. This will allow you to schedule
a packet to be sent async, but itll be dispatched sync for packet
listeners to process.

This should solve some deadlock risks

This may provide a decent performance improvement because thread synchronization incurs a cache reset
so by avoiding ever entering a synchronized block, we get to avoid that, and packet sending is a really
hot activity.
---
 ...-Signs-in-Chunks-creating-large-pack.patch | 139 ----------
 ...-Manager-and-add-advanced-packet-sup.patch | 238 ++++++++++++++++++
 ...le-Oversized-Tile-Entities-in-chunks.patch |  57 +++++
 ...-Fix-Whitelist-On-Off-inconsistency.patch} |  10 +-
 ...t-tick-at-start-of-drowning-process.patch} |   4 +-
 ...51-Allow-Saving-of-Oversized-Chunks.patch} |   8 +-
 ...ggleEvent-when-whitelist-is-toggled.patch} |   6 +-
 ...53-Add-LivingEntity-getTargetEntity.patch} |  12 +-
 ...ngth-when-serialising-BungeeCord-te.patch} |   4 +-
 ...=> 0355-Entity-getEntitySpawnReason.patch} |  14 +-
 ...ty-Metadata-for-all-tracked-players.patch} |   6 +-
 ...tch => 0357-Fire-event-on-GS4-query.patch} |   8 +-
 ...58-Implement-PlayerPostRespawnEvent.patch} |  10 +-
 ...for-pickupDelay-breaks-picking-up-i.patch} |   4 +-
 ...-and-setters-for-EntityItem-owner-a.patch} |   4 +-
 ...ts.patch => 0361-Server-Tick-Events.patch} |   4 +-
 ...362-PlayerDeathEvent-getItemsToKeep.patch} |   4 +-
 ...Optimize-Captured-TileEntity-Lookup.patch} |   4 +-
 ...API.patch => 0364-Add-Heightmap-API.patch} |   6 +-
 ...> 0365-Mob-Spawner-API-Enhancements.patch} |   6 +-
 ...ayer-View-Distance-API-placeholders.patch} |  10 +-
 ...-to-changed-postToMainThread-method.patch} |   4 +-
 ...-item-frames-are-modified-MC-123450.patch} |   6 +-
 ...sPrimaryThread-and-MinecraftServer-.patch} |   6 +-
 ...-entity-loss-due-to-unloaded-chunks.patch} |   6 +-
 ... 0371-Duplicate-UUID-Resolve-Option.patch} |  14 +-
 ...72-improve-CraftWorld-isChunkLoaded.patch} |   4 +-
 ...e-Keep-Spawn-Loaded-range-per-world.patch} |  16 +-
 ...-some-generation-concurrency-issues.patch} |   8 +-
 ...ityAreaEffectCloud-from-going-negat.patch} |   4 +-
 ....patch => 0376-ChunkMapDistance-CME.patch} |   4 +-
 ...0377-Implement-CraftBlockSoundGroup.patch} |  10 +-
 ...d.patch => 0378-Chunk-debug-command.patch} |  14 +-
 ...ch => 0379-incremental-chunk-saving.patch} |  18 +-
 ...ptions-from-dispenser-entity-spawns.patch} |   4 +-
 ...81-Fix-World-isChunkGenerated-calls.patch} |  22 +-
 ...te-location-if-we-failed-to-read-it.patch} |   4 +-
 ...ad-in-DataPaletteBlock-lock-failure.patch} |   6 +-
 ...tatus-cache-when-saving-protochunks.patch} |   6 +-
 ...4-Anti-Xray.patch => 0385-Anti-Xray.patch} |  75 +-----
 ...l-Spawned-mobs-towards-natural-spaw.patch} |   2 +-
 ...urable-projectile-relative-velocity.patch} |   2 +-
 ...being-ticked-when-notifying-navigat.patch} |   6 +-
 ...h => 0389-offset-item-frame-ticking.patch} |   4 +-
 ...pper-searches-if-there-are-no-items.patch} |   8 +-
 ...1-Asynchronous-chunk-IO-and-loading.patch} |   2 +-
 ...tChunkIfLoadedImmediately-in-places.patch} |   8 +-
 ...ads.patch => 0393-Reduce-sync-loads.patch} |  12 +-
 ...ement-alternative-item-despawn-rate.patch} |   2 +-
 ...f-we-have-a-custom-Bukkit-generator.patch} |   4 +-
 ...-158900.patch => 0396-Fix-MC-158900.patch} |   6 +-
 ...ment-optional-per-player-mob-spawns.patch} |   2 +-
 ...event-consuming-the-wrong-itemstack.patch} |   4 +-
 ...ssanger-entities-once-from-spawners.patch} |   4 +-
 ... => 0400-Fix-nether-portal-creation.patch} |   4 +-
 ...gs.patch => 0401-Generator-Settings.patch} |   2 +-
 ...o-tick-instant-grow-farms-MC-113809.patch} |   2 +-
 ...-161754.patch => 0403-Fix-MC-161754.patch} |   4 +-
 ...e-improvement-for-Chunk.getEntities.patch} |   4 +-
 ...anging-entities-that-are-not-ItemFr.patch} |   4 +-
 ...06-Expose-the-internal-current-tick.patch} |   4 +-
 ...sneak-when-changing-worlds-MC-10657.patch} |   8 +-
 ...-option-to-disable-pillager-patrols.patch} |   2 +-
 ...r-when-player-hand-set-to-empty-typ.patch} |   6 +-
 ...=> 0410-PlayerLaunchProjectileEvent.patch} |  18 +-
 ...tMagicNumbers.isSupportedApiVersion.patch} |   4 +-
 ...k-loads-when-villagers-try-to-find-.patch} |   4 +-
 ...Fix-spawn-radius-being-treated-as-0.patch} |   4 +-
 ...656-Fix-Follow-Range-Initial-Target.patch} |   2 +-
 ...pers.patch => 0415-Optimize-Hoppers.patch} |   2 +-
 ...ayerDeathEvent-shouldDropExperience.patch} |   4 +-
 ...ading-chunks-checking-hive-position.patch} |   4 +-
 ...hunks-from-Hoppers-and-other-things.patch} |   4 +-
 ...ializing-mismatching-chunk-coordina.patch} |   6 +-
 ...imise-IEntityAccess-getPlayerByUUID.patch} |   6 +-
 ...421-Fix-items-not-falling-correctly.patch} |   4 +-
 ...patch => 0422-Lag-compensate-eating.patch} |   4 +-
 ...ize-call-to-getFluid-for-explosions.patch} |   4 +-
 ...-in-stack-not-having-effects-when-d.patch} |   4 +-
 ...=> 0425-Entity-Activation-Range-2.0.patch} |  28 +--
 ...Add-effect-to-block-break-naturally.patch} |   4 +-
 ...=> 0427-Tracking-Range-Improvements.patch} |   8 +-
 ...tor-behavior-for-EntityPhanton-goal.patch} |   4 +-
 ...-items-vanishing-through-end-portal.patch} |   4 +-
 ...h => 0430-Seed-based-feature-search.patch} |   2 +-
 ...et-gravity-in-void.-Fixes-MC-167279.patch} |   8 +-
 ...-getChunkAt-calls-for-loaded-chunks.patch} |   6 +-
 ...more-tolerant-of-invalid-attributes.patch} |   4 +-
 ...w-overriding-the-java-version-check.patch} |   4 +-
 ...tch => 0435-Add-ThrownEggHatchEvent.patch} |   4 +-
 ... 0436-Optimise-random-block-ticking.patch} |   2 +-
 ...p-API.patch => 0437-Entity-Jump-API.patch} |   8 +-
 ...-to-nerf-pigmen-from-nether-portals.patch} |   2 +-
 ... => 0439-Make-the-GUI-graph-fancier.patch} |  18 +-
 ... => 0440-Backport-fix-for-MC-167561.patch} |   4 +-
 ...41-add-hand-to-BlockMultiPlaceEvent.patch} |   4 +-
 ...2-Prevent-teleporting-dead-entities.patch} |   4 +-
 ...ipwire-hook-placement-before-update.patch} |   4 +-
 ...o-allow-iron-golems-to-spawn-in-air.patch} |   2 +-
 ...chance-of-villager-zombie-infection.patch} |   2 +-
 ...tch => 0446-Optimise-Chunk-getFluid.patch} |   2 +-
 ...mise-TickListServer-by-rewriting-it.patch} |   2 +-
 ...pawn-settings-and-per-player-option.patch} |   2 +-
 ...e-Entity-is-never-double-registered.patch} |   8 +-
 ...ring-entities-from-unloading-chunks.patch} |   6 +-
 ...nections-shouldn-t-hold-up-shutdown.patch} |   6 +-
 ...ow-bees-to-load-chunks-for-beehives.patch} |   6 +-
 ...PlayerChunkMap-adds-crashing-server.patch} |   8 +-
 ...n-Chunk-lookup-and-avoid-loading-fa.patch} |   6 +-
 ...tch => 0455-Don-t-tick-dead-players.patch} |   6 +-
 ...-Player-s-shouldn-t-be-able-to-move.patch} |   6 +-
 ...unkMap-memory-use-for-visibleChunks.patch} |  14 +-
 ...s-when-attempting-to-unload-a-chunk.patch} |   6 +-
 ...h => 0459-Increase-Light-Queue-Size.patch} |   2 +-
 ...sks-Speed-up-processing-of-chunk-lo.patch} |  14 +-
 ...ove-existing-players-to-world-spawn.patch} |   8 +-
 ...Add-tick-times-API-and-mspt-command.patch} |  12 +-
 ...63-Expose-MinecraftServer-isRunning.patch} |   6 +-
 ...riority-Urgency-System-for-World-Ge.patch} |   2 +-
 ...5-Remove-streams-from-Mob-AI-System.patch} |  10 +-
 ...ons-until-after-entity-ticking-is-d.patch} |   8 +-
 ... => 0467-Async-command-map-building.patch} |   6 +-
 ...rash-support-and-Improve-Async-Shut.patch} |  28 +--
 ....patch => 0469-Optimize-Pathfinding.patch} |   6 +-
 ...Villager-AI-optimizations-DROP-1.16.patch} |   6 +-
 ...1-Reduce-Either-Optional-allocation.patch} |   6 +-
 ...472-Remove-streams-from-PairedQueue.patch} |   6 +-
 ...73-Remove-streams-from-MinecraftKey.patch} |   6 +-
 ...-memory-footprint-of-NBTTagCompound.patch} |   6 +-
 ...ent-opening-inventories-when-frozen.patch} |   8 +-
 ...76-Optimise-ArraySetSorted-removeIf.patch} |   6 +-
 ...entity-collision-code-if-not-needed.patch} |   6 +-
 ...mise-entity-hard-collision-checking.patch} |  14 +-
 ...viderServer-s-chunk-level-checking-.patch} |   6 +-
 ...teleport-command-to-valid-locations.patch} |   6 +-
 ...Implement-Player-Client-Options-API.patch} |  14 +-
 ...Chunk-Post-Processing-deadlock-risk.patch} |   8 +-
 ...ayer-is-attempted-to-be-removed-fro.patch} |   6 +-
 ...4-Broadcast-join-message-to-console.patch} |   8 +-
 ...-Broken-behavior-of-PlayerJoinEvent.patch} |  18 +-
 ...oad-Chunks-for-Login-Asynchronously.patch} |  30 +--
 ...awn-point-if-spawn-in-unloaded-worl.patch} |   6 +-
 ...488-Allow-sleeping-players-to-float.patch} |   6 +-
 ...layerAttackEntityCooldownResetEvent.patch} |   6 +-
 ...llbacks-to-schedule-for-Callback-Ex.patch} |   6 +-
 ...-fire-BlockFade-on-worldgen-threads.patch} |   6 +-
 ...tom-creative-and-insomniac-controls.patch} |   2 +-
 ...-duplication-issues-and-teleport-is.patch} |  10 +-
 ...0494-Implement-Brigadier-Mojang-API.patch} |  12 +-
 ...patch => 0495-Villager-Restocks-API.patch} |   8 +-
 ...ickItem-Packet-and-kick-for-invalid.patch} |   6 +-
 ...n.patch => 0497-Expose-game-version.patch} |   6 +-
 ...0498-Sync-position-on-teleportation.patch} |   6 +-
 ...> 0499-Optimize-Voxel-Shape-Merging.patch} |   8 +-
 ...Region-Files-Direct-Memory-on-close.patch} |   6 +-
 ...per-thread-native-byte-buffer-cache.patch} |   6 +-
 ...atch => 0502-Implement-Mob-Goal-API.patch} |  26 +-
 ...ist-iteration-requiring-entities-be.patch} |  12 +-
 ...ance-map-to-optimise-entity-tracker.patch} |  12 +-
 ...isOutsideRange-to-use-distance-maps.patch} |  14 +-
 ...e-operations-for-updating-light-dat.patch} |  12 +-
 ...o-Tick-view-distance-implementation.patch} |  12 +-
 162 files changed, 862 insertions(+), 761 deletions(-)
 delete mode 100644 Spigot-Server-Patches/0347-Handle-Excessive-Signs-in-Chunks-creating-large-pack.patch
 create mode 100644 Spigot-Server-Patches/0347-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
 create mode 100644 Spigot-Server-Patches/0348-Handle-Oversized-Tile-Entities-in-chunks.patch
 rename Spigot-Server-Patches/{0348-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch => 0349-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch} (91%)
 rename Spigot-Server-Patches/{0349-Set-Zombie-last-tick-at-start-of-drowning-process.patch => 0350-Set-Zombie-last-tick-at-start-of-drowning-process.patch} (89%)
 rename Spigot-Server-Patches/{0350-Allow-Saving-of-Oversized-Chunks.patch => 0351-Allow-Saving-of-Oversized-Chunks.patch} (98%)
 rename Spigot-Server-Patches/{0351-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch => 0352-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch} (79%)
 rename Spigot-Server-Patches/{0352-Add-LivingEntity-getTargetEntity.patch => 0353-Add-LivingEntity-getTargetEntity.patch} (96%)
 rename Spigot-Server-Patches/{0353-Use-proper-max-length-when-serialising-BungeeCord-te.patch => 0354-Use-proper-max-length-when-serialising-BungeeCord-te.patch} (94%)
 rename Spigot-Server-Patches/{0354-Entity-getEntitySpawnReason.patch => 0355-Entity-getEntitySpawnReason.patch} (94%)
 rename Spigot-Server-Patches/{0355-Update-entity-Metadata-for-all-tracked-players.patch => 0356-Update-entity-Metadata-for-all-tracked-players.patch} (93%)
 rename Spigot-Server-Patches/{0356-Fire-event-on-GS4-query.patch => 0357-Fire-event-on-GS4-query.patch} (98%)
 rename Spigot-Server-Patches/{0357-Implement-PlayerPostRespawnEvent.patch => 0358-Implement-PlayerPostRespawnEvent.patch} (86%)
 rename Spigot-Server-Patches/{0358-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch => 0359-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch} (93%)
 rename Spigot-Server-Patches/{0359-Implement-getters-and-setters-for-EntityItem-owner-a.patch => 0360-Implement-getters-and-setters-for-EntityItem-owner-a.patch} (93%)
 rename Spigot-Server-Patches/{0360-Server-Tick-Events.patch => 0361-Server-Tick-Events.patch} (93%)
 rename Spigot-Server-Patches/{0361-PlayerDeathEvent-getItemsToKeep.patch => 0362-PlayerDeathEvent-getItemsToKeep.patch} (96%)
 rename Spigot-Server-Patches/{0362-Optimize-Captured-TileEntity-Lookup.patch => 0363-Optimize-Captured-TileEntity-Lookup.patch} (93%)
 rename Spigot-Server-Patches/{0363-Add-Heightmap-API.patch => 0364-Add-Heightmap-API.patch} (94%)
 rename Spigot-Server-Patches/{0364-Mob-Spawner-API-Enhancements.patch => 0365-Mob-Spawner-API-Enhancements.patch} (97%)
 rename Spigot-Server-Patches/{0365-Per-Player-View-Distance-API-placeholders.patch => 0366-Per-Player-View-Distance-API-placeholders.patch} (95%)
 rename Spigot-Server-Patches/{0366-Fix-CB-call-to-changed-postToMainThread-method.patch => 0367-Fix-CB-call-to-changed-postToMainThread-method.patch} (88%)
 rename Spigot-Server-Patches/{0367-Fix-sounds-when-item-frames-are-modified-MC-123450.patch => 0368-Fix-sounds-when-item-frames-are-modified-MC-123450.patch} (91%)
 rename Spigot-Server-Patches/{0368-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch => 0369-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch} (93%)
 rename Spigot-Server-Patches/{0369-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch => 0370-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch} (94%)
 rename Spigot-Server-Patches/{0370-Duplicate-UUID-Resolve-Option.patch => 0371-Duplicate-UUID-Resolve-Option.patch} (97%)
 rename Spigot-Server-Patches/{0371-improve-CraftWorld-isChunkLoaded.patch => 0372-improve-CraftWorld-isChunkLoaded.patch} (93%)
 rename Spigot-Server-Patches/{0372-Configurable-Keep-Spawn-Loaded-range-per-world.patch => 0373-Configurable-Keep-Spawn-Loaded-range-per-world.patch} (97%)
 rename Spigot-Server-Patches/{0373-Fix-some-generation-concurrency-issues.patch => 0374-Fix-some-generation-concurrency-issues.patch} (98%)
 rename Spigot-Server-Patches/{0374-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch => 0375-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch} (89%)
 rename Spigot-Server-Patches/{0375-ChunkMapDistance-CME.patch => 0376-ChunkMapDistance-CME.patch} (95%)
 rename Spigot-Server-Patches/{0376-Implement-CraftBlockSoundGroup.patch => 0377-Implement-CraftBlockSoundGroup.patch} (95%)
 rename Spigot-Server-Patches/{0377-Chunk-debug-command.patch => 0378-Chunk-debug-command.patch} (98%)
 rename Spigot-Server-Patches/{0378-incremental-chunk-saving.patch => 0379-incremental-chunk-saving.patch} (97%)
 rename Spigot-Server-Patches/{0379-Catch-exceptions-from-dispenser-entity-spawns.patch => 0380-Catch-exceptions-from-dispenser-entity-spawns.patch} (92%)
 rename Spigot-Server-Patches/{0380-Fix-World-isChunkGenerated-calls.patch => 0381-Fix-World-isChunkGenerated-calls.patch} (97%)
 rename Spigot-Server-Patches/{0381-Show-blockstate-location-if-we-failed-to-read-it.patch => 0382-Show-blockstate-location-if-we-failed-to-read-it.patch} (93%)
 rename Spigot-Server-Patches/{0382-Log-other-thread-in-DataPaletteBlock-lock-failure.patch => 0383-Log-other-thread-in-DataPaletteBlock-lock-failure.patch} (95%)
 rename Spigot-Server-Patches/{0383-Use-ChunkStatus-cache-when-saving-protochunks.patch => 0384-Use-ChunkStatus-cache-when-saving-protochunks.patch} (92%)
 rename Spigot-Server-Patches/{0384-Anti-Xray.patch => 0385-Anti-Xray.patch} (95%)
 rename Spigot-Server-Patches/{0385-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch => 0386-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch} (97%)
 rename Spigot-Server-Patches/{0386-Configurable-projectile-relative-velocity.patch => 0387-Configurable-projectile-relative-velocity.patch} (98%)
 rename Spigot-Server-Patches/{0387-Mark-entities-as-being-ticked-when-notifying-navigat.patch => 0388-Mark-entities-as-being-ticked-when-notifying-navigat.patch} (90%)
 rename Spigot-Server-Patches/{0388-offset-item-frame-ticking.patch => 0389-offset-item-frame-ticking.patch} (88%)
 rename Spigot-Server-Patches/{0389-Avoid-hopper-searches-if-there-are-no-items.patch => 0390-Avoid-hopper-searches-if-there-are-no-items.patch} (97%)
 rename Spigot-Server-Patches/{0390-Asynchronous-chunk-IO-and-loading.patch => 0391-Asynchronous-chunk-IO-and-loading.patch} (99%)
 rename Spigot-Server-Patches/{0391-Use-getChunkIfLoadedImmediately-in-places.patch => 0392-Use-getChunkIfLoadedImmediately-in-places.patch} (96%)
 rename Spigot-Server-Patches/{0392-Reduce-sync-loads.patch => 0393-Reduce-sync-loads.patch} (98%)
 rename Spigot-Server-Patches/{0393-Implement-alternative-item-despawn-rate.patch => 0394-Implement-alternative-item-despawn-rate.patch} (98%)
 rename Spigot-Server-Patches/{0394-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch => 0395-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch} (96%)
 rename Spigot-Server-Patches/{0395-Fix-MC-158900.patch => 0396-Fix-MC-158900.patch} (89%)
 rename Spigot-Server-Patches/{0396-implement-optional-per-player-mob-spawns.patch => 0397-implement-optional-per-player-mob-spawns.patch} (99%)
 rename Spigot-Server-Patches/{0397-Prevent-consuming-the-wrong-itemstack.patch => 0398-Prevent-consuming-the-wrong-itemstack.patch} (95%)
 rename Spigot-Server-Patches/{0398-only-add-passanger-entities-once-from-spawners.patch => 0399-only-add-passanger-entities-once-from-spawners.patch} (89%)
 rename Spigot-Server-Patches/{0399-Fix-nether-portal-creation.patch => 0400-Fix-nether-portal-creation.patch} (91%)
 rename Spigot-Server-Patches/{0400-Generator-Settings.patch => 0401-Generator-Settings.patch} (97%)
 rename Spigot-Server-Patches/{0401-Fix-zero-tick-instant-grow-farms-MC-113809.patch => 0402-Fix-zero-tick-instant-grow-farms-MC-113809.patch} (98%)
 rename Spigot-Server-Patches/{0402-Fix-MC-161754.patch => 0403-Fix-MC-161754.patch} (90%)
 rename Spigot-Server-Patches/{0403-Performance-improvement-for-Chunk.getEntities.patch => 0404-Performance-improvement-for-Chunk.getEntities.patch} (93%)
 rename Spigot-Server-Patches/{0404-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch => 0405-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch} (93%)
 rename Spigot-Server-Patches/{0405-Expose-the-internal-current-tick.patch => 0406-Expose-the-internal-current-tick.patch} (87%)
 rename Spigot-Server-Patches/{0406-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch => 0407-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch} (88%)
 rename Spigot-Server-Patches/{0407-Add-option-to-disable-pillager-patrols.patch => 0408-Add-option-to-disable-pillager-patrols.patch} (96%)
 rename Spigot-Server-Patches/{0408-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch => 0409-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch} (92%)
 rename Spigot-Server-Patches/{0409-PlayerLaunchProjectileEvent.patch => 0410-PlayerLaunchProjectileEvent.patch} (97%)
 rename Spigot-Server-Patches/{0410-Add-CraftMagicNumbers.isSupportedApiVersion.patch => 0411-Add-CraftMagicNumbers.isSupportedApiVersion.patch} (89%)
 rename Spigot-Server-Patches/{0411-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch => 0412-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch} (92%)
 rename Spigot-Server-Patches/{0412-Fix-spawn-radius-being-treated-as-0.patch => 0413-Fix-spawn-radius-being-treated-as-0.patch} (91%)
 rename Spigot-Server-Patches/{0413-MC-145656-Fix-Follow-Range-Initial-Target.patch => 0414-MC-145656-Fix-Follow-Range-Initial-Target.patch} (97%)
 rename Spigot-Server-Patches/{0414-Optimize-Hoppers.patch => 0415-Optimize-Hoppers.patch} (99%)
 rename Spigot-Server-Patches/{0415-PlayerDeathEvent-shouldDropExperience.patch => 0416-PlayerDeathEvent-shouldDropExperience.patch} (90%)
 rename Spigot-Server-Patches/{0416-Prevent-bees-loading-chunks-checking-hive-position.patch => 0417-Prevent-bees-loading-chunks-checking-hive-position.patch} (90%)
 rename Spigot-Server-Patches/{0417-Don-t-load-Chunks-from-Hoppers-and-other-things.patch => 0418-Don-t-load-Chunks-from-Hoppers-and-other-things.patch} (94%)
 rename Spigot-Server-Patches/{0418-Guard-against-serializing-mismatching-chunk-coordina.patch => 0419-Guard-against-serializing-mismatching-chunk-coordina.patch} (96%)
 rename Spigot-Server-Patches/{0419-Optimise-IEntityAccess-getPlayerByUUID.patch => 0420-Optimise-IEntityAccess-getPlayerByUUID.patch} (92%)
 rename Spigot-Server-Patches/{0420-Fix-items-not-falling-correctly.patch => 0421-Fix-items-not-falling-correctly.patch} (93%)
 rename Spigot-Server-Patches/{0421-Lag-compensate-eating.patch => 0422-Lag-compensate-eating.patch} (97%)
 rename Spigot-Server-Patches/{0422-Optimize-call-to-getFluid-for-explosions.patch => 0423-Optimize-call-to-getFluid-for-explosions.patch} (90%)
 rename Spigot-Server-Patches/{0423-Fix-last-firework-in-stack-not-having-effects-when-d.patch => 0424-Fix-last-firework-in-stack-not-having-effects-when-d.patch} (92%)
 rename Spigot-Server-Patches/{0424-Entity-Activation-Range-2.0.patch => 0425-Entity-Activation-Range-2.0.patch} (98%)
 rename Spigot-Server-Patches/{0425-Add-effect-to-block-break-naturally.patch => 0426-Add-effect-to-block-break-naturally.patch} (93%)
 rename Spigot-Server-Patches/{0426-Tracking-Range-Improvements.patch => 0427-Tracking-Range-Improvements.patch} (95%)
 rename Spigot-Server-Patches/{0427-Fix-comparator-behavior-for-EntityPhanton-goal.patch => 0428-Fix-comparator-behavior-for-EntityPhanton-goal.patch} (89%)
 rename Spigot-Server-Patches/{0428-Fix-items-vanishing-through-end-portal.patch => 0429-Fix-items-vanishing-through-end-portal.patch} (94%)
 rename Spigot-Server-Patches/{0429-Seed-based-feature-search.patch => 0430-Seed-based-feature-search.patch} (98%)
 rename Spigot-Server-Patches/{0430-Bees-get-gravity-in-void.-Fixes-MC-167279.patch => 0431-Bees-get-gravity-in-void.-Fixes-MC-167279.patch} (93%)
 rename Spigot-Server-Patches/{0431-Optimise-getChunkAt-calls-for-loaded-chunks.patch => 0432-Optimise-getChunkAt-calls-for-loaded-chunks.patch} (96%)
 rename Spigot-Server-Patches/{0432-Be-more-tolerant-of-invalid-attributes.patch => 0433-Be-more-tolerant-of-invalid-attributes.patch} (93%)
 rename Spigot-Server-Patches/{0433-Allow-overriding-the-java-version-check.patch => 0434-Allow-overriding-the-java-version-check.patch} (89%)
 rename Spigot-Server-Patches/{0434-Add-ThrownEggHatchEvent.patch => 0435-Add-ThrownEggHatchEvent.patch} (93%)
 rename Spigot-Server-Patches/{0435-Optimise-random-block-ticking.patch => 0436-Optimise-random-block-ticking.patch} (99%)
 rename Spigot-Server-Patches/{0436-Entity-Jump-API.patch => 0437-Entity-Jump-API.patch} (93%)
 rename Spigot-Server-Patches/{0437-Add-option-to-nerf-pigmen-from-nether-portals.patch => 0438-Add-option-to-nerf-pigmen-from-nether-portals.patch} (98%)
 rename Spigot-Server-Patches/{0438-Make-the-GUI-graph-fancier.patch => 0439-Make-the-GUI-graph-fancier.patch} (97%)
 rename Spigot-Server-Patches/{0439-Backport-fix-for-MC-167561.patch => 0440-Backport-fix-for-MC-167561.patch} (95%)
 rename Spigot-Server-Patches/{0440-add-hand-to-BlockMultiPlaceEvent.patch => 0441-add-hand-to-BlockMultiPlaceEvent.patch} (92%)
 rename Spigot-Server-Patches/{0441-Prevent-teleporting-dead-entities.patch => 0442-Prevent-teleporting-dead-entities.patch} (89%)
 rename Spigot-Server-Patches/{0442-Validate-tripwire-hook-placement-before-update.patch => 0443-Validate-tripwire-hook-placement-before-update.patch} (89%)
 rename Spigot-Server-Patches/{0443-Add-option-to-allow-iron-golems-to-spawn-in-air.patch => 0444-Add-option-to-allow-iron-golems-to-spawn-in-air.patch} (96%)
 rename Spigot-Server-Patches/{0444-Configurable-chance-of-villager-zombie-infection.patch => 0445-Configurable-chance-of-villager-zombie-infection.patch} (97%)
 rename Spigot-Server-Patches/{0445-Optimise-Chunk-getFluid.patch => 0446-Optimise-Chunk-getFluid.patch} (97%)
 rename Spigot-Server-Patches/{0446-Optimise-TickListServer-by-rewriting-it.patch => 0447-Optimise-TickListServer-by-rewriting-it.patch} (99%)
 rename Spigot-Server-Patches/{0447-Pillager-patrol-spawn-settings-and-per-player-option.patch => 0448-Pillager-patrol-spawn-settings-and-per-player-option.patch} (99%)
 rename Spigot-Server-Patches/{0448-Ensure-Entity-is-never-double-registered.patch => 0449-Ensure-Entity-is-never-double-registered.patch} (96%)
 rename Spigot-Server-Patches/{0449-Fix-unregistering-entities-from-unloading-chunks.patch => 0450-Fix-unregistering-entities-from-unloading-chunks.patch} (93%)
 rename Spigot-Server-Patches/{0450-Remote-Connections-shouldn-t-hold-up-shutdown.patch => 0451-Remote-Connections-shouldn-t-hold-up-shutdown.patch} (90%)
 rename Spigot-Server-Patches/{0451-Do-not-allow-bees-to-load-chunks-for-beehives.patch => 0452-Do-not-allow-bees-to-load-chunks-for-beehives.patch} (95%)
 rename Spigot-Server-Patches/{0452-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch => 0453-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch} (94%)
 rename Spigot-Server-Patches/{0453-Optimize-Collision-Chunk-lookup-and-avoid-loading-fa.patch => 0454-Optimize-Collision-Chunk-lookup-and-avoid-loading-fa.patch} (95%)
 rename Spigot-Server-Patches/{0454-Don-t-tick-dead-players.patch => 0455-Don-t-tick-dead-players.patch} (89%)
 rename Spigot-Server-Patches/{0455-Dead-Player-s-shouldn-t-be-able-to-move.patch => 0456-Dead-Player-s-shouldn-t-be-able-to-move.patch} (88%)
 rename Spigot-Server-Patches/{0456-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch => 0457-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch} (98%)
 rename Spigot-Server-Patches/{0457-Don-t-load-chunks-when-attempting-to-unload-a-chunk.patch => 0458-Don-t-load-chunks-when-attempting-to-unload-a-chunk.patch} (93%)
 rename Spigot-Server-Patches/{0458-Increase-Light-Queue-Size.patch => 0459-Increase-Light-Queue-Size.patch} (96%)
 rename Spigot-Server-Patches/{0459-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch => 0460-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch} (98%)
 rename Spigot-Server-Patches/{0460-Don-t-move-existing-players-to-world-spawn.patch => 0461-Don-t-move-existing-players-to-world-spawn.patch} (94%)
 rename Spigot-Server-Patches/{0461-Add-tick-times-API-and-mspt-command.patch => 0462-Add-tick-times-API-and-mspt-command.patch} (96%)
 rename Spigot-Server-Patches/{0462-Expose-MinecraftServer-isRunning.patch => 0463-Expose-MinecraftServer-isRunning.patch} (88%)
 rename Spigot-Server-Patches/{0463-Implement-Chunk-Priority-Urgency-System-for-World-Ge.patch => 0464-Implement-Chunk-Priority-Urgency-System-for-World-Ge.patch} (99%)
 rename Spigot-Server-Patches/{0464-Remove-streams-from-Mob-AI-System.patch => 0465-Remove-streams-from-Mob-AI-System.patch} (98%)
 rename Spigot-Server-Patches/{0465-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch => 0466-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch} (94%)
 rename Spigot-Server-Patches/{0466-Async-command-map-building.patch => 0467-Async-command-map-building.patch} (94%)
 rename Spigot-Server-Patches/{0467-Forced-Watchdog-Crash-support-and-Improve-Async-Shut.patch => 0468-Forced-Watchdog-Crash-support-and-Improve-Async-Shut.patch} (97%)
 rename Spigot-Server-Patches/{0468-Optimize-Pathfinding.patch => 0469-Optimize-Pathfinding.patch} (95%)
 rename Spigot-Server-Patches/{0469-Port-20w15a-Villager-AI-optimizations-DROP-1.16.patch => 0470-Port-20w15a-Villager-AI-optimizations-DROP-1.16.patch} (98%)
 rename Spigot-Server-Patches/{0470-Reduce-Either-Optional-allocation.patch => 0471-Reduce-Either-Optional-allocation.patch} (94%)
 rename Spigot-Server-Patches/{0471-Remove-streams-from-PairedQueue.patch => 0472-Remove-streams-from-PairedQueue.patch} (96%)
 rename Spigot-Server-Patches/{0472-Remove-streams-from-MinecraftKey.patch => 0473-Remove-streams-from-MinecraftKey.patch} (94%)
 rename Spigot-Server-Patches/{0473-Reduce-memory-footprint-of-NBTTagCompound.patch => 0474-Reduce-memory-footprint-of-NBTTagCompound.patch} (95%)
 rename Spigot-Server-Patches/{0474-Prevent-opening-inventories-when-frozen.patch => 0475-Prevent-opening-inventories-when-frozen.patch} (96%)
 rename Spigot-Server-Patches/{0475-Optimise-ArraySetSorted-removeIf.patch => 0476-Optimise-ArraySetSorted-removeIf.patch} (95%)
 rename Spigot-Server-Patches/{0476-Don-t-run-entity-collision-code-if-not-needed.patch => 0477-Don-t-run-entity-collision-code-if-not-needed.patch} (92%)
 rename Spigot-Server-Patches/{0477-Optimise-entity-hard-collision-checking.patch => 0478-Optimise-entity-hard-collision-checking.patch} (97%)
 rename Spigot-Server-Patches/{0478-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch => 0479-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch} (96%)
 rename Spigot-Server-Patches/{0479-Restrict-vanilla-teleport-command-to-valid-locations.patch => 0480-Restrict-vanilla-teleport-command-to-valid-locations.patch} (92%)
 rename Spigot-Server-Patches/{0480-Implement-Player-Client-Options-API.patch => 0481-Implement-Player-Client-Options-API.patch} (97%)
 rename Spigot-Server-Patches/{0481-Fix-Chunk-Post-Processing-deadlock-risk.patch => 0482-Fix-Chunk-Post-Processing-deadlock-risk.patch} (95%)
 rename Spigot-Server-Patches/{0482-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch => 0483-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch} (89%)
 rename Spigot-Server-Patches/{0483-Broadcast-join-message-to-console.patch => 0484-Broadcast-join-message-to-console.patch} (85%)
 rename Spigot-Server-Patches/{0484-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch => 0485-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch} (92%)
 rename Spigot-Server-Patches/{0485-Load-Chunks-for-Login-Asynchronously.patch => 0486-Load-Chunks-for-Login-Asynchronously.patch} (95%)
 rename Spigot-Server-Patches/{0486-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch => 0487-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch} (92%)
 rename Spigot-Server-Patches/{0487-Allow-sleeping-players-to-float.patch => 0488-Allow-sleeping-players-to-float.patch} (92%)
 rename Spigot-Server-Patches/{0488-Add-PlayerAttackEntityCooldownResetEvent.patch => 0489-Add-PlayerAttackEntityCooldownResetEvent.patch} (94%)
 rename Spigot-Server-Patches/{0489-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch => 0490-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch} (95%)
 rename Spigot-Server-Patches/{0490-Don-t-fire-BlockFade-on-worldgen-threads.patch => 0491-Don-t-fire-BlockFade-on-worldgen-threads.patch} (91%)
 rename Spigot-Server-Patches/{0491-Add-phantom-creative-and-insomniac-controls.patch => 0492-Add-phantom-creative-and-insomniac-controls.patch} (98%)
 rename Spigot-Server-Patches/{0492-Fix-numerous-item-duplication-issues-and-teleport-is.patch => 0493-Fix-numerous-item-duplication-issues-and-teleport-is.patch} (96%)
 rename Spigot-Server-Patches/{0493-Implement-Brigadier-Mojang-API.patch => 0494-Implement-Brigadier-Mojang-API.patch} (97%)
 rename Spigot-Server-Patches/{0494-Villager-Restocks-API.patch => 0495-Villager-Restocks-API.patch} (92%)
 rename Spigot-Server-Patches/{0495-Validate-PickItem-Packet-and-kick-for-invalid.patch => 0496-Validate-PickItem-Packet-and-kick-for-invalid.patch} (94%)
 rename Spigot-Server-Patches/{0496-Expose-game-version.patch => 0497-Expose-game-version.patch} (87%)
 rename Spigot-Server-Patches/{0497-Sync-position-on-teleportation.patch => 0498-Sync-position-on-teleportation.patch} (93%)
 rename Spigot-Server-Patches/{0498-Optimize-Voxel-Shape-Merging.patch => 0499-Optimize-Voxel-Shape-Merging.patch} (97%)
 rename Spigot-Server-Patches/{0499-Cleanup-Region-Files-Direct-Memory-on-close.patch => 0500-Cleanup-Region-Files-Direct-Memory-on-close.patch} (97%)
 rename Spigot-Server-Patches/{0500-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch => 0501-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch} (92%)
 rename Spigot-Server-Patches/{0501-Implement-Mob-Goal-API.patch => 0502-Implement-Mob-Goal-API.patch} (98%)
 rename Spigot-Server-Patches/{0502-Optimize-entity-list-iteration-requiring-entities-be.patch => 0503-Optimize-entity-list-iteration-requiring-entities-be.patch} (98%)
 rename Spigot-Server-Patches/{0503-Use-distance-map-to-optimise-entity-tracker.patch => 0504-Use-distance-map-to-optimise-entity-tracker.patch} (98%)
 rename Spigot-Server-Patches/{0504-Optimize-isOutsideRange-to-use-distance-maps.patch => 0505-Optimize-isOutsideRange-to-use-distance-maps.patch} (98%)
 rename Spigot-Server-Patches/{0505-Stop-copy-on-write-operations-for-updating-light-dat.patch => 0506-Stop-copy-on-write-operations-for-updating-light-dat.patch} (98%)
 rename Spigot-Server-Patches/{0506-No-Tick-view-distance-implementation.patch => 0507-No-Tick-view-distance-implementation.patch} (99%)

diff --git a/Spigot-Server-Patches/0347-Handle-Excessive-Signs-in-Chunks-creating-large-pack.patch b/Spigot-Server-Patches/0347-Handle-Excessive-Signs-in-Chunks-creating-large-pack.patch
deleted file mode 100644
index 4c78fc8257..0000000000
--- a/Spigot-Server-Patches/0347-Handle-Excessive-Signs-in-Chunks-creating-large-pack.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-From 57f98e2c510b576b4d3c94b12384b1bc4b6b5e33 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Sat, 2 Mar 2019 14:55:01 -0500
-Subject: [PATCH] Handle Excessive Signs in Chunks creating large packets
-
-Also adds a limit to stop sending Sign and other data to client after
-a significant amount have been sent.
-
-Use -DPaper.excessiveTELimit=750 to configure that limit, or -1
-to disable the limit and let your players be abused.
-
-With further contributions from
-
-Co-Authored-by: Spottedleaf <spottedleaf@spottedleaf.dev>
-
-diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index b1dededc15..e966b6edcc 100644
---- a/src/main/java/net/minecraft/server/NetworkManager.java
-+++ b/src/main/java/net/minecraft/server/NetworkManager.java
-@@ -158,19 +158,55 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
-         NetworkManager.LOGGER.debug("Set listener of {} to {}", this, packetlistener);
-         this.packetListener = packetlistener;
-     }
-+    // Paper start
-+    private static class InnerUtil { // Attempt to hide these methods from ProtocolLib so it doesn't accidently pick them up.
-+        private static java.util.List<Packet> buildExtraPackets(Packet packet) {
-+            java.util.List<Packet> extra = packet.getExtraPackets();
-+            if (extra == null || extra.isEmpty()) {
-+                return null;
-+            }
-+            java.util.List<Packet> ret = new java.util.ArrayList<>(1 + extra.size());
-+            buildExtraPackets0(extra, ret);
-+            return ret;
-+        }
-+
-+        private static void buildExtraPackets0(java.util.List<Packet> extraPackets, java.util.List<Packet> into) {
-+            for (Packet extra : extraPackets) {
-+                into.add(extra);
-+                java.util.List<Packet> extraExtra = extra.getExtraPackets();
-+                if (extraExtra != null && !extraExtra.isEmpty()) {
-+                    buildExtraPackets0(extraExtra, into);
-+                }
-+            }
-+        }
-+    }
-+    // Paper end
- 
-     public void sendPacket(Packet<?> packet) {
-         this.sendPacket(packet, (GenericFutureListener) null);
-     }
- 
-     public void sendPacket(Packet<?> packet, @Nullable GenericFutureListener<? extends Future<? super Void>> genericfuturelistener) {
--        if (this.isConnected()) {
--            this.o();
--            this.b(packet, genericfuturelistener);
--        } else {
-+        // Paper start - handle oversized packets better
-+        // write the packets to the queue, then flush - antixray hooks there already
-+        java.util.List<Packet> extraPackets = InnerUtil.buildExtraPackets(packet);
-+        boolean hasExtraPackets = extraPackets != null && !extraPackets.isEmpty();
-+        if (!hasExtraPackets) {
-             this.packetQueue.add(new NetworkManager.QueuedPacket(packet, genericfuturelistener));
--        }
-+        } else {
-+            java.util.List<NetworkManager.QueuedPacket> packets = new java.util.ArrayList<>(1 + extraPackets.size());
-+            packets.add(new NetworkManager.QueuedPacket(packet, null)); // delay the future listener until the end of the extra packets
- 
-+            for (int i = 0, len = extraPackets.size(); i < len;) {
-+                Packet extra = extraPackets.get(i);
-+                boolean end = ++i == len;
-+                packets.add(new NetworkManager.QueuedPacket(extra, end ? genericfuturelistener : null)); // append listener to the end
-+            }
-+
-+            this.packetQueue.addAll(packets); // atomic
-+        }
-+        this.sendPacketQueue(); // ensure only one flush call is made
-+        // Paper end
-     }
- 
-     private void dispatchPacket(Packet<?> packet, @Nullable GenericFutureListener<? extends Future<? super Void>> genericFutureListener) { this.b(packet, genericFutureListener); } // Paper - OBFHELPER
-diff --git a/src/main/java/net/minecraft/server/Packet.java b/src/main/java/net/minecraft/server/Packet.java
-index 2d8e6a2f4a..8d0965a053 100644
---- a/src/main/java/net/minecraft/server/Packet.java
-+++ b/src/main/java/net/minecraft/server/Packet.java
-@@ -11,6 +11,7 @@ public interface Packet<T extends PacketListener> {
-     void a(T t0);
- 
-     // Paper start
-+    default java.util.List<Packet> getExtraPackets() { return null; }
-     default boolean packetTooLarge(NetworkManager manager) {
-         return false;
-     }
-diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
-index a0b87f89df..23223f3f45 100644
---- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
-+++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
-@@ -23,6 +23,15 @@ public class PacketPlayOutMapChunk implements Packet<PacketListenerPlayOut> {
- 
-     public PacketPlayOutMapChunk() {}
- 
-+    // Paper start
-+    private final java.util.List<Packet> extraPackets = new java.util.ArrayList<>();
-+    private static final int TE_LIMIT = Integer.getInteger("Paper.excessiveTELimit", 750);
-+
-+    @Override
-+    public java.util.List<Packet> getExtraPackets() {
-+        return extraPackets;
-+    }
-+    // Paper end
-     public PacketPlayOutMapChunk(Chunk chunk, int i) {
-         ChunkCoordIntPair chunkcoordintpair = chunk.getPos();
- 
-@@ -49,6 +58,7 @@ public class PacketPlayOutMapChunk implements Packet<PacketListenerPlayOut> {
-         this.c = this.a(new PacketDataSerializer(this.j()), chunk, i);
-         this.g = Lists.newArrayList();
-         iterator = chunk.getTileEntities().entrySet().iterator();
-+        int totalTileEntities = 0; // Paper
- 
-         while (iterator.hasNext()) {
-             entry = (Entry) iterator.next();
-@@ -57,6 +67,15 @@ public class PacketPlayOutMapChunk implements Packet<PacketListenerPlayOut> {
-             int j = blockposition.getY() >> 4;
- 
-             if (this.f() || (i & 1 << j) != 0) {
-+                // Paper start - improve oversized chunk data packet handling
-+                if (++totalTileEntities > TE_LIMIT) {
-+                    PacketPlayOutTileEntityData updatePacket = tileentity.getUpdatePacket();
-+                    if (updatePacket != null) {
-+                        this.extraPackets.add(updatePacket);
-+                        continue;
-+                    }
-+                }
-+                // Paper end
-                 NBTTagCompound nbttagcompound = tileentity.b();
-                 if (tileentity instanceof TileEntitySkull) { TileEntitySkull.sanitizeTileEntityUUID(nbttagcompound); } // Paper
- 
--- 
-2.26.2
-
diff --git a/Spigot-Server-Patches/0347-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/Spigot-Server-Patches/0347-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
new file mode 100644
index 0000000000..43c17a28bf
--- /dev/null
+++ b/Spigot-Server-Patches/0347-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
@@ -0,0 +1,238 @@
+From 3e4b27fb20f3daa3a10de02dbb640208038ec2c4 Mon Sep 17 00:00:00 2001
+From: Aikar <aikar@aikar.co>
+Date: Wed, 6 May 2020 04:53:35 -0400
+Subject: [PATCH] Optimize Network Manager and add advanced packet support
+
+Adds ability for 1 packet to bundle other packets to follow it
+adds ability for a packet to delay sending more packets until a state is ready.
+
+Removes synchronization from sending packets
+Removes processing packet queue off of main thread
+  - for the few cases where it is allowed, order is not necessary nor
+    should it even be happening concurrently in first place (handshaking/login/status)
+
+Ensures packets sent asynchronously are dispatched on main thread
+
+This helps ensure safety for ProtocolLib as packet listeners
+are commonly accessing world state. This will allow you to schedule
+a packet to be sent async, but itll be dispatched sync for packet
+listeners to process.
+
+This should solve some deadlock risks
+
+Part of this commit was authored by: Spottedleaf
+
+diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
+index b1dededc15c..b529c888249 100644
+--- a/src/main/java/net/minecraft/server/NetworkManager.java
++++ b/src/main/java/net/minecraft/server/NetworkManager.java
+@@ -64,6 +64,10 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
+     public int protocolVersion;
+     public java.net.InetSocketAddress virtualHost;
+     private static boolean enableExplicitFlush = Boolean.getBoolean("paper.explicit-flush");
++    // Optimize network
++    boolean isPending = true;
++    boolean queueImmunity = false;
++    EnumProtocol protocol;
+     // Paper end
+ 
+     public NetworkManager(EnumProtocolDirection enumprotocoldirection) {
+@@ -87,6 +91,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
+     }
+ 
+     public void setProtocol(EnumProtocol enumprotocol) {
++        protocol = enumprotocol; // Paper
+         this.channel.attr(NetworkManager.c).set(enumprotocol);
+         this.channel.config().setAutoRead(true);
+         NetworkManager.LOGGER.debug("Enabled auto read");
+@@ -158,19 +163,72 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
+         NetworkManager.LOGGER.debug("Set listener of {} to {}", this, packetlistener);
+         this.packetListener = packetlistener;
+     }
++    // Paper start
++    private static class InnerUtil { // Attempt to hide these methods from ProtocolLib so it doesn't accidently pick them up.
++        private static java.util.List<Packet> buildExtraPackets(Packet packet) {
++            java.util.List<Packet> extra = packet.getExtraPackets();
++            if (extra == null || extra.isEmpty()) {
++                return null;
++            }
++            java.util.List<Packet> ret = new java.util.ArrayList<>(1 + extra.size());
++            buildExtraPackets0(extra, ret);
++            return ret;
++        }
++
++        private static void buildExtraPackets0(java.util.List<Packet> extraPackets, java.util.List<Packet> into) {
++            for (Packet extra : extraPackets) {
++                into.add(extra);
++                java.util.List<Packet> extraExtra = extra.getExtraPackets();
++                if (extraExtra != null && !extraExtra.isEmpty()) {
++                    buildExtraPackets0(extraExtra, into);
++                }
++            }
++        }
++    }
++    // Paper end
+ 
+     public void sendPacket(Packet<?> packet) {
+         this.sendPacket(packet, (GenericFutureListener) null);
+     }
+ 
++    // Paper start
++    private boolean canSendImmediate(Packet<?> packet) {
++        return isPending || protocol == EnumProtocol.HANDSHAKING || protocol == EnumProtocol.STATUS || queueImmunity ||
++            packet instanceof PacketPlayOutKeepAlive ||
++            packet instanceof PacketPlayOutChat ||
++            packet instanceof PacketPlayOutTabComplete;
++    }
++    // Paper end
+     public void sendPacket(Packet<?> packet, @Nullable GenericFutureListener<? extends Future<? super Void>> genericfuturelistener) {
+-        if (this.isConnected()) {
+-            this.o();
+-            this.b(packet, genericfuturelistener);
+-        } else {
+-            this.packetQueue.add(new NetworkManager.QueuedPacket(packet, genericfuturelistener));
++        // Paper start - handle oversized packets better
++        boolean connected = this.isConnected();
++        if (!connected && !preparing) return; // Do nothing
++        if (connected && (canSendImmediate(packet) || (
++            MCUtil.isMainThread() && packet.isReady() && this.packetQueue.isEmpty() &&
++            (packet.getExtraPackets() == null || packet.getExtraPackets().isEmpty())
++        ))) {
++            this.dispatchPacket(packet, genericfuturelistener);
++            return;
+         }
++        // write the packets to the queue, then flush - antixray hooks there already
++        java.util.List<Packet> extraPackets = InnerUtil.buildExtraPackets(packet);
++        boolean hasExtraPackets = extraPackets != null && !extraPackets.isEmpty();
++        if (!hasExtraPackets) {
++            this.packetQueue.add(new NetworkManager.QueuedPacket(packet, genericfuturelistener));
++        } else {
++            java.util.List<NetworkManager.QueuedPacket> packets = new java.util.ArrayList<>(1 + extraPackets.size());
++            packets.add(new NetworkManager.QueuedPacket(packet, null)); // delay the future listener until the end of the extra packets
+ 
++            for (int i = 0, len = extraPackets.size(); i < len;) {
++                Packet extra = extraPackets.get(i);
++                boolean end = ++i == len;
++                packets.add(new NetworkManager.QueuedPacket(extra, end ? genericfuturelistener : null)); // append listener to the end
++            }
++
++            this.packetQueue.addAll(packets); // atomic
++        }
++        this.sendPacketQueue();
++        // Paper end
+     }
+ 
+     private void dispatchPacket(Packet<?> packet, @Nullable GenericFutureListener<? extends Future<? super Void>> genericFutureListener) { this.b(packet, genericFutureListener); } // Paper - OBFHELPER
+@@ -214,21 +272,46 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
+ 
+     }
+ 
+-    private void sendPacketQueue() { this.o(); } // Paper - OBFHELPER
+-    private void o() {
+-        if (this.channel != null && this.channel.isOpen()) {
+-            Queue queue = this.packetQueue;
+-
++    // Paper start - rewrite this to be safer on
++    private boolean sendPacketQueue() { return this.o(); } // OBFHELPER // void -> boolean
++    private boolean o() { // void -> boolean
++        if (!isConnected()) {
++            return true;
++        }
++        if (MCUtil.isMainThread()) {
++            return processQueue();
++        } else if (isPending) {
++            // Should only happen during login/status stages
+             synchronized (this.packetQueue) {
+-                NetworkManager.QueuedPacket networkmanager_queuedpacket;
+-
+-                while ((networkmanager_queuedpacket = (NetworkManager.QueuedPacket) this.packetQueue.poll()) != null) {
+-                    this.b(networkmanager_queuedpacket.a, networkmanager_queuedpacket.b);
+-                }
++                return this.processQueue();
++            }
++        }
++        return false;
++    }
++    private boolean processQueue() {
++        if (this.packetQueue.isEmpty()) return true;
++        // If we are on main, we are safe here in that nothing else should be processing queue off main anymore
++        // But if we are not on main due to login/status, the parent is synchronized on packetQueue
++        java.util.Iterator<QueuedPacket> iterator = this.packetQueue.iterator();
++        while (iterator.hasNext()) {
++            NetworkManager.QueuedPacket queued = iterator.next(); // poll -> peek
++
++            // Fix NPE (Spigot bug caused by handleDisconnection())
++            if (queued == null) {
++                return true;
++            }
+ 
++            Packet<?> packet = queued.getPacket();
++            if (!packet.isReady()) {
++                return false;
++            } else {
++                iterator.remove();
++                this.dispatchPacket(packet, queued.getGenericFutureListener());
+             }
+         }
++        return true;
+     }
++    // Paper end
+ 
+     public void a() {
+         this.o();
+@@ -260,6 +343,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
+     public void close(IChatBaseComponent ichatbasecomponent) {
+         // Spigot Start
+         this.preparing = false;
++        this.packetQueue.clear(); // Paper - just incase its closed before we ever get to the main thread to do this
+         // Spigot End
+         if (this.channel.isOpen()) {
+             this.channel.close(); // We can't wait as this may be called from an event loop.
+diff --git a/src/main/java/net/minecraft/server/Packet.java b/src/main/java/net/minecraft/server/Packet.java
+index 2d8e6a2f4a0..45142ed9d24 100644
+--- a/src/main/java/net/minecraft/server/Packet.java
++++ b/src/main/java/net/minecraft/server/Packet.java
+@@ -11,6 +11,8 @@ public interface Packet<T extends PacketListener> {
+     void a(T t0);
+ 
+     // Paper start
++    default boolean isReady() { return true; }
++    default java.util.List<Packet> getExtraPackets() { return null; }
+     default boolean packetTooLarge(NetworkManager manager) {
+         return false;
+     }
+diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
+index e148940ab37..e917d37382d 100644
+--- a/src/main/java/net/minecraft/server/PlayerList.java
++++ b/src/main/java/net/minecraft/server/PlayerList.java
+@@ -143,6 +143,7 @@ public abstract class PlayerList {
+ 
+         // CraftBukkit - getType()
+         // Spigot - view distance
++        networkmanager.queueImmunity = true; // Paper
+         playerconnection.sendPacket(new PacketPlayOutLogin(entityplayer.getId(), entityplayer.playerInteractManager.getGameMode(), WorldData.c(worlddata.getSeed()), worlddata.isHardcore(), worldserver.worldProvider.getDimensionManager().getType(), this.getMaxPlayers(), worlddata.getType(), worldserver.spigotConfig.viewDistance, flag1, !flag));
+         entityplayer.getBukkitEntity().sendSupportedChannels(); // CraftBukkit
+         playerconnection.sendPacket(new PacketPlayOutCustomPayload(PacketPlayOutCustomPayload.a, (new PacketDataSerializer(Unpooled.buffer())).a(this.getServer().getServerModName())));
+@@ -152,6 +153,7 @@ public abstract class PlayerList {
+         playerconnection.sendPacket(new PacketPlayOutRecipeUpdate(this.server.getCraftingManager().b()));
+         playerconnection.sendPacket(new PacketPlayOutTags(this.server.getTagRegistry()));
+         playerconnection.sendPacket(new PacketPlayOutEntityStatus(entityplayer, (byte) (worldserver.getGameRules().getBoolean(GameRules.REDUCED_DEBUG_INFO) ? 22 : 23))); // Paper - fix this rule not being initialized on the client
++        networkmanager.queueImmunity = false; // Paper
+         this.d(entityplayer);
+         entityplayer.getStatisticManager().c();
+         entityplayer.B().a(entityplayer);
+diff --git a/src/main/java/net/minecraft/server/ServerConnection.java b/src/main/java/net/minecraft/server/ServerConnection.java
+index 37a22ba6f7a..06cd29bb9a5 100644
+--- a/src/main/java/net/minecraft/server/ServerConnection.java
++++ b/src/main/java/net/minecraft/server/ServerConnection.java
+@@ -45,6 +45,7 @@ public class ServerConnection {
+         NetworkManager manager = null;
+         while ((manager = pending.poll()) != null) {
+             connectedChannels.add(manager);
++            manager.isPending = false;
+         }
+     }
+     // Paper end
+-- 
+2.26.2
+
diff --git a/Spigot-Server-Patches/0348-Handle-Oversized-Tile-Entities-in-chunks.patch b/Spigot-Server-Patches/0348-Handle-Oversized-Tile-Entities-in-chunks.patch
new file mode 100644
index 0000000000..992414d533
--- /dev/null
+++ b/Spigot-Server-Patches/0348-Handle-Oversized-Tile-Entities-in-chunks.patch
@@ -0,0 +1,57 @@
+From 46d39faab3128c9e0784d79f684421cfd0633385 Mon Sep 17 00:00:00 2001
+From: Aikar <aikar@aikar.co>
+Date: Wed, 6 May 2020 05:00:57 -0400
+Subject: [PATCH] Handle Oversized Tile Entities in chunks
+
+Splits out Extra Packets if too many TE's are encountered to prevent
+creating too large of a packet to sed.
+
+Co authored by Spottedleaf
+
+diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
+index a0b87f89df7..23223f3f452 100644
+--- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
++++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
+@@ -23,6 +23,15 @@ public class PacketPlayOutMapChunk implements Packet<PacketListenerPlayOut> {
+ 
+     public PacketPlayOutMapChunk() {}
+ 
++    // Paper start
++    private final java.util.List<Packet> extraPackets = new java.util.ArrayList<>();
++    private static final int TE_LIMIT = Integer.getInteger("Paper.excessiveTELimit", 750);
++
++    @Override
++    public java.util.List<Packet> getExtraPackets() {
++        return extraPackets;
++    }
++    // Paper end
+     public PacketPlayOutMapChunk(Chunk chunk, int i) {
+         ChunkCoordIntPair chunkcoordintpair = chunk.getPos();
+ 
+@@ -49,6 +58,7 @@ public class PacketPlayOutMapChunk implements Packet<PacketListenerPlayOut> {
+         this.c = this.a(new PacketDataSerializer(this.j()), chunk, i);
+         this.g = Lists.newArrayList();
+         iterator = chunk.getTileEntities().entrySet().iterator();
++        int totalTileEntities = 0; // Paper
+ 
+         while (iterator.hasNext()) {
+             entry = (Entry) iterator.next();
+@@ -57,6 +67,15 @@ public class PacketPlayOutMapChunk implements Packet<PacketListenerPlayOut> {
+             int j = blockposition.getY() >> 4;
+ 
+             if (this.f() || (i & 1 << j) != 0) {
++                // Paper start - improve oversized chunk data packet handling
++                if (++totalTileEntities > TE_LIMIT) {
++                    PacketPlayOutTileEntityData updatePacket = tileentity.getUpdatePacket();
++                    if (updatePacket != null) {
++                        this.extraPackets.add(updatePacket);
++                        continue;
++                    }
++                }
++                // Paper end
+                 NBTTagCompound nbttagcompound = tileentity.b();
+                 if (tileentity instanceof TileEntitySkull) { TileEntitySkull.sanitizeTileEntityUUID(nbttagcompound); } // Paper
+ 
+-- 
+2.26.2
+
diff --git a/Spigot-Server-Patches/0348-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch b/Spigot-Server-Patches/0349-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
similarity index 91%
rename from Spigot-Server-Patches/0348-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
rename to Spigot-Server-Patches/0349-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
index 949b0cc957..24ce2234fc 100644
--- a/Spigot-Server-Patches/0348-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
+++ b/Spigot-Server-Patches/0349-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
@@ -1,4 +1,4 @@
-From fba67f3ef49b5657b06b515fa949537fb350e6d5 Mon Sep 17 00:00:00 2001
+From 3730a4cd59b2ed66ea859188f3192b34baee9b2e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 2 Mar 2019 16:12:35 -0500
 Subject: [PATCH] MC-145260: Fix Whitelist On/Off inconsistency
@@ -11,7 +11,7 @@ everything to the Whitelist object.
 https://github.com/PaperMC/Paper/issues/1880
 
 diff --git a/src/main/java/net/minecraft/server/JsonList.java b/src/main/java/net/minecraft/server/JsonList.java
-index 8570e38f42..c97be42dd7 100644
+index 8570e38f42e..c97be42dd7b 100644
 --- a/src/main/java/net/minecraft/server/JsonList.java
 +++ b/src/main/java/net/minecraft/server/JsonList.java
 @@ -64,6 +64,7 @@ public class JsonList<K, V extends JsonListEntry<K>> {
@@ -23,7 +23,7 @@ index 8570e38f42..c97be42dd7 100644
          this.e = flag;
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index e148940ab3..f71c9f4a88 100644
+index e917d37382d..b30b1f68787 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -62,7 +62,7 @@ public abstract class PlayerList {
@@ -35,7 +35,7 @@ index e148940ab3..f71c9f4a88 100644
      protected final int maxPlayers;
      private int viewDistance;
      private EnumGamemode t;
-@@ -887,9 +887,9 @@ public abstract class PlayerList {
+@@ -889,9 +889,9 @@ public abstract class PlayerList {
      }
      public boolean isWhitelisted(GameProfile gameprofile, org.bukkit.event.player.PlayerLoginEvent loginEvent) {
          boolean isOp = this.operators.d(gameprofile);
@@ -47,7 +47,7 @@ index e148940ab3..f71c9f4a88 100644
          event.callEvent();
          if (!event.isWhitelisted()) {
              if (loginEvent != null) {
-@@ -1018,11 +1018,11 @@ public abstract class PlayerList {
+@@ -1020,11 +1020,11 @@ public abstract class PlayerList {
      }
  
      public boolean getHasWhitelist() {
diff --git a/Spigot-Server-Patches/0349-Set-Zombie-last-tick-at-start-of-drowning-process.patch b/Spigot-Server-Patches/0350-Set-Zombie-last-tick-at-start-of-drowning-process.patch
similarity index 89%
rename from Spigot-Server-Patches/0349-Set-Zombie-last-tick-at-start-of-drowning-process.patch
rename to Spigot-Server-Patches/0350-Set-Zombie-last-tick-at-start-of-drowning-process.patch
index 9053f00481..3d23663e23 100644
--- a/Spigot-Server-Patches/0349-Set-Zombie-last-tick-at-start-of-drowning-process.patch
+++ b/Spigot-Server-Patches/0350-Set-Zombie-last-tick-at-start-of-drowning-process.patch
@@ -1,4 +1,4 @@
-From 927f97dad5c3c7c78203de3e3fd891a8d85652eb Mon Sep 17 00:00:00 2001
+From fa2447042a27326216b884467d19e78e05ff514f Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Mon, 4 Mar 2019 02:23:28 -0500
 Subject: [PATCH] Set Zombie last tick at start of drowning process
@@ -6,7 +6,7 @@ Subject: [PATCH] Set Zombie last tick at start of drowning process
 Fixes GH-1887
 
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 2d4f8aac8f..8635d4f40c 100644
+index 2d4f8aac8fa..8635d4f40ca 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -169,6 +169,7 @@ public class EntityZombie extends EntityMonster {
diff --git a/Spigot-Server-Patches/0350-Allow-Saving-of-Oversized-Chunks.patch b/Spigot-Server-Patches/0351-Allow-Saving-of-Oversized-Chunks.patch
similarity index 98%
rename from Spigot-Server-Patches/0350-Allow-Saving-of-Oversized-Chunks.patch
rename to Spigot-Server-Patches/0351-Allow-Saving-of-Oversized-Chunks.patch
index 4de197181f..f873ae71f9 100644
--- a/Spigot-Server-Patches/0350-Allow-Saving-of-Oversized-Chunks.patch
+++ b/Spigot-Server-Patches/0351-Allow-Saving-of-Oversized-Chunks.patch
@@ -1,4 +1,4 @@
-From 3d59a86908c816eb90269b64d8b8d8b6d7829673 Mon Sep 17 00:00:00 2001
+From 0170a6bb955274d88f237f2414d6b01c7b6f9942 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 15 Feb 2019 01:08:19 -0500
 Subject: [PATCH] Allow Saving of Oversized Chunks
@@ -31,7 +31,7 @@ this fix, as the data will remain in the oversized file. Once the server returns
 to a jar with this fix, the data will be restored.
 
 diff --git a/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java b/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java
-index db66d4ac7d..2322c0c8c5 100644
+index db66d4ac7dc..2322c0c8c5a 100644
 --- a/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java
 +++ b/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java
 @@ -69,6 +69,7 @@ public class NBTCompressedStreamTools {
@@ -51,7 +51,7 @@ index db66d4ac7d..2322c0c8c5 100644
          a((NBTBase) nbttagcompound, dataoutput);
      }
 diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
-index cee1ea8f43..6b543f89d4 100644
+index cee1ea8f43e..6b543f89d4e 100644
 --- a/src/main/java/net/minecraft/server/RegionFile.java
 +++ b/src/main/java/net/minecraft/server/RegionFile.java
 @@ -17,6 +17,8 @@ import java.nio.file.Files;
@@ -156,7 +156,7 @@ index cee1ea8f43..6b543f89d4 100644
  
          private final ChunkCoordIntPair b;
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index 5065ece393..942b7d3239 100644
+index 5065ece393a..942b7d32393 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
 @@ -42,6 +42,74 @@ public final class RegionFileCache implements AutoCloseable {
diff --git a/Spigot-Server-Patches/0351-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/Spigot-Server-Patches/0352-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
similarity index 79%
rename from Spigot-Server-Patches/0351-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
rename to Spigot-Server-Patches/0352-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
index 550ccd13dc..47dfa44346 100644
--- a/Spigot-Server-Patches/0351-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
+++ b/Spigot-Server-Patches/0352-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
@@ -1,14 +1,14 @@
-From 2309159b775070446967c0c5904e5a5aed637fdf Mon Sep 17 00:00:00 2001
+From 47fde785e25ff945b9beacaa0430ba95b7939349 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Wed, 13 Mar 2019 20:08:09 +0200
 Subject: [PATCH] Call WhitelistToggleEvent when whitelist is toggled
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index f71c9f4a88..e9908cd01f 100644
+index b30b1f68787..faea0b31ddc 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -1022,6 +1022,7 @@ public abstract class PlayerList {
+@@ -1024,6 +1024,7 @@ public abstract class PlayerList {
      }
  
      public void setHasWhitelist(boolean flag) {
diff --git a/Spigot-Server-Patches/0352-Add-LivingEntity-getTargetEntity.patch b/Spigot-Server-Patches/0353-Add-LivingEntity-getTargetEntity.patch
similarity index 96%
rename from Spigot-Server-Patches/0352-Add-LivingEntity-getTargetEntity.patch
rename to Spigot-Server-Patches/0353-Add-LivingEntity-getTargetEntity.patch
index 5fa0fb791c..e10ebf1a7d 100644
--- a/Spigot-Server-Patches/0352-Add-LivingEntity-getTargetEntity.patch
+++ b/Spigot-Server-Patches/0353-Add-LivingEntity-getTargetEntity.patch
@@ -1,11 +1,11 @@
-From 20e594e2be54a1376bc40e754be8898060789567 Mon Sep 17 00:00:00 2001
+From e619f016a0ec5bca78761599e81bf0907e29b855 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 22 Sep 2018 00:33:08 -0500
 Subject: [PATCH] Add LivingEntity#getTargetEntity
 
 
 diff --git a/src/main/java/net/minecraft/server/AxisAlignedBB.java b/src/main/java/net/minecraft/server/AxisAlignedBB.java
-index f427953a83..3fdb52007a 100644
+index f427953a83c..3fdb52007a2 100644
 --- a/src/main/java/net/minecraft/server/AxisAlignedBB.java
 +++ b/src/main/java/net/minecraft/server/AxisAlignedBB.java
 @@ -108,6 +108,7 @@ public class AxisAlignedBB {
@@ -46,7 +46,7 @@ index f427953a83..3fdb52007a 100644
          double[] adouble = new double[]{1.0D};
          double d0 = vec3d1.x - vec3d.x;
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 3fc3b76436..3a1d97c290 100644
+index 3fc3b76436c..3a1d97c290c 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1475,6 +1475,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -66,7 +66,7 @@ index 3fc3b76436..3a1d97c290 100644
          return 0.0F;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index c7c248f63f..aecd5011cb 100644
+index c7c248f63f8..aecd5011cbe 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -3310,6 +3310,37 @@ public abstract class EntityLiving extends Entity {
@@ -108,7 +108,7 @@ index c7c248f63f..aecd5011cb 100644
  
      public int getShieldBlockingDelay() {
 diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
-index c1f462d9d3..498f381099 100644
+index c1f462d9d3e..498f381099b 100644
 --- a/src/main/java/net/minecraft/server/IEntitySelector.java
 +++ b/src/main/java/net/minecraft/server/IEntitySelector.java
 @@ -18,6 +18,7 @@ public final class IEntitySelector {
@@ -120,7 +120,7 @@ index c1f462d9d3..498f381099 100644
          return !entity.isSpectator();
      };
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 9e082d4514..7d101d9630 100644
+index 9e082d4514e..7d101d96308 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -216,6 +216,33 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/Spigot-Server-Patches/0353-Use-proper-max-length-when-serialising-BungeeCord-te.patch b/Spigot-Server-Patches/0354-Use-proper-max-length-when-serialising-BungeeCord-te.patch
similarity index 94%
rename from Spigot-Server-Patches/0353-Use-proper-max-length-when-serialising-BungeeCord-te.patch
rename to Spigot-Server-Patches/0354-Use-proper-max-length-when-serialising-BungeeCord-te.patch
index c44b7daff9..5f1c904401 100644
--- a/Spigot-Server-Patches/0353-Use-proper-max-length-when-serialising-BungeeCord-te.patch
+++ b/Spigot-Server-Patches/0354-Use-proper-max-length-when-serialising-BungeeCord-te.patch
@@ -1,4 +1,4 @@
-From 04fbaf647e0fe31e89d8ddea1e2da1f746a35035 Mon Sep 17 00:00:00 2001
+From d6d78cc32a6f2eef77024202d1a006091c4fc7d9 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 20 Mar 2019 21:19:29 -0700
 Subject: [PATCH] Use proper max length when serialising BungeeCord text
@@ -6,7 +6,7 @@ Subject: [PATCH] Use proper max length when serialising BungeeCord text
 
 
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutChat.java b/src/main/java/net/minecraft/server/PacketPlayOutChat.java
-index 0ab611564e..f7b2095bb7 100644
+index 0ab611564ed..f7b2095bb75 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutChat.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutChat.java
 @@ -3,7 +3,7 @@ package net.minecraft.server;
diff --git a/Spigot-Server-Patches/0354-Entity-getEntitySpawnReason.patch b/Spigot-Server-Patches/0355-Entity-getEntitySpawnReason.patch
similarity index 94%
rename from Spigot-Server-Patches/0354-Entity-getEntitySpawnReason.patch
rename to Spigot-Server-Patches/0355-Entity-getEntitySpawnReason.patch
index 3aa105d21d..d004673237 100644
--- a/Spigot-Server-Patches/0354-Entity-getEntitySpawnReason.patch
+++ b/Spigot-Server-Patches/0355-Entity-getEntitySpawnReason.patch
@@ -1,4 +1,4 @@
-From 2a916333230f6ec329d7edc1c0e3fa63d874739a Mon Sep 17 00:00:00 2001
+From e40a7b09de9dbe16ad64e56fad91efa3dfc5d965 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 24 Mar 2019 00:24:52 -0400
 Subject: [PATCH] Entity#getEntitySpawnReason
@@ -10,7 +10,7 @@ persistenting Living Entity, SPAWNER for spawners,
 or DEFAULT since data was not stored.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 3a1d97c290..030c9992eb 100644
+index 3a1d97c290c..030c9992ebe 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -72,6 +72,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -59,10 +59,10 @@ index 3a1d97c290..030c9992eb 100644
  
          } catch (Throwable throwable) {
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index e9908cd01f..7745e70d2d 100644
+index faea0b31ddc..faecf793416 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -238,7 +238,7 @@ public abstract class PlayerList {
+@@ -240,7 +240,7 @@ public abstract class PlayerList {
              // CraftBukkit start
              WorldServer finalWorldServer = worldserver;
              Entity entity = EntityTypes.a(nbttagcompound1.getCompound("Entity"), finalWorldServer, (entity1) -> {
@@ -72,7 +72,7 @@ index e9908cd01f..7745e70d2d 100644
              });
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index a75034079b..955003d5f8 100644
+index a75034079b0..955003d5f83 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1000,6 +1000,7 @@ public class WorldServer extends World {
@@ -84,7 +84,7 @@ index a75034079b..955003d5f8 100644
          if (entity.valid) {
              MinecraftServer.LOGGER.error("Attempted Double World add on " + entity, new Throwable());
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index bc2df82a5f..ff60568ce4 100644
+index bc2df82a5f4..ff60568ce43 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -1053,5 +1053,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -99,5 +99,5 @@ index bc2df82a5f..ff60568ce4 100644
      // Paper end
  }
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0355-Update-entity-Metadata-for-all-tracked-players.patch b/Spigot-Server-Patches/0356-Update-entity-Metadata-for-all-tracked-players.patch
similarity index 93%
rename from Spigot-Server-Patches/0355-Update-entity-Metadata-for-all-tracked-players.patch
rename to Spigot-Server-Patches/0356-Update-entity-Metadata-for-all-tracked-players.patch
index ebfeefb43b..b89a347c9f 100644
--- a/Spigot-Server-Patches/0355-Update-entity-Metadata-for-all-tracked-players.patch
+++ b/Spigot-Server-Patches/0356-Update-entity-Metadata-for-all-tracked-players.patch
@@ -1,11 +1,11 @@
-From 53f2486cd178c8aeafe4f7fcbcc38b91401cdb88 Mon Sep 17 00:00:00 2001
+From 6a1e78f606bdaf63e33ad53c875643ee4d23ec0e Mon Sep 17 00:00:00 2001
 From: AgentTroll <woodyc40@gmail.com>
 Date: Fri, 22 Mar 2019 22:24:03 -0700
 Subject: [PATCH] Update entity Metadata for all tracked players
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index 3ff7a7b4a8..3a88c9a670 100644
+index 3ff7a7b4a85..3a88c9a6706 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 @@ -387,6 +387,12 @@ public class EntityTrackerEntry {
@@ -22,7 +22,7 @@ index 3ff7a7b4a8..3a88c9a670 100644
          this.f.accept(packet);
          if (this.tracker instanceof EntityPlayer) {
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 94d3d602cc..f496006f3c 100644
+index 94d3d602ccd..f496006f3cc 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2006,7 +2006,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0356-Fire-event-on-GS4-query.patch b/Spigot-Server-Patches/0357-Fire-event-on-GS4-query.patch
similarity index 98%
rename from Spigot-Server-Patches/0356-Fire-event-on-GS4-query.patch
rename to Spigot-Server-Patches/0357-Fire-event-on-GS4-query.patch
index 90149b6d04..e46e56a491 100644
--- a/Spigot-Server-Patches/0356-Fire-event-on-GS4-query.patch
+++ b/Spigot-Server-Patches/0357-Fire-event-on-GS4-query.patch
@@ -1,11 +1,11 @@
-From 6368f83b3c11cd5930a058d7e1af219689de710a Mon Sep 17 00:00:00 2001
+From b66157b0e104e63060671da87f8b7070d77ec623 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Sun, 17 Mar 2019 21:46:56 +0200
 Subject: [PATCH] Fire event on GS4 query
 
 
 diff --git a/src/main/java/net/minecraft/server/RemoteConnectionThread.java b/src/main/java/net/minecraft/server/RemoteConnectionThread.java
-index 66bfbcf02b..d821ef9a75 100644
+index 66bfbcf02b5..d821ef9a757 100644
 --- a/src/main/java/net/minecraft/server/RemoteConnectionThread.java
 +++ b/src/main/java/net/minecraft/server/RemoteConnectionThread.java
 @@ -15,7 +15,7 @@ public abstract class RemoteConnectionThread implements Runnable {
@@ -26,7 +26,7 @@ index 66bfbcf02b..d821ef9a75 100644
          return this.b.getPlayerCount();
      }
 diff --git a/src/main/java/net/minecraft/server/RemoteStatusListener.java b/src/main/java/net/minecraft/server/RemoteStatusListener.java
-index f4f4e31d3c..d502593847 100644
+index f4f4e31d3c2..d5025938473 100644
 --- a/src/main/java/net/minecraft/server/RemoteStatusListener.java
 +++ b/src/main/java/net/minecraft/server/RemoteStatusListener.java
 @@ -21,19 +21,19 @@ public class RemoteStatusListener extends RemoteConnectionThread {
@@ -184,7 +184,7 @@ index f4f4e31d3c..d502593847 100644
          }
      }
 diff --git a/src/main/java/net/minecraft/server/RemoteStatusReply.java b/src/main/java/net/minecraft/server/RemoteStatusReply.java
-index 848b5c3f0e..73efea7e13 100644
+index 848b5c3f0e0..73efea7e135 100644
 --- a/src/main/java/net/minecraft/server/RemoteStatusReply.java
 +++ b/src/main/java/net/minecraft/server/RemoteStatusReply.java
 @@ -18,15 +18,27 @@ public class RemoteStatusReply {
diff --git a/Spigot-Server-Patches/0357-Implement-PlayerPostRespawnEvent.patch b/Spigot-Server-Patches/0358-Implement-PlayerPostRespawnEvent.patch
similarity index 86%
rename from Spigot-Server-Patches/0357-Implement-PlayerPostRespawnEvent.patch
rename to Spigot-Server-Patches/0358-Implement-PlayerPostRespawnEvent.patch
index 73ff2bf8bb..be84b48fc0 100644
--- a/Spigot-Server-Patches/0357-Implement-PlayerPostRespawnEvent.patch
+++ b/Spigot-Server-Patches/0358-Implement-PlayerPostRespawnEvent.patch
@@ -1,14 +1,14 @@
-From fe1d9061214fcaaea43cc380bd8819db43cd6ef5 Mon Sep 17 00:00:00 2001
+From efb2085aea2ab734b3304938ab927e1346c61124 Mon Sep 17 00:00:00 2001
 From: MisterVector <whizkid3000@hotmail.com>
 Date: Fri, 26 Oct 2018 21:31:00 -0700
 Subject: [PATCH] Implement PlayerPostRespawnEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 7745e70d2d..765ebe2ccf 100644
+index faecf793416..b8302de65a7 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -625,9 +625,14 @@ public abstract class PlayerList {
+@@ -627,9 +627,14 @@ public abstract class PlayerList {
  
          // this.a(entityplayer1, entityplayer, worldserver); // CraftBukkit - removed
  
@@ -24,7 +24,7 @@ index 7745e70d2d..765ebe2ccf 100644
              CraftWorld cworld = (CraftWorld) this.server.server.getWorld(entityplayer.spawnWorld);
              if (cworld != null && blockposition != null) {
              Optional<Vec3D> optional = EntityHuman.getBed(cworld.getHandle(), blockposition, flag1);
-@@ -660,6 +665,7 @@ public abstract class PlayerList {
+@@ -662,6 +667,7 @@ public abstract class PlayerList {
  
              location = respawnEvent.getRespawnLocation();
              if (!flag) entityplayer.reset(); // SPIGOT-4785
@@ -32,7 +32,7 @@ index 7745e70d2d..765ebe2ccf 100644
          } else {
              location.setWorld(server.getWorldServer(dimensionmanager).getWorld());
          }
-@@ -721,6 +727,13 @@ public abstract class PlayerList {
+@@ -723,6 +729,13 @@ public abstract class PlayerList {
          if (entityplayer.playerConnection.isDisconnected()) {
              this.savePlayerFile(entityplayer);
          }
diff --git a/Spigot-Server-Patches/0358-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/Spigot-Server-Patches/0359-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
similarity index 93%
rename from Spigot-Server-Patches/0358-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
rename to Spigot-Server-Patches/0359-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
index 8f418585c3..1dfed50519 100644
--- a/Spigot-Server-Patches/0358-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
+++ b/Spigot-Server-Patches/0359-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
@@ -1,4 +1,4 @@
-From 0c5dafb96edefcc69c58ac616a6cdfa53a9d424a Mon Sep 17 00:00:00 2001
+From 1b3e4940f789fd007e51ab14997b1f6d12ae5bdb Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 24 Mar 2019 18:09:20 -0400
 Subject: [PATCH] don't go below 0 for pickupDelay, breaks picking up items
@@ -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 e5c9bac88a..ef2cf6565b 100644
+index e5c9bac88a5..ef2cf6565b5 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/0359-Implement-getters-and-setters-for-EntityItem-owner-a.patch b/Spigot-Server-Patches/0360-Implement-getters-and-setters-for-EntityItem-owner-a.patch
similarity index 93%
rename from Spigot-Server-Patches/0359-Implement-getters-and-setters-for-EntityItem-owner-a.patch
rename to Spigot-Server-Patches/0360-Implement-getters-and-setters-for-EntityItem-owner-a.patch
index a00738c088..77d1c4dda0 100644
--- a/Spigot-Server-Patches/0359-Implement-getters-and-setters-for-EntityItem-owner-a.patch
+++ b/Spigot-Server-Patches/0360-Implement-getters-and-setters-for-EntityItem-owner-a.patch
@@ -1,4 +1,4 @@
-From f2e944bdd3e61bff0b406b41f6e9479773f303f7 Mon Sep 17 00:00:00 2001
+From d348aeb4cd8433a29684d89109fbec52c26e20ad Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 6 Oct 2018 20:54:23 -0500
 Subject: [PATCH] Implement getters and setters for EntityItem owner and
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement getters and setters for EntityItem owner and
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
-index 3f552b5905..cb756b1ba0 100644
+index 3f552b5905e..cb756b1ba04 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 @@ -8,6 +8,11 @@ import org.bukkit.entity.EntityType;
diff --git a/Spigot-Server-Patches/0360-Server-Tick-Events.patch b/Spigot-Server-Patches/0361-Server-Tick-Events.patch
similarity index 93%
rename from Spigot-Server-Patches/0360-Server-Tick-Events.patch
rename to Spigot-Server-Patches/0361-Server-Tick-Events.patch
index 01a59082f0..bdccd2ef1b 100644
--- a/Spigot-Server-Patches/0360-Server-Tick-Events.patch
+++ b/Spigot-Server-Patches/0361-Server-Tick-Events.patch
@@ -1,4 +1,4 @@
-From 920bc1ee45449dd207915a96b375578c12ff65df Mon Sep 17 00:00:00 2001
+From 5deb0eb94ead4e4a486ec4bcdd8eab5554935401 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 27 Mar 2019 22:48:45 -0400
 Subject: [PATCH] Server Tick Events
@@ -6,7 +6,7 @@ Subject: [PATCH] Server Tick Events
 Fires event at start and end of a server tick
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 3d9cc2ce67..249eaf56bc 100644
+index 3d9cc2ce67b..249eaf56bc0 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1089,6 +1089,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
diff --git a/Spigot-Server-Patches/0361-PlayerDeathEvent-getItemsToKeep.patch b/Spigot-Server-Patches/0362-PlayerDeathEvent-getItemsToKeep.patch
similarity index 96%
rename from Spigot-Server-Patches/0361-PlayerDeathEvent-getItemsToKeep.patch
rename to Spigot-Server-Patches/0362-PlayerDeathEvent-getItemsToKeep.patch
index 72e38d831e..f152c26f36 100644
--- a/Spigot-Server-Patches/0361-PlayerDeathEvent-getItemsToKeep.patch
+++ b/Spigot-Server-Patches/0362-PlayerDeathEvent-getItemsToKeep.patch
@@ -1,4 +1,4 @@
-From 503288334c8c014ccf596d10eda2ae7d79af30db Mon Sep 17 00:00:00 2001
+From dbdaf7148eb63c2e7d4beb433705b9d84f096f94 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 27 Mar 2019 23:01:33 -0400
 Subject: [PATCH] PlayerDeathEvent#getItemsToKeep
@@ -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 17c9c90359..f375c9507c 100644
+index 17c9c90359f..f375c9507c0 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -516,6 +516,46 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0362-Optimize-Captured-TileEntity-Lookup.patch b/Spigot-Server-Patches/0363-Optimize-Captured-TileEntity-Lookup.patch
similarity index 93%
rename from Spigot-Server-Patches/0362-Optimize-Captured-TileEntity-Lookup.patch
rename to Spigot-Server-Patches/0363-Optimize-Captured-TileEntity-Lookup.patch
index 5b4406e35e..59333d4297 100644
--- a/Spigot-Server-Patches/0362-Optimize-Captured-TileEntity-Lookup.patch
+++ b/Spigot-Server-Patches/0363-Optimize-Captured-TileEntity-Lookup.patch
@@ -1,4 +1,4 @@
-From 23c0ef61239b0c992bdd637d092e08161c8376a1 Mon Sep 17 00:00:00 2001
+From 7a9d022f868304772dd7371ea54c01d8b265e0c2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 6 Apr 2019 10:16:48 -0400
 Subject: [PATCH] Optimize Captured TileEntity Lookup
@@ -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 a3fbdf5db5..f797d737a3 100644
+index a3fbdf5db5c..f797d737a37 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -998,12 +998,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
diff --git a/Spigot-Server-Patches/0363-Add-Heightmap-API.patch b/Spigot-Server-Patches/0364-Add-Heightmap-API.patch
similarity index 94%
rename from Spigot-Server-Patches/0363-Add-Heightmap-API.patch
rename to Spigot-Server-Patches/0364-Add-Heightmap-API.patch
index 844e77118e..9fb5ab96f7 100644
--- a/Spigot-Server-Patches/0363-Add-Heightmap-API.patch
+++ b/Spigot-Server-Patches/0364-Add-Heightmap-API.patch
@@ -1,11 +1,11 @@
-From 6bf15982de8340f724270d5927326022f541c9bf Mon Sep 17 00:00:00 2001
+From 03c72e21e244c7c8beb80f9767b4b8db173b0dc8 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Tue, 1 Jan 2019 02:22:01 -0800
 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 f797d737a3..983bc1c7d9 100644
+index f797d737a37..983bc1c7d9c 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -573,8 +573,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -20,7 +20,7 @@ index f797d737a3..983bc1c7d9 100644
  
          if (i >= -30000000 && j >= -30000000 && i < 30000000 && j < 30000000) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index db31b17b87..0d5731429a 100644
+index db31b17b870..0d5731429ab 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -339,6 +339,29 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0364-Mob-Spawner-API-Enhancements.patch b/Spigot-Server-Patches/0365-Mob-Spawner-API-Enhancements.patch
similarity index 97%
rename from Spigot-Server-Patches/0364-Mob-Spawner-API-Enhancements.patch
rename to Spigot-Server-Patches/0365-Mob-Spawner-API-Enhancements.patch
index 4e10ed2137..1722af119c 100644
--- a/Spigot-Server-Patches/0364-Mob-Spawner-API-Enhancements.patch
+++ b/Spigot-Server-Patches/0365-Mob-Spawner-API-Enhancements.patch
@@ -1,11 +1,11 @@
-From d46e20a175c7deee53044d4e966d5df554c526c1 Mon Sep 17 00:00:00 2001
+From 820419ffdc15ff3e0b1136313ab35bebec02ee66 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 19 Apr 2019 12:41:13 -0500
 Subject: [PATCH] Mob Spawner API Enhancements
 
 
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index cb7cb789b8..41001b02a6 100644
+index cb7cb789b82..41001b02a65 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -47,6 +47,7 @@ public abstract class MobSpawnerAbstract {
@@ -82,7 +82,7 @@ index cb7cb789b8..41001b02a6 100644
              nbttagcompound.setShort("MaxNearbyEntities", (short) this.maxNearbyEntities);
              nbttagcompound.setShort("RequiredPlayerRange", (short) this.requiredPlayerRange);
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java b/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java
-index 5c4c3c70c7..e78e3804ba 100644
+index 5c4c3c70c74..e78e3804bad 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java
 @@ -121,4 +121,16 @@ public class CraftCreatureSpawner extends CraftBlockEntityState<TileEntityMobSpa
diff --git a/Spigot-Server-Patches/0365-Per-Player-View-Distance-API-placeholders.patch b/Spigot-Server-Patches/0366-Per-Player-View-Distance-API-placeholders.patch
similarity index 95%
rename from Spigot-Server-Patches/0365-Per-Player-View-Distance-API-placeholders.patch
rename to Spigot-Server-Patches/0366-Per-Player-View-Distance-API-placeholders.patch
index 431c6aaac9..e3972e9701 100644
--- a/Spigot-Server-Patches/0365-Per-Player-View-Distance-API-placeholders.patch
+++ b/Spigot-Server-Patches/0366-Per-Player-View-Distance-API-placeholders.patch
@@ -1,4 +1,4 @@
-From c5faeb8cde3cbd30f2ce61fb48120094d890a6b3 Mon Sep 17 00:00:00 2001
+From 4b91f6659653324605c15185b8bd45129e5c0ae8 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Mon, 6 May 2019 01:29:25 -0400
 Subject: [PATCH] Per-Player View Distance API placeholders
@@ -7,7 +7,7 @@ I hope to look at this more in-depth soon. It appears doable.
 However this should not block the update.
 
 diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index 6a4ccaeb0f..5bf99e0028 100644
+index 6a4ccaeb0fe..5bf99e0028b 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
 @@ -579,9 +579,9 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
@@ -23,7 +23,7 @@ index 6a4ccaeb0f..5bf99e0028 100644
                      double deltaX = this.locX() - player.locX();
                      double deltaZ = this.locZ() - player.locZ();
 diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java
-index 2e95069c19..2f466af4d5 100644
+index 2e95069c190..2f466af4d56 100644
 --- a/src/main/java/net/minecraft/server/EntityWither.java
 +++ b/src/main/java/net/minecraft/server/EntityWither.java
 @@ -208,9 +208,9 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
@@ -39,7 +39,7 @@ index 2e95069c19..2f466af4d5 100644
                      double deltaX = this.locX() - player.locX();
                      double deltaZ = this.locZ() - player.locZ();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 6e3bcfe2cd..6672feaf51 100644
+index 6e3bcfe2cd7..6672feaf519 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1959,6 +1959,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -60,5 +60,5 @@ index 6e3bcfe2cd..6672feaf51 100644
  
      // Spigot start
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0366-Fix-CB-call-to-changed-postToMainThread-method.patch b/Spigot-Server-Patches/0367-Fix-CB-call-to-changed-postToMainThread-method.patch
similarity index 88%
rename from Spigot-Server-Patches/0366-Fix-CB-call-to-changed-postToMainThread-method.patch
rename to Spigot-Server-Patches/0367-Fix-CB-call-to-changed-postToMainThread-method.patch
index fa80476b96..a3a4535e23 100644
--- a/Spigot-Server-Patches/0366-Fix-CB-call-to-changed-postToMainThread-method.patch
+++ b/Spigot-Server-Patches/0367-Fix-CB-call-to-changed-postToMainThread-method.patch
@@ -1,11 +1,11 @@
-From 2cf64c24dc08b86ebede63940f7c60e939293fd3 Mon Sep 17 00:00:00 2001
+From 1a82c85c9131e8d849c299a84f6faaad89126a8e Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Fri, 10 May 2019 18:38:19 +0100
 Subject: [PATCH] Fix CB call to changed postToMainThread method
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index f496006f3c..65c171cec3 100644
+index f496006f3cc..65c171cec3c 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -286,7 +286,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0367-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/Spigot-Server-Patches/0368-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
similarity index 91%
rename from Spigot-Server-Patches/0367-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
rename to Spigot-Server-Patches/0368-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
index 43a72d0b80..26881a6d95 100644
--- a/Spigot-Server-Patches/0367-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
+++ b/Spigot-Server-Patches/0368-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
@@ -1,4 +1,4 @@
-From 6d6002de9471b8642c27bbb0117d32aad673952f Mon Sep 17 00:00:00 2001
+From adcbdd24b1904b926deb18cb52aaf5bdc6bef916 Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Sat, 27 Apr 2019 20:00:43 +0100
 Subject: [PATCH] Fix sounds when item frames are modified (MC-123450)
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix sounds when item frames are modified (MC-123450)
 This also fixes the adding sound playing when the item frame direction is changed.
 
 diff --git a/src/main/java/net/minecraft/server/EntityItemFrame.java b/src/main/java/net/minecraft/server/EntityItemFrame.java
-index 9b1e07452f..f8a2f32f1d 100644
+index 9b1e07452f9..f8a2f32f1d9 100644
 --- a/src/main/java/net/minecraft/server/EntityItemFrame.java
 +++ b/src/main/java/net/minecraft/server/EntityItemFrame.java
 @@ -224,7 +224,7 @@ public class EntityItemFrame extends EntityHanging {
@@ -19,7 +19,7 @@ index 9b1e07452f..f8a2f32f1d 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java
-index 2873ff9d1f..a3613edcbb 100644
+index 2873ff9d1f0..a3613edcbb5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java
 @@ -49,7 +49,7 @@ public class CraftItemFrame extends CraftHanging implements ItemFrame {
diff --git a/Spigot-Server-Patches/0368-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch b/Spigot-Server-Patches/0369-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
similarity index 93%
rename from Spigot-Server-Patches/0368-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
rename to Spigot-Server-Patches/0369-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
index 82c5eb2a1d..1e893b5304 100644
--- a/Spigot-Server-Patches/0368-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
+++ b/Spigot-Server-Patches/0369-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
@@ -1,4 +1,4 @@
-From 8af095a4141ffaceab91fafb82e0d51a82533b58 Mon Sep 17 00:00:00 2001
+From d852e8603fe42022eadb6c3098ca1fc5d105f51f Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Mon, 13 May 2019 21:10:59 -0700
 Subject: [PATCH] Fix CraftServer#isPrimaryThread and MinecraftServer
@@ -16,7 +16,7 @@ handling that should have been handled synchronously will be handled
 synchronously when the server gets shut down.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 249eaf56bc..45882ee30f 100644
+index 249eaf56bc0..45882ee30f5 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2217,7 +2217,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -29,7 +29,7 @@ index 249eaf56bc..45882ee30f 100644
  
      @Deprecated
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 811e676e4f..14cc12d772 100644
+index 811e676e4f9..14cc12d772f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1706,7 +1706,7 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0369-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch b/Spigot-Server-Patches/0370-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
similarity index 94%
rename from Spigot-Server-Patches/0369-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
rename to Spigot-Server-Patches/0370-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
index e9a48e8b2d..c855eff467 100644
--- a/Spigot-Server-Patches/0369-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
+++ b/Spigot-Server-Patches/0370-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
@@ -1,4 +1,4 @@
-From 95e5aec7a2016027b8d2e8bbd4c4e3f0bf34ecfa Mon Sep 17 00:00:00 2001
+From ff8fc720f8efa7406986c50bea7f9626f8c420b5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 28 Sep 2018 21:49:53 -0400
 Subject: [PATCH] Fix issues with entity loss due to unloaded chunks
@@ -19,7 +19,7 @@ This change ensures the chunks are always loaded when entities are
 added to the world, or a valid entity moves between chunks.
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 955003d5f8..6da2392915 100644
+index 955003d5f83..6da2392915e 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -707,7 +707,7 @@ public class WorldServer extends World {
@@ -41,5 +41,5 @@ index 955003d5f8..6da2392915 100644
              if (!(ichunkaccess instanceof Chunk)) {
                  return false;
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0370-Duplicate-UUID-Resolve-Option.patch b/Spigot-Server-Patches/0371-Duplicate-UUID-Resolve-Option.patch
similarity index 97%
rename from Spigot-Server-Patches/0370-Duplicate-UUID-Resolve-Option.patch
rename to Spigot-Server-Patches/0371-Duplicate-UUID-Resolve-Option.patch
index 515ab86632..de6d9d3789 100644
--- a/Spigot-Server-Patches/0370-Duplicate-UUID-Resolve-Option.patch
+++ b/Spigot-Server-Patches/0371-Duplicate-UUID-Resolve-Option.patch
@@ -1,4 +1,4 @@
-From 97b023aeeb726ea74a5d6b68d2caf5ec322c3867 Mon Sep 17 00:00:00 2001
+From ef0a83ad4172464d369414ca845de3c00cf356ec Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 21 Jul 2018 14:27:34 -0400
 Subject: [PATCH] Duplicate UUID Resolve Option
@@ -33,7 +33,7 @@ But for those who are ok with leaving this inconsistent behavior, you may use WA
 It is recommended you regenerate the entities, as these were legit entities, and deserve your love.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 4ba72275b9..572679e4d1 100644
+index 4ba72275b96..572679e4d1c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -442,4 +442,43 @@ public class PaperWorldConfig {
@@ -81,7 +81,7 @@ index 4ba72275b9..572679e4d1 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 8e9ddca049..165cb994e8 100644
+index 8e9ddca049f..165cb994e84 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -492,6 +492,7 @@ public class Chunk implements IChunkAccess {
@@ -93,7 +93,7 @@ index 8e9ddca049..165cb994e8 100644
  
          int k = MathHelper.floor(entity.locY() / 16.0D);
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 030c9992eb..fd6dad8437 100644
+index 030c9992ebe..fd6dad8437b 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2749,6 +2749,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -105,7 +105,7 @@ index 030c9992eb..fd6dad8437 100644
          this.uniqueID = uuid;
          this.am = this.uniqueID.toString();
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 4ee26ff08f..1d255ce383 100644
+index 4ee26ff08f7..1d255ce3833 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -1,6 +1,7 @@
@@ -197,7 +197,7 @@ index 4ee26ff08f..1d255ce383 100644
          ChunkCoordIntPair chunkcoordintpair = playerchunk.i();
          CompletableFuture<Either<List<IChunkAccess>, PlayerChunk.Failure>> completablefuture = this.a(chunkcoordintpair, 1, (i) -> {
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 6da2392915..081df240f3 100644
+index 6da2392915e..081df240f30 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -3,6 +3,8 @@ package net.minecraft.server;
@@ -236,5 +236,5 @@ index 6da2392915..081df240f3 100644
          }
      }
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0371-improve-CraftWorld-isChunkLoaded.patch b/Spigot-Server-Patches/0372-improve-CraftWorld-isChunkLoaded.patch
similarity index 93%
rename from Spigot-Server-Patches/0371-improve-CraftWorld-isChunkLoaded.patch
rename to Spigot-Server-Patches/0372-improve-CraftWorld-isChunkLoaded.patch
index f58a3b76c2..bd12a45cc2 100644
--- a/Spigot-Server-Patches/0371-improve-CraftWorld-isChunkLoaded.patch
+++ b/Spigot-Server-Patches/0372-improve-CraftWorld-isChunkLoaded.patch
@@ -1,4 +1,4 @@
-From 9a1f286e2ac42d5cf63e7e26f8d676f23d140cff Mon Sep 17 00:00:00 2001
+From 0508c10e21274ebf11d37c0814625ab35675e76f Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Tue, 21 May 2019 02:34:04 +0100
 Subject: [PATCH] improve CraftWorld#isChunkLoaded
@@ -9,7 +9,7 @@ waiting for the execution queue to get to our request; We can just query
 the chunk status and get a response now, vs having to wait
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 0d5731429a..5ea7b0b25a 100644
+index 0d5731429ab..5ea7b0b25ae 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -405,14 +405,13 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0372-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0373-Configurable-Keep-Spawn-Loaded-range-per-world.patch
similarity index 97%
rename from Spigot-Server-Patches/0372-Configurable-Keep-Spawn-Loaded-range-per-world.patch
rename to Spigot-Server-Patches/0373-Configurable-Keep-Spawn-Loaded-range-per-world.patch
index 79a7acc26d..e59ab1d870 100644
--- a/Spigot-Server-Patches/0372-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/Spigot-Server-Patches/0373-Configurable-Keep-Spawn-Loaded-range-per-world.patch
@@ -1,4 +1,4 @@
-From cc2a6afe5cb4a37d3a57b7afaa5754485474a05d Mon Sep 17 00:00:00 2001
+From 5cbff57039db1e60204a869d6629d1472501956a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 13 Sep 2014 23:14:43 -0400
 Subject: [PATCH] Configurable Keep Spawn Loaded range per world
@@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Keep Spawn Loaded range per world
 This lets you disable it for some worlds and lower it for others.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 572679e4d1..071e5e7f72 100644
+index 572679e4d1c..071e5e7f729 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -481,4 +481,10 @@ public class PaperWorldConfig {
@@ -21,7 +21,7 @@ index 572679e4d1..071e5e7f72 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 45882ee30f..0ee1d8e486 100644
+index 45882ee30f5..0ee1d8e4869 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -586,6 +586,14 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -60,7 +60,7 @@ index 45882ee30f..0ee1d8e486 100644
          // CraftBukkit start
          // this.nextTick = SystemUtils.getMonotonicMillis() + 10L;
 diff --git a/src/main/java/net/minecraft/server/WorldLoadListener.java b/src/main/java/net/minecraft/server/WorldLoadListener.java
-index d6762d3853..7b6f5b2da0 100644
+index d6762d3853b..7b6f5b2da0a 100644
 --- a/src/main/java/net/minecraft/server/WorldLoadListener.java
 +++ b/src/main/java/net/minecraft/server/WorldLoadListener.java
 @@ -9,4 +9,6 @@ public interface WorldLoadListener {
@@ -71,7 +71,7 @@ index d6762d3853..7b6f5b2da0 100644
 +    void setChunkRadius(int radius); // Paper - allow changing chunk radius
  }
 diff --git a/src/main/java/net/minecraft/server/WorldLoadListenerLogger.java b/src/main/java/net/minecraft/server/WorldLoadListenerLogger.java
-index 3868572aed..ae77805f71 100644
+index 3868572aed5..ae77805f71c 100644
 --- a/src/main/java/net/minecraft/server/WorldLoadListenerLogger.java
 +++ b/src/main/java/net/minecraft/server/WorldLoadListenerLogger.java
 @@ -7,16 +7,24 @@ import org.apache.logging.log4j.Logger;
@@ -102,7 +102,7 @@ index 3868572aed..ae77805f71 100644
      @Override
      public void a(ChunkCoordIntPair chunkcoordintpair) {
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 081df240f3..ce506e0e12 100644
+index 081df240f30..ce506e0e129 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1596,13 +1596,89 @@ public class WorldServer extends World {
@@ -199,7 +199,7 @@ index 081df240f3..ce506e0e12 100644
  
      public LongSet getForceLoadedChunks() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 5ea7b0b25a..8f8c18c5a4 100644
+index 5ea7b0b25ae..8f8c18c5a4f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1932,15 +1932,21 @@ public class CraftWorld implements World {
@@ -229,5 +229,5 @@ index 5ea7b0b25a..8f8c18c5a4 100644
  
      @Override
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0373-Fix-some-generation-concurrency-issues.patch b/Spigot-Server-Patches/0374-Fix-some-generation-concurrency-issues.patch
similarity index 98%
rename from Spigot-Server-Patches/0373-Fix-some-generation-concurrency-issues.patch
rename to Spigot-Server-Patches/0374-Fix-some-generation-concurrency-issues.patch
index bc4f321c91..ccfee26871 100644
--- a/Spigot-Server-Patches/0373-Fix-some-generation-concurrency-issues.patch
+++ b/Spigot-Server-Patches/0374-Fix-some-generation-concurrency-issues.patch
@@ -1,11 +1,11 @@
-From d49bbe17f24c083ab0defcf54a81be3c1c62dd4f Mon Sep 17 00:00:00 2001
+From d2a98726d1f84c4bdd9e8657f802d5a6a321c824 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Fri, 24 May 2019 07:53:16 +0100
 Subject: [PATCH] Fix some generation concurrency issues
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 983bc1c7d9..8cf3c10274 100644
+index 983bc1c7d9c..8cf3c10274b 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -86,6 +86,23 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -33,7 +33,7 @@ index 983bc1c7d9..8cf3c10274 100644
      public CraftWorld getWorld() {
          return this.world;
 diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureStateProviderWeighted.java b/src/main/java/net/minecraft/server/WorldGenFeatureStateProviderWeighted.java
-index 22e14fe1e9..e2af6d43b2 100644
+index 22e14fe1e98..e2af6d43b2e 100644
 --- a/src/main/java/net/minecraft/server/WorldGenFeatureStateProviderWeighted.java
 +++ b/src/main/java/net/minecraft/server/WorldGenFeatureStateProviderWeighted.java
 @@ -23,18 +23,18 @@ public class WorldGenFeatureStateProviderWeighted extends WorldGenFeatureStatePr
@@ -59,7 +59,7 @@ index 22e14fe1e9..e2af6d43b2 100644
  
          builder.put(dynamicops.createString("type"), dynamicops.createString(IRegistry.t.getKey(this.a).toString())).put(dynamicops.createString("entries"), this.b.a(dynamicops, (iblockdata) -> {
 diff --git a/src/main/java/net/minecraft/server/WorldGenStronghold.java b/src/main/java/net/minecraft/server/WorldGenStronghold.java
-index fc4348b602..44be7169ff 100644
+index fc4348b6024..44be7169ffd 100644
 --- a/src/main/java/net/minecraft/server/WorldGenStronghold.java
 +++ b/src/main/java/net/minecraft/server/WorldGenStronghold.java
 @@ -10,10 +10,12 @@ import javax.annotation.Nullable;
diff --git a/Spigot-Server-Patches/0374-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch b/Spigot-Server-Patches/0375-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch
similarity index 89%
rename from Spigot-Server-Patches/0374-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch
rename to Spigot-Server-Patches/0375-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch
index 5f6a3b41ba..f3f51bc15d 100644
--- a/Spigot-Server-Patches/0374-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch
+++ b/Spigot-Server-Patches/0375-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch
@@ -1,4 +1,4 @@
-From b534976a471b308f55d533a4d9b8a4196af985f1 Mon Sep 17 00:00:00 2001
+From 8e94206baea84377f5af244de9b5081b4805f69b Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Mon, 27 May 2019 17:35:39 -0500
 Subject: [PATCH] MC-114618 - Fix EntityAreaEffectCloud from going negative
@@ -6,7 +6,7 @@ Subject: [PATCH] MC-114618 - Fix EntityAreaEffectCloud from going negative
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java b/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java
-index e8f3e55fd3..44289c2301 100644
+index e8f3e55fd3f..44289c23013 100644
 --- a/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java
 +++ b/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java
 @@ -175,6 +175,12 @@ public class EntityAreaEffectCloud extends Entity {
diff --git a/Spigot-Server-Patches/0375-ChunkMapDistance-CME.patch b/Spigot-Server-Patches/0376-ChunkMapDistance-CME.patch
similarity index 95%
rename from Spigot-Server-Patches/0375-ChunkMapDistance-CME.patch
rename to Spigot-Server-Patches/0376-ChunkMapDistance-CME.patch
index 09bb7e1a66..a53ea9d156 100644
--- a/Spigot-Server-Patches/0375-ChunkMapDistance-CME.patch
+++ b/Spigot-Server-Patches/0376-ChunkMapDistance-CME.patch
@@ -1,11 +1,11 @@
-From 3ddc66c3dead96c8a40ecd6a9e1a6e998d73113d Mon Sep 17 00:00:00 2001
+From 384ed7ddbd1fb6ee901787fc1b89fd8078bd6421 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Wed, 29 May 2019 04:01:22 +0100
 Subject: [PATCH] ChunkMapDistance CME
 
 
 diff --git a/src/main/java/net/minecraft/server/ChunkMapDistance.java b/src/main/java/net/minecraft/server/ChunkMapDistance.java
-index ae66129777..0244768f76 100644
+index ae661297774..0244768f76d 100644
 --- a/src/main/java/net/minecraft/server/ChunkMapDistance.java
 +++ b/src/main/java/net/minecraft/server/ChunkMapDistance.java
 @@ -33,7 +33,7 @@ public abstract class ChunkMapDistance {
diff --git a/Spigot-Server-Patches/0376-Implement-CraftBlockSoundGroup.patch b/Spigot-Server-Patches/0377-Implement-CraftBlockSoundGroup.patch
similarity index 95%
rename from Spigot-Server-Patches/0376-Implement-CraftBlockSoundGroup.patch
rename to Spigot-Server-Patches/0377-Implement-CraftBlockSoundGroup.patch
index fb8dcd9557..e3a41ac798 100644
--- a/Spigot-Server-Patches/0376-Implement-CraftBlockSoundGroup.patch
+++ b/Spigot-Server-Patches/0377-Implement-CraftBlockSoundGroup.patch
@@ -1,4 +1,4 @@
-From c27bee1089d1793ed4abb4ce78edad4c2b0b35ea Mon Sep 17 00:00:00 2001
+From 16268e83f7a03f9362cc71c8485458ac118f6850 Mon Sep 17 00:00:00 2001
 From: simpleauthority <jacob@algorithmjunkie.com>
 Date: Tue, 28 May 2019 03:48:51 -0700
 Subject: [PATCH] Implement CraftBlockSoundGroup
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement CraftBlockSoundGroup
 
 diff --git a/src/main/java/com/destroystokyo/paper/block/CraftBlockSoundGroup.java b/src/main/java/com/destroystokyo/paper/block/CraftBlockSoundGroup.java
 new file mode 100644
-index 0000000000..99f99330d0
+index 00000000000..99f99330d01
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/block/CraftBlockSoundGroup.java
 @@ -0,0 +1,38 @@
@@ -49,7 +49,7 @@ index 0000000000..99f99330d0
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/IBlockData.java b/src/main/java/net/minecraft/server/IBlockData.java
-index c1ff62aa52..de43881653 100644
+index c1ff62aa525..de43881653f 100644
 --- a/src/main/java/net/minecraft/server/IBlockData.java
 +++ b/src/main/java/net/minecraft/server/IBlockData.java
 @@ -275,6 +275,7 @@ public class IBlockData extends BlockDataAbstract<Block, IBlockData> implements
@@ -61,7 +61,7 @@ index c1ff62aa52..de43881653 100644
          return this.getBlock().getStepSound(this);
      }
 diff --git a/src/main/java/net/minecraft/server/SoundEffectType.java b/src/main/java/net/minecraft/server/SoundEffectType.java
-index b774d2d8d9..0184bf3fc9 100644
+index b774d2d8d90..0184bf3fc9e 100644
 --- a/src/main/java/net/minecraft/server/SoundEffectType.java
 +++ b/src/main/java/net/minecraft/server/SoundEffectType.java
 @@ -27,10 +27,10 @@ public class SoundEffectType {
@@ -96,7 +96,7 @@ index b774d2d8d9..0184bf3fc9 100644
          return this.D;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index ef81c1d3a9..db446c25c4 100644
+index ef81c1d3a96..db446c25c41 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -701,4 +701,11 @@ public class CraftBlock implements Block {
diff --git a/Spigot-Server-Patches/0377-Chunk-debug-command.patch b/Spigot-Server-Patches/0378-Chunk-debug-command.patch
similarity index 98%
rename from Spigot-Server-Patches/0377-Chunk-debug-command.patch
rename to Spigot-Server-Patches/0378-Chunk-debug-command.patch
index 079fdf353c..29dca4c934 100644
--- a/Spigot-Server-Patches/0377-Chunk-debug-command.patch
+++ b/Spigot-Server-Patches/0378-Chunk-debug-command.patch
@@ -1,4 +1,4 @@
-From fe0e64b5fa6c9cf4e1f5d5b3f69a1afdcac2838f Mon Sep 17 00:00:00 2001
+From 90e4bcf58d0c12a6b6069c3f829ae0a65d07a18a Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sat, 1 Jun 2019 13:00:55 -0700
 Subject: [PATCH] Chunk debug command
@@ -32,7 +32,7 @@ https://bugs.mojang.com/browse/MC-141484?focusedCommentId=528273&page=com.atlass
 https://bugs.mojang.com/browse/MC-141484?focusedCommentId=528577&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-528577
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-index 5acad8e44f..af81098784 100644
+index 5acad8e44f0..af810987846 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
 @@ -28,14 +28,14 @@ public class PaperCommand extends Command {
@@ -185,7 +185,7 @@ index 5acad8e44f..af81098784 100644
       * Ported from MinecraftForge - author: LexManos <LexManos@gmail.com> - License: LGPLv2.1
       */
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 8c6550433c..e6d08756f7 100644
+index 8c6550433c2..e6d08756f76 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -22,7 +22,7 @@ import org.apache.logging.log4j.Logger;
@@ -198,7 +198,7 @@ index 8c6550433c..e6d08756f7 100644
      public final ChunkGenerator<?> chunkGenerator;
      private final WorldServer world;
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
-index 3342278bcd..2dcecc1bbd 100644
+index 3342278bcd4..2dcecc1bbd0 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
 @@ -4,7 +4,13 @@ import com.destroystokyo.paper.block.TargetBlockInfo;
@@ -399,7 +399,7 @@ index 3342278bcd..2dcecc1bbd 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index 6e9f402fb0..a640cb3845 100644
+index 6e9f402fb0f..a640cb3845a 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
 @@ -26,7 +26,7 @@ public class PlayerChunk {
@@ -412,7 +412,7 @@ index 6e9f402fb0..a640cb3845 100644
      private int dirtyCount;
      private int r;
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 3c237b259e..6122d19ccf 100644
+index 1d255ce3833..34f470779fa 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -58,7 +58,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -434,7 +434,7 @@ index 3c237b259e..6122d19ccf 100644
      private final DefinedStructureManager definedStructureManager;
      private final File w;
 diff --git a/src/main/java/net/minecraft/server/Ticket.java b/src/main/java/net/minecraft/server/Ticket.java
-index 77bb6b092a..7a8397815a 100644
+index 77bb6b092a0..7a8397815a5 100644
 --- a/src/main/java/net/minecraft/server/Ticket.java
 +++ b/src/main/java/net/minecraft/server/Ticket.java
 @@ -6,8 +6,8 @@ public final class Ticket<T> implements Comparable<Ticket<?>> {
diff --git a/Spigot-Server-Patches/0378-incremental-chunk-saving.patch b/Spigot-Server-Patches/0379-incremental-chunk-saving.patch
similarity index 97%
rename from Spigot-Server-Patches/0378-incremental-chunk-saving.patch
rename to Spigot-Server-Patches/0379-incremental-chunk-saving.patch
index 3c5aa168fa..f9b29e273d 100644
--- a/Spigot-Server-Patches/0378-incremental-chunk-saving.patch
+++ b/Spigot-Server-Patches/0379-incremental-chunk-saving.patch
@@ -1,11 +1,11 @@
-From 66128649d1111260a8bac1509459a62a354d645f Mon Sep 17 00:00:00 2001
+From c03e491a8ed8909f4fb05239f72cd6701aa85c3c Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 9 Jun 2019 03:53:22 +0100
 Subject: [PATCH] incremental chunk saving
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 071e5e7f72..4867615215 100644
+index 071e5e7f729..48676152152 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -487,4 +487,19 @@ public class PaperWorldConfig {
@@ -29,7 +29,7 @@ index 071e5e7f72..4867615215 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 165cb994e8..af0d6aff4d 100644
+index 165cb994e84..af0d6aff4de 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -42,7 +42,7 @@ public class Chunk implements IChunkAccess {
@@ -42,7 +42,7 @@ index 165cb994e8..af0d6aff4d 100644
      private long inhabitedTime;
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index e6d08756f7..6713b7667a 100644
+index e6d08756f76..6713b7667ae 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -515,6 +515,15 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -62,7 +62,7 @@ index e6d08756f7..6713b7667a 100644
      public void close() throws IOException {
          // CraftBukkit start
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 0ee1d8e486..7ecf781263 100644
+index 0ee1d8e4869..7ecf7812631 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -168,6 +168,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -108,7 +108,7 @@ index 0ee1d8e486..7ecf781263 100644
          this.methodProfiler.enter("snooper");
          if (((DedicatedServer) this).getDedicatedServerProperties().snooperEnabled && !this.snooper.d() && this.ticks > 100) { // Spigot
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index a640cb3845..3d255b1964 100644
+index a640cb3845a..3d255b19647 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
 @@ -40,6 +40,9 @@ public class PlayerChunk {
@@ -175,7 +175,7 @@ index a640cb3845..3d255b1964 100644
      public void a(ProtoChunkExtension protochunkextension) {
          for (int i = 0; i < this.statusFutures.length(); ++i) {
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 34f470779f..4f5b516144 100644
+index 34f470779fa..4f5b5161448 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -332,6 +332,64 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -261,7 +261,7 @@ index 34f470779f..4f5b516144 100644
                      return PlayerChunk.getChunkState(playerchunk.getTicketLevel());
                  });
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index ce506e0e12..ad5e538b24 100644
+index ce506e0e129..ad5e538b249 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -814,11 +814,44 @@ public class WorldServer extends World {
@@ -319,5 +319,5 @@ index ce506e0e12..ad5e538b24 100644
          this.checkSession();
          this.worldProvider.i();
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0379-Catch-exceptions-from-dispenser-entity-spawns.patch b/Spigot-Server-Patches/0380-Catch-exceptions-from-dispenser-entity-spawns.patch
similarity index 92%
rename from Spigot-Server-Patches/0379-Catch-exceptions-from-dispenser-entity-spawns.patch
rename to Spigot-Server-Patches/0380-Catch-exceptions-from-dispenser-entity-spawns.patch
index 6aea698002..7e39cf3a22 100644
--- a/Spigot-Server-Patches/0379-Catch-exceptions-from-dispenser-entity-spawns.patch
+++ b/Spigot-Server-Patches/0380-Catch-exceptions-from-dispenser-entity-spawns.patch
@@ -1,11 +1,11 @@
-From f403a4b73ac3674658a77dd99754681bc8fe9d9b Mon Sep 17 00:00:00 2001
+From e91ccdfcf67e3cb91dfac91124dc2b9b90d458ad Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Mon, 10 Jun 2019 09:36:40 +0100
 Subject: [PATCH] Catch exceptions from dispenser entity spawns
 
 
 diff --git a/src/main/java/net/minecraft/server/IDispenseBehavior.java b/src/main/java/net/minecraft/server/IDispenseBehavior.java
-index 5a8c4dc6ba..b6b7e3c6c9 100644
+index 5a8c4dc6ba3..b6b7e3c6c97 100644
 --- a/src/main/java/net/minecraft/server/IDispenseBehavior.java
 +++ b/src/main/java/net/minecraft/server/IDispenseBehavior.java
 @@ -163,7 +163,14 @@ public interface IDispenseBehavior {
diff --git a/Spigot-Server-Patches/0380-Fix-World-isChunkGenerated-calls.patch b/Spigot-Server-Patches/0381-Fix-World-isChunkGenerated-calls.patch
similarity index 97%
rename from Spigot-Server-Patches/0380-Fix-World-isChunkGenerated-calls.patch
rename to Spigot-Server-Patches/0381-Fix-World-isChunkGenerated-calls.patch
index 9c5eb3cc6d..32f6adfd00 100644
--- a/Spigot-Server-Patches/0380-Fix-World-isChunkGenerated-calls.patch
+++ b/Spigot-Server-Patches/0381-Fix-World-isChunkGenerated-calls.patch
@@ -1,4 +1,4 @@
-From 75b996c4fd3a28b61da26277680b89205538715d Mon Sep 17 00:00:00 2001
+From 9c05bc01b61c0d3e656e41ba6e037f24422aa8f5 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sat, 15 Jun 2019 08:54:33 -0700
 Subject: [PATCH] Fix World#isChunkGenerated calls
@@ -8,7 +8,7 @@ This patch also adds a chunk status cache on region files (note that
 its only purpose is to cache the status on DISK)
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 6713b7667a..4c9c8e4839 100644
+index 6713b7667ae..4c9c8e48397 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -28,7 +28,7 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -43,7 +43,7 @@ index 6713b7667a..4c9c8e4839 100644
  
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index f54572773c..8e4b3e52cb 100644
+index f54572773c2..8e4b3e52cbc 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -403,6 +403,17 @@ public class ChunkRegionLoader {
@@ -65,7 +65,7 @@ index f54572773c..8e4b3e52cb 100644
          if (nbttagcompound != null) {
              ChunkStatus chunkstatus = ChunkStatus.a(nbttagcompound.getCompound("Level").getString("Status"));
 diff --git a/src/main/java/net/minecraft/server/ChunkStatus.java b/src/main/java/net/minecraft/server/ChunkStatus.java
-index efdf611e66..134a4f0b7d 100644
+index efdf611e66f..134a4f0b7d2 100644
 --- a/src/main/java/net/minecraft/server/ChunkStatus.java
 +++ b/src/main/java/net/minecraft/server/ChunkStatus.java
 @@ -176,6 +176,7 @@ public class ChunkStatus {
@@ -95,7 +95,7 @@ index efdf611e66..134a4f0b7d 100644
          return (ChunkStatus) IRegistry.CHUNK_STATUS.get(MinecraftKey.a(s));
      }
 diff --git a/src/main/java/net/minecraft/server/IChunkLoader.java b/src/main/java/net/minecraft/server/IChunkLoader.java
-index f0a052eec2..2f95174fcc 100644
+index f0a052eec2f..2f95174fcc4 100644
 --- a/src/main/java/net/minecraft/server/IChunkLoader.java
 +++ b/src/main/java/net/minecraft/server/IChunkLoader.java
 @@ -8,7 +8,7 @@ import javax.annotation.Nullable;
@@ -108,7 +108,7 @@ index f0a052eec2..2f95174fcc 100644
      @Nullable
      private PersistentStructureLegacy c;
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index 3d255b1964..040d4b41ea 100644
+index 3d255b19647..040d4b41ea2 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
 @@ -114,6 +114,19 @@ public class PlayerChunk {
@@ -132,7 +132,7 @@ index 3d255b1964..040d4b41ea 100644
  
      public CompletableFuture<Either<IChunkAccess, PlayerChunk.Failure>> getStatusFutureUnchecked(ChunkStatus chunkstatus) {
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 4f5b516144..1d517fd1ae 100644
+index 4f5b5161448..1d517fd1aea 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -969,12 +969,62 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -201,7 +201,7 @@ index 4f5b516144..1d517fd1ae 100644
          // Spigot start
          return isOutsideOfRange(chunkcoordintpair, false);
 diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
-index 6b543f89d4..d37abf2cf3 100644
+index 6b543f89d4e..d37abf2cf30 100644
 --- a/src/main/java/net/minecraft/server/RegionFile.java
 +++ b/src/main/java/net/minecraft/server/RegionFile.java
 @@ -36,6 +36,30 @@ public class RegionFile implements AutoCloseable {
@@ -250,7 +250,7 @@ index 6b543f89d4..d37abf2cf3 100644
              this.c();
          } finally {
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index 942b7d3239..2f8af42e2a 100644
+index 942b7d32393..2f8af42e2aa 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
 @@ -18,7 +18,14 @@ public final class RegionFileCache implements AutoCloseable {
@@ -280,7 +280,7 @@ index 942b7d3239..2f8af42e2a 100644
              throwable = throwable1;
              throw throwable1;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 8f8c18c5a4..50467656df 100644
+index 8f8c18c5a4f..50467656df0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -19,6 +19,7 @@ import java.util.Objects;
@@ -376,5 +376,5 @@ index 8f8c18c5a4..50467656df 100644
  
      @Override
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0381-Show-blockstate-location-if-we-failed-to-read-it.patch b/Spigot-Server-Patches/0382-Show-blockstate-location-if-we-failed-to-read-it.patch
similarity index 93%
rename from Spigot-Server-Patches/0381-Show-blockstate-location-if-we-failed-to-read-it.patch
rename to Spigot-Server-Patches/0382-Show-blockstate-location-if-we-failed-to-read-it.patch
index 97542cff81..1706e20b7b 100644
--- a/Spigot-Server-Patches/0381-Show-blockstate-location-if-we-failed-to-read-it.patch
+++ b/Spigot-Server-Patches/0382-Show-blockstate-location-if-we-failed-to-read-it.patch
@@ -1,11 +1,11 @@
-From 5fb77abe2ba87a60f9554a8b90cfa4195ab9bc60 Mon Sep 17 00:00:00 2001
+From 68d3254c13adaa72ad19d365d9b93228659f8f6a Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sat, 15 Jun 2019 10:28:25 -0700
 Subject: [PATCH] Show blockstate location if we failed to read it
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
-index f6401e2cde..3e22d558ea 100644
+index f6401e2cde9..3e22d558ea0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 @@ -19,6 +19,8 @@ public class CraftBlockEntityState<T extends TileEntity> extends CraftBlockState
diff --git a/Spigot-Server-Patches/0382-Log-other-thread-in-DataPaletteBlock-lock-failure.patch b/Spigot-Server-Patches/0383-Log-other-thread-in-DataPaletteBlock-lock-failure.patch
similarity index 95%
rename from Spigot-Server-Patches/0382-Log-other-thread-in-DataPaletteBlock-lock-failure.patch
rename to Spigot-Server-Patches/0383-Log-other-thread-in-DataPaletteBlock-lock-failure.patch
index ee8b28ef88..01a4bda272 100644
--- a/Spigot-Server-Patches/0382-Log-other-thread-in-DataPaletteBlock-lock-failure.patch
+++ b/Spigot-Server-Patches/0383-Log-other-thread-in-DataPaletteBlock-lock-failure.patch
@@ -1,4 +1,4 @@
-From c180f32a504b094bc68c03280d7a8e8e8cf0cf95 Mon Sep 17 00:00:00 2001
+From 752b4b4ee83b0fb68b360836985b4b5868f5193f Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Fri, 21 Jun 2019 14:42:48 -0700
 Subject: [PATCH] Log other thread in DataPaletteBlock lock failure
@@ -6,7 +6,7 @@ Subject: [PATCH] Log other thread in DataPaletteBlock lock failure
 
 diff --git a/src/main/java/com/destroystokyo/paper/util/ReentrantLockWithGetOwner.java b/src/main/java/com/destroystokyo/paper/util/ReentrantLockWithGetOwner.java
 new file mode 100644
-index 0000000000..a3b174618d
+index 00000000000..a3b174618d4
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/util/ReentrantLockWithGetOwner.java
 @@ -0,0 +1,11 @@
@@ -22,7 +22,7 @@ index 0000000000..a3b174618d
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/DataPaletteBlock.java b/src/main/java/net/minecraft/server/DataPaletteBlock.java
-index d5f5a51872..2c1d1b1a55 100644
+index d5f5a51872d..2c1d1b1a556 100644
 --- a/src/main/java/net/minecraft/server/DataPaletteBlock.java
 +++ b/src/main/java/net/minecraft/server/DataPaletteBlock.java
 @@ -22,14 +22,17 @@ public class DataPaletteBlock<T> implements DataPaletteExpandable<T> {
diff --git a/Spigot-Server-Patches/0383-Use-ChunkStatus-cache-when-saving-protochunks.patch b/Spigot-Server-Patches/0384-Use-ChunkStatus-cache-when-saving-protochunks.patch
similarity index 92%
rename from Spigot-Server-Patches/0383-Use-ChunkStatus-cache-when-saving-protochunks.patch
rename to Spigot-Server-Patches/0384-Use-ChunkStatus-cache-when-saving-protochunks.patch
index 143ec2d770..0e7bdbdcbc 100644
--- a/Spigot-Server-Patches/0383-Use-ChunkStatus-cache-when-saving-protochunks.patch
+++ b/Spigot-Server-Patches/0384-Use-ChunkStatus-cache-when-saving-protochunks.patch
@@ -1,4 +1,4 @@
-From 49a348381d91ac93ec0d3b43bfdf5751ba9e0f31 Mon Sep 17 00:00:00 2001
+From fcb0693eae0508c934823b90905ecac2ba6fc5f8 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sat, 22 Jun 2019 04:20:47 -0700
 Subject: [PATCH] Use ChunkStatus cache when saving protochunks
@@ -7,7 +7,7 @@ The cache should contain the chunk status when saving. If not it
 will load it.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 1d517fd1ae..9171785ad5 100644
+index 1d517fd1aea..9171785ad54 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -845,8 +845,10 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -24,5 +24,5 @@ index 1d517fd1ae..9171785ad5 100644
                      }
  
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0384-Anti-Xray.patch b/Spigot-Server-Patches/0385-Anti-Xray.patch
similarity index 95%
rename from Spigot-Server-Patches/0384-Anti-Xray.patch
rename to Spigot-Server-Patches/0385-Anti-Xray.patch
index 59c58203e9..66da612058 100644
--- a/Spigot-Server-Patches/0384-Anti-Xray.patch
+++ b/Spigot-Server-Patches/0385-Anti-Xray.patch
@@ -1,4 +1,4 @@
-From 5428b63f7eed04603e23443185f1593dff63141f Mon Sep 17 00:00:00 2001
+From 081c30c2fad9c1e70600d092292f753ca4054587 Mon Sep 17 00:00:00 2001
 From: stonar96 <minecraft.stonar96@gmail.com>
 Date: Mon, 20 Aug 2018 03:03:58 +0200
 Subject: [PATCH] Anti-Xray
@@ -1219,63 +1219,8 @@ index 2c1d1b1a556..2c7872bd051 100644
          int j = along.length * 64 / 4096;
  
          if (this.h == this.b) {
-diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 02a9f3d5fa4..55441e10023 100644
---- a/src/main/java/net/minecraft/server/NetworkManager.java
-+++ b/src/main/java/net/minecraft/server/NetworkManager.java
-@@ -188,6 +188,11 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
- 
-     public void sendPacket(Packet<?> packet, @Nullable GenericFutureListener<? extends Future<? super Void>> genericfuturelistener) {
-         // Paper start - handle oversized packets better
-+        // Special case keepalive, allow it to go out of queue order
-+        if (packet instanceof PacketPlayOutKeepAlive && this.isConnected()) {
-+            this.dispatchPacket(packet, genericfuturelistener);
-+            return;
-+        }
-         // write the packets to the queue, then flush - antixray hooks there already
-         java.util.List<Packet> extraPackets = InnerUtil.buildExtraPackets(packet);
-         boolean hasExtraPackets = extraPackets != null && !extraPackets.isEmpty();
-@@ -250,21 +255,32 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
- 
-     }
- 
--    private void sendPacketQueue() { this.o(); } // Paper - OBFHELPER
--    private void o() {
-+    // Paper start - Async-Anti-Xray - Stop dispatching further packets and return false if the peeked packet is a chunk packet which is not ready
-+    private boolean sendPacketQueue() { return this.o(); } // OBFHELPER // void -> boolean
-+    private boolean o() { // void -> boolean
-         if (this.channel != null && this.channel.isOpen()) {
-             Queue queue = this.packetQueue;
- 
-             synchronized (this.packetQueue) {
--                NetworkManager.QueuedPacket networkmanager_queuedpacket;
--
--                while ((networkmanager_queuedpacket = (NetworkManager.QueuedPacket) this.packetQueue.poll()) != null) {
--                    this.b(networkmanager_queuedpacket.a, networkmanager_queuedpacket.b);
-+                while (!this.packetQueue.isEmpty()) {
-+                    NetworkManager.QueuedPacket networkmanager_queuedpacket = (NetworkManager.QueuedPacket) queue.peek(); // poll -> peek
-+
-+                    if (networkmanager_queuedpacket != null) { // Fix NPE (Spigot bug caused by handleDisconnection())
-+                        if (networkmanager_queuedpacket.getPacket() instanceof PacketPlayOutMapChunk && !((PacketPlayOutMapChunk) networkmanager_queuedpacket.getPacket()).isReady()) { // Check if the peeked packet is a chunk packet which is not ready
-+                            return false; // Return false if the peeked packet is a chunk packet which is not ready
-+                        } else {
-+                            queue.poll(); // poll here
-+                            this.dispatchPacket(networkmanager_queuedpacket.getPacket(), networkmanager_queuedpacket.getGenericFutureListener()); // dispatch the packet
-+                        }
-+                    }
-                 }
- 
-             }
-         }
-+
-+        return true; // Return true if all packets were dispatched
-     }
-+    // Paper end
- 
-     public void a() {
-         this.o();
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
-index 23223f3f452..0d485064cac 100644
+index 23223f3f452..9b608d73869 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 @@ -1,5 +1,6 @@
@@ -1322,7 +1267,7 @@ index 23223f3f452..0d485064cac 100644
          this.g = Lists.newArrayList();
          iterator = chunk.getTileEntities().entrySet().iterator();
          int totalTileEntities = 0; // Paper
-@@ -82,9 +94,19 @@ public class PacketPlayOutMapChunk implements Packet<PacketListenerPlayOut> {
+@@ -82,8 +94,19 @@ public class PacketPlayOutMapChunk implements Packet<PacketListenerPlayOut> {
                  this.g.add(nbttagcompound);
              }
          }
@@ -1330,19 +1275,19 @@ index 23223f3f452..0d485064cac 100644
 +    }
  
 +    // Paper start - Async-Anti-Xray - Getter and Setter for the ready flag
++    @Override
 +    public boolean isReady() {
 +        return this.ready;
-     }
- 
++    }
++
 +    public void setReady(boolean ready) {
 +        this.ready = ready;
-+    }
+     }
 +    // Paper end
-+
+ 
      @Override
      public void a(PacketDataSerializer packetdataserializer) throws IOException {
-         this.a = packetdataserializer.readInt();
-@@ -149,8 +171,12 @@ public class PacketPlayOutMapChunk implements Packet<PacketListenerPlayOut> {
+@@ -149,8 +172,12 @@ public class PacketPlayOutMapChunk implements Packet<PacketListenerPlayOut> {
          return bytebuf;
      }
  
@@ -1357,7 +1302,7 @@ index 23223f3f452..0d485064cac 100644
          int j = 0;
          ChunkSection[] achunksection = chunk.getSections();
          int k = 0;
-@@ -160,7 +186,7 @@ public class PacketPlayOutMapChunk implements Packet<PacketListenerPlayOut> {
+@@ -160,7 +187,7 @@ public class PacketPlayOutMapChunk implements Packet<PacketListenerPlayOut> {
  
              if (chunksection != Chunk.a && (!this.f() || !chunksection.c()) && (i & 1 << k) != 0) {
                  j |= 1 << k;
diff --git a/Spigot-Server-Patches/0385-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/Spigot-Server-Patches/0386-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
similarity index 97%
rename from Spigot-Server-Patches/0385-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
rename to Spigot-Server-Patches/0386-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
index 0784b261dc..cd5b4018ca 100644
--- a/Spigot-Server-Patches/0385-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
+++ b/Spigot-Server-Patches/0386-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
@@ -1,4 +1,4 @@
-From 2a775d142dadfb085d3d2cfa1d68d241266f561c Mon Sep 17 00:00:00 2001
+From 59d1d306e9914f440eb7f2b3c41b8bf530da8229 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 24 Mar 2019 01:01:32 -0400
 Subject: [PATCH] Only count Natural Spawned mobs towards natural spawn mob
diff --git a/Spigot-Server-Patches/0386-Configurable-projectile-relative-velocity.patch b/Spigot-Server-Patches/0387-Configurable-projectile-relative-velocity.patch
similarity index 98%
rename from Spigot-Server-Patches/0386-Configurable-projectile-relative-velocity.patch
rename to Spigot-Server-Patches/0387-Configurable-projectile-relative-velocity.patch
index 2d99efb208..673789e211 100644
--- a/Spigot-Server-Patches/0386-Configurable-projectile-relative-velocity.patch
+++ b/Spigot-Server-Patches/0387-Configurable-projectile-relative-velocity.patch
@@ -1,4 +1,4 @@
-From 3e542a3222644e3e755f1eccaf1928aa032c811c Mon Sep 17 00:00:00 2001
+From 36f980352d9ce16a9745728412d3483c095aa88b Mon Sep 17 00:00:00 2001
 From: Lucavon <lucavonlp@gmail.com>
 Date: Tue, 23 Jul 2019 20:29:20 -0500
 Subject: [PATCH] Configurable projectile relative velocity
diff --git a/Spigot-Server-Patches/0387-Mark-entities-as-being-ticked-when-notifying-navigat.patch b/Spigot-Server-Patches/0388-Mark-entities-as-being-ticked-when-notifying-navigat.patch
similarity index 90%
rename from Spigot-Server-Patches/0387-Mark-entities-as-being-ticked-when-notifying-navigat.patch
rename to Spigot-Server-Patches/0388-Mark-entities-as-being-ticked-when-notifying-navigat.patch
index 66ee903c40..310475ec04 100644
--- a/Spigot-Server-Patches/0387-Mark-entities-as-being-ticked-when-notifying-navigat.patch
+++ b/Spigot-Server-Patches/0388-Mark-entities-as-being-ticked-when-notifying-navigat.patch
@@ -1,11 +1,11 @@
-From 48c7ea33b09e22bfd136ef2e492543d543b71d7e Mon Sep 17 00:00:00 2001
+From 18edd33aa38027c5395645ceb17dbc4a3c4a384a Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 28 Jul 2019 00:51:11 +0100
 Subject: [PATCH] Mark entities as being ticked when notifying navigation
 
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 5d1fa08f69..8561f96b9a 100644
+index 5d1fa08f697..8561f96b9a1 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1410,6 +1410,7 @@ public class WorldServer extends World {
@@ -25,5 +25,5 @@ index 5d1fa08f69..8561f96b9a 100644
      }
  
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0388-offset-item-frame-ticking.patch b/Spigot-Server-Patches/0389-offset-item-frame-ticking.patch
similarity index 88%
rename from Spigot-Server-Patches/0388-offset-item-frame-ticking.patch
rename to Spigot-Server-Patches/0389-offset-item-frame-ticking.patch
index 0bca33c64b..7bd7811622 100644
--- a/Spigot-Server-Patches/0388-offset-item-frame-ticking.patch
+++ b/Spigot-Server-Patches/0389-offset-item-frame-ticking.patch
@@ -1,11 +1,11 @@
-From 98908628b9c29971f4722aed224482f50070323d Mon Sep 17 00:00:00 2001
+From 728b0a752597f2df4b25e41c18b95acdf661e782 Mon Sep 17 00:00:00 2001
 From: kickash32 <kickash32@gmail.com>
 Date: Tue, 30 Jul 2019 03:17:16 +0500
 Subject: [PATCH] offset item frame ticking
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHanging.java b/src/main/java/net/minecraft/server/EntityHanging.java
-index 21dbc9b2ab..ef9c4717c3 100644
+index 21dbc9b2ab7..ef9c4717c31 100644
 --- a/src/main/java/net/minecraft/server/EntityHanging.java
 +++ b/src/main/java/net/minecraft/server/EntityHanging.java
 @@ -15,7 +15,7 @@ public abstract class EntityHanging extends Entity {
diff --git a/Spigot-Server-Patches/0389-Avoid-hopper-searches-if-there-are-no-items.patch b/Spigot-Server-Patches/0390-Avoid-hopper-searches-if-there-are-no-items.patch
similarity index 97%
rename from Spigot-Server-Patches/0389-Avoid-hopper-searches-if-there-are-no-items.patch
rename to Spigot-Server-Patches/0390-Avoid-hopper-searches-if-there-are-no-items.patch
index ba1cf8f6bd..78be34afc7 100644
--- a/Spigot-Server-Patches/0389-Avoid-hopper-searches-if-there-are-no-items.patch
+++ b/Spigot-Server-Patches/0390-Avoid-hopper-searches-if-there-are-no-items.patch
@@ -1,4 +1,4 @@
-From e60938cf3ba63d6a51554c36f6116512c7c53863 Mon Sep 17 00:00:00 2001
+From c2fa94a9b7c538d689b2de14058ad48e90d78e9b Mon Sep 17 00:00:00 2001
 From: CullanP <cullanpage@gmail.com>
 Date: Thu, 3 Mar 2016 02:13:38 -0600
 Subject: [PATCH] Avoid hopper searches if there are no items
@@ -14,7 +14,7 @@ And since minecart hoppers are used _very_ rarely near we can avoid alot of sear
 Combined, this adds up a lot.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 472d3a4c03..42eede6781 100644
+index 2604fe9756e..a2a0ca3394c 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -84,6 +84,10 @@ public class Chunk implements IChunkAccess {
@@ -100,7 +100,7 @@ index 472d3a4c03..42eede6781 100644
                  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 498f381099..a2d1ef3602 100644
+index 498f381099b..a2d1ef3602a 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 {
@@ -112,5 +112,5 @@ index 498f381099..a2d1ef3602 100644
          return entity instanceof IInventory && entity.isAlive();
      };
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0390-Asynchronous-chunk-IO-and-loading.patch b/Spigot-Server-Patches/0391-Asynchronous-chunk-IO-and-loading.patch
similarity index 99%
rename from Spigot-Server-Patches/0390-Asynchronous-chunk-IO-and-loading.patch
rename to Spigot-Server-Patches/0391-Asynchronous-chunk-IO-and-loading.patch
index d0001efe57..9d487453f4 100644
--- a/Spigot-Server-Patches/0390-Asynchronous-chunk-IO-and-loading.patch
+++ b/Spigot-Server-Patches/0391-Asynchronous-chunk-IO-and-loading.patch
@@ -1,4 +1,4 @@
-From 716ddcc84ced03f72de0bbb0f322f2abacec6431 Mon Sep 17 00:00:00 2001
+From 5cd7dc87cb723913b949c3c281ffb79145e6e43a Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sat, 13 Jul 2019 09:23:10 -0700
 Subject: [PATCH] Asynchronous chunk IO and loading
diff --git a/Spigot-Server-Patches/0391-Use-getChunkIfLoadedImmediately-in-places.patch b/Spigot-Server-Patches/0392-Use-getChunkIfLoadedImmediately-in-places.patch
similarity index 96%
rename from Spigot-Server-Patches/0391-Use-getChunkIfLoadedImmediately-in-places.patch
rename to Spigot-Server-Patches/0392-Use-getChunkIfLoadedImmediately-in-places.patch
index 09b7065353..07feeeb264 100644
--- a/Spigot-Server-Patches/0391-Use-getChunkIfLoadedImmediately-in-places.patch
+++ b/Spigot-Server-Patches/0392-Use-getChunkIfLoadedImmediately-in-places.patch
@@ -1,4 +1,4 @@
-From 2b2289ac4de87e51fb19efa3b9026657a8e4e232 Mon Sep 17 00:00:00 2001
+From 476570fd19de352c2635eb273083201bc817d103 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Mon, 8 Jul 2019 00:13:36 -0700
 Subject: [PATCH] Use getChunkIfLoadedImmediately in places
@@ -8,7 +8,7 @@ ticket level 33 (yes getChunkIfLoaded will actually perform a chunk
 load in that case).
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 65c171cec3..f00653dfe7 100644
+index 65c171cec3c..f00653dfe7a 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -989,7 +989,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -21,7 +21,7 @@ index 65c171cec3..f00653dfe7 100644
                                  return;
                              }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 0bde171743..311685180f 100644
+index 0bde1717431..311685180fe 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -116,8 +116,16 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -69,7 +69,7 @@ index 0bde171743..311685180f 100644
                  if (chunk != null) {
                      chunk.a(oclass, axisalignedbb, list, predicate);
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index f86404f83a..92601c581c 100644
+index f86404f83ae..92601c581cf 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -143,9 +143,10 @@ public class ActivationRange
diff --git a/Spigot-Server-Patches/0392-Reduce-sync-loads.patch b/Spigot-Server-Patches/0393-Reduce-sync-loads.patch
similarity index 98%
rename from Spigot-Server-Patches/0392-Reduce-sync-loads.patch
rename to Spigot-Server-Patches/0393-Reduce-sync-loads.patch
index f6b0216645..010f3dea25 100644
--- a/Spigot-Server-Patches/0392-Reduce-sync-loads.patch
+++ b/Spigot-Server-Patches/0393-Reduce-sync-loads.patch
@@ -1,4 +1,4 @@
-From c3fba670ea1762ac634d8153ad202832ba0de639 Mon Sep 17 00:00:00 2001
+From 1440b353a0fab354863c290471a71877884150b2 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Fri, 19 Jul 2019 03:29:14 -0700
 Subject: [PATCH] Reduce sync loads
@@ -11,7 +11,7 @@ it must be enabled by setting the startup flag -Dpaper.debug-sync-loads=true
 To get a debug log for sync loads, the command is /paper syncloadinfo
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-index af81098784..ddb60e9a48 100644
+index af810987846..ddb60e9a48e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
 @@ -1,9 +1,13 @@
@@ -108,7 +108,7 @@ index af81098784..ddb60e9a48 100644
          if (args.length < 2 || args[1].equals("*")) {
 diff --git a/src/main/java/com/destroystokyo/paper/io/SyncLoadFinder.java b/src/main/java/com/destroystokyo/paper/io/SyncLoadFinder.java
 new file mode 100644
-index 0000000000..59aec10329
+index 00000000000..59aec103295
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/io/SyncLoadFinder.java
 @@ -0,0 +1,172 @@
@@ -285,7 +285,7 @@ index 0000000000..59aec10329
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 259af7095c..ea1117dc86 100644
+index 259af7095c4..ea1117dc86e 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -459,6 +459,7 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -297,7 +297,7 @@ index 259af7095c..ea1117dc86 100644
              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 311685180f..568e04faa3 100644
+index 311685180fe..568e04faa31 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1173,7 +1173,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -328,7 +328,7 @@ index 311685180f..568e04faa3 100644
                  if (chunk != null) {
                      chunk.a(oclass, axisalignedbb, list, predicate);
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 3db0ad0a46..5f2c425129 100644
+index c0476f69e4a..2fa1b86adf8 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -154,6 +154,12 @@ public class WorldServer extends World {
diff --git a/Spigot-Server-Patches/0393-Implement-alternative-item-despawn-rate.patch b/Spigot-Server-Patches/0394-Implement-alternative-item-despawn-rate.patch
similarity index 98%
rename from Spigot-Server-Patches/0393-Implement-alternative-item-despawn-rate.patch
rename to Spigot-Server-Patches/0394-Implement-alternative-item-despawn-rate.patch
index 158754a020..43519f2a78 100644
--- a/Spigot-Server-Patches/0393-Implement-alternative-item-despawn-rate.patch
+++ b/Spigot-Server-Patches/0394-Implement-alternative-item-despawn-rate.patch
@@ -1,4 +1,4 @@
-From 3791e9d22672ab8da1a91136665fa4789a604971 Mon Sep 17 00:00:00 2001
+From a17b7e027112d322e786d0ed8e61cd678291c482 Mon Sep 17 00:00:00 2001
 From: kickash32 <kickash32@gmail.com>
 Date: Mon, 3 Jun 2019 02:02:39 -0400
 Subject: [PATCH] Implement alternative item-despawn-rate
diff --git a/Spigot-Server-Patches/0394-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch b/Spigot-Server-Patches/0395-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
similarity index 96%
rename from Spigot-Server-Patches/0394-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
rename to Spigot-Server-Patches/0395-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
index 8ab9638cc5..879802b7b3 100644
--- a/Spigot-Server-Patches/0394-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
+++ b/Spigot-Server-Patches/0395-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
@@ -1,4 +1,4 @@
-From 0fdda81892adc2da343950e2519dbf8bacc60060 Mon Sep 17 00:00:00 2001
+From 8c33530822f43e437a88985da1c0cc9146cda55d Mon Sep 17 00:00:00 2001
 From: Paul Sauve <paul@burngames.net>
 Date: Sun, 14 Jul 2019 21:05:03 -0500
 Subject: [PATCH] Do less work if we have a custom Bukkit generator
@@ -7,7 +7,7 @@ If the Bukkit generator already has a spawn, use it immediately instead
 of spending time generating one that we won't use
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 5f2c425129..f9aed78188 100644
+index 2fa1b86adf8..731f6a83200 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -811,12 +811,13 @@ public class WorldServer extends World {
diff --git a/Spigot-Server-Patches/0395-Fix-MC-158900.patch b/Spigot-Server-Patches/0396-Fix-MC-158900.patch
similarity index 89%
rename from Spigot-Server-Patches/0395-Fix-MC-158900.patch
rename to Spigot-Server-Patches/0396-Fix-MC-158900.patch
index 48ed05328b..06803639bd 100644
--- a/Spigot-Server-Patches/0395-Fix-MC-158900.patch
+++ b/Spigot-Server-Patches/0396-Fix-MC-158900.patch
@@ -1,4 +1,4 @@
-From ad4120163dd9b8c6433cadcee4ef912132fa72e6 Mon Sep 17 00:00:00 2001
+From 26b1db2584c921ed605b3b10df6f7f96aaab36db Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Tue, 13 Aug 2019 06:35:17 -0700
 Subject: [PATCH] Fix MC-158900
@@ -7,10 +7,10 @@ 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 765ebe2ccf..0ccfd8de0f 100644
+index b8302de65a7..b45911cf819 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -500,8 +500,10 @@ public abstract class PlayerList {
+@@ -502,8 +502,10 @@ public abstract class PlayerList {
          Player player = entity.getBukkitEntity();
          PlayerLoginEvent event = new PlayerLoginEvent(player, hostname, ((java.net.InetSocketAddress) socketaddress).getAddress(), ((java.net.InetSocketAddress) loginlistener.networkManager.getRawAddress()).getAddress());
  
diff --git a/Spigot-Server-Patches/0396-implement-optional-per-player-mob-spawns.patch b/Spigot-Server-Patches/0397-implement-optional-per-player-mob-spawns.patch
similarity index 99%
rename from Spigot-Server-Patches/0396-implement-optional-per-player-mob-spawns.patch
rename to Spigot-Server-Patches/0397-implement-optional-per-player-mob-spawns.patch
index 16bd4f0aba..52aceee68b 100644
--- a/Spigot-Server-Patches/0396-implement-optional-per-player-mob-spawns.patch
+++ b/Spigot-Server-Patches/0397-implement-optional-per-player-mob-spawns.patch
@@ -1,4 +1,4 @@
-From c3eac674b85ef88b47b0906686409f976616c207 Mon Sep 17 00:00:00 2001
+From 4a1df7264ddf4407e0ba8e6a8b87874d15da0eac Mon Sep 17 00:00:00 2001
 From: kickash32 <kickash32@gmail.com>
 Date: Mon, 19 Aug 2019 01:27:58 +0500
 Subject: [PATCH] implement optional per player mob spawns
diff --git a/Spigot-Server-Patches/0397-Prevent-consuming-the-wrong-itemstack.patch b/Spigot-Server-Patches/0398-Prevent-consuming-the-wrong-itemstack.patch
similarity index 95%
rename from Spigot-Server-Patches/0397-Prevent-consuming-the-wrong-itemstack.patch
rename to Spigot-Server-Patches/0398-Prevent-consuming-the-wrong-itemstack.patch
index 9e4b2400f8..6d9939567c 100644
--- a/Spigot-Server-Patches/0397-Prevent-consuming-the-wrong-itemstack.patch
+++ b/Spigot-Server-Patches/0398-Prevent-consuming-the-wrong-itemstack.patch
@@ -1,11 +1,11 @@
-From d34d69baed9c9e1ed4e99560e1c9c2f9d513a6e1 Mon Sep 17 00:00:00 2001
+From d5bc6d208f0997975cd195b00f77c0aac8b420c9 Mon Sep 17 00:00:00 2001
 From: kickash32 <kickash32@gmail.com>
 Date: Mon, 19 Aug 2019 19:42:35 +0500
 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 aecd5011cb..24594aa0e9 100644
+index aecd5011cbe..24594aa0e9b 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2896,10 +2896,13 @@ public abstract class EntityLiving extends Entity {
diff --git a/Spigot-Server-Patches/0398-only-add-passanger-entities-once-from-spawners.patch b/Spigot-Server-Patches/0399-only-add-passanger-entities-once-from-spawners.patch
similarity index 89%
rename from Spigot-Server-Patches/0398-only-add-passanger-entities-once-from-spawners.patch
rename to Spigot-Server-Patches/0399-only-add-passanger-entities-once-from-spawners.patch
index 427ae748c0..caa07d8b47 100644
--- a/Spigot-Server-Patches/0398-only-add-passanger-entities-once-from-spawners.patch
+++ b/Spigot-Server-Patches/0399-only-add-passanger-entities-once-from-spawners.patch
@@ -1,11 +1,11 @@
-From 4e50ea6ae7ef2ced7f56dfddaf7adde624292800 Mon Sep 17 00:00:00 2001
+From ba41a67600a5a7c8c3a78fb8324c27602b7dc25e Mon Sep 17 00:00:00 2001
 From: kickash32 <kickash32@gmail.com>
 Date: Wed, 21 Aug 2019 23:57:32 +0500
 Subject: [PATCH] only add passanger entities once from spawners
 
 
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index 41001b02a6..df494d37be 100644
+index 41001b02a65..df494d37be6 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -196,7 +196,7 @@ public abstract class MobSpawnerAbstract {
diff --git a/Spigot-Server-Patches/0399-Fix-nether-portal-creation.patch b/Spigot-Server-Patches/0400-Fix-nether-portal-creation.patch
similarity index 91%
rename from Spigot-Server-Patches/0399-Fix-nether-portal-creation.patch
rename to Spigot-Server-Patches/0400-Fix-nether-portal-creation.patch
index 253ce6fbdc..097cc1b0dc 100644
--- a/Spigot-Server-Patches/0399-Fix-nether-portal-creation.patch
+++ b/Spigot-Server-Patches/0400-Fix-nether-portal-creation.patch
@@ -1,11 +1,11 @@
-From b7b94c91cc3ccaf702145a2e0dc2acc9c07f326e Mon Sep 17 00:00:00 2001
+From 1325f69d8a53b77ce1222d8becb2df817c717796 Mon Sep 17 00:00:00 2001
 From: Michael Himing <mhiming@gmail.com>
 Date: Mon, 9 Sep 2019 13:21:17 +1000
 Subject: [PATCH] Fix nether portal creation
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/BlockStateListPopulator.java b/src/main/java/org/bukkit/craftbukkit/util/BlockStateListPopulator.java
-index 60330f753f..c22dbbfbe8 100644
+index 60330f753fc..c22dbbfbe8b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/BlockStateListPopulator.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/BlockStateListPopulator.java
 @@ -38,6 +38,11 @@ public class BlockStateListPopulator extends DummyGeneratorAccess {
diff --git a/Spigot-Server-Patches/0400-Generator-Settings.patch b/Spigot-Server-Patches/0401-Generator-Settings.patch
similarity index 97%
rename from Spigot-Server-Patches/0400-Generator-Settings.patch
rename to Spigot-Server-Patches/0401-Generator-Settings.patch
index edc46961e6..3964117e95 100644
--- a/Spigot-Server-Patches/0400-Generator-Settings.patch
+++ b/Spigot-Server-Patches/0401-Generator-Settings.patch
@@ -1,4 +1,4 @@
-From 82d538f5599601f13e2c0537f26056d4ddf64b3f Mon Sep 17 00:00:00 2001
+From 9dd618ac5d7b843d3800dd344f34050a17425308 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 02:17:54 -0600
 Subject: [PATCH] Generator Settings
diff --git a/Spigot-Server-Patches/0401-Fix-zero-tick-instant-grow-farms-MC-113809.patch b/Spigot-Server-Patches/0402-Fix-zero-tick-instant-grow-farms-MC-113809.patch
similarity index 98%
rename from Spigot-Server-Patches/0401-Fix-zero-tick-instant-grow-farms-MC-113809.patch
rename to Spigot-Server-Patches/0402-Fix-zero-tick-instant-grow-farms-MC-113809.patch
index 8aeb05d04e..eda265e6fe 100644
--- a/Spigot-Server-Patches/0401-Fix-zero-tick-instant-grow-farms-MC-113809.patch
+++ b/Spigot-Server-Patches/0402-Fix-zero-tick-instant-grow-farms-MC-113809.patch
@@ -1,4 +1,4 @@
-From 801216b8988793fedf4755e0731d1480eec6c88e Mon Sep 17 00:00:00 2001
+From 448237ec196c32d672999706de094510b261366e Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Sun, 15 Sep 2019 11:32:32 -0500
 Subject: [PATCH] Fix zero-tick instant grow farms MC-113809
diff --git a/Spigot-Server-Patches/0402-Fix-MC-161754.patch b/Spigot-Server-Patches/0403-Fix-MC-161754.patch
similarity index 90%
rename from Spigot-Server-Patches/0402-Fix-MC-161754.patch
rename to Spigot-Server-Patches/0403-Fix-MC-161754.patch
index f9e8ccd0f4..7676e3f874 100644
--- a/Spigot-Server-Patches/0402-Fix-MC-161754.patch
+++ b/Spigot-Server-Patches/0403-Fix-MC-161754.patch
@@ -1,4 +1,4 @@
-From e80c30ecea0cd61d59efd03f42d86aa352f52288 Mon Sep 17 00:00:00 2001
+From a7e308ddce1453a5f3299aabfaa20e90924c22a1 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Tue, 24 Sep 2019 16:03:00 -0700
 Subject: [PATCH] Fix MC-161754
@@ -9,7 +9,7 @@ We can use an entity valid check since this method is invoked for
 each inventory iteraction (thanks to CB) and on player tick (vanilla).
 
 diff --git a/src/main/java/net/minecraft/server/ContainerHorse.java b/src/main/java/net/minecraft/server/ContainerHorse.java
-index c95ce0124d..18e1ae7f0a 100644
+index c95ce0124d9..18e1ae7f0a4 100644
 --- a/src/main/java/net/minecraft/server/ContainerHorse.java
 +++ b/src/main/java/net/minecraft/server/ContainerHorse.java
 @@ -76,7 +76,7 @@ public class ContainerHorse extends Container {
diff --git a/Spigot-Server-Patches/0403-Performance-improvement-for-Chunk.getEntities.patch b/Spigot-Server-Patches/0404-Performance-improvement-for-Chunk.getEntities.patch
similarity index 93%
rename from Spigot-Server-Patches/0403-Performance-improvement-for-Chunk.getEntities.patch
rename to Spigot-Server-Patches/0404-Performance-improvement-for-Chunk.getEntities.patch
index db8fa5cc5f..db2dcacf0c 100644
--- a/Spigot-Server-Patches/0403-Performance-improvement-for-Chunk.getEntities.patch
+++ b/Spigot-Server-Patches/0404-Performance-improvement-for-Chunk.getEntities.patch
@@ -1,4 +1,4 @@
-From f753ddd40c035673950e3c881ac4acbf616be093 Mon Sep 17 00:00:00 2001
+From a8c688477c9552a27a27d5ffb34fbb4cfb2116c0 Mon Sep 17 00:00:00 2001
 From: wea_ondara <wea_ondara@alpenblock.net>
 Date: Thu, 10 Oct 2019 11:29:42 +0200
 Subject: [PATCH] Performance improvement for Chunk.getEntities
@@ -10,7 +10,7 @@ operation. This patch will reduce the load of plugins which for example
 implement custom moblimits and depend on Chunk.getEntities().
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-index a53bb7295c..3de9b1c594 100644
+index 47f1b970b9b..39ef95cbbb1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 @@ -111,14 +111,14 @@ public class CraftChunk implements Chunk {
diff --git a/Spigot-Server-Patches/0404-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch b/Spigot-Server-Patches/0405-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
similarity index 93%
rename from Spigot-Server-Patches/0404-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
rename to Spigot-Server-Patches/0405-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
index f462606ac9..2629619573 100644
--- a/Spigot-Server-Patches/0404-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
+++ b/Spigot-Server-Patches/0405-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
@@ -1,4 +1,4 @@
-From 4789f5c27a2ea3e518a3f78851fd3fbe00112e12 Mon Sep 17 00:00:00 2001
+From 8d846ecb9651d3bae713144b60c900bdc226404b Mon Sep 17 00:00:00 2001
 From: MisterErwin <git@askarian.net>
 Date: Wed, 30 Oct 2019 16:57:54 +0100
 Subject: [PATCH] Fix spawning of hanging entities that are not ItemFrames and
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix spawning of hanging entities that are not ItemFrames and
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index d3ac0ffe46..07ebd78acc 100644
+index d3ac0ffe468..07ebd78acc7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1850,7 +1850,12 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0405-Expose-the-internal-current-tick.patch b/Spigot-Server-Patches/0406-Expose-the-internal-current-tick.patch
similarity index 87%
rename from Spigot-Server-Patches/0405-Expose-the-internal-current-tick.patch
rename to Spigot-Server-Patches/0406-Expose-the-internal-current-tick.patch
index 4174289149..3aa7022b6a 100644
--- a/Spigot-Server-Patches/0405-Expose-the-internal-current-tick.patch
+++ b/Spigot-Server-Patches/0406-Expose-the-internal-current-tick.patch
@@ -1,11 +1,11 @@
-From 6de8b1c9d9c2b2625156ab0f7346f9e6a357c728 Mon Sep 17 00:00:00 2001
+From 7ca24be41ff4d779959e669c370dd878b5621e26 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 20 Apr 2019 19:47:34 -0500
 Subject: [PATCH] Expose the internal current tick
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 14cc12d772..e8d3528d51 100644
+index 14cc12d772f..e8d3528d515 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2203,5 +2203,10 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0406-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch b/Spigot-Server-Patches/0407-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
similarity index 88%
rename from Spigot-Server-Patches/0406-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
rename to Spigot-Server-Patches/0407-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
index 4440a59c3e..7974dc6e25 100644
--- a/Spigot-Server-Patches/0406-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
+++ b/Spigot-Server-Patches/0407-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
@@ -1,11 +1,11 @@
-From f2ace7ce845cb625a87b25a448a47d1c77db352c Mon Sep 17 00:00:00 2001
+From 740e4d3c326a5a0c1c02831286cf6d16e382b28d Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Wed, 9 Oct 2019 21:51:43 -0500
 Subject: [PATCH] Fix stuck in sneak when changing worlds (MC-10657)
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index fcd887ce30..bb10857cf3 100644
+index fcd887ce30d..bb10857cf37 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -984,6 +984,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -18,10 +18,10 @@ index fcd887ce30..bb10857cf3 100644
              PlayerChangedWorldEvent changeEvent = new PlayerChangedWorldEvent(this.getBukkitEntity(), worldserver.getWorld());
              this.world.getServer().getPluginManager().callEvent(changeEvent);
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 0ccfd8de0f..01345a62b7 100644
+index b45911cf819..909d86e14c7 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -716,6 +716,8 @@ public abstract class PlayerList {
+@@ -718,6 +718,8 @@ public abstract class PlayerList {
              entityplayer.playerConnection.sendPacket(new PacketPlayOutEntityEffect(entityplayer.getId(), mobEffect));
          }
  
diff --git a/Spigot-Server-Patches/0407-Add-option-to-disable-pillager-patrols.patch b/Spigot-Server-Patches/0408-Add-option-to-disable-pillager-patrols.patch
similarity index 96%
rename from Spigot-Server-Patches/0407-Add-option-to-disable-pillager-patrols.patch
rename to Spigot-Server-Patches/0408-Add-option-to-disable-pillager-patrols.patch
index dad357bbdc..f48691391c 100644
--- a/Spigot-Server-Patches/0407-Add-option-to-disable-pillager-patrols.patch
+++ b/Spigot-Server-Patches/0408-Add-option-to-disable-pillager-patrols.patch
@@ -1,4 +1,4 @@
-From b9d5e577abc7ea9c81a07c063ab9a923115d29ee Mon Sep 17 00:00:00 2001
+From 8471e9c56c520609a50898b884c3f32df04fc4df Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Wed, 9 Oct 2019 21:46:15 -0500
 Subject: [PATCH] Add option to disable pillager patrols
diff --git a/Spigot-Server-Patches/0408-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch b/Spigot-Server-Patches/0409-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
similarity index 92%
rename from Spigot-Server-Patches/0408-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
rename to Spigot-Server-Patches/0409-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
index 71e81292f5..007b12b625 100644
--- a/Spigot-Server-Patches/0408-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
+++ b/Spigot-Server-Patches/0409-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
@@ -1,4 +1,4 @@
-From b4de1c05b39bde78c5894d95c61392e084fcfb01 Mon Sep 17 00:00:00 2001
+From ee57e7fe0f18155f1f8cf5c41e5c909b39f50bc4 Mon Sep 17 00:00:00 2001
 From: Lukasz Derlatka <toranktto@gmail.com>
 Date: Mon, 11 Nov 2019 16:08:13 +0100
 Subject: [PATCH] Fix AssertionError when player hand set to empty type
@@ -7,7 +7,7 @@ Fixes an AssertionError when setting the player's item in hand to null or a new
 Fixes GH-2718
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 24594aa0e9..aada8d3b08 100644
+index 24594aa0e9b..aada8d3b08b 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1891,6 +1891,7 @@ public abstract class EntityLiving extends Entity {
@@ -19,7 +19,7 @@ index 24594aa0e9..aada8d3b08 100644
          if (enumhand == EnumHand.MAIN_HAND) {
              return this.getEquipment(EnumItemSlot.MAINHAND);
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index f00653dfe7..71d045ee00 100644
+index f00653dfe7a..71d045ee00d 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1430,6 +1430,10 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0409-PlayerLaunchProjectileEvent.patch b/Spigot-Server-Patches/0410-PlayerLaunchProjectileEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0409-PlayerLaunchProjectileEvent.patch
rename to Spigot-Server-Patches/0410-PlayerLaunchProjectileEvent.patch
index 9bb7fa31f0..f0dc15e0cf 100644
--- a/Spigot-Server-Patches/0409-PlayerLaunchProjectileEvent.patch
+++ b/Spigot-Server-Patches/0410-PlayerLaunchProjectileEvent.patch
@@ -1,11 +1,11 @@
-From 99a6eecdaaf00be03a70e78de4a4f3b5cb54e97f Mon Sep 17 00:00:00 2001
+From ea764df2fe7d68b0f6d484394d59f19d4a2d298e Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 21 Jul 2018 03:11:03 -0500
 Subject: [PATCH] PlayerLaunchProjectileEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/InteractionResultWrapper.java b/src/main/java/net/minecraft/server/InteractionResultWrapper.java
-index 5cab47a282..886babdcda 100644
+index 5cab47a2821..886babdcda0 100644
 --- a/src/main/java/net/minecraft/server/InteractionResultWrapper.java
 +++ b/src/main/java/net/minecraft/server/InteractionResultWrapper.java
 @@ -10,6 +10,7 @@ public class InteractionResultWrapper<T> {
@@ -17,7 +17,7 @@ index 5cab47a282..886babdcda 100644
          return this.a;
      }
 diff --git a/src/main/java/net/minecraft/server/ItemEgg.java b/src/main/java/net/minecraft/server/ItemEgg.java
-index 6fccd70a03..16f1b734e0 100644
+index 6fccd70a034..16f1b734e01 100644
 --- a/src/main/java/net/minecraft/server/ItemEgg.java
 +++ b/src/main/java/net/minecraft/server/ItemEgg.java
 @@ -16,21 +16,35 @@ public class ItemEgg extends Item {
@@ -61,7 +61,7 @@ index 6fccd70a03..16f1b734e0 100644
          return InteractionResultWrapper.success(itemstack);
      }
 diff --git a/src/main/java/net/minecraft/server/ItemEnderPearl.java b/src/main/java/net/minecraft/server/ItemEnderPearl.java
-index cab869e8e9..b57e9f7e72 100644
+index cab869e8e9b..b57e9f7e72b 100644
 --- a/src/main/java/net/minecraft/server/ItemEnderPearl.java
 +++ b/src/main/java/net/minecraft/server/ItemEnderPearl.java
 @@ -16,22 +16,37 @@ public class ItemEnderPearl extends Item {
@@ -113,7 +113,7 @@ index cab869e8e9..b57e9f7e72 100644
          return InteractionResultWrapper.success(itemstack);
      }
 diff --git a/src/main/java/net/minecraft/server/ItemExpBottle.java b/src/main/java/net/minecraft/server/ItemExpBottle.java
-index 071688b3ab..1d575af526 100644
+index 071688b3ab4..1d575af5269 100644
 --- a/src/main/java/net/minecraft/server/ItemExpBottle.java
 +++ b/src/main/java/net/minecraft/server/ItemExpBottle.java
 @@ -15,19 +15,38 @@ public class ItemExpBottle extends Item {
@@ -158,7 +158,7 @@ index 071688b3ab..1d575af526 100644
          return InteractionResultWrapper.success(itemstack);
      }
 diff --git a/src/main/java/net/minecraft/server/ItemLingeringPotion.java b/src/main/java/net/minecraft/server/ItemLingeringPotion.java
-index c19b678cfb..7672e31fc0 100644
+index c19b678cfb2..7672e31fc0c 100644
 --- a/src/main/java/net/minecraft/server/ItemLingeringPotion.java
 +++ b/src/main/java/net/minecraft/server/ItemLingeringPotion.java
 @@ -8,7 +8,11 @@ public class ItemLingeringPotion extends ItemPotionThrowable {
@@ -176,7 +176,7 @@ index c19b678cfb..7672e31fc0 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/ItemPotionThrowable.java b/src/main/java/net/minecraft/server/ItemPotionThrowable.java
-index 5d1f118c51..d1beab1ab7 100644
+index 5d1f118c513..d1beab1ab72 100644
 --- a/src/main/java/net/minecraft/server/ItemPotionThrowable.java
 +++ b/src/main/java/net/minecraft/server/ItemPotionThrowable.java
 @@ -15,13 +15,31 @@ public class ItemPotionThrowable extends ItemPotion {
@@ -213,7 +213,7 @@ index 5d1f118c51..d1beab1ab7 100644
          return InteractionResultWrapper.success(itemstack);
      }
 diff --git a/src/main/java/net/minecraft/server/ItemSnowball.java b/src/main/java/net/minecraft/server/ItemSnowball.java
-index 56ec508959..e6044e654b 100644
+index 56ec5089596..e6044e654b7 100644
 --- a/src/main/java/net/minecraft/server/ItemSnowball.java
 +++ b/src/main/java/net/minecraft/server/ItemSnowball.java
 @@ -17,19 +17,27 @@ public class ItemSnowball extends Item {
@@ -251,7 +251,7 @@ index 56ec508959..e6044e654b 100644
          /*
          if (!entityhuman.abilities.canInstantlyBuild) {
 diff --git a/src/main/java/net/minecraft/server/ItemSplashPotion.java b/src/main/java/net/minecraft/server/ItemSplashPotion.java
-index 18bd846cee..e71e933fff 100644
+index 18bd846ceec..e71e933fffb 100644
 --- a/src/main/java/net/minecraft/server/ItemSplashPotion.java
 +++ b/src/main/java/net/minecraft/server/ItemSplashPotion.java
 @@ -8,7 +8,11 @@ public class ItemSplashPotion extends ItemPotionThrowable {
diff --git a/Spigot-Server-Patches/0410-Add-CraftMagicNumbers.isSupportedApiVersion.patch b/Spigot-Server-Patches/0411-Add-CraftMagicNumbers.isSupportedApiVersion.patch
similarity index 89%
rename from Spigot-Server-Patches/0410-Add-CraftMagicNumbers.isSupportedApiVersion.patch
rename to Spigot-Server-Patches/0411-Add-CraftMagicNumbers.isSupportedApiVersion.patch
index 5aa3e2da18..a158856803 100644
--- a/Spigot-Server-Patches/0410-Add-CraftMagicNumbers.isSupportedApiVersion.patch
+++ b/Spigot-Server-Patches/0411-Add-CraftMagicNumbers.isSupportedApiVersion.patch
@@ -1,11 +1,11 @@
-From 9e4a9c0454c471fcaea876267f4f96d49ba222f2 Mon Sep 17 00:00:00 2001
+From 53e658495045a486753890686545c837ab02ee2e Mon Sep 17 00:00:00 2001
 From: BlackHole <black-hole@live.com>
 Date: Sun, 15 Dec 2019 19:12:39 +0100
 Subject: [PATCH] Add CraftMagicNumbers.isSupportedApiVersion()
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index b1e1b59d45..770375ed42 100644
+index b1e1b59d451..770375ed420 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -308,6 +308,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/Spigot-Server-Patches/0411-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/Spigot-Server-Patches/0412-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
similarity index 92%
rename from Spigot-Server-Patches/0411-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
rename to Spigot-Server-Patches/0412-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
index 73f9a32343..2c5a5fa29d 100644
--- a/Spigot-Server-Patches/0411-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
+++ b/Spigot-Server-Patches/0412-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
@@ -1,11 +1,11 @@
-From c30711cf8364170309721921a3dd340402cfcd6f Mon Sep 17 00:00:00 2001
+From 2237a0b7aab90a43277efa7838da2ab4c2da5059 Mon Sep 17 00:00:00 2001
 From: Callahan <mr.callahhh@gmail.com>
 Date: Mon, 13 Jan 2020 23:47:28 -0600
 Subject: [PATCH] Prevent sync chunk loads when villagers try to find beds
 
 
 diff --git a/src/main/java/net/minecraft/server/BehaviorSleep.java b/src/main/java/net/minecraft/server/BehaviorSleep.java
-index fa575dde19..dfe0f66500 100644
+index fa575dde192..dfe0f66500a 100644
 --- a/src/main/java/net/minecraft/server/BehaviorSleep.java
 +++ b/src/main/java/net/minecraft/server/BehaviorSleep.java
 @@ -31,7 +31,8 @@ public class BehaviorSleep extends Behavior<EntityLiving> {
diff --git a/Spigot-Server-Patches/0412-Fix-spawn-radius-being-treated-as-0.patch b/Spigot-Server-Patches/0413-Fix-spawn-radius-being-treated-as-0.patch
similarity index 91%
rename from Spigot-Server-Patches/0412-Fix-spawn-radius-being-treated-as-0.patch
rename to Spigot-Server-Patches/0413-Fix-spawn-radius-being-treated-as-0.patch
index 4729115b5e..dbc4d97fdc 100644
--- a/Spigot-Server-Patches/0412-Fix-spawn-radius-being-treated-as-0.patch
+++ b/Spigot-Server-Patches/0413-Fix-spawn-radius-being-treated-as-0.patch
@@ -1,11 +1,11 @@
-From f0c0011326491d419782bf793a7f2140185f4b14 Mon Sep 17 00:00:00 2001
+From 035022176e8ef626fd9639c6cdf37753fdf22b86 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 15 Dec 2019 19:41:28 +0000
 Subject: [PATCH] Fix spawn radius being treated as 0
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index bb10857cf3..b9d1747ab2 100644
+index bb10857cf37..b9d1747ab2a 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -129,7 +129,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0413-MC-145656-Fix-Follow-Range-Initial-Target.patch b/Spigot-Server-Patches/0414-MC-145656-Fix-Follow-Range-Initial-Target.patch
similarity index 97%
rename from Spigot-Server-Patches/0413-MC-145656-Fix-Follow-Range-Initial-Target.patch
rename to Spigot-Server-Patches/0414-MC-145656-Fix-Follow-Range-Initial-Target.patch
index 0d3fe78acc..7219f19a22 100644
--- a/Spigot-Server-Patches/0413-MC-145656-Fix-Follow-Range-Initial-Target.patch
+++ b/Spigot-Server-Patches/0414-MC-145656-Fix-Follow-Range-Initial-Target.patch
@@ -1,4 +1,4 @@
-From 9f361143cfd9838fb109508ae6b102b9102177b9 Mon Sep 17 00:00:00 2001
+From 294494a32012632470ca8fc99e7ff36a9c9f3027 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Wed, 18 Dec 2019 22:21:35 -0600
 Subject: [PATCH] MC-145656 Fix Follow Range Initial Target
diff --git a/Spigot-Server-Patches/0414-Optimize-Hoppers.patch b/Spigot-Server-Patches/0415-Optimize-Hoppers.patch
similarity index 99%
rename from Spigot-Server-Patches/0414-Optimize-Hoppers.patch
rename to Spigot-Server-Patches/0415-Optimize-Hoppers.patch
index 4496365086..45fb566791 100644
--- a/Spigot-Server-Patches/0414-Optimize-Hoppers.patch
+++ b/Spigot-Server-Patches/0415-Optimize-Hoppers.patch
@@ -1,4 +1,4 @@
-From a83dbbb1d5292071a139187a538339d01fb55545 Mon Sep 17 00:00:00 2001
+From 2e3c16be1393bef658a5488a38309fde4c6550be Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 27 Apr 2016 22:09:52 -0400
 Subject: [PATCH] Optimize Hoppers
diff --git a/Spigot-Server-Patches/0415-PlayerDeathEvent-shouldDropExperience.patch b/Spigot-Server-Patches/0416-PlayerDeathEvent-shouldDropExperience.patch
similarity index 90%
rename from Spigot-Server-Patches/0415-PlayerDeathEvent-shouldDropExperience.patch
rename to Spigot-Server-Patches/0416-PlayerDeathEvent-shouldDropExperience.patch
index 82682cc720..c1d300574b 100644
--- a/Spigot-Server-Patches/0415-PlayerDeathEvent-shouldDropExperience.patch
+++ b/Spigot-Server-Patches/0416-PlayerDeathEvent-shouldDropExperience.patch
@@ -1,11 +1,11 @@
-From 4c5a72f2b7479ba24446c2504c6142b356b5d48d Mon Sep 17 00:00:00 2001
+From 52c3847535ea2a326b260c32333f8a225b644fac Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Tue, 24 Dec 2019 00:35:42 +0000
 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 b9d1747ab2..cf837bdb3b 100644
+index b9d1747ab2a..cf837bdb3b2 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -645,7 +645,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0416-Prevent-bees-loading-chunks-checking-hive-position.patch b/Spigot-Server-Patches/0417-Prevent-bees-loading-chunks-checking-hive-position.patch
similarity index 90%
rename from Spigot-Server-Patches/0416-Prevent-bees-loading-chunks-checking-hive-position.patch
rename to Spigot-Server-Patches/0417-Prevent-bees-loading-chunks-checking-hive-position.patch
index 9d1fc7daaa..f1109a04fd 100644
--- a/Spigot-Server-Patches/0416-Prevent-bees-loading-chunks-checking-hive-position.patch
+++ b/Spigot-Server-Patches/0417-Prevent-bees-loading-chunks-checking-hive-position.patch
@@ -1,11 +1,11 @@
-From ec2d3d5de3a448e46148436c9b86308b2f434288 Mon Sep 17 00:00:00 2001
+From 7a9acb2b929b4ae045ccae931154e35470d8145d Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 5 Jan 2020 17:24:34 -0600
 Subject: [PATCH] Prevent bees loading chunks checking hive position
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityBee.java b/src/main/java/net/minecraft/server/EntityBee.java
-index b39599654e..73e0162578 100644
+index b39599654e3..73e01625784 100644
 --- a/src/main/java/net/minecraft/server/EntityBee.java
 +++ b/src/main/java/net/minecraft/server/EntityBee.java
 @@ -386,6 +386,7 @@ public class EntityBee extends EntityAnimal implements EntityBird {
diff --git a/Spigot-Server-Patches/0417-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/Spigot-Server-Patches/0418-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
similarity index 94%
rename from Spigot-Server-Patches/0417-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
rename to Spigot-Server-Patches/0418-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
index 0cd84bc0fb..209c448037 100644
--- a/Spigot-Server-Patches/0417-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
+++ b/Spigot-Server-Patches/0418-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
@@ -1,4 +1,4 @@
-From 9b68068d44705a5e711840f1899ce2ae4007687a Mon Sep 17 00:00:00 2001
+From 79c84119b1beba2108c113c9b559c5c727b64cd7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Nov 2016 20:28:12 -0400
 Subject: [PATCH] Don't load Chunks from Hoppers and other things
@@ -13,7 +13,7 @@ This of course is undesirable, so just return the loaded side as "primary"
 and treat it as a single chest if the other sides are unloaded
 
 diff --git a/src/main/java/net/minecraft/server/DoubleBlockFinder.java b/src/main/java/net/minecraft/server/DoubleBlockFinder.java
-index 3cb6e60895..7a16a3e0e2 100644
+index 3cb6e608956..7a16a3e0e20 100644
 --- a/src/main/java/net/minecraft/server/DoubleBlockFinder.java
 +++ b/src/main/java/net/minecraft/server/DoubleBlockFinder.java
 @@ -21,8 +21,12 @@ public class DoubleBlockFinder {
diff --git a/Spigot-Server-Patches/0418-Guard-against-serializing-mismatching-chunk-coordina.patch b/Spigot-Server-Patches/0419-Guard-against-serializing-mismatching-chunk-coordina.patch
similarity index 96%
rename from Spigot-Server-Patches/0418-Guard-against-serializing-mismatching-chunk-coordina.patch
rename to Spigot-Server-Patches/0419-Guard-against-serializing-mismatching-chunk-coordina.patch
index d7d94b7fa9..a19e072db4 100644
--- a/Spigot-Server-Patches/0418-Guard-against-serializing-mismatching-chunk-coordina.patch
+++ b/Spigot-Server-Patches/0419-Guard-against-serializing-mismatching-chunk-coordina.patch
@@ -1,4 +1,4 @@
-From bd2c97b4e2a476c2170825a496cc155b9380db25 Mon Sep 17 00:00:00 2001
+From dbf60c4aea0812474c4a45c78473fafcb0ca11e9 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Fri, 27 Dec 2019 09:42:26 -0800
 Subject: [PATCH] Guard against serializing mismatching chunk coordinate
@@ -6,7 +6,7 @@ Subject: [PATCH] Guard against serializing mismatching chunk coordinate
 Should help if something dumb happens
 
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 7389aba1a4..938c747dcc 100644
+index 34cd09a503b..fa893b14bce 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -23,6 +23,13 @@ public class ChunkRegionLoader {
@@ -35,7 +35,7 @@ index 7389aba1a4..938c747dcc 100644
          if (!Objects.equals(chunkcoordintpair, chunkcoordintpair1)) {
              ChunkRegionLoader.LOGGER.error("Chunk file at {} is in the wrong location; relocating. (Expected {}, got {})", chunkcoordintpair, chunkcoordintpair, chunkcoordintpair1);
 diff --git a/src/main/java/net/minecraft/server/IChunkLoader.java b/src/main/java/net/minecraft/server/IChunkLoader.java
-index 134c76065b..25c8b131fe 100644
+index 134c76065bf..25c8b131fec 100644
 --- a/src/main/java/net/minecraft/server/IChunkLoader.java
 +++ b/src/main/java/net/minecraft/server/IChunkLoader.java
 @@ -106,6 +106,13 @@ public class IChunkLoader extends RegionFileCache implements AutoCloseable {
diff --git a/Spigot-Server-Patches/0419-Optimise-IEntityAccess-getPlayerByUUID.patch b/Spigot-Server-Patches/0420-Optimise-IEntityAccess-getPlayerByUUID.patch
similarity index 92%
rename from Spigot-Server-Patches/0419-Optimise-IEntityAccess-getPlayerByUUID.patch
rename to Spigot-Server-Patches/0420-Optimise-IEntityAccess-getPlayerByUUID.patch
index f895f14a50..78b7a3374d 100644
--- a/Spigot-Server-Patches/0419-Optimise-IEntityAccess-getPlayerByUUID.patch
+++ b/Spigot-Server-Patches/0420-Optimise-IEntityAccess-getPlayerByUUID.patch
@@ -1,4 +1,4 @@
-From 7cd937068c4806c38ef0b721fe5029baf4932ac3 Mon Sep 17 00:00:00 2001
+From cfb3679c56aa60beb888f2049d0951d665eadd81 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sat, 11 Jan 2020 21:50:56 -0800
 Subject: [PATCH] Optimise IEntityAccess#getPlayerByUUID
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimise IEntityAccess#getPlayerByUUID
 Use the world entity map instead of iterating over all players
 
 diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java
-index d5c284cdd1..4157e50e4d 100644
+index d5c284cdd10..4157e50e4d9 100644
 --- a/src/main/java/net/minecraft/server/IEntityAccess.java
 +++ b/src/main/java/net/minecraft/server/IEntityAccess.java
 @@ -219,6 +219,12 @@ public interface IEntityAccess {
@@ -23,7 +23,7 @@ index d5c284cdd1..4157e50e4d 100644
              EntityHuman entityhuman = (EntityHuman) this.getPlayers().get(i);
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 06d693ca2c..62fabb7ad5 100644
+index 17560a20fce..c348e3e5008 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -82,6 +82,15 @@ public class WorldServer extends World {
diff --git a/Spigot-Server-Patches/0420-Fix-items-not-falling-correctly.patch b/Spigot-Server-Patches/0421-Fix-items-not-falling-correctly.patch
similarity index 93%
rename from Spigot-Server-Patches/0420-Fix-items-not-falling-correctly.patch
rename to Spigot-Server-Patches/0421-Fix-items-not-falling-correctly.patch
index b85bcb00a5..c811b6dada 100644
--- a/Spigot-Server-Patches/0420-Fix-items-not-falling-correctly.patch
+++ b/Spigot-Server-Patches/0421-Fix-items-not-falling-correctly.patch
@@ -1,4 +1,4 @@
-From a5e48d88bee5596fbcbc2dc2d358f2b62b31fa27 Mon Sep 17 00:00:00 2001
+From 9536954962f7fc1e7c43193037bbf4e192b11076 Mon Sep 17 00:00:00 2001
 From: AJMFactsheets <AJMFactsheets@gmail.com>
 Date: Fri, 17 Jan 2020 17:17:54 -0600
 Subject: [PATCH] Fix items not falling correctly
@@ -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 507627a29f..2926fbb957 100644
+index 507627a29f6..2926fbb9570 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -86,7 +86,7 @@ public class EntityItem extends Entity {
diff --git a/Spigot-Server-Patches/0421-Lag-compensate-eating.patch b/Spigot-Server-Patches/0422-Lag-compensate-eating.patch
similarity index 97%
rename from Spigot-Server-Patches/0421-Lag-compensate-eating.patch
rename to Spigot-Server-Patches/0422-Lag-compensate-eating.patch
index 5f0e8fad1e..bc88aa0b9c 100644
--- a/Spigot-Server-Patches/0421-Lag-compensate-eating.patch
+++ b/Spigot-Server-Patches/0422-Lag-compensate-eating.patch
@@ -1,4 +1,4 @@
-From 861a006e94de134f1c156428d5afde26df94f0e5 Mon Sep 17 00:00:00 2001
+From 9efcbab890c45f84253c9abc75fe640c019cc4da Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Tue, 14 Jan 2020 15:28:28 -0800
 Subject: [PATCH] Lag compensate eating
@@ -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 aada8d3b08..252b3c5929 100644
+index aada8d3b08b..252b3c59294 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -113,7 +113,7 @@ public abstract class EntityLiving extends Entity {
diff --git a/Spigot-Server-Patches/0422-Optimize-call-to-getFluid-for-explosions.patch b/Spigot-Server-Patches/0423-Optimize-call-to-getFluid-for-explosions.patch
similarity index 90%
rename from Spigot-Server-Patches/0422-Optimize-call-to-getFluid-for-explosions.patch
rename to Spigot-Server-Patches/0423-Optimize-call-to-getFluid-for-explosions.patch
index d8eb101450..6b70b7c074 100644
--- a/Spigot-Server-Patches/0422-Optimize-call-to-getFluid-for-explosions.patch
+++ b/Spigot-Server-Patches/0423-Optimize-call-to-getFluid-for-explosions.patch
@@ -1,11 +1,11 @@
-From 3a804ad8fa753b51411862f74a8224b27526b286 Mon Sep 17 00:00:00 2001
+From b60afe8cf95e5f6ab6881e2a007dd2465b662ae4 Mon Sep 17 00:00:00 2001
 From: BrodyBeckwith <brody@beckwith.dev>
 Date: Tue, 14 Jan 2020 17:49:03 -0500
 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 d99d2defe9..a353f3d5fa 100644
+index d99d2defe99..a353f3d5fa5 100644
 --- a/src/main/java/net/minecraft/server/Explosion.java
 +++ b/src/main/java/net/minecraft/server/Explosion.java
 @@ -117,7 +117,7 @@ public class Explosion {
diff --git a/Spigot-Server-Patches/0423-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/Spigot-Server-Patches/0424-Fix-last-firework-in-stack-not-having-effects-when-d.patch
similarity index 92%
rename from Spigot-Server-Patches/0423-Fix-last-firework-in-stack-not-having-effects-when-d.patch
rename to Spigot-Server-Patches/0424-Fix-last-firework-in-stack-not-having-effects-when-d.patch
index d4bcb3e851..bfd36a4072 100644
--- a/Spigot-Server-Patches/0423-Fix-last-firework-in-stack-not-having-effects-when-d.patch
+++ b/Spigot-Server-Patches/0424-Fix-last-firework-in-stack-not-having-effects-when-d.patch
@@ -1,4 +1,4 @@
-From b967c96d5eaaf93c2d021e544619fad69145d61f Mon Sep 17 00:00:00 2001
+From 31e232a99f09f39503c31eb590d2becbc780d2ed Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Fri, 17 Jan 2020 18:44:55 -0800
 Subject: [PATCH] Fix last firework in stack not having effects when dispensed
@@ -9,7 +9,7 @@ dispensed. The resulting item would have size == 0 and therefore
 be convertered to air, hence why the effects disappeared.
 
 diff --git a/src/main/java/net/minecraft/server/IDispenseBehavior.java b/src/main/java/net/minecraft/server/IDispenseBehavior.java
-index b6b7e3c6c9..3af686c7f1 100644
+index b6b7e3c6c97..3af686c7f1e 100644
 --- a/src/main/java/net/minecraft/server/IDispenseBehavior.java
 +++ b/src/main/java/net/minecraft/server/IDispenseBehavior.java
 @@ -265,7 +265,7 @@ public interface IDispenseBehavior {
diff --git a/Spigot-Server-Patches/0424-Entity-Activation-Range-2.0.patch b/Spigot-Server-Patches/0425-Entity-Activation-Range-2.0.patch
similarity index 98%
rename from Spigot-Server-Patches/0424-Entity-Activation-Range-2.0.patch
rename to Spigot-Server-Patches/0425-Entity-Activation-Range-2.0.patch
index c64a3f5023..883ac13c2a 100644
--- a/Spigot-Server-Patches/0424-Entity-Activation-Range-2.0.patch
+++ b/Spigot-Server-Patches/0425-Entity-Activation-Range-2.0.patch
@@ -1,4 +1,4 @@
-From 15707af6bfb4b1a034d72de16ab84afdb2e5d9d9 Mon Sep 17 00:00:00 2001
+From 33013e82ce9c1ab73845fe489fc0bf3030bb62d8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 13 May 2016 01:38:06 -0400
 Subject: [PATCH] Entity Activation Range 2.0
@@ -14,7 +14,7 @@ Adds flying monsters to control ghast and phantoms
 Adds villagers as separate config
 
 diff --git a/src/main/java/net/minecraft/server/BehaviorController.java b/src/main/java/net/minecraft/server/BehaviorController.java
-index a1883eba63..7c6e687707 100644
+index a1883eba63e..7c6e687707c 100644
 --- a/src/main/java/net/minecraft/server/BehaviorController.java
 +++ b/src/main/java/net/minecraft/server/BehaviorController.java
 @@ -161,6 +161,7 @@ public class BehaviorController<E extends EntityLiving> implements MinecraftSeri
@@ -26,7 +26,7 @@ index a1883eba63..7c6e687707 100644
          return this.g.contains(activity);
      }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index fd6dad8437..067420f195 100644
+index fd6dad8437b..067420f1955 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
@@ -68,7 +68,7 @@ index fd6dad8437..067420f195 100644
          // Paper start
          return this.pushedByWater();
 diff --git a/src/main/java/net/minecraft/server/EntityCreature.java b/src/main/java/net/minecraft/server/EntityCreature.java
-index b40c8d2f83..4eda130750 100644
+index b40c8d2f83a..4eda130750f 100644
 --- a/src/main/java/net/minecraft/server/EntityCreature.java
 +++ b/src/main/java/net/minecraft/server/EntityCreature.java
 @@ -7,6 +7,7 @@ import org.bukkit.event.entity.EntityUnleashEvent;
@@ -80,7 +80,7 @@ index b40c8d2f83..4eda130750 100644
      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 6d53254f83..5aca7a9131 100644
+index 6d53254f838..5aca7a91317 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -46,7 +46,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -111,7 +111,7 @@ index 6d53254f83..5aca7a9131 100644
          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 252b3c5929..38f666bb11 100644
+index 252b3c59294..38f666bb115 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -91,7 +91,7 @@ public abstract class EntityLiving extends Entity {
@@ -124,7 +124,7 @@ index 252b3c5929..38f666bb11 100644
      public float ba;
      public float bb;
 diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java
-index 6d4d41c88c..193dbfc5f6 100644
+index 6d4d41c88c2..193dbfc5f68 100644
 --- a/src/main/java/net/minecraft/server/EntityLlama.java
 +++ b/src/main/java/net/minecraft/server/EntityLlama.java
 @@ -382,6 +382,7 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
@@ -136,7 +136,7 @@ index 6d4d41c88c..193dbfc5f6 100644
          return this.bJ != null;
      }
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoal.java b/src/main/java/net/minecraft/server/PathfinderGoal.java
-index f22f12eeb0..bdb90a3466 100644
+index f22f12eeb0b..bdb90a34663 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoal.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoal.java
 @@ -20,7 +20,10 @@ public abstract class PathfinderGoal {
@@ -152,7 +152,7 @@ index f22f12eeb0..bdb90a3466 100644
      public void e() {}
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java b/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java
-index 41fb166ce0..e93129f0b2 100644
+index 41fb166ce0a..e93129f0b28 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java
 @@ -4,12 +4,12 @@ import java.util.EnumSet;
@@ -193,7 +193,7 @@ index 41fb166ce0..e93129f0b2 100644
                          }
                      }
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
-index 44bb18c594..935136771e 100644
+index 44bb18c5945..935136771e7 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
 @@ -24,10 +24,11 @@ public class PathfinderGoalSelector {
@@ -237,7 +237,7 @@ index 44bb18c594..935136771e 100644
          this.d.stream().filter((pathfindergoalwrapped) -> {
              return pathfindergoalwrapped.j() == pathfindergoal;
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java b/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java
-index 5a8c60ad90..29657fed75 100644
+index 5a8c60ad909..29657fed751 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java
 @@ -64,6 +64,7 @@ public class PathfinderGoalWrapped extends PathfinderGoal {
@@ -249,7 +249,7 @@ index 5a8c60ad90..29657fed75 100644
          return this.c;
      }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 9e161746f2..228e6e9ab9 100644
+index 9e161746f2a..228e6e9ab99 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -76,6 +76,12 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -266,7 +266,7 @@ index 9e161746f2..228e6e9ab9 100644
      public final org.spigotmc.SpigotWorldConfig spigotConfig; // Spigot
  
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 92601c581c..d873b8cf3a 100644
+index 92601c581cf..d873b8cf3ae 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -2,24 +2,34 @@ package org.spigotmc;
@@ -653,7 +653,7 @@ index 92601c581c..d873b8cf3a 100644
              isActive = false;
          }
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 5e932a5d97..9d706626bf 100644
+index 5e932a5d979..9d706626bf2 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -180,13 +180,59 @@ public class SpigotWorldConfig
diff --git a/Spigot-Server-Patches/0425-Add-effect-to-block-break-naturally.patch b/Spigot-Server-Patches/0426-Add-effect-to-block-break-naturally.patch
similarity index 93%
rename from Spigot-Server-Patches/0425-Add-effect-to-block-break-naturally.patch
rename to Spigot-Server-Patches/0426-Add-effect-to-block-break-naturally.patch
index c996e5304a..3778a1940a 100644
--- a/Spigot-Server-Patches/0425-Add-effect-to-block-break-naturally.patch
+++ b/Spigot-Server-Patches/0426-Add-effect-to-block-break-naturally.patch
@@ -1,11 +1,11 @@
-From a7cd7cc5a51a79febd66af4ce2a213cae72bbeea Mon Sep 17 00:00:00 2001
+From 7c5edd1b9c247c6fa959d7ee26b1bc1c2df83208 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 2 Jan 2020 12:25:07 -0600
 Subject: [PATCH] Add effect to block break naturally
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index db446c25c4..01c524cc01 100644
+index db446c25c41..01c524cc017 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -606,12 +606,20 @@ public class CraftBlock implements Block {
diff --git a/Spigot-Server-Patches/0426-Tracking-Range-Improvements.patch b/Spigot-Server-Patches/0427-Tracking-Range-Improvements.patch
similarity index 95%
rename from Spigot-Server-Patches/0426-Tracking-Range-Improvements.patch
rename to Spigot-Server-Patches/0427-Tracking-Range-Improvements.patch
index a4a7f4d950..40311e96d3 100644
--- a/Spigot-Server-Patches/0426-Tracking-Range-Improvements.patch
+++ b/Spigot-Server-Patches/0427-Tracking-Range-Improvements.patch
@@ -1,4 +1,4 @@
-From af85458ed4090ab13771f6e762dea488fe58e236 Mon Sep 17 00:00:00 2001
+From 6b6cdf8d8327e083ce4870d76cc47be1e12460b6 Mon Sep 17 00:00:00 2001
 From: kickash32 <kickash32@gmail.com>
 Date: Sat, 21 Dec 2019 15:22:09 -0500
 Subject: [PATCH] Tracking Range Improvements
@@ -8,7 +8,7 @@ Sets tracking range of watermobs to animals instead of misc and simplifies code
 Also ignores Enderdragon, defaulting it to Mojang's setting
 
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 0fd1d6b3e6..73bfebb837 100644
+index 692388821a7..6eb05591317 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -1737,6 +1737,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -20,7 +20,7 @@ index 0fd1d6b3e6..73bfebb837 100644
                  if (j > i) {
                      i = j;
 diff --git a/src/main/java/org/spigotmc/TrackingRange.java b/src/main/java/org/spigotmc/TrackingRange.java
-index 6f8e6c1d07..765bdaf9b5 100644
+index 6f8e6c1d079..765bdaf9b52 100644
 --- a/src/main/java/org/spigotmc/TrackingRange.java
 +++ b/src/main/java/org/spigotmc/TrackingRange.java
 @@ -1,6 +1,7 @@
@@ -74,5 +74,5 @@ index 6f8e6c1d07..765bdaf9b5 100644
          }
      }
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0427-Fix-comparator-behavior-for-EntityPhanton-goal.patch b/Spigot-Server-Patches/0428-Fix-comparator-behavior-for-EntityPhanton-goal.patch
similarity index 89%
rename from Spigot-Server-Patches/0427-Fix-comparator-behavior-for-EntityPhanton-goal.patch
rename to Spigot-Server-Patches/0428-Fix-comparator-behavior-for-EntityPhanton-goal.patch
index 0bd578c3e0..92be5c7557 100644
--- a/Spigot-Server-Patches/0427-Fix-comparator-behavior-for-EntityPhanton-goal.patch
+++ b/Spigot-Server-Patches/0428-Fix-comparator-behavior-for-EntityPhanton-goal.patch
@@ -1,11 +1,11 @@
-From 6400c06a994b01d69a401a0b73e718a000200ef3 Mon Sep 17 00:00:00 2001
+From b718f60b6d3b66c86051d1a17e260526aec7a9a0 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Wed, 22 Jan 2020 21:00:21 +0000
 Subject: [PATCH] Fix comparator behavior for EntityPhanton goal
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java
-index 82323bf4ac..90eeddb1af 100644
+index 82323bf4acc..90eeddb1af5 100644
 --- a/src/main/java/net/minecraft/server/EntityPhantom.java
 +++ b/src/main/java/net/minecraft/server/EntityPhantom.java
 @@ -224,7 +224,7 @@ public class EntityPhantom extends EntityFlying implements IMonster {
diff --git a/Spigot-Server-Patches/0428-Fix-items-vanishing-through-end-portal.patch b/Spigot-Server-Patches/0429-Fix-items-vanishing-through-end-portal.patch
similarity index 94%
rename from Spigot-Server-Patches/0428-Fix-items-vanishing-through-end-portal.patch
rename to Spigot-Server-Patches/0429-Fix-items-vanishing-through-end-portal.patch
index 166bc18328..ef0a9d9ac7 100644
--- a/Spigot-Server-Patches/0428-Fix-items-vanishing-through-end-portal.patch
+++ b/Spigot-Server-Patches/0429-Fix-items-vanishing-through-end-portal.patch
@@ -1,4 +1,4 @@
-From 9f8127daa87474a4d38be257abc1252430f0f718 Mon Sep 17 00:00:00 2001
+From 46307cc2e05cfdd0f870bef095db58e521aff169 Mon Sep 17 00:00:00 2001
 From: AJMFactsheets <AJMFactsheets@gmail.com>
 Date: Wed, 22 Jan 2020 19:52:28 -0600
 Subject: [PATCH] Fix items vanishing through end portal
@@ -13,7 +13,7 @@ Quickly loading the exact world spawn chunk before searching the
 heightmap resolves the issue without having to load all spawn chunks.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 067420f195..599bcabd14 100644
+index 067420f1955..599bcabd14a 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2611,6 +2611,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
diff --git a/Spigot-Server-Patches/0429-Seed-based-feature-search.patch b/Spigot-Server-Patches/0430-Seed-based-feature-search.patch
similarity index 98%
rename from Spigot-Server-Patches/0429-Seed-based-feature-search.patch
rename to Spigot-Server-Patches/0430-Seed-based-feature-search.patch
index 042b0b5b21..1bf66dd5cd 100644
--- a/Spigot-Server-Patches/0429-Seed-based-feature-search.patch
+++ b/Spigot-Server-Patches/0430-Seed-based-feature-search.patch
@@ -1,4 +1,4 @@
-From d792a6e7f49015ded97c2eb2d41c930cf246395a Mon Sep 17 00:00:00 2001
+From 9af59b7f553993afac4f6d5725550b3c8ce38d4a Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Mon, 13 Jan 2020 15:40:32 +0100
 Subject: [PATCH] Seed based feature search
diff --git a/Spigot-Server-Patches/0430-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/Spigot-Server-Patches/0431-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
similarity index 93%
rename from Spigot-Server-Patches/0430-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
rename to Spigot-Server-Patches/0431-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
index 8a77c95398..e431e22dba 100644
--- a/Spigot-Server-Patches/0430-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
+++ b/Spigot-Server-Patches/0431-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
@@ -1,11 +1,11 @@
-From d86f5b06729e26846af2f19d5a38d7b33da26f53 Mon Sep 17 00:00:00 2001
+From 493bb05332e776809acae159664d69fd7c222185 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 26 Jan 2020 16:30:19 -0600
 Subject: [PATCH] Bees get gravity in void. Fixes MC-167279
 
 
 diff --git a/src/main/java/net/minecraft/server/ControllerMove.java b/src/main/java/net/minecraft/server/ControllerMove.java
-index 7e3671dae6..a5c4cbb67f 100644
+index 7e3671dae61..a5c4cbb67f0 100644
 --- a/src/main/java/net/minecraft/server/ControllerMove.java
 +++ b/src/main/java/net/minecraft/server/ControllerMove.java
 @@ -2,7 +2,7 @@ package net.minecraft.server;
@@ -18,7 +18,7 @@ index 7e3671dae6..a5c4cbb67f 100644
      protected double c;
      protected double d;
 diff --git a/src/main/java/net/minecraft/server/ControllerMoveFlying.java b/src/main/java/net/minecraft/server/ControllerMoveFlying.java
-index 2b6ac2eeb0..0496c0c5db 100644
+index 2b6ac2eeb0f..0496c0c5dbb 100644
 --- a/src/main/java/net/minecraft/server/ControllerMoveFlying.java
 +++ b/src/main/java/net/minecraft/server/ControllerMoveFlying.java
 @@ -12,7 +12,7 @@ public class ControllerMoveFlying extends ControllerMove {
@@ -31,7 +31,7 @@ index 2b6ac2eeb0..0496c0c5db 100644
              this.h = ControllerMove.Operation.WAIT;
              this.a.setNoGravity(true);
 diff --git a/src/main/java/net/minecraft/server/EntityBee.java b/src/main/java/net/minecraft/server/EntityBee.java
-index 73e0162578..c7d79efdf6 100644
+index 73e01625784..c7d79efdf6e 100644
 --- a/src/main/java/net/minecraft/server/EntityBee.java
 +++ b/src/main/java/net/minecraft/server/EntityBee.java
 @@ -36,7 +36,17 @@ public class EntityBee extends EntityAnimal implements EntityBird {
diff --git a/Spigot-Server-Patches/0431-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/Spigot-Server-Patches/0432-Optimise-getChunkAt-calls-for-loaded-chunks.patch
similarity index 96%
rename from Spigot-Server-Patches/0431-Optimise-getChunkAt-calls-for-loaded-chunks.patch
rename to Spigot-Server-Patches/0432-Optimise-getChunkAt-calls-for-loaded-chunks.patch
index 05866278bd..483c538893 100644
--- a/Spigot-Server-Patches/0431-Optimise-getChunkAt-calls-for-loaded-chunks.patch
+++ b/Spigot-Server-Patches/0432-Optimise-getChunkAt-calls-for-loaded-chunks.patch
@@ -1,4 +1,4 @@
-From ecae8caf37165aba7f2ac5f12f41a882079878da Mon Sep 17 00:00:00 2001
+From 549612dc773af3de62aa21bc9d14542502120044 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sat, 25 Jan 2020 17:04:35 -0800
 Subject: [PATCH] Optimise getChunkAt calls for loaded chunks
@@ -7,7 +7,7 @@ bypass the need to get a player chunk, then get the either,
 then unwrap it...
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index fe894a68bc..e67e006535 100644
+index fe894a68bc2..e67e0065357 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -435,6 +435,12 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -65,7 +65,7 @@ index fe894a68bc..e67e006535 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index f1d072a39c..0c23fc89d7 100644
+index f1d072a39cc..0c23fc89d7a 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -265,6 +265,14 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
diff --git a/Spigot-Server-Patches/0432-Be-more-tolerant-of-invalid-attributes.patch b/Spigot-Server-Patches/0433-Be-more-tolerant-of-invalid-attributes.patch
similarity index 93%
rename from Spigot-Server-Patches/0432-Be-more-tolerant-of-invalid-attributes.patch
rename to Spigot-Server-Patches/0433-Be-more-tolerant-of-invalid-attributes.patch
index c573c68f22..21aec1a5db 100644
--- a/Spigot-Server-Patches/0432-Be-more-tolerant-of-invalid-attributes.patch
+++ b/Spigot-Server-Patches/0433-Be-more-tolerant-of-invalid-attributes.patch
@@ -1,4 +1,4 @@
-From 2a21cc0e0e438f74c2e58c21e3795061a1dd17bd Mon Sep 17 00:00:00 2001
+From a56e3e783fa197e1fc497e76640855b6f1d9b66f Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Thu, 6 Feb 2020 19:20:27 -0600
 Subject: [PATCH] Be more tolerant of invalid attributes
@@ -11,7 +11,7 @@ In a more perfect world the API would expose some way to interact with these att
 particularly flexible in this area. Perhaps this is an area for future expansion at a later time.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeMap.java b/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeMap.java
-index 77e584b129..007d28b16c 100644
+index 77e584b129a..007d28b16ce 100644
 --- a/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeMap.java
 +++ b/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeMap.java
 @@ -47,6 +47,12 @@ public class CraftAttributeMap implements Attributable {
diff --git a/Spigot-Server-Patches/0433-Allow-overriding-the-java-version-check.patch b/Spigot-Server-Patches/0434-Allow-overriding-the-java-version-check.patch
similarity index 89%
rename from Spigot-Server-Patches/0433-Allow-overriding-the-java-version-check.patch
rename to Spigot-Server-Patches/0434-Allow-overriding-the-java-version-check.patch
index 61e9905bb5..81ace371c4 100644
--- a/Spigot-Server-Patches/0433-Allow-overriding-the-java-version-check.patch
+++ b/Spigot-Server-Patches/0434-Allow-overriding-the-java-version-check.patch
@@ -1,4 +1,4 @@
-From fcbfa3c706dbd6e026210aeae63e189a4aa0236f Mon Sep 17 00:00:00 2001
+From 564d94bbaa8140e3e35a3ee2611bdf8e0db6abc2 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Sat, 8 Feb 2020 18:02:24 -0600
 Subject: [PATCH] Allow overriding the java version check
@@ -6,7 +6,7 @@ Subject: [PATCH] Allow overriding the java version check
 -DPaper.IgnoreJavaVersion=true
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index bf0a020189..093dbeae27 100644
+index bf0a0201894..093dbeae278 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -175,7 +175,7 @@ public class Main {
diff --git a/Spigot-Server-Patches/0434-Add-ThrownEggHatchEvent.patch b/Spigot-Server-Patches/0435-Add-ThrownEggHatchEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0434-Add-ThrownEggHatchEvent.patch
rename to Spigot-Server-Patches/0435-Add-ThrownEggHatchEvent.patch
index 6ddd8215d0..44bc30021e 100644
--- a/Spigot-Server-Patches/0434-Add-ThrownEggHatchEvent.patch
+++ b/Spigot-Server-Patches/0435-Add-ThrownEggHatchEvent.patch
@@ -1,4 +1,4 @@
-From 50bb85d3fc3124e08daa13774417051f4e3667ba Mon Sep 17 00:00:00 2001
+From 4f57e24a7223d126b1af51ee1a74086acf79a2f9 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 9 Feb 2020 00:19:05 -0600
 Subject: [PATCH] Add ThrownEggHatchEvent
@@ -7,7 +7,7 @@ Adds a new event similar to PlayerEggThrowEvent, but without the Player requirem
 (dispensers can throw eggs to hatch them, too).
 
 diff --git a/src/main/java/net/minecraft/server/EntityEgg.java b/src/main/java/net/minecraft/server/EntityEgg.java
-index 970f9109d9..bdd82d052a 100644
+index 970f9109d9b..bdd82d052a2 100644
 --- a/src/main/java/net/minecraft/server/EntityEgg.java
 +++ b/src/main/java/net/minecraft/server/EntityEgg.java
 @@ -52,6 +52,16 @@ public class EntityEgg extends EntityProjectileThrowable {
diff --git a/Spigot-Server-Patches/0435-Optimise-random-block-ticking.patch b/Spigot-Server-Patches/0436-Optimise-random-block-ticking.patch
similarity index 99%
rename from Spigot-Server-Patches/0435-Optimise-random-block-ticking.patch
rename to Spigot-Server-Patches/0436-Optimise-random-block-ticking.patch
index 9f010555b8..41738217e6 100644
--- a/Spigot-Server-Patches/0435-Optimise-random-block-ticking.patch
+++ b/Spigot-Server-Patches/0436-Optimise-random-block-ticking.patch
@@ -1,4 +1,4 @@
-From 1ff4b88c8f2c5f43455442a2d76a0438c3d9c593 Mon Sep 17 00:00:00 2001
+From d45dfa8834ff0c2034f66e574de6f43bd26489d2 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Mon, 27 Jan 2020 21:28:00 -0800
 Subject: [PATCH] Optimise random block ticking
diff --git a/Spigot-Server-Patches/0436-Entity-Jump-API.patch b/Spigot-Server-Patches/0437-Entity-Jump-API.patch
similarity index 93%
rename from Spigot-Server-Patches/0436-Entity-Jump-API.patch
rename to Spigot-Server-Patches/0437-Entity-Jump-API.patch
index 706ace3f29..f2d026599a 100644
--- a/Spigot-Server-Patches/0436-Entity-Jump-API.patch
+++ b/Spigot-Server-Patches/0437-Entity-Jump-API.patch
@@ -1,11 +1,11 @@
-From 0dde405e740b34c0138f6905d8855e32199264f7 Mon Sep 17 00:00:00 2001
+From 2ff08448c0940e1c33341da273166f342dfd9549 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 8 Feb 2020 23:26:11 -0600
 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 38f666bb11..253e35826f 100644
+index 38f666bb115..253e35826f6 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2608,8 +2608,10 @@ public abstract class EntityLiving extends Entity {
@@ -20,7 +20,7 @@ index 38f666bb11..253e35826f 100644
          } else {
              this.jumpTicks = 0;
 diff --git a/src/main/java/net/minecraft/server/EntityPanda.java b/src/main/java/net/minecraft/server/EntityPanda.java
-index cd41c80f19..f50ed19080 100644
+index cd41c80f191..f50ed190802 100644
 --- a/src/main/java/net/minecraft/server/EntityPanda.java
 +++ b/src/main/java/net/minecraft/server/EntityPanda.java
 @@ -438,7 +438,9 @@ public class EntityPanda extends EntityAnimal {
@@ -34,7 +34,7 @@ index cd41c80f19..f50ed19080 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 7d101d9630..245bd116d1 100644
+index 7d101d96308..245bd116d14 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -723,5 +723,20 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/Spigot-Server-Patches/0437-Add-option-to-nerf-pigmen-from-nether-portals.patch b/Spigot-Server-Patches/0438-Add-option-to-nerf-pigmen-from-nether-portals.patch
similarity index 98%
rename from Spigot-Server-Patches/0437-Add-option-to-nerf-pigmen-from-nether-portals.patch
rename to Spigot-Server-Patches/0438-Add-option-to-nerf-pigmen-from-nether-portals.patch
index 114c678874..f8dfa5c57c 100644
--- a/Spigot-Server-Patches/0437-Add-option-to-nerf-pigmen-from-nether-portals.patch
+++ b/Spigot-Server-Patches/0438-Add-option-to-nerf-pigmen-from-nether-portals.patch
@@ -1,4 +1,4 @@
-From 6653c1309749d5e38c16b384041f830ab03d8e1a Mon Sep 17 00:00:00 2001
+From e8a2b0157bca4740f685aace8f8a274bee018df7 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 7 Feb 2020 14:36:56 -0600
 Subject: [PATCH] Add option to nerf pigmen from nether portals
diff --git a/Spigot-Server-Patches/0438-Make-the-GUI-graph-fancier.patch b/Spigot-Server-Patches/0439-Make-the-GUI-graph-fancier.patch
similarity index 97%
rename from Spigot-Server-Patches/0438-Make-the-GUI-graph-fancier.patch
rename to Spigot-Server-Patches/0439-Make-the-GUI-graph-fancier.patch
index d131e01884..957358ac95 100644
--- a/Spigot-Server-Patches/0438-Make-the-GUI-graph-fancier.patch
+++ b/Spigot-Server-Patches/0439-Make-the-GUI-graph-fancier.patch
@@ -1,4 +1,4 @@
-From 4cc59ca1b2c243beb92b676275d659770c5051ae Mon Sep 17 00:00:00 2001
+From 5bf76c13c7e5ee7394a9cb9c57fba8869d30dac4 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 2 Feb 2020 04:00:40 -0600
 Subject: [PATCH] Make the GUI graph fancier
@@ -6,7 +6,7 @@ Subject: [PATCH] Make the GUI graph fancier
 
 diff --git a/src/main/java/com/destroystokyo/paper/gui/GraphColor.java b/src/main/java/com/destroystokyo/paper/gui/GraphColor.java
 new file mode 100644
-index 0000000000..a4e641fdcc
+index 00000000000..a4e641fdccc
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/gui/GraphColor.java
 @@ -0,0 +1,44 @@
@@ -56,7 +56,7 @@ index 0000000000..a4e641fdcc
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/gui/GraphData.java b/src/main/java/com/destroystokyo/paper/gui/GraphData.java
 new file mode 100644
-index 0000000000..186fc72296
+index 00000000000..186fc722965
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/gui/GraphData.java
 @@ -0,0 +1,47 @@
@@ -109,7 +109,7 @@ index 0000000000..186fc72296
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/gui/GuiStatsComponent.java b/src/main/java/com/destroystokyo/paper/gui/GuiStatsComponent.java
 new file mode 100644
-index 0000000000..0f29ad583e
+index 00000000000..0f29ad583e7
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/gui/GuiStatsComponent.java
 @@ -0,0 +1,41 @@
@@ -156,7 +156,7 @@ index 0000000000..0f29ad583e
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java b/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java
 new file mode 100644
-index 0000000000..e463a86a6a
+index 00000000000..e463a86a6ad
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java
 @@ -0,0 +1,74 @@
@@ -236,7 +236,7 @@ index 0000000000..e463a86a6a
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/gui/RAMGraph.java b/src/main/java/com/destroystokyo/paper/gui/RAMGraph.java
 new file mode 100644
-index 0000000000..c3e54da4ab
+index 00000000000..c3e54da4ab6
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/gui/RAMGraph.java
 @@ -0,0 +1,144 @@
@@ -385,7 +385,7 @@ index 0000000000..c3e54da4ab
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/GuiStatsComponent.java b/src/main/java/net/minecraft/server/GuiStatsComponent.java
-index c21db8e6b7..7b6e935257 100644
+index c21db8e6b79..7b6e9352578 100644
 --- a/src/main/java/net/minecraft/server/GuiStatsComponent.java
 +++ b/src/main/java/net/minecraft/server/GuiStatsComponent.java
 @@ -12,7 +12,7 @@ import javax.swing.Timer;
@@ -398,7 +398,7 @@ index c21db8e6b7..7b6e935257 100644
      });
      private final int[] b = new int[256];
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 63db74993c..d1f82eff21 100644
+index 63db74993c1..d1f82eff218 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -105,7 +105,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -411,7 +411,7 @@ index 63db74993c..d1f82eff21 100644
      private KeyPair I;
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/ServerGUI.java b/src/main/java/net/minecraft/server/ServerGUI.java
-index 95561d9db4..470009fe4c 100644
+index 95561d9db4b..470009fe4c4 100644
 --- a/src/main/java/net/minecraft/server/ServerGUI.java
 +++ b/src/main/java/net/minecraft/server/ServerGUI.java
 @@ -90,7 +90,7 @@ public class ServerGUI extends JComponent {
diff --git a/Spigot-Server-Patches/0439-Backport-fix-for-MC-167561.patch b/Spigot-Server-Patches/0440-Backport-fix-for-MC-167561.patch
similarity index 95%
rename from Spigot-Server-Patches/0439-Backport-fix-for-MC-167561.patch
rename to Spigot-Server-Patches/0440-Backport-fix-for-MC-167561.patch
index 7ffa867fa5..f075181d20 100644
--- a/Spigot-Server-Patches/0439-Backport-fix-for-MC-167561.patch
+++ b/Spigot-Server-Patches/0440-Backport-fix-for-MC-167561.patch
@@ -1,11 +1,11 @@
-From 0030a63b4740fd272eafaa9f4c5511fd66474643 Mon Sep 17 00:00:00 2001
+From c9017c720e6357470ee7a60af33bf2948f91a6d5 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Fri, 21 Feb 2020 18:44:28 +0000
 Subject: [PATCH] Backport fix for MC-167561
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityWolf.java b/src/main/java/net/minecraft/server/EntityWolf.java
-index db15d5e0a2..eec1e26b6e 100644
+index db15d5e0a23..eec1e26b6eb 100644
 --- a/src/main/java/net/minecraft/server/EntityWolf.java
 +++ b/src/main/java/net/minecraft/server/EntityWolf.java
 @@ -296,7 +296,14 @@ public class EntityWolf extends EntityTameableAnimal {
diff --git a/Spigot-Server-Patches/0440-add-hand-to-BlockMultiPlaceEvent.patch b/Spigot-Server-Patches/0441-add-hand-to-BlockMultiPlaceEvent.patch
similarity index 92%
rename from Spigot-Server-Patches/0440-add-hand-to-BlockMultiPlaceEvent.patch
rename to Spigot-Server-Patches/0441-add-hand-to-BlockMultiPlaceEvent.patch
index b040ed0ba9..d874c3aac1 100644
--- a/Spigot-Server-Patches/0440-add-hand-to-BlockMultiPlaceEvent.patch
+++ b/Spigot-Server-Patches/0441-add-hand-to-BlockMultiPlaceEvent.patch
@@ -1,11 +1,11 @@
-From 8a2660468466486b4fe5fb1107be67204f4d6699 Mon Sep 17 00:00:00 2001
+From 0dc82d15ad22fe076a72056f2f33d5b3f2539d81 Mon Sep 17 00:00:00 2001
 From: Trigary <trigary0@gmail.com>
 Date: Sun, 1 Mar 2020 22:43:24 +0100
 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 fcf2b190aa..c3f7e46121 100644
+index fcf2b190aaf..c3f7e461210 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -303,13 +303,18 @@ public class CraftEventFactory {
diff --git a/Spigot-Server-Patches/0441-Prevent-teleporting-dead-entities.patch b/Spigot-Server-Patches/0442-Prevent-teleporting-dead-entities.patch
similarity index 89%
rename from Spigot-Server-Patches/0441-Prevent-teleporting-dead-entities.patch
rename to Spigot-Server-Patches/0442-Prevent-teleporting-dead-entities.patch
index 1a7e44a6ec..c2f66c3bd9 100644
--- a/Spigot-Server-Patches/0441-Prevent-teleporting-dead-entities.patch
+++ b/Spigot-Server-Patches/0442-Prevent-teleporting-dead-entities.patch
@@ -1,11 +1,11 @@
-From 4d4e8a911ceec51125642a93a5351383e643c3d3 Mon Sep 17 00:00:00 2001
+From 5b9ca387d0968d488e0f86614a2143f982b51225 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Tue, 3 Mar 2020 05:26:40 +0000
 Subject: [PATCH] Prevent teleporting dead entities
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 71d045ee00..2e81f3a1d9 100644
+index 71d045ee00d..2e81f3a1d93 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1209,6 +1209,10 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0442-Validate-tripwire-hook-placement-before-update.patch b/Spigot-Server-Patches/0443-Validate-tripwire-hook-placement-before-update.patch
similarity index 89%
rename from Spigot-Server-Patches/0442-Validate-tripwire-hook-placement-before-update.patch
rename to Spigot-Server-Patches/0443-Validate-tripwire-hook-placement-before-update.patch
index b81e301577..8e7f246f82 100644
--- a/Spigot-Server-Patches/0442-Validate-tripwire-hook-placement-before-update.patch
+++ b/Spigot-Server-Patches/0443-Validate-tripwire-hook-placement-before-update.patch
@@ -1,11 +1,11 @@
-From e31f4bc14529a7ac69abb42ad60aacc51d879221 Mon Sep 17 00:00:00 2001
+From f4a127bb46e7480a5709c3ba832b87e5fec90e0c Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 7 Mar 2020 00:07:51 +0000
 Subject: [PATCH] Validate tripwire hook placement before update
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockTripwireHook.java b/src/main/java/net/minecraft/server/BlockTripwireHook.java
-index 1b9d889af6..a5e6e94fe0 100644
+index 1b9d889af6b..a5e6e94fe0d 100644
 --- a/src/main/java/net/minecraft/server/BlockTripwireHook.java
 +++ b/src/main/java/net/minecraft/server/BlockTripwireHook.java
 @@ -149,6 +149,7 @@ public class BlockTripwireHook extends Block {
diff --git a/Spigot-Server-Patches/0443-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/Spigot-Server-Patches/0444-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
similarity index 96%
rename from Spigot-Server-Patches/0443-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
rename to Spigot-Server-Patches/0444-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
index c86f8353ae..f0babed976 100644
--- a/Spigot-Server-Patches/0443-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
+++ b/Spigot-Server-Patches/0444-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
@@ -1,4 +1,4 @@
-From 0ea5faac090c99ceedb906e1bc3b4eb4f2f398c7 Mon Sep 17 00:00:00 2001
+From 192d3a89332e086f0647af17844cd05b19f1f7d8 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 13 Apr 2019 16:50:58 -0500
 Subject: [PATCH] Add option to allow iron golems to spawn in air
diff --git a/Spigot-Server-Patches/0444-Configurable-chance-of-villager-zombie-infection.patch b/Spigot-Server-Patches/0445-Configurable-chance-of-villager-zombie-infection.patch
similarity index 97%
rename from Spigot-Server-Patches/0444-Configurable-chance-of-villager-zombie-infection.patch
rename to Spigot-Server-Patches/0445-Configurable-chance-of-villager-zombie-infection.patch
index 0c614d3d08..acdef7a845 100644
--- a/Spigot-Server-Patches/0444-Configurable-chance-of-villager-zombie-infection.patch
+++ b/Spigot-Server-Patches/0445-Configurable-chance-of-villager-zombie-infection.patch
@@ -1,4 +1,4 @@
-From 8231d190422655d01fdbdd3442ae00e1c9862a82 Mon Sep 17 00:00:00 2001
+From 6e2480233d20a29cead315f160935d6816919a4b Mon Sep 17 00:00:00 2001
 From: Zero <zero@cock.li>
 Date: Sat, 22 Feb 2020 16:10:31 -0500
 Subject: [PATCH] Configurable chance of villager zombie infection
diff --git a/Spigot-Server-Patches/0445-Optimise-Chunk-getFluid.patch b/Spigot-Server-Patches/0446-Optimise-Chunk-getFluid.patch
similarity index 97%
rename from Spigot-Server-Patches/0445-Optimise-Chunk-getFluid.patch
rename to Spigot-Server-Patches/0446-Optimise-Chunk-getFluid.patch
index 418adff9f4..44e9bb3a94 100644
--- a/Spigot-Server-Patches/0445-Optimise-Chunk-getFluid.patch
+++ b/Spigot-Server-Patches/0446-Optimise-Chunk-getFluid.patch
@@ -1,4 +1,4 @@
-From bb77add12b69b2a029463faaf86c67c643371777 Mon Sep 17 00:00:00 2001
+From 6268c9dcf697b86724085367d7ad14ddea65d49b Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Tue, 14 Jan 2020 14:59:08 -0800
 Subject: [PATCH] Optimise Chunk#getFluid
diff --git a/Spigot-Server-Patches/0446-Optimise-TickListServer-by-rewriting-it.patch b/Spigot-Server-Patches/0447-Optimise-TickListServer-by-rewriting-it.patch
similarity index 99%
rename from Spigot-Server-Patches/0446-Optimise-TickListServer-by-rewriting-it.patch
rename to Spigot-Server-Patches/0447-Optimise-TickListServer-by-rewriting-it.patch
index 2da940a37e..dfb62e89d8 100644
--- a/Spigot-Server-Patches/0446-Optimise-TickListServer-by-rewriting-it.patch
+++ b/Spigot-Server-Patches/0447-Optimise-TickListServer-by-rewriting-it.patch
@@ -1,4 +1,4 @@
-From 356c51a88c4e469fe8d0627c3a8c713d4e15689a Mon Sep 17 00:00:00 2001
+From 7953128bd96ef3878736f57eaa3a3c17915c1164 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Fri, 14 Feb 2020 01:24:39 -0800
 Subject: [PATCH] Optimise TickListServer by rewriting it
diff --git a/Spigot-Server-Patches/0447-Pillager-patrol-spawn-settings-and-per-player-option.patch b/Spigot-Server-Patches/0448-Pillager-patrol-spawn-settings-and-per-player-option.patch
similarity index 99%
rename from Spigot-Server-Patches/0447-Pillager-patrol-spawn-settings-and-per-player-option.patch
rename to Spigot-Server-Patches/0448-Pillager-patrol-spawn-settings-and-per-player-option.patch
index 9b10d68ff7..bbfbf8a00f 100644
--- a/Spigot-Server-Patches/0447-Pillager-patrol-spawn-settings-and-per-player-option.patch
+++ b/Spigot-Server-Patches/0448-Pillager-patrol-spawn-settings-and-per-player-option.patch
@@ -1,4 +1,4 @@
-From d636af4fc71167bc8dab4c302c7254a087cf6ef1 Mon Sep 17 00:00:00 2001
+From aa15930df539329829a962e8319db810b79ae549 Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Sat, 1 Feb 2020 16:50:39 +0100
 Subject: [PATCH] Pillager patrol spawn settings and per player options
diff --git a/Spigot-Server-Patches/0448-Ensure-Entity-is-never-double-registered.patch b/Spigot-Server-Patches/0449-Ensure-Entity-is-never-double-registered.patch
similarity index 96%
rename from Spigot-Server-Patches/0448-Ensure-Entity-is-never-double-registered.patch
rename to Spigot-Server-Patches/0449-Ensure-Entity-is-never-double-registered.patch
index 5d6463d66b..059f4a0fb7 100644
--- a/Spigot-Server-Patches/0448-Ensure-Entity-is-never-double-registered.patch
+++ b/Spigot-Server-Patches/0449-Ensure-Entity-is-never-double-registered.patch
@@ -1,4 +1,4 @@
-From 5e261d2773e625fa5bffbd4b7ae848b40e6b8972 Mon Sep 17 00:00:00 2001
+From 2b1e709cee17ac542df6168116a7a4abe24dab3c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 29 Mar 2020 18:26:14 -0400
 Subject: [PATCH] Ensure Entity is never double registered
@@ -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 00df89d650..0dbe2dce11 100644
+index 00df89d6509..0dbe2dce111 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -59,6 +59,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -23,7 +23,7 @@ index 00df89d650..0dbe2dce11 100644
          private boolean locked = false;
          @Override
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 5173731dc5..3fc25183ca 100644
+index 5173731dc55..3fc25183ca4 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -532,6 +532,7 @@ public class WorldServer extends World {
@@ -78,5 +78,5 @@ index 5173731dc5..3fc25183ca 100644
              if (entity instanceof EntityEnderDragon) {
                  EntityComplexPart[] aentitycomplexpart = ((EntityEnderDragon) entity).eo();
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0449-Fix-unregistering-entities-from-unloading-chunks.patch b/Spigot-Server-Patches/0450-Fix-unregistering-entities-from-unloading-chunks.patch
similarity index 93%
rename from Spigot-Server-Patches/0449-Fix-unregistering-entities-from-unloading-chunks.patch
rename to Spigot-Server-Patches/0450-Fix-unregistering-entities-from-unloading-chunks.patch
index 9770a4ee05..66ca95ec95 100644
--- a/Spigot-Server-Patches/0449-Fix-unregistering-entities-from-unloading-chunks.patch
+++ b/Spigot-Server-Patches/0450-Fix-unregistering-entities-from-unloading-chunks.patch
@@ -1,4 +1,4 @@
-From 80f240c7853f1795c5e7959e3daec3e1af7faee3 Mon Sep 17 00:00:00 2001
+From 743d5c90a28b0f1f0a624cc429a8722d3128d880 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 31 Mar 2020 03:01:45 -0400
 Subject: [PATCH] Fix unregistering entities from unloading chunks
@@ -15,7 +15,7 @@ Combine that with a buggy detail of the previous implementation of
 the Dupe UUID patch, then this was the likely source of the "Ghost entities"
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 3fc25183ca..9fbe8fa1b2 100644
+index 3fc25183ca4..9fbe8fa1b2b 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1506,9 +1506,9 @@ public class WorldServer extends World {
@@ -31,5 +31,5 @@ index 3fc25183ca..9fbe8fa1b2 100644
          }
  
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0450-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/Spigot-Server-Patches/0451-Remote-Connections-shouldn-t-hold-up-shutdown.patch
similarity index 90%
rename from Spigot-Server-Patches/0450-Remote-Connections-shouldn-t-hold-up-shutdown.patch
rename to Spigot-Server-Patches/0451-Remote-Connections-shouldn-t-hold-up-shutdown.patch
index d4161e0254..b9bf81d464 100644
--- a/Spigot-Server-Patches/0450-Remote-Connections-shouldn-t-hold-up-shutdown.patch
+++ b/Spigot-Server-Patches/0451-Remote-Connections-shouldn-t-hold-up-shutdown.patch
@@ -1,4 +1,4 @@
-From 38e70a8701f6abb26dcc1681a4b6523576503d4a Mon Sep 17 00:00:00 2001
+From 1f66dce82479f635273b51d5ed56cbe4dc287bb9 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 31 Mar 2020 03:50:42 -0400
 Subject: [PATCH] Remote Connections shouldn't hold up shutdown
@@ -6,7 +6,7 @@ Subject: [PATCH] Remote Connections shouldn't hold up shutdown
 Bugs in the connection logic appears to leave stale connections even, preventing shutdown
 
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 349a0ea213..1ef7890da5 100644
+index 349a0ea213f..1ef7890da59 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -415,11 +415,11 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -24,5 +24,5 @@ index 349a0ea213..1ef7890da5 100644
  
          System.exit(0); // CraftBukkit
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0451-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/Spigot-Server-Patches/0452-Do-not-allow-bees-to-load-chunks-for-beehives.patch
similarity index 95%
rename from Spigot-Server-Patches/0451-Do-not-allow-bees-to-load-chunks-for-beehives.patch
rename to Spigot-Server-Patches/0452-Do-not-allow-bees-to-load-chunks-for-beehives.patch
index 436cb119b0..99b38687db 100644
--- a/Spigot-Server-Patches/0451-Do-not-allow-bees-to-load-chunks-for-beehives.patch
+++ b/Spigot-Server-Patches/0452-Do-not-allow-bees-to-load-chunks-for-beehives.patch
@@ -1,11 +1,11 @@
-From 5ed395f3dacf7c33486ae39e1580132e4b1284c0 Mon Sep 17 00:00:00 2001
+From 93c5f228e9cf15809c3bb58aa9053697d17e7131 Mon Sep 17 00:00:00 2001
 From: chickeneer <emcchickeneer@gmail.com>
 Date: Tue, 17 Mar 2020 14:18:50 -0500
 Subject: [PATCH] Do not allow bees to load chunks for beehives
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityBee.java b/src/main/java/net/minecraft/server/EntityBee.java
-index c7d79efdf6..dd1d246aeb 100644
+index c7d79efdf6e..dd1d246aeb5 100644
 --- a/src/main/java/net/minecraft/server/EntityBee.java
 +++ b/src/main/java/net/minecraft/server/EntityBee.java
 @@ -315,6 +315,7 @@ public class EntityBee extends EntityAnimal implements EntityBird {
@@ -41,5 +41,5 @@ index c7d79efdf6..dd1d246aeb 100644
  
              if (tileentity instanceof TileEntityBeehive) {
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0452-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/Spigot-Server-Patches/0453-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
similarity index 94%
rename from Spigot-Server-Patches/0452-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
rename to Spigot-Server-Patches/0453-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
index f924006b03..81d7143e62 100644
--- a/Spigot-Server-Patches/0452-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
+++ b/Spigot-Server-Patches/0453-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
@@ -1,4 +1,4 @@
-From a04b7ed17e96d5d02e9d14e3d96a5638a148fcd4 Mon Sep 17 00:00:00 2001
+From 3bf2d6906af2ae65a709444f3d72597ead34cac1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 2 Apr 2020 01:42:39 -0400
 Subject: [PATCH] Prevent Double PlayerChunkMap adds crashing server
@@ -7,7 +7,7 @@ Suspected case would be around the technique used in .stopRiding
 Stack will identify any causer of this and warn instead of crashing.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 73bfebb837..e22ef19534 100644
+index 6eb05591317..4beae504c87 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -1446,6 +1446,14 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -26,7 +26,7 @@ index 73bfebb837..e22ef19534 100644
              if (!(entity instanceof EntityLightning)) {
                  EntityTypes<?> entitytypes = entity.getEntityType();
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 9fbe8fa1b2..2a7a47c670 100644
+index 9fbe8fa1b2b..2a7a47c6707 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1472,7 +1472,7 @@ public class WorldServer extends World {
@@ -47,5 +47,5 @@ index 9fbe8fa1b2..2a7a47c670 100644
              if (entity.origin == null) {
                  entity.origin = entity.getBukkitEntity().getLocation();
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0453-Optimize-Collision-Chunk-lookup-and-avoid-loading-fa.patch b/Spigot-Server-Patches/0454-Optimize-Collision-Chunk-lookup-and-avoid-loading-fa.patch
similarity index 95%
rename from Spigot-Server-Patches/0453-Optimize-Collision-Chunk-lookup-and-avoid-loading-fa.patch
rename to Spigot-Server-Patches/0454-Optimize-Collision-Chunk-lookup-and-avoid-loading-fa.patch
index 731e236aeb..fbde5b8c00 100644
--- a/Spigot-Server-Patches/0453-Optimize-Collision-Chunk-lookup-and-avoid-loading-fa.patch
+++ b/Spigot-Server-Patches/0454-Optimize-Collision-Chunk-lookup-and-avoid-loading-fa.patch
@@ -1,4 +1,4 @@
-From 102b09f710cfa66c9284bf278763fb30b66cf3a4 Mon Sep 17 00:00:00 2001
+From f48abf532a4b211d32fbbdf6e10cb30943ce3f67 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 2 Apr 2020 02:37:57 -0400
 Subject: [PATCH] Optimize Collision Chunk lookup and avoid loading far chunks
@@ -10,7 +10,7 @@ The collision code takes an AABB and generates a cuboid of checks rather
 than a cylinder, so at high velocity this can generate a lot of chunk checks.
 
 diff --git a/src/main/java/net/minecraft/server/ICollisionAccess.java b/src/main/java/net/minecraft/server/ICollisionAccess.java
-index f851ed11df..d154487294 100644
+index f851ed11df1..d154487294b 100644
 --- a/src/main/java/net/minecraft/server/ICollisionAccess.java
 +++ b/src/main/java/net/minecraft/server/ICollisionAccess.java
 @@ -83,15 +83,19 @@ public interface ICollisionAccess extends IBlockAccess {
@@ -38,5 +38,5 @@ index f851ed11df..d154487294 100644
                          if (iblockaccess != null) {
                              blockposition_mutableblockposition.d(k1, l1, i2);
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0454-Don-t-tick-dead-players.patch b/Spigot-Server-Patches/0455-Don-t-tick-dead-players.patch
similarity index 89%
rename from Spigot-Server-Patches/0454-Don-t-tick-dead-players.patch
rename to Spigot-Server-Patches/0455-Don-t-tick-dead-players.patch
index 2c34f2973f..0b0d5784e5 100644
--- a/Spigot-Server-Patches/0454-Don-t-tick-dead-players.patch
+++ b/Spigot-Server-Patches/0455-Don-t-tick-dead-players.patch
@@ -1,4 +1,4 @@
-From c0c34e10d92aefb26116f3c7865b54debcd31ba7 Mon Sep 17 00:00:00 2001
+From 61c81d1c8c5796bd292b9e00b82bbceb6d7fcbb3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 2 Apr 2020 17:16:48 -0400
 Subject: [PATCH] Don't tick dead players
@@ -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 900631ebe0..aa9c903aa8 100644
+index 900631ebe05..aa9c903aa82 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -429,7 +429,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -20,5 +20,5 @@ index 900631ebe0..aa9c903aa8 100644
              }
  
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0455-Dead-Player-s-shouldn-t-be-able-to-move.patch b/Spigot-Server-Patches/0456-Dead-Player-s-shouldn-t-be-able-to-move.patch
similarity index 88%
rename from Spigot-Server-Patches/0455-Dead-Player-s-shouldn-t-be-able-to-move.patch
rename to Spigot-Server-Patches/0456-Dead-Player-s-shouldn-t-be-able-to-move.patch
index a1645a3874..c5871341be 100644
--- a/Spigot-Server-Patches/0455-Dead-Player-s-shouldn-t-be-able-to-move.patch
+++ b/Spigot-Server-Patches/0456-Dead-Player-s-shouldn-t-be-able-to-move.patch
@@ -1,4 +1,4 @@
-From 09137b1fb59822c382267f14ad337c59403bc733 Mon Sep 17 00:00:00 2001
+From 35120b7369791696840251d9cf452ccb8a3911b9 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 2 Apr 2020 19:31:16 -0400
 Subject: [PATCH] Dead Player's shouldn't be able to move
@@ -7,7 +7,7 @@ This fixes a lot of game state issues where packets were delayed for processing
 due to 1.15's new queue but processed while dead.
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 61c9e030a1..c4d4334305 100644
+index 61c9e030a10..c4d43343050 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -978,7 +978,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -20,5 +20,5 @@ index 61c9e030a1..c4d4334305 100644
  
      @Override
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0456-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch b/Spigot-Server-Patches/0457-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
similarity index 98%
rename from Spigot-Server-Patches/0456-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
rename to Spigot-Server-Patches/0457-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
index 8e529d92a6..d6c4b2e7ae 100644
--- a/Spigot-Server-Patches/0456-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
+++ b/Spigot-Server-Patches/0457-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
@@ -1,4 +1,4 @@
-From c02c51d21e1c92abe3c71d9f8718bb457b545c93 Mon Sep 17 00:00:00 2001
+From 91df067828218cd2c2a6bcd9a1a61772eff3fede Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 8 Apr 2020 03:06:30 -0400
 Subject: [PATCH] Optimize PlayerChunkMap memory use for visibleChunks
@@ -13,7 +13,7 @@ This should result in siginificant memory use reduction and improved GC behavior
 
 diff --git a/src/main/java/com/destroystokyo/paper/util/map/Long2ObjectLinkedOpenHashMapFastCopy.java b/src/main/java/com/destroystokyo/paper/util/map/Long2ObjectLinkedOpenHashMapFastCopy.java
 new file mode 100644
-index 0000000000..e0ad725b2e
+index 00000000000..e0ad725b2e6
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/util/map/Long2ObjectLinkedOpenHashMapFastCopy.java
 @@ -0,0 +1,32 @@
@@ -50,7 +50,7 @@ index 0000000000..e0ad725b2e
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index ca1b5b3b09..c457e3b772 100644
+index ca1b5b3b094..c457e3b772e 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -750,7 +750,7 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -63,7 +63,7 @@ index ca1b5b3b09..c457e3b772 100644
  
                  if (optional.isPresent()) {
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
-index d9941b38ca..71ab65e00f 100644
+index d9941b38ca0..71ab65e00fe 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
 @@ -529,7 +529,7 @@ public final class MCUtil {
@@ -76,7 +76,7 @@ index d9941b38ca..71ab65e00f 100644
              List<PlayerChunk> allChunks = new ArrayList<>(visibleChunks.values());
              List<EntityPlayer> players = world.players;
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index e22ef19534..db5a35598d 100644
+index 4beae504c87..00f26ae23da 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -55,8 +55,10 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -213,7 +213,7 @@ index e22ef19534..db5a35598d 100644
          while (objectbidirectionaliterator.hasNext()) {
              Entry<PlayerChunk> entry = (Entry) objectbidirectionaliterator.next();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 07ebd78acc..b70c0fd977 100644
+index 07ebd78acc7..b70c0fd977c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -74,6 +74,7 @@ import net.minecraft.server.GameRules;
@@ -271,5 +271,5 @@ index 07ebd78acc..b70c0fd977 100644
          return chunks.values().stream().map(PlayerChunk::getFullChunk).filter(Objects::nonNull).map(net.minecraft.server.Chunk::getBukkitChunk).toArray(Chunk[]::new);
      }
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0457-Don-t-load-chunks-when-attempting-to-unload-a-chunk.patch b/Spigot-Server-Patches/0458-Don-t-load-chunks-when-attempting-to-unload-a-chunk.patch
similarity index 93%
rename from Spigot-Server-Patches/0457-Don-t-load-chunks-when-attempting-to-unload-a-chunk.patch
rename to Spigot-Server-Patches/0458-Don-t-load-chunks-when-attempting-to-unload-a-chunk.patch
index d7a08de32c..06767d7412 100644
--- a/Spigot-Server-Patches/0457-Don-t-load-chunks-when-attempting-to-unload-a-chunk.patch
+++ b/Spigot-Server-Patches/0458-Don-t-load-chunks-when-attempting-to-unload-a-chunk.patch
@@ -1,4 +1,4 @@
-From 215f58b96ad22596b69d824ef9252ed9290c7d89 Mon Sep 17 00:00:00 2001
+From 438f8e07931fd9c3536a62fe8aad4fb0b1e288d1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 8 Apr 2020 21:07:08 -0400
 Subject: [PATCH] Don't load chunks when attempting to unload a chunk
@@ -6,7 +6,7 @@ Subject: [PATCH] Don't load chunks when attempting to unload a chunk
 Big Brain Logic
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index b70c0fd977..eb7b48422e 100644
+index b70c0fd977c..eb7b48422e0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -473,7 +473,7 @@ public class CraftWorld implements World {
@@ -28,5 +28,5 @@ index b70c0fd977..eb7b48422e 100644
              return true;
          }
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0458-Increase-Light-Queue-Size.patch b/Spigot-Server-Patches/0459-Increase-Light-Queue-Size.patch
similarity index 96%
rename from Spigot-Server-Patches/0458-Increase-Light-Queue-Size.patch
rename to Spigot-Server-Patches/0459-Increase-Light-Queue-Size.patch
index 94613367eb..3df8f63f80 100644
--- a/Spigot-Server-Patches/0458-Increase-Light-Queue-Size.patch
+++ b/Spigot-Server-Patches/0459-Increase-Light-Queue-Size.patch
@@ -1,4 +1,4 @@
-From a6e7765b2ccf8621cbef028703c1a20ad6a03a0f Mon Sep 17 00:00:00 2001
+From 238da0bfbafde5fadcba5d39613c28eeb68e5e82 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 8 Apr 2020 21:24:05 -0400
 Subject: [PATCH] Increase Light Queue Size
diff --git a/Spigot-Server-Patches/0459-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch b/Spigot-Server-Patches/0460-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch
similarity index 98%
rename from Spigot-Server-Patches/0459-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch
rename to Spigot-Server-Patches/0460-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch
index d9ad2fb9f1..43eedd2444 100644
--- a/Spigot-Server-Patches/0459-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch
+++ b/Spigot-Server-Patches/0460-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch
@@ -1,4 +1,4 @@
-From 203692f5bd79a69c2a0306ecf4dc963d58f176ea Mon Sep 17 00:00:00 2001
+From 29b58569cbd8a41bfd0664647359a4d7080ed14c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 9 Apr 2020 00:09:26 -0400
 Subject: [PATCH] Mid Tick Chunk Tasks - Speed up processing of chunk loads and
@@ -30,7 +30,7 @@ In a view distance of 15, chunk loading performance was visually faster on the c
 Flying at high speed in spectator mode was able to keep up with chunk loading (as long as they are already generated)
 
 diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java
-index 223d3b1125..37341d2d2e 100644
+index 223d3b1125d..37341d2d2e7 100644
 --- a/src/main/java/co/aikar/timings/MinecraftTimings.java
 +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
 @@ -13,6 +13,7 @@ import java.util.Map;
@@ -42,7 +42,7 @@ index 223d3b1125..37341d2d2e 100644
      public static final Timing commandFunctionsTimer = Timings.ofSafe("Command Functions");
      public static final Timing connectionTimer = Timings.ofSafe("Connection Handler");
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 647f6fc8ef..9f1662ece5 100644
+index 647f6fc8efb..9f1662ece53 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -421,4 +421,9 @@ public class PaperConfig {
@@ -56,7 +56,7 @@ index 647f6fc8ef..9f1662ece5 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index c457e3b772..747305619b 100644
+index c457e3b772e..747305619b5 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -683,6 +683,7 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -135,7 +135,7 @@ index c457e3b772..747305619b 100644
          protected boolean executeNext() {
          // CraftBukkit start - process pending Chunk loadCallback() and unloadCallback() after each run task
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 77adc64e30..3c25436f15 100644
+index 77adc64e30c..3c25436f158 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -907,6 +907,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -226,7 +226,7 @@ index 77adc64e30..3c25436f15 100644
                      // Spigot Start
                      CrashReport crashreport;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 2a7a47c670..9b5f24c262 100644
+index 2a7a47c6707..9b5f24c262e 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -432,6 +432,7 @@ public class WorldServer extends World {
@@ -262,5 +262,5 @@ index 2a7a47c670..9b5f24c262 100644
          }
  
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0460-Don-t-move-existing-players-to-world-spawn.patch b/Spigot-Server-Patches/0461-Don-t-move-existing-players-to-world-spawn.patch
similarity index 94%
rename from Spigot-Server-Patches/0460-Don-t-move-existing-players-to-world-spawn.patch
rename to Spigot-Server-Patches/0461-Don-t-move-existing-players-to-world-spawn.patch
index ee1e0bf583..50db42e502 100644
--- a/Spigot-Server-Patches/0460-Don-t-move-existing-players-to-world-spawn.patch
+++ b/Spigot-Server-Patches/0461-Don-t-move-existing-players-to-world-spawn.patch
@@ -1,4 +1,4 @@
-From 71d1b3f0878eee64b6a71f95471d4b2fdebf0a9d Mon Sep 17 00:00:00 2001
+From 979cdaa4c29974dac18a2c256333b98b8cd2cc56 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 9 Apr 2020 21:20:33 -0400
 Subject: [PATCH] Don't move existing players to world spawn
@@ -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 aa9c903aa8..d51af68a92 100644
+index aa9c903aa82..d51af68a920 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -114,7 +114,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -40,7 +40,7 @@ index aa9c903aa8..d51af68a92 100644
          this.dimension = ((WorldServer) this.world).getWorldProvider().getDimensionManager();
          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 01345a62b7..dfe6251576 100644
+index 909d86e14c7..0b5800649ab 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -108,6 +108,7 @@ public abstract class PlayerList {
@@ -52,5 +52,5 @@ index 01345a62b7..dfe6251576 100644
  
          entityplayer.spawnIn(worldserver);
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0461-Add-tick-times-API-and-mspt-command.patch b/Spigot-Server-Patches/0462-Add-tick-times-API-and-mspt-command.patch
similarity index 96%
rename from Spigot-Server-Patches/0461-Add-tick-times-API-and-mspt-command.patch
rename to Spigot-Server-Patches/0462-Add-tick-times-API-and-mspt-command.patch
index 3d61c29023..3bdc35863c 100644
--- a/Spigot-Server-Patches/0461-Add-tick-times-API-and-mspt-command.patch
+++ b/Spigot-Server-Patches/0462-Add-tick-times-API-and-mspt-command.patch
@@ -1,4 +1,4 @@
-From b65aaf9114f0e17ab726ae3af1481f519b82790f Mon Sep 17 00:00:00 2001
+From 93850a83c22596106fb1f58a397f75e2809da20c Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 5 Apr 2020 22:23:14 -0500
 Subject: [PATCH] Add tick times API and /mspt command
@@ -6,7 +6,7 @@ Subject: [PATCH] Add tick times API and /mspt command
 
 diff --git a/src/main/java/com/destroystokyo/paper/MSPTCommand.java b/src/main/java/com/destroystokyo/paper/MSPTCommand.java
 new file mode 100644
-index 0000000000..d0211d4f39
+index 00000000000..d0211d4f39f
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/MSPTCommand.java
 @@ -0,0 +1,64 @@
@@ -75,7 +75,7 @@ index 0000000000..d0211d4f39
 +    }
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 9f1662ece5..e0d7832c3a 100644
+index 9f1662ece53..e0d7832c3a0 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -70,6 +70,7 @@ public class PaperConfig {
@@ -87,7 +87,7 @@ index 9f1662ece5..e0d7832c3a 100644
          version = getInt("config-version", 20);
          set("config-version", 20);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 3c25436f15..5f57a9e1c8 100644
+index 3c25436f158..5f57a9e1c8d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -106,6 +106,11 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -147,7 +147,7 @@ index 3c25436f15..5f57a9e1c8 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e8d3528d51..4a41003203 100644
+index e8d3528d515..4a41003203b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2053,6 +2053,16 @@ public final class CraftServer implements Server {
@@ -168,5 +168,5 @@ index e8d3528d51..4a41003203 100644
  
      private final Spigot spigot = new Spigot()
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0462-Expose-MinecraftServer-isRunning.patch b/Spigot-Server-Patches/0463-Expose-MinecraftServer-isRunning.patch
similarity index 88%
rename from Spigot-Server-Patches/0462-Expose-MinecraftServer-isRunning.patch
rename to Spigot-Server-Patches/0463-Expose-MinecraftServer-isRunning.patch
index 24b4dfa0e6..1ec5db4bb1 100644
--- a/Spigot-Server-Patches/0462-Expose-MinecraftServer-isRunning.patch
+++ b/Spigot-Server-Patches/0463-Expose-MinecraftServer-isRunning.patch
@@ -1,4 +1,4 @@
-From 3d40e8ed1f266d37d4e3e069fad413bbc7567262 Mon Sep 17 00:00:00 2001
+From eae3de0690b07e74af36a82ae65df6bb06ebf5a6 Mon Sep 17 00:00:00 2001
 From: JRoy <joshroy126@gmail.com>
 Date: Fri, 10 Apr 2020 21:24:12 -0400
 Subject: [PATCH] Expose MinecraftServer#isRunning
@@ -6,7 +6,7 @@ Subject: [PATCH] Expose MinecraftServer#isRunning
 This allows for plugins to detect if the server is actually turning off in onDisable rather than just plugins reloading.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 4a41003203..b627180729 100644
+index 4a41003203b..b627180729a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2218,5 +2218,10 @@ public final class CraftServer implements Server {
@@ -21,5 +21,5 @@ index 4a41003203..b627180729 100644
      // Paper end
  }
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0463-Implement-Chunk-Priority-Urgency-System-for-World-Ge.patch b/Spigot-Server-Patches/0464-Implement-Chunk-Priority-Urgency-System-for-World-Ge.patch
similarity index 99%
rename from Spigot-Server-Patches/0463-Implement-Chunk-Priority-Urgency-System-for-World-Ge.patch
rename to Spigot-Server-Patches/0464-Implement-Chunk-Priority-Urgency-System-for-World-Ge.patch
index 6886e656d9..5d414935f3 100644
--- a/Spigot-Server-Patches/0463-Implement-Chunk-Priority-Urgency-System-for-World-Ge.patch
+++ b/Spigot-Server-Patches/0464-Implement-Chunk-Priority-Urgency-System-for-World-Ge.patch
@@ -1,4 +1,4 @@
-From 58d879a91971e96b5d2d5190bf8ca139db82a522 Mon Sep 17 00:00:00 2001
+From cff0c275be13d76ea9ea6b1447bf8164d126604d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 11 Apr 2020 03:56:07 -0400
 Subject: [PATCH] Implement Chunk Priority / Urgency System for World Gen
diff --git a/Spigot-Server-Patches/0464-Remove-streams-from-Mob-AI-System.patch b/Spigot-Server-Patches/0465-Remove-streams-from-Mob-AI-System.patch
similarity index 98%
rename from Spigot-Server-Patches/0464-Remove-streams-from-Mob-AI-System.patch
rename to Spigot-Server-Patches/0465-Remove-streams-from-Mob-AI-System.patch
index d9c10088d1..16dbcfe438 100644
--- a/Spigot-Server-Patches/0464-Remove-streams-from-Mob-AI-System.patch
+++ b/Spigot-Server-Patches/0465-Remove-streams-from-Mob-AI-System.patch
@@ -1,4 +1,4 @@
-From 06c4a96e4c945a0d731ea66f43b78262e7082482 Mon Sep 17 00:00:00 2001
+From 25edafaf750a2a220974d2b56ef705278c51242b Mon Sep 17 00:00:00 2001
 From: Spottedleaf <spottedleaf@spottedleaf.dev>
 Date: Mon, 6 Apr 2020 17:53:29 -0700
 Subject: [PATCH] Remove streams from Mob AI System
@@ -10,7 +10,7 @@ Also optimise the stream.anyMatch statement to move to a bitset
 where we can replace the call with a single bitwise operation.
 
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoal.java b/src/main/java/net/minecraft/server/PathfinderGoal.java
-index bdb90a3466..93009d83f0 100644
+index bdb90a34663..93009d83f07 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoal.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoal.java
 @@ -1,10 +1,12 @@
@@ -53,7 +53,7 @@ index bdb90a3466..93009d83f0 100644
  
      public static enum Type {
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
-index 935136771e..84d2abbcb9 100644
+index 935136771e7..84d2abbcb90 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
 @@ -1,8 +1,10 @@
@@ -232,7 +232,7 @@ index 935136771e..84d2abbcb9 100644
  
      public void a(PathfinderGoal.Type pathfindergoal_type, boolean flag) {
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java b/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java
-index 29657fed75..1b800c558f 100644
+index 29657fed751..1b800c558f0 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java
 @@ -59,9 +59,10 @@ public class PathfinderGoalWrapped extends PathfinderGoal {
@@ -250,5 +250,5 @@ index 29657fed75..1b800c558f 100644
  
      public boolean isRunning() { return this.g(); } // Paper - OBFHELPER
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0465-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch b/Spigot-Server-Patches/0466-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch
similarity index 94%
rename from Spigot-Server-Patches/0465-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch
rename to Spigot-Server-Patches/0466-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch
index 1a3f036d1e..ac61c697a9 100644
--- a/Spigot-Server-Patches/0465-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch
+++ b/Spigot-Server-Patches/0466-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch
@@ -1,4 +1,4 @@
-From 20b3b4c7387b9ba6883a3865aeeda334bea48c1b Mon Sep 17 00:00:00 2001
+From 9b4c7accbb78fe4cee5494775b0e2b41c6d4790f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 11 Apr 2020 21:23:42 -0400
 Subject: [PATCH] Delay unsafe actions until after entity ticking is done
@@ -6,7 +6,7 @@ Subject: [PATCH] Delay unsafe actions until after entity ticking is done
 This will help prevent many cases of unregistering entities during entity ticking
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 9b5f24c262..b3785775ec 100644
+index 9b5f24c262e..b3785775ecd 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -60,6 +60,16 @@ public class WorldServer extends World {
@@ -44,7 +44,7 @@ index 9b5f24c262..b3785775ec 100644
  
              try (co.aikar.timings.Timing ignored = this.timings.newEntities.startTiming()) { // Paper - timings
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index eb7b48422e..ac257d50de 100644
+index eb7b48422e0..ac257d50dea 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -2473,7 +2473,7 @@ public class CraftWorld implements World {
@@ -57,5 +57,5 @@ index eb7b48422e..ac257d50de 100644
  
          return ret;
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0466-Async-command-map-building.patch b/Spigot-Server-Patches/0467-Async-command-map-building.patch
similarity index 94%
rename from Spigot-Server-Patches/0466-Async-command-map-building.patch
rename to Spigot-Server-Patches/0467-Async-command-map-building.patch
index ffedb3e4f3..bdfe0a84eb 100644
--- a/Spigot-Server-Patches/0466-Async-command-map-building.patch
+++ b/Spigot-Server-Patches/0467-Async-command-map-building.patch
@@ -1,11 +1,11 @@
-From 9f7453549fbee5fae923580d3c02c0e4cf4cf57e Mon Sep 17 00:00:00 2001
+From a868e8687cd2ec76eb08fd5e62bb8371aba369bd Mon Sep 17 00:00:00 2001
 From: Callahan <mr.callahhh@gmail.com>
 Date: Wed, 8 Apr 2020 02:42:14 -0500
 Subject: [PATCH] Async command map building
 
 
 diff --git a/src/main/java/net/minecraft/server/CommandDispatcher.java b/src/main/java/net/minecraft/server/CommandDispatcher.java
-index 37b1a7947c..2414b0a552 100644
+index 37b1a7947c2..2414b0a552e 100644
 --- a/src/main/java/net/minecraft/server/CommandDispatcher.java
 +++ b/src/main/java/net/minecraft/server/CommandDispatcher.java
 @@ -241,6 +241,14 @@ public class CommandDispatcher {
@@ -39,5 +39,5 @@ index 37b1a7947c..2414b0a552 100644
          event.getPlayer().getServer().getPluginManager().callEvent(event);
  
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0467-Forced-Watchdog-Crash-support-and-Improve-Async-Shut.patch b/Spigot-Server-Patches/0468-Forced-Watchdog-Crash-support-and-Improve-Async-Shut.patch
similarity index 97%
rename from Spigot-Server-Patches/0467-Forced-Watchdog-Crash-support-and-Improve-Async-Shut.patch
rename to Spigot-Server-Patches/0468-Forced-Watchdog-Crash-support-and-Improve-Async-Shut.patch
index e898eacb15..3bf7cb0a68 100644
--- a/Spigot-Server-Patches/0467-Forced-Watchdog-Crash-support-and-Improve-Async-Shut.patch
+++ b/Spigot-Server-Patches/0468-Forced-Watchdog-Crash-support-and-Improve-Async-Shut.patch
@@ -1,4 +1,4 @@
-From b70ba5ecf0012b649a82f6a4d674743ddf9e038c Mon Sep 17 00:00:00 2001
+From f38831253210b7d537c57827d1e0aeffde5e8cd2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 12 Apr 2020 15:50:48 -0400
 Subject: [PATCH] Forced Watchdog Crash support and Improve Async Shutdown
@@ -36,7 +36,7 @@ We have to ensure Thread Death propagates correctly though to stop main complete
 This is to ensure that if main isn't truely stuck, it's not manipulating state we are trying to save.
 
 diff --git a/src/main/java/net/minecraft/server/CrashReport.java b/src/main/java/net/minecraft/server/CrashReport.java
-index 3de19c998b..c7dc8787cc 100644
+index 3de19c998b7..c7dc8787cc3 100644
 --- a/src/main/java/net/minecraft/server/CrashReport.java
 +++ b/src/main/java/net/minecraft/server/CrashReport.java
 @@ -257,6 +257,7 @@ public class CrashReport {
@@ -48,7 +48,7 @@ index 3de19c998b..c7dc8787cc 100644
              throwable = throwable.getCause();
          }
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 1ef7890da5..e62ca0543f 100644
+index 1ef7890da59..e62ca0543f1 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -750,7 +750,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -61,7 +61,7 @@ index 1ef7890da5..e62ca0543f 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/IAsyncTaskHandler.java b/src/main/java/net/minecraft/server/IAsyncTaskHandler.java
-index cfe43e882e..2632c7c3ec 100644
+index cfe43e882e5..2632c7c3ec7 100644
 --- a/src/main/java/net/minecraft/server/IAsyncTaskHandler.java
 +++ b/src/main/java/net/minecraft/server/IAsyncTaskHandler.java
 @@ -135,6 +135,7 @@ public abstract class IAsyncTaskHandler<R extends Runnable> implements Mailbox<R
@@ -73,7 +73,7 @@ index cfe43e882e..2632c7c3ec 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5f57a9e1c8..98f0398348 100644
+index 5f57a9e1c8d..98f03983485 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -144,6 +144,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -178,10 +178,10 @@ index 5f57a9e1c8..98f0398348 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index dfe6251576..160476fa29 100644
+index 0b5800649ab..62891d2dc6f 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -398,7 +398,7 @@ public abstract class PlayerList {
+@@ -400,7 +400,7 @@ public abstract class PlayerList {
          cserver.getPluginManager().callEvent(playerQuitEvent);
          entityplayer.getBukkitEntity().disconnect(playerQuitEvent.getQuitMessage());
  
@@ -191,7 +191,7 @@ index dfe6251576..160476fa29 100644
  
          // Paper start - Remove from collideRule team if needed
 diff --git a/src/main/java/net/minecraft/server/SystemUtils.java b/src/main/java/net/minecraft/server/SystemUtils.java
-index dc6d030621..bc8b904660 100644
+index dc6d030621b..bc8b9046605 100644
 --- a/src/main/java/net/minecraft/server/SystemUtils.java
 +++ b/src/main/java/net/minecraft/server/SystemUtils.java
 @@ -109,6 +109,7 @@ public class SystemUtils {
@@ -203,7 +203,7 @@ index dc6d030621..bc8b904660 100644
          SystemUtils.c.shutdown();
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index de9f49b884..c8619af2cf 100644
+index de9f49b8848..c8619af2cf4 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -792,6 +792,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -223,7 +223,7 @@ index de9f49b884..c8619af2cf 100644
              String msg = "Entity threw exception at " + entity.world.getWorld().getName() + ":" + entity.locX() + "," + entity.locY() + "," + entity.locZ();
              System.err.println(msg);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b627180729..f49193d9d7 100644
+index b627180729a..f49193d9d7c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1706,7 +1706,7 @@ public final class CraftServer implements Server {
@@ -236,7 +236,7 @@ index b627180729..f49193d9d7 100644
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
-index 449e99d1b6..899a525209 100644
+index 449e99d1b67..899a525209c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
 @@ -12,12 +12,25 @@ public class ServerShutdownThread extends Thread {
@@ -267,7 +267,7 @@ index 449e99d1b6..899a525209 100644
              }
          }
 diff --git a/src/main/java/org/spigotmc/RestartCommand.java b/src/main/java/org/spigotmc/RestartCommand.java
-index aefea3a9a8..123de5ac90 100644
+index aefea3a9a8b..123de5ac902 100644
 --- a/src/main/java/org/spigotmc/RestartCommand.java
 +++ b/src/main/java/org/spigotmc/RestartCommand.java
 @@ -139,7 +139,7 @@ public class RestartCommand extends Command
@@ -280,7 +280,7 @@ index aefea3a9a8..123de5ac90 100644
          String[] split = restartScript.split( " " );
          if ( split.length > 0 && new File( split[0] ).isFile() )
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index 5bdcdcf9e8..fe4b8caf28 100644
+index 5bdcdcf9e85..fe4b8caf28b 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
 @@ -41,6 +41,7 @@ public class WatchdogThread extends Thread
@@ -345,5 +345,5 @@ index 5bdcdcf9e8..fe4b8caf28 100644
                  break;
                  } // Paper end
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0468-Optimize-Pathfinding.patch b/Spigot-Server-Patches/0469-Optimize-Pathfinding.patch
similarity index 95%
rename from Spigot-Server-Patches/0468-Optimize-Pathfinding.patch
rename to Spigot-Server-Patches/0469-Optimize-Pathfinding.patch
index e0c670f199..77a09aff6d 100644
--- a/Spigot-Server-Patches/0468-Optimize-Pathfinding.patch
+++ b/Spigot-Server-Patches/0469-Optimize-Pathfinding.patch
@@ -1,4 +1,4 @@
-From feb3426b29a8e9110eb293543f82ff0a53cac9b8 Mon Sep 17 00:00:00 2001
+From ed15355ebb8c3aeb9299598a9873c1fc7aee586b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 02:02:07 -0600
 Subject: [PATCH] Optimize Pathfinding
@@ -7,7 +7,7 @@ Prevents pathfinding from spamming failures for things such as
 arrow attacks.
 
 diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
-index f06764973f..dc32107ec3 100644
+index f06764973fe..dc32107ec32 100644
 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java
 +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
 @@ -11,7 +11,7 @@ public abstract class NavigationAbstract {
@@ -52,5 +52,5 @@ index f06764973f..dc32107ec3 100644
  
      public boolean setDestination(@Nullable PathEntity pathentity, double speed) { return a(pathentity, speed); } // Paper - OBFHELPER
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0469-Port-20w15a-Villager-AI-optimizations-DROP-1.16.patch b/Spigot-Server-Patches/0470-Port-20w15a-Villager-AI-optimizations-DROP-1.16.patch
similarity index 98%
rename from Spigot-Server-Patches/0469-Port-20w15a-Villager-AI-optimizations-DROP-1.16.patch
rename to Spigot-Server-Patches/0470-Port-20w15a-Villager-AI-optimizations-DROP-1.16.patch
index 2d44e51eb9..a03bc8c85d 100644
--- a/Spigot-Server-Patches/0469-Port-20w15a-Villager-AI-optimizations-DROP-1.16.patch
+++ b/Spigot-Server-Patches/0470-Port-20w15a-Villager-AI-optimizations-DROP-1.16.patch
@@ -1,11 +1,11 @@
-From 3d87dd6ae279f1ddb4681e2378b1df05acab9697 Mon Sep 17 00:00:00 2001
+From e0154474288454c9edee7131fe44a3114600858f Mon Sep 17 00:00:00 2001
 From: Callahan <mr.callahhh@gmail.com>
 Date: Wed, 8 Apr 2020 18:00:17 -0500
 Subject: [PATCH] Port 20w15a Villager AI optimizations - DROP 1.16
 
 
 diff --git a/src/main/java/net/minecraft/server/BehaviorController.java b/src/main/java/net/minecraft/server/BehaviorController.java
-index 7c6e687707..396b64ea0f 100644
+index 7c6e687707c..396b64ea0fc 100644
 --- a/src/main/java/net/minecraft/server/BehaviorController.java
 +++ b/src/main/java/net/minecraft/server/BehaviorController.java
 @@ -38,30 +38,22 @@ public class BehaviorController<E extends EntityLiving> implements MinecraftSeri
@@ -194,5 +194,5 @@ index 7c6e687707..396b64ea0f 100644
  
      private boolean a(Object object) {
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0470-Reduce-Either-Optional-allocation.patch b/Spigot-Server-Patches/0471-Reduce-Either-Optional-allocation.patch
similarity index 94%
rename from Spigot-Server-Patches/0470-Reduce-Either-Optional-allocation.patch
rename to Spigot-Server-Patches/0471-Reduce-Either-Optional-allocation.patch
index c410c9719b..6b4071e026 100644
--- a/Spigot-Server-Patches/0470-Reduce-Either-Optional-allocation.patch
+++ b/Spigot-Server-Patches/0471-Reduce-Either-Optional-allocation.patch
@@ -1,4 +1,4 @@
-From 7c0d5dcaea2050d0fc03f8c965ae6835e416d973 Mon Sep 17 00:00:00 2001
+From 663c7f09f1aa62d23a9cfad9826a93901969b489 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <spottedleaf@spottedleaf.dev>
 Date: Mon, 6 Apr 2020 18:35:09 -0700
 Subject: [PATCH] Reduce Either Optional allocation
@@ -7,7 +7,7 @@ In order to get chunk values, we shouldn't need to create
 an optional each time.
 
 diff --git a/src/main/java/com/mojang/datafixers/util/Either.java b/src/main/java/com/mojang/datafixers/util/Either.java
-index a90adac7bd..3f65fe7102 100644
+index a90adac7bd7..3f65fe71024 100644
 --- a/src/main/java/com/mojang/datafixers/util/Either.java
 +++ b/src/main/java/com/mojang/datafixers/util/Either.java
 @@ -22,7 +22,7 @@ public abstract class Either<L, R> implements App<Either.Mu<R>, L> {
@@ -47,5 +47,5 @@ index a90adac7bd..3f65fe7102 100644
  
          @Override
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0471-Remove-streams-from-PairedQueue.patch b/Spigot-Server-Patches/0472-Remove-streams-from-PairedQueue.patch
similarity index 96%
rename from Spigot-Server-Patches/0471-Remove-streams-from-PairedQueue.patch
rename to Spigot-Server-Patches/0472-Remove-streams-from-PairedQueue.patch
index 5a2520ee37..983baf6a8b 100644
--- a/Spigot-Server-Patches/0471-Remove-streams-from-PairedQueue.patch
+++ b/Spigot-Server-Patches/0472-Remove-streams-from-PairedQueue.patch
@@ -1,4 +1,4 @@
-From d81186e106a802c1faafc42ee24deee0160ac058 Mon Sep 17 00:00:00 2001
+From 5845b578162a1f609e1e6a9cc604f29fb0a17ddb Mon Sep 17 00:00:00 2001
 From: Spottedleaf <spottedleaf@spottedleaf.dev>
 Date: Mon, 6 Apr 2020 18:10:43 -0700
 Subject: [PATCH] Remove streams from PairedQueue
@@ -7,7 +7,7 @@ We shouldn't be doing stream calls just to see if the queue is
 empty. This creates loads of garbage thanks to how often it's called.
 
 diff --git a/src/main/java/net/minecraft/server/PairedQueue.java b/src/main/java/net/minecraft/server/PairedQueue.java
-index 85bb22e4b7..2369afb4f3 100644
+index 85bb22e4b73..2369afb4f37 100644
 --- a/src/main/java/net/minecraft/server/PairedQueue.java
 +++ b/src/main/java/net/minecraft/server/PairedQueue.java
 @@ -20,32 +20,30 @@ public interface PairedQueue<T, F> {
@@ -78,5 +78,5 @@ index 85bb22e4b7..2369afb4f3 100644
      }
  
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0472-Remove-streams-from-MinecraftKey.patch b/Spigot-Server-Patches/0473-Remove-streams-from-MinecraftKey.patch
similarity index 94%
rename from Spigot-Server-Patches/0472-Remove-streams-from-MinecraftKey.patch
rename to Spigot-Server-Patches/0473-Remove-streams-from-MinecraftKey.patch
index 86f2a4af93..51e4cb2b51 100644
--- a/Spigot-Server-Patches/0472-Remove-streams-from-MinecraftKey.patch
+++ b/Spigot-Server-Patches/0473-Remove-streams-from-MinecraftKey.patch
@@ -1,4 +1,4 @@
-From 88311757ba33ed1beed93ac2c08123490bc554f7 Mon Sep 17 00:00:00 2001
+From 7c90e9d5af0fd9d41e79510be2d7df5f2a9a9398 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <spottedleaf@spottedleaf.dev>
 Date: Mon, 6 Apr 2020 18:06:24 -0700
 Subject: [PATCH] Remove streams from MinecraftKey
@@ -6,7 +6,7 @@ Subject: [PATCH] Remove streams from MinecraftKey
 They produce a lot of garbage.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftKey.java b/src/main/java/net/minecraft/server/MinecraftKey.java
-index 2b271d3e50..b1beebf0ed 100644
+index 2b271d3e509..b1beebf0ed5 100644
 --- a/src/main/java/net/minecraft/server/MinecraftKey.java
 +++ b/src/main/java/net/minecraft/server/MinecraftKey.java
 @@ -125,15 +125,29 @@ public class MinecraftKey implements Comparable<MinecraftKey> {
@@ -46,5 +46,5 @@ index 2b271d3e50..b1beebf0ed 100644
  
      public static class a implements JsonDeserializer<MinecraftKey>, JsonSerializer<MinecraftKey> {
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0473-Reduce-memory-footprint-of-NBTTagCompound.patch b/Spigot-Server-Patches/0474-Reduce-memory-footprint-of-NBTTagCompound.patch
similarity index 95%
rename from Spigot-Server-Patches/0473-Reduce-memory-footprint-of-NBTTagCompound.patch
rename to Spigot-Server-Patches/0474-Reduce-memory-footprint-of-NBTTagCompound.patch
index d16a428f28..9b1b0ee480 100644
--- a/Spigot-Server-Patches/0473-Reduce-memory-footprint-of-NBTTagCompound.patch
+++ b/Spigot-Server-Patches/0474-Reduce-memory-footprint-of-NBTTagCompound.patch
@@ -1,4 +1,4 @@
-From 749d192499880dacf26a985d14e172a9c6f25078 Mon Sep 17 00:00:00 2001
+From e83faf8d07cdd383c05d13bcc5e125550528d0de Mon Sep 17 00:00:00 2001
 From: Spottedleaf <spottedleaf@spottedleaf.dev>
 Date: Mon, 6 Apr 2020 17:39:25 -0700
 Subject: [PATCH] Reduce memory footprint of NBTTagCompound
@@ -8,7 +8,7 @@ is important because we clone chunk data after reading it for safety.
 So, reduce the impact of the clone on GC.
 
 diff --git a/src/main/java/net/minecraft/server/NBTTagCompound.java b/src/main/java/net/minecraft/server/NBTTagCompound.java
-index 98deaba12c..02a2ed1baa 100644
+index 98deaba12ce..02a2ed1baa3 100644
 --- a/src/main/java/net/minecraft/server/NBTTagCompound.java
 +++ b/src/main/java/net/minecraft/server/NBTTagCompound.java
 @@ -31,7 +31,7 @@ public class NBTTagCompound implements NBTBase {
@@ -50,5 +50,5 @@ index 98deaba12c..02a2ed1baa 100644
  
      public boolean equals(Object object) {
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0474-Prevent-opening-inventories-when-frozen.patch b/Spigot-Server-Patches/0475-Prevent-opening-inventories-when-frozen.patch
similarity index 96%
rename from Spigot-Server-Patches/0474-Prevent-opening-inventories-when-frozen.patch
rename to Spigot-Server-Patches/0475-Prevent-opening-inventories-when-frozen.patch
index 55180b0163..c9076f8f3d 100644
--- a/Spigot-Server-Patches/0474-Prevent-opening-inventories-when-frozen.patch
+++ b/Spigot-Server-Patches/0475-Prevent-opening-inventories-when-frozen.patch
@@ -1,11 +1,11 @@
-From f0b7dac5f0f6ebce44688f3919eb5f727cc38b34 Mon Sep 17 00:00:00 2001
+From cee5ee79b0e47a740b0544e662839b17dd0b1009 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Mon, 13 Apr 2020 07:31:44 +0100
 Subject: [PATCH] Prevent opening inventories when frozen
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index d51af68a92..f453ccdb02 100644
+index d51af68a920..f453ccdb020 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -380,7 +380,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -36,7 +36,7 @@ index d51af68a92..f453ccdb02 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index a6d75c0e07..a5e9fc90ff 100644
+index a6d75c0e07a..a5e9fc90ffa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -350,7 +350,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@@ -58,5 +58,5 @@ index a6d75c0e07..a5e9fc90ff 100644
          player.activeContainer.addSlotListener(player);
      }
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0475-Optimise-ArraySetSorted-removeIf.patch b/Spigot-Server-Patches/0476-Optimise-ArraySetSorted-removeIf.patch
similarity index 95%
rename from Spigot-Server-Patches/0475-Optimise-ArraySetSorted-removeIf.patch
rename to Spigot-Server-Patches/0476-Optimise-ArraySetSorted-removeIf.patch
index 62080ce564..3119e77456 100644
--- a/Spigot-Server-Patches/0475-Optimise-ArraySetSorted-removeIf.patch
+++ b/Spigot-Server-Patches/0476-Optimise-ArraySetSorted-removeIf.patch
@@ -1,4 +1,4 @@
-From 97f1acf281aa18312031d809f24aac85bf6c2611 Mon Sep 17 00:00:00 2001
+From 81b188b50e526cb99c57f350c51457083dc56300 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Wed, 15 Apr 2020 18:23:28 -0700
 Subject: [PATCH] Optimise ArraySetSorted#removeIf
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimise ArraySetSorted#removeIf
 Remove iterator allocation and ensure the call is always O(n)
 
 diff --git a/src/main/java/net/minecraft/server/ArraySetSorted.java b/src/main/java/net/minecraft/server/ArraySetSorted.java
-index 85f799a713..7db6b5850b 100644
+index 85f799a713d..7db6b5850b9 100644
 --- a/src/main/java/net/minecraft/server/ArraySetSorted.java
 +++ b/src/main/java/net/minecraft/server/ArraySetSorted.java
 @@ -10,8 +10,8 @@ import java.util.NoSuchElementException;
@@ -64,5 +64,5 @@ index 85f799a713..7db6b5850b 100644
          return new ArraySetSorted<>(i, (Comparator)Comparator.naturalOrder()); // Paper - decompile fix
      }
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0476-Don-t-run-entity-collision-code-if-not-needed.patch b/Spigot-Server-Patches/0477-Don-t-run-entity-collision-code-if-not-needed.patch
similarity index 92%
rename from Spigot-Server-Patches/0476-Don-t-run-entity-collision-code-if-not-needed.patch
rename to Spigot-Server-Patches/0477-Don-t-run-entity-collision-code-if-not-needed.patch
index 73d68323cc..1b86136485 100644
--- a/Spigot-Server-Patches/0476-Don-t-run-entity-collision-code-if-not-needed.patch
+++ b/Spigot-Server-Patches/0477-Don-t-run-entity-collision-code-if-not-needed.patch
@@ -1,4 +1,4 @@
-From 042be6672a5aa3fb6d55fca93722548bae75da92 Mon Sep 17 00:00:00 2001
+From 33ba8aeb0d9111fc2a29d9d2ae89e1c69e586d46 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Wed, 15 Apr 2020 17:56:07 -0700
 Subject: [PATCH] Don't run entity collision code if not needed
@@ -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 253e35826f..2c81344a65 100644
+index 253e35826f6..2c81344a65b 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2666,10 +2666,16 @@ public abstract class EntityLiving extends Entity {
@@ -29,5 +29,5 @@ index 253e35826f..2c81344a65 100644
  
              if (i > 0 && list.size() > i - 1 && this.random.nextInt(4) == 0) {
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0477-Optimise-entity-hard-collision-checking.patch b/Spigot-Server-Patches/0478-Optimise-entity-hard-collision-checking.patch
similarity index 97%
rename from Spigot-Server-Patches/0477-Optimise-entity-hard-collision-checking.patch
rename to Spigot-Server-Patches/0478-Optimise-entity-hard-collision-checking.patch
index 4594bc156d..9cee974781 100644
--- a/Spigot-Server-Patches/0477-Optimise-entity-hard-collision-checking.patch
+++ b/Spigot-Server-Patches/0478-Optimise-entity-hard-collision-checking.patch
@@ -1,4 +1,4 @@
-From 4dcc309197466e350b831399ebdba433cfeaef13 Mon Sep 17 00:00:00 2001
+From 8ec1a7844e8695e13ee75b99bd67c2e759a2e20a Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Wed, 15 Apr 2020 18:08:53 -0700
 Subject: [PATCH] Optimise entity hard collision checking
@@ -11,7 +11,7 @@ Less crammed entities are likely to show significantly less benefit.
 Effectively, this patch optimises crammed entity situations.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 696634ebf5..00dd21205d 100644
+index 33456b0bb42..750fb07756f 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -90,6 +90,54 @@ public class Chunk implements IChunkAccess {
@@ -88,7 +88,7 @@ index 696634ebf5..00dd21205d 100644
          }
          if (entity instanceof EntityItem) {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 0dbe2dce11..324fd07bce 100644
+index 0dbe2dce111..324fd07bcee 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -210,6 +210,40 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -133,7 +133,7 @@ index 0dbe2dce11..324fd07bce 100644
          this.id = Entity.entityCount.incrementAndGet();
          this.passengers = Lists.newArrayList();
 diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index 5bf99e0028..aecdaacfc7 100644
+index 5bf99e0028b..aecdaacfc7d 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
 @@ -847,6 +847,7 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
@@ -145,7 +145,7 @@ index 5bf99e0028..aecdaacfc7 100644
          return this.children;
      }
 diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java
-index 4157e50e4d..5135308fb6 100644
+index 4157e50e4d9..5135308fb61 100644
 --- a/src/main/java/net/minecraft/server/IEntityAccess.java
 +++ b/src/main/java/net/minecraft/server/IEntityAccess.java
 @@ -42,17 +42,26 @@ public interface IEntityAccess {
@@ -178,7 +178,7 @@ index 4157e50e4d..5135308fb6 100644
  
              return stream.filter(axisalignedbb1::c).map(VoxelShapes::a);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index c8619af2cf..899c535c40 100644
+index c8619af2cf4..899c535c405 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1178,6 +1178,32 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -215,5 +215,5 @@ index c8619af2cf..899c535c40 100644
      public List<Entity> getEntities(@Nullable Entity entity, AxisAlignedBB axisalignedbb, @Nullable Predicate<? super Entity> predicate) {
          this.getMethodProfiler().c("getEntities");
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0478-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch b/Spigot-Server-Patches/0479-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch
similarity index 96%
rename from Spigot-Server-Patches/0478-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch
rename to Spigot-Server-Patches/0479-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch
index 8bafde4627..4fb37383b1 100644
--- a/Spigot-Server-Patches/0478-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch
+++ b/Spigot-Server-Patches/0479-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch
@@ -1,4 +1,4 @@
-From 253be66625c8d5ead5169a7dd27d192c66ed8993 Mon Sep 17 00:00:00 2001
+From 82740c949a5a4f0526af2531218b2bee7acf5725 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Thu, 16 Apr 2020 16:13:59 -0700
 Subject: [PATCH] Optimize ChunkProviderServer's chunk level checking helper
@@ -9,7 +9,7 @@ so inline where possible, and avoid the abstraction of the
 Either class.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 746b5b5589..c2e4e4f6f1 100644
+index 746b5b55896..c2e4e4f6f18 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -615,27 +615,37 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -61,5 +61,5 @@ index 746b5b5589..c2e4e4f6f1 100644
  
      private boolean a(long i, Function<PlayerChunk, CompletableFuture<Either<Chunk, PlayerChunk.Failure>>> function) {
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0479-Restrict-vanilla-teleport-command-to-valid-locations.patch b/Spigot-Server-Patches/0480-Restrict-vanilla-teleport-command-to-valid-locations.patch
similarity index 92%
rename from Spigot-Server-Patches/0479-Restrict-vanilla-teleport-command-to-valid-locations.patch
rename to Spigot-Server-Patches/0480-Restrict-vanilla-teleport-command-to-valid-locations.patch
index 2673ca3a58..9b415e04c3 100644
--- a/Spigot-Server-Patches/0479-Restrict-vanilla-teleport-command-to-valid-locations.patch
+++ b/Spigot-Server-Patches/0480-Restrict-vanilla-teleport-command-to-valid-locations.patch
@@ -1,4 +1,4 @@
-From a8a2c0877959a563ba354a1d238b9bbea01224ac Mon Sep 17 00:00:00 2001
+From ee64b1f98b2e1a48027cfd90612cdd63cf415db7 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Thu, 16 Apr 2020 20:07:29 -0500
 Subject: [PATCH] Restrict vanilla teleport command to valid locations
@@ -6,7 +6,7 @@ Subject: [PATCH] Restrict vanilla teleport command to valid locations
 Fixes GH-3165
 
 diff --git a/src/main/java/net/minecraft/server/CommandTeleport.java b/src/main/java/net/minecraft/server/CommandTeleport.java
-index 3060b4f68b..79016b5870 100644
+index 3060b4f68b1..79016b58707 100644
 --- a/src/main/java/net/minecraft/server/CommandTeleport.java
 +++ b/src/main/java/net/minecraft/server/CommandTeleport.java
 @@ -116,6 +116,12 @@ public class CommandTeleport {
@@ -23,5 +23,5 @@ index 3060b4f68b..79016b5870 100644
              ChunkCoordIntPair chunkcoordintpair = new ChunkCoordIntPair(new BlockPosition(d0, d1, d2));
  
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0480-Implement-Player-Client-Options-API.patch b/Spigot-Server-Patches/0481-Implement-Player-Client-Options-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0480-Implement-Player-Client-Options-API.patch
rename to Spigot-Server-Patches/0481-Implement-Player-Client-Options-API.patch
index 0767080e03..0a34b1c7e9 100644
--- a/Spigot-Server-Patches/0480-Implement-Player-Client-Options-API.patch
+++ b/Spigot-Server-Patches/0481-Implement-Player-Client-Options-API.patch
@@ -1,4 +1,4 @@
-From 3cb8049368979b5cc7f3f9c24f323333161a10d3 Mon Sep 17 00:00:00 2001
+From 8ddf7e68d9df72179c159d8d4db16b01dbe787ae Mon Sep 17 00:00:00 2001
 From: MiniDigger <admin@minidigger.me>
 Date: Mon, 20 Jan 2020 21:38:15 +0100
 Subject: [PATCH] Implement Player Client Options API
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement Player Client Options API
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperSkinParts.java b/src/main/java/com/destroystokyo/paper/PaperSkinParts.java
 new file mode 100644
-index 0000000000..b6f4400df3
+index 00000000000..b6f4400df3d
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/PaperSkinParts.java
 @@ -0,0 +1,74 @@
@@ -85,7 +85,7 @@ index 0000000000..b6f4400df3
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index c4d4334305..7df24be46e 100644
+index c4d43343050..7df24be46e4 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -35,7 +35,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -98,7 +98,7 @@ index c4d4334305..7df24be46e 100644
      protected static final DataWatcherObject<NBTTagCompound> bs = DataWatcher.a(EntityHuman.class, DataWatcherRegistry.p);
      protected static final DataWatcherObject<NBTTagCompound> bt = DataWatcher.a(EntityHuman.class, DataWatcherRegistry.p);
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index f453ccdb02..bf2ba0548d 100644
+index f453ccdb020..bf2ba0548d9 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -2,6 +2,7 @@ package net.minecraft.server;
@@ -127,7 +127,7 @@ index f453ccdb02..bf2ba0548d 100644
          if (getMainHand() != packetplayinsettings.getMainHand()) {
              PlayerChangedMainHandEvent event = new PlayerChangedMainHandEvent(getBukkitEntity(), getMainHand() == EnumMainHand.LEFT ? MainHand.LEFT : MainHand.RIGHT);
 diff --git a/src/main/java/net/minecraft/server/PacketPlayInSettings.java b/src/main/java/net/minecraft/server/PacketPlayInSettings.java
-index 8faebf9efe..4da6371381 100644
+index 8faebf9efed..4da63713819 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayInSettings.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayInSettings.java
 @@ -37,18 +37,22 @@ public class PacketPlayInSettings implements Packet<PacketListenerPlayIn> {
@@ -154,7 +154,7 @@ index 8faebf9efe..4da6371381 100644
          return this.e;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 6672feaf51..dcbda5b35a 100644
+index 6672feaf519..dcbda5b35ab 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1,5 +1,8 @@
@@ -200,5 +200,5 @@ index 6672feaf51..dcbda5b35a 100644
  
      // Spigot start
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0481-Fix-Chunk-Post-Processing-deadlock-risk.patch b/Spigot-Server-Patches/0482-Fix-Chunk-Post-Processing-deadlock-risk.patch
similarity index 95%
rename from Spigot-Server-Patches/0481-Fix-Chunk-Post-Processing-deadlock-risk.patch
rename to Spigot-Server-Patches/0482-Fix-Chunk-Post-Processing-deadlock-risk.patch
index 73cb1b67f3..b5d3e8f779 100644
--- a/Spigot-Server-Patches/0481-Fix-Chunk-Post-Processing-deadlock-risk.patch
+++ b/Spigot-Server-Patches/0482-Fix-Chunk-Post-Processing-deadlock-risk.patch
@@ -1,4 +1,4 @@
-From 9ce6c35e1a6618d71f84e3d9cea6cda01bbd4047 Mon Sep 17 00:00:00 2001
+From 9c7f676e711c7849276b215466709681ba69d5a5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 18 Apr 2020 04:36:11 -0400
 Subject: [PATCH] Fix Chunk Post Processing deadlock risk
@@ -25,7 +25,7 @@ This successfully fixed a reoccurring and highly reproduceable crash
 for heightmaps.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index c2e4e4f6f1..78a8a3cc68 100644
+index c2e4e4f6f18..78a8a3cc68f 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -1048,6 +1048,7 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -37,7 +37,7 @@ index c2e4e4f6f1..78a8a3cc68 100644
          }
          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 22550f74df..cc400a9a84 100644
+index 6c178492b75..79133dd40c4 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -108,6 +108,8 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -59,5 +59,5 @@ index 22550f74df..cc400a9a84 100644
  
          completablefuture1.thenAcceptAsync((either) -> {
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0482-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/Spigot-Server-Patches/0483-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
similarity index 89%
rename from Spigot-Server-Patches/0482-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
rename to Spigot-Server-Patches/0483-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
index 703266240a..42e464d554 100644
--- a/Spigot-Server-Patches/0482-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
+++ b/Spigot-Server-Patches/0483-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
@@ -1,4 +1,4 @@
-From 5332bdb3e363c520fd86a1c419d2ef4899661010 Mon Sep 17 00:00:00 2001
+From 170facae670205f822b89153dbe25d9c7eeb2c98 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 18 Apr 2020 15:59:41 -0400
 Subject: [PATCH] Don't crash if player is attempted to be removed from
@@ -7,7 +7,7 @@ Subject: [PATCH] Don't crash if player is attempted to be removed from
 I suspect it deals with teleporting as it uses players current x/y/z
 
 diff --git a/src/main/java/net/minecraft/server/ChunkMapDistance.java b/src/main/java/net/minecraft/server/ChunkMapDistance.java
-index 0244768f76..279c7a85fb 100644
+index 0244768f76d..279c7a85fb5 100644
 --- a/src/main/java/net/minecraft/server/ChunkMapDistance.java
 +++ b/src/main/java/net/minecraft/server/ChunkMapDistance.java
 @@ -226,6 +226,7 @@ public abstract class ChunkMapDistance {
@@ -19,5 +19,5 @@ index 0244768f76..279c7a85fb 100644
          objectset.remove(entityplayer);
          if (objectset.isEmpty()) {
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0483-Broadcast-join-message-to-console.patch b/Spigot-Server-Patches/0484-Broadcast-join-message-to-console.patch
similarity index 85%
rename from Spigot-Server-Patches/0483-Broadcast-join-message-to-console.patch
rename to Spigot-Server-Patches/0484-Broadcast-join-message-to-console.patch
index ed88e83522..37a9bb9caf 100644
--- a/Spigot-Server-Patches/0483-Broadcast-join-message-to-console.patch
+++ b/Spigot-Server-Patches/0484-Broadcast-join-message-to-console.patch
@@ -1,14 +1,14 @@
-From d71b04af8dd05225fb5703e590b000243f968900 Mon Sep 17 00:00:00 2001
+From 1343b255a498178e51b1e1b27912225821add7a1 Mon Sep 17 00:00:00 2001
 From: AvrooVulcan <avrovulcan.programming@gmail.com>
 Date: Fri, 17 Apr 2020 00:15:23 +0100
 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 160476fa29..7403be0b25 100644
+index 62891d2dc6f..e79a4d9ff80 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -186,9 +186,9 @@ public abstract class PlayerList {
+@@ -188,9 +188,9 @@ public abstract class PlayerList {
          joinMessage = playerJoinEvent.getJoinMessage();
  
          if (joinMessage != null && joinMessage.length() > 0) {
@@ -22,5 +22,5 @@ index 160476fa29..7403be0b25 100644
          // CraftBukkit end
  
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0484-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/Spigot-Server-Patches/0485-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
similarity index 92%
rename from Spigot-Server-Patches/0484-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
rename to Spigot-Server-Patches/0485-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
index 9e043471a4..9fda290f89 100644
--- a/Spigot-Server-Patches/0484-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
+++ b/Spigot-Server-Patches/0485-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
@@ -1,4 +1,4 @@
-From 59ffe8f9308d4fbaba074ad07266e65918676505 Mon Sep 17 00:00:00 2001
+From da179ba8446e2c3ca110f65ae52b418bd2874dac Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 19 Apr 2020 00:05:46 -0400
 Subject: [PATCH] Fix Longstanding Broken behavior of PlayerJoinEvent
@@ -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 bf2ba0548d..45df816980 100644
+index bf2ba0548d9..45df816980c 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -100,6 +100,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -40,7 +40,7 @@ index bf2ba0548d..45df816980 100644
      // CraftBukkit end
      public PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index cc400a9a84..a06c0327df 100644
+index 79133dd40c4..ea0086ceb64 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -1526,6 +1526,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -52,10 +52,10 @@ index cc400a9a84..a06c0327df 100644
          if (!(entity instanceof EntityComplexPart)) {
              if (!(entity instanceof EntityLightning)) {
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 7403be0b25..ec45c30dd3 100644
+index e79a4d9ff80..6a4e4f93eb3 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -175,6 +175,12 @@ public abstract class PlayerList {
+@@ -177,6 +177,12 @@ public abstract class PlayerList {
          this.j.put(entityplayer.getUniqueID(), entityplayer);
          // this.sendAll(new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.ADD_PLAYER, new EntityPlayer[]{entityplayer})); // CraftBukkit - replaced with loop below
  
@@ -68,7 +68,7 @@ index 7403be0b25..ec45c30dd3 100644
          // CraftBukkit start
          PlayerJoinEvent playerJoinEvent = new PlayerJoinEvent(cserver.getPlayer(entityplayer), joinMessage);
          cserver.getPluginManager().callEvent(playerJoinEvent);
-@@ -209,6 +215,8 @@ public abstract class PlayerList {
+@@ -211,6 +217,8 @@ public abstract class PlayerList {
              entityplayer.playerConnection.sendPacket(new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.ADD_PLAYER, new EntityPlayer[] { entityplayer1}));
          }
          entityplayer.sentListPacket = true;
@@ -77,7 +77,7 @@ index 7403be0b25..ec45c30dd3 100644
          // CraftBukkit end
  
          entityplayer.playerConnection.sendPacket(new PacketPlayOutEntityMetadata(entityplayer.getId(), entityplayer.datawatcher, true)); // CraftBukkit - BungeeCord#2321, send complete data to self on spawn
-@@ -234,6 +242,11 @@ public abstract class PlayerList {
+@@ -236,6 +244,11 @@ public abstract class PlayerList {
              playerconnection.sendPacket(new PacketPlayOutEntityEffect(entityplayer.getId(), mobeffect));
          }
  
@@ -89,7 +89,7 @@ index 7403be0b25..ec45c30dd3 100644
          if (nbttagcompound != null && nbttagcompound.hasKeyOfType("RootVehicle", 10)) {
              NBTTagCompound nbttagcompound1 = nbttagcompound.getCompound("RootVehicle");
              // CraftBukkit start
-@@ -275,6 +288,10 @@ public abstract class PlayerList {
+@@ -277,6 +290,10 @@ public abstract class PlayerList {
              }
          }
  
@@ -101,5 +101,5 @@ index 7403be0b25..ec45c30dd3 100644
          // Paper start - Add to collideRule team if needed
          final Scoreboard scoreboard = this.getServer().getWorldServer(DimensionManager.OVERWORLD).getScoreboard();
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0485-Load-Chunks-for-Login-Asynchronously.patch b/Spigot-Server-Patches/0486-Load-Chunks-for-Login-Asynchronously.patch
similarity index 95%
rename from Spigot-Server-Patches/0485-Load-Chunks-for-Login-Asynchronously.patch
rename to Spigot-Server-Patches/0486-Load-Chunks-for-Login-Asynchronously.patch
index d6fabc4f6c..0b73feeb40 100644
--- a/Spigot-Server-Patches/0485-Load-Chunks-for-Login-Asynchronously.patch
+++ b/Spigot-Server-Patches/0486-Load-Chunks-for-Login-Asynchronously.patch
@@ -1,11 +1,11 @@
-From 0cfef8cdd6a79282ce95c46ab2ae67b9df6227a7 Mon Sep 17 00:00:00 2001
+From 0a30b7a3e4a74081cc67dd17291ecfacee643fcb Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 19 Apr 2020 04:28:29 -0400
 Subject: [PATCH] Load Chunks for Login Asynchronously
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 324fd07bce..01330045c0 100644
+index 324fd07bcee..01330045c0f 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1382,7 +1382,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -18,7 +18,7 @@ index 324fd07bce..01330045c0 100644
  
      public void setPositionRotation(BlockPosition blockposition, float f, float f1) {
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 45df816980..48bbaec4b6 100644
+index 45df816980c..48bbaec4b64 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -43,6 +43,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -38,7 +38,7 @@ index 45df816980..48bbaec4b6 100644
      // CraftBukkit end
      public PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index f1222fcb2b..28f48f2252 100644
+index f1222fcb2bd..28f48f22522 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -66,7 +66,7 @@ public class LoginListener implements PacketLoginInListener {
@@ -60,7 +60,7 @@ index f1222fcb2b..28f48f2252 100644
              if (entityplayer != null) {
                  this.g = LoginListener.EnumProtocolState.DELAY_ACCEPT;
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 2e81f3a1d9..8800a8fcf9 100644
+index 2e81f3a1d93..8800a8fcf9a 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -69,6 +69,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -90,7 +90,7 @@ index 2e81f3a1d9..8800a8fcf9 100644
          this.player.lastX = this.player.locX();
          this.player.lastY = this.player.locY();
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index ec45c30dd3..edf9df8c8a 100644
+index 6a4e4f93eb3..61c7f5f9528 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -52,11 +52,12 @@ public abstract class PlayerList {
@@ -128,7 +128,7 @@ index ec45c30dd3..edf9df8c8a 100644
          if (nbttagcompound == null) entityplayer.moveToSpawn(worldserver); // Paper - only move to spawn on first login, otherwise, stay where you are....
          // CraftBukkit end
  
-@@ -158,6 +164,50 @@ public abstract class PlayerList {
+@@ -160,6 +166,50 @@ public abstract class PlayerList {
          entityplayer.B().a(entityplayer);
          this.sendScoreboard(worldserver.getScoreboard(), entityplayer);
          this.server.invalidatePingSample();
@@ -179,7 +179,7 @@ index ec45c30dd3..edf9df8c8a 100644
          ChatMessage chatmessage;
  
          if (entityplayer.getProfile().getName().equalsIgnoreCase(s)) {
-@@ -216,7 +266,6 @@ public abstract class PlayerList {
+@@ -218,7 +268,6 @@ public abstract class PlayerList {
          }
          entityplayer.sentListPacket = true;
          entityplayer.supressTrackerForLogin = false; // Paper
@@ -187,7 +187,7 @@ index ec45c30dd3..edf9df8c8a 100644
          // CraftBukkit end
  
          entityplayer.playerConnection.sendPacket(new PacketPlayOutEntityMetadata(entityplayer.getId(), entityplayer.datawatcher, true)); // CraftBukkit - BungeeCord#2321, send complete data to self on spawn
-@@ -243,6 +292,7 @@ public abstract class PlayerList {
+@@ -245,6 +294,7 @@ public abstract class PlayerList {
          }
  
          // Paper start - move vehicle into method so it can be called above - short circuit around that code
@@ -195,7 +195,7 @@ index ec45c30dd3..edf9df8c8a 100644
          onPlayerJoinFinish(entityplayer, worldserver, s1);
      }
      private void mountSavedVehicle(EntityPlayer entityplayer, WorldServer worldserver, NBTTagCompound nbttagcompound) {
-@@ -388,6 +438,7 @@ public abstract class PlayerList {
+@@ -390,6 +440,7 @@ public abstract class PlayerList {
  
      protected void savePlayerFile(EntityPlayer entityplayer) {
          if (!entityplayer.getBukkitEntity().isPersistent()) return; // CraftBukkit
@@ -203,7 +203,7 @@ index ec45c30dd3..edf9df8c8a 100644
          this.playerFileData.save(entityplayer);
          ServerStatisticManager serverstatisticmanager = (ServerStatisticManager) entityplayer.getStatisticManager(); // CraftBukkit
  
-@@ -412,7 +463,7 @@ public abstract class PlayerList {
+@@ -414,7 +465,7 @@ public abstract class PlayerList {
          org.bukkit.craftbukkit.event.CraftEventFactory.handleInventoryCloseEvent(entityplayer, org.bukkit.event.inventory.InventoryCloseEvent.Reason.DISCONNECT); // Paper
  
          PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(cserver.getPlayer(entityplayer), "\u00A7e" + entityplayer.getName() + " left the game");
@@ -212,7 +212,7 @@ index ec45c30dd3..edf9df8c8a 100644
          entityplayer.getBukkitEntity().disconnect(playerQuitEvent.getQuitMessage());
  
          if (server.isMainThread()) entityplayer.playerTick();// SPIGOT-924 // Paper - don't tick during emergency shutdowns (Watchdog)
-@@ -464,6 +515,13 @@ public abstract class PlayerList {
+@@ -466,6 +517,13 @@ public abstract class PlayerList {
              // this.p.remove(uuid);
              // CraftBukkit end
          }
@@ -226,7 +226,7 @@ index ec45c30dd3..edf9df8c8a 100644
  
          // CraftBukkit start
          //  this.sendAll(new PacketPlayOutPlayerInfo(EnumPlayerInfoAction.REMOVE_PLAYER, new EntityPlayer[]{entityplayer}));
-@@ -481,7 +539,7 @@ public abstract class PlayerList {
+@@ -483,7 +541,7 @@ public abstract class PlayerList {
          cserver.getScoreboardManager().removePlayer(entityplayer.getBukkitEntity());
          // CraftBukkit end
  
@@ -235,7 +235,7 @@ index ec45c30dd3..edf9df8c8a 100644
      }
  
      // CraftBukkit start - Whole method, SocketAddress to LoginListener, added hostname to signature, return EntityPlayer
-@@ -500,6 +558,13 @@ public abstract class PlayerList {
+@@ -502,6 +560,13 @@ public abstract class PlayerList {
                  list.add(entityplayer);
              }
          }
@@ -250,5 +250,5 @@ index ec45c30dd3..edf9df8c8a 100644
          Iterator iterator = list.iterator();
  
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0486-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/Spigot-Server-Patches/0487-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
similarity index 92%
rename from Spigot-Server-Patches/0486-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
rename to Spigot-Server-Patches/0487-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
index c31661cc4b..a8b9f46152 100644
--- a/Spigot-Server-Patches/0486-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
+++ b/Spigot-Server-Patches/0487-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
@@ -1,4 +1,4 @@
-From 9ac930771782d9f29527f7361b0435f5e357d2c6 Mon Sep 17 00:00:00 2001
+From c1c61c4f63743bd676ae7e63c4f1cc6e69c2d3f3 Mon Sep 17 00:00:00 2001
 From: 2277 <38501234+2277@users.noreply.github.com>
 Date: Tue, 31 Mar 2020 10:33:55 +0100
 Subject: [PATCH] Move player to spawn point if spawn in unloaded world
@@ -7,7 +7,7 @@ The code following this has better support for null worlds to move
 them back to the world spawn.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 01330045c0..9bb5a4bcf1 100644
+index 01330045c0f..9bb5a4bcf1e 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1790,9 +1790,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -26,5 +26,5 @@ index 01330045c0..9bb5a4bcf1 100644
                  spawnIn(bworld == null ? null : ((CraftWorld) bworld).getHandle());
              }
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0487-Allow-sleeping-players-to-float.patch b/Spigot-Server-Patches/0488-Allow-sleeping-players-to-float.patch
similarity index 92%
rename from Spigot-Server-Patches/0487-Allow-sleeping-players-to-float.patch
rename to Spigot-Server-Patches/0488-Allow-sleeping-players-to-float.patch
index 8d99b14435..50cc57ec7a 100644
--- a/Spigot-Server-Patches/0487-Allow-sleeping-players-to-float.patch
+++ b/Spigot-Server-Patches/0488-Allow-sleeping-players-to-float.patch
@@ -1,4 +1,4 @@
-From 73cbe81da65fdec0d5e4042fa4994837e41944a6 Mon Sep 17 00:00:00 2001
+From 3d403a23b0618443127a7abdac3576198a03a86b Mon Sep 17 00:00:00 2001
 From: Mariell Hoversholm <proximyst@proximyst.com>
 Date: Sun, 19 Apr 2020 12:25:20 +0200
 Subject: [PATCH] Allow sleeping players to float
@@ -9,7 +9,7 @@ their position to the ground/exit location when entering the bed, resulting in
 the server believing they're still in the air.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 8800a8fcf9..38ec22f4c0 100644
+index 8800a8fcf9a..38ec22f4c03 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -162,7 +162,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -22,5 +22,5 @@ index 8800a8fcf9..38ec22f4c0 100644
                  PlayerConnection.LOGGER.warn("{} was kicked for floating too long!", this.player.getDisplayName().getString());
                  this.disconnect(com.destroystokyo.paper.PaperConfig.flyingKickPlayerMessage); // Paper - use configurable kick message
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0488-Add-PlayerAttackEntityCooldownResetEvent.patch b/Spigot-Server-Patches/0489-Add-PlayerAttackEntityCooldownResetEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0488-Add-PlayerAttackEntityCooldownResetEvent.patch
rename to Spigot-Server-Patches/0489-Add-PlayerAttackEntityCooldownResetEvent.patch
index 96f0247058..c9b3d55a4f 100644
--- a/Spigot-Server-Patches/0488-Add-PlayerAttackEntityCooldownResetEvent.patch
+++ b/Spigot-Server-Patches/0489-Add-PlayerAttackEntityCooldownResetEvent.patch
@@ -1,11 +1,11 @@
-From 152b6fbacb2b2f599adc5815981e17db8fc97515 Mon Sep 17 00:00:00 2001
+From c72ed431f4cc362c8e828c425d88ce21c0190040 Mon Sep 17 00:00:00 2001
 From: nossr50 <nossr50@gmail.com>
 Date: Thu, 26 Mar 2020 19:44:50 -0700
 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 2c81344a65..3fc2360a10 100644
+index 2c81344a65b..3fc2360a103 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1690,7 +1690,17 @@ public abstract class EntityLiving extends Entity {
@@ -28,5 +28,5 @@ index 2c81344a65..3fc2360a10 100644
              if (event.isCancelled()) {
                  return false;
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0489-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch b/Spigot-Server-Patches/0490-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
similarity index 95%
rename from Spigot-Server-Patches/0489-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
rename to Spigot-Server-Patches/0490-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
index 3da86e08f7..2bc9a71166 100644
--- a/Spigot-Server-Patches/0489-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
+++ b/Spigot-Server-Patches/0490-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
@@ -1,4 +1,4 @@
-From eb89bb7522116612e4286157a0b9993d0cf9dbba Mon Sep 17 00:00:00 2001
+From c3224481d028cf472836c79ccfcba95e70979901 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 21 Apr 2020 03:51:53 -0400
 Subject: [PATCH] Allow multiple callbacks to schedule for Callback Executor
@@ -14,7 +14,7 @@ Use an ArrayDeque to store this Queue
 We make sure to also implement a pattern that is recursion safe too.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index a06c0327df..e08a3bd96c 100644
+index ea0086ceb64..bdf835397aa 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -87,24 +87,32 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -57,5 +57,5 @@ index a06c0327df..e08a3bd96c 100644
      // CraftBukkit end
  
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0490-Don-t-fire-BlockFade-on-worldgen-threads.patch b/Spigot-Server-Patches/0491-Don-t-fire-BlockFade-on-worldgen-threads.patch
similarity index 91%
rename from Spigot-Server-Patches/0490-Don-t-fire-BlockFade-on-worldgen-threads.patch
rename to Spigot-Server-Patches/0491-Don-t-fire-BlockFade-on-worldgen-threads.patch
index 96b67d93e1..2b99f05aa9 100644
--- a/Spigot-Server-Patches/0490-Don-t-fire-BlockFade-on-worldgen-threads.patch
+++ b/Spigot-Server-Patches/0491-Don-t-fire-BlockFade-on-worldgen-threads.patch
@@ -1,4 +1,4 @@
-From 6d05ae8a7ec0b849d7922f0912f1fedb05dbf993 Mon Sep 17 00:00:00 2001
+From fd9f5cd3a9853bba484a9ed61c5cf013ba2c285b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 23 Apr 2020 01:36:39 -0400
 Subject: [PATCH] Don't fire BlockFade on worldgen threads
@@ -6,7 +6,7 @@ Subject: [PATCH] Don't fire BlockFade on worldgen threads
 Caused a deadlock
 
 diff --git a/src/main/java/net/minecraft/server/BlockFire.java b/src/main/java/net/minecraft/server/BlockFire.java
-index b41de95a63..9e501514f3 100644
+index b41de95a639..9e501514f30 100644
 --- a/src/main/java/net/minecraft/server/BlockFire.java
 +++ b/src/main/java/net/minecraft/server/BlockFire.java
 @@ -44,6 +44,7 @@ public class BlockFire extends Block {
@@ -18,5 +18,5 @@ index b41de95a63..9e501514f3 100644
              CraftBlockState blockState = CraftBlockState.getBlockState(generatoraccess, blockposition);
              blockState.setData(Blocks.AIR.getBlockData());
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0491-Add-phantom-creative-and-insomniac-controls.patch b/Spigot-Server-Patches/0492-Add-phantom-creative-and-insomniac-controls.patch
similarity index 98%
rename from Spigot-Server-Patches/0491-Add-phantom-creative-and-insomniac-controls.patch
rename to Spigot-Server-Patches/0492-Add-phantom-creative-and-insomniac-controls.patch
index 3e7c99de80..2693b61418 100644
--- a/Spigot-Server-Patches/0491-Add-phantom-creative-and-insomniac-controls.patch
+++ b/Spigot-Server-Patches/0492-Add-phantom-creative-and-insomniac-controls.patch
@@ -1,4 +1,4 @@
-From 677c2d8b9fdcace682753b32175bbc16a3df9c59 Mon Sep 17 00:00:00 2001
+From 8a5d889963cb87f6facff13cc846278ded17aeaa Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 25 Apr 2020 15:13:41 -0500
 Subject: [PATCH] Add phantom creative and insomniac controls
diff --git a/Spigot-Server-Patches/0492-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/Spigot-Server-Patches/0493-Fix-numerous-item-duplication-issues-and-teleport-is.patch
similarity index 96%
rename from Spigot-Server-Patches/0492-Fix-numerous-item-duplication-issues-and-teleport-is.patch
rename to Spigot-Server-Patches/0493-Fix-numerous-item-duplication-issues-and-teleport-is.patch
index 1379dd5c72..f8c40a895e 100644
--- a/Spigot-Server-Patches/0492-Fix-numerous-item-duplication-issues-and-teleport-is.patch
+++ b/Spigot-Server-Patches/0493-Fix-numerous-item-duplication-issues-and-teleport-is.patch
@@ -1,4 +1,4 @@
-From a3d9cf01c0faa21381f3f2d1ec6b27395be1eec4 Mon Sep 17 00:00:00 2001
+From c8d61cc54c9cf1c1cca1e6f6d615b0218e6fbdb7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 25 Apr 2020 06:46:35 -0400
 Subject: [PATCH] Fix numerous item duplication issues and teleport issues
@@ -16,7 +16,7 @@ So even if something NEW comes up, it would be impossible to drop the
 same item twice because the source was destroyed.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 9bb5a4bcf1..14ba037c1d 100644
+index 9bb5a4bcf1e..14ba037c1dc 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1966,11 +1966,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -57,7 +57,7 @@ index 9bb5a4bcf1..14ba037c1d 100644
  
      public float a(Explosion explosion, IBlockAccess iblockaccess, BlockPosition blockposition, IBlockData iblockdata, Fluid fluid, float f) {
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 8ad131e4fc..d35a0b2d94 100644
+index 8ad131e4fc2..d35a0b2d94e 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -557,7 +557,7 @@ public class EntityArmorStand extends EntityLiving {
@@ -79,7 +79,7 @@ index 8ad131e4fc..d35a0b2d94 100644
              }
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index c3f7e46121..73b271f6f3 100644
+index c3f7e461210..73b271f6f3e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -776,7 +776,8 @@ public class CraftEventFactory {
@@ -93,5 +93,5 @@ index c3f7e46121..73b271f6f3 100644
  
          return event;
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0493-Implement-Brigadier-Mojang-API.patch b/Spigot-Server-Patches/0494-Implement-Brigadier-Mojang-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0493-Implement-Brigadier-Mojang-API.patch
rename to Spigot-Server-Patches/0494-Implement-Brigadier-Mojang-API.patch
index d0edbe2b53..4468ca8843 100644
--- a/Spigot-Server-Patches/0493-Implement-Brigadier-Mojang-API.patch
+++ b/Spigot-Server-Patches/0494-Implement-Brigadier-Mojang-API.patch
@@ -1,4 +1,4 @@
-From 235f4bba895f9ea8992b76a696eef67ca3595425 Mon Sep 17 00:00:00 2001
+From e8941f176a44632fda8e8008fdc4df681d5ad10c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 19 Apr 2020 18:15:29 -0400
 Subject: [PATCH] Implement Brigadier Mojang API
@@ -10,7 +10,7 @@ Adds CommandRegisteredEvent
   - Allows manipulating the CommandNode to add more children/metadata for the client
 
 diff --git a/src/main/java/net/minecraft/server/CommandDispatcher.java b/src/main/java/net/minecraft/server/CommandDispatcher.java
-index 2414b0a552..2d512aa4f9 100644
+index 2414b0a552e..2d512aa4f9a 100644
 --- a/src/main/java/net/minecraft/server/CommandDispatcher.java
 +++ b/src/main/java/net/minecraft/server/CommandDispatcher.java
 @@ -267,6 +267,7 @@ public class CommandDispatcher {
@@ -30,7 +30,7 @@ index 2414b0a552..2d512aa4f9 100644
          event.getPlayer().getServer().getPluginManager().callEvent(event);
  
 diff --git a/src/main/java/net/minecraft/server/CommandListenerWrapper.java b/src/main/java/net/minecraft/server/CommandListenerWrapper.java
-index 0b23a0548d..c988c929f1 100644
+index 0b23a0548d5..c988c929f10 100644
 --- a/src/main/java/net/minecraft/server/CommandListenerWrapper.java
 +++ b/src/main/java/net/minecraft/server/CommandListenerWrapper.java
 @@ -15,7 +15,7 @@ import java.util.function.BinaryOperator;
@@ -69,7 +69,7 @@ index 0b23a0548d..c988c929f1 100644
      public boolean hasPermission(int i) {
          // CraftBukkit start
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 38ec22f4c0..a180df220e 100644
+index 38ec22f4c03..a180df220e4 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -576,8 +576,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -101,7 +101,7 @@ index 38ec22f4c0..a180df220e 100644
          // Paper end - async tab completion
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/BukkitCommandWrapper.java b/src/main/java/org/bukkit/craftbukkit/command/BukkitCommandWrapper.java
-index 5f33c9e52a..e16ecdea7d 100644
+index 5f33c9e52ac..e16ecdea7d2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/command/BukkitCommandWrapper.java
 +++ b/src/main/java/org/bukkit/craftbukkit/command/BukkitCommandWrapper.java
 @@ -17,7 +17,7 @@ import net.minecraft.server.CommandListenerWrapper;
@@ -138,5 +138,5 @@ index 5f33c9e52a..e16ecdea7d 100644
  
      @Override
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0494-Villager-Restocks-API.patch b/Spigot-Server-Patches/0495-Villager-Restocks-API.patch
similarity index 92%
rename from Spigot-Server-Patches/0494-Villager-Restocks-API.patch
rename to Spigot-Server-Patches/0495-Villager-Restocks-API.patch
index 368e744503..9955611524 100644
--- a/Spigot-Server-Patches/0494-Villager-Restocks-API.patch
+++ b/Spigot-Server-Patches/0495-Villager-Restocks-API.patch
@@ -1,11 +1,11 @@
-From 85dc598c049c292cae2909d518a0df13778ba64b Mon Sep 17 00:00:00 2001
+From 4a5f84073599f79c8a5031bd29dcb7334d414a7c Mon Sep 17 00:00:00 2001
 From: zbk <zbk@projectsolaris.net>
 Date: Sun, 26 Apr 2020 23:49:01 -0400
 Subject: [PATCH] Villager Restocks API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 6e0020ae0b..ef2ee68cd6 100644
+index 6e0020ae0b4..ef2ee68cd67 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -977,4 +977,13 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -23,7 +23,7 @@ index 6e0020ae0b..ef2ee68cd6 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
-index fe726e7884..a8384081c0 100644
+index fe726e7884c..a8384081c03 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
 @@ -82,6 +82,18 @@ public class CraftVillager extends CraftAbstractVillager implements Villager {
@@ -46,5 +46,5 @@ index fe726e7884..a8384081c0 100644
      public boolean sleep(Location location) {
          Preconditions.checkArgument(location != null, "Location cannot be null");
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0495-Validate-PickItem-Packet-and-kick-for-invalid.patch b/Spigot-Server-Patches/0496-Validate-PickItem-Packet-and-kick-for-invalid.patch
similarity index 94%
rename from Spigot-Server-Patches/0495-Validate-PickItem-Packet-and-kick-for-invalid.patch
rename to Spigot-Server-Patches/0496-Validate-PickItem-Packet-and-kick-for-invalid.patch
index 06ad006ee7..5e39baccb6 100644
--- a/Spigot-Server-Patches/0495-Validate-PickItem-Packet-and-kick-for-invalid.patch
+++ b/Spigot-Server-Patches/0496-Validate-PickItem-Packet-and-kick-for-invalid.patch
@@ -1,11 +1,11 @@
-From ff054938e2ca3779c9f1aed3717015c120dcdf5c Mon Sep 17 00:00:00 2001
+From cd53caeea290b688b6b402da58cbc0fca194af7d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 2 May 2020 03:09:46 -0400
 Subject: [PATCH] Validate PickItem Packet and kick for invalid
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index a180df220e..02bda8bee4 100644
+index a180df220e4..02bda8bee46 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -691,7 +691,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -25,5 +25,5 @@ index a180df220e..02bda8bee4 100644
          this.player.playerConnection.sendPacket(new PacketPlayOutSetSlot(-2, packetplayinpickitem.b(), this.player.inventory.getItem(packetplayinpickitem.b())));
          this.player.playerConnection.sendPacket(new PacketPlayOutHeldItemSlot(this.player.inventory.itemInHandIndex));
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0496-Expose-game-version.patch b/Spigot-Server-Patches/0497-Expose-game-version.patch
similarity index 87%
rename from Spigot-Server-Patches/0496-Expose-game-version.patch
rename to Spigot-Server-Patches/0497-Expose-game-version.patch
index 9f62ff8569..f7d910c653 100644
--- a/Spigot-Server-Patches/0496-Expose-game-version.patch
+++ b/Spigot-Server-Patches/0497-Expose-game-version.patch
@@ -1,11 +1,11 @@
-From 3eb7a15b09cbee5e58e2647927e24392ac898799 Mon Sep 17 00:00:00 2001
+From 22d0e4e2aded18b3561e3cda3e65d64a27ac17a5 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Fri, 1 May 2020 17:39:26 +0300
 Subject: [PATCH] Expose game version
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f49193d9d7..1647c09756 100644
+index f49193d9d7c..1647c09756e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -489,6 +489,13 @@ public final class CraftServer implements Server {
@@ -23,5 +23,5 @@ index f49193d9d7..1647c09756 100644
      public List<CraftPlayer> getOnlinePlayers() {
          return this.playerView;
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0497-Sync-position-on-teleportation.patch b/Spigot-Server-Patches/0498-Sync-position-on-teleportation.patch
similarity index 93%
rename from Spigot-Server-Patches/0497-Sync-position-on-teleportation.patch
rename to Spigot-Server-Patches/0498-Sync-position-on-teleportation.patch
index 7d7f6fc37a..d5dc090bfe 100644
--- a/Spigot-Server-Patches/0497-Sync-position-on-teleportation.patch
+++ b/Spigot-Server-Patches/0498-Sync-position-on-teleportation.patch
@@ -1,4 +1,4 @@
-From cd9083a28d860b7f0fa2d5b3cc59d88f45d474fc Mon Sep 17 00:00:00 2001
+From 3e7391730310c563d073be105c8370cd1be5ac12 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 3 May 2020 14:25:55 -0400
 Subject: [PATCH] Sync position on teleportation
@@ -13,7 +13,7 @@ it is triggering a massive movement velocity.
 This will ensure that the servers position is synchronized anytime player is teleported.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 02bda8bee4..a188d9f3b6 100644
+index 02bda8bee46..a188d9f3b60 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -500,6 +500,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -33,5 +33,5 @@ index 02bda8bee4..a188d9f3b6 100644
      }
  
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0498-Optimize-Voxel-Shape-Merging.patch b/Spigot-Server-Patches/0499-Optimize-Voxel-Shape-Merging.patch
similarity index 97%
rename from Spigot-Server-Patches/0498-Optimize-Voxel-Shape-Merging.patch
rename to Spigot-Server-Patches/0499-Optimize-Voxel-Shape-Merging.patch
index d089b76697..f791c9a57a 100644
--- a/Spigot-Server-Patches/0498-Optimize-Voxel-Shape-Merging.patch
+++ b/Spigot-Server-Patches/0499-Optimize-Voxel-Shape-Merging.patch
@@ -1,4 +1,4 @@
-From 7ca4e13c3ecf2b275f2b4fc7b399a65f26f506a6 Mon Sep 17 00:00:00 2001
+From c9336ba6dcc9a9573528c62c22be1ddd7f6e1d07 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 3 May 2020 22:35:09 -0400
 Subject: [PATCH] Optimize Voxel Shape Merging
@@ -30,7 +30,7 @@ Additionally, this lets us avoid even allocating new objects for this too, furth
 reducing memory usage.
 
 diff --git a/src/main/java/net/minecraft/server/VoxelShapeMergerList.java b/src/main/java/net/minecraft/server/VoxelShapeMergerList.java
-index 71d2ae2a9c..232b002377 100644
+index 71d2ae2a9c5..232b0023773 100644
 --- a/src/main/java/net/minecraft/server/VoxelShapeMergerList.java
 +++ b/src/main/java/net/minecraft/server/VoxelShapeMergerList.java
 @@ -6,10 +6,16 @@ import it.unimi.dsi.fastutil.ints.IntArrayList;
@@ -75,7 +75,7 @@ index 71d2ae2a9c..232b002377 100644
          this.b = new IntArrayList(i1);
          this.c = new IntArrayList(i1);
 diff --git a/src/main/java/net/minecraft/server/VoxelShapes.java b/src/main/java/net/minecraft/server/VoxelShapes.java
-index 08c83c62df..bb3a1a97df 100644
+index 08c83c62dfe..bb3a1a97df9 100644
 --- a/src/main/java/net/minecraft/server/VoxelShapes.java
 +++ b/src/main/java/net/minecraft/server/VoxelShapes.java
 @@ -316,9 +316,21 @@ public final class VoxelShapes {
@@ -126,5 +126,5 @@ index 08c83c62df..bb3a1a97df 100644
  
      public interface a {
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0499-Cleanup-Region-Files-Direct-Memory-on-close.patch b/Spigot-Server-Patches/0500-Cleanup-Region-Files-Direct-Memory-on-close.patch
similarity index 97%
rename from Spigot-Server-Patches/0499-Cleanup-Region-Files-Direct-Memory-on-close.patch
rename to Spigot-Server-Patches/0500-Cleanup-Region-Files-Direct-Memory-on-close.patch
index 5020ddb66e..af65db4354 100644
--- a/Spigot-Server-Patches/0499-Cleanup-Region-Files-Direct-Memory-on-close.patch
+++ b/Spigot-Server-Patches/0500-Cleanup-Region-Files-Direct-Memory-on-close.patch
@@ -1,4 +1,4 @@
-From d435cc4e885c3c821ef1a3f703e56729cd9e436f Mon Sep 17 00:00:00 2001
+From cee647e81a3c64791e2e231fbadf7b4da897b1c3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 4 May 2020 00:38:13 -0400
 Subject: [PATCH] Cleanup Region Files Direct Memory on close
@@ -10,7 +10,7 @@ Finalizers have no guarantee on when they will be ran, and since this is
 old generation memory, it might be a while before its called.
 
 diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
-index df728e2c0a..20927d55c6 100644
+index df728e2c0a2..20927d55c67 100644
 --- a/src/main/java/net/minecraft/server/RegionFile.java
 +++ b/src/main/java/net/minecraft/server/RegionFile.java
 @@ -30,7 +30,7 @@ public class RegionFile implements AutoCloseable {
@@ -83,5 +83,5 @@ index df728e2c0a..20927d55c6 100644
      private void c() throws IOException {
          int i = (int) this.dataFile.size();
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0500-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/Spigot-Server-Patches/0501-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
similarity index 92%
rename from Spigot-Server-Patches/0500-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
rename to Spigot-Server-Patches/0501-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
index b6dc79dc96..4fccea4404 100644
--- a/Spigot-Server-Patches/0500-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
+++ b/Spigot-Server-Patches/0501-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
@@ -1,4 +1,4 @@
-From 4f2c03a5f5be32ff4e04312b84d1db70efab691a Mon Sep 17 00:00:00 2001
+From 1a054b86819314f6e6aae65af695b3f048122466 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 4 May 2020 01:08:56 -0400
 Subject: [PATCH] Set cap on JDK per-thread native byte buffer cache
@@ -17,7 +17,7 @@ keeping long lived large direct buffers in cache.
 Set system properly at server startup if not set already to help protect from this.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 093dbeae27..93340e9470 100644
+index 093dbeae278..93340e9470b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -21,6 +21,7 @@ public class Main {
@@ -29,5 +29,5 @@ index 093dbeae27..93340e9470 100644
              {
                  acceptsAll(asList("?", "help"), "Show the help");
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0501-Implement-Mob-Goal-API.patch b/Spigot-Server-Patches/0502-Implement-Mob-Goal-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0501-Implement-Mob-Goal-API.patch
rename to Spigot-Server-Patches/0502-Implement-Mob-Goal-API.patch
index b33ff44496..0fe447744c 100644
--- a/Spigot-Server-Patches/0501-Implement-Mob-Goal-API.patch
+++ b/Spigot-Server-Patches/0502-Implement-Mob-Goal-API.patch
@@ -1,11 +1,11 @@
-From accf79a4f2b55be26ffbfa73370aab3a568aba7e Mon Sep 17 00:00:00 2001
+From fe881f4cdb74409b6af489ccebf374bee6c1e620 Mon Sep 17 00:00:00 2001
 From: MiniDigger <admin@minidigger.me>
 Date: Fri, 3 Jan 2020 16:26:19 +0100
 Subject: [PATCH] Implement Mob Goal API
 
 
 diff --git a/pom.xml b/pom.xml
-index bc8438ae1a..0c0051f7f2 100644
+index bc8438ae1ae..0c0051f7f2a 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -122,6 +122,13 @@
@@ -24,7 +24,7 @@ index bc8438ae1a..0c0051f7f2 100644
      <repositories>
 diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java
 new file mode 100644
-index 0000000000..d6ee941078
+index 00000000000..d6ee9410786
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java
 @@ -0,0 +1,329 @@
@@ -359,7 +359,7 @@ index 0000000000..d6ee941078
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/PaperCustomGoal.java b/src/main/java/com/destroystokyo/paper/entity/ai/PaperCustomGoal.java
 new file mode 100644
-index 0000000000..8e4dc2708d
+index 00000000000..8e4dc2708d7
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/entity/ai/PaperCustomGoal.java
 @@ -0,0 +1,52 @@
@@ -417,7 +417,7 @@ index 0000000000..8e4dc2708d
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/PaperMobGoals.java b/src/main/java/com/destroystokyo/paper/entity/ai/PaperMobGoals.java
 new file mode 100644
-index 0000000000..d9df0236e8
+index 00000000000..d9df0236e82
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/entity/ai/PaperMobGoals.java
 @@ -0,0 +1,236 @@
@@ -659,7 +659,7 @@ index 0000000000..d9df0236e8
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/PaperVanillaGoal.java b/src/main/java/com/destroystokyo/paper/entity/ai/PaperVanillaGoal.java
 new file mode 100644
-index 0000000000..263e8c65b9
+index 00000000000..263e8c65b9e
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/entity/ai/PaperVanillaGoal.java
 @@ -0,0 +1,63 @@
@@ -727,7 +727,7 @@ index 0000000000..263e8c65b9
 +    }
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/util/set/OptimizedSmallEnumSet.java b/src/main/java/com/destroystokyo/paper/util/set/OptimizedSmallEnumSet.java
-index 9df0006c1a..b3329c6fcd 100644
+index 9df0006c1a2..b3329c6fcd6 100644
 --- a/src/main/java/com/destroystokyo/paper/util/set/OptimizedSmallEnumSet.java
 +++ b/src/main/java/com/destroystokyo/paper/util/set/OptimizedSmallEnumSet.java
 @@ -64,4 +64,8 @@ public final class OptimizedSmallEnumSet<E extends Enum<E>> {
@@ -740,7 +740,7 @@ index 9df0006c1a..b3329c6fcd 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoal.java b/src/main/java/net/minecraft/server/PathfinderGoal.java
-index 93009d83f0..2dfbecf390 100644
+index 93009d83f07..2dfbecf3905 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoal.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoal.java
 @@ -10,9 +10,9 @@ public abstract class PathfinderGoal {
@@ -776,7 +776,7 @@ index 93009d83f0..2dfbecf390 100644
          this.goalTypes.clear();
          this.goalTypes.addAllUnchecked(enumset);
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
-index 84d2abbcb9..a68fc11ec6 100644
+index 84d2abbcb90..a68fc11ec66 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
 @@ -26,7 +26,7 @@ public class PathfinderGoalSelector {
@@ -815,7 +815,7 @@ index 84d2abbcb9..a68fc11ec6 100644
          return this.d.stream().filter(PathfinderGoalWrapped::g);
      }
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java b/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java
-index 1b800c558f..dee4e2beac 100644
+index 1b800c558f0..dee4e2beacb 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java
 @@ -5,8 +5,8 @@ import javax.annotation.Nullable;
@@ -830,7 +830,7 @@ index 1b800c558f..dee4e2beac 100644
  
      public PathfinderGoalWrapped(int i, PathfinderGoal pathfindergoal) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 1647c09756..b89f99a66f 100644
+index 1647c09756e..b89f99a66fe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2230,5 +2230,11 @@ public final class CraftServer implements Server {
@@ -847,7 +847,7 @@ index 1647c09756..b89f99a66f 100644
  }
 diff --git a/src/test/java/com/destroystokyo/paper/entity/ai/VanillaMobGoalTest.java b/src/test/java/com/destroystokyo/paper/entity/ai/VanillaMobGoalTest.java
 new file mode 100644
-index 0000000000..83d34761d9
+index 00000000000..83d34761d91
 --- /dev/null
 +++ b/src/test/java/com/destroystokyo/paper/entity/ai/VanillaMobGoalTest.java
 @@ -0,0 +1,92 @@
@@ -944,5 +944,5 @@ index 0000000000..83d34761d9
 +    }
 +}
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0502-Optimize-entity-list-iteration-requiring-entities-be.patch b/Spigot-Server-Patches/0503-Optimize-entity-list-iteration-requiring-entities-be.patch
similarity index 98%
rename from Spigot-Server-Patches/0502-Optimize-entity-list-iteration-requiring-entities-be.patch
rename to Spigot-Server-Patches/0503-Optimize-entity-list-iteration-requiring-entities-be.patch
index 3ce498f49d..b7bd73958a 100644
--- a/Spigot-Server-Patches/0502-Optimize-entity-list-iteration-requiring-entities-be.patch
+++ b/Spigot-Server-Patches/0503-Optimize-entity-list-iteration-requiring-entities-be.patch
@@ -1,4 +1,4 @@
-From d7c73b33312bee2b2fe27b6691ad4b5ccb20a383 Mon Sep 17 00:00:00 2001
+From f7902ec0612cd05ad9b4a86652810dd2f8449cb3 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Tue, 5 May 2020 19:49:23 -0700
 Subject: [PATCH] Optimize entity list iteration requiring entities be in
@@ -7,7 +7,7 @@ Subject: [PATCH] Optimize entity list iteration requiring entities be in
 We retain a list of loaded entities specifically for this usage
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 00dd21205d..53d3acccd3 100644
+index 750fb07756f..69bfece7d43 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -801,6 +801,7 @@ public class Chunk implements IChunkAccess {
@@ -27,7 +27,7 @@ index 00dd21205d..53d3acccd3 100644
      // CraftBukkit end
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index b3785775ec..d9b3aa285a 100644
+index b3785775ecd..d9b3aa285a7 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -189,6 +189,25 @@ public class WorldServer extends World {
@@ -104,7 +104,7 @@ index b3785775ec..d9b3aa285a 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index ac257d50de..995f706678 100644
+index ac257d50dea..995f706678f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1110,16 +1110,16 @@ public class CraftWorld implements World {
@@ -184,7 +184,7 @@ index ac257d50de..995f706678 100644
                          }
                          break;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index ff60568ce4..f377112161 100644
+index ff60568ce43..f3771121617 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -180,6 +180,18 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -207,5 +207,5 @@ index ff60568ce4..f377112161 100644
      public Chunk getChunk() {
          net.minecraft.server.Chunk currentChunk = entity.getCurrentChunk();
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0503-Use-distance-map-to-optimise-entity-tracker.patch b/Spigot-Server-Patches/0504-Use-distance-map-to-optimise-entity-tracker.patch
similarity index 98%
rename from Spigot-Server-Patches/0503-Use-distance-map-to-optimise-entity-tracker.patch
rename to Spigot-Server-Patches/0504-Use-distance-map-to-optimise-entity-tracker.patch
index ab3707e9db..d86af64d46 100644
--- a/Spigot-Server-Patches/0503-Use-distance-map-to-optimise-entity-tracker.patch
+++ b/Spigot-Server-Patches/0504-Use-distance-map-to-optimise-entity-tracker.patch
@@ -1,4 +1,4 @@
-From 4063516ae6d3b1b4608687075cb114252685c949 Mon Sep 17 00:00:00 2001
+From 6f44ef0cdfda2837e43c2a2cb02eb1677723b3bc Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Tue, 5 May 2020 20:18:05 -0700
 Subject: [PATCH] Use distance map to optimise entity tracker
@@ -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 14ba037c1d..8820e4b650 100644
+index 14ba037c1dc..8820e4b6506 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -244,6 +244,21 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -32,7 +32,7 @@ index 14ba037c1d..8820e4b650 100644
          this.id = Entity.entityCount.incrementAndGet();
          this.passengers = Lists.newArrayList();
 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index 3a88c9a670..6d3b34ead9 100644
+index 3a88c9a6706..6d3b34ead9c 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 @@ -70,6 +70,7 @@ public class EntityTrackerEntry {
@@ -44,7 +44,7 @@ index 3a88c9a670..6d3b34ead9 100644
          List<Entity> list = this.tracker.getPassengers();
  
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index e08a3bd96c..a780cf5b45 100644
+index bdf835397aa..d460bc62b8d 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -120,21 +120,51 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -328,7 +328,7 @@ index e08a3bd96c..a780cf5b45 100644
                  }
              }
 diff --git a/src/main/java/org/spigotmc/TrackingRange.java b/src/main/java/org/spigotmc/TrackingRange.java
-index 765bdaf9b5..43b5ed8e39 100644
+index 765bdaf9b52..43b5ed8e396 100644
 --- a/src/main/java/org/spigotmc/TrackingRange.java
 +++ b/src/main/java/org/spigotmc/TrackingRange.java
 @@ -49,4 +49,43 @@ public class TrackingRange
@@ -376,5 +376,5 @@ index 765bdaf9b5..43b5ed8e39 100644
 +    // Paper end - optimise entity tracking
  }
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0504-Optimize-isOutsideRange-to-use-distance-maps.patch b/Spigot-Server-Patches/0505-Optimize-isOutsideRange-to-use-distance-maps.patch
similarity index 98%
rename from Spigot-Server-Patches/0504-Optimize-isOutsideRange-to-use-distance-maps.patch
rename to Spigot-Server-Patches/0505-Optimize-isOutsideRange-to-use-distance-maps.patch
index cb3b070c9b..241681efef 100644
--- a/Spigot-Server-Patches/0504-Optimize-isOutsideRange-to-use-distance-maps.patch
+++ b/Spigot-Server-Patches/0505-Optimize-isOutsideRange-to-use-distance-maps.patch
@@ -1,4 +1,4 @@
-From daf950caa0ecae1e657c926b8bf694df778ae219 Mon Sep 17 00:00:00 2001
+From 54b10482abd4ba1b16555717aebc33275a22d962 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Tue, 5 May 2020 20:40:53 -0700
 Subject: [PATCH] Optimize isOutsideRange to use distance maps
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize isOutsideRange to use distance maps
 Use a distance map to find the players in range quickly
 
 diff --git a/src/main/java/net/minecraft/server/ChunkMapDistance.java b/src/main/java/net/minecraft/server/ChunkMapDistance.java
-index 279c7a85fb..7cd4e29123 100644
+index 279c7a85fb5..7cd4e291235 100644
 --- a/src/main/java/net/minecraft/server/ChunkMapDistance.java
 +++ b/src/main/java/net/minecraft/server/ChunkMapDistance.java
 @@ -31,7 +31,7 @@ public abstract class ChunkMapDistance {
@@ -77,7 +77,7 @@ index 279c7a85fb..7cd4e29123 100644
  
      public String c() {
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 78a8a3cc68..e2abda1bc3 100644
+index 78a8a3cc68f..e2abda1bc37 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -733,6 +733,36 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -148,7 +148,7 @@ index 78a8a3cc68..e2abda1bc3 100644
                              this.world.timings.mobSpawn.startTiming(); // Spigot
                              EnumCreatureType[] aenumcreaturetype1 = aenumcreaturetype;
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 48bbaec4b6..6e8179b465 100644
+index 48bbaec4b64..6e8179b4651 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -109,6 +109,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -161,7 +161,7 @@ index 48bbaec4b6..6e8179b465 100644
          super((World) worldserver, gameprofile);
          playerinteractmanager.player = this;
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index 568fbbd5f2..8742d13499 100644
+index 4b341c81fc9..bae9371a1e2 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
 @@ -148,6 +148,18 @@ public class PlayerChunk {
@@ -192,7 +192,7 @@ index 568fbbd5f2..8742d13499 100644
  
      // Paper start
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index a780cf5b45..099e612171 100644
+index d460bc62b8d..4317d9b98e4 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -130,6 +130,17 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -383,5 +383,5 @@ index a780cf5b45..099e612171 100644
      private boolean b(EntityPlayer entityplayer) {
          return entityplayer.isSpectator() && !this.world.getGameRules().getBoolean(GameRules.SPECTATORS_GENERATE_CHUNKS);
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0505-Stop-copy-on-write-operations-for-updating-light-dat.patch b/Spigot-Server-Patches/0506-Stop-copy-on-write-operations-for-updating-light-dat.patch
similarity index 98%
rename from Spigot-Server-Patches/0505-Stop-copy-on-write-operations-for-updating-light-dat.patch
rename to Spigot-Server-Patches/0506-Stop-copy-on-write-operations-for-updating-light-dat.patch
index 33af1075d3..7c95f2df9b 100644
--- a/Spigot-Server-Patches/0505-Stop-copy-on-write-operations-for-updating-light-dat.patch
+++ b/Spigot-Server-Patches/0506-Stop-copy-on-write-operations-for-updating-light-dat.patch
@@ -1,4 +1,4 @@
-From 4ba6af90544b8cf6d3da553a565e88c397dc8041 Mon Sep 17 00:00:00 2001
+From 0972401dfb337f0846bb7f6a9f88213be61be85a Mon Sep 17 00:00:00 2001
 From: Spottedleaf <spottedleaf@spottedleaf.dev>
 Date: Mon, 27 Apr 2020 04:05:38 -0700
 Subject: [PATCH] Stop copy-on-write operations for updating light data
@@ -6,7 +6,7 @@ Subject: [PATCH] Stop copy-on-write operations for updating light data
 Causes huge memory allocations + gc issues
 
 diff --git a/src/main/java/net/minecraft/server/LightEngineStorage.java b/src/main/java/net/minecraft/server/LightEngineStorage.java
-index a3f919816e..88277d23c3 100644
+index a3f919816eb..88277d23c36 100644
 --- a/src/main/java/net/minecraft/server/LightEngineStorage.java
 +++ b/src/main/java/net/minecraft/server/LightEngineStorage.java
 @@ -19,8 +19,8 @@ public abstract class LightEngineStorage<M extends LightEngineStorageArray<M>> e
@@ -63,7 +63,7 @@ index a3f919816e..88277d23c3 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/LightEngineStorageArray.java b/src/main/java/net/minecraft/server/LightEngineStorageArray.java
-index b978723a66..278aec8846 100644
+index b978723a66d..278aec8846d 100644
 --- a/src/main/java/net/minecraft/server/LightEngineStorageArray.java
 +++ b/src/main/java/net/minecraft/server/LightEngineStorageArray.java
 @@ -8,10 +8,17 @@ public abstract class LightEngineStorageArray<M extends LightEngineStorageArray<
@@ -129,7 +129,7 @@ index b978723a66..278aec8846 100644
  
      public void c() {
 diff --git a/src/main/java/net/minecraft/server/LightEngineStorageBlock.java b/src/main/java/net/minecraft/server/LightEngineStorageBlock.java
-index 0f7f4744d9..292d8c742d 100644
+index 0f7f4744d9f..292d8c742d3 100644
 --- a/src/main/java/net/minecraft/server/LightEngineStorageBlock.java
 +++ b/src/main/java/net/minecraft/server/LightEngineStorageBlock.java
 @@ -5,7 +5,7 @@ import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
@@ -159,7 +159,7 @@ index 0f7f4744d9..292d8c742d 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/LightEngineStorageSky.java b/src/main/java/net/minecraft/server/LightEngineStorageSky.java
-index 75d9065b32..06bc8371fe 100644
+index 75d9065b327..06bc8371fe9 100644
 --- a/src/main/java/net/minecraft/server/LightEngineStorageSky.java
 +++ b/src/main/java/net/minecraft/server/LightEngineStorageSky.java
 @@ -17,15 +17,16 @@ public class LightEngineStorageSky extends LightEngineStorage<LightEngineStorage
@@ -296,5 +296,5 @@ index 75d9065b32..06bc8371fe 100644
      }
  }
 -- 
-2.26.0
+2.26.2
 
diff --git a/Spigot-Server-Patches/0506-No-Tick-view-distance-implementation.patch b/Spigot-Server-Patches/0507-No-Tick-view-distance-implementation.patch
similarity index 99%
rename from Spigot-Server-Patches/0506-No-Tick-view-distance-implementation.patch
rename to Spigot-Server-Patches/0507-No-Tick-view-distance-implementation.patch
index 9be4b77564..cf46ffb8f5 100644
--- a/Spigot-Server-Patches/0506-No-Tick-view-distance-implementation.patch
+++ b/Spigot-Server-Patches/0507-No-Tick-view-distance-implementation.patch
@@ -1,4 +1,4 @@
-From bd2cf1b4ef75665ee95267f4e238ee92fb64dcb6 Mon Sep 17 00:00:00 2001
+From fae5620132fc31e4ed1f88b0c71f3084d2c96070 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Tue, 5 May 2020 21:23:34 -0700
 Subject: [PATCH] No-Tick view distance implementation
@@ -550,19 +550,19 @@ index 4317d9b98e4..a3abad95a11 100644
                          }
                      }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index edf9df8c8ad..ec95b63e51a 100644
+index 61c7f5f9528..9786f110c5e 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -150,7 +150,7 @@ public abstract class PlayerList {
- 
+@@ -151,7 +151,7 @@ public abstract class PlayerList {
          // CraftBukkit - getType()
          // Spigot - view distance
+         networkmanager.queueImmunity = true; // Paper
 -        playerconnection.sendPacket(new PacketPlayOutLogin(entityplayer.getId(), entityplayer.playerInteractManager.getGameMode(), WorldData.c(worlddata.getSeed()), worlddata.isHardcore(), worldserver.worldProvider.getDimensionManager().getType(), this.getMaxPlayers(), worlddata.getType(), worldserver.spigotConfig.viewDistance, flag1, !flag));
 +        playerconnection.sendPacket(new PacketPlayOutLogin(entityplayer.getId(), entityplayer.playerInteractManager.getGameMode(), WorldData.c(worlddata.getSeed()), worlddata.isHardcore(), worldserver.worldProvider.getDimensionManager().getType(), this.getMaxPlayers(), worlddata.getType(), worldserver.getChunkProvider().playerChunkMap.getEffectiveNoTickViewDistance(), flag1, !flag)); // Paper - no-tick view distance
          entityplayer.getBukkitEntity().sendSupportedChannels(); // CraftBukkit
          playerconnection.sendPacket(new PacketPlayOutCustomPayload(PacketPlayOutCustomPayload.a, (new PacketDataSerializer(Unpooled.buffer())).a(this.getServer().getServerModName())));
          playerconnection.sendPacket(new PacketPlayOutServerDifficulty(worlddata.getDifficulty(), worlddata.isDifficultyLocked()));
-@@ -770,7 +770,7 @@ public abstract class PlayerList {
+@@ -772,7 +772,7 @@ public abstract class PlayerList {
          WorldData worlddata = worldserver.getWorldData();
  
          entityplayer1.playerConnection.sendPacket(new PacketPlayOutRespawn(worldserver.worldProvider.getDimensionManager().getType(),  WorldData.c(worldserver.getWorldData().getSeed()), worldserver.getWorldData().getType(), entityplayer1.playerInteractManager.getGameMode()));
@@ -571,7 +571,7 @@ index edf9df8c8ad..ec95b63e51a 100644
          entityplayer1.spawnIn(worldserver);
          entityplayer1.dead = false;
          entityplayer1.playerConnection.teleport(new Location(worldserver.getWorld(), entityplayer1.locX(), entityplayer1.locY(), entityplayer1.locZ(), entityplayer1.yaw, entityplayer1.pitch));
-@@ -1254,7 +1254,7 @@ public abstract class PlayerList {
+@@ -1256,7 +1256,7 @@ public abstract class PlayerList {
  
      public void a(int i) {
          this.viewDistance = i;