From c47cf32c7cb520be19b60041cb1b8bea7efded6c Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Mon, 16 Dec 2019 02:58:10 +0000
Subject: [PATCH] Restore 0129-Optimize-World.isLoaded-BlockPosition-Z.patch

---
 ...imize-World.isLoaded-BlockPosition-Z.patch | 15 ++---
 ...Bound-Treasure-Maps-to-World-Border.patch} |  8 +--
 ...igurable-Cartographer-Treasure-Maps.patch} |  8 +--
 ... => 0132-Optimize-ItemStack.isEmpty.patch} |  6 +-
 ...o-control-if-armour-stands-can-move.patch} |  8 +--
 ...4-Properly-fix-item-duplication-bug.patch} |  8 +--
 ...=> 0135-String-based-Action-Bar-API.patch} |  8 +--
 ...-API-s.patch => 0136-Firework-API-s.patch} | 14 ++---
 ... 0137-PlayerTeleportEndGatewayEvent.patch} |  6 +-
 ...ovide-E-TE-Chunk-count-stat-methods.patch} |  6 +-
 ...h => 0139-Enforce-Sync-Player-Saves.patch} |  6 +-
 ...low-entities-to-ride-themselves-572.patch} |  6 +-
 ...I-for-Reason-Source-Triggering-play.patch} | 34 +++++-----
 ...patch => 0142-Cap-Entity-Collisions.patch} | 10 +--
 ...-CraftScheduler-Async-Task-Debugger.patch} |  6 +-
 ...ore-aggressive-in-the-chunk-unload-.patch} |  6 +-
 ...> 0145-Do-not-let-armorstands-drown.patch} |  8 +--
 ...e-async-calls-to-restart-the-server.patch} | 10 +--
 ...roperty-to-disable-book-size-limits.patch} |  6 +-
 ...e-parrots-stay-on-shoulders-despite.patch} | 10 +--
 ...-option-to-prevent-player-names-fro.patch} |  8 +--
 ...leAppender-for-console-improvements.patch} | 32 +++++-----
 ...rable-option-to-disable-creeper-lin.patch} |  8 +--
 ....patch => 0152-Item-canEntityPickup.patch} | 10 +--
 ...layerPickupItemEvent-setFlyAtPlayer.patch} |  6 +-
 ...> 0154-PlayerAttemptPickupItemEvent.patch} |  6 +-
 ...tch => 0155-Add-UnknownCommandEvent.patch} |  6 +-
 ...tch => 0156-Basic-PlayerProfile-API.patch} | 22 +++----
 ... 0157-Shoulder-Entities-Release-API.patch} |  8 +--
 ...patch => 0158-Profile-Lookup-Events.patch} |  6 +-
 ...layer-logins-during-server-shutdown.patch} |  6 +-
 ...patch => 0160-Entity-fromMobSpawner.patch} | 10 +--
 ...1-Improve-the-Saddle-API-for-Horses.patch} | 10 +--
 ...plement-ensureServerConversions-API.patch} |  4 +-
 ...> 0163-Implement-getI18NDisplayName.patch} |  6 +-
 ...=> 0164-ProfileWhitelistVerifyEvent.patch} |  6 +-
 ...ch => 0165-Fix-this-stupid-bullshit.patch} |  6 +-
 ...wns-should-honor-nametags-and-leash.patch} |  6 +-
 ...mer-when-spawner-event-is-cancelled.patch} |  6 +-
 ...8-Fix-MC-117075-TE-Unload-Lag-Spike.patch} |  8 +--
 ...a-custom-authentication-servers-dow.patch} |  8 +--
 ...atch => 0170-LivingEntity-setKiller.patch} |  8 +--
 ...ms-to-redirect-System.out-err-to-lo.patch} |  8 +--
 ...-prefixes-using-Log4J-configuration.patch} | 10 +--
 ...Include-Log4J2-SLF4J-implementation.patch} |  6 +-
 ...efix-for-various-plugins-bypassing-.patch} |  6 +-
 ...t.patch => 0175-Add-PlayerJumpEvent.patch} |  6 +-
 ...-handle-PacketPlayInKeepAlive-async.patch} |  6 +-
 ...t-protocol-version-and-virtual-host.patch} | 14 ++---
 ...t-serverside-behavior-of-keepalives.patch} |  6 +-
 ...Effects-only-to-players-who-can-see.patch} | 10 +--
 ...maximum-exp-value-when-merging-orbs.patch} |  8 +--
 ... => 0181-Add-PlayerArmorChangeEvent.patch} |  8 +--
 ...om-being-processed-when-the-player-.patch} |  6 +-
 ...-implementations-for-captured-block.patch} |  8 +--
 ...get-a-BlockState-without-a-snapshot.patch} | 12 ++--
 ...patch => 0185-AsyncTabCompleteEvent.patch} | 10 +--
 ...86-Avoid-NPE-in-PathfinderGoalTempt.patch} |  6 +-
 ...=> 0187-PlayerPickupExperienceEvent.patch} |  6 +-
 ...tch => 0188-ExperienceOrbMergeEvent.patch} |  6 +-
 ...-Ability-to-apply-mending-to-XP-API.patch} | 10 +--
 ...max-squid-spawn-height-configurable.patch} |  8 +--
 ...patch => 0191-PreCreatureSpawnEvent.patch} |  8 +--
 ...-PlayerNaturallySpawnCreaturesEvent.patch} |  6 +-
 ...Add-setPlayerProfile-API-for-Skulls.patch} |  8 +--
 ...> 0194-Fill-Profile-Property-Events.patch} |  6 +-
 ...layerAdvancementCriterionGrantEvent.patch} |  6 +-
 ...ch => 0196-Add-ArmorStand-Item-Meta.patch} | 10 +--
 ...Extend-Player-Interact-cancellation.patch} |  6 +-
 ... 0198-Tameable-getOwnerUniqueId-API.patch} |  8 +--
 ...-crits-helps-mitigate-hacked-client.patch} |  8 +--
 ...ing-location-from-InventoryEnderChe.patch} |  6 +-
 ...ted-Ice-from-loading-holding-chunks.patch} |  6 +-
 ...e-Explicit-Network-Manager-Flushing.patch} |  6 +-
 ...t-extended-PaperServerListPingEvent.patch} | 18 +++---
 ... 0204-Improved-Async-Task-Scheduler.patch} |  8 +--
 ...-PlayerProfile-in-AsyncPreLoginEven.patch} |  6 +-
 ...=> 0206-Player.setPlayerProfile-API.patch} | 10 +--
 ...h => 0207-Fix-Dragon-Server-Crashes.patch} |  6 +-
 ...patch => 0208-getPlayerUniqueId-API.patch} |  6 +-
 ...ake-player-data-saving-configurable.patch} |  8 +--
 ...e-legacy-ping-handler-more-reliable.patch} |  6 +-
 ...erverListPingEvent-for-legacy-pings.patch} |  8 +--
 ...2-Flag-to-disable-the-channel-limit.patch} |  6 +-
 ...-method-to-open-already-placed-sign.patch} |  6 +-
 ...rable-sprint-interruption-on-attack.patch} |  8 +--
 ...allowed-colored-signs-to-be-created.patch} |  6 +-
 ...t.patch => 0216-EndermanEscapeEvent.patch} |  6 +-
 ...h => 0217-Enderman.teleportRandomly.patch} |  8 +--
 ...218-Block-Enderpearl-Travel-Exploit.patch} |  8 +--
 ...d.spawnParticle-API-and-add-Builder.patch} |  6 +-
 ...h => 0220-EndermanAttackPlayerEvent.patch} |  6 +-
 ...tch => 0221-WitchConsumePotionEvent.patch} |  6 +-
 ...patch => 0222-WitchThrowPotionEvent.patch} |  6 +-
 ...tem-entities-with-World.spawnEntity.patch} |  4 +-
 ...patch => 0224-WitchReadyPotionEvent.patch} |  6 +-
 ...225-ItemStack-getMaxItemUseDuration.patch} |  8 +--
 ...ement-EntityTeleportEndGatewayEvent.patch} |  6 +-
 ...d-flag-on-cancel-of-Explosion-Event.patch} |  6 +-
 ...ch => 0228-Fix-CraftEntity-hashCode.patch} |  6 +-
 ...e-Alternative-LootPool-Luck-Formula.patch} |  8 +--
 ...ls-when-failing-to-save-player-data.patch} |  6 +-
 ...-shield-blocking-delay-configurable.patch} | 10 +--
 ...cipes-in-RecipeBook-to-avoid-data-e.patch} |  6 +-
 ...nt-consumeArrow-and-getArrowItem-AP.patch} | 12 ++--
 ...patch => 0234-PlayerReadyArrowEvent.patch} |  6 +-
 ...-EntityShootBowEvent-for-Illusioner.patch} |  6 +-
 ...lement-EntityKnockbackByEntityEvent.patch} |  6 +-
 ...patch => 0237-Expand-Explosions-API.patch} |  6 +-
 ...vingEntity-Hand-Raised-Item-Use-API.patch} |  8 +--
 ...-API.patch => 0239-RangedEntity-API.patch} | 20 +++---
 ...o-disable-ender-dragon-legacy-check.patch} |  8 +--
 ...-Implement-World.getEntity-UUID-API.patch} |  4 +-
 ...0242-InventoryCloseEvent-Reason-API.patch} | 20 +++---
 ...0243-Configurable-Bed-Search-Radius.patch} |  8 +--
 ...I.patch => 0244-Vex-getSummoner-API.patch} |  8 +--
 ...ventory-when-cancelling-PlayerInter.patch} |  6 +-
 ...e-the-Entity-Random-seed-for-squids.patch} |  6 +-
 ...illa-entity-warnings-for-duplicates.patch} |  4 +-
 ...-if-stack-size-above-max-stack-size.patch} |  6 +-
 ...49-Use-asynchronous-Log4j-2-loggers.patch} | 10 +--
 ...more-information-to-Entity.toString.patch} |  6 +-
 ...es-option-to-debug-dupe-uuid-issues.patch} | 10 +--
 ...ts.patch => 0252-EnderDragon-Events.patch} | 10 +--
 ...atch => 0253-PlayerElytraBoostEvent.patch} |  6 +-
 ...Speedup-BlockPos-by-fixing-inlining.patch} |  8 +--
 ...patch => 0255-Optimize-RegistryID.c.patch} |  6 +-
 ...-armor-stands-from-doing-entity-loo.patch} | 10 +--
 ...-Vanished-players-don-t-have-rights.patch} | 18 +++---
 ...anytime-entities-change-to-guarante.patch} |  6 +-
 ...d-some-Debug-to-Chunk-Entity-slices.patch} |  8 +--
 ...atch => 0260-EntityTransformedEvent.patch} | 12 ++--
 ...tch => 0261-SkeletonHorse-Additions.patch} | 10 +--
 ...event-Saving-Bad-entities-to-chunks.patch} |  6 +-
 ...n-t-call-getItemMeta-on-hasItemMeta.patch} |  6 +-
 ...ad-Entities-in-entityList-iteration.patch} | 12 ++--
 ...65-MC-111480-Start-Entity-ID-s-at-1.patch} |  6 +-
 ...6-Implement-Expanded-ArmorStand-API.patch} |  8 +--
 ...vent.patch => 0267-AnvilDamageEvent.patch} |  6 +-
 ...ent.patch => 0268-Add-TNTPrimeEvent.patch} | 10 +--
 ...d-make-tab-spam-limits-configurable.patch} |  8 +--
 ...h => 0270-Add-hand-to-bucket-events.patch} | 10 +--
 ...-Experience-should-save-as-Integers.patch} |  6 +-
 ...ent-rendering-skulls-from-same-user.patch} | 12 ++--
 ...d-Early-Warning-Feature-to-WatchDog.patch} | 14 ++---
 ...0274-Make-EnderDragon-implement-Mob.patch} |  6 +-
 ...5-Use-ConcurrentHashMap-in-JsonList.patch} |  6 +-
 ...6-Use-a-Queue-for-Queueing-Commands.patch} |  6 +-
 ...le-Entities-from-a-chunk-without-sn.patch} |  4 +-
 ...llow-disabling-armour-stand-ticking.patch} | 12 ++--
 ...timize-BlockPosition-helper-methods.patch} |  6 +-
 ...ts-from-world-player-list-not-serve.patch} |  8 +--
 ...tore-vanlla-default-mob-spawn-range.patch} |  6 +-
 ...82-Optimize-CraftBlockData-Creation.patch} |  6 +-
 ...-124320.patch => 0283-Fix-MC-124320.patch} |  6 +-
 ...tch => 0284-Slime-Pathfinder-Events.patch} |  6 +-
 ...e-speed-for-water-flowing-over-lava.patch} |  6 +-
 ... => 0286-Optimize-RegistryMaterials.patch} |  4 +-
 ...ch => 0287-Add-PhantomPreSpawnEvent.patch} |  8 +--
 ....patch => 0288-Add-More-Creeper-API.patch} |  6 +-
 ...=> 0289-Inventory-removeItemAnySlot.patch} |  4 +-
 ...oadChunk-int-int-false-load-unconve.patch} |  4 +-
 ...ray-tracing-methods-to-LivingEntity.patch} |  6 +-
 ...-attack-cooldown-methods-for-Player.patch} |  6 +-
 ....patch => 0293-Improve-death-events.patch} | 22 +++----
 ...w-chests-to-be-placed-with-NBT-data.patch} |  6 +-
 ...I.patch => 0295-Mob-Pathfinding-API.patch} | 12 ++--
 ...nt-chunk-loading-from-Fluid-Flowing.patch} |  4 +-
 ...for-CanPlaceOn-and-CanDestroy-NBT-v.patch} |  6 +-
 ...nt-Mob-AI-Rules-from-Loading-Chunks.patch} |  6 +-
 ...ning-from-loading-generating-chunks.patch} |  4 +-
 ...-Biome-Mob-Lookups-for-Mob-Spawning.patch} |  4 +-
 ...t-furnace-cook-speed-multiplier-API.patch} |  6 +-
 ...0302-Support-Overriding-World-Seeds.patch} | 10 +--
 ...h => 0303-Optimize-Server-World-Map.patch} |  6 +-
 ....patch => 0304-PreSpawnerSpawnEvent.patch} |  4 +-
 ...rseException-in-Entity-and-TE-names.patch} | 12 ++--
 ... 0306-Avoid-dimension-id-collisions.patch} |  4 +-
 ...=> 0307-Honor-EntityAgeable.ageLock.patch} |  4 +-
 ...le-connection-throttle-kick-message.patch} |  6 +-
 ...> 0309-Hook-into-CB-plugin-rewrites.patch} |  4 +-
 ...10-Allow-setting-the-vex-s-summoner.patch} |  6 +-
 ...I.patch => 0311-Add-sun-related-API.patch} | 12 ++--
 ...wned-for-Villager-Aggression-Config.patch} |  4 +-
 ...-Johnny.patch => 0313-Here-s-Johnny.patch} |  6 +-
 ...Turtle-API.patch => 0314-Turtle-API.patch} |  6 +-
 ...it-lightning-strike-effect-distance.patch} |  8 +--
 ...her-worlds-for-shooter-of-projectil.patch} |  4 +-
 ...Call-player-spectator-target-events.patch} |  4 +-
 ...-Add-Velocity-IP-Forwarding-Support.patch} | 18 +++---
 ...PI.patch => 0319-Add-more-Witch-API.patch} |  6 +-
 ...MC-93764.patch => 0320-Fix-MC-93764.patch} |  4 +-
 ...vent-players-from-moving-into-unloa.patch} |  6 +-
 ...2-Reset-players-airTicks-on-respawn.patch} |  6 +-
 ...-area-unicode-characters-from-signs.patch} |  4 +-
 ...after-profile-lookups-if-not-needed.patch} |  4 +-
 ...le-thread-count-default-for-bootstr.patch} |  4 +-
 ...=> 0326-Optimize-World-Time-Updates.patch} |  4 +-
 ...tore-custom-InventoryHolder-support.patch} |  4 +-
 ...=> 0328-Use-Vanilla-Minecart-Speeds.patch} |  4 +-
 ...0329-Fix-SpongeAbsortEvent-handling.patch} |  6 +-
 ...-allow-digging-into-unloaded-chunks.patch} |  4 +-
 ...=> 0331-Optimize-redstone-algorithm.patch} | 14 ++---
 ...ntity-dismount-during-teleportation.patch} | 10 +--
 ...mits.patch => 0333-Book-Size-Limits.patch} |  6 +-
 ...ult-permission-message-configurable.patch} |  6 +-
 ...I.patch => 0335-Add-more-Zombie-API.patch} |  8 +--
 ...revent-rayTrace-from-loading-chunks.patch} |  4 +-
 ...-Large-Packets-disconnecting-client.patch} | 12 ++--
 ...world-storage-in-CraftOfflinePlayer.patch} |  4 +-
 ...0339-Add-PlayerConnectionCloseEvent.patch} |  6 +-
 ...revent-Enderman-from-loading-chunks.patch} |  4 +-
 ...replace-OfflinePlayer-getLastPlayed.patch} | 10 +--
 ...tch => 0342-Fix-PlayerEditBookEvent.patch} |  4 +-
 ...ehicle-tracking-issue-on-disconnect.patch} |  4 +-
 ...nRetractEvent-for-all-empty-pistons.patch} |  4 +-
 ...remove-from-being-called-on-Players.patch} |  4 +-
 ...ent.patch => 0346-BlockDestroyEvent.patch} |  6 +-
 ...m-Shapeless-Custom-Crafting-Recipes.patch} |  4 +-
 ...h => 0348-Fix-sign-edit-memory-leak.patch} |  6 +-
 ... 0349-Limit-Client-Sign-length-more.patch} |  4 +-
 ...onvertSigns-boolean-every-sign-save.patch} |  4 +-
 ...Signs-in-Chunks-creating-too-large-.patch} |  8 +--
 ...-Fix-Whitelist-On-Off-inconsistency.patch} |  6 +-
 ...t-tick-at-start-of-drowning-process.patch} |  4 +-
 ...54-Allow-Saving-of-Oversized-Chunks.patch} |  8 +--
 ...ggleEvent-when-whitelist-is-toggled.patch} |  4 +-
 ...56-Add-LivingEntity-getTargetEntity.patch} | 12 ++--
 ...ngth-when-serialising-BungeeCord-te.patch} |  4 +-
 ...=> 0358-Entity-getEntitySpawnReason.patch} | 10 +--
 ...ty-Metadata-for-all-tracked-players.patch} |  6 +-
 ...tch => 0360-Fire-event-on-GS4-query.patch} |  8 +--
 ...61-Implement-PlayerPostRespawnEvent.patch} |  4 +-
 ...for-pickupDelay-breaks-picking-up-i.patch} |  4 +-
 ...-and-setters-for-EntityItem-owner-a.patch} |  4 +-
 ...ts.patch => 0364-Server-Tick-Events.patch} |  4 +-
 ...365-PlayerDeathEvent-getItemsToKeep.patch} |  4 +-
 ...Optimize-Captured-TileEntity-Lookup.patch} |  6 +-
 ...API.patch => 0367-Add-Heightmap-API.patch} |  8 +--
 ...> 0368-Mob-Spawner-API-Enhancements.patch} |  6 +-
 ...ayer-View-Distance-API-placeholders.patch} |  8 +--
 ...-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} |  4 +-
 ... 0374-Duplicate-UUID-Resolve-Option.patch} | 12 ++--
 ...75-improve-CraftWorld-isChunkLoaded.patch} |  4 +-
 ...e-Keep-Spawn-Loaded-range-per-world.patch} | 14 ++---
 ...-some-generation-concurrency-issues.patch} |  4 +-
 ...ityAreaEffectCloud-from-going-negat.patch} |  4 +-
 ....patch => 0379-ChunkMapDistance-CME.patch} |  4 +-
 ...0380-Implement-CraftBlockSoundGroup.patch} | 10 +--
 ...d.patch => 0381-Chunk-debug-command.patch} | 14 ++---
 ...ch => 0382-incremental-chunk-saving.patch} | 14 ++---
 ...ptions-from-dispenser-entity-spawns.patch} |  4 +-
 ...84-Fix-World-isChunkGenerated-calls.patch} | 20 +++---
 ...te-location-if-we-failed-to-read-it.patch} |  4 +-
 ...ad-in-DataPaletteBlock-lock-failure.patch} |  6 +-
 ...tatus-cache-when-saving-protochunks.patch} |  4 +-
 ...7-Anti-Xray.patch => 0388-Anti-Xray.patch} | 44 ++++++-------
 ...l-Spawned-mobs-towards-natural-spaw.patch} |  6 +-
 ...urable-projectile-relative-velocity.patch} |  8 +--
 ...being-ticked-when-notifying-navigat.patch} |  4 +-
 ...h => 0392-offset-item-frame-ticking.patch} |  4 +-
 ...pper-searches-if-there-are-no-items.patch} |  6 +-
 ...56852.patch => 0394-Fixed-MC-156852.patch} |  4 +-
 ...5-Asynchronous-chunk-IO-and-loading.patch} | 62 +++++++++----------
 ...tChunkIfLoadedImmediately-in-places.patch} |  6 +-
 ...ads.patch => 0397-Reduce-sync-loads.patch} | 10 +--
 ...ement-alternative-item-despawn-rate.patch} |  2 +-
 ...f-we-have-a-custom-Bukkit-generator.patch} |  2 +-
 ...-158900.patch => 0400-Fix-MC-158900.patch} |  2 +-
 ...ment-optional-per-player-mob-spawns.patch} |  2 +-
 ...event-consuming-the-wrong-itemstack.patch} |  2 +-
 ...ssanger-entities-once-from-spawners.patch} |  2 +-
 ... => 0404-Fix-nether-portal-creation.patch} |  2 +-
 ...gs.patch => 0405-Generator-Settings.patch} |  2 +-
 ...o-tick-instant-grow-farms-MC-113809.patch} |  2 +-
 ...-161754.patch => 0407-Fix-MC-161754.patch} |  2 +-
 ...e-improvement-for-Chunk.getEntities.patch} |  2 +-
 ...anging-entities-that-are-not-ItemFr.patch} |  2 +-
 ...10-Expose-the-internal-current-tick.patch} |  2 +-
 ...sneak-when-changing-worlds-MC-10657.patch} |  2 +-
 ...-option-to-disable-pillager-patrols.patch} |  2 +-
 ...r-when-player-hand-set-to-empty-typ.patch} |  2 +-
 ...revent-TRAP-while-loading-Fireballs.patch} |  2 +-
 ...=> 0415-PlayerLaunchProjectileEvent.patch} |  2 +-
 ...tMagicNumbers.isSupportedApiVersion.patch} |  2 +-
 ...ps-for-Entity-TileEntity-Current-Ch.patch} | 10 +--
 ...Fix-spawn-radius-being-treated-as-0.patch} |  2 +-
 290 files changed, 1073 insertions(+), 1072 deletions(-)
 rename {removed/1.15 => Spigot-Server-Patches}/0129-Optimize-World.isLoaded-BlockPosition-Z.patch (66%)
 rename Spigot-Server-Patches/{0129-Bound-Treasure-Maps-to-World-Border.patch => 0130-Bound-Treasure-Maps-to-World-Border.patch} (94%)
 rename Spigot-Server-Patches/{0130-Configurable-Cartographer-Treasure-Maps.patch => 0131-Configurable-Cartographer-Treasure-Maps.patch} (94%)
 rename Spigot-Server-Patches/{0131-Optimize-ItemStack.isEmpty.patch => 0132-Optimize-ItemStack.isEmpty.patch} (88%)
 rename Spigot-Server-Patches/{0132-Add-API-methods-to-control-if-armour-stands-can-move.patch => 0133-Add-API-methods-to-control-if-armour-stands-can-move.patch} (92%)
 rename Spigot-Server-Patches/{0133-Properly-fix-item-duplication-bug.patch => 0134-Properly-fix-item-duplication-bug.patch} (90%)
 rename Spigot-Server-Patches/{0134-String-based-Action-Bar-API.patch => 0135-String-based-Action-Bar-API.patch} (94%)
 rename Spigot-Server-Patches/{0135-Firework-API-s.patch => 0136-Firework-API-s.patch} (96%)
 rename Spigot-Server-Patches/{0136-PlayerTeleportEndGatewayEvent.patch => 0137-PlayerTeleportEndGatewayEvent.patch} (92%)
 rename Spigot-Server-Patches/{0137-Provide-E-TE-Chunk-count-stat-methods.patch => 0138-Provide-E-TE-Chunk-count-stat-methods.patch} (95%)
 rename Spigot-Server-Patches/{0138-Enforce-Sync-Player-Saves.patch => 0139-Enforce-Sync-Player-Saves.patch} (90%)
 rename Spigot-Server-Patches/{0139-Don-t-allow-entities-to-ride-themselves-572.patch => 0140-Don-t-allow-entities-to-ride-themselves-572.patch} (88%)
 rename Spigot-Server-Patches/{0140-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch => 0141-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch} (96%)
 rename Spigot-Server-Patches/{0141-Cap-Entity-Collisions.patch => 0142-Cap-Entity-Collisions.patch} (93%)
 rename Spigot-Server-Patches/{0142-Remove-CraftScheduler-Async-Task-Debugger.patch => 0143-Remove-CraftScheduler-Async-Task-Debugger.patch} (95%)
 rename Spigot-Server-Patches/{0143-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch => 0144-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch} (95%)
 rename Spigot-Server-Patches/{0144-Do-not-let-armorstands-drown.patch => 0145-Do-not-let-armorstands-drown.patch} (93%)
 rename Spigot-Server-Patches/{0145-Properly-handle-async-calls-to-restart-the-server.patch => 0146-Properly-handle-async-calls-to-restart-the-server.patch} (98%)
 rename Spigot-Server-Patches/{0146-Add-system-property-to-disable-book-size-limits.patch => 0147-Add-system-property-to-disable-book-size-limits.patch} (96%)
 rename Spigot-Server-Patches/{0147-Add-option-to-make-parrots-stay-on-shoulders-despite.patch => 0148-Add-option-to-make-parrots-stay-on-shoulders-despite.patch} (94%)
 rename Spigot-Server-Patches/{0148-Add-configuration-option-to-prevent-player-names-fro.patch => 0149-Add-configuration-option-to-prevent-player-names-fro.patch} (91%)
 rename Spigot-Server-Patches/{0149-Use-TerminalConsoleAppender-for-console-improvements.patch => 0150-Use-TerminalConsoleAppender-for-console-improvements.patch} (98%)
 rename Spigot-Server-Patches/{0150-provide-a-configurable-option-to-disable-creeper-lin.patch => 0151-provide-a-configurable-option-to-disable-creeper-lin.patch} (92%)
 rename Spigot-Server-Patches/{0151-Item-canEntityPickup.patch => 0152-Item-canEntityPickup.patch} (92%)
 rename Spigot-Server-Patches/{0152-PlayerPickupItemEvent-setFlyAtPlayer.patch => 0153-PlayerPickupItemEvent-setFlyAtPlayer.patch} (95%)
 rename Spigot-Server-Patches/{0153-PlayerAttemptPickupItemEvent.patch => 0154-PlayerAttemptPickupItemEvent.patch} (93%)
 rename Spigot-Server-Patches/{0154-Add-UnknownCommandEvent.patch => 0155-Add-UnknownCommandEvent.patch} (94%)
 rename Spigot-Server-Patches/{0155-Basic-PlayerProfile-API.patch => 0156-Basic-PlayerProfile-API.patch} (98%)
 rename Spigot-Server-Patches/{0156-Shoulder-Entities-Release-API.patch => 0157-Shoulder-Entities-Release-API.patch} (96%)
 rename Spigot-Server-Patches/{0157-Profile-Lookup-Events.patch => 0158-Profile-Lookup-Events.patch} (97%)
 rename Spigot-Server-Patches/{0158-Block-player-logins-during-server-shutdown.patch => 0159-Block-player-logins-during-server-shutdown.patch} (90%)
 rename Spigot-Server-Patches/{0159-Entity-fromMobSpawner.patch => 0160-Entity-fromMobSpawner.patch} (94%)
 rename Spigot-Server-Patches/{0160-Improve-the-Saddle-API-for-Horses.patch => 0161-Improve-the-Saddle-API-for-Horses.patch} (94%)
 rename Spigot-Server-Patches/{0161-Implement-ensureServerConversions-API.patch => 0162-Implement-ensureServerConversions-API.patch} (91%)
 rename Spigot-Server-Patches/{0162-Implement-getI18NDisplayName.patch => 0163-Implement-getI18NDisplayName.patch} (93%)
 rename Spigot-Server-Patches/{0163-ProfileWhitelistVerifyEvent.patch => 0164-ProfileWhitelistVerifyEvent.patch} (96%)
 rename Spigot-Server-Patches/{0164-Fix-this-stupid-bullshit.patch => 0165-Fix-this-stupid-bullshit.patch} (93%)
 rename Spigot-Server-Patches/{0165-Ocelot-despawns-should-honor-nametags-and-leash.patch => 0166-Ocelot-despawns-should-honor-nametags-and-leash.patch} (88%)
 rename Spigot-Server-Patches/{0166-Reset-spawner-timer-when-spawner-event-is-cancelled.patch => 0167-Reset-spawner-timer-when-spawner-event-is-cancelled.patch} (92%)
 rename Spigot-Server-Patches/{0167-Fix-MC-117075-TE-Unload-Lag-Spike.patch => 0168-Fix-MC-117075-TE-Unload-Lag-Spike.patch} (86%)
 rename Spigot-Server-Patches/{0168-Allow-specifying-a-custom-authentication-servers-dow.patch => 0169-Allow-specifying-a-custom-authentication-servers-dow.patch} (94%)
 rename Spigot-Server-Patches/{0169-LivingEntity-setKiller.patch => 0170-LivingEntity-setKiller.patch} (92%)
 rename Spigot-Server-Patches/{0170-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch => 0171-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch} (93%)
 rename Spigot-Server-Patches/{0171-Handle-plugin-prefixes-using-Log4J-configuration.patch => 0172-Handle-plugin-prefixes-using-Log4J-configuration.patch} (95%)
 rename Spigot-Server-Patches/{0172-Include-Log4J2-SLF4J-implementation.patch => 0173-Include-Log4J2-SLF4J-implementation.patch} (86%)
 rename Spigot-Server-Patches/{0173-Disable-logger-prefix-for-various-plugins-bypassing-.patch => 0174-Disable-logger-prefix-for-various-plugins-bypassing-.patch} (95%)
 rename Spigot-Server-Patches/{0174-Add-PlayerJumpEvent.patch => 0175-Add-PlayerJumpEvent.patch} (96%)
 rename Spigot-Server-Patches/{0175-handle-PacketPlayInKeepAlive-async.patch => 0176-handle-PacketPlayInKeepAlive-async.patch} (95%)
 rename Spigot-Server-Patches/{0176-Expose-client-protocol-version-and-virtual-host.patch => 0177-Expose-client-protocol-version-and-virtual-host.patch} (95%)
 rename Spigot-Server-Patches/{0177-revert-serverside-behavior-of-keepalives.patch => 0178-revert-serverside-behavior-of-keepalives.patch} (97%)
 rename Spigot-Server-Patches/{0178-Send-attack-SoundEffects-only-to-players-who-can-see.patch => 0179-Send-attack-SoundEffects-only-to-players-who-can-see.patch} (96%)
 rename Spigot-Server-Patches/{0179-Option-for-maximum-exp-value-when-merging-orbs.patch => 0180-Option-for-maximum-exp-value-when-merging-orbs.patch} (95%)
 rename Spigot-Server-Patches/{0180-Add-PlayerArmorChangeEvent.patch => 0181-Add-PlayerArmorChangeEvent.patch} (93%)
 rename Spigot-Server-Patches/{0181-Prevent-logins-from-being-processed-when-the-player-.patch => 0182-Prevent-logins-from-being-processed-when-the-player-.patch} (90%)
 rename Spigot-Server-Patches/{0182-use-CB-BlockState-implementations-for-captured-block.patch => 0183-use-CB-BlockState-implementations-for-captured-block.patch} (90%)
 rename Spigot-Server-Patches/{0183-API-to-get-a-BlockState-without-a-snapshot.patch => 0184-API-to-get-a-BlockState-without-a-snapshot.patch} (96%)
 rename Spigot-Server-Patches/{0184-AsyncTabCompleteEvent.patch => 0185-AsyncTabCompleteEvent.patch} (97%)
 rename Spigot-Server-Patches/{0185-Avoid-NPE-in-PathfinderGoalTempt.patch => 0186-Avoid-NPE-in-PathfinderGoalTempt.patch} (88%)
 rename Spigot-Server-Patches/{0186-PlayerPickupExperienceEvent.patch => 0187-PlayerPickupExperienceEvent.patch} (91%)
 rename Spigot-Server-Patches/{0187-ExperienceOrbMergeEvent.patch => 0188-ExperienceOrbMergeEvent.patch} (93%)
 rename Spigot-Server-Patches/{0188-Ability-to-apply-mending-to-XP-API.patch => 0189-Ability-to-apply-mending-to-XP-API.patch} (95%)
 rename Spigot-Server-Patches/{0189-Make-max-squid-spawn-height-configurable.patch => 0190-Make-max-squid-spawn-height-configurable.patch} (93%)
 rename Spigot-Server-Patches/{0190-PreCreatureSpawnEvent.patch => 0191-PreCreatureSpawnEvent.patch} (97%)
 rename Spigot-Server-Patches/{0191-PlayerNaturallySpawnCreaturesEvent.patch => 0192-PlayerNaturallySpawnCreaturesEvent.patch} (95%)
 rename Spigot-Server-Patches/{0192-Add-setPlayerProfile-API-for-Skulls.patch => 0193-Add-setPlayerProfile-API-for-Skulls.patch} (96%)
 rename Spigot-Server-Patches/{0193-Fill-Profile-Property-Events.patch => 0194-Fill-Profile-Property-Events.patch} (94%)
 rename Spigot-Server-Patches/{0194-PlayerAdvancementCriterionGrantEvent.patch => 0195-PlayerAdvancementCriterionGrantEvent.patch} (90%)
 rename Spigot-Server-Patches/{0195-Add-ArmorStand-Item-Meta.patch => 0196-Add-ArmorStand-Item-Meta.patch} (98%)
 rename Spigot-Server-Patches/{0196-Extend-Player-Interact-cancellation.patch => 0197-Extend-Player-Interact-cancellation.patch} (97%)
 rename Spigot-Server-Patches/{0197-Tameable-getOwnerUniqueId-API.patch => 0198-Tameable-getOwnerUniqueId-API.patch} (91%)
 rename Spigot-Server-Patches/{0198-Toggleable-player-crits-helps-mitigate-hacked-client.patch => 0199-Toggleable-player-crits-helps-mitigate-hacked-client.patch} (92%)
 rename Spigot-Server-Patches/{0199-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch => 0200-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch} (91%)
 rename Spigot-Server-Patches/{0200-Prevent-Frosted-Ice-from-loading-holding-chunks.patch => 0201-Prevent-Frosted-Ice-from-loading-holding-chunks.patch} (94%)
 rename Spigot-Server-Patches/{0201-Disable-Explicit-Network-Manager-Flushing.patch => 0202-Disable-Explicit-Network-Manager-Flushing.patch} (93%)
 rename Spigot-Server-Patches/{0202-Implement-extended-PaperServerListPingEvent.patch => 0203-Implement-extended-PaperServerListPingEvent.patch} (97%)
 rename Spigot-Server-Patches/{0203-Improved-Async-Task-Scheduler.patch => 0204-Improved-Async-Task-Scheduler.patch} (99%)
 rename Spigot-Server-Patches/{0204-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch => 0205-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch} (95%)
 rename Spigot-Server-Patches/{0205-Player.setPlayerProfile-API.patch => 0206-Player.setPlayerProfile-API.patch} (97%)
 rename Spigot-Server-Patches/{0206-Fix-Dragon-Server-Crashes.patch => 0207-Fix-Dragon-Server-Crashes.patch} (91%)
 rename Spigot-Server-Patches/{0207-getPlayerUniqueId-API.patch => 0208-getPlayerUniqueId-API.patch} (94%)
 rename Spigot-Server-Patches/{0208-Make-player-data-saving-configurable.patch => 0209-Make-player-data-saving-configurable.patch} (92%)
 rename Spigot-Server-Patches/{0209-Make-legacy-ping-handler-more-reliable.patch => 0210-Make-legacy-ping-handler-more-reliable.patch} (98%)
 rename Spigot-Server-Patches/{0210-Call-PaperServerListPingEvent-for-legacy-pings.patch => 0211-Call-PaperServerListPingEvent-for-legacy-pings.patch} (98%)
 rename Spigot-Server-Patches/{0211-Flag-to-disable-the-channel-limit.patch => 0212-Flag-to-disable-the-channel-limit.patch} (94%)
 rename Spigot-Server-Patches/{0212-Add-method-to-open-already-placed-sign.patch => 0213-Add-method-to-open-already-placed-sign.patch} (92%)
 rename Spigot-Server-Patches/{0213-Configurable-sprint-interruption-on-attack.patch => 0214-Configurable-sprint-interruption-on-attack.patch} (92%)
 rename Spigot-Server-Patches/{0214-Fix-exploit-that-allowed-colored-signs-to-be-created.patch => 0215-Fix-exploit-that-allowed-colored-signs-to-be-created.patch} (91%)
 rename Spigot-Server-Patches/{0215-EndermanEscapeEvent.patch => 0216-EndermanEscapeEvent.patch} (97%)
 rename Spigot-Server-Patches/{0216-Enderman.teleportRandomly.patch => 0217-Enderman.teleportRandomly.patch} (90%)
 rename Spigot-Server-Patches/{0217-Block-Enderpearl-Travel-Exploit.patch => 0218-Block-Enderpearl-Travel-Exploit.patch} (93%)
 rename Spigot-Server-Patches/{0218-Expand-World.spawnParticle-API-and-add-Builder.patch => 0219-Expand-World.spawnParticle-API-and-add-Builder.patch} (96%)
 rename Spigot-Server-Patches/{0219-EndermanAttackPlayerEvent.patch => 0220-EndermanAttackPlayerEvent.patch} (92%)
 rename Spigot-Server-Patches/{0220-WitchConsumePotionEvent.patch => 0221-WitchConsumePotionEvent.patch} (92%)
 rename Spigot-Server-Patches/{0221-WitchThrowPotionEvent.patch => 0222-WitchThrowPotionEvent.patch} (94%)
 rename Spigot-Server-Patches/{0222-Allow-spawning-Item-entities-with-World.spawnEntity.patch => 0223-Allow-spawning-Item-entities-with-World.spawnEntity.patch} (92%)
 rename Spigot-Server-Patches/{0223-WitchReadyPotionEvent.patch => 0224-WitchReadyPotionEvent.patch} (93%)
 rename Spigot-Server-Patches/{0224-ItemStack-getMaxItemUseDuration.patch => 0225-ItemStack-getMaxItemUseDuration.patch} (91%)
 rename Spigot-Server-Patches/{0225-Implement-EntityTeleportEndGatewayEvent.patch => 0226-Implement-EntityTeleportEndGatewayEvent.patch} (94%)
 rename Spigot-Server-Patches/{0226-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch => 0227-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch} (93%)
 rename Spigot-Server-Patches/{0227-Fix-CraftEntity-hashCode.patch => 0228-Fix-CraftEntity-hashCode.patch} (94%)
 rename Spigot-Server-Patches/{0228-Configurable-Alternative-LootPool-Luck-Formula.patch => 0229-Configurable-Alternative-LootPool-Luck-Formula.patch} (97%)
 rename Spigot-Server-Patches/{0229-Print-Error-details-when-failing-to-save-player-data.patch => 0230-Print-Error-details-when-failing-to-save-player-data.patch} (88%)
 rename Spigot-Server-Patches/{0230-Make-shield-blocking-delay-configurable.patch => 0231-Make-shield-blocking-delay-configurable.patch} (94%)
 rename Spigot-Server-Patches/{0231-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch => 0232-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch} (93%)
 rename Spigot-Server-Patches/{0232-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch => 0233-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch} (97%)
 rename Spigot-Server-Patches/{0233-PlayerReadyArrowEvent.patch => 0234-PlayerReadyArrowEvent.patch} (94%)
 rename Spigot-Server-Patches/{0234-Fire-EntityShootBowEvent-for-Illusioner.patch => 0235-Fire-EntityShootBowEvent-for-Illusioner.patch} (93%)
 rename Spigot-Server-Patches/{0235-Implement-EntityKnockbackByEntityEvent.patch => 0236-Implement-EntityKnockbackByEntityEvent.patch} (93%)
 rename Spigot-Server-Patches/{0236-Expand-Explosions-API.patch => 0237-Expand-Explosions-API.patch} (92%)
 rename Spigot-Server-Patches/{0237-LivingEntity-Hand-Raised-Item-Use-API.patch => 0238-LivingEntity-Hand-Raised-Item-Use-API.patch} (93%)
 rename Spigot-Server-Patches/{0238-RangedEntity-API.patch => 0239-RangedEntity-API.patch} (95%)
 rename Spigot-Server-Patches/{0239-Add-config-to-disable-ender-dragon-legacy-check.patch => 0240-Add-config-to-disable-ender-dragon-legacy-check.patch} (94%)
 rename Spigot-Server-Patches/{0240-Implement-World.getEntity-UUID-API.patch => 0241-Implement-World.getEntity-UUID-API.patch} (90%)
 rename Spigot-Server-Patches/{0241-InventoryCloseEvent-Reason-API.patch => 0242-InventoryCloseEvent-Reason-API.patch} (96%)
 rename Spigot-Server-Patches/{0242-Configurable-Bed-Search-Radius.patch => 0243-Configurable-Bed-Search-Radius.patch} (98%)
 rename Spigot-Server-Patches/{0243-Vex-getSummoner-API.patch => 0244-Vex-getSummoner-API.patch} (91%)
 rename Spigot-Server-Patches/{0244-Refresh-player-inventory-when-cancelling-PlayerInter.patch => 0245-Refresh-player-inventory-when-cancelling-PlayerInter.patch} (92%)
 rename Spigot-Server-Patches/{0245-Don-t-change-the-Entity-Random-seed-for-squids.patch => 0246-Don-t-change-the-Entity-Random-seed-for-squids.patch} (87%)
 rename Spigot-Server-Patches/{0246-Re-add-vanilla-entity-warnings-for-duplicates.patch => 0247-Re-add-vanilla-entity-warnings-for-duplicates.patch} (92%)
 rename Spigot-Server-Patches/{0247-Avoid-item-merge-if-stack-size-above-max-stack-size.patch => 0248-Avoid-item-merge-if-stack-size-above-max-stack-size.patch} (90%)
 rename Spigot-Server-Patches/{0248-Use-asynchronous-Log4j-2-loggers.patch => 0249-Use-asynchronous-Log4j-2-loggers.patch} (91%)
 rename Spigot-Server-Patches/{0249-add-more-information-to-Entity.toString.patch => 0250-add-more-information-to-Entity.toString.patch} (92%)
 rename Spigot-Server-Patches/{0250-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch => 0251-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch} (96%)
 rename Spigot-Server-Patches/{0251-EnderDragon-Events.patch => 0252-EnderDragon-Events.patch} (95%)
 rename Spigot-Server-Patches/{0252-PlayerElytraBoostEvent.patch => 0253-PlayerElytraBoostEvent.patch} (94%)
 rename Spigot-Server-Patches/{0253-Speedup-BlockPos-by-fixing-inlining.patch => 0254-Speedup-BlockPos-by-fixing-inlining.patch} (98%)
 rename Spigot-Server-Patches/{0254-Optimize-RegistryID.c.patch => 0255-Optimize-RegistryID.c.patch} (95%)
 rename Spigot-Server-Patches/{0255-Option-to-prevent-armor-stands-from-doing-entity-loo.patch => 0256-Option-to-prevent-armor-stands-from-doing-entity-loo.patch} (88%)
 rename Spigot-Server-Patches/{0256-Vanished-players-don-t-have-rights.patch => 0257-Vanished-players-don-t-have-rights.patch} (96%)
 rename Spigot-Server-Patches/{0257-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch => 0258-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch} (88%)
 rename Spigot-Server-Patches/{0258-Add-some-Debug-to-Chunk-Entity-slices.patch => 0259-Add-some-Debug-to-Chunk-Entity-slices.patch} (95%)
 rename Spigot-Server-Patches/{0259-EntityTransformedEvent.patch => 0260-EntityTransformedEvent.patch} (95%)
 rename Spigot-Server-Patches/{0260-SkeletonHorse-Additions.patch => 0261-SkeletonHorse-Additions.patch} (94%)
 rename Spigot-Server-Patches/{0261-Prevent-Saving-Bad-entities-to-chunks.patch => 0262-Prevent-Saving-Bad-entities-to-chunks.patch} (96%)
 rename Spigot-Server-Patches/{0262-Don-t-call-getItemMeta-on-hasItemMeta.patch => 0263-Don-t-call-getItemMeta-on-hasItemMeta.patch} (96%)
 rename Spigot-Server-Patches/{0263-Ignore-Dead-Entities-in-entityList-iteration.patch => 0264-Ignore-Dead-Entities-in-entityList-iteration.patch} (96%)
 rename Spigot-Server-Patches/{0264-MC-111480-Start-Entity-ID-s-at-1.patch => 0265-MC-111480-Start-Entity-ID-s-at-1.patch} (90%)
 rename Spigot-Server-Patches/{0265-Implement-Expanded-ArmorStand-API.patch => 0266-Implement-Expanded-ArmorStand-API.patch} (97%)
 rename Spigot-Server-Patches/{0266-AnvilDamageEvent.patch => 0267-AnvilDamageEvent.patch} (94%)
 rename Spigot-Server-Patches/{0267-Add-TNTPrimeEvent.patch => 0268-Add-TNTPrimeEvent.patch} (97%)
 rename Spigot-Server-Patches/{0268-Break-up-and-make-tab-spam-limits-configurable.patch => 0269-Break-up-and-make-tab-spam-limits-configurable.patch} (96%)
 rename Spigot-Server-Patches/{0269-Add-hand-to-bucket-events.patch => 0270-Add-hand-to-bucket-events.patch} (98%)
 rename Spigot-Server-Patches/{0270-MC-135506-Experience-should-save-as-Integers.patch => 0271-MC-135506-Experience-should-save-as-Integers.patch} (92%)
 rename Spigot-Server-Patches/{0271-Fix-client-rendering-skulls-from-same-user.patch => 0272-Fix-client-rendering-skulls-from-same-user.patch} (96%)
 rename Spigot-Server-Patches/{0272-Add-Early-Warning-Feature-to-WatchDog.patch => 0273-Add-Early-Warning-Feature-to-WatchDog.patch} (97%)
 rename Spigot-Server-Patches/{0273-Make-EnderDragon-implement-Mob.patch => 0274-Make-EnderDragon-implement-Mob.patch} (92%)
 rename Spigot-Server-Patches/{0274-Use-ConcurrentHashMap-in-JsonList.patch => 0275-Use-ConcurrentHashMap-in-JsonList.patch} (97%)
 rename Spigot-Server-Patches/{0275-Use-a-Queue-for-Queueing-Commands.patch => 0276-Use-a-Queue-for-Queueing-Commands.patch} (94%)
 rename Spigot-Server-Patches/{0276-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch => 0277-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch} (93%)
 rename Spigot-Server-Patches/{0277-Allow-disabling-armour-stand-ticking.patch => 0278-Allow-disabling-armour-stand-ticking.patch} (98%)
 rename Spigot-Server-Patches/{0278-Optimize-BlockPosition-helper-methods.patch => 0279-Optimize-BlockPosition-helper-methods.patch} (97%)
 rename Spigot-Server-Patches/{0279-Send-nearby-packets-from-world-player-list-not-serve.patch => 0280-Send-nearby-packets-from-world-player-list-not-serve.patch} (96%)
 rename Spigot-Server-Patches/{0280-Restore-vanlla-default-mob-spawn-range.patch => 0281-Restore-vanlla-default-mob-spawn-range.patch} (86%)
 rename Spigot-Server-Patches/{0281-Optimize-CraftBlockData-Creation.patch => 0282-Optimize-CraftBlockData-Creation.patch} (94%)
 rename Spigot-Server-Patches/{0282-Fix-MC-124320.patch => 0283-Fix-MC-124320.patch} (95%)
 rename Spigot-Server-Patches/{0283-Slime-Pathfinder-Events.patch => 0284-Slime-Pathfinder-Events.patch} (98%)
 rename Spigot-Server-Patches/{0284-Configurable-speed-for-water-flowing-over-lava.patch => 0285-Configurable-speed-for-water-flowing-over-lava.patch} (96%)
 rename Spigot-Server-Patches/{0285-Optimize-RegistryMaterials.patch => 0286-Optimize-RegistryMaterials.patch} (93%)
 rename Spigot-Server-Patches/{0286-Add-PhantomPreSpawnEvent.patch => 0287-Add-PhantomPreSpawnEvent.patch} (96%)
 rename Spigot-Server-Patches/{0287-Add-More-Creeper-API.patch => 0288-Add-More-Creeper-API.patch} (94%)
 rename Spigot-Server-Patches/{0288-Inventory-removeItemAnySlot.patch => 0289-Inventory-removeItemAnySlot.patch} (95%)
 rename Spigot-Server-Patches/{0289-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch => 0290-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch} (91%)
 rename Spigot-Server-Patches/{0290-Add-ray-tracing-methods-to-LivingEntity.patch => 0291-Add-ray-tracing-methods-to-LivingEntity.patch} (96%)
 rename Spigot-Server-Patches/{0291-Expose-attack-cooldown-methods-for-Player.patch => 0292-Expose-attack-cooldown-methods-for-Player.patch} (93%)
 rename Spigot-Server-Patches/{0292-Improve-death-events.patch => 0293-Improve-death-events.patch} (98%)
 rename Spigot-Server-Patches/{0293-Allow-chests-to-be-placed-with-NBT-data.patch => 0294-Allow-chests-to-be-placed-with-NBT-data.patch} (91%)
 rename Spigot-Server-Patches/{0294-Mob-Pathfinding-API.patch => 0295-Mob-Pathfinding-API.patch} (97%)
 rename Spigot-Server-Patches/{0295-Prevent-chunk-loading-from-Fluid-Flowing.patch => 0296-Prevent-chunk-loading-from-Fluid-Flowing.patch} (97%)
 rename Spigot-Server-Patches/{0296-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch => 0297-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch} (99%)
 rename Spigot-Server-Patches/{0297-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch => 0298-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch} (97%)
 rename Spigot-Server-Patches/{0298-Prevent-mob-spawning-from-loading-generating-chunks.patch => 0299-Prevent-mob-spawning-from-loading-generating-chunks.patch} (95%)
 rename Spigot-Server-Patches/{0299-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch => 0300-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch} (96%)
 rename Spigot-Server-Patches/{0300-Implement-furnace-cook-speed-multiplier-API.patch => 0301-Implement-furnace-cook-speed-multiplier-API.patch} (96%)
 rename Spigot-Server-Patches/{0301-Support-Overriding-World-Seeds.patch => 0302-Support-Overriding-World-Seeds.patch} (96%)
 rename Spigot-Server-Patches/{0302-Optimize-Server-World-Map.patch => 0303-Optimize-Server-World-Map.patch} (98%)
 rename Spigot-Server-Patches/{0303-PreSpawnerSpawnEvent.patch => 0304-PreSpawnerSpawnEvent.patch} (94%)
 rename Spigot-Server-Patches/{0304-Catch-JsonParseException-in-Entity-and-TE-names.patch => 0305-Catch-JsonParseException-in-Entity-and-TE-names.patch} (95%)
 rename Spigot-Server-Patches/{0305-Avoid-dimension-id-collisions.patch => 0306-Avoid-dimension-id-collisions.patch} (91%)
 rename Spigot-Server-Patches/{0306-Honor-EntityAgeable.ageLock.patch => 0307-Honor-EntityAgeable.ageLock.patch} (86%)
 rename Spigot-Server-Patches/{0307-Configurable-connection-throttle-kick-message.patch => 0308-Configurable-connection-throttle-kick-message.patch} (94%)
 rename Spigot-Server-Patches/{0308-Hook-into-CB-plugin-rewrites.patch => 0309-Hook-into-CB-plugin-rewrites.patch} (98%)
 rename Spigot-Server-Patches/{0309-Allow-setting-the-vex-s-summoner.patch => 0310-Allow-setting-the-vex-s-summoner.patch} (90%)
 rename Spigot-Server-Patches/{0310-Add-sun-related-API.patch => 0311-Add-sun-related-API.patch} (89%)
 rename Spigot-Server-Patches/{0311-Check-Drowned-for-Villager-Aggression-Config.patch => 0312-Check-Drowned-for-Villager-Aggression-Config.patch} (93%)
 rename Spigot-Server-Patches/{0312-Here-s-Johnny.patch => 0313-Here-s-Johnny.patch} (92%)
 rename Spigot-Server-Patches/{0313-Turtle-API.patch => 0314-Turtle-API.patch} (98%)
 rename Spigot-Server-Patches/{0314-Limit-lightning-strike-effect-distance.patch => 0315-Limit-lightning-strike-effect-distance.patch} (96%)
 rename Spigot-Server-Patches/{0315-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch => 0316-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch} (94%)
 rename Spigot-Server-Patches/{0316-Call-player-spectator-target-events.patch => 0317-Call-player-spectator-target-events.patch} (97%)
 rename Spigot-Server-Patches/{0317-Add-Velocity-IP-Forwarding-Support.patch => 0318-Add-Velocity-IP-Forwarding-Support.patch} (97%)
 rename Spigot-Server-Patches/{0318-Add-more-Witch-API.patch => 0319-Add-more-Witch-API.patch} (98%)
 rename Spigot-Server-Patches/{0319-Fix-MC-93764.patch => 0320-Fix-MC-93764.patch} (86%)
 rename Spigot-Server-Patches/{0320-Add-option-to-prevent-players-from-moving-into-unloa.patch => 0321-Add-option-to-prevent-players-from-moving-into-unloa.patch} (96%)
 rename Spigot-Server-Patches/{0321-Reset-players-airTicks-on-respawn.patch => 0322-Reset-players-airTicks-on-respawn.patch} (89%)
 rename Spigot-Server-Patches/{0322-Strip-private-area-unicode-characters-from-signs.patch => 0323-Strip-private-area-unicode-characters-from-signs.patch} (97%)
 rename Spigot-Server-Patches/{0323-Don-t-sleep-after-profile-lookups-if-not-needed.patch => 0324-Don-t-sleep-after-profile-lookups-if-not-needed.patch} (94%)
 rename Spigot-Server-Patches/{0324-Use-more-reasonable-thread-count-default-for-bootstr.patch => 0325-Use-more-reasonable-thread-count-default-for-bootstr.patch} (89%)
 rename Spigot-Server-Patches/{0325-Optimize-World-Time-Updates.patch => 0326-Optimize-World-Time-Updates.patch} (96%)
 rename Spigot-Server-Patches/{0326-Restore-custom-InventoryHolder-support.patch => 0327-Restore-custom-InventoryHolder-support.patch} (95%)
 rename Spigot-Server-Patches/{0327-Use-Vanilla-Minecart-Speeds.patch => 0328-Use-Vanilla-Minecart-Speeds.patch} (91%)
 rename Spigot-Server-Patches/{0328-Fix-SpongeAbsortEvent-handling.patch => 0329-Fix-SpongeAbsortEvent-handling.patch} (93%)
 rename Spigot-Server-Patches/{0329-Don-t-allow-digging-into-unloaded-chunks.patch => 0330-Don-t-allow-digging-into-unloaded-chunks.patch} (92%)
 rename Spigot-Server-Patches/{0330-Optimize-redstone-algorithm.patch => 0331-Optimize-redstone-algorithm.patch} (99%)
 rename Spigot-Server-Patches/{0331-force-entity-dismount-during-teleportation.patch => 0332-force-entity-dismount-during-teleportation.patch} (96%)
 rename Spigot-Server-Patches/{0332-Book-Size-Limits.patch => 0333-Book-Size-Limits.patch} (96%)
 rename Spigot-Server-Patches/{0333-Make-the-default-permission-message-configurable.patch => 0334-Make-the-default-permission-message-configurable.patch} (94%)
 rename Spigot-Server-Patches/{0334-Add-more-Zombie-API.patch => 0335-Add-more-Zombie-API.patch} (96%)
 rename Spigot-Server-Patches/{0335-Prevent-rayTrace-from-loading-chunks.patch => 0336-Prevent-rayTrace-from-loading-chunks.patch} (93%)
 rename Spigot-Server-Patches/{0336-Handle-Large-Packets-disconnecting-client.patch => 0337-Handle-Large-Packets-disconnecting-client.patch} (94%)
 rename Spigot-Server-Patches/{0337-Lazy-init-world-storage-in-CraftOfflinePlayer.patch => 0338-Lazy-init-world-storage-in-CraftOfflinePlayer.patch} (96%)
 rename Spigot-Server-Patches/{0338-Add-PlayerConnectionCloseEvent.patch => 0339-Add-PlayerConnectionCloseEvent.patch} (97%)
 rename Spigot-Server-Patches/{0339-Prevent-Enderman-from-loading-chunks.patch => 0340-Prevent-Enderman-from-loading-chunks.patch} (95%)
 rename Spigot-Server-Patches/{0340-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch => 0341-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch} (96%)
 rename Spigot-Server-Patches/{0341-Fix-PlayerEditBookEvent.patch => 0342-Fix-PlayerEditBookEvent.patch} (94%)
 rename Spigot-Server-Patches/{0342-Workaround-for-vehicle-tracking-issue-on-disconnect.patch => 0343-Workaround-for-vehicle-tracking-issue-on-disconnect.patch} (90%)
 rename Spigot-Server-Patches/{0343-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch => 0344-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch} (96%)
 rename Spigot-Server-Patches/{0344-Block-Entity-remove-from-being-called-on-Players.patch => 0345-Block-Entity-remove-from-being-called-on-Players.patch} (93%)
 rename Spigot-Server-Patches/{0345-BlockDestroyEvent.patch => 0346-BlockDestroyEvent.patch} (92%)
 rename Spigot-Server-Patches/{0346-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch => 0347-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch} (96%)
 rename Spigot-Server-Patches/{0347-Fix-sign-edit-memory-leak.patch => 0348-Fix-sign-edit-memory-leak.patch} (94%)
 rename Spigot-Server-Patches/{0348-Limit-Client-Sign-length-more.patch => 0349-Limit-Client-Sign-length-more.patch} (96%)
 rename Spigot-Server-Patches/{0349-Don-t-check-ConvertSigns-boolean-every-sign-save.patch => 0350-Don-t-check-ConvertSigns-boolean-every-sign-save.patch} (93%)
 rename Spigot-Server-Patches/{0350-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch => 0351-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch} (95%)
 rename Spigot-Server-Patches/{0351-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch => 0352-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch} (95%)
 rename Spigot-Server-Patches/{0352-Set-Zombie-last-tick-at-start-of-drowning-process.patch => 0353-Set-Zombie-last-tick-at-start-of-drowning-process.patch} (89%)
 rename Spigot-Server-Patches/{0353-Allow-Saving-of-Oversized-Chunks.patch => 0354-Allow-Saving-of-Oversized-Chunks.patch} (98%)
 rename Spigot-Server-Patches/{0354-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch => 0355-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch} (87%)
 rename Spigot-Server-Patches/{0355-Add-LivingEntity-getTargetEntity.patch => 0356-Add-LivingEntity-getTargetEntity.patch} (96%)
 rename Spigot-Server-Patches/{0356-Use-proper-max-length-when-serialising-BungeeCord-te.patch => 0357-Use-proper-max-length-when-serialising-BungeeCord-te.patch} (94%)
 rename Spigot-Server-Patches/{0357-Entity-getEntitySpawnReason.patch => 0358-Entity-getEntitySpawnReason.patch} (96%)
 rename Spigot-Server-Patches/{0358-Update-entity-Metadata-for-all-tracked-players.patch => 0359-Update-entity-Metadata-for-all-tracked-players.patch} (92%)
 rename Spigot-Server-Patches/{0359-Fire-event-on-GS4-query.patch => 0360-Fire-event-on-GS4-query.patch} (98%)
 rename Spigot-Server-Patches/{0360-Implement-PlayerPostRespawnEvent.patch => 0361-Implement-PlayerPostRespawnEvent.patch} (95%)
 rename Spigot-Server-Patches/{0361-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch => 0362-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch} (93%)
 rename Spigot-Server-Patches/{0362-Implement-getters-and-setters-for-EntityItem-owner-a.patch => 0363-Implement-getters-and-setters-for-EntityItem-owner-a.patch} (93%)
 rename Spigot-Server-Patches/{0363-Server-Tick-Events.patch => 0364-Server-Tick-Events.patch} (93%)
 rename Spigot-Server-Patches/{0364-PlayerDeathEvent-getItemsToKeep.patch => 0365-PlayerDeathEvent-getItemsToKeep.patch} (96%)
 rename Spigot-Server-Patches/{0365-Optimize-Captured-TileEntity-Lookup.patch => 0366-Optimize-Captured-TileEntity-Lookup.patch} (89%)
 rename Spigot-Server-Patches/{0366-Add-Heightmap-API.patch => 0367-Add-Heightmap-API.patch} (92%)
 rename Spigot-Server-Patches/{0367-Mob-Spawner-API-Enhancements.patch => 0368-Mob-Spawner-API-Enhancements.patch} (97%)
 rename Spigot-Server-Patches/{0368-Per-Player-View-Distance-API-placeholders.patch => 0369-Per-Player-View-Distance-API-placeholders.patch} (95%)
 rename Spigot-Server-Patches/{0369-Fix-CB-call-to-changed-postToMainThread-method.patch => 0370-Fix-CB-call-to-changed-postToMainThread-method.patch} (88%)
 rename Spigot-Server-Patches/{0370-Fix-sounds-when-item-frames-are-modified-MC-123450.patch => 0371-Fix-sounds-when-item-frames-are-modified-MC-123450.patch} (92%)
 rename Spigot-Server-Patches/{0371-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch => 0372-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch} (93%)
 rename Spigot-Server-Patches/{0372-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch => 0373-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch} (95%)
 rename Spigot-Server-Patches/{0373-Duplicate-UUID-Resolve-Option.patch => 0374-Duplicate-UUID-Resolve-Option.patch} (98%)
 rename Spigot-Server-Patches/{0374-improve-CraftWorld-isChunkLoaded.patch => 0375-improve-CraftWorld-isChunkLoaded.patch} (93%)
 rename Spigot-Server-Patches/{0375-Configurable-Keep-Spawn-Loaded-range-per-world.patch => 0376-Configurable-Keep-Spawn-Loaded-range-per-world.patch} (97%)
 rename Spigot-Server-Patches/{0376-Fix-some-generation-concurrency-issues.patch => 0377-Fix-some-generation-concurrency-issues.patch} (99%)
 rename Spigot-Server-Patches/{0377-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch => 0378-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch} (89%)
 rename Spigot-Server-Patches/{0378-ChunkMapDistance-CME.patch => 0379-ChunkMapDistance-CME.patch} (95%)
 rename Spigot-Server-Patches/{0379-Implement-CraftBlockSoundGroup.patch => 0380-Implement-CraftBlockSoundGroup.patch} (95%)
 rename Spigot-Server-Patches/{0380-Chunk-debug-command.patch => 0381-Chunk-debug-command.patch} (98%)
 rename Spigot-Server-Patches/{0381-incremental-chunk-saving.patch => 0382-incremental-chunk-saving.patch} (97%)
 rename Spigot-Server-Patches/{0382-Catch-exceptions-from-dispenser-entity-spawns.patch => 0383-Catch-exceptions-from-dispenser-entity-spawns.patch} (92%)
 rename Spigot-Server-Patches/{0383-Fix-World-isChunkGenerated-calls.patch => 0384-Fix-World-isChunkGenerated-calls.patch} (97%)
 rename Spigot-Server-Patches/{0384-Show-blockstate-location-if-we-failed-to-read-it.patch => 0385-Show-blockstate-location-if-we-failed-to-read-it.patch} (93%)
 rename Spigot-Server-Patches/{0385-Log-other-thread-in-DataPaletteBlock-lock-failure.patch => 0386-Log-other-thread-in-DataPaletteBlock-lock-failure.patch} (95%)
 rename Spigot-Server-Patches/{0386-Use-ChunkStatus-cache-when-saving-protochunks.patch => 0387-Use-ChunkStatus-cache-when-saving-protochunks.patch} (92%)
 rename Spigot-Server-Patches/{0387-Anti-Xray.patch => 0388-Anti-Xray.patch} (99%)
 rename Spigot-Server-Patches/{0388-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch => 0389-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch} (95%)
 rename Spigot-Server-Patches/{0389-Configurable-projectile-relative-velocity.patch => 0390-Configurable-projectile-relative-velocity.patch} (95%)
 rename Spigot-Server-Patches/{0390-Mark-entities-as-being-ticked-when-notifying-navigat.patch => 0391-Mark-entities-as-being-ticked-when-notifying-navigat.patch} (91%)
 rename Spigot-Server-Patches/{0391-offset-item-frame-ticking.patch => 0392-offset-item-frame-ticking.patch} (88%)
 rename Spigot-Server-Patches/{0392-Avoid-hopper-searches-if-there-are-no-items.patch => 0393-Avoid-hopper-searches-if-there-are-no-items.patch} (97%)
 rename Spigot-Server-Patches/{0393-Fixed-MC-156852.patch => 0394-Fixed-MC-156852.patch} (93%)
 rename Spigot-Server-Patches/{0394-Asynchronous-chunk-IO-and-loading.patch => 0395-Asynchronous-chunk-IO-and-loading.patch} (99%)
 rename Spigot-Server-Patches/{0395-Use-getChunkIfLoadedImmediately-in-places.patch => 0396-Use-getChunkIfLoadedImmediately-in-places.patch} (96%)
 rename Spigot-Server-Patches/{0396-Reduce-sync-loads.patch => 0397-Reduce-sync-loads.patch} (97%)
 rename Spigot-Server-Patches/{0397-Implement-alternative-item-despawn-rate.patch => 0398-Implement-alternative-item-despawn-rate.patch} (98%)
 rename Spigot-Server-Patches/{0398-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch => 0399-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch} (97%)
 rename Spigot-Server-Patches/{0399-Fix-MC-158900.patch => 0400-Fix-MC-158900.patch} (95%)
 rename Spigot-Server-Patches/{0400-implement-optional-per-player-mob-spawns.patch => 0401-implement-optional-per-player-mob-spawns.patch} (99%)
 rename Spigot-Server-Patches/{0401-Prevent-consuming-the-wrong-itemstack.patch => 0402-Prevent-consuming-the-wrong-itemstack.patch} (97%)
 rename Spigot-Server-Patches/{0402-only-add-passanger-entities-once-from-spawners.patch => 0403-only-add-passanger-entities-once-from-spawners.patch} (93%)
 rename Spigot-Server-Patches/{0403-Fix-nether-portal-creation.patch => 0404-Fix-nether-portal-creation.patch} (94%)
 rename Spigot-Server-Patches/{0404-Generator-Settings.patch => 0405-Generator-Settings.patch} (97%)
 rename Spigot-Server-Patches/{0405-Fix-zero-tick-instant-grow-farms-MC-113809.patch => 0406-Fix-zero-tick-instant-grow-farms-MC-113809.patch} (98%)
 rename Spigot-Server-Patches/{0406-Fix-MC-161754.patch => 0407-Fix-MC-161754.patch} (94%)
 rename Spigot-Server-Patches/{0407-Performance-improvement-for-Chunk.getEntities.patch => 0408-Performance-improvement-for-Chunk.getEntities.patch} (96%)
 rename Spigot-Server-Patches/{0408-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch => 0409-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch} (96%)
 rename Spigot-Server-Patches/{0409-Expose-the-internal-current-tick.patch => 0410-Expose-the-internal-current-tick.patch} (92%)
 rename Spigot-Server-Patches/{0410-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch => 0411-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch} (96%)
 rename Spigot-Server-Patches/{0411-Add-option-to-disable-pillager-patrols.patch => 0412-Add-option-to-disable-pillager-patrols.patch} (95%)
 rename Spigot-Server-Patches/{0412-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch => 0413-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch} (96%)
 rename Spigot-Server-Patches/{0413-Prevent-TRAP-while-loading-Fireballs.patch => 0414-Prevent-TRAP-while-loading-Fireballs.patch} (93%)
 rename Spigot-Server-Patches/{0414-PlayerLaunchProjectileEvent.patch => 0415-PlayerLaunchProjectileEvent.patch} (99%)
 rename Spigot-Server-Patches/{0415-Add-CraftMagicNumbers.isSupportedApiVersion.patch => 0416-Add-CraftMagicNumbers.isSupportedApiVersion.patch} (93%)
 rename Spigot-Server-Patches/{0416-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch => 0417-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch} (92%)
 rename Spigot-Server-Patches/{0417-Fix-spawn-radius-being-treated-as-0.patch => 0418-Fix-spawn-radius-being-treated-as-0.patch} (94%)

diff --git a/removed/1.15/0129-Optimize-World.isLoaded-BlockPosition-Z.patch b/Spigot-Server-Patches/0129-Optimize-World.isLoaded-BlockPosition-Z.patch
similarity index 66%
rename from removed/1.15/0129-Optimize-World.isLoaded-BlockPosition-Z.patch
rename to Spigot-Server-Patches/0129-Optimize-World.isLoaded-BlockPosition-Z.patch
index e1ec10f346..94d832354a 100644
--- a/removed/1.15/0129-Optimize-World.isLoaded-BlockPosition-Z.patch
+++ b/Spigot-Server-Patches/0129-Optimize-World.isLoaded-BlockPosition-Z.patch
@@ -1,4 +1,4 @@
-From afe90ec5ec5202911c92ff2b497d734b76057256 Mon Sep 17 00:00:00 2001
+From 6f3694fc16bfe1aa83e509272a6e5061f0cac424 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 2 Dec 2016 00:11:43 -0500
 Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z
@@ -6,20 +6,21 @@ Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z
 Reduce method invocations for World.isLoaded(BlockPosition)Z
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 4ce18f85b..cfdb6b57f 100644
+index 3a52958a16..50808b1a9f 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -209,6 +209,10 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
-         return i < 0 || i >= 256;
+@@ -237,6 +237,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+         return chunk == null ? null : chunk.getFluid(blockposition);
      }
  
 +    public boolean isLoaded(BlockPosition blockposition) {
 +        return getChunkIfLoaded(blockposition.getX() >> 4, blockposition.getZ() >> 4) != null; // Paper
 +    }
 +
-     // Paper start
++
      public boolean isLoadedAndInBounds(BlockPosition blockposition) {
-         return getWorldBorder().isInBounds(blockposition) && getChunkIfLoaded(blockposition.getX() >> 4, blockposition.getZ() >> 4) != null;
+         return getWorldBorder().isInBounds(blockposition) && getChunkIfLoadedImmediately(blockposition.getX() >> 4, blockposition.getZ() >> 4) != null;
+     }
 -- 
-2.22.0
+2.24.1
 
diff --git a/Spigot-Server-Patches/0129-Bound-Treasure-Maps-to-World-Border.patch b/Spigot-Server-Patches/0130-Bound-Treasure-Maps-to-World-Border.patch
similarity index 94%
rename from Spigot-Server-Patches/0129-Bound-Treasure-Maps-to-World-Border.patch
rename to Spigot-Server-Patches/0130-Bound-Treasure-Maps-to-World-Border.patch
index bbf10cc9be..e0c3edb98a 100644
--- a/Spigot-Server-Patches/0129-Bound-Treasure-Maps-to-World-Border.patch
+++ b/Spigot-Server-Patches/0130-Bound-Treasure-Maps-to-World-Border.patch
@@ -1,4 +1,4 @@
-From b6ea5bc92d6f07a2a5aa0cc9fe7f19a8b9f180ee Mon Sep 17 00:00:00 2001
+From 4bc309b797100c0fa004b93a0c8aa59be67ebf9e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 20 Dec 2016 15:15:11 -0500
 Subject: [PATCH] Bound Treasure Maps to World Border
@@ -11,7 +11,7 @@ that is outside happens to be closer, but unreachable, yet another reachable
 one is in border that would of been missed.
 
 diff --git a/src/main/java/net/minecraft/server/StructureGenerator.java b/src/main/java/net/minecraft/server/StructureGenerator.java
-index 0f248b6de..e8ce2ecf2 100644
+index 0f248b6de3..e8ce2ecf23 100644
 --- a/src/main/java/net/minecraft/server/StructureGenerator.java
 +++ b/src/main/java/net/minecraft/server/StructureGenerator.java
 @@ -108,6 +108,7 @@ public abstract class StructureGenerator<C extends WorldGenFeatureConfiguration>
@@ -23,7 +23,7 @@ index 0f248b6de..e8ce2ecf2 100644
  
                                  if (structurestart != null && structurestart.e()) {
 diff --git a/src/main/java/net/minecraft/server/WorldBorder.java b/src/main/java/net/minecraft/server/WorldBorder.java
-index 4ee13ac45..5f10c4338 100644
+index 4ee13ac454..5f10c4338e 100644
 --- a/src/main/java/net/minecraft/server/WorldBorder.java
 +++ b/src/main/java/net/minecraft/server/WorldBorder.java
 @@ -24,6 +24,18 @@ public class WorldBorder {
@@ -46,5 +46,5 @@ index 4ee13ac45..5f10c4338 100644
          return (double) chunkcoordintpair.f() > this.c() && (double) chunkcoordintpair.d() < this.e() && (double) chunkcoordintpair.g() > this.d() && (double) chunkcoordintpair.e() < this.f();
      }
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0130-Configurable-Cartographer-Treasure-Maps.patch b/Spigot-Server-Patches/0131-Configurable-Cartographer-Treasure-Maps.patch
similarity index 94%
rename from Spigot-Server-Patches/0130-Configurable-Cartographer-Treasure-Maps.patch
rename to Spigot-Server-Patches/0131-Configurable-Cartographer-Treasure-Maps.patch
index 1646ecd7f2..6444c3b77c 100644
--- a/Spigot-Server-Patches/0130-Configurable-Cartographer-Treasure-Maps.patch
+++ b/Spigot-Server-Patches/0131-Configurable-Cartographer-Treasure-Maps.patch
@@ -1,4 +1,4 @@
-From 6a2c7cb959467d46b721e83a2f25eef3a9a12cf5 Mon Sep 17 00:00:00 2001
+From 40a5fa15dcb0bc09af143775aa33c0728975b72f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 20 Dec 2016 15:26:27 -0500
 Subject: [PATCH] Configurable Cartographer Treasure Maps
@@ -9,7 +9,7 @@ Also allow turning off treasure maps all together as they can eat up Map ID's
 which are limited in quantity.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index ba8edcf7e..bf11448bc 100644
+index ba8edcf7ef..bf11448bcd 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -310,4 +310,14 @@ public class PaperWorldConfig {
@@ -28,7 +28,7 @@ index ba8edcf7e..bf11448bc 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/VillagerTrades.java b/src/main/java/net/minecraft/server/VillagerTrades.java
-index 3bcf0b385..4764ffef7 100644
+index 3bcf0b385d..4764ffef77 100644
 --- a/src/main/java/net/minecraft/server/VillagerTrades.java
 +++ b/src/main/java/net/minecraft/server/VillagerTrades.java
 @@ -92,7 +92,8 @@ public class VillagerTrades {
@@ -42,5 +42,5 @@ index 3bcf0b385..4764ffef7 100644
                  if (blockposition != null) {
                      ItemStack itemstack = ItemWorldMap.createFilledMapView(worldserver, blockposition.getX(), blockposition.getZ(), (byte) 2, true, true);
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0131-Optimize-ItemStack.isEmpty.patch b/Spigot-Server-Patches/0132-Optimize-ItemStack.isEmpty.patch
similarity index 88%
rename from Spigot-Server-Patches/0131-Optimize-ItemStack.isEmpty.patch
rename to Spigot-Server-Patches/0132-Optimize-ItemStack.isEmpty.patch
index 4e273d4a8a..352d277396 100644
--- a/Spigot-Server-Patches/0131-Optimize-ItemStack.isEmpty.patch
+++ b/Spigot-Server-Patches/0132-Optimize-ItemStack.isEmpty.patch
@@ -1,4 +1,4 @@
-From bf58400df5a723d81164dc713ed54293b8ff6dc4 Mon Sep 17 00:00:00 2001
+From 1b09bcf4e69cb92dc412a07237446afbd101ecf6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Dec 2016 03:48:29 -0500
 Subject: [PATCH] Optimize ItemStack.isEmpty()
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize ItemStack.isEmpty()
 Remove hashMap lookup every check, simplify code to remove ternary
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 0a1596ff0..2d0a8c58f 100644
+index 0a1596ff06..2d0a8c58fb 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -150,7 +150,7 @@ public final class ItemStack {
@@ -19,5 +19,5 @@ index 0a1596ff0..2d0a8c58f 100644
  
      public ItemStack cloneAndSubtract(int i) {
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0132-Add-API-methods-to-control-if-armour-stands-can-move.patch b/Spigot-Server-Patches/0133-Add-API-methods-to-control-if-armour-stands-can-move.patch
similarity index 92%
rename from Spigot-Server-Patches/0132-Add-API-methods-to-control-if-armour-stands-can-move.patch
rename to Spigot-Server-Patches/0133-Add-API-methods-to-control-if-armour-stands-can-move.patch
index 51f46adfd0..9a7bd9e55c 100644
--- a/Spigot-Server-Patches/0132-Add-API-methods-to-control-if-armour-stands-can-move.patch
+++ b/Spigot-Server-Patches/0133-Add-API-methods-to-control-if-armour-stands-can-move.patch
@@ -1,11 +1,11 @@
-From 5503284388857eb1a7a16fb5d85d84f5c66edf6d Mon Sep 17 00:00:00 2001
+From 2dee4cbf0de58c1b0bb4d85de55cb30e5d167baa Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 21 Dec 2016 11:47:25 -0600
 Subject: [PATCH] Add API methods to control if armour stands can move
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 9d0b85d1c..37ce4d48b 100644
+index 9d0b85d1c1..37ce4d48bc 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -43,6 +43,7 @@ public class EntityArmorStand extends EntityLiving {
@@ -31,7 +31,7 @@ index 9d0b85d1c..37ce4d48b 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
-index 2b66a08ad..124c3185b 100644
+index 2b66a08ade..124c3185bc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 @@ -211,4 +211,16 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
@@ -52,5 +52,5 @@ index 2b66a08ad..124c3185b 100644
 +    // Paper end
  }
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0133-Properly-fix-item-duplication-bug.patch b/Spigot-Server-Patches/0134-Properly-fix-item-duplication-bug.patch
similarity index 90%
rename from Spigot-Server-Patches/0133-Properly-fix-item-duplication-bug.patch
rename to Spigot-Server-Patches/0134-Properly-fix-item-duplication-bug.patch
index 0b823e259e..fe5ec0c45a 100644
--- a/Spigot-Server-Patches/0133-Properly-fix-item-duplication-bug.patch
+++ b/Spigot-Server-Patches/0134-Properly-fix-item-duplication-bug.patch
@@ -1,4 +1,4 @@
-From d79301aeed703c330dcfac1c59d54135974ab30f Mon Sep 17 00:00:00 2001
+From 3ba999f1582d8a1669193f86691db5856546b48d Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Tue, 27 Dec 2016 01:57:57 +0000
 Subject: [PATCH] Properly fix item duplication bug
@@ -6,7 +6,7 @@ Subject: [PATCH] Properly fix item duplication bug
 Credit to prplz for figuring out the real issue
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index caca40a0c..6443e68f4 100644
+index 1c0bf4dacb..774289a0f0 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1766,7 +1766,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -19,7 +19,7 @@ index caca40a0c..6443e68f4 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 16b70221e..cc6a2aaeb 100644
+index 16b70221ea..cc6a2aaeb3 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2525,7 +2525,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -32,5 +32,5 @@ index 16b70221e..cc6a2aaeb 100644
      // CraftBukkit end
  
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0134-String-based-Action-Bar-API.patch b/Spigot-Server-Patches/0135-String-based-Action-Bar-API.patch
similarity index 94%
rename from Spigot-Server-Patches/0134-String-based-Action-Bar-API.patch
rename to Spigot-Server-Patches/0135-String-based-Action-Bar-API.patch
index d3ee978b18..08686395ed 100644
--- a/Spigot-Server-Patches/0134-String-based-Action-Bar-API.patch
+++ b/Spigot-Server-Patches/0135-String-based-Action-Bar-API.patch
@@ -1,11 +1,11 @@
-From 2711c437c0a4ce474e4579a6a11b84393ec9907b Mon Sep 17 00:00:00 2001
+From df57c6fea7e013d6a3f910b96026baf86c7b5b76 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 27 Dec 2016 15:02:42 -0500
 Subject: [PATCH] String based Action Bar API
 
 
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
-index c96f3ed17..1f6a12632 100644
+index 628b73a12d..2f10dab36c 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
 @@ -2,6 +2,7 @@ package net.minecraft.server;
@@ -42,7 +42,7 @@ index c96f3ed17..1f6a12632 100644
      public static boolean isMainThread() {
          return MinecraftServer.getServer().isMainThread();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 534e2756d..1c5007015 100644
+index 6cf85f0703..1c41f00551 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -216,6 +216,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -65,5 +65,5 @@ index 534e2756d..1c5007015 100644
      public void setPlayerListHeaderFooter(BaseComponent[] header, BaseComponent[] footer) {
           if (header != null) {
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0135-Firework-API-s.patch b/Spigot-Server-Patches/0136-Firework-API-s.patch
similarity index 96%
rename from Spigot-Server-Patches/0135-Firework-API-s.patch
rename to Spigot-Server-Patches/0136-Firework-API-s.patch
index 4782889415..c75b45db91 100644
--- a/Spigot-Server-Patches/0135-Firework-API-s.patch
+++ b/Spigot-Server-Patches/0136-Firework-API-s.patch
@@ -1,11 +1,11 @@
-From 83eee358ab42e7130b5dad53a4c0a98f202610c4 Mon Sep 17 00:00:00 2001
+From 421a62ed00b0fb4660535dbf0e65a9eee5ac7b93 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 28 Dec 2016 07:18:33 +0100
 Subject: [PATCH] Firework API's
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityFireworks.java b/src/main/java/net/minecraft/server/EntityFireworks.java
-index 4f51b9b65..278ef79d8 100644
+index 4f51b9b654..278ef79d89 100644
 --- a/src/main/java/net/minecraft/server/EntityFireworks.java
 +++ b/src/main/java/net/minecraft/server/EntityFireworks.java
 @@ -3,6 +3,8 @@ package net.minecraft.server;
@@ -53,7 +53,7 @@ index 4f51b9b65..278ef79d8 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/ItemCrossbow.java b/src/main/java/net/minecraft/server/ItemCrossbow.java
-index 6f2f6b9f5..608be9e70 100644
+index 6f2f6b9f5d..608be9e70a 100644
 --- a/src/main/java/net/minecraft/server/ItemCrossbow.java
 +++ b/src/main/java/net/minecraft/server/ItemCrossbow.java
 @@ -199,6 +199,7 @@ public class ItemCrossbow extends ItemProjectileWeapon {
@@ -65,7 +65,7 @@ index 6f2f6b9f5..608be9e70 100644
                  object = a(world, entityliving, itemstack, itemstack1);
                  if (flag || f3 != 0.0F) {
 diff --git a/src/main/java/net/minecraft/server/ItemFireworks.java b/src/main/java/net/minecraft/server/ItemFireworks.java
-index 914297bad..76b253a50 100644
+index 914297bad6..76b253a50d 100644
 --- a/src/main/java/net/minecraft/server/ItemFireworks.java
 +++ b/src/main/java/net/minecraft/server/ItemFireworks.java
 @@ -18,6 +18,7 @@ public class ItemFireworks extends Item {
@@ -90,7 +90,7 @@ index 914297bad..76b253a50 100644
                      itemstack.subtract(1);
                  }
 diff --git a/src/main/java/net/minecraft/server/NBTTagCompound.java b/src/main/java/net/minecraft/server/NBTTagCompound.java
-index 75604dbc6..98deaba12 100644
+index 75604dbc69..98deaba12c 100644
 --- a/src/main/java/net/minecraft/server/NBTTagCompound.java
 +++ b/src/main/java/net/minecraft/server/NBTTagCompound.java
 @@ -136,7 +136,7 @@ public class NBTTagCompound implements NBTBase {
@@ -103,7 +103,7 @@ index 75604dbc6..98deaba12 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
-index 475b7b004..de74e7214 100644
+index 475b7b004b..de74e7214a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
 @@ -2,6 +2,7 @@ package org.bukkit.craftbukkit.entity;
@@ -145,5 +145,5 @@ index 475b7b004..de74e7214 100644
 +    // Paper end
  }
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0136-PlayerTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/0137-PlayerTeleportEndGatewayEvent.patch
similarity index 92%
rename from Spigot-Server-Patches/0136-PlayerTeleportEndGatewayEvent.patch
rename to Spigot-Server-Patches/0137-PlayerTeleportEndGatewayEvent.patch
index 69880b6cc2..b4ff09f916 100644
--- a/Spigot-Server-Patches/0136-PlayerTeleportEndGatewayEvent.patch
+++ b/Spigot-Server-Patches/0137-PlayerTeleportEndGatewayEvent.patch
@@ -1,4 +1,4 @@
-From b399ea16b2848230ce345357ac855fc4e9b19a21 Mon Sep 17 00:00:00 2001
+From 814c2c20ab537baeb9d6e960d5224ce189271876 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 31 Dec 2016 21:44:50 -0500
 Subject: [PATCH] PlayerTeleportEndGatewayEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] PlayerTeleportEndGatewayEvent
 Allows you to access the Gateway being used in a teleport event
 
 diff --git a/src/main/java/net/minecraft/server/TileEntityEndGateway.java b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
-index b907a3c4d..78fba7937 100644
+index b907a3c4d8..78fba79378 100644
 --- a/src/main/java/net/minecraft/server/TileEntityEndGateway.java
 +++ b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
 @@ -133,7 +133,7 @@ public class TileEntityEndGateway extends TileEntityEnderPortal implements ITick
@@ -19,5 +19,5 @@ index b907a3c4d..78fba7937 100644
                      if (teleEvent.isCancelled()) {
                          return;
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0137-Provide-E-TE-Chunk-count-stat-methods.patch b/Spigot-Server-Patches/0138-Provide-E-TE-Chunk-count-stat-methods.patch
similarity index 95%
rename from Spigot-Server-Patches/0137-Provide-E-TE-Chunk-count-stat-methods.patch
rename to Spigot-Server-Patches/0138-Provide-E-TE-Chunk-count-stat-methods.patch
index bf4dc8480b..b1847f3413 100644
--- a/Spigot-Server-Patches/0137-Provide-E-TE-Chunk-count-stat-methods.patch
+++ b/Spigot-Server-Patches/0138-Provide-E-TE-Chunk-count-stat-methods.patch
@@ -1,4 +1,4 @@
-From 94daa691d441e249ceeffd0b9d6849bfd8417f4b Mon Sep 17 00:00:00 2001
+From f7deaf13648aaedfe20b2f5b6dcebb9d93ff870e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 Jan 2017 15:24:46 -0500
 Subject: [PATCH] Provide E/TE/Chunk count stat methods
@@ -7,7 +7,7 @@ Provides counts without the ineffeciency of using .getEntities().size()
 which creates copy of the collections.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 31213dd20..ebe30cc21 100644
+index f600d7f7c3..2abebd465a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -275,6 +275,48 @@ public class CraftWorld implements World {
@@ -60,5 +60,5 @@ index 31213dd20..ebe30cc21 100644
  
      public CraftWorld(WorldServer world, ChunkGenerator gen, Environment env) {
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0138-Enforce-Sync-Player-Saves.patch b/Spigot-Server-Patches/0139-Enforce-Sync-Player-Saves.patch
similarity index 90%
rename from Spigot-Server-Patches/0138-Enforce-Sync-Player-Saves.patch
rename to Spigot-Server-Patches/0139-Enforce-Sync-Player-Saves.patch
index bbe7963485..28c0452e8c 100644
--- a/Spigot-Server-Patches/0138-Enforce-Sync-Player-Saves.patch
+++ b/Spigot-Server-Patches/0139-Enforce-Sync-Player-Saves.patch
@@ -1,4 +1,4 @@
-From df4a5a4b9a37740c2ad02f8e9f51f4167f1257d6 Mon Sep 17 00:00:00 2001
+From 70b62dec73d594de95c2a87b103aa4c191f95c99 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 Jan 2017 15:41:58 -0500
 Subject: [PATCH] Enforce Sync Player Saves
@@ -7,7 +7,7 @@ Saving players async is extremely dangerous. This will force it to main
 the same way we handle async chunk loads.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index b7012b5b6..ce5bd2229 100644
+index b7012b5b64..ce5bd2229e 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -931,11 +931,13 @@ public abstract class PlayerList {
@@ -25,5 +25,5 @@ index b7012b5b6..ce5bd2229 100644
  
      public WhiteList getWhitelist() {
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0139-Don-t-allow-entities-to-ride-themselves-572.patch b/Spigot-Server-Patches/0140-Don-t-allow-entities-to-ride-themselves-572.patch
similarity index 88%
rename from Spigot-Server-Patches/0139-Don-t-allow-entities-to-ride-themselves-572.patch
rename to Spigot-Server-Patches/0140-Don-t-allow-entities-to-ride-themselves-572.patch
index b0ae663622..f668ac777a 100644
--- a/Spigot-Server-Patches/0139-Don-t-allow-entities-to-ride-themselves-572.patch
+++ b/Spigot-Server-Patches/0140-Don-t-allow-entities-to-ride-themselves-572.patch
@@ -1,11 +1,11 @@
-From d9e303b768837901e71e950b680879ca1ec734f4 Mon Sep 17 00:00:00 2001
+From 265ea866a833bd7b24bd2c9291f5f59c98be3c19 Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Sun, 8 Jan 2017 04:31:36 +0000
 Subject: [PATCH] Don't allow entities to ride themselves - #572
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 63d44401a..1619d9f41 100644
+index 63d44401ab..1619d9f415 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2025,6 +2025,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -17,5 +17,5 @@ index 63d44401a..1619d9f41 100644
              throw new IllegalStateException("Use x.startRiding(y), not y.addPassenger(x)");
          } else {
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0140-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/Spigot-Server-Patches/0141-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
similarity index 96%
rename from Spigot-Server-Patches/0140-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
rename to Spigot-Server-Patches/0141-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
index 08f1b5ca20..2c52ce6583 100644
--- a/Spigot-Server-Patches/0140-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/Spigot-Server-Patches/0141-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
@@ -1,4 +1,4 @@
-From 7803162d6eb5310a29f4ac2a5869eec6b0700432 Mon Sep 17 00:00:00 2001
+From f6485f8e7bacc338b5d415867da10c8ea455809f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 16:31:46 -0500
 Subject: [PATCH] ExperienceOrbs API for Reason/Source/Triggering player
@@ -8,7 +8,7 @@ Adds lots of information about why this orb exists.
 Replaces isFromBottle() with logic that persists entity reloads too.
 
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index e485d4a82..3e4fc4ee5 100644
+index e485d4a82c..3e4fc4ee5e 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -511,13 +511,13 @@ public class Block implements IMaterial {
@@ -28,7 +28,7 @@ index e485d4a82..3e4fc4ee5 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/ContainerGrindstone.java b/src/main/java/net/minecraft/server/ContainerGrindstone.java
-index 2d2cd09ad..ed88e208d 100644
+index 2d2cd09ad1..ed88e208d0 100644
 --- a/src/main/java/net/minecraft/server/ContainerGrindstone.java
 +++ b/src/main/java/net/minecraft/server/ContainerGrindstone.java
 @@ -81,7 +81,7 @@ public class ContainerGrindstone extends Container {
@@ -41,7 +41,7 @@ index 2d2cd09ad..ed88e208d 100644
  
                      world.triggerEffect(1042, blockposition, 0);
 diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index e0d240a89..07abcc1e2 100644
+index e0d240a89a..07abcc1e24 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
 @@ -616,7 +616,7 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
@@ -54,7 +54,7 @@ index e0d240a89..07abcc1e2 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index 0447800d9..d4275e733 100644
+index 0447800d9d..d4275e733d 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -16,9 +16,59 @@ public class EntityExperienceOrb extends Entity {
@@ -134,7 +134,7 @@ index 0447800d9..d4275e733 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
-index 8ad0d0db1..8d48154e5 100644
+index 8ad0d0db18..8d48154e5b 100644
 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
 @@ -401,7 +401,7 @@ public class EntityFishingHook extends Entity {
@@ -147,7 +147,7 @@ index 8ad0d0db1..8d48154e5 100644
                      // CraftBukkit end
                      if (itemstack1.getItem().a(TagsItem.FISHES)) {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 191e7dfaf..be85a76ac 100644
+index 191e7dfaf6..be85a76acd 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1377,7 +1377,8 @@ public abstract class EntityLiving extends Entity {
@@ -161,7 +161,7 @@ index 191e7dfaf..be85a76ac 100644
              this.expToDrop = 0;
          }
 diff --git a/src/main/java/net/minecraft/server/EntityThrownExpBottle.java b/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
-index 0bfc0a773..ba2f90cc6 100644
+index 0bfc0a773d..ba2f90cc6a 100644
 --- a/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
 +++ b/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
 @@ -43,7 +43,7 @@ public class EntityThrownExpBottle extends EntityProjectileThrowable {
@@ -174,7 +174,7 @@ index 0bfc0a773..ba2f90cc6 100644
  
              this.die();
 diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java
-index c73cc9ae4..76296119a 100644
+index c73cc9ae4b..76296119a1 100644
 --- a/src/main/java/net/minecraft/server/EntityTurtle.java
 +++ b/src/main/java/net/minecraft/server/EntityTurtle.java
 @@ -510,7 +510,7 @@ public class EntityTurtle extends EntityAnimal {
@@ -187,7 +187,7 @@ index c73cc9ae4..76296119a 100644
  
          }
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 00300c6aa..4aa947e24 100644
+index fddc28cd13..3b4a3a4fd2 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -506,7 +506,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -200,7 +200,7 @@ index 00300c6aa..4aa947e24 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/EntityVillagerTrader.java b/src/main/java/net/minecraft/server/EntityVillagerTrader.java
-index fa814814f..14ccf33c0 100644
+index fa814814fc..14ccf33c09 100644
 --- a/src/main/java/net/minecraft/server/EntityVillagerTrader.java
 +++ b/src/main/java/net/minecraft/server/EntityVillagerTrader.java
 @@ -147,7 +147,7 @@ public class EntityVillagerTrader extends EntityVillagerAbstract {
@@ -213,7 +213,7 @@ index fa814814f..14ccf33c0 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalBreed.java b/src/main/java/net/minecraft/server/PathfinderGoalBreed.java
-index 1ab2668e9..2b708761d 100644
+index 1ab2668e91..2b708761d0 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalBreed.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalBreed.java
 @@ -117,7 +117,7 @@ public class PathfinderGoalBreed extends PathfinderGoal {
@@ -226,7 +226,7 @@ index 1ab2668e9..2b708761d 100644
                  // CraftBukkit end
              }
 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index 46154b281..56f249c43 100644
+index 46154b2810..56f249c431 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
 @@ -374,7 +374,7 @@ public class PlayerInteractManager {
@@ -239,7 +239,7 @@ index 46154b281..56f249c43 100644
  
                  return true;
 diff --git a/src/main/java/net/minecraft/server/SlotFurnaceResult.java b/src/main/java/net/minecraft/server/SlotFurnaceResult.java
-index d2698e847..edc4a5c34 100644
+index d2698e847c..edc4a5c34e 100644
 --- a/src/main/java/net/minecraft/server/SlotFurnaceResult.java
 +++ b/src/main/java/net/minecraft/server/SlotFurnaceResult.java
 @@ -2,7 +2,7 @@ package net.minecraft.server;
@@ -252,7 +252,7 @@ index d2698e847..edc4a5c34 100644
  
      public SlotFurnaceResult(EntityHuman entityhuman, IInventory iinventory, int i, int j, int k) {
 diff --git a/src/main/java/net/minecraft/server/TileEntityFurnace.java b/src/main/java/net/minecraft/server/TileEntityFurnace.java
-index 2a51a241e..0419aea92 100644
+index 2a51a241ee..0419aea923 100644
 --- a/src/main/java/net/minecraft/server/TileEntityFurnace.java
 +++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java
 @@ -554,7 +554,7 @@ public abstract class TileEntityFurnace extends TileEntityContainer implements I
@@ -265,7 +265,7 @@ index 2a51a241e..0419aea92 100644
  
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 2abebd465..1e59f3f14 100644
+index 2abebd465a..1e59f3f147 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1773,7 +1773,7 @@ public class CraftWorld implements World {
@@ -278,7 +278,7 @@ index 2abebd465..1e59f3f14 100644
              entity = new EntityLightning(world, x, y, z, false);
          } else if (Firework.class.isAssignableFrom(clazz)) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
-index 1b512cc45..fbad04567 100644
+index 1b512cc45c..fbad045675 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
 @@ -20,6 +20,18 @@ public class CraftExperienceOrb extends CraftEntity implements ExperienceOrb {
diff --git a/Spigot-Server-Patches/0141-Cap-Entity-Collisions.patch b/Spigot-Server-Patches/0142-Cap-Entity-Collisions.patch
similarity index 93%
rename from Spigot-Server-Patches/0141-Cap-Entity-Collisions.patch
rename to Spigot-Server-Patches/0142-Cap-Entity-Collisions.patch
index e10c637a55..dd80b2ca25 100644
--- a/Spigot-Server-Patches/0141-Cap-Entity-Collisions.patch
+++ b/Spigot-Server-Patches/0142-Cap-Entity-Collisions.patch
@@ -1,4 +1,4 @@
-From c667019226f7a78de46e1e18cdc92176f0b1044c Mon Sep 17 00:00:00 2001
+From b4c4fa54f5a94e4d29234238e452812550993522 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 22 Jan 2017 18:07:56 -0500
 Subject: [PATCH] Cap Entity Collisions
@@ -12,7 +12,7 @@ just as it does in Vanilla, but entity pushing logic will be capped.
 You can set this to 0 to disable collisions.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index bf11448bc..e00e1e8f6 100644
+index bf11448bcd..e00e1e8f6a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -320,4 +320,10 @@ public class PaperWorldConfig {
@@ -27,7 +27,7 @@ index bf11448bc..e00e1e8f6 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 1619d9f41..fcfe8f550 100644
+index 1619d9f415..fcfe8f550d 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -189,6 +189,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -39,7 +39,7 @@ index 1619d9f41..fcfe8f550 100644
      // Spigot end
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index be85a76ac..6379b361a 100644
+index be85a76acd..6379b361a9 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2621,8 +2621,11 @@ public abstract class EntityLiving extends Entity {
@@ -56,5 +56,5 @@ index be85a76ac..6379b361a 100644
                  this.C(entity);
              }
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0142-Remove-CraftScheduler-Async-Task-Debugger.patch b/Spigot-Server-Patches/0143-Remove-CraftScheduler-Async-Task-Debugger.patch
similarity index 95%
rename from Spigot-Server-Patches/0142-Remove-CraftScheduler-Async-Task-Debugger.patch
rename to Spigot-Server-Patches/0143-Remove-CraftScheduler-Async-Task-Debugger.patch
index f4491eacfb..c11183ea1f 100644
--- a/Spigot-Server-Patches/0142-Remove-CraftScheduler-Async-Task-Debugger.patch
+++ b/Spigot-Server-Patches/0143-Remove-CraftScheduler-Async-Task-Debugger.patch
@@ -1,4 +1,4 @@
-From 37411084342435f6aad5b3250a8c95300c63489c Mon Sep 17 00:00:00 2001
+From 1819a4fd44fc92d50e4861e5e6698c97ec1bf515 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 5 Feb 2017 00:04:04 -0500
 Subject: [PATCH] Remove CraftScheduler Async Task Debugger
@@ -9,7 +9,7 @@ One report of a suspected memory leak with the system.
 This adds additional overhead to asynchronous task dispatching
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index 552daf437..e102be583 100644
+index 552daf4376..e102be583c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 @@ -414,7 +414,7 @@ public class CraftScheduler implements BukkitScheduler {
@@ -47,5 +47,5 @@ index 552daf437..e102be583 100644
  
      @Deprecated
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0143-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch b/Spigot-Server-Patches/0144-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
similarity index 95%
rename from Spigot-Server-Patches/0143-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
rename to Spigot-Server-Patches/0144-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
index 8c904589fb..527befb451 100644
--- a/Spigot-Server-Patches/0143-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
+++ b/Spigot-Server-Patches/0144-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
@@ -1,11 +1,11 @@
-From ea0c748587a2f8db9942b79451971ba63d98d112 Mon Sep 17 00:00:00 2001
+From ef5f87f2ce646100c67be2d67abf14c1e210539f Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Tue, 7 Feb 2017 16:55:35 -0600
 Subject: [PATCH] Make targetSize more aggressive in the chunk unload queue
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 1d4eddd93..492d1538f 100644
+index 1d4eddd931..492d1538fa 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -110,7 +110,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -37,5 +37,5 @@ index 1d4eddd93..492d1538f 100644
          }
  
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0144-Do-not-let-armorstands-drown.patch b/Spigot-Server-Patches/0145-Do-not-let-armorstands-drown.patch
similarity index 93%
rename from Spigot-Server-Patches/0144-Do-not-let-armorstands-drown.patch
rename to Spigot-Server-Patches/0145-Do-not-let-armorstands-drown.patch
index 053e162014..07766fc6f4 100644
--- a/Spigot-Server-Patches/0144-Do-not-let-armorstands-drown.patch
+++ b/Spigot-Server-Patches/0145-Do-not-let-armorstands-drown.patch
@@ -1,11 +1,11 @@
-From fb88fcc7b5baa69684dd4771823d7a4a8aa14ed2 Mon Sep 17 00:00:00 2001
+From 5e59ad29bd851e66e208d654a3ef888007f43c0b Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 18 Feb 2017 19:29:58 -0600
 Subject: [PATCH] Do not let armorstands drown
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 37ce4d48b..80bf58b05 100644
+index 37ce4d48bc..80bf58b052 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -826,5 +826,10 @@ public class EntityArmorStand extends EntityLiving {
@@ -20,7 +20,7 @@ index 37ce4d48b..80bf58b05 100644
      // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 6379b361a..f6cb18639 100644
+index 6379b361a9..f6cb18639c 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -227,6 +227,7 @@ public abstract class EntityLiving extends Entity {
@@ -41,5 +41,5 @@ index 6379b361a..f6cb18639 100644
                      if (this.getAirTicks() == -20) {
                          this.setAirTicks(0);
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0145-Properly-handle-async-calls-to-restart-the-server.patch b/Spigot-Server-Patches/0146-Properly-handle-async-calls-to-restart-the-server.patch
similarity index 98%
rename from Spigot-Server-Patches/0145-Properly-handle-async-calls-to-restart-the-server.patch
rename to Spigot-Server-Patches/0146-Properly-handle-async-calls-to-restart-the-server.patch
index dc74a535c1..fa1f4eba24 100644
--- a/Spigot-Server-Patches/0145-Properly-handle-async-calls-to-restart-the-server.patch
+++ b/Spigot-Server-Patches/0146-Properly-handle-async-calls-to-restart-the-server.patch
@@ -1,4 +1,4 @@
-From 6be55762cf5ee4507a7f72325554765c96dc7d2c Mon Sep 17 00:00:00 2001
+From 06e0b57232e7d6e1f4307a3f348ba347fcf5bd60 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 12 May 2017 23:34:11 -0500
 Subject: [PATCH] Properly handle async calls to restart the server
@@ -30,7 +30,7 @@ will have plugins and worlds saving to the disk has a high potential to result
 in corruption/dataloss.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 38bf3ea44..a180ba6b0 100644
+index 38bf3ea449..a180ba6b0c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -88,6 +88,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -73,7 +73,7 @@ index 38bf3ea44..a180ba6b0 100644
      // Spigot Start
      private static double calcTps(double avg, double exp, double tps)
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index ce5bd2229..1eb53f67e 100644
+index ce5bd2229e..1eb53f67ef 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1042,10 +1042,15 @@ public abstract class PlayerList {
@@ -102,7 +102,7 @@ index ce5bd2229..1eb53f67e 100644
      // CraftBukkit start
      public void sendMessage(IChatBaseComponent[] iChatBaseComponents) {
 diff --git a/src/main/java/org/spigotmc/RestartCommand.java b/src/main/java/org/spigotmc/RestartCommand.java
-index ccea803f5..aefea3a9a 100644
+index ccea803f58..aefea3a9a8 100644
 --- a/src/main/java/org/spigotmc/RestartCommand.java
 +++ b/src/main/java/org/spigotmc/RestartCommand.java
 @@ -46,86 +46,134 @@ public class RestartCommand extends Command
@@ -307,5 +307,5 @@ index ccea803f5..aefea3a9a 100644
 +
  }
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0146-Add-system-property-to-disable-book-size-limits.patch b/Spigot-Server-Patches/0147-Add-system-property-to-disable-book-size-limits.patch
similarity index 96%
rename from Spigot-Server-Patches/0146-Add-system-property-to-disable-book-size-limits.patch
rename to Spigot-Server-Patches/0147-Add-system-property-to-disable-book-size-limits.patch
index fb060f2ade..c7014c78db 100644
--- a/Spigot-Server-Patches/0146-Add-system-property-to-disable-book-size-limits.patch
+++ b/Spigot-Server-Patches/0147-Add-system-property-to-disable-book-size-limits.patch
@@ -1,4 +1,4 @@
-From 2d1817280a0d11836091e26148edcc8ba09a689a Mon Sep 17 00:00:00 2001
+From f71ea06b0827a788f11a9108fb099317c506ccbf Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 13 May 2017 20:11:21 -0500
 Subject: [PATCH] Add system property to disable book size limits
@@ -11,7 +11,7 @@ to make books with as much data as they want. Do not use this without
 limiting incoming data from packets in some other way.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
-index 0e89025a0..1bf74bdae 100644
+index 0e89025a06..1bf74bdaea 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
 @@ -36,6 +36,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
@@ -57,5 +57,5 @@ index 0e89025a0..1bf74bdae 100644
              }
  
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0147-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/Spigot-Server-Patches/0148-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
similarity index 94%
rename from Spigot-Server-Patches/0147-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
rename to Spigot-Server-Patches/0148-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
index d623f91ed7..3662e40e74 100644
--- a/Spigot-Server-Patches/0147-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
+++ b/Spigot-Server-Patches/0148-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
@@ -1,4 +1,4 @@
-From 2efa7347f652e1e7343139018169984a046c3812 Mon Sep 17 00:00:00 2001
+From ec99b16f0ef9b97e6d5464724b1a76dd91451399 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 16 May 2017 21:29:08 -0500
 Subject: [PATCH] Add option to make parrots stay on shoulders despite movement
@@ -11,7 +11,7 @@ I suspect Mojang may switch to this behavior before full release.
 To be converted into a Paper-API event at some point in the future?
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index e00e1e8f6..f151e43c3 100644
+index e00e1e8f6a..f151e43c38 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -326,4 +326,10 @@ public class PaperWorldConfig {
@@ -26,7 +26,7 @@ index e00e1e8f6..f151e43c3 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 242d0df1c..673e2b79d 100644
+index 242d0df1c0..673e2b79d5 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -463,7 +463,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -39,7 +39,7 @@ index 242d0df1c..673e2b79d 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index cc6a2aaeb..01ab2e151 100644
+index cc6a2aaeb3..01ab2e1516 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1772,6 +1772,13 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -57,5 +57,5 @@ index cc6a2aaeb..01ab2e151 100644
              case RELEASE_SHIFT_KEY:
                  this.player.setSneaking(false);
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0148-Add-configuration-option-to-prevent-player-names-fro.patch b/Spigot-Server-Patches/0149-Add-configuration-option-to-prevent-player-names-fro.patch
similarity index 91%
rename from Spigot-Server-Patches/0148-Add-configuration-option-to-prevent-player-names-fro.patch
rename to Spigot-Server-Patches/0149-Add-configuration-option-to-prevent-player-names-fro.patch
index b923639f33..acb6f7b912 100644
--- a/Spigot-Server-Patches/0148-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/Spigot-Server-Patches/0149-Add-configuration-option-to-prevent-player-names-fro.patch
@@ -1,4 +1,4 @@
-From 0c7cb8c62714ae93958efc38d6b7a613fccc339c Mon Sep 17 00:00:00 2001
+From afcc911a162ba846da9493a6642a834db37a8a2c Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Fri, 9 Jun 2017 07:24:34 -0700
 Subject: [PATCH] Add configuration option to prevent player names from being
@@ -6,7 +6,7 @@ Subject: [PATCH] Add configuration option to prevent player names from being
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 5a83fc21c..295b8390c 100644
+index 5a83fc21cb..295b8390cb 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -259,4 +259,9 @@ public class PaperConfig {
@@ -20,7 +20,7 @@ index 5a83fc21c..295b8390c 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 811c33b90..77bb68605 100644
+index 811c33b900..77bb686052 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2099,5 +2099,10 @@ public final class CraftServer implements Server {
@@ -35,5 +35,5 @@ index 811c33b90..77bb68605 100644
      // Paper end
  }
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0149-Use-TerminalConsoleAppender-for-console-improvements.patch b/Spigot-Server-Patches/0150-Use-TerminalConsoleAppender-for-console-improvements.patch
similarity index 98%
rename from Spigot-Server-Patches/0149-Use-TerminalConsoleAppender-for-console-improvements.patch
rename to Spigot-Server-Patches/0150-Use-TerminalConsoleAppender-for-console-improvements.patch
index b0121a0ce2..5e7d45d9ae 100644
--- a/Spigot-Server-Patches/0149-Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/Spigot-Server-Patches/0150-Use-TerminalConsoleAppender-for-console-improvements.patch
@@ -1,4 +1,4 @@
-From 9c98c9243d9cc8b495dce4ef15ed0df94c8d0df5 Mon Sep 17 00:00:00 2001
+From 66c89823b46d9e650360ebebe95bb84b06856cec Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Fri, 9 Jun 2017 19:03:43 +0200
 Subject: [PATCH] Use TerminalConsoleAppender for console improvements
@@ -19,7 +19,7 @@ Other changes:
     configuration
 
 diff --git a/pom.xml b/pom.xml
-index ae1de6d01..f716e9870 100644
+index ae1de6d010..f716e98702 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -41,10 +41,27 @@
@@ -75,7 +75,7 @@ index ae1de6d01..f716e9870 100644
                  <groupId>org.apache.maven.plugins</groupId>
 diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
 new file mode 100644
-index 000000000..cd6e25923
+index 0000000000..cd6e259239
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
 @@ -0,0 +1,40 @@
@@ -121,7 +121,7 @@ index 000000000..cd6e25923
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java
 new file mode 100644
-index 000000000..685deaa0e
+index 0000000000..685deaa0e5
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java
 @@ -0,0 +1,17 @@
@@ -143,7 +143,7 @@ index 000000000..685deaa0e
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index a5a8bad4f..dfe806291 100644
+index a5a8bad4f8..dfe8062919 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -85,6 +85,9 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -185,7 +185,7 @@ index a5a8bad4f..dfe806291 100644
          System.setOut(new PrintStream(new LoggerOutputStream(logger, Level.INFO), true));
          System.setErr(new PrintStream(new LoggerOutputStream(logger, Level.WARN), true));
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index a180ba6b0..7df3ae0ec 100644
+index a180ba6b0c..7df3ae0ec5 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -57,7 +57,7 @@ import org.apache.commons.lang3.Validate;
@@ -244,7 +244,7 @@ index a180ba6b0..7df3ae0ec 100644
  
      public KeyPair getKeyPair() {
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 1eb53f67e..308bc3baf 100644
+index 1eb53f67ef..308bc3baf2 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -76,8 +76,7 @@ public abstract class PlayerList {
@@ -258,7 +258,7 @@ index 1eb53f67e..308bc3baf 100644
  
          this.k = new GameProfileBanList(PlayerList.b);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 77bb68605..cd58906ad 100644
+index 77bb686052..cd58906ad4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -41,7 +41,6 @@ import java.util.function.Consumer;
@@ -284,7 +284,7 @@ index 77bb68605..cd58906ad 100644
      @Override
      public PluginCommand getPluginCommand(String name) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 4a4e56e76..b562e95dc 100644
+index 4a4e56e764..b562e95dcd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -13,7 +13,7 @@ import java.util.logging.Logger;
@@ -335,7 +335,7 @@ index 4a4e56e76..b562e95dc 100644
              } catch (Throwable t) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java b/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java
 deleted file mode 100644
-index fdf2f075e..000000000
+index fdf2f075e2..0000000000
 --- a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java
 +++ /dev/null
 @@ -1,72 +0,0 @@
@@ -412,7 +412,7 @@ index fdf2f075e..000000000
 -    }
 -}
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
-index befcc19f9..5510266fb 100644
+index befcc19f9b..5510266fb1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
 +++ b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
 @@ -4,20 +4,31 @@ import java.util.Collections;
@@ -495,7 +495,7 @@ index befcc19f9..5510266fb 100644
      }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
-index 70f8d4299..449e99d1b 100644
+index 70f8d42992..449e99d1b6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
 @@ -17,7 +17,7 @@ public class ServerShutdownThread extends Thread {
@@ -509,7 +509,7 @@ index 70f8d4299..449e99d1b 100644
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java b/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java
 deleted file mode 100644
-index f267f99f9..000000000
+index f267f99f96..0000000000
 --- a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java
 +++ /dev/null
 @@ -1,57 +0,0 @@
@@ -572,13 +572,13 @@ index f267f99f9..000000000
 -}
 diff --git a/src/main/resources/log4j2.component.properties b/src/main/resources/log4j2.component.properties
 new file mode 100644
-index 000000000..0694b2146
+index 0000000000..0694b21465
 --- /dev/null
 +++ b/src/main/resources/log4j2.component.properties
 @@ -0,0 +1 @@
 +log4j.skipJansi=true
 diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index 490a9acc7..08b6bb7f9 100644
+index 490a9acc70..08b6bb7f97 100644
 --- a/src/main/resources/log4j2.xml
 +++ b/src/main/resources/log4j2.xml
 @@ -1,12 +1,11 @@
@@ -608,5 +608,5 @@ index 490a9acc7..08b6bb7f9 100644
              <AppenderRef ref="TerminalConsole" level="info"/>
          </Root>
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0150-provide-a-configurable-option-to-disable-creeper-lin.patch b/Spigot-Server-Patches/0151-provide-a-configurable-option-to-disable-creeper-lin.patch
similarity index 92%
rename from Spigot-Server-Patches/0150-provide-a-configurable-option-to-disable-creeper-lin.patch
rename to Spigot-Server-Patches/0151-provide-a-configurable-option-to-disable-creeper-lin.patch
index 2dcae93ffb..fad59f6083 100644
--- a/Spigot-Server-Patches/0150-provide-a-configurable-option-to-disable-creeper-lin.patch
+++ b/Spigot-Server-Patches/0151-provide-a-configurable-option-to-disable-creeper-lin.patch
@@ -1,4 +1,4 @@
-From 221b72d1ca538a47727288b31db4e4069ec289e7 Mon Sep 17 00:00:00 2001
+From 87f4257f24379f12edcb7b596bc3f0f41550735e Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 11 Jun 2017 21:01:18 +0100
 Subject: [PATCH] provide a configurable option to disable creeper lingering
@@ -6,7 +6,7 @@ Subject: [PATCH] provide a configurable option to disable creeper lingering
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index f151e43c3..c145e27cc 100644
+index f151e43c38..c145e27ccb 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -332,4 +332,10 @@ public class PaperWorldConfig {
@@ -21,7 +21,7 @@ index f151e43c3..c145e27cc 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
-index 859b52845..dabe40c5f 100644
+index 859b528456..dabe40c5f9 100644
 --- a/src/main/java/net/minecraft/server/EntityCreeper.java
 +++ b/src/main/java/net/minecraft/server/EntityCreeper.java
 @@ -228,7 +228,7 @@ public class EntityCreeper extends EntityMonster {
@@ -34,5 +34,5 @@ index 859b52845..dabe40c5f 100644
  
              entityareaeffectcloud.setSource(this); // CraftBukkit
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0151-Item-canEntityPickup.patch b/Spigot-Server-Patches/0152-Item-canEntityPickup.patch
similarity index 92%
rename from Spigot-Server-Patches/0151-Item-canEntityPickup.patch
rename to Spigot-Server-Patches/0152-Item-canEntityPickup.patch
index abbc303dac..0bff5224e8 100644
--- a/Spigot-Server-Patches/0151-Item-canEntityPickup.patch
+++ b/Spigot-Server-Patches/0152-Item-canEntityPickup.patch
@@ -1,11 +1,11 @@
-From d5f7773be6ecef58bcea504533c3bb613ee1ceb5 Mon Sep 17 00:00:00 2001
+From 37702d06c80affdbcdff440d82ad3357e660fe1d Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 5 May 2017 03:57:17 -0500
 Subject: [PATCH] Item#canEntityPickup
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index dac3540c6..eadac07f6 100644
+index dac3540c6b..eadac07f69 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -513,6 +513,11 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -21,7 +21,7 @@ index dac3540c6..eadac07f6 100644
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index f657607a1..9973fc0b1 100644
+index f657607a15..9973fc0b12 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -20,6 +20,7 @@ public class EntityItem extends Entity {
@@ -33,7 +33,7 @@ index f657607a1..9973fc0b1 100644
      public EntityItem(EntityTypes<? extends EntityItem> entitytypes, World world) {
          super(entitytypes, world);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
-index cc593fbc9..3f552b590 100644
+index cc593fbc99..3f552b5905 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 @@ -48,6 +48,16 @@ public class CraftItem extends CraftEntity implements Item {
@@ -54,5 +54,5 @@ index cc593fbc9..3f552b590 100644
      public String toString() {
          return "CraftItem";
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0152-PlayerPickupItemEvent-setFlyAtPlayer.patch b/Spigot-Server-Patches/0153-PlayerPickupItemEvent-setFlyAtPlayer.patch
similarity index 95%
rename from Spigot-Server-Patches/0152-PlayerPickupItemEvent-setFlyAtPlayer.patch
rename to Spigot-Server-Patches/0153-PlayerPickupItemEvent-setFlyAtPlayer.patch
index a9d79bc472..cd899ec3ce 100644
--- a/Spigot-Server-Patches/0152-PlayerPickupItemEvent-setFlyAtPlayer.patch
+++ b/Spigot-Server-Patches/0153-PlayerPickupItemEvent-setFlyAtPlayer.patch
@@ -1,11 +1,11 @@
-From d564e48afbfbcf86f14ef7d91940a5fc82b7b9ee Mon Sep 17 00:00:00 2001
+From 22e480619883ebfb9c513063ee24f30ed745b7a0 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 May 2017 06:26:09 -0500
 Subject: [PATCH] PlayerPickupItemEvent#setFlyAtPlayer
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index 9973fc0b1..4b2e19f30 100644
+index 9973fc0b12..4b2e19f308 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -322,6 +322,7 @@ public class EntityItem extends Entity {
@@ -45,5 +45,5 @@ index 9973fc0b1..4b2e19f30 100644
                      this.die();
                      itemstack.setCount(i);
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0153-PlayerAttemptPickupItemEvent.patch b/Spigot-Server-Patches/0154-PlayerAttemptPickupItemEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0153-PlayerAttemptPickupItemEvent.patch
rename to Spigot-Server-Patches/0154-PlayerAttemptPickupItemEvent.patch
index c8e051ded9..cb77652bc1 100644
--- a/Spigot-Server-Patches/0153-PlayerAttemptPickupItemEvent.patch
+++ b/Spigot-Server-Patches/0154-PlayerAttemptPickupItemEvent.patch
@@ -1,11 +1,11 @@
-From 48df7a39fc7f335f7b3b6e7404156087612219af Mon Sep 17 00:00:00 2001
+From d23ead16ce3d5eb25d6e66d733194b07cc598101 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 11 Jun 2017 16:30:30 -0500
 Subject: [PATCH] PlayerAttemptPickupItemEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index 4b2e19f30..fcc1c0993 100644
+index 4b2e19f308..fcc1c0993d 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -9,6 +9,7 @@ import javax.annotation.Nullable;
@@ -40,5 +40,5 @@ index 4b2e19f30..fcc1c0993 100644
                  itemstack.setCount(canHold);
                  // Call legacy event
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0154-Add-UnknownCommandEvent.patch b/Spigot-Server-Patches/0155-Add-UnknownCommandEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0154-Add-UnknownCommandEvent.patch
rename to Spigot-Server-Patches/0155-Add-UnknownCommandEvent.patch
index fc74e64bd4..3b75b59de6 100644
--- a/Spigot-Server-Patches/0154-Add-UnknownCommandEvent.patch
+++ b/Spigot-Server-Patches/0155-Add-UnknownCommandEvent.patch
@@ -1,11 +1,11 @@
-From 0da274f7c094ef3191d0881e7739d9109eb19975 Mon Sep 17 00:00:00 2001
+From 87dbe871dc3acb33ff070e684f6743048f96d41f Mon Sep 17 00:00:00 2001
 From: Sweepyoface <github@sweepy.pw>
 Date: Sat, 17 Jun 2017 18:48:21 -0400
 Subject: [PATCH] Add UnknownCommandEvent
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index cd58906ad..202f6ad68 100644
+index cd58906ad4..202f6ad68b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -77,6 +77,7 @@ import net.minecraft.server.WorldServer;
@@ -40,5 +40,5 @@ index cd58906ad..202f6ad68 100644
          // Spigot end
  
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0155-Basic-PlayerProfile-API.patch b/Spigot-Server-Patches/0156-Basic-PlayerProfile-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0155-Basic-PlayerProfile-API.patch
rename to Spigot-Server-Patches/0156-Basic-PlayerProfile-API.patch
index ef25488110..bd230a5358 100644
--- a/Spigot-Server-Patches/0155-Basic-PlayerProfile-API.patch
+++ b/Spigot-Server-Patches/0156-Basic-PlayerProfile-API.patch
@@ -1,4 +1,4 @@
-From eceb81a7db137272593422ec5de6c890ba92f9d4 Mon Sep 17 00:00:00 2001
+From 701befb83fdaa729136843a5b102226c44de41de Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 15 Jan 2018 22:11:48 -0500
 Subject: [PATCH] Basic PlayerProfile API
@@ -7,7 +7,7 @@ Establishes base extension of profile systems for future edits too
 
 diff --git a/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java
 new file mode 100644
-index 000000000..b151a13c1
+index 0000000000..b151a13c1b
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java
 @@ -0,0 +1,280 @@
@@ -293,7 +293,7 @@ index 000000000..b151a13c1
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperAuthenticationService.java b/src/main/java/com/destroystokyo/paper/profile/PaperAuthenticationService.java
 new file mode 100644
-index 000000000..25836b975
+index 0000000000..25836b975b
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperAuthenticationService.java
 @@ -0,0 +1,30 @@
@@ -329,7 +329,7 @@ index 000000000..25836b975
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java b/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java
 new file mode 100644
-index 000000000..3bcdb8f93
+index 0000000000..3bcdb8f93f
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java
 @@ -0,0 +1,17 @@
@@ -352,7 +352,7 @@ index 000000000..3bcdb8f93
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java
 new file mode 100644
-index 000000000..4b2a67423
+index 0000000000..4b2a67423f
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java
 @@ -0,0 +1,29 @@
@@ -387,7 +387,7 @@ index 000000000..4b2a67423
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperUserAuthentication.java b/src/main/java/com/destroystokyo/paper/profile/PaperUserAuthentication.java
 new file mode 100644
-index 000000000..3aceb0ea8
+index 0000000000..3aceb0ea8a
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperUserAuthentication.java
 @@ -0,0 +1,11 @@
@@ -403,7 +403,7 @@ index 000000000..3aceb0ea8
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
-index 2f10dab36..670f8313a 100644
+index 2f10dab36c..670f8313ae 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
 @@ -1,7 +1,10 @@
@@ -429,7 +429,7 @@ index 2f10dab36..670f8313a 100644
       * Calculates distance between 2 entities
       * @param e1
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 7df3ae0ec..1ddb10741 100644
+index 7df3ae0ec5..1ddb10741b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1289,7 +1289,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -450,7 +450,7 @@ index 7df3ae0ec..1ddb10741 100644
          return this.minecraftSessionService;
      }
 diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java
-index 581199e6d..a072222bc 100644
+index 581199e6dc..a072222bc5 100644
 --- a/src/main/java/net/minecraft/server/UserCache.java
 +++ b/src/main/java/net/minecraft/server/UserCache.java
 @@ -43,7 +43,7 @@ public class UserCache {
@@ -486,7 +486,7 @@ index 581199e6d..a072222bc 100644
  
          private UserCacheEntry(GameProfile gameprofile, Date date) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 202f6ad68..2f7769c00 100644
+index 202f6ad68b..2f7769c00e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -197,6 +197,9 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
@@ -525,5 +525,5 @@ index 202f6ad68..2f7769c00 100644
      // Paper end
  }
 -- 
-2.24.0
+2.24.1
 
diff --git a/Spigot-Server-Patches/0156-Shoulder-Entities-Release-API.patch b/Spigot-Server-Patches/0157-Shoulder-Entities-Release-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0156-Shoulder-Entities-Release-API.patch
rename to Spigot-Server-Patches/0157-Shoulder-Entities-Release-API.patch
index e7a38de6a5..f61da0e301 100644
--- a/Spigot-Server-Patches/0156-Shoulder-Entities-Release-API.patch
+++ b/Spigot-Server-Patches/0157-Shoulder-Entities-Release-API.patch
@@ -1,11 +1,11 @@
-From d07f3a2beb5500decddbeece416426183bde9c91 Mon Sep 17 00:00:00 2001
+From db651db982d33c97c1e9672009e7aca3bb032af5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 17 Jun 2017 15:18:30 -0400
 Subject: [PATCH] Shoulder Entities Release API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 673e2b79d..2d982ce1e 100644
+index 673e2b79d5..2d982ce1e0 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -1893,20 +1893,44 @@ public abstract class EntityHuman extends EntityLiving {
@@ -58,7 +58,7 @@ index 673e2b79d..2d982ce1e 100644
      @Override
      public abstract boolean isSpectator();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 66cd2db1e..a1397d142 100644
+index 66cd2db1ea..a1397d1427 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -665,6 +665,32 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@@ -95,5 +95,5 @@ index 66cd2db1e..a1397d142 100644
      public boolean discoverRecipe(NamespacedKey recipe) {
          return discoverRecipes(Arrays.asList(recipe)) != 0;
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0157-Profile-Lookup-Events.patch b/Spigot-Server-Patches/0158-Profile-Lookup-Events.patch
similarity index 97%
rename from Spigot-Server-Patches/0157-Profile-Lookup-Events.patch
rename to Spigot-Server-Patches/0158-Profile-Lookup-Events.patch
index 48b5441469..596880fd20 100644
--- a/Spigot-Server-Patches/0157-Profile-Lookup-Events.patch
+++ b/Spigot-Server-Patches/0158-Profile-Lookup-Events.patch
@@ -1,4 +1,4 @@
-From 231e2f402814cd547155b82ee47531f0a81dfb97 Mon Sep 17 00:00:00 2001
+From 16e3b587fce6bea6237f111906fb01d94eb0b0db Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 17 Jun 2017 17:00:32 -0400
 Subject: [PATCH] Profile Lookup Events
@@ -7,7 +7,7 @@ Adds a Pre Lookup Event and a Post Lookup Event so that plugins may prefill in p
 profiles that had to be looked up.
 
 diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java b/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java
-index 3bcdb8f93..bb9894318 100644
+index 3bcdb8f93f..bb9894318e 100644
 --- a/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java
 @@ -1,17 +1,68 @@
@@ -81,5 +81,5 @@ index 3bcdb8f93..bb9894318 100644
      }
  }
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0158-Block-player-logins-during-server-shutdown.patch b/Spigot-Server-Patches/0159-Block-player-logins-during-server-shutdown.patch
similarity index 90%
rename from Spigot-Server-Patches/0158-Block-player-logins-during-server-shutdown.patch
rename to Spigot-Server-Patches/0159-Block-player-logins-during-server-shutdown.patch
index 1873f0dc9c..bab279e5c5 100644
--- a/Spigot-Server-Patches/0158-Block-player-logins-during-server-shutdown.patch
+++ b/Spigot-Server-Patches/0159-Block-player-logins-during-server-shutdown.patch
@@ -1,11 +1,11 @@
-From 94a516b0a57ec3612f96098903af158bff7ce867 Mon Sep 17 00:00:00 2001
+From af3ffc6a7e90eb89f8a73291717e6cd3eb038500 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 2 Jul 2017 21:35:56 -0500
 Subject: [PATCH] Block player logins during server shutdown
 
 
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index 3683fa298..6f7c71579 100644
+index 3683fa2984..6f7c715794 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -49,6 +49,12 @@ public class LoginListener implements PacketLoginInListener {
@@ -22,5 +22,5 @@ index 3683fa298..6f7c71579 100644
              this.c();
          } else if (this.g == LoginListener.EnumProtocolState.DELAY_ACCEPT) {
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0159-Entity-fromMobSpawner.patch b/Spigot-Server-Patches/0160-Entity-fromMobSpawner.patch
similarity index 94%
rename from Spigot-Server-Patches/0159-Entity-fromMobSpawner.patch
rename to Spigot-Server-Patches/0160-Entity-fromMobSpawner.patch
index 939148237c..df9e31a834 100644
--- a/Spigot-Server-Patches/0159-Entity-fromMobSpawner.patch
+++ b/Spigot-Server-Patches/0160-Entity-fromMobSpawner.patch
@@ -1,11 +1,11 @@
-From 56e14834b23acaeffb94083b1e35cc7a40b98c33 Mon Sep 17 00:00:00 2001
+From 320aa57d604f28bc1f678be85099222483c4dba7 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 18 Jun 2017 18:17:05 -0500
 Subject: [PATCH] Entity#fromMobSpawner()
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index fcfe8f550..7c4ab7fe7 100644
+index fcfe8f550d..7c4ab7fe72 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -189,6 +189,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -37,7 +37,7 @@ index fcfe8f550..7c4ab7fe7 100644
  
          } catch (Throwable throwable) {
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index deb32db2b..8384a2cbf 100644
+index deb32db2b2..8384a2cbf8 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -134,6 +134,7 @@ public abstract class MobSpawnerAbstract {
@@ -49,7 +49,7 @@ index deb32db2b..8384a2cbf 100644
                          if ( entity.world.spigotConfig.nerfSpawnerMobs )
                          {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index bb07dec3c..495a7c464 100644
+index bb07dec3c8..495a7c464f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -1045,5 +1045,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -64,5 +64,5 @@ index bb07dec3c..495a7c464 100644
      // Paper end
  }
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0160-Improve-the-Saddle-API-for-Horses.patch b/Spigot-Server-Patches/0161-Improve-the-Saddle-API-for-Horses.patch
similarity index 94%
rename from Spigot-Server-Patches/0160-Improve-the-Saddle-API-for-Horses.patch
rename to Spigot-Server-Patches/0161-Improve-the-Saddle-API-for-Horses.patch
index 850386ea14..8e07c07137 100644
--- a/Spigot-Server-Patches/0160-Improve-the-Saddle-API-for-Horses.patch
+++ b/Spigot-Server-Patches/0161-Improve-the-Saddle-API-for-Horses.patch
@@ -1,4 +1,4 @@
-From dca9dc7dc24627c6e09515251c1235d96365f14f Mon Sep 17 00:00:00 2001
+From 62cabe177f1205d2a6dc64aea56a228b0d2e20ae Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 10 Dec 2016 16:24:06 -0500
 Subject: [PATCH] Improve the Saddle API for Horses
@@ -7,7 +7,7 @@ Not all horses with Saddles have armor. This lets us break up the horses with sa
 and access their saddle state separately from an interface shared with Armor.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
-index 09016e354..9952db3eb 100644
+index 09016e3547..9952db3eb5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
 @@ -6,6 +6,7 @@ import net.minecraft.server.EntityHorseAbstract;
@@ -27,7 +27,7 @@ index 09016e354..9952db3eb 100644
      }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java
-index 63991bf4b..9a47a1adc 100644
+index 63991bf4be..9a47a1adc1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java
 @@ -4,7 +4,7 @@ import net.minecraft.server.IInventory;
@@ -41,7 +41,7 @@ index 63991bf4b..9a47a1adc 100644
          super(inventory);
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftSaddledInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftSaddledInventory.java
 new file mode 100644
-index 000000000..99cfbaf90
+index 0000000000..99cfbaf90b
 --- /dev/null
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftSaddledInventory.java
 @@ -0,0 +1,15 @@
@@ -61,5 +61,5 @@ index 000000000..99cfbaf90
 +
 +}
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0161-Implement-ensureServerConversions-API.patch b/Spigot-Server-Patches/0162-Implement-ensureServerConversions-API.patch
similarity index 91%
rename from Spigot-Server-Patches/0161-Implement-ensureServerConversions-API.patch
rename to Spigot-Server-Patches/0162-Implement-ensureServerConversions-API.patch
index 279c12ccbc..f5d34b888e 100644
--- a/Spigot-Server-Patches/0161-Implement-ensureServerConversions-API.patch
+++ b/Spigot-Server-Patches/0162-Implement-ensureServerConversions-API.patch
@@ -1,4 +1,4 @@
-From 8265eef5c89938c66997f160170ef15c83912669 Mon Sep 17 00:00:00 2001
+From a1209416ec3aa88eaa43a52746caff71f1044a61 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 May 2016 22:43:12 -0400
 Subject: [PATCH] Implement ensureServerConversions API
@@ -7,7 +7,7 @@ This will take a Bukkit ItemStack and run it through any conversions a server pr
 to ensure it meets latest minecraft expectations.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-index 01ab19434..8b219b5fa 100644
+index 01ab19434a..8b219b5fa2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 @@ -335,4 +335,10 @@ public final class CraftItemFactory implements ItemFactory {
diff --git a/Spigot-Server-Patches/0162-Implement-getI18NDisplayName.patch b/Spigot-Server-Patches/0163-Implement-getI18NDisplayName.patch
similarity index 93%
rename from Spigot-Server-Patches/0162-Implement-getI18NDisplayName.patch
rename to Spigot-Server-Patches/0163-Implement-getI18NDisplayName.patch
index 92ed0bd0f2..14c9b4deed 100644
--- a/Spigot-Server-Patches/0162-Implement-getI18NDisplayName.patch
+++ b/Spigot-Server-Patches/0163-Implement-getI18NDisplayName.patch
@@ -1,4 +1,4 @@
-From 4b0055c1746ebc722b062767f34c9e75eb6ff3d2 Mon Sep 17 00:00:00 2001
+From c10308e739e8fb37c042b6933967e4fa1f91d80d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 May 2016 23:59:38 -0400
 Subject: [PATCH] Implement getI18NDisplayName
@@ -8,7 +8,7 @@ Currently the server only supports the English language. To override this,
 You must replace the language file embedded in the server jar.
 
 diff --git a/src/main/java/net/minecraft/server/LocaleLanguage.java b/src/main/java/net/minecraft/server/LocaleLanguage.java
-index c0c13798f..601273933 100644
+index c0c13798f8..6012739331 100644
 --- a/src/main/java/net/minecraft/server/LocaleLanguage.java
 +++ b/src/main/java/net/minecraft/server/LocaleLanguage.java
 @@ -65,10 +65,12 @@ public class LocaleLanguage {
@@ -25,7 +25,7 @@ index c0c13798f..601273933 100644
          return this.c(s);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-index 8b219b5fa..23d775645 100644
+index 8b219b5fa2..23d7756456 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 @@ -340,5 +340,18 @@ public final class CraftItemFactory implements ItemFactory {
diff --git a/Spigot-Server-Patches/0163-ProfileWhitelistVerifyEvent.patch b/Spigot-Server-Patches/0164-ProfileWhitelistVerifyEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0163-ProfileWhitelistVerifyEvent.patch
rename to Spigot-Server-Patches/0164-ProfileWhitelistVerifyEvent.patch
index 656dd2dc16..955263e671 100644
--- a/Spigot-Server-Patches/0163-ProfileWhitelistVerifyEvent.patch
+++ b/Spigot-Server-Patches/0164-ProfileWhitelistVerifyEvent.patch
@@ -1,11 +1,11 @@
-From 5823c5485f3d20cd2cd53ff1229f0243e79a774b Mon Sep 17 00:00:00 2001
+From ea49daa5f717ed9027cd001e027289b0ca562101 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 3 Jul 2017 18:11:10 -0500
 Subject: [PATCH] ProfileWhitelistVerifyEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 308bc3baf..002f7e844 100644
+index 308bc3baf2..002f7e844a 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -522,9 +522,9 @@ public abstract class PlayerList {
@@ -48,5 +48,5 @@ index 308bc3baf..002f7e844 100644
      public boolean isOp(GameProfile gameprofile) {
          return this.operators.d(gameprofile) || this.server.a(gameprofile) && this.server.getWorldServer(DimensionManager.OVERWORLD).getWorldData().t() || this.u;
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0164-Fix-this-stupid-bullshit.patch b/Spigot-Server-Patches/0165-Fix-this-stupid-bullshit.patch
similarity index 93%
rename from Spigot-Server-Patches/0164-Fix-this-stupid-bullshit.patch
rename to Spigot-Server-Patches/0165-Fix-this-stupid-bullshit.patch
index c6086c3859..cee29bba5f 100644
--- a/Spigot-Server-Patches/0164-Fix-this-stupid-bullshit.patch
+++ b/Spigot-Server-Patches/0165-Fix-this-stupid-bullshit.patch
@@ -1,4 +1,4 @@
-From 1afac47b97ebd139492651cc002123164c99f701 Mon Sep 17 00:00:00 2001
+From 84d7b66fbc057f0b35ed90ed0a5fd6f1d1e2f478 Mon Sep 17 00:00:00 2001
 From: DemonWav <demonwav@gmail.com>
 Date: Sun, 6 Aug 2017 17:17:53 -0500
 Subject: [PATCH] Fix this stupid bullshit
@@ -9,7 +9,7 @@ modified in order to prevent merge conflicts when Spigot changes/disables the wa
 and to provide some level of hint without being disruptive.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index b562e95dc..140b82275 100644
+index b562e95dcd..140b82275c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -217,10 +217,12 @@ public class Main {
@@ -29,5 +29,5 @@ index b562e95dc..140b82275 100644
                  }
  
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0165-Ocelot-despawns-should-honor-nametags-and-leash.patch b/Spigot-Server-Patches/0166-Ocelot-despawns-should-honor-nametags-and-leash.patch
similarity index 88%
rename from Spigot-Server-Patches/0165-Ocelot-despawns-should-honor-nametags-and-leash.patch
rename to Spigot-Server-Patches/0166-Ocelot-despawns-should-honor-nametags-and-leash.patch
index f3154490e9..7400d24c0c 100644
--- a/Spigot-Server-Patches/0165-Ocelot-despawns-should-honor-nametags-and-leash.patch
+++ b/Spigot-Server-Patches/0166-Ocelot-despawns-should-honor-nametags-and-leash.patch
@@ -1,11 +1,11 @@
-From 94586121247edbc9777d6629a0d18c3b8c386f53 Mon Sep 17 00:00:00 2001
+From c6cb9206eb7d1a561e945c54df100e21c1c3ed33 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 31 Jul 2017 01:54:40 -0500
 Subject: [PATCH] Ocelot despawns should honor nametags and leash
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityOcelot.java b/src/main/java/net/minecraft/server/EntityOcelot.java
-index 062411455..d9a7b8ac1 100644
+index 0624114553..d9a7b8ac1e 100644
 --- a/src/main/java/net/minecraft/server/EntityOcelot.java
 +++ b/src/main/java/net/minecraft/server/EntityOcelot.java
 @@ -81,7 +81,7 @@ public class EntityOcelot extends EntityAnimal {
@@ -18,5 +18,5 @@ index 062411455..d9a7b8ac1 100644
  
      @Override
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0166-Reset-spawner-timer-when-spawner-event-is-cancelled.patch b/Spigot-Server-Patches/0167-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
similarity index 92%
rename from Spigot-Server-Patches/0166-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
rename to Spigot-Server-Patches/0167-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
index 0b666513b3..d8332980b2 100644
--- a/Spigot-Server-Patches/0166-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
+++ b/Spigot-Server-Patches/0167-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
@@ -1,11 +1,11 @@
-From fc0c24008c1783f514a071176e2e159cfd820172 Mon Sep 17 00:00:00 2001
+From b316d460813fc1076648fe0772afc1b6c381d18e Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 31 Jul 2017 01:45:19 -0500
 Subject: [PATCH] Reset spawner timer when spawner event is cancelled
 
 
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index 8384a2cbf..258e96ba5 100644
+index 8384a2cbf8..258e96ba5c 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -140,6 +140,9 @@ public abstract class MobSpawnerAbstract {
@@ -28,5 +28,5 @@ index 8384a2cbf..258e96ba5 100644
                  }
  
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0167-Fix-MC-117075-TE-Unload-Lag-Spike.patch b/Spigot-Server-Patches/0168-Fix-MC-117075-TE-Unload-Lag-Spike.patch
similarity index 86%
rename from Spigot-Server-Patches/0167-Fix-MC-117075-TE-Unload-Lag-Spike.patch
rename to Spigot-Server-Patches/0168-Fix-MC-117075-TE-Unload-Lag-Spike.patch
index f39e629a69..3e74298393 100644
--- a/Spigot-Server-Patches/0167-Fix-MC-117075-TE-Unload-Lag-Spike.patch
+++ b/Spigot-Server-Patches/0168-Fix-MC-117075-TE-Unload-Lag-Spike.patch
@@ -1,14 +1,14 @@
-From 5a4f65aa640f16cfe63ad3d4a6fad3d5a01e583e Mon Sep 17 00:00:00 2001
+From 35728314aaf56249d3997a4e6c5200041d319ea1 Mon Sep 17 00:00:00 2001
 From: mezz <tehgeek@gmail.com>
 Date: Wed, 9 Aug 2017 17:51:22 -0500
 Subject: [PATCH] Fix MC-117075: TE Unload Lag Spike
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index ef5cec964..3cab54e77 100644
+index 50808b1a9f..948c025c1f 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -666,7 +666,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -671,7 +671,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
          gameprofilerfiller.enter("blockEntities");
          timings.tileEntityTick.startTiming(); // Spigot
          if (!this.tileEntityListUnload.isEmpty()) {
@@ -22,5 +22,5 @@ index ef5cec964..3cab54e77 100644
              this.tileEntityListUnload.clear();
          }
 -- 
-2.24.0
+2.24.1
 
diff --git a/Spigot-Server-Patches/0168-Allow-specifying-a-custom-authentication-servers-dow.patch b/Spigot-Server-Patches/0169-Allow-specifying-a-custom-authentication-servers-dow.patch
similarity index 94%
rename from Spigot-Server-Patches/0168-Allow-specifying-a-custom-authentication-servers-dow.patch
rename to Spigot-Server-Patches/0169-Allow-specifying-a-custom-authentication-servers-dow.patch
index fc484f20f8..e4d9ffab10 100644
--- a/Spigot-Server-Patches/0168-Allow-specifying-a-custom-authentication-servers-dow.patch
+++ b/Spigot-Server-Patches/0169-Allow-specifying-a-custom-authentication-servers-dow.patch
@@ -1,4 +1,4 @@
-From af7e3f0496ac4b7f4dd6f8b9b60329b68aa759cb Mon Sep 17 00:00:00 2001
+From 218046707327f37b5b49ef297b19cd62d665d54d Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 17 Aug 2017 16:08:20 -0700
 Subject: [PATCH] Allow specifying a custom "authentication servers down" kick
@@ -6,7 +6,7 @@ Subject: [PATCH] Allow specifying a custom "authentication servers down" kick
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 295b8390c..5884b04f7 100644
+index 295b8390cb..5884b04f7e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -1,5 +1,6 @@
@@ -27,7 +27,7 @@ index 295b8390c..5884b04f7 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index 6f7c71579..a1be28390 100644
+index 6f7c715794..a1be28390d 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -247,6 +247,10 @@ public class LoginListener implements PacketLoginInListener {
@@ -42,5 +42,5 @@ index 6f7c71579..a1be28390 100644
                              LoginListener.LOGGER.error("Couldn't verify username because servers are unavailable");
                          }
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0169-LivingEntity-setKiller.patch b/Spigot-Server-Patches/0170-LivingEntity-setKiller.patch
similarity index 92%
rename from Spigot-Server-Patches/0169-LivingEntity-setKiller.patch
rename to Spigot-Server-Patches/0170-LivingEntity-setKiller.patch
index 1b9678ae06..14d89abf69 100644
--- a/Spigot-Server-Patches/0169-LivingEntity-setKiller.patch
+++ b/Spigot-Server-Patches/0170-LivingEntity-setKiller.patch
@@ -1,11 +1,11 @@
-From 0404dd95e23bd99fcf65b823dcf94cc16545caa5 Mon Sep 17 00:00:00 2001
+From c0ee1c5b592500d2be274cdb15cfefee63489237 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 31 Jul 2017 01:49:48 -0500
 Subject: [PATCH] LivingEntity#setKiller
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index f6cb18639..bf049bfc4 100644
+index f6cb18639c..bf049bfc44 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -80,7 +80,7 @@ public abstract class EntityLiving extends Entity {
@@ -18,7 +18,7 @@ index f6cb18639..bf049bfc4 100644
      protected int ticksFarFromPlayer;
      protected float aR;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 7e9aff668..b8482c632 100644
+index 7e9aff6684..b8482c6328 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -317,6 +317,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -39,5 +39,5 @@ index 7e9aff668..b8482c632 100644
      public boolean addPotionEffect(PotionEffect effect) {
          return addPotionEffect(effect, false);
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0170-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch b/Spigot-Server-Patches/0171-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
similarity index 93%
rename from Spigot-Server-Patches/0170-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
rename to Spigot-Server-Patches/0171-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
index 78b193b71b..bbcac77e1c 100644
--- a/Spigot-Server-Patches/0170-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
+++ b/Spigot-Server-Patches/0171-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
@@ -1,4 +1,4 @@
-From 51f074f0e0f071356d81aace1d38ceaf4fe2a3e8 Mon Sep 17 00:00:00 2001
+From 3915b039ecab5ac03a22ce6cd519578b9ddec572 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Mon, 18 Sep 2017 12:00:03 +0200
 Subject: [PATCH] Use Log4j IOStreams to redirect System.out/err to logger
@@ -12,7 +12,7 @@ results in a separate line, even though it should not result in
 a line break. Log4j's implementation handles it correctly.
 
 diff --git a/pom.xml b/pom.xml
-index f716e9870..e6395c773 100644
+index f716e98702..e6395c7734 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -63,6 +63,11 @@
@@ -28,7 +28,7 @@ index f716e9870..e6395c773 100644
              <groupId>org.ow2.asm</groupId>
              <artifactId>asm</artifactId>
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index dfe806291..6e95a0452 100644
+index dfe8062919..6e95a0452e 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -147,8 +147,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -45,5 +45,5 @@ index dfe806291..6e95a0452 100644
  
          thread.setDaemon(true);
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0171-Handle-plugin-prefixes-using-Log4J-configuration.patch b/Spigot-Server-Patches/0172-Handle-plugin-prefixes-using-Log4J-configuration.patch
similarity index 95%
rename from Spigot-Server-Patches/0171-Handle-plugin-prefixes-using-Log4J-configuration.patch
rename to Spigot-Server-Patches/0172-Handle-plugin-prefixes-using-Log4J-configuration.patch
index db95ff71c9..7b5a6ae9c0 100644
--- a/Spigot-Server-Patches/0171-Handle-plugin-prefixes-using-Log4J-configuration.patch
+++ b/Spigot-Server-Patches/0172-Handle-plugin-prefixes-using-Log4J-configuration.patch
@@ -1,4 +1,4 @@
-From 8124c833fa4861c85f5451ca8e3e5033b0d83bde Mon Sep 17 00:00:00 2001
+From c10820f45b843ebe4597c7431f9d32f0f2213131 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Thu, 21 Sep 2017 16:14:55 +0200
 Subject: [PATCH] Handle plugin prefixes using Log4J configuration
@@ -15,7 +15,7 @@ This may cause additional prefixes to be disabled for plugins bypassing
 the plugin logger.
 
 diff --git a/pom.xml b/pom.xml
-index e6395c773..026dcfdab 100644
+index e6395c7734..026dcfdab5 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -61,7 +61,7 @@
@@ -28,7 +28,7 @@ index e6395c773..026dcfdab 100644
          <dependency>
              <groupId>org.apache.logging.log4j</groupId>
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index d873256c0..783aa6db1 100644
+index fdca34346a..6d77bbc5aa 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -286,7 +286,7 @@ public class SpigotConfig
@@ -41,7 +41,7 @@ index d873256c0..783aa6db1 100644
  
      public static int playerShuffle;
 diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index 08b6bb7f9..9f8334376 100644
+index 08b6bb7f97..9f8334376f 100644
 --- a/src/main/resources/log4j2.xml
 +++ b/src/main/resources/log4j2.xml
 @@ -2,10 +2,22 @@
@@ -70,5 +70,5 @@ index 08b6bb7f9..9f8334376 100644
                  <TimeBasedTriggeringPolicy />
                  <OnStartupTriggeringPolicy />
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0172-Include-Log4J2-SLF4J-implementation.patch b/Spigot-Server-Patches/0173-Include-Log4J2-SLF4J-implementation.patch
similarity index 86%
rename from Spigot-Server-Patches/0172-Include-Log4J2-SLF4J-implementation.patch
rename to Spigot-Server-Patches/0173-Include-Log4J2-SLF4J-implementation.patch
index 0c8eec61ba..4168513fd4 100644
--- a/Spigot-Server-Patches/0172-Include-Log4J2-SLF4J-implementation.patch
+++ b/Spigot-Server-Patches/0173-Include-Log4J2-SLF4J-implementation.patch
@@ -1,11 +1,11 @@
-From 81c4efd41672172bdc421347dfc9429c64348208 Mon Sep 17 00:00:00 2001
+From 3c2712cd3fc1aa4f3437344970425c423a0d584e Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Thu, 21 Sep 2017 16:33:35 +0200
 Subject: [PATCH] Include Log4J2 SLF4J implementation
 
 
 diff --git a/pom.xml b/pom.xml
-index 026dcfdab..dbc425524 100644
+index 026dcfdab5..dbc425524c 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -63,6 +63,12 @@
@@ -22,5 +22,5 @@ index 026dcfdab..dbc425524 100644
              <groupId>org.apache.logging.log4j</groupId>
              <artifactId>log4j-iostreams</artifactId>
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0173-Disable-logger-prefix-for-various-plugins-bypassing-.patch b/Spigot-Server-Patches/0174-Disable-logger-prefix-for-various-plugins-bypassing-.patch
similarity index 95%
rename from Spigot-Server-Patches/0173-Disable-logger-prefix-for-various-plugins-bypassing-.patch
rename to Spigot-Server-Patches/0174-Disable-logger-prefix-for-various-plugins-bypassing-.patch
index 637972d226..61319c123d 100644
--- a/Spigot-Server-Patches/0173-Disable-logger-prefix-for-various-plugins-bypassing-.patch
+++ b/Spigot-Server-Patches/0174-Disable-logger-prefix-for-various-plugins-bypassing-.patch
@@ -1,4 +1,4 @@
-From 60dfcd4e3f304e962558e5263c9e03c13b40058e Mon Sep 17 00:00:00 2001
+From 5451a743dbe25a42d5da3889ac1ef95c0f749c12 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Sat, 23 Sep 2017 21:07:20 +0200
 Subject: [PATCH] Disable logger prefix for various plugins bypassing the
@@ -11,7 +11,7 @@ log. Disable the logger prefix for these plugins so the messages
 show up correctly.
 
 diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index 9f8334376..6711e6dff 100644
+index 9f8334376f..6711e6dff9 100644
 --- a/src/main/resources/log4j2.xml
 +++ b/src/main/resources/log4j2.xml
 @@ -5,7 +5,8 @@
@@ -35,5 +35,5 @@ index 9f8334376..6711e6dff 100644
                  </LoggerNamePatternSelector>
              </PatternLayout>
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0174-Add-PlayerJumpEvent.patch b/Spigot-Server-Patches/0175-Add-PlayerJumpEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0174-Add-PlayerJumpEvent.patch
rename to Spigot-Server-Patches/0175-Add-PlayerJumpEvent.patch
index ea59c788bd..17a945fb27 100644
--- a/Spigot-Server-Patches/0174-Add-PlayerJumpEvent.patch
+++ b/Spigot-Server-Patches/0175-Add-PlayerJumpEvent.patch
@@ -1,11 +1,11 @@
-From 066208622cb57436c6e832f8b57820d4b9be3c8c Mon Sep 17 00:00:00 2001
+From 44f20e09eafe43f04041c71d71da4ff084354300 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 28 Sep 2017 17:21:44 -0400
 Subject: [PATCH] Add PlayerJumpEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 01ab2e151..399724d6a 100644
+index 01ab2e1516..399724d6ac 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -58,6 +58,8 @@ import org.bukkit.inventory.CraftingInventory;
@@ -54,5 +54,5 @@ index 01ab2e151..399724d6a 100644
  
                              this.player.move(EnumMoveType.PLAYER, new Vec3D(d7, d8, d9));
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0175-handle-PacketPlayInKeepAlive-async.patch b/Spigot-Server-Patches/0176-handle-PacketPlayInKeepAlive-async.patch
similarity index 95%
rename from Spigot-Server-Patches/0175-handle-PacketPlayInKeepAlive-async.patch
rename to Spigot-Server-Patches/0176-handle-PacketPlayInKeepAlive-async.patch
index 6890a4a248..d89a253f9d 100644
--- a/Spigot-Server-Patches/0175-handle-PacketPlayInKeepAlive-async.patch
+++ b/Spigot-Server-Patches/0176-handle-PacketPlayInKeepAlive-async.patch
@@ -1,4 +1,4 @@
-From 531d21dac3ed12422173380c48104e9c09248412 Mon Sep 17 00:00:00 2001
+From 2f09acaa257b5cae146cf981ffa42577d506011b Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Thu, 5 Oct 2017 01:54:07 +0100
 Subject: [PATCH] handle PacketPlayInKeepAlive async
@@ -15,7 +15,7 @@ also adding some additional logging in order to help work out what is causing
 random disconnections for clients.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 399724d6a..a4660f2b8 100644
+index 399724d6ac..a4660f2b87 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2486,14 +2486,18 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -40,5 +40,5 @@ index 399724d6a..a4660f2b8 100644
  
      }
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0176-Expose-client-protocol-version-and-virtual-host.patch b/Spigot-Server-Patches/0177-Expose-client-protocol-version-and-virtual-host.patch
similarity index 95%
rename from Spigot-Server-Patches/0176-Expose-client-protocol-version-and-virtual-host.patch
rename to Spigot-Server-Patches/0177-Expose-client-protocol-version-and-virtual-host.patch
index c534b3978b..4ba57f6ee2 100644
--- a/Spigot-Server-Patches/0176-Expose-client-protocol-version-and-virtual-host.patch
+++ b/Spigot-Server-Patches/0177-Expose-client-protocol-version-and-virtual-host.patch
@@ -1,4 +1,4 @@
-From 710d05e1055a1d076ee3615b9a82256baba38b5e Mon Sep 17 00:00:00 2001
+From 7f1fa0582f4ece4ddf2d2721dfe17014279fba58 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Tue, 10 Oct 2017 18:45:20 +0200
 Subject: [PATCH] Expose client protocol version and virtual host
@@ -6,7 +6,7 @@ Subject: [PATCH] Expose client protocol version and virtual host
 
 diff --git a/src/main/java/com/destroystokyo/paper/network/PaperNetworkClient.java b/src/main/java/com/destroystokyo/paper/network/PaperNetworkClient.java
 new file mode 100644
-index 000000000..5caca6439
+index 0000000000..5caca6439d
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/PaperNetworkClient.java
 @@ -0,0 +1,50 @@
@@ -61,7 +61,7 @@ index 000000000..5caca6439
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
-index d0b9c6e3d..8928d93e4 100644
+index d0b9c6e3dc..8928d93e49 100644
 --- a/src/main/java/net/minecraft/server/HandshakeListener.java
 +++ b/src/main/java/net/minecraft/server/HandshakeListener.java
 @@ -15,6 +15,7 @@ public class HandshakeListener implements PacketHandshakingInListener {
@@ -84,7 +84,7 @@ index d0b9c6e3d..8928d93e4 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 3ccf16636..e2d8ed88f 100644
+index 3ccf166366..e2d8ed88f0 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -60,6 +60,10 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -99,7 +99,7 @@ index 3ccf16636..e2d8ed88f 100644
      public NetworkManager(EnumProtocolDirection enumprotocoldirection) {
          this.h = enumprotocoldirection;
 diff --git a/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java b/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java
-index 4f008e472..8545146fb 100644
+index 4f008e4723..8545146fb1 100644
 --- a/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java
 +++ b/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java
 @@ -35,6 +35,7 @@ public class PacketHandshakingInSetProtocol implements Packet<PacketHandshakingI
@@ -111,7 +111,7 @@ index 4f008e472..8545146fb 100644
          return this.a;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 1c5007015..cade504af 100644
+index 1c41f00551..d47b982e7a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -183,6 +183,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -136,5 +136,5 @@ index 1c5007015..cade504af 100644
      public double getEyeHeight(boolean ignorePose) {
          if (ignorePose) {
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0177-revert-serverside-behavior-of-keepalives.patch b/Spigot-Server-Patches/0178-revert-serverside-behavior-of-keepalives.patch
similarity index 97%
rename from Spigot-Server-Patches/0177-revert-serverside-behavior-of-keepalives.patch
rename to Spigot-Server-Patches/0178-revert-serverside-behavior-of-keepalives.patch
index d983974307..37a9a2dc5b 100644
--- a/Spigot-Server-Patches/0177-revert-serverside-behavior-of-keepalives.patch
+++ b/Spigot-Server-Patches/0178-revert-serverside-behavior-of-keepalives.patch
@@ -1,4 +1,4 @@
-From a04915c0d944cae377ef56a079b1da1b840766fa Mon Sep 17 00:00:00 2001
+From 4c399ba80cf163df1dd379e0dc0770840a9b2993 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 15 Oct 2017 00:29:07 +0100
 Subject: [PATCH] revert serverside behavior of keepalives
@@ -17,7 +17,7 @@ from networking or during connections flood of chunk packets on slower clients,
  at the cost of dead connections being kept open for longer.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index a4660f2b8..9af8e947e 100644
+index a4660f2b87..9af8e947ef 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -70,7 +70,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -74,5 +74,5 @@ index a4660f2b8..9af8e947e 100644
          this.minecraftServer.getMethodProfiler().exit();
          // CraftBukkit start
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0178-Send-attack-SoundEffects-only-to-players-who-can-see.patch b/Spigot-Server-Patches/0179-Send-attack-SoundEffects-only-to-players-who-can-see.patch
similarity index 96%
rename from Spigot-Server-Patches/0178-Send-attack-SoundEffects-only-to-players-who-can-see.patch
rename to Spigot-Server-Patches/0179-Send-attack-SoundEffects-only-to-players-who-can-see.patch
index 31139f4221..cb7eea9d74 100644
--- a/Spigot-Server-Patches/0178-Send-attack-SoundEffects-only-to-players-who-can-see.patch
+++ b/Spigot-Server-Patches/0179-Send-attack-SoundEffects-only-to-players-who-can-see.patch
@@ -1,4 +1,4 @@
-From 1d4f71098b09cba6d0e85447da13cd260f250be8 Mon Sep 17 00:00:00 2001
+From 2bc49a24a1222a95085870214fd1db6c6376e94f Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Tue, 31 Oct 2017 03:26:18 +0100
 Subject: [PATCH] Send attack SoundEffects only to players who can see the
@@ -6,7 +6,7 @@ Subject: [PATCH] Send attack SoundEffects only to players who can see the
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 2d982ce1e..fd7de143e 100644
+index 2d982ce1e0..fd7de143e3 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -1023,6 +1023,15 @@ public abstract class EntityHuman extends EntityLiving {
@@ -72,10 +72,10 @@ index 2d982ce1e..fd7de143e 100644
                              entity.extinguish();
                          }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 3cab54e77..989d4d8ca 100644
+index 948c025c1f..c065a5f6e1 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -603,6 +603,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -608,6 +608,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
          this.playSound(entityhuman, (double) blockposition.getX() + 0.5D, (double) blockposition.getY() + 0.5D, (double) blockposition.getZ() + 0.5D, soundeffect, soundcategory, f, f1);
      }
  
@@ -88,5 +88,5 @@ index 3cab54e77..989d4d8ca 100644
  
      public abstract void playSound(@Nullable EntityHuman entityhuman, Entity entity, SoundEffect soundeffect, SoundCategory soundcategory, float f, float f1);
 -- 
-2.24.0
+2.24.1
 
diff --git a/Spigot-Server-Patches/0179-Option-for-maximum-exp-value-when-merging-orbs.patch b/Spigot-Server-Patches/0180-Option-for-maximum-exp-value-when-merging-orbs.patch
similarity index 95%
rename from Spigot-Server-Patches/0179-Option-for-maximum-exp-value-when-merging-orbs.patch
rename to Spigot-Server-Patches/0180-Option-for-maximum-exp-value-when-merging-orbs.patch
index 86ff2f2edb..1097f717e2 100644
--- a/Spigot-Server-Patches/0179-Option-for-maximum-exp-value-when-merging-orbs.patch
+++ b/Spigot-Server-Patches/0180-Option-for-maximum-exp-value-when-merging-orbs.patch
@@ -1,11 +1,11 @@
-From 2fceac6687db42c0f6c5fa45ee062a4d55722d6f Mon Sep 17 00:00:00 2001
+From efa15ce75601ea4142787336aa79021d9a66e302 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 10 Nov 2017 23:03:12 -0500
 Subject: [PATCH] Option for maximum exp value when merging orbs
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index c145e27cc..671587631 100644
+index c145e27ccb..671587631e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -338,4 +338,10 @@ public class PaperWorldConfig {
@@ -20,7 +20,7 @@ index c145e27cc..671587631 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 2bf53db88..e310f2afe 100644
+index 2bf53db885..e310f2afe1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -537,16 +537,32 @@ public class CraftEventFactory {
@@ -60,5 +60,5 @@ index 2bf53db88..e310f2afe 100644
          // Spigot end
          } else if (!(entity instanceof EntityPlayer)) {
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0180-Add-PlayerArmorChangeEvent.patch b/Spigot-Server-Patches/0181-Add-PlayerArmorChangeEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0180-Add-PlayerArmorChangeEvent.patch
rename to Spigot-Server-Patches/0181-Add-PlayerArmorChangeEvent.patch
index b0a7ff463a..23c80e131c 100644
--- a/Spigot-Server-Patches/0180-Add-PlayerArmorChangeEvent.patch
+++ b/Spigot-Server-Patches/0181-Add-PlayerArmorChangeEvent.patch
@@ -1,11 +1,11 @@
-From 353818a8456ac6461323ddb7ac6d1815cef712db Mon Sep 17 00:00:00 2001
+From 26c247a323e2e822648af09f81bb1131b8e61203 Mon Sep 17 00:00:00 2001
 From: pkt77 <parkerkt77@gmail.com>
 Date: Fri, 10 Nov 2017 23:46:34 -0500
 Subject: [PATCH] Add PlayerArmorChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index bf049bfc4..c03fcd2d3 100644
+index bf049bfc44..c03fcd2d38 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1,5 +1,6 @@
@@ -30,7 +30,7 @@ index bf049bfc4..c03fcd2d3 100644
                      if (!itemstack.isEmpty()) {
                          this.getAttributeMap().a(itemstack.a(enumitemslot));
 diff --git a/src/main/java/net/minecraft/server/EnumItemSlot.java b/src/main/java/net/minecraft/server/EnumItemSlot.java
-index 02a7ae678..60b235f16 100644
+index 02a7ae6785..60b235f16f 100644
 --- a/src/main/java/net/minecraft/server/EnumItemSlot.java
 +++ b/src/main/java/net/minecraft/server/EnumItemSlot.java
 @@ -16,6 +16,7 @@ public enum EnumItemSlot {
@@ -42,5 +42,5 @@ index 02a7ae678..60b235f16 100644
          return this.g;
      }
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0181-Prevent-logins-from-being-processed-when-the-player-.patch b/Spigot-Server-Patches/0182-Prevent-logins-from-being-processed-when-the-player-.patch
similarity index 90%
rename from Spigot-Server-Patches/0181-Prevent-logins-from-being-processed-when-the-player-.patch
rename to Spigot-Server-Patches/0182-Prevent-logins-from-being-processed-when-the-player-.patch
index 38c0f9fffb..5535bcd9ee 100644
--- a/Spigot-Server-Patches/0181-Prevent-logins-from-being-processed-when-the-player-.patch
+++ b/Spigot-Server-Patches/0182-Prevent-logins-from-being-processed-when-the-player-.patch
@@ -1,4 +1,4 @@
-From 02a7530a63a6e92cd283b0416021f7b128296ae5 Mon Sep 17 00:00:00 2001
+From 90ceaaaef9632c727719ec42a402016d217e863e Mon Sep 17 00:00:00 2001
 From: killme <killme-git@ibts.me>
 Date: Sun, 12 Nov 2017 19:40:01 +0100
 Subject: [PATCH] Prevent logins from being processed when the player has
@@ -6,7 +6,7 @@ Subject: [PATCH] Prevent logins from being processed when the player has
 
 
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index a1be28390..828b64e41 100644
+index a1be28390d..828b64e419 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -56,7 +56,11 @@ public class LoginListener implements PacketLoginInListener {
@@ -23,5 +23,5 @@ index a1be28390..828b64e41 100644
              EntityPlayer entityplayer = this.server.getPlayerList().a(this.i.getId());
  
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0182-use-CB-BlockState-implementations-for-captured-block.patch b/Spigot-Server-Patches/0183-use-CB-BlockState-implementations-for-captured-block.patch
similarity index 90%
rename from Spigot-Server-Patches/0182-use-CB-BlockState-implementations-for-captured-block.patch
rename to Spigot-Server-Patches/0183-use-CB-BlockState-implementations-for-captured-block.patch
index b693bf5a51..3e37778004 100644
--- a/Spigot-Server-Patches/0182-use-CB-BlockState-implementations-for-captured-block.patch
+++ b/Spigot-Server-Patches/0183-use-CB-BlockState-implementations-for-captured-block.patch
@@ -1,4 +1,4 @@
-From 8577b822d9e3d4150092229e8e65bdbe83ef91ff Mon Sep 17 00:00:00 2001
+From d9b7412b5f93b09eb3685a630972fa96a13e7665 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Thu, 16 Nov 2017 12:12:41 +0000
 Subject: [PATCH] use CB BlockState implementations for captured blocks
@@ -18,10 +18,10 @@ the blockstate that will be valid for restoration, as opposed to dropping
 information on restoration when the event is cancelled.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 989d4d8ca..e7b8a6920 100644
+index c065a5f6e1..8b2ee61b3b 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -294,7 +294,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -299,7 +299,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
              // CraftBukkit start - capture blockstates
              CraftBlockState blockstate = null;
              if (this.captureBlockStates) {
@@ -31,5 +31,5 @@ index 989d4d8ca..e7b8a6920 100644
              }
              // CraftBukkit end
 -- 
-2.24.0
+2.24.1
 
diff --git a/Spigot-Server-Patches/0183-API-to-get-a-BlockState-without-a-snapshot.patch b/Spigot-Server-Patches/0184-API-to-get-a-BlockState-without-a-snapshot.patch
similarity index 96%
rename from Spigot-Server-Patches/0183-API-to-get-a-BlockState-without-a-snapshot.patch
rename to Spigot-Server-Patches/0184-API-to-get-a-BlockState-without-a-snapshot.patch
index 7cc2472afc..85ad5fa821 100644
--- a/Spigot-Server-Patches/0183-API-to-get-a-BlockState-without-a-snapshot.patch
+++ b/Spigot-Server-Patches/0184-API-to-get-a-BlockState-without-a-snapshot.patch
@@ -1,4 +1,4 @@
-From 282a855337c9b21d88e3a025014d290aea141cf8 Mon Sep 17 00:00:00 2001
+From ae21a2ecfd6ab6db948e04a340c54fde01e7162d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 6 Nov 2017 21:08:22 -0500
 Subject: [PATCH] API to get a BlockState without a snapshot
@@ -13,7 +13,7 @@ also Avoid NPE during CraftBlockEntityState load if could not get TE
 If Tile Entity was null, correct Sign to return empty lines instead of null
 
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 630b27915..958279249 100644
+index 630b279158..958279249f 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -231,7 +231,12 @@ public abstract class TileEntity implements KeyedObject { // Paper
@@ -39,7 +39,7 @@ index 630b27915..958279249 100644
          return null;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index 3d632543b..887ade5e8 100644
+index c0f557568d..fa840c3d38 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -309,6 +309,20 @@ public class CraftBlock implements Block {
@@ -64,7 +64,7 @@ index 3d632543b..887ade5e8 100644
  
          switch (material) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
-index 17d80b5c6..f6401e2cd 100644
+index 17d80b5c6e..f6401e2cde 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 @@ -26,20 +26,40 @@ public class CraftBlockEntityState<T extends TileEntity> extends CraftBlockState
@@ -114,7 +114,7 @@ index 17d80b5c6..f6401e2cd 100644
  
      private T createSnapshot(T tileEntity) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
-index 15022ada0..af15656cc 100644
+index 15022ada0c..af15656cc4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
 @@ -17,10 +17,12 @@ public class CraftSign extends CraftBlockEntityState<TileEntitySign> implements
@@ -131,5 +131,5 @@ index 15022ada0..af15656cc 100644
  
      @Override
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0184-AsyncTabCompleteEvent.patch b/Spigot-Server-Patches/0185-AsyncTabCompleteEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0184-AsyncTabCompleteEvent.patch
rename to Spigot-Server-Patches/0185-AsyncTabCompleteEvent.patch
index 5a1d21bc86..9fec29911e 100644
--- a/Spigot-Server-Patches/0184-AsyncTabCompleteEvent.patch
+++ b/Spigot-Server-Patches/0185-AsyncTabCompleteEvent.patch
@@ -1,4 +1,4 @@
-From 78dda52d682ec67a2f8154d53b92ee578ae623e7 Mon Sep 17 00:00:00 2001
+From 8f3096e85007f17edeb22fc8f12dced89ed94ebb Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 26 Nov 2017 13:19:58 -0500
 Subject: [PATCH] AsyncTabCompleteEvent
@@ -14,7 +14,7 @@ completion, such as offline players.
 Also adds isCommand and getLocation to the sync TabCompleteEvent
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 9af8e947e..ad2a36627 100644
+index 9af8e947ef..ad2a366275 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -524,10 +524,10 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -72,7 +72,7 @@ index 9af8e947e..ad2a36627 100644
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 2f7769c00..9fe19fb59 100644
+index 2f7769c00e..9fe19fb595 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1671,7 +1671,7 @@ public final class CraftServer implements Server {
@@ -85,7 +85,7 @@ index 2f7769c00..9fe19fb59 100644
  
          return tabEvent.isCancelled() ? Collections.EMPTY_LIST : tabEvent.getCompletions();
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
-index 5510266fb..a51202ed5 100644
+index 5510266fb1..a51202ed53 100644
 --- a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
 +++ b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
 @@ -28,6 +28,39 @@ public class ConsoleCommandCompleter implements Completer {
@@ -129,5 +129,5 @@ index 5510266fb..a51202ed5 100644
          Waitable<List<String>> waitable = new Waitable<List<String>>() {
              @Override
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0185-Avoid-NPE-in-PathfinderGoalTempt.patch b/Spigot-Server-Patches/0186-Avoid-NPE-in-PathfinderGoalTempt.patch
similarity index 88%
rename from Spigot-Server-Patches/0185-Avoid-NPE-in-PathfinderGoalTempt.patch
rename to Spigot-Server-Patches/0186-Avoid-NPE-in-PathfinderGoalTempt.patch
index 2f25aa6e78..7fd16c4678 100644
--- a/Spigot-Server-Patches/0185-Avoid-NPE-in-PathfinderGoalTempt.patch
+++ b/Spigot-Server-Patches/0186-Avoid-NPE-in-PathfinderGoalTempt.patch
@@ -1,11 +1,11 @@
-From c72f85b26faae29bc8da82ed7ba569f479c5f427 Mon Sep 17 00:00:00 2001
+From 231de19cfd14c831c6755f5e674f2e5f0c796af8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 29 Nov 2017 22:18:54 -0500
 Subject: [PATCH] Avoid NPE in PathfinderGoalTempt
 
 
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalTempt.java b/src/main/java/net/minecraft/server/PathfinderGoalTempt.java
-index eafdcb916..d37a2fa0a 100644
+index eafdcb916a..d37a2fa0ab 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalTempt.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalTempt.java
 @@ -55,7 +55,7 @@ public class PathfinderGoalTempt extends PathfinderGoal {
@@ -18,5 +18,5 @@ index eafdcb916..d37a2fa0a 100644
          }
      }
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0186-PlayerPickupExperienceEvent.patch b/Spigot-Server-Patches/0187-PlayerPickupExperienceEvent.patch
similarity index 91%
rename from Spigot-Server-Patches/0186-PlayerPickupExperienceEvent.patch
rename to Spigot-Server-Patches/0187-PlayerPickupExperienceEvent.patch
index 68d6b514f8..313a178a85 100644
--- a/Spigot-Server-Patches/0186-PlayerPickupExperienceEvent.patch
+++ b/Spigot-Server-Patches/0187-PlayerPickupExperienceEvent.patch
@@ -1,4 +1,4 @@
-From d658459a32f49fc117a6dd2af0355f472518ca05 Mon Sep 17 00:00:00 2001
+From 447f68c2177cc27b6aa2e64539bda549240c01ef Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 22:02:53 -0500
 Subject: [PATCH] PlayerPickupExperienceEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] PlayerPickupExperienceEvent
 Allows plugins to cancel a player picking up an experience orb
 
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index d4275e733..b3edb69a9 100644
+index d4275e733d..b3edb69a96 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -222,7 +222,7 @@ public class EntityExperienceOrb extends Entity {
@@ -19,5 +19,5 @@ index d4275e733..b3edb69a9 100644
                  entityhuman.receive(this, 1);
                  Entry<EnumItemSlot, ItemStack> entry = EnchantmentManager.b(Enchantments.MENDING, (EntityLiving) entityhuman);
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0187-ExperienceOrbMergeEvent.patch b/Spigot-Server-Patches/0188-ExperienceOrbMergeEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0187-ExperienceOrbMergeEvent.patch
rename to Spigot-Server-Patches/0188-ExperienceOrbMergeEvent.patch
index 5f50f82bd1..1c326c4a1c 100644
--- a/Spigot-Server-Patches/0187-ExperienceOrbMergeEvent.patch
+++ b/Spigot-Server-Patches/0188-ExperienceOrbMergeEvent.patch
@@ -1,4 +1,4 @@
-From f779071caff42d2a59ef762a8d39da9f3e0227e6 Mon Sep 17 00:00:00 2001
+From 7a7a77f3a1ff391f37d670a7846a038d6fbf86a5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 22:57:26 -0500
 Subject: [PATCH] ExperienceOrbMergeEvent
@@ -8,7 +8,7 @@ Plugins can cancel this if they want to ensure experience orbs do not lose impor
 metadata such as spawn reason, or conditionally move data from source to target.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index e310f2afe..9b314eacc 100644
+index e310f2afe1..9b314eacc3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -547,7 +547,7 @@ public class CraftEventFactory {
@@ -21,5 +21,5 @@ index e310f2afe..9b314eacc 100644
                              if ((int) newTotal < 0) continue; // Overflow
                              if (maxValue > 0 && newTotal > (long)maxValue) {
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0188-Ability-to-apply-mending-to-XP-API.patch b/Spigot-Server-Patches/0189-Ability-to-apply-mending-to-XP-API.patch
similarity index 95%
rename from Spigot-Server-Patches/0188-Ability-to-apply-mending-to-XP-API.patch
rename to Spigot-Server-Patches/0189-Ability-to-apply-mending-to-XP-API.patch
index 5309da83d9..96c337b541 100644
--- a/Spigot-Server-Patches/0188-Ability-to-apply-mending-to-XP-API.patch
+++ b/Spigot-Server-Patches/0189-Ability-to-apply-mending-to-XP-API.patch
@@ -1,4 +1,4 @@
-From c9388d6d8ed70955b2c0765e9dae6ffa6a9650fc Mon Sep 17 00:00:00 2001
+From bd8432442535ad09345d53cd9f2ac82fd4156a8c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 20 Dec 2017 17:36:49 -0500
 Subject: [PATCH] Ability to apply mending to XP API
@@ -10,7 +10,7 @@ of giving the player experience points.
 Both an API To standalone mend, and apply mending logic to .giveExp has been added.
 
 diff --git a/src/main/java/net/minecraft/server/EnchantmentManager.java b/src/main/java/net/minecraft/server/EnchantmentManager.java
-index 1822178e8..fabc7a8dd 100644
+index 1822178e8d..fabc7a8dd7 100644
 --- a/src/main/java/net/minecraft/server/EnchantmentManager.java
 +++ b/src/main/java/net/minecraft/server/EnchantmentManager.java
 @@ -246,6 +246,11 @@ public class EnchantmentManager {
@@ -26,7 +26,7 @@ index 1822178e8..fabc7a8dd 100644
      public static Entry<EnumItemSlot, ItemStack> b(Enchantment enchantment, EntityLiving entityliving) {
          Map<EnumItemSlot, ItemStack> map = enchantment.a(entityliving);
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index b3edb69a9..87c6b77ce 100644
+index b3edb69a96..87c6b77ce3 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -254,10 +254,12 @@ public class EntityExperienceOrb extends Entity {
@@ -43,7 +43,7 @@ index b3edb69a9..87c6b77ce 100644
          return i * 2;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d47b982e7..6bdee24f8 100644
+index d47b982e7a..6bdee24f84 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1047,8 +1047,37 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -86,5 +86,5 @@ index d47b982e7..6bdee24f8 100644
      }
  
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0189-Make-max-squid-spawn-height-configurable.patch b/Spigot-Server-Patches/0190-Make-max-squid-spawn-height-configurable.patch
similarity index 93%
rename from Spigot-Server-Patches/0189-Make-max-squid-spawn-height-configurable.patch
rename to Spigot-Server-Patches/0190-Make-max-squid-spawn-height-configurable.patch
index b318dcacb5..7ff675557f 100644
--- a/Spigot-Server-Patches/0189-Make-max-squid-spawn-height-configurable.patch
+++ b/Spigot-Server-Patches/0190-Make-max-squid-spawn-height-configurable.patch
@@ -1,4 +1,4 @@
-From eaaf3357e4e96bf181c4f311f7e20ad9e798830c Mon Sep 17 00:00:00 2001
+From feee9c593efa057e9f1d53320031ed830164d05a Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 11 Jan 2018 16:47:28 -0600
 Subject: [PATCH] Make max squid spawn height configurable
@@ -7,7 +7,7 @@ I don't know why upstream made only the minimum height configurable but
 whatever
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 671587631..e315a00cc 100644
+index 671587631e..e315a00cc3 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -344,4 +344,9 @@ public class PaperWorldConfig {
@@ -21,7 +21,7 @@ index 671587631..e315a00cc 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java
-index 8c4f3b2c2..1c1ff2069 100644
+index 8c4f3b2c2e..1c1ff2069d 100644
 --- a/src/main/java/net/minecraft/server/EntitySquid.java
 +++ b/src/main/java/net/minecraft/server/EntitySquid.java
 @@ -171,7 +171,8 @@ public class EntitySquid extends EntityWaterAnimal {
@@ -35,5 +35,5 @@ index 8c4f3b2c2..1c1ff2069 100644
  
      public void a(float f, float f1, float f2) {
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0190-PreCreatureSpawnEvent.patch b/Spigot-Server-Patches/0191-PreCreatureSpawnEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0190-PreCreatureSpawnEvent.patch
rename to Spigot-Server-Patches/0191-PreCreatureSpawnEvent.patch
index dd92fcb92f..0f982f23e7 100644
--- a/Spigot-Server-Patches/0190-PreCreatureSpawnEvent.patch
+++ b/Spigot-Server-Patches/0191-PreCreatureSpawnEvent.patch
@@ -1,4 +1,4 @@
-From 092a93451181da9283c1131567c817f0177ed7ec Mon Sep 17 00:00:00 2001
+From 3d34d1826afa4a881b19c30a277d6794e50d4728 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 14 Jan 2018 17:01:31 -0500
 Subject: [PATCH] PreCreatureSpawnEvent
@@ -15,7 +15,7 @@ instead and save a lot of server resources.
 See: https://github.com/PaperMC/Paper/issues/917
 
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index 258e96ba5..fe8bc7f75 100644
+index 258e96ba5c..fe8bc7f75d 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -105,6 +105,27 @@ public abstract class MobSpawnerAbstract {
@@ -47,7 +47,7 @@ index 258e96ba5..fe8bc7f75 100644
                              entity1.setPositionRotation(d3, d4, d5, entity1.yaw, entity1.pitch);
                              return entity1;
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index 02157d051..224443e03 100644
+index 02157d051f..224443e03c 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -38,7 +38,7 @@ public final class SpawnerCreature {
@@ -86,5 +86,5 @@ index 02157d051..224443e03 100644
                                                              Entity entity = entitytypes.a((World) worldserver);
  
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0191-PlayerNaturallySpawnCreaturesEvent.patch b/Spigot-Server-Patches/0192-PlayerNaturallySpawnCreaturesEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0191-PlayerNaturallySpawnCreaturesEvent.patch
rename to Spigot-Server-Patches/0192-PlayerNaturallySpawnCreaturesEvent.patch
index 9e8ad3d81b..e6f728b87e 100644
--- a/Spigot-Server-Patches/0191-PlayerNaturallySpawnCreaturesEvent.patch
+++ b/Spigot-Server-Patches/0192-PlayerNaturallySpawnCreaturesEvent.patch
@@ -1,4 +1,4 @@
-From 880e221e575862228c507b8f5dcb67ca4d78f2b0 Mon Sep 17 00:00:00 2001
+From 36a38d68e42ce672b6fd3e116f292b911b2458bc Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 14 Jan 2018 17:36:02 -0500
 Subject: [PATCH] PlayerNaturallySpawnCreaturesEvent
@@ -9,7 +9,7 @@ from triggering monster spawns on a server.
 Also a highly more effecient way to blanket block spawns in a world
 
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 492d1538f..df24bac3b 100644
+index 492d1538fa..df24bac3bb 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -843,12 +843,24 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -40,5 +40,5 @@ index 492d1538f..df24bac3b 100644
      }
  
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0192-Add-setPlayerProfile-API-for-Skulls.patch b/Spigot-Server-Patches/0193-Add-setPlayerProfile-API-for-Skulls.patch
similarity index 96%
rename from Spigot-Server-Patches/0192-Add-setPlayerProfile-API-for-Skulls.patch
rename to Spigot-Server-Patches/0193-Add-setPlayerProfile-API-for-Skulls.patch
index 969a083ae6..aec5ac7ed6 100644
--- a/Spigot-Server-Patches/0192-Add-setPlayerProfile-API-for-Skulls.patch
+++ b/Spigot-Server-Patches/0193-Add-setPlayerProfile-API-for-Skulls.patch
@@ -1,4 +1,4 @@
-From 2ef86bc0487e416d204b91b9fb1ca946971dbe13 Mon Sep 17 00:00:00 2001
+From ed3bb3a215f95fd2c7df8b6899e6562ed30e874c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 19 Jan 2018 00:36:25 -0500
 Subject: [PATCH] Add setPlayerProfile API for Skulls
@@ -7,7 +7,7 @@ This allows you to create already filled textures on Skulls to avoid texture loo
 which commonly cause rate limit issues with Mojang API
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java
-index a4bc7f970..2dd2f476f 100644
+index a4bc7f9701..2dd2f476f0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java
 @@ -1,5 +1,7 @@
@@ -48,7 +48,7 @@ index a4bc7f970..2dd2f476f 100644
      public BlockFace getRotation() {
          BlockData blockData = getBlockData();
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
-index a83abc722..c29a78fd3 100644
+index a83abc722d..c29a78fd3c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
 @@ -3,6 +3,8 @@ package org.bukkit.craftbukkit.inventory;
@@ -89,5 +89,5 @@ index a83abc722..c29a78fd3 100644
      public OfflinePlayer getOwningPlayer() {
          if (hasOwner()) {
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0193-Fill-Profile-Property-Events.patch b/Spigot-Server-Patches/0194-Fill-Profile-Property-Events.patch
similarity index 94%
rename from Spigot-Server-Patches/0193-Fill-Profile-Property-Events.patch
rename to Spigot-Server-Patches/0194-Fill-Profile-Property-Events.patch
index c25cb5f37a..12802b79f9 100644
--- a/Spigot-Server-Patches/0193-Fill-Profile-Property-Events.patch
+++ b/Spigot-Server-Patches/0194-Fill-Profile-Property-Events.patch
@@ -1,4 +1,4 @@
-From 29b51a8a3a8baa13e34edeb2742e860244d98ccc Mon Sep 17 00:00:00 2001
+From 70b63c7727ebbe78bdbd664f30409d630b2e2271 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 2 Jan 2018 00:31:26 -0500
 Subject: [PATCH] Fill Profile Property Events
@@ -11,7 +11,7 @@ If Mojang API does need to be hit, event fire so you can get the results.
 This is useful for implementing a ProfileCache for Player Skulls
 
 diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java
-index 4b2a67423..61cfdf73c 100644
+index 4b2a67423f..61cfdf73c8 100644
 --- a/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java
 @@ -1,5 +1,7 @@
@@ -40,5 +40,5 @@ index 4b2a67423..61cfdf73c 100644
  
      @Override
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0194-PlayerAdvancementCriterionGrantEvent.patch b/Spigot-Server-Patches/0195-PlayerAdvancementCriterionGrantEvent.patch
similarity index 90%
rename from Spigot-Server-Patches/0194-PlayerAdvancementCriterionGrantEvent.patch
rename to Spigot-Server-Patches/0195-PlayerAdvancementCriterionGrantEvent.patch
index b4922c8c36..4c7cee90bc 100644
--- a/Spigot-Server-Patches/0194-PlayerAdvancementCriterionGrantEvent.patch
+++ b/Spigot-Server-Patches/0195-PlayerAdvancementCriterionGrantEvent.patch
@@ -1,11 +1,11 @@
-From a995742255e4fdbd4865622b4047974b45b91b59 Mon Sep 17 00:00:00 2001
+From bcf95fe63d4cd386decaceeb3a2a713bd36086f3 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 19 Jan 2018 08:15:29 -0600
 Subject: [PATCH] PlayerAdvancementCriterionGrantEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
-index 4407e760c..fe5bea363 100644
+index 4407e760cb..fe5bea363f 100644
 --- a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
 +++ b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
 @@ -276,6 +276,12 @@ public class AdvancementDataPlayer {
@@ -22,5 +22,5 @@ index 4407e760c..fe5bea363 100644
              this.i.add(advancement);
              flag = true;
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0195-Add-ArmorStand-Item-Meta.patch b/Spigot-Server-Patches/0196-Add-ArmorStand-Item-Meta.patch
similarity index 98%
rename from Spigot-Server-Patches/0195-Add-ArmorStand-Item-Meta.patch
rename to Spigot-Server-Patches/0196-Add-ArmorStand-Item-Meta.patch
index 574a34a384..682de1a6d7 100644
--- a/Spigot-Server-Patches/0195-Add-ArmorStand-Item-Meta.patch
+++ b/Spigot-Server-Patches/0196-Add-ArmorStand-Item-Meta.patch
@@ -1,4 +1,4 @@
-From adffa3a0e999f6283f0c7cc41049bd40d3a7354c Mon Sep 17 00:00:00 2001
+From 2cac6305d9f20cbb442a69d9dedbe940c0087b5f Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 27 Jan 2018 17:04:14 -0500
 Subject: [PATCH] Add ArmorStand Item Meta
@@ -13,7 +13,7 @@ starting point for future additions in this area.
 Fixes GH-559
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java
-index f70052284..3723facca 100644
+index f700522840..3723faccac 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java
 @@ -8,13 +8,39 @@ import org.bukkit.Material;
@@ -267,7 +267,7 @@ index f70052284..3723facca 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 5ee968f2e..1eede4bcc 100644
+index 5ee968f2e0..1eede4bcc6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -1428,7 +1428,15 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
@@ -288,7 +288,7 @@ index 5ee968f2e..1eede4bcc 100644
              }
              return HANDLED_TAGS;
 diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
-index 630233960..3a82bede7 100644
+index 6302339601..3a82bede7c 100644
 --- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
 +++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
 @@ -6,6 +6,7 @@ import java.util.ArrayList;
@@ -308,5 +308,5 @@ index 630233960..3a82bede7 100644
                      return cleanStack;
                  }
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0196-Extend-Player-Interact-cancellation.patch b/Spigot-Server-Patches/0197-Extend-Player-Interact-cancellation.patch
similarity index 97%
rename from Spigot-Server-Patches/0196-Extend-Player-Interact-cancellation.patch
rename to Spigot-Server-Patches/0197-Extend-Player-Interact-cancellation.patch
index f50221c4b7..ec279ddea6 100644
--- a/Spigot-Server-Patches/0196-Extend-Player-Interact-cancellation.patch
+++ b/Spigot-Server-Patches/0197-Extend-Player-Interact-cancellation.patch
@@ -1,4 +1,4 @@
-From cf5b0d2dad1db1eb4f84e52d537acdff1882a711 Mon Sep 17 00:00:00 2001
+From 01183d139a2b287c2ef78efb863c855655ee0bd3 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 11 Feb 2018 10:43:46 +0000
 Subject: [PATCH] Extend Player Interact cancellation
@@ -13,7 +13,7 @@ Update adjacent blocks of doors, double plants, pistons and beds
 when cancelling interaction.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index 56f249c43..18ff6dd68 100644
+index 56f249c431..18ff6dd686 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
 @@ -137,6 +137,11 @@ public class PlayerInteractManager {
@@ -55,5 +55,5 @@ index 56f249c43..18ff6dd68 100644
              enuminteractionresult = (event.useItemInHand() != Event.Result.ALLOW) ? EnumInteractionResult.SUCCESS : EnumInteractionResult.PASS;
          } else if (this.gamemode == EnumGamemode.SPECTATOR) {
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0197-Tameable-getOwnerUniqueId-API.patch b/Spigot-Server-Patches/0198-Tameable-getOwnerUniqueId-API.patch
similarity index 91%
rename from Spigot-Server-Patches/0197-Tameable-getOwnerUniqueId-API.patch
rename to Spigot-Server-Patches/0198-Tameable-getOwnerUniqueId-API.patch
index b9052a7da4..4ba31e0a59 100644
--- a/Spigot-Server-Patches/0197-Tameable-getOwnerUniqueId-API.patch
+++ b/Spigot-Server-Patches/0198-Tameable-getOwnerUniqueId-API.patch
@@ -1,4 +1,4 @@
-From 2d9fdd1cb99d883bc8c08484c733055f154d8b8d Mon Sep 17 00:00:00 2001
+From 38a1d36783c330734362167fde6718a19d496b02 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 24 Feb 2018 01:14:55 -0500
 Subject: [PATCH] Tameable#getOwnerUniqueId API
@@ -7,7 +7,7 @@ This is faster if all you need is the UUID, as .getOwner() will cause
 an OfflinePlayer to be loaded from disk.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
-index 9952db3eb..1aea5f3f0 100644
+index 9952db3eb5..1aea5f3f05 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
 @@ -90,6 +90,9 @@ public abstract class CraftAbstractHorse extends CraftAnimals implements Abstrac
@@ -21,7 +21,7 @@ index 9952db3eb..1aea5f3f0 100644
          return getHandle().getOwnerUUID();
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java
-index 5dfa40dda..407b95caf 100644
+index 5dfa40dda1..407b95cafd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java
 @@ -17,6 +17,9 @@ public class CraftTameableAnimal extends CraftAnimals implements Tameable, Creat
@@ -35,5 +35,5 @@ index 5dfa40dda..407b95caf 100644
          try {
              return getHandle().getOwnerUUID();
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0198-Toggleable-player-crits-helps-mitigate-hacked-client.patch b/Spigot-Server-Patches/0199-Toggleable-player-crits-helps-mitigate-hacked-client.patch
similarity index 92%
rename from Spigot-Server-Patches/0198-Toggleable-player-crits-helps-mitigate-hacked-client.patch
rename to Spigot-Server-Patches/0199-Toggleable-player-crits-helps-mitigate-hacked-client.patch
index d50d2b116d..3b23c22b5d 100644
--- a/Spigot-Server-Patches/0198-Toggleable-player-crits-helps-mitigate-hacked-client.patch
+++ b/Spigot-Server-Patches/0199-Toggleable-player-crits-helps-mitigate-hacked-client.patch
@@ -1,11 +1,11 @@
-From 7168d4b9d1760a2b192340f2b1d42c23eec90328 Mon Sep 17 00:00:00 2001
+From 53c70ef02af18b8a46227272d21fd4a24d35a931 Mon Sep 17 00:00:00 2001
 From: MiniDigger <admin@minidigger.me>
 Date: Sat, 10 Mar 2018 00:50:24 +0100
 Subject: [PATCH] Toggleable player crits, helps mitigate hacked clients.
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index e315a00cc..2607c4e5f 100644
+index e315a00cc3..2607c4e5fa 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -187,6 +187,11 @@ public class PaperWorldConfig {
@@ -21,7 +21,7 @@ index e315a00cc..2607c4e5f 100644
      private void allChunksAreSlimeChunks() {
          allChunksAreSlimeChunks = getBoolean("all-chunks-are-slime-chunks", false);
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index fd7de143e..eb8f3833e 100644
+index fd7de143e3..eb8f3833ec 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -1063,6 +1063,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -33,5 +33,5 @@ index fd7de143e..eb8f3833e 100644
                      if (flag2) {
                          f *= 1.5F;
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0199-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch b/Spigot-Server-Patches/0200-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
similarity index 91%
rename from Spigot-Server-Patches/0199-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
rename to Spigot-Server-Patches/0200-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
index af212d0375..9b173d9a2d 100644
--- a/Spigot-Server-Patches/0199-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
+++ b/Spigot-Server-Patches/0200-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
@@ -1,4 +1,4 @@
-From 32c5eda601084a43d756e78afb3b9f215a8dbcd0 Mon Sep 17 00:00:00 2001
+From c7a1a29a606ac2ac3a6a2ecf0172ab530798dbec Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 10 Mar 2018 13:03:49 +0000
 Subject: [PATCH] Fix NPE when getting location from InventoryEnderChest opened
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix NPE when getting location from InventoryEnderChest opened
 
 
 diff --git a/src/main/java/net/minecraft/server/InventoryEnderChest.java b/src/main/java/net/minecraft/server/InventoryEnderChest.java
-index 5a9ac3960..fd31b9a6d 100644
+index 5a9ac3960d..fd31b9a6dc 100644
 --- a/src/main/java/net/minecraft/server/InventoryEnderChest.java
 +++ b/src/main/java/net/minecraft/server/InventoryEnderChest.java
 @@ -5,7 +5,7 @@ import org.bukkit.inventory.InventoryHolder;
@@ -27,5 +27,5 @@ index 5a9ac3960..fd31b9a6d 100644
      }
  
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0200-Prevent-Frosted-Ice-from-loading-holding-chunks.patch b/Spigot-Server-Patches/0201-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
similarity index 94%
rename from Spigot-Server-Patches/0200-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
rename to Spigot-Server-Patches/0201-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
index fa7d678adb..07f445c72e 100644
--- a/Spigot-Server-Patches/0200-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
+++ b/Spigot-Server-Patches/0201-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
@@ -1,11 +1,11 @@
-From 220a60e8e84b4da22e86c2aed5f2da427ae2c721 Mon Sep 17 00:00:00 2001
+From 37753ff75ed0edba06f7328de1ca42f56e78f090 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 10 Mar 2018 16:33:15 -0500
 Subject: [PATCH] Prevent Frosted Ice from loading/holding chunks
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockIceFrost.java b/src/main/java/net/minecraft/server/BlockIceFrost.java
-index 5e414138e..638a0aa5a 100644
+index 5e414138e4..638a0aa5ae 100644
 --- a/src/main/java/net/minecraft/server/BlockIceFrost.java
 +++ b/src/main/java/net/minecraft/server/BlockIceFrost.java
 @@ -26,8 +26,8 @@ public class BlockIceFrost extends BlockIce {
@@ -29,5 +29,5 @@ index 5e414138e..638a0aa5a 100644
                      if (j >= i) {
                          boolean flag = false;
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0201-Disable-Explicit-Network-Manager-Flushing.patch b/Spigot-Server-Patches/0202-Disable-Explicit-Network-Manager-Flushing.patch
similarity index 93%
rename from Spigot-Server-Patches/0201-Disable-Explicit-Network-Manager-Flushing.patch
rename to Spigot-Server-Patches/0202-Disable-Explicit-Network-Manager-Flushing.patch
index 7fd8b71190..8bf0f58463 100644
--- a/Spigot-Server-Patches/0201-Disable-Explicit-Network-Manager-Flushing.patch
+++ b/Spigot-Server-Patches/0202-Disable-Explicit-Network-Manager-Flushing.patch
@@ -1,4 +1,4 @@
-From 39155da9b345372c1221b2d7850c7d7b0f2f8e26 Mon Sep 17 00:00:00 2001
+From f2941c6f8f5805f8bcd34dad5d7c918f2e87b6b1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 11 Mar 2018 14:13:33 -0400
 Subject: [PATCH] Disable Explicit Network Manager Flushing
@@ -12,7 +12,7 @@ flushing on the netty event loop, so it won't do the flush on the main thread.
 Renable flushing by passing -Dpaper.explicit-flush=true
 
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index e2d8ed88f..08e314af7 100644
+index e2d8ed88f0..08e314af7c 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -63,6 +63,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -33,5 +33,5 @@ index e2d8ed88f..08e314af7 100644
  
          if (this.t++ % 20 == 0) {
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0202-Implement-extended-PaperServerListPingEvent.patch b/Spigot-Server-Patches/0203-Implement-extended-PaperServerListPingEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0202-Implement-extended-PaperServerListPingEvent.patch
rename to Spigot-Server-Patches/0203-Implement-extended-PaperServerListPingEvent.patch
index 0c2c70d035..9addf2f32a 100644
--- a/Spigot-Server-Patches/0202-Implement-extended-PaperServerListPingEvent.patch
+++ b/Spigot-Server-Patches/0203-Implement-extended-PaperServerListPingEvent.patch
@@ -1,4 +1,4 @@
-From 85dd7c98b6fe9a8daaae06ce0aa84d6335381510 Mon Sep 17 00:00:00 2001
+From f641996995a86cf099fcaa53f850625edb707bcc Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Wed, 11 Oct 2017 15:56:26 +0200
 Subject: [PATCH] Implement extended PaperServerListPingEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement extended PaperServerListPingEvent
 
 diff --git a/src/main/java/com/destroystokyo/paper/network/PaperServerListPingEventImpl.java b/src/main/java/com/destroystokyo/paper/network/PaperServerListPingEventImpl.java
 new file mode 100644
-index 000000000..c1a8e295b
+index 0000000000..c1a8e295b6
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/PaperServerListPingEventImpl.java
 @@ -0,0 +1,31 @@
@@ -43,7 +43,7 @@ index 000000000..c1a8e295b
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/network/PaperStatusClient.java b/src/main/java/com/destroystokyo/paper/network/PaperStatusClient.java
 new file mode 100644
-index 000000000..a2a409e63
+index 0000000000..a2a409e635
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/PaperStatusClient.java
 @@ -0,0 +1,11 @@
@@ -60,7 +60,7 @@ index 000000000..a2a409e63
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/network/StandardPaperServerListPingEventImpl.java b/src/main/java/com/destroystokyo/paper/network/StandardPaperServerListPingEventImpl.java
 new file mode 100644
-index 000000000..a85466bc7
+index 0000000000..a85466bc7e
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/StandardPaperServerListPingEventImpl.java
 @@ -0,0 +1,112 @@
@@ -177,7 +177,7 @@ index 000000000..a85466bc7
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 1ddb10741..97a0a6924 100644
+index 1ddb10741b..97a0a69247 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1,6 +1,9 @@
@@ -200,7 +200,7 @@ index 1ddb10741..97a0a6924 100644
  
              for (int k = 0; k < agameprofile.length; ++k) {
 diff --git a/src/main/java/net/minecraft/server/PacketStatusListener.java b/src/main/java/net/minecraft/server/PacketStatusListener.java
-index 658ea609c..4bb21c48b 100644
+index 658ea609cb..4bb21c48bd 100644
 --- a/src/main/java/net/minecraft/server/PacketStatusListener.java
 +++ b/src/main/java/net/minecraft/server/PacketStatusListener.java
 @@ -37,6 +37,8 @@ public class PacketStatusListener implements PacketStatusInListener {
@@ -223,7 +223,7 @@ index 658ea609c..4bb21c48b 100644
          // CraftBukkit end
      }
 diff --git a/src/main/java/net/minecraft/server/ServerPing.java b/src/main/java/net/minecraft/server/ServerPing.java
-index aa125a52d..ea52e89bd 100644
+index aa125a52dc..ea52e89bd9 100644
 --- a/src/main/java/net/minecraft/server/ServerPing.java
 +++ b/src/main/java/net/minecraft/server/ServerPing.java
 @@ -29,6 +29,7 @@ public class ServerPing {
@@ -248,7 +248,7 @@ index aa125a52d..ea52e89bd 100644
              this.c = agameprofile;
          }
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 783aa6db1..33767c85c 100644
+index 6d77bbc5aa..1cf214eaca 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -285,7 +285,7 @@ public class SpigotConfig
@@ -261,5 +261,5 @@ index 783aa6db1..33767c85c 100644
      }
  
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0203-Improved-Async-Task-Scheduler.patch b/Spigot-Server-Patches/0204-Improved-Async-Task-Scheduler.patch
similarity index 99%
rename from Spigot-Server-Patches/0203-Improved-Async-Task-Scheduler.patch
rename to Spigot-Server-Patches/0204-Improved-Async-Task-Scheduler.patch
index f7a16e02dc..933d4c8a09 100644
--- a/Spigot-Server-Patches/0203-Improved-Async-Task-Scheduler.patch
+++ b/Spigot-Server-Patches/0204-Improved-Async-Task-Scheduler.patch
@@ -1,4 +1,4 @@
-From cfad943ea663c283bb1f29e4873a882158d2c2d3 Mon Sep 17 00:00:00 2001
+From 18a12fd61ac30c984eec18f436140016bb7e072e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 16 Mar 2018 22:59:43 -0400
 Subject: [PATCH] Improved Async Task Scheduler
@@ -32,7 +32,7 @@ operations are decoupled from the sync tasks queue.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java
 new file mode 100644
-index 000000000..3c1992e21
+index 0000000000..3c1992e212
 --- /dev/null
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java
 @@ -0,0 +1,122 @@
@@ -159,7 +159,7 @@ index 000000000..3c1992e21
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index e102be583..5db848de1 100644
+index e102be583c..5db848de14 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 @@ -62,7 +62,7 @@ public class CraftScheduler implements BukkitScheduler {
@@ -365,5 +365,5 @@ index e102be583..5db848de1 100644
  
      private boolean isReady(final int currentTick) {
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0204-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/Spigot-Server-Patches/0205-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
similarity index 95%
rename from Spigot-Server-Patches/0204-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
rename to Spigot-Server-Patches/0205-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
index e4c82c4e43..471af38e55 100644
--- a/Spigot-Server-Patches/0204-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
+++ b/Spigot-Server-Patches/0205-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
@@ -1,4 +1,4 @@
-From 4a6a24dad2e9fbd89fd2843d554781ead788e13b Mon Sep 17 00:00:00 2001
+From 992532977da87f5636f6d26d3ca13a372071db85 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 18 Mar 2018 11:45:57 -0400
 Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent
 This will allow you to change the players name or skin on login.
 
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index 828b64e41..0614976b8 100644
+index 828b64e419..0614976b86 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -1,5 +1,7 @@
@@ -44,5 +44,5 @@ index 828b64e41..0614976b8 100644
                              if (PlayerPreLoginEvent.getHandlerList().getRegisteredListeners().length != 0) {
                                  final PlayerPreLoginEvent event = new PlayerPreLoginEvent(playerName, address, uniqueId);
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0205-Player.setPlayerProfile-API.patch b/Spigot-Server-Patches/0206-Player.setPlayerProfile-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0205-Player.setPlayerProfile-API.patch
rename to Spigot-Server-Patches/0206-Player.setPlayerProfile-API.patch
index d6ba079117..2c0425aea6 100644
--- a/Spigot-Server-Patches/0205-Player.setPlayerProfile-API.patch
+++ b/Spigot-Server-Patches/0206-Player.setPlayerProfile-API.patch
@@ -1,4 +1,4 @@
-From b8ef4a1e566f44104d288e456d79bdb4e33feb9b Mon Sep 17 00:00:00 2001
+From 3536545d96acde2dd82d5b6a3e0c9c5045a0026a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 18 Mar 2018 12:29:48 -0400
 Subject: [PATCH] Player.setPlayerProfile API
@@ -6,7 +6,7 @@ Subject: [PATCH] Player.setPlayerProfile API
 This can be useful for changing name or skins after a player has logged in.
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index eb8f3833e..205a842ee 100644
+index eb8f3833ec..205a842ee6 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -66,7 +66,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -19,7 +19,7 @@ index eb8f3833e..205a842ee 100644
      private final ItemCooldown bW;
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index 0614976b8..a985ae7ba 100644
+index 0614976b86..a985ae7ba0 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -37,7 +37,7 @@ public class LoginListener implements PacketLoginInListener {
@@ -48,7 +48,7 @@ index 0614976b8..a985ae7ba 100644
                              uniqueId = i.getId();
                              // Paper end
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 6bdee24f8..96b1eec91 100644
+index 6bdee24f84..96b1eec916 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1,6 +1,8 @@
@@ -138,5 +138,5 @@ index 6bdee24f8..96b1eec91 100644
      public void removeDisconnectingPlayer(Player player) {
          hiddenPlayers.remove(player.getUniqueId());
 -- 
-2.24.0
+2.24.1
 
diff --git a/Spigot-Server-Patches/0206-Fix-Dragon-Server-Crashes.patch b/Spigot-Server-Patches/0207-Fix-Dragon-Server-Crashes.patch
similarity index 91%
rename from Spigot-Server-Patches/0206-Fix-Dragon-Server-Crashes.patch
rename to Spigot-Server-Patches/0207-Fix-Dragon-Server-Crashes.patch
index aafd068a53..8b42edcad6 100644
--- a/Spigot-Server-Patches/0206-Fix-Dragon-Server-Crashes.patch
+++ b/Spigot-Server-Patches/0207-Fix-Dragon-Server-Crashes.patch
@@ -1,4 +1,4 @@
-From 98467daafc3c829fb77aa7b95d3eeb908cd43e4e Mon Sep 17 00:00:00 2001
+From 6a9a1797c502aa96a964168b5d5f0a32fae0709d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Mar 2018 20:52:07 -0400
 Subject: [PATCH] Fix Dragon Server Crashes
@@ -7,7 +7,7 @@ If the dragon tries to find "ground" and hits a hole, or off edge,
 it will infinitely keep looking for non air and eventually crash.
 
 diff --git a/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java b/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
-index c42de9771..40a8beff5 100644
+index c42de9771e..40a8beff55 100644
 --- a/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
 +++ b/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
 @@ -54,7 +54,7 @@ public class DragonControllerLandedFlame extends AbstractDragonControllerLanded
@@ -20,5 +20,5 @@ index c42de9771..40a8beff5 100644
                  if (d3 < 0.0D) {
                      d3 = d2;
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0207-getPlayerUniqueId-API.patch b/Spigot-Server-Patches/0208-getPlayerUniqueId-API.patch
similarity index 94%
rename from Spigot-Server-Patches/0207-getPlayerUniqueId-API.patch
rename to Spigot-Server-Patches/0208-getPlayerUniqueId-API.patch
index 101134588e..9989841d18 100644
--- a/Spigot-Server-Patches/0207-getPlayerUniqueId-API.patch
+++ b/Spigot-Server-Patches/0208-getPlayerUniqueId-API.patch
@@ -1,4 +1,4 @@
-From a8739afeb83ca2ccda5b6485ad3fba3702c1ccf5 Mon Sep 17 00:00:00 2001
+From b3f434caaf4cd3c54698cee75bbdd1fc66ebb530 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 22 Mar 2018 01:40:24 -0400
 Subject: [PATCH] getPlayerUniqueId API
@@ -9,7 +9,7 @@ In Offline Mode, will return an Offline UUID
 This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 9fe19fb59..296a11f14 100644
+index 9fe19fb595..296a11f141 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1364,6 +1364,26 @@ public final class CraftServer implements Server {
@@ -40,5 +40,5 @@ index 9fe19fb59..296a11f14 100644
      @Deprecated
      public OfflinePlayer getOfflinePlayer(String name) {
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0208-Make-player-data-saving-configurable.patch b/Spigot-Server-Patches/0209-Make-player-data-saving-configurable.patch
similarity index 92%
rename from Spigot-Server-Patches/0208-Make-player-data-saving-configurable.patch
rename to Spigot-Server-Patches/0209-Make-player-data-saving-configurable.patch
index 5c0c5ce8c8..504f3bbf18 100644
--- a/Spigot-Server-Patches/0208-Make-player-data-saving-configurable.patch
+++ b/Spigot-Server-Patches/0209-Make-player-data-saving-configurable.patch
@@ -1,11 +1,11 @@
-From 6f44e546f3bf909bfe8955e190a860fd1e7bf36e Mon Sep 17 00:00:00 2001
+From cbdc8be63d8cc41da8d4d75ad99e066d9132fd04 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Mon, 26 Mar 2018 18:30:53 +0300
 Subject: [PATCH] Make player data saving configurable
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 5884b04f7..ba341e017 100644
+index 5884b04f7e..ba341e0174 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -270,4 +270,13 @@ public class PaperConfig {
@@ -23,7 +23,7 @@ index 5884b04f7..ba341e017 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java
-index a0254d8e5..e60e10c57 100644
+index a0254d8e51..e60e10c57d 100644
 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
 +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java
 @@ -138,6 +138,7 @@ public class WorldNBTStorage implements IPlayerFileData {
@@ -35,5 +35,5 @@ index a0254d8e5..e60e10c57 100644
              NBTTagCompound nbttagcompound = entityhuman.save(new NBTTagCompound());
              File file = new File(this.playerDir, entityhuman.getUniqueIDString() + ".dat.tmp");
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0209-Make-legacy-ping-handler-more-reliable.patch b/Spigot-Server-Patches/0210-Make-legacy-ping-handler-more-reliable.patch
similarity index 98%
rename from Spigot-Server-Patches/0209-Make-legacy-ping-handler-more-reliable.patch
rename to Spigot-Server-Patches/0210-Make-legacy-ping-handler-more-reliable.patch
index 01dc0a2134..d0bc2e9221 100644
--- a/Spigot-Server-Patches/0209-Make-legacy-ping-handler-more-reliable.patch
+++ b/Spigot-Server-Patches/0210-Make-legacy-ping-handler-more-reliable.patch
@@ -1,4 +1,4 @@
-From ce39789a663bcb1d132ab10623b3535fd6680797 Mon Sep 17 00:00:00 2001
+From 88e48ce26b86d60d39c9bb4d371d48e995fc6502 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Wed, 11 Oct 2017 18:22:50 +0200
 Subject: [PATCH] Make legacy ping handler more reliable
@@ -28,7 +28,7 @@ respond to the request.
 [2]: https://netty.io/wiki/user-guide-for-4.x.html#wiki-h4-13
 
 diff --git a/src/main/java/net/minecraft/server/LegacyPingHandler.java b/src/main/java/net/minecraft/server/LegacyPingHandler.java
-index 9ee5a1ff0..063efe9bb 100644
+index 9ee5a1ff02..063efe9bbe 100644
 --- a/src/main/java/net/minecraft/server/LegacyPingHandler.java
 +++ b/src/main/java/net/minecraft/server/LegacyPingHandler.java
 @@ -14,6 +14,7 @@ public class LegacyPingHandler extends ChannelInboundHandlerAdapter {
@@ -167,5 +167,5 @@ index 9ee5a1ff0..063efe9bb 100644
          channelhandlercontext.pipeline().firstContext().writeAndFlush(bytebuf).addListener(ChannelFutureListener.CLOSE);
      }
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0210-Call-PaperServerListPingEvent-for-legacy-pings.patch b/Spigot-Server-Patches/0211-Call-PaperServerListPingEvent-for-legacy-pings.patch
similarity index 98%
rename from Spigot-Server-Patches/0210-Call-PaperServerListPingEvent-for-legacy-pings.patch
rename to Spigot-Server-Patches/0211-Call-PaperServerListPingEvent-for-legacy-pings.patch
index 08b700151c..e1ffd92f44 100644
--- a/Spigot-Server-Patches/0210-Call-PaperServerListPingEvent-for-legacy-pings.patch
+++ b/Spigot-Server-Patches/0211-Call-PaperServerListPingEvent-for-legacy-pings.patch
@@ -1,4 +1,4 @@
-From 828caedc08c05b4702952f1447f9a9e79e64586f Mon Sep 17 00:00:00 2001
+From 302dff4265ee6786aa146d3f0a91335e603e83fc Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Wed, 11 Oct 2017 19:30:51 +0200
 Subject: [PATCH] Call PaperServerListPingEvent for legacy pings
@@ -6,7 +6,7 @@ Subject: [PATCH] Call PaperServerListPingEvent for legacy pings
 
 diff --git a/src/main/java/com/destroystokyo/paper/network/PaperLegacyStatusClient.java b/src/main/java/com/destroystokyo/paper/network/PaperLegacyStatusClient.java
 new file mode 100644
-index 000000000..74c012fd4
+index 0000000000..74c012fd40
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/PaperLegacyStatusClient.java
 @@ -0,0 +1,73 @@
@@ -84,7 +84,7 @@ index 000000000..74c012fd4
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/LegacyPingHandler.java b/src/main/java/net/minecraft/server/LegacyPingHandler.java
-index 063efe9bb..4a49fe4cc 100644
+index 063efe9bbe..4a49fe4cc6 100644
 --- a/src/main/java/net/minecraft/server/LegacyPingHandler.java
 +++ b/src/main/java/net/minecraft/server/LegacyPingHandler.java
 @@ -1,5 +1,7 @@
@@ -153,5 +153,5 @@ index 063efe9bb..4a49fe4cc 100644
      }
  
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0211-Flag-to-disable-the-channel-limit.patch b/Spigot-Server-Patches/0212-Flag-to-disable-the-channel-limit.patch
similarity index 94%
rename from Spigot-Server-Patches/0211-Flag-to-disable-the-channel-limit.patch
rename to Spigot-Server-Patches/0212-Flag-to-disable-the-channel-limit.patch
index 212d9314fa..9854d46697 100644
--- a/Spigot-Server-Patches/0211-Flag-to-disable-the-channel-limit.patch
+++ b/Spigot-Server-Patches/0212-Flag-to-disable-the-channel-limit.patch
@@ -1,4 +1,4 @@
-From 708fcdaf3cb707f2d8ceeef9ee0afd71baaad221 Mon Sep 17 00:00:00 2001
+From 41d0afaa76bb4b80d203d3dbb08aa243d643af26 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 31 Mar 2018 17:04:26 +0100
 Subject: [PATCH] Flag to disable the channel limit
@@ -9,7 +9,7 @@ e.g. servers which allow and support the usage of mod packs.
 provide an optional flag to disable this check, at your own risk.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index e786641cc..b3a2b7fea 100644
+index 96b1eec916..ebf025c8aa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -138,6 +138,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -30,5 +30,5 @@ index e786641cc..b3a2b7fea 100644
          if (channels.add(channel)) {
              server.getPluginManager().callEvent(new PlayerRegisterChannelEvent(this, channel));
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0212-Add-method-to-open-already-placed-sign.patch b/Spigot-Server-Patches/0213-Add-method-to-open-already-placed-sign.patch
similarity index 92%
rename from Spigot-Server-Patches/0212-Add-method-to-open-already-placed-sign.patch
rename to Spigot-Server-Patches/0213-Add-method-to-open-already-placed-sign.patch
index 6d4bc81c0b..2ea422ecce 100644
--- a/Spigot-Server-Patches/0212-Add-method-to-open-already-placed-sign.patch
+++ b/Spigot-Server-Patches/0213-Add-method-to-open-already-placed-sign.patch
@@ -1,11 +1,11 @@
-From 97c9c6abb25684ca2eef0039ac1098d3cabf5941 Mon Sep 17 00:00:00 2001
+From a5fef17d17b313d74e01ed606dcb48ef44a87b79 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Sun, 1 Apr 2018 02:29:37 +0300
 Subject: [PATCH] Add method to open already placed sign
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index a1397d142..cd8ad2704 100644
+index a1397d1427..cd8ad27047 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -764,4 +764,17 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@@ -27,5 +27,5 @@ index a1397d142..cd8ad2704 100644
 +    // Paper end
  }
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0213-Configurable-sprint-interruption-on-attack.patch b/Spigot-Server-Patches/0214-Configurable-sprint-interruption-on-attack.patch
similarity index 92%
rename from Spigot-Server-Patches/0213-Configurable-sprint-interruption-on-attack.patch
rename to Spigot-Server-Patches/0214-Configurable-sprint-interruption-on-attack.patch
index 7cc321378c..62f8f059cf 100644
--- a/Spigot-Server-Patches/0213-Configurable-sprint-interruption-on-attack.patch
+++ b/Spigot-Server-Patches/0214-Configurable-sprint-interruption-on-attack.patch
@@ -1,4 +1,4 @@
-From 40ca4c9ec73dd0d1d305f637e5f29588f16d9303 Mon Sep 17 00:00:00 2001
+From ab9d9343bd388345ec9a2c56b1281f5fd721d9cb Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Sat, 14 Apr 2018 20:20:46 +0200
 Subject: [PATCH] Configurable sprint interruption on attack
@@ -6,7 +6,7 @@ Subject: [PATCH] Configurable sprint interruption on attack
 If the sprint interruption is disabled players continue sprinting when they attack entities.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 2607c4e5f..1d3120b9b 100644
+index 2607c4e5fa..1d3120b9bf 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -354,4 +354,9 @@ public class PaperWorldConfig {
@@ -20,7 +20,7 @@ index 2607c4e5f..1d3120b9b 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 205a842ee..4e91fdd69 100644
+index 205a842ee6..4e91fdd69e 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -1112,7 +1112,11 @@ public abstract class EntityHuman extends EntityLiving {
@@ -37,5 +37,5 @@ index 205a842ee..4e91fdd69 100644
  
                          if (flag3) {
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0214-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/Spigot-Server-Patches/0215-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
similarity index 91%
rename from Spigot-Server-Patches/0214-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
rename to Spigot-Server-Patches/0215-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
index 37ec412245..ae08e8e74a 100644
--- a/Spigot-Server-Patches/0214-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
+++ b/Spigot-Server-Patches/0215-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
@@ -1,11 +1,11 @@
-From ee33643447f7f46a805022cbc1e6ff9ae0025517 Mon Sep 17 00:00:00 2001
+From 525e9a5b2ced642a9fa7fd1ad5e1f5e3b12ea495 Mon Sep 17 00:00:00 2001
 From: 0x22 <0x22@futureclient.net>
 Date: Thu, 26 Apr 2018 04:41:11 -0400
 Subject: [PATCH] Fix exploit that allowed colored signs to be created
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index ad2a36627..8757b6751 100644
+index ad2a366275..8757b6751e 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2501,7 +2501,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -18,5 +18,5 @@ index ad2a36627..8757b6751 100644
              SignChangeEvent event = new SignChangeEvent((org.bukkit.craftbukkit.block.CraftBlock) player.getWorld().getBlockAt(x, y, z), this.server.getPlayer(this.player), lines);
              this.server.getPluginManager().callEvent(event);
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0215-EndermanEscapeEvent.patch b/Spigot-Server-Patches/0216-EndermanEscapeEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0215-EndermanEscapeEvent.patch
rename to Spigot-Server-Patches/0216-EndermanEscapeEvent.patch
index 5d15aadd73..9e14b75ca0 100644
--- a/Spigot-Server-Patches/0215-EndermanEscapeEvent.patch
+++ b/Spigot-Server-Patches/0216-EndermanEscapeEvent.patch
@@ -1,4 +1,4 @@
-From 95f1d8935e27b90364050306fa692c00ad998f2f Mon Sep 17 00:00:00 2001
+From 602aee708d913111e6007e8fd3171a22eb56d68e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 13:15:55 -0400
 Subject: [PATCH] EndermanEscapeEvent
@@ -8,7 +8,7 @@ Fires an event anytime an enderman intends to teleport away from the player
 You may cancel this, enabling ranged attacks to damage the enderman for example.
 
 diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
-index 4519be39a..60ff02770 100644
+index 4519be39ad..60ff027700 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
 @@ -2,6 +2,7 @@ package net.minecraft.server;
@@ -81,5 +81,5 @@ index 4519be39a..60ff02770 100644
                          }
  
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0216-Enderman.teleportRandomly.patch b/Spigot-Server-Patches/0217-Enderman.teleportRandomly.patch
similarity index 90%
rename from Spigot-Server-Patches/0216-Enderman.teleportRandomly.patch
rename to Spigot-Server-Patches/0217-Enderman.teleportRandomly.patch
index 506aacbf8e..9c126d3841 100644
--- a/Spigot-Server-Patches/0216-Enderman.teleportRandomly.patch
+++ b/Spigot-Server-Patches/0217-Enderman.teleportRandomly.patch
@@ -1,4 +1,4 @@
-From 918588265838ec621e001485b36f68a4af54becb Mon Sep 17 00:00:00 2001
+From 35f7c053217f45c19fea1bae3ab1d64c3081ca0a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 13:29:44 -0400
 Subject: [PATCH] Enderman.teleportRandomly()
@@ -6,7 +6,7 @@ Subject: [PATCH] Enderman.teleportRandomly()
 Ability to trigger the vanilla "teleport randomly" mechanic of an enderman.
 
 diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
-index 60ff02770..6868ca415 100644
+index 60ff027700..6868ca4154 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
 @@ -193,6 +193,7 @@ public class EntityEnderman extends EntityMonster {
@@ -18,7 +18,7 @@ index 60ff02770..6868ca415 100644
          if (!this.world.p_() && this.isAlive()) {
              double d0 = this.locX() + (this.random.nextDouble() - 0.5D) * 64.0D;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
-index 970efabd3..0c5f35934 100644
+index 970efabd37..0c5f359346 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
 @@ -16,6 +16,7 @@ public class CraftEnderman extends CraftMonster implements Enderman {
@@ -30,5 +30,5 @@ index 970efabd3..0c5f35934 100644
      public MaterialData getCarriedMaterial() {
          IBlockData blockData = getHandle().getCarried();
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0217-Block-Enderpearl-Travel-Exploit.patch b/Spigot-Server-Patches/0218-Block-Enderpearl-Travel-Exploit.patch
similarity index 93%
rename from Spigot-Server-Patches/0217-Block-Enderpearl-Travel-Exploit.patch
rename to Spigot-Server-Patches/0218-Block-Enderpearl-Travel-Exploit.patch
index e09aed1b66..4274090310 100644
--- a/Spigot-Server-Patches/0217-Block-Enderpearl-Travel-Exploit.patch
+++ b/Spigot-Server-Patches/0218-Block-Enderpearl-Travel-Exploit.patch
@@ -1,4 +1,4 @@
-From 36ce57946d39251b606722693561454b8b63e7a2 Mon Sep 17 00:00:00 2001
+From 8bed28be730343282419516db2bb02293d4d9aeb Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 17:15:26 -0400
 Subject: [PATCH] Block Enderpearl Travel Exploit
@@ -12,7 +12,7 @@ This disables that by not saving the thrower when the chunk is unloaded.
 This is mainly useful for survival servers that do not allow freeform teleporting.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 1d3120b9b..585646ded 100644
+index 1d3120b9bf..585646deda 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -359,4 +359,10 @@ public class PaperWorldConfig {
@@ -27,7 +27,7 @@ index 1d3120b9b..585646ded 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java
-index 724b78b5d..9eed1dce3 100644
+index 724b78b5d2..9eed1dce3e 100644
 --- a/src/main/java/net/minecraft/server/EntityProjectile.java
 +++ b/src/main/java/net/minecraft/server/EntityProjectile.java
 @@ -201,6 +201,7 @@ public abstract class EntityProjectile extends Entity implements IProjectile {
@@ -39,5 +39,5 @@ index 724b78b5d..9eed1dce3 100644
      }
  
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0218-Expand-World.spawnParticle-API-and-add-Builder.patch b/Spigot-Server-Patches/0219-Expand-World.spawnParticle-API-and-add-Builder.patch
similarity index 96%
rename from Spigot-Server-Patches/0218-Expand-World.spawnParticle-API-and-add-Builder.patch
rename to Spigot-Server-Patches/0219-Expand-World.spawnParticle-API-and-add-Builder.patch
index 30a8c24c80..fae0203a9f 100644
--- a/Spigot-Server-Patches/0218-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/Spigot-Server-Patches/0219-Expand-World.spawnParticle-API-and-add-Builder.patch
@@ -1,4 +1,4 @@
-From 33aeabed1a727fd1745d0c9d8eceef2260106725 Mon Sep 17 00:00:00 2001
+From d6bb623518ca5a620eef3aa68a872719f181e8f3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 15 Aug 2017 22:29:12 -0400
 Subject: [PATCH] Expand World.spawnParticle API and add Builder
@@ -10,7 +10,7 @@ Adds an option to control the force mode of the particle.
 This adds a new Builder API which is much friendlier to use.
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index f84e727d9..8a8c2eaf5 100644
+index f84e727d9f..8a8c2eaf58 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -55,7 +55,7 @@ public class WorldServer extends World {
@@ -43,7 +43,7 @@ index f84e727d9..8a8c2eaf5 100644
  
              if (this.a(entityplayer, force, d0, d1, d2, packetplayoutworldparticles)) { // CraftBukkit
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 1e59f3f14..2f1f308ab 100644
+index 1e59f3f147..2f1f308ab1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -2233,11 +2233,17 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0219-EndermanAttackPlayerEvent.patch b/Spigot-Server-Patches/0220-EndermanAttackPlayerEvent.patch
similarity index 92%
rename from Spigot-Server-Patches/0219-EndermanAttackPlayerEvent.patch
rename to Spigot-Server-Patches/0220-EndermanAttackPlayerEvent.patch
index 099791ef78..f49dbff621 100644
--- a/Spigot-Server-Patches/0219-EndermanAttackPlayerEvent.patch
+++ b/Spigot-Server-Patches/0220-EndermanAttackPlayerEvent.patch
@@ -1,4 +1,4 @@
-From 2525095dad65d3f653f2900049dabd95e9af773d Mon Sep 17 00:00:00 2001
+From 24c9f46cdac11e14f83a383b6dbc4917c75dab16 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 1 May 2018 20:18:54 -0400
 Subject: [PATCH] EndermanAttackPlayerEvent
@@ -8,7 +8,7 @@ Allow control over whether or not an enderman aggros a player.
 This allows you to override/extend the pumpkin/stare logic.
 
 diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
-index 6868ca415..607d6da6a 100644
+index 6868ca4154..607d6da6a4 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
 @@ -141,7 +141,15 @@ public class EntityEnderman extends EntityMonster {
@@ -28,5 +28,5 @@ index 6868ca415..607d6da6a 100644
  
          if (itemstack.getItem() == Blocks.CARVED_PUMPKIN.getItem()) {
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0220-WitchConsumePotionEvent.patch b/Spigot-Server-Patches/0221-WitchConsumePotionEvent.patch
similarity index 92%
rename from Spigot-Server-Patches/0220-WitchConsumePotionEvent.patch
rename to Spigot-Server-Patches/0221-WitchConsumePotionEvent.patch
index ec387dc52c..a133fe2339 100644
--- a/Spigot-Server-Patches/0220-WitchConsumePotionEvent.patch
+++ b/Spigot-Server-Patches/0221-WitchConsumePotionEvent.patch
@@ -1,4 +1,4 @@
-From e2e97b1806e88aecdbbaa983a3f1ec0eac102b39 Mon Sep 17 00:00:00 2001
+From 660fec333580d4510f4bcd1c645c14461a341c31 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 16 May 2018 20:35:16 -0400
 Subject: [PATCH] WitchConsumePotionEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] WitchConsumePotionEvent
 Fires when a witch consumes the potion in their hand
 
 diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java
-index ddff0b578..aa9011171 100644
+index ddff0b5786..aa90111716 100644
 --- a/src/main/java/net/minecraft/server/EntityWitch.java
 +++ b/src/main/java/net/minecraft/server/EntityWitch.java
 @@ -88,7 +88,11 @@ public class EntityWitch extends EntityRaider implements IRangedEntity {
@@ -23,5 +23,5 @@ index ddff0b578..aa9011171 100644
                          if (list != null) {
                              Iterator iterator = list.iterator();
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0221-WitchThrowPotionEvent.patch b/Spigot-Server-Patches/0222-WitchThrowPotionEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0221-WitchThrowPotionEvent.patch
rename to Spigot-Server-Patches/0222-WitchThrowPotionEvent.patch
index 19205980c3..c5e92d3288 100644
--- a/Spigot-Server-Patches/0221-WitchThrowPotionEvent.patch
+++ b/Spigot-Server-Patches/0222-WitchThrowPotionEvent.patch
@@ -1,4 +1,4 @@
-From d752ec090fd564619e2e18a95ef1090909fdeb75 Mon Sep 17 00:00:00 2001
+From 6472b7b72f2ec634ac692407a510ee91e004db33 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 16 May 2018 20:44:58 -0400
 Subject: [PATCH] WitchThrowPotionEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] WitchThrowPotionEvent
 Fired when a witch throws a potion at a player
 
 diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java
-index aa9011171..1f2759e95 100644
+index aa90111716..1f2759e95e 100644
 --- a/src/main/java/net/minecraft/server/EntityWitch.java
 +++ b/src/main/java/net/minecraft/server/EntityWitch.java
 @@ -185,9 +185,16 @@ public class EntityWitch extends EntityRaider implements IRangedEntity {
@@ -29,5 +29,5 @@ index aa9011171..1f2759e95 100644
              entitypotion.shoot(d0, d1 + (double) (f1 * 0.2F), d2, 0.75F, 8.0F);
              this.world.playSound((EntityHuman) null, this.locX(), this.locY(), this.locZ(), SoundEffects.ENTITY_WITCH_THROW, this.getSoundCategory(), 1.0F, 0.8F + this.random.nextFloat() * 0.4F);
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0222-Allow-spawning-Item-entities-with-World.spawnEntity.patch b/Spigot-Server-Patches/0223-Allow-spawning-Item-entities-with-World.spawnEntity.patch
similarity index 92%
rename from Spigot-Server-Patches/0222-Allow-spawning-Item-entities-with-World.spawnEntity.patch
rename to Spigot-Server-Patches/0223-Allow-spawning-Item-entities-with-World.spawnEntity.patch
index d3348df6b4..27ebfb9ab9 100644
--- a/Spigot-Server-Patches/0222-Allow-spawning-Item-entities-with-World.spawnEntity.patch
+++ b/Spigot-Server-Patches/0223-Allow-spawning-Item-entities-with-World.spawnEntity.patch
@@ -1,4 +1,4 @@
-From dc1627fdf76e17665a6053858faa93c077e62622 Mon Sep 17 00:00:00 2001
+From bf1fd2d7de1417e3d99088b483c266b01f0aa7bf Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 4 Jun 2018 20:39:20 -0400
 Subject: [PATCH] Allow spawning Item entities with World.spawnEntity
@@ -8,7 +8,7 @@ This API has more capabilities than .dropItem with the Consumer function
 Item can be set inside of the Consumer pre spawn function.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 2f1f308ab..b66fa7b89 100644
+index 2f1f308ab1..b66fa7b894 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1465,6 +1465,10 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0223-WitchReadyPotionEvent.patch b/Spigot-Server-Patches/0224-WitchReadyPotionEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0223-WitchReadyPotionEvent.patch
rename to Spigot-Server-Patches/0224-WitchReadyPotionEvent.patch
index 730b56ca4a..51d8f051dc 100644
--- a/Spigot-Server-Patches/0223-WitchReadyPotionEvent.patch
+++ b/Spigot-Server-Patches/0224-WitchReadyPotionEvent.patch
@@ -1,11 +1,11 @@
-From 7822c66db3ab96c5b892428bd1c3a7df96645715 Mon Sep 17 00:00:00 2001
+From 799359edc3098c9b8ac49c02fdaf8e61f8793fd4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Jun 2018 22:47:26 -0400
 Subject: [PATCH] WitchReadyPotionEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java
-index 1f2759e95..be6ecfb08 100644
+index 1f2759e95e..be6ecfb08a 100644
 --- a/src/main/java/net/minecraft/server/EntityWitch.java
 +++ b/src/main/java/net/minecraft/server/EntityWitch.java
 @@ -121,7 +121,11 @@ public class EntityWitch extends EntityRaider implements IRangedEntity {
@@ -22,5 +22,5 @@ index 1f2759e95..be6ecfb08 100644
                      this.t(true);
                      this.world.playSound((EntityHuman) null, this.locX(), this.locY(), this.locZ(), SoundEffects.ENTITY_WITCH_DRINK, this.getSoundCategory(), 1.0F, 0.8F + this.random.nextFloat() * 0.4F);
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0224-ItemStack-getMaxItemUseDuration.patch b/Spigot-Server-Patches/0225-ItemStack-getMaxItemUseDuration.patch
similarity index 91%
rename from Spigot-Server-Patches/0224-ItemStack-getMaxItemUseDuration.patch
rename to Spigot-Server-Patches/0225-ItemStack-getMaxItemUseDuration.patch
index 3c19be0543..2e2c7f66a1 100644
--- a/Spigot-Server-Patches/0224-ItemStack-getMaxItemUseDuration.patch
+++ b/Spigot-Server-Patches/0225-ItemStack-getMaxItemUseDuration.patch
@@ -1,4 +1,4 @@
-From 73e6994894a822b241cf0cc485ac9b8b1d6a8c76 Mon Sep 17 00:00:00 2001
+From 3668331a4c3224665732696a292e087603180f9e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Jun 2018 23:00:29 -0400
 Subject: [PATCH] ItemStack#getMaxItemUseDuration
@@ -6,7 +6,7 @@ Subject: [PATCH] ItemStack#getMaxItemUseDuration
 Allows you to determine how long it takes to use a usable/consumable item
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 2d0a8c58f..5fc7124dd 100644
+index 2d0a8c58fb..5fc7124dd5 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -548,6 +548,7 @@ public final class ItemStack {
@@ -18,7 +18,7 @@ index 2d0a8c58f..5fc7124dd 100644
          return this.getItem().f_(this);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 410444747..553f60987 100644
+index 3dd912abe3..a41be8fdae 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -174,6 +174,13 @@ public final class CraftItemStack extends ItemStack {
@@ -36,5 +36,5 @@ index 410444747..553f60987 100644
      public void addUnsafeEnchantment(Enchantment ench, int level) {
          Validate.notNull(ench, "Cannot add null enchantment");
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0225-Implement-EntityTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/0226-Implement-EntityTeleportEndGatewayEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0225-Implement-EntityTeleportEndGatewayEvent.patch
rename to Spigot-Server-Patches/0226-Implement-EntityTeleportEndGatewayEvent.patch
index a025f7a7d0..7bd0f12d48 100644
--- a/Spigot-Server-Patches/0225-Implement-EntityTeleportEndGatewayEvent.patch
+++ b/Spigot-Server-Patches/0226-Implement-EntityTeleportEndGatewayEvent.patch
@@ -1,11 +1,11 @@
-From 72c985a2c8e569e9471edc10f46e5edd7e9e7cd9 Mon Sep 17 00:00:00 2001
+From 5df14fcf69aad1c5e8fedb327641895e3b825a1b Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 9 Jun 2018 14:08:39 +0200
 Subject: [PATCH] Implement EntityTeleportEndGatewayEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/TileEntityEndGateway.java b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
-index 78fba7937..c71f76004 100644
+index 78fba79378..c71f76004e 100644
 --- a/src/main/java/net/minecraft/server/TileEntityEndGateway.java
 +++ b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
 @@ -145,8 +145,19 @@ public class TileEntityEndGateway extends TileEntityEnderPortal implements ITick
@@ -30,5 +30,5 @@ index 78fba7937..c71f76004 100644
  
              this.h();
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0226-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/Spigot-Server-Patches/0227-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
similarity index 93%
rename from Spigot-Server-Patches/0226-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
rename to Spigot-Server-Patches/0227-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
index daa218ba1a..9168349dce 100644
--- a/Spigot-Server-Patches/0226-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
+++ b/Spigot-Server-Patches/0227-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
@@ -1,4 +1,4 @@
-From 29ec2e2ea3e8cc94fa15a4bdbd7f9fef3a4c3381 Mon Sep 17 00:00:00 2001
+From 71b17d41c230f37f7896238653970eb145a1bca7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 10 Jun 2018 01:18:49 -0400
 Subject: [PATCH] Unset Ignited flag on cancel of Explosion Event
@@ -6,7 +6,7 @@ Subject: [PATCH] Unset Ignited flag on cancel of Explosion Event
 Otherwise the creeper infinite explodes
 
 diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
-index dabe40c5f..317c1998e 100644
+index dabe40c5f9..317c1998e6 100644
 --- a/src/main/java/net/minecraft/server/EntityCreeper.java
 +++ b/src/main/java/net/minecraft/server/EntityCreeper.java
 @@ -12,7 +12,7 @@ public class EntityCreeper extends EntityMonster {
@@ -27,5 +27,5 @@ index dabe40c5f..317c1998e 100644
              // CraftBukkit end
          }
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0227-Fix-CraftEntity-hashCode.patch b/Spigot-Server-Patches/0228-Fix-CraftEntity-hashCode.patch
similarity index 94%
rename from Spigot-Server-Patches/0227-Fix-CraftEntity-hashCode.patch
rename to Spigot-Server-Patches/0228-Fix-CraftEntity-hashCode.patch
index dd195de8bc..b2c87450c1 100644
--- a/Spigot-Server-Patches/0227-Fix-CraftEntity-hashCode.patch
+++ b/Spigot-Server-Patches/0228-Fix-CraftEntity-hashCode.patch
@@ -1,4 +1,4 @@
-From 22b1f8bebd55c58a20f60090957dc3e8bd4fc9f7 Mon Sep 17 00:00:00 2001
+From 655e6e34576247e9c6e0dc75782d760880823d12 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 10 Jun 2018 20:20:15 -0400
 Subject: [PATCH] Fix CraftEntity hashCode
@@ -21,7 +21,7 @@ check is essentially the same as this.getHandle() == other.getHandle()
 However, replaced it too to make it clearer of intent.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 495a7c464..915ccb180 100644
+index 495a7c464f..915ccb1807 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -723,14 +723,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -45,5 +45,5 @@ index 495a7c464..915ccb180 100644
  
      @Override
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0228-Configurable-Alternative-LootPool-Luck-Formula.patch b/Spigot-Server-Patches/0229-Configurable-Alternative-LootPool-Luck-Formula.patch
similarity index 97%
rename from Spigot-Server-Patches/0228-Configurable-Alternative-LootPool-Luck-Formula.patch
rename to Spigot-Server-Patches/0229-Configurable-Alternative-LootPool-Luck-Formula.patch
index ab45ae0133..56a6268580 100644
--- a/Spigot-Server-Patches/0228-Configurable-Alternative-LootPool-Luck-Formula.patch
+++ b/Spigot-Server-Patches/0229-Configurable-Alternative-LootPool-Luck-Formula.patch
@@ -1,4 +1,4 @@
-From c15b1063aeb983155071258bb459b721206ddc95 Mon Sep 17 00:00:00 2001
+From 5fc41c66b880fb304f3fe0fc635283d996c6ad67 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 15 Jun 2018 00:30:32 -0400
 Subject: [PATCH] Configurable Alternative LootPool Luck Formula
@@ -36,7 +36,7 @@ This change will result in some major changes to fishing formulas.
 I would love to see this change in Vanilla, so Mojang please pull :)
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index ba341e017..26ab855dc 100644
+index ba341e0174..26ab855dcf 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -279,4 +279,12 @@ public class PaperConfig {
@@ -53,7 +53,7 @@ index ba341e017..26ab855dc 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/LootSelectorEntry.java b/src/main/java/net/minecraft/server/LootSelectorEntry.java
-index 3ed6a1e78..03398ce8f 100644
+index 3ed6a1e785..03398ce8fd 100644
 --- a/src/main/java/net/minecraft/server/LootSelectorEntry.java
 +++ b/src/main/java/net/minecraft/server/LootSelectorEntry.java
 @@ -11,8 +11,8 @@ import org.apache.commons.lang3.ArrayUtils;
@@ -109,5 +109,5 @@ index 3ed6a1e78..03398ce8f 100644
 +        // Paper end
  }
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0229-Print-Error-details-when-failing-to-save-player-data.patch b/Spigot-Server-Patches/0230-Print-Error-details-when-failing-to-save-player-data.patch
similarity index 88%
rename from Spigot-Server-Patches/0229-Print-Error-details-when-failing-to-save-player-data.patch
rename to Spigot-Server-Patches/0230-Print-Error-details-when-failing-to-save-player-data.patch
index 7fec825cc9..b4e38eb9a4 100644
--- a/Spigot-Server-Patches/0229-Print-Error-details-when-failing-to-save-player-data.patch
+++ b/Spigot-Server-Patches/0230-Print-Error-details-when-failing-to-save-player-data.patch
@@ -1,11 +1,11 @@
-From ca65176138244564301d2c5eefd88e0a47ccd942 Mon Sep 17 00:00:00 2001
+From 46da088e8952a8d9435ff03034ea2b2c4c48bf4e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 15 Jun 2018 20:37:03 -0400
 Subject: [PATCH] Print Error details when failing to save player data
 
 
 diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java
-index e60e10c57..350ac42d6 100644
+index e60e10c57d..350ac42d6b 100644
 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
 +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java
 @@ -151,7 +151,7 @@ public class WorldNBTStorage implements IPlayerFileData {
@@ -18,5 +18,5 @@ index e60e10c57..350ac42d6 100644
  
      }
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0230-Make-shield-blocking-delay-configurable.patch b/Spigot-Server-Patches/0231-Make-shield-blocking-delay-configurable.patch
similarity index 94%
rename from Spigot-Server-Patches/0230-Make-shield-blocking-delay-configurable.patch
rename to Spigot-Server-Patches/0231-Make-shield-blocking-delay-configurable.patch
index f7d7200530..18d96b681c 100644
--- a/Spigot-Server-Patches/0230-Make-shield-blocking-delay-configurable.patch
+++ b/Spigot-Server-Patches/0231-Make-shield-blocking-delay-configurable.patch
@@ -1,11 +1,11 @@
-From 7d065a2a08e59025bd4d81b8c2f63f18e66132a1 Mon Sep 17 00:00:00 2001
+From ec7724be6c1c144194915816e3fa6f533296ee83 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 16 Jun 2018 01:18:16 -0500
 Subject: [PATCH] Make shield blocking delay configurable
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 585646ded..54bf1323e 100644
+index 585646deda..54bf1323e0 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -365,4 +365,9 @@ public class PaperWorldConfig {
@@ -19,7 +19,7 @@ index 585646ded..54bf1323e 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index c03fcd2d3..3f493f415 100644
+index c03fcd2d38..3f493f4158 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2996,7 +2996,7 @@ public abstract class EntityLiving extends Entity {
@@ -48,7 +48,7 @@ index c03fcd2d3..3f493f415 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index b8482c632..67f275321 100644
+index b8482c6328..67f275321b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -632,5 +632,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -68,5 +68,5 @@ index b8482c632..67f275321 100644
      // Paper end
  }
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0231-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch b/Spigot-Server-Patches/0232-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
similarity index 93%
rename from Spigot-Server-Patches/0231-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
rename to Spigot-Server-Patches/0232-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
index 5eca43a74a..ae6f3fc1e1 100644
--- a/Spigot-Server-Patches/0231-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
+++ b/Spigot-Server-Patches/0232-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
@@ -1,4 +1,4 @@
-From 18febd91f8f096df4f2ac1d8b426723d0bbee9bc Mon Sep 17 00:00:00 2001
+From bd24b362196cf6f9c17d8e3438a479615614d3e1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 16 Jun 2018 16:23:38 -0400
 Subject: [PATCH] Ignore Missing Recipes in RecipeBook to avoid data errors
@@ -6,7 +6,7 @@ Subject: [PATCH] Ignore Missing Recipes in RecipeBook to avoid data errors
 This code was causing NPE's in saving player data, potentially related to reloads.
 
 diff --git a/src/main/java/net/minecraft/server/RecipeBookServer.java b/src/main/java/net/minecraft/server/RecipeBookServer.java
-index 0203e26ec..aa6e5681f 100644
+index 0203e26ec9..aa6e5681f6 100644
 --- a/src/main/java/net/minecraft/server/RecipeBookServer.java
 +++ b/src/main/java/net/minecraft/server/RecipeBookServer.java
 @@ -79,6 +79,10 @@ public class RecipeBookServer extends RecipeBook {
@@ -32,5 +32,5 @@ index 0203e26ec..aa6e5681f 100644
              nbttaglist1.add(NBTTagString.a(minecraftkey1.toString()));
          }
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0232-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch b/Spigot-Server-Patches/0233-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
similarity index 97%
rename from Spigot-Server-Patches/0232-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
rename to Spigot-Server-Patches/0233-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
index a987dd2a4a..2e124c86e5 100644
--- a/Spigot-Server-Patches/0232-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
+++ b/Spigot-Server-Patches/0233-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
@@ -1,4 +1,4 @@
-From fb58d6a90beadd6594463b3e6bb929f9b30a4fd2 Mon Sep 17 00:00:00 2001
+From ea676427ba9119a25f3d0cb7f5b20438058be63c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 15 Jun 2013 19:51:17 -0400
 Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API
@@ -6,7 +6,7 @@ Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API
 Adds ability to get what arrow was shot, and control if it should be consumed.
 
 diff --git a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
-index d97558da3..fdeb8980d 100644
+index d97558da3e..fdeb8980d9 100644
 --- a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
 @@ -157,7 +157,7 @@ public abstract class EntitySkeletonAbstract extends EntityMonster implements IR
@@ -19,7 +19,7 @@ index d97558da3..fdeb8980d 100644
              event.getProjectile().remove();
              return;
 diff --git a/src/main/java/net/minecraft/server/ItemBow.java b/src/main/java/net/minecraft/server/ItemBow.java
-index 4b07e18c7..71800b34b 100644
+index 4b07e18c7e..71800b34b4 100644
 --- a/src/main/java/net/minecraft/server/ItemBow.java
 +++ b/src/main/java/net/minecraft/server/ItemBow.java
 @@ -36,6 +36,7 @@ public class ItemBow extends ItemProjectileWeapon {
@@ -59,7 +59,7 @@ index 4b07e18c7..71800b34b 100644
                          if (itemstack1.isEmpty()) {
                              entityhuman.inventory.f(itemstack1);
 diff --git a/src/main/java/net/minecraft/server/ItemCrossbow.java b/src/main/java/net/minecraft/server/ItemCrossbow.java
-index 608be9e70..011efc6f5 100644
+index 608be9e70a..011efc6f5b 100644
 --- a/src/main/java/net/minecraft/server/ItemCrossbow.java
 +++ b/src/main/java/net/minecraft/server/ItemCrossbow.java
 @@ -221,7 +221,7 @@ public class ItemCrossbow extends ItemProjectileWeapon {
@@ -72,7 +72,7 @@ index 608be9e70..011efc6f5 100644
                  event.getProjectile().remove();
                  return;
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 9b314eacc..94fbac5e4 100644
+index 9b314eacc3..94fbac5e40 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -51,6 +51,7 @@ import net.minecraft.server.GeneratorAccess;
@@ -104,5 +104,5 @@ index 9b314eacc..94fbac5e4 100644
  
          return event;
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0233-PlayerReadyArrowEvent.patch b/Spigot-Server-Patches/0234-PlayerReadyArrowEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0233-PlayerReadyArrowEvent.patch
rename to Spigot-Server-Patches/0234-PlayerReadyArrowEvent.patch
index b77818d8d3..4d08456b1c 100644
--- a/Spigot-Server-Patches/0233-PlayerReadyArrowEvent.patch
+++ b/Spigot-Server-Patches/0234-PlayerReadyArrowEvent.patch
@@ -1,4 +1,4 @@
-From 87f3926a3b2fc53691d6e4a5490abfafd18728f2 Mon Sep 17 00:00:00 2001
+From aac2c8bb5c984fbcdb11ebd6a391e4de76851b62 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 18 Jun 2018 01:12:53 -0400
 Subject: [PATCH] PlayerReadyArrowEvent
@@ -7,7 +7,7 @@ Called when a player is firing a bow and the server is choosing an arrow to use.
 Plugins can skip selection of certain arrows and control which is used.
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 4e91fdd69..3917980b7 100644
+index 4e91fdd69e..3917980b76 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -2149,6 +2149,17 @@ public abstract class EntityHuman extends EntityLiving {
@@ -38,5 +38,5 @@ index 4e91fdd69..3917980b7 100644
                      }
                  }
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0234-Fire-EntityShootBowEvent-for-Illusioner.patch b/Spigot-Server-Patches/0235-Fire-EntityShootBowEvent-for-Illusioner.patch
similarity index 93%
rename from Spigot-Server-Patches/0234-Fire-EntityShootBowEvent-for-Illusioner.patch
rename to Spigot-Server-Patches/0235-Fire-EntityShootBowEvent-for-Illusioner.patch
index 71c7133d0c..6aaaddc539 100644
--- a/Spigot-Server-Patches/0234-Fire-EntityShootBowEvent-for-Illusioner.patch
+++ b/Spigot-Server-Patches/0235-Fire-EntityShootBowEvent-for-Illusioner.patch
@@ -1,11 +1,11 @@
-From a4bdbe606b3b17f6e5e756b434130f15815427ea Mon Sep 17 00:00:00 2001
+From 7bdaa94715970463f8750208a4b3bc8f7228ab44 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 18 Jun 2018 22:19:36 -0400
 Subject: [PATCH] Fire EntityShootBowEvent for Illusioner
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
-index 2ea0583a3..81b7cd06f 100644
+index 2ea0583a3e..81b7cd06f2 100644
 --- a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
 +++ b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
 @@ -138,8 +138,18 @@ public class EntityIllagerIllusioner extends EntityIllagerWizard implements IRan
@@ -29,5 +29,5 @@ index 2ea0583a3..81b7cd06f 100644
  
      class a extends EntityIllagerWizard.c {
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0235-Implement-EntityKnockbackByEntityEvent.patch b/Spigot-Server-Patches/0236-Implement-EntityKnockbackByEntityEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0235-Implement-EntityKnockbackByEntityEvent.patch
rename to Spigot-Server-Patches/0236-Implement-EntityKnockbackByEntityEvent.patch
index e47684a80d..ab3581f967 100644
--- a/Spigot-Server-Patches/0235-Implement-EntityKnockbackByEntityEvent.patch
+++ b/Spigot-Server-Patches/0236-Implement-EntityKnockbackByEntityEvent.patch
@@ -1,4 +1,4 @@
-From df6bfa902abdf629a7cdef8d789da60a3a0ed5b0 Mon Sep 17 00:00:00 2001
+From 875bd87e9087628e63e007d8c50b833c982db8bb Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Mon, 18 Jun 2018 15:46:23 +0200
 Subject: [PATCH] Implement EntityKnockbackByEntityEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement EntityKnockbackByEntityEvent
 This event is called when an entity receives knockback by another entity.
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 3f493f415..855afcd64 100644
+index 3f493f4158..855afcd64b 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1419,6 +1419,16 @@ public abstract class EntityLiving extends Entity {
@@ -27,5 +27,5 @@ index 3f493f415..855afcd64 100644
      }
  
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0236-Expand-Explosions-API.patch b/Spigot-Server-Patches/0237-Expand-Explosions-API.patch
similarity index 92%
rename from Spigot-Server-Patches/0236-Expand-Explosions-API.patch
rename to Spigot-Server-Patches/0237-Expand-Explosions-API.patch
index 9d54e4b69b..10d5be35eb 100644
--- a/Spigot-Server-Patches/0236-Expand-Explosions-API.patch
+++ b/Spigot-Server-Patches/0237-Expand-Explosions-API.patch
@@ -1,4 +1,4 @@
-From e06c5edc8f85e500fa445188e2a64df7505d8193 Mon Sep 17 00:00:00 2001
+From 785f14773759aa29e05181fe93d709fc85338715 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 20 Jun 2018 23:17:24 -0400
 Subject: [PATCH] Expand Explosions API
@@ -6,7 +6,7 @@ Subject: [PATCH] Expand Explosions API
 Add Entity as a Source capability, and add more API choices, and on Location.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 6a7c088f9..a062e10fc 100644
+index b66fa7b894..c31737d352 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -874,6 +874,11 @@ public class CraftWorld implements World {
@@ -22,5 +22,5 @@ index 6a7c088f9..a062e10fc 100644
      @Override
      public boolean createExplosion(Location loc, float power) {
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0237-LivingEntity-Hand-Raised-Item-Use-API.patch b/Spigot-Server-Patches/0238-LivingEntity-Hand-Raised-Item-Use-API.patch
similarity index 93%
rename from Spigot-Server-Patches/0237-LivingEntity-Hand-Raised-Item-Use-API.patch
rename to Spigot-Server-Patches/0238-LivingEntity-Hand-Raised-Item-Use-API.patch
index 17d26fccc9..099ad4f45c 100644
--- a/Spigot-Server-Patches/0237-LivingEntity-Hand-Raised-Item-Use-API.patch
+++ b/Spigot-Server-Patches/0238-LivingEntity-Hand-Raised-Item-Use-API.patch
@@ -1,4 +1,4 @@
-From 5b7335774bdd0fd92d6917afc94144b618d4ea7b Mon Sep 17 00:00:00 2001
+From 6180f5f273986977648298889eb810bb4e03ad84 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 29 Jun 2018 00:21:28 -0400
 Subject: [PATCH] LivingEntity Hand Raised/Item Use API
@@ -6,7 +6,7 @@ Subject: [PATCH] LivingEntity Hand Raised/Item Use API
 How long an entity has raised hands to charge an attack or use an item
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 855afcd64..470cbddeb 100644
+index 855afcd64b..470cbddeb8 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -112,7 +112,7 @@ public abstract class EntityLiving extends Entity {
@@ -32,7 +32,7 @@ index 855afcd64..470cbddeb 100644
          return this.isHandRaised() ? this.activeItem.k() - this.dE() : 0;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 67f275321..379239567 100644
+index 67f275321b..379239567e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -642,5 +642,25 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -62,5 +62,5 @@ index 67f275321..379239567 100644
      // Paper end
  }
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0238-RangedEntity-API.patch b/Spigot-Server-Patches/0239-RangedEntity-API.patch
similarity index 95%
rename from Spigot-Server-Patches/0238-RangedEntity-API.patch
rename to Spigot-Server-Patches/0239-RangedEntity-API.patch
index 05ed838caa..327de1c7ad 100644
--- a/Spigot-Server-Patches/0238-RangedEntity-API.patch
+++ b/Spigot-Server-Patches/0239-RangedEntity-API.patch
@@ -1,4 +1,4 @@
-From 2573811027012f44f42576a77ad445e0b7b480b5 Mon Sep 17 00:00:00 2001
+From 3bdc0c6bb3c52b1a0990d913e91f9ae2a14836fc Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 26 Jun 2018 22:00:49 -0400
 Subject: [PATCH] RangedEntity API
@@ -8,7 +8,7 @@ and to perform an attack.
 
 diff --git a/src/main/java/com/destroystokyo/paper/entity/CraftRangedEntity.java b/src/main/java/com/destroystokyo/paper/entity/CraftRangedEntity.java
 new file mode 100644
-index 000000000..696660b08
+index 0000000000..696660b089
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/entity/CraftRangedEntity.java
 @@ -0,0 +1,19 @@
@@ -32,7 +32,7 @@ index 000000000..696660b08
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/IRangedEntity.java b/src/main/java/net/minecraft/server/IRangedEntity.java
-index b4178ce1e..9b79ac77d 100644
+index b4178ce1e8..9b79ac77db 100644
 --- a/src/main/java/net/minecraft/server/IRangedEntity.java
 +++ b/src/main/java/net/minecraft/server/IRangedEntity.java
 @@ -2,5 +2,8 @@ package net.minecraft.server;
@@ -46,7 +46,7 @@ index b4178ce1e..9b79ac77d 100644
 +    void q(boolean flag); default void setChargingAttack(boolean charging) { q(charging); }; // Paper
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftIllusioner.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftIllusioner.java
-index 2ec1af8be..f31d3eed3 100644
+index 2ec1af8be4..f31d3eed3a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftIllusioner.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftIllusioner.java
 @@ -1,11 +1,12 @@
@@ -64,7 +64,7 @@ index 2ec1af8be..f31d3eed3 100644
      public CraftIllusioner(CraftServer server, EntityIllagerIllusioner entity) {
          super(server, entity);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
-index 23ab78da1..3f94c5a92 100644
+index 23ab78da15..3f94c5a920 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
 @@ -1,5 +1,6 @@
@@ -84,7 +84,7 @@ index 23ab78da1..3f94c5a92 100644
      public CraftLlama(CraftServer server, EntityLlama entity) {
          super(server, entity);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java
-index b4ae89840..02df66ecf 100644
+index b4ae898401..02df66ecfe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java
 @@ -1,11 +1,12 @@
@@ -102,7 +102,7 @@ index b4ae89840..02df66ecf 100644
      public CraftSkeleton(CraftServer server, EntitySkeletonAbstract entity) {
          super(server, entity);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java
-index 27460c59e..e482b1c9d 100644
+index 27460c59e3..e482b1c9dc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java
 @@ -1,11 +1,12 @@
@@ -120,7 +120,7 @@ index 27460c59e..e482b1c9d 100644
          super(server, entity);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
-index 244e4dc8e..bae107e76 100644
+index 244e4dc8ec..bae107e76e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
 @@ -1,11 +1,12 @@
@@ -138,7 +138,7 @@ index 244e4dc8e..bae107e76 100644
          super(server, entity);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java
-index 38b555cc7..03cf6136e 100644
+index 38b555cc7e..03cf6136e6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java
 @@ -1,5 +1,6 @@
@@ -158,5 +158,5 @@ index 38b555cc7..03cf6136e 100644
      private BossBar bossBar;
  
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0239-Add-config-to-disable-ender-dragon-legacy-check.patch b/Spigot-Server-Patches/0240-Add-config-to-disable-ender-dragon-legacy-check.patch
similarity index 94%
rename from Spigot-Server-Patches/0239-Add-config-to-disable-ender-dragon-legacy-check.patch
rename to Spigot-Server-Patches/0240-Add-config-to-disable-ender-dragon-legacy-check.patch
index ded69bf89b..6ebf8ae0c5 100644
--- a/Spigot-Server-Patches/0239-Add-config-to-disable-ender-dragon-legacy-check.patch
+++ b/Spigot-Server-Patches/0240-Add-config-to-disable-ender-dragon-legacy-check.patch
@@ -1,11 +1,11 @@
-From 866ce8f74164ffc502a506ad8c7d98f1c3a17937 Mon Sep 17 00:00:00 2001
+From 581d4753a42a14b3ed01c91abb2d00f13598b466 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 22 Jun 2018 10:38:31 -0500
 Subject: [PATCH] Add config to disable ender dragon legacy check
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 54bf1323e..f5cafbeca 100644
+index 54bf1323e0..f5cafbecaf 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -370,4 +370,9 @@ public class PaperWorldConfig {
@@ -19,7 +19,7 @@ index 54bf1323e..f5cafbeca 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EnderDragonBattle.java b/src/main/java/net/minecraft/server/EnderDragonBattle.java
-index f2c0e06ba..032561f51 100644
+index 909d13c427..218c04245b 100644
 --- a/src/main/java/net/minecraft/server/EnderDragonBattle.java
 +++ b/src/main/java/net/minecraft/server/EnderDragonBattle.java
 @@ -28,10 +28,10 @@ public class EnderDragonBattle {
@@ -47,5 +47,5 @@ index f2c0e06ba..032561f51 100644
          if (nbttagcompound.hasKeyOfType("DragonKilled", 99)) {
              if (nbttagcompound.b("DragonUUID")) {
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0240-Implement-World.getEntity-UUID-API.patch b/Spigot-Server-Patches/0241-Implement-World.getEntity-UUID-API.patch
similarity index 90%
rename from Spigot-Server-Patches/0240-Implement-World.getEntity-UUID-API.patch
rename to Spigot-Server-Patches/0241-Implement-World.getEntity-UUID-API.patch
index 82e8cc0497..0442adc292 100644
--- a/Spigot-Server-Patches/0240-Implement-World.getEntity-UUID-API.patch
+++ b/Spigot-Server-Patches/0241-Implement-World.getEntity-UUID-API.patch
@@ -1,11 +1,11 @@
-From b8d16f5bd4c542d07b85f6b59001a8f98555a543 Mon Sep 17 00:00:00 2001
+From 504c9116b9c34bfa669b838fc2ff855bff1b0383 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Tue, 3 Jul 2018 16:08:14 +0200
 Subject: [PATCH] Implement World.getEntity(UUID) API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index c31737d35..022eefc67 100644
+index c31737d352..022eefc677 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1267,6 +1267,15 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0241-InventoryCloseEvent-Reason-API.patch b/Spigot-Server-Patches/0242-InventoryCloseEvent-Reason-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0241-InventoryCloseEvent-Reason-API.patch
rename to Spigot-Server-Patches/0242-InventoryCloseEvent-Reason-API.patch
index 221304e1a4..cd042f0301 100644
--- a/Spigot-Server-Patches/0241-InventoryCloseEvent-Reason-API.patch
+++ b/Spigot-Server-Patches/0242-InventoryCloseEvent-Reason-API.patch
@@ -1,4 +1,4 @@
-From f25751b7d11157ad17eab03837a8fecec84c83a0 Mon Sep 17 00:00:00 2001
+From 02746ee6554ae0bcbe0ac213ae6f23ee77bffa2a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 3 Jul 2018 21:56:23 -0400
 Subject: [PATCH] InventoryCloseEvent Reason API
@@ -7,7 +7,7 @@ Allows you to determine why an inventory was closed, enabling plugin developers
 to "confirm" things based on if it was player triggered close or not.
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 3917980b7..007934d8c 100644
+index 3917980b76..007934d8c5 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -164,7 +164,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -34,7 +34,7 @@ index 3917980b7..007934d8c 100644
          this.activeContainer = this.defaultContainer;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 6443e68f4..850c7cc1b 100644
+index 774289a0f0..1e552b1a10 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -362,7 +362,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -88,7 +88,7 @@ index 6443e68f4..850c7cc1b 100644
          this.m();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 8757b6751..4f04410f9 100644
+index 8757b6751e..4f04410f9b 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2039,7 +2039,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -101,7 +101,7 @@ index 8757b6751..4f04410f9 100644
          this.player.m();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 002f7e844..fd0f5c6f2 100644
+index 002f7e844a..fd0f5c6f29 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -403,7 +403,7 @@ public abstract class PlayerList {
@@ -114,7 +114,7 @@ index 002f7e844..fd0f5c6f2 100644
          PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(cserver.getPlayer(entityplayer), "\u00A7e" + entityplayer.getName() + " left the game");
          cserver.getPluginManager().callEvent(playerQuitEvent);
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 8a8c2eaf5..eb311a731 100644
+index 8a8c2eaf58..eb311a731f 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1027,7 +1027,7 @@ public class WorldServer extends World {
@@ -136,7 +136,7 @@ index 8a8c2eaf5..eb311a731 100644
                      }
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index cd8ad2704..e169679c8 100644
+index cd8ad27047..e169679c88 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -619,8 +619,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@@ -155,7 +155,7 @@ index cd8ad2704..e169679c8 100644
      @Override
      public boolean isBlocking() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b3a2b7fea..61dbb31e7 100644
+index ebf025c8aa..ba4eb3726a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -780,7 +780,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -168,7 +168,7 @@ index b3a2b7fea..61dbb31e7 100644
  
          // Check if the fromWorld and toWorld are the same.
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 94fbac5e4..7967222d9 100644
+index 94fbac5e40..7967222d99 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1288,8 +1288,19 @@ public class CraftEventFactory {
@@ -193,5 +193,5 @@ index 94fbac5e4..7967222d9 100644
          human.activeContainer.transferTo(human.defaultContainer, human.getBukkitEntity());
      }
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0242-Configurable-Bed-Search-Radius.patch b/Spigot-Server-Patches/0243-Configurable-Bed-Search-Radius.patch
similarity index 98%
rename from Spigot-Server-Patches/0242-Configurable-Bed-Search-Radius.patch
rename to Spigot-Server-Patches/0243-Configurable-Bed-Search-Radius.patch
index 5a6b598ae0..de6dcf3e9a 100644
--- a/Spigot-Server-Patches/0242-Configurable-Bed-Search-Radius.patch
+++ b/Spigot-Server-Patches/0243-Configurable-Bed-Search-Radius.patch
@@ -1,4 +1,4 @@
-From defe39819444dcf2df2e3543d531ecd429ee464f Mon Sep 17 00:00:00 2001
+From e318355e0c847c81d00e49474f5ad3caab3bd873 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 Jul 2018 15:22:06 -0400
 Subject: [PATCH] Configurable Bed Search Radius
@@ -10,7 +10,7 @@ player at their bed should it of became obstructed.
 Defaults to vanilla 1.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index f5cafbeca..b4e5948cc 100644
+index f5cafbecaf..b4e5948ccf 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -375,4 +375,15 @@ public class PaperWorldConfig {
@@ -30,7 +30,7 @@ index f5cafbeca..b4e5948cc 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/BlockBed.java b/src/main/java/net/minecraft/server/BlockBed.java
-index 794756342..06a35629a 100644
+index 7947563426..06a35629ab 100644
 --- a/src/main/java/net/minecraft/server/BlockBed.java
 +++ b/src/main/java/net/minecraft/server/BlockBed.java
 @@ -196,6 +196,10 @@ public class BlockBed extends BlockFacingHorizontal implements ITileEntity {
@@ -149,5 +149,5 @@ index 794756342..06a35629a 100644
          VoxelShape voxelshape = iworldreader.getType(blockposition).getCollisionShape(iworldreader, blockposition);
  
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0243-Vex-getSummoner-API.patch b/Spigot-Server-Patches/0244-Vex-getSummoner-API.patch
similarity index 91%
rename from Spigot-Server-Patches/0243-Vex-getSummoner-API.patch
rename to Spigot-Server-Patches/0244-Vex-getSummoner-API.patch
index 9743cfda31..63d12562c3 100644
--- a/Spigot-Server-Patches/0243-Vex-getSummoner-API.patch
+++ b/Spigot-Server-Patches/0244-Vex-getSummoner-API.patch
@@ -1,4 +1,4 @@
-From 5f41049c8d0a8e4958ca592e35e10d9b63549039 Mon Sep 17 00:00:00 2001
+From 715b0caa9037c29a24fa6f1b1019e8fd1113b6de Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 Jul 2018 15:30:22 -0400
 Subject: [PATCH] Vex#getSummoner API
@@ -6,7 +6,7 @@ Subject: [PATCH] Vex#getSummoner API
 Get's the NPC that summoned this Vex
 
 diff --git a/src/main/java/net/minecraft/server/EntityVex.java b/src/main/java/net/minecraft/server/EntityVex.java
-index cd9fb3aab..a46730460 100644
+index cd9fb3aabf..a46730460e 100644
 --- a/src/main/java/net/minecraft/server/EntityVex.java
 +++ b/src/main/java/net/minecraft/server/EntityVex.java
 @@ -92,6 +92,7 @@ public class EntityVex extends EntityMonster {
@@ -18,7 +18,7 @@ index cd9fb3aab..a46730460 100644
          return this.c;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
-index 737a37b6f..169c951ec 100644
+index 737a37b6fe..169c951ec3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
 @@ -1,8 +1,10 @@
@@ -47,5 +47,5 @@ index 737a37b6f..169c951ec 100644
      public String toString() {
          return "CraftVex";
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0244-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/Spigot-Server-Patches/0245-Refresh-player-inventory-when-cancelling-PlayerInter.patch
similarity index 92%
rename from Spigot-Server-Patches/0244-Refresh-player-inventory-when-cancelling-PlayerInter.patch
rename to Spigot-Server-Patches/0245-Refresh-player-inventory-when-cancelling-PlayerInter.patch
index 298c51518b..126a84a15c 100644
--- a/Spigot-Server-Patches/0244-Refresh-player-inventory-when-cancelling-PlayerInter.patch
+++ b/Spigot-Server-Patches/0245-Refresh-player-inventory-when-cancelling-PlayerInter.patch
@@ -1,4 +1,4 @@
-From 92d4c5567ba80219f1bfd171f500d5a10dd54ac0 Mon Sep 17 00:00:00 2001
+From 469b199f7aa9f37f09967637b108a23da00b5211 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Fri, 13 Jul 2018 14:54:43 +0200
 Subject: [PATCH] Refresh player inventory when cancelling
@@ -16,7 +16,7 @@ Refresh the player inventory when PlayerInteractEntityEvent is
 cancelled to avoid this problem.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 4f04410f9..3a7e197e3 100644
+index 4f04410f9b..3a7e197e39 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1949,6 +1949,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -28,5 +28,5 @@ index 4f04410f9..3a7e197e3 100644
                      }
                      // CraftBukkit end
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0245-Don-t-change-the-Entity-Random-seed-for-squids.patch b/Spigot-Server-Patches/0246-Don-t-change-the-Entity-Random-seed-for-squids.patch
similarity index 87%
rename from Spigot-Server-Patches/0245-Don-t-change-the-Entity-Random-seed-for-squids.patch
rename to Spigot-Server-Patches/0246-Don-t-change-the-Entity-Random-seed-for-squids.patch
index f7f3d33ced..f6d3b0f1a0 100644
--- a/Spigot-Server-Patches/0245-Don-t-change-the-Entity-Random-seed-for-squids.patch
+++ b/Spigot-Server-Patches/0246-Don-t-change-the-Entity-Random-seed-for-squids.patch
@@ -1,11 +1,11 @@
-From f8ebae1f5b873604cd8d96076d556f66f14b16e9 Mon Sep 17 00:00:00 2001
+From 492d9f6d6c7c890086f19cf58bc31a7c23170883 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 19 Jul 2018 01:05:00 -0400
 Subject: [PATCH] Don't change the Entity Random seed for squids
 
 
 diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java
-index 1c1ff2069..92efe4e7f 100644
+index 1c1ff2069d..92efe4e7f5 100644
 --- a/src/main/java/net/minecraft/server/EntitySquid.java
 +++ b/src/main/java/net/minecraft/server/EntitySquid.java
 @@ -21,7 +21,7 @@ public class EntitySquid extends EntityWaterAnimal {
@@ -18,5 +18,5 @@ index 1c1ff2069..92efe4e7f 100644
      }
  
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0246-Re-add-vanilla-entity-warnings-for-duplicates.patch b/Spigot-Server-Patches/0247-Re-add-vanilla-entity-warnings-for-duplicates.patch
similarity index 92%
rename from Spigot-Server-Patches/0246-Re-add-vanilla-entity-warnings-for-duplicates.patch
rename to Spigot-Server-Patches/0247-Re-add-vanilla-entity-warnings-for-duplicates.patch
index cb99e733de..aba61f7320 100644
--- a/Spigot-Server-Patches/0246-Re-add-vanilla-entity-warnings-for-duplicates.patch
+++ b/Spigot-Server-Patches/0247-Re-add-vanilla-entity-warnings-for-duplicates.patch
@@ -1,4 +1,4 @@
-From 79d6f7c19fc31722b836dca918c8005479ead258 Mon Sep 17 00:00:00 2001
+From a6b7202d3c5020bad4cf3a4ddac6ec7bed687c8a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 19 Jul 2018 01:08:05 -0400
 Subject: [PATCH] Re-add vanilla entity warnings for duplicates
@@ -8,7 +8,7 @@ These are a critical sign that somethin went wrong, and you've lost some data...
 We should kind of know about these things you know.
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index eb311a731..7d99d34ae 100644
+index eb311a731f..7d99d34ae5 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1012,7 +1012,8 @@ public class WorldServer extends World {
diff --git a/Spigot-Server-Patches/0247-Avoid-item-merge-if-stack-size-above-max-stack-size.patch b/Spigot-Server-Patches/0248-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
similarity index 90%
rename from Spigot-Server-Patches/0247-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
rename to Spigot-Server-Patches/0248-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
index 531da210e0..c8df51e9ac 100644
--- a/Spigot-Server-Patches/0247-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
+++ b/Spigot-Server-Patches/0248-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
@@ -1,11 +1,11 @@
-From e21c5266e93f3fb2d2400ea7fb2be5729f267837 Mon Sep 17 00:00:00 2001
+From a85c8b0c7857937f33ecede1016c4ae13dcd981f Mon Sep 17 00:00:00 2001
 From: Hugo Manrique <hugmanrique@gmail.com>
 Date: Mon, 16 Jul 2018 12:42:20 +0200
 Subject: [PATCH] Avoid item merge if stack size above max stack size
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index fcc1c0993..5f46c7f86 100644
+index fcc1c0993d..5f46c7f869 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -170,6 +170,10 @@ public class EntityItem extends Entity {
@@ -20,5 +20,5 @@ index fcc1c0993..5f46c7f86 100644
              double radius = world.spigotConfig.itemMerge;
              List<EntityItem> list = this.world.a(EntityItem.class, this.getBoundingBox().grow(radius, radius, radius), (entityitem) -> {
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0248-Use-asynchronous-Log4j-2-loggers.patch b/Spigot-Server-Patches/0249-Use-asynchronous-Log4j-2-loggers.patch
similarity index 91%
rename from Spigot-Server-Patches/0248-Use-asynchronous-Log4j-2-loggers.patch
rename to Spigot-Server-Patches/0249-Use-asynchronous-Log4j-2-loggers.patch
index 840e2eb9a0..b62b8a4e1c 100644
--- a/Spigot-Server-Patches/0248-Use-asynchronous-Log4j-2-loggers.patch
+++ b/Spigot-Server-Patches/0249-Use-asynchronous-Log4j-2-loggers.patch
@@ -1,11 +1,11 @@
-From c99b1ee74fe52fec1b2c67725e2168e25fcba5b2 Mon Sep 17 00:00:00 2001
+From e00c207e94e81d585c7e87e31b4fd8b1a0793044 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Tue, 17 Jul 2018 16:42:17 +0200
 Subject: [PATCH] Use asynchronous Log4j 2 loggers
 
 
 diff --git a/pom.xml b/pom.xml
-index dbc425524..d10c219e3 100644
+index dbc425524c..d10c219e3f 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -74,6 +74,13 @@
@@ -24,7 +24,7 @@ index dbc425524..d10c219e3 100644
              <artifactId>asm</artifactId>
 diff --git a/src/main/java/com/destroystokyo/paper/log/LogFullPolicy.java b/src/main/java/com/destroystokyo/paper/log/LogFullPolicy.java
 new file mode 100644
-index 000000000..db652a1f7
+index 0000000000..db652a1f7a
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/log/LogFullPolicy.java
 @@ -0,0 +1,17 @@
@@ -46,7 +46,7 @@ index 000000000..db652a1f7
 +    }
 +}
 diff --git a/src/main/resources/log4j2.component.properties b/src/main/resources/log4j2.component.properties
-index 0694b2146..30efeb5fa 100644
+index 0694b21465..30efeb5faf 100644
 --- a/src/main/resources/log4j2.component.properties
 +++ b/src/main/resources/log4j2.component.properties
 @@ -1 +1,3 @@
@@ -54,5 +54,5 @@ index 0694b2146..30efeb5fa 100644
 +log4j2.AsyncQueueFullPolicy="com.destroystokyo.paper.log.LogFullPolicy"
  log4j.skipJansi=true
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0249-add-more-information-to-Entity.toString.patch b/Spigot-Server-Patches/0250-add-more-information-to-Entity.toString.patch
similarity index 92%
rename from Spigot-Server-Patches/0249-add-more-information-to-Entity.toString.patch
rename to Spigot-Server-Patches/0250-add-more-information-to-Entity.toString.patch
index 7a4eeef405..7517db3789 100644
--- a/Spigot-Server-Patches/0249-add-more-information-to-Entity.toString.patch
+++ b/Spigot-Server-Patches/0250-add-more-information-to-Entity.toString.patch
@@ -1,4 +1,4 @@
-From a6c05645c938d3b1d5ea09f5f0a71f82b7f1df81 Mon Sep 17 00:00:00 2001
+From 711048be5cefd3e2532ca823422c9e824daf90b9 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 19 Jul 2018 01:13:28 -0400
 Subject: [PATCH] add more information to Entity.toString()
@@ -6,7 +6,7 @@ Subject: [PATCH] add more information to Entity.toString()
 UUID, ticks lived, valid, dead
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 7c4ab7fe7..5823b3740 100644
+index 7c4ab7fe72..5823b3740d 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2499,7 +2499,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -19,5 +19,5 @@ index 7c4ab7fe7..5823b3740 100644
  
      public boolean isInvulnerable(DamageSource damagesource) {
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0250-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/Spigot-Server-Patches/0251-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
similarity index 96%
rename from Spigot-Server-Patches/0250-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
rename to Spigot-Server-Patches/0251-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
index 2244e18e13..2f75e17e60 100644
--- a/Spigot-Server-Patches/0250-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
+++ b/Spigot-Server-Patches/0251-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
@@ -1,4 +1,4 @@
-From c3bdd0b033e432a2df1f00ae4ae1b4f6d914fddd Mon Sep 17 00:00:00 2001
+From 104ce7173d93de75875e8bbc031b0f732e146a50 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 21 Jul 2018 08:25:40 -0400
 Subject: [PATCH] Add Debug Entities option to debug dupe uuid issues
@@ -6,7 +6,7 @@ Subject: [PATCH] Add Debug Entities option to debug dupe uuid issues
 Add -Ddebug.entities=true to your JVM flags to gain more information
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 5823b3740..3458333c9 100644
+index 5823b3740d..3458333c9b 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -76,6 +76,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -19,7 +19,7 @@ index 5823b3740..3458333c9 100644
          if (bukkitEntity == null) {
              bukkitEntity = CraftEntity.getEntity(world.getServer(), this);
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index df24bac3b..a2b09597f 100644
+index df24bac3bb..a2b09597f3 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -1022,6 +1022,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -40,7 +40,7 @@ index df24bac3b..a2b09597f 100644
  
      protected void g() {
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 39b136935..7fcc8c52d 100644
+index 8b2ee61b3b..5d04d13012 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -67,6 +67,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -52,7 +52,7 @@ index 39b136935..7fcc8c52d 100644
      public boolean captureBlockStates = false;
      public boolean captureTreeGeneration = false;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 7d99d34ae..0cd48c5bc 100644
+index 7d99d34ae5..0cd48c5bcf 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -75,6 +75,9 @@ public class WorldServer extends World {
diff --git a/Spigot-Server-Patches/0251-EnderDragon-Events.patch b/Spigot-Server-Patches/0252-EnderDragon-Events.patch
similarity index 95%
rename from Spigot-Server-Patches/0251-EnderDragon-Events.patch
rename to Spigot-Server-Patches/0252-EnderDragon-Events.patch
index add365b15f..97fb954f63 100644
--- a/Spigot-Server-Patches/0251-EnderDragon-Events.patch
+++ b/Spigot-Server-Patches/0252-EnderDragon-Events.patch
@@ -1,11 +1,11 @@
-From 81f46b2f9721098c4ef7cad5ee8e2121e0f2d64d Mon Sep 17 00:00:00 2001
+From 3e3419b34e0a2ba51d62ba44bb8e2a9f939d9f7d Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 21 Jul 2018 01:51:27 -0500
 Subject: [PATCH] EnderDragon Events
 
 
 diff --git a/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java b/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
-index 40a8beff5..18fdcd453 100644
+index 40a8beff55..18fdcd453a 100644
 --- a/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
 +++ b/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
 @@ -71,7 +71,11 @@ public class DragonControllerLandedFlame extends AbstractDragonControllerLanded
@@ -29,7 +29,7 @@ index 40a8beff5..18fdcd453 100644
      public void e() {
          if (this.d != null) {
 diff --git a/src/main/java/net/minecraft/server/DragonControllerStrafe.java b/src/main/java/net/minecraft/server/DragonControllerStrafe.java
-index a2c36548c..a9d20ee3b 100644
+index a2c36548ca..a9d20ee3bb 100644
 --- a/src/main/java/net/minecraft/server/DragonControllerStrafe.java
 +++ b/src/main/java/net/minecraft/server/DragonControllerStrafe.java
 @@ -68,7 +68,9 @@ public class DragonControllerStrafe extends AbstractDragonController {
@@ -43,7 +43,7 @@ index a2c36548c..a9d20ee3b 100644
                          if (this.d != null) {
                              while (!this.d.b()) {
 diff --git a/src/main/java/net/minecraft/server/EntityDragonFireball.java b/src/main/java/net/minecraft/server/EntityDragonFireball.java
-index bc08b53fc..db43ac1cc 100644
+index bc08b53fcd..db43ac1cc4 100644
 --- a/src/main/java/net/minecraft/server/EntityDragonFireball.java
 +++ b/src/main/java/net/minecraft/server/EntityDragonFireball.java
 @@ -41,8 +41,10 @@ public class EntityDragonFireball extends EntityFireball {
@@ -58,5 +58,5 @@ index bc08b53fc..db43ac1cc 100644
              }
  
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0252-PlayerElytraBoostEvent.patch b/Spigot-Server-Patches/0253-PlayerElytraBoostEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0252-PlayerElytraBoostEvent.patch
rename to Spigot-Server-Patches/0253-PlayerElytraBoostEvent.patch
index efc091daf4..e230fd1d43 100644
--- a/Spigot-Server-Patches/0252-PlayerElytraBoostEvent.patch
+++ b/Spigot-Server-Patches/0253-PlayerElytraBoostEvent.patch
@@ -1,11 +1,11 @@
-From dc98d0cf26aee885975465eb616fc8324dbd23f1 Mon Sep 17 00:00:00 2001
+From e821e56f5cb1608df4fceead00f1b947c808d63b Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 21 Jul 2018 01:59:59 -0500
 Subject: [PATCH] PlayerElytraBoostEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/ItemFireworks.java b/src/main/java/net/minecraft/server/ItemFireworks.java
-index 76b253a50..a43e52889 100644
+index 76b253a50d..a43e52889f 100644
 --- a/src/main/java/net/minecraft/server/ItemFireworks.java
 +++ b/src/main/java/net/minecraft/server/ItemFireworks.java
 @@ -36,11 +36,16 @@ public class ItemFireworks extends Item {
@@ -30,5 +30,5 @@ index 76b253a50..a43e52889 100644
  
              return InteractionResultWrapper.a(entityhuman.b(enumhand));
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0253-Speedup-BlockPos-by-fixing-inlining.patch b/Spigot-Server-Patches/0254-Speedup-BlockPos-by-fixing-inlining.patch
similarity index 98%
rename from Spigot-Server-Patches/0253-Speedup-BlockPos-by-fixing-inlining.patch
rename to Spigot-Server-Patches/0254-Speedup-BlockPos-by-fixing-inlining.patch
index 580a1fd041..f21e939040 100644
--- a/Spigot-Server-Patches/0253-Speedup-BlockPos-by-fixing-inlining.patch
+++ b/Spigot-Server-Patches/0254-Speedup-BlockPos-by-fixing-inlining.patch
@@ -1,4 +1,4 @@
-From 4c3456696264a80f869e8731e9b553a2fad3589c Mon Sep 17 00:00:00 2001
+From c6943acd17e47ff98ab1014b740e544ea8d9364e Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Wed, 30 Nov 2016 20:56:58 -0600
 Subject: [PATCH] Speedup BlockPos by fixing inlining
@@ -21,7 +21,7 @@ This is based upon conclusions drawn from inspecting the assenmbly generated byt
 They had 'callq' (invoke) instead of 'mov' (get from memory) instructions.
 
 diff --git a/src/main/java/net/minecraft/server/BaseBlockPosition.java b/src/main/java/net/minecraft/server/BaseBlockPosition.java
-index 71089442c..c439a8d01 100644
+index 71089442c1..c439a8d019 100644
 --- a/src/main/java/net/minecraft/server/BaseBlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BaseBlockPosition.java
 @@ -7,25 +7,22 @@ import javax.annotation.concurrent.Immutable;
@@ -110,7 +110,7 @@ index 71089442c..c439a8d01 100644
          return (int) (f + f1 + f2);
      }
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index 1cdf0346f..5a505b753 100644
+index 1cdf0346fa..5a505b753a 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -342,11 +342,13 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali
@@ -206,5 +206,5 @@ index 1cdf0346f..5a505b753 100644
  
          @Override
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0254-Optimize-RegistryID.c.patch b/Spigot-Server-Patches/0255-Optimize-RegistryID.c.patch
similarity index 95%
rename from Spigot-Server-Patches/0254-Optimize-RegistryID.c.patch
rename to Spigot-Server-Patches/0255-Optimize-RegistryID.c.patch
index 63994ada55..c4921faf9a 100644
--- a/Spigot-Server-Patches/0254-Optimize-RegistryID.c.patch
+++ b/Spigot-Server-Patches/0255-Optimize-RegistryID.c.patch
@@ -1,4 +1,4 @@
-From 45f992de41d492cdd3c8f4138d33fd04b5b4dd7c Mon Sep 17 00:00:00 2001
+From 0efdc2836b86d07a56a883c0f1885be68d730630 Mon Sep 17 00:00:00 2001
 From: Andrew Steinborn <git@steinborn.me>
 Date: Mon, 23 Jul 2018 13:08:19 -0400
 Subject: [PATCH] Optimize RegistryID.c()
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize RegistryID.c()
 This is a frequent hotspot for world loading/saving.
 
 diff --git a/src/main/java/net/minecraft/server/RegistryID.java b/src/main/java/net/minecraft/server/RegistryID.java
-index e15d28671..e8a48b9a4 100644
+index e15d286710..e8a48b9a4c 100644
 --- a/src/main/java/net/minecraft/server/RegistryID.java
 +++ b/src/main/java/net/minecraft/server/RegistryID.java
 @@ -14,12 +14,14 @@ public class RegistryID<K> implements Registry<K> {
@@ -64,5 +64,5 @@ index e15d28671..e8a48b9a4 100644
  
      public int b() {
 -- 
-2.17.1
+2.24.1
 
diff --git a/Spigot-Server-Patches/0255-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/Spigot-Server-Patches/0256-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
similarity index 88%
rename from Spigot-Server-Patches/0255-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
rename to Spigot-Server-Patches/0256-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
index 543506a45c..ec12346c0a 100644
--- a/Spigot-Server-Patches/0255-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
+++ b/Spigot-Server-Patches/0256-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
@@ -1,11 +1,11 @@
-From 5608410605bce2f4b96dedc1289a4254b4416ca8 Mon Sep 17 00:00:00 2001
+From 95ab537764618d02f25e87b7d0bdb8e6a1a7ad32 Mon Sep 17 00:00:00 2001
 From: Hugo Manrique <hugmanrique@gmail.com>
 Date: Mon, 23 Jul 2018 12:57:39 +0200
 Subject: [PATCH] Option to prevent armor stands from doing entity lookups
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index b4e5948cc..0a99b8fe9 100644
+index b4e5948ccf..0a99b8fe95 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -386,4 +386,9 @@ public class PaperWorldConfig {
@@ -19,10 +19,10 @@ index b4e5948cc..0a99b8fe9 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 059e4544e..a4fd1cb37 100644
+index 5d04d13012..307a2d060f 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -800,6 +800,14 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -805,6 +805,14 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
          }
      }
  
@@ -38,5 +38,5 @@ index 059e4544e..a4fd1cb37 100644
          int i = MathHelper.floor(axisalignedbb.minX);
          int j = MathHelper.f(axisalignedbb.maxX);
 -- 
-2.24.0
+2.24.1
 
diff --git a/Spigot-Server-Patches/0256-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0257-Vanished-players-don-t-have-rights.patch
similarity index 96%
rename from Spigot-Server-Patches/0256-Vanished-players-don-t-have-rights.patch
rename to Spigot-Server-Patches/0257-Vanished-players-don-t-have-rights.patch
index f14f95b071..af09a3efbf 100644
--- a/Spigot-Server-Patches/0256-Vanished-players-don-t-have-rights.patch
+++ b/Spigot-Server-Patches/0257-Vanished-players-don-t-have-rights.patch
@@ -1,11 +1,11 @@
-From ed7ca392c8ac6f2e1acb67904f3da1bc65cf5aed Mon Sep 17 00:00:00 2001
+From 2a309ccd0cc41e615ba2c7455161ac1e4fc39449 Mon Sep 17 00:00:00 2001
 From: Hugo Manrique <hugmanrique@gmail.com>
 Date: Mon, 23 Jul 2018 14:22:26 +0200
 Subject: [PATCH] Vanished players don't have rights
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 3458333c9..6ef5d2ebd 100644
+index 3458333c9b..6ef5d2ebd7 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -98,7 +98,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -18,7 +18,7 @@ index 3458333c9..6ef5d2ebd 100644
      protected int j;
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/IBlockData.java b/src/main/java/net/minecraft/server/IBlockData.java
-index 8d9b9af9b..08d884649 100644
+index 3a1ad2346b..9ab57be850 100644
 --- a/src/main/java/net/minecraft/server/IBlockData.java
 +++ b/src/main/java/net/minecraft/server/IBlockData.java
 @@ -146,6 +146,7 @@ public class IBlockData extends BlockDataAbstract<Block, IBlockData> implements
@@ -30,7 +30,7 @@ index 8d9b9af9b..08d884649 100644
          return this.getBlock().b(this, iblockaccess, blockposition, voxelshapecollision);
      }
 diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java
-index ab875a736..aed353365 100644
+index ab875a7365..aed353365b 100644
 --- a/src/main/java/net/minecraft/server/ItemBlock.java
 +++ b/src/main/java/net/minecraft/server/ItemBlock.java
 @@ -136,7 +136,8 @@ public class ItemBlock extends Item {
@@ -44,7 +44,7 @@ index ab875a736..aed353365 100644
  
          BlockCanBuildEvent event = new BlockCanBuildEvent(CraftBlock.at(blockactioncontext.getWorld(), blockactioncontext.getClickPosition()), player, CraftBlockData.fromData(iblockdata), defaultReturn);
 diff --git a/src/main/java/net/minecraft/server/VoxelShape.java b/src/main/java/net/minecraft/server/VoxelShape.java
-index 0f64a3c05..0f95bcbcc 100644
+index 0f64a3c056..0f95bcbccb 100644
 --- a/src/main/java/net/minecraft/server/VoxelShape.java
 +++ b/src/main/java/net/minecraft/server/VoxelShape.java
 @@ -46,6 +46,7 @@ public abstract class VoxelShape {
@@ -56,7 +56,7 @@ index 0f64a3c05..0f95bcbcc 100644
          return (VoxelShape) (this.isEmpty() ? VoxelShapes.a() : new VoxelShapeArray(this.a, new DoubleListOffset(this.a(EnumDirection.EnumAxis.X), d0), new DoubleListOffset(this.a(EnumDirection.EnumAxis.Y), d1), new DoubleListOffset(this.a(EnumDirection.EnumAxis.Z), d2)));
      }
 diff --git a/src/main/java/net/minecraft/server/VoxelShapes.java b/src/main/java/net/minecraft/server/VoxelShapes.java
-index 143be566c..08c83c62d 100644
+index 143be566c6..08c83c62df 100644
 --- a/src/main/java/net/minecraft/server/VoxelShapes.java
 +++ b/src/main/java/net/minecraft/server/VoxelShapes.java
 @@ -33,6 +33,7 @@ public final class VoxelShapes {
@@ -76,7 +76,7 @@ index 143be566c..08c83c62d 100644
          if (operatorboolean.apply(false, false)) {
              throw (IllegalArgumentException) SystemUtils.c(new IllegalArgumentException());
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index eea3a542d..bdbabe6a0 100644
+index 307a2d060f..39e85f80ca 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -164,6 +164,46 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -127,7 +127,7 @@ index eea3a542d..bdbabe6a0 100644
      public boolean p_() {
          return this.isClientSide;
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 7967222d9..e954c59d5 100644
+index 7967222d99..e954c59d54 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1166,6 +1166,14 @@ public class CraftEventFactory {
@@ -146,5 +146,5 @@ index 7967222d9..e954c59d5 100644
          return event;
      }
 -- 
-2.24.0
+2.24.1
 
diff --git a/Spigot-Server-Patches/0257-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch b/Spigot-Server-Patches/0258-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
similarity index 88%
rename from Spigot-Server-Patches/0257-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
rename to Spigot-Server-Patches/0258-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
index 955917ec4e..d19d8610d9 100644
--- a/Spigot-Server-Patches/0257-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
+++ b/Spigot-Server-Patches/0258-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
@@ -1,4 +1,4 @@
-From ad87d83601ee698012d473208eb47ce44ddf42c3 Mon Sep 17 00:00:00 2001
+From 6e446408eeb09c8344a208b0e8332b9e82f405d3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 23 Jul 2018 22:18:31 -0400
 Subject: [PATCH] Mark chunk dirty anytime entities change to guarantee it
@@ -6,7 +6,7 @@ Subject: [PATCH] Mark chunk dirty anytime entities change to guarantee it
 
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 1efddb533..6774c6480 100644
+index 1efddb5338..6774c64806 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -410,6 +410,7 @@ public class Chunk implements IChunkAccess {
@@ -26,5 +26,5 @@ index 1efddb533..6774c6480 100644
      }
  
 -- 
-2.24.0
+2.24.1
 
diff --git a/Spigot-Server-Patches/0258-Add-some-Debug-to-Chunk-Entity-slices.patch b/Spigot-Server-Patches/0259-Add-some-Debug-to-Chunk-Entity-slices.patch
similarity index 95%
rename from Spigot-Server-Patches/0258-Add-some-Debug-to-Chunk-Entity-slices.patch
rename to Spigot-Server-Patches/0259-Add-some-Debug-to-Chunk-Entity-slices.patch
index 4702642e7a..ebc7edddcb 100644
--- a/Spigot-Server-Patches/0258-Add-some-Debug-to-Chunk-Entity-slices.patch
+++ b/Spigot-Server-Patches/0259-Add-some-Debug-to-Chunk-Entity-slices.patch
@@ -1,4 +1,4 @@
-From 5ad8734def245b4eaeb12a9271d1d878e654f98a Mon Sep 17 00:00:00 2001
+From fd327a71c910a0ae3c12469cce85e43f4359dbc3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 23 Jul 2018 22:44:23 -0400
 Subject: [PATCH] Add some Debug to Chunk Entity slices
@@ -9,7 +9,7 @@ This should hopefully avoid duplicate entities ever being created
 if the entity was to end up in 2 different chunk slices
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 6774c6480..b156f5428 100644
+index 6774c64806..b156f5428c 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -402,6 +402,25 @@ public class Chunk implements IChunkAccess {
@@ -57,7 +57,7 @@ index 6774c6480..b156f5428 100644
              return;
          }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 6ef5d2ebd..be8f6ac99 100644
+index 6ef5d2ebd7..be8f6ac99f 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -71,6 +71,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -69,5 +69,5 @@ index 6ef5d2ebd..be8f6ac99 100644
  
      public com.destroystokyo.paper.loottable.PaperLootableInventoryData lootableData; // Paper
 -- 
-2.24.0
+2.24.1
 
diff --git a/Spigot-Server-Patches/0259-EntityTransformedEvent.patch b/Spigot-Server-Patches/0260-EntityTransformedEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0259-EntityTransformedEvent.patch
rename to Spigot-Server-Patches/0260-EntityTransformedEvent.patch
index 0429e12bd4..fa02898e91 100644
--- a/Spigot-Server-Patches/0259-EntityTransformedEvent.patch
+++ b/Spigot-Server-Patches/0260-EntityTransformedEvent.patch
@@ -1,11 +1,11 @@
-From 0c350de8da85d6bd775b71fa4219cce816aac3b9 Mon Sep 17 00:00:00 2001
+From 7b08bd7cae7ecf463db026f974328faaa3ef6956 Mon Sep 17 00:00:00 2001
 From: Anthony MacAllister <anthonymmacallister@gmail.com>
 Date: Thu, 26 Jul 2018 15:30:03 -0400
 Subject: [PATCH] EntityTransformedEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityMushroomCow.java b/src/main/java/net/minecraft/server/EntityMushroomCow.java
-index 1fff4ce63..efde7bd1d 100644
+index 1fff4ce63c..efde7bd1d7 100644
 --- a/src/main/java/net/minecraft/server/EntityMushroomCow.java
 +++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java
 @@ -116,6 +116,7 @@ public class EntityMushroomCow extends EntityCow {
@@ -17,7 +17,7 @@ index 1fff4ce63..efde7bd1d 100644
  
                      this.die(); // CraftBukkit - from above
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 4aa947e24..7ea55c939 100644
+index 3b4a3a4fd2..11e168a8ea 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -696,6 +696,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -29,7 +29,7 @@ index 4aa947e24..7ea55c939 100644
          // CraftBukkit end
          this.die();
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 6333d2234..c8e4dcdac 100644
+index 6333d2234b..c8e4dcdaca 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -257,6 +257,7 @@ public class EntityZombie extends EntityMonster {
@@ -49,7 +49,7 @@ index 6333d2234..c8e4dcdac 100644
              this.world.addEntity(entityzombievillager, CreatureSpawnEvent.SpawnReason.INFECTION); // CraftBukkit - add SpawnReason
              // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/EntityZombieVillager.java b/src/main/java/net/minecraft/server/EntityZombieVillager.java
-index 91cac5d53..8082fa617 100644
+index 91cac5d530..8082fa617a 100644
 --- a/src/main/java/net/minecraft/server/EntityZombieVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java
 @@ -197,6 +197,7 @@ public class EntityZombieVillager extends EntityZombie implements VillagerDataHo
@@ -61,5 +61,5 @@ index 91cac5d53..8082fa617 100644
          worldserver.addEntity(entityvillager, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.CURED); // CraftBukkit - add SpawnReason
          // CraftBukkit end
 -- 
-2.24.0
+2.24.1
 
diff --git a/Spigot-Server-Patches/0260-SkeletonHorse-Additions.patch b/Spigot-Server-Patches/0261-SkeletonHorse-Additions.patch
similarity index 94%
rename from Spigot-Server-Patches/0260-SkeletonHorse-Additions.patch
rename to Spigot-Server-Patches/0261-SkeletonHorse-Additions.patch
index 7e0f326e09..a0e3839f83 100644
--- a/Spigot-Server-Patches/0260-SkeletonHorse-Additions.patch
+++ b/Spigot-Server-Patches/0261-SkeletonHorse-Additions.patch
@@ -1,11 +1,11 @@
-From 2614673448fe2d3757e44f87d549f4b458195591 Mon Sep 17 00:00:00 2001
+From ba7a297627d6fd7f6834126a3d08366c53d08b3d Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 27 Jul 2018 22:36:31 -0500
 Subject: [PATCH] SkeletonHorse Additions
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
-index 621f2afee..290cb9337 100644
+index 621f2afee5..290cb9337c 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
 @@ -6,7 +6,7 @@ public class EntityHorseSkeleton extends EntityHorseAbstract {
@@ -31,7 +31,7 @@ index 621f2afee..290cb9337 100644
          if (flag != this.bG) {
              this.bG = flag;
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
-index dfe5a6358..37626f925 100644
+index dfe5a63583..37626f925f 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
 @@ -15,6 +15,7 @@ public class PathfinderGoalHorseTrap extends PathfinderGoal {
@@ -43,7 +43,7 @@ index dfe5a6358..37626f925 100644
  
          this.a.r(false);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java
-index e822c2200..2a7d1d4ec 100644
+index e822c2200d..2a7d1d4ec2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java
 @@ -26,4 +26,26 @@ public class CraftSkeletonHorse extends CraftAbstractHorse implements SkeletonHo
@@ -74,5 +74,5 @@ index e822c2200..2a7d1d4ec 100644
 +    // Paper end
  }
 -- 
-2.24.0
+2.24.1
 
diff --git a/Spigot-Server-Patches/0261-Prevent-Saving-Bad-entities-to-chunks.patch b/Spigot-Server-Patches/0262-Prevent-Saving-Bad-entities-to-chunks.patch
similarity index 96%
rename from Spigot-Server-Patches/0261-Prevent-Saving-Bad-entities-to-chunks.patch
rename to Spigot-Server-Patches/0262-Prevent-Saving-Bad-entities-to-chunks.patch
index dd2e8d86a3..8a71414b13 100644
--- a/Spigot-Server-Patches/0261-Prevent-Saving-Bad-entities-to-chunks.patch
+++ b/Spigot-Server-Patches/0262-Prevent-Saving-Bad-entities-to-chunks.patch
@@ -1,4 +1,4 @@
-From 67ed4f8755937acbbb51582709bf1621185783c4 Mon Sep 17 00:00:00 2001
+From b2869ded2f63a5b8a6f043551781ef4415968f57 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 26 Jul 2018 00:11:12 -0400
 Subject: [PATCH] Prevent Saving Bad entities to chunks
@@ -18,7 +18,7 @@ an invalid entity.
 This should reduce log occurrences of dupe uuid messages.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 4af5a230b..6371f2f5b 100644
+index 4af5a230ba..6371f2f5b1 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -300,6 +300,7 @@ public class ChunkRegionLoader {
@@ -61,5 +61,5 @@ index 4af5a230b..6371f2f5b 100644
              ProtoChunk protochunk = (ProtoChunk) ichunkaccess;
  
 -- 
-2.24.0
+2.24.1
 
diff --git a/Spigot-Server-Patches/0262-Don-t-call-getItemMeta-on-hasItemMeta.patch b/Spigot-Server-Patches/0263-Don-t-call-getItemMeta-on-hasItemMeta.patch
similarity index 96%
rename from Spigot-Server-Patches/0262-Don-t-call-getItemMeta-on-hasItemMeta.patch
rename to Spigot-Server-Patches/0263-Don-t-call-getItemMeta-on-hasItemMeta.patch
index f26a723455..9a47f15d61 100644
--- a/Spigot-Server-Patches/0262-Don-t-call-getItemMeta-on-hasItemMeta.patch
+++ b/Spigot-Server-Patches/0263-Don-t-call-getItemMeta-on-hasItemMeta.patch
@@ -1,4 +1,4 @@
-From b64736300fe65fae0d26e59dbdef3eb49168adb3 Mon Sep 17 00:00:00 2001
+From 7e3cb7dc349b699c6ef547413b9736cbd9f7d103 Mon Sep 17 00:00:00 2001
 From: Hugo Manrique <hugmanrique@gmail.com>
 Date: Thu, 26 Jul 2018 14:10:23 +0200
 Subject: [PATCH] Don't call getItemMeta on hasItemMeta
@@ -11,7 +11,7 @@ Returns true if getDamage() == 0 or has damage tag or other tag is set.
 Check the `ItemMetaTest#testTaggedButNotMeta` method to see how this method behaves.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index a41be8fda..d5e8a7ee6 100644
+index a41be8fdae..d5e8a7ee6d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -553,7 +553,7 @@ public final class CraftItemStack extends ItemStack {
@@ -24,7 +24,7 @@ index a41be8fda..d5e8a7ee6 100644
  
      static boolean hasItemMeta(net.minecraft.server.ItemStack item) {
 diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
-index 3a82bede7..d73141839 100644
+index 3a82bede7c..d731418397 100644
 --- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
 +++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
 @@ -2,10 +2,9 @@ package org.bukkit.craftbukkit.inventory;
diff --git a/Spigot-Server-Patches/0263-Ignore-Dead-Entities-in-entityList-iteration.patch b/Spigot-Server-Patches/0264-Ignore-Dead-Entities-in-entityList-iteration.patch
similarity index 96%
rename from Spigot-Server-Patches/0263-Ignore-Dead-Entities-in-entityList-iteration.patch
rename to Spigot-Server-Patches/0264-Ignore-Dead-Entities-in-entityList-iteration.patch
index 79c4eae27c..7f7e30fb3e 100644
--- a/Spigot-Server-Patches/0263-Ignore-Dead-Entities-in-entityList-iteration.patch
+++ b/Spigot-Server-Patches/0264-Ignore-Dead-Entities-in-entityList-iteration.patch
@@ -1,4 +1,4 @@
-From a606cefee223c8904e833771331caf6ab9ae59be Mon Sep 17 00:00:00 2001
+From f14d77d2ac1d21189dd71118d653b9dabcddc866 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 28 Jul 2018 12:18:27 -0400
 Subject: [PATCH] Ignore Dead Entities in entityList iteration
@@ -11,7 +11,7 @@ This will ensure that dead entities are skipped from iteration since
 they shouldn't of been in the list in the first place.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-index eecf27370..d704fc79c 100644
+index eecf27370b..d704fc79c0 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
 @@ -179,6 +179,7 @@ public class PaperCommand extends Command {
@@ -23,7 +23,7 @@ index eecf27370..d704fc79c 100644
                      MutablePair<Integer, Map<ChunkCoordIntPair, Integer>> info = list.computeIfAbsent(key, k -> MutablePair.of(0, Maps.newHashMap()));
                      ChunkCoordIntPair chunk = new ChunkCoordIntPair(e.getChunkX(), e.getChunkZ());
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index b156f5428..c7c600b80 100644
+index b156f5428c..c7c600b80c 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -671,6 +671,7 @@ public class Chunk implements IChunkAccess {
@@ -51,7 +51,7 @@ index b156f5428..c7c600b80 100644
                  if (oclass.isInstance(t0) && t0.getBoundingBox().c(axisalignedbb) && (predicate == null || predicate.test(t0))) { // Spigot - instance check
                      list.add(t0);
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index be8f6ac99..4a931aaf4 100644
+index be8f6ac99f..4a931aaf42 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -196,6 +196,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -63,7 +63,7 @@ index be8f6ac99..4a931aaf4 100644
      public float getBukkitYaw() {
          return this.yaw;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 0cd48c5bc..f4d6c68f4 100644
+index 0cd48c5bcf..f4d6c68f4d 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -885,7 +885,7 @@ public class WorldServer extends World {
@@ -92,7 +92,7 @@ index 0cd48c5bc..f4d6c68f4 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 022eefc67..4da55e0df 100644
+index 022eefc677..4da55e0df5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1003,6 +1003,7 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0264-MC-111480-Start-Entity-ID-s-at-1.patch b/Spigot-Server-Patches/0265-MC-111480-Start-Entity-ID-s-at-1.patch
similarity index 90%
rename from Spigot-Server-Patches/0264-MC-111480-Start-Entity-ID-s-at-1.patch
rename to Spigot-Server-Patches/0265-MC-111480-Start-Entity-ID-s-at-1.patch
index 5dd010089e..098f3e29d2 100644
--- a/Spigot-Server-Patches/0264-MC-111480-Start-Entity-ID-s-at-1.patch
+++ b/Spigot-Server-Patches/0265-MC-111480-Start-Entity-ID-s-at-1.patch
@@ -1,4 +1,4 @@
-From 292b1b3faeb3bf5eca86e49d192a0d9dd5e42870 Mon Sep 17 00:00:00 2001
+From 21b99a17c395ec6d2fbeb541b9bdcbb5cf4f28a1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 29 Jul 2018 22:58:47 -0400
 Subject: [PATCH] MC-111480: Start Entity ID's at 1
@@ -7,7 +7,7 @@ DataWatchers that store Entity ID's treat 0 as special,
 and can break things such as Elytra Fireworks.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 4a931aaf4..75343a438 100644
+index 4a931aaf42..75343a4386 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -93,7 +93,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -20,5 +20,5 @@ index 4a931aaf4..75343a438 100644
      private static final AxisAlignedBB d = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.0D, 0.0D, 0.0D);
      private static double e = 1.0D;
 -- 
-2.24.0
+2.24.1
 
diff --git a/Spigot-Server-Patches/0265-Implement-Expanded-ArmorStand-API.patch b/Spigot-Server-Patches/0266-Implement-Expanded-ArmorStand-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0265-Implement-Expanded-ArmorStand-API.patch
rename to Spigot-Server-Patches/0266-Implement-Expanded-ArmorStand-API.patch
index 28d5e0f5d6..db8a8a50c2 100644
--- a/Spigot-Server-Patches/0265-Implement-Expanded-ArmorStand-API.patch
+++ b/Spigot-Server-Patches/0266-Implement-Expanded-ArmorStand-API.patch
@@ -1,4 +1,4 @@
-From da3fb44719e20f155c6d71c1390728c30c57f0f4 Mon Sep 17 00:00:00 2001
+From 7d8dc4b2a0702e2339136d3324d43602c039d059 Mon Sep 17 00:00:00 2001
 From: willies952002 <admin@domnian.com>
 Date: Thu, 26 Jul 2018 02:25:46 -0400
 Subject: [PATCH] Implement Expanded ArmorStand API
@@ -8,7 +8,7 @@ Add the following:
 - Enable/Disable slot interactions
 
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 80bf58b05..eb6cf3a86 100644
+index 80bf58b052..eb6cf3a86b 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -36,7 +36,7 @@ public class EntityArmorStand extends EntityLiving {
@@ -29,7 +29,7 @@ index 80bf58b05..eb6cf3a86 100644
          return (this.bB & 1 << enumitemslot.c()) != 0 || enumitemslot.a() == EnumItemSlot.Function.HAND && !this.hasArms();
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
-index 124c3185b..d1d689e5d 100644
+index 124c3185bc..d1d689e5d7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 @@ -30,11 +30,13 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
@@ -126,5 +126,5 @@ index 124c3185b..d1d689e5d 100644
      // Paper end
  }
 -- 
-2.24.0
+2.24.1
 
diff --git a/Spigot-Server-Patches/0266-AnvilDamageEvent.patch b/Spigot-Server-Patches/0267-AnvilDamageEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0266-AnvilDamageEvent.patch
rename to Spigot-Server-Patches/0267-AnvilDamageEvent.patch
index 2858a13674..f10b013576 100644
--- a/Spigot-Server-Patches/0266-AnvilDamageEvent.patch
+++ b/Spigot-Server-Patches/0267-AnvilDamageEvent.patch
@@ -1,11 +1,11 @@
-From 26bc456a8ad1e2b824b7928557e116a4d9cfa296 Mon Sep 17 00:00:00 2001
+From 2173db383abb64418808e447c5ddbb91a04cae41 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 20 Jul 2018 23:37:03 -0500
 Subject: [PATCH] AnvilDamageEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/ContainerAnvil.java b/src/main/java/net/minecraft/server/ContainerAnvil.java
-index 1d9ce5ef1..286b930dd 100644
+index 1d9ce5ef1c..286b930ddb 100644
 --- a/src/main/java/net/minecraft/server/ContainerAnvil.java
 +++ b/src/main/java/net/minecraft/server/ContainerAnvil.java
 @@ -85,6 +85,16 @@ public class ContainerAnvil extends Container {
@@ -26,5 +26,5 @@ index 1d9ce5ef1..286b930dd 100644
                          if (iblockdata1 == null) {
                              world.a(blockposition, false);
 -- 
-2.24.0
+2.24.1
 
diff --git a/Spigot-Server-Patches/0267-Add-TNTPrimeEvent.patch b/Spigot-Server-Patches/0268-Add-TNTPrimeEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0267-Add-TNTPrimeEvent.patch
rename to Spigot-Server-Patches/0268-Add-TNTPrimeEvent.patch
index fe76eaffb3..d4a01163ff 100644
--- a/Spigot-Server-Patches/0267-Add-TNTPrimeEvent.patch
+++ b/Spigot-Server-Patches/0268-Add-TNTPrimeEvent.patch
@@ -1,11 +1,11 @@
-From 9ee8591ff2313a13e15a06ce71b6c5503854d2f1 Mon Sep 17 00:00:00 2001
+From abeb999a469ba9faf3872c1b4dcb155e9abe635f Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Mon, 16 Jul 2018 00:05:05 +0300
 Subject: [PATCH] Add TNTPrimeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockFire.java b/src/main/java/net/minecraft/server/BlockFire.java
-index 0ece78d4d..3400e7ce3 100644
+index 0ece78d4dc..3400e7ce37 100644
 --- a/src/main/java/net/minecraft/server/BlockFire.java
 +++ b/src/main/java/net/minecraft/server/BlockFire.java
 @@ -2,6 +2,7 @@ package net.minecraft.server;
@@ -39,7 +39,7 @@ index 0ece78d4d..3400e7ce3 100644
              }
          }
 diff --git a/src/main/java/net/minecraft/server/BlockTNT.java b/src/main/java/net/minecraft/server/BlockTNT.java
-index 44d26e096..ca9b0539f 100644
+index 44d26e096c..ca9b0539f0 100644
 --- a/src/main/java/net/minecraft/server/BlockTNT.java
 +++ b/src/main/java/net/minecraft/server/BlockTNT.java
 @@ -1,6 +1,7 @@
@@ -114,7 +114,7 @@ index 44d26e096..ca9b0539f 100644
                  world.a(blockposition, false);
              }
 diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index 07abcc1e2..3df8e30ec 100644
+index 07abcc1e24..3df8e30ec7 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
 @@ -11,6 +11,7 @@ import org.bukkit.craftbukkit.block.CraftBlock;
@@ -138,5 +138,5 @@ index 07abcc1e2..3df8e30ec 100644
  
                  this.world.a(blockposition, false);
 -- 
-2.24.0
+2.24.1
 
diff --git a/Spigot-Server-Patches/0268-Break-up-and-make-tab-spam-limits-configurable.patch b/Spigot-Server-Patches/0269-Break-up-and-make-tab-spam-limits-configurable.patch
similarity index 96%
rename from Spigot-Server-Patches/0268-Break-up-and-make-tab-spam-limits-configurable.patch
rename to Spigot-Server-Patches/0269-Break-up-and-make-tab-spam-limits-configurable.patch
index 141849a4d8..38e71b556e 100644
--- a/Spigot-Server-Patches/0268-Break-up-and-make-tab-spam-limits-configurable.patch
+++ b/Spigot-Server-Patches/0269-Break-up-and-make-tab-spam-limits-configurable.patch
@@ -1,4 +1,4 @@
-From 946cd85fec1e93728dd02008796b6fa1298b543e Mon Sep 17 00:00:00 2001
+From d404822b978f7c150834d20848f1d6252f075f34 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 29 Jul 2018 05:02:15 +0100
 Subject: [PATCH] Break up and make tab spam limits configurable
@@ -22,7 +22,7 @@ to take the burden of this into their own hand without having to rely on
 plugins doing unsafe things.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 26ab855dc..adef07d4d 100644
+index 26ab855dcf..adef07d4d5 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -287,4 +287,18 @@ public class PaperConfig {
@@ -45,7 +45,7 @@ index 26ab855dc..adef07d4d 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 3a7e197e3..77c375f71 100644
+index 3a7e197e39..77c375f71b 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -76,6 +76,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -74,5 +74,5 @@ index 3a7e197e3..77c375f71 100644
              return;
          }
 -- 
-2.24.0
+2.24.1
 
diff --git a/Spigot-Server-Patches/0269-Add-hand-to-bucket-events.patch b/Spigot-Server-Patches/0270-Add-hand-to-bucket-events.patch
similarity index 98%
rename from Spigot-Server-Patches/0269-Add-hand-to-bucket-events.patch
rename to Spigot-Server-Patches/0270-Add-hand-to-bucket-events.patch
index fa54cd3a52..95ab7d6246 100644
--- a/Spigot-Server-Patches/0269-Add-hand-to-bucket-events.patch
+++ b/Spigot-Server-Patches/0270-Add-hand-to-bucket-events.patch
@@ -1,11 +1,11 @@
-From abd00ec4f5c1c3a61e1304d17adb390fd741220a Mon Sep 17 00:00:00 2001
+From a2d951ee03d90c39b2ec6ce11ef0539757d88bda Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 2 Aug 2018 08:44:35 -0500
 Subject: [PATCH] Add hand to bucket events
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java
-index 6e385b530..2c8bbf20a 100644
+index 6e385b5304..2c8bbf20ae 100644
 --- a/src/main/java/net/minecraft/server/EntityCow.java
 +++ b/src/main/java/net/minecraft/server/EntityCow.java
 @@ -61,7 +61,7 @@ public class EntityCow extends EntityAnimal {
@@ -18,7 +18,7 @@ index 6e385b530..2c8bbf20a 100644
              if (event.isCancelled()) {
                  return false;
 diff --git a/src/main/java/net/minecraft/server/ItemBucket.java b/src/main/java/net/minecraft/server/ItemBucket.java
-index aaed8c0ae..0ff92aea5 100644
+index aaed8c0ae2..0ff92aea54 100644
 --- a/src/main/java/net/minecraft/server/ItemBucket.java
 +++ b/src/main/java/net/minecraft/server/ItemBucket.java
 @@ -41,7 +41,7 @@ public class ItemBucket extends Item {
@@ -69,7 +69,7 @@ index aaed8c0ae..0ff92aea5 100644
                          ((EntityPlayer) entityhuman).playerConnection.sendPacket(new PacketPlayOutBlockChange(world, blockposition)); // SPIGOT-4238: needed when looking through entity
                          ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory(); // SPIGOT-4541
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index e954c59d5..844781f4e 100644
+index e954c59d54..844781f4ec 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -368,6 +368,20 @@ public class CraftEventFactory {
@@ -107,5 +107,5 @@ index e954c59d5..844781f4e 100644
          }
  
 -- 
-2.24.0
+2.24.1
 
diff --git a/Spigot-Server-Patches/0270-MC-135506-Experience-should-save-as-Integers.patch b/Spigot-Server-Patches/0271-MC-135506-Experience-should-save-as-Integers.patch
similarity index 92%
rename from Spigot-Server-Patches/0270-MC-135506-Experience-should-save-as-Integers.patch
rename to Spigot-Server-Patches/0271-MC-135506-Experience-should-save-as-Integers.patch
index fafcebc897..36ec340993 100644
--- a/Spigot-Server-Patches/0270-MC-135506-Experience-should-save-as-Integers.patch
+++ b/Spigot-Server-Patches/0271-MC-135506-Experience-should-save-as-Integers.patch
@@ -1,11 +1,11 @@
-From 2c17ec220f207cfbc2efcce031acf1b635006e79 Mon Sep 17 00:00:00 2001
+From 830ab876589f4b0530f6f74cca373507111f8497 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 3 Aug 2018 00:04:54 -0400
 Subject: [PATCH] MC-135506: Experience should save as Integers
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index 87c6b77ce..53c6c3389 100644
+index 87c6b77ce3..53c6c33892 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -207,7 +207,7 @@ public class EntityExperienceOrb extends Entity {
@@ -27,5 +27,5 @@ index 87c6b77ce..53c6c3389 100644
      }
  
 -- 
-2.24.0
+2.24.1
 
diff --git a/Spigot-Server-Patches/0271-Fix-client-rendering-skulls-from-same-user.patch b/Spigot-Server-Patches/0272-Fix-client-rendering-skulls-from-same-user.patch
similarity index 96%
rename from Spigot-Server-Patches/0271-Fix-client-rendering-skulls-from-same-user.patch
rename to Spigot-Server-Patches/0272-Fix-client-rendering-skulls-from-same-user.patch
index e6aa12c0f0..6d7511ca08 100644
--- a/Spigot-Server-Patches/0271-Fix-client-rendering-skulls-from-same-user.patch
+++ b/Spigot-Server-Patches/0272-Fix-client-rendering-skulls-from-same-user.patch
@@ -1,4 +1,4 @@
-From 4594f92c898a543516bb905ce833f797e2991b0b Mon Sep 17 00:00:00 2001
+From c069ef9aa9b923df19d13d60c7a65f4b91691ac5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 22 Nov 2016 00:40:42 -0500
 Subject: [PATCH] Fix client rendering skulls from same user
@@ -12,7 +12,7 @@ This allows the client to render multiple skull textures from the same user,
 for when different skins were used when skull was made.
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 5fc7124dd..33d9cac4d 100644
+index 5fc7124dd5..33d9cac4de 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -54,7 +54,7 @@ public final class ItemStack {
@@ -25,7 +25,7 @@ index 5fc7124dd..33d9cac4d 100644
      private EntityItemFrame i;
      private ShapeDetectorBlock j;
 diff --git a/src/main/java/net/minecraft/server/PacketDataSerializer.java b/src/main/java/net/minecraft/server/PacketDataSerializer.java
-index d9574a9ac..93ae6dcd7 100644
+index d9574a9ace..93ae6dcd78 100644
 --- a/src/main/java/net/minecraft/server/PacketDataSerializer.java
 +++ b/src/main/java/net/minecraft/server/PacketDataSerializer.java
 @@ -253,6 +253,15 @@ public class PacketDataSerializer extends ByteBuf {
@@ -62,7 +62,7 @@ index d9574a9ac..93ae6dcd7 100644
              }
              // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
-index 3a1d0deb0..1fcbbd698 100644
+index 3a1d0deb0d..1fcbbd698a 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 @@ -58,6 +58,7 @@ public class PacketPlayOutMapChunk implements Packet<PacketListenerPlayOut> {
@@ -74,7 +74,7 @@ index 3a1d0deb0..1fcbbd698 100644
                  this.g.add(nbttagcompound);
              }
 diff --git a/src/main/java/net/minecraft/server/TileEntitySkull.java b/src/main/java/net/minecraft/server/TileEntitySkull.java
-index 177cceb77..0882d82ce 100644
+index 177cceb77f..0882d82cef 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySkull.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySkull.java
 @@ -142,9 +142,37 @@ public class TileEntitySkull extends TileEntity /*implements ITickable*/ { // Pa
@@ -117,5 +117,5 @@ index 177cceb77..0882d82ce 100644
      public NBTTagCompound b() {
          return this.save(new NBTTagCompound());
 -- 
-2.24.0
+2.24.1
 
diff --git a/Spigot-Server-Patches/0272-Add-Early-Warning-Feature-to-WatchDog.patch b/Spigot-Server-Patches/0273-Add-Early-Warning-Feature-to-WatchDog.patch
similarity index 97%
rename from Spigot-Server-Patches/0272-Add-Early-Warning-Feature-to-WatchDog.patch
rename to Spigot-Server-Patches/0273-Add-Early-Warning-Feature-to-WatchDog.patch
index f1754c6bf1..69f6f77ef2 100644
--- a/Spigot-Server-Patches/0272-Add-Early-Warning-Feature-to-WatchDog.patch
+++ b/Spigot-Server-Patches/0273-Add-Early-Warning-Feature-to-WatchDog.patch
@@ -1,4 +1,4 @@
-From bf10a9d58ea091d50c7486c6c5f2ee6df35d1635 Mon Sep 17 00:00:00 2001
+From 3798c3bcf6c92ae3bf115afd5df33e41b17c07c7 Mon Sep 17 00:00:00 2001
 From: miclebrick <miclebrick@outlook.com>
 Date: Wed, 8 Aug 2018 15:30:52 -0400
 Subject: [PATCH] Add Early Warning Feature to WatchDog
@@ -9,7 +9,7 @@ thread dumps at an interval until the point of crash.
 This will help diagnose what was going on in that time before the crash.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index adef07d4d..214b577b3 100644
+index adef07d4d5..214b577b32 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -24,6 +24,7 @@ import org.bukkit.configuration.file.YamlConfiguration;
@@ -36,7 +36,7 @@ index adef07d4d..214b577b3 100644
      public static int tabSpamLimit = 500;
      private static void tabSpamLimiters() {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 97a0a6924..dd2d8712e 100644
+index 97a0a69247..dd2d8712ed 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -869,6 +869,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -48,7 +48,7 @@ index 97a0a6924..dd2d8712e 100644
                  long start = System.nanoTime(), curTime, tickSection = start; // Paper - Further improve server tick loop
                  lastTick = start - TICK_TIME; // Paper
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 296a11f14..8636283fd 100644
+index 296a11f141..8636283fd1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -758,6 +758,7 @@ public final class CraftServer implements Server {
@@ -68,7 +68,7 @@ index 296a11f14..8636283fd 100644
  
      @Override
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 33767c85c..359a0c8af 100644
+index 1cf214eaca..e66050b87a 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -225,7 +225,7 @@ public class SpigotConfig
@@ -81,7 +81,7 @@ index 33767c85c..359a0c8af 100644
  
      public static boolean bungee;
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index 9532aada8..a1d93200e 100644
+index 9532aada82..a1d93200e6 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
 @@ -5,6 +5,7 @@ import java.lang.management.MonitorInfo;
@@ -182,5 +182,5 @@ index 9532aada8..a1d93200e 100644
              {
                  interrupt();
 -- 
-2.24.0
+2.24.1
 
diff --git a/Spigot-Server-Patches/0273-Make-EnderDragon-implement-Mob.patch b/Spigot-Server-Patches/0274-Make-EnderDragon-implement-Mob.patch
similarity index 92%
rename from Spigot-Server-Patches/0273-Make-EnderDragon-implement-Mob.patch
rename to Spigot-Server-Patches/0274-Make-EnderDragon-implement-Mob.patch
index b5a35ef39c..7280f02e5d 100644
--- a/Spigot-Server-Patches/0273-Make-EnderDragon-implement-Mob.patch
+++ b/Spigot-Server-Patches/0274-Make-EnderDragon-implement-Mob.patch
@@ -1,11 +1,11 @@
-From 6d874ac6c3a4e873cd2647efdd332060790ddbeb Mon Sep 17 00:00:00 2001
+From 5f869090f7e47fa334ff53ef46a8ffa7957bb2a1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 10 Aug 2018 22:11:49 -0400
 Subject: [PATCH] Make EnderDragon implement Mob
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java
-index cc115cc36..4947249da 100644
+index cc115cc368..4947249da2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java
 @@ -1,17 +1,18 @@
@@ -32,5 +32,5 @@ index cc115cc36..4947249da 100644
  
      @Override
 -- 
-2.24.0
+2.24.1
 
diff --git a/Spigot-Server-Patches/0274-Use-ConcurrentHashMap-in-JsonList.patch b/Spigot-Server-Patches/0275-Use-ConcurrentHashMap-in-JsonList.patch
similarity index 97%
rename from Spigot-Server-Patches/0274-Use-ConcurrentHashMap-in-JsonList.patch
rename to Spigot-Server-Patches/0275-Use-ConcurrentHashMap-in-JsonList.patch
index eb1770e591..838df2b29f 100644
--- a/Spigot-Server-Patches/0274-Use-ConcurrentHashMap-in-JsonList.patch
+++ b/Spigot-Server-Patches/0275-Use-ConcurrentHashMap-in-JsonList.patch
@@ -1,4 +1,4 @@
-From 8466229716ac8c3296927ca150e524ab8a407f8b Mon Sep 17 00:00:00 2001
+From 22d283b355d82dbea3c8c7de5d0ebf90de3e2125 Mon Sep 17 00:00:00 2001
 From: egg82 <phantom_zero@ymail.com>
 Date: Tue, 7 Aug 2018 01:24:23 -0600
 Subject: [PATCH] Use ConcurrentHashMap in JsonList
@@ -25,7 +25,7 @@ The point of this is readability, but does have a side-benefit of a small microp
 Finally, added a couple obfhelpers for the modified code
 
 diff --git a/src/main/java/net/minecraft/server/JsonList.java b/src/main/java/net/minecraft/server/JsonList.java
-index 734e7ecf6..8570e38f4 100644
+index 734e7ecf63..8570e38f42 100644
 --- a/src/main/java/net/minecraft/server/JsonList.java
 +++ b/src/main/java/net/minecraft/server/JsonList.java
 @@ -35,7 +35,8 @@ public class JsonList<K, V extends JsonListEntry<K>> {
@@ -99,5 +99,5 @@ index 734e7ecf6..8570e38f4 100644
          String s = this.b.toJson(collection);
          BufferedWriter bufferedwriter = null;
 -- 
-2.24.0
+2.24.1
 
diff --git a/Spigot-Server-Patches/0275-Use-a-Queue-for-Queueing-Commands.patch b/Spigot-Server-Patches/0276-Use-a-Queue-for-Queueing-Commands.patch
similarity index 94%
rename from Spigot-Server-Patches/0275-Use-a-Queue-for-Queueing-Commands.patch
rename to Spigot-Server-Patches/0276-Use-a-Queue-for-Queueing-Commands.patch
index a35f0c7d6d..e7667d8cdf 100644
--- a/Spigot-Server-Patches/0275-Use-a-Queue-for-Queueing-Commands.patch
+++ b/Spigot-Server-Patches/0276-Use-a-Queue-for-Queueing-Commands.patch
@@ -1,4 +1,4 @@
-From 3ff0d47c3608aa6de884773fcefe9fb564218b1a Mon Sep 17 00:00:00 2001
+From 867ff7369be06a33177ba4fb30f77a59f5fa941f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 12 Aug 2018 02:33:39 -0400
 Subject: [PATCH] Use a Queue for Queueing Commands
@@ -6,7 +6,7 @@ Subject: [PATCH] Use a Queue for Queueing Commands
 Lists are bad as Queues mmmkay.
 
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 6e95a0452..3ed74ae0e 100644
+index 6e95a0452e..3ed74ae0ec 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -43,7 +43,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -32,5 +32,5 @@ index 6e95a0452..3ed74ae0e 100644
              // CraftBukkit start - ServerCommand for preprocessing
              ServerCommandEvent event = new ServerCommandEvent(console, servercommand.command);
 -- 
-2.24.0
+2.24.1
 
diff --git a/Spigot-Server-Patches/0276-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/Spigot-Server-Patches/0277-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
similarity index 93%
rename from Spigot-Server-Patches/0276-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
rename to Spigot-Server-Patches/0277-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
index f5268e79e4..d89475715b 100644
--- a/Spigot-Server-Patches/0276-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
+++ b/Spigot-Server-Patches/0277-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
@@ -1,11 +1,11 @@
-From ec3f5be9364a62c51d62825ff2f1aa62fb2cbc98 Mon Sep 17 00:00:00 2001
+From 1eee1c091407f4147eb02bbf41aa947dff745abd Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 15 Aug 2018 01:16:34 -0400
 Subject: [PATCH] Ability to get Tile Entities from a chunk without snapshots
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-index 299523799..91f2066b1 100644
+index 2995237994..91f2066b12 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 @@ -127,9 +127,16 @@ public class CraftChunk implements Chunk {
diff --git a/Spigot-Server-Patches/0277-Allow-disabling-armour-stand-ticking.patch b/Spigot-Server-Patches/0278-Allow-disabling-armour-stand-ticking.patch
similarity index 98%
rename from Spigot-Server-Patches/0277-Allow-disabling-armour-stand-ticking.patch
rename to Spigot-Server-Patches/0278-Allow-disabling-armour-stand-ticking.patch
index 571c62346f..46276c0025 100644
--- a/Spigot-Server-Patches/0277-Allow-disabling-armour-stand-ticking.patch
+++ b/Spigot-Server-Patches/0278-Allow-disabling-armour-stand-ticking.patch
@@ -1,11 +1,11 @@
-From fd83a25dc850b5af4f206395331c5cf7ce3c5b8d Mon Sep 17 00:00:00 2001
+From 1e48b9fb8b37d1c9378a0628f6e9501344f30c2f Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 15 Aug 2018 01:26:09 -0700
 Subject: [PATCH] Allow disabling armour stand ticking
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 0a99b8fe9..42d14fac2 100644
+index 0a99b8fe95..42d14fac2c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -391,4 +391,10 @@ public class PaperWorldConfig {
@@ -20,7 +20,7 @@ index 0a99b8fe9..42d14fac2 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index eb6cf3a86..b51662ee9 100644
+index eb6cf3a86b..b51662ee99 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -44,6 +44,12 @@ public class EntityArmorStand extends EntityLiving {
@@ -142,7 +142,7 @@ index eb6cf3a86..b51662ee9 100644
  
      public Vector3f r() {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 470cbddeb..91b6d6878 100644
+index 470cbddeb8..91b6d68787 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2324,52 +2324,7 @@ public abstract class EntityLiving extends Entity {
@@ -256,7 +256,7 @@ index 470cbddeb..91b6d6878 100644
          float f2 = MathHelper.g(f - this.aI);
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
-index d1d689e5d..ac105270d 100644
+index d1d689e5d7..ac105270d5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 @@ -297,5 +297,16 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
@@ -277,5 +277,5 @@ index d1d689e5d..ac105270d 100644
      // Paper end
  }
 -- 
-2.24.0
+2.24.1
 
diff --git a/Spigot-Server-Patches/0278-Optimize-BlockPosition-helper-methods.patch b/Spigot-Server-Patches/0279-Optimize-BlockPosition-helper-methods.patch
similarity index 97%
rename from Spigot-Server-Patches/0278-Optimize-BlockPosition-helper-methods.patch
rename to Spigot-Server-Patches/0279-Optimize-BlockPosition-helper-methods.patch
index 796f0196e1..89c1afd13c 100644
--- a/Spigot-Server-Patches/0278-Optimize-BlockPosition-helper-methods.patch
+++ b/Spigot-Server-Patches/0279-Optimize-BlockPosition-helper-methods.patch
@@ -1,4 +1,4 @@
-From 358d0fc1ce9cb5ce91e52c5dcaa89c7ebae35ac8 Mon Sep 17 00:00:00 2001
+From 63e1349041f98461fd36bd852d522d35b62e5697 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Wed, 15 Aug 2018 12:05:12 -0700
 Subject: [PATCH] Optimize BlockPosition helper methods
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize BlockPosition helper methods
 Resolves #1338
 
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index 5a505b753..142476395 100644
+index 5a505b753a..1424763954 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -134,57 +134,74 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali
@@ -98,5 +98,5 @@ index 5a505b753..142476395 100644
  
      @Override
 -- 
-2.24.0
+2.24.1
 
diff --git a/Spigot-Server-Patches/0279-Send-nearby-packets-from-world-player-list-not-serve.patch b/Spigot-Server-Patches/0280-Send-nearby-packets-from-world-player-list-not-serve.patch
similarity index 96%
rename from Spigot-Server-Patches/0279-Send-nearby-packets-from-world-player-list-not-serve.patch
rename to Spigot-Server-Patches/0280-Send-nearby-packets-from-world-player-list-not-serve.patch
index e61ab7d276..8e6decd2cb 100644
--- a/Spigot-Server-Patches/0279-Send-nearby-packets-from-world-player-list-not-serve.patch
+++ b/Spigot-Server-Patches/0280-Send-nearby-packets-from-world-player-list-not-serve.patch
@@ -1,11 +1,11 @@
-From 36e368d76d98587d80594e5dfa5632c7d6a71cef Mon Sep 17 00:00:00 2001
+From e4699158564e1f29cbc7ff4c82964f5b7af6529e Mon Sep 17 00:00:00 2001
 From: Mystiflow <mystiflow@gmail.com>
 Date: Fri, 6 Jul 2018 13:21:30 +0100
 Subject: [PATCH] Send nearby packets from world player list not server list
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index fd0f5c6f2..e46436623 100644
+index fd0f5c6f29..e46436623c 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -923,8 +923,25 @@ public abstract class PlayerList {
@@ -46,7 +46,7 @@ index fd0f5c6f2..e46436623 100644
                  double d5 = d1 - entityplayer.locY();
                  double d6 = d2 - entityplayer.locZ();
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index f4d6c68f4..a0c714129 100644
+index f4d6c68f4d..a0c7141294 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1250,7 +1250,7 @@ public class WorldServer extends World {
@@ -68,7 +68,7 @@ index f4d6c68f4..a0c714129 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 4da55e0df..7d8ec9450 100644
+index 4da55e0df5..7d8ec94508 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -2068,7 +2068,7 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0280-Restore-vanlla-default-mob-spawn-range.patch b/Spigot-Server-Patches/0281-Restore-vanlla-default-mob-spawn-range.patch
similarity index 86%
rename from Spigot-Server-Patches/0280-Restore-vanlla-default-mob-spawn-range.patch
rename to Spigot-Server-Patches/0281-Restore-vanlla-default-mob-spawn-range.patch
index c72209fd51..699b9ce6d3 100644
--- a/Spigot-Server-Patches/0280-Restore-vanlla-default-mob-spawn-range.patch
+++ b/Spigot-Server-Patches/0281-Restore-vanlla-default-mob-spawn-range.patch
@@ -1,11 +1,11 @@
-From fe176073abc6d42b34160371c9766ed78ebcf57e Mon Sep 17 00:00:00 2001
+From f1cf5f272ab375515fa02d9f920f8ba0bc537660 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 18 Aug 2018 12:43:16 -0400
 Subject: [PATCH] Restore vanlla default mob-spawn-range
 
 
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 8c7dd0133..4feea10de 100644
+index 5686a4f1a0..c2906f20a5 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -165,7 +165,7 @@ public class SpigotWorldConfig
@@ -18,5 +18,5 @@ index 8c7dd0133..4feea10de 100644
      }
  
 -- 
-2.24.0
+2.24.1
 
diff --git a/Spigot-Server-Patches/0281-Optimize-CraftBlockData-Creation.patch b/Spigot-Server-Patches/0282-Optimize-CraftBlockData-Creation.patch
similarity index 94%
rename from Spigot-Server-Patches/0281-Optimize-CraftBlockData-Creation.patch
rename to Spigot-Server-Patches/0282-Optimize-CraftBlockData-Creation.patch
index 722ec6a3b2..ee51c52cb4 100644
--- a/Spigot-Server-Patches/0281-Optimize-CraftBlockData-Creation.patch
+++ b/Spigot-Server-Patches/0282-Optimize-CraftBlockData-Creation.patch
@@ -1,4 +1,4 @@
-From dc069e1a6668c0e44a93eef06e15d919abdc74ca Mon Sep 17 00:00:00 2001
+From 9a0443261421b82411cc68f8e99ef90056e1a71d Mon Sep 17 00:00:00 2001
 From: miclebrick <miclebrick@outlook.com>
 Date: Thu, 23 Aug 2018 11:45:32 -0400
 Subject: [PATCH] Optimize CraftBlockData Creation
@@ -7,7 +7,7 @@ Avoids a hashmap lookup by cacheing a reference to the CraftBlockData
 and cloning it when one is needed.
 
 diff --git a/src/main/java/net/minecraft/server/IBlockData.java b/src/main/java/net/minecraft/server/IBlockData.java
-index 9ab57be85..c1ff62aa5 100644
+index 9ab57be850..c1ff62aa52 100644
 --- a/src/main/java/net/minecraft/server/IBlockData.java
 +++ b/src/main/java/net/minecraft/server/IBlockData.java
 @@ -4,6 +4,8 @@ import com.google.common.collect.ImmutableMap;
@@ -36,7 +36,7 @@ index 9ab57be85..c1ff62aa5 100644
          return this.getBlock().k(this);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
-index e371e7f6d..32e1e7e20 100644
+index e371e7f6d9..32e1e7e20a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
 @@ -549,7 +549,17 @@ public class CraftBlockData implements BlockData {
diff --git a/Spigot-Server-Patches/0282-Fix-MC-124320.patch b/Spigot-Server-Patches/0283-Fix-MC-124320.patch
similarity index 95%
rename from Spigot-Server-Patches/0282-Fix-MC-124320.patch
rename to Spigot-Server-Patches/0283-Fix-MC-124320.patch
index 62aa179145..841becdac2 100644
--- a/Spigot-Server-Patches/0282-Fix-MC-124320.patch
+++ b/Spigot-Server-Patches/0283-Fix-MC-124320.patch
@@ -1,11 +1,11 @@
-From dac3f29d0a5a4e59c4f826b6d50dce11025c4504 Mon Sep 17 00:00:00 2001
+From 2f971f57477b2d3bd4581d61d01dc50bc43c2734 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 23 Aug 2018 09:25:30 -0500
 Subject: [PATCH] Fix MC-124320
 
 
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index 3e4fc4ee5..2262a8253 100644
+index 3e4fc4ee5e..2262a82532 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -170,6 +170,7 @@ public class Block implements IMaterial {
@@ -17,7 +17,7 @@ index 3e4fc4ee5..2262a8253 100644
          IBlockData iblockdata1 = iblockdata;
          BlockPosition.MutableBlockPosition blockposition_mutableblockposition = new BlockPosition.MutableBlockPosition();
 diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
-index 607d6da6a..9783576e3 100644
+index 607d6da6a4..9783576e38 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
 @@ -354,8 +354,9 @@ public class EntityEnderman extends EntityMonster {
diff --git a/Spigot-Server-Patches/0283-Slime-Pathfinder-Events.patch b/Spigot-Server-Patches/0284-Slime-Pathfinder-Events.patch
similarity index 98%
rename from Spigot-Server-Patches/0283-Slime-Pathfinder-Events.patch
rename to Spigot-Server-Patches/0284-Slime-Pathfinder-Events.patch
index 75711cc986..05c0a606ea 100644
--- a/Spigot-Server-Patches/0283-Slime-Pathfinder-Events.patch
+++ b/Spigot-Server-Patches/0284-Slime-Pathfinder-Events.patch
@@ -1,11 +1,11 @@
-From 8f91fc9b0d4f624020bef4488a0cd1d2d45c92bf Mon Sep 17 00:00:00 2001
+From aa7e8b35b0a7961ee837e1230a017f672a6a7ad7 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 24 Aug 2018 08:18:42 -0500
 Subject: [PATCH] Slime Pathfinder Events
 
 
 diff --git a/src/main/java/net/minecraft/server/EntitySlime.java b/src/main/java/net/minecraft/server/EntitySlime.java
-index 3ecf73219..2efc18df9 100644
+index 3ecf732192..2efc18df94 100644
 --- a/src/main/java/net/minecraft/server/EntitySlime.java
 +++ b/src/main/java/net/minecraft/server/EntitySlime.java
 @@ -3,6 +3,14 @@ package net.minecraft.server;
@@ -147,7 +147,7 @@ index 3ecf73219..2efc18df9 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
-index ce6ed6e89..6e9f1b66d 100644
+index ce6ed6e890..6e9f1b66df 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
 @@ -35,4 +35,14 @@ public class CraftSlime extends CraftMob implements Slime {
diff --git a/Spigot-Server-Patches/0284-Configurable-speed-for-water-flowing-over-lava.patch b/Spigot-Server-Patches/0285-Configurable-speed-for-water-flowing-over-lava.patch
similarity index 96%
rename from Spigot-Server-Patches/0284-Configurable-speed-for-water-flowing-over-lava.patch
rename to Spigot-Server-Patches/0285-Configurable-speed-for-water-flowing-over-lava.patch
index 9c9fc9ec07..d06b520e1b 100644
--- a/Spigot-Server-Patches/0284-Configurable-speed-for-water-flowing-over-lava.patch
+++ b/Spigot-Server-Patches/0285-Configurable-speed-for-water-flowing-over-lava.patch
@@ -1,11 +1,11 @@
-From e7f1401564669e09a5cc18a9fe4c286ee592e14f Mon Sep 17 00:00:00 2001
+From 1e3f4727b8362e1c3f223420ec5f8860c6ea50b0 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 8 Aug 2018 16:33:21 -0600
 Subject: [PATCH] Configurable speed for water flowing over lava
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 42d14fac2..50ac7afa3 100644
+index 42d14fac2c..50ac7afa36 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -397,4 +397,10 @@ public class PaperWorldConfig {
@@ -20,7 +20,7 @@ index 42d14fac2..50ac7afa3 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/BlockFluids.java b/src/main/java/net/minecraft/server/BlockFluids.java
-index f56e14e1e..6d351f097 100644
+index f56e14e1e2..6d351f0979 100644
 --- a/src/main/java/net/minecraft/server/BlockFluids.java
 +++ b/src/main/java/net/minecraft/server/BlockFluids.java
 @@ -70,11 +70,28 @@ public class BlockFluids extends Block implements IFluidSource {
diff --git a/Spigot-Server-Patches/0285-Optimize-RegistryMaterials.patch b/Spigot-Server-Patches/0286-Optimize-RegistryMaterials.patch
similarity index 93%
rename from Spigot-Server-Patches/0285-Optimize-RegistryMaterials.patch
rename to Spigot-Server-Patches/0286-Optimize-RegistryMaterials.patch
index bb2754a63c..3e1d69eec8 100644
--- a/Spigot-Server-Patches/0285-Optimize-RegistryMaterials.patch
+++ b/Spigot-Server-Patches/0286-Optimize-RegistryMaterials.patch
@@ -1,4 +1,4 @@
-From eded868d4f4ee0db989d4d4450005d72b7763e04 Mon Sep 17 00:00:00 2001
+From debafca18922cf529cf9ae83cd0eda966650b588 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 26 Aug 2018 20:49:50 -0400
 Subject: [PATCH] Optimize RegistryMaterials
@@ -8,7 +8,7 @@ Use larger initial sizes to increase bucket capacity on the BiMap
 BiMap.get was seen to be using a good bit of CPU time.
 
 diff --git a/src/main/java/net/minecraft/server/RegistryMaterials.java b/src/main/java/net/minecraft/server/RegistryMaterials.java
-index 2d6a7b3a4..8477febca 100644
+index 2d6a7b3a47..8477febca2 100644
 --- a/src/main/java/net/minecraft/server/RegistryMaterials.java
 +++ b/src/main/java/net/minecraft/server/RegistryMaterials.java
 @@ -16,8 +16,8 @@ import org.apache.logging.log4j.Logger;
diff --git a/Spigot-Server-Patches/0286-Add-PhantomPreSpawnEvent.patch b/Spigot-Server-Patches/0287-Add-PhantomPreSpawnEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0286-Add-PhantomPreSpawnEvent.patch
rename to Spigot-Server-Patches/0287-Add-PhantomPreSpawnEvent.patch
index 504cc20aae..2782fab654 100644
--- a/Spigot-Server-Patches/0286-Add-PhantomPreSpawnEvent.patch
+++ b/Spigot-Server-Patches/0287-Add-PhantomPreSpawnEvent.patch
@@ -1,11 +1,11 @@
-From 0accc6808ee27464e15f1c6ca176689553a1d9ed Mon Sep 17 00:00:00 2001
+From 7af3240895be8ef7f366b602c107a6d287e01f5b Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 25 Aug 2018 19:56:51 -0500
 Subject: [PATCH] Add PhantomPreSpawnEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java
-index b62a8227b..82323bf4a 100644
+index b62a8227b2..82323bf4ac 100644
 --- a/src/main/java/net/minecraft/server/EntityPhantom.java
 +++ b/src/main/java/net/minecraft/server/EntityPhantom.java
 @@ -130,6 +130,11 @@ public class EntityPhantom extends EntityFlying implements IMonster {
@@ -48,7 +48,7 @@ index b62a8227b..82323bf4a 100644
  
          private final PathfinderTargetCondition b;
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
-index add566ea4..f488c22ed 100644
+index add566ea4f..f488c22ed6 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
 @@ -52,8 +52,17 @@ public class MobSpawnerPhantom {
@@ -71,7 +71,7 @@ index add566ea4..f488c22ed 100644
                                                  groupdataentity = entityphantom.prepare(worldserver, difficultydamagescaler, EnumMobSpawn.NATURAL, groupdataentity, (NBTTagCompound) null);
                                                  worldserver.addEntity(entityphantom, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.NATURAL); // CraftBukkit
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
-index 9f9ee9239..2b9731369 100644
+index 9f9ee92390..2b97313694 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
 @@ -35,4 +35,10 @@ public class CraftPhantom extends CraftFlying implements Phantom {
diff --git a/Spigot-Server-Patches/0287-Add-More-Creeper-API.patch b/Spigot-Server-Patches/0288-Add-More-Creeper-API.patch
similarity index 94%
rename from Spigot-Server-Patches/0287-Add-More-Creeper-API.patch
rename to Spigot-Server-Patches/0288-Add-More-Creeper-API.patch
index 70dc1209a3..9f6b72ed53 100644
--- a/Spigot-Server-Patches/0287-Add-More-Creeper-API.patch
+++ b/Spigot-Server-Patches/0288-Add-More-Creeper-API.patch
@@ -1,11 +1,11 @@
-From 6136f3073915b4d39f24dd6b1011ddcec6b3f62e Mon Sep 17 00:00:00 2001
+From 0fae68c138d88aba80eede7fadafcc00e96418c6 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 24 Aug 2018 11:50:26 -0500
 Subject: [PATCH] Add More Creeper API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
-index 317c1998e..77ba92333 100644
+index 317c1998e6..77ba923338 100644
 --- a/src/main/java/net/minecraft/server/EntityCreeper.java
 +++ b/src/main/java/net/minecraft/server/EntityCreeper.java
 @@ -14,7 +14,7 @@ public class EntityCreeper extends EntityMonster {
@@ -38,7 +38,7 @@ index 317c1998e..77ba92333 100644
  
      public boolean canCauseHeadDrop() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
-index 896405148..075a5e77e 100644
+index 896405148c..075a5e77e2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
 @@ -88,4 +88,18 @@ public class CraftCreeper extends CraftMonster implements Creeper {
diff --git a/Spigot-Server-Patches/0288-Inventory-removeItemAnySlot.patch b/Spigot-Server-Patches/0289-Inventory-removeItemAnySlot.patch
similarity index 95%
rename from Spigot-Server-Patches/0288-Inventory-removeItemAnySlot.patch
rename to Spigot-Server-Patches/0289-Inventory-removeItemAnySlot.patch
index f04cad6682..b03604270c 100644
--- a/Spigot-Server-Patches/0288-Inventory-removeItemAnySlot.patch
+++ b/Spigot-Server-Patches/0289-Inventory-removeItemAnySlot.patch
@@ -1,11 +1,11 @@
-From 53cb4b440463a3cb369108ba4d984d493e0d9555 Mon Sep 17 00:00:00 2001
+From 080d7ba36c9d780a06c372d51518ffc4332ceb6a Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 28 Aug 2018 23:04:15 -0400
 Subject: [PATCH] Inventory#removeItemAnySlot
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
-index 0d637e207..026a0c399 100644
+index 0d637e207e..026a0c3995 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
 @@ -223,10 +223,16 @@ public class CraftInventory implements Inventory {
diff --git a/Spigot-Server-Patches/0289-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/Spigot-Server-Patches/0290-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
similarity index 91%
rename from Spigot-Server-Patches/0289-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
rename to Spigot-Server-Patches/0290-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
index ed25a5630c..c8d2028e58 100644
--- a/Spigot-Server-Patches/0289-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
+++ b/Spigot-Server-Patches/0290-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
@@ -1,4 +1,4 @@
-From d4a0697746dc9599de85ab742ef80b87c2bdc1fd Mon Sep 17 00:00:00 2001
+From 2c13d701a9622e0b5d380f32f396ec529d99f220 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sun, 2 Sep 2018 19:34:33 -0700
 Subject: [PATCH] Make CraftWorld#loadChunk(int, int, false) load unconverted
@@ -6,7 +6,7 @@ Subject: [PATCH] Make CraftWorld#loadChunk(int, int, false) load unconverted
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 7d8ec9450..8a0675037 100644
+index 7d8ec94508..8a0675037a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -500,7 +500,7 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0290-Add-ray-tracing-methods-to-LivingEntity.patch b/Spigot-Server-Patches/0291-Add-ray-tracing-methods-to-LivingEntity.patch
similarity index 96%
rename from Spigot-Server-Patches/0290-Add-ray-tracing-methods-to-LivingEntity.patch
rename to Spigot-Server-Patches/0291-Add-ray-tracing-methods-to-LivingEntity.patch
index d77b767248..5cc8bd0e84 100644
--- a/Spigot-Server-Patches/0290-Add-ray-tracing-methods-to-LivingEntity.patch
+++ b/Spigot-Server-Patches/0291-Add-ray-tracing-methods-to-LivingEntity.patch
@@ -1,11 +1,11 @@
-From dd4edd1e0805256c62289afad1ece9ce39021c30 Mon Sep 17 00:00:00 2001
+From 76516c54af150355907b2c8d2fc8dc8f547dc12c Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 3 Sep 2018 18:20:03 -0500
 Subject: [PATCH] Add ray tracing methods to LivingEntity
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 91b6d6878..1592a705f 100644
+index 91b6d68787..1592a705f6 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -3252,6 +3252,23 @@ public abstract class EntityLiving extends Entity {
@@ -33,7 +33,7 @@ index 91b6d6878..1592a705f 100644
  
      public int getShieldBlockingDelay() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 379239567..6f4c6c589 100644
+index 379239567e..6f4c6c5891 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -195,6 +195,28 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/Spigot-Server-Patches/0291-Expose-attack-cooldown-methods-for-Player.patch b/Spigot-Server-Patches/0292-Expose-attack-cooldown-methods-for-Player.patch
similarity index 93%
rename from Spigot-Server-Patches/0291-Expose-attack-cooldown-methods-for-Player.patch
rename to Spigot-Server-Patches/0292-Expose-attack-cooldown-methods-for-Player.patch
index 40973b54cb..faf8e7c0b9 100644
--- a/Spigot-Server-Patches/0291-Expose-attack-cooldown-methods-for-Player.patch
+++ b/Spigot-Server-Patches/0292-Expose-attack-cooldown-methods-for-Player.patch
@@ -1,11 +1,11 @@
-From 621287e4ba520e85816acbd76d953782e6135bda Mon Sep 17 00:00:00 2001
+From 9a867df63923dddcf51d50de57318d5e6e645658 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 4 Sep 2018 15:02:00 -0500
 Subject: [PATCH] Expose attack cooldown methods for Player
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 007934d8c..78e48f478 100644
+index 007934d8c5..78e48f478c 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -2115,14 +2115,17 @@ public abstract class EntityHuman extends EntityLiving {
@@ -27,7 +27,7 @@ index 007934d8c..78e48f478 100644
          this.aB = 0;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index ba4eb3726..609e274a3 100644
+index ba4eb3726a..609e274a31 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1911,6 +1911,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0292-Improve-death-events.patch b/Spigot-Server-Patches/0293-Improve-death-events.patch
similarity index 98%
rename from Spigot-Server-Patches/0292-Improve-death-events.patch
rename to Spigot-Server-Patches/0293-Improve-death-events.patch
index 5a1cf393e6..01ee697a32 100644
--- a/Spigot-Server-Patches/0292-Improve-death-events.patch
+++ b/Spigot-Server-Patches/0293-Improve-death-events.patch
@@ -1,4 +1,4 @@
-From ef392b83073887b09af57cfec07da022cc478055 Mon Sep 17 00:00:00 2001
+From 42d59f9bb438f96c8d004b2b58de53bc0609efee Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Tue, 21 Aug 2018 01:39:35 +0100
 Subject: [PATCH] Improve death events
@@ -15,7 +15,7 @@ items and experience which is otherwise only properly possible by using
 internal code.
 
 diff --git a/src/main/java/net/minecraft/server/CombatTracker.java b/src/main/java/net/minecraft/server/CombatTracker.java
-index 6daa400d2..38fe29f8a 100644
+index 6daa400d27..38fe29f8a2 100644
 --- a/src/main/java/net/minecraft/server/CombatTracker.java
 +++ b/src/main/java/net/minecraft/server/CombatTracker.java
 @@ -175,6 +175,7 @@ public class CombatTracker {
@@ -27,7 +27,7 @@ index 6daa400d2..38fe29f8a 100644
          int i = this.f ? 300 : 100;
  
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 75343a438..b03316bc8 100644
+index 75343a4386..b03316bc8c 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1503,6 +1503,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -47,7 +47,7 @@ index 75343a438..b03316bc8 100644
  
      protected void k(double d0, double d1, double d2) {
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index b51662ee9..e6032e3ed 100644
+index b51662ee99..e6032e3edc 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -706,7 +706,8 @@ public class EntityArmorStand extends EntityLiving {
@@ -61,7 +61,7 @@ index b51662ee9..e6032e3ed 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java
-index ac8eaffb9..7495af8e3 100644
+index ac8eaffb93..7495af8e3a 100644
 --- a/src/main/java/net/minecraft/server/EntityFox.java
 +++ b/src/main/java/net/minecraft/server/EntityFox.java
 @@ -571,15 +571,25 @@ public class EntityFox extends EntityAnimal {
@@ -94,7 +94,7 @@ index ac8eaffb9..7495af8e3 100644
  
      public static boolean a(EntityFox entityfox, EntityLiving entityliving) {
 diff --git a/src/main/java/net/minecraft/server/EntityHorseChestedAbstract.java b/src/main/java/net/minecraft/server/EntityHorseChestedAbstract.java
-index 80717ad9a..53aac5bcc 100644
+index 80717ad9ac..53aac5bccd 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseChestedAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseChestedAbstract.java
 @@ -55,11 +55,19 @@ public abstract class EntityHorseChestedAbstract extends EntityHorseAbstract {
@@ -119,7 +119,7 @@ index 80717ad9a..53aac5bcc 100644
      public void b(NBTTagCompound nbttagcompound) {
          super.b(nbttagcompound);
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 1592a705f..b59b39d41 100644
+index 1592a705f6..b59b39d418 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -89,7 +89,7 @@ public abstract class EntityLiving extends Entity {
@@ -279,7 +279,7 @@ index 1592a705f..b59b39d41 100644
          return this.isBaby() ? (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.5F : (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.0F;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 1e552b1a1..4c7692721 100644
+index 1e552b1a10..4c76927217 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -75,6 +75,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -330,7 +330,7 @@ index 1e552b1a1..4c7692721 100644
          }
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftSound.java b/src/main/java/org/bukkit/craftbukkit/CraftSound.java
-index 90fdf89c8..b761a41dc 100644
+index 90fdf89c81..b761a41dcd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftSound.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftSound.java
 @@ -821,6 +821,22 @@ public enum CraftSound {
@@ -357,7 +357,7 @@ index 90fdf89c8..b761a41dc 100644
          this.minecraftKey = minecraftKey;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 609e274a3..73a7cc7fd 100644
+index 609e274a31..73a7cc7fd3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1704,7 +1704,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -378,7 +378,7 @@ index 609e274a3..73a7cc7fd 100644
  
      public void injectScaledMaxHealth(Collection<AttributeInstance> collection, boolean force) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 844781f4e..4fb1092ce 100644
+index 844781f4ec..4fb1092ce6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -744,9 +744,16 @@ public class CraftEventFactory {
diff --git a/Spigot-Server-Patches/0293-Allow-chests-to-be-placed-with-NBT-data.patch b/Spigot-Server-Patches/0294-Allow-chests-to-be-placed-with-NBT-data.patch
similarity index 91%
rename from Spigot-Server-Patches/0293-Allow-chests-to-be-placed-with-NBT-data.patch
rename to Spigot-Server-Patches/0294-Allow-chests-to-be-placed-with-NBT-data.patch
index 6f453e493c..0c7fec650a 100644
--- a/Spigot-Server-Patches/0293-Allow-chests-to-be-placed-with-NBT-data.patch
+++ b/Spigot-Server-Patches/0294-Allow-chests-to-be-placed-with-NBT-data.patch
@@ -1,11 +1,11 @@
-From 1b80a8b0485c770ffc0e7a9a211d513b63d49755 Mon Sep 17 00:00:00 2001
+From aff8c157c1a042b2bf1de87c0397a79a2945b679 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 8 Sep 2018 18:43:31 -0500
 Subject: [PATCH] Allow chests to be placed with NBT data
 
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 33d9cac4d..d891e7b0e 100644
+index 33d9cac4de..d891e7b0ee 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -240,6 +240,7 @@ public final class ItemStack {
@@ -17,7 +17,7 @@ index 33d9cac4d..d891e7b0e 100644
                      for (BlockState blockstate : blocks) {
                          blockstate.update(true, false);
 diff --git a/src/main/java/net/minecraft/server/TileEntityChest.java b/src/main/java/net/minecraft/server/TileEntityChest.java
-index c4766f729..b22bd06e2 100644
+index c4766f729f..b22bd06e27 100644
 --- a/src/main/java/net/minecraft/server/TileEntityChest.java
 +++ b/src/main/java/net/minecraft/server/TileEntityChest.java
 @@ -292,7 +292,7 @@ public class TileEntityChest extends TileEntityLootable { // Paper - Remove ITic
diff --git a/Spigot-Server-Patches/0294-Mob-Pathfinding-API.patch b/Spigot-Server-Patches/0295-Mob-Pathfinding-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0294-Mob-Pathfinding-API.patch
rename to Spigot-Server-Patches/0295-Mob-Pathfinding-API.patch
index 78865b630f..86658911de 100644
--- a/Spigot-Server-Patches/0294-Mob-Pathfinding-API.patch
+++ b/Spigot-Server-Patches/0295-Mob-Pathfinding-API.patch
@@ -1,4 +1,4 @@
-From 584c67abf4dd71762380e31f5fc963983ada8d23 Mon Sep 17 00:00:00 2001
+From bd88e6a31468f5b2204f5b45f3330e91de3f68bb Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 9 Sep 2018 13:30:00 -0400
 Subject: [PATCH] Mob Pathfinding API
@@ -7,7 +7,7 @@ Implements Pathfinding API for mobs
 
 diff --git a/src/main/java/com/destroystokyo/paper/entity/PaperPathfinder.java b/src/main/java/com/destroystokyo/paper/entity/PaperPathfinder.java
 new file mode 100644
-index 000000000..f68a07cb9
+index 0000000000..f68a07cb96
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/entity/PaperPathfinder.java
 @@ -0,0 +1,111 @@
@@ -123,7 +123,7 @@ index 000000000..f68a07cb9
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
-index bdd092e49..f06764973 100644
+index bdd092e49d..f06764973f 100644
 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java
 +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
 @@ -80,7 +80,7 @@ public abstract class NavigationAbstract {
@@ -170,7 +170,7 @@ index bdd092e49..f06764973 100644
          this.c = null;
      }
 diff --git a/src/main/java/net/minecraft/server/PathEntity.java b/src/main/java/net/minecraft/server/PathEntity.java
-index 312352ef8..dcb4e2508 100644
+index 312352ef84..dcb4e25080 100644
 --- a/src/main/java/net/minecraft/server/PathEntity.java
 +++ b/src/main/java/net/minecraft/server/PathEntity.java
 @@ -5,13 +5,14 @@ import javax.annotation.Nullable;
@@ -210,7 +210,7 @@ index 312352ef8..dcb4e2508 100644
  
          return new Vec3D((double) pathpoint.a, (double) pathpoint.b, (double) pathpoint.c);
 diff --git a/src/main/java/net/minecraft/server/PathPoint.java b/src/main/java/net/minecraft/server/PathPoint.java
-index b1db95daa..18cdd2a6f 100644
+index b1db95daa9..18cdd2a6f2 100644
 --- a/src/main/java/net/minecraft/server/PathPoint.java
 +++ b/src/main/java/net/minecraft/server/PathPoint.java
 @@ -2,9 +2,9 @@ package net.minecraft.server;
@@ -227,7 +227,7 @@ index b1db95daa..18cdd2a6f 100644
      public int d = -1;
      public float e;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-index 5bf1cd06f..53c2d154e 100644
+index 5bf1cd06fa..53c2d154ed 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 @@ -12,8 +12,11 @@ import org.bukkit.loot.LootTable;
diff --git a/Spigot-Server-Patches/0295-Prevent-chunk-loading-from-Fluid-Flowing.patch b/Spigot-Server-Patches/0296-Prevent-chunk-loading-from-Fluid-Flowing.patch
similarity index 97%
rename from Spigot-Server-Patches/0295-Prevent-chunk-loading-from-Fluid-Flowing.patch
rename to Spigot-Server-Patches/0296-Prevent-chunk-loading-from-Fluid-Flowing.patch
index 94c764e03f..845bdc4df7 100644
--- a/Spigot-Server-Patches/0295-Prevent-chunk-loading-from-Fluid-Flowing.patch
+++ b/Spigot-Server-Patches/0296-Prevent-chunk-loading-from-Fluid-Flowing.patch
@@ -1,11 +1,11 @@
-From 0cc3822895653baa4edd64bb2c8ec634c9798d08 Mon Sep 17 00:00:00 2001
+From 1dd70b1f7c7a33dba19d72767a24ee778a4e83a6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 10 Sep 2018 23:36:16 -0400
 Subject: [PATCH] Prevent chunk loading from Fluid Flowing
 
 
 diff --git a/src/main/java/net/minecraft/server/FluidTypeFlowing.java b/src/main/java/net/minecraft/server/FluidTypeFlowing.java
-index 3099a5e65..376dca188 100644
+index 3099a5e654..376dca1889 100644
 --- a/src/main/java/net/minecraft/server/FluidTypeFlowing.java
 +++ b/src/main/java/net/minecraft/server/FluidTypeFlowing.java
 @@ -178,7 +178,8 @@ public abstract class FluidTypeFlowing extends FluidType {
diff --git a/Spigot-Server-Patches/0296-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/Spigot-Server-Patches/0297-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
similarity index 99%
rename from Spigot-Server-Patches/0296-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
rename to Spigot-Server-Patches/0297-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
index 9db1113035..a8d2a90872 100644
--- a/Spigot-Server-Patches/0296-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
+++ b/Spigot-Server-Patches/0297-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
@@ -1,11 +1,11 @@
-From 85fb0de6a6b21cb679f1b8bfe80731ba8e3703ca Mon Sep 17 00:00:00 2001
+From e566200e9046c62b1de472caf63ba8dbb00c0afe Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Wed, 12 Sep 2018 18:53:55 +0300
 Subject: [PATCH] Implement an API for CanPlaceOn and CanDestroy NBT values
 
 
 diff --git a/src/main/java/net/minecraft/server/ArgumentBlock.java b/src/main/java/net/minecraft/server/ArgumentBlock.java
-index 005ebec26..97d85f845 100644
+index 005ebec266..97d85f8451 100644
 --- a/src/main/java/net/minecraft/server/ArgumentBlock.java
 +++ b/src/main/java/net/minecraft/server/ArgumentBlock.java
 @@ -43,7 +43,7 @@ public class ArgumentBlock {
@@ -32,7 +32,7 @@ index 005ebec26..97d85f845 100644
          this.s = this::l;
          if (this.i.canRead() && this.i.peek() == '#') {
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 1eede4bcc..fb78d6cce 100644
+index 1eede4bcc6..fb78d6cce0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -87,6 +87,12 @@ import org.bukkit.persistence.PersistentDataContainer;
diff --git a/Spigot-Server-Patches/0297-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/Spigot-Server-Patches/0298-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
similarity index 97%
rename from Spigot-Server-Patches/0297-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
rename to Spigot-Server-Patches/0298-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
index abe2f01856..8745991484 100644
--- a/Spigot-Server-Patches/0297-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
+++ b/Spigot-Server-Patches/0298-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
@@ -1,11 +1,11 @@
-From 7a407b116a4f576b3b250ec6ba7533662750a21d Mon Sep 17 00:00:00 2001
+From dc43fec66678f87814f96a24ae1b8c9b835ca5f3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 10 Sep 2018 23:56:36 -0400
 Subject: [PATCH] Prevent Mob AI Rules from Loading Chunks
 
 
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java b/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java
-index bf8ca9b32..7ccb3d5c0 100644
+index bf8ca9b32a..7ccb3d5c06 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java
 @@ -12,11 +12,13 @@ public class PathfinderGoalRemoveBlock extends PathfinderGoalGotoTarget {
@@ -52,7 +52,7 @@ index bf8ca9b32..7ccb3d5c0 100644
          return ichunkaccess == null ? false : ichunkaccess.getType(blockposition).getBlock() == this.g && ichunkaccess.getType(blockposition.up()).isAir() && ichunkaccess.getType(blockposition.up(2)).isAir();
      }
 diff --git a/src/main/java/net/minecraft/server/RandomPositionGenerator.java b/src/main/java/net/minecraft/server/RandomPositionGenerator.java
-index d4cd50918..d6a3b9933 100644
+index d4cd50918b..d6a3b99339 100644
 --- a/src/main/java/net/minecraft/server/RandomPositionGenerator.java
 +++ b/src/main/java/net/minecraft/server/RandomPositionGenerator.java
 @@ -109,6 +109,7 @@ public class RandomPositionGenerator {
diff --git a/Spigot-Server-Patches/0298-Prevent-mob-spawning-from-loading-generating-chunks.patch b/Spigot-Server-Patches/0299-Prevent-mob-spawning-from-loading-generating-chunks.patch
similarity index 95%
rename from Spigot-Server-Patches/0298-Prevent-mob-spawning-from-loading-generating-chunks.patch
rename to Spigot-Server-Patches/0299-Prevent-mob-spawning-from-loading-generating-chunks.patch
index 47018b7c0f..63ac5f7d50 100644
--- a/Spigot-Server-Patches/0298-Prevent-mob-spawning-from-loading-generating-chunks.patch
+++ b/Spigot-Server-Patches/0299-Prevent-mob-spawning-from-loading-generating-chunks.patch
@@ -1,4 +1,4 @@
-From 6f40294ed937e0962a5962d8069684a2a24f6bdf Mon Sep 17 00:00:00 2001
+From 497bd15717816f6d4797c3b70d40c57eadb993ea Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 12 Sep 2018 21:12:57 -0400
 Subject: [PATCH] Prevent mob spawning from loading/generating chunks
@@ -6,7 +6,7 @@ Subject: [PATCH] Prevent mob spawning from loading/generating chunks
 also prevents if out of world border bounds
 
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index 224443e03..fdac5bb3a 100644
+index 224443e03c..fdac5bb3a2 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -25,9 +25,9 @@ public final class SpawnerCreature {
diff --git a/Spigot-Server-Patches/0299-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/Spigot-Server-Patches/0300-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 96%
rename from Spigot-Server-Patches/0299-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to Spigot-Server-Patches/0300-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
index 288b457a15..7930104393 100644
--- a/Spigot-Server-Patches/0299-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
+++ b/Spigot-Server-Patches/0300-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
@@ -1,4 +1,4 @@
-From aebda4e47815964a87d71d557e486a2f52ff8ba7 Mon Sep 17 00:00:00 2001
+From 044c369e0d9d3db2ae9609a960fd844de71f32d5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 12 Sep 2018 21:47:01 -0400
 Subject: [PATCH] Optimize Biome Mob Lookups for Mob Spawning
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize Biome Mob Lookups for Mob Spawning
 Uses an EnumMap as well as a Set paired List for O(1) contains calls.
 
 diff --git a/src/main/java/net/minecraft/server/BiomeBase.java b/src/main/java/net/minecraft/server/BiomeBase.java
-index 253890e53..0102a170d 100644
+index 253890e537..0102a170dc 100644
 --- a/src/main/java/net/minecraft/server/BiomeBase.java
 +++ b/src/main/java/net/minecraft/server/BiomeBase.java
 @@ -40,7 +40,7 @@ public abstract class BiomeBase {
diff --git a/Spigot-Server-Patches/0300-Implement-furnace-cook-speed-multiplier-API.patch b/Spigot-Server-Patches/0301-Implement-furnace-cook-speed-multiplier-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0300-Implement-furnace-cook-speed-multiplier-API.patch
rename to Spigot-Server-Patches/0301-Implement-furnace-cook-speed-multiplier-API.patch
index 78ffae43f4..582ff5ee5f 100644
--- a/Spigot-Server-Patches/0300-Implement-furnace-cook-speed-multiplier-API.patch
+++ b/Spigot-Server-Patches/0301-Implement-furnace-cook-speed-multiplier-API.patch
@@ -1,4 +1,4 @@
-From 850e794465a469751d8c18f03f08a470d0caeaaf Mon Sep 17 00:00:00 2001
+From d8cd15b5bb8b1ea68fdff1854117a00f835f3a7e Mon Sep 17 00:00:00 2001
 From: Tassu <git@tassu.me>
 Date: Thu, 13 Sep 2018 08:45:21 +0300
 Subject: [PATCH] Implement furnace cook speed multiplier API
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement furnace cook speed multiplier API
 Signed-off-by: Tassu <git@tassu.me>
 
 diff --git a/src/main/java/net/minecraft/server/TileEntityFurnace.java b/src/main/java/net/minecraft/server/TileEntityFurnace.java
-index 0419aea92..04849c3da 100644
+index 0419aea923..04849c3da6 100644
 --- a/src/main/java/net/minecraft/server/TileEntityFurnace.java
 +++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java
 @@ -8,6 +8,7 @@ import java.util.Map;
@@ -57,7 +57,7 @@ index 0419aea92..04849c3da 100644
                          this.cookTimeTotal = this.getRecipeCookingTime();
                          this.burn(irecipe);
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java b/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java
-index 9cc67915c..1ce10ea04 100644
+index 9cc67915ca..1ce10ea049 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java
 @@ -63,4 +63,18 @@ public class CraftFurnace<T extends TileEntityFurnace> extends CraftContainer<T>
diff --git a/Spigot-Server-Patches/0301-Support-Overriding-World-Seeds.patch b/Spigot-Server-Patches/0302-Support-Overriding-World-Seeds.patch
similarity index 96%
rename from Spigot-Server-Patches/0301-Support-Overriding-World-Seeds.patch
rename to Spigot-Server-Patches/0302-Support-Overriding-World-Seeds.patch
index 4b5dddbc33..b92b264b55 100644
--- a/Spigot-Server-Patches/0301-Support-Overriding-World-Seeds.patch
+++ b/Spigot-Server-Patches/0302-Support-Overriding-World-Seeds.patch
@@ -1,4 +1,4 @@
-From ad2d8db5351b84ed2078f553b337151701cd7f1a Mon Sep 17 00:00:00 2001
+From 19989dfb7d45e49f73acc4be9b0d809a4a95b719 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 17 Sep 2018 23:05:31 -0400
 Subject: [PATCH] Support Overriding World Seeds
@@ -15,7 +15,7 @@ This seed will end up being saved to the world data file, so it is
 a permanent change in that it won't go back if you remove it from paper.yml
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 214b577b3..559e6b42b 100644
+index 214b577b32..559e6b42ba 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -11,6 +11,7 @@ import java.lang.reflect.Modifier;
@@ -59,7 +59,7 @@ index 214b577b3..559e6b42b 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index dd2d8712e..7fd040409 100644
+index dd2d8712ed..7fd0404093 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -377,7 +377,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -72,7 +72,7 @@ index dd2d8712e..7fd040409 100644
  
              if (j == 0) {
 diff --git a/src/main/java/net/minecraft/server/WorldData.java b/src/main/java/net/minecraft/server/WorldData.java
-index 2d4691b7b..4e35846a3 100644
+index 2d4691b7b5..4e35846a3f 100644
 --- a/src/main/java/net/minecraft/server/WorldData.java
 +++ b/src/main/java/net/minecraft/server/WorldData.java
 @@ -116,7 +116,7 @@ public class WorldData {
@@ -85,7 +85,7 @@ index 2d4691b7b..4e35846a3 100644
              String s = nbttagcompound.getString("generatorName");
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8636283fd..1ca9a7724 100644
+index 8636283fd1..1ca9a7724a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -991,7 +991,7 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0302-Optimize-Server-World-Map.patch b/Spigot-Server-Patches/0303-Optimize-Server-World-Map.patch
similarity index 98%
rename from Spigot-Server-Patches/0302-Optimize-Server-World-Map.patch
rename to Spigot-Server-Patches/0303-Optimize-Server-World-Map.patch
index 6cea74eebb..4298f8046c 100644
--- a/Spigot-Server-Patches/0302-Optimize-Server-World-Map.patch
+++ b/Spigot-Server-Patches/0303-Optimize-Server-World-Map.patch
@@ -1,4 +1,4 @@
-From e7d49cef72f6b4ddb01388f114549d62d2b77f96 Mon Sep 17 00:00:00 2001
+From f654df6d267b4933ca2fd0ec65e504a5ec74be3a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 17 Sep 2018 23:37:31 -0400
 Subject: [PATCH] Optimize Server World Map
@@ -21,7 +21,7 @@ known NMS used methods, but we can add more if naughty plugins are found later.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldMap.java b/src/main/java/com/destroystokyo/paper/PaperWorldMap.java
 new file mode 100644
-index 000000000..6bb2f98b4
+index 0000000000..6bb2f98b45
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldMap.java
 @@ -0,0 +1,191 @@
@@ -217,7 +217,7 @@ index 000000000..6bb2f98b4
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 7fd040409..553014b79 100644
+index 7fd0404093..553014b79e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -88,7 +88,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
diff --git a/Spigot-Server-Patches/0303-PreSpawnerSpawnEvent.patch b/Spigot-Server-Patches/0304-PreSpawnerSpawnEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0303-PreSpawnerSpawnEvent.patch
rename to Spigot-Server-Patches/0304-PreSpawnerSpawnEvent.patch
index 5ea67cdd33..d5ffd7111a 100644
--- a/Spigot-Server-Patches/0303-PreSpawnerSpawnEvent.patch
+++ b/Spigot-Server-Patches/0304-PreSpawnerSpawnEvent.patch
@@ -1,4 +1,4 @@
-From c6f33ee6e264960037e6d684a68ba1a585515fc4 Mon Sep 17 00:00:00 2001
+From 16e2e158e194aba2f6db484c4ba3230dc5929ba4 Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Tue, 18 Sep 2018 23:53:23 +0100
 Subject: [PATCH] PreSpawnerSpawnEvent
@@ -9,7 +9,7 @@ SpawnerSpawnEvent gets called instead of the CreatureSpawnEvent for
 spawners.
 
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index fe8bc7f75..90ca1ee14 100644
+index fe8bc7f75d..90ca1ee141 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -111,11 +111,11 @@ public abstract class MobSpawnerAbstract {
diff --git a/Spigot-Server-Patches/0304-Catch-JsonParseException-in-Entity-and-TE-names.patch b/Spigot-Server-Patches/0305-Catch-JsonParseException-in-Entity-and-TE-names.patch
similarity index 95%
rename from Spigot-Server-Patches/0304-Catch-JsonParseException-in-Entity-and-TE-names.patch
rename to Spigot-Server-Patches/0305-Catch-JsonParseException-in-Entity-and-TE-names.patch
index fad267ca70..7b594961d8 100644
--- a/Spigot-Server-Patches/0304-Catch-JsonParseException-in-Entity-and-TE-names.patch
+++ b/Spigot-Server-Patches/0305-Catch-JsonParseException-in-Entity-and-TE-names.patch
@@ -1,4 +1,4 @@
-From 2ed32884d4ea2411a043f0726eae08d08a639377 Mon Sep 17 00:00:00 2001
+From 72e93bc7a90780864ce743797ea17219c931500c Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 22 Sep 2018 15:56:59 -0400
 Subject: [PATCH] Catch JsonParseException in Entity and TE names
@@ -13,7 +13,7 @@ Shulkers) may need to be changed in order for it to re-save properly
 No more crashing though.
 
 diff --git a/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java b/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java
-index e6bf34ab0..c447cf1ae 100644
+index e6bf34ab00..c447cf1aed 100644
 --- a/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java
 +++ b/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java
 @@ -59,7 +59,7 @@ public abstract class CommandBlockListenerAbstract implements ICommandListener {
@@ -26,7 +26,7 @@ index e6bf34ab0..c447cf1ae 100644
  
          if (nbttagcompound.hasKeyOfType("TrackOutput", 1)) {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index b03316bc8..5d31068d7 100644
+index b03316bc8c..5d31068d7d 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1679,7 +1679,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -39,7 +39,7 @@ index b03316bc8..5d31068d7 100644
  
                      this.setCustomNameVisible(nbttagcompound.getBoolean("CustomNameVisible"));
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
-index 670f8313a..d49e210a3 100644
+index 670f8313ae..d49e210a3c 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
 @@ -339,4 +339,19 @@ public final class MCUtil {
@@ -63,7 +63,7 @@ index 670f8313a..d49e210a3 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/TileEntityBanner.java b/src/main/java/net/minecraft/server/TileEntityBanner.java
-index 21a2415fb..7a911c5a5 100644
+index 21a2415fbe..7a911c5a5e 100644
 --- a/src/main/java/net/minecraft/server/TileEntityBanner.java
 +++ b/src/main/java/net/minecraft/server/TileEntityBanner.java
 @@ -59,7 +59,7 @@ public class TileEntityBanner extends TileEntity implements INamableTileEntity {
@@ -76,7 +76,7 @@ index 21a2415fb..7a911c5a5 100644
  
          if (this.hasWorld()) {
 diff --git a/src/main/java/net/minecraft/server/TileEntityContainer.java b/src/main/java/net/minecraft/server/TileEntityContainer.java
-index 473ec2cbd..ab6b86e4e 100644
+index 473ec2cbde..ab6b86e4e9 100644
 --- a/src/main/java/net/minecraft/server/TileEntityContainer.java
 +++ b/src/main/java/net/minecraft/server/TileEntityContainer.java
 @@ -17,7 +17,7 @@ public abstract class TileEntityContainer extends TileEntity implements IInvento
diff --git a/Spigot-Server-Patches/0305-Avoid-dimension-id-collisions.patch b/Spigot-Server-Patches/0306-Avoid-dimension-id-collisions.patch
similarity index 91%
rename from Spigot-Server-Patches/0305-Avoid-dimension-id-collisions.patch
rename to Spigot-Server-Patches/0306-Avoid-dimension-id-collisions.patch
index ed97c5c879..a3aed473de 100644
--- a/Spigot-Server-Patches/0305-Avoid-dimension-id-collisions.patch
+++ b/Spigot-Server-Patches/0306-Avoid-dimension-id-collisions.patch
@@ -1,4 +1,4 @@
-From 70c826696730642c3602faf0056ab265ed2f90cc Mon Sep 17 00:00:00 2001
+From ea77ed836455767035fdc6124e904b3e453a68c6 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Tue, 25 Sep 2018 06:53:43 +0200
 Subject: [PATCH] Avoid dimension id collisions
@@ -8,7 +8,7 @@ we would reuse an existing dimension id, if some other dimension was
 unloaded before.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 1ca9a7724..e1c9a9e12 100644
+index 1ca9a7724a..e1c9a9e120 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -977,7 +977,7 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0306-Honor-EntityAgeable.ageLock.patch b/Spigot-Server-Patches/0307-Honor-EntityAgeable.ageLock.patch
similarity index 86%
rename from Spigot-Server-Patches/0306-Honor-EntityAgeable.ageLock.patch
rename to Spigot-Server-Patches/0307-Honor-EntityAgeable.ageLock.patch
index e79f62a57d..e0da7ef03d 100644
--- a/Spigot-Server-Patches/0306-Honor-EntityAgeable.ageLock.patch
+++ b/Spigot-Server-Patches/0307-Honor-EntityAgeable.ageLock.patch
@@ -1,11 +1,11 @@
-From f7aa983753ae8dc280c47b436a3ce629d07604f1 Mon Sep 17 00:00:00 2001
+From fe543262b07590e5cf598bb1a866da01910de44f Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 23 Sep 2018 20:59:53 -0500
 Subject: [PATCH] Honor EntityAgeable.ageLock
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityAgeable.java b/src/main/java/net/minecraft/server/EntityAgeable.java
-index cec938436..3d27f0964 100644
+index cec938436d..3d27f0964a 100644
 --- a/src/main/java/net/minecraft/server/EntityAgeable.java
 +++ b/src/main/java/net/minecraft/server/EntityAgeable.java
 @@ -101,6 +101,7 @@ public abstract class EntityAgeable extends EntityCreature {
diff --git a/Spigot-Server-Patches/0307-Configurable-connection-throttle-kick-message.patch b/Spigot-Server-Patches/0308-Configurable-connection-throttle-kick-message.patch
similarity index 94%
rename from Spigot-Server-Patches/0307-Configurable-connection-throttle-kick-message.patch
rename to Spigot-Server-Patches/0308-Configurable-connection-throttle-kick-message.patch
index 3484682806..e1ea92fef5 100644
--- a/Spigot-Server-Patches/0307-Configurable-connection-throttle-kick-message.patch
+++ b/Spigot-Server-Patches/0308-Configurable-connection-throttle-kick-message.patch
@@ -1,11 +1,11 @@
-From c49c8a13f7456b3b157160c4b8efbfe141c11fc0 Mon Sep 17 00:00:00 2001
+From 5ed2b57345317a42de525cee8a0ed8c2c5a90d96 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Tue, 2 Oct 2018 09:57:50 +0100
 Subject: [PATCH] Configurable connection throttle kick message
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 559e6b42b..092bff78a 100644
+index 559e6b42ba..092bff78ab 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -274,6 +274,11 @@ public class PaperConfig {
@@ -21,7 +21,7 @@ index 559e6b42b..092bff78a 100644
      private static void savePlayerData() {
          savePlayerData = getBoolean("settings.save-player-data", savePlayerData);
 diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
-index 8928d93e4..0532f975b 100644
+index 8928d93e49..0532f975b7 100644
 --- a/src/main/java/net/minecraft/server/HandshakeListener.java
 +++ b/src/main/java/net/minecraft/server/HandshakeListener.java
 @@ -38,7 +38,7 @@ public class HandshakeListener implements PacketHandshakingInListener {
diff --git a/Spigot-Server-Patches/0308-Hook-into-CB-plugin-rewrites.patch b/Spigot-Server-Patches/0309-Hook-into-CB-plugin-rewrites.patch
similarity index 98%
rename from Spigot-Server-Patches/0308-Hook-into-CB-plugin-rewrites.patch
rename to Spigot-Server-Patches/0309-Hook-into-CB-plugin-rewrites.patch
index 1fb67a3805..9dd96951b2 100644
--- a/Spigot-Server-Patches/0308-Hook-into-CB-plugin-rewrites.patch
+++ b/Spigot-Server-Patches/0309-Hook-into-CB-plugin-rewrites.patch
@@ -1,4 +1,4 @@
-From 0fa9ae56f2a4b9832143a7e78918ec2711089b51 Mon Sep 17 00:00:00 2001
+From 9aede8db3a0bd41702a24be33af9cf07be1c3aa8 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Wed, 3 Oct 2018 20:09:18 -0400
 Subject: [PATCH] Hook into CB plugin rewrites
@@ -8,7 +8,7 @@ our own relocation. Also lets us rewrite NMS calls for when we're
 debugging in an IDE pre-relocate.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
-index 467b2d938..61f102355 100644
+index 467b2d9385..61f1023557 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
 @@ -6,7 +6,9 @@ import java.io.FileOutputStream;
diff --git a/Spigot-Server-Patches/0309-Allow-setting-the-vex-s-summoner.patch b/Spigot-Server-Patches/0310-Allow-setting-the-vex-s-summoner.patch
similarity index 90%
rename from Spigot-Server-Patches/0309-Allow-setting-the-vex-s-summoner.patch
rename to Spigot-Server-Patches/0310-Allow-setting-the-vex-s-summoner.patch
index bd704d682f..737912d325 100644
--- a/Spigot-Server-Patches/0309-Allow-setting-the-vex-s-summoner.patch
+++ b/Spigot-Server-Patches/0310-Allow-setting-the-vex-s-summoner.patch
@@ -1,11 +1,11 @@
-From 923efac08294fb6fa32dd7b4d7a6165c444dcd91 Mon Sep 17 00:00:00 2001
+From 2876e7f04dead535408f8fdfec37682cf22279e6 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 6 Oct 2018 21:47:44 -0500
 Subject: [PATCH] Allow setting the vex's summoner
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityVex.java b/src/main/java/net/minecraft/server/EntityVex.java
-index a46730460..cf274666c 100644
+index a46730460e..cf274666c7 100644
 --- a/src/main/java/net/minecraft/server/EntityVex.java
 +++ b/src/main/java/net/minecraft/server/EntityVex.java
 @@ -133,6 +133,7 @@ public class EntityVex extends EntityMonster {
@@ -17,7 +17,7 @@ index a46730460..cf274666c 100644
          this.c = entityinsentient;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
-index 169c951ec..2f7df3074 100644
+index 169c951ec3..2f7df3074f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
 @@ -23,6 +23,10 @@ public class CraftVex extends CraftMonster implements Vex {
diff --git a/Spigot-Server-Patches/0310-Add-sun-related-API.patch b/Spigot-Server-Patches/0311-Add-sun-related-API.patch
similarity index 89%
rename from Spigot-Server-Patches/0310-Add-sun-related-API.patch
rename to Spigot-Server-Patches/0311-Add-sun-related-API.patch
index 62645fa0e8..ee4fbd886b 100644
--- a/Spigot-Server-Patches/0310-Add-sun-related-API.patch
+++ b/Spigot-Server-Patches/0311-Add-sun-related-API.patch
@@ -1,11 +1,11 @@
-From 385c1916cb44cea61c817fedaed56efda2fc0064 Mon Sep 17 00:00:00 2001
+From 7fb5d1f255437c8bdee1549abcac6cbafc4b3b59 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 Oct 2018 00:54:21 -0500
 Subject: [PATCH] Add sun related API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index eadac07f6..cbaed08f5 100644
+index eadac07f69..cbaed08f52 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -1334,6 +1334,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -17,10 +17,10 @@ index eadac07f6..cbaed08f5 100644
          if (this.world.J() && !this.world.isClientSide) {
              float f = this.aI();
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 5e6a4e20b..08b6ae252 100644
+index 39e85f80ca..75c539d72d 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -631,6 +631,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -636,6 +636,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
          }
      }
  
@@ -29,7 +29,7 @@ index 5e6a4e20b..08b6ae252 100644
          return this.worldProvider.getDimensionManager().getType() == DimensionManager.OVERWORLD && this.c < 4; // CraftBukkit
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 8a0675037..aec657952 100644
+index 8a0675037a..aec657952c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -855,6 +855,13 @@ public class CraftWorld implements World {
@@ -47,7 +47,7 @@ index 8a0675037..aec657952 100644
      public boolean createExplosion(double x, double y, double z, float power) {
          return createExplosion(x, y, z, power, false, true);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-index 53c2d154e..56c233872 100644
+index 53c2d154ed..56c233872b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 @@ -68,4 +68,11 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob {
diff --git a/Spigot-Server-Patches/0311-Check-Drowned-for-Villager-Aggression-Config.patch b/Spigot-Server-Patches/0312-Check-Drowned-for-Villager-Aggression-Config.patch
similarity index 93%
rename from Spigot-Server-Patches/0311-Check-Drowned-for-Villager-Aggression-Config.patch
rename to Spigot-Server-Patches/0312-Check-Drowned-for-Villager-Aggression-Config.patch
index 5f6565c99d..658ada50b5 100644
--- a/Spigot-Server-Patches/0311-Check-Drowned-for-Villager-Aggression-Config.patch
+++ b/Spigot-Server-Patches/0312-Check-Drowned-for-Villager-Aggression-Config.patch
@@ -1,11 +1,11 @@
-From 072b7b87fcff080669bf7a70369b96f0a3d4e7d2 Mon Sep 17 00:00:00 2001
+From 681b356b181ae069b9ff7cddf6e8cc5b90d000a6 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Wed, 10 Oct 2018 21:22:44 -0500
 Subject: [PATCH] Check Drowned for Villager Aggression Config
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityDrowned.java b/src/main/java/net/minecraft/server/EntityDrowned.java
-index 255b3d0cd..3a1928b22 100644
+index 255b3d0cde..3a1928b221 100644
 --- a/src/main/java/net/minecraft/server/EntityDrowned.java
 +++ b/src/main/java/net/minecraft/server/EntityDrowned.java
 @@ -29,7 +29,7 @@ public class EntityDrowned extends EntityZombie implements IRangedEntity {
diff --git a/Spigot-Server-Patches/0312-Here-s-Johnny.patch b/Spigot-Server-Patches/0313-Here-s-Johnny.patch
similarity index 92%
rename from Spigot-Server-Patches/0312-Here-s-Johnny.patch
rename to Spigot-Server-Patches/0313-Here-s-Johnny.patch
index a8fd53fc30..7232ee5ed6 100644
--- a/Spigot-Server-Patches/0312-Here-s-Johnny.patch
+++ b/Spigot-Server-Patches/0313-Here-s-Johnny.patch
@@ -1,11 +1,11 @@
-From 120ae735500a4aa764a0b92d1dfd49bbff2e7df8 Mon Sep 17 00:00:00 2001
+From bd1c0daed361b07b62aa2a6893a940bc0784c38a Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 12 Oct 2018 01:37:22 -0500
 Subject: [PATCH] Here's Johnny!
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityVindicator.java b/src/main/java/net/minecraft/server/EntityVindicator.java
-index 73ecdd22e..c974c02e9 100644
+index 73ecdd22ea..c974c02e92 100644
 --- a/src/main/java/net/minecraft/server/EntityVindicator.java
 +++ b/src/main/java/net/minecraft/server/EntityVindicator.java
 @@ -11,7 +11,7 @@ public class EntityVindicator extends EntityIllagerAbstract {
@@ -18,7 +18,7 @@ index 73ecdd22e..c974c02e9 100644
      public EntityVindicator(EntityTypes<? extends EntityVindicator> entitytypes, World world) {
          super(entitytypes, world);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java
-index 951d47929..5ff957ced 100644
+index 951d479298..5ff957ced7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java
 @@ -25,4 +25,14 @@ public class CraftVindicator extends CraftIllager implements Vindicator {
diff --git a/Spigot-Server-Patches/0313-Turtle-API.patch b/Spigot-Server-Patches/0314-Turtle-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0313-Turtle-API.patch
rename to Spigot-Server-Patches/0314-Turtle-API.patch
index bf8335a4db..2edfbc12f9 100644
--- a/Spigot-Server-Patches/0313-Turtle-API.patch
+++ b/Spigot-Server-Patches/0314-Turtle-API.patch
@@ -1,11 +1,11 @@
-From 25f1b06d245fdea0f550ecd6fd010f862046fcad Mon Sep 17 00:00:00 2001
+From 1e24a3a152b551daf1d36c38396162c2298e5190 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 29 Sep 2018 16:08:23 -0500
 Subject: [PATCH] Turtle API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java
-index 76296119a..dd02cb348 100644
+index 76296119a1..dd02cb3485 100644
 --- a/src/main/java/net/minecraft/server/EntityTurtle.java
 +++ b/src/main/java/net/minecraft/server/EntityTurtle.java
 @@ -27,51 +27,63 @@ public class EntityTurtle extends EntityAnimal {
@@ -103,7 +103,7 @@ index 76296119a..dd02cb348 100644
  
          @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java
-index 123a2c75c..8edcf7af6 100644
+index 123a2c75ca..8edcf7af65 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java
 @@ -1,6 +1,8 @@
diff --git a/Spigot-Server-Patches/0314-Limit-lightning-strike-effect-distance.patch b/Spigot-Server-Patches/0315-Limit-lightning-strike-effect-distance.patch
similarity index 96%
rename from Spigot-Server-Patches/0314-Limit-lightning-strike-effect-distance.patch
rename to Spigot-Server-Patches/0315-Limit-lightning-strike-effect-distance.patch
index dc31aba767..296146f144 100644
--- a/Spigot-Server-Patches/0314-Limit-lightning-strike-effect-distance.patch
+++ b/Spigot-Server-Patches/0315-Limit-lightning-strike-effect-distance.patch
@@ -1,11 +1,11 @@
-From b61262b1d7a4a8d8e63c8e0546d8d9ecd6279b3a Mon Sep 17 00:00:00 2001
+From c430c8018281f7ebbfab4a4d44b8a1a5808987f5 Mon Sep 17 00:00:00 2001
 From: Trigary <trigary0@gmail.com>
 Date: Fri, 14 Sep 2018 17:42:08 +0200
 Subject: [PATCH] Limit lightning strike effect distance
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 50ac7afa3..7dda0803c 100644
+index 50ac7afa36..7dda0803c4 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -240,6 +240,28 @@ public class PaperWorldConfig {
@@ -38,7 +38,7 @@ index 50ac7afa3..7dda0803c 100644
      private void fixedInhabitedTime() {
          if (PaperConfig.version < 16) {
 diff --git a/src/main/java/net/minecraft/server/EntityLightning.java b/src/main/java/net/minecraft/server/EntityLightning.java
-index 7c518983a..bdb534deb 100644
+index 7c518983a9..bdb534deb4 100644
 --- a/src/main/java/net/minecraft/server/EntityLightning.java
 +++ b/src/main/java/net/minecraft/server/EntityLightning.java
 @@ -64,6 +64,17 @@ public class EntityLightning extends Entity {
@@ -69,7 +69,7 @@ index 7c518983a..bdb534deb 100644
  
          --this.lifeTicks;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index a0c714129..ecfcecfdc 100644
+index a0c7141294..ecfcecfdc2 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1250,7 +1250,7 @@ public class WorldServer extends World {
diff --git a/Spigot-Server-Patches/0315-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/Spigot-Server-Patches/0316-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
similarity index 94%
rename from Spigot-Server-Patches/0315-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
rename to Spigot-Server-Patches/0316-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
index 1545bee331..2b22f699c8 100644
--- a/Spigot-Server-Patches/0315-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
+++ b/Spigot-Server-Patches/0316-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
@@ -1,4 +1,4 @@
-From b7877cb9c6075cd50b9289eaee125a5253959919 Mon Sep 17 00:00:00 2001
+From f4d74e3ab68297624b084772807e36ab921e0446 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 17 Oct 2018 19:17:27 -0400
 Subject: [PATCH] MC-50319: Check other worlds for shooter of projectiles
@@ -11,7 +11,7 @@ If the projectile fails to find the shooter in the current world, check
 other worlds.
 
 diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java
-index 9eed1dce3..6c091b680 100644
+index 9eed1dce3e..6c091b6808 100644
 --- a/src/main/java/net/minecraft/server/EntityProjectile.java
 +++ b/src/main/java/net/minecraft/server/EntityProjectile.java
 @@ -209,6 +209,16 @@ public abstract class EntityProjectile extends Entity implements IProjectile {
diff --git a/Spigot-Server-Patches/0316-Call-player-spectator-target-events.patch b/Spigot-Server-Patches/0317-Call-player-spectator-target-events.patch
similarity index 97%
rename from Spigot-Server-Patches/0316-Call-player-spectator-target-events.patch
rename to Spigot-Server-Patches/0317-Call-player-spectator-target-events.patch
index ed5527b74d..e49abf577e 100644
--- a/Spigot-Server-Patches/0316-Call-player-spectator-target-events.patch
+++ b/Spigot-Server-Patches/0317-Call-player-spectator-target-events.patch
@@ -1,11 +1,11 @@
-From 8cf6495cc26f6715296f7fd24c49fb1debd68b11 Mon Sep 17 00:00:00 2001
+From 42375f7bc96fefb507c63cdd141bce77be6b3226 Mon Sep 17 00:00:00 2001
 From: Caleb Bassham <caleb.bassham@gmail.com>
 Date: Fri, 28 Sep 2018 02:32:19 -0500
 Subject: [PATCH] Call player spectator target events
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 4c7692721..d32d6d40a 100644
+index 4c76927217..d32d6d40ad 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -60,7 +60,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0317-Add-Velocity-IP-Forwarding-Support.patch b/Spigot-Server-Patches/0318-Add-Velocity-IP-Forwarding-Support.patch
similarity index 97%
rename from Spigot-Server-Patches/0317-Add-Velocity-IP-Forwarding-Support.patch
rename to Spigot-Server-Patches/0318-Add-Velocity-IP-Forwarding-Support.patch
index b086703a11..3fcf563da3 100644
--- a/Spigot-Server-Patches/0317-Add-Velocity-IP-Forwarding-Support.patch
+++ b/Spigot-Server-Patches/0318-Add-Velocity-IP-Forwarding-Support.patch
@@ -1,4 +1,4 @@
-From e72f06db36a229d2c0bc532bae74f722fac0a233 Mon Sep 17 00:00:00 2001
+From eacd5eea80e890842c0c5505cf23eadf6fedb4ca Mon Sep 17 00:00:00 2001
 From: Andrew Steinborn <git@steinborn.me>
 Date: Mon, 8 Oct 2018 14:36:14 -0400
 Subject: [PATCH] Add Velocity IP Forwarding Support
@@ -14,7 +14,7 @@ forwarding, and is integrated into the Minecraft login process by using the 1.13
 login plugin message packet.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 092bff78a..7e85a0224 100644
+index 092bff78ab..7e85a02242 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -8,6 +8,7 @@ import java.io.IOException;
@@ -55,7 +55,7 @@ index 092bff78a..7e85a0224 100644
  }
 diff --git a/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java b/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java
 new file mode 100644
-index 000000000..fdd8708f9
+index 0000000000..fdd8708f97
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java
 @@ -0,0 +1,67 @@
@@ -127,7 +127,7 @@ index 000000000..fdd8708f9
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index a985ae7ba..c3d57461d 100644
+index a985ae7ba0..c3d57461df 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -42,6 +42,7 @@ public class LoginListener implements PacketLoginInListener {
@@ -203,7 +203,7 @@ index a985ae7ba..c3d57461d 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 08e314af7..046196d54 100644
+index 08e314af7c..046196d54d 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -44,7 +44,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -216,7 +216,7 @@ index 08e314af7..046196d54 100644
      public java.util.UUID spoofedUUID;
      public com.mojang.authlib.properties.Property[] spoofedProfile;
 diff --git a/src/main/java/net/minecraft/server/PacketDataSerializer.java b/src/main/java/net/minecraft/server/PacketDataSerializer.java
-index 93ae6dcd7..fb9186b3f 100644
+index 93ae6dcd78..fb9186b3f5 100644
 --- a/src/main/java/net/minecraft/server/PacketDataSerializer.java
 +++ b/src/main/java/net/minecraft/server/PacketDataSerializer.java
 @@ -140,6 +140,7 @@ public class PacketDataSerializer extends ByteBuf {
@@ -244,7 +244,7 @@ index 93ae6dcd7..fb9186b3f 100644
          int j = this.i();
  
 diff --git a/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java b/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java
-index 4d1f44139..c1ca6f950 100644
+index 4d1f441395..c1ca6f9501 100644
 --- a/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java
 +++ b/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java
 @@ -4,8 +4,8 @@ import java.io.IOException;
@@ -259,7 +259,7 @@ index 4d1f44139..c1ca6f950 100644
      public PacketLoginInCustomPayload() {}
  
 diff --git a/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java b/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java
-index ae74dc9e1..7eb230f1b 100644
+index ae74dc9e18..7eb230f1b2 100644
 --- a/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java
 +++ b/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java
 @@ -10,6 +10,14 @@ public class PacketLoginOutCustomPayload implements Packet<PacketLoginOutListene
@@ -278,7 +278,7 @@ index ae74dc9e1..7eb230f1b 100644
      public void a(PacketDataSerializer packetdataserializer) throws IOException {
          this.a = packetdataserializer.i();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e1c9a9e12..7e810e008 100644
+index e1c9a9e120..7e810e0086 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -645,7 +645,7 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0318-Add-more-Witch-API.patch b/Spigot-Server-Patches/0319-Add-more-Witch-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0318-Add-more-Witch-API.patch
rename to Spigot-Server-Patches/0319-Add-more-Witch-API.patch
index 4908aef89a..aab1669520 100644
--- a/Spigot-Server-Patches/0318-Add-more-Witch-API.patch
+++ b/Spigot-Server-Patches/0319-Add-more-Witch-API.patch
@@ -1,11 +1,11 @@
-From e3a7eb28cb3cc34ebd41c56cd3a013c343011ba6 Mon Sep 17 00:00:00 2001
+From 74f85feeff13eb38ee58b8d50dd5d97cf229eb37 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 12 Oct 2018 14:10:46 -0500
 Subject: [PATCH] Add more Witch API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java
-index be6ecfb08..7b6b1ad17 100644
+index be6ecfb08a..7b6b1ad17b 100644
 --- a/src/main/java/net/minecraft/server/EntityWitch.java
 +++ b/src/main/java/net/minecraft/server/EntityWitch.java
 @@ -1,5 +1,11 @@
@@ -97,7 +97,7 @@ index be6ecfb08..7b6b1ad17 100644
      public SoundEffect eq() {
          return SoundEffects.ENTITY_WITCH_CELEBRATE;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
-index bae107e76..b43a2bbd5 100644
+index bae107e76e..b43a2bbd5b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
 @@ -1,12 +1,18 @@
diff --git a/Spigot-Server-Patches/0319-Fix-MC-93764.patch b/Spigot-Server-Patches/0320-Fix-MC-93764.patch
similarity index 86%
rename from Spigot-Server-Patches/0319-Fix-MC-93764.patch
rename to Spigot-Server-Patches/0320-Fix-MC-93764.patch
index f76b22c2af..da3c231637 100644
--- a/Spigot-Server-Patches/0319-Fix-MC-93764.patch
+++ b/Spigot-Server-Patches/0320-Fix-MC-93764.patch
@@ -1,11 +1,11 @@
-From d8db018c4246c147e10b2789a37a93ccad625e0c Mon Sep 17 00:00:00 2001
+From 3ef9521e440fa0392eb13b2e3d070b7bcc210639 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 19 Oct 2018 19:38:45 -0500
 Subject: [PATCH] Fix MC-93764
 
 
 diff --git a/src/main/java/net/minecraft/server/WorldProviderTheEnd.java b/src/main/java/net/minecraft/server/WorldProviderTheEnd.java
-index 9d4fcf8bc..4b9760709 100644
+index 9d4fcf8bcf..4b9760709d 100644
 --- a/src/main/java/net/minecraft/server/WorldProviderTheEnd.java
 +++ b/src/main/java/net/minecraft/server/WorldProviderTheEnd.java
 @@ -27,7 +27,7 @@ public class WorldProviderTheEnd extends WorldProvider {
diff --git a/Spigot-Server-Patches/0320-Add-option-to-prevent-players-from-moving-into-unloa.patch b/Spigot-Server-Patches/0321-Add-option-to-prevent-players-from-moving-into-unloa.patch
similarity index 96%
rename from Spigot-Server-Patches/0320-Add-option-to-prevent-players-from-moving-into-unloa.patch
rename to Spigot-Server-Patches/0321-Add-option-to-prevent-players-from-moving-into-unloa.patch
index 59778b8cbf..dc4db94778 100644
--- a/Spigot-Server-Patches/0320-Add-option-to-prevent-players-from-moving-into-unloa.patch
+++ b/Spigot-Server-Patches/0321-Add-option-to-prevent-players-from-moving-into-unloa.patch
@@ -1,4 +1,4 @@
-From 3377e609d184a9aa40e18e32cbc9f87657a01dc7 Mon Sep 17 00:00:00 2001
+From fa52d846a4cf65b435f06e72fb0da2bc057a6d7d Mon Sep 17 00:00:00 2001
 From: Gabriele C <sgdc3.mail@gmail.com>
 Date: Mon, 22 Oct 2018 17:34:10 +0200
 Subject: [PATCH] Add option to prevent players from moving into unloaded
@@ -6,7 +6,7 @@ Subject: [PATCH] Add option to prevent players from moving into unloaded
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 7dda0803c..dd5e263d7 100644
+index 7dda0803c4..dd5e263d71 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -425,4 +425,9 @@ public class PaperWorldConfig {
@@ -20,7 +20,7 @@ index 7dda0803c..dd5e263d7 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 77c375f71..ccad0a601 100644
+index 77c375f71b..ccad0a601c 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -351,6 +351,13 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0321-Reset-players-airTicks-on-respawn.patch b/Spigot-Server-Patches/0322-Reset-players-airTicks-on-respawn.patch
similarity index 89%
rename from Spigot-Server-Patches/0321-Reset-players-airTicks-on-respawn.patch
rename to Spigot-Server-Patches/0322-Reset-players-airTicks-on-respawn.patch
index 0417291a81..7cbb6eaacf 100644
--- a/Spigot-Server-Patches/0321-Reset-players-airTicks-on-respawn.patch
+++ b/Spigot-Server-Patches/0322-Reset-players-airTicks-on-respawn.patch
@@ -1,11 +1,11 @@
-From 7c1513e669c5fad4b1a3c3e799b3447c28c2683b Mon Sep 17 00:00:00 2001
+From a41776a605355949df30008014d529646343675c Mon Sep 17 00:00:00 2001
 From: GreenMeanie <GreenMeanieMC@gmail.com>
 Date: Sat, 20 Oct 2018 22:34:02 -0400
 Subject: [PATCH] Reset players airTicks on respawn
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 5d31068d7..365984bb8 100644
+index 5d31068d7d..365984bb8b 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2326,6 +2326,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -17,7 +17,7 @@ index 5d31068d7..365984bb8 100644
          return 300;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index de11e1249..8eb20424f 100644
+index d32d6d40ad..c90ae53a65 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1831,6 +1831,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0322-Strip-private-area-unicode-characters-from-signs.patch b/Spigot-Server-Patches/0323-Strip-private-area-unicode-characters-from-signs.patch
similarity index 97%
rename from Spigot-Server-Patches/0322-Strip-private-area-unicode-characters-from-signs.patch
rename to Spigot-Server-Patches/0323-Strip-private-area-unicode-characters-from-signs.patch
index 2b060720ec..3609efd616 100644
--- a/Spigot-Server-Patches/0322-Strip-private-area-unicode-characters-from-signs.patch
+++ b/Spigot-Server-Patches/0323-Strip-private-area-unicode-characters-from-signs.patch
@@ -1,4 +1,4 @@
-From c69b65368cddc674f019eb4cb7c37a31173a259c Mon Sep 17 00:00:00 2001
+From 80b6c40c0cc5c605e988627f7c905163558c828f Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Tue, 23 Oct 2018 20:53:43 -0400
 Subject: [PATCH] Strip private area unicode characters from signs
@@ -20,7 +20,7 @@ think of no reason to use it.
 Fixes GH-1571
 
 diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
-index 03f6ddf00..4c2273497 100644
+index 03f6ddf000..4c2273497b 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySign.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySign.java
 @@ -11,6 +11,11 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
diff --git a/Spigot-Server-Patches/0323-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/Spigot-Server-Patches/0324-Don-t-sleep-after-profile-lookups-if-not-needed.patch
similarity index 94%
rename from Spigot-Server-Patches/0323-Don-t-sleep-after-profile-lookups-if-not-needed.patch
rename to Spigot-Server-Patches/0324-Don-t-sleep-after-profile-lookups-if-not-needed.patch
index ede5eebca7..10438fab04 100644
--- a/Spigot-Server-Patches/0323-Don-t-sleep-after-profile-lookups-if-not-needed.patch
+++ b/Spigot-Server-Patches/0324-Don-t-sleep-after-profile-lookups-if-not-needed.patch
@@ -1,4 +1,4 @@
-From 35172f3f87fc921d282df772400ec414c5c27eff Mon Sep 17 00:00:00 2001
+From 90e61d55098b75de4ce33072d6e3e9c0de99d9b5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 23 Oct 2018 20:25:05 -0400
 Subject: [PATCH] Don't sleep after profile lookups if not needed
@@ -7,7 +7,7 @@ Mojang was sleeping even if we had no more requests to go after
 the current one finished, resulting in 100ms lost per profile lookup
 
 diff --git a/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java b/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java
-index 71e48e87b..23f1447cf 100644
+index 71e48e87b4..23f1447cfc 100644
 --- a/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java
 +++ b/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java
 @@ -42,6 +42,7 @@ public class YggdrasilGameProfileRepository implements GameProfileRepository {
diff --git a/Spigot-Server-Patches/0324-Use-more-reasonable-thread-count-default-for-bootstr.patch b/Spigot-Server-Patches/0325-Use-more-reasonable-thread-count-default-for-bootstr.patch
similarity index 89%
rename from Spigot-Server-Patches/0324-Use-more-reasonable-thread-count-default-for-bootstr.patch
rename to Spigot-Server-Patches/0325-Use-more-reasonable-thread-count-default-for-bootstr.patch
index d60e4661ab..68d3d9e372 100644
--- a/Spigot-Server-Patches/0324-Use-more-reasonable-thread-count-default-for-bootstr.patch
+++ b/Spigot-Server-Patches/0325-Use-more-reasonable-thread-count-default-for-bootstr.patch
@@ -1,11 +1,11 @@
-From d9c69b73842983fcc3cc97931a7bd7ee3301b355 Mon Sep 17 00:00:00 2001
+From 23df2c9ac84d8464e7a7f73c8a90ae26dc73ad93 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 23 Oct 2018 23:14:38 -0400
 Subject: [PATCH] Use more reasonable thread count default for bootstrap
 
 
 diff --git a/src/main/java/net/minecraft/server/SystemUtils.java b/src/main/java/net/minecraft/server/SystemUtils.java
-index 7e224ebef..dc6d03062 100644
+index 7e224ebeff..dc6d030621 100644
 --- a/src/main/java/net/minecraft/server/SystemUtils.java
 +++ b/src/main/java/net/minecraft/server/SystemUtils.java
 @@ -66,7 +66,7 @@ public class SystemUtils {
diff --git a/Spigot-Server-Patches/0325-Optimize-World-Time-Updates.patch b/Spigot-Server-Patches/0326-Optimize-World-Time-Updates.patch
similarity index 96%
rename from Spigot-Server-Patches/0325-Optimize-World-Time-Updates.patch
rename to Spigot-Server-Patches/0326-Optimize-World-Time-Updates.patch
index 9fd46b8869..2012978dbb 100644
--- a/Spigot-Server-Patches/0325-Optimize-World-Time-Updates.patch
+++ b/Spigot-Server-Patches/0326-Optimize-World-Time-Updates.patch
@@ -1,4 +1,4 @@
-From f583ea4420282cd91b18bae2fbca841fa9fb9fe5 Mon Sep 17 00:00:00 2001
+From 6a0b370f6e6b1d6f45ca16da6e919655d3d0849c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 2 Nov 2018 23:11:51 -0400
 Subject: [PATCH] Optimize World Time Updates
@@ -8,7 +8,7 @@ the updates per world, so that we can re-use the same packet
 object for every player unless they have per-player time enabled.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 553014b79..ca45093e6 100644
+index 553014b79e..ca45093e66 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1155,12 +1155,24 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
diff --git a/Spigot-Server-Patches/0326-Restore-custom-InventoryHolder-support.patch b/Spigot-Server-Patches/0327-Restore-custom-InventoryHolder-support.patch
similarity index 95%
rename from Spigot-Server-Patches/0326-Restore-custom-InventoryHolder-support.patch
rename to Spigot-Server-Patches/0327-Restore-custom-InventoryHolder-support.patch
index 4923711ee3..0caeb522bb 100644
--- a/Spigot-Server-Patches/0326-Restore-custom-InventoryHolder-support.patch
+++ b/Spigot-Server-Patches/0327-Restore-custom-InventoryHolder-support.patch
@@ -1,4 +1,4 @@
-From c17359fff9d3b571e6f6eb5f2f44e8603889e269 Mon Sep 17 00:00:00 2001
+From 8807db67216b659dd324cdb51d44c75f2ec2d959 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Mon, 5 Nov 2018 04:23:51 +0000
 Subject: [PATCH] Restore custom InventoryHolder support
@@ -17,7 +17,7 @@ will always work as intended in the past, those without will create implementati
 based inventories.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java b/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java
-index 9957ed040..ae280dd40 100644
+index 9957ed0402..ae280dd40b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java
 @@ -39,10 +39,20 @@ public final class CraftInventoryCreator {
diff --git a/Spigot-Server-Patches/0327-Use-Vanilla-Minecart-Speeds.patch b/Spigot-Server-Patches/0328-Use-Vanilla-Minecart-Speeds.patch
similarity index 91%
rename from Spigot-Server-Patches/0327-Use-Vanilla-Minecart-Speeds.patch
rename to Spigot-Server-Patches/0328-Use-Vanilla-Minecart-Speeds.patch
index 1f4772299e..a3696966f1 100644
--- a/Spigot-Server-Patches/0327-Use-Vanilla-Minecart-Speeds.patch
+++ b/Spigot-Server-Patches/0328-Use-Vanilla-Minecart-Speeds.patch
@@ -1,4 +1,4 @@
-From c7a89c6bc396372086d221e61f91a4dcae92a800 Mon Sep 17 00:00:00 2001
+From f622d3f3fe5d64da154b7a34150691f6fcfcd7f2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 8 Nov 2018 21:33:09 -0500
 Subject: [PATCH] Use Vanilla Minecart Speeds
@@ -6,7 +6,7 @@ Subject: [PATCH] Use Vanilla Minecart Speeds
 CraftBukkit changed the values on flying speed, restore back to vanilla
 
 diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
-index 1b64ad824..4388186db 100644
+index 1b64ad8243..4388186db5 100644
 --- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 @@ -59,9 +59,9 @@ public abstract class EntityMinecartAbstract extends Entity {
diff --git a/Spigot-Server-Patches/0328-Fix-SpongeAbsortEvent-handling.patch b/Spigot-Server-Patches/0329-Fix-SpongeAbsortEvent-handling.patch
similarity index 93%
rename from Spigot-Server-Patches/0328-Fix-SpongeAbsortEvent-handling.patch
rename to Spigot-Server-Patches/0329-Fix-SpongeAbsortEvent-handling.patch
index 046db750b1..ab26a58d5b 100644
--- a/Spigot-Server-Patches/0328-Fix-SpongeAbsortEvent-handling.patch
+++ b/Spigot-Server-Patches/0329-Fix-SpongeAbsortEvent-handling.patch
@@ -1,4 +1,4 @@
-From ccbfe4d6310b8faf79b1f885c1cb996565c363a0 Mon Sep 17 00:00:00 2001
+From 44cda44409f8fce52277f6939177ece03b62db58 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 10 Nov 2018 05:15:21 +0000
 Subject: [PATCH] Fix SpongeAbsortEvent handling
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix SpongeAbsortEvent handling
 Only process drops when the block is actually going to be removed
 
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index 2262a8253..46490a943 100644
+index 2262a82532..46490a9430 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -472,7 +472,7 @@ public class Block implements IMaterial {
@@ -19,7 +19,7 @@ index 2262a8253..46490a943 100644
          if (world instanceof WorldServer) {
              a(iblockdata, (WorldServer) world, blockposition, tileentity).forEach((itemstack) -> {
 diff --git a/src/main/java/net/minecraft/server/BlockSponge.java b/src/main/java/net/minecraft/server/BlockSponge.java
-index 685a30f3f..9edf937a6 100644
+index 685a30f3f1..9edf937a65 100644
 --- a/src/main/java/net/minecraft/server/BlockSponge.java
 +++ b/src/main/java/net/minecraft/server/BlockSponge.java
 @@ -115,8 +115,11 @@ public class BlockSponge extends Block {
diff --git a/Spigot-Server-Patches/0329-Don-t-allow-digging-into-unloaded-chunks.patch b/Spigot-Server-Patches/0330-Don-t-allow-digging-into-unloaded-chunks.patch
similarity index 92%
rename from Spigot-Server-Patches/0329-Don-t-allow-digging-into-unloaded-chunks.patch
rename to Spigot-Server-Patches/0330-Don-t-allow-digging-into-unloaded-chunks.patch
index fc4f13cc73..1b59304b66 100644
--- a/Spigot-Server-Patches/0329-Don-t-allow-digging-into-unloaded-chunks.patch
+++ b/Spigot-Server-Patches/0330-Don-t-allow-digging-into-unloaded-chunks.patch
@@ -1,11 +1,11 @@
-From 493a77676345fe8ae6915ae48b0b40be2405cfbd Mon Sep 17 00:00:00 2001
+From 885065934284b39491841922be8c933e2de6b656 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 11 Nov 2018 21:01:09 +0000
 Subject: [PATCH] Don't allow digging into unloaded chunks
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index ccad0a601..d263897da 100644
+index ccad0a601c..d263897da4 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1271,6 +1271,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0330-Optimize-redstone-algorithm.patch b/Spigot-Server-Patches/0331-Optimize-redstone-algorithm.patch
similarity index 99%
rename from Spigot-Server-Patches/0330-Optimize-redstone-algorithm.patch
rename to Spigot-Server-Patches/0331-Optimize-redstone-algorithm.patch
index 9d230c5e37..a8d0caad49 100644
--- a/Spigot-Server-Patches/0330-Optimize-redstone-algorithm.patch
+++ b/Spigot-Server-Patches/0331-Optimize-redstone-algorithm.patch
@@ -1,4 +1,4 @@
-From 8491e3914100159923445dc9a4a811dc40c288e4 Mon Sep 17 00:00:00 2001
+From 91071dd74395c9e6e25e23696421927e18e6b64c Mon Sep 17 00:00:00 2001
 From: theosib <millerti@172.16.221.1>
 Date: Thu, 27 Sep 2018 01:43:35 -0600
 Subject: [PATCH] Optimize redstone algorithm
@@ -19,7 +19,7 @@ Aside from making the obvious class/function renames and obfhelpers I didn't nee
 Just added Bukkit's event system and took a few liberties with dead code and comment misspellings.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index dd5e263d7..357c7cf1d 100644
+index dd5e263d71..357c7cf1df 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -430,4 +430,14 @@ public class PaperWorldConfig {
@@ -39,7 +39,7 @@ index dd5e263d7..357c7cf1d 100644
  }
 diff --git a/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java b/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java
 new file mode 100644
-index 000000000..cf5661f1c
+index 0000000000..cf5661f1c5
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java
 @@ -0,0 +1,912 @@
@@ -956,7 +956,7 @@ index 000000000..cf5661f1c
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/BlockRedstoneWire.java b/src/main/java/net/minecraft/server/BlockRedstoneWire.java
-index 5bf2fc0b3..52a4982ec 100644
+index 5bf2fc0b3f..52a4982ecd 100644
 --- a/src/main/java/net/minecraft/server/BlockRedstoneWire.java
 +++ b/src/main/java/net/minecraft/server/BlockRedstoneWire.java
 @@ -1,5 +1,7 @@
@@ -1124,10 +1124,10 @@ index 5bf2fc0b3..52a4982ec 100644
                  c(iblockdata, world, blockposition);
                  world.a(blockposition, false);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 3e4632425..3e7ba9be6 100644
+index 75c539d72d..380833ee54 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -538,6 +538,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -543,6 +543,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
  
      }
  
@@ -1135,7 +1135,7 @@ index 3e4632425..3e7ba9be6 100644
      public void a(BlockPosition blockposition, Block block, BlockPosition blockposition1) {
          if (!this.isClientSide) {
              IBlockData iblockdata = this.getType(blockposition);
-@@ -1287,6 +1288,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -1292,6 +1293,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
          return this.getBlockFacePower(blockposition.down(), EnumDirection.DOWN) > 0 ? true : (this.getBlockFacePower(blockposition.up(), EnumDirection.UP) > 0 ? true : (this.getBlockFacePower(blockposition.north(), EnumDirection.NORTH) > 0 ? true : (this.getBlockFacePower(blockposition.south(), EnumDirection.SOUTH) > 0 ? true : (this.getBlockFacePower(blockposition.west(), EnumDirection.WEST) > 0 ? true : this.getBlockFacePower(blockposition.east(), EnumDirection.EAST) > 0))));
      }
  
diff --git a/Spigot-Server-Patches/0331-force-entity-dismount-during-teleportation.patch b/Spigot-Server-Patches/0332-force-entity-dismount-during-teleportation.patch
similarity index 96%
rename from Spigot-Server-Patches/0331-force-entity-dismount-during-teleportation.patch
rename to Spigot-Server-Patches/0332-force-entity-dismount-during-teleportation.patch
index 09f8fcd38d..007765dc6a 100644
--- a/Spigot-Server-Patches/0331-force-entity-dismount-during-teleportation.patch
+++ b/Spigot-Server-Patches/0332-force-entity-dismount-during-teleportation.patch
@@ -1,4 +1,4 @@
-From 480eccfddcbf1ac36970a4a0d2721cb1e87c73a5 Mon Sep 17 00:00:00 2001
+From 5968833c58c2c2479dbc25f2cb1177fc0a8b4d85 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Thu, 15 Nov 2018 13:38:37 +0000
 Subject: [PATCH] force entity dismount during teleportation
@@ -20,7 +20,7 @@ this is going to be the best soultion all around.
 Improvements/suggestions welcome!
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 365984bb8..0f2480521 100644
+index 365984bb8b..0f24805210 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2027,12 +2027,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -72,7 +72,7 @@ index 365984bb8..0f2480521 100644
              if (event.isCancelled()) {
                  return false;
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 78e48f478..4bb24de9d 100644
+index 78e48f478c..4bb24de9d9 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -968,9 +968,11 @@ public abstract class EntityHuman extends EntityLiving {
@@ -91,7 +91,7 @@ index 78e48f478..4bb24de9d 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index b59b39d41..a63edeeb9 100644
+index b59b39d418..a63edeeb95 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2733,11 +2733,13 @@ public abstract class EntityLiving extends Entity {
@@ -112,7 +112,7 @@ index b59b39d41..a63edeeb9 100644
              this.a(entity);
          }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 8eb20424f..635be7ccc 100644
+index c90ae53a65..c5cbbe1a25 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -985,11 +985,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0332-Book-Size-Limits.patch b/Spigot-Server-Patches/0333-Book-Size-Limits.patch
similarity index 96%
rename from Spigot-Server-Patches/0332-Book-Size-Limits.patch
rename to Spigot-Server-Patches/0333-Book-Size-Limits.patch
index 4d15c09cae..785250d373 100644
--- a/Spigot-Server-Patches/0332-Book-Size-Limits.patch
+++ b/Spigot-Server-Patches/0333-Book-Size-Limits.patch
@@ -1,4 +1,4 @@
-From 804b4e3ee0fa012ea4c0de1481983200156a2acc Mon Sep 17 00:00:00 2001
+From ec46a7a8f3b1fe1bbdba42febfcf7d956a083314 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 16 Nov 2018 23:08:50 -0500
 Subject: [PATCH] Book Size Limits
@@ -6,7 +6,7 @@ Subject: [PATCH] Book Size Limits
 Puts some limits on the size of books.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 7e85a0224..30f35304a 100644
+index 7e85a02242..30f35304ad 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -351,4 +351,11 @@ public class PaperConfig {
@@ -22,7 +22,7 @@ index 7e85a0224..30f35304a 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index d263897da..e5db2de26 100644
+index d263897da4..e5db2de26e 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -14,6 +14,7 @@ import java.util.Iterator;
diff --git a/Spigot-Server-Patches/0333-Make-the-default-permission-message-configurable.patch b/Spigot-Server-Patches/0334-Make-the-default-permission-message-configurable.patch
similarity index 94%
rename from Spigot-Server-Patches/0333-Make-the-default-permission-message-configurable.patch
rename to Spigot-Server-Patches/0334-Make-the-default-permission-message-configurable.patch
index 6eeae7b68c..b3957e90b9 100644
--- a/Spigot-Server-Patches/0333-Make-the-default-permission-message-configurable.patch
+++ b/Spigot-Server-Patches/0334-Make-the-default-permission-message-configurable.patch
@@ -1,11 +1,11 @@
-From df4e32369884d66afe8eecadd52cb1421d018aac Mon Sep 17 00:00:00 2001
+From d2f9615e2b12453949c136e1033434c09fc94357 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 18 Nov 2018 19:49:56 +0000
 Subject: [PATCH] Make the default permission message configurable
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 30f35304a..546a1cfe0 100644
+index 30f35304ad..546a1cfe0a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -20,6 +20,7 @@ import java.util.regex.Pattern;
@@ -29,7 +29,7 @@ index 30f35304a..546a1cfe0 100644
      private static void savePlayerData() {
          savePlayerData = getBoolean("settings.save-player-data", savePlayerData);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 7e810e008..58b343259 100644
+index 7e810e0086..58b3432590 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2141,6 +2141,11 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0334-Add-more-Zombie-API.patch b/Spigot-Server-Patches/0335-Add-more-Zombie-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0334-Add-more-Zombie-API.patch
rename to Spigot-Server-Patches/0335-Add-more-Zombie-API.patch
index 640e7f8fae..7607d0b501 100644
--- a/Spigot-Server-Patches/0334-Add-more-Zombie-API.patch
+++ b/Spigot-Server-Patches/0335-Add-more-Zombie-API.patch
@@ -1,11 +1,11 @@
-From fd585e1a2f0dab7075eb13314c98b410d069a1f7 Mon Sep 17 00:00:00 2001
+From b2237c2b5ed734c7b9244b2c8f3b039ad64a4791 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 Oct 2018 04:29:59 -0500
 Subject: [PATCH] Add more Zombie API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index cbaed08f5..6bad1687f 100644
+index cbaed08f52..6bad1687fe 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -1253,6 +1253,8 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -18,7 +18,7 @@ index cbaed08f5..6bad1687f 100644
          byte b0 = (Byte) this.datawatcher.get(EntityInsentient.b);
  
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index c8e4dcdac..1c2c05ae3 100644
+index c8e4dcdaca..1c2c05ae3a 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -33,6 +33,7 @@ public class EntityZombie extends EntityMonster {
@@ -92,7 +92,7 @@ index c8e4dcdac..1c2c05ae3 100644
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
-index 0429cf020..c4320dbb6 100644
+index 0429cf020e..c4320dbb67 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
 @@ -80,4 +80,41 @@ public class CraftZombie extends CraftMonster implements Zombie {
diff --git a/Spigot-Server-Patches/0335-Prevent-rayTrace-from-loading-chunks.patch b/Spigot-Server-Patches/0336-Prevent-rayTrace-from-loading-chunks.patch
similarity index 93%
rename from Spigot-Server-Patches/0335-Prevent-rayTrace-from-loading-chunks.patch
rename to Spigot-Server-Patches/0336-Prevent-rayTrace-from-loading-chunks.patch
index 427315745b..265ab78293 100644
--- a/Spigot-Server-Patches/0335-Prevent-rayTrace-from-loading-chunks.patch
+++ b/Spigot-Server-Patches/0336-Prevent-rayTrace-from-loading-chunks.patch
@@ -1,4 +1,4 @@
-From 57232ac435cd24bbab737587e73ff06b0af41062 Mon Sep 17 00:00:00 2001
+From 72e8e504ce8125125e9c2a395ea15ad3bbd11507 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 26 Nov 2018 19:21:58 -0500
 Subject: [PATCH] Prevent rayTrace from loading chunks
@@ -7,7 +7,7 @@ ray tracing into an unloaded chunk should be treated as a miss
 this saves a ton of lag for when AI tries to raytrace near unloaded chunks.
 
 diff --git a/src/main/java/net/minecraft/server/IBlockAccess.java b/src/main/java/net/minecraft/server/IBlockAccess.java
-index 0dff02352..29cdc0087 100644
+index 0dff023529..29cdc00875 100644
 --- a/src/main/java/net/minecraft/server/IBlockAccess.java
 +++ b/src/main/java/net/minecraft/server/IBlockAccess.java
 @@ -41,7 +41,15 @@ public interface IBlockAccess {
diff --git a/Spigot-Server-Patches/0336-Handle-Large-Packets-disconnecting-client.patch b/Spigot-Server-Patches/0337-Handle-Large-Packets-disconnecting-client.patch
similarity index 94%
rename from Spigot-Server-Patches/0336-Handle-Large-Packets-disconnecting-client.patch
rename to Spigot-Server-Patches/0337-Handle-Large-Packets-disconnecting-client.patch
index f7427687ff..0fd0ebc4e8 100644
--- a/Spigot-Server-Patches/0336-Handle-Large-Packets-disconnecting-client.patch
+++ b/Spigot-Server-Patches/0337-Handle-Large-Packets-disconnecting-client.patch
@@ -1,4 +1,4 @@
-From f63177f1c6cbbef1a89cdf6c11e9fc7c83d686da Mon Sep 17 00:00:00 2001
+From c2690b4ef9dd8835fc11488728a893d6dd22eee0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 27 Nov 2018 21:18:06 -0500
 Subject: [PATCH] Handle Large Packets disconnecting client
@@ -7,7 +7,7 @@ If a players inventory is too big to send in a single packet,
 split the inventory set into multiple packets instead.
 
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 046196d54..d4aad8a5b 100644
+index 046196d54d..d4aad8a5b7 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -97,6 +97,15 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -27,7 +27,7 @@ index 046196d54..d4aad8a5b 100644
              NetworkManager.LOGGER.debug("Skipping packet due to errors", throwable.getCause());
          } else {
 diff --git a/src/main/java/net/minecraft/server/Packet.java b/src/main/java/net/minecraft/server/Packet.java
-index 601d4d0fa..2d8e6a2f4 100644
+index 601d4d0fa2..2d8e6a2f4a 100644
 --- a/src/main/java/net/minecraft/server/Packet.java
 +++ b/src/main/java/net/minecraft/server/Packet.java
 @@ -10,6 +10,12 @@ public interface Packet<T extends PacketListener> {
@@ -44,7 +44,7 @@ index 601d4d0fa..2d8e6a2f4 100644
          return false;
      }
 diff --git a/src/main/java/net/minecraft/server/PacketEncoder.java b/src/main/java/net/minecraft/server/PacketEncoder.java
-index 63c4dbd32..b0cfef52c 100644
+index 63c4dbd327..b0cfef52cb 100644
 --- a/src/main/java/net/minecraft/server/PacketEncoder.java
 +++ b/src/main/java/net/minecraft/server/PacketEncoder.java
 @@ -49,7 +49,31 @@ public class PacketEncoder extends MessageToByteEncoder<Packet<?>> {
@@ -80,7 +80,7 @@ index 63c4dbd32..b0cfef52c 100644
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
-index 1fcbbd698..a0b87f89d 100644
+index 1fcbbd698a..a0b87f89df 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 @@ -79,7 +79,7 @@ public class PacketPlayOutMapChunk implements Packet<PacketListenerPlayOut> {
@@ -93,7 +93,7 @@ index 1fcbbd698..a0b87f89d 100644
          } else {
              this.f = new byte[i];
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutWindowItems.java b/src/main/java/net/minecraft/server/PacketPlayOutWindowItems.java
-index f7c365567..631234324 100644
+index f7c3655671..631234324d 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutWindowItems.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutWindowItems.java
 @@ -9,6 +9,15 @@ public class PacketPlayOutWindowItems implements Packet<PacketListenerPlayOut> {
diff --git a/Spigot-Server-Patches/0337-Lazy-init-world-storage-in-CraftOfflinePlayer.patch b/Spigot-Server-Patches/0338-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
similarity index 96%
rename from Spigot-Server-Patches/0337-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
rename to Spigot-Server-Patches/0338-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
index 20cf7622c2..2864603f55 100644
--- a/Spigot-Server-Patches/0337-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
+++ b/Spigot-Server-Patches/0338-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
@@ -1,4 +1,4 @@
-From 97678a5b421b5dd54b2268949dc692cf514dcaa6 Mon Sep 17 00:00:00 2001
+From d8d1fa502fa53b0121cd986afb0519b3c98cd34e Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Tue, 11 Dec 2018 22:25:07 -0500
 Subject: [PATCH] Lazy init world storage in CraftOfflinePlayer
@@ -8,7 +8,7 @@ worlds loaded. This is typically a rare occurrence but probably one that
 should be covered as best we can.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
-index 6a448c02e..c1ef1c950 100644
+index 6a448c02ec..c1ef1c950d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 @@ -25,12 +25,12 @@ import org.bukkit.plugin.Plugin;
diff --git a/Spigot-Server-Patches/0338-Add-PlayerConnectionCloseEvent.patch b/Spigot-Server-Patches/0339-Add-PlayerConnectionCloseEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0338-Add-PlayerConnectionCloseEvent.patch
rename to Spigot-Server-Patches/0339-Add-PlayerConnectionCloseEvent.patch
index b16c4c66fe..fc284ecb74 100644
--- a/Spigot-Server-Patches/0338-Add-PlayerConnectionCloseEvent.patch
+++ b/Spigot-Server-Patches/0339-Add-PlayerConnectionCloseEvent.patch
@@ -1,4 +1,4 @@
-From 245beba4063a8d227258da3fded8a6b968787727 Mon Sep 17 00:00:00 2001
+From c75ab2e4521d296a572435b722e308c4d9bea517 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sun, 7 Oct 2018 12:05:28 -0700
 Subject: [PATCH] Add PlayerConnectionCloseEvent
@@ -34,7 +34,7 @@ how PlayerPreLoginEvent interacts with PlayerConnectionCloseEvent
 is undefined.
 
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index c3d57461d..a6b22254a 100644
+index c3d57461df..a6b22254ac 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -35,9 +35,9 @@ public class LoginListener implements PacketLoginInListener {
@@ -50,7 +50,7 @@ index c3d57461d..a6b22254a 100644
      private SecretKey loginKey;
      private EntityPlayer l;
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index d4aad8a5b..b1dededc1 100644
+index d4aad8a5b7..b1dededc15 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -336,6 +336,26 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
diff --git a/Spigot-Server-Patches/0339-Prevent-Enderman-from-loading-chunks.patch b/Spigot-Server-Patches/0340-Prevent-Enderman-from-loading-chunks.patch
similarity index 95%
rename from Spigot-Server-Patches/0339-Prevent-Enderman-from-loading-chunks.patch
rename to Spigot-Server-Patches/0340-Prevent-Enderman-from-loading-chunks.patch
index 3ab8ea7299..652ea4b169 100644
--- a/Spigot-Server-Patches/0339-Prevent-Enderman-from-loading-chunks.patch
+++ b/Spigot-Server-Patches/0340-Prevent-Enderman-from-loading-chunks.patch
@@ -1,11 +1,11 @@
-From f2d1ceccb42459e2a3aabcafde5ac1c0a8d7af25 Mon Sep 17 00:00:00 2001
+From 5bdeb1dd1680e7793f2e1aaf8440ed2d184c9931 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Tue, 18 Dec 2018 02:15:08 +0000
 Subject: [PATCH] Prevent Enderman from loading chunks
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
-index 9783576e3..13507edbc 100644
+index 9783576e38..13507edbce 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
 @@ -344,7 +344,8 @@ public class EntityEnderman extends EntityMonster {
diff --git a/Spigot-Server-Patches/0340-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/Spigot-Server-Patches/0341-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
similarity index 96%
rename from Spigot-Server-Patches/0340-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
rename to Spigot-Server-Patches/0341-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
index e8d8494ede..f4af011fb6 100644
--- a/Spigot-Server-Patches/0340-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
+++ b/Spigot-Server-Patches/0341-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
@@ -1,4 +1,4 @@
-From 8f4e56613b709136c437992da11ab426cbfd91b4 Mon Sep 17 00:00:00 2001
+From 8b0e163037e098d0a4dbb7f89c45c49176068605 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Wed, 2 Jan 2019 00:35:43 -0600
 Subject: [PATCH] Add APIs to replace OfflinePlayer#getLastPlayed
@@ -16,7 +16,7 @@ intent to remove) and replace it with two new methods, clearly named and
 documented as to their purpose.
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 635be7ccc..a9ea2fd87 100644
+index c5cbbe1a25..ae100a374f 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -75,6 +75,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -28,7 +28,7 @@ index 635be7ccc..a9ea2fd87 100644
      public boolean queueHealthUpdatePacket = false;
      public net.minecraft.server.PacketPlayOutUpdateHealth queuedHealthUpdatePacket;
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index e46436623..659ce2181 100644
+index e46436623c..659ce21818 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -94,6 +94,7 @@ public abstract class PlayerList {
@@ -40,7 +40,7 @@ index e46436623..659ce2181 100644
          UserCache usercache = this.server.getUserCache();
          GameProfile gameprofile1 = usercache.getProfile(gameprofile.getId());
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
-index c1ef1c950..3824180ee 100644
+index c1ef1c950d..3824180ee5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 @@ -256,6 +256,61 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
@@ -106,7 +106,7 @@ index c1ef1c950..3824180ee 100644
      public Location getBedSpawnLocation() {
          NBTTagCompound data = getData();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 73a7cc7fd..14695d1a1 100644
+index 73a7cc7fd3..14695d1a1e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -139,6 +139,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0341-Fix-PlayerEditBookEvent.patch b/Spigot-Server-Patches/0342-Fix-PlayerEditBookEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0341-Fix-PlayerEditBookEvent.patch
rename to Spigot-Server-Patches/0342-Fix-PlayerEditBookEvent.patch
index 152876fc6f..37cf17b9f0 100644
--- a/Spigot-Server-Patches/0341-Fix-PlayerEditBookEvent.patch
+++ b/Spigot-Server-Patches/0342-Fix-PlayerEditBookEvent.patch
@@ -1,4 +1,4 @@
-From 9fccc9f9807f4d7345a8508acecd7a6a58f58276 Mon Sep 17 00:00:00 2001
+From 56d470c052804818d690c2646db01a9cd3b7e95f Mon Sep 17 00:00:00 2001
 From: Michael Himing <mhiming@gmail.com>
 Date: Sun, 16 Dec 2018 13:07:33 +1100
 Subject: [PATCH] Fix PlayerEditBookEvent
@@ -10,7 +10,7 @@ it impossible to properly cancel the event or modify the book meta
 cancelled writing
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index e5db2de26..c3feccbd6 100644
+index e5db2de26e..c3feccbd64 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -871,9 +871,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0342-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/Spigot-Server-Patches/0343-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
similarity index 90%
rename from Spigot-Server-Patches/0342-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
rename to Spigot-Server-Patches/0343-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
index 8450ec392c..6cdb6f8906 100644
--- a/Spigot-Server-Patches/0342-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
+++ b/Spigot-Server-Patches/0343-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
@@ -1,11 +1,11 @@
-From 7bab0dc65e44afd64b0dcd1c5904fea7d79f71da Mon Sep 17 00:00:00 2001
+From 73955b76dd5133d111ca1f1b316345d439f32bb3 Mon Sep 17 00:00:00 2001
 From: connorhartley <vectrixu+gh@gmail.com>
 Date: Mon, 7 Jan 2019 14:43:48 -0600
 Subject: [PATCH] Workaround for vehicle tracking issue on disconnect
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index a9ea2fd87..65b6051cf 100644
+index ae100a374f..ed1c37bee9 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1260,6 +1260,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0343-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch b/Spigot-Server-Patches/0344-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
similarity index 96%
rename from Spigot-Server-Patches/0343-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
rename to Spigot-Server-Patches/0344-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
index 7ebf07df54..b044535c63 100644
--- a/Spigot-Server-Patches/0343-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
+++ b/Spigot-Server-Patches/0344-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
@@ -1,4 +1,4 @@
-From d7a6b3885c2d0b5a9d49de9a62b586c429c1d617 Mon Sep 17 00:00:00 2001
+From 5315f77f15062f5a76c11a2e13b3885cc70f49b1 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Thu, 31 Jan 2019 16:33:36 -0500
 Subject: [PATCH] Fire BlockPistonRetractEvent for all empty pistons
@@ -24,7 +24,7 @@ Instead we opt to remove the check entirely so that the event fires for
 all piston types.
 
 diff --git a/src/main/java/net/minecraft/server/BlockPiston.java b/src/main/java/net/minecraft/server/BlockPiston.java
-index 1170a2810..b29525c40 100644
+index 1170a28107..b29525c40d 100644
 --- a/src/main/java/net/minecraft/server/BlockPiston.java
 +++ b/src/main/java/net/minecraft/server/BlockPiston.java
 @@ -122,7 +122,7 @@ public class BlockPiston extends BlockDirectional {
diff --git a/Spigot-Server-Patches/0344-Block-Entity-remove-from-being-called-on-Players.patch b/Spigot-Server-Patches/0345-Block-Entity-remove-from-being-called-on-Players.patch
similarity index 93%
rename from Spigot-Server-Patches/0344-Block-Entity-remove-from-being-called-on-Players.patch
rename to Spigot-Server-Patches/0345-Block-Entity-remove-from-being-called-on-Players.patch
index 9f3c781dcc..d1dc5378a3 100644
--- a/Spigot-Server-Patches/0344-Block-Entity-remove-from-being-called-on-Players.patch
+++ b/Spigot-Server-Patches/0345-Block-Entity-remove-from-being-called-on-Players.patch
@@ -1,4 +1,4 @@
-From 0891775894bfad96f05fd5db0b3cd18065e4b474 Mon Sep 17 00:00:00 2001
+From cf3c71abc77fafdc3a4bd68a682b51b8ae0f3cf3 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Mon, 4 Feb 2019 23:33:24 -0500
 Subject: [PATCH] Block Entity#remove from being called on Players
@@ -12,7 +12,7 @@ Player we will look at limiting the scope of this change. It appears to
 be unintentional in the few cases we've seen so far.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 14695d1a1..10c653e8e 100644
+index 14695d1a1e..10c653e8ed 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1956,6 +1956,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0345-BlockDestroyEvent.patch b/Spigot-Server-Patches/0346-BlockDestroyEvent.patch
similarity index 92%
rename from Spigot-Server-Patches/0345-BlockDestroyEvent.patch
rename to Spigot-Server-Patches/0346-BlockDestroyEvent.patch
index 6e2e20f49c..bf98986493 100644
--- a/Spigot-Server-Patches/0345-BlockDestroyEvent.patch
+++ b/Spigot-Server-Patches/0346-BlockDestroyEvent.patch
@@ -1,4 +1,4 @@
-From cac5d2a4ffc2717f6f7a300daae26228fefa3d0a Mon Sep 17 00:00:00 2001
+From 74b7490d65427a72952d493d94b3fe6211fda27a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 6 Feb 2019 00:20:33 -0500
 Subject: [PATCH] BlockDestroyEvent
@@ -11,10 +11,10 @@ floating in the air.
 This can replace many uses of BlockPhysicsEvent
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 3e7ba9be6..77db1b73d 100644
+index 380833ee54..59f7900b4e 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -468,8 +468,20 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -473,8 +473,20 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
              return false;
          } else {
              Fluid fluid = this.getFluid(blockposition);
diff --git a/Spigot-Server-Patches/0346-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch b/Spigot-Server-Patches/0347-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
similarity index 96%
rename from Spigot-Server-Patches/0346-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
rename to Spigot-Server-Patches/0347-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
index 8fa57e2e6b..24628a453c 100644
--- a/Spigot-Server-Patches/0346-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
+++ b/Spigot-Server-Patches/0347-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
@@ -1,4 +1,4 @@
-From e4ebe3851390cc69d980db8b3e4ab44cef833fcc Mon Sep 17 00:00:00 2001
+From f0d5c2134b3423b0b864afd2c8e4a097c53cad53 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Jan 2019 00:08:15 -0500
 Subject: [PATCH] Fix Custom Shapeless Custom Crafting Recipes
@@ -10,7 +10,7 @@ This made the Bukkit RecipeChoice API not work for Shapeless.
 This reimplements vanilla logic using the same test logic as Shaped
 
 diff --git a/src/main/java/net/minecraft/server/ShapelessRecipes.java b/src/main/java/net/minecraft/server/ShapelessRecipes.java
-index fe03a35cc..fb481e658 100644
+index fe03a35cc8..fb481e6586 100644
 --- a/src/main/java/net/minecraft/server/ShapelessRecipes.java
 +++ b/src/main/java/net/minecraft/server/ShapelessRecipes.java
 @@ -63,16 +63,46 @@ public class ShapelessRecipes implements RecipeCrafting {
diff --git a/Spigot-Server-Patches/0347-Fix-sign-edit-memory-leak.patch b/Spigot-Server-Patches/0348-Fix-sign-edit-memory-leak.patch
similarity index 94%
rename from Spigot-Server-Patches/0347-Fix-sign-edit-memory-leak.patch
rename to Spigot-Server-Patches/0348-Fix-sign-edit-memory-leak.patch
index 838e60e3ac..cfc06b5838 100644
--- a/Spigot-Server-Patches/0347-Fix-sign-edit-memory-leak.patch
+++ b/Spigot-Server-Patches/0348-Fix-sign-edit-memory-leak.patch
@@ -1,4 +1,4 @@
-From a387b5bd36b555aea67243d4582c92cd3a28defc Mon Sep 17 00:00:00 2001
+From aa164dd151ab3d3ead034731745db1e55a972a6b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 28 Feb 2019 00:15:28 -0500
 Subject: [PATCH] Fix sign edit memory leak
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix sign edit memory leak
 when a player edits a sign, a reference to their Entity is never cleand up.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index c3feccbd6..c54e1c9a0 100644
+index c3feccbd64..c54e1c9a08 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2545,7 +2545,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -19,7 +19,7 @@ index c3feccbd6..c54e1c9a0 100644
                  this.sendPacket(tileentity.getUpdatePacket()); // CraftBukkit
                  return;
 diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
-index 4c2273497..f051f2d3c 100644
+index 4c2273497b..f051f2d3c6 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySign.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySign.java
 @@ -14,6 +14,7 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
diff --git a/Spigot-Server-Patches/0348-Limit-Client-Sign-length-more.patch b/Spigot-Server-Patches/0349-Limit-Client-Sign-length-more.patch
similarity index 96%
rename from Spigot-Server-Patches/0348-Limit-Client-Sign-length-more.patch
rename to Spigot-Server-Patches/0349-Limit-Client-Sign-length-more.patch
index 2cb5baa49a..754dfbcbf2 100644
--- a/Spigot-Server-Patches/0348-Limit-Client-Sign-length-more.patch
+++ b/Spigot-Server-Patches/0349-Limit-Client-Sign-length-more.patch
@@ -1,4 +1,4 @@
-From 53ad129e65ef3a97b87ad130d6f44270355b9889 Mon Sep 17 00:00:00 2001
+From bb751fbc2c916abca2f319d92b379079f2489649 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 27 Feb 2019 22:18:40 -0500
 Subject: [PATCH] Limit Client Sign length more
@@ -22,7 +22,7 @@ it only impacts data sent from the client.
 Set -DPaper.maxSignLength=XX to change limit or -1 to disable
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index c54e1c9a0..bd2ee459f 100644
+index c54e1c9a08..bd2ee459f1 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -103,6 +103,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0349-Don-t-check-ConvertSigns-boolean-every-sign-save.patch b/Spigot-Server-Patches/0350-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
similarity index 93%
rename from Spigot-Server-Patches/0349-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
rename to Spigot-Server-Patches/0350-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
index f5b97277a9..29b10b58ed 100644
--- a/Spigot-Server-Patches/0349-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
+++ b/Spigot-Server-Patches/0350-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
@@ -1,4 +1,4 @@
-From 51425c63846a9797f41a025ffcf79a980f202c65 Mon Sep 17 00:00:00 2001
+From 845ef08736ccbb04c7d244dec9a085f73ee2f1d3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 2 Mar 2019 11:11:29 -0500
 Subject: [PATCH] Don't check ConvertSigns boolean every sign save
@@ -7,7 +7,7 @@ property lookups arent super cheap. they synchronize, validate
 and check security managers.
 
 diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
-index f051f2d3c..5eb86c434 100644
+index f051f2d3c6..5eb86c4341 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySign.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySign.java
 @@ -15,6 +15,7 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
diff --git a/Spigot-Server-Patches/0350-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch b/Spigot-Server-Patches/0351-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch
similarity index 95%
rename from Spigot-Server-Patches/0350-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch
rename to Spigot-Server-Patches/0351-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch
index 920f970c67..922624ab4f 100644
--- a/Spigot-Server-Patches/0350-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch
+++ b/Spigot-Server-Patches/0351-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch
@@ -1,4 +1,4 @@
-From 1f16dbca7a54ed7372011bb8a9c9349bc6539d7a Mon Sep 17 00:00:00 2001
+From 673d3ee1e10e029df171c5e47847a05cfeffe751 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 too large of
@@ -11,7 +11,7 @@ Use -DPaper.excessiveSignsLimit=500 to configure that limit, or -1
 to disable the limit and let your players be abused.
 
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index b1dededc1..e156804f7 100644
+index b1dededc15..e156804f7a 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -212,6 +212,15 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -31,7 +31,7 @@ index b1dededc1..e156804f7 100644
  
      private void sendPacketQueue() { this.o(); } // Paper - OBFHELPER
 diff --git a/src/main/java/net/minecraft/server/Packet.java b/src/main/java/net/minecraft/server/Packet.java
-index 2d8e6a2f4..8d0965a05 100644
+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> {
@@ -43,7 +43,7 @@ index 2d8e6a2f4..8d0965a05 100644
          return false;
      }
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
-index a0b87f89d..47710067a 100644
+index a0b87f89df..47710067a6 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> {
diff --git a/Spigot-Server-Patches/0351-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch b/Spigot-Server-Patches/0352-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
similarity index 95%
rename from Spigot-Server-Patches/0351-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
rename to Spigot-Server-Patches/0352-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
index 7f957bad61..e2d818d6cf 100644
--- a/Spigot-Server-Patches/0351-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
+++ b/Spigot-Server-Patches/0352-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
@@ -1,4 +1,4 @@
-From e7840847814412233a6867a8da08e412b8a09ce9 Mon Sep 17 00:00:00 2001
+From 7ffca02f733f68041ab9c7f5db1745932ffcce7c 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 8570e38f4..c97be42dd 100644
+index 8570e38f42..c97be42dd7 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 8570e38f4..c97be42dd 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 659ce2181..62d807597 100644
+index 659ce21818..62d8075971 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 {
diff --git a/Spigot-Server-Patches/0352-Set-Zombie-last-tick-at-start-of-drowning-process.patch b/Spigot-Server-Patches/0353-Set-Zombie-last-tick-at-start-of-drowning-process.patch
similarity index 89%
rename from Spigot-Server-Patches/0352-Set-Zombie-last-tick-at-start-of-drowning-process.patch
rename to Spigot-Server-Patches/0353-Set-Zombie-last-tick-at-start-of-drowning-process.patch
index 9f462b3820..7615a83568 100644
--- a/Spigot-Server-Patches/0352-Set-Zombie-last-tick-at-start-of-drowning-process.patch
+++ b/Spigot-Server-Patches/0353-Set-Zombie-last-tick-at-start-of-drowning-process.patch
@@ -1,4 +1,4 @@
-From 4e754ad0b171a557958d8ce94be5437538d113b8 Mon Sep 17 00:00:00 2001
+From c5dd4280a0f1e2df083484e4932c8d0086bec3cc 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 1c2c05ae3..7d882d9c7 100644
+index 1c2c05ae3a..7d882d9c7e 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/0353-Allow-Saving-of-Oversized-Chunks.patch b/Spigot-Server-Patches/0354-Allow-Saving-of-Oversized-Chunks.patch
similarity index 98%
rename from Spigot-Server-Patches/0353-Allow-Saving-of-Oversized-Chunks.patch
rename to Spigot-Server-Patches/0354-Allow-Saving-of-Oversized-Chunks.patch
index 1a1509a7f2..2785c6650c 100644
--- a/Spigot-Server-Patches/0353-Allow-Saving-of-Oversized-Chunks.patch
+++ b/Spigot-Server-Patches/0354-Allow-Saving-of-Oversized-Chunks.patch
@@ -1,4 +1,4 @@
-From 70341166bd7df7e0f9972190de9bbcccb59f6e1d Mon Sep 17 00:00:00 2001
+From f1b1e9e78c69791d2d44b82c0ac83b34ab780770 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 db66d4ac7..2322c0c8c 100644
+index db66d4ac7d..2322c0c8c5 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 db66d4ac7..2322c0c8c 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 4ff261091..c12fb3c10 100644
+index 4ff261091b..c12fb3c10f 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 4ff261091..c12fb3c10 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 57ce53cfd..b3d1bb5fd 100644
+index 57ce53cfdc..b3d1bb5fd8 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
 @@ -42,10 +42,84 @@ public final class RegionFileCache implements AutoCloseable {
diff --git a/Spigot-Server-Patches/0354-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/Spigot-Server-Patches/0355-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
similarity index 87%
rename from Spigot-Server-Patches/0354-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
rename to Spigot-Server-Patches/0355-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
index 3cd0646443..527642f534 100644
--- a/Spigot-Server-Patches/0354-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
+++ b/Spigot-Server-Patches/0355-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
@@ -1,11 +1,11 @@
-From bd633c440866b6ebd290e2352b9e604aa7a8673f Mon Sep 17 00:00:00 2001
+From 0a303e331b84bcd8fabe4519e6608c2c788935d9 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 62d807597..9d715d891 100644
+index 62d8075971..9d715d891d 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1035,6 +1035,7 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0355-Add-LivingEntity-getTargetEntity.patch b/Spigot-Server-Patches/0356-Add-LivingEntity-getTargetEntity.patch
similarity index 96%
rename from Spigot-Server-Patches/0355-Add-LivingEntity-getTargetEntity.patch
rename to Spigot-Server-Patches/0356-Add-LivingEntity-getTargetEntity.patch
index 08dfb12d57..59f68f4dc8 100644
--- a/Spigot-Server-Patches/0355-Add-LivingEntity-getTargetEntity.patch
+++ b/Spigot-Server-Patches/0356-Add-LivingEntity-getTargetEntity.patch
@@ -1,11 +1,11 @@
-From 6554913c44e191eeecdd9a48520ba5ca59d4ec20 Mon Sep 17 00:00:00 2001
+From e811159df149fa177058864e2f1639d13496998e 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 4f60b931a..c950139c0 100644
+index 4f60b931a1..c950139c0f 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 4f60b931a..c950139c0 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 0f2480521..2e8aedf5f 100644
+index 0f24805210..2e8aedf5fb 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 0f2480521..2e8aedf5f 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 a63edeeb9..43b8a722d 100644
+index a63edeeb95..43b8a722d0 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -3305,6 +3305,37 @@ public abstract class EntityLiving extends Entity {
@@ -108,7 +108,7 @@ index a63edeeb9..43b8a722d 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 c1f462d9d..498f38109 100644
+index c1f462d9d3..498f381099 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 c1f462d9d..498f38109 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 6f4c6c589..b27fd44dc 100644
+index 6f4c6c5891..b27fd44dcd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -215,6 +215,33 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/Spigot-Server-Patches/0356-Use-proper-max-length-when-serialising-BungeeCord-te.patch b/Spigot-Server-Patches/0357-Use-proper-max-length-when-serialising-BungeeCord-te.patch
similarity index 94%
rename from Spigot-Server-Patches/0356-Use-proper-max-length-when-serialising-BungeeCord-te.patch
rename to Spigot-Server-Patches/0357-Use-proper-max-length-when-serialising-BungeeCord-te.patch
index c6bdc385c3..80ed24a62d 100644
--- a/Spigot-Server-Patches/0356-Use-proper-max-length-when-serialising-BungeeCord-te.patch
+++ b/Spigot-Server-Patches/0357-Use-proper-max-length-when-serialising-BungeeCord-te.patch
@@ -1,4 +1,4 @@
-From 079403370e8a777a76c09884240e8617ba978bf8 Mon Sep 17 00:00:00 2001
+From 5e1fd0fad0d62825e89e45ffc2fff57d713e5d2d 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 0ab611564..f7b2095bb 100644
+index 0ab611564e..f7b2095bb7 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/0357-Entity-getEntitySpawnReason.patch b/Spigot-Server-Patches/0358-Entity-getEntitySpawnReason.patch
similarity index 96%
rename from Spigot-Server-Patches/0357-Entity-getEntitySpawnReason.patch
rename to Spigot-Server-Patches/0358-Entity-getEntitySpawnReason.patch
index 6aaef8a91b..b8ec2c9c7e 100644
--- a/Spigot-Server-Patches/0357-Entity-getEntitySpawnReason.patch
+++ b/Spigot-Server-Patches/0358-Entity-getEntitySpawnReason.patch
@@ -1,4 +1,4 @@
-From b2f085403fbb7a053640b0e8f3a85dd87ad30e99 Mon Sep 17 00:00:00 2001
+From fb92210339f1d8233f92eec22ced9465bb0fb3af 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 2e8aedf5f..96b0917a3 100644
+index 2e8aedf5fb..96b0917a3b 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,7 +59,7 @@ index 2e8aedf5f..96b0917a3 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 9d715d891..49437f212 100644
+index 9d715d891d..49437f2124 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -251,7 +251,7 @@ public abstract class PlayerList {
@@ -72,7 +72,7 @@ index 9d715d891..49437f212 100644
              });
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index ecfcecfdc..63e7f2bce 100644
+index ecfcecfdc2..63e7f2bce7 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -977,6 +977,7 @@ public class WorldServer extends World {
@@ -84,7 +84,7 @@ index ecfcecfdc..63e7f2bce 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 915ccb180..dfa15372b 100644
+index 915ccb1807..dfa15372b8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -1051,5 +1051,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/Spigot-Server-Patches/0358-Update-entity-Metadata-for-all-tracked-players.patch b/Spigot-Server-Patches/0359-Update-entity-Metadata-for-all-tracked-players.patch
similarity index 92%
rename from Spigot-Server-Patches/0358-Update-entity-Metadata-for-all-tracked-players.patch
rename to Spigot-Server-Patches/0359-Update-entity-Metadata-for-all-tracked-players.patch
index 0252c1da7c..75a2955f1c 100644
--- a/Spigot-Server-Patches/0358-Update-entity-Metadata-for-all-tracked-players.patch
+++ b/Spigot-Server-Patches/0359-Update-entity-Metadata-for-all-tracked-players.patch
@@ -1,11 +1,11 @@
-From ef60d8ea89f7715ab6c57ea1b6eea65606085469 Mon Sep 17 00:00:00 2001
+From 5fd400efbfa3ecea916a6a70d7b5c9866f7aa363 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 3ff7a7b4a..3a88c9a67 100644
+index 3ff7a7b4a8..3a88c9a670 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 3ff7a7b4a..3a88c9a67 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 bd2ee459f..17eeecaf4 100644
+index bd2ee459f1..17eeecaf4f 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2005,7 +2005,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0359-Fire-event-on-GS4-query.patch b/Spigot-Server-Patches/0360-Fire-event-on-GS4-query.patch
similarity index 98%
rename from Spigot-Server-Patches/0359-Fire-event-on-GS4-query.patch
rename to Spigot-Server-Patches/0360-Fire-event-on-GS4-query.patch
index 1518eca82a..77902bd345 100644
--- a/Spigot-Server-Patches/0359-Fire-event-on-GS4-query.patch
+++ b/Spigot-Server-Patches/0360-Fire-event-on-GS4-query.patch
@@ -1,11 +1,11 @@
-From 08b4aba6d52afdb2ca5deaea9fcbaab087f7e216 Mon Sep 17 00:00:00 2001
+From eb6e688b528840cbe7b19820e9b479f71ffad298 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 66bfbcf02..d821ef9a7 100644
+index 66bfbcf02b..d821ef9a75 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 66bfbcf02..d821ef9a7 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 16bb89af0..1b084f211 100644
+index 16bb89af0f..1b084f2112 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 16bb89af0..1b084f211 100644
          }
      }
 diff --git a/src/main/java/net/minecraft/server/RemoteStatusReply.java b/src/main/java/net/minecraft/server/RemoteStatusReply.java
-index 848b5c3f0..73efea7e1 100644
+index 848b5c3f0e..73efea7e13 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/0360-Implement-PlayerPostRespawnEvent.patch b/Spigot-Server-Patches/0361-Implement-PlayerPostRespawnEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0360-Implement-PlayerPostRespawnEvent.patch
rename to Spigot-Server-Patches/0361-Implement-PlayerPostRespawnEvent.patch
index b138116ba4..282fc43723 100644
--- a/Spigot-Server-Patches/0360-Implement-PlayerPostRespawnEvent.patch
+++ b/Spigot-Server-Patches/0361-Implement-PlayerPostRespawnEvent.patch
@@ -1,11 +1,11 @@
-From c6db972505d9fb1479441cff4bc9fdc6001d0fda Mon Sep 17 00:00:00 2001
+From 9f24ddc1ec8cb2eaeeb6198b94cd83c60989c813 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 49437f212..68e089a4b 100644
+index 49437f2124..68e089a4b6 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -638,9 +638,14 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0361-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/Spigot-Server-Patches/0362-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
similarity index 93%
rename from Spigot-Server-Patches/0361-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
rename to Spigot-Server-Patches/0362-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
index 2a02f69307..8eeabdd14a 100644
--- a/Spigot-Server-Patches/0361-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
+++ b/Spigot-Server-Patches/0362-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
@@ -1,4 +1,4 @@
-From 352fa634de72bb5b7f40f8314fee276ffa27deb9 Mon Sep 17 00:00:00 2001
+From c6e6f1c5da5e4b01283396445ffea74e66eff376 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 5f46c7f86..a0d1e7fd2 100644
+index 5f46c7f869..a0d1e7fd27 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/0362-Implement-getters-and-setters-for-EntityItem-owner-a.patch b/Spigot-Server-Patches/0363-Implement-getters-and-setters-for-EntityItem-owner-a.patch
similarity index 93%
rename from Spigot-Server-Patches/0362-Implement-getters-and-setters-for-EntityItem-owner-a.patch
rename to Spigot-Server-Patches/0363-Implement-getters-and-setters-for-EntityItem-owner-a.patch
index 45071f26b0..e50c5a1e45 100644
--- a/Spigot-Server-Patches/0362-Implement-getters-and-setters-for-EntityItem-owner-a.patch
+++ b/Spigot-Server-Patches/0363-Implement-getters-and-setters-for-EntityItem-owner-a.patch
@@ -1,4 +1,4 @@
-From acf07f60ba44c6b3da03f476ec7ed353cebc2dfa Mon Sep 17 00:00:00 2001
+From 164c698f430156235f83a2dd6b4f0d41a5e3c5a4 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 3f552b590..cb756b1ba 100644
+index 3f552b5905..cb756b1ba0 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/0363-Server-Tick-Events.patch b/Spigot-Server-Patches/0364-Server-Tick-Events.patch
similarity index 93%
rename from Spigot-Server-Patches/0363-Server-Tick-Events.patch
rename to Spigot-Server-Patches/0364-Server-Tick-Events.patch
index e660dcb256..c2298cc2b3 100644
--- a/Spigot-Server-Patches/0363-Server-Tick-Events.patch
+++ b/Spigot-Server-Patches/0364-Server-Tick-Events.patch
@@ -1,4 +1,4 @@
-From 9911de7013eb89584b2a954de92c2bc8d9f77614 Mon Sep 17 00:00:00 2001
+From b0fcc9e0e91993d6995337ca5a04b3f6da16e86a 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 ca45093e6..430d38b9c 100644
+index ca45093e66..430d38b9c9 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1080,6 +1080,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
diff --git a/Spigot-Server-Patches/0364-PlayerDeathEvent-getItemsToKeep.patch b/Spigot-Server-Patches/0365-PlayerDeathEvent-getItemsToKeep.patch
similarity index 96%
rename from Spigot-Server-Patches/0364-PlayerDeathEvent-getItemsToKeep.patch
rename to Spigot-Server-Patches/0365-PlayerDeathEvent-getItemsToKeep.patch
index 2e3c83b777..c4c0ef2dc3 100644
--- a/Spigot-Server-Patches/0364-PlayerDeathEvent-getItemsToKeep.patch
+++ b/Spigot-Server-Patches/0365-PlayerDeathEvent-getItemsToKeep.patch
@@ -1,4 +1,4 @@
-From 151f1f2d13a5e08079841b18441366477de1d0ea Mon Sep 17 00:00:00 2001
+From f71d7b6bd67be1d934922cf2cefd285c57433423 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 65b6051cf..72938a2e2 100644
+index ed1c37bee9..ba30730b5a 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -510,6 +510,46 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0365-Optimize-Captured-TileEntity-Lookup.patch b/Spigot-Server-Patches/0366-Optimize-Captured-TileEntity-Lookup.patch
similarity index 89%
rename from Spigot-Server-Patches/0365-Optimize-Captured-TileEntity-Lookup.patch
rename to Spigot-Server-Patches/0366-Optimize-Captured-TileEntity-Lookup.patch
index 649d7948b1..d90feff39c 100644
--- a/Spigot-Server-Patches/0365-Optimize-Captured-TileEntity-Lookup.patch
+++ b/Spigot-Server-Patches/0366-Optimize-Captured-TileEntity-Lookup.patch
@@ -1,4 +1,4 @@
-From fe758c19c612b165efc5f0e41a47cc003615ef39 Mon Sep 17 00:00:00 2001
+From fbad0a84e22cbbe24b2b113150eb24e307c1a6ce 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,10 +10,10 @@ 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 77db1b73d..7d39a8fbc 100644
+index 59f7900b4e..a99b2405c9 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1012,12 +1012,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -1017,12 +1017,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
              return null;
          } else {
              // CraftBukkit start
diff --git a/Spigot-Server-Patches/0366-Add-Heightmap-API.patch b/Spigot-Server-Patches/0367-Add-Heightmap-API.patch
similarity index 92%
rename from Spigot-Server-Patches/0366-Add-Heightmap-API.patch
rename to Spigot-Server-Patches/0367-Add-Heightmap-API.patch
index 77b9376f61..7cfba6f5be 100644
--- a/Spigot-Server-Patches/0366-Add-Heightmap-API.patch
+++ b/Spigot-Server-Patches/0367-Add-Heightmap-API.patch
@@ -1,14 +1,14 @@
-From f71bed37cfda78178f562dc43d9a59ac6720aead Mon Sep 17 00:00:00 2001
+From a7de9681908350f748dcb6e52078bbd34ac04bfc 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 7d39a8fbc..9889b0543 100644
+index a99b2405c9..1846aacc9a 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -589,8 +589,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -594,8 +594,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
          }
      }
  
@@ -20,7 +20,7 @@ index 7d39a8fbc..9889b0543 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 aec657952..38f61fddf 100644
+index aec657952c..38f61fddfd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -340,6 +340,29 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0367-Mob-Spawner-API-Enhancements.patch b/Spigot-Server-Patches/0368-Mob-Spawner-API-Enhancements.patch
similarity index 97%
rename from Spigot-Server-Patches/0367-Mob-Spawner-API-Enhancements.patch
rename to Spigot-Server-Patches/0368-Mob-Spawner-API-Enhancements.patch
index 0dce8816fd..7b38a6aad2 100644
--- a/Spigot-Server-Patches/0367-Mob-Spawner-API-Enhancements.patch
+++ b/Spigot-Server-Patches/0368-Mob-Spawner-API-Enhancements.patch
@@ -1,11 +1,11 @@
-From 5c0e95ab17ba63cef874c180171859bddc33a5c8 Mon Sep 17 00:00:00 2001
+From b0bef67d0488103272e29b26c09cafa796994d75 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 90ca1ee14..b179893a1 100644
+index 90ca1ee141..b179893a17 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 90ca1ee14..b179893a1 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 5c4c3c70c..e78e3804b 100644
+index 5c4c3c70c7..e78e3804ba 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/0368-Per-Player-View-Distance-API-placeholders.patch b/Spigot-Server-Patches/0369-Per-Player-View-Distance-API-placeholders.patch
similarity index 95%
rename from Spigot-Server-Patches/0368-Per-Player-View-Distance-API-placeholders.patch
rename to Spigot-Server-Patches/0369-Per-Player-View-Distance-API-placeholders.patch
index 50a417e57c..47954f5107 100644
--- a/Spigot-Server-Patches/0368-Per-Player-View-Distance-API-placeholders.patch
+++ b/Spigot-Server-Patches/0369-Per-Player-View-Distance-API-placeholders.patch
@@ -1,4 +1,4 @@
-From a82afc02122f372ee3da63677e94eb3890f2657a Mon Sep 17 00:00:00 2001
+From 8e4472d6d8f90f2ad50bd2382a13bde5aac121d5 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 3df8e30ec..9acdd6e56 100644
+index 3df8e30ec7..9acdd6e566 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 3df8e30ec..9acdd6e56 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 2e95069c1..8977c3516 100644
+index 2e95069c19..8977c3516b 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 2e95069c1..8977c3516 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 10c653e8e..712056cad 100644
+index 10c653e8ed..712056cad1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1965,6 +1965,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0369-Fix-CB-call-to-changed-postToMainThread-method.patch b/Spigot-Server-Patches/0370-Fix-CB-call-to-changed-postToMainThread-method.patch
similarity index 88%
rename from Spigot-Server-Patches/0369-Fix-CB-call-to-changed-postToMainThread-method.patch
rename to Spigot-Server-Patches/0370-Fix-CB-call-to-changed-postToMainThread-method.patch
index 504f4c9290..55687b6128 100644
--- a/Spigot-Server-Patches/0369-Fix-CB-call-to-changed-postToMainThread-method.patch
+++ b/Spigot-Server-Patches/0370-Fix-CB-call-to-changed-postToMainThread-method.patch
@@ -1,11 +1,11 @@
-From c020d00b79f4d675eb51c9b87d4b311abcf89d60 Mon Sep 17 00:00:00 2001
+From acbff9aa4ecc1cd25b2d8b2797069b902f6cbc44 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 17eeecaf4..8c54022e0 100644
+index 17eeecaf4f..8c54022e07 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/0370-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/Spigot-Server-Patches/0371-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
similarity index 92%
rename from Spigot-Server-Patches/0370-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
rename to Spigot-Server-Patches/0371-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
index af0eaf44f7..e441eab00f 100644
--- a/Spigot-Server-Patches/0370-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
+++ b/Spigot-Server-Patches/0371-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
@@ -1,4 +1,4 @@
-From 1484860a31c238ec53bd91145a3cb0124e2a338e Mon Sep 17 00:00:00 2001
+From c59b376815945a61913f3321d9a6936e648e68b7 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 9b1e07452..f8a2f32f1 100644
+index 9b1e07452f..f8a2f32f1d 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 9b1e07452..f8a2f32f1 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java
-index 799036f26..9ad180d94 100644
+index 799036f268..9ad180d946 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/0371-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch b/Spigot-Server-Patches/0372-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
similarity index 93%
rename from Spigot-Server-Patches/0371-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
rename to Spigot-Server-Patches/0372-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
index a35ee36ca2..f8bde1bf51 100644
--- a/Spigot-Server-Patches/0371-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
+++ b/Spigot-Server-Patches/0372-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
@@ -1,4 +1,4 @@
-From 626b1d6c3c35deb8aae7928131378a751ad845ed Mon Sep 17 00:00:00 2001
+From 36846aa6f1ed6e24e6d3353e47c5effa1ca6f8eb 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 430d38b9c..be31fef79 100644
+index 430d38b9c9..be31fef799 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2199,7 +2199,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -29,7 +29,7 @@ index 430d38b9c..be31fef79 100644
  
      @Deprecated
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 58b343259..18b76ed0f 100644
+index 58b3432590..18b76ed0f7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1667,7 +1667,7 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0372-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch b/Spigot-Server-Patches/0373-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
similarity index 95%
rename from Spigot-Server-Patches/0372-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
rename to Spigot-Server-Patches/0373-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
index 73adb0a89b..f809e9129d 100644
--- a/Spigot-Server-Patches/0372-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
+++ b/Spigot-Server-Patches/0373-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
@@ -1,4 +1,4 @@
-From 85aa39dbc3abe289e50479e679cdef0d6baac6de Mon Sep 17 00:00:00 2001
+From c6aa4fb92ed12be093c17d299f13c766f5b06734 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 63e7f2bce..0138738b3 100644
+index 63e7f2bce7..0138738b33 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -684,7 +684,7 @@ public class WorldServer extends World {
diff --git a/Spigot-Server-Patches/0373-Duplicate-UUID-Resolve-Option.patch b/Spigot-Server-Patches/0374-Duplicate-UUID-Resolve-Option.patch
similarity index 98%
rename from Spigot-Server-Patches/0373-Duplicate-UUID-Resolve-Option.patch
rename to Spigot-Server-Patches/0374-Duplicate-UUID-Resolve-Option.patch
index 3212267e3e..9bc938414f 100644
--- a/Spigot-Server-Patches/0373-Duplicate-UUID-Resolve-Option.patch
+++ b/Spigot-Server-Patches/0374-Duplicate-UUID-Resolve-Option.patch
@@ -1,4 +1,4 @@
-From 4d3393a297882dea5e713803d18a237db3268509 Mon Sep 17 00:00:00 2001
+From 29ae4e3fa5ee62b1b9b004d9e795451ca0d6d861 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 357c7cf1d..2b2c82d5e 100644
+index 357c7cf1df..2b2c82d5ee 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -440,4 +440,43 @@ public class PaperWorldConfig {
@@ -81,7 +81,7 @@ index 357c7cf1d..2b2c82d5e 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index c7c600b80..64c327669 100644
+index c7c600b80c..64c3276692 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -391,6 +391,7 @@ public class Chunk implements IChunkAccess {
@@ -93,7 +93,7 @@ index c7c600b80..64c327669 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 96b0917a3..f0d1a5b14 100644
+index 96b0917a3b..f0d1a5b14d 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2735,6 +2735,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -105,7 +105,7 @@ index 96b0917a3..f0d1a5b14 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 a2b09597f..5fd001170 100644
+index a2b09597f3..5fd001170b 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -1,6 +1,7 @@
@@ -210,7 +210,7 @@ index a2b09597f..5fd001170 100644
  
                      if (list != null) {
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 0138738b3..d59eee27a 100644
+index 0138738b33..d59eee27a1 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;
diff --git a/Spigot-Server-Patches/0374-improve-CraftWorld-isChunkLoaded.patch b/Spigot-Server-Patches/0375-improve-CraftWorld-isChunkLoaded.patch
similarity index 93%
rename from Spigot-Server-Patches/0374-improve-CraftWorld-isChunkLoaded.patch
rename to Spigot-Server-Patches/0375-improve-CraftWorld-isChunkLoaded.patch
index b2f1f6610d..4c6b845931 100644
--- a/Spigot-Server-Patches/0374-improve-CraftWorld-isChunkLoaded.patch
+++ b/Spigot-Server-Patches/0375-improve-CraftWorld-isChunkLoaded.patch
@@ -1,4 +1,4 @@
-From c87b8edb5b45bf1861a3c487d2c8862d9b590166 Mon Sep 17 00:00:00 2001
+From 4cd88e841cae81f8bbcd16d99759cef8092820b9 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 38f61fddf..f773534d9 100644
+index 38f61fddfd..f773534d9a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -404,14 +404,13 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0375-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0376-Configurable-Keep-Spawn-Loaded-range-per-world.patch
similarity index 97%
rename from Spigot-Server-Patches/0375-Configurable-Keep-Spawn-Loaded-range-per-world.patch
rename to Spigot-Server-Patches/0376-Configurable-Keep-Spawn-Loaded-range-per-world.patch
index 327167f8af..dd96531b37 100644
--- a/Spigot-Server-Patches/0375-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/Spigot-Server-Patches/0376-Configurable-Keep-Spawn-Loaded-range-per-world.patch
@@ -1,4 +1,4 @@
-From 77bf85a030697ecce07563ca6319030815f78bc4 Mon Sep 17 00:00:00 2001
+From 8cf203a7fc3b1d8a0356a42e088a75bf69561115 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 2b2c82d5e..778de4630 100644
+index 2b2c82d5ee..778de46305 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -479,4 +479,10 @@ public class PaperWorldConfig {
@@ -21,7 +21,7 @@ index 2b2c82d5e..778de4630 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index be31fef79..6be2e1e2f 100644
+index be31fef799..6be2e1e2ff 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -585,6 +585,14 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -72,7 +72,7 @@ index be31fef79..6be2e1e2f 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 d6762d385..7b6f5b2da 100644
+index d6762d3853..7b6f5b2da0 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 {
@@ -83,7 +83,7 @@ index d6762d385..7b6f5b2da 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 3868572ae..ae77805f7 100644
+index 3868572aed..ae77805f71 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;
@@ -114,7 +114,7 @@ index 3868572ae..ae77805f7 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 d59eee27a..c28c0431a 100644
+index d59eee27a1..c28c0431a2 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1557,13 +1557,85 @@ public class WorldServer extends World {
@@ -207,7 +207,7 @@ index d59eee27a..c28c0431a 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 f773534d9..ceb638c98 100644
+index f773534d9a..ceb638c988 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1906,15 +1906,21 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0376-Fix-some-generation-concurrency-issues.patch b/Spigot-Server-Patches/0377-Fix-some-generation-concurrency-issues.patch
similarity index 99%
rename from Spigot-Server-Patches/0376-Fix-some-generation-concurrency-issues.patch
rename to Spigot-Server-Patches/0377-Fix-some-generation-concurrency-issues.patch
index 75b4a4b115..61d67a07ac 100644
--- a/Spigot-Server-Patches/0376-Fix-some-generation-concurrency-issues.patch
+++ b/Spigot-Server-Patches/0377-Fix-some-generation-concurrency-issues.patch
@@ -1,11 +1,11 @@
-From 2658c1b132e2176ce72f91f6670923ad8349f757 Mon Sep 17 00:00:00 2001
+From 5d67feaf7677b3b4331a45e12ebbabc8ba75463b 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 66e1745836..d7a7720996 100644
+index 1846aacc9a..46c810376e 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -100,6 +100,23 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
diff --git a/Spigot-Server-Patches/0377-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch b/Spigot-Server-Patches/0378-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch
similarity index 89%
rename from Spigot-Server-Patches/0377-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch
rename to Spigot-Server-Patches/0378-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch
index 59d93e05e0..1dc2d0b1e0 100644
--- a/Spigot-Server-Patches/0377-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch
+++ b/Spigot-Server-Patches/0378-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch
@@ -1,4 +1,4 @@
-From 1f992db60d9b4ab3db9479fd43f1d7261080eb84 Mon Sep 17 00:00:00 2001
+From 19ab184d6152d90818930ab6f63665ee2da6c455 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 e8f3e55fd..44289c230 100644
+index e8f3e55fd3..44289c2301 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/0378-ChunkMapDistance-CME.patch b/Spigot-Server-Patches/0379-ChunkMapDistance-CME.patch
similarity index 95%
rename from Spigot-Server-Patches/0378-ChunkMapDistance-CME.patch
rename to Spigot-Server-Patches/0379-ChunkMapDistance-CME.patch
index bc5e031ed7..d9944c4f4c 100644
--- a/Spigot-Server-Patches/0378-ChunkMapDistance-CME.patch
+++ b/Spigot-Server-Patches/0379-ChunkMapDistance-CME.patch
@@ -1,11 +1,11 @@
-From 83d334835999f4e8cca2658fc8abf1a4155c47b9 Mon Sep 17 00:00:00 2001
+From 9f996d0c55e7de903ef5dffc52115917ca3379ed 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 a35f0e18b..8c1945687 100644
+index a35f0e18b5..8c19456875 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/0379-Implement-CraftBlockSoundGroup.patch b/Spigot-Server-Patches/0380-Implement-CraftBlockSoundGroup.patch
similarity index 95%
rename from Spigot-Server-Patches/0379-Implement-CraftBlockSoundGroup.patch
rename to Spigot-Server-Patches/0380-Implement-CraftBlockSoundGroup.patch
index d0f7b70982..830120c1e5 100644
--- a/Spigot-Server-Patches/0379-Implement-CraftBlockSoundGroup.patch
+++ b/Spigot-Server-Patches/0380-Implement-CraftBlockSoundGroup.patch
@@ -1,4 +1,4 @@
-From afaec6e1906c61cd27dc92535b247e489f413462 Mon Sep 17 00:00:00 2001
+From 33328513e7947ba7da892fe021caa8604c4684fe 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 000000000..99f99330d
+index 0000000000..99f99330d0
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/block/CraftBlockSoundGroup.java
 @@ -0,0 +1,38 @@
@@ -49,7 +49,7 @@ index 000000000..99f99330d
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/IBlockData.java b/src/main/java/net/minecraft/server/IBlockData.java
-index c1ff62aa5..de4388165 100644
+index c1ff62aa52..de43881653 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 c1ff62aa5..de4388165 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 b774d2d8d..0184bf3fc 100644
+index b774d2d8d9..0184bf3fc9 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 b774d2d8d..0184bf3fc 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 fa840c3d3..a667e58ed 100644
+index fa840c3d38..a667e58ed2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -697,4 +697,11 @@ public class CraftBlock implements Block {
diff --git a/Spigot-Server-Patches/0380-Chunk-debug-command.patch b/Spigot-Server-Patches/0381-Chunk-debug-command.patch
similarity index 98%
rename from Spigot-Server-Patches/0380-Chunk-debug-command.patch
rename to Spigot-Server-Patches/0381-Chunk-debug-command.patch
index e88235ed9d..91eeff55a7 100644
--- a/Spigot-Server-Patches/0380-Chunk-debug-command.patch
+++ b/Spigot-Server-Patches/0381-Chunk-debug-command.patch
@@ -1,4 +1,4 @@
-From 024bc00a29fe05c6069d8e2e866d97c3f37e9642 Mon Sep 17 00:00:00 2001
+From 6833643e5152ce0860958429c3d807b2c26dedb2 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 d704fc79c..09efbf725 100644
+index d704fc79c0..09efbf7250 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 d704fc79c..09efbf725 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 038b7b68d..9b2bafdbd 100644
+index 038b7b68da..9b2bafdbd1 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 038b7b68d..9b2bafdbd 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 d49e210a3..25a87c2d3 100644
+index d49e210a3c..25a87c2d37 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 d49e210a3..25a87c2d3 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index 3c6fe0596..43d9a5634 100644
+index 3c6fe0596c..43d9a56340 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 3c6fe0596..43d9a5634 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 5fd001170..827831aab 100644
+index 5fd001170b..827831aabc 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 5fd001170..827831aab 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 77bb6b092..7a8397815 100644
+index 77bb6b092a..7a8397815a 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/0381-incremental-chunk-saving.patch b/Spigot-Server-Patches/0382-incremental-chunk-saving.patch
similarity index 97%
rename from Spigot-Server-Patches/0381-incremental-chunk-saving.patch
rename to Spigot-Server-Patches/0382-incremental-chunk-saving.patch
index 80b5cd1725..a5b1aa7d09 100644
--- a/Spigot-Server-Patches/0381-incremental-chunk-saving.patch
+++ b/Spigot-Server-Patches/0382-incremental-chunk-saving.patch
@@ -1,11 +1,11 @@
-From dfd2d1fd27da3b0c1683623ff2686cda4b5b0500 Mon Sep 17 00:00:00 2001
+From c61854173c32b93a6752633b85340a9c1569f058 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 778de4630..99f1541b9 100644
+index 778de46305..99f1541b90 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -485,4 +485,19 @@ public class PaperWorldConfig {
@@ -29,7 +29,7 @@ index 778de4630..99f1541b9 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 64c327669..14ec31f0a 100644
+index 64c3276692..14ec31f0a5 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 64c327669..14ec31f0a 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 9b2bafdbd..f138b112f 100644
+index 9b2bafdbd1..f138b112fe 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -335,6 +335,15 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -62,7 +62,7 @@ index 9b2bafdbd..f138b112f 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 6be2e1e2f..f63269157 100644
+index 6be2e1e2ff..f632691578 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 6be2e1e2f..f63269157 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/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 827831aab..4379434f6 100644
+index 827831aabc..4379434f67 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -298,6 +298,36 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -149,7 +149,7 @@ index 827831aab..4379434f6 100644
          if (flag) {
              List<PlayerChunk> list = (List) this.visibleChunks.values().stream().filter(PlayerChunk::hasBeenLoaded).peek(PlayerChunk::m).collect(Collectors.toList());
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index c28c0431a..4bfa6ea0e 100644
+index c28c0431a2..4bfa6ea0e7 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -791,11 +791,44 @@ public class WorldServer extends World {
diff --git a/Spigot-Server-Patches/0382-Catch-exceptions-from-dispenser-entity-spawns.patch b/Spigot-Server-Patches/0383-Catch-exceptions-from-dispenser-entity-spawns.patch
similarity index 92%
rename from Spigot-Server-Patches/0382-Catch-exceptions-from-dispenser-entity-spawns.patch
rename to Spigot-Server-Patches/0383-Catch-exceptions-from-dispenser-entity-spawns.patch
index e071dd387e..394c648cdb 100644
--- a/Spigot-Server-Patches/0382-Catch-exceptions-from-dispenser-entity-spawns.patch
+++ b/Spigot-Server-Patches/0383-Catch-exceptions-from-dispenser-entity-spawns.patch
@@ -1,11 +1,11 @@
-From 455dd7ab12fef3c54641a8873fdb47f685a6a3e3 Mon Sep 17 00:00:00 2001
+From 892615eecbde89d87f0462d0f8bb9787d5201882 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 abc0cd346..9a8be1474 100644
+index abc0cd3462..9a8be1474d 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/0383-Fix-World-isChunkGenerated-calls.patch b/Spigot-Server-Patches/0384-Fix-World-isChunkGenerated-calls.patch
similarity index 97%
rename from Spigot-Server-Patches/0383-Fix-World-isChunkGenerated-calls.patch
rename to Spigot-Server-Patches/0384-Fix-World-isChunkGenerated-calls.patch
index cb680c9bc9..36e950cd9b 100644
--- a/Spigot-Server-Patches/0383-Fix-World-isChunkGenerated-calls.patch
+++ b/Spigot-Server-Patches/0384-Fix-World-isChunkGenerated-calls.patch
@@ -1,4 +1,4 @@
-From 402cd38be41985a0c39f27179ead31c3365e61ba Mon Sep 17 00:00:00 2001
+From b17621c33805ced9221bf0dc3cf969159b1466bb 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 f138b112f..e9cd44fae 100644
+index f138b112fe..e9cd44fae1 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 f138b112f..e9cd44fae 100644
  
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 6371f2f5b..961228e9d 100644
+index 6371f2f5b1..961228e9df 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -391,6 +391,17 @@ public class ChunkRegionLoader {
@@ -65,7 +65,7 @@ index 6371f2f5b..961228e9d 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 efdf611e6..134a4f0b7 100644
+index efdf611e66..134a4f0b7d 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 efdf611e6..134a4f0b7 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 f0a052eec..2f95174fc 100644
+index f0a052eec2..2f95174fcc 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 f0a052eec..2f95174fc 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 43d9a5634..6f2cca07e 100644
+index 43d9a56340..6f2cca07e0 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
 @@ -70,6 +70,19 @@ public class PlayerChunk {
@@ -132,7 +132,7 @@ index 43d9a5634..6f2cca07e 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 4379434f6..8e2208422 100644
+index 4379434f67..8e22084227 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -898,11 +898,61 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -200,7 +200,7 @@ index 4379434f6..8e2208422 100644
      boolean isOutsideOfRange(ChunkCoordIntPair chunkcoordintpair) {
          // Spigot start
 diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
-index c12fb3c10..4295e2d8d 100644
+index c12fb3c10f..4295e2d8d6 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 {
@@ -249,7 +249,7 @@ index c12fb3c10..4295e2d8d 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 b3d1bb5fd..e07ae9854 100644
+index b3d1bb5fd8..e07ae98540 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 {
@@ -279,7 +279,7 @@ index b3d1bb5fd..e07ae9854 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 ceb638c98..b824518a2 100644
+index ceb638c988..b824518a21 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -18,6 +18,7 @@ import java.util.Objects;
diff --git a/Spigot-Server-Patches/0384-Show-blockstate-location-if-we-failed-to-read-it.patch b/Spigot-Server-Patches/0385-Show-blockstate-location-if-we-failed-to-read-it.patch
similarity index 93%
rename from Spigot-Server-Patches/0384-Show-blockstate-location-if-we-failed-to-read-it.patch
rename to Spigot-Server-Patches/0385-Show-blockstate-location-if-we-failed-to-read-it.patch
index 2ecdc007bb..3a93c6f16c 100644
--- a/Spigot-Server-Patches/0384-Show-blockstate-location-if-we-failed-to-read-it.patch
+++ b/Spigot-Server-Patches/0385-Show-blockstate-location-if-we-failed-to-read-it.patch
@@ -1,11 +1,11 @@
-From 52d9b8603d0a3a173f5f3b5c9fcf5672b9ceb17f Mon Sep 17 00:00:00 2001
+From c55d563741cac88102c70c74269b22594863eff9 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 f6401e2cd..3e22d558e 100644
+index f6401e2cde..3e22d558ea 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/0385-Log-other-thread-in-DataPaletteBlock-lock-failure.patch b/Spigot-Server-Patches/0386-Log-other-thread-in-DataPaletteBlock-lock-failure.patch
similarity index 95%
rename from Spigot-Server-Patches/0385-Log-other-thread-in-DataPaletteBlock-lock-failure.patch
rename to Spigot-Server-Patches/0386-Log-other-thread-in-DataPaletteBlock-lock-failure.patch
index b336dbc8d5..d760925aa2 100644
--- a/Spigot-Server-Patches/0385-Log-other-thread-in-DataPaletteBlock-lock-failure.patch
+++ b/Spigot-Server-Patches/0386-Log-other-thread-in-DataPaletteBlock-lock-failure.patch
@@ -1,4 +1,4 @@
-From 79e67795f2ea7f0d1fc09eb591b9194cb0a80785 Mon Sep 17 00:00:00 2001
+From bf88da807ddb0dc446176b281f7c56fa1ad7ca7f 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 000000000..a3b174618
+index 0000000000..a3b174618d
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/util/ReentrantLockWithGetOwner.java
 @@ -0,0 +1,11 @@
@@ -22,7 +22,7 @@ index 000000000..a3b174618
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/DataPaletteBlock.java b/src/main/java/net/minecraft/server/DataPaletteBlock.java
-index d5f5a5187..2c1d1b1a5 100644
+index d5f5a51872..2c1d1b1a55 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/0386-Use-ChunkStatus-cache-when-saving-protochunks.patch b/Spigot-Server-Patches/0387-Use-ChunkStatus-cache-when-saving-protochunks.patch
similarity index 92%
rename from Spigot-Server-Patches/0386-Use-ChunkStatus-cache-when-saving-protochunks.patch
rename to Spigot-Server-Patches/0387-Use-ChunkStatus-cache-when-saving-protochunks.patch
index 0ea12c5341..69177dc7b1 100644
--- a/Spigot-Server-Patches/0386-Use-ChunkStatus-cache-when-saving-protochunks.patch
+++ b/Spigot-Server-Patches/0387-Use-ChunkStatus-cache-when-saving-protochunks.patch
@@ -1,4 +1,4 @@
-From af640b35e671ce1e35457e716f8f0f74fae58f6b Mon Sep 17 00:00:00 2001
+From cefa16377ffe16c3bc283b3dc6f449e956bb35f3 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 8e2208422..cbab813d9 100644
+index 8e22084227..cbab813d94 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -775,8 +775,10 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
diff --git a/Spigot-Server-Patches/0387-Anti-Xray.patch b/Spigot-Server-Patches/0388-Anti-Xray.patch
similarity index 99%
rename from Spigot-Server-Patches/0387-Anti-Xray.patch
rename to Spigot-Server-Patches/0388-Anti-Xray.patch
index 00a83d8442..85c63bac5c 100644
--- a/Spigot-Server-Patches/0387-Anti-Xray.patch
+++ b/Spigot-Server-Patches/0388-Anti-Xray.patch
@@ -1,11 +1,11 @@
-From b023a025f9e7e5960b1b4b52ceaeb10a6935f5fc Mon Sep 17 00:00:00 2001
+From 288969b67635f4db3e6dce73fbb0b4e8c294195d 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
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 99f1541b9..6634ef923 100644
+index 99f1541b90..6634ef923a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -1,7 +1,11 @@
@@ -66,7 +66,7 @@ index 99f1541b9..6634ef923 100644
  }
 diff --git a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockController.java b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockController.java
 new file mode 100644
-index 000000000..f7e376ce6
+index 0000000000..f7e376ce6a
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockController.java
 @@ -0,0 +1,46 @@
@@ -118,7 +118,7 @@ index 000000000..f7e376ce6
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java
 new file mode 100644
-index 000000000..23626bef3
+index 0000000000..23626bef3a
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java
 @@ -0,0 +1,782 @@
@@ -906,7 +906,7 @@ index 000000000..23626bef3
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketInfo.java b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketInfo.java
 new file mode 100644
-index 000000000..a68bace35
+index 0000000000..a68bace353
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketInfo.java
 @@ -0,0 +1,81 @@
@@ -993,7 +993,7 @@ index 000000000..a68bace35
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketInfoAntiXray.java b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketInfoAntiXray.java
 new file mode 100644
-index 000000000..067dfb2f1
+index 0000000000..067dfb2f14
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketInfoAntiXray.java
 @@ -0,0 +1,31 @@
@@ -1030,7 +1030,7 @@ index 000000000..067dfb2f1
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/antixray/DataBitsReader.java b/src/main/java/com/destroystokyo/paper/antixray/DataBitsReader.java
 new file mode 100644
-index 000000000..cc586827a
+index 0000000000..cc586827aa
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/antixray/DataBitsReader.java
 @@ -0,0 +1,56 @@
@@ -1092,7 +1092,7 @@ index 000000000..cc586827a
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/antixray/DataBitsWriter.java b/src/main/java/com/destroystokyo/paper/antixray/DataBitsWriter.java
 new file mode 100644
-index 000000000..37093419c
+index 0000000000..37093419cf
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/antixray/DataBitsWriter.java
 @@ -0,0 +1,84 @@
@@ -1181,7 +1181,7 @@ index 000000000..37093419c
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 14ec31f0a..863a2222f 100644
+index 14ec31f0a5..863a2222f5 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -315,7 +315,7 @@ public class Chunk implements IChunkAccess {
@@ -1194,7 +1194,7 @@ index 14ec31f0a..863a2222f 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 961228e9d..a950ad801 100644
+index 961228e9df..a950ad801d 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -57,7 +57,7 @@ public class ChunkRegionLoader {
@@ -1216,7 +1216,7 @@ index 961228e9d..a950ad801 100644
              protochunk.a(biomestorage);
              object = protochunk;
 diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java
-index 0d5deee36..4526527ac 100644
+index 0d5deee365..4526527aca 100644
 --- a/src/main/java/net/minecraft/server/ChunkSection.java
 +++ b/src/main/java/net/minecraft/server/ChunkSection.java
 @@ -6,21 +6,31 @@ public class ChunkSection {
@@ -1255,7 +1255,7 @@ index 0d5deee36..4526527ac 100644
  
      public IBlockData getType(int i, int j, int k) {
 diff --git a/src/main/java/net/minecraft/server/DataPaletteBlock.java b/src/main/java/net/minecraft/server/DataPaletteBlock.java
-index 2c1d1b1a5..44aed6727 100644
+index 2c1d1b1a55..44aed67274 100644
 --- a/src/main/java/net/minecraft/server/DataPaletteBlock.java
 +++ b/src/main/java/net/minecraft/server/DataPaletteBlock.java
 @@ -3,6 +3,7 @@ package net.minecraft.server;
@@ -1377,7 +1377,7 @@ index 2c1d1b1a5..44aed6727 100644
  
          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 e156804f7..96a785af2 100644
+index e156804f7a..96a785af27 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -42,7 +42,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -1440,7 +1440,7 @@ index e156804f7..96a785af2 100644
      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 47710067a..ef7ade797 100644
+index 47710067a6..ef7ade797b 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 @@ -1,5 +1,6 @@
@@ -1533,7 +1533,7 @@ index 47710067a..ef7ade797 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index 6f2cca07e..7a1578afa 100644
+index 6f2cca07e0..7a1578afaa 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
 @@ -176,6 +176,11 @@ public class PlayerChunk {
@@ -1558,7 +1558,7 @@ index 6f2cca07e..7a1578afa 100644
                  this.a(new PacketPlayOutMultiBlockChange(this.dirtyCount, this.dirtyBlocks, chunk), false);
  
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index cbab813d9..6a54ccb86 100644
+index cbab813d94..6a54ccb864 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -540,7 +540,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -1580,7 +1580,7 @@ index cbab813d9..6a54ccb86 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index 18ff6dd68..8720dd120 100644
+index 18ff6dd686..8720dd1209 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
 @@ -264,6 +264,8 @@ public class PlayerInteractManager {
@@ -1593,7 +1593,7 @@ index 18ff6dd68..8720dd120 100644
  
      public void a(BlockPosition blockposition, PacketPlayInBlockDig.EnumPlayerDigType packetplayinblockdig_enumplayerdigtype, String s) {
 diff --git a/src/main/java/net/minecraft/server/ProtoChunk.java b/src/main/java/net/minecraft/server/ProtoChunk.java
-index 39339fa27..f376e2106 100644
+index 39339fa275..f376e21068 100644
 --- a/src/main/java/net/minecraft/server/ProtoChunk.java
 +++ b/src/main/java/net/minecraft/server/ProtoChunk.java
 @@ -45,16 +45,28 @@ public class ProtoChunk implements IChunkAccess {
@@ -1636,7 +1636,7 @@ index 39339fa27..f376e2106 100644
  
          return this.j[i];
 diff --git a/src/main/java/net/minecraft/server/TicketType.java b/src/main/java/net/minecraft/server/TicketType.java
-index a905a29e7..335b64435 100644
+index a905a29e75..335b644351 100644
 --- a/src/main/java/net/minecraft/server/TicketType.java
 +++ b/src/main/java/net/minecraft/server/TicketType.java
 @@ -21,6 +21,7 @@ public class TicketType<T> {
@@ -1648,7 +1648,7 @@ index a905a29e7..335b64435 100644
      public static <T> TicketType<T> a(String s, Comparator<T> comparator) {
          return new TicketType<>(s, comparator, 0L);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index e80cb3b97..985f30372 100644
+index 46c810376e..fcc013d803 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -2,6 +2,8 @@ package net.minecraft.server;
@@ -1676,7 +1676,7 @@ index e80cb3b97..985f30372 100644
          this.generator = gen;
          this.world = new CraftWorld((WorldServer) this, gen, env);
          this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
-@@ -358,6 +362,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -363,6 +367,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
              // CraftBukkit end
  
              IBlockData iblockdata1 = chunk.setType(blockposition, iblockdata, (i & 64) != 0, (i & 1024) == 0); // CraftBukkit custom NO_PLACE flag
@@ -1685,7 +1685,7 @@ index e80cb3b97..985f30372 100644
              if (iblockdata1 == null) {
                  // CraftBukkit start - remove blockstate if failed
 diff --git a/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java b/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java
-index 7772d5900..4570ed999 100644
+index 7772d59005..4570ed9991 100644
 --- a/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java
 +++ b/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java
 @@ -21,9 +21,11 @@ public final class CraftChunkData implements ChunkGenerator.ChunkData {
diff --git a/Spigot-Server-Patches/0388-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/Spigot-Server-Patches/0389-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
similarity index 95%
rename from Spigot-Server-Patches/0388-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
rename to Spigot-Server-Patches/0389-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
index a8b4191c77..bb3b8466fe 100644
--- a/Spigot-Server-Patches/0388-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
+++ b/Spigot-Server-Patches/0389-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
@@ -1,4 +1,4 @@
-From 09480f5f29d007a061700da21de8d4af42f509e4 Mon Sep 17 00:00:00 2001
+From 9a85a6ce658aa5a9e2acf2a67353c3a8ed2cd717 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
@@ -17,7 +17,7 @@ This should fully solve all of the issues around it so that only natural
 influences natural spawns.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 6634ef923..2f0b06dc5 100644
+index 6634ef923a..2f0b06dc55 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -505,6 +505,16 @@ public class PaperWorldConfig {
@@ -38,7 +38,7 @@ index 6634ef923..2f0b06dc5 100644
      public boolean asynchronous;
      public EngineMode engineMode;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 4bfa6ea0e..733f3e10e 100644
+index 4bfa6ea0e7..733f3e10ef 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -934,6 +934,13 @@ public class WorldServer extends World {
diff --git a/Spigot-Server-Patches/0389-Configurable-projectile-relative-velocity.patch b/Spigot-Server-Patches/0390-Configurable-projectile-relative-velocity.patch
similarity index 95%
rename from Spigot-Server-Patches/0389-Configurable-projectile-relative-velocity.patch
rename to Spigot-Server-Patches/0390-Configurable-projectile-relative-velocity.patch
index af4a082b11..71e07b0992 100644
--- a/Spigot-Server-Patches/0389-Configurable-projectile-relative-velocity.patch
+++ b/Spigot-Server-Patches/0390-Configurable-projectile-relative-velocity.patch
@@ -1,4 +1,4 @@
-From f3379bf46a0891085e516fa895d126e8ecca5105 Mon Sep 17 00:00:00 2001
+From ab900cea1b5588387881ee6687f298f4e6b7a811 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
@@ -25,7 +25,7 @@ P3) Solutions for 1) and especially 2) might not be future-proof, while this
 server-internal fix makes this change future-proof.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 2f0b06dc5..0fc77ac28 100644
+index 2f0b06dc55..0fc77ac287 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -553,4 +553,9 @@ public class PaperWorldConfig {
@@ -39,7 +39,7 @@ index 2f0b06dc5..0fc77ac28 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
-index 0c3664758..288259e49 100644
+index 634e2bd304..9c97edf9c9 100644
 --- a/src/main/java/net/minecraft/server/EntityArrow.java
 +++ b/src/main/java/net/minecraft/server/EntityArrow.java
 @@ -85,7 +85,7 @@ public abstract class EntityArrow extends Entity implements IProjectile {
@@ -52,7 +52,7 @@ index 0c3664758..288259e49 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java
-index 6c091b680..f5c8074dc 100644
+index 6c091b6808..f5c8074dcf 100644
 --- a/src/main/java/net/minecraft/server/EntityProjectile.java
 +++ b/src/main/java/net/minecraft/server/EntityProjectile.java
 @@ -43,7 +43,7 @@ public abstract class EntityProjectile extends Entity implements IProjectile {
diff --git a/Spigot-Server-Patches/0390-Mark-entities-as-being-ticked-when-notifying-navigat.patch b/Spigot-Server-Patches/0391-Mark-entities-as-being-ticked-when-notifying-navigat.patch
similarity index 91%
rename from Spigot-Server-Patches/0390-Mark-entities-as-being-ticked-when-notifying-navigat.patch
rename to Spigot-Server-Patches/0391-Mark-entities-as-being-ticked-when-notifying-navigat.patch
index 659c2543ba..f51bc2d7ab 100644
--- a/Spigot-Server-Patches/0390-Mark-entities-as-being-ticked-when-notifying-navigat.patch
+++ b/Spigot-Server-Patches/0391-Mark-entities-as-being-ticked-when-notifying-navigat.patch
@@ -1,11 +1,11 @@
-From 11ef54b9b193bd1ce013dac43eb18c7d0e93a6a5 Mon Sep 17 00:00:00 2001
+From d086e8f6567f4a4ff33aff067a9bbf33a08c80c2 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 733f3e10e..049d4ef4e 100644
+index 733f3e10ef..049d4ef4ee 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1371,6 +1371,7 @@ public class WorldServer extends World {
diff --git a/Spigot-Server-Patches/0391-offset-item-frame-ticking.patch b/Spigot-Server-Patches/0392-offset-item-frame-ticking.patch
similarity index 88%
rename from Spigot-Server-Patches/0391-offset-item-frame-ticking.patch
rename to Spigot-Server-Patches/0392-offset-item-frame-ticking.patch
index 70924e4255..8af26dbfbb 100644
--- a/Spigot-Server-Patches/0391-offset-item-frame-ticking.patch
+++ b/Spigot-Server-Patches/0392-offset-item-frame-ticking.patch
@@ -1,11 +1,11 @@
-From 123b916f6bd1693d07c8f04ef9c4d3e88f852406 Mon Sep 17 00:00:00 2001
+From 197465af8ed1a4c66a36adefa13a7b923cd3cc32 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 e9cde9c6e..04864a36e 100644
+index e9cde9c6e7..04864a36ef 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/0392-Avoid-hopper-searches-if-there-are-no-items.patch b/Spigot-Server-Patches/0393-Avoid-hopper-searches-if-there-are-no-items.patch
similarity index 97%
rename from Spigot-Server-Patches/0392-Avoid-hopper-searches-if-there-are-no-items.patch
rename to Spigot-Server-Patches/0393-Avoid-hopper-searches-if-there-are-no-items.patch
index c96004dc0c..e64134d19b 100644
--- a/Spigot-Server-Patches/0392-Avoid-hopper-searches-if-there-are-no-items.patch
+++ b/Spigot-Server-Patches/0393-Avoid-hopper-searches-if-there-are-no-items.patch
@@ -1,4 +1,4 @@
-From a11c674e76dba82e797e970fefe89accb67b2769 Mon Sep 17 00:00:00 2001
+From c3d22601f3a549f38d3346fdf47e94cdf2b60360 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 863a2222f..f2a04cb6a 100644
+index 863a2222f5..f2a04cb6a0 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 {
@@ -85,7 +85,7 @@ index 863a2222f..f2a04cb6a 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 498f38109..a2d1ef360 100644
+index 498f381099..a2d1ef3602 100644
 --- a/src/main/java/net/minecraft/server/IEntitySelector.java
 +++ b/src/main/java/net/minecraft/server/IEntitySelector.java
 @@ -11,6 +11,7 @@ public final class IEntitySelector {
diff --git a/Spigot-Server-Patches/0393-Fixed-MC-156852.patch b/Spigot-Server-Patches/0394-Fixed-MC-156852.patch
similarity index 93%
rename from Spigot-Server-Patches/0393-Fixed-MC-156852.patch
rename to Spigot-Server-Patches/0394-Fixed-MC-156852.patch
index f243796edd..c83ab023db 100644
--- a/Spigot-Server-Patches/0393-Fixed-MC-156852.patch
+++ b/Spigot-Server-Patches/0394-Fixed-MC-156852.patch
@@ -1,4 +1,4 @@
-From 603fa201cf4d51981a9fe52bf46c79bca9c93118 Mon Sep 17 00:00:00 2001
+From ff366a3dddb05e9289dc6f54f0787ca587b1832e Mon Sep 17 00:00:00 2001
 From: TheGreatKetchup <TheGreatKetchup@users.noreply.github.com>
 Date: Thu, 1 Aug 2019 21:24:30 -0400
 Subject: [PATCH] Fixed MC-156852
@@ -12,7 +12,7 @@ issue in 1.8-1.12.
 Originally solved by Gnembon on MC-5694 at bugs.mojang.com
 
 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index 8720dd120..cc77dd8e5 100644
+index 8720dd1209..cc77dd8e54 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
 @@ -223,7 +223,7 @@ public class PlayerInteractManager {
diff --git a/Spigot-Server-Patches/0394-Asynchronous-chunk-IO-and-loading.patch b/Spigot-Server-Patches/0395-Asynchronous-chunk-IO-and-loading.patch
similarity index 99%
rename from Spigot-Server-Patches/0394-Asynchronous-chunk-IO-and-loading.patch
rename to Spigot-Server-Patches/0395-Asynchronous-chunk-IO-and-loading.patch
index 28e40a7d56..438950fd0e 100644
--- a/Spigot-Server-Patches/0394-Asynchronous-chunk-IO-and-loading.patch
+++ b/Spigot-Server-Patches/0395-Asynchronous-chunk-IO-and-loading.patch
@@ -1,4 +1,4 @@
-From 554643a97a096ef6b744326dc35ac2999fb331a4 Mon Sep 17 00:00:00 2001
+From 224c34dfa40d0ef432f6fee9682155b3e309a914 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
@@ -121,7 +121,7 @@ tasks required to be executed by the chunk load task (i.e lighting
 and some poi tasks).
 
 diff --git a/src/main/java/co/aikar/timings/WorldTimingsHandler.java b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
-index 3a79cde59..8de6c4816 100644
+index 3a79cde595..8de6c4816c 100644
 --- a/src/main/java/co/aikar/timings/WorldTimingsHandler.java
 +++ b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
 @@ -63,6 +63,17 @@ public class WorldTimingsHandler {
@@ -161,7 +161,7 @@ index 3a79cde59..8de6c4816 100644
  
      public static Timing getTickList(WorldServer worldserver, String timingsType) {
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 546a1cfe0..1d7d1ffbf 100644
+index 546a1cfe0a..1d7d1ffbf7 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -1,5 +1,6 @@
@@ -237,7 +237,7 @@ index 546a1cfe0..1d7d1ffbf 100644
 +    }
  }
 diff --git a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java
-index 23626bef3..1edcecd2e 100644
+index 23626bef3a..1edcecd2ee 100644
 --- a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java
 +++ b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java
 @@ -9,6 +9,7 @@ import java.util.concurrent.Executors;
@@ -318,7 +318,7 @@ index 23626bef3..1edcecd2e 100644
  
 diff --git a/src/main/java/com/destroystokyo/paper/io/IOUtil.java b/src/main/java/com/destroystokyo/paper/io/IOUtil.java
 new file mode 100644
-index 000000000..5af0ac3d9
+index 0000000000..5af0ac3d9e
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/io/IOUtil.java
 @@ -0,0 +1,62 @@
@@ -386,7 +386,7 @@ index 000000000..5af0ac3d9
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/io/PaperFileIOThread.java b/src/main/java/com/destroystokyo/paper/io/PaperFileIOThread.java
 new file mode 100644
-index 000000000..4f10a8311
+index 0000000000..4f10a8311e
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/io/PaperFileIOThread.java
 @@ -0,0 +1,661 @@
@@ -1053,7 +1053,7 @@ index 000000000..4f10a8311
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/io/PrioritizedTaskQueue.java b/src/main/java/com/destroystokyo/paper/io/PrioritizedTaskQueue.java
 new file mode 100644
-index 000000000..78bd238f4
+index 0000000000..78bd238f4c
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/io/PrioritizedTaskQueue.java
 @@ -0,0 +1,276 @@
@@ -1335,7 +1335,7 @@ index 000000000..78bd238f4
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/io/QueueExecutorThread.java b/src/main/java/com/destroystokyo/paper/io/QueueExecutorThread.java
 new file mode 100644
-index 000000000..ee906b594
+index 0000000000..ee906b594b
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/io/QueueExecutorThread.java
 @@ -0,0 +1,241 @@
@@ -1582,7 +1582,7 @@ index 000000000..ee906b594
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/io/chunk/ChunkLoadTask.java b/src/main/java/com/destroystokyo/paper/io/chunk/ChunkLoadTask.java
 new file mode 100644
-index 000000000..305da4786
+index 0000000000..305da47868
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/io/chunk/ChunkLoadTask.java
 @@ -0,0 +1,149 @@
@@ -1737,7 +1737,7 @@ index 000000000..305da4786
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/io/chunk/ChunkSaveTask.java b/src/main/java/com/destroystokyo/paper/io/chunk/ChunkSaveTask.java
 new file mode 100644
-index 000000000..60312b85f
+index 0000000000..60312b85f9
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/io/chunk/ChunkSaveTask.java
 @@ -0,0 +1,112 @@
@@ -1855,7 +1855,7 @@ index 000000000..60312b85f
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/io/chunk/ChunkTask.java b/src/main/java/com/destroystokyo/paper/io/chunk/ChunkTask.java
 new file mode 100644
-index 000000000..1dfa8abfd
+index 0000000000..1dfa8abfd8
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/io/chunk/ChunkTask.java
 @@ -0,0 +1,40 @@
@@ -1901,7 +1901,7 @@ index 000000000..1dfa8abfd
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/io/chunk/ChunkTaskManager.java b/src/main/java/com/destroystokyo/paper/io/chunk/ChunkTaskManager.java
 new file mode 100644
-index 000000000..59d73bfad
+index 0000000000..59d73bfad7
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/io/chunk/ChunkTaskManager.java
 @@ -0,0 +1,453 @@
@@ -2359,7 +2359,7 @@ index 000000000..59d73bfad
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index e9cd44fae..1f6b1c4f1 100644
+index e9cd44fae1..1f6b1c4f16 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -124,11 +124,137 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -2529,7 +2529,7 @@ index e9cd44fae..1f6b1c4f1 100644
          } finally {
              playerChunkMap.callbackExecutor.run();
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index a950ad801..26f1a4b09 100644
+index a950ad801d..26f1a4b095 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -6,6 +6,7 @@ import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
@@ -2798,7 +2798,7 @@ index a950ad801..26f1a4b09 100644
  
          nbttagcompound1.set("PostProcessing", a(ichunkaccess.l()));
 diff --git a/src/main/java/net/minecraft/server/ChunkStatus.java b/src/main/java/net/minecraft/server/ChunkStatus.java
-index 134a4f0b7..88f167461 100644
+index 134a4f0b7d..88f1674616 100644
 --- a/src/main/java/net/minecraft/server/ChunkStatus.java
 +++ b/src/main/java/net/minecraft/server/ChunkStatus.java
 @@ -153,6 +153,7 @@ public class ChunkStatus {
@@ -2810,7 +2810,7 @@ index 134a4f0b7..88f167461 100644
          return ChunkStatus.r.getInt(chunkstatus.c());
      }
 diff --git a/src/main/java/net/minecraft/server/IAsyncTaskHandler.java b/src/main/java/net/minecraft/server/IAsyncTaskHandler.java
-index 721021791..f7156acb8 100644
+index 7210217913..f7156acb89 100644
 --- a/src/main/java/net/minecraft/server/IAsyncTaskHandler.java
 +++ b/src/main/java/net/minecraft/server/IAsyncTaskHandler.java
 @@ -91,7 +91,7 @@ public abstract class IAsyncTaskHandler<R extends Runnable> implements Mailbox<R
@@ -2823,7 +2823,7 @@ index 721021791..f7156acb8 100644
              ;
          }
 diff --git a/src/main/java/net/minecraft/server/IChunkLoader.java b/src/main/java/net/minecraft/server/IChunkLoader.java
-index 2f95174fc..134c76065 100644
+index 2f95174fcc..134c76065b 100644
 --- a/src/main/java/net/minecraft/server/IChunkLoader.java
 +++ b/src/main/java/net/minecraft/server/IChunkLoader.java
 @@ -3,37 +3,49 @@ package net.minecraft.server;
@@ -2948,7 +2948,7 @@ index 2f95174fc..134c76065 100644
 +//    Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
-index 25a87c2d3..c02c53b50 100644
+index 25a87c2d37..c02c53b50b 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
 @@ -530,4 +530,9 @@ public final class MCUtil {
@@ -2962,7 +2962,7 @@ index 25a87c2d3..c02c53b50 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index f63269157..664c48d68 100644
+index f632691578..664c48d688 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -788,6 +788,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -2974,7 +2974,7 @@ index f63269157..664c48d68 100644
  
      public String getServerIp() {
 diff --git a/src/main/java/net/minecraft/server/NextTickListEntry.java b/src/main/java/net/minecraft/server/NextTickListEntry.java
-index e9c405fb5..33cfeabde 100644
+index e9c405fb53..33cfeabdee 100644
 --- a/src/main/java/net/minecraft/server/NextTickListEntry.java
 +++ b/src/main/java/net/minecraft/server/NextTickListEntry.java
 @@ -4,7 +4,7 @@ import java.util.Comparator;
@@ -2996,7 +2996,7 @@ index e9c405fb5..33cfeabde 100644
          this.e = t0;
          this.b = i;
 diff --git a/src/main/java/net/minecraft/server/NibbleArray.java b/src/main/java/net/minecraft/server/NibbleArray.java
-index ed8c4a87b..996c83263 100644
+index ed8c4a87b5..996c832638 100644
 --- a/src/main/java/net/minecraft/server/NibbleArray.java
 +++ b/src/main/java/net/minecraft/server/NibbleArray.java
 @@ -71,6 +71,7 @@ public class NibbleArray {
@@ -3008,7 +3008,7 @@ index ed8c4a87b..996c83263 100644
          return this.a == null ? new NibbleArray() : new NibbleArray((byte[]) this.a.clone());
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index 7a1578afa..0fb9c1e44 100644
+index 7a1578afaa..0fb9c1e441 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
 @@ -310,7 +310,7 @@ public class PlayerChunk {
@@ -3034,7 +3034,7 @@ index 7a1578afa..0fb9c1e44 100644
                  completablefuture = (CompletableFuture) this.statusFutures.get(i);
                  if (completablefuture != null) {
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 6a54ccb86..fce37d0d6 100644
+index 6a54ccb864..fce37d0d67 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -63,7 +63,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -3542,7 +3542,7 @@ index 6a54ccb86..fce37d0d6 100644
          return this.m;
      }
 diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
-index 4295e2d8d..d0354531d 100644
+index 4295e2d8d6..d0354531d3 100644
 --- a/src/main/java/net/minecraft/server/RegionFile.java
 +++ b/src/main/java/net/minecraft/server/RegionFile.java
 @@ -224,7 +224,7 @@ public class RegionFile implements AutoCloseable {
@@ -3564,7 +3564,7 @@ index 4295e2d8d..d0354531d 100644
          try {
              this.c();
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index e07ae9854..d927f9321 100644
+index e07ae98540..d927f93211 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
 @@ -9,7 +9,7 @@ import java.io.File;
@@ -3610,7 +3610,7 @@ index e07ae9854..d927f9321 100644
  
          return regionfile != null ? regionfile.chunkExists(pos) : false;
 diff --git a/src/main/java/net/minecraft/server/RegionFileSection.java b/src/main/java/net/minecraft/server/RegionFileSection.java
-index db9f0196b..a6d8ef5eb 100644
+index db9f0196bd..a6d8ef5eb4 100644
 --- a/src/main/java/net/minecraft/server/RegionFileSection.java
 +++ b/src/main/java/net/minecraft/server/RegionFileSection.java
 @@ -20,28 +20,29 @@ import javax.annotation.Nullable;
@@ -3746,7 +3746,7 @@ index db9f0196b..a6d8ef5eb 100644
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/TicketType.java b/src/main/java/net/minecraft/server/TicketType.java
-index 335b64435..481d95480 100644
+index 335b644351..481d954808 100644
 --- a/src/main/java/net/minecraft/server/TicketType.java
 +++ b/src/main/java/net/minecraft/server/TicketType.java
 @@ -22,6 +22,7 @@ public class TicketType<T> {
@@ -3758,7 +3758,7 @@ index 335b64435..481d95480 100644
      public static <T> TicketType<T> a(String s, Comparator<T> comparator) {
          return new TicketType<>(s, comparator, 0L);
 diff --git a/src/main/java/net/minecraft/server/VillagePlace.java b/src/main/java/net/minecraft/server/VillagePlace.java
-index c999f8c9b..b59ef1a63 100644
+index c999f8c9bf..b59ef1a633 100644
 --- a/src/main/java/net/minecraft/server/VillagePlace.java
 +++ b/src/main/java/net/minecraft/server/VillagePlace.java
 @@ -24,8 +24,16 @@ public class VillagePlace extends RegionFileSection<VillagePlaceSection> {
@@ -3847,7 +3847,7 @@ index c999f8c9b..b59ef1a63 100644
  
          HAS_SPACE(VillagePlaceRecord::d), IS_OCCUPIED(VillagePlaceRecord::e), ANY((villageplacerecord) -> {
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 049d4ef4e..59b2fc629 100644
+index 049d4ef4ee..59b2fc6297 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -81,6 +81,79 @@ public class WorldServer extends World {
@@ -3940,7 +3940,7 @@ index 049d4ef4e..59b2fc629 100644
  
      // CraftBukkit start
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index b824518a2..739968a69 100644
+index b824518a21..739968a69b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -555,22 +555,23 @@ public class CraftWorld implements World {
@@ -4002,7 +4002,7 @@ index b824518a2..739968a69 100644
      @Override
      public int getViewDistance() {
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index a1d93200e..6ca0ebfde 100644
+index a1d93200e6..6ca0ebfdee 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
 @@ -6,6 +6,7 @@ import java.lang.management.ThreadInfo;
diff --git a/Spigot-Server-Patches/0395-Use-getChunkIfLoadedImmediately-in-places.patch b/Spigot-Server-Patches/0396-Use-getChunkIfLoadedImmediately-in-places.patch
similarity index 96%
rename from Spigot-Server-Patches/0395-Use-getChunkIfLoadedImmediately-in-places.patch
rename to Spigot-Server-Patches/0396-Use-getChunkIfLoadedImmediately-in-places.patch
index 0184c40d37..7872ac834b 100644
--- a/Spigot-Server-Patches/0395-Use-getChunkIfLoadedImmediately-in-places.patch
+++ b/Spigot-Server-Patches/0396-Use-getChunkIfLoadedImmediately-in-places.patch
@@ -1,4 +1,4 @@
-From 914a609ce5874bb04211ccd2cca2f7f6452acb66 Mon Sep 17 00:00:00 2001
+From b9bb2bda54faef996b8bd0d87e974b1c69318bcb 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
@@ -34,7 +34,7 @@ index 8c54022e07..f6fbba36f4 100644
                                  return;
                              }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 1262e0097f..f701e079db 100644
+index fcc013d803..b0bfa2602b 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -130,8 +130,16 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -55,7 +55,7 @@ index 1262e0097f..f701e079db 100644
  
      protected World(WorldData worlddata, DimensionManager dimensionmanager, BiFunction<World, WorldProvider, IChunkProvider> bifunction, GameProfilerFiller gameprofilerfiller, boolean flag, org.bukkit.generator.ChunkGenerator gen, org.bukkit.World.Environment env) {
          this.spigotConfig = new org.spigotmc.SpigotWorldConfig( worlddata.getName() ); // Spigot
-@@ -1123,14 +1131,14 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -1128,14 +1136,14 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
      }
  
      public boolean n(BlockPosition blockposition) {
diff --git a/Spigot-Server-Patches/0396-Reduce-sync-loads.patch b/Spigot-Server-Patches/0397-Reduce-sync-loads.patch
similarity index 97%
rename from Spigot-Server-Patches/0396-Reduce-sync-loads.patch
rename to Spigot-Server-Patches/0397-Reduce-sync-loads.patch
index 908bd04577..292970796f 100644
--- a/Spigot-Server-Patches/0396-Reduce-sync-loads.patch
+++ b/Spigot-Server-Patches/0397-Reduce-sync-loads.patch
@@ -1,4 +1,4 @@
-From e4b7f58ef87523749b79982993f6d6ce1ff867e4 Mon Sep 17 00:00:00 2001
+From 6597437c3be4202f87ee7aa19084b30a14f5a5c1 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
@@ -280,10 +280,10 @@ index 1f6b1c4f16..58654f4538 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 f701e079db..0baa884bbf 100644
+index b0bfa2602b..2c92d3390a 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1186,7 +1186,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -1191,7 +1191,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
  
          for (int i1 = i; i1 <= j; ++i1) {
              for (int j1 = k; j1 <= l; ++j1) {
@@ -292,7 +292,7 @@ index f701e079db..0baa884bbf 100644
  
                  if (chunk != null) {
                      chunk.a(entity, axisalignedbb, list, predicate);
-@@ -1206,7 +1206,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -1211,7 +1211,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
  
          for (int i1 = i; i1 < j; ++i1) {
              for (int j1 = k; j1 < l; ++j1) {
@@ -301,7 +301,7 @@ index f701e079db..0baa884bbf 100644
  
                  if (chunk != null) {
                      chunk.a(entitytypes, axisalignedbb, list, predicate);
-@@ -1228,7 +1228,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -1233,7 +1233,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
  
          for (int i1 = i; i1 < j; ++i1) {
              for (int j1 = k; j1 < l; ++j1) {
diff --git a/Spigot-Server-Patches/0397-Implement-alternative-item-despawn-rate.patch b/Spigot-Server-Patches/0398-Implement-alternative-item-despawn-rate.patch
similarity index 98%
rename from Spigot-Server-Patches/0397-Implement-alternative-item-despawn-rate.patch
rename to Spigot-Server-Patches/0398-Implement-alternative-item-despawn-rate.patch
index a61da627c9..f6494af363 100644
--- a/Spigot-Server-Patches/0397-Implement-alternative-item-despawn-rate.patch
+++ b/Spigot-Server-Patches/0398-Implement-alternative-item-despawn-rate.patch
@@ -1,4 +1,4 @@
-From a3ce0687113e7435466aa6425bb1b1d016444c96 Mon Sep 17 00:00:00 2001
+From bbfda228c1b88bf6ab10d4ec1e2078abdc0146ff 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/0398-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch b/Spigot-Server-Patches/0399-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
similarity index 97%
rename from Spigot-Server-Patches/0398-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
rename to Spigot-Server-Patches/0399-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
index f5f97a23e2..96cf7a7018 100644
--- a/Spigot-Server-Patches/0398-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
+++ b/Spigot-Server-Patches/0399-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
@@ -1,4 +1,4 @@
-From 738eb7de57934483c0a8ecb4f3cd8195de2ddc91 Mon Sep 17 00:00:00 2001
+From f06f45d1b44c70f9ef4bdd0609fe3d9c192fcfef 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
diff --git a/Spigot-Server-Patches/0399-Fix-MC-158900.patch b/Spigot-Server-Patches/0400-Fix-MC-158900.patch
similarity index 95%
rename from Spigot-Server-Patches/0399-Fix-MC-158900.patch
rename to Spigot-Server-Patches/0400-Fix-MC-158900.patch
index 45d178670a..ab001f660b 100644
--- a/Spigot-Server-Patches/0399-Fix-MC-158900.patch
+++ b/Spigot-Server-Patches/0400-Fix-MC-158900.patch
@@ -1,4 +1,4 @@
-From d6f295929cac80322a5f226500da150518ca05ca Mon Sep 17 00:00:00 2001
+From 5eed901d5840bd3011f06acbdbce04ad5f2f89f7 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
diff --git a/Spigot-Server-Patches/0400-implement-optional-per-player-mob-spawns.patch b/Spigot-Server-Patches/0401-implement-optional-per-player-mob-spawns.patch
similarity index 99%
rename from Spigot-Server-Patches/0400-implement-optional-per-player-mob-spawns.patch
rename to Spigot-Server-Patches/0401-implement-optional-per-player-mob-spawns.patch
index c137467f72..6deb6f8c89 100644
--- a/Spigot-Server-Patches/0400-implement-optional-per-player-mob-spawns.patch
+++ b/Spigot-Server-Patches/0401-implement-optional-per-player-mob-spawns.patch
@@ -1,4 +1,4 @@
-From ea1ab70c96e2f98199bd9ba00c64fabd922f4d2d Mon Sep 17 00:00:00 2001
+From 213eef20e57994d1827227b529da8058c1ae11b3 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/0401-Prevent-consuming-the-wrong-itemstack.patch b/Spigot-Server-Patches/0402-Prevent-consuming-the-wrong-itemstack.patch
similarity index 97%
rename from Spigot-Server-Patches/0401-Prevent-consuming-the-wrong-itemstack.patch
rename to Spigot-Server-Patches/0402-Prevent-consuming-the-wrong-itemstack.patch
index 306f0205c8..385d91a56b 100644
--- a/Spigot-Server-Patches/0401-Prevent-consuming-the-wrong-itemstack.patch
+++ b/Spigot-Server-Patches/0402-Prevent-consuming-the-wrong-itemstack.patch
@@ -1,4 +1,4 @@
-From 7f39bb23d384752d3eadd1651fa4966b7dfe310d Mon Sep 17 00:00:00 2001
+From dbf6b7b54ac1533f68fe2577b5c9f0ba31c687a2 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/Spigot-Server-Patches/0402-only-add-passanger-entities-once-from-spawners.patch b/Spigot-Server-Patches/0403-only-add-passanger-entities-once-from-spawners.patch
similarity index 93%
rename from Spigot-Server-Patches/0402-only-add-passanger-entities-once-from-spawners.patch
rename to Spigot-Server-Patches/0403-only-add-passanger-entities-once-from-spawners.patch
index 6821497fb2..5bffdf2244 100644
--- a/Spigot-Server-Patches/0402-only-add-passanger-entities-once-from-spawners.patch
+++ b/Spigot-Server-Patches/0403-only-add-passanger-entities-once-from-spawners.patch
@@ -1,4 +1,4 @@
-From 6b1aa5b32221f9b236fd0aa3e1f7cccd16c8c6bc Mon Sep 17 00:00:00 2001
+From 263d4328d65fc870427a529fee730111c0753a73 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/Spigot-Server-Patches/0403-Fix-nether-portal-creation.patch b/Spigot-Server-Patches/0404-Fix-nether-portal-creation.patch
similarity index 94%
rename from Spigot-Server-Patches/0403-Fix-nether-portal-creation.patch
rename to Spigot-Server-Patches/0404-Fix-nether-portal-creation.patch
index 21095d8552..fba6a1047f 100644
--- a/Spigot-Server-Patches/0403-Fix-nether-portal-creation.patch
+++ b/Spigot-Server-Patches/0404-Fix-nether-portal-creation.patch
@@ -1,4 +1,4 @@
-From b9873f7ec14b05ee084faa1e9e94b464b596d3b5 Mon Sep 17 00:00:00 2001
+From 821be36bae9294b5d2fb00f9fd2fd062fe1bce79 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/Spigot-Server-Patches/0404-Generator-Settings.patch b/Spigot-Server-Patches/0405-Generator-Settings.patch
similarity index 97%
rename from Spigot-Server-Patches/0404-Generator-Settings.patch
rename to Spigot-Server-Patches/0405-Generator-Settings.patch
index 3526de5c21..c18b5de8ff 100644
--- a/Spigot-Server-Patches/0404-Generator-Settings.patch
+++ b/Spigot-Server-Patches/0405-Generator-Settings.patch
@@ -1,4 +1,4 @@
-From c923211b3672cb2d07e773698eb8db87dff32c9c Mon Sep 17 00:00:00 2001
+From 98cff66b98d870ec0e0b98f9a112e6bef763bdd5 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/0405-Fix-zero-tick-instant-grow-farms-MC-113809.patch b/Spigot-Server-Patches/0406-Fix-zero-tick-instant-grow-farms-MC-113809.patch
similarity index 98%
rename from Spigot-Server-Patches/0405-Fix-zero-tick-instant-grow-farms-MC-113809.patch
rename to Spigot-Server-Patches/0406-Fix-zero-tick-instant-grow-farms-MC-113809.patch
index ff1629d52c..672088f0a6 100644
--- a/Spigot-Server-Patches/0405-Fix-zero-tick-instant-grow-farms-MC-113809.patch
+++ b/Spigot-Server-Patches/0406-Fix-zero-tick-instant-grow-farms-MC-113809.patch
@@ -1,4 +1,4 @@
-From 106a1b3fc7f29c9839758d192d7ef5f434e5f239 Mon Sep 17 00:00:00 2001
+From b995eb601a68f80e691beb7f081f21f46984b650 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/0406-Fix-MC-161754.patch b/Spigot-Server-Patches/0407-Fix-MC-161754.patch
similarity index 94%
rename from Spigot-Server-Patches/0406-Fix-MC-161754.patch
rename to Spigot-Server-Patches/0407-Fix-MC-161754.patch
index c93a828056..01b54f6221 100644
--- a/Spigot-Server-Patches/0406-Fix-MC-161754.patch
+++ b/Spigot-Server-Patches/0407-Fix-MC-161754.patch
@@ -1,4 +1,4 @@
-From 95eb89d0f29cfb355255285d50a508d501207d79 Mon Sep 17 00:00:00 2001
+From 50870f9758bbac32ba1b296206b5af2b6bf5ce32 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
diff --git a/Spigot-Server-Patches/0407-Performance-improvement-for-Chunk.getEntities.patch b/Spigot-Server-Patches/0408-Performance-improvement-for-Chunk.getEntities.patch
similarity index 96%
rename from Spigot-Server-Patches/0407-Performance-improvement-for-Chunk.getEntities.patch
rename to Spigot-Server-Patches/0408-Performance-improvement-for-Chunk.getEntities.patch
index b9e8c096f9..70cac56458 100644
--- a/Spigot-Server-Patches/0407-Performance-improvement-for-Chunk.getEntities.patch
+++ b/Spigot-Server-Patches/0408-Performance-improvement-for-Chunk.getEntities.patch
@@ -1,4 +1,4 @@
-From f2199c6f3926d2a0a3d304cc86b5afb02077e1e6 Mon Sep 17 00:00:00 2001
+From 32d4a337c94bccc2ae845eb5c197d8306e7673be 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
diff --git a/Spigot-Server-Patches/0408-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch b/Spigot-Server-Patches/0409-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
similarity index 96%
rename from Spigot-Server-Patches/0408-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
rename to Spigot-Server-Patches/0409-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
index 6ba736a9c4..d2e7465f7f 100644
--- a/Spigot-Server-Patches/0408-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
+++ b/Spigot-Server-Patches/0409-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
@@ -1,4 +1,4 @@
-From a38902b30837e45fc998e9956e2079c482348c5a Mon Sep 17 00:00:00 2001
+From 53e8a47576f01a96be38659aacb7402f9b4bd8a9 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
diff --git a/Spigot-Server-Patches/0409-Expose-the-internal-current-tick.patch b/Spigot-Server-Patches/0410-Expose-the-internal-current-tick.patch
similarity index 92%
rename from Spigot-Server-Patches/0409-Expose-the-internal-current-tick.patch
rename to Spigot-Server-Patches/0410-Expose-the-internal-current-tick.patch
index 334d87c7f0..0026425cf1 100644
--- a/Spigot-Server-Patches/0409-Expose-the-internal-current-tick.patch
+++ b/Spigot-Server-Patches/0410-Expose-the-internal-current-tick.patch
@@ -1,4 +1,4 @@
-From 9475be31b097c0f33ad62effcb12a20c09ea0044 Mon Sep 17 00:00:00 2001
+From 9d6bff4402c92c5b5f9977faf411f8ffe9a031ca 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/Spigot-Server-Patches/0410-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch b/Spigot-Server-Patches/0411-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
similarity index 96%
rename from Spigot-Server-Patches/0410-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
rename to Spigot-Server-Patches/0411-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
index 9ac80f731e..d09bd0c26e 100644
--- a/Spigot-Server-Patches/0410-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
+++ b/Spigot-Server-Patches/0411-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
@@ -1,4 +1,4 @@
-From d40eb01c6996bd57268c7e629d51b48c661bcb42 Mon Sep 17 00:00:00 2001
+From 9fa26888edb34f403a928423f97954b0733ce328 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/Spigot-Server-Patches/0411-Add-option-to-disable-pillager-patrols.patch b/Spigot-Server-Patches/0412-Add-option-to-disable-pillager-patrols.patch
similarity index 95%
rename from Spigot-Server-Patches/0411-Add-option-to-disable-pillager-patrols.patch
rename to Spigot-Server-Patches/0412-Add-option-to-disable-pillager-patrols.patch
index ffe83c624c..6fedfb6b50 100644
--- a/Spigot-Server-Patches/0411-Add-option-to-disable-pillager-patrols.patch
+++ b/Spigot-Server-Patches/0412-Add-option-to-disable-pillager-patrols.patch
@@ -1,4 +1,4 @@
-From e6641e24e4766c40da83fe32e8860f9dcc6a3ddb Mon Sep 17 00:00:00 2001
+From 13f0a89d99877180dae9b5d4233a909833740b34 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/0412-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch b/Spigot-Server-Patches/0413-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
similarity index 96%
rename from Spigot-Server-Patches/0412-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
rename to Spigot-Server-Patches/0413-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
index 94b47c03b0..ba2a5d9337 100644
--- a/Spigot-Server-Patches/0412-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
+++ b/Spigot-Server-Patches/0413-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
@@ -1,4 +1,4 @@
-From 6e91204372f7870277c5f84657a6dd4b34c9afee Mon Sep 17 00:00:00 2001
+From 790ec25581fb4df8c802a36f12fa3348381248e0 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
diff --git a/Spigot-Server-Patches/0413-Prevent-TRAP-while-loading-Fireballs.patch b/Spigot-Server-Patches/0414-Prevent-TRAP-while-loading-Fireballs.patch
similarity index 93%
rename from Spigot-Server-Patches/0413-Prevent-TRAP-while-loading-Fireballs.patch
rename to Spigot-Server-Patches/0414-Prevent-TRAP-while-loading-Fireballs.patch
index f7a0ca1010..c770401158 100644
--- a/Spigot-Server-Patches/0413-Prevent-TRAP-while-loading-Fireballs.patch
+++ b/Spigot-Server-Patches/0414-Prevent-TRAP-while-loading-Fireballs.patch
@@ -1,4 +1,4 @@
-From a8eee874aed5c9b5fde29bbb0ad160be44953d10 Mon Sep 17 00:00:00 2001
+From e6d8c07d576607a1caa436219801345fd4667c24 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 14 Dec 2019 01:10:45 +0000
 Subject: [PATCH] Prevent TRAP while loading Fireballs
diff --git a/Spigot-Server-Patches/0414-PlayerLaunchProjectileEvent.patch b/Spigot-Server-Patches/0415-PlayerLaunchProjectileEvent.patch
similarity index 99%
rename from Spigot-Server-Patches/0414-PlayerLaunchProjectileEvent.patch
rename to Spigot-Server-Patches/0415-PlayerLaunchProjectileEvent.patch
index 646b050908..92c4221669 100644
--- a/Spigot-Server-Patches/0414-PlayerLaunchProjectileEvent.patch
+++ b/Spigot-Server-Patches/0415-PlayerLaunchProjectileEvent.patch
@@ -1,4 +1,4 @@
-From 551aae7bfa26f24179eba157f306c68bd7a03d18 Mon Sep 17 00:00:00 2001
+From cdff9796b6b2cd859ab372d827f555411a66dcd5 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/Spigot-Server-Patches/0415-Add-CraftMagicNumbers.isSupportedApiVersion.patch b/Spigot-Server-Patches/0416-Add-CraftMagicNumbers.isSupportedApiVersion.patch
similarity index 93%
rename from Spigot-Server-Patches/0415-Add-CraftMagicNumbers.isSupportedApiVersion.patch
rename to Spigot-Server-Patches/0416-Add-CraftMagicNumbers.isSupportedApiVersion.patch
index c7ebee30da..9f94d5654d 100644
--- a/Spigot-Server-Patches/0415-Add-CraftMagicNumbers.isSupportedApiVersion.patch
+++ b/Spigot-Server-Patches/0416-Add-CraftMagicNumbers.isSupportedApiVersion.patch
@@ -1,4 +1,4 @@
-From 282e173cf881d87529c4a355631d875991247e2b Mon Sep 17 00:00:00 2001
+From 15747ba9932f93e9f01492d4f111a4f6b2d358cd 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/Spigot-Server-Patches/0416-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch b/Spigot-Server-Patches/0417-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
similarity index 92%
rename from Spigot-Server-Patches/0416-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
rename to Spigot-Server-Patches/0417-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
index 0b95b7abfc..307f228f40 100644
--- a/Spigot-Server-Patches/0416-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
+++ b/Spigot-Server-Patches/0417-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
@@ -1,4 +1,4 @@
-From e9ded59f2d2f5dfeaa0c9997ba6478a3f7b1bc59 Mon Sep 17 00:00:00 2001
+From 95da400b09518a7f98754568f41aca73afddb92a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 Jul 2018 03:39:51 -0400
 Subject: [PATCH] Avoid Chunk Lookups for Entity/TileEntity Current Chunk
@@ -14,10 +14,10 @@ to the object directly on the Entity/TileEntity object we can directly grab.
 Use that local value instead to reduce lookups in many hot places.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 0baa884bbf..373ea71e64 100644
+index 2c92d3390a..3c3a504991 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -784,7 +784,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -789,7 +789,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
              if (!tileentity.isRemoved() && tileentity.hasWorld()) {
                  BlockPosition blockposition = tileentity.getPosition();
  
@@ -26,7 +26,7 @@ index 0baa884bbf..373ea71e64 100644
                      try {
                          gameprofilerfiller.a(() -> {
                              return String.valueOf(TileEntityTypes.a(tileentity.getTileType()));
-@@ -823,8 +823,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -828,8 +828,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
                  this.tileEntityListTick.remove(tileTickPosition--);
                  // Spigot end
                  //this.tileEntityList.remove(tileentity); // Paper - remove unused list
@@ -40,7 +40,7 @@ index 0baa884bbf..373ea71e64 100644
                  }
              }
          }
-@@ -844,8 +847,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -849,8 +852,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
                      }
                      // CraftBukkit end */
  
diff --git a/Spigot-Server-Patches/0417-Fix-spawn-radius-being-treated-as-0.patch b/Spigot-Server-Patches/0418-Fix-spawn-radius-being-treated-as-0.patch
similarity index 94%
rename from Spigot-Server-Patches/0417-Fix-spawn-radius-being-treated-as-0.patch
rename to Spigot-Server-Patches/0418-Fix-spawn-radius-being-treated-as-0.patch
index b735836d77..6dc28639b2 100644
--- a/Spigot-Server-Patches/0417-Fix-spawn-radius-being-treated-as-0.patch
+++ b/Spigot-Server-Patches/0418-Fix-spawn-radius-being-treated-as-0.patch
@@ -1,4 +1,4 @@
-From edc43ace428a80cd988fcae335e14377f08a0cd4 Mon Sep 17 00:00:00 2001
+From 664038653ff5446ed266bda06841652ad8e9393c 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