From 459987d69fc6be722321dfbf42547613a62daaed Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 4 Oct 2018 23:18:46 -0400
Subject: [PATCH] More improvements to activation range, improve turtles

improved the water code so that immunity wont trigger if the entity
has the water pathfinder system active, so this improves support
for all entities that know how to behave in water.

Merged 2 EAR patches together, and removed an MCUtil method that
doesnt have a purpose anymore
---
 Spigot-Server-Patches/0004-MC-Utils.patch     |  44 ++----
 .../0028-Lighting-Queue.patch                 |  10 +-
 ...Location-getType-and-getBlockData-fo.patch |   8 +-
 ...-Do-not-load-chunks-for-light-checks.patch | 118 ++++++++++++++++-
 ... 0115-Activation-Range-Improvements.patch} |  95 +++++++++----
 Spigot-Server-Patches/0115-Optimize-EAR.patch |  70 ----------
 ...unk-Unloads-based-on-Player-Movement.patch |   8 +-
 ...vent-Pathfinding-out-of-World-Border.patch |   8 +-
 ...-API-s.patch => 0161-Firework-API-s.patch} |   2 +-
 ... 0162-PlayerTeleportEndGatewayEvent.patch} |   2 +-
 ... => 0163-ShulkerBox-Dupe-Prevention.patch} |   2 +-
 ...ovide-E-TE-Chunk-count-stat-methods.patch} |   2 +-
 ...h => 0165-Enforce-Sync-Player-Saves.patch} |   4 +-
 ... => 0166-Enforce-Sync-Chunk-Unloads.patch} |   2 +-
 ...low-entities-to-ride-themselves-572.patch} |   2 +-
 ...atch => 0168-Fix-block-break-desync.patch} |   2 +-
 ...I-for-Reason-Source-Triggering-play.patch} |   2 +-
 ...patch => 0170-Cap-Entity-Collisions.patch} |   2 +-
 ...-CraftScheduler-Async-Task-Debugger.patch} |   2 +-
 ...g.patch => 0172-Shame-on-you-Mojang.patch} |   2 +-
 ...ore-aggressive-in-the-chunk-unload-.patch} |   2 +-
 ...> 0174-Do-not-let-armorstands-drown.patch} |   2 +-
 ...e-async-calls-to-restart-the-server.patch} |   8 +-
 ...roperty-to-disable-book-size-limits.patch} |   2 +-
 ...e-parrots-stay-on-shoulders-despite.patch} |   2 +-
 ...-option-to-prevent-player-names-fro.patch} |   4 +-
 ...leAppender-for-console-improvements.patch} |   4 +-
 ...rable-option-to-disable-creeper-lin.patch} |   2 +-
 ....patch => 0181-Item-canEntityPickup.patch} |   2 +-
 ...layerPickupItemEvent-setFlyAtPlayer.patch} |   2 +-
 ...> 0183-PlayerAttemptPickupItemEvent.patch} |   2 +-
 ...tch => 0184-Add-UnknownCommandEvent.patch} |   2 +-
 ...tch => 0185-Basic-PlayerProfile-API.patch} |   4 +-
 ... 0186-Shoulder-Entities-Release-API.patch} |   2 +-
 ...patch => 0187-Profile-Lookup-Events.patch} |   2 +-
 ...layer-logins-during-server-shutdown.patch} |   2 +-
 ...patch => 0189-Entity-fromMobSpawner.patch} |   2 +-
 ...0190-Fix-Anvil-Level-sync-to-client.patch} |   2 +-
 ...ages-for-getTileEntity-in-order-to-.patch} |   2 +-
 ...2-Improve-the-Saddle-API-for-Horses.patch} |   2 +-
 ...plement-ensureServerConversions-API.patch} |   2 +-
 ...> 0194-Implement-getI18NDisplayName.patch} |   2 +-
 ...ving-disabled-before-unloading-all-.patch} |   2 +-
 ...=> 0196-ProfileWhitelistVerifyEvent.patch} |   4 +-
 ...ch => 0197-Fix-this-stupid-bullshit.patch} |   2 +-
 ...wns-should-honor-nametags-and-leash.patch} |   2 +-
 ...mer-when-spawner-event-is-cancelled.patch} |   2 +-
 ...0-Fix-MC-117075-TE-Unload-Lag-Spike.patch} |   2 +-
 ...a-custom-authentication-servers-dow.patch} |   4 +-
 ...atch => 0202-LivingEntity-setKiller.patch} |   2 +-
 ...ms-to-redirect-System.out-err-to-lo.patch} |   2 +-
 ...-prefixes-using-Log4J-configuration.patch} |   2 +-
 ...Include-Log4J2-SLF4J-implementation.patch} |   2 +-
 ...efix-for-various-plugins-bypassing-.patch} |   2 +-
 ...t.patch => 0207-Add-PlayerJumpEvent.patch} |   2 +-
 ...-handle-PacketPlayInKeepAlive-async.patch} |   2 +-
 ...t-protocol-version-and-virtual-host.patch} |   2 +-
 ...t-serverside-behavior-of-keepalives.patch} |   2 +-
 ...ith-fastutil-s-ObjectOpenHashSet-in.patch} |   2 +-
 ...Effects-only-to-players-who-can-see.patch} |   2 +-
 ...maximum-exp-value-when-merging-orbs.patch} |   2 +-
 ... => 0214-Add-PlayerArmorChangeEvent.patch} |   2 +-
 ...om-being-processed-when-the-player-.patch} |   2 +-
 ...-implementations-for-captured-block.patch} |   2 +-
 ...get-a-BlockState-without-a-snapshot.patch} |   2 +-
 ...patch => 0218-AsyncTabCompleteEvent.patch} |   2 +-
 ...19-Avoid-NPE-in-PathfinderGoalTempt.patch} |   2 +-
 ...=> 0220-PlayerPickupExperienceEvent.patch} |   2 +-
 ...tch => 0221-ExperienceOrbMergeEvent.patch} |   2 +-
 ...-Ability-to-apply-mending-to-XP-API.patch} |   2 +-
 ...rable-Chunks-Sends-per-Tick-setting.patch} |   2 +-
 ...onfigurable-Max-Chunk-Gens-per-Tick.patch} |   4 +-
 ...max-squid-spawn-height-configurable.patch} |   2 +-
 ...patch => 0226-PreCreatureSpawnEvent.patch} |   2 +-
 ...-PlayerNaturallySpawnCreaturesEvent.patch} |   2 +-
 ...Add-setPlayerProfile-API-for-Skulls.patch} |   2 +-
 ...> 0229-Fill-Profile-Property-Events.patch} |   2 +-
 ...layerAdvancementCriterionGrantEvent.patch} |   2 +-
 ...ch => 0231-Add-ArmorStand-Item-Meta.patch} |   2 +-
 ...Extend-Player-Interact-cancellation.patch} |   2 +-
 ... 0233-Tameable-getOwnerUniqueId-API.patch} |   2 +-
 ...-crits-helps-mitigate-hacked-client.patch} |   2 +-
 ...ing-location-from-InventoryEnderChe.patch} |   2 +-
 ...ted-Ice-from-loading-holding-chunks.patch} |   2 +-
 ...e-Explicit-Network-Manager-Flushing.patch} |   2 +-
 ...t-extended-PaperServerListPingEvent.patch} |   2 +-
 ... 0239-Improved-Async-Task-Scheduler.patch} |   2 +-
 ...-PlayerProfile-in-AsyncPreLoginEven.patch} |   2 +-
 ...-PortalCreateEvent-for-exit-portals.patch} |   2 +-
 ...=> 0242-Player.setPlayerProfile-API.patch} |   2 +-
 ...h => 0243-Fix-Dragon-Server-Crashes.patch} |   2 +-
 ...patch => 0244-getPlayerUniqueId-API.patch} |   2 +-
 ...ake-player-data-saving-configurable.patch} |   4 +-
 ...e-legacy-ping-handler-more-reliable.patch} |   2 +-
 ...erverListPingEvent-for-legacy-pings.patch} |   2 +-
 ...8-Flag-to-disable-the-channel-limit.patch} |   2 +-
 ...-method-to-open-already-placed-sign.patch} |   2 +-
 ...oad-version-history-at-server-start.patch} |   2 +-
 ...rable-sprint-interruption-on-attack.patch} |   2 +-
 ...allowed-colored-signs-to-be-created.patch} |   2 +-
 ...t.patch => 0253-EndermanEscapeEvent.patch} |   2 +-
 ...h => 0254-Enderman.teleportRandomly.patch} |   2 +-
 ...255-Block-Enderpearl-Travel-Exploit.patch} |   2 +-
 ...d.spawnParticle-API-and-add-Builder.patch} |   2 +-
 ...h => 0257-EndermanAttackPlayerEvent.patch} |   2 +-
 ...tch => 0258-WitchConsumePotionEvent.patch} |   2 +-
 ...patch => 0259-WitchThrowPotionEvent.patch} |   2 +-
 ...tem-entities-with-World.spawnEntity.patch} |   2 +-
 ...ages-loading-chunks-for-door-checks.patch} |   2 +-
 ...patch => 0262-WitchReadyPotionEvent.patch} |   2 +-
 ...263-ItemStack-getMaxItemUseDuration.patch} |   2 +-
 ...ement-EntityTeleportEndGatewayEvent.patch} |   2 +-
 ...d-flag-on-cancel-of-Explosion-Event.patch} |   2 +-
 ...move-entities-on-dimension-teleport.patch} |   2 +-
 ...ch => 0267-Fix-CraftEntity-hashCode.patch} |   2 +-
 ...e-Alternative-LootPool-Luck-Formula.patch} |   4 +-
 ...ls-when-failing-to-save-player-data.patch} |   2 +-
 ...-shield-blocking-delay-configurable.patch} |   2 +-
 ...cipes-in-RecipeBook-to-avoid-data-e.patch} |   2 +-
 ...nt-consumeArrow-and-getArrowItem-AP.patch} |   2 +-
 ...patch => 0273-PlayerReadyArrowEvent.patch} |   2 +-
 ...-EntityShootBowEvent-for-Illusioner.patch} |   2 +-
 ...lement-EntityKnockbackByEntityEvent.patch} |   2 +-
 ...patch => 0276-Expand-Explosions-API.patch} |   2 +-
 ...vingEntity-Hand-Raised-Item-Use-API.patch} |   2 +-
 ...-API.patch => 0278-RangedEntity-API.patch} |   2 +-
 ...eHitEvent-to-include-the-BlockFace-.patch} |   2 +-
 ...o-disable-ender-dragon-legacy-check.patch} |   2 +-
 ...-Implement-World.getEntity-UUID-API.patch} |   2 +-
 ...0282-InventoryCloseEvent-Reason-API.patch} |  18 +--
 ...ps-for-Entity-TileEntity-Current-Ch.patch} |   4 +-
 ...0284-Configurable-Bed-Search-Radius.patch} |   2 +-
 ...I.patch => 0285-Vex-getSummoner-API.patch} |   2 +-
 ...ventory-when-cancelling-PlayerInter.patch} |   2 +-
 ...e-the-Entity-Random-seed-for-squids.patch} |   2 +-
 ...illa-entity-warnings-for-duplicates.patch} |   2 +-
 ...pawn-if-entity-is-in-a-chunk-schedu.patch} |   2 +-
 ...-if-stack-size-above-max-stack-size.patch} |   2 +-
 ...91-Use-asynchronous-Log4j-2-loggers.patch} |   2 +-
 ...more-information-to-Entity.toString.patch} |   2 +-
 ...es-option-to-debug-dupe-uuid-issues.patch} |   2 +-
 ...ts.patch => 0294-EnderDragon-Events.patch} |   2 +-
 ...atch => 0295-PlayerElytraBoostEvent.patch} |   2 +-
 ...=> 0296-PlayerLaunchProjectileEvent.patch} |   2 +-
 ... 0297-Duplicate-UUID-Resolve-Option.patch} |   4 +-
 ...Speedup-BlockPos-by-fixing-inlining.patch} |  18 +--
 ...tch => 0299-Don-t-save-Proto-Chunks.patch} |   2 +-
 ...patch => 0300-Optimize-RegistryID.c.patch} |   2 +-
 ...-armor-stands-from-doing-entity-loo.patch} |   4 +-
 ...-Vanished-players-don-t-have-rights.patch} |   2 +-
 ...anytime-entities-change-to-guarante.patch} |   4 +-
 ...d-some-Debug-to-Chunk-Entity-slices.patch} |   4 +-
 ... => 0305-Optimize-Region-File-Cache.patch} |   2 +-
 ...atch => 0306-EntityTransformedEvent.patch} |   2 +-
 ...tch => 0307-SkeletonHorse-Additions.patch} |   2 +-
 ...event-Saving-Bad-entities-to-chunks.patch} |   2 +-
 ...n-t-call-getItemMeta-on-hasItemMeta.patch} |   2 +-
 ...ocess-chunk-removal-in-removeEntity.patch} |   2 +-
 ...ad-Entities-in-entityList-iteration.patch} |   2 +-
 ...-use-a-versioned-world-folder-for-t.patch} |   4 +-
 ...13-MC-111480-Start-Entity-ID-s-at-1.patch} |   2 +-
 ...4-Implement-Expanded-ArmorStand-API.patch} |   2 +-
 ...vent.patch => 0315-AnvilDamageEvent.patch} |   2 +-
 ...ld-EntityHuman-Lookup-Optimizations.patch} |   2 +-
 ...ent.patch => 0317-Add-TNTPrimeEvent.patch} |   2 +-
 ...d-make-tab-spam-limits-configurable.patch} |   4 +-
 ...ortation-adjustment-math-more-accur.patch} |   2 +-
 ...h => 0320-Add-hand-to-bucket-events.patch} |   2 +-
 ...-Experience-should-save-as-Integers.patch} |   2 +-
 ...h => 0322-Entity-add-to-world-fixes.patch} |   4 +-
 ...ent-rendering-skulls-from-same-user.patch} |   2 +-
 ...d-Early-Warning-Feature-to-WatchDog.patch} |   4 +-
 ...0325-Make-EnderDragon-implement-Mob.patch} |   2 +-
 ...ect-and-repair-corrupt-Region-Files.patch} |   2 +-
 ...7-Use-ConcurrentHashMap-in-JsonList.patch} |   2 +-
 ...8-Use-a-Queue-for-Queueing-Commands.patch} |   2 +-
 ...le-Entities-from-a-chunk-without-sn.patch} |   2 +-
 ...llow-disabling-armour-stand-ticking.patch} |   2 +-
 ...timize-BlockPosition-helper-methods.patch} |   4 +-
 ...ts-from-world-player-list-not-serve.patch} |  10 +-
 ...0333-Cache-World-Entity-Type-counts.patch} |   2 +-
 ...tore-vanlla-default-mob-spawn-range.patch} |   4 +-
 ...pers.patch => 0335-Optimize-Hoppers.patch} |   4 +-
 ...36-Optimize-CraftBlockData-Creation.patch} |   2 +-
 ...-124320.patch => 0337-Fix-MC-124320.patch} |   2 +-
 ...tch => 0338-Slime-Pathfinder-Events.patch} |   6 +-
 ...d-source-block-to-BlockPhysicsEvent.patch} |   2 +-
 ...1-Anti-Xray.patch => 0340-Anti-Xray.patch} |   6 +-
 ...e-speed-for-water-flowing-over-lava.patch} |   2 +-
 ... => 0342-Optimize-RegistryMaterials.patch} |   2 +-
 ...ch => 0343-Add-PhantomPreSpawnEvent.patch} |   2 +-
 ....patch => 0344-Add-More-Creeper-API.patch} |   2 +-
 ...patch => 0345-Optimize-Chunk-getPos.patch} |   4 +-
 ...se-an-EnumMap-for-Chunk-Height-Maps.patch} |   4 +-
 ...47-Implement-Force-Loaded-Chunk-API.patch} |   2 +-
 ...=> 0348-Inventory-removeItemAnySlot.patch} |   2 +-
 ...ptimize-getChunkIfLoaded-type-calls.patch} |   2 +-
 ...50-Don-t-double-add-golems-to-world.patch} |   4 +-
 ...fix-newlines-in-spigot-tab-list-API.patch} |   2 +-
 ...oadChunk-int-int-false-load-unconve.patch} |   2 +-
 ...ray-tracing-methods-to-LivingEntity.patch} |   2 +-
 ...nd-performance-issues-in-DataFixers.patch} |   2 +-
 ...-attack-cooldown-methods-for-Player.patch} |   2 +-
 ...357-Fix-1420.patch => 0356-Fix-1420.patch} |   2 +-
 ...-load-entity-AABB-to-prevent-wobble.patch} |   2 +-
 ....patch => 0358-Improve-death-events.patch} |   2 +-
 ...w-chests-to-be-placed-with-NBT-data.patch} |   6 +-
 ...I.patch => 0360-Mob-Pathfinding-API.patch} |  14 +-
 ...nt-chunk-loading-from-Fluid-Flowing.patch} |   2 +-
 ...for-CanPlaceOn-and-CanDestroy-NBT-v.patch} |   2 +-
 ...nt-Mob-AI-Rules-from-Loading-Chunks.patch} |   4 +-
 ...vent-pathfinding-from-loading-chunks.patch | 125 ------------------
 ...ning-from-loading-generating-chunks.patch} |   2 +-
 ...-Biome-Mob-Lookups-for-Mob-Spawning.patch} |   2 +-
 ...Optimize-and-Fix-ExpiringMap-Issues.patch} |   2 +-
 ...t-furnace-cook-speed-multiplier-API.patch} |   2 +-
 ...0368-Support-Overriding-World-Seeds.patch} |   6 +-
 ...h => 0369-Optimize-Server-World-Map.patch} |   2 +-
 ....patch => 0370-PreSpawnerSpawnEvent.patch} |   2 +-
 ...5-Fix-Double-Chest-Conversion-Error.patch} |   4 +-
 ...rseException-in-Entity-and-TE-names.patch} |   6 +-
 ... 0373-Avoid-dimension-id-collisions.patch} |   2 +-
 ...=> 0374-Honor-EntityAgeable.ageLock.patch} |   2 +-
 ...-Async-Chunk-Loading-and-Generation.patch} |   2 +-
 ...-Dimension-NBT-field-in-Entity-data.patch} |   2 +-
 ...le-lag.patch => 0377-Fix-turtle-lag.patch} |   4 +-
 ... 0378-Optimize-Light-Recalculations.patch} |   2 +-
 ...-entity-loss-due-to-unloaded-chunks.patch} |   2 +-
 ...-recheck-type-after-setting-a-block.patch} |   2 +-
 ...> 0381-Fix-Sending-Chunks-to-Client.patch} |   2 +-
 ...le-connection-throttle-kick-message.patch} |   4 +-
 ...Fix-FileIOThread-concurrency-issues.patch} |   2 +-
 232 files changed, 507 insertions(+), 559 deletions(-)
 rename Spigot-Server-Patches/{0161-Activation-Range-Improvements.patch => 0115-Activation-Range-Improvements.patch} (81%)
 delete mode 100644 Spigot-Server-Patches/0115-Optimize-EAR.patch
 rename Spigot-Server-Patches/{0162-Firework-API-s.patch => 0161-Firework-API-s.patch} (98%)
 rename Spigot-Server-Patches/{0163-PlayerTeleportEndGatewayEvent.patch => 0162-PlayerTeleportEndGatewayEvent.patch} (95%)
 rename Spigot-Server-Patches/{0164-ShulkerBox-Dupe-Prevention.patch => 0163-ShulkerBox-Dupe-Prevention.patch} (94%)
 rename Spigot-Server-Patches/{0165-Provide-E-TE-Chunk-count-stat-methods.patch => 0164-Provide-E-TE-Chunk-count-stat-methods.patch} (96%)
 rename Spigot-Server-Patches/{0166-Enforce-Sync-Player-Saves.patch => 0165-Enforce-Sync-Player-Saves.patch} (91%)
 rename Spigot-Server-Patches/{0167-Enforce-Sync-Chunk-Unloads.patch => 0166-Enforce-Sync-Chunk-Unloads.patch} (95%)
 rename Spigot-Server-Patches/{0168-Don-t-allow-entities-to-ride-themselves-572.patch => 0167-Don-t-allow-entities-to-ride-themselves-572.patch} (93%)
 rename Spigot-Server-Patches/{0169-Fix-block-break-desync.patch => 0168-Fix-block-break-desync.patch} (94%)
 rename Spigot-Server-Patches/{0170-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch => 0169-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch} (99%)
 rename Spigot-Server-Patches/{0171-Cap-Entity-Collisions.patch => 0170-Cap-Entity-Collisions.patch} (97%)
 rename Spigot-Server-Patches/{0172-Remove-CraftScheduler-Async-Task-Debugger.patch => 0171-Remove-CraftScheduler-Async-Task-Debugger.patch} (97%)
 rename Spigot-Server-Patches/{0173-Shame-on-you-Mojang.patch => 0172-Shame-on-you-Mojang.patch} (94%)
 rename Spigot-Server-Patches/{0174-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch => 0173-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch} (94%)
 rename Spigot-Server-Patches/{0175-Do-not-let-armorstands-drown.patch => 0174-Do-not-let-armorstands-drown.patch} (96%)
 rename Spigot-Server-Patches/{0176-Properly-handle-async-calls-to-restart-the-server.patch => 0175-Properly-handle-async-calls-to-restart-the-server.patch} (98%)
 rename Spigot-Server-Patches/{0177-Add-system-property-to-disable-book-size-limits.patch => 0176-Add-system-property-to-disable-book-size-limits.patch} (97%)
 rename Spigot-Server-Patches/{0178-Add-option-to-make-parrots-stay-on-shoulders-despite.patch => 0177-Add-option-to-make-parrots-stay-on-shoulders-despite.patch} (97%)
 rename Spigot-Server-Patches/{0179-Add-configuration-option-to-prevent-player-names-fro.patch => 0178-Add-configuration-option-to-prevent-player-names-fro.patch} (93%)
 rename Spigot-Server-Patches/{0180-Use-TerminalConsoleAppender-for-console-improvements.patch => 0179-Use-TerminalConsoleAppender-for-console-improvements.patch} (99%)
 rename Spigot-Server-Patches/{0181-provide-a-configurable-option-to-disable-creeper-lin.patch => 0180-provide-a-configurable-option-to-disable-creeper-lin.patch} (96%)
 rename Spigot-Server-Patches/{0182-Item-canEntityPickup.patch => 0181-Item-canEntityPickup.patch} (97%)
 rename Spigot-Server-Patches/{0183-PlayerPickupItemEvent-setFlyAtPlayer.patch => 0182-PlayerPickupItemEvent-setFlyAtPlayer.patch} (97%)
 rename Spigot-Server-Patches/{0184-PlayerAttemptPickupItemEvent.patch => 0183-PlayerAttemptPickupItemEvent.patch} (96%)
 rename Spigot-Server-Patches/{0185-Add-UnknownCommandEvent.patch => 0184-Add-UnknownCommandEvent.patch} (96%)
 rename Spigot-Server-Patches/{0186-Basic-PlayerProfile-API.patch => 0185-Basic-PlayerProfile-API.patch} (99%)
 rename Spigot-Server-Patches/{0187-Shoulder-Entities-Release-API.patch => 0186-Shoulder-Entities-Release-API.patch} (98%)
 rename Spigot-Server-Patches/{0188-Profile-Lookup-Events.patch => 0187-Profile-Lookup-Events.patch} (98%)
 rename Spigot-Server-Patches/{0189-Block-player-logins-during-server-shutdown.patch => 0188-Block-player-logins-during-server-shutdown.patch} (94%)
 rename Spigot-Server-Patches/{0190-Entity-fromMobSpawner.patch => 0189-Entity-fromMobSpawner.patch} (98%)
 rename Spigot-Server-Patches/{0191-Fix-Anvil-Level-sync-to-client.patch => 0190-Fix-Anvil-Level-sync-to-client.patch} (97%)
 rename Spigot-Server-Patches/{0192-Add-missing-coverages-for-getTileEntity-in-order-to-.patch => 0191-Add-missing-coverages-for-getTileEntity-in-order-to-.patch} (94%)
 rename Spigot-Server-Patches/{0193-Improve-the-Saddle-API-for-Horses.patch => 0192-Improve-the-Saddle-API-for-Horses.patch} (97%)
 rename Spigot-Server-Patches/{0194-Implement-ensureServerConversions-API.patch => 0193-Implement-ensureServerConversions-API.patch} (94%)
 rename Spigot-Server-Patches/{0195-Implement-getI18NDisplayName.patch => 0194-Implement-getI18NDisplayName.patch} (96%)
 rename Spigot-Server-Patches/{0196-GH-806-Respect-saving-disabled-before-unloading-all-.patch => 0195-GH-806-Respect-saving-disabled-before-unloading-all-.patch} (94%)
 rename Spigot-Server-Patches/{0197-ProfileWhitelistVerifyEvent.patch => 0196-ProfileWhitelistVerifyEvent.patch} (96%)
 rename Spigot-Server-Patches/{0198-Fix-this-stupid-bullshit.patch => 0197-Fix-this-stupid-bullshit.patch} (96%)
 rename Spigot-Server-Patches/{0199-Ocelot-despawns-should-honor-nametags-and-leash.patch => 0198-Ocelot-despawns-should-honor-nametags-and-leash.patch} (93%)
 rename Spigot-Server-Patches/{0200-Reset-spawner-timer-when-spawner-event-is-cancelled.patch => 0199-Reset-spawner-timer-when-spawner-event-is-cancelled.patch} (95%)
 rename Spigot-Server-Patches/{0201-Fix-MC-117075-TE-Unload-Lag-Spike.patch => 0200-Fix-MC-117075-TE-Unload-Lag-Spike.patch} (95%)
 rename Spigot-Server-Patches/{0202-Allow-specifying-a-custom-authentication-servers-dow.patch => 0201-Allow-specifying-a-custom-authentication-servers-dow.patch} (96%)
 rename Spigot-Server-Patches/{0203-LivingEntity-setKiller.patch => 0202-LivingEntity-setKiller.patch} (95%)
 rename Spigot-Server-Patches/{0204-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch => 0203-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch} (96%)
 rename Spigot-Server-Patches/{0205-Handle-plugin-prefixes-using-Log4J-configuration.patch => 0204-Handle-plugin-prefixes-using-Log4J-configuration.patch} (98%)
 rename Spigot-Server-Patches/{0206-Include-Log4J2-SLF4J-implementation.patch => 0205-Include-Log4J2-SLF4J-implementation.patch} (91%)
 rename Spigot-Server-Patches/{0207-Disable-logger-prefix-for-various-plugins-bypassing-.patch => 0206-Disable-logger-prefix-for-various-plugins-bypassing-.patch} (97%)
 rename Spigot-Server-Patches/{0208-Add-PlayerJumpEvent.patch => 0207-Add-PlayerJumpEvent.patch} (98%)
 rename Spigot-Server-Patches/{0209-handle-PacketPlayInKeepAlive-async.patch => 0208-handle-PacketPlayInKeepAlive-async.patch} (97%)
 rename Spigot-Server-Patches/{0210-Expose-client-protocol-version-and-virtual-host.patch => 0209-Expose-client-protocol-version-and-virtual-host.patch} (98%)
 rename Spigot-Server-Patches/{0211-revert-serverside-behavior-of-keepalives.patch => 0210-revert-serverside-behavior-of-keepalives.patch} (98%)
 rename Spigot-Server-Patches/{0212-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch => 0211-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch} (95%)
 rename Spigot-Server-Patches/{0213-Send-attack-SoundEffects-only-to-players-who-can-see.patch => 0212-Send-attack-SoundEffects-only-to-players-who-can-see.patch} (98%)
 rename Spigot-Server-Patches/{0214-Option-for-maximum-exp-value-when-merging-orbs.patch => 0213-Option-for-maximum-exp-value-when-merging-orbs.patch} (98%)
 rename Spigot-Server-Patches/{0215-Add-PlayerArmorChangeEvent.patch => 0214-Add-PlayerArmorChangeEvent.patch} (97%)
 rename Spigot-Server-Patches/{0216-Prevent-logins-from-being-processed-when-the-player-.patch => 0215-Prevent-logins-from-being-processed-when-the-player-.patch} (94%)
 rename Spigot-Server-Patches/{0217-use-CB-BlockState-implementations-for-captured-block.patch => 0216-use-CB-BlockState-implementations-for-captured-block.patch} (96%)
 rename Spigot-Server-Patches/{0218-API-to-get-a-BlockState-without-a-snapshot.patch => 0217-API-to-get-a-BlockState-without-a-snapshot.patch} (98%)
 rename Spigot-Server-Patches/{0219-AsyncTabCompleteEvent.patch => 0218-AsyncTabCompleteEvent.patch} (99%)
 rename Spigot-Server-Patches/{0220-Avoid-NPE-in-PathfinderGoalTempt.patch => 0219-Avoid-NPE-in-PathfinderGoalTempt.patch} (93%)
 rename Spigot-Server-Patches/{0221-PlayerPickupExperienceEvent.patch => 0220-PlayerPickupExperienceEvent.patch} (94%)
 rename Spigot-Server-Patches/{0222-ExperienceOrbMergeEvent.patch => 0221-ExperienceOrbMergeEvent.patch} (95%)
 rename Spigot-Server-Patches/{0223-Ability-to-apply-mending-to-XP-API.patch => 0222-Ability-to-apply-mending-to-XP-API.patch} (98%)
 rename Spigot-Server-Patches/{0224-Configurable-Chunks-Sends-per-Tick-setting.patch => 0223-Configurable-Chunks-Sends-per-Tick-setting.patch} (96%)
 rename Spigot-Server-Patches/{0225-Configurable-Max-Chunk-Gens-per-Tick.patch => 0224-Configurable-Max-Chunk-Gens-per-Tick.patch} (98%)
 rename Spigot-Server-Patches/{0226-Make-max-squid-spawn-height-configurable.patch => 0225-Make-max-squid-spawn-height-configurable.patch} (96%)
 rename Spigot-Server-Patches/{0227-PreCreatureSpawnEvent.patch => 0226-PreCreatureSpawnEvent.patch} (98%)
 rename Spigot-Server-Patches/{0228-PlayerNaturallySpawnCreaturesEvent.patch => 0227-PlayerNaturallySpawnCreaturesEvent.patch} (96%)
 rename Spigot-Server-Patches/{0229-Add-setPlayerProfile-API-for-Skulls.patch => 0228-Add-setPlayerProfile-API-for-Skulls.patch} (98%)
 rename Spigot-Server-Patches/{0230-Fill-Profile-Property-Events.patch => 0229-Fill-Profile-Property-Events.patch} (96%)
 rename Spigot-Server-Patches/{0231-PlayerAdvancementCriterionGrantEvent.patch => 0230-PlayerAdvancementCriterionGrantEvent.patch} (94%)
 rename Spigot-Server-Patches/{0232-Add-ArmorStand-Item-Meta.patch => 0231-Add-ArmorStand-Item-Meta.patch} (99%)
 rename Spigot-Server-Patches/{0233-Extend-Player-Interact-cancellation.patch => 0232-Extend-Player-Interact-cancellation.patch} (98%)
 rename Spigot-Server-Patches/{0234-Tameable-getOwnerUniqueId-API.patch => 0233-Tameable-getOwnerUniqueId-API.patch} (96%)
 rename Spigot-Server-Patches/{0235-Toggleable-player-crits-helps-mitigate-hacked-client.patch => 0234-Toggleable-player-crits-helps-mitigate-hacked-client.patch} (96%)
 rename Spigot-Server-Patches/{0236-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch => 0235-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch} (95%)
 rename Spigot-Server-Patches/{0237-Prevent-Frosted-Ice-from-loading-holding-chunks.patch => 0236-Prevent-Frosted-Ice-from-loading-holding-chunks.patch} (96%)
 rename Spigot-Server-Patches/{0238-Disable-Explicit-Network-Manager-Flushing.patch => 0237-Disable-Explicit-Network-Manager-Flushing.patch} (96%)
 rename Spigot-Server-Patches/{0239-Implement-extended-PaperServerListPingEvent.patch => 0238-Implement-extended-PaperServerListPingEvent.patch} (99%)
 rename Spigot-Server-Patches/{0240-Improved-Async-Task-Scheduler.patch => 0239-Improved-Async-Task-Scheduler.patch} (99%)
 rename Spigot-Server-Patches/{0241-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch => 0240-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch} (97%)
 rename Spigot-Server-Patches/{0242-Call-PortalCreateEvent-for-exit-portals.patch => 0241-Call-PortalCreateEvent-for-exit-portals.patch} (98%)
 rename Spigot-Server-Patches/{0243-Player.setPlayerProfile-API.patch => 0242-Player.setPlayerProfile-API.patch} (99%)
 rename Spigot-Server-Patches/{0244-Fix-Dragon-Server-Crashes.patch => 0243-Fix-Dragon-Server-Crashes.patch} (95%)
 rename Spigot-Server-Patches/{0245-getPlayerUniqueId-API.patch => 0244-getPlayerUniqueId-API.patch} (96%)
 rename Spigot-Server-Patches/{0246-Make-player-data-saving-configurable.patch => 0245-Make-player-data-saving-configurable.patch} (95%)
 rename Spigot-Server-Patches/{0247-Make-legacy-ping-handler-more-reliable.patch => 0246-Make-legacy-ping-handler-more-reliable.patch} (98%)
 rename Spigot-Server-Patches/{0248-Call-PaperServerListPingEvent-for-legacy-pings.patch => 0247-Call-PaperServerListPingEvent-for-legacy-pings.patch} (99%)
 rename Spigot-Server-Patches/{0249-Flag-to-disable-the-channel-limit.patch => 0248-Flag-to-disable-the-channel-limit.patch} (96%)
 rename Spigot-Server-Patches/{0250-Add-method-to-open-already-placed-sign.patch => 0249-Add-method-to-open-already-placed-sign.patch} (95%)
 rename Spigot-Server-Patches/{0251-Load-version-history-at-server-start.patch => 0250-Load-version-history-at-server-start.patch} (93%)
 rename Spigot-Server-Patches/{0252-Configurable-sprint-interruption-on-attack.patch => 0251-Configurable-sprint-interruption-on-attack.patch} (96%)
 rename Spigot-Server-Patches/{0253-Fix-exploit-that-allowed-colored-signs-to-be-created.patch => 0252-Fix-exploit-that-allowed-colored-signs-to-be-created.patch} (94%)
 rename Spigot-Server-Patches/{0254-EndermanEscapeEvent.patch => 0253-EndermanEscapeEvent.patch} (98%)
 rename Spigot-Server-Patches/{0255-Enderman.teleportRandomly.patch => 0254-Enderman.teleportRandomly.patch} (96%)
 rename Spigot-Server-Patches/{0256-Block-Enderpearl-Travel-Exploit.patch => 0255-Block-Enderpearl-Travel-Exploit.patch} (97%)
 rename Spigot-Server-Patches/{0257-Expand-World.spawnParticle-API-and-add-Builder.patch => 0256-Expand-World.spawnParticle-API-and-add-Builder.patch} (98%)
 rename Spigot-Server-Patches/{0258-EndermanAttackPlayerEvent.patch => 0257-EndermanAttackPlayerEvent.patch} (95%)
 rename Spigot-Server-Patches/{0259-WitchConsumePotionEvent.patch => 0258-WitchConsumePotionEvent.patch} (95%)
 rename Spigot-Server-Patches/{0260-WitchThrowPotionEvent.patch => 0259-WitchThrowPotionEvent.patch} (96%)
 rename Spigot-Server-Patches/{0261-Allow-spawning-Item-entities-with-World.spawnEntity.patch => 0260-Allow-spawning-Item-entities-with-World.spawnEntity.patch} (95%)
 rename Spigot-Server-Patches/{0262-Configurable-Villages-loading-chunks-for-door-checks.patch => 0261-Configurable-Villages-loading-chunks-for-door-checks.patch} (98%)
 rename Spigot-Server-Patches/{0263-WitchReadyPotionEvent.patch => 0262-WitchReadyPotionEvent.patch} (95%)
 rename Spigot-Server-Patches/{0264-ItemStack-getMaxItemUseDuration.patch => 0263-ItemStack-getMaxItemUseDuration.patch} (96%)
 rename Spigot-Server-Patches/{0265-Implement-EntityTeleportEndGatewayEvent.patch => 0264-Implement-EntityTeleportEndGatewayEvent.patch} (96%)
 rename Spigot-Server-Patches/{0266-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch => 0265-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch} (95%)
 rename Spigot-Server-Patches/{0267-Properly-remove-entities-on-dimension-teleport.patch => 0266-Properly-remove-entities-on-dimension-teleport.patch} (97%)
 rename Spigot-Server-Patches/{0268-Fix-CraftEntity-hashCode.patch => 0267-Fix-CraftEntity-hashCode.patch} (96%)
 rename Spigot-Server-Patches/{0269-Configurable-Alternative-LootPool-Luck-Formula.patch => 0268-Configurable-Alternative-LootPool-Luck-Formula.patch} (97%)
 rename Spigot-Server-Patches/{0270-Print-Error-details-when-failing-to-save-player-data.patch => 0269-Print-Error-details-when-failing-to-save-player-data.patch} (93%)
 rename Spigot-Server-Patches/{0271-Make-shield-blocking-delay-configurable.patch => 0270-Make-shield-blocking-delay-configurable.patch} (97%)
 rename Spigot-Server-Patches/{0272-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch => 0271-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch} (95%)
 rename Spigot-Server-Patches/{0273-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch => 0272-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch} (98%)
 rename Spigot-Server-Patches/{0274-PlayerReadyArrowEvent.patch => 0273-PlayerReadyArrowEvent.patch} (98%)
 rename Spigot-Server-Patches/{0275-Fire-EntityShootBowEvent-for-Illusioner.patch => 0274-Fire-EntityShootBowEvent-for-Illusioner.patch} (95%)
 rename Spigot-Server-Patches/{0276-Implement-EntityKnockbackByEntityEvent.patch => 0275-Implement-EntityKnockbackByEntityEvent.patch} (96%)
 rename Spigot-Server-Patches/{0277-Expand-Explosions-API.patch => 0276-Expand-Explosions-API.patch} (95%)
 rename Spigot-Server-Patches/{0278-LivingEntity-Hand-Raised-Item-Use-API.patch => 0277-LivingEntity-Hand-Raised-Item-Use-API.patch} (97%)
 rename Spigot-Server-Patches/{0279-RangedEntity-API.patch => 0278-RangedEntity-API.patch} (99%)
 rename Spigot-Server-Patches/{0280-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch => 0279-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch} (95%)
 rename Spigot-Server-Patches/{0281-Add-config-to-disable-ender-dragon-legacy-check.patch => 0280-Add-config-to-disable-ender-dragon-legacy-check.patch} (97%)
 rename Spigot-Server-Patches/{0282-Implement-World.getEntity-UUID-API.patch => 0281-Implement-World.getEntity-UUID-API.patch} (93%)
 rename Spigot-Server-Patches/{0283-InventoryCloseEvent-Reason-API.patch => 0282-InventoryCloseEvent-Reason-API.patch} (96%)
 rename Spigot-Server-Patches/{0284-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch => 0283-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch} (97%)
 rename Spigot-Server-Patches/{0285-Configurable-Bed-Search-Radius.patch => 0284-Configurable-Bed-Search-Radius.patch} (98%)
 rename Spigot-Server-Patches/{0286-Vex-getSummoner-API.patch => 0285-Vex-getSummoner-API.patch} (96%)
 rename Spigot-Server-Patches/{0287-Refresh-player-inventory-when-cancelling-PlayerInter.patch => 0286-Refresh-player-inventory-when-cancelling-PlayerInter.patch} (95%)
 rename Spigot-Server-Patches/{0288-Don-t-change-the-Entity-Random-seed-for-squids.patch => 0287-Don-t-change-the-Entity-Random-seed-for-squids.patch} (92%)
 rename Spigot-Server-Patches/{0289-Re-add-vanilla-entity-warnings-for-duplicates.patch => 0288-Re-add-vanilla-entity-warnings-for-duplicates.patch} (95%)
 rename Spigot-Server-Patches/{0290-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch => 0289-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch} (95%)
 rename Spigot-Server-Patches/{0291-Avoid-item-merge-if-stack-size-above-max-stack-size.patch => 0290-Avoid-item-merge-if-stack-size-above-max-stack-size.patch} (93%)
 rename Spigot-Server-Patches/{0292-Use-asynchronous-Log4j-2-loggers.patch => 0291-Use-asynchronous-Log4j-2-loggers.patch} (94%)
 rename Spigot-Server-Patches/{0293-add-more-information-to-Entity.toString.patch => 0292-add-more-information-to-Entity.toString.patch} (95%)
 rename Spigot-Server-Patches/{0294-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch => 0293-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch} (98%)
 rename Spigot-Server-Patches/{0295-EnderDragon-Events.patch => 0294-EnderDragon-Events.patch} (98%)
 rename Spigot-Server-Patches/{0296-PlayerElytraBoostEvent.patch => 0295-PlayerElytraBoostEvent.patch} (96%)
 rename Spigot-Server-Patches/{0297-PlayerLaunchProjectileEvent.patch => 0296-PlayerLaunchProjectileEvent.patch} (99%)
 rename Spigot-Server-Patches/{0298-Duplicate-UUID-Resolve-Option.patch => 0297-Duplicate-UUID-Resolve-Option.patch} (99%)
 rename Spigot-Server-Patches/{0299-Speedup-BlockPos-by-fixing-inlining.patch => 0298-Speedup-BlockPos-by-fixing-inlining.patch} (93%)
 rename Spigot-Server-Patches/{0300-Don-t-save-Proto-Chunks.patch => 0299-Don-t-save-Proto-Chunks.patch} (97%)
 rename Spigot-Server-Patches/{0301-Optimize-RegistryID.c.patch => 0300-Optimize-RegistryID.c.patch} (96%)
 rename Spigot-Server-Patches/{0302-Option-to-prevent-armor-stands-from-doing-entity-loo.patch => 0301-Option-to-prevent-armor-stands-from-doing-entity-loo.patch} (94%)
 rename Spigot-Server-Patches/{0303-Vanished-players-don-t-have-rights.patch => 0302-Vanished-players-don-t-have-rights.patch} (99%)
 rename Spigot-Server-Patches/{0304-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch => 0303-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch} (90%)
 rename Spigot-Server-Patches/{0305-Add-some-Debug-to-Chunk-Entity-slices.patch => 0304-Add-some-Debug-to-Chunk-Entity-slices.patch} (97%)
 rename Spigot-Server-Patches/{0306-Optimize-Region-File-Cache.patch => 0305-Optimize-Region-File-Cache.patch} (97%)
 rename Spigot-Server-Patches/{0307-EntityTransformedEvent.patch => 0306-EntityTransformedEvent.patch} (98%)
 rename Spigot-Server-Patches/{0308-SkeletonHorse-Additions.patch => 0307-SkeletonHorse-Additions.patch} (97%)
 rename Spigot-Server-Patches/{0309-Prevent-Saving-Bad-entities-to-chunks.patch => 0308-Prevent-Saving-Bad-entities-to-chunks.patch} (97%)
 rename Spigot-Server-Patches/{0310-Don-t-call-getItemMeta-on-hasItemMeta.patch => 0309-Don-t-call-getItemMeta-on-hasItemMeta.patch} (98%)
 rename Spigot-Server-Patches/{0311-Always-process-chunk-removal-in-removeEntity.patch => 0310-Always-process-chunk-removal-in-removeEntity.patch} (95%)
 rename Spigot-Server-Patches/{0312-Ignore-Dead-Entities-in-entityList-iteration.patch => 0311-Ignore-Dead-Entities-in-entityList-iteration.patch} (98%)
 rename Spigot-Server-Patches/{0313-Provide-option-to-use-a-versioned-world-folder-for-t.patch => 0312-Provide-option-to-use-a-versioned-world-folder-for-t.patch} (99%)
 rename Spigot-Server-Patches/{0314-MC-111480-Start-Entity-ID-s-at-1.patch => 0313-MC-111480-Start-Entity-ID-s-at-1.patch} (94%)
 rename Spigot-Server-Patches/{0315-Implement-Expanded-ArmorStand-API.patch => 0314-Implement-Expanded-ArmorStand-API.patch} (98%)
 rename Spigot-Server-Patches/{0316-AnvilDamageEvent.patch => 0315-AnvilDamageEvent.patch} (96%)
 rename Spigot-Server-Patches/{0317-World-EntityHuman-Lookup-Optimizations.patch => 0316-World-EntityHuman-Lookup-Optimizations.patch} (98%)
 rename Spigot-Server-Patches/{0318-Add-TNTPrimeEvent.patch => 0317-Add-TNTPrimeEvent.patch} (99%)
 rename Spigot-Server-Patches/{0319-Break-up-and-make-tab-spam-limits-configurable.patch => 0318-Break-up-and-make-tab-spam-limits-configurable.patch} (97%)
 rename Spigot-Server-Patches/{0320-Make-portal-teleportation-adjustment-math-more-accur.patch => 0319-Make-portal-teleportation-adjustment-math-more-accur.patch} (98%)
 rename Spigot-Server-Patches/{0321-Add-hand-to-bucket-events.patch => 0320-Add-hand-to-bucket-events.patch} (99%)
 rename Spigot-Server-Patches/{0322-MC-135506-Experience-should-save-as-Integers.patch => 0321-MC-135506-Experience-should-save-as-Integers.patch} (95%)
 rename Spigot-Server-Patches/{0323-Entity-add-to-world-fixes.patch => 0322-Entity-add-to-world-fixes.patch} (97%)
 rename Spigot-Server-Patches/{0324-Fix-client-rendering-skulls-from-same-user.patch => 0323-Fix-client-rendering-skulls-from-same-user.patch} (98%)
 rename Spigot-Server-Patches/{0325-Add-Early-Warning-Feature-to-WatchDog.patch => 0324-Add-Early-Warning-Feature-to-WatchDog.patch} (98%)
 rename Spigot-Server-Patches/{0326-Make-EnderDragon-implement-Mob.patch => 0325-Make-EnderDragon-implement-Mob.patch} (95%)
 rename Spigot-Server-Patches/{0327-Detect-and-repair-corrupt-Region-Files.patch => 0326-Detect-and-repair-corrupt-Region-Files.patch} (96%)
 rename Spigot-Server-Patches/{0328-Use-ConcurrentHashMap-in-JsonList.patch => 0327-Use-ConcurrentHashMap-in-JsonList.patch} (98%)
 rename Spigot-Server-Patches/{0329-Use-a-Queue-for-Queueing-Commands.patch => 0328-Use-a-Queue-for-Queueing-Commands.patch} (96%)
 rename Spigot-Server-Patches/{0330-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch => 0329-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch} (95%)
 rename Spigot-Server-Patches/{0331-Allow-disabling-armour-stand-ticking.patch => 0330-Allow-disabling-armour-stand-ticking.patch} (97%)
 rename Spigot-Server-Patches/{0332-Optimize-BlockPosition-helper-methods.patch => 0331-Optimize-BlockPosition-helper-methods.patch} (98%)
 rename Spigot-Server-Patches/{0333-Send-nearby-packets-from-world-player-list-not-serve.patch => 0332-Send-nearby-packets-from-world-player-list-not-serve.patch} (97%)
 rename Spigot-Server-Patches/{0334-Cache-World-Entity-Type-counts.patch => 0333-Cache-World-Entity-Type-counts.patch} (99%)
 rename Spigot-Server-Patches/{0335-Restore-vanlla-default-mob-spawn-range.patch => 0334-Restore-vanlla-default-mob-spawn-range.patch} (87%)
 rename Spigot-Server-Patches/{0336-Optimize-Hoppers.patch => 0335-Optimize-Hoppers.patch} (99%)
 rename Spigot-Server-Patches/{0337-Optimize-CraftBlockData-Creation.patch => 0336-Optimize-CraftBlockData-Creation.patch} (98%)
 rename Spigot-Server-Patches/{0338-Fix-MC-124320.patch => 0337-Fix-MC-124320.patch} (97%)
 rename Spigot-Server-Patches/{0339-Slime-Pathfinder-Events.patch => 0338-Slime-Pathfinder-Events.patch} (97%)
 rename Spigot-Server-Patches/{0340-Add-source-block-to-BlockPhysicsEvent.patch => 0339-Add-source-block-to-BlockPhysicsEvent.patch} (95%)
 rename Spigot-Server-Patches/{0341-Anti-Xray.patch => 0340-Anti-Xray.patch} (99%)
 rename Spigot-Server-Patches/{0342-Configurable-speed-for-water-flowing-over-lava.patch => 0341-Configurable-speed-for-water-flowing-over-lava.patch} (98%)
 rename Spigot-Server-Patches/{0343-Optimize-RegistryMaterials.patch => 0342-Optimize-RegistryMaterials.patch} (94%)
 rename Spigot-Server-Patches/{0344-Add-PhantomPreSpawnEvent.patch => 0343-Add-PhantomPreSpawnEvent.patch} (98%)
 rename Spigot-Server-Patches/{0345-Add-More-Creeper-API.patch => 0344-Add-More-Creeper-API.patch} (98%)
 rename Spigot-Server-Patches/{0346-Optimize-Chunk-getPos.patch => 0345-Optimize-Chunk-getPos.patch} (92%)
 rename Spigot-Server-Patches/{0347-Use-an-EnumMap-for-Chunk-Height-Maps.patch => 0346-Use-an-EnumMap-for-Chunk-Height-Maps.patch} (88%)
 rename Spigot-Server-Patches/{0348-Implement-Force-Loaded-Chunk-API.patch => 0347-Implement-Force-Loaded-Chunk-API.patch} (97%)
 rename Spigot-Server-Patches/{0349-Inventory-removeItemAnySlot.patch => 0348-Inventory-removeItemAnySlot.patch} (97%)
 rename Spigot-Server-Patches/{0350-Optimize-getChunkIfLoaded-type-calls.patch => 0349-Optimize-getChunkIfLoaded-type-calls.patch} (98%)
 rename Spigot-Server-Patches/{0351-Don-t-double-add-golems-to-world.patch => 0350-Don-t-double-add-golems-to-world.patch} (89%)
 rename Spigot-Server-Patches/{0352-fix-newlines-in-spigot-tab-list-API.patch => 0351-fix-newlines-in-spigot-tab-list-API.patch} (97%)
 rename Spigot-Server-Patches/{0353-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch => 0352-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch} (93%)
 rename Spigot-Server-Patches/{0354-Add-ray-tracing-methods-to-LivingEntity.patch => 0353-Add-ray-tracing-methods-to-LivingEntity.patch} (98%)
 rename Spigot-Server-Patches/{0355-Fix-concurrency-and-performance-issues-in-DataFixers.patch => 0354-Fix-concurrency-and-performance-issues-in-DataFixers.patch} (99%)
 rename Spigot-Server-Patches/{0356-Expose-attack-cooldown-methods-for-Player.patch => 0355-Expose-attack-cooldown-methods-for-Player.patch} (96%)
 rename Spigot-Server-Patches/{0357-Fix-1420.patch => 0356-Fix-1420.patch} (97%)
 rename Spigot-Server-Patches/{0358-MC-2025-Save-and-load-entity-AABB-to-prevent-wobble.patch => 0357-MC-2025-Save-and-load-entity-AABB-to-prevent-wobble.patch} (98%)
 rename Spigot-Server-Patches/{0359-Improve-death-events.patch => 0358-Improve-death-events.patch} (99%)
 rename Spigot-Server-Patches/{0360-Allow-chests-to-be-placed-with-NBT-data.patch => 0359-Allow-chests-to-be-placed-with-NBT-data.patch} (92%)
 rename Spigot-Server-Patches/{0361-Mob-Pathfinding-API.patch => 0360-Mob-Pathfinding-API.patch} (95%)
 rename Spigot-Server-Patches/{0362-Prevent-chunk-loading-from-Fluid-Flowing.patch => 0361-Prevent-chunk-loading-from-Fluid-Flowing.patch} (98%)
 rename Spigot-Server-Patches/{0364-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch => 0362-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch} (99%)
 rename Spigot-Server-Patches/{0365-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch => 0363-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch} (98%)
 delete mode 100644 Spigot-Server-Patches/0363-Prevent-pathfinding-from-loading-chunks.patch
 rename Spigot-Server-Patches/{0366-Prevent-mob-spawning-from-loading-generating-chunks.patch => 0364-Prevent-mob-spawning-from-loading-generating-chunks.patch} (97%)
 rename Spigot-Server-Patches/{0367-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch => 0365-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch} (98%)
 rename Spigot-Server-Patches/{0368-Optimize-and-Fix-ExpiringMap-Issues.patch => 0366-Optimize-and-Fix-ExpiringMap-Issues.patch} (99%)
 rename Spigot-Server-Patches/{0369-Implement-furnace-cook-speed-multiplier-API.patch => 0367-Implement-furnace-cook-speed-multiplier-API.patch} (98%)
 rename Spigot-Server-Patches/{0370-Support-Overriding-World-Seeds.patch => 0368-Support-Overriding-World-Seeds.patch} (97%)
 rename Spigot-Server-Patches/{0371-Optimize-Server-World-Map.patch => 0369-Optimize-Server-World-Map.patch} (99%)
 rename Spigot-Server-Patches/{0372-PreSpawnerSpawnEvent.patch => 0370-PreSpawnerSpawnEvent.patch} (96%)
 rename Spigot-Server-Patches/{0373-MC-134115-Fix-Double-Chest-Conversion-Error.patch => 0371-MC-134115-Fix-Double-Chest-Conversion-Error.patch} (97%)
 rename Spigot-Server-Patches/{0374-Catch-JsonParseException-in-Entity-and-TE-names.patch => 0372-Catch-JsonParseException-in-Entity-and-TE-names.patch} (98%)
 rename Spigot-Server-Patches/{0375-Avoid-dimension-id-collisions.patch => 0373-Avoid-dimension-id-collisions.patch} (94%)
 rename Spigot-Server-Patches/{0376-Honor-EntityAgeable.ageLock.patch => 0374-Honor-EntityAgeable.ageLock.patch} (91%)
 rename Spigot-Server-Patches/{0377-Async-Chunk-Loading-and-Generation.patch => 0375-Async-Chunk-Loading-and-Generation.patch} (99%)
 rename Spigot-Server-Patches/{0378-Ignore-Dimension-NBT-field-in-Entity-data.patch => 0376-Ignore-Dimension-NBT-field-in-Entity-data.patch} (97%)
 rename Spigot-Server-Patches/{0379-Fix-turtle-lag.patch => 0377-Fix-turtle-lag.patch} (93%)
 rename Spigot-Server-Patches/{0380-Optimize-Light-Recalculations.patch => 0378-Optimize-Light-Recalculations.patch} (98%)
 rename Spigot-Server-Patches/{0381-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch => 0379-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch} (96%)
 rename Spigot-Server-Patches/{0382-Don-t-recheck-type-after-setting-a-block.patch => 0380-Don-t-recheck-type-after-setting-a-block.patch} (95%)
 rename Spigot-Server-Patches/{0383-Fix-Sending-Chunks-to-Client.patch => 0381-Fix-Sending-Chunks-to-Client.patch} (97%)
 rename Spigot-Server-Patches/{0384-Configurable-connection-throttle-kick-message.patch => 0382-Configurable-connection-throttle-kick-message.patch} (95%)
 rename Spigot-Server-Patches/{0385-Fix-FileIOThread-concurrency-issues.patch => 0383-Fix-FileIOThread-concurrency-issues.patch} (96%)

diff --git a/Spigot-Server-Patches/0004-MC-Utils.patch b/Spigot-Server-Patches/0004-MC-Utils.patch
index bcd29b2aed..ec33ac6f89 100644
--- a/Spigot-Server-Patches/0004-MC-Utils.patch
+++ b/Spigot-Server-Patches/0004-MC-Utils.patch
@@ -1,11 +1,11 @@
-From 9c41b033695b2ef0aaa8f9ba1f6fe6abe50ceb50 Mon Sep 17 00:00:00 2001
+From 8521645f1d0a690c7ba90ca59172f9dcec1df615 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 20:55:47 -0400
 Subject: [PATCH] MC Utils
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index 6ffc535146..5ed34cf7e3 100644
+index 6ffc535146..5c5f19b4b4 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -9,7 +9,7 @@ import org.apache.logging.log4j.Logger;
@@ -25,7 +25,15 @@ index 6ffc535146..5ed34cf7e3 100644
      public BlockPosition a(int ix, int jx, int kx) {
          return ix == 0 && jx == 0 && kx == 0 ? this : new BlockPosition(this.getX() + ix, this.getY() + jx, this.getZ() + kx);
      }
-@@ -282,6 +283,7 @@ public class BlockPosition extends BaseBlockPosition {
+@@ -186,6 +187,7 @@ public class BlockPosition extends BaseBlockPosition {
+         };
+     }
+ 
++    public BlockPosition asImmutable() { return h(); } // Paper - OBFHELPER
+     public BlockPosition h() {
+         return this;
+     }
+@@ -282,6 +284,7 @@ public class BlockPosition extends BaseBlockPosition {
              return this.d;
          }
  
@@ -33,7 +41,7 @@ index 6ffc535146..5ed34cf7e3 100644
          public BlockPosition.MutableBlockPosition c(int i, int j, int k) {
              this.b = i;
              this.c = j;
-@@ -289,6 +291,7 @@ public class BlockPosition extends BaseBlockPosition {
+@@ -289,6 +292,7 @@ public class BlockPosition extends BaseBlockPosition {
              return this;
          }
  
@@ -292,10 +300,10 @@ index c54275bc2f..318c4204df 100644
      }
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
 new file mode 100644
-index 0000000000..faec947224
+index 0000000000..c97e116aaf
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
-@@ -0,0 +1,340 @@
+@@ -0,0 +1,316 @@
 +package net.minecraft.server;
 +
 +import com.destroystokyo.paper.block.TargetBlockInfo;
@@ -552,30 +560,6 @@ index 0000000000..faec947224
 +    }
 +
 +    /**
-+     * Gets a chunk without changing its boolean for should unload
-+     * @param world
-+     * @param x
-+     * @param z
-+     * @return
-+     */
-+    @Nullable
-+    public static Chunk getLoadedChunkWithoutMarkingActive(World world, int x, int z) {
-+        return ((ChunkProviderServer) world.chunkProvider).chunks.get(ChunkCoordIntPair.a(x, z));
-+    }
-+
-+    /**
-+     * Gets a chunk without changing its boolean for should unload
-+     * @param provider
-+     * @param x
-+     * @param z
-+     * @return
-+     */
-+    @Nullable
-+    public static Chunk getLoadedChunkWithoutMarkingActive(IChunkProvider provider, int x, int z) {
-+        return ((ChunkProviderServer)provider).chunks.get(ChunkCoordIntPair.a(x, z));
-+    }
-+
-+    /**
 +     * Posts a task to be executed asynchronously
 +     * @param run
 +     */
diff --git a/Spigot-Server-Patches/0028-Lighting-Queue.patch b/Spigot-Server-Patches/0028-Lighting-Queue.patch
index f6df113921..47b2f21435 100644
--- a/Spigot-Server-Patches/0028-Lighting-Queue.patch
+++ b/Spigot-Server-Patches/0028-Lighting-Queue.patch
@@ -1,4 +1,4 @@
-From c5fa856a9c824a188540888c0224415592fd8c0f Mon Sep 17 00:00:00 2001
+From 6c6649b7448fdcb1a1d3235b41294da22a232603 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 00:52:31 -0600
 Subject: [PATCH] Lighting Queue
@@ -28,7 +28,7 @@ index 145cb274b0..eff9dcf54f 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 4812da0dac..d0eb7c0fc2 100644
+index 6ab2eaa169..27775476f9 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -184,6 +184,11 @@ public class PaperConfig {
@@ -61,7 +61,7 @@ index 39d565db1f..8f6f0288be 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index a97f0499cd..397798cf28 100644
+index af181d4bd7..4ec5fe739f 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -38,7 +38,7 @@ public class Chunk implements IChunkAccess {
@@ -190,7 +190,7 @@ index d6ea4ae532..5086fe4027 100644
      }
 diff --git a/src/main/java/net/minecraft/server/PaperLightingQueue.java b/src/main/java/net/minecraft/server/PaperLightingQueue.java
 new file mode 100644
-index 0000000000..bfb05e8766
+index 0000000000..d207266db3
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/PaperLightingQueue.java
 @@ -0,0 +1,99 @@
@@ -280,7 +280,7 @@ index 0000000000..bfb05e8766
 +                        continue;
 +                    }
 +
-+                    Chunk neighbor = MCUtil.getLoadedChunkWithoutMarkingActive(chunk.world, x, z);
++                    Chunk neighbor = chunk.world.getChunkIfLoaded(x, z);
 +                    if (neighbor != null) {
 +                        neighbor.lightingQueue.processQueue(0, 0); // No timeout
 +                    }
diff --git a/Spigot-Server-Patches/0080-Optimize-isValidLocation-getType-and-getBlockData-fo.patch b/Spigot-Server-Patches/0080-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
index 23e451c44e..691a8b22c5 100644
--- a/Spigot-Server-Patches/0080-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
+++ b/Spigot-Server-Patches/0080-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
@@ -1,4 +1,4 @@
-From ddf05e292f18cdd911fd1360401b33e317016bd3 Mon Sep 17 00:00:00 2001
+From 179f3a755d31a07486dddac8aa1e92254fa7cd9b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 02:07:55 -0600
 Subject: [PATCH] Optimize isValidLocation, getType and getBlockData for inling
@@ -31,10 +31,10 @@ index 4048937c63..680764b342 100644
      public BaseBlockPosition(int i, int j, int k) {
          this.a = i;
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index 5ed34cf7e3..f4ed98d2d9 100644
+index 5c5f19b4b4..d81e2dc1c5 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
-@@ -239,6 +239,16 @@ public class BlockPosition extends BaseBlockPosition {
+@@ -240,6 +240,16 @@ public class BlockPosition extends BaseBlockPosition {
          protected int b;
          protected int c;
          protected int d;
@@ -52,7 +52,7 @@ index 5ed34cf7e3..f4ed98d2d9 100644
          public MutableBlockPosition() {
              this(0, 0, 0);
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 36def82bca..0e84fd283d 100644
+index 38ef8ab6ad..a9c5a0b6f8 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -421,12 +421,24 @@ public class Chunk implements IChunkAccess {
diff --git a/Spigot-Server-Patches/0089-Do-not-load-chunks-for-light-checks.patch b/Spigot-Server-Patches/0089-Do-not-load-chunks-for-light-checks.patch
index 7ea8040eff..05d32e79c3 100644
--- a/Spigot-Server-Patches/0089-Do-not-load-chunks-for-light-checks.patch
+++ b/Spigot-Server-Patches/0089-Do-not-load-chunks-for-light-checks.patch
@@ -1,4 +1,4 @@
-From 06c4f9aff700a2985587ebb592453724eaf0852e Mon Sep 17 00:00:00 2001
+From 19bc80177637e62f6abf6e8422fb97663e2bd524 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 31 Mar 2016 19:17:58 -0400
 Subject: [PATCH] Do not load chunks for light checks
@@ -6,6 +6,122 @@ Subject: [PATCH] Do not load chunks for light checks
 Should only happen for blocks on the edge that uses neighbors light level
 (certain blocks). In that case, there will be 3-4 other neighbors to get a light level from.
 
+diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
+index a8b070ed32..7a4bc0fcc3 100644
+--- a/src/main/java/net/minecraft/server/NavigationAbstract.java
++++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
+@@ -21,13 +21,15 @@ public abstract class NavigationAbstract {
+     protected long n;
+     protected PathfinderAbstract o;
+     private BlockPosition q;
+-    private Pathfinder r;
++    private Pathfinder r; public Pathfinder getPathfinder() { return r; } // Paper - OBFHELPER
+ 
++    private void setWorld() { if (getPathfinder() != null && getPathfinder().getPathfinder() != null) getPathfinder().getPathfinder().world = getEntity().world; } // Paper
+     public NavigationAbstract(EntityInsentient entityinsentient, World world) {
+         this.a = entityinsentient;
+         this.b = world;
+         this.p = entityinsentient.getAttributeInstance(GenericAttributes.FOLLOW_RANGE);
+         this.r = this.a();
++        setWorld(); // Paper
+     }
+ 
+     public BlockPosition i() {
+@@ -164,6 +166,7 @@ public abstract class NavigationAbstract {
+     }
+ 
+     public void d() {
++        setWorld(); // Paper
+         ++this.e;
+         if (this.m) {
+             this.l();
+diff --git a/src/main/java/net/minecraft/server/Pathfinder.java b/src/main/java/net/minecraft/server/Pathfinder.java
+index 04c71ac0ef..6e583356ce 100644
+--- a/src/main/java/net/minecraft/server/Pathfinder.java
++++ b/src/main/java/net/minecraft/server/Pathfinder.java
+@@ -8,7 +8,7 @@ public class Pathfinder {
+     private final Path a = new Path();
+     private final Set<PathPoint> b = Sets.newHashSet();
+     private final PathPoint[] c = new PathPoint[32];
+-    private PathfinderAbstract d;
++    private PathfinderAbstract d; public PathfinderAbstract getPathfinder() { return d; }  // Paper - OBFHELPER
+ 
+     public Pathfinder(PathfinderAbstract pathfinderabstract) {
+         this.d = pathfinderabstract;
+diff --git a/src/main/java/net/minecraft/server/PathfinderAbstract.java b/src/main/java/net/minecraft/server/PathfinderAbstract.java
+index ba7fe359fe..6716280146 100644
+--- a/src/main/java/net/minecraft/server/PathfinderAbstract.java
++++ b/src/main/java/net/minecraft/server/PathfinderAbstract.java
+@@ -3,6 +3,7 @@ package net.minecraft.server;
+ public abstract class PathfinderAbstract {
+     protected IBlockAccess a;
+     protected EntityInsentient b;
++    public World world; // Paper
+     protected final IntHashMap<PathPoint> c = new IntHashMap<PathPoint>();
+     protected int d;
+     protected int e;
+@@ -16,6 +17,7 @@ public abstract class PathfinderAbstract {
+ 
+     public void a(IBlockAccess iblockaccess, EntityInsentient entityinsentient) {
+         this.a = iblockaccess;
++        if (iblockaccess instanceof World) world = (World) iblockaccess; // Paper
+         this.b = entityinsentient;
+         this.c.c();
+         this.d = MathHelper.d(entityinsentient.width + 1.0F);
+diff --git a/src/main/java/net/minecraft/server/PathfinderNormal.java b/src/main/java/net/minecraft/server/PathfinderNormal.java
+index 64e0b08170..93f3d2e363 100644
+--- a/src/main/java/net/minecraft/server/PathfinderNormal.java
++++ b/src/main/java/net/minecraft/server/PathfinderNormal.java
+@@ -47,7 +47,7 @@ public class PathfinderNormal extends PathfinderAbstract {
+         BlockPosition blockposition2 = new BlockPosition(this.b);
+         PathType pathtype1 = this.a(this.b, blockposition2.getX(), i, blockposition2.getZ());
+         if (this.b.a(pathtype1) < 0.0F) {
+-            HashSet hashset = Sets.newHashSet();
++            HashSet<BlockPosition> hashset = Sets.newHashSet(); // Paper - decompile fix
+             hashset.add(new BlockPosition(this.b.getBoundingBox().a, (double)i, this.b.getBoundingBox().c));
+             hashset.add(new BlockPosition(this.b.getBoundingBox().a, (double)i, this.b.getBoundingBox().f));
+             hashset.add(new BlockPosition(this.b.getBoundingBox().d, (double)i, this.b.getBoundingBox().c));
+@@ -233,7 +233,7 @@ public class PathfinderNormal extends PathfinderAbstract {
+     }
+ 
+     public PathType a(IBlockAccess iblockaccess, int i, int jx, int k, EntityInsentient entityinsentient, int l, int i1, int j1, boolean flag, boolean flag1) {
+-        EnumSet enumset = EnumSet.noneOf(PathType.class);
++        EnumSet<PathType> enumset = EnumSet.noneOf(PathType.class); // Paper - decompile fix
+         PathType pathtype = PathType.BLOCKED;
+         double d0 = (double)entityinsentient.width / 2.0D;
+         BlockPosition blockposition = new BlockPosition(entityinsentient);
+@@ -304,7 +304,8 @@ public class PathfinderNormal extends PathfinderAbstract {
+     public PathType a(IBlockAccess iblockaccess, int i, int jx, int k) {
+         PathType pathtype = this.b(iblockaccess, i, jx, k);
+         if (pathtype == PathType.OPEN && jx >= 1) {
+-            Block block = iblockaccess.getType(new BlockPosition(i, jx - 1, k)).getBlock();
++            Block block = world.getBlockIfLoaded(new BlockPosition(i, jx - 1, k)); // Paper
++            if (block == null) return PathType.BLOCKED; // Paper
+             PathType pathtype1 = this.b(iblockaccess, i, jx - 1, k);
+             pathtype = pathtype1 != PathType.WALKABLE && pathtype1 != PathType.OPEN && pathtype1 != PathType.WATER && pathtype1 != PathType.LAVA ? PathType.WALKABLE : PathType.OPEN;
+             if (pathtype1 == PathType.DAMAGE_FIRE || block == Blocks.MAGMA_BLOCK) {
+@@ -326,8 +327,9 @@ public class PathfinderNormal extends PathfinderAbstract {
+                 for(int l = -1; l <= 1; ++l) {
+                     for(int i1 = -1; i1 <= 1; ++i1) {
+                         if (l != 0 || i1 != 0) {
+-                            Block block = iblockaccess.getType(blockposition$b.f(l + i, jx, i1 + k)).getBlock();
+-                            if (block == Blocks.CACTUS) {
++                            Block block = world.getBlockIfLoaded(blockposition$b.f(l + i, jx, i1 + k)); // Paper
++                            if (block == null) pathtype = PathType.BLOCKED; // Paper
++                            else if (block == Blocks.CACTUS) { // Paper
+                                 pathtype = PathType.DANGER_CACTUS;
+                             } else if (block == Blocks.FIRE) {
+                                 pathtype = PathType.DANGER_FIRE;
+@@ -343,7 +345,8 @@ public class PathfinderNormal extends PathfinderAbstract {
+ 
+     protected PathType b(IBlockAccess iblockaccess, int i, int jx, int k) {
+         BlockPosition blockposition = new BlockPosition(i, jx, k);
+-        IBlockData iblockdata = iblockaccess.getType(blockposition);
++        IBlockData iblockdata = world.getTypeIfLoaded(blockposition); // Paper
++        if (iblockdata == null) return PathType.BLOCKED; // Paper
+         Block block = iblockdata.getBlock();
+         Material material = iblockdata.getMaterial();
+         if (iblockdata.isAir()) {
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
 index 207f53a9c3..b8fcfb6092 100644
 --- a/src/main/java/net/minecraft/server/World.java
diff --git a/Spigot-Server-Patches/0161-Activation-Range-Improvements.patch b/Spigot-Server-Patches/0115-Activation-Range-Improvements.patch
similarity index 81%
rename from Spigot-Server-Patches/0161-Activation-Range-Improvements.patch
rename to Spigot-Server-Patches/0115-Activation-Range-Improvements.patch
index 9f53a8279d..1e57afe27f 100644
--- a/Spigot-Server-Patches/0161-Activation-Range-Improvements.patch
+++ b/Spigot-Server-Patches/0115-Activation-Range-Improvements.patch
@@ -1,17 +1,19 @@
-From 5c8d5740834de57a88322d4bdb1a0fb33831dc29 Mon Sep 17 00:00:00 2001
+From 49e4bf33f5be44524fb07c642291336604a8e64e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
-Date: Tue, 27 Dec 2016 22:38:06 -0500
+Date: Fri, 13 May 2016 01:38:06 -0400
 Subject: [PATCH] Activation Range Improvements
 
+Optimizes performance of Activation Range
+
 Fixes and adds new Immunities to improve gameplay behavior
 
 Adds water Mobs to activation range config and nerfs fish
 
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index f4ed98d2d9..1dfd71df0a 100644
+index d81e2dc1c5..7bd51b3578 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
-@@ -326,6 +326,7 @@ public class BlockPosition extends BaseBlockPosition {
+@@ -327,6 +327,7 @@ public class BlockPosition extends BaseBlockPosition {
              this.c = i;
          }
  
@@ -112,35 +114,52 @@ index 9a75cb63ba..cf10605aaa 100644
                          }
                      }
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index f9bb19fed6..d176008f44 100644
+index f52de10238..05e10fb366 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
-@@ -13,13 +13,16 @@ import net.minecraft.server.EntityArrow;
- import net.minecraft.server.EntityComplexPart;
- import net.minecraft.server.EntityCreature;
+@@ -2,6 +2,8 @@ package org.spigotmc;
+ 
+ import java.util.List;
+ import java.util.Set;
++
++import co.aikar.timings.MinecraftTimings;
+ import net.minecraft.server.AxisAlignedBB;
+ import net.minecraft.server.Chunk;
+ import net.minecraft.server.Entity;
+@@ -13,25 +15,29 @@ import net.minecraft.server.EntityCreature;
  import net.minecraft.server.EntityCreeper;
-+import net.minecraft.server.EntityDrowned;
  import net.minecraft.server.EntityEnderCrystal;
  import net.minecraft.server.EntityEnderDragon;
- import net.minecraft.server.EntityFallingBlock;
+-import net.minecraft.server.EntityFallingBlock; // Paper
++import net.minecraft.server.EntityFallingBlock;
  import net.minecraft.server.EntityFireball;
  import net.minecraft.server.EntityFireworks;
 +import net.minecraft.server.EntityFish;
  import net.minecraft.server.EntityHuman;
++import net.minecraft.server.EntityInsentient;
  import net.minecraft.server.EntityLiving;
 +import net.minecraft.server.EntityLlama;
  import net.minecraft.server.EntityMonster;
  import net.minecraft.server.EntityProjectile;
  import net.minecraft.server.EntitySheep;
-@@ -27,6 +30,7 @@ import net.minecraft.server.EntitySlime;
+-import net.minecraft.server.EntitySlice;
+ import net.minecraft.server.EntitySlime;
  import net.minecraft.server.EntityTNTPrimed;
  import net.minecraft.server.EntityThrownTrident;
  import net.minecraft.server.EntityVillager;
 +import net.minecraft.server.EntityWaterAnimal;
  import net.minecraft.server.EntityWeather;
  import net.minecraft.server.EntityWither;
- import net.minecraft.server.MCUtil;
-@@ -40,6 +44,7 @@ public class ActivationRange
++import net.minecraft.server.MCUtil;
+ import net.minecraft.server.MathHelper;
+ import net.minecraft.server.MinecraftServer;
++import net.minecraft.server.NavigationGuardian;
+ import net.minecraft.server.World;
+-import co.aikar.timings.MinecraftTimings;
+ 
+ public class ActivationRange
+ {
+@@ -39,6 +45,7 @@ public class ActivationRange
      static AxisAlignedBB maxBB = new AxisAlignedBB( 0, 0, 0, 0, 0, 0 );
      static AxisAlignedBB miscBB = new AxisAlignedBB( 0, 0, 0, 0, 0, 0 );
      static AxisAlignedBB animalBB = new AxisAlignedBB( 0, 0, 0, 0, 0, 0 );
@@ -148,7 +167,7 @@ index f9bb19fed6..d176008f44 100644
      static AxisAlignedBB monsterBB = new AxisAlignedBB( 0, 0, 0, 0, 0, 0 );
  
      /**
-@@ -51,6 +56,7 @@ public class ActivationRange
+@@ -50,6 +57,7 @@ public class ActivationRange
       */
      public static byte initializeEntityActivationType(Entity entity)
      {
@@ -156,7 +175,7 @@ index f9bb19fed6..d176008f44 100644
          if ( entity instanceof EntityMonster || entity instanceof EntitySlime )
          {
              return 1; // Monster
-@@ -75,6 +81,7 @@ public class ActivationRange
+@@ -74,6 +82,7 @@ public class ActivationRange
          if ( ( entity.activationType == 3 && config.miscActivationRange == 0 )
                  || ( entity.activationType == 2 && config.animalActivationRange == 0 )
                  || ( entity.activationType == 1 && config.monsterActivationRange == 0 )
@@ -164,7 +183,7 @@ index f9bb19fed6..d176008f44 100644
                  || entity instanceof EntityHuman
                  || entity instanceof EntityProjectile
                  || entity instanceof EntityEnderDragon
-@@ -106,6 +113,7 @@ public class ActivationRange
+@@ -105,11 +114,13 @@ public class ActivationRange
          final int miscActivationRange = world.spigotConfig.miscActivationRange;
          final int animalActivationRange = world.spigotConfig.animalActivationRange;
          final int monsterActivationRange = world.spigotConfig.monsterActivationRange;
@@ -172,7 +191,13 @@ index f9bb19fed6..d176008f44 100644
  
          int maxRange = Math.max( monsterActivationRange, animalActivationRange );
          maxRange = Math.max( maxRange, miscActivationRange );
-@@ -119,6 +127,7 @@ public class ActivationRange
+         //maxRange = Math.min( ( world.spigotConfig.viewDistance << 4 ) - 8, maxRange ); Paper - Use player view distance API below instead
+ 
++        Chunk chunk; // Paper
+         for ( EntityHuman player : world.players )
+         {
+             int playerMaxRange = maxRange = Math.min( ( player.getViewDistance() << 4 ) - 8, maxRange ); // Paper - Use player view distance API
+@@ -117,6 +128,7 @@ public class ActivationRange
              maxBB = player.getBoundingBox().grow( playerMaxRange, 256, playerMaxRange ); // Paper - Use player view distance API
              miscBB = player.getBoundingBox().grow( miscActivationRange, 256, miscActivationRange );
              animalBB = player.getBoundingBox().grow( animalActivationRange, 256, animalActivationRange );
@@ -180,7 +205,19 @@ index f9bb19fed6..d176008f44 100644
              monsterBB = player.getBoundingBox().grow( monsterActivationRange, 256, monsterActivationRange );
  
              int i = MathHelper.floor( maxBB.a / 16.0D );
-@@ -172,6 +181,14 @@ public class ActivationRange
+@@ -128,9 +140,9 @@ public class ActivationRange
+             {
+                 for ( int j1 = k; j1 <= l; ++j1 )
+                 {
+-                    if ( world.getWorld().isChunkLoaded( i1, j1 ) )
++                    if ( (chunk = world.getChunkIfLoaded(i1, j1 )) != null ) // Paper
+                     {
+-                        activateChunkEntities( world.getChunkAt( i1, j1 ) );
++                        activateChunkEntities( chunk ); // Paper
+                     }
+                 }
+             }
+@@ -170,6 +182,14 @@ public class ActivationRange
                                  entity.activatedTick = MinecraftServer.currentTick;
                              }
                              break;
@@ -195,22 +232,28 @@ index f9bb19fed6..d176008f44 100644
                          case 3:
                          default:
                              if ( miscBB.c( entity.getBoundingBox() ) )
-@@ -193,8 +210,13 @@ public class ActivationRange
+@@ -191,11 +211,17 @@ public class ActivationRange
       */
      public static boolean checkEntityImmunities(Entity entity)
      {
+-        // quick checks.
+-        if ( entity.inWater || entity.fireTicks > 0 )
+-        {
 +        // Paper start - optimize Water cases
 +        if (entity instanceof EntityFish) {
 +            return false;
 +        }
-         // quick checks.
--        if ( entity.inWater || entity.fireTicks > 0 )
-+        if ( (entity.inWater && (!(entity instanceof EntityWaterAnimal || entity instanceof EntityDrowned))) || entity.fireTicks > 0 )
-+        // Paper end
-         {
++        if ((entity.inWater && entity instanceof EntityInsentient && !(((EntityInsentient) entity).getNavigation() instanceof NavigationGuardian))) {
              return true;
          }
-@@ -212,18 +234,29 @@ public class ActivationRange
++        if (entity.fireTicks > 0) {
++            return true;
++        }
++        // Paper end
+         if ( !( entity instanceof EntityArrow ) )
+         {
+             if ( !entity.onGround || !entity.passengers.isEmpty() || entity.isPassenger() )
+@@ -210,18 +236,29 @@ public class ActivationRange
          if ( entity instanceof EntityLiving )
          {
              EntityLiving living = (EntityLiving) entity;
@@ -243,7 +286,7 @@ index f9bb19fed6..d176008f44 100644
              if ( entity instanceof EntityAnimal )
              {
                  EntityAnimal animal = (EntityAnimal) entity;
-@@ -276,10 +309,10 @@ public class ActivationRange
+@@ -274,10 +311,10 @@ public class ActivationRange
          {
              isActive = false;
          }
diff --git a/Spigot-Server-Patches/0115-Optimize-EAR.patch b/Spigot-Server-Patches/0115-Optimize-EAR.patch
deleted file mode 100644
index e7fb453a85..0000000000
--- a/Spigot-Server-Patches/0115-Optimize-EAR.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 985660e1b67c134bedf39833962111048d6d395a Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Fri, 13 May 2016 01:38:06 -0400
-Subject: [PATCH] Optimize EAR
-
-
-diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index f52de10238..12040596df 100644
---- a/src/main/java/org/spigotmc/ActivationRange.java
-+++ b/src/main/java/org/spigotmc/ActivationRange.java
-@@ -2,6 +2,8 @@ package org.spigotmc;
- 
- import java.util.List;
- import java.util.Set;
-+
-+import co.aikar.timings.MinecraftTimings;
- import net.minecraft.server.AxisAlignedBB;
- import net.minecraft.server.Chunk;
- import net.minecraft.server.Entity;
-@@ -13,7 +15,7 @@ import net.minecraft.server.EntityCreature;
- import net.minecraft.server.EntityCreeper;
- import net.minecraft.server.EntityEnderCrystal;
- import net.minecraft.server.EntityEnderDragon;
--import net.minecraft.server.EntityFallingBlock; // Paper
-+import net.minecraft.server.EntityFallingBlock;
- import net.minecraft.server.EntityFireball;
- import net.minecraft.server.EntityFireworks;
- import net.minecraft.server.EntityHuman;
-@@ -21,17 +23,16 @@ import net.minecraft.server.EntityLiving;
- import net.minecraft.server.EntityMonster;
- import net.minecraft.server.EntityProjectile;
- import net.minecraft.server.EntitySheep;
--import net.minecraft.server.EntitySlice;
- import net.minecraft.server.EntitySlime;
- import net.minecraft.server.EntityTNTPrimed;
- import net.minecraft.server.EntityThrownTrident;
- import net.minecraft.server.EntityVillager;
- import net.minecraft.server.EntityWeather;
- import net.minecraft.server.EntityWither;
-+import net.minecraft.server.MCUtil;
- import net.minecraft.server.MathHelper;
- import net.minecraft.server.MinecraftServer;
- import net.minecraft.server.World;
--import co.aikar.timings.MinecraftTimings;
- 
- public class ActivationRange
- {
-@@ -110,6 +111,7 @@ public class ActivationRange
-         maxRange = Math.max( maxRange, miscActivationRange );
-         //maxRange = Math.min( ( world.spigotConfig.viewDistance << 4 ) - 8, maxRange ); Paper - Use player view distance API below instead
- 
-+        Chunk chunk; // Paper
-         for ( EntityHuman player : world.players )
-         {
-             int playerMaxRange = maxRange = Math.min( ( player.getViewDistance() << 4 ) - 8, maxRange ); // Paper - Use player view distance API
-@@ -128,9 +130,9 @@ public class ActivationRange
-             {
-                 for ( int j1 = k; j1 <= l; ++j1 )
-                 {
--                    if ( world.getWorld().isChunkLoaded( i1, j1 ) )
-+                    if ( (chunk = MCUtil.getLoadedChunkWithoutMarkingActive(world, i1, j1 )) != null ) // Paper
-                     {
--                        activateChunkEntities( world.getChunkAt( i1, j1 ) );
-+                        activateChunkEntities( chunk ); // Paper
-                     }
-                 }
-             }
--- 
-2.19.0
-
diff --git a/Spigot-Server-Patches/0123-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/Spigot-Server-Patches/0123-Delay-Chunk-Unloads-based-on-Player-Movement.patch
index 3403cd3e24..408a7d43a1 100644
--- a/Spigot-Server-Patches/0123-Delay-Chunk-Unloads-based-on-Player-Movement.patch
+++ b/Spigot-Server-Patches/0123-Delay-Chunk-Unloads-based-on-Player-Movement.patch
@@ -1,4 +1,4 @@
-From 35769e706c68ba327d1264aacd7cd27c1df767fe Mon Sep 17 00:00:00 2001
+From 55ee472e8ef42a126e87749d723842dc3d7e3151 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 18 Jun 2016 23:22:12 -0400
 Subject: [PATCH] Delay Chunk Unloads based on Player Movement
@@ -43,7 +43,7 @@ index ff1a2046f6..0cd15c17e8 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 41d3aaa80b..824727ec66 100644
+index e1c3e19029..bc4d6f127d 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -37,6 +37,7 @@ public class Chunk implements IChunkAccess {
@@ -211,10 +211,10 @@ index 72d1a0f51d..3536433d14 100644
              }
  
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 12040596df..f9bb19fed6 100644
+index 05e10fb366..d47a77fdee 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
-@@ -284,6 +284,11 @@ public class ActivationRange
+@@ -319,6 +319,11 @@ public class ActivationRange
          {
              isActive = false;
          }
diff --git a/Spigot-Server-Patches/0153-Prevent-Pathfinding-out-of-World-Border.patch b/Spigot-Server-Patches/0153-Prevent-Pathfinding-out-of-World-Border.patch
index 9f785c3311..579482d8ed 100644
--- a/Spigot-Server-Patches/0153-Prevent-Pathfinding-out-of-World-Border.patch
+++ b/Spigot-Server-Patches/0153-Prevent-Pathfinding-out-of-World-Border.patch
@@ -1,4 +1,4 @@
-From d9d01a96e3782d6b0f5911c509b0670c692c9f29 Mon Sep 17 00:00:00 2001
+From 6cbf0d8ca037c71d47ed2b79ed80531d56268a38 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 19 Dec 2016 23:07:42 -0500
 Subject: [PATCH] Prevent Pathfinding out of World Border
@@ -6,10 +6,10 @@ Subject: [PATCH] Prevent Pathfinding out of World Border
 This prevents Entities from trying to run outside of the World Border
 
 diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
-index a8b070ed32..452da80f11 100644
+index 7a4bc0fcc3..efdfa7195c 100644
 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java
 +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
-@@ -69,6 +69,7 @@ public abstract class NavigationAbstract {
+@@ -71,6 +71,7 @@ public abstract class NavigationAbstract {
  
      @Nullable
      public PathEntity b(BlockPosition blockposition) {
@@ -17,7 +17,7 @@ index a8b070ed32..452da80f11 100644
          if (!this.b()) {
              return null;
          } else if (this.c != null && !this.c.b() && blockposition.equals(this.q)) {
-@@ -93,6 +94,7 @@ public abstract class NavigationAbstract {
+@@ -95,6 +96,7 @@ public abstract class NavigationAbstract {
              return null;
          } else {
              BlockPosition blockposition = new BlockPosition(entity);
diff --git a/Spigot-Server-Patches/0162-Firework-API-s.patch b/Spigot-Server-Patches/0161-Firework-API-s.patch
similarity index 98%
rename from Spigot-Server-Patches/0162-Firework-API-s.patch
rename to Spigot-Server-Patches/0161-Firework-API-s.patch
index f8419af2eb..8603f54153 100644
--- a/Spigot-Server-Patches/0162-Firework-API-s.patch
+++ b/Spigot-Server-Patches/0161-Firework-API-s.patch
@@ -1,4 +1,4 @@
-From 477f25944a48d6758127751c710a055ce38771a5 Mon Sep 17 00:00:00 2001
+From 38fd6ea28a3b7560f0ec309f7bfa7ea6571c8655 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 28 Dec 2016 01:18:33 -0500
 Subject: [PATCH] Firework API's
diff --git a/Spigot-Server-Patches/0163-PlayerTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/0162-PlayerTeleportEndGatewayEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0163-PlayerTeleportEndGatewayEvent.patch
rename to Spigot-Server-Patches/0162-PlayerTeleportEndGatewayEvent.patch
index 18ef3cc401..4288a133b8 100644
--- a/Spigot-Server-Patches/0163-PlayerTeleportEndGatewayEvent.patch
+++ b/Spigot-Server-Patches/0162-PlayerTeleportEndGatewayEvent.patch
@@ -1,4 +1,4 @@
-From 57292e6bc72fced6acb39159d59c17238d9d5635 Mon Sep 17 00:00:00 2001
+From f8d41615a68e7ccdf94eff4ab5fe3d84ebb58149 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 31 Dec 2016 21:44:50 -0500
 Subject: [PATCH] PlayerTeleportEndGatewayEvent
diff --git a/Spigot-Server-Patches/0164-ShulkerBox-Dupe-Prevention.patch b/Spigot-Server-Patches/0163-ShulkerBox-Dupe-Prevention.patch
similarity index 94%
rename from Spigot-Server-Patches/0164-ShulkerBox-Dupe-Prevention.patch
rename to Spigot-Server-Patches/0163-ShulkerBox-Dupe-Prevention.patch
index a75a18bc4f..d74bada124 100644
--- a/Spigot-Server-Patches/0164-ShulkerBox-Dupe-Prevention.patch
+++ b/Spigot-Server-Patches/0163-ShulkerBox-Dupe-Prevention.patch
@@ -1,4 +1,4 @@
-From 0595f09922334f3b66c5ceebbe875990dd4d1117 Mon Sep 17 00:00:00 2001
+From e618f0e07ba700822b5535b70b756e9b1c37664a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 2 Jan 2017 16:32:56 -0500
 Subject: [PATCH] ShulkerBox Dupe Prevention
diff --git a/Spigot-Server-Patches/0165-Provide-E-TE-Chunk-count-stat-methods.patch b/Spigot-Server-Patches/0164-Provide-E-TE-Chunk-count-stat-methods.patch
similarity index 96%
rename from Spigot-Server-Patches/0165-Provide-E-TE-Chunk-count-stat-methods.patch
rename to Spigot-Server-Patches/0164-Provide-E-TE-Chunk-count-stat-methods.patch
index fe2e534fdc..9232c2e24e 100644
--- a/Spigot-Server-Patches/0165-Provide-E-TE-Chunk-count-stat-methods.patch
+++ b/Spigot-Server-Patches/0164-Provide-E-TE-Chunk-count-stat-methods.patch
@@ -1,4 +1,4 @@
-From 112fbc9f04f10cb66099f635f93b8d8baf775402 Mon Sep 17 00:00:00 2001
+From 364f74a31e5d72d9a339f77282f85c27db8f59a8 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
diff --git a/Spigot-Server-Patches/0166-Enforce-Sync-Player-Saves.patch b/Spigot-Server-Patches/0165-Enforce-Sync-Player-Saves.patch
similarity index 91%
rename from Spigot-Server-Patches/0166-Enforce-Sync-Player-Saves.patch
rename to Spigot-Server-Patches/0165-Enforce-Sync-Player-Saves.patch
index 4d1bbfc616..80fbd508b2 100644
--- a/Spigot-Server-Patches/0166-Enforce-Sync-Player-Saves.patch
+++ b/Spigot-Server-Patches/0165-Enforce-Sync-Player-Saves.patch
@@ -1,4 +1,4 @@
-From 069e181b2583de1377bd1787e0288c38caa51d53 Mon Sep 17 00:00:00 2001
+From 2a263f5083a6f68a1411638b82d48cddf7c608e4 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 7d778ff3..06ce2af1 100644
+index 7d778ff3e0..06ce2af1e6 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1215,6 +1215,7 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0167-Enforce-Sync-Chunk-Unloads.patch b/Spigot-Server-Patches/0166-Enforce-Sync-Chunk-Unloads.patch
similarity index 95%
rename from Spigot-Server-Patches/0167-Enforce-Sync-Chunk-Unloads.patch
rename to Spigot-Server-Patches/0166-Enforce-Sync-Chunk-Unloads.patch
index 13142db232..7e90ebc6a8 100644
--- a/Spigot-Server-Patches/0167-Enforce-Sync-Chunk-Unloads.patch
+++ b/Spigot-Server-Patches/0166-Enforce-Sync-Chunk-Unloads.patch
@@ -1,4 +1,4 @@
-From 90196edf4705c485d9624b4d3a3b3ad067845ae1 Mon Sep 17 00:00:00 2001
+From d470ccd2730c7898a6036ed37307d897ae1c72de Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 Jan 2017 16:06:44 -0500
 Subject: [PATCH] Enforce Sync Chunk Unloads
diff --git a/Spigot-Server-Patches/0168-Don-t-allow-entities-to-ride-themselves-572.patch b/Spigot-Server-Patches/0167-Don-t-allow-entities-to-ride-themselves-572.patch
similarity index 93%
rename from Spigot-Server-Patches/0168-Don-t-allow-entities-to-ride-themselves-572.patch
rename to Spigot-Server-Patches/0167-Don-t-allow-entities-to-ride-themselves-572.patch
index dddf6660d7..92ce442d6d 100644
--- a/Spigot-Server-Patches/0168-Don-t-allow-entities-to-ride-themselves-572.patch
+++ b/Spigot-Server-Patches/0167-Don-t-allow-entities-to-ride-themselves-572.patch
@@ -1,4 +1,4 @@
-From 6aba3bfbae99d2150d0af1695c5890cb936912b3 Mon Sep 17 00:00:00 2001
+From 484e628fd2b20a8cb9e9143b579d0e5d0846c057 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/Spigot-Server-Patches/0169-Fix-block-break-desync.patch b/Spigot-Server-Patches/0168-Fix-block-break-desync.patch
similarity index 94%
rename from Spigot-Server-Patches/0169-Fix-block-break-desync.patch
rename to Spigot-Server-Patches/0168-Fix-block-break-desync.patch
index a5431ae5c3..f8287e1564 100644
--- a/Spigot-Server-Patches/0169-Fix-block-break-desync.patch
+++ b/Spigot-Server-Patches/0168-Fix-block-break-desync.patch
@@ -1,4 +1,4 @@
-From 3c6260b482e950db8175272d423b2d301006dcb5 Mon Sep 17 00:00:00 2001
+From 4cb8376b3a308bd9466db6835ab58acd7326453f Mon Sep 17 00:00:00 2001
 From: Michael Himing <mhiming@gmail.com>
 Date: Sun, 8 Jan 2017 18:50:35 +1100
 Subject: [PATCH] Fix block break desync
diff --git a/Spigot-Server-Patches/0170-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/Spigot-Server-Patches/0169-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
similarity index 99%
rename from Spigot-Server-Patches/0170-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
rename to Spigot-Server-Patches/0169-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
index 467c1d5941..00d13f6f9c 100644
--- a/Spigot-Server-Patches/0170-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/Spigot-Server-Patches/0169-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
@@ -1,4 +1,4 @@
-From 02a948a5869a2f0667e8024e141347e2fa323502 Mon Sep 17 00:00:00 2001
+From c4b3587065b1ea9a389610659cad506f528c5bb5 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
diff --git a/Spigot-Server-Patches/0171-Cap-Entity-Collisions.patch b/Spigot-Server-Patches/0170-Cap-Entity-Collisions.patch
similarity index 97%
rename from Spigot-Server-Patches/0171-Cap-Entity-Collisions.patch
rename to Spigot-Server-Patches/0170-Cap-Entity-Collisions.patch
index fcf327b295..0e185511a9 100644
--- a/Spigot-Server-Patches/0171-Cap-Entity-Collisions.patch
+++ b/Spigot-Server-Patches/0170-Cap-Entity-Collisions.patch
@@ -1,4 +1,4 @@
-From d2ad4e7ad54b5fa9fc0120909acb500e68b9fd56 Mon Sep 17 00:00:00 2001
+From 0a23e674c29fc0ad5edf834507ae3d01d26f0a5c 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
diff --git a/Spigot-Server-Patches/0172-Remove-CraftScheduler-Async-Task-Debugger.patch b/Spigot-Server-Patches/0171-Remove-CraftScheduler-Async-Task-Debugger.patch
similarity index 97%
rename from Spigot-Server-Patches/0172-Remove-CraftScheduler-Async-Task-Debugger.patch
rename to Spigot-Server-Patches/0171-Remove-CraftScheduler-Async-Task-Debugger.patch
index dc0d0acf06..d667ec74c1 100644
--- a/Spigot-Server-Patches/0172-Remove-CraftScheduler-Async-Task-Debugger.patch
+++ b/Spigot-Server-Patches/0171-Remove-CraftScheduler-Async-Task-Debugger.patch
@@ -1,4 +1,4 @@
-From 94c6d1da37a9be67ae8745e85952a6269f0d1de6 Mon Sep 17 00:00:00 2001
+From 33c49da2b7dbc7302550853833adb693e2a4d438 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
diff --git a/Spigot-Server-Patches/0173-Shame-on-you-Mojang.patch b/Spigot-Server-Patches/0172-Shame-on-you-Mojang.patch
similarity index 94%
rename from Spigot-Server-Patches/0173-Shame-on-you-Mojang.patch
rename to Spigot-Server-Patches/0172-Shame-on-you-Mojang.patch
index 99ec15767d..adea18a364 100644
--- a/Spigot-Server-Patches/0173-Shame-on-you-Mojang.patch
+++ b/Spigot-Server-Patches/0172-Shame-on-you-Mojang.patch
@@ -1,4 +1,4 @@
-From 6ee94db8532442e2ab30e3b7cb7739c7cdb7af23 Mon Sep 17 00:00:00 2001
+From 8d6e913bba8c42ec058c9bee03f22a2f43b4418f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 5 Feb 2017 19:17:28 -0500
 Subject: [PATCH] Shame on you Mojang
diff --git a/Spigot-Server-Patches/0174-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch b/Spigot-Server-Patches/0173-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
similarity index 94%
rename from Spigot-Server-Patches/0174-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
rename to Spigot-Server-Patches/0173-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
index debdd945a7..e2b392019a 100644
--- a/Spigot-Server-Patches/0174-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
+++ b/Spigot-Server-Patches/0173-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
@@ -1,4 +1,4 @@
-From 281254c055ebd9657dec56034e3c46ed66f2e8e7 Mon Sep 17 00:00:00 2001
+From 567b6385af03c95fe786cbd295f1f90437d6c902 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/Spigot-Server-Patches/0175-Do-not-let-armorstands-drown.patch b/Spigot-Server-Patches/0174-Do-not-let-armorstands-drown.patch
similarity index 96%
rename from Spigot-Server-Patches/0175-Do-not-let-armorstands-drown.patch
rename to Spigot-Server-Patches/0174-Do-not-let-armorstands-drown.patch
index 8de5731d5e..44e05dbfc2 100644
--- a/Spigot-Server-Patches/0175-Do-not-let-armorstands-drown.patch
+++ b/Spigot-Server-Patches/0174-Do-not-let-armorstands-drown.patch
@@ -1,4 +1,4 @@
-From 571465f5f4fdec7f27e5e4ad2af08f9bdf6e406d Mon Sep 17 00:00:00 2001
+From d3dc554ffad4b9665f26bc93ad2b45efa06bba9a 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/Spigot-Server-Patches/0176-Properly-handle-async-calls-to-restart-the-server.patch b/Spigot-Server-Patches/0175-Properly-handle-async-calls-to-restart-the-server.patch
similarity index 98%
rename from Spigot-Server-Patches/0176-Properly-handle-async-calls-to-restart-the-server.patch
rename to Spigot-Server-Patches/0175-Properly-handle-async-calls-to-restart-the-server.patch
index ce4ea149f1..3b55a59075 100644
--- a/Spigot-Server-Patches/0176-Properly-handle-async-calls-to-restart-the-server.patch
+++ b/Spigot-Server-Patches/0175-Properly-handle-async-calls-to-restart-the-server.patch
@@ -1,4 +1,4 @@
-From e95ffc7ab6f240b1bd2c25cef5a931adc5eb0cbd Mon Sep 17 00:00:00 2001
+From 9f61283f8da8c7033bc081f086dbaca6bb987824 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 a547ee5c..8d345a05 100644
+index a547ee5ca1..8d345a0502 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -90,6 +90,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -68,7 +68,7 @@ index a547ee5c..8d345a05 100644
      private boolean aT() {
          return System.nanoTime() - lastTick + catchupTime < TICK_TIME; // Paper - improved "are we lagging" check to match our own
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 06ce2af1..e61a6387 100644
+index 06ce2af1e6..e61a638752 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1333,10 +1333,15 @@ public abstract class PlayerList {
@@ -97,7 +97,7 @@ index 06ce2af1..e61a6387 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 947c43a5..f15fd9f3 100644
+index 947c43a5d0..f15fd9f370 100644
 --- a/src/main/java/org/spigotmc/RestartCommand.java
 +++ b/src/main/java/org/spigotmc/RestartCommand.java
 @@ -46,88 +46,123 @@ public class RestartCommand extends Command
diff --git a/Spigot-Server-Patches/0177-Add-system-property-to-disable-book-size-limits.patch b/Spigot-Server-Patches/0176-Add-system-property-to-disable-book-size-limits.patch
similarity index 97%
rename from Spigot-Server-Patches/0177-Add-system-property-to-disable-book-size-limits.patch
rename to Spigot-Server-Patches/0176-Add-system-property-to-disable-book-size-limits.patch
index f815bdba9f..9c5bd060a7 100644
--- a/Spigot-Server-Patches/0177-Add-system-property-to-disable-book-size-limits.patch
+++ b/Spigot-Server-Patches/0176-Add-system-property-to-disable-book-size-limits.patch
@@ -1,4 +1,4 @@
-From a5339fccea2bd59e7dff197d710845ab8f08656c Mon Sep 17 00:00:00 2001
+From dd36b59cafdc53476976450108b186568f4ad908 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
diff --git a/Spigot-Server-Patches/0178-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/Spigot-Server-Patches/0177-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
similarity index 97%
rename from Spigot-Server-Patches/0178-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
rename to Spigot-Server-Patches/0177-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
index bc233d2cb2..537096295b 100644
--- a/Spigot-Server-Patches/0178-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
+++ b/Spigot-Server-Patches/0177-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
@@ -1,4 +1,4 @@
-From 5ecdf5f97d28a70e5ec06d27e6b054bbcb6176d0 Mon Sep 17 00:00:00 2001
+From 8c1fd5cc02bce2bb212187855617f4cd6798d566 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
diff --git a/Spigot-Server-Patches/0179-Add-configuration-option-to-prevent-player-names-fro.patch b/Spigot-Server-Patches/0178-Add-configuration-option-to-prevent-player-names-fro.patch
similarity index 93%
rename from Spigot-Server-Patches/0179-Add-configuration-option-to-prevent-player-names-fro.patch
rename to Spigot-Server-Patches/0178-Add-configuration-option-to-prevent-player-names-fro.patch
index 741483fc20..480e5b73aa 100644
--- a/Spigot-Server-Patches/0179-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/Spigot-Server-Patches/0178-Add-configuration-option-to-prevent-player-names-fro.patch
@@ -1,4 +1,4 @@
-From e9e83c3e4f20724f7ee11f45ed055452c270f265 Mon Sep 17 00:00:00 2001
+From b9afe5d1eebf933d456cfb4f549b62895bacf5b8 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 a848edfc10..ccbe1482fc 100644
+index 78dbcb919d..e255d3d1e8 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -275,4 +275,9 @@ public class PaperConfig {
diff --git a/Spigot-Server-Patches/0180-Use-TerminalConsoleAppender-for-console-improvements.patch b/Spigot-Server-Patches/0179-Use-TerminalConsoleAppender-for-console-improvements.patch
similarity index 99%
rename from Spigot-Server-Patches/0180-Use-TerminalConsoleAppender-for-console-improvements.patch
rename to Spigot-Server-Patches/0179-Use-TerminalConsoleAppender-for-console-improvements.patch
index c99b20e976..1020f2b765 100644
--- a/Spigot-Server-Patches/0180-Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/Spigot-Server-Patches/0179-Use-TerminalConsoleAppender-for-console-improvements.patch
@@ -1,4 +1,4 @@
-From 5144753ba0ed24d90a493cdd431df8445a2073f4 Mon Sep 17 00:00:00 2001
+From 1c34de0ea97c6a691915688da7b8e554c4521217 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
@@ -243,7 +243,7 @@ index 8d345a0502..6a3d5fdff4 100644
  
      public KeyPair E() {
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index a9906f03c9..2f2f301383 100644
+index e61a638752..de549d207c 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -78,8 +78,7 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0181-provide-a-configurable-option-to-disable-creeper-lin.patch b/Spigot-Server-Patches/0180-provide-a-configurable-option-to-disable-creeper-lin.patch
similarity index 96%
rename from Spigot-Server-Patches/0181-provide-a-configurable-option-to-disable-creeper-lin.patch
rename to Spigot-Server-Patches/0180-provide-a-configurable-option-to-disable-creeper-lin.patch
index 346efcf617..0331463b78 100644
--- a/Spigot-Server-Patches/0181-provide-a-configurable-option-to-disable-creeper-lin.patch
+++ b/Spigot-Server-Patches/0180-provide-a-configurable-option-to-disable-creeper-lin.patch
@@ -1,4 +1,4 @@
-From 185c041bc7f55e2b934a831ebaec2d9cd4475a6d Mon Sep 17 00:00:00 2001
+From 99b4835e40d1d4ede781bb22ee30b5683d2aff35 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
diff --git a/Spigot-Server-Patches/0182-Item-canEntityPickup.patch b/Spigot-Server-Patches/0181-Item-canEntityPickup.patch
similarity index 97%
rename from Spigot-Server-Patches/0182-Item-canEntityPickup.patch
rename to Spigot-Server-Patches/0181-Item-canEntityPickup.patch
index 434cefd7d2..e4f7b193d8 100644
--- a/Spigot-Server-Patches/0182-Item-canEntityPickup.patch
+++ b/Spigot-Server-Patches/0181-Item-canEntityPickup.patch
@@ -1,4 +1,4 @@
-From a1ff462154e3c6e97e7a5cd380eb4ae9684aaf5c Mon Sep 17 00:00:00 2001
+From 1c7be2d6340c5d04e4ad3990cee743353727952e 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/Spigot-Server-Patches/0183-PlayerPickupItemEvent-setFlyAtPlayer.patch b/Spigot-Server-Patches/0182-PlayerPickupItemEvent-setFlyAtPlayer.patch
similarity index 97%
rename from Spigot-Server-Patches/0183-PlayerPickupItemEvent-setFlyAtPlayer.patch
rename to Spigot-Server-Patches/0182-PlayerPickupItemEvent-setFlyAtPlayer.patch
index f452ebdba8..6a4659790f 100644
--- a/Spigot-Server-Patches/0183-PlayerPickupItemEvent-setFlyAtPlayer.patch
+++ b/Spigot-Server-Patches/0182-PlayerPickupItemEvent-setFlyAtPlayer.patch
@@ -1,4 +1,4 @@
-From 883031f68dcfe2e1472f0b7b807d6b8481e0d750 Mon Sep 17 00:00:00 2001
+From df7bf328a6c36551758f3a52f2ec36c3a380afb1 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/Spigot-Server-Patches/0184-PlayerAttemptPickupItemEvent.patch b/Spigot-Server-Patches/0183-PlayerAttemptPickupItemEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0184-PlayerAttemptPickupItemEvent.patch
rename to Spigot-Server-Patches/0183-PlayerAttemptPickupItemEvent.patch
index 7d06eb391a..a81e07d9c3 100644
--- a/Spigot-Server-Patches/0184-PlayerAttemptPickupItemEvent.patch
+++ b/Spigot-Server-Patches/0183-PlayerAttemptPickupItemEvent.patch
@@ -1,4 +1,4 @@
-From 650a13dedf3acdf0aab3792792e1465f2d3f8c83 Mon Sep 17 00:00:00 2001
+From 9c188947d2debdea36e4796d455b317400fb7bd3 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/Spigot-Server-Patches/0185-Add-UnknownCommandEvent.patch b/Spigot-Server-Patches/0184-Add-UnknownCommandEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0185-Add-UnknownCommandEvent.patch
rename to Spigot-Server-Patches/0184-Add-UnknownCommandEvent.patch
index dbe7458597..6efde833b7 100644
--- a/Spigot-Server-Patches/0185-Add-UnknownCommandEvent.patch
+++ b/Spigot-Server-Patches/0184-Add-UnknownCommandEvent.patch
@@ -1,4 +1,4 @@
-From 0890f45cf9facbda79b33156330c681321574888 Mon Sep 17 00:00:00 2001
+From 939c395bc7e17a0813aab266f1f4444c0f22ca9d 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/Spigot-Server-Patches/0186-Basic-PlayerProfile-API.patch b/Spigot-Server-Patches/0185-Basic-PlayerProfile-API.patch
similarity index 99%
rename from Spigot-Server-Patches/0186-Basic-PlayerProfile-API.patch
rename to Spigot-Server-Patches/0185-Basic-PlayerProfile-API.patch
index 4a8763751d..5deda74733 100644
--- a/Spigot-Server-Patches/0186-Basic-PlayerProfile-API.patch
+++ b/Spigot-Server-Patches/0185-Basic-PlayerProfile-API.patch
@@ -1,4 +1,4 @@
-From d3729da16568052185ac4b37a547aa43ed840130 Mon Sep 17 00:00:00 2001
+From 84e2ca2bf186beba6ac2aaf2c2546cf2a0def6d6 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
@@ -403,7 +403,7 @@ index 0000000000..3aceb0ea8a
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
-index dce1417aff..f7856897f6 100644
+index e1af5c4885..0ef5ad1165 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
 @@ -1,7 +1,10 @@
diff --git a/Spigot-Server-Patches/0187-Shoulder-Entities-Release-API.patch b/Spigot-Server-Patches/0186-Shoulder-Entities-Release-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0187-Shoulder-Entities-Release-API.patch
rename to Spigot-Server-Patches/0186-Shoulder-Entities-Release-API.patch
index 2827044807..ab50ce272d 100644
--- a/Spigot-Server-Patches/0187-Shoulder-Entities-Release-API.patch
+++ b/Spigot-Server-Patches/0186-Shoulder-Entities-Release-API.patch
@@ -1,4 +1,4 @@
-From cbbed5356c380a5ead3ccc168dc13d08d0953052 Mon Sep 17 00:00:00 2001
+From 018559a084e608f3bd6fb7e2c30bf7bbd525f8e1 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/Spigot-Server-Patches/0188-Profile-Lookup-Events.patch b/Spigot-Server-Patches/0187-Profile-Lookup-Events.patch
similarity index 98%
rename from Spigot-Server-Patches/0188-Profile-Lookup-Events.patch
rename to Spigot-Server-Patches/0187-Profile-Lookup-Events.patch
index 808a493cb8..dc11686d69 100644
--- a/Spigot-Server-Patches/0188-Profile-Lookup-Events.patch
+++ b/Spigot-Server-Patches/0187-Profile-Lookup-Events.patch
@@ -1,4 +1,4 @@
-From 27f330381e0cab43219fd7c414ca8c9d13383663 Mon Sep 17 00:00:00 2001
+From 6bdc6eb94a2982fc5b6c4629c5f3e933908817fe 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
diff --git a/Spigot-Server-Patches/0189-Block-player-logins-during-server-shutdown.patch b/Spigot-Server-Patches/0188-Block-player-logins-during-server-shutdown.patch
similarity index 94%
rename from Spigot-Server-Patches/0189-Block-player-logins-during-server-shutdown.patch
rename to Spigot-Server-Patches/0188-Block-player-logins-during-server-shutdown.patch
index 08a59b954f..8b4fa8f191 100644
--- a/Spigot-Server-Patches/0189-Block-player-logins-during-server-shutdown.patch
+++ b/Spigot-Server-Patches/0188-Block-player-logins-during-server-shutdown.patch
@@ -1,4 +1,4 @@
-From ab6360e70dead0c0a2753ad324009898e6b9b7f4 Mon Sep 17 00:00:00 2001
+From 9ccd366cdf434284ea3d6a8c12d0d0e6e8d60e2f 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/Spigot-Server-Patches/0190-Entity-fromMobSpawner.patch b/Spigot-Server-Patches/0189-Entity-fromMobSpawner.patch
similarity index 98%
rename from Spigot-Server-Patches/0190-Entity-fromMobSpawner.patch
rename to Spigot-Server-Patches/0189-Entity-fromMobSpawner.patch
index 6a0f532a05..830928c2f1 100644
--- a/Spigot-Server-Patches/0190-Entity-fromMobSpawner.patch
+++ b/Spigot-Server-Patches/0189-Entity-fromMobSpawner.patch
@@ -1,4 +1,4 @@
-From 000e3534b873ef7427de8b5e1b120b57df5f1d45 Mon Sep 17 00:00:00 2001
+From e34fd932553d56656b7cf47267297350bf4a4d78 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/Spigot-Server-Patches/0191-Fix-Anvil-Level-sync-to-client.patch b/Spigot-Server-Patches/0190-Fix-Anvil-Level-sync-to-client.patch
similarity index 97%
rename from Spigot-Server-Patches/0191-Fix-Anvil-Level-sync-to-client.patch
rename to Spigot-Server-Patches/0190-Fix-Anvil-Level-sync-to-client.patch
index 368487d30f..85b09dd6b3 100644
--- a/Spigot-Server-Patches/0191-Fix-Anvil-Level-sync-to-client.patch
+++ b/Spigot-Server-Patches/0190-Fix-Anvil-Level-sync-to-client.patch
@@ -1,4 +1,4 @@
-From a1da8594b29038f7fe5cafca15eef197424d0605 Mon Sep 17 00:00:00 2001
+From 979f39c0572758d21860c8724f57f680b4e378c0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 11 Jul 2017 23:17:57 -0400
 Subject: [PATCH] Fix Anvil Level sync to client
diff --git a/Spigot-Server-Patches/0192-Add-missing-coverages-for-getTileEntity-in-order-to-.patch b/Spigot-Server-Patches/0191-Add-missing-coverages-for-getTileEntity-in-order-to-.patch
similarity index 94%
rename from Spigot-Server-Patches/0192-Add-missing-coverages-for-getTileEntity-in-order-to-.patch
rename to Spigot-Server-Patches/0191-Add-missing-coverages-for-getTileEntity-in-order-to-.patch
index 56b6593e00..074e93af17 100644
--- a/Spigot-Server-Patches/0192-Add-missing-coverages-for-getTileEntity-in-order-to-.patch
+++ b/Spigot-Server-Patches/0191-Add-missing-coverages-for-getTileEntity-in-order-to-.patch
@@ -1,4 +1,4 @@
-From fd9f6e2cb6863164a3278578726543c6011140e0 Mon Sep 17 00:00:00 2001
+From 27561c26a78ebee8146b8e4f040496bddde42e64 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 22 Jul 2017 15:22:59 +0100
 Subject: [PATCH] Add missing coverages for getTileEntity in order to attempt
diff --git a/Spigot-Server-Patches/0193-Improve-the-Saddle-API-for-Horses.patch b/Spigot-Server-Patches/0192-Improve-the-Saddle-API-for-Horses.patch
similarity index 97%
rename from Spigot-Server-Patches/0193-Improve-the-Saddle-API-for-Horses.patch
rename to Spigot-Server-Patches/0192-Improve-the-Saddle-API-for-Horses.patch
index 1de3fd1f57..a2e6083eba 100644
--- a/Spigot-Server-Patches/0193-Improve-the-Saddle-API-for-Horses.patch
+++ b/Spigot-Server-Patches/0192-Improve-the-Saddle-API-for-Horses.patch
@@ -1,4 +1,4 @@
-From be7705d2b048f5b357227720f7a2d86dcd4dd661 Mon Sep 17 00:00:00 2001
+From b024c6904375e8248a5bcdbc6d29d4c9a1f3fcba 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
diff --git a/Spigot-Server-Patches/0194-Implement-ensureServerConversions-API.patch b/Spigot-Server-Patches/0193-Implement-ensureServerConversions-API.patch
similarity index 94%
rename from Spigot-Server-Patches/0194-Implement-ensureServerConversions-API.patch
rename to Spigot-Server-Patches/0193-Implement-ensureServerConversions-API.patch
index b1516fd991..0d3084b8ea 100644
--- a/Spigot-Server-Patches/0194-Implement-ensureServerConversions-API.patch
+++ b/Spigot-Server-Patches/0193-Implement-ensureServerConversions-API.patch
@@ -1,4 +1,4 @@
-From 94434ffb86938335fd334e78244ccfe1b088c964 Mon Sep 17 00:00:00 2001
+From 995ff17669ecc2be7d3a6b7350ec7d2e4bf7c74c 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
diff --git a/Spigot-Server-Patches/0195-Implement-getI18NDisplayName.patch b/Spigot-Server-Patches/0194-Implement-getI18NDisplayName.patch
similarity index 96%
rename from Spigot-Server-Patches/0195-Implement-getI18NDisplayName.patch
rename to Spigot-Server-Patches/0194-Implement-getI18NDisplayName.patch
index 4ecf711555..17d3aaa7bf 100644
--- a/Spigot-Server-Patches/0195-Implement-getI18NDisplayName.patch
+++ b/Spigot-Server-Patches/0194-Implement-getI18NDisplayName.patch
@@ -1,4 +1,4 @@
-From 22fb079adf1464ff5748ede042ce08d3240475d6 Mon Sep 17 00:00:00 2001
+From 8793499e5859578ac931eac545c2a87dcfd0b98a 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
diff --git a/Spigot-Server-Patches/0196-GH-806-Respect-saving-disabled-before-unloading-all-.patch b/Spigot-Server-Patches/0195-GH-806-Respect-saving-disabled-before-unloading-all-.patch
similarity index 94%
rename from Spigot-Server-Patches/0196-GH-806-Respect-saving-disabled-before-unloading-all-.patch
rename to Spigot-Server-Patches/0195-GH-806-Respect-saving-disabled-before-unloading-all-.patch
index 46ad21b2ff..64d2f43152 100644
--- a/Spigot-Server-Patches/0196-GH-806-Respect-saving-disabled-before-unloading-all-.patch
+++ b/Spigot-Server-Patches/0195-GH-806-Respect-saving-disabled-before-unloading-all-.patch
@@ -1,4 +1,4 @@
-From 57a8cb1f914f889dc4a152de16a47ee1077d1040 Mon Sep 17 00:00:00 2001
+From 571545c9c126571aa5ad9c1a9c63baecf61ef5e0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 27 Jul 2017 00:06:43 -0400
 Subject: [PATCH] GH-806: Respect saving disabled before unloading all chunks
diff --git a/Spigot-Server-Patches/0197-ProfileWhitelistVerifyEvent.patch b/Spigot-Server-Patches/0196-ProfileWhitelistVerifyEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0197-ProfileWhitelistVerifyEvent.patch
rename to Spigot-Server-Patches/0196-ProfileWhitelistVerifyEvent.patch
index 3f55e553de..8024ea6a8a 100644
--- a/Spigot-Server-Patches/0197-ProfileWhitelistVerifyEvent.patch
+++ b/Spigot-Server-Patches/0196-ProfileWhitelistVerifyEvent.patch
@@ -1,11 +1,11 @@
-From 356f0298ced084a1e8fb2509ffaef28601ded966 Mon Sep 17 00:00:00 2001
+From af4db5029b964c6798b837610a64d2adc9052174 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 de549d20..6bdeb2cc 100644
+index de549d207c..6bdeb2cc90 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -544,9 +544,9 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0198-Fix-this-stupid-bullshit.patch b/Spigot-Server-Patches/0197-Fix-this-stupid-bullshit.patch
similarity index 96%
rename from Spigot-Server-Patches/0198-Fix-this-stupid-bullshit.patch
rename to Spigot-Server-Patches/0197-Fix-this-stupid-bullshit.patch
index 7dac069766..c4ce35cd24 100644
--- a/Spigot-Server-Patches/0198-Fix-this-stupid-bullshit.patch
+++ b/Spigot-Server-Patches/0197-Fix-this-stupid-bullshit.patch
@@ -1,4 +1,4 @@
-From bbc344016aa6a90176f32a59a3e02ddd955ee075 Mon Sep 17 00:00:00 2001
+From af6980c50bad0cd035739fcf1e0c39e00f65764a 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
diff --git a/Spigot-Server-Patches/0199-Ocelot-despawns-should-honor-nametags-and-leash.patch b/Spigot-Server-Patches/0198-Ocelot-despawns-should-honor-nametags-and-leash.patch
similarity index 93%
rename from Spigot-Server-Patches/0199-Ocelot-despawns-should-honor-nametags-and-leash.patch
rename to Spigot-Server-Patches/0198-Ocelot-despawns-should-honor-nametags-and-leash.patch
index cdf7d39db3..f8a47b69c3 100644
--- a/Spigot-Server-Patches/0199-Ocelot-despawns-should-honor-nametags-and-leash.patch
+++ b/Spigot-Server-Patches/0198-Ocelot-despawns-should-honor-nametags-and-leash.patch
@@ -1,4 +1,4 @@
-From f257ecfad1be7ef00b623cc5c857bffb10641ce4 Mon Sep 17 00:00:00 2001
+From 23a07330847d4ddf96a3ba1882668889be0981e5 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/Spigot-Server-Patches/0200-Reset-spawner-timer-when-spawner-event-is-cancelled.patch b/Spigot-Server-Patches/0199-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
similarity index 95%
rename from Spigot-Server-Patches/0200-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
rename to Spigot-Server-Patches/0199-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
index ec71f4050d..9d67f17b0b 100644
--- a/Spigot-Server-Patches/0200-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
+++ b/Spigot-Server-Patches/0199-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
@@ -1,4 +1,4 @@
-From f31a64ff44e550e0fd66df4353a422b0cd7f3387 Mon Sep 17 00:00:00 2001
+From 07ceae1ae72511ececf469231511c23d7be7a550 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/Spigot-Server-Patches/0201-Fix-MC-117075-TE-Unload-Lag-Spike.patch b/Spigot-Server-Patches/0200-Fix-MC-117075-TE-Unload-Lag-Spike.patch
similarity index 95%
rename from Spigot-Server-Patches/0201-Fix-MC-117075-TE-Unload-Lag-Spike.patch
rename to Spigot-Server-Patches/0200-Fix-MC-117075-TE-Unload-Lag-Spike.patch
index fee346d387..3f0083f7a0 100644
--- a/Spigot-Server-Patches/0201-Fix-MC-117075-TE-Unload-Lag-Spike.patch
+++ b/Spigot-Server-Patches/0200-Fix-MC-117075-TE-Unload-Lag-Spike.patch
@@ -1,4 +1,4 @@
-From 05b26d3750481e193a73014ff04a7a41fdefc34c Mon Sep 17 00:00:00 2001
+From dfe68b605eafeba30f3fb064ce05d08c96e63349 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/Spigot-Server-Patches/0202-Allow-specifying-a-custom-authentication-servers-dow.patch b/Spigot-Server-Patches/0201-Allow-specifying-a-custom-authentication-servers-dow.patch
similarity index 96%
rename from Spigot-Server-Patches/0202-Allow-specifying-a-custom-authentication-servers-dow.patch
rename to Spigot-Server-Patches/0201-Allow-specifying-a-custom-authentication-servers-dow.patch
index 5ee2c6d1b1..26bf1943d8 100644
--- a/Spigot-Server-Patches/0202-Allow-specifying-a-custom-authentication-servers-dow.patch
+++ b/Spigot-Server-Patches/0201-Allow-specifying-a-custom-authentication-servers-dow.patch
@@ -1,4 +1,4 @@
-From d2bb273bac11d6ccc8889aa3cfd46298d98f448e Mon Sep 17 00:00:00 2001
+From eb0e3b787bb3494aa30cc7ed15dbed3dd1cfc49f 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 ccbe1482fc..8a899ed40d 100644
+index e255d3d1e8..6fcfeafc04 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -1,5 +1,6 @@
diff --git a/Spigot-Server-Patches/0203-LivingEntity-setKiller.patch b/Spigot-Server-Patches/0202-LivingEntity-setKiller.patch
similarity index 95%
rename from Spigot-Server-Patches/0203-LivingEntity-setKiller.patch
rename to Spigot-Server-Patches/0202-LivingEntity-setKiller.patch
index bec54c9d29..d4054c89a2 100644
--- a/Spigot-Server-Patches/0203-LivingEntity-setKiller.patch
+++ b/Spigot-Server-Patches/0202-LivingEntity-setKiller.patch
@@ -1,4 +1,4 @@
-From bdbd3ab0d4fc6b37c94e8839152eedc1266c57fe Mon Sep 17 00:00:00 2001
+From 9c88a6860c9857c1ab2423f6edd26e11d5836772 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/Spigot-Server-Patches/0204-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch b/Spigot-Server-Patches/0203-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
similarity index 96%
rename from Spigot-Server-Patches/0204-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
rename to Spigot-Server-Patches/0203-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
index 20e632c2a8..f925446cf9 100644
--- a/Spigot-Server-Patches/0204-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
+++ b/Spigot-Server-Patches/0203-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
@@ -1,4 +1,4 @@
-From 726cdd87e6633caf1acbe1d50ba6cb5b36ccf452 Mon Sep 17 00:00:00 2001
+From bd9ca6e169ebb2bfa1848f3ca94291a7c0beddc5 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
diff --git a/Spigot-Server-Patches/0205-Handle-plugin-prefixes-using-Log4J-configuration.patch b/Spigot-Server-Patches/0204-Handle-plugin-prefixes-using-Log4J-configuration.patch
similarity index 98%
rename from Spigot-Server-Patches/0205-Handle-plugin-prefixes-using-Log4J-configuration.patch
rename to Spigot-Server-Patches/0204-Handle-plugin-prefixes-using-Log4J-configuration.patch
index 349edcfb3c..19cfa33fa6 100644
--- a/Spigot-Server-Patches/0205-Handle-plugin-prefixes-using-Log4J-configuration.patch
+++ b/Spigot-Server-Patches/0204-Handle-plugin-prefixes-using-Log4J-configuration.patch
@@ -1,4 +1,4 @@
-From 2a5a7c0beb6078b743b7793e181bf26d56c03ef2 Mon Sep 17 00:00:00 2001
+From 45e1223c049ddcb41d076b94e742adf299b762eb 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
diff --git a/Spigot-Server-Patches/0206-Include-Log4J2-SLF4J-implementation.patch b/Spigot-Server-Patches/0205-Include-Log4J2-SLF4J-implementation.patch
similarity index 91%
rename from Spigot-Server-Patches/0206-Include-Log4J2-SLF4J-implementation.patch
rename to Spigot-Server-Patches/0205-Include-Log4J2-SLF4J-implementation.patch
index 0c420ef6f9..ceeeee21be 100644
--- a/Spigot-Server-Patches/0206-Include-Log4J2-SLF4J-implementation.patch
+++ b/Spigot-Server-Patches/0205-Include-Log4J2-SLF4J-implementation.patch
@@ -1,4 +1,4 @@
-From 0d0a000ad830d232e3d984de72a359cef23ec164 Mon Sep 17 00:00:00 2001
+From 2c68f0bd180e1a053dd2b9e87ff0f4e1d18ca09a 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/Spigot-Server-Patches/0207-Disable-logger-prefix-for-various-plugins-bypassing-.patch b/Spigot-Server-Patches/0206-Disable-logger-prefix-for-various-plugins-bypassing-.patch
similarity index 97%
rename from Spigot-Server-Patches/0207-Disable-logger-prefix-for-various-plugins-bypassing-.patch
rename to Spigot-Server-Patches/0206-Disable-logger-prefix-for-various-plugins-bypassing-.patch
index 65fcf31a9a..44f60774dd 100644
--- a/Spigot-Server-Patches/0207-Disable-logger-prefix-for-various-plugins-bypassing-.patch
+++ b/Spigot-Server-Patches/0206-Disable-logger-prefix-for-various-plugins-bypassing-.patch
@@ -1,4 +1,4 @@
-From 4dc90edc20b18809969db18645ee3e127a5d59b5 Mon Sep 17 00:00:00 2001
+From 5d4638bf1ac248bb211637ffb67ab6bbc61d4d38 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
diff --git a/Spigot-Server-Patches/0208-Add-PlayerJumpEvent.patch b/Spigot-Server-Patches/0207-Add-PlayerJumpEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0208-Add-PlayerJumpEvent.patch
rename to Spigot-Server-Patches/0207-Add-PlayerJumpEvent.patch
index 1efc23e2f8..eb7a6586bf 100644
--- a/Spigot-Server-Patches/0208-Add-PlayerJumpEvent.patch
+++ b/Spigot-Server-Patches/0207-Add-PlayerJumpEvent.patch
@@ -1,4 +1,4 @@
-From 02d094a81f938886ce698788fe4cbde37b25a640 Mon Sep 17 00:00:00 2001
+From 37fc69d96efb51fcf33bdd3bc8923e0d60ccb36a 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/Spigot-Server-Patches/0209-handle-PacketPlayInKeepAlive-async.patch b/Spigot-Server-Patches/0208-handle-PacketPlayInKeepAlive-async.patch
similarity index 97%
rename from Spigot-Server-Patches/0209-handle-PacketPlayInKeepAlive-async.patch
rename to Spigot-Server-Patches/0208-handle-PacketPlayInKeepAlive-async.patch
index 3b00369bbd..35031a383b 100644
--- a/Spigot-Server-Patches/0209-handle-PacketPlayInKeepAlive-async.patch
+++ b/Spigot-Server-Patches/0208-handle-PacketPlayInKeepAlive-async.patch
@@ -1,4 +1,4 @@
-From 08e897f48e3d2cec25ab1a6bd56db1420eebe6be Mon Sep 17 00:00:00 2001
+From 850d1a94bd4ad1eb9df199a1ed4f717d21e13dfd 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
diff --git a/Spigot-Server-Patches/0210-Expose-client-protocol-version-and-virtual-host.patch b/Spigot-Server-Patches/0209-Expose-client-protocol-version-and-virtual-host.patch
similarity index 98%
rename from Spigot-Server-Patches/0210-Expose-client-protocol-version-and-virtual-host.patch
rename to Spigot-Server-Patches/0209-Expose-client-protocol-version-and-virtual-host.patch
index 69de9d2cad..70ba82e37c 100644
--- a/Spigot-Server-Patches/0210-Expose-client-protocol-version-and-virtual-host.patch
+++ b/Spigot-Server-Patches/0209-Expose-client-protocol-version-and-virtual-host.patch
@@ -1,4 +1,4 @@
-From 433e260dac80c0e76dc65b0efc2f68313ffaca1d Mon Sep 17 00:00:00 2001
+From ca8e4f3b46c8477a1dc8c29f9d9799ae9c012e30 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
diff --git a/Spigot-Server-Patches/0211-revert-serverside-behavior-of-keepalives.patch b/Spigot-Server-Patches/0210-revert-serverside-behavior-of-keepalives.patch
similarity index 98%
rename from Spigot-Server-Patches/0211-revert-serverside-behavior-of-keepalives.patch
rename to Spigot-Server-Patches/0210-revert-serverside-behavior-of-keepalives.patch
index fa3e8a2620..95694f7986 100644
--- a/Spigot-Server-Patches/0211-revert-serverside-behavior-of-keepalives.patch
+++ b/Spigot-Server-Patches/0210-revert-serverside-behavior-of-keepalives.patch
@@ -1,4 +1,4 @@
-From 0d734218b344ed4ab7c2ee8926a50b9b1dc3e2a3 Mon Sep 17 00:00:00 2001
+From 064858ed1b41ea7941a517f4307786f75836865a 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
diff --git a/Spigot-Server-Patches/0212-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch b/Spigot-Server-Patches/0211-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch
similarity index 95%
rename from Spigot-Server-Patches/0212-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch
rename to Spigot-Server-Patches/0211-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch
index f3307012bc..46aa4d4502 100644
--- a/Spigot-Server-Patches/0212-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch
+++ b/Spigot-Server-Patches/0211-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch
@@ -1,4 +1,4 @@
-From 4655ad979edf64817ec2b39c74440642a7bdf9a2 Mon Sep 17 00:00:00 2001
+From 87ff1130c173155c8c30225d7a91e3dd8a56e96e Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Fri, 20 Oct 2017 04:33:45 +0200
 Subject: [PATCH] Replace HashSet with fastutil's ObjectOpenHashSet in
diff --git a/Spigot-Server-Patches/0213-Send-attack-SoundEffects-only-to-players-who-can-see.patch b/Spigot-Server-Patches/0212-Send-attack-SoundEffects-only-to-players-who-can-see.patch
similarity index 98%
rename from Spigot-Server-Patches/0213-Send-attack-SoundEffects-only-to-players-who-can-see.patch
rename to Spigot-Server-Patches/0212-Send-attack-SoundEffects-only-to-players-who-can-see.patch
index a890872cd8..dc0b109f50 100644
--- a/Spigot-Server-Patches/0213-Send-attack-SoundEffects-only-to-players-who-can-see.patch
+++ b/Spigot-Server-Patches/0212-Send-attack-SoundEffects-only-to-players-who-can-see.patch
@@ -1,4 +1,4 @@
-From 369644a66dc653811818e3ebfadaff639e61c91b Mon Sep 17 00:00:00 2001
+From d0a4697ca78a1a3dc06eec3e819e9e4d7dc639c5 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
diff --git a/Spigot-Server-Patches/0214-Option-for-maximum-exp-value-when-merging-orbs.patch b/Spigot-Server-Patches/0213-Option-for-maximum-exp-value-when-merging-orbs.patch
similarity index 98%
rename from Spigot-Server-Patches/0214-Option-for-maximum-exp-value-when-merging-orbs.patch
rename to Spigot-Server-Patches/0213-Option-for-maximum-exp-value-when-merging-orbs.patch
index aeb77ed4c3..7ef9fdd0f6 100644
--- a/Spigot-Server-Patches/0214-Option-for-maximum-exp-value-when-merging-orbs.patch
+++ b/Spigot-Server-Patches/0213-Option-for-maximum-exp-value-when-merging-orbs.patch
@@ -1,4 +1,4 @@
-From 63d4774615f8b5359ee87cf4e818d01ec9ff01cc Mon Sep 17 00:00:00 2001
+From b32669093d9d7936120b2bdcbcb6d1eb27fe5682 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/Spigot-Server-Patches/0215-Add-PlayerArmorChangeEvent.patch b/Spigot-Server-Patches/0214-Add-PlayerArmorChangeEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0215-Add-PlayerArmorChangeEvent.patch
rename to Spigot-Server-Patches/0214-Add-PlayerArmorChangeEvent.patch
index 9d3362877c..1b1560cee3 100644
--- a/Spigot-Server-Patches/0215-Add-PlayerArmorChangeEvent.patch
+++ b/Spigot-Server-Patches/0214-Add-PlayerArmorChangeEvent.patch
@@ -1,4 +1,4 @@
-From 1efe46f056352cf6f8b11b654093dda41c091ef3 Mon Sep 17 00:00:00 2001
+From 0c6ce876938c0eed64a3e2934d4c6395a687a0b1 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/Spigot-Server-Patches/0216-Prevent-logins-from-being-processed-when-the-player-.patch b/Spigot-Server-Patches/0215-Prevent-logins-from-being-processed-when-the-player-.patch
similarity index 94%
rename from Spigot-Server-Patches/0216-Prevent-logins-from-being-processed-when-the-player-.patch
rename to Spigot-Server-Patches/0215-Prevent-logins-from-being-processed-when-the-player-.patch
index eda8d75d39..71944f4161 100644
--- a/Spigot-Server-Patches/0216-Prevent-logins-from-being-processed-when-the-player-.patch
+++ b/Spigot-Server-Patches/0215-Prevent-logins-from-being-processed-when-the-player-.patch
@@ -1,4 +1,4 @@
-From 8ead98df2a5d9887a8ac6ac91991b6647044c009 Mon Sep 17 00:00:00 2001
+From 6f93bb5e5f2bfb8117f9c93f7797e32d704293d4 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
diff --git a/Spigot-Server-Patches/0217-use-CB-BlockState-implementations-for-captured-block.patch b/Spigot-Server-Patches/0216-use-CB-BlockState-implementations-for-captured-block.patch
similarity index 96%
rename from Spigot-Server-Patches/0217-use-CB-BlockState-implementations-for-captured-block.patch
rename to Spigot-Server-Patches/0216-use-CB-BlockState-implementations-for-captured-block.patch
index 54941df1a4..4381f88bcd 100644
--- a/Spigot-Server-Patches/0217-use-CB-BlockState-implementations-for-captured-block.patch
+++ b/Spigot-Server-Patches/0216-use-CB-BlockState-implementations-for-captured-block.patch
@@ -1,4 +1,4 @@
-From 08867a799871fa47b23557ace702cfe77f54374d Mon Sep 17 00:00:00 2001
+From ff6e4c55a7fc5a3980d77e8b648537098b3974b7 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
diff --git a/Spigot-Server-Patches/0218-API-to-get-a-BlockState-without-a-snapshot.patch b/Spigot-Server-Patches/0217-API-to-get-a-BlockState-without-a-snapshot.patch
similarity index 98%
rename from Spigot-Server-Patches/0218-API-to-get-a-BlockState-without-a-snapshot.patch
rename to Spigot-Server-Patches/0217-API-to-get-a-BlockState-without-a-snapshot.patch
index 8c53a9afbb..a64012946b 100644
--- a/Spigot-Server-Patches/0218-API-to-get-a-BlockState-without-a-snapshot.patch
+++ b/Spigot-Server-Patches/0217-API-to-get-a-BlockState-without-a-snapshot.patch
@@ -1,4 +1,4 @@
-From b879d5e036766ef649d560aa1cd8ce8bb27834ae Mon Sep 17 00:00:00 2001
+From c579bd8a4185d49e669eea46646c157d71201936 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
diff --git a/Spigot-Server-Patches/0219-AsyncTabCompleteEvent.patch b/Spigot-Server-Patches/0218-AsyncTabCompleteEvent.patch
similarity index 99%
rename from Spigot-Server-Patches/0219-AsyncTabCompleteEvent.patch
rename to Spigot-Server-Patches/0218-AsyncTabCompleteEvent.patch
index fa05162ca4..9441407827 100644
--- a/Spigot-Server-Patches/0219-AsyncTabCompleteEvent.patch
+++ b/Spigot-Server-Patches/0218-AsyncTabCompleteEvent.patch
@@ -1,4 +1,4 @@
-From 8a9e74f57f7f774225415163916c8f12b6efcb4d Mon Sep 17 00:00:00 2001
+From 665e3a64ac739af750b4e417ba0004a8e4b513ce Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 26 Nov 2017 13:19:58 -0500
 Subject: [PATCH] AsyncTabCompleteEvent
diff --git a/Spigot-Server-Patches/0220-Avoid-NPE-in-PathfinderGoalTempt.patch b/Spigot-Server-Patches/0219-Avoid-NPE-in-PathfinderGoalTempt.patch
similarity index 93%
rename from Spigot-Server-Patches/0220-Avoid-NPE-in-PathfinderGoalTempt.patch
rename to Spigot-Server-Patches/0219-Avoid-NPE-in-PathfinderGoalTempt.patch
index a01d9a7577..9a4977e222 100644
--- a/Spigot-Server-Patches/0220-Avoid-NPE-in-PathfinderGoalTempt.patch
+++ b/Spigot-Server-Patches/0219-Avoid-NPE-in-PathfinderGoalTempt.patch
@@ -1,4 +1,4 @@
-From ad8dc8010bcf8e45f0c22f4cdd23d18ff626f599 Mon Sep 17 00:00:00 2001
+From 3bea380a901c68260b6eaf2225129a68c2e1f882 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/Spigot-Server-Patches/0221-PlayerPickupExperienceEvent.patch b/Spigot-Server-Patches/0220-PlayerPickupExperienceEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0221-PlayerPickupExperienceEvent.patch
rename to Spigot-Server-Patches/0220-PlayerPickupExperienceEvent.patch
index c368c43f81..ee09c85417 100644
--- a/Spigot-Server-Patches/0221-PlayerPickupExperienceEvent.patch
+++ b/Spigot-Server-Patches/0220-PlayerPickupExperienceEvent.patch
@@ -1,4 +1,4 @@
-From 7fb904b9bdf314922f45def951681cd51d55a8e7 Mon Sep 17 00:00:00 2001
+From ce5a7f73bb7a1d74c0ccd47ad9425dc765b8af3c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 22:02:53 -0500
 Subject: [PATCH] PlayerPickupExperienceEvent
diff --git a/Spigot-Server-Patches/0222-ExperienceOrbMergeEvent.patch b/Spigot-Server-Patches/0221-ExperienceOrbMergeEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0222-ExperienceOrbMergeEvent.patch
rename to Spigot-Server-Patches/0221-ExperienceOrbMergeEvent.patch
index a23b155c8b..97aee2fbb2 100644
--- a/Spigot-Server-Patches/0222-ExperienceOrbMergeEvent.patch
+++ b/Spigot-Server-Patches/0221-ExperienceOrbMergeEvent.patch
@@ -1,4 +1,4 @@
-From bb231385c0c0dfc5181cc942c34aa048093247b7 Mon Sep 17 00:00:00 2001
+From 1733fa91a63015f99c127379c07cd56e1397a1ad Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 22:57:26 -0500
 Subject: [PATCH] ExperienceOrbMergeEvent
diff --git a/Spigot-Server-Patches/0223-Ability-to-apply-mending-to-XP-API.patch b/Spigot-Server-Patches/0222-Ability-to-apply-mending-to-XP-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0223-Ability-to-apply-mending-to-XP-API.patch
rename to Spigot-Server-Patches/0222-Ability-to-apply-mending-to-XP-API.patch
index ea28317615..42b7e4f1c1 100644
--- a/Spigot-Server-Patches/0223-Ability-to-apply-mending-to-XP-API.patch
+++ b/Spigot-Server-Patches/0222-Ability-to-apply-mending-to-XP-API.patch
@@ -1,4 +1,4 @@
-From 7b29c313c8795d2700da25e279a9377e57a4fe86 Mon Sep 17 00:00:00 2001
+From 39b86fa69e8d2d6404b044b90c923f766294834e 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
diff --git a/Spigot-Server-Patches/0224-Configurable-Chunks-Sends-per-Tick-setting.patch b/Spigot-Server-Patches/0223-Configurable-Chunks-Sends-per-Tick-setting.patch
similarity index 96%
rename from Spigot-Server-Patches/0224-Configurable-Chunks-Sends-per-Tick-setting.patch
rename to Spigot-Server-Patches/0223-Configurable-Chunks-Sends-per-Tick-setting.patch
index a2d79286a7..a7ee03cbbc 100644
--- a/Spigot-Server-Patches/0224-Configurable-Chunks-Sends-per-Tick-setting.patch
+++ b/Spigot-Server-Patches/0223-Configurable-Chunks-Sends-per-Tick-setting.patch
@@ -1,4 +1,4 @@
-From cfb497b52aa5b4c3620c53fa6db506f5210a4c1f Mon Sep 17 00:00:00 2001
+From 2d9f35af04abffc9bf46670bf90fae53bc5c00bd Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 1 Jan 2018 15:41:59 -0500
 Subject: [PATCH] Configurable Chunks Sends per Tick setting
diff --git a/Spigot-Server-Patches/0225-Configurable-Max-Chunk-Gens-per-Tick.patch b/Spigot-Server-Patches/0224-Configurable-Max-Chunk-Gens-per-Tick.patch
similarity index 98%
rename from Spigot-Server-Patches/0225-Configurable-Max-Chunk-Gens-per-Tick.patch
rename to Spigot-Server-Patches/0224-Configurable-Max-Chunk-Gens-per-Tick.patch
index 7ba96ec710..f81cdb0173 100644
--- a/Spigot-Server-Patches/0225-Configurable-Max-Chunk-Gens-per-Tick.patch
+++ b/Spigot-Server-Patches/0224-Configurable-Max-Chunk-Gens-per-Tick.patch
@@ -1,4 +1,4 @@
-From 4ea0d21a910e0b43daefd58d3f4c477d9ca703fa Mon Sep 17 00:00:00 2001
+From 5f31238e22a6ca4da573ae75fb09824ab8a6aca5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 1 Jan 2018 16:10:24 -0500
 Subject: [PATCH] Configurable Max Chunk Gens per Tick
@@ -33,7 +33,7 @@ index af69342e6c..ca7efc9175 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index abf5a7554d..84896d6f6b 100644
+index 2fd8fa30ee..a0fcac3296 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
 @@ -28,6 +28,7 @@ public class PlayerChunk {
diff --git a/Spigot-Server-Patches/0226-Make-max-squid-spawn-height-configurable.patch b/Spigot-Server-Patches/0225-Make-max-squid-spawn-height-configurable.patch
similarity index 96%
rename from Spigot-Server-Patches/0226-Make-max-squid-spawn-height-configurable.patch
rename to Spigot-Server-Patches/0225-Make-max-squid-spawn-height-configurable.patch
index a09d127c34..b64d2cffe0 100644
--- a/Spigot-Server-Patches/0226-Make-max-squid-spawn-height-configurable.patch
+++ b/Spigot-Server-Patches/0225-Make-max-squid-spawn-height-configurable.patch
@@ -1,4 +1,4 @@
-From 5b13362be9a779df6b65026f72995bf5ba0a668d Mon Sep 17 00:00:00 2001
+From b772743743a4424318eec7d23057069599ac64a8 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
diff --git a/Spigot-Server-Patches/0227-PreCreatureSpawnEvent.patch b/Spigot-Server-Patches/0226-PreCreatureSpawnEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0227-PreCreatureSpawnEvent.patch
rename to Spigot-Server-Patches/0226-PreCreatureSpawnEvent.patch
index b807a8bb56..70c39a2227 100644
--- a/Spigot-Server-Patches/0227-PreCreatureSpawnEvent.patch
+++ b/Spigot-Server-Patches/0226-PreCreatureSpawnEvent.patch
@@ -1,4 +1,4 @@
-From 50a7ddacc14cd3f3cfbdd0b9639f5575b510c846 Mon Sep 17 00:00:00 2001
+From 83b5a86c5de9a3f9ea95ae34a473f739224c0ee8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 14 Jan 2018 17:01:31 -0500
 Subject: [PATCH] PreCreatureSpawnEvent
diff --git a/Spigot-Server-Patches/0228-PlayerNaturallySpawnCreaturesEvent.patch b/Spigot-Server-Patches/0227-PlayerNaturallySpawnCreaturesEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0228-PlayerNaturallySpawnCreaturesEvent.patch
rename to Spigot-Server-Patches/0227-PlayerNaturallySpawnCreaturesEvent.patch
index 5ded0a6023..8843ee6043 100644
--- a/Spigot-Server-Patches/0228-PlayerNaturallySpawnCreaturesEvent.patch
+++ b/Spigot-Server-Patches/0227-PlayerNaturallySpawnCreaturesEvent.patch
@@ -1,4 +1,4 @@
-From 8a4ee53008156f1eaed8961fce5e60db18c6585a Mon Sep 17 00:00:00 2001
+From c2e105f84b7417ae201d9c23ccc2b819aa0dfa48 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 14 Jan 2018 17:36:02 -0500
 Subject: [PATCH] PlayerNaturallySpawnCreaturesEvent
diff --git a/Spigot-Server-Patches/0229-Add-setPlayerProfile-API-for-Skulls.patch b/Spigot-Server-Patches/0228-Add-setPlayerProfile-API-for-Skulls.patch
similarity index 98%
rename from Spigot-Server-Patches/0229-Add-setPlayerProfile-API-for-Skulls.patch
rename to Spigot-Server-Patches/0228-Add-setPlayerProfile-API-for-Skulls.patch
index e1f256e65e..00edadbf7c 100644
--- a/Spigot-Server-Patches/0229-Add-setPlayerProfile-API-for-Skulls.patch
+++ b/Spigot-Server-Patches/0228-Add-setPlayerProfile-API-for-Skulls.patch
@@ -1,4 +1,4 @@
-From ff7609807c3c69ad099fb67cc7fde75494090a99 Mon Sep 17 00:00:00 2001
+From 9a871f17c9a198eb5bc9b74e789ea310e2fca616 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
diff --git a/Spigot-Server-Patches/0230-Fill-Profile-Property-Events.patch b/Spigot-Server-Patches/0229-Fill-Profile-Property-Events.patch
similarity index 96%
rename from Spigot-Server-Patches/0230-Fill-Profile-Property-Events.patch
rename to Spigot-Server-Patches/0229-Fill-Profile-Property-Events.patch
index 8e47c8c3cf..1f64c58b5a 100644
--- a/Spigot-Server-Patches/0230-Fill-Profile-Property-Events.patch
+++ b/Spigot-Server-Patches/0229-Fill-Profile-Property-Events.patch
@@ -1,4 +1,4 @@
-From 8ec62ae1e5fe8a645abf7703443d7fe17aa23ecc Mon Sep 17 00:00:00 2001
+From 94844222be50f102f30ea65c4705d15e004b5530 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
diff --git a/Spigot-Server-Patches/0231-PlayerAdvancementCriterionGrantEvent.patch b/Spigot-Server-Patches/0230-PlayerAdvancementCriterionGrantEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0231-PlayerAdvancementCriterionGrantEvent.patch
rename to Spigot-Server-Patches/0230-PlayerAdvancementCriterionGrantEvent.patch
index 5714cfd6bb..d47980f7f2 100644
--- a/Spigot-Server-Patches/0231-PlayerAdvancementCriterionGrantEvent.patch
+++ b/Spigot-Server-Patches/0230-PlayerAdvancementCriterionGrantEvent.patch
@@ -1,4 +1,4 @@
-From 49980e61fc954682da770bdb4ba9d78c79e8c3d1 Mon Sep 17 00:00:00 2001
+From f7db7b5bf402cd0f61de0918d6e5b1b66763f1b8 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/Spigot-Server-Patches/0232-Add-ArmorStand-Item-Meta.patch b/Spigot-Server-Patches/0231-Add-ArmorStand-Item-Meta.patch
similarity index 99%
rename from Spigot-Server-Patches/0232-Add-ArmorStand-Item-Meta.patch
rename to Spigot-Server-Patches/0231-Add-ArmorStand-Item-Meta.patch
index 3e2e296980..0291ce08f2 100644
--- a/Spigot-Server-Patches/0232-Add-ArmorStand-Item-Meta.patch
+++ b/Spigot-Server-Patches/0231-Add-ArmorStand-Item-Meta.patch
@@ -1,4 +1,4 @@
-From 3d7b2fb8559f4b7e9a77cc5bf847fbbaa018975f Mon Sep 17 00:00:00 2001
+From 7034e1b56e73ac61baa240bc969cf857f48f7fb7 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
diff --git a/Spigot-Server-Patches/0233-Extend-Player-Interact-cancellation.patch b/Spigot-Server-Patches/0232-Extend-Player-Interact-cancellation.patch
similarity index 98%
rename from Spigot-Server-Patches/0233-Extend-Player-Interact-cancellation.patch
rename to Spigot-Server-Patches/0232-Extend-Player-Interact-cancellation.patch
index 8e14724868..1ab92e299f 100644
--- a/Spigot-Server-Patches/0233-Extend-Player-Interact-cancellation.patch
+++ b/Spigot-Server-Patches/0232-Extend-Player-Interact-cancellation.patch
@@ -1,4 +1,4 @@
-From ec15754c56022bd014cd5c6feb1380c4fb325b18 Mon Sep 17 00:00:00 2001
+From 325016cc7a982f737cea5fc4368000ccf7e30564 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
diff --git a/Spigot-Server-Patches/0234-Tameable-getOwnerUniqueId-API.patch b/Spigot-Server-Patches/0233-Tameable-getOwnerUniqueId-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0234-Tameable-getOwnerUniqueId-API.patch
rename to Spigot-Server-Patches/0233-Tameable-getOwnerUniqueId-API.patch
index 384197d3b4..a31ab3e045 100644
--- a/Spigot-Server-Patches/0234-Tameable-getOwnerUniqueId-API.patch
+++ b/Spigot-Server-Patches/0233-Tameable-getOwnerUniqueId-API.patch
@@ -1,4 +1,4 @@
-From 5b5466728902e005d72d2f8e51d87b6973e89008 Mon Sep 17 00:00:00 2001
+From 0caca786108d71c213532dbb058efd5f5bb3a771 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
diff --git a/Spigot-Server-Patches/0235-Toggleable-player-crits-helps-mitigate-hacked-client.patch b/Spigot-Server-Patches/0234-Toggleable-player-crits-helps-mitigate-hacked-client.patch
similarity index 96%
rename from Spigot-Server-Patches/0235-Toggleable-player-crits-helps-mitigate-hacked-client.patch
rename to Spigot-Server-Patches/0234-Toggleable-player-crits-helps-mitigate-hacked-client.patch
index aca3715278..a566f45edc 100644
--- a/Spigot-Server-Patches/0235-Toggleable-player-crits-helps-mitigate-hacked-client.patch
+++ b/Spigot-Server-Patches/0234-Toggleable-player-crits-helps-mitigate-hacked-client.patch
@@ -1,4 +1,4 @@
-From d3908c2872249433b4ffadda9f2c35cdd851a133 Mon Sep 17 00:00:00 2001
+From b5fe5cfedb0892d65579588e47cd426c64b85dae 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/Spigot-Server-Patches/0236-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch b/Spigot-Server-Patches/0235-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
similarity index 95%
rename from Spigot-Server-Patches/0236-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
rename to Spigot-Server-Patches/0235-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
index f1079ce060..f87a9c0ff8 100644
--- a/Spigot-Server-Patches/0236-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
+++ b/Spigot-Server-Patches/0235-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
@@ -1,4 +1,4 @@
-From 4d8116a77923aebfa7d45af006b2dc0c4bf9babf Mon Sep 17 00:00:00 2001
+From 7ecd398e6b9b995538cc6c56cfe1cd5a605dd523 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
diff --git a/Spigot-Server-Patches/0237-Prevent-Frosted-Ice-from-loading-holding-chunks.patch b/Spigot-Server-Patches/0236-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
similarity index 96%
rename from Spigot-Server-Patches/0237-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
rename to Spigot-Server-Patches/0236-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
index ce8fcbaa8b..5d8d4637fc 100644
--- a/Spigot-Server-Patches/0237-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
+++ b/Spigot-Server-Patches/0236-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
@@ -1,4 +1,4 @@
-From a545c755665ffec6dbea81ab36f0245be40806d6 Mon Sep 17 00:00:00 2001
+From 0337ec68f7397efe5c6599cb488ae42952f290a8 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/Spigot-Server-Patches/0238-Disable-Explicit-Network-Manager-Flushing.patch b/Spigot-Server-Patches/0237-Disable-Explicit-Network-Manager-Flushing.patch
similarity index 96%
rename from Spigot-Server-Patches/0238-Disable-Explicit-Network-Manager-Flushing.patch
rename to Spigot-Server-Patches/0237-Disable-Explicit-Network-Manager-Flushing.patch
index a9cee7e43b..b0ae0886da 100644
--- a/Spigot-Server-Patches/0238-Disable-Explicit-Network-Manager-Flushing.patch
+++ b/Spigot-Server-Patches/0237-Disable-Explicit-Network-Manager-Flushing.patch
@@ -1,4 +1,4 @@
-From 282ddad68b63ce73482aaad7d34013853af32289 Mon Sep 17 00:00:00 2001
+From 1bbdbfeadb10437782ff1ed24a4a09db0d8e52db 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
diff --git a/Spigot-Server-Patches/0239-Implement-extended-PaperServerListPingEvent.patch b/Spigot-Server-Patches/0238-Implement-extended-PaperServerListPingEvent.patch
similarity index 99%
rename from Spigot-Server-Patches/0239-Implement-extended-PaperServerListPingEvent.patch
rename to Spigot-Server-Patches/0238-Implement-extended-PaperServerListPingEvent.patch
index 3aca179906..9fecfb0c25 100644
--- a/Spigot-Server-Patches/0239-Implement-extended-PaperServerListPingEvent.patch
+++ b/Spigot-Server-Patches/0238-Implement-extended-PaperServerListPingEvent.patch
@@ -1,4 +1,4 @@
-From 77f8535b9c4b4ef7d24b8f23cb19d68624346542 Mon Sep 17 00:00:00 2001
+From e5b9baa3179e567e8d031ea4c5bce99b8efefaf9 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
diff --git a/Spigot-Server-Patches/0240-Improved-Async-Task-Scheduler.patch b/Spigot-Server-Patches/0239-Improved-Async-Task-Scheduler.patch
similarity index 99%
rename from Spigot-Server-Patches/0240-Improved-Async-Task-Scheduler.patch
rename to Spigot-Server-Patches/0239-Improved-Async-Task-Scheduler.patch
index 986b98effb..34d9c329eb 100644
--- a/Spigot-Server-Patches/0240-Improved-Async-Task-Scheduler.patch
+++ b/Spigot-Server-Patches/0239-Improved-Async-Task-Scheduler.patch
@@ -1,4 +1,4 @@
-From a15b5ec480aba287c3bda0cd06aa871a47746471 Mon Sep 17 00:00:00 2001
+From 219b0871a8f1b93075b7ca410a4663b67771ee1c 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
diff --git a/Spigot-Server-Patches/0241-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/Spigot-Server-Patches/0240-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
similarity index 97%
rename from Spigot-Server-Patches/0241-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
rename to Spigot-Server-Patches/0240-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
index 9360d5a86e..c1d480bcf3 100644
--- a/Spigot-Server-Patches/0241-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
+++ b/Spigot-Server-Patches/0240-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
@@ -1,4 +1,4 @@
-From 5c2d7d6ffe3b1b05b007b7e66c4b4831b8039d25 Mon Sep 17 00:00:00 2001
+From 982c19767d50214ca6c84babe208d483ddcb5e4e 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
diff --git a/Spigot-Server-Patches/0242-Call-PortalCreateEvent-for-exit-portals.patch b/Spigot-Server-Patches/0241-Call-PortalCreateEvent-for-exit-portals.patch
similarity index 98%
rename from Spigot-Server-Patches/0242-Call-PortalCreateEvent-for-exit-portals.patch
rename to Spigot-Server-Patches/0241-Call-PortalCreateEvent-for-exit-portals.patch
index fb45ead775..fa1610daa2 100644
--- a/Spigot-Server-Patches/0242-Call-PortalCreateEvent-for-exit-portals.patch
+++ b/Spigot-Server-Patches/0241-Call-PortalCreateEvent-for-exit-portals.patch
@@ -1,4 +1,4 @@
-From 0c86471b4b20265927a4b60e646b6d2a8a36a167 Mon Sep 17 00:00:00 2001
+From 8031e2f0a6c2736b55d5e96c527b6cf080b88d74 Mon Sep 17 00:00:00 2001
 From: MiniDigger <admin@minidigger.me>
 Date: Sun, 18 Mar 2018 15:44:44 +0100
 Subject: [PATCH] Call PortalCreateEvent for exit portals
diff --git a/Spigot-Server-Patches/0243-Player.setPlayerProfile-API.patch b/Spigot-Server-Patches/0242-Player.setPlayerProfile-API.patch
similarity index 99%
rename from Spigot-Server-Patches/0243-Player.setPlayerProfile-API.patch
rename to Spigot-Server-Patches/0242-Player.setPlayerProfile-API.patch
index a61c79798e..3db4813eaa 100644
--- a/Spigot-Server-Patches/0243-Player.setPlayerProfile-API.patch
+++ b/Spigot-Server-Patches/0242-Player.setPlayerProfile-API.patch
@@ -1,4 +1,4 @@
-From 9361263d0896b5fb7e856d7db593d8109a61f696 Mon Sep 17 00:00:00 2001
+From aa252e29df89602af7e487e33e63fb46ff9a77a0 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
diff --git a/Spigot-Server-Patches/0244-Fix-Dragon-Server-Crashes.patch b/Spigot-Server-Patches/0243-Fix-Dragon-Server-Crashes.patch
similarity index 95%
rename from Spigot-Server-Patches/0244-Fix-Dragon-Server-Crashes.patch
rename to Spigot-Server-Patches/0243-Fix-Dragon-Server-Crashes.patch
index 9869c3dda1..4bb9f3be83 100644
--- a/Spigot-Server-Patches/0244-Fix-Dragon-Server-Crashes.patch
+++ b/Spigot-Server-Patches/0243-Fix-Dragon-Server-Crashes.patch
@@ -1,4 +1,4 @@
-From 1ab4d56fede934397f12f3adad702a38a51ec536 Mon Sep 17 00:00:00 2001
+From 83b8bb51552c5b1ffd6509c9f9d6b46a747f6a2c 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
diff --git a/Spigot-Server-Patches/0245-getPlayerUniqueId-API.patch b/Spigot-Server-Patches/0244-getPlayerUniqueId-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0245-getPlayerUniqueId-API.patch
rename to Spigot-Server-Patches/0244-getPlayerUniqueId-API.patch
index aabe5be75a..ad2cd2e0e0 100644
--- a/Spigot-Server-Patches/0245-getPlayerUniqueId-API.patch
+++ b/Spigot-Server-Patches/0244-getPlayerUniqueId-API.patch
@@ -1,4 +1,4 @@
-From debc7e10b92212db182c021c52b819143e511c45 Mon Sep 17 00:00:00 2001
+From 30bd8cf126f419185caa6520eca498e877c4b0ce 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
diff --git a/Spigot-Server-Patches/0246-Make-player-data-saving-configurable.patch b/Spigot-Server-Patches/0245-Make-player-data-saving-configurable.patch
similarity index 95%
rename from Spigot-Server-Patches/0246-Make-player-data-saving-configurable.patch
rename to Spigot-Server-Patches/0245-Make-player-data-saving-configurable.patch
index a8a72627c6..a336dad8f1 100644
--- a/Spigot-Server-Patches/0246-Make-player-data-saving-configurable.patch
+++ b/Spigot-Server-Patches/0245-Make-player-data-saving-configurable.patch
@@ -1,11 +1,11 @@
-From 9a4c167b01c3c4a4e896574bf45366a11095644a Mon Sep 17 00:00:00 2001
+From 3963a8afce003d4c78d10807a75dfa6f3a1d6497 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 8a899ed40d..8b347a9b47 100644
+index 6fcfeafc04..f9ad4f97ec 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -286,4 +286,13 @@ public class PaperConfig {
diff --git a/Spigot-Server-Patches/0247-Make-legacy-ping-handler-more-reliable.patch b/Spigot-Server-Patches/0246-Make-legacy-ping-handler-more-reliable.patch
similarity index 98%
rename from Spigot-Server-Patches/0247-Make-legacy-ping-handler-more-reliable.patch
rename to Spigot-Server-Patches/0246-Make-legacy-ping-handler-more-reliable.patch
index 7e1b860e01..efe5f290a1 100644
--- a/Spigot-Server-Patches/0247-Make-legacy-ping-handler-more-reliable.patch
+++ b/Spigot-Server-Patches/0246-Make-legacy-ping-handler-more-reliable.patch
@@ -1,4 +1,4 @@
-From f1dd4093f4e8f7d7ac4e82b2eb972e830913bf95 Mon Sep 17 00:00:00 2001
+From 03f5df321e1299135fb47f7febb879bb492a9dfb 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
diff --git a/Spigot-Server-Patches/0248-Call-PaperServerListPingEvent-for-legacy-pings.patch b/Spigot-Server-Patches/0247-Call-PaperServerListPingEvent-for-legacy-pings.patch
similarity index 99%
rename from Spigot-Server-Patches/0248-Call-PaperServerListPingEvent-for-legacy-pings.patch
rename to Spigot-Server-Patches/0247-Call-PaperServerListPingEvent-for-legacy-pings.patch
index d8018c1b1a..a96af7449a 100644
--- a/Spigot-Server-Patches/0248-Call-PaperServerListPingEvent-for-legacy-pings.patch
+++ b/Spigot-Server-Patches/0247-Call-PaperServerListPingEvent-for-legacy-pings.patch
@@ -1,4 +1,4 @@
-From df020f38cbecc35e57d92f1a528e3456e9e0e6be Mon Sep 17 00:00:00 2001
+From 51238ebbbbd3fa77c730204f46bb3bee2db0cd15 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
diff --git a/Spigot-Server-Patches/0249-Flag-to-disable-the-channel-limit.patch b/Spigot-Server-Patches/0248-Flag-to-disable-the-channel-limit.patch
similarity index 96%
rename from Spigot-Server-Patches/0249-Flag-to-disable-the-channel-limit.patch
rename to Spigot-Server-Patches/0248-Flag-to-disable-the-channel-limit.patch
index 143092f1de..18369a5b60 100644
--- a/Spigot-Server-Patches/0249-Flag-to-disable-the-channel-limit.patch
+++ b/Spigot-Server-Patches/0248-Flag-to-disable-the-channel-limit.patch
@@ -1,4 +1,4 @@
-From 8f142191160c0c153d273f2ef8056c2ede7fa78d Mon Sep 17 00:00:00 2001
+From beeb06397df382083e4ce46067bffe583ad595ba 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
diff --git a/Spigot-Server-Patches/0250-Add-method-to-open-already-placed-sign.patch b/Spigot-Server-Patches/0249-Add-method-to-open-already-placed-sign.patch
similarity index 95%
rename from Spigot-Server-Patches/0250-Add-method-to-open-already-placed-sign.patch
rename to Spigot-Server-Patches/0249-Add-method-to-open-already-placed-sign.patch
index fa169ae44c..20afabb3da 100644
--- a/Spigot-Server-Patches/0250-Add-method-to-open-already-placed-sign.patch
+++ b/Spigot-Server-Patches/0249-Add-method-to-open-already-placed-sign.patch
@@ -1,4 +1,4 @@
-From 7814c18d81fd97bc562371ba48bf5bff1be6dadb Mon Sep 17 00:00:00 2001
+From d10e4e52c21070aa77e423b03a65302e5ca17f9d 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/Spigot-Server-Patches/0251-Load-version-history-at-server-start.patch b/Spigot-Server-Patches/0250-Load-version-history-at-server-start.patch
similarity index 93%
rename from Spigot-Server-Patches/0251-Load-version-history-at-server-start.patch
rename to Spigot-Server-Patches/0250-Load-version-history-at-server-start.patch
index 87b6ad3692..ab329621ec 100644
--- a/Spigot-Server-Patches/0251-Load-version-history-at-server-start.patch
+++ b/Spigot-Server-Patches/0250-Load-version-history-at-server-start.patch
@@ -1,4 +1,4 @@
-From ddf5a46a4f3f712a6ba773d837ea86e3946ebcfd Mon Sep 17 00:00:00 2001
+From 1636fc154af5dadcd9d9ee7950506ceb41e0e973 Mon Sep 17 00:00:00 2001
 From: Kyle Wood <demonwav@gmail.com>
 Date: Thu, 1 Mar 2018 19:38:14 -0600
 Subject: [PATCH] Load version history at server start
diff --git a/Spigot-Server-Patches/0252-Configurable-sprint-interruption-on-attack.patch b/Spigot-Server-Patches/0251-Configurable-sprint-interruption-on-attack.patch
similarity index 96%
rename from Spigot-Server-Patches/0252-Configurable-sprint-interruption-on-attack.patch
rename to Spigot-Server-Patches/0251-Configurable-sprint-interruption-on-attack.patch
index ed8c0922d0..9d4f9cebca 100644
--- a/Spigot-Server-Patches/0252-Configurable-sprint-interruption-on-attack.patch
+++ b/Spigot-Server-Patches/0251-Configurable-sprint-interruption-on-attack.patch
@@ -1,4 +1,4 @@
-From b80c14207336e5a32b4693e8d6a338438c645468 Mon Sep 17 00:00:00 2001
+From ab27cd2f822ead83bcbb5e058b2dd23b2d0942d1 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
diff --git a/Spigot-Server-Patches/0253-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/Spigot-Server-Patches/0252-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
similarity index 94%
rename from Spigot-Server-Patches/0253-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
rename to Spigot-Server-Patches/0252-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
index c94a5a0a46..fdf00ffcdd 100644
--- a/Spigot-Server-Patches/0253-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
+++ b/Spigot-Server-Patches/0252-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
@@ -1,4 +1,4 @@
-From d83b434f71dac05dad84c2de38e1e185a7d41e77 Mon Sep 17 00:00:00 2001
+From 7ecdd7ff4e17135f5184695dcde3abb7017b6ea7 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/Spigot-Server-Patches/0254-EndermanEscapeEvent.patch b/Spigot-Server-Patches/0253-EndermanEscapeEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0254-EndermanEscapeEvent.patch
rename to Spigot-Server-Patches/0253-EndermanEscapeEvent.patch
index 672981c448..b8621d8c9f 100644
--- a/Spigot-Server-Patches/0254-EndermanEscapeEvent.patch
+++ b/Spigot-Server-Patches/0253-EndermanEscapeEvent.patch
@@ -1,4 +1,4 @@
-From 3497bf47db1ca5e9f50d6a7e85d66f23ed8993e5 Mon Sep 17 00:00:00 2001
+From aac7b934c6ba1da1ee67804cca10f524efe67535 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 13:15:55 -0400
 Subject: [PATCH] EndermanEscapeEvent
diff --git a/Spigot-Server-Patches/0255-Enderman.teleportRandomly.patch b/Spigot-Server-Patches/0254-Enderman.teleportRandomly.patch
similarity index 96%
rename from Spigot-Server-Patches/0255-Enderman.teleportRandomly.patch
rename to Spigot-Server-Patches/0254-Enderman.teleportRandomly.patch
index bd988d43e7..46368aa3ac 100644
--- a/Spigot-Server-Patches/0255-Enderman.teleportRandomly.patch
+++ b/Spigot-Server-Patches/0254-Enderman.teleportRandomly.patch
@@ -1,4 +1,4 @@
-From a5cb74203f3a80c860ee9b724f4453762b4cd83d Mon Sep 17 00:00:00 2001
+From b0c4e5504b1e5e3cfc54db2057e31d7d8733fa05 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()
diff --git a/Spigot-Server-Patches/0256-Block-Enderpearl-Travel-Exploit.patch b/Spigot-Server-Patches/0255-Block-Enderpearl-Travel-Exploit.patch
similarity index 97%
rename from Spigot-Server-Patches/0256-Block-Enderpearl-Travel-Exploit.patch
rename to Spigot-Server-Patches/0255-Block-Enderpearl-Travel-Exploit.patch
index 0ec9290297..418dcbb1b2 100644
--- a/Spigot-Server-Patches/0256-Block-Enderpearl-Travel-Exploit.patch
+++ b/Spigot-Server-Patches/0255-Block-Enderpearl-Travel-Exploit.patch
@@ -1,4 +1,4 @@
-From 9ae96a4c39cb99a121e52e6960e2fbabab6c2fdb Mon Sep 17 00:00:00 2001
+From 97aa493a6d38781247226e4c8b22304905ee0297 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
diff --git a/Spigot-Server-Patches/0257-Expand-World.spawnParticle-API-and-add-Builder.patch b/Spigot-Server-Patches/0256-Expand-World.spawnParticle-API-and-add-Builder.patch
similarity index 98%
rename from Spigot-Server-Patches/0257-Expand-World.spawnParticle-API-and-add-Builder.patch
rename to Spigot-Server-Patches/0256-Expand-World.spawnParticle-API-and-add-Builder.patch
index 82d47e7631..cc82cba255 100644
--- a/Spigot-Server-Patches/0257-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/Spigot-Server-Patches/0256-Expand-World.spawnParticle-API-and-add-Builder.patch
@@ -1,4 +1,4 @@
-From a23ffd467b0f0795dc00383cb888c29bf5705d7b Mon Sep 17 00:00:00 2001
+From 22cea100009c3346d73e002abd6786f2766a9795 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
diff --git a/Spigot-Server-Patches/0258-EndermanAttackPlayerEvent.patch b/Spigot-Server-Patches/0257-EndermanAttackPlayerEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0258-EndermanAttackPlayerEvent.patch
rename to Spigot-Server-Patches/0257-EndermanAttackPlayerEvent.patch
index 263bd77036..d312249c55 100644
--- a/Spigot-Server-Patches/0258-EndermanAttackPlayerEvent.patch
+++ b/Spigot-Server-Patches/0257-EndermanAttackPlayerEvent.patch
@@ -1,4 +1,4 @@
-From aff5cc7cd13209576268258b6b525e1cdccc6a6d Mon Sep 17 00:00:00 2001
+From 081c20c5cacf693b7b401bb41b09f798db036263 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 1 May 2018 20:18:54 -0400
 Subject: [PATCH] EndermanAttackPlayerEvent
diff --git a/Spigot-Server-Patches/0259-WitchConsumePotionEvent.patch b/Spigot-Server-Patches/0258-WitchConsumePotionEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0259-WitchConsumePotionEvent.patch
rename to Spigot-Server-Patches/0258-WitchConsumePotionEvent.patch
index 24131a9875..d5ea5cbdde 100644
--- a/Spigot-Server-Patches/0259-WitchConsumePotionEvent.patch
+++ b/Spigot-Server-Patches/0258-WitchConsumePotionEvent.patch
@@ -1,4 +1,4 @@
-From 71636f4142f5e0cda2863895be3e6e8553da4ce5 Mon Sep 17 00:00:00 2001
+From c9d947db8035e9549431d25f17b33764b0653fc3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 16 May 2018 20:35:16 -0400
 Subject: [PATCH] WitchConsumePotionEvent
diff --git a/Spigot-Server-Patches/0260-WitchThrowPotionEvent.patch b/Spigot-Server-Patches/0259-WitchThrowPotionEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0260-WitchThrowPotionEvent.patch
rename to Spigot-Server-Patches/0259-WitchThrowPotionEvent.patch
index cdf26d634f..2dde7537c2 100644
--- a/Spigot-Server-Patches/0260-WitchThrowPotionEvent.patch
+++ b/Spigot-Server-Patches/0259-WitchThrowPotionEvent.patch
@@ -1,4 +1,4 @@
-From 8dc80448adf526dc7bac7e1cc73b7e0a1a5dcd7e Mon Sep 17 00:00:00 2001
+From 87695882f78f6951e4c17496a84b16eb9273a20b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 16 May 2018 20:44:58 -0400
 Subject: [PATCH] WitchThrowPotionEvent
diff --git a/Spigot-Server-Patches/0261-Allow-spawning-Item-entities-with-World.spawnEntity.patch b/Spigot-Server-Patches/0260-Allow-spawning-Item-entities-with-World.spawnEntity.patch
similarity index 95%
rename from Spigot-Server-Patches/0261-Allow-spawning-Item-entities-with-World.spawnEntity.patch
rename to Spigot-Server-Patches/0260-Allow-spawning-Item-entities-with-World.spawnEntity.patch
index 2fc31ab39c..447a0402ec 100644
--- a/Spigot-Server-Patches/0261-Allow-spawning-Item-entities-with-World.spawnEntity.patch
+++ b/Spigot-Server-Patches/0260-Allow-spawning-Item-entities-with-World.spawnEntity.patch
@@ -1,4 +1,4 @@
-From 31b1e549a6c1045187e4eac2d80911f474e518ec Mon Sep 17 00:00:00 2001
+From 92b63fc82b3f37c99206b5b1263e8b27b6cf7332 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
diff --git a/Spigot-Server-Patches/0262-Configurable-Villages-loading-chunks-for-door-checks.patch b/Spigot-Server-Patches/0261-Configurable-Villages-loading-chunks-for-door-checks.patch
similarity index 98%
rename from Spigot-Server-Patches/0262-Configurable-Villages-loading-chunks-for-door-checks.patch
rename to Spigot-Server-Patches/0261-Configurable-Villages-loading-chunks-for-door-checks.patch
index e755920910..0867d1a864 100644
--- a/Spigot-Server-Patches/0262-Configurable-Villages-loading-chunks-for-door-checks.patch
+++ b/Spigot-Server-Patches/0261-Configurable-Villages-loading-chunks-for-door-checks.patch
@@ -1,4 +1,4 @@
-From 15bff8984584cdb609079bd13e99af4ed845243a Mon Sep 17 00:00:00 2001
+From 2fd84bb4152e70a21453a5deb49b2938207764b8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Jun 2018 00:32:22 -0400
 Subject: [PATCH] Configurable Villages loading chunks for door checks
diff --git a/Spigot-Server-Patches/0263-WitchReadyPotionEvent.patch b/Spigot-Server-Patches/0262-WitchReadyPotionEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0263-WitchReadyPotionEvent.patch
rename to Spigot-Server-Patches/0262-WitchReadyPotionEvent.patch
index 6d459a1e93..e926a1d418 100644
--- a/Spigot-Server-Patches/0263-WitchReadyPotionEvent.patch
+++ b/Spigot-Server-Patches/0262-WitchReadyPotionEvent.patch
@@ -1,4 +1,4 @@
-From 7496a676d263099984ccca8829033c95ba113bda Mon Sep 17 00:00:00 2001
+From a73c930e547660446807e57975e0de532c229594 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/Spigot-Server-Patches/0264-ItemStack-getMaxItemUseDuration.patch b/Spigot-Server-Patches/0263-ItemStack-getMaxItemUseDuration.patch
similarity index 96%
rename from Spigot-Server-Patches/0264-ItemStack-getMaxItemUseDuration.patch
rename to Spigot-Server-Patches/0263-ItemStack-getMaxItemUseDuration.patch
index 73f8610754..52f01d5363 100644
--- a/Spigot-Server-Patches/0264-ItemStack-getMaxItemUseDuration.patch
+++ b/Spigot-Server-Patches/0263-ItemStack-getMaxItemUseDuration.patch
@@ -1,4 +1,4 @@
-From 78a35f7fe1d4c9611112459347dc0c083fba77a7 Mon Sep 17 00:00:00 2001
+From 1e12dab0780ccc1ca6e689cff0c54010aab97f66 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
diff --git a/Spigot-Server-Patches/0265-Implement-EntityTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/0264-Implement-EntityTeleportEndGatewayEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0265-Implement-EntityTeleportEndGatewayEvent.patch
rename to Spigot-Server-Patches/0264-Implement-EntityTeleportEndGatewayEvent.patch
index da5a1a534f..70eb61c9d5 100644
--- a/Spigot-Server-Patches/0265-Implement-EntityTeleportEndGatewayEvent.patch
+++ b/Spigot-Server-Patches/0264-Implement-EntityTeleportEndGatewayEvent.patch
@@ -1,4 +1,4 @@
-From 6497f7f23c35b54e1f661288a8fede7b5bcbf627 Mon Sep 17 00:00:00 2001
+From 9aebe1e759505f810a8893bce3ea74aa46d27df6 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/Spigot-Server-Patches/0266-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/Spigot-Server-Patches/0265-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
similarity index 95%
rename from Spigot-Server-Patches/0266-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
rename to Spigot-Server-Patches/0265-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
index 5a4ab2a064..eb3a019f07 100644
--- a/Spigot-Server-Patches/0266-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
+++ b/Spigot-Server-Patches/0265-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
@@ -1,4 +1,4 @@
-From af4fe660fff1c67b0f4e981fbf414ebe5cbe367a Mon Sep 17 00:00:00 2001
+From 73594e284d277127349fb5fa7cd857bffcd68974 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
diff --git a/Spigot-Server-Patches/0267-Properly-remove-entities-on-dimension-teleport.patch b/Spigot-Server-Patches/0266-Properly-remove-entities-on-dimension-teleport.patch
similarity index 97%
rename from Spigot-Server-Patches/0267-Properly-remove-entities-on-dimension-teleport.patch
rename to Spigot-Server-Patches/0266-Properly-remove-entities-on-dimension-teleport.patch
index 08b1c49d48..f6935bb03c 100644
--- a/Spigot-Server-Patches/0267-Properly-remove-entities-on-dimension-teleport.patch
+++ b/Spigot-Server-Patches/0266-Properly-remove-entities-on-dimension-teleport.patch
@@ -1,4 +1,4 @@
-From c1ad42c1320658298476c0e0e18d7a43a9d8d3e1 Mon Sep 17 00:00:00 2001
+From 3aed4cf92a8420481473aacf4a54016261305bac Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 10 Jun 2018 20:04:42 -0400
 Subject: [PATCH] Properly remove entities on dimension teleport
diff --git a/Spigot-Server-Patches/0268-Fix-CraftEntity-hashCode.patch b/Spigot-Server-Patches/0267-Fix-CraftEntity-hashCode.patch
similarity index 96%
rename from Spigot-Server-Patches/0268-Fix-CraftEntity-hashCode.patch
rename to Spigot-Server-Patches/0267-Fix-CraftEntity-hashCode.patch
index 47776fb6ae..4d6d61f453 100644
--- a/Spigot-Server-Patches/0268-Fix-CraftEntity-hashCode.patch
+++ b/Spigot-Server-Patches/0267-Fix-CraftEntity-hashCode.patch
@@ -1,4 +1,4 @@
-From 19e865b18de274d752ba9aeed4920baacdf33edd Mon Sep 17 00:00:00 2001
+From cce32d2f2e5368d30242a44a4f7657f7b6d90928 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
diff --git a/Spigot-Server-Patches/0269-Configurable-Alternative-LootPool-Luck-Formula.patch b/Spigot-Server-Patches/0268-Configurable-Alternative-LootPool-Luck-Formula.patch
similarity index 97%
rename from Spigot-Server-Patches/0269-Configurable-Alternative-LootPool-Luck-Formula.patch
rename to Spigot-Server-Patches/0268-Configurable-Alternative-LootPool-Luck-Formula.patch
index 71b657d086..701886778c 100644
--- a/Spigot-Server-Patches/0269-Configurable-Alternative-LootPool-Luck-Formula.patch
+++ b/Spigot-Server-Patches/0268-Configurable-Alternative-LootPool-Luck-Formula.patch
@@ -1,4 +1,4 @@
-From 6695076172d9271b952a86b997fa1e38a9c6449d Mon Sep 17 00:00:00 2001
+From 476129ef8316c6789c51a1df5d7859ce53cf22a0 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 8b347a9b47..ad031dedaa 100644
+index f9ad4f97ec..80bbdec480 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -295,4 +295,12 @@ public class PaperConfig {
diff --git a/Spigot-Server-Patches/0270-Print-Error-details-when-failing-to-save-player-data.patch b/Spigot-Server-Patches/0269-Print-Error-details-when-failing-to-save-player-data.patch
similarity index 93%
rename from Spigot-Server-Patches/0270-Print-Error-details-when-failing-to-save-player-data.patch
rename to Spigot-Server-Patches/0269-Print-Error-details-when-failing-to-save-player-data.patch
index a55ebf5c32..8c34f65947 100644
--- a/Spigot-Server-Patches/0270-Print-Error-details-when-failing-to-save-player-data.patch
+++ b/Spigot-Server-Patches/0269-Print-Error-details-when-failing-to-save-player-data.patch
@@ -1,4 +1,4 @@
-From d294980e5507132eb6fe8de464f4f3556309f2eb Mon Sep 17 00:00:00 2001
+From 5fd104088d7fcb8677589cf20a19287f416006b9 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/Spigot-Server-Patches/0271-Make-shield-blocking-delay-configurable.patch b/Spigot-Server-Patches/0270-Make-shield-blocking-delay-configurable.patch
similarity index 97%
rename from Spigot-Server-Patches/0271-Make-shield-blocking-delay-configurable.patch
rename to Spigot-Server-Patches/0270-Make-shield-blocking-delay-configurable.patch
index b601e76fdd..a1d34b40b7 100644
--- a/Spigot-Server-Patches/0271-Make-shield-blocking-delay-configurable.patch
+++ b/Spigot-Server-Patches/0270-Make-shield-blocking-delay-configurable.patch
@@ -1,4 +1,4 @@
-From b9ab361fdf72abfa18a4bf1d59ff06d654c97dfb Mon Sep 17 00:00:00 2001
+From 1c2e1f99cacb6123fce53f8942c700cda2c4c87d 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/Spigot-Server-Patches/0272-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch b/Spigot-Server-Patches/0271-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
similarity index 95%
rename from Spigot-Server-Patches/0272-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
rename to Spigot-Server-Patches/0271-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
index b9cec50a6b..55271dfdf0 100644
--- a/Spigot-Server-Patches/0272-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
+++ b/Spigot-Server-Patches/0271-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
@@ -1,4 +1,4 @@
-From 4d6c05dc231007713d6a6b489537eb3951ed701a Mon Sep 17 00:00:00 2001
+From 6d5a47af205f96269023aae4c781e2487398e98c 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
diff --git a/Spigot-Server-Patches/0273-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch b/Spigot-Server-Patches/0272-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
similarity index 98%
rename from Spigot-Server-Patches/0273-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
rename to Spigot-Server-Patches/0272-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
index 7b57889a2b..721c959a61 100644
--- a/Spigot-Server-Patches/0273-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
+++ b/Spigot-Server-Patches/0272-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
@@ -1,4 +1,4 @@
-From 8cd10426fab3bc25487bc3037915689a51b5442d Mon Sep 17 00:00:00 2001
+From a5ad3e6239c7c47bc3640ab93d82d104dbccb000 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
diff --git a/Spigot-Server-Patches/0274-PlayerReadyArrowEvent.patch b/Spigot-Server-Patches/0273-PlayerReadyArrowEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0274-PlayerReadyArrowEvent.patch
rename to Spigot-Server-Patches/0273-PlayerReadyArrowEvent.patch
index 6e4b97ea1b..71d2dbc358 100644
--- a/Spigot-Server-Patches/0274-PlayerReadyArrowEvent.patch
+++ b/Spigot-Server-Patches/0273-PlayerReadyArrowEvent.patch
@@ -1,4 +1,4 @@
-From e19c8c0bd3024b5c1abd42fe1ffb4468be4a8f6e Mon Sep 17 00:00:00 2001
+From c49c00d50f048309923a635b82d67ab84c7a4723 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 18 Jun 2018 01:12:53 -0400
 Subject: [PATCH] PlayerReadyArrowEvent
diff --git a/Spigot-Server-Patches/0275-Fire-EntityShootBowEvent-for-Illusioner.patch b/Spigot-Server-Patches/0274-Fire-EntityShootBowEvent-for-Illusioner.patch
similarity index 95%
rename from Spigot-Server-Patches/0275-Fire-EntityShootBowEvent-for-Illusioner.patch
rename to Spigot-Server-Patches/0274-Fire-EntityShootBowEvent-for-Illusioner.patch
index 4811d320a9..81b62ab984 100644
--- a/Spigot-Server-Patches/0275-Fire-EntityShootBowEvent-for-Illusioner.patch
+++ b/Spigot-Server-Patches/0274-Fire-EntityShootBowEvent-for-Illusioner.patch
@@ -1,4 +1,4 @@
-From f32e563368a157390e9f434cf4d12bae9c1a4f78 Mon Sep 17 00:00:00 2001
+From 4a63c370d62804b3a2d2ec760b7ea68b4831a37c 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/Spigot-Server-Patches/0276-Implement-EntityKnockbackByEntityEvent.patch b/Spigot-Server-Patches/0275-Implement-EntityKnockbackByEntityEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0276-Implement-EntityKnockbackByEntityEvent.patch
rename to Spigot-Server-Patches/0275-Implement-EntityKnockbackByEntityEvent.patch
index 129814c48c..c397280f98 100644
--- a/Spigot-Server-Patches/0276-Implement-EntityKnockbackByEntityEvent.patch
+++ b/Spigot-Server-Patches/0275-Implement-EntityKnockbackByEntityEvent.patch
@@ -1,4 +1,4 @@
-From b6869d7ec0479144f05aaf16ffed7ce74ffbc2d4 Mon Sep 17 00:00:00 2001
+From b664061d5a2f0735d9077636c959ecbda15c7795 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
diff --git a/Spigot-Server-Patches/0277-Expand-Explosions-API.patch b/Spigot-Server-Patches/0276-Expand-Explosions-API.patch
similarity index 95%
rename from Spigot-Server-Patches/0277-Expand-Explosions-API.patch
rename to Spigot-Server-Patches/0276-Expand-Explosions-API.patch
index 221b688248..7a345daa42 100644
--- a/Spigot-Server-Patches/0277-Expand-Explosions-API.patch
+++ b/Spigot-Server-Patches/0276-Expand-Explosions-API.patch
@@ -1,4 +1,4 @@
-From 2604ca02a5b5d941671a6e3c1497e966fa04294c Mon Sep 17 00:00:00 2001
+From b667575c43a3cf9270ccfda0640964d7a70fc453 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
diff --git a/Spigot-Server-Patches/0278-LivingEntity-Hand-Raised-Item-Use-API.patch b/Spigot-Server-Patches/0277-LivingEntity-Hand-Raised-Item-Use-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0278-LivingEntity-Hand-Raised-Item-Use-API.patch
rename to Spigot-Server-Patches/0277-LivingEntity-Hand-Raised-Item-Use-API.patch
index d28f94c824..920bd55b69 100644
--- a/Spigot-Server-Patches/0278-LivingEntity-Hand-Raised-Item-Use-API.patch
+++ b/Spigot-Server-Patches/0277-LivingEntity-Hand-Raised-Item-Use-API.patch
@@ -1,4 +1,4 @@
-From b952f295cbf428f7d024c1b378bd11e4d2292f9b Mon Sep 17 00:00:00 2001
+From b38b8d9b970ba9669dff79d66e7e6ab750b7394b 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
diff --git a/Spigot-Server-Patches/0279-RangedEntity-API.patch b/Spigot-Server-Patches/0278-RangedEntity-API.patch
similarity index 99%
rename from Spigot-Server-Patches/0279-RangedEntity-API.patch
rename to Spigot-Server-Patches/0278-RangedEntity-API.patch
index 347ddb53a0..015cdc51f6 100644
--- a/Spigot-Server-Patches/0279-RangedEntity-API.patch
+++ b/Spigot-Server-Patches/0278-RangedEntity-API.patch
@@ -1,4 +1,4 @@
-From cd9a6e0e7c1860d07d33c2aa6f82a1e22b1f405f Mon Sep 17 00:00:00 2001
+From f1049c3a4947e559a7de47a86ec47bb0e253c452 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
diff --git a/Spigot-Server-Patches/0280-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch b/Spigot-Server-Patches/0279-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch
similarity index 95%
rename from Spigot-Server-Patches/0280-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch
rename to Spigot-Server-Patches/0279-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch
index 892ab31ac6..7bb53be9ff 100644
--- a/Spigot-Server-Patches/0280-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch
+++ b/Spigot-Server-Patches/0279-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch
@@ -1,4 +1,4 @@
-From 01c84b8c0d7b136d8e21c4e6d22f17be35ae32f2 Mon Sep 17 00:00:00 2001
+From 62a4cc869b3aab8adc3d982ba7ac0ab4307b1535 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Sat, 30 Jun 2018 05:45:39 +0200
 Subject: [PATCH] Improve ProjectileHitEvent to include the BlockFace where the
diff --git a/Spigot-Server-Patches/0281-Add-config-to-disable-ender-dragon-legacy-check.patch b/Spigot-Server-Patches/0280-Add-config-to-disable-ender-dragon-legacy-check.patch
similarity index 97%
rename from Spigot-Server-Patches/0281-Add-config-to-disable-ender-dragon-legacy-check.patch
rename to Spigot-Server-Patches/0280-Add-config-to-disable-ender-dragon-legacy-check.patch
index 14370f46bd..37e7953a78 100644
--- a/Spigot-Server-Patches/0281-Add-config-to-disable-ender-dragon-legacy-check.patch
+++ b/Spigot-Server-Patches/0280-Add-config-to-disable-ender-dragon-legacy-check.patch
@@ -1,4 +1,4 @@
-From 274b492a435a173f8fb6e7a94480a8326e3d421d Mon Sep 17 00:00:00 2001
+From 47714f32a19249b6a14932b999938ac838beb9a8 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/Spigot-Server-Patches/0282-Implement-World.getEntity-UUID-API.patch b/Spigot-Server-Patches/0281-Implement-World.getEntity-UUID-API.patch
similarity index 93%
rename from Spigot-Server-Patches/0282-Implement-World.getEntity-UUID-API.patch
rename to Spigot-Server-Patches/0281-Implement-World.getEntity-UUID-API.patch
index e7cb585fc7..cf8033dcdd 100644
--- a/Spigot-Server-Patches/0282-Implement-World.getEntity-UUID-API.patch
+++ b/Spigot-Server-Patches/0281-Implement-World.getEntity-UUID-API.patch
@@ -1,4 +1,4 @@
-From 6fb6eaa3ed3eec1ca82a483f94c033416632b0c4 Mon Sep 17 00:00:00 2001
+From bd43029a77d22976f860f0827bb778454c33adb5 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/Spigot-Server-Patches/0283-InventoryCloseEvent-Reason-API.patch b/Spigot-Server-Patches/0282-InventoryCloseEvent-Reason-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0283-InventoryCloseEvent-Reason-API.patch
rename to Spigot-Server-Patches/0282-InventoryCloseEvent-Reason-API.patch
index 8b41577859..3597b069d6 100644
--- a/Spigot-Server-Patches/0283-InventoryCloseEvent-Reason-API.patch
+++ b/Spigot-Server-Patches/0282-InventoryCloseEvent-Reason-API.patch
@@ -1,4 +1,4 @@
-From e554948a0ab9794a99d985f39e32de285e8be070 Mon Sep 17 00:00:00 2001
+From 14c6eaa9f284ece0ff44ae652ce97d38b8ce592c 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/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index b09aa135..1652d882 100644
+index b09aa1351c..1652d88298 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -931,7 +931,7 @@ public class Chunk implements IChunkAccess {
@@ -29,7 +29,7 @@ index b09aa135..1652d882 100644
                      }
                  }
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 5e13cb06..c7dc6fe0 100644
+index 5e13cb0640..c7dc6fe0ef 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -162,7 +162,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -56,7 +56,7 @@ index 5e13cb06..c7dc6fe0 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 3644fde3..68f5842c 100644
+index 3644fde3bb..68f5842cfe 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -346,7 +346,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -110,7 +110,7 @@ index 3644fde3..68f5842c 100644
          this.m();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index da32ed7a..9819bc05 100644
+index da32ed7a01..9819bc0576 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2031,7 +2031,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -123,7 +123,7 @@ index da32ed7a..9819bc05 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 6bdeb2cc..a9b468fa 100644
+index 6bdeb2cc90..a9b468facd 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -423,7 +423,7 @@ public abstract class PlayerList {
@@ -136,7 +136,7 @@ index 6bdeb2cc..a9b468fa 100644
          PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(cserver.getPlayer(entityplayer), "\u00A7e" + entityplayer.getName() + " left the game");
          cserver.getPluginManager().callEvent(playerQuitEvent);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 32fcba1d..3c23d40b 100644
+index 32fcba1d1a..3c23d40b1d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -417,8 +417,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@@ -155,7 +155,7 @@ index 32fcba1d..3c23d40b 100644
      public boolean isBlocking() {
          return getHandle().isBlocking();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 898371e5..912b2e62 100644
+index 898371e5f4..912b2e6284 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -740,7 +740,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -168,7 +168,7 @@ index 898371e5..912b2e62 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 66b1293b..f04fb045 100644
+index 66b1293bf9..f04fb045eb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -930,8 +930,19 @@ public class CraftEventFactory {
diff --git a/Spigot-Server-Patches/0284-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch b/Spigot-Server-Patches/0283-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
similarity index 97%
rename from Spigot-Server-Patches/0284-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
rename to Spigot-Server-Patches/0283-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
index 7f50f4e9ee..efb158604f 100644
--- a/Spigot-Server-Patches/0284-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
+++ b/Spigot-Server-Patches/0283-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
@@ -1,4 +1,4 @@
-From 583609632906eff38271b61b6a7d080fae31b478 Mon Sep 17 00:00:00 2001
+From fe1b8ed7df7010ef1aa4dbac5e2c88df3962df29 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
@@ -10,7 +10,7 @@ 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/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 9ba489f356..321837811e 100644
+index 1652d88298..982b3de65c 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -719,6 +719,7 @@ public class Chunk implements IChunkAccess {
diff --git a/Spigot-Server-Patches/0285-Configurable-Bed-Search-Radius.patch b/Spigot-Server-Patches/0284-Configurable-Bed-Search-Radius.patch
similarity index 98%
rename from Spigot-Server-Patches/0285-Configurable-Bed-Search-Radius.patch
rename to Spigot-Server-Patches/0284-Configurable-Bed-Search-Radius.patch
index 500d94599c..fcf8dd8b3b 100644
--- a/Spigot-Server-Patches/0285-Configurable-Bed-Search-Radius.patch
+++ b/Spigot-Server-Patches/0284-Configurable-Bed-Search-Radius.patch
@@ -1,4 +1,4 @@
-From 5f218bd95d6d89e8e06ca7c2e882336bff075021 Mon Sep 17 00:00:00 2001
+From 8eb4fdbb9a85ee002833fb2317b9ae125b5b1816 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
diff --git a/Spigot-Server-Patches/0286-Vex-getSummoner-API.patch b/Spigot-Server-Patches/0285-Vex-getSummoner-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0286-Vex-getSummoner-API.patch
rename to Spigot-Server-Patches/0285-Vex-getSummoner-API.patch
index 5c314d295c..8cc9b94109 100644
--- a/Spigot-Server-Patches/0286-Vex-getSummoner-API.patch
+++ b/Spigot-Server-Patches/0285-Vex-getSummoner-API.patch
@@ -1,4 +1,4 @@
-From 051fb03eeb07f62c0a96d6c6c1741576a0073e82 Mon Sep 17 00:00:00 2001
+From 69419d95db57ea53d9bd6aefa1c93bc9c302302d 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
diff --git a/Spigot-Server-Patches/0287-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/Spigot-Server-Patches/0286-Refresh-player-inventory-when-cancelling-PlayerInter.patch
similarity index 95%
rename from Spigot-Server-Patches/0287-Refresh-player-inventory-when-cancelling-PlayerInter.patch
rename to Spigot-Server-Patches/0286-Refresh-player-inventory-when-cancelling-PlayerInter.patch
index c98864bd7a..6180a7c6b1 100644
--- a/Spigot-Server-Patches/0287-Refresh-player-inventory-when-cancelling-PlayerInter.patch
+++ b/Spigot-Server-Patches/0286-Refresh-player-inventory-when-cancelling-PlayerInter.patch
@@ -1,4 +1,4 @@
-From 7e83534fa07819817ce6033a0c4ec18cc1702f02 Mon Sep 17 00:00:00 2001
+From 0b0c51426d946c84f67f99076f3e60271d86bbf2 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
diff --git a/Spigot-Server-Patches/0288-Don-t-change-the-Entity-Random-seed-for-squids.patch b/Spigot-Server-Patches/0287-Don-t-change-the-Entity-Random-seed-for-squids.patch
similarity index 92%
rename from Spigot-Server-Patches/0288-Don-t-change-the-Entity-Random-seed-for-squids.patch
rename to Spigot-Server-Patches/0287-Don-t-change-the-Entity-Random-seed-for-squids.patch
index 39f8be1b2a..ae68ef2444 100644
--- a/Spigot-Server-Patches/0288-Don-t-change-the-Entity-Random-seed-for-squids.patch
+++ b/Spigot-Server-Patches/0287-Don-t-change-the-Entity-Random-seed-for-squids.patch
@@ -1,4 +1,4 @@
-From d16c6f5c1f93734f221c943a494052986672bd60 Mon Sep 17 00:00:00 2001
+From 8ecfbad7b86050b24ad575382b3fd29c199bc5a8 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/Spigot-Server-Patches/0289-Re-add-vanilla-entity-warnings-for-duplicates.patch b/Spigot-Server-Patches/0288-Re-add-vanilla-entity-warnings-for-duplicates.patch
similarity index 95%
rename from Spigot-Server-Patches/0289-Re-add-vanilla-entity-warnings-for-duplicates.patch
rename to Spigot-Server-Patches/0288-Re-add-vanilla-entity-warnings-for-duplicates.patch
index 9944226a46..ef2c578dfd 100644
--- a/Spigot-Server-Patches/0289-Re-add-vanilla-entity-warnings-for-duplicates.patch
+++ b/Spigot-Server-Patches/0288-Re-add-vanilla-entity-warnings-for-duplicates.patch
@@ -1,4 +1,4 @@
-From f8ad60365b915601f53595fa8e6f4a860179cf4c Mon Sep 17 00:00:00 2001
+From fb17a0382199e08478fafa054ffaba06dcfce1fa 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
diff --git a/Spigot-Server-Patches/0290-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch b/Spigot-Server-Patches/0289-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch
similarity index 95%
rename from Spigot-Server-Patches/0290-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch
rename to Spigot-Server-Patches/0289-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch
index 160b303c5b..313de39694 100644
--- a/Spigot-Server-Patches/0290-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch
+++ b/Spigot-Server-Patches/0289-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch
@@ -1,4 +1,4 @@
-From 39348ad7fde2ce97d3e9f9d59325f5bee42595dd Mon Sep 17 00:00:00 2001
+From 7ebee1455ff20e7424264ecce40e8dd4c8de973c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 19 Jul 2018 01:23:00 -0400
 Subject: [PATCH] Don't process despawn if entity is in a chunk scheduled for
diff --git a/Spigot-Server-Patches/0291-Avoid-item-merge-if-stack-size-above-max-stack-size.patch b/Spigot-Server-Patches/0290-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
similarity index 93%
rename from Spigot-Server-Patches/0291-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
rename to Spigot-Server-Patches/0290-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
index 0e12e1edeb..a5f6a3526b 100644
--- a/Spigot-Server-Patches/0291-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
+++ b/Spigot-Server-Patches/0290-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
@@ -1,4 +1,4 @@
-From 2ec58768016b4ff5934e282d8077d23c7b47c4d4 Mon Sep 17 00:00:00 2001
+From 74c3f8a4b47eda9664038146cd285a1142732039 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/Spigot-Server-Patches/0292-Use-asynchronous-Log4j-2-loggers.patch b/Spigot-Server-Patches/0291-Use-asynchronous-Log4j-2-loggers.patch
similarity index 94%
rename from Spigot-Server-Patches/0292-Use-asynchronous-Log4j-2-loggers.patch
rename to Spigot-Server-Patches/0291-Use-asynchronous-Log4j-2-loggers.patch
index 79e68baa14..838ac40ba3 100644
--- a/Spigot-Server-Patches/0292-Use-asynchronous-Log4j-2-loggers.patch
+++ b/Spigot-Server-Patches/0291-Use-asynchronous-Log4j-2-loggers.patch
@@ -1,4 +1,4 @@
-From 8b890db5ab561306a00fdf5e89c609de4d69e800 Mon Sep 17 00:00:00 2001
+From 2e7ba223102646f119fdfdbee12670b397a3b8d2 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/Spigot-Server-Patches/0293-add-more-information-to-Entity.toString.patch b/Spigot-Server-Patches/0292-add-more-information-to-Entity.toString.patch
similarity index 95%
rename from Spigot-Server-Patches/0293-add-more-information-to-Entity.toString.patch
rename to Spigot-Server-Patches/0292-add-more-information-to-Entity.toString.patch
index 95bc49ae42..792d6ba99a 100644
--- a/Spigot-Server-Patches/0293-add-more-information-to-Entity.toString.patch
+++ b/Spigot-Server-Patches/0292-add-more-information-to-Entity.toString.patch
@@ -1,4 +1,4 @@
-From c91cbe2d3522234d29247eac89269d847119e95c Mon Sep 17 00:00:00 2001
+From 9033f11036980fc2b1ba2f237e8b6e82cb939b3f 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()
diff --git a/Spigot-Server-Patches/0294-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/Spigot-Server-Patches/0293-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
similarity index 98%
rename from Spigot-Server-Patches/0294-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
rename to Spigot-Server-Patches/0293-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
index f55e787bcb..5b997cbb83 100644
--- a/Spigot-Server-Patches/0294-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
+++ b/Spigot-Server-Patches/0293-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
@@ -1,4 +1,4 @@
-From afa37770f08dd663e681ec36f7a6742fe5a9073d Mon Sep 17 00:00:00 2001
+From 06f6a8d9e4e27632a3122849abe57ff0e5966e7c 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
diff --git a/Spigot-Server-Patches/0295-EnderDragon-Events.patch b/Spigot-Server-Patches/0294-EnderDragon-Events.patch
similarity index 98%
rename from Spigot-Server-Patches/0295-EnderDragon-Events.patch
rename to Spigot-Server-Patches/0294-EnderDragon-Events.patch
index daac80d1f6..c267379778 100644
--- a/Spigot-Server-Patches/0295-EnderDragon-Events.patch
+++ b/Spigot-Server-Patches/0294-EnderDragon-Events.patch
@@ -1,4 +1,4 @@
-From 34a08b36a0774cba74c90fe025e48106b243cf81 Mon Sep 17 00:00:00 2001
+From cf7eb31d8748ed0bcf048d8146af360669173b0c 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/Spigot-Server-Patches/0296-PlayerElytraBoostEvent.patch b/Spigot-Server-Patches/0295-PlayerElytraBoostEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0296-PlayerElytraBoostEvent.patch
rename to Spigot-Server-Patches/0295-PlayerElytraBoostEvent.patch
index a73590586d..b69ccfbb99 100644
--- a/Spigot-Server-Patches/0296-PlayerElytraBoostEvent.patch
+++ b/Spigot-Server-Patches/0295-PlayerElytraBoostEvent.patch
@@ -1,4 +1,4 @@
-From d87458828b5340bd8fc06aac91450efe96983543 Mon Sep 17 00:00:00 2001
+From 9e35ddf0782e89383c33333b36d2640d7cf216ce 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/Spigot-Server-Patches/0297-PlayerLaunchProjectileEvent.patch b/Spigot-Server-Patches/0296-PlayerLaunchProjectileEvent.patch
similarity index 99%
rename from Spigot-Server-Patches/0297-PlayerLaunchProjectileEvent.patch
rename to Spigot-Server-Patches/0296-PlayerLaunchProjectileEvent.patch
index 6abdef5c4a..8e53c29e2f 100644
--- a/Spigot-Server-Patches/0297-PlayerLaunchProjectileEvent.patch
+++ b/Spigot-Server-Patches/0296-PlayerLaunchProjectileEvent.patch
@@ -1,4 +1,4 @@
-From 5641056a15138f51b65f1f7ebf4179ec2553a4c9 Mon Sep 17 00:00:00 2001
+From 1e69a35c0ca2212f2b3576237f2e20481064ecc9 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/0298-Duplicate-UUID-Resolve-Option.patch b/Spigot-Server-Patches/0297-Duplicate-UUID-Resolve-Option.patch
similarity index 99%
rename from Spigot-Server-Patches/0298-Duplicate-UUID-Resolve-Option.patch
rename to Spigot-Server-Patches/0297-Duplicate-UUID-Resolve-Option.patch
index 08002fe97c..2c6df17ebb 100644
--- a/Spigot-Server-Patches/0298-Duplicate-UUID-Resolve-Option.patch
+++ b/Spigot-Server-Patches/0297-Duplicate-UUID-Resolve-Option.patch
@@ -1,4 +1,4 @@
-From fd4f9ec55426776628f3b5b415f2310988d46435 Mon Sep 17 00:00:00 2001
+From 215399669662d874fbd131be64dca7bea95d0c5f 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
@@ -85,7 +85,7 @@ index deb0d4f053..249af8b4c6 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 321837811e..cd87f0c241 100644
+index 982b3de65c..42a437383a 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -1,5 +1,10 @@
diff --git a/Spigot-Server-Patches/0299-Speedup-BlockPos-by-fixing-inlining.patch b/Spigot-Server-Patches/0298-Speedup-BlockPos-by-fixing-inlining.patch
similarity index 93%
rename from Spigot-Server-Patches/0299-Speedup-BlockPos-by-fixing-inlining.patch
rename to Spigot-Server-Patches/0298-Speedup-BlockPos-by-fixing-inlining.patch
index 8b7da237ce..68f13cdfb8 100644
--- a/Spigot-Server-Patches/0299-Speedup-BlockPos-by-fixing-inlining.patch
+++ b/Spigot-Server-Patches/0298-Speedup-BlockPos-by-fixing-inlining.patch
@@ -1,4 +1,4 @@
-From 065e7c9f13c0749ea89c4928db3512550d365b01 Mon Sep 17 00:00:00 2001
+From 0f133791272ef61f2012e980808baf094cc01bb4 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
@@ -80,10 +80,10 @@ index 680764b342..25334377a2 100644
      public BaseBlockPosition d(BaseBlockPosition baseblockposition1) {
          return new BaseBlockPosition(this.getY() * baseblockposition1.getZ() - this.getZ() * baseblockposition1.getY(), this.getZ() * baseblockposition1.getX() - this.getX() * baseblockposition1.getZ(), this.getX() * baseblockposition1.getY() - this.getY() * baseblockposition1.getX());
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index 1dfd71df0a..986b1e13a5 100644
+index 7bd51b3578..9ce3cd9c9d 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
-@@ -204,18 +204,20 @@ public class BlockPosition extends BaseBlockPosition {
+@@ -205,18 +205,20 @@ public class BlockPosition extends BaseBlockPosition {
                      if (this.g == null) {
                          this.g = new BlockPosition.MutableBlockPosition(ix, jx, kx);
                          return this.g;
@@ -114,7 +114,7 @@ index 1dfd71df0a..986b1e13a5 100644
                          }
  
                          return this.g;
-@@ -236,10 +238,12 @@ public class BlockPosition extends BaseBlockPosition {
+@@ -237,10 +239,12 @@ public class BlockPosition extends BaseBlockPosition {
      }
  
      public static class MutableBlockPosition extends BlockPosition {
@@ -128,7 +128,7 @@ index 1dfd71df0a..986b1e13a5 100644
          @Override
          public boolean isValidLocation() {
              return b >= -30000000 && d >= -30000000 && b < 30000000 && d < 30000000 && c >= 0 && c < 256;
-@@ -248,6 +252,7 @@ public class BlockPosition extends BaseBlockPosition {
+@@ -249,6 +253,7 @@ public class BlockPosition extends BaseBlockPosition {
          public boolean isInvalidYLocation() {
              return c < 0 || c >= 256;
          }
@@ -136,7 +136,7 @@ index 1dfd71df0a..986b1e13a5 100644
          // Paper end
  
          public MutableBlockPosition() {
-@@ -259,10 +264,13 @@ public class BlockPosition extends BaseBlockPosition {
+@@ -260,10 +265,13 @@ public class BlockPosition extends BaseBlockPosition {
          }
  
          public MutableBlockPosition(int i, int j, int k) {
@@ -152,7 +152,7 @@ index 1dfd71df0a..986b1e13a5 100644
          }
  
          public BlockPosition a(double d0, double d1, double d2) {
-@@ -281,6 +289,8 @@ public class BlockPosition extends BaseBlockPosition {
+@@ -282,6 +290,8 @@ public class BlockPosition extends BaseBlockPosition {
              return super.a(enumblockrotation).h();
          }
  
@@ -161,7 +161,7 @@ index 1dfd71df0a..986b1e13a5 100644
          public int getX() {
              return this.b;
          }
-@@ -291,13 +301,16 @@ public class BlockPosition extends BaseBlockPosition {
+@@ -292,13 +302,16 @@ public class BlockPosition extends BaseBlockPosition {
  
          public int getZ() {
              return this.d;
@@ -182,7 +182,7 @@ index 1dfd71df0a..986b1e13a5 100644
              return this;
          }
  
-@@ -315,15 +328,15 @@ public class BlockPosition extends BaseBlockPosition {
+@@ -316,15 +329,15 @@ public class BlockPosition extends BaseBlockPosition {
          }
  
          public BlockPosition.MutableBlockPosition c(EnumDirection enumdirection, int i) {
diff --git a/Spigot-Server-Patches/0300-Don-t-save-Proto-Chunks.patch b/Spigot-Server-Patches/0299-Don-t-save-Proto-Chunks.patch
similarity index 97%
rename from Spigot-Server-Patches/0300-Don-t-save-Proto-Chunks.patch
rename to Spigot-Server-Patches/0299-Don-t-save-Proto-Chunks.patch
index 86273f03a8..f4c9468948 100644
--- a/Spigot-Server-Patches/0300-Don-t-save-Proto-Chunks.patch
+++ b/Spigot-Server-Patches/0299-Don-t-save-Proto-Chunks.patch
@@ -1,4 +1,4 @@
-From ef04639136c63dc275c50894c2ba0de88c3f0bc6 Mon Sep 17 00:00:00 2001
+From 1e8c6bcd03fc5466a28c8f17e76e871d09558bc1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 22 Jul 2018 21:21:41 -0400
 Subject: [PATCH] Don't save Proto Chunks
diff --git a/Spigot-Server-Patches/0301-Optimize-RegistryID.c.patch b/Spigot-Server-Patches/0300-Optimize-RegistryID.c.patch
similarity index 96%
rename from Spigot-Server-Patches/0301-Optimize-RegistryID.c.patch
rename to Spigot-Server-Patches/0300-Optimize-RegistryID.c.patch
index 463236d5e6..c465567a70 100644
--- a/Spigot-Server-Patches/0301-Optimize-RegistryID.c.patch
+++ b/Spigot-Server-Patches/0300-Optimize-RegistryID.c.patch
@@ -1,4 +1,4 @@
-From 7fbc8773c73f1e54b047a43056b23503f1109d3f Mon Sep 17 00:00:00 2001
+From 765c811360685b754d86b1617a860f682f03b9d0 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()
diff --git a/Spigot-Server-Patches/0302-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/Spigot-Server-Patches/0301-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
similarity index 94%
rename from Spigot-Server-Patches/0302-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
rename to Spigot-Server-Patches/0301-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
index 6fcdd121f2..c420117b6c 100644
--- a/Spigot-Server-Patches/0302-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
+++ b/Spigot-Server-Patches/0301-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
@@ -1,11 +1,11 @@
-From ec1efbb791942e526c80d2b70ffbd2d899b22cff Mon Sep 17 00:00:00 2001
+From 13c3f44b26ba139b2efbe86eec73387824392748 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 1bfa9ad567..4a89d8bedb 100644
+index 249af8b4c6..4fbafb5bf2 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -361,6 +361,11 @@ public class PaperWorldConfig {
diff --git a/Spigot-Server-Patches/0303-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0302-Vanished-players-don-t-have-rights.patch
similarity index 99%
rename from Spigot-Server-Patches/0303-Vanished-players-don-t-have-rights.patch
rename to Spigot-Server-Patches/0302-Vanished-players-don-t-have-rights.patch
index 72dfb2f93a..78ec5323ed 100644
--- a/Spigot-Server-Patches/0303-Vanished-players-don-t-have-rights.patch
+++ b/Spigot-Server-Patches/0302-Vanished-players-don-t-have-rights.patch
@@ -1,4 +1,4 @@
-From b404da6cf659ee9f19cfc47d6325b06e6ee11a1c Mon Sep 17 00:00:00 2001
+From ead1757140df48b12c98fc7cae969d7248308e56 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/Spigot-Server-Patches/0304-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch b/Spigot-Server-Patches/0303-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
similarity index 90%
rename from Spigot-Server-Patches/0304-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
rename to Spigot-Server-Patches/0303-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
index 3d2f72b333..4a51f3ab08 100644
--- a/Spigot-Server-Patches/0304-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
+++ b/Spigot-Server-Patches/0303-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
@@ -1,4 +1,4 @@
-From aa6cffc960979224fa6e2f8170637de1303e537f Mon Sep 17 00:00:00 2001
+From 02f91d834c017cf38a77eeade14c5f1a064be4e6 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 cd87f0c241..17f1e71d48 100644
+index 42a437383a..c7f67bce6c 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -712,6 +712,7 @@ public class Chunk implements IChunkAccess {
diff --git a/Spigot-Server-Patches/0305-Add-some-Debug-to-Chunk-Entity-slices.patch b/Spigot-Server-Patches/0304-Add-some-Debug-to-Chunk-Entity-slices.patch
similarity index 97%
rename from Spigot-Server-Patches/0305-Add-some-Debug-to-Chunk-Entity-slices.patch
rename to Spigot-Server-Patches/0304-Add-some-Debug-to-Chunk-Entity-slices.patch
index 43e0fa6c86..f46741c8f8 100644
--- a/Spigot-Server-Patches/0305-Add-some-Debug-to-Chunk-Entity-slices.patch
+++ b/Spigot-Server-Patches/0304-Add-some-Debug-to-Chunk-Entity-slices.patch
@@ -1,4 +1,4 @@
-From f73262650a77e5b3300a76bc932eb6c96b0b60b8 Mon Sep 17 00:00:00 2001
+From be6b2c15dde0d4d8b87768e2d56809bacc5cf54a 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 17f1e71d48..a75b058e2a 100644
+index c7f67bce6c..a7cbd9b201 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -710,8 +710,34 @@ public class Chunk implements IChunkAccess {
diff --git a/Spigot-Server-Patches/0306-Optimize-Region-File-Cache.patch b/Spigot-Server-Patches/0305-Optimize-Region-File-Cache.patch
similarity index 97%
rename from Spigot-Server-Patches/0306-Optimize-Region-File-Cache.patch
rename to Spigot-Server-Patches/0305-Optimize-Region-File-Cache.patch
index 9b82c409d7..4ba5446eb5 100644
--- a/Spigot-Server-Patches/0306-Optimize-Region-File-Cache.patch
+++ b/Spigot-Server-Patches/0305-Optimize-Region-File-Cache.patch
@@ -1,4 +1,4 @@
-From f8945eb1a5cce6fc1a4b55a34efb14fc03b3c387 Mon Sep 17 00:00:00 2001
+From dddfa3385a6f08eb4bba4dcaf6ef11570db9c0f5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 23 Jul 2018 23:40:04 -0400
 Subject: [PATCH] Optimize Region File Cache
diff --git a/Spigot-Server-Patches/0307-EntityTransformedEvent.patch b/Spigot-Server-Patches/0306-EntityTransformedEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0307-EntityTransformedEvent.patch
rename to Spigot-Server-Patches/0306-EntityTransformedEvent.patch
index 0b43452862..21ff4bc95b 100644
--- a/Spigot-Server-Patches/0307-EntityTransformedEvent.patch
+++ b/Spigot-Server-Patches/0306-EntityTransformedEvent.patch
@@ -1,4 +1,4 @@
-From a697b22e43b3c614f251d1d45cd9f8867297c7c1 Mon Sep 17 00:00:00 2001
+From db6933607895a3d095e9699ebfa6ca114c43d273 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/Spigot-Server-Patches/0308-SkeletonHorse-Additions.patch b/Spigot-Server-Patches/0307-SkeletonHorse-Additions.patch
similarity index 97%
rename from Spigot-Server-Patches/0308-SkeletonHorse-Additions.patch
rename to Spigot-Server-Patches/0307-SkeletonHorse-Additions.patch
index e188b0424a..73df0d2f24 100644
--- a/Spigot-Server-Patches/0308-SkeletonHorse-Additions.patch
+++ b/Spigot-Server-Patches/0307-SkeletonHorse-Additions.patch
@@ -1,4 +1,4 @@
-From bc5d3f088236be6bf87c277517df739b8527f9f3 Mon Sep 17 00:00:00 2001
+From 00de64f0020739cb73b826de2cf58b842c0d410d 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/Spigot-Server-Patches/0309-Prevent-Saving-Bad-entities-to-chunks.patch b/Spigot-Server-Patches/0308-Prevent-Saving-Bad-entities-to-chunks.patch
similarity index 97%
rename from Spigot-Server-Patches/0309-Prevent-Saving-Bad-entities-to-chunks.patch
rename to Spigot-Server-Patches/0308-Prevent-Saving-Bad-entities-to-chunks.patch
index a1688a51fc..19403722f2 100644
--- a/Spigot-Server-Patches/0309-Prevent-Saving-Bad-entities-to-chunks.patch
+++ b/Spigot-Server-Patches/0308-Prevent-Saving-Bad-entities-to-chunks.patch
@@ -1,4 +1,4 @@
-From 799f61153c06ca66649e7d0fde50328f472d932f Mon Sep 17 00:00:00 2001
+From ec29810bd4cedf7fa9c2690520c27bff8a989749 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
diff --git a/Spigot-Server-Patches/0310-Don-t-call-getItemMeta-on-hasItemMeta.patch b/Spigot-Server-Patches/0309-Don-t-call-getItemMeta-on-hasItemMeta.patch
similarity index 98%
rename from Spigot-Server-Patches/0310-Don-t-call-getItemMeta-on-hasItemMeta.patch
rename to Spigot-Server-Patches/0309-Don-t-call-getItemMeta-on-hasItemMeta.patch
index f726b1bd16..56b162b5f0 100644
--- a/Spigot-Server-Patches/0310-Don-t-call-getItemMeta-on-hasItemMeta.patch
+++ b/Spigot-Server-Patches/0309-Don-t-call-getItemMeta-on-hasItemMeta.patch
@@ -1,4 +1,4 @@
-From c5fea884215816933aca601888fd54404640700a Mon Sep 17 00:00:00 2001
+From 13973782d74358e896bdd0aaa5c94fe5db3a9b76 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
diff --git a/Spigot-Server-Patches/0311-Always-process-chunk-removal-in-removeEntity.patch b/Spigot-Server-Patches/0310-Always-process-chunk-removal-in-removeEntity.patch
similarity index 95%
rename from Spigot-Server-Patches/0311-Always-process-chunk-removal-in-removeEntity.patch
rename to Spigot-Server-Patches/0310-Always-process-chunk-removal-in-removeEntity.patch
index af4f2bf37f..433599a303 100644
--- a/Spigot-Server-Patches/0311-Always-process-chunk-removal-in-removeEntity.patch
+++ b/Spigot-Server-Patches/0310-Always-process-chunk-removal-in-removeEntity.patch
@@ -1,4 +1,4 @@
-From d1494196b284ecc7640f065c43f9131567ca6b22 Mon Sep 17 00:00:00 2001
+From 420eba627bc5757d41f2994bf65859b5dca849c5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 28 Jul 2018 12:09:20 -0400
 Subject: [PATCH] Always process chunk removal in removeEntity
diff --git a/Spigot-Server-Patches/0312-Ignore-Dead-Entities-in-entityList-iteration.patch b/Spigot-Server-Patches/0311-Ignore-Dead-Entities-in-entityList-iteration.patch
similarity index 98%
rename from Spigot-Server-Patches/0312-Ignore-Dead-Entities-in-entityList-iteration.patch
rename to Spigot-Server-Patches/0311-Ignore-Dead-Entities-in-entityList-iteration.patch
index 2e03984b3f..2b46f4c5e1 100644
--- a/Spigot-Server-Patches/0312-Ignore-Dead-Entities-in-entityList-iteration.patch
+++ b/Spigot-Server-Patches/0311-Ignore-Dead-Entities-in-entityList-iteration.patch
@@ -1,4 +1,4 @@
-From 1f5c157d77d0a9dcf226d7842456de466ff579da Mon Sep 17 00:00:00 2001
+From 924ae422b2731d52ed7074b64f7fdff6b61791f5 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
diff --git a/Spigot-Server-Patches/0313-Provide-option-to-use-a-versioned-world-folder-for-t.patch b/Spigot-Server-Patches/0312-Provide-option-to-use-a-versioned-world-folder-for-t.patch
similarity index 99%
rename from Spigot-Server-Patches/0313-Provide-option-to-use-a-versioned-world-folder-for-t.patch
rename to Spigot-Server-Patches/0312-Provide-option-to-use-a-versioned-world-folder-for-t.patch
index 094f6c35dd..a82c7bdafa 100644
--- a/Spigot-Server-Patches/0313-Provide-option-to-use-a-versioned-world-folder-for-t.patch
+++ b/Spigot-Server-Patches/0312-Provide-option-to-use-a-versioned-world-folder-for-t.patch
@@ -1,4 +1,4 @@
-From 1c88f287d37594e783c43e4e12ee3e6aadc3ba35 Mon Sep 17 00:00:00 2001
+From 4d82481bb8ea73a625a3d0a772d162e3b7c483d5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 29 Jul 2018 15:48:50 -0400
 Subject: [PATCH] Provide option to use a versioned world folder for testing
@@ -19,7 +19,7 @@ may be some delay there, but region files are only copied on demand.
 This is highly experiemental so backup your world before relying on this to not modify it
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index ad031dedaa..b32e75ae9a 100644
+index 80bbdec480..4782ae8adc 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -13,6 +13,7 @@ import java.util.List;
diff --git a/Spigot-Server-Patches/0314-MC-111480-Start-Entity-ID-s-at-1.patch b/Spigot-Server-Patches/0313-MC-111480-Start-Entity-ID-s-at-1.patch
similarity index 94%
rename from Spigot-Server-Patches/0314-MC-111480-Start-Entity-ID-s-at-1.patch
rename to Spigot-Server-Patches/0313-MC-111480-Start-Entity-ID-s-at-1.patch
index 7518b809af..5dc7979639 100644
--- a/Spigot-Server-Patches/0314-MC-111480-Start-Entity-ID-s-at-1.patch
+++ b/Spigot-Server-Patches/0313-MC-111480-Start-Entity-ID-s-at-1.patch
@@ -1,4 +1,4 @@
-From 30b20b6870c1ea6571d916c38beeb3ba590327c9 Mon Sep 17 00:00:00 2001
+From 9fba22ed9ce928dca7c5596181e6aa883e7473d8 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
diff --git a/Spigot-Server-Patches/0315-Implement-Expanded-ArmorStand-API.patch b/Spigot-Server-Patches/0314-Implement-Expanded-ArmorStand-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0315-Implement-Expanded-ArmorStand-API.patch
rename to Spigot-Server-Patches/0314-Implement-Expanded-ArmorStand-API.patch
index dc146f8e1b..ea66e7bd0a 100644
--- a/Spigot-Server-Patches/0315-Implement-Expanded-ArmorStand-API.patch
+++ b/Spigot-Server-Patches/0314-Implement-Expanded-ArmorStand-API.patch
@@ -1,4 +1,4 @@
-From 3e600e2f11b41c27cd1676280b112d2700bc3a06 Mon Sep 17 00:00:00 2001
+From 2c737ca36dc1dfff4e6ef70b46329b43d6a09814 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
diff --git a/Spigot-Server-Patches/0316-AnvilDamageEvent.patch b/Spigot-Server-Patches/0315-AnvilDamageEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0316-AnvilDamageEvent.patch
rename to Spigot-Server-Patches/0315-AnvilDamageEvent.patch
index bcdd5ef345..9e5d933fd3 100644
--- a/Spigot-Server-Patches/0316-AnvilDamageEvent.patch
+++ b/Spigot-Server-Patches/0315-AnvilDamageEvent.patch
@@ -1,4 +1,4 @@
-From c00fed6fb8704f5e05ac2d5c9c09caafaea4cbfd Mon Sep 17 00:00:00 2001
+From 95eab5a0a9da4e8d8fea7184768ab9333978d015 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/Spigot-Server-Patches/0317-World-EntityHuman-Lookup-Optimizations.patch b/Spigot-Server-Patches/0316-World-EntityHuman-Lookup-Optimizations.patch
similarity index 98%
rename from Spigot-Server-Patches/0317-World-EntityHuman-Lookup-Optimizations.patch
rename to Spigot-Server-Patches/0316-World-EntityHuman-Lookup-Optimizations.patch
index b6e973f0ff..69e5ad290a 100644
--- a/Spigot-Server-Patches/0317-World-EntityHuman-Lookup-Optimizations.patch
+++ b/Spigot-Server-Patches/0316-World-EntityHuman-Lookup-Optimizations.patch
@@ -1,4 +1,4 @@
-From b5fce661d635a0dc22d0b0502b7a7ad9ffe7dfe0 Mon Sep 17 00:00:00 2001
+From 04b8f18d18f9287206e3e257d8d7d6d84d885ed7 Mon Sep 17 00:00:00 2001
 From: willies952002 <admin@domnian.com>
 Date: Mon, 30 Jul 2018 02:42:49 -0400
 Subject: [PATCH] World EntityHuman Lookup Optimizations
diff --git a/Spigot-Server-Patches/0318-Add-TNTPrimeEvent.patch b/Spigot-Server-Patches/0317-Add-TNTPrimeEvent.patch
similarity index 99%
rename from Spigot-Server-Patches/0318-Add-TNTPrimeEvent.patch
rename to Spigot-Server-Patches/0317-Add-TNTPrimeEvent.patch
index 6c0394adab..4385660848 100644
--- a/Spigot-Server-Patches/0318-Add-TNTPrimeEvent.patch
+++ b/Spigot-Server-Patches/0317-Add-TNTPrimeEvent.patch
@@ -1,4 +1,4 @@
-From b4841ff955cc1223c70fecf891a4951f7518acbc Mon Sep 17 00:00:00 2001
+From b9694859d9ab9153646c1652af936a96459a786b 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/Spigot-Server-Patches/0319-Break-up-and-make-tab-spam-limits-configurable.patch b/Spigot-Server-Patches/0318-Break-up-and-make-tab-spam-limits-configurable.patch
similarity index 97%
rename from Spigot-Server-Patches/0319-Break-up-and-make-tab-spam-limits-configurable.patch
rename to Spigot-Server-Patches/0318-Break-up-and-make-tab-spam-limits-configurable.patch
index a77c0fcbd8..8bff7be091 100644
--- a/Spigot-Server-Patches/0319-Break-up-and-make-tab-spam-limits-configurable.patch
+++ b/Spigot-Server-Patches/0318-Break-up-and-make-tab-spam-limits-configurable.patch
@@ -1,4 +1,4 @@
-From 31935e155c4aeb345d2a16f88ad1b1e0c5b3123e Mon Sep 17 00:00:00 2001
+From 9538d5c2c04994e66b6e1174c189013df9c867d8 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 b32e75ae9a..3419847e34 100644
+index 4782ae8adc..a2894da71b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -327,4 +327,18 @@ public class PaperConfig {
diff --git a/Spigot-Server-Patches/0320-Make-portal-teleportation-adjustment-math-more-accur.patch b/Spigot-Server-Patches/0319-Make-portal-teleportation-adjustment-math-more-accur.patch
similarity index 98%
rename from Spigot-Server-Patches/0320-Make-portal-teleportation-adjustment-math-more-accur.patch
rename to Spigot-Server-Patches/0319-Make-portal-teleportation-adjustment-math-more-accur.patch
index 543ce45483..30a733419b 100644
--- a/Spigot-Server-Patches/0320-Make-portal-teleportation-adjustment-math-more-accur.patch
+++ b/Spigot-Server-Patches/0319-Make-portal-teleportation-adjustment-math-more-accur.patch
@@ -1,4 +1,4 @@
-From 921f30bc3afaba7d60be1a9f6190c260b88ab761 Mon Sep 17 00:00:00 2001
+From 0a584c7a4ae66c14d3bf496d5e7939f58dcb5a00 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 31 Jul 2018 19:32:57 -0500
 Subject: [PATCH] Make portal teleportation adjustment math more accurate
diff --git a/Spigot-Server-Patches/0321-Add-hand-to-bucket-events.patch b/Spigot-Server-Patches/0320-Add-hand-to-bucket-events.patch
similarity index 99%
rename from Spigot-Server-Patches/0321-Add-hand-to-bucket-events.patch
rename to Spigot-Server-Patches/0320-Add-hand-to-bucket-events.patch
index fc5f668a8d..66cee6ea7a 100644
--- a/Spigot-Server-Patches/0321-Add-hand-to-bucket-events.patch
+++ b/Spigot-Server-Patches/0320-Add-hand-to-bucket-events.patch
@@ -1,4 +1,4 @@
-From d1fc4500d42f41872e2d196af60e552f7f253dc2 Mon Sep 17 00:00:00 2001
+From 18fd911b8f6852d2b29a4e7ddd50bc8fecc704a9 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/Spigot-Server-Patches/0322-MC-135506-Experience-should-save-as-Integers.patch b/Spigot-Server-Patches/0321-MC-135506-Experience-should-save-as-Integers.patch
similarity index 95%
rename from Spigot-Server-Patches/0322-MC-135506-Experience-should-save-as-Integers.patch
rename to Spigot-Server-Patches/0321-MC-135506-Experience-should-save-as-Integers.patch
index 84d22bcf61..e43a300040 100644
--- a/Spigot-Server-Patches/0322-MC-135506-Experience-should-save-as-Integers.patch
+++ b/Spigot-Server-Patches/0321-MC-135506-Experience-should-save-as-Integers.patch
@@ -1,4 +1,4 @@
-From 3cc25f923009c34eef3d7e6715b9afcd33261807 Mon Sep 17 00:00:00 2001
+From 6b2c1c2661fac08070630fcab4bb7bd75cbc4814 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/Spigot-Server-Patches/0323-Entity-add-to-world-fixes.patch b/Spigot-Server-Patches/0322-Entity-add-to-world-fixes.patch
similarity index 97%
rename from Spigot-Server-Patches/0323-Entity-add-to-world-fixes.patch
rename to Spigot-Server-Patches/0322-Entity-add-to-world-fixes.patch
index 8906f2f462..a4d31ac1f2 100644
--- a/Spigot-Server-Patches/0323-Entity-add-to-world-fixes.patch
+++ b/Spigot-Server-Patches/0322-Entity-add-to-world-fixes.patch
@@ -1,4 +1,4 @@
-From 6715291630433fec052c1ac1da51b25b1d0dd46d Mon Sep 17 00:00:00 2001
+From 9f68c9f8f80023f04a27ea0da3e57e46cfbe549e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 3 Aug 2018 22:47:46 -0400
 Subject: [PATCH] Entity add to world fixes
@@ -14,7 +14,7 @@ Fix this by differing entity add to world for all entities at the same time
 the original entity is dead, overwrite it as the logic does for unloaod queued entities.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index a75b058e2a..56116ae170 100644
+index a7cbd9b201..ae7e00d81e 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -911,6 +911,7 @@ public class Chunk implements IChunkAccess {
diff --git a/Spigot-Server-Patches/0324-Fix-client-rendering-skulls-from-same-user.patch b/Spigot-Server-Patches/0323-Fix-client-rendering-skulls-from-same-user.patch
similarity index 98%
rename from Spigot-Server-Patches/0324-Fix-client-rendering-skulls-from-same-user.patch
rename to Spigot-Server-Patches/0323-Fix-client-rendering-skulls-from-same-user.patch
index 62f9c5acf0..87e80f1a09 100644
--- a/Spigot-Server-Patches/0324-Fix-client-rendering-skulls-from-same-user.patch
+++ b/Spigot-Server-Patches/0323-Fix-client-rendering-skulls-from-same-user.patch
@@ -1,4 +1,4 @@
-From 8af723e221f15c221cb2521df57e872a5cf38cf5 Mon Sep 17 00:00:00 2001
+From 545079cfdb0bf7030b9480898d9db0631ed9aaeb 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
diff --git a/Spigot-Server-Patches/0325-Add-Early-Warning-Feature-to-WatchDog.patch b/Spigot-Server-Patches/0324-Add-Early-Warning-Feature-to-WatchDog.patch
similarity index 98%
rename from Spigot-Server-Patches/0325-Add-Early-Warning-Feature-to-WatchDog.patch
rename to Spigot-Server-Patches/0324-Add-Early-Warning-Feature-to-WatchDog.patch
index 9c3323379c..5728d12453 100644
--- a/Spigot-Server-Patches/0325-Add-Early-Warning-Feature-to-WatchDog.patch
+++ b/Spigot-Server-Patches/0324-Add-Early-Warning-Feature-to-WatchDog.patch
@@ -1,4 +1,4 @@
-From bed655aa8c024e85ad522b4863180292f3bc3c93 Mon Sep 17 00:00:00 2001
+From 5a971613f06a4eb226e77a7047f55fe981be4237 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 3419847e34..4bb81a09a8 100644
+index a2894da71b..6a70e5f4f5 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -24,6 +24,8 @@ import org.bukkit.configuration.InvalidConfigurationException;
diff --git a/Spigot-Server-Patches/0326-Make-EnderDragon-implement-Mob.patch b/Spigot-Server-Patches/0325-Make-EnderDragon-implement-Mob.patch
similarity index 95%
rename from Spigot-Server-Patches/0326-Make-EnderDragon-implement-Mob.patch
rename to Spigot-Server-Patches/0325-Make-EnderDragon-implement-Mob.patch
index 638219b06b..214375c57c 100644
--- a/Spigot-Server-Patches/0326-Make-EnderDragon-implement-Mob.patch
+++ b/Spigot-Server-Patches/0325-Make-EnderDragon-implement-Mob.patch
@@ -1,4 +1,4 @@
-From 20b2f3ae314b9567f3a739d5553966b9e71752f8 Mon Sep 17 00:00:00 2001
+From 7bfc5023bc0e32a91b6950708b60d1cff49c6d23 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/Spigot-Server-Patches/0327-Detect-and-repair-corrupt-Region-Files.patch b/Spigot-Server-Patches/0326-Detect-and-repair-corrupt-Region-Files.patch
similarity index 96%
rename from Spigot-Server-Patches/0327-Detect-and-repair-corrupt-Region-Files.patch
rename to Spigot-Server-Patches/0326-Detect-and-repair-corrupt-Region-Files.patch
index 749e8e579e..55d3abbedb 100644
--- a/Spigot-Server-Patches/0327-Detect-and-repair-corrupt-Region-Files.patch
+++ b/Spigot-Server-Patches/0326-Detect-and-repair-corrupt-Region-Files.patch
@@ -1,4 +1,4 @@
-From c1479920cb39b85e9dc4993c9c425dae8a22acb1 Mon Sep 17 00:00:00 2001
+From 14f3b79eeeb01949a87e9f9aa252de8d471ca5c1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 11 Aug 2018 00:49:20 -0400
 Subject: [PATCH] Detect and repair corrupt Region Files
diff --git a/Spigot-Server-Patches/0328-Use-ConcurrentHashMap-in-JsonList.patch b/Spigot-Server-Patches/0327-Use-ConcurrentHashMap-in-JsonList.patch
similarity index 98%
rename from Spigot-Server-Patches/0328-Use-ConcurrentHashMap-in-JsonList.patch
rename to Spigot-Server-Patches/0327-Use-ConcurrentHashMap-in-JsonList.patch
index c0559d3c63..bc42d89957 100644
--- a/Spigot-Server-Patches/0328-Use-ConcurrentHashMap-in-JsonList.patch
+++ b/Spigot-Server-Patches/0327-Use-ConcurrentHashMap-in-JsonList.patch
@@ -1,4 +1,4 @@
-From 1cd1b16cf3e1b39a0d43f3f904ddcc8155f59d40 Mon Sep 17 00:00:00 2001
+From 78850eeb498a048669ffaccd328c08406b0dfa37 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
diff --git a/Spigot-Server-Patches/0329-Use-a-Queue-for-Queueing-Commands.patch b/Spigot-Server-Patches/0328-Use-a-Queue-for-Queueing-Commands.patch
similarity index 96%
rename from Spigot-Server-Patches/0329-Use-a-Queue-for-Queueing-Commands.patch
rename to Spigot-Server-Patches/0328-Use-a-Queue-for-Queueing-Commands.patch
index 00b9c4c0c5..b8084e7517 100644
--- a/Spigot-Server-Patches/0329-Use-a-Queue-for-Queueing-Commands.patch
+++ b/Spigot-Server-Patches/0328-Use-a-Queue-for-Queueing-Commands.patch
@@ -1,4 +1,4 @@
-From c91a1efe34437425995ccd3f71afa040ef3b526e Mon Sep 17 00:00:00 2001
+From b63b770e39177d4c38bbdde408c5abe05ed28e5e 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
diff --git a/Spigot-Server-Patches/0330-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/Spigot-Server-Patches/0329-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
similarity index 95%
rename from Spigot-Server-Patches/0330-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
rename to Spigot-Server-Patches/0329-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
index ad875517ab..25fc5adc94 100644
--- a/Spigot-Server-Patches/0330-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
+++ b/Spigot-Server-Patches/0329-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
@@ -1,4 +1,4 @@
-From a053053de86c590dc6f65b0f9746fe8e40a26509 Mon Sep 17 00:00:00 2001
+From d1cb50480f7aad995cfc80a502340961c7e623f6 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/Spigot-Server-Patches/0331-Allow-disabling-armour-stand-ticking.patch b/Spigot-Server-Patches/0330-Allow-disabling-armour-stand-ticking.patch
similarity index 97%
rename from Spigot-Server-Patches/0331-Allow-disabling-armour-stand-ticking.patch
rename to Spigot-Server-Patches/0330-Allow-disabling-armour-stand-ticking.patch
index f95f0ea1cd..2dc643a926 100644
--- a/Spigot-Server-Patches/0331-Allow-disabling-armour-stand-ticking.patch
+++ b/Spigot-Server-Patches/0330-Allow-disabling-armour-stand-ticking.patch
@@ -1,4 +1,4 @@
-From 1b717bb84d8f34e7a18f4880d2c0ff5210a08bb7 Mon Sep 17 00:00:00 2001
+From 27d3ec80ce28800aaf9076345a2994ff5f710511 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/Spigot-Server-Patches/0332-Optimize-BlockPosition-helper-methods.patch b/Spigot-Server-Patches/0331-Optimize-BlockPosition-helper-methods.patch
similarity index 98%
rename from Spigot-Server-Patches/0332-Optimize-BlockPosition-helper-methods.patch
rename to Spigot-Server-Patches/0331-Optimize-BlockPosition-helper-methods.patch
index 9c6bc2b479..cecca2e9c0 100644
--- a/Spigot-Server-Patches/0332-Optimize-BlockPosition-helper-methods.patch
+++ b/Spigot-Server-Patches/0331-Optimize-BlockPosition-helper-methods.patch
@@ -1,4 +1,4 @@
-From 5487faf5715f545c2c3199f94e388d03f85cc73b Mon Sep 17 00:00:00 2001
+From fe94333525c84f0e38966d2c3d99317d7cf4bd2b 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 986b1e13a5..45f7794613 100644
+index 9ce3cd9c9d..adf648dfd5 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -58,59 +58,96 @@ public class BlockPosition extends BaseBlockPosition {
diff --git a/Spigot-Server-Patches/0333-Send-nearby-packets-from-world-player-list-not-serve.patch b/Spigot-Server-Patches/0332-Send-nearby-packets-from-world-player-list-not-serve.patch
similarity index 97%
rename from Spigot-Server-Patches/0333-Send-nearby-packets-from-world-player-list-not-serve.patch
rename to Spigot-Server-Patches/0332-Send-nearby-packets-from-world-player-list-not-serve.patch
index e90ecb9e0f..dd65a424d0 100644
--- a/Spigot-Server-Patches/0333-Send-nearby-packets-from-world-player-list-not-serve.patch
+++ b/Spigot-Server-Patches/0332-Send-nearby-packets-from-world-player-list-not-serve.patch
@@ -1,11 +1,11 @@
-From ec6876173a5596cfa16aa9ac22f067b740462caa Mon Sep 17 00:00:00 2001
+From 96c008295d8de99bb2b3847c2c07cbc6dcaf4d85 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 a9b468fa..9a064d16 100644
+index a9b468facd..9a064d1618 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1202,8 +1202,25 @@ public abstract class PlayerList {
@@ -46,7 +46,7 @@ index a9b468fa..9a064d16 100644
                  double d5 = d1 - entityplayer.locY;
                  double d6 = d2 - entityplayer.locZ;
 diff --git a/src/main/java/net/minecraft/server/WorldManager.java b/src/main/java/net/minecraft/server/WorldManager.java
-index e26405d3..23f390c2 100644
+index e26405d341..23f390c221 100644
 --- a/src/main/java/net/minecraft/server/WorldManager.java
 +++ b/src/main/java/net/minecraft/server/WorldManager.java
 @@ -35,8 +35,8 @@ public class WorldManager implements IWorldAccess {
@@ -95,7 +95,7 @@ index e26405d3..23f390c2 100644
              if (entityplayer != null && entityplayer.world == this.world && entityplayer.getId() != i) {
                  double d0 = (double) blockposition.getX() - entityplayer.locX;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 9cba1822..14905fce 100644
+index 9cba1822bf..14905fceb0 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1090,7 +1090,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -119,7 +119,7 @@ index 9cba1822..14905fce 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 52d36052..8565de51 100644
+index 52d36052b2..8565de51f4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1497,7 +1497,7 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0334-Cache-World-Entity-Type-counts.patch b/Spigot-Server-Patches/0333-Cache-World-Entity-Type-counts.patch
similarity index 99%
rename from Spigot-Server-Patches/0334-Cache-World-Entity-Type-counts.patch
rename to Spigot-Server-Patches/0333-Cache-World-Entity-Type-counts.patch
index b79423f8bc..5f3983db15 100644
--- a/Spigot-Server-Patches/0334-Cache-World-Entity-Type-counts.patch
+++ b/Spigot-Server-Patches/0333-Cache-World-Entity-Type-counts.patch
@@ -1,4 +1,4 @@
-From 80766964f2dee726b83d594c94362939f5628a7a Mon Sep 17 00:00:00 2001
+From 30fc63f03ee14456ee992b95357b7ada038bf4e6 Mon Sep 17 00:00:00 2001
 From: Colin Godsey <crgodsey@gmail.com>
 Date: Wed, 8 Aug 2018 10:10:06 -0600
 Subject: [PATCH] Cache World Entity Type counts
diff --git a/Spigot-Server-Patches/0335-Restore-vanlla-default-mob-spawn-range.patch b/Spigot-Server-Patches/0334-Restore-vanlla-default-mob-spawn-range.patch
similarity index 87%
rename from Spigot-Server-Patches/0335-Restore-vanlla-default-mob-spawn-range.patch
rename to Spigot-Server-Patches/0334-Restore-vanlla-default-mob-spawn-range.patch
index 2b4dd845b1..e34248643a 100644
--- a/Spigot-Server-Patches/0335-Restore-vanlla-default-mob-spawn-range.patch
+++ b/Spigot-Server-Patches/0334-Restore-vanlla-default-mob-spawn-range.patch
@@ -1,11 +1,11 @@
-From 7b18a99972e162d3ef31c7192a77fffc31666d77 Mon Sep 17 00:00:00 2001
+From 11621f2b919b38c0c58fa036707ec17e313141dd 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 87bc8e2d9c..d2942fd8e7 100644
+index 06d84a0b66..15abde4f5d 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -130,7 +130,7 @@ public class SpigotWorldConfig
diff --git a/Spigot-Server-Patches/0336-Optimize-Hoppers.patch b/Spigot-Server-Patches/0335-Optimize-Hoppers.patch
similarity index 99%
rename from Spigot-Server-Patches/0336-Optimize-Hoppers.patch
rename to Spigot-Server-Patches/0335-Optimize-Hoppers.patch
index 25816913a6..c91794c14d 100644
--- a/Spigot-Server-Patches/0336-Optimize-Hoppers.patch
+++ b/Spigot-Server-Patches/0335-Optimize-Hoppers.patch
@@ -1,4 +1,4 @@
-From f67b0dce5c66b50b5c1516cdf838caa259d31b2e Mon Sep 17 00:00:00 2001
+From b8f8ff8c81c3a92ae48adb86b8decabe0d11a702 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 27 Apr 2016 22:09:52 -0400
 Subject: [PATCH] Optimize Hoppers
@@ -11,7 +11,7 @@ Subject: [PATCH] Optimize Hoppers
 * Skip subsequent InventoryMoveItemEvents if a plugin does not use the item after first event fire for an iteration
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index b412d02ada..cfeba61a32 100644
+index 31b2c71960..d818d39039 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -415,6 +415,15 @@ public class PaperWorldConfig {
diff --git a/Spigot-Server-Patches/0337-Optimize-CraftBlockData-Creation.patch b/Spigot-Server-Patches/0336-Optimize-CraftBlockData-Creation.patch
similarity index 98%
rename from Spigot-Server-Patches/0337-Optimize-CraftBlockData-Creation.patch
rename to Spigot-Server-Patches/0336-Optimize-CraftBlockData-Creation.patch
index d22f441937..487b3f24a9 100644
--- a/Spigot-Server-Patches/0337-Optimize-CraftBlockData-Creation.patch
+++ b/Spigot-Server-Patches/0336-Optimize-CraftBlockData-Creation.patch
@@ -1,4 +1,4 @@
-From bd4d2145c1328fd5fbfe25d29bb080447aa199a5 Mon Sep 17 00:00:00 2001
+From a0d86a396033f06301c88c4714d383b2fa6bacf3 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
diff --git a/Spigot-Server-Patches/0338-Fix-MC-124320.patch b/Spigot-Server-Patches/0337-Fix-MC-124320.patch
similarity index 97%
rename from Spigot-Server-Patches/0338-Fix-MC-124320.patch
rename to Spigot-Server-Patches/0337-Fix-MC-124320.patch
index 50dc7d89f2..cfcd2d5dc0 100644
--- a/Spigot-Server-Patches/0338-Fix-MC-124320.patch
+++ b/Spigot-Server-Patches/0337-Fix-MC-124320.patch
@@ -1,4 +1,4 @@
-From 663011368c8066bd5156e59914507f351eb098b6 Mon Sep 17 00:00:00 2001
+From eeae8286b41292e83ce46456b7f60a349dd2f825 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/Spigot-Server-Patches/0339-Slime-Pathfinder-Events.patch b/Spigot-Server-Patches/0338-Slime-Pathfinder-Events.patch
similarity index 97%
rename from Spigot-Server-Patches/0339-Slime-Pathfinder-Events.patch
rename to Spigot-Server-Patches/0338-Slime-Pathfinder-Events.patch
index 739be12a7f..d30bec3f3d 100644
--- a/Spigot-Server-Patches/0339-Slime-Pathfinder-Events.patch
+++ b/Spigot-Server-Patches/0338-Slime-Pathfinder-Events.patch
@@ -1,11 +1,11 @@
-From 94377d65907b8bb20d19f0a357e1d37b851b68f6 Mon Sep 17 00:00:00 2001
+From 0f6f16bc720dec704eeb9feff92d0b39245051c5 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 238f3c792..586b9a3a6 100644
+index 238f3c7926..586b9a3a66 100644
 --- a/src/main/java/net/minecraft/server/EntitySlime.java
 +++ b/src/main/java/net/minecraft/server/EntitySlime.java
 @@ -57,6 +57,7 @@ public class EntitySlime extends EntityInsentient implements IMonster {
@@ -119,7 +119,7 @@ index 238f3c792..586b9a3a6 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 18e7ef80a..8403c1e01 100644
+index 18e7ef80ac..8403c1e01c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
 @@ -33,4 +33,14 @@ public class CraftSlime extends CraftMob implements Slime {
diff --git a/Spigot-Server-Patches/0340-Add-source-block-to-BlockPhysicsEvent.patch b/Spigot-Server-Patches/0339-Add-source-block-to-BlockPhysicsEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0340-Add-source-block-to-BlockPhysicsEvent.patch
rename to Spigot-Server-Patches/0339-Add-source-block-to-BlockPhysicsEvent.patch
index 51fd7be0f9..2ce0aa3d39 100644
--- a/Spigot-Server-Patches/0340-Add-source-block-to-BlockPhysicsEvent.patch
+++ b/Spigot-Server-Patches/0339-Add-source-block-to-BlockPhysicsEvent.patch
@@ -1,4 +1,4 @@
-From 0365084d4f66cd4cf52417b580f2aba4c1b311b1 Mon Sep 17 00:00:00 2001
+From df4ecee0af1df4edb57d94b00c33ead1d68ea27a Mon Sep 17 00:00:00 2001
 From: Sotr <i@omc.hk>
 Date: Thu, 23 Aug 2018 16:14:12 +0800
 Subject: [PATCH] Add source block to BlockPhysicsEvent
diff --git a/Spigot-Server-Patches/0341-Anti-Xray.patch b/Spigot-Server-Patches/0340-Anti-Xray.patch
similarity index 99%
rename from Spigot-Server-Patches/0341-Anti-Xray.patch
rename to Spigot-Server-Patches/0340-Anti-Xray.patch
index bafec657b4..c1e2f8266b 100644
--- a/Spigot-Server-Patches/0341-Anti-Xray.patch
+++ b/Spigot-Server-Patches/0340-Anti-Xray.patch
@@ -1,4 +1,4 @@
-From 4d479efcce6177802b86638396126228f3c8351f Mon Sep 17 00:00:00 2001
+From 15bfb73a209c5a4aa1a0e0472189836fa020b3b0 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
@@ -1049,7 +1049,7 @@ index 0000000000..37093419cf
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 56116ae170..6f8e6db820 100644
+index ae7e00d81e..a3c53c1d84 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -535,7 +535,7 @@ public class Chunk implements IChunkAccess {
@@ -1418,7 +1418,7 @@ index 22a262bb60..40ec398eef 100644
                  if (flag) {
                      packetdataserializer.writeBytes(chunksection.getSkyLightArray().asBytes());
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index 84896d6f6b..2a889dc20a 100644
+index a0fcac3296..2c7c8adf7c 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
 @@ -118,6 +118,8 @@ public class PlayerChunk {
diff --git a/Spigot-Server-Patches/0342-Configurable-speed-for-water-flowing-over-lava.patch b/Spigot-Server-Patches/0341-Configurable-speed-for-water-flowing-over-lava.patch
similarity index 98%
rename from Spigot-Server-Patches/0342-Configurable-speed-for-water-flowing-over-lava.patch
rename to Spigot-Server-Patches/0341-Configurable-speed-for-water-flowing-over-lava.patch
index babe750437..89ba83b6f6 100644
--- a/Spigot-Server-Patches/0342-Configurable-speed-for-water-flowing-over-lava.patch
+++ b/Spigot-Server-Patches/0341-Configurable-speed-for-water-flowing-over-lava.patch
@@ -1,4 +1,4 @@
-From bc6aa0160941037d2193cfb5386289723418492a Mon Sep 17 00:00:00 2001
+From 9d7bb190745b0418017f5f3b7afde878fb903ff6 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/Spigot-Server-Patches/0343-Optimize-RegistryMaterials.patch b/Spigot-Server-Patches/0342-Optimize-RegistryMaterials.patch
similarity index 94%
rename from Spigot-Server-Patches/0343-Optimize-RegistryMaterials.patch
rename to Spigot-Server-Patches/0342-Optimize-RegistryMaterials.patch
index 45e515162b..de7d3342cf 100644
--- a/Spigot-Server-Patches/0343-Optimize-RegistryMaterials.patch
+++ b/Spigot-Server-Patches/0342-Optimize-RegistryMaterials.patch
@@ -1,4 +1,4 @@
-From 34afe0971637852760abc1aa363833ab3fb88f4b Mon Sep 17 00:00:00 2001
+From d1a99aa3a770edc860e74ec16778082dc0888040 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
diff --git a/Spigot-Server-Patches/0344-Add-PhantomPreSpawnEvent.patch b/Spigot-Server-Patches/0343-Add-PhantomPreSpawnEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0344-Add-PhantomPreSpawnEvent.patch
rename to Spigot-Server-Patches/0343-Add-PhantomPreSpawnEvent.patch
index fba3a16ce0..cb9139f210 100644
--- a/Spigot-Server-Patches/0344-Add-PhantomPreSpawnEvent.patch
+++ b/Spigot-Server-Patches/0343-Add-PhantomPreSpawnEvent.patch
@@ -1,4 +1,4 @@
-From dd5d7473b0c1a10572abe04e974ce504be12270a Mon Sep 17 00:00:00 2001
+From 99fc8d9cadca3916a3c8d17df85d0030b95af22f 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/Spigot-Server-Patches/0345-Add-More-Creeper-API.patch b/Spigot-Server-Patches/0344-Add-More-Creeper-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0345-Add-More-Creeper-API.patch
rename to Spigot-Server-Patches/0344-Add-More-Creeper-API.patch
index b2db323670..9c61e133bc 100644
--- a/Spigot-Server-Patches/0345-Add-More-Creeper-API.patch
+++ b/Spigot-Server-Patches/0344-Add-More-Creeper-API.patch
@@ -1,4 +1,4 @@
-From 74c0ccbb939db48c2e3c10af810630132b2d7d74 Mon Sep 17 00:00:00 2001
+From 7061fddd7e9ce6887914136c7ba44beaaf46f2f7 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/Spigot-Server-Patches/0346-Optimize-Chunk-getPos.patch b/Spigot-Server-Patches/0345-Optimize-Chunk-getPos.patch
similarity index 92%
rename from Spigot-Server-Patches/0346-Optimize-Chunk-getPos.patch
rename to Spigot-Server-Patches/0345-Optimize-Chunk-getPos.patch
index a70d54cc73..221d9feb25 100644
--- a/Spigot-Server-Patches/0346-Optimize-Chunk-getPos.patch
+++ b/Spigot-Server-Patches/0345-Optimize-Chunk-getPos.patch
@@ -1,4 +1,4 @@
-From 5479183572b20794e13a31078bb9e15b04252a18 Mon Sep 17 00:00:00 2001
+From 3deb5d8004055fe2f252cef42e39eea20a47b3fc Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 28 Aug 2018 21:35:05 -0400
 Subject: [PATCH] Optimize Chunk#getPos
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize Chunk#getPos
 Don't create an object just to get chunk coords.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 6f8e6db820..82d8aca47f 100644
+index a3c53c1d84..f4b26bd999 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -169,8 +169,9 @@ public class Chunk implements IChunkAccess {
diff --git a/Spigot-Server-Patches/0347-Use-an-EnumMap-for-Chunk-Height-Maps.patch b/Spigot-Server-Patches/0346-Use-an-EnumMap-for-Chunk-Height-Maps.patch
similarity index 88%
rename from Spigot-Server-Patches/0347-Use-an-EnumMap-for-Chunk-Height-Maps.patch
rename to Spigot-Server-Patches/0346-Use-an-EnumMap-for-Chunk-Height-Maps.patch
index a6f170293c..0a2049f2c9 100644
--- a/Spigot-Server-Patches/0347-Use-an-EnumMap-for-Chunk-Height-Maps.patch
+++ b/Spigot-Server-Patches/0346-Use-an-EnumMap-for-Chunk-Height-Maps.patch
@@ -1,11 +1,11 @@
-From d220b6642224cbc4b6f2d901112592930e489b17 Mon Sep 17 00:00:00 2001
+From 28e003ea3f3461bb37b3b385505ef1eabfc05bb2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 28 Aug 2018 22:11:13 -0400
 Subject: [PATCH] Use an EnumMap for Chunk Height Maps
 
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 82d8aca47f..84df69a00d 100644
+index f4b26bd999..c68cef1677 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -133,7 +133,7 @@ public class Chunk implements IChunkAccess {
diff --git a/Spigot-Server-Patches/0348-Implement-Force-Loaded-Chunk-API.patch b/Spigot-Server-Patches/0347-Implement-Force-Loaded-Chunk-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0348-Implement-Force-Loaded-Chunk-API.patch
rename to Spigot-Server-Patches/0347-Implement-Force-Loaded-Chunk-API.patch
index 61c3da7179..2f75526045 100644
--- a/Spigot-Server-Patches/0348-Implement-Force-Loaded-Chunk-API.patch
+++ b/Spigot-Server-Patches/0347-Implement-Force-Loaded-Chunk-API.patch
@@ -1,4 +1,4 @@
-From 9757e7bf49913195d2867fd0d2d343cec1728054 Mon Sep 17 00:00:00 2001
+From 7d73bd83af6d5ec654addd52aff5bd878c96342f Mon Sep 17 00:00:00 2001
 From: willies952002 <admin@domnian.com>
 Date: Wed, 29 Aug 2018 00:37:42 -0400
 Subject: [PATCH] Implement Force-Loaded Chunk API
diff --git a/Spigot-Server-Patches/0349-Inventory-removeItemAnySlot.patch b/Spigot-Server-Patches/0348-Inventory-removeItemAnySlot.patch
similarity index 97%
rename from Spigot-Server-Patches/0349-Inventory-removeItemAnySlot.patch
rename to Spigot-Server-Patches/0348-Inventory-removeItemAnySlot.patch
index 765e15aadd..fb8668cf30 100644
--- a/Spigot-Server-Patches/0349-Inventory-removeItemAnySlot.patch
+++ b/Spigot-Server-Patches/0348-Inventory-removeItemAnySlot.patch
@@ -1,4 +1,4 @@
-From 892f96e546a94d2428b5f44ff25a8f8be6978792 Mon Sep 17 00:00:00 2001
+From cde4fa48e25eff26e56881ac77f50eae38d61521 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/Spigot-Server-Patches/0350-Optimize-getChunkIfLoaded-type-calls.patch b/Spigot-Server-Patches/0349-Optimize-getChunkIfLoaded-type-calls.patch
similarity index 98%
rename from Spigot-Server-Patches/0350-Optimize-getChunkIfLoaded-type-calls.patch
rename to Spigot-Server-Patches/0349-Optimize-getChunkIfLoaded-type-calls.patch
index 2cd0f50299..1850580444 100644
--- a/Spigot-Server-Patches/0350-Optimize-getChunkIfLoaded-type-calls.patch
+++ b/Spigot-Server-Patches/0349-Optimize-getChunkIfLoaded-type-calls.patch
@@ -1,4 +1,4 @@
-From d797aa17c60b25db601bf11249a7f7f4a50525ae Mon Sep 17 00:00:00 2001
+From 35b56ab3643bde1b5b3a4b9f26d34c5d9d1b23e5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 29 Aug 2018 21:59:22 -0400
 Subject: [PATCH] Optimize getChunkIfLoaded type calls
diff --git a/Spigot-Server-Patches/0351-Don-t-double-add-golems-to-world.patch b/Spigot-Server-Patches/0350-Don-t-double-add-golems-to-world.patch
similarity index 89%
rename from Spigot-Server-Patches/0351-Don-t-double-add-golems-to-world.patch
rename to Spigot-Server-Patches/0350-Don-t-double-add-golems-to-world.patch
index df869fb58f..4b6c6bb6ce 100644
--- a/Spigot-Server-Patches/0351-Don-t-double-add-golems-to-world.patch
+++ b/Spigot-Server-Patches/0350-Don-t-double-add-golems-to-world.patch
@@ -1,4 +1,4 @@
-From 447e870f1658adb0b69fa54b9bd0282fb8637931 Mon Sep 17 00:00:00 2001
+From 55a1e8faecf44ded04ae4ba2089134bcf7b4ee46 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 30 Aug 2018 20:56:26 -0400
 Subject: [PATCH] Don't double add golems to world
@@ -6,7 +6,7 @@ Subject: [PATCH] Don't double add golems to world
 spawnCreature adds to world now
 
 diff --git a/src/main/java/net/minecraft/server/Village.java b/src/main/java/net/minecraft/server/Village.java
-index 955041e266..5f280fcab9 100644
+index 0414f003a5..d92ef03661 100644
 --- a/src/main/java/net/minecraft/server/Village.java
 +++ b/src/main/java/net/minecraft/server/Village.java
 @@ -77,7 +77,7 @@ public class Village {
diff --git a/Spigot-Server-Patches/0352-fix-newlines-in-spigot-tab-list-API.patch b/Spigot-Server-Patches/0351-fix-newlines-in-spigot-tab-list-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0352-fix-newlines-in-spigot-tab-list-API.patch
rename to Spigot-Server-Patches/0351-fix-newlines-in-spigot-tab-list-API.patch
index 176b825359..d7ccf5e155 100644
--- a/Spigot-Server-Patches/0352-fix-newlines-in-spigot-tab-list-API.patch
+++ b/Spigot-Server-Patches/0351-fix-newlines-in-spigot-tab-list-API.patch
@@ -1,4 +1,4 @@
-From 2d071eb90398dfd39229ed09c2b0f8383b484740 Mon Sep 17 00:00:00 2001
+From f15ad304fc3c04eae815094516634a4e1dfdeac6 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 1 Sep 2018 11:29:52 +0100
 Subject: [PATCH] fix newlines in spigot tab list API
diff --git a/Spigot-Server-Patches/0353-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/Spigot-Server-Patches/0352-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
similarity index 93%
rename from Spigot-Server-Patches/0353-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
rename to Spigot-Server-Patches/0352-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
index e16bb05ccd..69a05467f4 100644
--- a/Spigot-Server-Patches/0353-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
+++ b/Spigot-Server-Patches/0352-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
@@ -1,4 +1,4 @@
-From bb545ec01c987bda349ad566a357ffd156d27fc2 Mon Sep 17 00:00:00 2001
+From 81f1e6ead3e17cdceaab153207a34e7b3cc1ca30 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
diff --git a/Spigot-Server-Patches/0354-Add-ray-tracing-methods-to-LivingEntity.patch b/Spigot-Server-Patches/0353-Add-ray-tracing-methods-to-LivingEntity.patch
similarity index 98%
rename from Spigot-Server-Patches/0354-Add-ray-tracing-methods-to-LivingEntity.patch
rename to Spigot-Server-Patches/0353-Add-ray-tracing-methods-to-LivingEntity.patch
index 310040a379..7e4ce20f6f 100644
--- a/Spigot-Server-Patches/0354-Add-ray-tracing-methods-to-LivingEntity.patch
+++ b/Spigot-Server-Patches/0353-Add-ray-tracing-methods-to-LivingEntity.patch
@@ -1,4 +1,4 @@
-From 49bb1bff3fa47cdfc21ea8969f09a81547fb163f Mon Sep 17 00:00:00 2001
+From 390fed6c4568d2753e12fe3e7a80c7c00673b909 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/Spigot-Server-Patches/0355-Fix-concurrency-and-performance-issues-in-DataFixers.patch b/Spigot-Server-Patches/0354-Fix-concurrency-and-performance-issues-in-DataFixers.patch
similarity index 99%
rename from Spigot-Server-Patches/0355-Fix-concurrency-and-performance-issues-in-DataFixers.patch
rename to Spigot-Server-Patches/0354-Fix-concurrency-and-performance-issues-in-DataFixers.patch
index 844e1fddd3..d445a78e38 100644
--- a/Spigot-Server-Patches/0355-Fix-concurrency-and-performance-issues-in-DataFixers.patch
+++ b/Spigot-Server-Patches/0354-Fix-concurrency-and-performance-issues-in-DataFixers.patch
@@ -1,4 +1,4 @@
-From 80d19bcec8e7e1f21557b903d9f7dc6707595bc5 Mon Sep 17 00:00:00 2001
+From ab1a408584e0f6e7e28319956b32047f552bf668 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 3 Sep 2018 22:18:38 -0400
 Subject: [PATCH] Fix concurrency and performance issues in DataFixers
diff --git a/Spigot-Server-Patches/0356-Expose-attack-cooldown-methods-for-Player.patch b/Spigot-Server-Patches/0355-Expose-attack-cooldown-methods-for-Player.patch
similarity index 96%
rename from Spigot-Server-Patches/0356-Expose-attack-cooldown-methods-for-Player.patch
rename to Spigot-Server-Patches/0355-Expose-attack-cooldown-methods-for-Player.patch
index 49da32e3f8..31e143eb23 100644
--- a/Spigot-Server-Patches/0356-Expose-attack-cooldown-methods-for-Player.patch
+++ b/Spigot-Server-Patches/0355-Expose-attack-cooldown-methods-for-Player.patch
@@ -1,4 +1,4 @@
-From 737b3741e2a934d12b78b38c6fecc782e13e6b64 Mon Sep 17 00:00:00 2001
+From 4e87d71abca5dc5f455afa7f7803b2e0cd9dee2f 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/Spigot-Server-Patches/0357-Fix-1420.patch b/Spigot-Server-Patches/0356-Fix-1420.patch
similarity index 97%
rename from Spigot-Server-Patches/0357-Fix-1420.patch
rename to Spigot-Server-Patches/0356-Fix-1420.patch
index da385e2c52..a4be5a83dd 100644
--- a/Spigot-Server-Patches/0357-Fix-1420.patch
+++ b/Spigot-Server-Patches/0356-Fix-1420.patch
@@ -1,4 +1,4 @@
-From e06803bd62e09787db83ae3506c2785a567a83db Mon Sep 17 00:00:00 2001
+From 3f994823ee28a8aa606a0f3dddf190a3e22a6872 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 7 Sep 2018 18:28:24 -0500
 Subject: [PATCH] Fix #1420
diff --git a/Spigot-Server-Patches/0358-MC-2025-Save-and-load-entity-AABB-to-prevent-wobble.patch b/Spigot-Server-Patches/0357-MC-2025-Save-and-load-entity-AABB-to-prevent-wobble.patch
similarity index 98%
rename from Spigot-Server-Patches/0358-MC-2025-Save-and-load-entity-AABB-to-prevent-wobble.patch
rename to Spigot-Server-Patches/0357-MC-2025-Save-and-load-entity-AABB-to-prevent-wobble.patch
index 3a76cf16b3..8d3f7b6af5 100644
--- a/Spigot-Server-Patches/0358-MC-2025-Save-and-load-entity-AABB-to-prevent-wobble.patch
+++ b/Spigot-Server-Patches/0357-MC-2025-Save-and-load-entity-AABB-to-prevent-wobble.patch
@@ -1,4 +1,4 @@
-From 5f45339526005282340d8f3f34f73a81b9f9d8ae Mon Sep 17 00:00:00 2001
+From b15596a5c1821f6cf47a5ab1c74e6b588684126b Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 4 Sep 2018 19:07:57 -0400
 Subject: [PATCH] MC-2025: Save and load entity AABB to prevent wobble
diff --git a/Spigot-Server-Patches/0359-Improve-death-events.patch b/Spigot-Server-Patches/0358-Improve-death-events.patch
similarity index 99%
rename from Spigot-Server-Patches/0359-Improve-death-events.patch
rename to Spigot-Server-Patches/0358-Improve-death-events.patch
index 88258992b8..4cb04aa8bc 100644
--- a/Spigot-Server-Patches/0359-Improve-death-events.patch
+++ b/Spigot-Server-Patches/0358-Improve-death-events.patch
@@ -1,4 +1,4 @@
-From ee6f1646f7ab60641b44bdf7cb1381ca65f509a1 Mon Sep 17 00:00:00 2001
+From 4a4878217d66303dd4b85128f99d4067c8e59a23 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
diff --git a/Spigot-Server-Patches/0360-Allow-chests-to-be-placed-with-NBT-data.patch b/Spigot-Server-Patches/0359-Allow-chests-to-be-placed-with-NBT-data.patch
similarity index 92%
rename from Spigot-Server-Patches/0360-Allow-chests-to-be-placed-with-NBT-data.patch
rename to Spigot-Server-Patches/0359-Allow-chests-to-be-placed-with-NBT-data.patch
index f4f9cefee5..4d19bc9ae5 100644
--- a/Spigot-Server-Patches/0360-Allow-chests-to-be-placed-with-NBT-data.patch
+++ b/Spigot-Server-Patches/0359-Allow-chests-to-be-placed-with-NBT-data.patch
@@ -1,11 +1,11 @@
-From fa57591b3691f5cb5f754fc423ecbcb78eacc41b Mon Sep 17 00:00:00 2001
+From df899b98ec5b314f89684d81f48312bb7d27511c 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 4641113f9..26055924b 100644
+index 4641113f9d..26055924b9 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -228,6 +228,15 @@ public final class ItemStack {
@@ -25,7 +25,7 @@ index 4641113f9..26055924b 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 9573a4ecd..7594c16e9 100644
+index 9573a4ecdf..7594c16e99 100644
 --- a/src/main/java/net/minecraft/server/TileEntityChest.java
 +++ b/src/main/java/net/minecraft/server/TileEntityChest.java
 @@ -305,7 +305,7 @@ public class TileEntityChest extends TileEntityLootable { // Paper - Remove ITic
diff --git a/Spigot-Server-Patches/0361-Mob-Pathfinding-API.patch b/Spigot-Server-Patches/0360-Mob-Pathfinding-API.patch
similarity index 95%
rename from Spigot-Server-Patches/0361-Mob-Pathfinding-API.patch
rename to Spigot-Server-Patches/0360-Mob-Pathfinding-API.patch
index 2c7649fc19..705a6d2efa 100644
--- a/Spigot-Server-Patches/0361-Mob-Pathfinding-API.patch
+++ b/Spigot-Server-Patches/0360-Mob-Pathfinding-API.patch
@@ -1,4 +1,4 @@
-From 6fc1ce9f3d6da7e3e418bfa524740713dd757ac0 Mon Sep 17 00:00:00 2001
+From be254c51040ca6213260aab425d0759e76f03576 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
@@ -125,10 +125,10 @@ index 0000000000..ed3d86ddd3
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
-index 452da80f11..4023253f42 100644
+index efdfa7195c..113fd9a50f 100644
 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java
 +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
-@@ -63,7 +63,7 @@ public abstract class NavigationAbstract {
+@@ -65,7 +65,7 @@ public abstract class NavigationAbstract {
      }
  
      @Nullable
@@ -137,7 +137,7 @@ index 452da80f11..4023253f42 100644
          return this.b(new BlockPosition(d0, d1, d2));
      }
  
-@@ -89,7 +89,7 @@ public abstract class NavigationAbstract {
+@@ -91,7 +91,7 @@ public abstract class NavigationAbstract {
      }
  
      @Nullable
@@ -146,7 +146,7 @@ index 452da80f11..4023253f42 100644
          if (!this.b()) {
              return null;
          } else {
-@@ -138,6 +138,7 @@ public abstract class NavigationAbstract {
+@@ -140,6 +140,7 @@ public abstract class NavigationAbstract {
      private int pathfindFailures = 0;
      // Paper end
  
@@ -154,7 +154,7 @@ index 452da80f11..4023253f42 100644
      public boolean a(@Nullable PathEntity pathentity, double d0) {
          if (pathentity == null) {
              this.c = null;
-@@ -159,8 +160,7 @@ public abstract class NavigationAbstract {
+@@ -161,8 +162,7 @@ public abstract class NavigationAbstract {
              }
          }
      }
@@ -164,7 +164,7 @@ index 452da80f11..4023253f42 100644
      public PathEntity m() {
          return this.c;
      }
-@@ -261,6 +261,7 @@ public abstract class NavigationAbstract {
+@@ -264,6 +264,7 @@ public abstract class NavigationAbstract {
          return this.c == null || this.c.b();
      }
  
diff --git a/Spigot-Server-Patches/0362-Prevent-chunk-loading-from-Fluid-Flowing.patch b/Spigot-Server-Patches/0361-Prevent-chunk-loading-from-Fluid-Flowing.patch
similarity index 98%
rename from Spigot-Server-Patches/0362-Prevent-chunk-loading-from-Fluid-Flowing.patch
rename to Spigot-Server-Patches/0361-Prevent-chunk-loading-from-Fluid-Flowing.patch
index d90bcff04e..6253fa1aea 100644
--- a/Spigot-Server-Patches/0362-Prevent-chunk-loading-from-Fluid-Flowing.patch
+++ b/Spigot-Server-Patches/0361-Prevent-chunk-loading-from-Fluid-Flowing.patch
@@ -1,4 +1,4 @@
-From c67be096b478f6cd80c274133e10a73f66320cb3 Mon Sep 17 00:00:00 2001
+From a99f18b8f595114614470c2a507b27498d468194 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/Spigot-Server-Patches/0364-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/Spigot-Server-Patches/0362-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
similarity index 99%
rename from Spigot-Server-Patches/0364-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
rename to Spigot-Server-Patches/0362-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
index 741b051d4a..cf2e9759d9 100644
--- a/Spigot-Server-Patches/0364-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
+++ b/Spigot-Server-Patches/0362-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
@@ -1,4 +1,4 @@
-From 12fc862bde751d3c9842ff5a59eb75da76f3dbac Mon Sep 17 00:00:00 2001
+From db7102f02de62cb69bcace5cb914e63e4fc2253e 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/Spigot-Server-Patches/0365-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/Spigot-Server-Patches/0363-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
similarity index 98%
rename from Spigot-Server-Patches/0365-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
rename to Spigot-Server-Patches/0363-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
index e293062efa..020daaab9a 100644
--- a/Spigot-Server-Patches/0365-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
+++ b/Spigot-Server-Patches/0363-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
@@ -1,11 +1,11 @@
-From 218e4454bb4c8e5f56a0d46a289f1621ea24fb6e Mon Sep 17 00:00:00 2001
+From b7b5152e42f0919e1199cdbe053e6ac69233aad2 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/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 84df69a00d..63e7ba9a9a 100644
+index c68cef1677..f81985a847 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -482,6 +482,7 @@ public class Chunk implements IChunkAccess {
diff --git a/Spigot-Server-Patches/0363-Prevent-pathfinding-from-loading-chunks.patch b/Spigot-Server-Patches/0363-Prevent-pathfinding-from-loading-chunks.patch
deleted file mode 100644
index 4b95ae928a..0000000000
--- a/Spigot-Server-Patches/0363-Prevent-pathfinding-from-loading-chunks.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-From d4c08451b25b657274e3ad1b3a492338e6242f08 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Mon, 10 Sep 2018 23:52:28 -0400
-Subject: [PATCH] Prevent pathfinding from loading chunks
-
-
-diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
-index 4023253f42..113fd9a50f 100644
---- a/src/main/java/net/minecraft/server/NavigationAbstract.java
-+++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
-@@ -21,13 +21,15 @@ public abstract class NavigationAbstract {
-     protected long n;
-     protected PathfinderAbstract o;
-     private BlockPosition q;
--    private Pathfinder r;
-+    private Pathfinder r; public Pathfinder getPathfinder() { return r; } // Paper - OBFHELPER
- 
-+    private void setWorld() { if (getPathfinder() != null && getPathfinder().getPathfinder() != null) getPathfinder().getPathfinder().world = getEntity().world; } // Paper
-     public NavigationAbstract(EntityInsentient entityinsentient, World world) {
-         this.a = entityinsentient;
-         this.b = world;
-         this.p = entityinsentient.getAttributeInstance(GenericAttributes.FOLLOW_RANGE);
-         this.r = this.a();
-+        setWorld(); // Paper
-     }
- 
-     public BlockPosition i() {
-@@ -166,6 +168,7 @@ public abstract class NavigationAbstract {
-     }
- 
-     public void d() {
-+        setWorld(); // Paper
-         ++this.e;
-         if (this.m) {
-             this.l();
-diff --git a/src/main/java/net/minecraft/server/Pathfinder.java b/src/main/java/net/minecraft/server/Pathfinder.java
-index 04c71ac0ef..6e583356ce 100644
---- a/src/main/java/net/minecraft/server/Pathfinder.java
-+++ b/src/main/java/net/minecraft/server/Pathfinder.java
-@@ -8,7 +8,7 @@ public class Pathfinder {
-     private final Path a = new Path();
-     private final Set<PathPoint> b = Sets.newHashSet();
-     private final PathPoint[] c = new PathPoint[32];
--    private PathfinderAbstract d;
-+    private PathfinderAbstract d; public PathfinderAbstract getPathfinder() { return d; }  // Paper - OBFHELPER
- 
-     public Pathfinder(PathfinderAbstract pathfinderabstract) {
-         this.d = pathfinderabstract;
-diff --git a/src/main/java/net/minecraft/server/PathfinderAbstract.java b/src/main/java/net/minecraft/server/PathfinderAbstract.java
-index ba7fe359fe..6716280146 100644
---- a/src/main/java/net/minecraft/server/PathfinderAbstract.java
-+++ b/src/main/java/net/minecraft/server/PathfinderAbstract.java
-@@ -3,6 +3,7 @@ package net.minecraft.server;
- public abstract class PathfinderAbstract {
-     protected IBlockAccess a;
-     protected EntityInsentient b;
-+    public World world; // Paper
-     protected final IntHashMap<PathPoint> c = new IntHashMap<PathPoint>();
-     protected int d;
-     protected int e;
-@@ -16,6 +17,7 @@ public abstract class PathfinderAbstract {
- 
-     public void a(IBlockAccess iblockaccess, EntityInsentient entityinsentient) {
-         this.a = iblockaccess;
-+        if (iblockaccess instanceof World) world = (World) iblockaccess; // Paper
-         this.b = entityinsentient;
-         this.c.c();
-         this.d = MathHelper.d(entityinsentient.width + 1.0F);
-diff --git a/src/main/java/net/minecraft/server/PathfinderNormal.java b/src/main/java/net/minecraft/server/PathfinderNormal.java
-index 64e0b08170..93f3d2e363 100644
---- a/src/main/java/net/minecraft/server/PathfinderNormal.java
-+++ b/src/main/java/net/minecraft/server/PathfinderNormal.java
-@@ -47,7 +47,7 @@ public class PathfinderNormal extends PathfinderAbstract {
-         BlockPosition blockposition2 = new BlockPosition(this.b);
-         PathType pathtype1 = this.a(this.b, blockposition2.getX(), i, blockposition2.getZ());
-         if (this.b.a(pathtype1) < 0.0F) {
--            HashSet hashset = Sets.newHashSet();
-+            HashSet<BlockPosition> hashset = Sets.newHashSet(); // Paper - decompile fix
-             hashset.add(new BlockPosition(this.b.getBoundingBox().a, (double)i, this.b.getBoundingBox().c));
-             hashset.add(new BlockPosition(this.b.getBoundingBox().a, (double)i, this.b.getBoundingBox().f));
-             hashset.add(new BlockPosition(this.b.getBoundingBox().d, (double)i, this.b.getBoundingBox().c));
-@@ -233,7 +233,7 @@ public class PathfinderNormal extends PathfinderAbstract {
-     }
- 
-     public PathType a(IBlockAccess iblockaccess, int i, int jx, int k, EntityInsentient entityinsentient, int l, int i1, int j1, boolean flag, boolean flag1) {
--        EnumSet enumset = EnumSet.noneOf(PathType.class);
-+        EnumSet<PathType> enumset = EnumSet.noneOf(PathType.class); // Paper - decompile fix
-         PathType pathtype = PathType.BLOCKED;
-         double d0 = (double)entityinsentient.width / 2.0D;
-         BlockPosition blockposition = new BlockPosition(entityinsentient);
-@@ -304,7 +304,8 @@ public class PathfinderNormal extends PathfinderAbstract {
-     public PathType a(IBlockAccess iblockaccess, int i, int jx, int k) {
-         PathType pathtype = this.b(iblockaccess, i, jx, k);
-         if (pathtype == PathType.OPEN && jx >= 1) {
--            Block block = iblockaccess.getType(new BlockPosition(i, jx - 1, k)).getBlock();
-+            Block block = world.getBlockIfLoaded(new BlockPosition(i, jx - 1, k)); // Paper
-+            if (block == null) return PathType.BLOCKED; // Paper
-             PathType pathtype1 = this.b(iblockaccess, i, jx - 1, k);
-             pathtype = pathtype1 != PathType.WALKABLE && pathtype1 != PathType.OPEN && pathtype1 != PathType.WATER && pathtype1 != PathType.LAVA ? PathType.WALKABLE : PathType.OPEN;
-             if (pathtype1 == PathType.DAMAGE_FIRE || block == Blocks.MAGMA_BLOCK) {
-@@ -326,8 +327,9 @@ public class PathfinderNormal extends PathfinderAbstract {
-                 for(int l = -1; l <= 1; ++l) {
-                     for(int i1 = -1; i1 <= 1; ++i1) {
-                         if (l != 0 || i1 != 0) {
--                            Block block = iblockaccess.getType(blockposition$b.f(l + i, jx, i1 + k)).getBlock();
--                            if (block == Blocks.CACTUS) {
-+                            Block block = world.getBlockIfLoaded(blockposition$b.f(l + i, jx, i1 + k)); // Paper
-+                            if (block == null) pathtype = PathType.BLOCKED; // Paper
-+                            else if (block == Blocks.CACTUS) { // Paper
-                                 pathtype = PathType.DANGER_CACTUS;
-                             } else if (block == Blocks.FIRE) {
-                                 pathtype = PathType.DANGER_FIRE;
-@@ -343,7 +345,8 @@ public class PathfinderNormal extends PathfinderAbstract {
- 
-     protected PathType b(IBlockAccess iblockaccess, int i, int jx, int k) {
-         BlockPosition blockposition = new BlockPosition(i, jx, k);
--        IBlockData iblockdata = iblockaccess.getType(blockposition);
-+        IBlockData iblockdata = world.getTypeIfLoaded(blockposition); // Paper
-+        if (iblockdata == null) return PathType.BLOCKED; // Paper
-         Block block = iblockdata.getBlock();
-         Material material = iblockdata.getMaterial();
-         if (iblockdata.isAir()) {
--- 
-2.19.0
-
diff --git a/Spigot-Server-Patches/0366-Prevent-mob-spawning-from-loading-generating-chunks.patch b/Spigot-Server-Patches/0364-Prevent-mob-spawning-from-loading-generating-chunks.patch
similarity index 97%
rename from Spigot-Server-Patches/0366-Prevent-mob-spawning-from-loading-generating-chunks.patch
rename to Spigot-Server-Patches/0364-Prevent-mob-spawning-from-loading-generating-chunks.patch
index 2bbdbd84e6..1e36a021b9 100644
--- a/Spigot-Server-Patches/0366-Prevent-mob-spawning-from-loading-generating-chunks.patch
+++ b/Spigot-Server-Patches/0364-Prevent-mob-spawning-from-loading-generating-chunks.patch
@@ -1,4 +1,4 @@
-From 7ec849dea852e5a0cabe8f50a086bdfc0636b78b Mon Sep 17 00:00:00 2001
+From 485ece17c4764863f24a18ee12f281e53001cee4 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
diff --git a/Spigot-Server-Patches/0367-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/Spigot-Server-Patches/0365-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 98%
rename from Spigot-Server-Patches/0367-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to Spigot-Server-Patches/0365-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
index 6eefd835d5..74ee9cf082 100644
--- a/Spigot-Server-Patches/0367-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
+++ b/Spigot-Server-Patches/0365-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
@@ -1,4 +1,4 @@
-From 39ac4e554ae280c1dd3a3cfb6be744c15ec0b266 Mon Sep 17 00:00:00 2001
+From 35b06fbc69eb0867a47bb057761d48a87e9ba5ec 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
diff --git a/Spigot-Server-Patches/0368-Optimize-and-Fix-ExpiringMap-Issues.patch b/Spigot-Server-Patches/0366-Optimize-and-Fix-ExpiringMap-Issues.patch
similarity index 99%
rename from Spigot-Server-Patches/0368-Optimize-and-Fix-ExpiringMap-Issues.patch
rename to Spigot-Server-Patches/0366-Optimize-and-Fix-ExpiringMap-Issues.patch
index 3d3b1d3d09..257158e309 100644
--- a/Spigot-Server-Patches/0368-Optimize-and-Fix-ExpiringMap-Issues.patch
+++ b/Spigot-Server-Patches/0366-Optimize-and-Fix-ExpiringMap-Issues.patch
@@ -1,4 +1,4 @@
-From 1fe8b3bfa12c02879dc017cfa6435ac9225fdf5e Mon Sep 17 00:00:00 2001
+From 4771b93f2593ee779005428247ca5f36869b20b1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 16 Sep 2018 00:00:16 -0400
 Subject: [PATCH] Optimize and Fix ExpiringMap Issues
diff --git a/Spigot-Server-Patches/0369-Implement-furnace-cook-speed-multiplier-API.patch b/Spigot-Server-Patches/0367-Implement-furnace-cook-speed-multiplier-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0369-Implement-furnace-cook-speed-multiplier-API.patch
rename to Spigot-Server-Patches/0367-Implement-furnace-cook-speed-multiplier-API.patch
index e7a4eb058d..c8c66ef38f 100644
--- a/Spigot-Server-Patches/0369-Implement-furnace-cook-speed-multiplier-API.patch
+++ b/Spigot-Server-Patches/0367-Implement-furnace-cook-speed-multiplier-API.patch
@@ -1,4 +1,4 @@
-From 2db7829c9a28d4c3029e83d3a90f918dc16ce870 Mon Sep 17 00:00:00 2001
+From 935f046149d6ddc3fd62bcebd39a34cb4511feaa 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
diff --git a/Spigot-Server-Patches/0370-Support-Overriding-World-Seeds.patch b/Spigot-Server-Patches/0368-Support-Overriding-World-Seeds.patch
similarity index 97%
rename from Spigot-Server-Patches/0370-Support-Overriding-World-Seeds.patch
rename to Spigot-Server-Patches/0368-Support-Overriding-World-Seeds.patch
index 58e68fb1b7..0c64f0119a 100644
--- a/Spigot-Server-Patches/0370-Support-Overriding-World-Seeds.patch
+++ b/Spigot-Server-Patches/0368-Support-Overriding-World-Seeds.patch
@@ -1,4 +1,4 @@
-From af345c69a55e2a31773cfb44df7b1301f8f43c44 Mon Sep 17 00:00:00 2001
+From 6af19d0d92df6bcab75e2fb3f93b71674749bbdf 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 4bb81a09a8..da710cc6fe 100644
+index 6a70e5f4f5..912c990404 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;
@@ -72,7 +72,7 @@ index 81cda5df56..fb62320310 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 a98bc4d0e1..c108b97b9b 100644
+index db07e5f9ec..1b188f96ef 100644
 --- a/src/main/java/net/minecraft/server/WorldData.java
 +++ b/src/main/java/net/minecraft/server/WorldData.java
 @@ -110,7 +110,7 @@ public class WorldData {
diff --git a/Spigot-Server-Patches/0371-Optimize-Server-World-Map.patch b/Spigot-Server-Patches/0369-Optimize-Server-World-Map.patch
similarity index 99%
rename from Spigot-Server-Patches/0371-Optimize-Server-World-Map.patch
rename to Spigot-Server-Patches/0369-Optimize-Server-World-Map.patch
index d77754ec04..4df01986a8 100644
--- a/Spigot-Server-Patches/0371-Optimize-Server-World-Map.patch
+++ b/Spigot-Server-Patches/0369-Optimize-Server-World-Map.patch
@@ -1,4 +1,4 @@
-From 821db2216e06dc3d67fb3baaffa213cf7eae7f51 Mon Sep 17 00:00:00 2001
+From 8d24c6c8e263ed28f10d5162bb8b103b7d2f977e 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
diff --git a/Spigot-Server-Patches/0372-PreSpawnerSpawnEvent.patch b/Spigot-Server-Patches/0370-PreSpawnerSpawnEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0372-PreSpawnerSpawnEvent.patch
rename to Spigot-Server-Patches/0370-PreSpawnerSpawnEvent.patch
index d18d33e72d..35c7f7b384 100644
--- a/Spigot-Server-Patches/0372-PreSpawnerSpawnEvent.patch
+++ b/Spigot-Server-Patches/0370-PreSpawnerSpawnEvent.patch
@@ -1,4 +1,4 @@
-From 259f5a016d4058c012a8a303459e2016b4f00724 Mon Sep 17 00:00:00 2001
+From 7bf3b93ce5009806e945c8a8b093f9f535a0bece Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Tue, 18 Sep 2018 23:53:23 +0100
 Subject: [PATCH] PreSpawnerSpawnEvent
diff --git a/Spigot-Server-Patches/0373-MC-134115-Fix-Double-Chest-Conversion-Error.patch b/Spigot-Server-Patches/0371-MC-134115-Fix-Double-Chest-Conversion-Error.patch
similarity index 97%
rename from Spigot-Server-Patches/0373-MC-134115-Fix-Double-Chest-Conversion-Error.patch
rename to Spigot-Server-Patches/0371-MC-134115-Fix-Double-Chest-Conversion-Error.patch
index 1b802ec5a0..5bd08b1eb2 100644
--- a/Spigot-Server-Patches/0373-MC-134115-Fix-Double-Chest-Conversion-Error.patch
+++ b/Spigot-Server-Patches/0371-MC-134115-Fix-Double-Chest-Conversion-Error.patch
@@ -1,4 +1,4 @@
-From f76e3c781a1cadadc69bb96ba9d74ef4f2e6d746 Mon Sep 17 00:00:00 2001
+From 2c5daacb9fc24c9a32b96d1e1d1201b6f04b5d01 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 20 Sep 2018 19:11:33 -0400
 Subject: [PATCH] MC-134115: Fix Double Chest Conversion Error
@@ -9,7 +9,7 @@ loss from chunks if they crossed chunk boundries.
 This fixes the issue.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 63e7ba9a9a..53aab97866 100644
+index f81985a847..9162151e2a 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -515,6 +515,26 @@ public class Chunk implements IChunkAccess {
diff --git a/Spigot-Server-Patches/0374-Catch-JsonParseException-in-Entity-and-TE-names.patch b/Spigot-Server-Patches/0372-Catch-JsonParseException-in-Entity-and-TE-names.patch
similarity index 98%
rename from Spigot-Server-Patches/0374-Catch-JsonParseException-in-Entity-and-TE-names.patch
rename to Spigot-Server-Patches/0372-Catch-JsonParseException-in-Entity-and-TE-names.patch
index 5c9f551ca0..d7cdf6ddba 100644
--- a/Spigot-Server-Patches/0374-Catch-JsonParseException-in-Entity-and-TE-names.patch
+++ b/Spigot-Server-Patches/0372-Catch-JsonParseException-in-Entity-and-TE-names.patch
@@ -1,4 +1,4 @@
-From d1f048e1a9846bf688bd9f099cdb00ae37fb4990 Mon Sep 17 00:00:00 2001
+From 3e0e589f83c3f7543cb9f7fea818f0434db58311 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
@@ -39,10 +39,10 @@ index c45c52084a..0237049a40 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 f7856897f6..e11f439ff1 100644
+index 0ef5ad1165..f70f5899fa 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
-@@ -363,4 +363,19 @@ public final class MCUtil {
+@@ -339,4 +339,19 @@ public final class MCUtil {
                  return null;
          }
      }
diff --git a/Spigot-Server-Patches/0375-Avoid-dimension-id-collisions.patch b/Spigot-Server-Patches/0373-Avoid-dimension-id-collisions.patch
similarity index 94%
rename from Spigot-Server-Patches/0375-Avoid-dimension-id-collisions.patch
rename to Spigot-Server-Patches/0373-Avoid-dimension-id-collisions.patch
index f24e1d33c7..101f71bfd7 100644
--- a/Spigot-Server-Patches/0375-Avoid-dimension-id-collisions.patch
+++ b/Spigot-Server-Patches/0373-Avoid-dimension-id-collisions.patch
@@ -1,4 +1,4 @@
-From 724231fe16ef4bf8df4ac0841d87856f67f8d21b Mon Sep 17 00:00:00 2001
+From 5d31f8028750d115f3df2006f84a83146ac04bc9 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
diff --git a/Spigot-Server-Patches/0376-Honor-EntityAgeable.ageLock.patch b/Spigot-Server-Patches/0374-Honor-EntityAgeable.ageLock.patch
similarity index 91%
rename from Spigot-Server-Patches/0376-Honor-EntityAgeable.ageLock.patch
rename to Spigot-Server-Patches/0374-Honor-EntityAgeable.ageLock.patch
index 5f180ced26..51d5707f08 100644
--- a/Spigot-Server-Patches/0376-Honor-EntityAgeable.ageLock.patch
+++ b/Spigot-Server-Patches/0374-Honor-EntityAgeable.ageLock.patch
@@ -1,4 +1,4 @@
-From 38e55d08998ee1d472135e3fe9e32628ec176e34 Mon Sep 17 00:00:00 2001
+From a41467f57d1d54423076d9bdb0755fcad6334971 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/Spigot-Server-Patches/0377-Async-Chunk-Loading-and-Generation.patch b/Spigot-Server-Patches/0375-Async-Chunk-Loading-and-Generation.patch
similarity index 99%
rename from Spigot-Server-Patches/0377-Async-Chunk-Loading-and-Generation.patch
rename to Spigot-Server-Patches/0375-Async-Chunk-Loading-and-Generation.patch
index b859d3ab10..cd367e89fd 100644
--- a/Spigot-Server-Patches/0377-Async-Chunk-Loading-and-Generation.patch
+++ b/Spigot-Server-Patches/0375-Async-Chunk-Loading-and-Generation.patch
@@ -1,4 +1,4 @@
-From 5b1ddb18ea0397774eed24f27ab4d3fe2449141c Mon Sep 17 00:00:00 2001
+From a7faf5d399919612519fa88efe145384fd12ea0c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 21 Jul 2018 16:55:04 -0400
 Subject: [PATCH] Async Chunk Loading and Generation
diff --git a/Spigot-Server-Patches/0378-Ignore-Dimension-NBT-field-in-Entity-data.patch b/Spigot-Server-Patches/0376-Ignore-Dimension-NBT-field-in-Entity-data.patch
similarity index 97%
rename from Spigot-Server-Patches/0378-Ignore-Dimension-NBT-field-in-Entity-data.patch
rename to Spigot-Server-Patches/0376-Ignore-Dimension-NBT-field-in-Entity-data.patch
index 3a1113922d..863882cdcb 100644
--- a/Spigot-Server-Patches/0378-Ignore-Dimension-NBT-field-in-Entity-data.patch
+++ b/Spigot-Server-Patches/0376-Ignore-Dimension-NBT-field-in-Entity-data.patch
@@ -1,4 +1,4 @@
-From d5fbc8011efa46a6a01adffe0d2d308e785b0e14 Mon Sep 17 00:00:00 2001
+From 504a023b16e2eb3ee750f752955f73c187126f7b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 27 Sep 2018 00:08:31 -0400
 Subject: [PATCH] Ignore Dimension NBT field in Entity data
diff --git a/Spigot-Server-Patches/0379-Fix-turtle-lag.patch b/Spigot-Server-Patches/0377-Fix-turtle-lag.patch
similarity index 93%
rename from Spigot-Server-Patches/0379-Fix-turtle-lag.patch
rename to Spigot-Server-Patches/0377-Fix-turtle-lag.patch
index 61fe0ea1ba..e204d4291b 100644
--- a/Spigot-Server-Patches/0379-Fix-turtle-lag.patch
+++ b/Spigot-Server-Patches/0377-Fix-turtle-lag.patch
@@ -1,11 +1,11 @@
-From 984c873f273e8f63bb5c4d3d5704b301a818d5f6 Mon Sep 17 00:00:00 2001
+From a5e931ce6ea72f02bb5f5791b2a15f9d622b8cab Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 28 Sep 2018 12:27:54 -0500
 Subject: [PATCH] Fix turtle lag
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java
-index 1b09f577e..4f5592d1c 100644
+index 1b09f577e9..4f5592d1c9 100644
 --- a/src/main/java/net/minecraft/server/EntityTurtle.java
 +++ b/src/main/java/net/minecraft/server/EntityTurtle.java
 @@ -599,7 +599,7 @@ public class EntityTurtle extends EntityAnimal {
diff --git a/Spigot-Server-Patches/0380-Optimize-Light-Recalculations.patch b/Spigot-Server-Patches/0378-Optimize-Light-Recalculations.patch
similarity index 98%
rename from Spigot-Server-Patches/0380-Optimize-Light-Recalculations.patch
rename to Spigot-Server-Patches/0378-Optimize-Light-Recalculations.patch
index 753fc3bcfb..aac6f2988d 100644
--- a/Spigot-Server-Patches/0380-Optimize-Light-Recalculations.patch
+++ b/Spigot-Server-Patches/0378-Optimize-Light-Recalculations.patch
@@ -1,4 +1,4 @@
-From 1b776a800b336105e8b519498c9ad387a58035b0 Mon Sep 17 00:00:00 2001
+From b4d02104e408e22e9d1216717cf27a23f7a0c589 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 28 Sep 2018 20:46:29 -0400
 Subject: [PATCH] Optimize Light Recalculations
diff --git a/Spigot-Server-Patches/0381-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch b/Spigot-Server-Patches/0379-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
similarity index 96%
rename from Spigot-Server-Patches/0381-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
rename to Spigot-Server-Patches/0379-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
index c88d1007b6..e1f20cee31 100644
--- a/Spigot-Server-Patches/0381-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
+++ b/Spigot-Server-Patches/0379-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
@@ -1,4 +1,4 @@
-From 17559df2144117d9f2ad7bf70d54fbd8d8c0a8db Mon Sep 17 00:00:00 2001
+From 1e4ac163aedb580ae00b2bb02a1a2d8d14b808a6 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
diff --git a/Spigot-Server-Patches/0382-Don-t-recheck-type-after-setting-a-block.patch b/Spigot-Server-Patches/0380-Don-t-recheck-type-after-setting-a-block.patch
similarity index 95%
rename from Spigot-Server-Patches/0382-Don-t-recheck-type-after-setting-a-block.patch
rename to Spigot-Server-Patches/0380-Don-t-recheck-type-after-setting-a-block.patch
index 68b81e786c..7168a270d4 100644
--- a/Spigot-Server-Patches/0382-Don-t-recheck-type-after-setting-a-block.patch
+++ b/Spigot-Server-Patches/0380-Don-t-recheck-type-after-setting-a-block.patch
@@ -1,4 +1,4 @@
-From ab7e26676e388e98f45d9edb6bc48c3fc2d2de7d Mon Sep 17 00:00:00 2001
+From 9fd45ea1c94c85f6d1a8e1e1674b0f8b5f6a407d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 28 Sep 2018 22:27:33 -0400
 Subject: [PATCH] Don't recheck type after setting a block
diff --git a/Spigot-Server-Patches/0383-Fix-Sending-Chunks-to-Client.patch b/Spigot-Server-Patches/0381-Fix-Sending-Chunks-to-Client.patch
similarity index 97%
rename from Spigot-Server-Patches/0383-Fix-Sending-Chunks-to-Client.patch
rename to Spigot-Server-Patches/0381-Fix-Sending-Chunks-to-Client.patch
index 480d6efdd3..e7a31df370 100644
--- a/Spigot-Server-Patches/0383-Fix-Sending-Chunks-to-Client.patch
+++ b/Spigot-Server-Patches/0381-Fix-Sending-Chunks-to-Client.patch
@@ -1,4 +1,4 @@
-From 0270355d40dd0fcd9b6d326f6d0084d07d689e49 Mon Sep 17 00:00:00 2001
+From 27b8ed81ec77a907745fc72a87e44036a067f1c2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 29 Sep 2018 01:18:16 -0400
 Subject: [PATCH] Fix Sending Chunks to Client
diff --git a/Spigot-Server-Patches/0384-Configurable-connection-throttle-kick-message.patch b/Spigot-Server-Patches/0382-Configurable-connection-throttle-kick-message.patch
similarity index 95%
rename from Spigot-Server-Patches/0384-Configurable-connection-throttle-kick-message.patch
rename to Spigot-Server-Patches/0382-Configurable-connection-throttle-kick-message.patch
index 9a1edadf88..0bbe6dea20 100644
--- a/Spigot-Server-Patches/0384-Configurable-connection-throttle-kick-message.patch
+++ b/Spigot-Server-Patches/0382-Configurable-connection-throttle-kick-message.patch
@@ -1,11 +1,11 @@
-From a08c09c59deda7061bb1b28f1b761294a1e17b4f Mon Sep 17 00:00:00 2001
+From 19ab64e9d4f2203808f7baf0fa7d45913de4f208 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 6b65364e22..ae91c8d5e3 100644
+index 2f6d7f2976..effc296e3e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -292,6 +292,11 @@ public class PaperConfig {
diff --git a/Spigot-Server-Patches/0385-Fix-FileIOThread-concurrency-issues.patch b/Spigot-Server-Patches/0383-Fix-FileIOThread-concurrency-issues.patch
similarity index 96%
rename from Spigot-Server-Patches/0385-Fix-FileIOThread-concurrency-issues.patch
rename to Spigot-Server-Patches/0383-Fix-FileIOThread-concurrency-issues.patch
index eabb9c0a70..309239085a 100644
--- a/Spigot-Server-Patches/0385-Fix-FileIOThread-concurrency-issues.patch
+++ b/Spigot-Server-Patches/0383-Fix-FileIOThread-concurrency-issues.patch
@@ -1,4 +1,4 @@
-From e6174b677b73ca1e2b00dba04697ea49e20b773f Mon Sep 17 00:00:00 2001
+From 6e01cd4caf34532a9e356ae702e8bdf732171b68 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Wed, 3 Oct 2018 19:04:53 +0100
 Subject: [PATCH] Fix FileIOThread concurrency issues