From b62dfa0bf95ac27ba0fbb3fae18c064e4bb61d50 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 28 Sep 2018 19:31:59 -0400
Subject: [PATCH] Updated Upstream (Bukkit/CraftBukkit)

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

Bukkit Changes:
39ce5d3a SPIGOT-4399: ItemMeta.equals broken with AttributeModifiers

CraftBukkit Changes:
1cf8b5dc SPIGOT-4400: Populators running on existing chunks
116cb9a1 SPIGOT-4399: Add attribute modifier equality test
5ee1c18a SPIGOT-4398: Set ASM7_EXPERIMENTAL flag
---
 ...dition-on-name-for-AttributeModifier.patch |  6 +-
 ...to-current-Chunk-for-Entity-and-Bloc.patch |  6 +-
 Spigot-Server-Patches/0009-Timings-v2.patch   | 45 ++++++++-----
 .../0028-Lighting-Queue.patch                 |  8 +--
 ...=> 0042-Add-PlayerInitialSpawnEvent.patch} |  6 +-
 ...figurable-Chunk-IO-Thread-Base-Count.patch | 43 -------------
 ...rable-Disabling-Cat-Chest-Detection.patch} |  2 +-
 ...4-Ensure-commands-are-not-ran-async.patch} |  2 +-
 ...hunks-are-slime-spawn-chunks-toggle.patch} |  2 +-
 ....patch => 0046-Optimize-Pathfinding.patch} |  4 +-
 ...pper-searches-if-there-are-no-items.patch} |  8 +--
 ...ch => 0048-Expose-server-CommandMap.patch} |  4 +-
 ...-informative-in-maxHealth-exception.patch} |  6 +-
 ...0050-Player-Tab-List-and-Title-APIs.patch} |  6 +-
 ...> 0051-Ensure-inv-drag-is-in-bounds.patch} |  6 +-
 ...ntation-of-tile-entity-removal-list.patch} |  4 +-
 ...d-configurable-portal-search-radius.patch} |  2 +-
 ...patch => 0054-Add-velocity-warnings.patch} |  8 +--
 ...le-inter-world-teleportation-safety.patch} |  4 +-
 ... 0056-Add-exception-reporting-event.patch} |  4 +-
 ...don-t-need-to-when-cerealising-text.patch} |  6 +-
 ...reboards-for-non-players-by-default.patch} |  2 +-
 ...orking-with-arrows-stuck-in-living-.patch} |  6 +-
 ... => 0060-Complete-resource-pack-API.patch} |  6 +-
 ... 0061-Chunk-save-queue-improvements.patch} | 10 +--
 ....patch => 0062-Chunk-Save-Reattempt.patch} |  4 +-
 ...ding-permissions.yml-before-plugins.patch} |  6 +-
 ...low-Reloading-of-Custom-Permissions.patch} |  4 +-
 ...h => 0065-Remove-Metadata-on-reload.patch} |  4 +-
 ...patch => 0066-Undead-horse-leashing.patch} |  2 +-
 ...67-Handle-Item-Meta-Inconsistencies.patch} |  8 +--
 ...rable-Non-Player-Arrow-Despawn-Rate.patch} |  2 +-
 ...atch => 0069-Add-World-Util-Methods.patch} |  4 +-
 ...0-Optimized-Light-Level-Comparisons.patch} |  6 +-
 ...0071-Pass-world-to-Village-creation.patch} |  4 +-
 ...-Custom-replacement-for-eaten-items.patch} |  4 +-
 ...h-absorb-values-and-repair-bad-data.patch} |  6 +-
 ...tch-Async-PlayerChunkMap-operations.patch} |  6 +-
 ...ch => 0075-Waving-banner-workaround.patch} |  4 +-
 ...76-Use-a-Shared-Random-for-Entities.patch} |  6 +-
 ...> 0077-Don-t-teleport-dead-entities.patch} |  2 +-
 ...patch => 0078-Optimize-Chunk-Access.patch} | 10 +--
 ...e-spawn-chances-for-skeleton-horses.patch} |  2 +-
 ...ocation-getType-and-getBlockData-fo.patch} |  4 +-
 ... 0081-Access-items-by-EquipmentSlot.patch} |  4 +-
 ...able-BlockPhysicsEvent-for-Redstone.patch} |  2 +-
 ...ntity-AddTo-RemoveFrom-World-Events.patch} |  2 +-
 ...-Configurable-Chunk-Inhabited-Timer.patch} |  6 +-
 ...t.patch => 0085-EntityPathfindEvent.patch} |  4 +-
 ...ce-IO-ops-opening-a-new-region-file.patch} |  4 +-
 ...gionFileCache-and-make-configurable.patch} |  6 +-
 ...h => 0088-Use-Optimized-Collections.patch} |  4 +-
 ...Do-not-load-chunks-for-light-checks.patch} |  2 +-
 ...090-Add-PlayerUseUnknownEntityEvent.patch} |  2 +-
 ...DebugInfo-not-initialized-on-client.patch} |  6 +-
 ...Configurable-Grass-Spread-Tick-Rate.patch} |  2 +-
 ...e-Keep-Spawn-Loaded-range-per-world.patch} |  2 +-
 ...-BlockPlaceEvent-triggering-physics.patch} |  2 +-
 ...m-reload-spawn-chunks-in-nether-end.patch} |  4 +-
 ...6-Remove-Debug-checks-from-DataBits.patch} |  4 +-
 ...illa-per-world-scoreboard-coloring-.patch} |  2 +-
 ...d-for-setting-passengers-on-players.patch} |  6 +-
 ...emove-unused-World-Tile-Entity-List.patch} |  2 +-
 ... 0100-Don-t-tick-Skulls-unused-code.patch} |  6 +-
 ... 0101-Configurable-Player-Collision.patch} |  6 +-
 ...nt-to-allow-plugins-to-handle-clien.patch} |  6 +-
 ...> 0103-Configurable-RCON-IP-address.patch} |  4 +-
 ...04-Prevent-Fire-from-loading-chunks.patch} |  6 +-
 ...5-Implement-PlayerLocaleChangeEvent.patch} |  8 +--
 ...tyRegainHealthEvent-isFastRegen-API.patch} |  6 +-
 ...to-configure-frosted_ice-properties.patch} |  2 +-
 ...possibility-for-getServer-singleton.patch} |  2 +-
 ...tem-frames-performance-and-bug-fixe.patch} |  2 +-
 ...API-Replenishable-Lootables-Feature.patch} |  4 +-
 ...-Do-not-load-chunks-for-pathfinding.patch} |  4 +-
 ...> 0112-Entity-Tracking-Improvements.patch} |  8 +--
 ...-scoreboard-teams-to-scoreboard.dat.patch} |  6 +-
 ...em-property-for-disabling-watchdoge.patch} |  4 +-
 ...mize-EAR.patch => 0115-Optimize-EAR.patch} |  6 +-
 ...0116-Optimize-UserCache-Thread-Safe.patch} |  6 +-
 ...locking-on-Network-Manager-creation.patch} |  4 +-
 ...-Optional-TNT-doesn-t-move-in-water.patch} |  2 +-
 ...-redstone-torch-rapid-clock-removal.patch} |  4 +-
 ...Ensure-Chunks-never-ever-load-async.patch} | 10 +--
 ...h => 0121-Add-server-name-parameter.patch} |  6 +-
 ...n-Wither-Death-sounds-to-same-world.patch} |  4 +-
 ...nk-Unloads-based-on-Player-Movement.patch} |  4 +-
 ...=> 0124-Fix-Double-World-Add-issues.patch} |  2 +-
 ...tch => 0125-Fix-Old-Sign-Conversion.patch} |  4 +-
 ...-profiles-that-have-no-UUID-and-no-.patch} |  4 +-
 ...ative-vehicle-moved-wrongly-message.patch} |  2 +-
 ...rs-that-dismount-from-other-players.patch} |  6 +-
 ...etting-for-proxy-online-mode-status.patch} |  6 +-
 ...-BlockStateEnum-hashCode-and-equals.patch} |  4 +-
 ...0131-Disable-ticking-of-snow-blocks.patch} |  4 +-
 ...32-Fix-AIOOBE-in-inventory-handling.patch} |  2 +-
 ...nfigurable-packet-in-spam-threshold.patch} |  6 +-
 ...4-Configurable-flying-kick-messages.patch} |  8 +--
 ...atch => 0135-Auto-Save-Improvements.patch} | 10 +--
 ...ch => 0136-Chunk-registration-fixes.patch} |  2 +-
 ...k-reference-on-Craft-Entity-removal.patch} |  4 +-
 ...to-fix-bad-Y-levels-on-player-login.patch} |  6 +-
 ...ch => 0139-Disable-Vanilla-Chunk-GC.patch} |  6 +-
 ...ion-to-remove-corrupt-tile-entities.patch} |  4 +-
 ...nt.patch => 0141-Add-EntityZapEvent.patch} |  8 +--
 ...hunks-from-Hoppers-and-other-things.patch} |  4 +-
 ...ent-Auto-Save-if-Save-Queue-is-full.patch} |  2 +-
 ... 0144-Chunk-Save-Stats-Debug-Option.patch} |  2 +-
 ...-from-ArmorStand-and-SpawnEgg-items.patch} |  2 +-
 ...46-Cache-user-authenticator-threads.patch} |  4 +-
 ....patch => 0147-Optimise-removeQueue.patch} |  6 +-
 ...-Allow-Reloading-of-Command-Aliases.patch} |  4 +-
 ...-Add-source-to-PlayerExpChangeEvent.patch} |  6 +-
 ...mize-World.isLoaded-BlockPosition-Z.patch} |  2 +-
 ...-Don-t-let-fishinghooks-use-portals.patch} |  6 +-
 ... => 0152-Add-ProjectileCollideEvent.patch} | 12 ++--
 ...ent-Pathfinding-out-of-World-Border.patch} |  4 +-
 ...Bound-Treasure-Maps-to-World-Border.patch} |  6 +-
 ...igurable-Cartographer-Treasure-Maps.patch} |  2 +-
 ... => 0156-Optimize-ItemStack.isEmpty.patch} |  4 +-
 ...o-control-if-armour-stands-can-move.patch} |  4 +-
 ...option-to-remove-invalid-statistics.patch} |  6 +-
 ...9-Properly-fix-item-duplication-bug.patch} |  2 +-
 ...=> 0160-String-based-Action-Bar-API.patch} |  8 +--
 ... 0161-Activation-Range-Improvements.patch} |  8 +--
 ...-API-s.patch => 0162-Firework-API-s.patch} |  4 +-
 ... 0163-PlayerTeleportEndGatewayEvent.patch} |  4 +-
 ... => 0164-ShulkerBox-Dupe-Prevention.patch} |  4 +-
 ...ovide-E-TE-Chunk-count-stat-methods.patch} |  4 +-
 ...h => 0166-Enforce-Sync-Player-Saves.patch} |  4 +-
 ... => 0167-Enforce-Sync-Chunk-Unloads.patch} |  2 +-
 ...low-entities-to-ride-themselves-572.patch} |  2 +-
 ...atch => 0169-Fix-block-break-desync.patch} |  2 +-
 ...I-for-Reason-Source-Triggering-play.patch} |  2 +-
 ...patch => 0171-Cap-Entity-Collisions.patch} |  4 +-
 ...-CraftScheduler-Async-Task-Debugger.patch} |  4 +-
 ...g.patch => 0173-Shame-on-you-Mojang.patch} |  4 +-
 ...ore-aggressive-in-the-chunk-unload-.patch} |  6 +-
 ...> 0175-Do-not-let-armorstands-drown.patch} |  6 +-
 ...e-async-calls-to-restart-the-server.patch} |  6 +-
 ...roperty-to-disable-book-size-limits.patch} |  4 +-
 ...e-parrots-stay-on-shoulders-despite.patch} |  2 +-
 ...-option-to-prevent-player-names-fro.patch} |  6 +-
 ...leAppender-for-console-improvements.patch} | 28 ++++----
 ...rable-option-to-disable-creeper-lin.patch} |  2 +-
 ....patch => 0182-Item-canEntityPickup.patch} |  4 +-
 ...layerPickupItemEvent-setFlyAtPlayer.patch} |  4 +-
 ...> 0184-PlayerAttemptPickupItemEvent.patch} |  4 +-
 ...tch => 0185-Add-UnknownCommandEvent.patch} |  4 +-
 ...tch => 0186-Basic-PlayerProfile-API.patch} | 20 +++---
 ... 0187-Shoulder-Entities-Release-API.patch} |  8 +--
 ...patch => 0188-Profile-Lookup-Events.patch} |  4 +-
 ...layer-logins-during-server-shutdown.patch} |  4 +-
 ...patch => 0190-Entity-fromMobSpawner.patch} |  2 +-
 ...0191-Fix-Anvil-Level-sync-to-client.patch} |  6 +-
 ...ages-for-getTileEntity-in-order-to-.patch} |  6 +-
 ...3-Improve-the-Saddle-API-for-Horses.patch} |  4 +-
 ...plement-ensureServerConversions-API.patch} |  6 +-
 ...> 0195-Implement-getI18NDisplayName.patch} |  4 +-
 ...ving-disabled-before-unloading-all-.patch} |  6 +-
 ...=> 0197-ProfileWhitelistVerifyEvent.patch} |  4 +-
 ...ch => 0198-Fix-this-stupid-bullshit.patch} |  4 +-
 ...wns-should-honor-nametags-and-leash.patch} |  4 +-
 ...mer-when-spawner-event-is-cancelled.patch} |  2 +-
 ...1-Fix-MC-117075-TE-Unload-Lag-Spike.patch} |  2 +-
 ...a-custom-authentication-servers-dow.patch} |  6 +-
 ...atch => 0203-LivingEntity-setKiller.patch} |  4 +-
 ...ms-to-redirect-System.out-err-to-lo.patch} |  8 +--
 ...-prefixes-using-Log4J-configuration.patch} |  6 +-
 ...Include-Log4J2-SLF4J-implementation.patch} |  6 +-
 ...efix-for-various-plugins-bypassing-.patch} |  4 +-
 ...t.patch => 0208-Add-PlayerJumpEvent.patch} |  2 +-
 ...-handle-PacketPlayInKeepAlive-async.patch} |  2 +-
 ...t-protocol-version-and-virtual-host.patch} |  6 +-
 ...t-serverside-behavior-of-keepalives.patch} |  6 +-
 ...ith-fastutil-s-ObjectOpenHashSet-in.patch} |  4 +-
 ...Effects-only-to-players-who-can-see.patch} |  2 +-
 ...maximum-exp-value-when-merging-orbs.patch} |  2 +-
 ... => 0215-Add-PlayerArmorChangeEvent.patch} |  6 +-
 ...om-being-processed-when-the-player-.patch} |  4 +-
 ...-implementations-for-captured-block.patch} |  2 +-
 ...get-a-BlockState-without-a-snapshot.patch} | 10 +--
 ...patch => 0219-AsyncTabCompleteEvent.patch} |  2 +-
 ...20-Avoid-NPE-in-PathfinderGoalTempt.patch} |  4 +-
 ...=> 0221-PlayerPickupExperienceEvent.patch} |  4 +-
 ...tch => 0222-ExperienceOrbMergeEvent.patch} |  2 +-
 ...-Ability-to-apply-mending-to-XP-API.patch} |  6 +-
 ...rable-Chunks-Sends-per-Tick-setting.patch} |  2 +-
 ...onfigurable-Max-Chunk-Gens-per-Tick.patch} |  6 +-
 ...max-squid-spawn-height-configurable.patch} |  2 +-
 ...patch => 0227-PreCreatureSpawnEvent.patch} |  8 +--
 ...-PlayerNaturallySpawnCreaturesEvent.patch} |  6 +-
 ...Add-setPlayerProfile-API-for-Skulls.patch} |  4 +-
 ...> 0230-Fill-Profile-Property-Events.patch} |  4 +-
 ...layerAdvancementCriterionGrantEvent.patch} |  4 +-
 ...ch => 0232-Add-ArmorStand-Item-Meta.patch} | 20 +++---
 ...Extend-Player-Interact-cancellation.patch} |  4 +-
 ... 0234-Tameable-getOwnerUniqueId-API.patch} |  4 +-
 ...-crits-helps-mitigate-hacked-client.patch} |  2 +-
 ...ing-location-from-InventoryEnderChe.patch} |  4 +-
 ...ted-Ice-from-loading-holding-chunks.patch} |  4 +-
 ...e-Explicit-Network-Manager-Flushing.patch} |  4 +-
 ...t-extended-PaperServerListPingEvent.patch} |  4 +-
 ... 0240-Improved-Async-Task-Scheduler.patch} |  4 +-
 ...-PlayerProfile-in-AsyncPreLoginEven.patch} |  4 +-
 ...-PortalCreateEvent-for-exit-portals.patch} |  4 +-
 ...=> 0243-Player.setPlayerProfile-API.patch} |  8 +--
 ...h => 0244-Fix-Dragon-Server-Crashes.patch} |  4 +-
 ...patch => 0245-getPlayerUniqueId-API.patch} |  4 +-
 ...ake-player-data-saving-configurable.patch} |  6 +-
 ...e-legacy-ping-handler-more-reliable.patch} |  4 +-
 ...erverListPingEvent-for-legacy-pings.patch} |  4 +-
 ...9-Flag-to-disable-the-channel-limit.patch} |  6 +-
 ...-method-to-open-already-placed-sign.patch} |  4 +-
 ...oad-version-history-at-server-start.patch} |  6 +-
 ...rable-sprint-interruption-on-attack.patch} |  2 +-
 ...allowed-colored-signs-to-be-created.patch} |  2 +-
 ...t.patch => 0254-EndermanEscapeEvent.patch} |  4 +-
 ...h => 0255-Enderman.teleportRandomly.patch} |  4 +-
 ...256-Block-Enderpearl-Travel-Exploit.patch} |  2 +-
 ...d.spawnParticle-API-and-add-Builder.patch} |  2 +-
 ...h => 0258-EndermanAttackPlayerEvent.patch} |  4 +-
 ...tch => 0259-WitchConsumePotionEvent.patch} |  4 +-
 ...patch => 0260-WitchThrowPotionEvent.patch} |  4 +-
 ...tem-entities-with-World.spawnEntity.patch} |  2 +-
 ...oad-chunks-for-villager-door-checks.patch} |  4 +-
 ...patch => 0263-WitchReadyPotionEvent.patch} |  4 +-
 ...264-ItemStack-getMaxItemUseDuration.patch} |  6 +-
 ...ement-EntityTeleportEndGatewayEvent.patch} |  4 +-
 ...d-flag-on-cancel-of-Explosion-Event.patch} |  4 +-
 ...move-entities-on-dimension-teleport.patch} |  2 +-
 ...ch => 0268-Fix-CraftEntity-hashCode.patch} |  4 +-
 ...e-Alternative-LootPool-Luck-Formula.patch} |  6 +-
 ...ls-when-failing-to-save-player-data.patch} |  4 +-
 ...-shield-blocking-delay-configurable.patch} |  2 +-
 ...cipes-in-RecipeBook-to-avoid-data-e.patch} |  4 +-
 ...nt-consumeArrow-and-getArrowItem-AP.patch} |  8 +--
 ...patch => 0274-PlayerReadyArrowEvent.patch} |  4 +-
 ...-EntityShootBowEvent-for-Illusioner.patch} |  4 +-
 ...lement-EntityKnockbackByEntityEvent.patch} |  6 +-
 ...patch => 0277-Expand-Explosions-API.patch} |  2 +-
 ...vingEntity-Hand-Raised-Item-Use-API.patch} |  6 +-
 ...-API.patch => 0279-RangedEntity-API.patch} |  4 +-
 ...eHitEvent-to-include-the-BlockFace-.patch} |  4 +-
 ...o-disable-ender-dragon-legacy-check.patch} |  2 +-
 ...-Implement-World.getEntity-UUID-API.patch} |  2 +-
 ...0283-InventoryCloseEvent-Reason-API.patch} | 10 +--
 ...ps-for-Entity-TileEntity-Current-Ch.patch} |  4 +-
 ...0285-Configurable-Bed-Search-Radius.patch} |  2 +-
 ...I.patch => 0286-Vex-getSummoner-API.patch} |  4 +-
 ...ventory-when-cancelling-PlayerInter.patch} |  2 +-
 ...e-the-Entity-Random-seed-for-squids.patch} |  4 +-
 ...illa-entity-warnings-for-duplicates.patch} |  6 +-
 ...pawn-if-entity-is-in-a-chunk-schedu.patch} |  4 +-
 ...-if-stack-size-above-max-stack-size.patch} |  4 +-
 ...92-Use-asynchronous-Log4j-2-loggers.patch} |  6 +-
 ...more-information-to-Entity.toString.patch} |  2 +-
 ...es-option-to-debug-dupe-uuid-issues.patch} |  8 +--
 ...ts.patch => 0295-EnderDragon-Events.patch} |  4 +-
 ...atch => 0296-PlayerElytraBoostEvent.patch} |  4 +-
 ...=> 0297-PlayerLaunchProjectileEvent.patch} |  4 +-
 ... 0298-Duplicate-UUID-Resolve-Option.patch} |  4 +-
 ...Speedup-BlockPos-by-fixing-inlining.patch} |  2 +-
 ...tch => 0300-Don-t-save-Proto-Chunks.patch} |  2 +-
 ...patch => 0301-Optimize-RegistryID.c.patch} |  2 +-
 ...-armor-stands-from-doing-entity-loo.patch} |  2 +-
 ...-Vanished-players-don-t-have-rights.patch} |  2 +-
 ...anytime-entities-change-to-guarante.patch} |  4 +-
 ...d-some-Debug-to-Chunk-Entity-slices.patch} |  6 +-
 ... => 0306-Optimize-Region-File-Cache.patch} |  2 +-
 ...atch => 0307-EntityTransformedEvent.patch} |  2 +-
 ...tch => 0308-SkeletonHorse-Additions.patch} |  2 +-
 ...event-Saving-Bad-entities-to-chunks.patch} |  2 +-
 ...n-t-call-getItemMeta-on-hasItemMeta.patch} | 10 +--
 ...ocess-chunk-removal-in-removeEntity.patch} |  2 +-
 ...ad-Entities-in-entityList-iteration.patch} |  2 +-
 ...-use-a-versioned-world-folder-for-t.patch} |  6 +-
 ...14-MC-111480-Start-Entity-ID-s-at-1.patch} |  2 +-
 ...5-Implement-Expanded-ArmorStand-API.patch} |  2 +-
 ...vent.patch => 0316-AnvilDamageEvent.patch} |  2 +-
 ...ld-EntityHuman-Lookup-Optimizations.patch} |  2 +-
 ...ent.patch => 0318-Add-TNTPrimeEvent.patch} |  2 +-
 ...d-make-tab-spam-limits-configurable.patch} |  6 +-
 ...ortation-adjustment-math-more-accur.patch} |  2 +-
 ...h => 0321-Add-hand-to-bucket-events.patch} |  2 +-
 ...-Experience-should-save-as-Integers.patch} |  2 +-
 ...h => 0323-Entity-add-to-world-fixes.patch} |  4 +-
 ...ent-rendering-skulls-from-same-user.patch} |  2 +-
 ...d-Early-Warning-Feature-to-WatchDog.patch} |  6 +-
 ...0326-Make-EnderDragon-implement-Mob.patch} |  2 +-
 ...ect-and-repair-corrupt-Region-Files.patch} |  2 +-
 ...8-Use-ConcurrentHashMap-in-JsonList.patch} |  2 +-
 ...9-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} |  2 +-
 ...ts-from-world-player-list-not-serve.patch} |  2 +-
 ...0334-Cache-World-Entity-Type-counts.patch} |  2 +-
 ...tore-vanlla-default-mob-spawn-range.patch} |  2 +-
 ...pers.patch => 0336-Optimize-Hoppers.patch} |  2 +-
 ...37-Optimize-CraftBlockData-Creation.patch} |  2 +-
 ...-124320.patch => 0338-Fix-MC-124320.patch} |  2 +-
 ...tch => 0339-Slime-Pathfinder-Events.patch} |  2 +-
 ...d-source-block-to-BlockPhysicsEvent.patch} |  2 +-
 ...2-Anti-Xray.patch => 0341-Anti-Xray.patch} | 29 ++++-----
 ...e-speed-for-water-flowing-over-lava.patch} |  2 +-
 ... => 0343-Optimize-RegistryMaterials.patch} |  2 +-
 ...ch => 0344-Add-PhantomPreSpawnEvent.patch} |  2 +-
 ....patch => 0345-Add-More-Creeper-API.patch} |  2 +-
 ...patch => 0346-Optimize-Chunk-getPos.patch} |  8 +--
 ...se-an-EnumMap-for-Chunk-Height-Maps.patch} |  4 +-
 ...48-Implement-Force-Loaded-Chunk-API.patch} |  2 +-
 ...=> 0349-Inventory-removeItemAnySlot.patch} |  2 +-
 ...ptimize-getChunkIfLoaded-type-calls.patch} |  2 +-
 ...51-Don-t-double-add-golems-to-world.patch} |  2 +-
 ...fix-newlines-in-spigot-tab-list-API.patch} |  4 +-
 ...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} |  4 +-
 ...358-Fix-1420.patch => 0357-Fix-1420.patch} |  2 +-
 ...-load-entity-AABB-to-prevent-wobble.patch} |  2 +-
 ....patch => 0359-Improve-death-events.patch} |  4 +-
 ...w-chests-to-be-placed-with-NBT-data.patch} |  2 +-
 ...I.patch => 0361-Mob-Pathfinding-API.patch} |  2 +-
 ...nt-chunk-loading-from-Fluid-Flowing.patch} |  2 +-
 ...ent-pathfinding-from-loading-chunks.patch} |  2 +-
 ...for-CanPlaceOn-and-CanDestroy-NBT-v.patch} |  2 +-
 ...nt-Mob-AI-Rules-from-Loading-Chunks.patch} |  4 +-
 ...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 +-
 ...0370-Support-Overriding-World-Seeds.patch} |  6 +-
 ...h => 0371-Optimize-Server-World-Map.patch} |  2 +-
 ....patch => 0372-PreSpawnerSpawnEvent.patch} |  2 +-
 ...5-Fix-Double-Chest-Conversion-Error.patch} |  4 +-
 ...rseException-in-Entity-and-TE-names.patch} |  2 +-
 ... 0375-Avoid-dimension-id-collisions.patch} |  2 +-
 ...ntal-ASM-support-for-Java-11-plugins.patch | 42 ------------
 ...=> 0376-Honor-EntityAgeable.ageLock.patch} |  2 +-
 ...-Async-Chunk-Loading-and-Generation.patch} | 64 +++----------------
 ...-Dimension-NBT-field-in-Entity-data.patch} |  2 +-
 ...le-lag.patch => 0379-Fix-turtle-lag.patch} |  4 +-
 work/Bukkit                                   |  2 +-
 work/CraftBukkit                              |  2 +-
 346 files changed, 758 insertions(+), 881 deletions(-)
 rename Spigot-Server-Patches/{0043-Add-PlayerInitialSpawnEvent.patch => 0042-Add-PlayerInitialSpawnEvent.patch} (94%)
 delete mode 100644 Spigot-Server-Patches/0042-Configurable-Chunk-IO-Thread-Base-Count.patch
 rename Spigot-Server-Patches/{0044-Configurable-Disabling-Cat-Chest-Detection.patch => 0043-Configurable-Disabling-Cat-Chest-Detection.patch} (96%)
 rename Spigot-Server-Patches/{0045-Ensure-commands-are-not-ran-async.patch => 0044-Ensure-commands-are-not-ran-async.patch} (98%)
 rename Spigot-Server-Patches/{0046-All-chunks-are-slime-spawn-chunks-toggle.patch => 0045-All-chunks-are-slime-spawn-chunks-toggle.patch} (96%)
 rename Spigot-Server-Patches/{0047-Optimize-Pathfinding.patch => 0046-Optimize-Pathfinding.patch} (95%)
 rename Spigot-Server-Patches/{0048-Avoid-hopper-searches-if-there-are-no-items.patch => 0047-Avoid-hopper-searches-if-there-are-no-items.patch} (94%)
 rename Spigot-Server-Patches/{0049-Expose-server-CommandMap.patch => 0048-Expose-server-CommandMap.patch} (85%)
 rename Spigot-Server-Patches/{0050-Be-a-bit-more-informative-in-maxHealth-exception.patch => 0049-Be-a-bit-more-informative-in-maxHealth-exception.patch} (92%)
 rename Spigot-Server-Patches/{0051-Player-Tab-List-and-Title-APIs.patch => 0050-Player-Tab-List-and-Title-APIs.patch} (98%)
 rename Spigot-Server-Patches/{0052-Ensure-inv-drag-is-in-bounds.patch => 0051-Ensure-inv-drag-is-in-bounds.patch} (89%)
 rename Spigot-Server-Patches/{0053-Change-implementation-of-tile-entity-removal-list.patch => 0052-Change-implementation-of-tile-entity-removal-list.patch} (95%)
 rename Spigot-Server-Patches/{0054-Add-configurable-portal-search-radius.patch => 0053-Add-configurable-portal-search-radius.patch} (97%)
 rename Spigot-Server-Patches/{0055-Add-velocity-warnings.patch => 0054-Add-velocity-warnings.patch} (96%)
 rename Spigot-Server-Patches/{0056-Configurable-inter-world-teleportation-safety.patch => 0055-Configurable-inter-world-teleportation-safety.patch} (97%)
 rename Spigot-Server-Patches/{0057-Add-exception-reporting-event.patch => 0056-Add-exception-reporting-event.patch} (99%)
 rename Spigot-Server-Patches/{0058-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch => 0057-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch} (92%)
 rename Spigot-Server-Patches/{0059-Disable-Scoreboards-for-non-players-by-default.patch => 0058-Disable-Scoreboards-for-non-players-by-default.patch} (97%)
 rename Spigot-Server-Patches/{0060-Add-methods-for-working-with-arrows-stuck-in-living-.patch => 0059-Add-methods-for-working-with-arrows-stuck-in-living-.patch} (89%)
 rename Spigot-Server-Patches/{0061-Complete-resource-pack-API.patch => 0060-Complete-resource-pack-API.patch} (95%)
 rename Spigot-Server-Patches/{0062-Chunk-save-queue-improvements.patch => 0061-Chunk-save-queue-improvements.patch} (96%)
 rename Spigot-Server-Patches/{0063-Chunk-Save-Reattempt.patch => 0062-Chunk-Save-Reattempt.patch} (97%)
 rename Spigot-Server-Patches/{0064-Default-loading-permissions.yml-before-plugins.patch => 0063-Default-loading-permissions.yml-before-plugins.patch} (94%)
 rename Spigot-Server-Patches/{0065-Allow-Reloading-of-Custom-Permissions.patch => 0064-Allow-Reloading-of-Custom-Permissions.patch} (93%)
 rename Spigot-Server-Patches/{0066-Remove-Metadata-on-reload.patch => 0065-Remove-Metadata-on-reload.patch} (92%)
 rename Spigot-Server-Patches/{0067-Undead-horse-leashing.patch => 0066-Undead-horse-leashing.patch} (96%)
 rename Spigot-Server-Patches/{0068-Handle-Item-Meta-Inconsistencies.patch => 0067-Handle-Item-Meta-Inconsistencies.patch} (98%)
 rename Spigot-Server-Patches/{0069-Configurable-Non-Player-Arrow-Despawn-Rate.patch => 0068-Configurable-Non-Player-Arrow-Despawn-Rate.patch} (97%)
 rename Spigot-Server-Patches/{0070-Add-World-Util-Methods.patch => 0069-Add-World-Util-Methods.patch} (98%)
 rename Spigot-Server-Patches/{0071-Optimized-Light-Level-Comparisons.patch => 0070-Optimized-Light-Level-Comparisons.patch} (98%)
 rename Spigot-Server-Patches/{0072-Pass-world-to-Village-creation.patch => 0071-Pass-world-to-Village-creation.patch} (95%)
 rename Spigot-Server-Patches/{0073-Custom-replacement-for-eaten-items.patch => 0072-Custom-replacement-for-eaten-items.patch} (95%)
 rename Spigot-Server-Patches/{0074-handle-NaN-health-absorb-values-and-repair-bad-data.patch => 0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch} (94%)
 rename Spigot-Server-Patches/{0075-Catch-Async-PlayerChunkMap-operations.patch => 0074-Catch-Async-PlayerChunkMap-operations.patch} (88%)
 rename Spigot-Server-Patches/{0076-Waving-banner-workaround.patch => 0075-Waving-banner-workaround.patch} (94%)
 rename Spigot-Server-Patches/{0077-Use-a-Shared-Random-for-Entities.patch => 0076-Use-a-Shared-Random-for-Entities.patch} (94%)
 rename Spigot-Server-Patches/{0078-Don-t-teleport-dead-entities.patch => 0077-Don-t-teleport-dead-entities.patch} (94%)
 rename Spigot-Server-Patches/{0079-Optimize-Chunk-Access.patch => 0078-Optimize-Chunk-Access.patch} (94%)
 rename Spigot-Server-Patches/{0080-Configurable-spawn-chances-for-skeleton-horses.patch => 0079-Configurable-spawn-chances-for-skeleton-horses.patch} (97%)
 rename Spigot-Server-Patches/{0081-Optimize-isValidLocation-getType-and-getBlockData-fo.patch => 0080-Optimize-isValidLocation-getType-and-getBlockData-fo.patch} (98%)
 rename Spigot-Server-Patches/{0082-Access-items-by-EquipmentSlot.patch => 0081-Access-items-by-EquipmentSlot.patch} (96%)
 rename Spigot-Server-Patches/{0083-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch => 0082-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch} (98%)
 rename Spigot-Server-Patches/{0084-Entity-AddTo-RemoveFrom-World-Events.patch => 0083-Entity-AddTo-RemoveFrom-World-Events.patch} (94%)
 rename Spigot-Server-Patches/{0085-Configurable-Chunk-Inhabited-Timer.patch => 0084-Configurable-Chunk-Inhabited-Timer.patch} (89%)
 rename Spigot-Server-Patches/{0086-EntityPathfindEvent.patch => 0085-EntityPathfindEvent.patch} (96%)
 rename Spigot-Server-Patches/{0087-Reduce-IO-ops-opening-a-new-region-file.patch => 0086-Reduce-IO-ops-opening-a-new-region-file.patch} (96%)
 rename Spigot-Server-Patches/{0088-Sanitise-RegionFileCache-and-make-configurable.patch => 0087-Sanitise-RegionFileCache-and-make-configurable.patch} (95%)
 rename Spigot-Server-Patches/{0089-Use-Optimized-Collections.patch => 0088-Use-Optimized-Collections.patch} (96%)
 rename Spigot-Server-Patches/{0090-Do-not-load-chunks-for-light-checks.patch => 0089-Do-not-load-chunks-for-light-checks.patch} (94%)
 rename Spigot-Server-Patches/{0091-Add-PlayerUseUnknownEntityEvent.patch => 0090-Add-PlayerUseUnknownEntityEvent.patch} (96%)
 rename Spigot-Server-Patches/{0092-Fix-reducedDebugInfo-not-initialized-on-client.patch => 0091-Fix-reducedDebugInfo-not-initialized-on-client.patch} (91%)
 rename Spigot-Server-Patches/{0093-Configurable-Grass-Spread-Tick-Rate.patch => 0092-Configurable-Grass-Spread-Tick-Rate.patch} (96%)
 rename Spigot-Server-Patches/{0094-Configurable-Keep-Spawn-Loaded-range-per-world.patch => 0093-Configurable-Keep-Spawn-Loaded-range-per-world.patch} (98%)
 rename Spigot-Server-Patches/{0095-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch => 0094-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch} (93%)
 rename Spigot-Server-Patches/{0096-Don-t-spam-reload-spawn-chunks-in-nether-end.patch => 0095-Don-t-spam-reload-spawn-chunks-in-nether-end.patch} (94%)
 rename Spigot-Server-Patches/{0097-Remove-Debug-checks-from-DataBits.patch => 0096-Remove-Debug-checks-from-DataBits.patch} (95%)
 rename Spigot-Server-Patches/{0098-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch => 0097-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch} (97%)
 rename Spigot-Server-Patches/{0099-Workaround-for-setting-passengers-on-players.patch => 0098-Workaround-for-setting-passengers-on-players.patch} (91%)
 rename Spigot-Server-Patches/{0100-Remove-unused-World-Tile-Entity-List.patch => 0099-Remove-unused-World-Tile-Entity-List.patch} (98%)
 rename Spigot-Server-Patches/{0101-Don-t-tick-Skulls-unused-code.patch => 0100-Don-t-tick-Skulls-unused-code.patch} (87%)
 rename Spigot-Server-Patches/{0102-Configurable-Player-Collision.patch => 0101-Configurable-Player-Collision.patch} (97%)
 rename Spigot-Server-Patches/{0103-Add-handshake-event-to-allow-plugins-to-handle-clien.patch => 0102-Add-handshake-event-to-allow-plugins-to-handle-clien.patch} (96%)
 rename Spigot-Server-Patches/{0104-Configurable-RCON-IP-address.patch => 0103-Configurable-RCON-IP-address.patch} (93%)
 rename Spigot-Server-Patches/{0105-Prevent-Fire-from-loading-chunks.patch => 0104-Prevent-Fire-from-loading-chunks.patch} (95%)
 rename Spigot-Server-Patches/{0106-Implement-PlayerLocaleChangeEvent.patch => 0105-Implement-PlayerLocaleChangeEvent.patch} (95%)
 rename Spigot-Server-Patches/{0107-EntityRegainHealthEvent-isFastRegen-API.patch => 0106-EntityRegainHealthEvent-isFastRegen-API.patch} (95%)
 rename Spigot-Server-Patches/{0108-Add-ability-to-configure-frosted_ice-properties.patch => 0107-Add-ability-to-configure-frosted_ice-properties.patch} (98%)
 rename Spigot-Server-Patches/{0109-remove-null-possibility-for-getServer-singleton.patch => 0108-remove-null-possibility-for-getServer-singleton.patch} (96%)
 rename Spigot-Server-Patches/{0110-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch => 0109-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch} (99%)
 rename Spigot-Server-Patches/{0111-LootTable-API-Replenishable-Lootables-Feature.patch => 0110-LootTable-API-Replenishable-Lootables-Feature.patch} (99%)
 rename Spigot-Server-Patches/{0112-Do-not-load-chunks-for-pathfinding.patch => 0111-Do-not-load-chunks-for-pathfinding.patch} (91%)
 rename Spigot-Server-Patches/{0113-Entity-Tracking-Improvements.patch => 0112-Entity-Tracking-Improvements.patch} (96%)
 rename Spigot-Server-Patches/{0114-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch => 0113-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch} (91%)
 rename Spigot-Server-Patches/{0115-System-property-for-disabling-watchdoge.patch => 0114-System-property-for-disabling-watchdoge.patch} (92%)
 rename Spigot-Server-Patches/{0116-Optimize-EAR.patch => 0115-Optimize-EAR.patch} (96%)
 rename Spigot-Server-Patches/{0117-Optimize-UserCache-Thread-Safe.patch => 0116-Optimize-UserCache-Thread-Safe.patch} (97%)
 rename Spigot-Server-Patches/{0118-Avoid-blocking-on-Network-Manager-creation.patch => 0117-Avoid-blocking-on-Network-Manager-creation.patch} (97%)
 rename Spigot-Server-Patches/{0119-Optional-TNT-doesn-t-move-in-water.patch => 0118-Optional-TNT-doesn-t-move-in-water.patch} (98%)
 rename Spigot-Server-Patches/{0120-Faster-redstone-torch-rapid-clock-removal.patch => 0119-Faster-redstone-torch-rapid-clock-removal.patch} (96%)
 rename Spigot-Server-Patches/{0121-Ensure-Chunks-never-ever-load-async.patch => 0120-Ensure-Chunks-never-ever-load-async.patch} (92%)
 rename Spigot-Server-Patches/{0122-Add-server-name-parameter.patch => 0121-Add-server-name-parameter.patch} (89%)
 rename Spigot-Server-Patches/{0123-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch => 0122-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch} (97%)
 rename Spigot-Server-Patches/{0124-Delay-Chunk-Unloads-based-on-Player-Movement.patch => 0123-Delay-Chunk-Unloads-based-on-Player-Movement.patch} (98%)
 rename Spigot-Server-Patches/{0125-Fix-Double-World-Add-issues.patch => 0124-Fix-Double-World-Add-issues.patch} (96%)
 rename Spigot-Server-Patches/{0126-Fix-Old-Sign-Conversion.patch => 0125-Fix-Old-Sign-Conversion.patch} (98%)
 rename Spigot-Server-Patches/{0127-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch => 0126-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch} (93%)
 rename Spigot-Server-Patches/{0128-More-informative-vehicle-moved-wrongly-message.patch => 0127-More-informative-vehicle-moved-wrongly-message.patch} (94%)
 rename Spigot-Server-Patches/{0129-Re-track-players-that-dismount-from-other-players.patch => 0128-Re-track-players-that-dismount-from-other-players.patch} (90%)
 rename Spigot-Server-Patches/{0130-Add-setting-for-proxy-online-mode-status.patch => 0129-Add-setting-for-proxy-online-mode-status.patch} (94%)
 rename Spigot-Server-Patches/{0131-Optimise-BlockStateEnum-hashCode-and-equals.patch => 0130-Optimise-BlockStateEnum-hashCode-and-equals.patch} (97%)
 rename Spigot-Server-Patches/{0132-Disable-ticking-of-snow-blocks.patch => 0131-Disable-ticking-of-snow-blocks.patch} (92%)
 rename Spigot-Server-Patches/{0133-Fix-AIOOBE-in-inventory-handling.patch => 0132-Fix-AIOOBE-in-inventory-handling.patch} (94%)
 rename Spigot-Server-Patches/{0134-Configurable-packet-in-spam-threshold.patch => 0133-Configurable-packet-in-spam-threshold.patch} (93%)
 rename Spigot-Server-Patches/{0135-Configurable-flying-kick-messages.patch => 0134-Configurable-flying-kick-messages.patch} (92%)
 rename Spigot-Server-Patches/{0136-Auto-Save-Improvements.patch => 0135-Auto-Save-Improvements.patch} (97%)
 rename Spigot-Server-Patches/{0137-Chunk-registration-fixes.patch => 0136-Chunk-registration-fixes.patch} (93%)
 rename Spigot-Server-Patches/{0138-Remove-FishingHook-reference-on-Craft-Entity-removal.patch => 0137-Remove-FishingHook-reference-on-Craft-Entity-removal.patch} (92%)
 rename Spigot-Server-Patches/{0139-Auto-fix-bad-Y-levels-on-player-login.patch => 0138-Auto-fix-bad-Y-levels-on-player-login.patch} (89%)
 rename Spigot-Server-Patches/{0140-Disable-Vanilla-Chunk-GC.patch => 0139-Disable-Vanilla-Chunk-GC.patch} (91%)
 rename Spigot-Server-Patches/{0141-Option-to-remove-corrupt-tile-entities.patch => 0140-Option-to-remove-corrupt-tile-entities.patch} (95%)
 rename Spigot-Server-Patches/{0142-Add-EntityZapEvent.patch => 0141-Add-EntityZapEvent.patch} (95%)
 rename Spigot-Server-Patches/{0143-Don-t-load-Chunks-from-Hoppers-and-other-things.patch => 0142-Don-t-load-Chunks-from-Hoppers-and-other-things.patch} (96%)
 rename Spigot-Server-Patches/{0144-Prevent-Auto-Save-if-Save-Queue-is-full.patch => 0143-Prevent-Auto-Save-if-Save-Queue-is-full.patch} (97%)
 rename Spigot-Server-Patches/{0145-Chunk-Save-Stats-Debug-Option.patch => 0144-Chunk-Save-Stats-Debug-Option.patch} (98%)
 rename Spigot-Server-Patches/{0146-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch => 0145-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch} (97%)
 rename Spigot-Server-Patches/{0147-Cache-user-authenticator-threads.patch => 0146-Cache-user-authenticator-threads.patch} (97%)
 rename Spigot-Server-Patches/{0148-Optimise-removeQueue.patch => 0147-Optimise-removeQueue.patch} (96%)
 rename Spigot-Server-Patches/{0149-Allow-Reloading-of-Command-Aliases.patch => 0148-Allow-Reloading-of-Command-Aliases.patch} (93%)
 rename Spigot-Server-Patches/{0150-Add-source-to-PlayerExpChangeEvent.patch => 0149-Add-source-to-PlayerExpChangeEvent.patch} (94%)
 rename Spigot-Server-Patches/{0151-Optimize-World.isLoaded-BlockPosition-Z.patch => 0150-Optimize-World.isLoaded-BlockPosition-Z.patch} (94%)
 rename Spigot-Server-Patches/{0152-Don-t-let-fishinghooks-use-portals.patch => 0151-Don-t-let-fishinghooks-use-portals.patch} (93%)
 rename Spigot-Server-Patches/{0153-Add-ProjectileCollideEvent.patch => 0152-Add-ProjectileCollideEvent.patch} (95%)
 rename Spigot-Server-Patches/{0154-Prevent-Pathfinding-out-of-World-Border.patch => 0153-Prevent-Pathfinding-out-of-World-Border.patch} (96%)
 rename Spigot-Server-Patches/{0155-Bound-Treasure-Maps-to-World-Border.patch => 0154-Bound-Treasure-Maps-to-World-Border.patch} (96%)
 rename Spigot-Server-Patches/{0156-Configurable-Cartographer-Treasure-Maps.patch => 0155-Configurable-Cartographer-Treasure-Maps.patch} (97%)
 rename Spigot-Server-Patches/{0157-Optimize-ItemStack.isEmpty.patch => 0156-Optimize-ItemStack.isEmpty.patch} (92%)
 rename Spigot-Server-Patches/{0158-Add-API-methods-to-control-if-armour-stands-can-move.patch => 0157-Add-API-methods-to-control-if-armour-stands-can-move.patch} (96%)
 rename Spigot-Server-Patches/{0159-Add-option-to-remove-invalid-statistics.patch => 0158-Add-option-to-remove-invalid-statistics.patch} (93%)
 rename Spigot-Server-Patches/{0160-Properly-fix-item-duplication-bug.patch => 0159-Properly-fix-item-duplication-bug.patch} (95%)
 rename Spigot-Server-Patches/{0161-String-based-Action-Bar-API.patch => 0160-String-based-Action-Bar-API.patch} (94%)
 rename Spigot-Server-Patches/{0162-Activation-Range-Improvements.patch => 0161-Activation-Range-Improvements.patch} (98%)
 rename Spigot-Server-Patches/{0163-Firework-API-s.patch => 0162-Firework-API-s.patch} (98%)
 rename Spigot-Server-Patches/{0164-PlayerTeleportEndGatewayEvent.patch => 0163-PlayerTeleportEndGatewayEvent.patch} (94%)
 rename Spigot-Server-Patches/{0165-ShulkerBox-Dupe-Prevention.patch => 0164-ShulkerBox-Dupe-Prevention.patch} (93%)
 rename Spigot-Server-Patches/{0166-Provide-E-TE-Chunk-count-stat-methods.patch => 0165-Provide-E-TE-Chunk-count-stat-methods.patch} (93%)
 rename Spigot-Server-Patches/{0167-Enforce-Sync-Player-Saves.patch => 0166-Enforce-Sync-Player-Saves.patch} (93%)
 rename Spigot-Server-Patches/{0168-Enforce-Sync-Chunk-Unloads.patch => 0167-Enforce-Sync-Chunk-Unloads.patch} (95%)
 rename Spigot-Server-Patches/{0169-Don-t-allow-entities-to-ride-themselves-572.patch => 0168-Don-t-allow-entities-to-ride-themselves-572.patch} (93%)
 rename Spigot-Server-Patches/{0170-Fix-block-break-desync.patch => 0169-Fix-block-break-desync.patch} (94%)
 rename Spigot-Server-Patches/{0171-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch => 0170-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch} (99%)
 rename Spigot-Server-Patches/{0172-Cap-Entity-Collisions.patch => 0171-Cap-Entity-Collisions.patch} (96%)
 rename Spigot-Server-Patches/{0173-Remove-CraftScheduler-Async-Task-Debugger.patch => 0172-Remove-CraftScheduler-Async-Task-Debugger.patch} (97%)
 rename Spigot-Server-Patches/{0174-Shame-on-you-Mojang.patch => 0173-Shame-on-you-Mojang.patch} (94%)
 rename Spigot-Server-Patches/{0175-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch => 0174-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch} (91%)
 rename Spigot-Server-Patches/{0176-Do-not-let-armorstands-drown.patch => 0175-Do-not-let-armorstands-drown.patch} (94%)
 rename Spigot-Server-Patches/{0177-Properly-handle-async-calls-to-restart-the-server.patch => 0176-Properly-handle-async-calls-to-restart-the-server.patch} (99%)
 rename Spigot-Server-Patches/{0178-Add-system-property-to-disable-book-size-limits.patch => 0177-Add-system-property-to-disable-book-size-limits.patch} (97%)
 rename Spigot-Server-Patches/{0179-Add-option-to-make-parrots-stay-on-shoulders-despite.patch => 0178-Add-option-to-make-parrots-stay-on-shoulders-despite.patch} (97%)
 rename Spigot-Server-Patches/{0180-Add-configuration-option-to-prevent-player-names-fro.patch => 0179-Add-configuration-option-to-prevent-player-names-fro.patch} (90%)
 rename Spigot-Server-Patches/{0181-Use-TerminalConsoleAppender-for-console-improvements.patch => 0180-Use-TerminalConsoleAppender-for-console-improvements.patch} (98%)
 rename Spigot-Server-Patches/{0182-provide-a-configurable-option-to-disable-creeper-lin.patch => 0181-provide-a-configurable-option-to-disable-creeper-lin.patch} (96%)
 rename Spigot-Server-Patches/{0183-Item-canEntityPickup.patch => 0182-Item-canEntityPickup.patch} (97%)
 rename Spigot-Server-Patches/{0184-PlayerPickupItemEvent-setFlyAtPlayer.patch => 0183-PlayerPickupItemEvent-setFlyAtPlayer.patch} (96%)
 rename Spigot-Server-Patches/{0185-PlayerAttemptPickupItemEvent.patch => 0184-PlayerAttemptPickupItemEvent.patch} (95%)
 rename Spigot-Server-Patches/{0186-Add-UnknownCommandEvent.patch => 0185-Add-UnknownCommandEvent.patch} (93%)
 rename Spigot-Server-Patches/{0187-Basic-PlayerProfile-API.patch => 0186-Basic-PlayerProfile-API.patch} (98%)
 rename Spigot-Server-Patches/{0188-Shoulder-Entities-Release-API.patch => 0187-Shoulder-Entities-Release-API.patch} (96%)
 rename Spigot-Server-Patches/{0189-Profile-Lookup-Events.patch => 0188-Profile-Lookup-Events.patch} (98%)
 rename Spigot-Server-Patches/{0190-Block-player-logins-during-server-shutdown.patch => 0189-Block-player-logins-during-server-shutdown.patch} (93%)
 rename Spigot-Server-Patches/{0191-Entity-fromMobSpawner.patch => 0190-Entity-fromMobSpawner.patch} (98%)
 rename Spigot-Server-Patches/{0192-Fix-Anvil-Level-sync-to-client.patch => 0191-Fix-Anvil-Level-sync-to-client.patch} (95%)
 rename Spigot-Server-Patches/{0193-Add-missing-coverages-for-getTileEntity-in-order-to-.patch => 0192-Add-missing-coverages-for-getTileEntity-in-order-to-.patch} (90%)
 rename Spigot-Server-Patches/{0194-Improve-the-Saddle-API-for-Horses.patch => 0193-Improve-the-Saddle-API-for-Horses.patch} (97%)
 rename Spigot-Server-Patches/{0195-Implement-ensureServerConversions-API.patch => 0194-Implement-ensureServerConversions-API.patch} (90%)
 rename Spigot-Server-Patches/{0196-Implement-getI18NDisplayName.patch => 0195-Implement-getI18NDisplayName.patch} (96%)
 rename Spigot-Server-Patches/{0197-GH-806-Respect-saving-disabled-before-unloading-all-.patch => 0196-GH-806-Respect-saving-disabled-before-unloading-all-.patch} (90%)
 rename Spigot-Server-Patches/{0198-ProfileWhitelistVerifyEvent.patch => 0197-ProfileWhitelistVerifyEvent.patch} (97%)
 rename Spigot-Server-Patches/{0199-Fix-this-stupid-bullshit.patch => 0198-Fix-this-stupid-bullshit.patch} (94%)
 rename Spigot-Server-Patches/{0200-Ocelot-despawns-should-honor-nametags-and-leash.patch => 0199-Ocelot-despawns-should-honor-nametags-and-leash.patch} (92%)
 rename Spigot-Server-Patches/{0201-Reset-spawner-timer-when-spawner-event-is-cancelled.patch => 0200-Reset-spawner-timer-when-spawner-event-is-cancelled.patch} (95%)
 rename Spigot-Server-Patches/{0202-Fix-MC-117075-TE-Unload-Lag-Spike.patch => 0201-Fix-MC-117075-TE-Unload-Lag-Spike.patch} (95%)
 rename Spigot-Server-Patches/{0203-Allow-specifying-a-custom-authentication-servers-dow.patch => 0202-Allow-specifying-a-custom-authentication-servers-dow.patch} (94%)
 rename Spigot-Server-Patches/{0204-LivingEntity-setKiller.patch => 0203-LivingEntity-setKiller.patch} (94%)
 rename Spigot-Server-Patches/{0205-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch => 0204-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch} (93%)
 rename Spigot-Server-Patches/{0206-Handle-plugin-prefixes-using-Log4J-configuration.patch => 0205-Handle-plugin-prefixes-using-Log4J-configuration.patch} (97%)
 rename Spigot-Server-Patches/{0207-Include-Log4J2-SLF4J-implementation.patch => 0206-Include-Log4J2-SLF4J-implementation.patch} (86%)
 rename Spigot-Server-Patches/{0208-Disable-logger-prefix-for-various-plugins-bypassing-.patch => 0207-Disable-logger-prefix-for-various-plugins-bypassing-.patch} (96%)
 rename Spigot-Server-Patches/{0209-Add-PlayerJumpEvent.patch => 0208-Add-PlayerJumpEvent.patch} (98%)
 rename Spigot-Server-Patches/{0210-handle-PacketPlayInKeepAlive-async.patch => 0209-handle-PacketPlayInKeepAlive-async.patch} (97%)
 rename Spigot-Server-Patches/{0211-Expose-client-protocol-version-and-virtual-host.patch => 0210-Expose-client-protocol-version-and-virtual-host.patch} (98%)
 rename Spigot-Server-Patches/{0212-revert-serverside-behavior-of-keepalives.patch => 0211-revert-serverside-behavior-of-keepalives.patch} (97%)
 rename Spigot-Server-Patches/{0213-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch => 0212-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch} (95%)
 rename Spigot-Server-Patches/{0214-Send-attack-SoundEffects-only-to-players-who-can-see.patch => 0213-Send-attack-SoundEffects-only-to-players-who-can-see.patch} (98%)
 rename Spigot-Server-Patches/{0215-Option-for-maximum-exp-value-when-merging-orbs.patch => 0214-Option-for-maximum-exp-value-when-merging-orbs.patch} (98%)
 rename Spigot-Server-Patches/{0216-Add-PlayerArmorChangeEvent.patch => 0215-Add-PlayerArmorChangeEvent.patch} (94%)
 rename Spigot-Server-Patches/{0217-Prevent-logins-from-being-processed-when-the-player-.patch => 0216-Prevent-logins-from-being-processed-when-the-player-.patch} (93%)
 rename Spigot-Server-Patches/{0218-use-CB-BlockState-implementations-for-captured-block.patch => 0217-use-CB-BlockState-implementations-for-captured-block.patch} (96%)
 rename Spigot-Server-Patches/{0219-API-to-get-a-BlockState-without-a-snapshot.patch => 0218-API-to-get-a-BlockState-without-a-snapshot.patch} (96%)
 rename Spigot-Server-Patches/{0220-AsyncTabCompleteEvent.patch => 0219-AsyncTabCompleteEvent.patch} (99%)
 rename Spigot-Server-Patches/{0221-Avoid-NPE-in-PathfinderGoalTempt.patch => 0220-Avoid-NPE-in-PathfinderGoalTempt.patch} (92%)
 rename Spigot-Server-Patches/{0222-PlayerPickupExperienceEvent.patch => 0221-PlayerPickupExperienceEvent.patch} (94%)
 rename Spigot-Server-Patches/{0223-ExperienceOrbMergeEvent.patch => 0222-ExperienceOrbMergeEvent.patch} (95%)
 rename Spigot-Server-Patches/{0224-Ability-to-apply-mending-to-XP-API.patch => 0223-Ability-to-apply-mending-to-XP-API.patch} (97%)
 rename Spigot-Server-Patches/{0225-Configurable-Chunks-Sends-per-Tick-setting.patch => 0224-Configurable-Chunks-Sends-per-Tick-setting.patch} (96%)
 rename Spigot-Server-Patches/{0226-Configurable-Max-Chunk-Gens-per-Tick.patch => 0225-Configurable-Max-Chunk-Gens-per-Tick.patch} (97%)
 rename Spigot-Server-Patches/{0227-Make-max-squid-spawn-height-configurable.patch => 0226-Make-max-squid-spawn-height-configurable.patch} (96%)
 rename Spigot-Server-Patches/{0228-PreCreatureSpawnEvent.patch => 0227-PreCreatureSpawnEvent.patch} (97%)
 rename Spigot-Server-Patches/{0229-PlayerNaturallySpawnCreaturesEvent.patch => 0228-PlayerNaturallySpawnCreaturesEvent.patch} (93%)
 rename Spigot-Server-Patches/{0230-Add-setPlayerProfile-API-for-Skulls.patch => 0229-Add-setPlayerProfile-API-for-Skulls.patch} (97%)
 rename Spigot-Server-Patches/{0231-Fill-Profile-Property-Events.patch => 0230-Fill-Profile-Property-Events.patch} (96%)
 rename Spigot-Server-Patches/{0232-PlayerAdvancementCriterionGrantEvent.patch => 0231-PlayerAdvancementCriterionGrantEvent.patch} (93%)
 rename Spigot-Server-Patches/{0233-Add-ArmorStand-Item-Meta.patch => 0232-Add-ArmorStand-Item-Meta.patch} (97%)
 rename Spigot-Server-Patches/{0234-Extend-Player-Interact-cancellation.patch => 0233-Extend-Player-Interact-cancellation.patch} (98%)
 rename Spigot-Server-Patches/{0235-Tameable-getOwnerUniqueId-API.patch => 0234-Tameable-getOwnerUniqueId-API.patch} (95%)
 rename Spigot-Server-Patches/{0236-Toggleable-player-crits-helps-mitigate-hacked-client.patch => 0235-Toggleable-player-crits-helps-mitigate-hacked-client.patch} (96%)
 rename Spigot-Server-Patches/{0237-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch => 0236-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch} (94%)
 rename Spigot-Server-Patches/{0238-Prevent-Frosted-Ice-from-loading-holding-chunks.patch => 0237-Prevent-Frosted-Ice-from-loading-holding-chunks.patch} (96%)
 rename Spigot-Server-Patches/{0239-Disable-Explicit-Network-Manager-Flushing.patch => 0238-Disable-Explicit-Network-Manager-Flushing.patch} (95%)
 rename Spigot-Server-Patches/{0240-Implement-extended-PaperServerListPingEvent.patch => 0239-Implement-extended-PaperServerListPingEvent.patch} (99%)
 rename Spigot-Server-Patches/{0241-Improved-Async-Task-Scheduler.patch => 0240-Improved-Async-Task-Scheduler.patch} (99%)
 rename Spigot-Server-Patches/{0242-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch => 0241-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch} (97%)
 rename Spigot-Server-Patches/{0243-Call-PortalCreateEvent-for-exit-portals.patch => 0242-Call-PortalCreateEvent-for-exit-portals.patch} (98%)
 rename Spigot-Server-Patches/{0244-Player.setPlayerProfile-API.patch => 0243-Player.setPlayerProfile-API.patch} (97%)
 rename Spigot-Server-Patches/{0245-Fix-Dragon-Server-Crashes.patch => 0244-Fix-Dragon-Server-Crashes.patch} (94%)
 rename Spigot-Server-Patches/{0246-getPlayerUniqueId-API.patch => 0245-getPlayerUniqueId-API.patch} (94%)
 rename Spigot-Server-Patches/{0247-Make-player-data-saving-configurable.patch => 0246-Make-player-data-saving-configurable.patch} (92%)
 rename Spigot-Server-Patches/{0248-Make-legacy-ping-handler-more-reliable.patch => 0247-Make-legacy-ping-handler-more-reliable.patch} (98%)
 rename Spigot-Server-Patches/{0249-Call-PaperServerListPingEvent-for-legacy-pings.patch => 0248-Call-PaperServerListPingEvent-for-legacy-pings.patch} (99%)
 rename Spigot-Server-Patches/{0250-Flag-to-disable-the-channel-limit.patch => 0249-Flag-to-disable-the-channel-limit.patch} (94%)
 rename Spigot-Server-Patches/{0251-Add-method-to-open-already-placed-sign.patch => 0250-Add-method-to-open-already-placed-sign.patch} (94%)
 rename Spigot-Server-Patches/{0252-Load-version-history-at-server-start.patch => 0251-Load-version-history-at-server-start.patch} (89%)
 rename Spigot-Server-Patches/{0253-Configurable-sprint-interruption-on-attack.patch => 0252-Configurable-sprint-interruption-on-attack.patch} (96%)
 rename Spigot-Server-Patches/{0254-Fix-exploit-that-allowed-colored-signs-to-be-created.patch => 0253-Fix-exploit-that-allowed-colored-signs-to-be-created.patch} (94%)
 rename Spigot-Server-Patches/{0255-EndermanEscapeEvent.patch => 0254-EndermanEscapeEvent.patch} (98%)
 rename Spigot-Server-Patches/{0256-Enderman.teleportRandomly.patch => 0255-Enderman.teleportRandomly.patch} (95%)
 rename Spigot-Server-Patches/{0257-Block-Enderpearl-Travel-Exploit.patch => 0256-Block-Enderpearl-Travel-Exploit.patch} (97%)
 rename Spigot-Server-Patches/{0258-Expand-World.spawnParticle-API-and-add-Builder.patch => 0257-Expand-World.spawnParticle-API-and-add-Builder.patch} (98%)
 rename Spigot-Server-Patches/{0259-EndermanAttackPlayerEvent.patch => 0258-EndermanAttackPlayerEvent.patch} (95%)
 rename Spigot-Server-Patches/{0260-WitchConsumePotionEvent.patch => 0259-WitchConsumePotionEvent.patch} (95%)
 rename Spigot-Server-Patches/{0261-WitchThrowPotionEvent.patch => 0260-WitchThrowPotionEvent.patch} (95%)
 rename Spigot-Server-Patches/{0262-Allow-spawning-Item-entities-with-World.spawnEntity.patch => 0261-Allow-spawning-Item-entities-with-World.spawnEntity.patch} (95%)
 rename Spigot-Server-Patches/{0263-Don-t-load-chunks-for-villager-door-checks.patch => 0262-Don-t-load-chunks-for-villager-door-checks.patch} (92%)
 rename Spigot-Server-Patches/{0264-WitchReadyPotionEvent.patch => 0263-WitchReadyPotionEvent.patch} (95%)
 rename Spigot-Server-Patches/{0265-ItemStack-getMaxItemUseDuration.patch => 0264-ItemStack-getMaxItemUseDuration.patch} (93%)
 rename Spigot-Server-Patches/{0266-Implement-EntityTeleportEndGatewayEvent.patch => 0265-Implement-EntityTeleportEndGatewayEvent.patch} (96%)
 rename Spigot-Server-Patches/{0267-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch => 0266-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch} (95%)
 rename Spigot-Server-Patches/{0268-Properly-remove-entities-on-dimension-teleport.patch => 0267-Properly-remove-entities-on-dimension-teleport.patch} (97%)
 rename Spigot-Server-Patches/{0269-Fix-CraftEntity-hashCode.patch => 0268-Fix-CraftEntity-hashCode.patch} (96%)
 rename Spigot-Server-Patches/{0270-Configurable-Alternative-LootPool-Luck-Formula.patch => 0269-Configurable-Alternative-LootPool-Luck-Formula.patch} (96%)
 rename Spigot-Server-Patches/{0271-Print-Error-details-when-failing-to-save-player-data.patch => 0270-Print-Error-details-when-failing-to-save-player-data.patch} (92%)
 rename Spigot-Server-Patches/{0272-Make-shield-blocking-delay-configurable.patch => 0271-Make-shield-blocking-delay-configurable.patch} (97%)
 rename Spigot-Server-Patches/{0273-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch => 0272-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch} (95%)
 rename Spigot-Server-Patches/{0274-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch => 0273-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch} (96%)
 rename Spigot-Server-Patches/{0275-PlayerReadyArrowEvent.patch => 0274-PlayerReadyArrowEvent.patch} (98%)
 rename Spigot-Server-Patches/{0276-Fire-EntityShootBowEvent-for-Illusioner.patch => 0275-Fire-EntityShootBowEvent-for-Illusioner.patch} (95%)
 rename Spigot-Server-Patches/{0277-Implement-EntityKnockbackByEntityEvent.patch => 0276-Implement-EntityKnockbackByEntityEvent.patch} (94%)
 rename Spigot-Server-Patches/{0278-Expand-Explosions-API.patch => 0277-Expand-Explosions-API.patch} (95%)
 rename Spigot-Server-Patches/{0279-LivingEntity-Hand-Raised-Item-Use-API.patch => 0278-LivingEntity-Hand-Raised-Item-Use-API.patch} (94%)
 rename Spigot-Server-Patches/{0280-RangedEntity-API.patch => 0279-RangedEntity-API.patch} (99%)
 rename Spigot-Server-Patches/{0281-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch => 0280-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch} (92%)
 rename Spigot-Server-Patches/{0282-Add-config-to-disable-ender-dragon-legacy-check.patch => 0281-Add-config-to-disable-ender-dragon-legacy-check.patch} (97%)
 rename Spigot-Server-Patches/{0283-Implement-World.getEntity-UUID-API.patch => 0282-Implement-World.getEntity-UUID-API.patch} (93%)
 rename Spigot-Server-Patches/{0284-InventoryCloseEvent-Reason-API.patch => 0283-InventoryCloseEvent-Reason-API.patch} (98%)
 rename Spigot-Server-Patches/{0285-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch => 0284-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch} (97%)
 rename Spigot-Server-Patches/{0286-Configurable-Bed-Search-Radius.patch => 0285-Configurable-Bed-Search-Radius.patch} (98%)
 rename Spigot-Server-Patches/{0287-Vex-getSummoner-API.patch => 0286-Vex-getSummoner-API.patch} (95%)
 rename Spigot-Server-Patches/{0288-Refresh-player-inventory-when-cancelling-PlayerInter.patch => 0287-Refresh-player-inventory-when-cancelling-PlayerInter.patch} (95%)
 rename Spigot-Server-Patches/{0289-Don-t-change-the-Entity-Random-seed-for-squids.patch => 0288-Don-t-change-the-Entity-Random-seed-for-squids.patch} (91%)
 rename Spigot-Server-Patches/{0290-Re-add-vanilla-entity-warnings-for-duplicates.patch => 0289-Re-add-vanilla-entity-warnings-for-duplicates.patch} (94%)
 rename Spigot-Server-Patches/{0291-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch => 0290-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch} (94%)
 rename Spigot-Server-Patches/{0292-Avoid-item-merge-if-stack-size-above-max-stack-size.patch => 0291-Avoid-item-merge-if-stack-size-above-max-stack-size.patch} (92%)
 rename Spigot-Server-Patches/{0293-Use-asynchronous-Log4j-2-loggers.patch => 0292-Use-asynchronous-Log4j-2-loggers.patch} (90%)
 rename Spigot-Server-Patches/{0294-add-more-information-to-Entity.toString.patch => 0293-add-more-information-to-Entity.toString.patch} (95%)
 rename Spigot-Server-Patches/{0295-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch => 0294-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch} (96%)
 rename Spigot-Server-Patches/{0296-EnderDragon-Events.patch => 0295-EnderDragon-Events.patch} (98%)
 rename Spigot-Server-Patches/{0297-PlayerElytraBoostEvent.patch => 0296-PlayerElytraBoostEvent.patch} (96%)
 rename Spigot-Server-Patches/{0298-PlayerLaunchProjectileEvent.patch => 0297-PlayerLaunchProjectileEvent.patch} (99%)
 rename Spigot-Server-Patches/{0299-Duplicate-UUID-Resolve-Option.patch => 0298-Duplicate-UUID-Resolve-Option.patch} (99%)
 rename Spigot-Server-Patches/{0300-Speedup-BlockPos-by-fixing-inlining.patch => 0299-Speedup-BlockPos-by-fixing-inlining.patch} (99%)
 rename Spigot-Server-Patches/{0301-Don-t-save-Proto-Chunks.patch => 0300-Don-t-save-Proto-Chunks.patch} (97%)
 rename Spigot-Server-Patches/{0302-Optimize-RegistryID.c.patch => 0301-Optimize-RegistryID.c.patch} (96%)
 rename Spigot-Server-Patches/{0303-Option-to-prevent-armor-stands-from-doing-entity-loo.patch => 0302-Option-to-prevent-armor-stands-from-doing-entity-loo.patch} (96%)
 rename Spigot-Server-Patches/{0304-Vanished-players-don-t-have-rights.patch => 0303-Vanished-players-don-t-have-rights.patch} (99%)
 rename Spigot-Server-Patches/{0305-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch => 0304-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch} (90%)
 rename Spigot-Server-Patches/{0306-Add-some-Debug-to-Chunk-Entity-slices.patch => 0305-Add-some-Debug-to-Chunk-Entity-slices.patch} (95%)
 rename Spigot-Server-Patches/{0307-Optimize-Region-File-Cache.patch => 0306-Optimize-Region-File-Cache.patch} (97%)
 rename Spigot-Server-Patches/{0308-EntityTransformedEvent.patch => 0307-EntityTransformedEvent.patch} (98%)
 rename Spigot-Server-Patches/{0309-SkeletonHorse-Additions.patch => 0308-SkeletonHorse-Additions.patch} (97%)
 rename Spigot-Server-Patches/{0310-Prevent-Saving-Bad-entities-to-chunks.patch => 0309-Prevent-Saving-Bad-entities-to-chunks.patch} (97%)
 rename Spigot-Server-Patches/{0311-Don-t-call-getItemMeta-on-hasItemMeta.patch => 0310-Don-t-call-getItemMeta-on-hasItemMeta.patch} (94%)
 rename Spigot-Server-Patches/{0312-Always-process-chunk-removal-in-removeEntity.patch => 0311-Always-process-chunk-removal-in-removeEntity.patch} (95%)
 rename Spigot-Server-Patches/{0313-Ignore-Dead-Entities-in-entityList-iteration.patch => 0312-Ignore-Dead-Entities-in-entityList-iteration.patch} (98%)
 rename Spigot-Server-Patches/{0314-Provide-option-to-use-a-versioned-world-folder-for-t.patch => 0313-Provide-option-to-use-a-versioned-world-folder-for-t.patch} (98%)
 rename Spigot-Server-Patches/{0315-MC-111480-Start-Entity-ID-s-at-1.patch => 0314-MC-111480-Start-Entity-ID-s-at-1.patch} (94%)
 rename Spigot-Server-Patches/{0316-Implement-Expanded-ArmorStand-API.patch => 0315-Implement-Expanded-ArmorStand-API.patch} (98%)
 rename Spigot-Server-Patches/{0317-AnvilDamageEvent.patch => 0316-AnvilDamageEvent.patch} (96%)
 rename Spigot-Server-Patches/{0318-World-EntityHuman-Lookup-Optimizations.patch => 0317-World-EntityHuman-Lookup-Optimizations.patch} (98%)
 rename Spigot-Server-Patches/{0319-Add-TNTPrimeEvent.patch => 0318-Add-TNTPrimeEvent.patch} (99%)
 rename Spigot-Server-Patches/{0320-Break-up-and-make-tab-spam-limits-configurable.patch => 0319-Break-up-and-make-tab-spam-limits-configurable.patch} (96%)
 rename Spigot-Server-Patches/{0321-Make-portal-teleportation-adjustment-math-more-accur.patch => 0320-Make-portal-teleportation-adjustment-math-more-accur.patch} (98%)
 rename Spigot-Server-Patches/{0322-Add-hand-to-bucket-events.patch => 0321-Add-hand-to-bucket-events.patch} (99%)
 rename Spigot-Server-Patches/{0323-MC-135506-Experience-should-save-as-Integers.patch => 0322-MC-135506-Experience-should-save-as-Integers.patch} (95%)
 rename Spigot-Server-Patches/{0324-Entity-add-to-world-fixes.patch => 0323-Entity-add-to-world-fixes.patch} (97%)
 rename Spigot-Server-Patches/{0325-Fix-client-rendering-skulls-from-same-user.patch => 0324-Fix-client-rendering-skulls-from-same-user.patch} (98%)
 rename Spigot-Server-Patches/{0326-Add-Early-Warning-Feature-to-WatchDog.patch => 0325-Add-Early-Warning-Feature-to-WatchDog.patch} (98%)
 rename Spigot-Server-Patches/{0327-Make-EnderDragon-implement-Mob.patch => 0326-Make-EnderDragon-implement-Mob.patch} (95%)
 rename Spigot-Server-Patches/{0328-Detect-and-repair-corrupt-Region-Files.patch => 0327-Detect-and-repair-corrupt-Region-Files.patch} (96%)
 rename Spigot-Server-Patches/{0329-Use-ConcurrentHashMap-in-JsonList.patch => 0328-Use-ConcurrentHashMap-in-JsonList.patch} (98%)
 rename Spigot-Server-Patches/{0330-Use-a-Queue-for-Queueing-Commands.patch => 0329-Use-a-Queue-for-Queueing-Commands.patch} (96%)
 rename Spigot-Server-Patches/{0331-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch => 0330-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch} (95%)
 rename Spigot-Server-Patches/{0332-Allow-disabling-armour-stand-ticking.patch => 0331-Allow-disabling-armour-stand-ticking.patch} (97%)
 rename Spigot-Server-Patches/{0333-Optimize-BlockPosition-helper-methods.patch => 0332-Optimize-BlockPosition-helper-methods.patch} (98%)
 rename Spigot-Server-Patches/{0334-Send-nearby-packets-from-world-player-list-not-serve.patch => 0333-Send-nearby-packets-from-world-player-list-not-serve.patch} (99%)
 rename Spigot-Server-Patches/{0335-Cache-World-Entity-Type-counts.patch => 0334-Cache-World-Entity-Type-counts.patch} (99%)
 rename Spigot-Server-Patches/{0336-Restore-vanlla-default-mob-spawn-range.patch => 0335-Restore-vanlla-default-mob-spawn-range.patch} (92%)
 rename Spigot-Server-Patches/{0337-Optimize-Hoppers.patch => 0336-Optimize-Hoppers.patch} (99%)
 rename Spigot-Server-Patches/{0338-Optimize-CraftBlockData-Creation.patch => 0337-Optimize-CraftBlockData-Creation.patch} (98%)
 rename Spigot-Server-Patches/{0339-Fix-MC-124320.patch => 0338-Fix-MC-124320.patch} (97%)
 rename Spigot-Server-Patches/{0340-Slime-Pathfinder-Events.patch => 0339-Slime-Pathfinder-Events.patch} (98%)
 rename Spigot-Server-Patches/{0341-Add-source-block-to-BlockPhysicsEvent.patch => 0340-Add-source-block-to-BlockPhysicsEvent.patch} (95%)
 rename Spigot-Server-Patches/{0342-Anti-Xray.patch => 0341-Anti-Xray.patch} (98%)
 rename Spigot-Server-Patches/{0343-Configurable-speed-for-water-flowing-over-lava.patch => 0342-Configurable-speed-for-water-flowing-over-lava.patch} (98%)
 rename Spigot-Server-Patches/{0344-Optimize-RegistryMaterials.patch => 0343-Optimize-RegistryMaterials.patch} (94%)
 rename Spigot-Server-Patches/{0345-Add-PhantomPreSpawnEvent.patch => 0344-Add-PhantomPreSpawnEvent.patch} (98%)
 rename Spigot-Server-Patches/{0346-Add-More-Creeper-API.patch => 0345-Add-More-Creeper-API.patch} (98%)
 rename Spigot-Server-Patches/{0347-Optimize-Chunk-getPos.patch => 0346-Optimize-Chunk-getPos.patch} (83%)
 rename Spigot-Server-Patches/{0348-Use-an-EnumMap-for-Chunk-Height-Maps.patch => 0347-Use-an-EnumMap-for-Chunk-Height-Maps.patch} (88%)
 rename Spigot-Server-Patches/{0349-Implement-Force-Loaded-Chunk-API.patch => 0348-Implement-Force-Loaded-Chunk-API.patch} (97%)
 rename Spigot-Server-Patches/{0350-Inventory-removeItemAnySlot.patch => 0349-Inventory-removeItemAnySlot.patch} (97%)
 rename Spigot-Server-Patches/{0351-Optimize-getChunkIfLoaded-type-calls.patch => 0350-Optimize-getChunkIfLoaded-type-calls.patch} (98%)
 rename Spigot-Server-Patches/{0352-Don-t-double-add-golems-to-world.patch => 0351-Don-t-double-add-golems-to-world.patch} (93%)
 rename Spigot-Server-Patches/{0353-fix-newlines-in-spigot-tab-list-API.patch => 0352-fix-newlines-in-spigot-tab-list-API.patch} (96%)
 rename Spigot-Server-Patches/{0354-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch => 0353-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch} (93%)
 rename Spigot-Server-Patches/{0355-Add-ray-tracing-methods-to-LivingEntity.patch => 0354-Add-ray-tracing-methods-to-LivingEntity.patch} (98%)
 rename Spigot-Server-Patches/{0356-Fix-concurrency-and-performance-issues-in-DataFixers.patch => 0355-Fix-concurrency-and-performance-issues-in-DataFixers.patch} (99%)
 rename Spigot-Server-Patches/{0357-Expose-attack-cooldown-methods-for-Player.patch => 0356-Expose-attack-cooldown-methods-for-Player.patch} (95%)
 rename Spigot-Server-Patches/{0358-Fix-1420.patch => 0357-Fix-1420.patch} (97%)
 rename Spigot-Server-Patches/{0359-MC-2025-Save-and-load-entity-AABB-to-prevent-wobble.patch => 0358-MC-2025-Save-and-load-entity-AABB-to-prevent-wobble.patch} (98%)
 rename Spigot-Server-Patches/{0360-Improve-death-events.patch => 0359-Improve-death-events.patch} (99%)
 rename Spigot-Server-Patches/{0361-Allow-chests-to-be-placed-with-NBT-data.patch => 0360-Allow-chests-to-be-placed-with-NBT-data.patch} (91%)
 rename Spigot-Server-Patches/{0362-Mob-Pathfinding-API.patch => 0361-Mob-Pathfinding-API.patch} (99%)
 rename Spigot-Server-Patches/{0363-Prevent-chunk-loading-from-Fluid-Flowing.patch => 0362-Prevent-chunk-loading-from-Fluid-Flowing.patch} (98%)
 rename Spigot-Server-Patches/{0364-Prevent-pathfinding-from-loading-chunks.patch => 0363-Prevent-pathfinding-from-loading-chunks.patch} (99%)
 rename Spigot-Server-Patches/{0365-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch => 0364-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch} (98%)
 rename Spigot-Server-Patches/{0366-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch => 0365-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch} (98%)
 rename Spigot-Server-Patches/{0367-Prevent-mob-spawning-from-loading-generating-chunks.patch => 0366-Prevent-mob-spawning-from-loading-generating-chunks.patch} (97%)
 rename Spigot-Server-Patches/{0368-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch => 0367-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch} (98%)
 rename Spigot-Server-Patches/{0369-Optimize-and-Fix-ExpiringMap-Issues.patch => 0368-Optimize-and-Fix-ExpiringMap-Issues.patch} (99%)
 rename Spigot-Server-Patches/{0370-Implement-furnace-cook-speed-multiplier-API.patch => 0369-Implement-furnace-cook-speed-multiplier-API.patch} (98%)
 rename Spigot-Server-Patches/{0371-Support-Overriding-World-Seeds.patch => 0370-Support-Overriding-World-Seeds.patch} (97%)
 rename Spigot-Server-Patches/{0372-Optimize-Server-World-Map.patch => 0371-Optimize-Server-World-Map.patch} (99%)
 rename Spigot-Server-Patches/{0373-PreSpawnerSpawnEvent.patch => 0372-PreSpawnerSpawnEvent.patch} (96%)
 rename Spigot-Server-Patches/{0374-MC-134115-Fix-Double-Chest-Conversion-Error.patch => 0373-MC-134115-Fix-Double-Chest-Conversion-Error.patch} (97%)
 rename Spigot-Server-Patches/{0375-Catch-JsonParseException-in-Entity-and-TE-names.patch => 0374-Catch-JsonParseException-in-Entity-and-TE-names.patch} (99%)
 rename Spigot-Server-Patches/{0377-Avoid-dimension-id-collisions.patch => 0375-Avoid-dimension-id-collisions.patch} (94%)
 delete mode 100644 Spigot-Server-Patches/0376-Enable-experimental-ASM-support-for-Java-11-plugins.patch
 rename Spigot-Server-Patches/{0378-Honor-EntityAgeable.ageLock.patch => 0376-Honor-EntityAgeable.ageLock.patch} (91%)
 rename Spigot-Server-Patches/{0379-Async-Chunk-Loading-and-Generation.patch => 0377-Async-Chunk-Loading-and-Generation.patch} (97%)
 rename Spigot-Server-Patches/{0380-Ignore-Dimension-NBT-field-in-Entity-data.patch => 0378-Ignore-Dimension-NBT-field-in-Entity-data.patch} (97%)
 rename Spigot-Server-Patches/{0381-Fix-turtle-lag.patch => 0379-Fix-turtle-lag.patch} (91%)

diff --git a/Spigot-API-Patches/0156-Remove-Precondition-on-name-for-AttributeModifier.patch b/Spigot-API-Patches/0156-Remove-Precondition-on-name-for-AttributeModifier.patch
index c09df05760..62d770353c 100644
--- a/Spigot-API-Patches/0156-Remove-Precondition-on-name-for-AttributeModifier.patch
+++ b/Spigot-API-Patches/0156-Remove-Precondition-on-name-for-AttributeModifier.patch
@@ -1,4 +1,4 @@
-From 02ea14d151acf44e283dee55d8ed2daf733704ef Mon Sep 17 00:00:00 2001
+From 7a42dca8e149969ed13cdae48a9cdf98262a3319 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 22 Sep 2018 18:41:01 -0400
 Subject: [PATCH] Remove Precondition on name for AttributeModifier
@@ -6,10 +6,10 @@ Subject: [PATCH] Remove Precondition on name for AttributeModifier
 Vanilla allows empty names
 
 diff --git a/src/main/java/org/bukkit/attribute/AttributeModifier.java b/src/main/java/org/bukkit/attribute/AttributeModifier.java
-index a3a69ffa4..4d1691be0 100644
+index 2bc9878ff..0943eee46 100644
 --- a/src/main/java/org/bukkit/attribute/AttributeModifier.java
 +++ b/src/main/java/org/bukkit/attribute/AttributeModifier.java
-@@ -29,10 +29,10 @@ public class AttributeModifier implements ConfigurationSerializable {
+@@ -30,10 +30,10 @@ public class AttributeModifier implements ConfigurationSerializable {
  
      public AttributeModifier(UUID uuid, String name, double amount, Operation operation, EquipmentSlot slot) {
          Validate.notNull(uuid, "UUID cannot be null");
diff --git a/Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch b/Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch
index 04d7f987d4..1e35c9c6aa 100644
--- a/Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch
+++ b/Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch
@@ -1,4 +1,4 @@
-From ec579a0138fdc32c33ab4b1eef277e559a592b23 Mon Sep 17 00:00:00 2001
+From 70f95e0e0ad11ed2007a83c24d855cbb800f764b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 Jul 2018 02:10:36 -0400
 Subject: [PATCH] Store reference to current Chunk for Entity and Block
@@ -8,7 +8,7 @@ This enables us a fast reference to the entities current chunk instead
 of having to look it up by hashmap lookups.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index f64bfa1b95..16aa7f8f79 100644
+index bc43af7243..0a55ad6212 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -33,7 +33,7 @@ public class Chunk implements IChunkAccess {
@@ -85,7 +85,7 @@ index f64bfa1b95..16aa7f8f79 100644
      }
  
      public boolean c(BlockPosition blockposition) {
-@@ -849,6 +879,7 @@ public class Chunk implements IChunkAccess {
+@@ -872,6 +902,7 @@ public class Chunk implements IChunkAccess {
                      }
                  }
                  // Spigot End
diff --git a/Spigot-Server-Patches/0009-Timings-v2.patch b/Spigot-Server-Patches/0009-Timings-v2.patch
index 9ad2064f54..69f6dd8562 100644
--- a/Spigot-Server-Patches/0009-Timings-v2.patch
+++ b/Spigot-Server-Patches/0009-Timings-v2.patch
@@ -1,4 +1,4 @@
-From d4b39b8ec7ba1b81f51e9ace99e7e1e767976691 Mon Sep 17 00:00:00 2001
+From f8e6bf89950a7fef6a1f05d8e973eae16c41acc3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 04:00:11 -0600
 Subject: [PATCH] Timings v2
@@ -316,8 +316,28 @@ index 8811dbc9b3..7818a3b6a7 100644
      protected final MaterialMapColor l;
      private final float frictionFactor;
      protected final BlockStateList<Block, IBlockData> blockStateList;
+diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
+index 6ec067be48..8ba8af2773 100644
+--- a/src/main/java/net/minecraft/server/Chunk.java
++++ b/src/main/java/net/minecraft/server/Chunk.java
+@@ -841,6 +841,7 @@ public class Chunk implements IChunkAccess {
+             server.getPluginManager().callEvent(new org.bukkit.event.world.ChunkLoadEvent(this.bukkitChunk, this.needsDecoration));
+ 
+             if (this.needsDecoration) {
++                this.world.timings.syncChunkLoadPopulateTimer.startTiming(); // Paper
+                 BlockSand.instaFall = true;
+                 java.util.Random random = new java.util.Random();
+                 random.setSeed(world.getSeed());
+@@ -861,6 +862,7 @@ public class Chunk implements IChunkAccess {
+                 }
+                 BlockSand.instaFall = false;
+                 server.getPluginManager().callEvent(new org.bukkit.event.world.ChunkPopulateEvent(bukkitChunk));
++                this.world.timings.syncChunkLoadPopulateTimer.stopTiming(); // Paper
+             }
+         }
+         // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/ChunkMap.java b/src/main/java/net/minecraft/server/ChunkMap.java
-index e3d1761b49..fbebd4591c 100644
+index 85a065f039..4b8b77710b 100644
 --- a/src/main/java/net/minecraft/server/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/ChunkMap.java
 @@ -14,6 +14,7 @@ public class ChunkMap extends Long2ObjectOpenHashMap<Chunk> {
@@ -328,25 +348,14 @@ index e3d1761b49..fbebd4591c 100644
          Chunk chunk1 = (Chunk) super.put(i, chunk);
          ChunkCoordIntPair chunkcoordintpair = new ChunkCoordIntPair(i);
  
-@@ -46,8 +47,10 @@ public class ChunkMap extends Long2ObjectOpenHashMap<Chunk> {
+@@ -46,6 +47,7 @@ public class ChunkMap extends Long2ObjectOpenHashMap<Chunk> {
                  }
              }
          }
 +        chunk.world.timings.syncChunkLoadPostTimer.stopTiming(); // Paper
- 
-         if (chunk.newChunk) {
-+            chunk.world.timings.syncChunkLoadPopulateTimer.startTiming(); // Paper
-             BlockSand.instaFall = true;
-             java.util.Random random = new java.util.Random();
-             random.setSeed(chunk.world.getSeed());
-@@ -68,6 +71,7 @@ public class ChunkMap extends Long2ObjectOpenHashMap<Chunk> {
-             }
-             BlockSand.instaFall = false;
-             chunk.world.getServer().getPluginManager().callEvent(new org.bukkit.event.world.ChunkPopulateEvent(chunk.bukkitChunk));
-+            chunk.world.timings.syncChunkLoadPopulateTimer.stopTiming(); // Paper
-         }
          // CraftBukkit end
  
+         return chunk1;
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 index 0c8c10b7a7..31ed3e43a5 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -1554,19 +1563,21 @@ index 413dd35f06..52a8c48fa4 100644
  
      public void callStage3(QueuedChunk queuedChunk, Chunk chunk, Runnable runnable) throws RuntimeException {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 9f78f2c4ae..b8bdcb6b74 100644
+index 9f78f2c4ae..832d2de476 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1715,6 +1715,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1715,6 +1715,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              packet.components = components;
              getHandle().playerConnection.sendPacket(packet);
          }
 +
++        // Paper start
 +        @Override
 +        public int getPing()
 +        {
 +            return getHandle().ping;
 +        }
++        // Paper end
      };
  
      public Player.Spigot spigot()
diff --git a/Spigot-Server-Patches/0028-Lighting-Queue.patch b/Spigot-Server-Patches/0028-Lighting-Queue.patch
index 6fb1f96d9a..f6df113921 100644
--- a/Spigot-Server-Patches/0028-Lighting-Queue.patch
+++ b/Spigot-Server-Patches/0028-Lighting-Queue.patch
@@ -1,4 +1,4 @@
-From 98b1b56527d727395f8e97e6fcab6e533f54b9c0 Mon Sep 17 00:00:00 2001
+From c5fa856a9c824a188540888c0224415592fd8c0f 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
@@ -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 2f33b4208c..8f2de5a327 100644
+index a97f0499cd..397798cf28 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 {
@@ -118,7 +118,7 @@ index 2f33b4208c..8f2de5a327 100644
                  }
  
                  TileEntity tileentity;
-@@ -986,10 +990,16 @@ public class Chunk implements IChunkAccess {
+@@ -1011,10 +1015,16 @@ public class Chunk implements IChunkAccess {
          return false;
      }
  
@@ -138,7 +138,7 @@ index 2f33b4208c..8f2de5a327 100644
  
          this.u = true;
  
-@@ -1349,6 +1359,16 @@ public class Chunk implements IChunkAccess {
+@@ -1374,6 +1384,16 @@ public class Chunk implements IChunkAccess {
          return this.D == 8;
      }
  
diff --git a/Spigot-Server-Patches/0043-Add-PlayerInitialSpawnEvent.patch b/Spigot-Server-Patches/0042-Add-PlayerInitialSpawnEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0043-Add-PlayerInitialSpawnEvent.patch
rename to Spigot-Server-Patches/0042-Add-PlayerInitialSpawnEvent.patch
index e126da7bb1..a03c393ceb 100644
--- a/Spigot-Server-Patches/0043-Add-PlayerInitialSpawnEvent.patch
+++ b/Spigot-Server-Patches/0042-Add-PlayerInitialSpawnEvent.patch
@@ -1,4 +1,4 @@
-From c0e32dfbeb3b1371d3a0e9d3b5fcba34af4d2ff8 Mon Sep 17 00:00:00 2001
+From ccaf2d344c00e98b07e41c0e718e31193379fc11 Mon Sep 17 00:00:00 2001
 From: Steve Anton <anxuiz.nx@gmail.com>
 Date: Thu, 3 Mar 2016 00:09:38 -0600
 Subject: [PATCH] Add PlayerInitialSpawnEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerInitialSpawnEvent
 For modifying a player's initial spawn location as they join the server
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 1e3dd22e5..23562388a 100644
+index 26df2ff32f..4320efaef5 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -110,6 +110,21 @@ public abstract class PlayerList {
@@ -32,5 +32,5 @@ index 1e3dd22e5..23562388a 100644
          entityplayer.playerInteractManager.a((WorldServer) entityplayer.world);
          String s1 = "local";
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0042-Configurable-Chunk-IO-Thread-Base-Count.patch b/Spigot-Server-Patches/0042-Configurable-Chunk-IO-Thread-Base-Count.patch
deleted file mode 100644
index 7fd08c7008..0000000000
--- a/Spigot-Server-Patches/0042-Configurable-Chunk-IO-Thread-Base-Count.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 3f3d6fcab054bb9d075535721e4dff0b5fb68b36 Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Wed, 2 Mar 2016 23:46:57 -0600
-Subject: [PATCH] Configurable Chunk IO Thread Base Count
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index d0eb7c0fc2..12a56f6147 100644
---- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -208,4 +208,9 @@ public class PaperConfig {
-                 " - Interval: " + timeSummary(Timings.getHistoryInterval() / 20) +
-                 " - Length: " + timeSummary(Timings.getHistoryLength() / 20));
-     }
-+
-+    public static int minChunkLoadThreads = 2;
-+    private static void chunkLoadThreads() {
-+        minChunkLoadThreads = Math.min(6, getInt("settings.min-chunk-load-threads", 2)); // Keep people from doing stupid things with max of 6
-+    }
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
-index e4fd9bc604..7b7a3d01b9 100644
---- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
-+++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
-@@ -1,5 +1,6 @@
- package org.bukkit.craftbukkit.chunkio;
- 
-+import com.destroystokyo.paper.PaperConfig;
- import net.minecraft.server.Chunk;
- import net.minecraft.server.ChunkProviderServer;
- import net.minecraft.server.ChunkRegionLoader;
-@@ -7,7 +8,7 @@ import net.minecraft.server.World;
- import org.bukkit.craftbukkit.util.AsynchronousExecutor;
- 
- public class ChunkIOExecutor {
--    static final int BASE_THREADS = 1;
-+    static final int BASE_THREADS = PaperConfig.minChunkLoadThreads; // Paper
-     static final int PLAYERS_PER_THREAD = 50;
- 
-     private static final AsynchronousExecutor<QueuedChunk, Chunk, Runnable, RuntimeException> instance = new AsynchronousExecutor<QueuedChunk, Chunk, Runnable, RuntimeException>(new ChunkIOProvider(), BASE_THREADS);
--- 
-2.19.0
-
diff --git a/Spigot-Server-Patches/0044-Configurable-Disabling-Cat-Chest-Detection.patch b/Spigot-Server-Patches/0043-Configurable-Disabling-Cat-Chest-Detection.patch
similarity index 96%
rename from Spigot-Server-Patches/0044-Configurable-Disabling-Cat-Chest-Detection.patch
rename to Spigot-Server-Patches/0043-Configurable-Disabling-Cat-Chest-Detection.patch
index 8f70fd6017..1627b2286c 100644
--- a/Spigot-Server-Patches/0044-Configurable-Disabling-Cat-Chest-Detection.patch
+++ b/Spigot-Server-Patches/0043-Configurable-Disabling-Cat-Chest-Detection.patch
@@ -1,4 +1,4 @@
-From ccf869e8a33ffd31f1c7098cfff42a9fd7d2e743 Mon Sep 17 00:00:00 2001
+From 8405fca5dd7106f16174a4f33ebc7d50a4ec3a96 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 01:13:45 -0600
 Subject: [PATCH] Configurable Disabling Cat Chest Detection
diff --git a/Spigot-Server-Patches/0045-Ensure-commands-are-not-ran-async.patch b/Spigot-Server-Patches/0044-Ensure-commands-are-not-ran-async.patch
similarity index 98%
rename from Spigot-Server-Patches/0045-Ensure-commands-are-not-ran-async.patch
rename to Spigot-Server-Patches/0044-Ensure-commands-are-not-ran-async.patch
index f1defee6ca..2ed7c5318b 100644
--- a/Spigot-Server-Patches/0045-Ensure-commands-are-not-ran-async.patch
+++ b/Spigot-Server-Patches/0044-Ensure-commands-are-not-ran-async.patch
@@ -1,4 +1,4 @@
-From 320d0a1aa6bf90279d552231fde09b66da0ef1ca Mon Sep 17 00:00:00 2001
+From 1f4c8bf51994ff58179cc8e6ca23afac8890230f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 01:17:12 -0600
 Subject: [PATCH] Ensure commands are not ran async
diff --git a/Spigot-Server-Patches/0046-All-chunks-are-slime-spawn-chunks-toggle.patch b/Spigot-Server-Patches/0045-All-chunks-are-slime-spawn-chunks-toggle.patch
similarity index 96%
rename from Spigot-Server-Patches/0046-All-chunks-are-slime-spawn-chunks-toggle.patch
rename to Spigot-Server-Patches/0045-All-chunks-are-slime-spawn-chunks-toggle.patch
index cdb1b1561a..0e01889cab 100644
--- a/Spigot-Server-Patches/0046-All-chunks-are-slime-spawn-chunks-toggle.patch
+++ b/Spigot-Server-Patches/0045-All-chunks-are-slime-spawn-chunks-toggle.patch
@@ -1,4 +1,4 @@
-From dfaa55f4e9b36525ab7f7157051499109b735547 Mon Sep 17 00:00:00 2001
+From 7772db378d231dfad0f3aff06c04b9e90407ec5f Mon Sep 17 00:00:00 2001
 From: vemacs <d@nkmem.es>
 Date: Thu, 3 Mar 2016 01:19:22 -0600
 Subject: [PATCH] All chunks are slime spawn chunks toggle
diff --git a/Spigot-Server-Patches/0047-Optimize-Pathfinding.patch b/Spigot-Server-Patches/0046-Optimize-Pathfinding.patch
similarity index 95%
rename from Spigot-Server-Patches/0047-Optimize-Pathfinding.patch
rename to Spigot-Server-Patches/0046-Optimize-Pathfinding.patch
index 9d18a39480..d241ce0e80 100644
--- a/Spigot-Server-Patches/0047-Optimize-Pathfinding.patch
+++ b/Spigot-Server-Patches/0046-Optimize-Pathfinding.patch
@@ -1,4 +1,4 @@
-From 715fb2ad02cc5da7554f941ec7d7958406f0bffb Mon Sep 17 00:00:00 2001
+From 4eb56052b0b279c261b87dc066fc9840888f694c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 02:02:07 -0600
 Subject: [PATCH] Optimize Pathfinding
@@ -47,5 +47,5 @@ index d1d16b25d0..5d6f726d05 100644
      }
  
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0048-Avoid-hopper-searches-if-there-are-no-items.patch b/Spigot-Server-Patches/0047-Avoid-hopper-searches-if-there-are-no-items.patch
similarity index 94%
rename from Spigot-Server-Patches/0048-Avoid-hopper-searches-if-there-are-no-items.patch
rename to Spigot-Server-Patches/0047-Avoid-hopper-searches-if-there-are-no-items.patch
index d9be9e08f5..aa3a37ae83 100644
--- a/Spigot-Server-Patches/0048-Avoid-hopper-searches-if-there-are-no-items.patch
+++ b/Spigot-Server-Patches/0047-Avoid-hopper-searches-if-there-are-no-items.patch
@@ -1,4 +1,4 @@
-From 5a87db053c7f449bbf969d895202b3fb6ed82ed4 Mon Sep 17 00:00:00 2001
+From ada7db3a06c6a718dfb76ef7a52e15e1a165bdda Mon Sep 17 00:00:00 2001
 From: CullanP <cullanpage@gmail.com>
 Date: Thu, 3 Mar 2016 02:13:38 -0600
 Subject: [PATCH] Avoid hopper searches if there are no items
@@ -14,7 +14,7 @@ And since minecart hoppers are used _very_ rarely near we can avoid alot of sear
 Combined, this adds up a lot.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 8f2de5a327..3647d12ee2 100644
+index 397798cf28..3123c80db9 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -91,6 +91,10 @@ public class Chunk implements IChunkAccess {
@@ -52,7 +52,7 @@ index 8f2de5a327..3647d12ee2 100644
          entity.setCurrentChunk(null);
          entityCounts.decrement(entity.getMinecraftKeyString());
          // Paper end
-@@ -924,6 +938,15 @@ public class Chunk implements IChunkAccess {
+@@ -949,6 +963,15 @@ public class Chunk implements IChunkAccess {
              if (!this.entitySlices[k].isEmpty()) {
                  Iterator iterator = this.entitySlices[k].iterator();
  
@@ -68,7 +68,7 @@ index 8f2de5a327..3647d12ee2 100644
                  while (iterator.hasNext()) {
                      Entity entity1 = (Entity) iterator.next();
  
-@@ -960,7 +983,18 @@ public class Chunk implements IChunkAccess {
+@@ -985,7 +1008,18 @@ public class Chunk implements IChunkAccess {
          i = MathHelper.clamp(i, 0, this.entitySlices.length - 1);
          j = MathHelper.clamp(j, 0, this.entitySlices.length - 1);
  
diff --git a/Spigot-Server-Patches/0049-Expose-server-CommandMap.patch b/Spigot-Server-Patches/0048-Expose-server-CommandMap.patch
similarity index 85%
rename from Spigot-Server-Patches/0049-Expose-server-CommandMap.patch
rename to Spigot-Server-Patches/0048-Expose-server-CommandMap.patch
index 7173e3618c..05000868d7 100644
--- a/Spigot-Server-Patches/0049-Expose-server-CommandMap.patch
+++ b/Spigot-Server-Patches/0048-Expose-server-CommandMap.patch
@@ -1,11 +1,11 @@
-From 91efddcf73257353ca417fd45b8cf87ff994e49f Mon Sep 17 00:00:00 2001
+From 329d2e7e15e9a401aeab8a4c96fd32e738800d57 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 3 Mar 2016 02:15:57 -0600
 Subject: [PATCH] Expose server CommandMap
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 7f711cd64..267224c69 100644
+index 7f711cd642..267224c69c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1638,6 +1638,7 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0050-Be-a-bit-more-informative-in-maxHealth-exception.patch b/Spigot-Server-Patches/0049-Be-a-bit-more-informative-in-maxHealth-exception.patch
similarity index 92%
rename from Spigot-Server-Patches/0050-Be-a-bit-more-informative-in-maxHealth-exception.patch
rename to Spigot-Server-Patches/0049-Be-a-bit-more-informative-in-maxHealth-exception.patch
index dd5a65b455..8e8bbe1c1c 100644
--- a/Spigot-Server-Patches/0050-Be-a-bit-more-informative-in-maxHealth-exception.patch
+++ b/Spigot-Server-Patches/0049-Be-a-bit-more-informative-in-maxHealth-exception.patch
@@ -1,11 +1,11 @@
-From 159d7089d7b7173190d8b6453c0aea61acfc0ae5 Mon Sep 17 00:00:00 2001
+From 62e5eaac06b42adfec37d77a1e29dabfc855d7f3 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 3 Mar 2016 02:18:39 -0600
 Subject: [PATCH] Be a bit more informative in maxHealth exception
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index ae402a2bf4..9079f5e903 100644
+index cc9e48d585..dff0dd2e9a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -98,7 +98,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -21,5 +21,5 @@ index ae402a2bf4..9079f5e903 100644
  
          getHandle().setHealth((float) health);
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0051-Player-Tab-List-and-Title-APIs.patch b/Spigot-Server-Patches/0050-Player-Tab-List-and-Title-APIs.patch
similarity index 98%
rename from Spigot-Server-Patches/0051-Player-Tab-List-and-Title-APIs.patch
rename to Spigot-Server-Patches/0050-Player-Tab-List-and-Title-APIs.patch
index 7d2bcd2a87..781d039fdc 100644
--- a/Spigot-Server-Patches/0051-Player-Tab-List-and-Title-APIs.patch
+++ b/Spigot-Server-Patches/0050-Player-Tab-List-and-Title-APIs.patch
@@ -1,4 +1,4 @@
-From 445bd2998dd5b384883f8ecc382ce11d980d5c66 Mon Sep 17 00:00:00 2001
+From 636e742ec2316e633fb571f41ef8e6e4a6fdb4c1 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Thu, 3 Mar 2016 02:32:10 -0600
 Subject: [PATCH] Player Tab List and Title APIs
@@ -54,7 +54,7 @@ index 267b69de30..29cbe15a82 100644
  
          if (this.a == PacketPlayOutTitle.EnumTitleAction.TIMES) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 3cc16b6923..f518e94fe9 100644
+index 2ab720d73a..9e51645c30 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1,5 +1,6 @@
@@ -162,5 +162,5 @@ index 3cc16b6923..f518e94fe9 100644
      public String getDisplayName() {
          return getHandle().displayName;
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0052-Ensure-inv-drag-is-in-bounds.patch b/Spigot-Server-Patches/0051-Ensure-inv-drag-is-in-bounds.patch
similarity index 89%
rename from Spigot-Server-Patches/0052-Ensure-inv-drag-is-in-bounds.patch
rename to Spigot-Server-Patches/0051-Ensure-inv-drag-is-in-bounds.patch
index 91de1e75c8..dc69f693e1 100644
--- a/Spigot-Server-Patches/0052-Ensure-inv-drag-is-in-bounds.patch
+++ b/Spigot-Server-Patches/0051-Ensure-inv-drag-is-in-bounds.patch
@@ -1,11 +1,11 @@
-From 383cb078929132e57e648249639e8fc7cd507ea4 Mon Sep 17 00:00:00 2001
+From 57db0c39f7754d65592693b68263e83dbd7e6846 Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:33:53 -0600
 Subject: [PATCH] Ensure inv drag is in bounds
 
 
 diff --git a/src/main/java/net/minecraft/server/Container.java b/src/main/java/net/minecraft/server/Container.java
-index 0ae0b5ed8..1573c0559 100644
+index 0ae0b5ed82..1573c05594 100644
 --- a/src/main/java/net/minecraft/server/Container.java
 +++ b/src/main/java/net/minecraft/server/Container.java
 @@ -139,7 +139,7 @@ public abstract class Container {
@@ -18,5 +18,5 @@ index 0ae0b5ed8..1573c0559 100644
                  itemstack1 = playerinventory.getCarried();
                  if (slot != null && a(slot, itemstack1, true) && slot.isAllowed(itemstack1) && (this.dragType == 2 || itemstack1.getCount() > this.h.size()) && this.b(slot)) {
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0053-Change-implementation-of-tile-entity-removal-list.patch b/Spigot-Server-Patches/0052-Change-implementation-of-tile-entity-removal-list.patch
similarity index 95%
rename from Spigot-Server-Patches/0053-Change-implementation-of-tile-entity-removal-list.patch
rename to Spigot-Server-Patches/0052-Change-implementation-of-tile-entity-removal-list.patch
index 2a81ab533f..acbbd29243 100644
--- a/Spigot-Server-Patches/0053-Change-implementation-of-tile-entity-removal-list.patch
+++ b/Spigot-Server-Patches/0052-Change-implementation-of-tile-entity-removal-list.patch
@@ -1,11 +1,11 @@
-From 7c6c6994aef966b58c6c45848d922e469a53ec52 Mon Sep 17 00:00:00 2001
+From 2eeade3b60ffa9d2da91ae718e6c0ec98986f926 Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:39:54 -0600
 Subject: [PATCH] Change implementation of (tile)entity removal list
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 4a457e3302..fbcdf9ecaf 100644
+index 352a7f25a7..65e84b666f 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -73,11 +73,11 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
diff --git a/Spigot-Server-Patches/0054-Add-configurable-portal-search-radius.patch b/Spigot-Server-Patches/0053-Add-configurable-portal-search-radius.patch
similarity index 97%
rename from Spigot-Server-Patches/0054-Add-configurable-portal-search-radius.patch
rename to Spigot-Server-Patches/0053-Add-configurable-portal-search-radius.patch
index ef97c19bb3..b16afbf88e 100644
--- a/Spigot-Server-Patches/0054-Add-configurable-portal-search-radius.patch
+++ b/Spigot-Server-Patches/0053-Add-configurable-portal-search-radius.patch
@@ -1,4 +1,4 @@
-From 46029afee41c28fb042bb48bab28a32a293bf7bd Mon Sep 17 00:00:00 2001
+From ee19b52c8f80ea7fb920ff6736e719a610659b9d Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:46:17 -0600
 Subject: [PATCH] Add configurable portal search radius
diff --git a/Spigot-Server-Patches/0055-Add-velocity-warnings.patch b/Spigot-Server-Patches/0054-Add-velocity-warnings.patch
similarity index 96%
rename from Spigot-Server-Patches/0055-Add-velocity-warnings.patch
rename to Spigot-Server-Patches/0054-Add-velocity-warnings.patch
index 4146631254..3366a71e2b 100644
--- a/Spigot-Server-Patches/0055-Add-velocity-warnings.patch
+++ b/Spigot-Server-Patches/0054-Add-velocity-warnings.patch
@@ -1,11 +1,11 @@
-From d58db3ae2af3c2a90f937dab47954651fcf9f873 Mon Sep 17 00:00:00 2001
+From 901aeed4b57279cd6901464e6643049fc57e2a5f Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:48:12 -0600
 Subject: [PATCH] Add velocity warnings
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 267224c69..17fdc58bd 100644
+index 267224c69c..17fdc58bd0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -196,6 +196,7 @@ public final class CraftServer implements Server {
@@ -17,7 +17,7 @@ index 267224c69..17fdc58bd 100644
      private final class BooleanWrapper {
          private boolean value = true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 0c9b7276f..ae705e86f 100644
+index 0c9b7276fc..ae705e86f9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -264,12 +264,44 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -66,7 +66,7 @@ index 0c9b7276f..ae705e86f 100644
      public double getHeight() {
          return getHandle().length;
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index 91b8aa6a1..0c106ea9c 100644
+index 91b8aa6a16..0c106ea9c5 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
 @@ -66,7 +66,19 @@ public class WatchdogThread extends Thread
diff --git a/Spigot-Server-Patches/0056-Configurable-inter-world-teleportation-safety.patch b/Spigot-Server-Patches/0055-Configurable-inter-world-teleportation-safety.patch
similarity index 97%
rename from Spigot-Server-Patches/0056-Configurable-inter-world-teleportation-safety.patch
rename to Spigot-Server-Patches/0055-Configurable-inter-world-teleportation-safety.patch
index d5f3bb08bb..9974558e2e 100644
--- a/Spigot-Server-Patches/0056-Configurable-inter-world-teleportation-safety.patch
+++ b/Spigot-Server-Patches/0055-Configurable-inter-world-teleportation-safety.patch
@@ -1,4 +1,4 @@
-From 59c58eda01136297cb0ecc512f42eeb3abeb6ba0 Mon Sep 17 00:00:00 2001
+From 96c325739ed00f1c7e01805d6c3fd11a457faac0 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Thu, 3 Mar 2016 02:50:31 -0600
 Subject: [PATCH] Configurable inter-world teleportation safety
@@ -43,7 +43,7 @@ index 4320efaef5..9f2c7d3f45 100644
              entityplayer.getBukkitEntity().setVelocity(velocity);
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index f518e94fe9..42ee0efc1b 100644
+index 9e51645c30..15a99220ca 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -714,7 +714,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0057-Add-exception-reporting-event.patch b/Spigot-Server-Patches/0056-Add-exception-reporting-event.patch
similarity index 99%
rename from Spigot-Server-Patches/0057-Add-exception-reporting-event.patch
rename to Spigot-Server-Patches/0056-Add-exception-reporting-event.patch
index 809303cb87..cb9c52ea28 100644
--- a/Spigot-Server-Patches/0057-Add-exception-reporting-event.patch
+++ b/Spigot-Server-Patches/0056-Add-exception-reporting-event.patch
@@ -1,4 +1,4 @@
-From 29d87f4766b15630691b1f4cfe68a506109bc545 Mon Sep 17 00:00:00 2001
+From 1974e5a1120239134abe1baa64fb13d61704831f Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 03:15:41 -0600
 Subject: [PATCH] Add exception reporting event
@@ -50,7 +50,7 @@ index 0000000000..93397188b7
 +}
 \ No newline at end of file
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 3647d12ee2..fc0f052c70 100644
+index 3123c80db9..968cf6ec65 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -1,5 +1,6 @@
diff --git a/Spigot-Server-Patches/0058-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch b/Spigot-Server-Patches/0057-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
similarity index 92%
rename from Spigot-Server-Patches/0058-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
rename to Spigot-Server-Patches/0057-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
index 5c4ce6cbd6..6ce1eeb4cd 100644
--- a/Spigot-Server-Patches/0058-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
+++ b/Spigot-Server-Patches/0057-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
@@ -1,4 +1,4 @@
-From 7e5e4e0ac9f03e3ae15e7840536e99d085745778 Mon Sep 17 00:00:00 2001
+From 366c331315abcf82654e47d3faf4e192d5422e87 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Tue, 8 Mar 2016 18:28:43 -0800
 Subject: [PATCH] Don't nest if we don't need to when cerealising text
@@ -6,7 +6,7 @@ Subject: [PATCH] Don't nest if we don't need to when cerealising text
 
 
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutChat.java b/src/main/java/net/minecraft/server/PacketPlayOutChat.java
-index 28a262835..eba6aadad 100644
+index 28a2628350..eba6aadad7 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutChat.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutChat.java
 @@ -27,7 +27,14 @@ public class PacketPlayOutChat implements Packet<PacketListenerPlayOut> {
@@ -26,5 +26,5 @@ index 28a262835..eba6aadad 100644
              packetdataserializer.a(this.a);
          }
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0059-Disable-Scoreboards-for-non-players-by-default.patch b/Spigot-Server-Patches/0058-Disable-Scoreboards-for-non-players-by-default.patch
similarity index 97%
rename from Spigot-Server-Patches/0059-Disable-Scoreboards-for-non-players-by-default.patch
rename to Spigot-Server-Patches/0058-Disable-Scoreboards-for-non-players-by-default.patch
index 0aeb51a44b..3bbdbf4258 100644
--- a/Spigot-Server-Patches/0059-Disable-Scoreboards-for-non-players-by-default.patch
+++ b/Spigot-Server-Patches/0058-Disable-Scoreboards-for-non-players-by-default.patch
@@ -1,4 +1,4 @@
-From 24304ff50be7b3cf2f813bfaebc10574d2eb0e89 Mon Sep 17 00:00:00 2001
+From 8db6f7dff5c3f970e46f8f6bb6005c7067e235e0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 8 Mar 2016 23:25:45 -0500
 Subject: [PATCH] Disable Scoreboards for non players by default
diff --git a/Spigot-Server-Patches/0060-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/Spigot-Server-Patches/0059-Add-methods-for-working-with-arrows-stuck-in-living-.patch
similarity index 89%
rename from Spigot-Server-Patches/0060-Add-methods-for-working-with-arrows-stuck-in-living-.patch
rename to Spigot-Server-Patches/0059-Add-methods-for-working-with-arrows-stuck-in-living-.patch
index 3837929752..4ba2018500 100644
--- a/Spigot-Server-Patches/0060-Add-methods-for-working-with-arrows-stuck-in-living-.patch
+++ b/Spigot-Server-Patches/0059-Add-methods-for-working-with-arrows-stuck-in-living-.patch
@@ -1,11 +1,11 @@
-From 1732eed30441f263fee9c251e84341f0c7fdebf9 Mon Sep 17 00:00:00 2001
+From 539dda3f9de6eb64b362b456ecc96d83ee05ee89 Mon Sep 17 00:00:00 2001
 From: mrapple <tony@oc.tc>
 Date: Sun, 25 Nov 2012 13:43:39 -0600
 Subject: [PATCH] Add methods for working with arrows stuck in living entities
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 549205ecaa..ac301d379b 100644
+index dff0dd2e9a..09cf843d46 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -512,4 +512,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -26,5 +26,5 @@ index 549205ecaa..ac301d379b 100644
 +    // Paper end
  }
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0061-Complete-resource-pack-API.patch b/Spigot-Server-Patches/0060-Complete-resource-pack-API.patch
similarity index 95%
rename from Spigot-Server-Patches/0061-Complete-resource-pack-API.patch
rename to Spigot-Server-Patches/0060-Complete-resource-pack-API.patch
index 24e065c702..2382843f8e 100644
--- a/Spigot-Server-Patches/0061-Complete-resource-pack-API.patch
+++ b/Spigot-Server-Patches/0060-Complete-resource-pack-API.patch
@@ -1,11 +1,11 @@
-From 22ccbf55c661d74d594b10f808239aff3eb18850 Mon Sep 17 00:00:00 2001
+From 5c95037bbbfbc205d23d3c492d634c31d69e9da8 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 4 Apr 2015 23:17:52 -0400
 Subject: [PATCH] Complete resource pack API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 42ee0efc1b..cd32239132 100644
+index 15a99220ca..33bbda62f2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -128,6 +128,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -53,5 +53,5 @@ index 42ee0efc1b..cd32239132 100644
      private final Player.Spigot spigot = new Player.Spigot()
      {
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0062-Chunk-save-queue-improvements.patch b/Spigot-Server-Patches/0061-Chunk-save-queue-improvements.patch
similarity index 96%
rename from Spigot-Server-Patches/0062-Chunk-save-queue-improvements.patch
rename to Spigot-Server-Patches/0061-Chunk-save-queue-improvements.patch
index bbe9030175..ee9160132b 100644
--- a/Spigot-Server-Patches/0062-Chunk-save-queue-improvements.patch
+++ b/Spigot-Server-Patches/0061-Chunk-save-queue-improvements.patch
@@ -1,4 +1,4 @@
-From 8614fe1a1f8fa80b14d30b1b9887a169ecff6e51 Mon Sep 17 00:00:00 2001
+From a9fa65bc8f28a373e04a504b000976a25c3ec2b7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 4 Mar 2016 18:18:37 -0600
 Subject: [PATCH] Chunk save queue improvements
@@ -26,12 +26,12 @@ Then finally, Sleeping will by default be removed, but due to known issues with
 But if sleeps are to remain enabled, we at least lower the sleep interval so it doesn't have as much negative impact.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 12a56f6147..18296f1e1b 100644
+index d0eb7c0fc2..ad3433059d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -213,4 +213,10 @@ public class PaperConfig {
-     private static void chunkLoadThreads() {
-         minChunkLoadThreads = Math.min(6, getInt("settings.min-chunk-load-threads", 2)); // Keep people from doing stupid things with max of 6
+@@ -208,4 +208,10 @@ public class PaperConfig {
+                 " - Interval: " + timeSummary(Timings.getHistoryInterval() / 20) +
+                 " - Length: " + timeSummary(Timings.getHistoryLength() / 20));
      }
 +
 +    public static boolean enableFileIOThreadSleep;
diff --git a/Spigot-Server-Patches/0063-Chunk-Save-Reattempt.patch b/Spigot-Server-Patches/0062-Chunk-Save-Reattempt.patch
similarity index 97%
rename from Spigot-Server-Patches/0063-Chunk-Save-Reattempt.patch
rename to Spigot-Server-Patches/0062-Chunk-Save-Reattempt.patch
index dcfeed0707..1d2d50d447 100644
--- a/Spigot-Server-Patches/0063-Chunk-Save-Reattempt.patch
+++ b/Spigot-Server-Patches/0062-Chunk-Save-Reattempt.patch
@@ -1,4 +1,4 @@
-From 3cd840042adadf44252ecfc09aa287e8d531c74b Mon Sep 17 00:00:00 2001
+From 8b104aaf5b009efc9c04ac1839443575da074737 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 4 Mar 2013 23:46:10 -0500
 Subject: [PATCH] Chunk Save Reattempt
@@ -54,5 +54,5 @@ index e5115863ec..2217adf99c 100644
  
      public static synchronized boolean chunkExists(File file, int i, int j) {
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0064-Default-loading-permissions.yml-before-plugins.patch b/Spigot-Server-Patches/0063-Default-loading-permissions.yml-before-plugins.patch
similarity index 94%
rename from Spigot-Server-Patches/0064-Default-loading-permissions.yml-before-plugins.patch
rename to Spigot-Server-Patches/0063-Default-loading-permissions.yml-before-plugins.patch
index e69e8498c6..1b7dbf121f 100644
--- a/Spigot-Server-Patches/0064-Default-loading-permissions.yml-before-plugins.patch
+++ b/Spigot-Server-Patches/0063-Default-loading-permissions.yml-before-plugins.patch
@@ -1,4 +1,4 @@
-From be0d1a10650fe1ca271d8f011029fc4f92ce24bf Mon Sep 17 00:00:00 2001
+From 03dc024bc7d536a6744622390a0bd01046d03cb9 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 13:17:38 -0400
 Subject: [PATCH] Default loading permissions.yml before plugins
@@ -16,10 +16,10 @@ modify that. Under the previous logic, plugins were unable (cleanly) override pe
 A config option has been added for those who depend on the previous behavior, but I don't expect that.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 18296f1e1b..5ae78efdfe 100644
+index ad3433059d..88c465ef1c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -219,4 +219,9 @@ public class PaperConfig {
+@@ -214,4 +214,9 @@ public class PaperConfig {
          enableFileIOThreadSleep = getBoolean("settings.sleep-between-chunk-saves", false);
          if (enableFileIOThreadSleep) Bukkit.getLogger().info("Enabled sleeping between chunk saves, beware of memory issues");
      }
diff --git a/Spigot-Server-Patches/0065-Allow-Reloading-of-Custom-Permissions.patch b/Spigot-Server-Patches/0064-Allow-Reloading-of-Custom-Permissions.patch
similarity index 93%
rename from Spigot-Server-Patches/0065-Allow-Reloading-of-Custom-Permissions.patch
rename to Spigot-Server-Patches/0064-Allow-Reloading-of-Custom-Permissions.patch
index 5432c75175..cc9950ca8d 100644
--- a/Spigot-Server-Patches/0065-Allow-Reloading-of-Custom-Permissions.patch
+++ b/Spigot-Server-Patches/0064-Allow-Reloading-of-Custom-Permissions.patch
@@ -1,4 +1,4 @@
-From d7d0b571e979d10fc654c34ab1bea1c307b46e76 Mon Sep 17 00:00:00 2001
+From 34257015af334cb3e1e2f7f98ebf3085d24b5f13 Mon Sep 17 00:00:00 2001
 From: William <admin@domnian.com>
 Date: Fri, 18 Mar 2016 03:30:17 -0400
 Subject: [PATCH] Allow Reloading of Custom Permissions
@@ -6,7 +6,7 @@ Subject: [PATCH] Allow Reloading of Custom Permissions
 https://github.com/PaperMC/Paper/issues/49
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 385063d8a..583e31d59 100644
+index 385063d8aa..583e31d59b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2003,5 +2003,23 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0066-Remove-Metadata-on-reload.patch b/Spigot-Server-Patches/0065-Remove-Metadata-on-reload.patch
similarity index 92%
rename from Spigot-Server-Patches/0066-Remove-Metadata-on-reload.patch
rename to Spigot-Server-Patches/0065-Remove-Metadata-on-reload.patch
index c91ffd1a55..c91e097276 100644
--- a/Spigot-Server-Patches/0066-Remove-Metadata-on-reload.patch
+++ b/Spigot-Server-Patches/0065-Remove-Metadata-on-reload.patch
@@ -1,4 +1,4 @@
-From a374a3a2d5f52e956f9059f9698cc7f16eeb8b37 Mon Sep 17 00:00:00 2001
+From c89b7959440619afca8a6738df1e224d6efd61f4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 13:50:14 -0400
 Subject: [PATCH] Remove Metadata on reload
@@ -7,7 +7,7 @@ Metadata is not meant to persist reload as things break badly with non primitive
 This will remove metadata on reload so it does not crash everything if a plugin uses it.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 583e31d59..eb17d5e95 100644
+index 583e31d59b..eb17d5e957 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -794,8 +794,18 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0067-Undead-horse-leashing.patch b/Spigot-Server-Patches/0066-Undead-horse-leashing.patch
similarity index 96%
rename from Spigot-Server-Patches/0067-Undead-horse-leashing.patch
rename to Spigot-Server-Patches/0066-Undead-horse-leashing.patch
index 4bfe77398f..934997331f 100644
--- a/Spigot-Server-Patches/0067-Undead-horse-leashing.patch
+++ b/Spigot-Server-Patches/0066-Undead-horse-leashing.patch
@@ -1,4 +1,4 @@
-From 31db0c295b6a7795af976ad47c1303ecb3b87f76 Mon Sep 17 00:00:00 2001
+From dffcbee647e4d7391d244401c9df2ff96d1a2e1c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 14:19:19 -0400
 Subject: [PATCH] Undead horse leashing
diff --git a/Spigot-Server-Patches/0068-Handle-Item-Meta-Inconsistencies.patch b/Spigot-Server-Patches/0067-Handle-Item-Meta-Inconsistencies.patch
similarity index 98%
rename from Spigot-Server-Patches/0068-Handle-Item-Meta-Inconsistencies.patch
rename to Spigot-Server-Patches/0067-Handle-Item-Meta-Inconsistencies.patch
index 804b829f2a..6f7884cc16 100644
--- a/Spigot-Server-Patches/0068-Handle-Item-Meta-Inconsistencies.patch
+++ b/Spigot-Server-Patches/0067-Handle-Item-Meta-Inconsistencies.patch
@@ -1,4 +1,4 @@
-From fe9f75e118fe7e2a336fbe522a55caf9ecdb5f74 Mon Sep 17 00:00:00 2001
+From 9abc8366e45aaefa1b77f49d19c02cd94c6accc6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 28 May 2015 23:00:19 -0400
 Subject: [PATCH] Handle Item Meta Inconsistencies
@@ -18,7 +18,7 @@ For consistency, the old API methods now forward to use the
 ItemMeta API equivalents, and should deprecate the old API's.
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 318c4204d..56787ed25 100644
+index 318c4204df..56787ed25c 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -7,6 +7,8 @@ import com.mojang.brigadier.StringReader;
@@ -78,7 +78,7 @@ index 318c4204d..56787ed25 100644
  
      public boolean hasEnchantments() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 1d0580ff7..2733cda40 100644
+index 1d0580ff7f..2733cda407 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -4,6 +4,7 @@ import static org.bukkit.craftbukkit.inventory.CraftMetaItem.ENCHANTMENTS;
@@ -201,7 +201,7 @@ index 1d0580ff7..2733cda40 100644
  
      static Map<Enchantment, Integer> getEnchantments(net.minecraft.server.ItemStack item) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 99276f116..652866881 100644
+index 99276f1165..6528668816 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -8,6 +8,7 @@ import java.lang.reflect.Constructor;
diff --git a/Spigot-Server-Patches/0069-Configurable-Non-Player-Arrow-Despawn-Rate.patch b/Spigot-Server-Patches/0068-Configurable-Non-Player-Arrow-Despawn-Rate.patch
similarity index 97%
rename from Spigot-Server-Patches/0069-Configurable-Non-Player-Arrow-Despawn-Rate.patch
rename to Spigot-Server-Patches/0068-Configurable-Non-Player-Arrow-Despawn-Rate.patch
index fc0138b9f9..076f99707e 100644
--- a/Spigot-Server-Patches/0069-Configurable-Non-Player-Arrow-Despawn-Rate.patch
+++ b/Spigot-Server-Patches/0068-Configurable-Non-Player-Arrow-Despawn-Rate.patch
@@ -1,4 +1,4 @@
-From 378942b6c4acb8ba353194471f3e007ef24de4d4 Mon Sep 17 00:00:00 2001
+From 7b8d0f3c5d696a6fb1857fe8b1f6f1a94cca14ef Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 15:12:22 -0400
 Subject: [PATCH] Configurable Non Player Arrow Despawn Rate
diff --git a/Spigot-Server-Patches/0070-Add-World-Util-Methods.patch b/Spigot-Server-Patches/0069-Add-World-Util-Methods.patch
similarity index 98%
rename from Spigot-Server-Patches/0070-Add-World-Util-Methods.patch
rename to Spigot-Server-Patches/0069-Add-World-Util-Methods.patch
index 67f3db4f39..78991c83c9 100644
--- a/Spigot-Server-Patches/0070-Add-World-Util-Methods.patch
+++ b/Spigot-Server-Patches/0069-Add-World-Util-Methods.patch
@@ -1,4 +1,4 @@
-From 9b89ac214dad604784dbbe857ea7a1941f2a2fdc Mon Sep 17 00:00:00 2001
+From c4f46dc872cdc9d8a76ca4f785daa2cd89c1d1e7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 20:16:03 -0400
 Subject: [PATCH] Add World Util Methods
@@ -6,7 +6,7 @@ Subject: [PATCH] Add World Util Methods
 Methods that can be used for other patches to help improve logic.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index ab579b9052..b006282f38 100644
+index 968cf6ec65..36def82bca 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -633,6 +633,7 @@ public class Chunk implements IChunkAccess {
diff --git a/Spigot-Server-Patches/0071-Optimized-Light-Level-Comparisons.patch b/Spigot-Server-Patches/0070-Optimized-Light-Level-Comparisons.patch
similarity index 98%
rename from Spigot-Server-Patches/0071-Optimized-Light-Level-Comparisons.patch
rename to Spigot-Server-Patches/0070-Optimized-Light-Level-Comparisons.patch
index 31204b5e53..808372244e 100644
--- a/Spigot-Server-Patches/0071-Optimized-Light-Level-Comparisons.patch
+++ b/Spigot-Server-Patches/0070-Optimized-Light-Level-Comparisons.patch
@@ -1,4 +1,4 @@
-From 75b8c8e24cd6b38751500103dee0b8add52379a5 Mon Sep 17 00:00:00 2001
+From d1ca33ace69f0cd276ba58742fe9ff06482f4473 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 21:22:56 -0400
 Subject: [PATCH] Optimized Light Level Comparisons
@@ -34,7 +34,7 @@ index 42478d1fed..7426d14cbf 100644
              world.captureTreeGeneration = true;
              // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/BlockStem.java b/src/main/java/net/minecraft/server/BlockStem.java
-index 4fc8c5d3c6..0fc39bb9fb 100644
+index dd309030e5..7cddfc380c 100644
 --- a/src/main/java/net/minecraft/server/BlockStem.java
 +++ b/src/main/java/net/minecraft/server/BlockStem.java
 @@ -27,7 +27,7 @@ public class BlockStem extends BlockPlant implements IBlockFragilePlantElement {
@@ -85,5 +85,5 @@ index 1ab3072cc3..e5170bff5b 100644
                          if (!this.world.isPlayerNearby((double) i1, (double) j1, (double) k1, 7.0D) && this.world.a_(entityzombie, entityzombie.getBoundingBox()) && this.world.getCubes(entityzombie, entityzombie.getBoundingBox()) && !this.world.containsLiquid(entityzombie.getBoundingBox())) {
                              this.world.addEntity(entityzombie, CreatureSpawnEvent.SpawnReason.REINFORCEMENTS); // CraftBukkit
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0072-Pass-world-to-Village-creation.patch b/Spigot-Server-Patches/0071-Pass-world-to-Village-creation.patch
similarity index 95%
rename from Spigot-Server-Patches/0072-Pass-world-to-Village-creation.patch
rename to Spigot-Server-Patches/0071-Pass-world-to-Village-creation.patch
index 9ff4709e1b..b21e6d2cc5 100644
--- a/Spigot-Server-Patches/0072-Pass-world-to-Village-creation.patch
+++ b/Spigot-Server-Patches/0071-Pass-world-to-Village-creation.patch
@@ -1,4 +1,4 @@
-From e1a7033e3c4af7eb6dae4c51bf3a2f02ea02654d Mon Sep 17 00:00:00 2001
+From 4794e17198632431883eba3787fdbbf99df2f43b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 19 Mar 2016 15:16:54 -0400
 Subject: [PATCH] Pass world to Village creation
@@ -32,5 +32,5 @@ index f87e8e05af..bda67faefe 100644
          this.d = BlockPosition.ZERO;
          this.j = Maps.newHashMap();
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0073-Custom-replacement-for-eaten-items.patch b/Spigot-Server-Patches/0072-Custom-replacement-for-eaten-items.patch
similarity index 95%
rename from Spigot-Server-Patches/0073-Custom-replacement-for-eaten-items.patch
rename to Spigot-Server-Patches/0072-Custom-replacement-for-eaten-items.patch
index 143b65c45a..7940995246 100644
--- a/Spigot-Server-Patches/0073-Custom-replacement-for-eaten-items.patch
+++ b/Spigot-Server-Patches/0072-Custom-replacement-for-eaten-items.patch
@@ -1,11 +1,11 @@
-From 4182ffd42847bd0fdcfdedbdee5371e3b9a0b919 Mon Sep 17 00:00:00 2001
+From 8fb138862913c22188505f59838c6b2724b7d361 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 21 Jun 2015 15:07:20 -0400
 Subject: [PATCH] Custom replacement for eaten items
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 91baaa506..c3936c4e3 100644
+index 91baaa5062..c3936c4e36 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2602,12 +2602,13 @@ public abstract class EntityLiving extends Entity {
diff --git a/Spigot-Server-Patches/0074-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/Spigot-Server-Patches/0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch
similarity index 94%
rename from Spigot-Server-Patches/0074-handle-NaN-health-absorb-values-and-repair-bad-data.patch
rename to Spigot-Server-Patches/0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch
index 4af06f1e35..ba86d9e946 100644
--- a/Spigot-Server-Patches/0074-handle-NaN-health-absorb-values-and-repair-bad-data.patch
+++ b/Spigot-Server-Patches/0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch
@@ -1,11 +1,11 @@
-From ea2c2b6a9ec6632dc008eb223f2d825e77205144 Mon Sep 17 00:00:00 2001
+From 0e5ec8f1cd5d4e55e15adbbea9140341efdb7e6f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 27 Sep 2015 01:18:02 -0400
 Subject: [PATCH] handle NaN health/absorb values and repair bad data
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index c3936c4e3..d41a7fb08 100644
+index c3936c4e36..d41a7fb087 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -499,7 +499,13 @@ public abstract class EntityLiving extends Entity {
@@ -44,7 +44,7 @@ index c3936c4e3..d41a7fb08 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index cd3223913..fed28ecd9 100644
+index 33bbda62f2..c575fb933c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1563,6 +1563,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0075-Catch-Async-PlayerChunkMap-operations.patch b/Spigot-Server-Patches/0074-Catch-Async-PlayerChunkMap-operations.patch
similarity index 88%
rename from Spigot-Server-Patches/0075-Catch-Async-PlayerChunkMap-operations.patch
rename to Spigot-Server-Patches/0074-Catch-Async-PlayerChunkMap-operations.patch
index 531ab63491..7dacf8a904 100644
--- a/Spigot-Server-Patches/0075-Catch-Async-PlayerChunkMap-operations.patch
+++ b/Spigot-Server-Patches/0074-Catch-Async-PlayerChunkMap-operations.patch
@@ -1,11 +1,11 @@
-From e67d8424ff946ac6c96671f0a2b1fd6843ec7320 Mon Sep 17 00:00:00 2001
+From 5f489d6f0d19763383fc223b8f8b1a0b3743ccf7 Mon Sep 17 00:00:00 2001
 From: Daniel Ennis <dennis@icontact.com>
 Date: Sun, 20 Mar 2016 15:22:42 -0400
 Subject: [PATCH] Catch Async PlayerChunkMap operations
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 44f1ad90..174389e8 100644
+index fb593529e1..a69d510dd1 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -442,10 +442,12 @@ public class PlayerChunkMap {
@@ -22,5 +22,5 @@ index 44f1ad90..174389e8 100644
          long i = d(chunkcoordintpair.x, chunkcoordintpair.z);
  
 -- 
-2.18.0.windows.1
+2.19.0
 
diff --git a/Spigot-Server-Patches/0076-Waving-banner-workaround.patch b/Spigot-Server-Patches/0075-Waving-banner-workaround.patch
similarity index 94%
rename from Spigot-Server-Patches/0076-Waving-banner-workaround.patch
rename to Spigot-Server-Patches/0075-Waving-banner-workaround.patch
index 8577692a65..b596a5d9a6 100644
--- a/Spigot-Server-Patches/0076-Waving-banner-workaround.patch
+++ b/Spigot-Server-Patches/0075-Waving-banner-workaround.patch
@@ -1,4 +1,4 @@
-From be2605540c49de075459ddf5825d142b945c57eb Mon Sep 17 00:00:00 2001
+From 2a29c283343e48329376f2c90d533e7bdd3bd6d0 Mon Sep 17 00:00:00 2001
 From: Gabscap <git@gabscap.de>
 Date: Sat, 19 Mar 2016 22:25:11 +0100
 Subject: [PATCH] Waving banner workaround
@@ -34,5 +34,5 @@ index 731b96dea2..2a0fd2fbc0 100644
  
      public void a(PacketDataSerializer packetdataserializer) throws IOException {
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0077-Use-a-Shared-Random-for-Entities.patch b/Spigot-Server-Patches/0076-Use-a-Shared-Random-for-Entities.patch
similarity index 94%
rename from Spigot-Server-Patches/0077-Use-a-Shared-Random-for-Entities.patch
rename to Spigot-Server-Patches/0076-Use-a-Shared-Random-for-Entities.patch
index 917089ba81..3363326dc8 100644
--- a/Spigot-Server-Patches/0077-Use-a-Shared-Random-for-Entities.patch
+++ b/Spigot-Server-Patches/0076-Use-a-Shared-Random-for-Entities.patch
@@ -1,4 +1,4 @@
-From d9e146f01679a6389ff7838846ff6530b8333a55 Mon Sep 17 00:00:00 2001
+From 904838a83dcfe4d279996358ec02ff87a14ed35a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 22 Mar 2016 00:33:47 -0400
 Subject: [PATCH] Use a Shared Random for Entities
@@ -6,7 +6,7 @@ Subject: [PATCH] Use a Shared Random for Entities
 Reduces memory usage and provides ensures more randomness, Especially since a lot of garbage entity objects get created.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 27020c7e29..07172d3dd8 100644
+index 43ceb2fb18..e31c97fb72 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -51,6 +51,20 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -40,5 +40,5 @@ index 27020c7e29..07172d3dd8 100644
          this.justCreated = true;
          this.uniqueID = MathHelper.a(this.random);
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0078-Don-t-teleport-dead-entities.patch b/Spigot-Server-Patches/0077-Don-t-teleport-dead-entities.patch
similarity index 94%
rename from Spigot-Server-Patches/0078-Don-t-teleport-dead-entities.patch
rename to Spigot-Server-Patches/0077-Don-t-teleport-dead-entities.patch
index c25eda8f02..916c131ab1 100644
--- a/Spigot-Server-Patches/0078-Don-t-teleport-dead-entities.patch
+++ b/Spigot-Server-Patches/0077-Don-t-teleport-dead-entities.patch
@@ -1,4 +1,4 @@
-From 9045b80f44943e175475fc97925e8b453f5f3e55 Mon Sep 17 00:00:00 2001
+From 6af064d807377a45c74cb75e73e28d775d252e27 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 22 Mar 2016 00:55:23 -0400
 Subject: [PATCH] Don't teleport dead entities
diff --git a/Spigot-Server-Patches/0079-Optimize-Chunk-Access.patch b/Spigot-Server-Patches/0078-Optimize-Chunk-Access.patch
similarity index 94%
rename from Spigot-Server-Patches/0079-Optimize-Chunk-Access.patch
rename to Spigot-Server-Patches/0078-Optimize-Chunk-Access.patch
index 125e99651e..522e7b4dda 100644
--- a/Spigot-Server-Patches/0079-Optimize-Chunk-Access.patch
+++ b/Spigot-Server-Patches/0078-Optimize-Chunk-Access.patch
@@ -1,4 +1,4 @@
-From 886011f86b3e4c7e60676ac8d08977677187cafe Mon Sep 17 00:00:00 2001
+From 14e26ad623fc54b7f4e0c647f40b9cdcca79a88f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 27 Aug 2015 01:15:02 -0400
 Subject: [PATCH] Optimize Chunk Access
@@ -9,7 +9,7 @@ getChunkAt is called for the same chunk multiple times in a row, often from getT
 Optimize this look up by using a Last Access cache.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkMap.java b/src/main/java/net/minecraft/server/ChunkMap.java
-index fbebd4591c..b941676829 100644
+index 4b8b77710b..df967ff07d 100644
 --- a/src/main/java/net/minecraft/server/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/ChunkMap.java
 @@ -15,6 +15,7 @@ public class ChunkMap extends Long2ObjectOpenHashMap<Chunk> {
@@ -20,7 +20,7 @@ index fbebd4591c..b941676829 100644
          Chunk chunk1 = (Chunk) super.put(i, chunk);
          ChunkCoordIntPair chunkcoordintpair = new ChunkCoordIntPair(i);
  
-@@ -98,8 +99,22 @@ public class ChunkMap extends Long2ObjectOpenHashMap<Chunk> {
+@@ -73,8 +74,22 @@ public class ChunkMap extends Long2ObjectOpenHashMap<Chunk> {
              }
          }
  
@@ -44,7 +44,7 @@ index fbebd4591c..b941676829 100644
      public Chunk a(Object object) {
          return this.a(((Long) object).longValue());
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index d73034f329..b1e6901090 100644
+index d16fc452e3..2d10f4aa37 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -78,15 +78,16 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -86,5 +86,5 @@ index d73034f329..b1e6901090 100644
          return true;
      }
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0080-Configurable-spawn-chances-for-skeleton-horses.patch b/Spigot-Server-Patches/0079-Configurable-spawn-chances-for-skeleton-horses.patch
similarity index 97%
rename from Spigot-Server-Patches/0080-Configurable-spawn-chances-for-skeleton-horses.patch
rename to Spigot-Server-Patches/0079-Configurable-spawn-chances-for-skeleton-horses.patch
index ec44c35f90..b0c743fcab 100644
--- a/Spigot-Server-Patches/0080-Configurable-spawn-chances-for-skeleton-horses.patch
+++ b/Spigot-Server-Patches/0079-Configurable-spawn-chances-for-skeleton-horses.patch
@@ -1,4 +1,4 @@
-From ad6c8ae5dadadd8b7fb23d9c93f1aba50c6a4987 Mon Sep 17 00:00:00 2001
+From 78959508ddb0744bf1e6faed38c6b79c0a07775b Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 22 Mar 2016 12:04:28 -0500
 Subject: [PATCH] Configurable spawn chances for skeleton horses
diff --git a/Spigot-Server-Patches/0081-Optimize-isValidLocation-getType-and-getBlockData-fo.patch b/Spigot-Server-Patches/0080-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
similarity index 98%
rename from Spigot-Server-Patches/0081-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
rename to Spigot-Server-Patches/0080-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
index fc2595c78c..23e451c44e 100644
--- a/Spigot-Server-Patches/0081-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
+++ b/Spigot-Server-Patches/0080-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
@@ -1,4 +1,4 @@
-From a13d2700664c3333e72da26c2ea598c4cad882f2 Mon Sep 17 00:00:00 2001
+From ddf05e292f18cdd911fd1360401b33e317016bd3 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
@@ -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 b006282f38..a36034cc52 100644
+index 36def82bca..0e84fd283d 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/0082-Access-items-by-EquipmentSlot.patch b/Spigot-Server-Patches/0081-Access-items-by-EquipmentSlot.patch
similarity index 96%
rename from Spigot-Server-Patches/0082-Access-items-by-EquipmentSlot.patch
rename to Spigot-Server-Patches/0081-Access-items-by-EquipmentSlot.patch
index 10785d3d40..8b30315c5d 100644
--- a/Spigot-Server-Patches/0082-Access-items-by-EquipmentSlot.patch
+++ b/Spigot-Server-Patches/0081-Access-items-by-EquipmentSlot.patch
@@ -1,4 +1,4 @@
-From 0afff1632941d3adfb13808187d1578188c96c74 Mon Sep 17 00:00:00 2001
+From e39ea75f06d5a7f85143686fa4f1ebc0e8964f93 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 20 Mar 2016 06:45:01 -0400
 Subject: [PATCH] Access items by EquipmentSlot
@@ -64,5 +64,5 @@ index 6cbe069562..7b62f26d7c 100644
 +    // Paper end
  }
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0083-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch b/Spigot-Server-Patches/0082-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
similarity index 98%
rename from Spigot-Server-Patches/0083-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
rename to Spigot-Server-Patches/0082-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
index 6aea67b5de..91f74199e8 100644
--- a/Spigot-Server-Patches/0083-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
+++ b/Spigot-Server-Patches/0082-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
@@ -1,4 +1,4 @@
-From 433f7d7b92ae9a2ba2e5a10ad16d197a27e2b003 Mon Sep 17 00:00:00 2001
+From a0af0ad881fb9d995344062b85a00144cef634db Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 19:55:45 -0400
 Subject: [PATCH] Option to disable BlockPhysicsEvent for Redstone
diff --git a/Spigot-Server-Patches/0084-Entity-AddTo-RemoveFrom-World-Events.patch b/Spigot-Server-Patches/0083-Entity-AddTo-RemoveFrom-World-Events.patch
similarity index 94%
rename from Spigot-Server-Patches/0084-Entity-AddTo-RemoveFrom-World-Events.patch
rename to Spigot-Server-Patches/0083-Entity-AddTo-RemoveFrom-World-Events.patch
index e70127c9a8..4aac9eeab4 100644
--- a/Spigot-Server-Patches/0084-Entity-AddTo-RemoveFrom-World-Events.patch
+++ b/Spigot-Server-Patches/0083-Entity-AddTo-RemoveFrom-World-Events.patch
@@ -1,4 +1,4 @@
-From 782de7ab3e7d34f4181da096d22a103eb3078a7a Mon Sep 17 00:00:00 2001
+From d3b16edfb2a1998d0165e0c286da1ba9673eafe9 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 20:32:58 -0400
 Subject: [PATCH] Entity AddTo/RemoveFrom World Events
diff --git a/Spigot-Server-Patches/0085-Configurable-Chunk-Inhabited-Timer.patch b/Spigot-Server-Patches/0084-Configurable-Chunk-Inhabited-Timer.patch
similarity index 89%
rename from Spigot-Server-Patches/0085-Configurable-Chunk-Inhabited-Timer.patch
rename to Spigot-Server-Patches/0084-Configurable-Chunk-Inhabited-Timer.patch
index a93acddba2..66e751e57e 100644
--- a/Spigot-Server-Patches/0085-Configurable-Chunk-Inhabited-Timer.patch
+++ b/Spigot-Server-Patches/0084-Configurable-Chunk-Inhabited-Timer.patch
@@ -1,4 +1,4 @@
-From 813f611f2db93839add4f0664004ec2221717b9b Mon Sep 17 00:00:00 2001
+From ac97f8b532d4178a91324a72b5e3d51d26397d53 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 20:46:14 -0400
 Subject: [PATCH] Configurable Chunk Inhabited Timer
@@ -23,10 +23,10 @@ index deb4ec2543..dd23ea45e5 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index b783cdf8ed..9214b50b1c 100644
+index 0e84fd283d..41d3aaa80b 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
-@@ -1258,7 +1258,7 @@ public class Chunk implements IChunkAccess {
+@@ -1283,7 +1283,7 @@ public class Chunk implements IChunkAccess {
      }
  
      public long m() {
diff --git a/Spigot-Server-Patches/0086-EntityPathfindEvent.patch b/Spigot-Server-Patches/0085-EntityPathfindEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0086-EntityPathfindEvent.patch
rename to Spigot-Server-Patches/0085-EntityPathfindEvent.patch
index affe2d4eb5..8d32a185be 100644
--- a/Spigot-Server-Patches/0086-EntityPathfindEvent.patch
+++ b/Spigot-Server-Patches/0085-EntityPathfindEvent.patch
@@ -1,4 +1,4 @@
-From dcfdcaf5f2a8ecd65785d2c4b729e674bf262523 Mon Sep 17 00:00:00 2001
+From 662cf614a03e90feb9aaad1d22300aee82391b4c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 21:22:26 -0400
 Subject: [PATCH] EntityPathfindEvent
@@ -35,5 +35,5 @@ index 5d6f726d05..a8b070ed32 100644
                  float fx = this.j();
                  this.b.methodProfiler.a("pathfind");
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0087-Reduce-IO-ops-opening-a-new-region-file.patch b/Spigot-Server-Patches/0086-Reduce-IO-ops-opening-a-new-region-file.patch
similarity index 96%
rename from Spigot-Server-Patches/0087-Reduce-IO-ops-opening-a-new-region-file.patch
rename to Spigot-Server-Patches/0086-Reduce-IO-ops-opening-a-new-region-file.patch
index 6d8e45f24e..beb4a6b768 100644
--- a/Spigot-Server-Patches/0087-Reduce-IO-ops-opening-a-new-region-file.patch
+++ b/Spigot-Server-Patches/0086-Reduce-IO-ops-opening-a-new-region-file.patch
@@ -1,4 +1,4 @@
-From 7e1a19b733518affda90a116c3576335ae14f565 Mon Sep 17 00:00:00 2001
+From 3dcbb08c24ce42132cca1ad5df0ddddb756eae21 Mon Sep 17 00:00:00 2001
 From: Antony Riley <antony@cyberiantiger.org>
 Date: Tue, 29 Mar 2016 06:56:23 +0300
 Subject: [PATCH] Reduce IO ops opening a new region file.
@@ -49,5 +49,5 @@ index f4405be395..5d2853b9ce 100644
              }
          } catch (IOException ioexception) {
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0088-Sanitise-RegionFileCache-and-make-configurable.patch b/Spigot-Server-Patches/0087-Sanitise-RegionFileCache-and-make-configurable.patch
similarity index 95%
rename from Spigot-Server-Patches/0088-Sanitise-RegionFileCache-and-make-configurable.patch
rename to Spigot-Server-Patches/0087-Sanitise-RegionFileCache-and-make-configurable.patch
index a372030f76..b939f0bf66 100644
--- a/Spigot-Server-Patches/0088-Sanitise-RegionFileCache-and-make-configurable.patch
+++ b/Spigot-Server-Patches/0087-Sanitise-RegionFileCache-and-make-configurable.patch
@@ -1,4 +1,4 @@
-From 972dd99cdc558049c41b4e92ce7974b3ddefff8c Mon Sep 17 00:00:00 2001
+From 7d5b2bb1ce854b24a8ef1ec40574698774fb70f6 Mon Sep 17 00:00:00 2001
 From: Antony Riley <antony@cyberiantiger.org>
 Date: Tue, 29 Mar 2016 08:22:55 +0300
 Subject: [PATCH] Sanitise RegionFileCache and make configurable.
@@ -11,10 +11,10 @@ The implementation uses a LinkedHashMap as an LRU cache (modified from HashMap).
 The maximum size of the RegionFileCache is also made configurable.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 5ae78efdfe..94ba257c2d 100644
+index 88c465ef1c..121a87662c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -224,4 +224,9 @@ public class PaperConfig {
+@@ -219,4 +219,9 @@ public class PaperConfig {
      private static void loadPermsBeforePlugins() {
          loadPermsBeforePlugins = getBoolean("settings.load-permissions-yml-before-plugins", true);
      }
diff --git a/Spigot-Server-Patches/0089-Use-Optimized-Collections.patch b/Spigot-Server-Patches/0088-Use-Optimized-Collections.patch
similarity index 96%
rename from Spigot-Server-Patches/0089-Use-Optimized-Collections.patch
rename to Spigot-Server-Patches/0088-Use-Optimized-Collections.patch
index 4915b08352..acae4d02e7 100644
--- a/Spigot-Server-Patches/0089-Use-Optimized-Collections.patch
+++ b/Spigot-Server-Patches/0088-Use-Optimized-Collections.patch
@@ -1,4 +1,4 @@
-From 7acdaa46de379b7d8fc5e33700adbbffdcae5816 Mon Sep 17 00:00:00 2001
+From 1ab2476a22758ca4105962280dde11b9464b8966 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 30 Mar 2016 02:13:24 -0400
 Subject: [PATCH] Use Optimized Collections
@@ -34,5 +34,5 @@ index 2b27ae7973..7191185ba7 100644
      private boolean f = true;
      private boolean g;
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0090-Do-not-load-chunks-for-light-checks.patch b/Spigot-Server-Patches/0089-Do-not-load-chunks-for-light-checks.patch
similarity index 94%
rename from Spigot-Server-Patches/0090-Do-not-load-chunks-for-light-checks.patch
rename to Spigot-Server-Patches/0089-Do-not-load-chunks-for-light-checks.patch
index 7102637068..7ea8040eff 100644
--- a/Spigot-Server-Patches/0090-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 3ab90e2a7588d50861f13f319df4e6854c893d80 Mon Sep 17 00:00:00 2001
+From 06c4f9aff700a2985587ebb592453724eaf0852e 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
diff --git a/Spigot-Server-Patches/0091-Add-PlayerUseUnknownEntityEvent.patch b/Spigot-Server-Patches/0090-Add-PlayerUseUnknownEntityEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0091-Add-PlayerUseUnknownEntityEvent.patch
rename to Spigot-Server-Patches/0090-Add-PlayerUseUnknownEntityEvent.patch
index 9ab4f31c18..95feecff23 100644
--- a/Spigot-Server-Patches/0091-Add-PlayerUseUnknownEntityEvent.patch
+++ b/Spigot-Server-Patches/0090-Add-PlayerUseUnknownEntityEvent.patch
@@ -1,4 +1,4 @@
-From 9555bec7234cbae0515c187301f36f774c8dee55 Mon Sep 17 00:00:00 2001
+From 43cd905fa897553b08251ada854025047bc63f6d Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 2 Apr 2016 05:09:16 -0400
 Subject: [PATCH] Add PlayerUseUnknownEntityEvent
diff --git a/Spigot-Server-Patches/0092-Fix-reducedDebugInfo-not-initialized-on-client.patch b/Spigot-Server-Patches/0091-Fix-reducedDebugInfo-not-initialized-on-client.patch
similarity index 91%
rename from Spigot-Server-Patches/0092-Fix-reducedDebugInfo-not-initialized-on-client.patch
rename to Spigot-Server-Patches/0091-Fix-reducedDebugInfo-not-initialized-on-client.patch
index cce3f7c676..2f7b57d123 100644
--- a/Spigot-Server-Patches/0092-Fix-reducedDebugInfo-not-initialized-on-client.patch
+++ b/Spigot-Server-Patches/0091-Fix-reducedDebugInfo-not-initialized-on-client.patch
@@ -1,11 +1,11 @@
-From bf2f558773207bf9d83d115bb4a6edce244d4d30 Mon Sep 17 00:00:00 2001
+From a8396718f64ff043cf49da5e9056902cf50ce9d5 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 2 Apr 2016 20:37:03 -0400
 Subject: [PATCH] Fix reducedDebugInfo not initialized on client
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 8b3c2d2874..7f324a9c0f 100644
+index 9f2c7d3f45..8121f8e40a 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -162,6 +162,7 @@ public abstract class PlayerList {
@@ -17,5 +17,5 @@ index 8b3c2d2874..7f324a9c0f 100644
          entityplayer.getStatisticManager().c();
          entityplayer.B().a(entityplayer);
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0093-Configurable-Grass-Spread-Tick-Rate.patch b/Spigot-Server-Patches/0092-Configurable-Grass-Spread-Tick-Rate.patch
similarity index 96%
rename from Spigot-Server-Patches/0093-Configurable-Grass-Spread-Tick-Rate.patch
rename to Spigot-Server-Patches/0092-Configurable-Grass-Spread-Tick-Rate.patch
index 65a72e4401..ed97cfeef1 100644
--- a/Spigot-Server-Patches/0093-Configurable-Grass-Spread-Tick-Rate.patch
+++ b/Spigot-Server-Patches/0092-Configurable-Grass-Spread-Tick-Rate.patch
@@ -1,4 +1,4 @@
-From 92db70f012d7896c9da4fc6386c51e20df08d2a1 Mon Sep 17 00:00:00 2001
+From dc7aac4fbfb58430d712ad94f241daaab090468c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 3 Apr 2016 16:28:17 -0400
 Subject: [PATCH] Configurable Grass Spread Tick Rate
diff --git a/Spigot-Server-Patches/0094-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0093-Configurable-Keep-Spawn-Loaded-range-per-world.patch
similarity index 98%
rename from Spigot-Server-Patches/0094-Configurable-Keep-Spawn-Loaded-range-per-world.patch
rename to Spigot-Server-Patches/0093-Configurable-Keep-Spawn-Loaded-range-per-world.patch
index a865b44e0e..90b5a331d7 100644
--- a/Spigot-Server-Patches/0094-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/Spigot-Server-Patches/0093-Configurable-Keep-Spawn-Loaded-range-per-world.patch
@@ -1,4 +1,4 @@
-From 6a1c0d9780b2f6e6bfe3f23b76f594a7804aa0ee Mon Sep 17 00:00:00 2001
+From ba5a11cd178572ea41951140c92c56790a210921 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 13 Sep 2014 23:14:43 -0400
 Subject: [PATCH] Configurable Keep Spawn Loaded range per world
diff --git a/Spigot-Server-Patches/0095-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/Spigot-Server-Patches/0094-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
similarity index 93%
rename from Spigot-Server-Patches/0095-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
rename to Spigot-Server-Patches/0094-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
index cd926d5e61..5b3caba720 100644
--- a/Spigot-Server-Patches/0095-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
+++ b/Spigot-Server-Patches/0094-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
@@ -1,4 +1,4 @@
-From 9aa96ab2ab9656b172f1562f9fe6234b5426f009 Mon Sep 17 00:00:00 2001
+From 25a25007f6f5bd564e33ff440b2d81fbcc136649 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 3 Apr 2016 17:48:50 -0400
 Subject: [PATCH] Fix Cancelling BlockPlaceEvent triggering physics
diff --git a/Spigot-Server-Patches/0096-Don-t-spam-reload-spawn-chunks-in-nether-end.patch b/Spigot-Server-Patches/0095-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
similarity index 94%
rename from Spigot-Server-Patches/0096-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
rename to Spigot-Server-Patches/0095-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
index 54c7a43b59..fcfac85987 100644
--- a/Spigot-Server-Patches/0096-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
+++ b/Spigot-Server-Patches/0095-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
@@ -1,4 +1,4 @@
-From 9c6d4121a51b48f1ec000fd2ad83947847a3cfcb Mon Sep 17 00:00:00 2001
+From dcc23b7c3d5bef992833093cc60898dee23f8662 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Apr 2016 19:42:22 -0400
 Subject: [PATCH] Don't spam reload spawn chunks in nether/end
@@ -25,7 +25,7 @@ index b4274cf0ec..796ce3103a 100644
          ForcedChunk forcedchunk = (ForcedChunk) this.a(this.worldProvider.getDimensionManager(), ForcedChunk::new, "chunks");
  
 diff --git a/src/main/java/net/minecraft/server/WorldProvider.java b/src/main/java/net/minecraft/server/WorldProvider.java
-index 517b1e7124..0e654ebf70 100644
+index 53ce7d5e11..e1fe195bf8 100644
 --- a/src/main/java/net/minecraft/server/WorldProvider.java
 +++ b/src/main/java/net/minecraft/server/WorldProvider.java
 @@ -72,7 +72,7 @@ public abstract class WorldProvider {
diff --git a/Spigot-Server-Patches/0097-Remove-Debug-checks-from-DataBits.patch b/Spigot-Server-Patches/0096-Remove-Debug-checks-from-DataBits.patch
similarity index 95%
rename from Spigot-Server-Patches/0097-Remove-Debug-checks-from-DataBits.patch
rename to Spigot-Server-Patches/0096-Remove-Debug-checks-from-DataBits.patch
index 7567e3d7ab..eb8f398cdc 100644
--- a/Spigot-Server-Patches/0097-Remove-Debug-checks-from-DataBits.patch
+++ b/Spigot-Server-Patches/0096-Remove-Debug-checks-from-DataBits.patch
@@ -1,4 +1,4 @@
-From 15c0961341cb53d2ff8701e59812bd92a462b07e Mon Sep 17 00:00:00 2001
+From 369b5037160e7332a95789009a028599834eb2fb Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Apr 2016 21:38:58 -0400
 Subject: [PATCH] Remove Debug checks from DataBits
@@ -42,5 +42,5 @@ index 0dc948a375..f4de7fcf4b 100644
          int k = j / 64;
          int l = ((i + 1) * this.b - 1) / 64;
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0098-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/Spigot-Server-Patches/0097-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
similarity index 97%
rename from Spigot-Server-Patches/0098-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
rename to Spigot-Server-Patches/0097-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
index c71653e77a..64afc9b7ab 100644
--- a/Spigot-Server-Patches/0098-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
+++ b/Spigot-Server-Patches/0097-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
@@ -1,4 +1,4 @@
-From 2f0129988321a32c8f6f02aebaf00ba68d9546aa Mon Sep 17 00:00:00 2001
+From be604d180094b2596fee95c693f438ff7c5f7f2d Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 6 Apr 2016 01:04:23 -0500
 Subject: [PATCH] Option to use vanilla per-world scoreboard coloring on names
diff --git a/Spigot-Server-Patches/0099-Workaround-for-setting-passengers-on-players.patch b/Spigot-Server-Patches/0098-Workaround-for-setting-passengers-on-players.patch
similarity index 91%
rename from Spigot-Server-Patches/0099-Workaround-for-setting-passengers-on-players.patch
rename to Spigot-Server-Patches/0098-Workaround-for-setting-passengers-on-players.patch
index 95da6e551b..e4343e79d6 100644
--- a/Spigot-Server-Patches/0099-Workaround-for-setting-passengers-on-players.patch
+++ b/Spigot-Server-Patches/0098-Workaround-for-setting-passengers-on-players.patch
@@ -1,4 +1,4 @@
-From 7bc3196c89fcd80331a6d656f015b0d782f77094 Mon Sep 17 00:00:00 2001
+From 0d433f35b10d9e6ee6a85e5f7bce2797096c5cc1 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 10 Apr 2016 03:23:32 -0500
 Subject: [PATCH] Workaround for setting passengers on players
@@ -6,7 +6,7 @@ Subject: [PATCH] Workaround for setting passengers on players
 SPIGOT-1915 & GH-114
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index fed28ecd91..0c8cfd5fb9 100644
+index c575fb933c..3337d8c8e4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -724,6 +724,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -28,5 +28,5 @@ index fed28ecd91..0c8cfd5fb9 100644
      public void setSneaking(boolean sneak) {
          getHandle().setSneaking(sneak);
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0100-Remove-unused-World-Tile-Entity-List.patch b/Spigot-Server-Patches/0099-Remove-unused-World-Tile-Entity-List.patch
similarity index 98%
rename from Spigot-Server-Patches/0100-Remove-unused-World-Tile-Entity-List.patch
rename to Spigot-Server-Patches/0099-Remove-unused-World-Tile-Entity-List.patch
index 75081a2cf4..7f34f5cd3c 100644
--- a/Spigot-Server-Patches/0100-Remove-unused-World-Tile-Entity-List.patch
+++ b/Spigot-Server-Patches/0099-Remove-unused-World-Tile-Entity-List.patch
@@ -1,4 +1,4 @@
-From cccb296c07e9a0e29a68c3b592277a3209d106de Mon Sep 17 00:00:00 2001
+From 46c4520fc8ce86b6c7406c19624ef3ac8aa02ba5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 13 Apr 2016 00:25:28 -0400
 Subject: [PATCH] Remove unused World Tile Entity List
diff --git a/Spigot-Server-Patches/0101-Don-t-tick-Skulls-unused-code.patch b/Spigot-Server-Patches/0100-Don-t-tick-Skulls-unused-code.patch
similarity index 87%
rename from Spigot-Server-Patches/0101-Don-t-tick-Skulls-unused-code.patch
rename to Spigot-Server-Patches/0100-Don-t-tick-Skulls-unused-code.patch
index 6180b0ad1c..b91ed89775 100644
--- a/Spigot-Server-Patches/0101-Don-t-tick-Skulls-unused-code.patch
+++ b/Spigot-Server-Patches/0100-Don-t-tick-Skulls-unused-code.patch
@@ -1,11 +1,11 @@
-From bc669d463febf4e1a5f4e4200fdedc4cf4b5ca00 Mon Sep 17 00:00:00 2001
+From 8039d15ff0deb8967a880ed84c71c85ad745e058 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 13 Apr 2016 00:30:10 -0400
 Subject: [PATCH] Don't tick Skulls - unused code
 
 
 diff --git a/src/main/java/net/minecraft/server/TileEntitySkull.java b/src/main/java/net/minecraft/server/TileEntitySkull.java
-index af5e4093cc..85fd8dab60 100644
+index 3a54ebdb15..e59f3c21d7 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySkull.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySkull.java
 @@ -24,7 +24,7 @@ import com.mojang.authlib.ProfileLookupCallback;
@@ -18,5 +18,5 @@ index af5e4093cc..85fd8dab60 100644
      private GameProfile a;
      private int e;
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0102-Configurable-Player-Collision.patch b/Spigot-Server-Patches/0101-Configurable-Player-Collision.patch
similarity index 97%
rename from Spigot-Server-Patches/0102-Configurable-Player-Collision.patch
rename to Spigot-Server-Patches/0101-Configurable-Player-Collision.patch
index f363c908ea..4aa61996ea 100644
--- a/Spigot-Server-Patches/0102-Configurable-Player-Collision.patch
+++ b/Spigot-Server-Patches/0101-Configurable-Player-Collision.patch
@@ -1,14 +1,14 @@
-From 0ad1c1c223f79070d9b2eb5da014f4eee0885730 Mon Sep 17 00:00:00 2001
+From 776221ada4181fe340fa35cdec74b65561f240b4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 13 Apr 2016 02:10:49 -0400
 Subject: [PATCH] Configurable Player Collision
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 94ba257c2d..24a3e94fc8 100644
+index 121a87662c..93c964d315 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -229,4 +229,9 @@ public class PaperConfig {
+@@ -224,4 +224,9 @@ public class PaperConfig {
      private static void regionFileCacheSize() {
          regionFileCacheSize = getInt("settings.region-file-cache-size", 256);
      }
diff --git a/Spigot-Server-Patches/0103-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/Spigot-Server-Patches/0102-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
similarity index 96%
rename from Spigot-Server-Patches/0103-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
rename to Spigot-Server-Patches/0102-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
index 57687b766a..f013000a19 100644
--- a/Spigot-Server-Patches/0103-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
+++ b/Spigot-Server-Patches/0102-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
@@ -1,4 +1,4 @@
-From fcaa96c04e21424f4853ee85135b726a78a3d2c9 Mon Sep 17 00:00:00 2001
+From 6bd2cb3f07f6001f2bb9a90878954079ed476ba9 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 13 Apr 2016 20:21:38 -0700
 Subject: [PATCH] Add handshake event to allow plugins to handle client
@@ -6,7 +6,7 @@ Subject: [PATCH] Add handshake event to allow plugins to handle client
 
 
 diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
-index 5b784002f5..2d57bdf40e 100644
+index 72d841af06..6aabdc2974 100644
 --- a/src/main/java/net/minecraft/server/HandshakeListener.java
 +++ b/src/main/java/net/minecraft/server/HandshakeListener.java
 @@ -72,8 +72,33 @@ public class HandshakeListener implements PacketHandshakingInListener {
@@ -45,5 +45,5 @@ index 5b784002f5..2d57bdf40e 100644
                      if ( split.length == 3 || split.length == 4 ) {
                          packethandshakinginsetprotocol.hostname = split[0];
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0104-Configurable-RCON-IP-address.patch b/Spigot-Server-Patches/0103-Configurable-RCON-IP-address.patch
similarity index 93%
rename from Spigot-Server-Patches/0104-Configurable-RCON-IP-address.patch
rename to Spigot-Server-Patches/0103-Configurable-RCON-IP-address.patch
index 1d1b17427e..c9a4130d1b 100644
--- a/Spigot-Server-Patches/0104-Configurable-RCON-IP-address.patch
+++ b/Spigot-Server-Patches/0103-Configurable-RCON-IP-address.patch
@@ -1,4 +1,4 @@
-From 6d27d1a5c0d2e8c63b6cc0e401a4a2bd8e6cf71f Mon Sep 17 00:00:00 2001
+From cb1af7a80ad9f9d6520c17f799c27b84242efbab Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 16 Apr 2016 00:39:33 -0400
 Subject: [PATCH] Configurable RCON IP address
@@ -19,5 +19,5 @@ index 32244b55a2..4bfd41af18 100644
          if (0 == this.h) {
              this.h = this.i + 10;
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0105-Prevent-Fire-from-loading-chunks.patch b/Spigot-Server-Patches/0104-Prevent-Fire-from-loading-chunks.patch
similarity index 95%
rename from Spigot-Server-Patches/0105-Prevent-Fire-from-loading-chunks.patch
rename to Spigot-Server-Patches/0104-Prevent-Fire-from-loading-chunks.patch
index e761879e4a..8ab69a29da 100644
--- a/Spigot-Server-Patches/0105-Prevent-Fire-from-loading-chunks.patch
+++ b/Spigot-Server-Patches/0104-Prevent-Fire-from-loading-chunks.patch
@@ -1,4 +1,4 @@
-From 90bf2f4b99dcb11f07cb5152a27bc38d4e0e1118 Mon Sep 17 00:00:00 2001
+From 57322090640350505e3ab9d6e5950835a484c880 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 17 Apr 2016 17:27:09 -0400
 Subject: [PATCH] Prevent Fire from loading chunks
@@ -7,7 +7,7 @@ This causes the nether to spam unload/reload chunks, plus overall
 bad behavior.
 
 diff --git a/src/main/java/net/minecraft/server/BlockFire.java b/src/main/java/net/minecraft/server/BlockFire.java
-index 8339d6f056..25a8a1afdf 100644
+index ebf9d3510c..24573b4704 100644
 --- a/src/main/java/net/minecraft/server/BlockFire.java
 +++ b/src/main/java/net/minecraft/server/BlockFire.java
 @@ -162,6 +162,7 @@ public class BlockFire extends Block {
@@ -49,5 +49,5 @@ index 8339d6f056..25a8a1afdf 100644
  
              return i;
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0106-Implement-PlayerLocaleChangeEvent.patch b/Spigot-Server-Patches/0105-Implement-PlayerLocaleChangeEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0106-Implement-PlayerLocaleChangeEvent.patch
rename to Spigot-Server-Patches/0105-Implement-PlayerLocaleChangeEvent.patch
index c186e0e96e..e1a04c19e4 100644
--- a/Spigot-Server-Patches/0106-Implement-PlayerLocaleChangeEvent.patch
+++ b/Spigot-Server-Patches/0105-Implement-PlayerLocaleChangeEvent.patch
@@ -1,11 +1,11 @@
-From 27132f8d0653a6c8339c9bd68854275ed45e12f8 Mon Sep 17 00:00:00 2001
+From 5dd475cfe420792cb067c5c28ccfb0b2bb79c9e2 Mon Sep 17 00:00:00 2001
 From: Isaac Moore <rmsy@me.com>
 Date: Tue, 19 Apr 2016 14:09:31 -0500
 Subject: [PATCH] Implement PlayerLocaleChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index a279bf93..a9fbb20f 100644
+index a279bf9383..a9fbb20f73 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -36,7 +36,7 @@ import org.bukkit.inventory.MainHand;
@@ -39,7 +39,7 @@ index a279bf93..a9fbb20f 100644
          this.ct = packetplayinsettings.e();
          this.getDataWatcher().set(EntityPlayer.bx, Byte.valueOf((byte) packetplayinsettings.f()));
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 0c8cfd5f..291b664b 100644
+index 3337d8c8e4..7c1444dff2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1736,8 +1736,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -65,5 +65,5 @@ index 0c8cfd5f..291b664b 100644
  
          @Override
 -- 
-2.18.0.windows.1
+2.19.0
 
diff --git a/Spigot-Server-Patches/0107-EntityRegainHealthEvent-isFastRegen-API.patch b/Spigot-Server-Patches/0106-EntityRegainHealthEvent-isFastRegen-API.patch
similarity index 95%
rename from Spigot-Server-Patches/0107-EntityRegainHealthEvent-isFastRegen-API.patch
rename to Spigot-Server-Patches/0106-EntityRegainHealthEvent-isFastRegen-API.patch
index 740b130449..bc42efeefd 100644
--- a/Spigot-Server-Patches/0107-EntityRegainHealthEvent-isFastRegen-API.patch
+++ b/Spigot-Server-Patches/0106-EntityRegainHealthEvent-isFastRegen-API.patch
@@ -1,4 +1,4 @@
-From 65bc80f63ed83da9b191f3cd555cd6321aa482f9 Mon Sep 17 00:00:00 2001
+From 213af17f91d3ef8cb0685afe67ba8e45779e3bdf Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 22 Apr 2016 01:43:11 -0500
 Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
@@ -6,7 +6,7 @@ Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
 Don't even get me started
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 2d80f4e3e9..05546ff4db 100644
+index d41a7fb087..4fe91b5a2f 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -873,10 +873,16 @@ public abstract class EntityLiving extends Entity {
@@ -41,5 +41,5 @@ index 03dbd21ee8..aed3606bdc 100644
                  this.foodTickTimer = 0;
              }
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0108-Add-ability-to-configure-frosted_ice-properties.patch b/Spigot-Server-Patches/0107-Add-ability-to-configure-frosted_ice-properties.patch
similarity index 98%
rename from Spigot-Server-Patches/0108-Add-ability-to-configure-frosted_ice-properties.patch
rename to Spigot-Server-Patches/0107-Add-ability-to-configure-frosted_ice-properties.patch
index 4fcced9497..0d7deca090 100644
--- a/Spigot-Server-Patches/0108-Add-ability-to-configure-frosted_ice-properties.patch
+++ b/Spigot-Server-Patches/0107-Add-ability-to-configure-frosted_ice-properties.patch
@@ -1,4 +1,4 @@
-From 3f001c5aae3187744325aec06a94e979bfcd335a Mon Sep 17 00:00:00 2001
+From 16527a0ec911199ac7ee943708d9997ca81b08ba Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 21 Apr 2016 23:51:55 -0700
 Subject: [PATCH] Add ability to configure frosted_ice properties
diff --git a/Spigot-Server-Patches/0109-remove-null-possibility-for-getServer-singleton.patch b/Spigot-Server-Patches/0108-remove-null-possibility-for-getServer-singleton.patch
similarity index 96%
rename from Spigot-Server-Patches/0109-remove-null-possibility-for-getServer-singleton.patch
rename to Spigot-Server-Patches/0108-remove-null-possibility-for-getServer-singleton.patch
index 45197a7a4b..37f57f5455 100644
--- a/Spigot-Server-Patches/0109-remove-null-possibility-for-getServer-singleton.patch
+++ b/Spigot-Server-Patches/0108-remove-null-possibility-for-getServer-singleton.patch
@@ -1,4 +1,4 @@
-From e812bdd5c6d798f90b0f361e2c3c4c14c624e69c Mon Sep 17 00:00:00 2001
+From cfde7861f93d5d001dd84ec0490eb709c46e60dc Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 28 Apr 2016 00:57:27 -0400
 Subject: [PATCH] remove null possibility for getServer singleton
diff --git a/Spigot-Server-Patches/0110-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/Spigot-Server-Patches/0109-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
similarity index 99%
rename from Spigot-Server-Patches/0110-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
rename to Spigot-Server-Patches/0109-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
index ab07dead39..612effcd98 100644
--- a/Spigot-Server-Patches/0110-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
+++ b/Spigot-Server-Patches/0109-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
@@ -1,4 +1,4 @@
-From 99e93943b43879cdc1449e499a4aeb3e6529cb41 Mon Sep 17 00:00:00 2001
+From dc406506a9d9d30fd97e81991e7bd4974250223e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 29 Apr 2016 20:02:00 -0400
 Subject: [PATCH] Improve Maps (in item frames) performance and bug fixes
diff --git a/Spigot-Server-Patches/0111-LootTable-API-Replenishable-Lootables-Feature.patch b/Spigot-Server-Patches/0110-LootTable-API-Replenishable-Lootables-Feature.patch
similarity index 99%
rename from Spigot-Server-Patches/0111-LootTable-API-Replenishable-Lootables-Feature.patch
rename to Spigot-Server-Patches/0110-LootTable-API-Replenishable-Lootables-Feature.patch
index 38ce1e9e0d..fceaca5b11 100644
--- a/Spigot-Server-Patches/0111-LootTable-API-Replenishable-Lootables-Feature.patch
+++ b/Spigot-Server-Patches/0110-LootTable-API-Replenishable-Lootables-Feature.patch
@@ -1,4 +1,4 @@
-From 1abf5eb6058a9e3eaeca3071d174db4d6336de67 Mon Sep 17 00:00:00 2001
+From f4c7b9955bc7319b2dcc07d7037ee8f860758a4c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 1 May 2016 21:19:14 -0400
 Subject: [PATCH] LootTable API & Replenishable Lootables Feature
@@ -520,7 +520,7 @@ index 0000000000..d50410532c
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 5e3a1094e8..eaec95bf54 100644
+index 83de2d63a5..1474209a1e 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -69,6 +69,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
diff --git a/Spigot-Server-Patches/0112-Do-not-load-chunks-for-pathfinding.patch b/Spigot-Server-Patches/0111-Do-not-load-chunks-for-pathfinding.patch
similarity index 91%
rename from Spigot-Server-Patches/0112-Do-not-load-chunks-for-pathfinding.patch
rename to Spigot-Server-Patches/0111-Do-not-load-chunks-for-pathfinding.patch
index c76422f7ec..34da44c6be 100644
--- a/Spigot-Server-Patches/0112-Do-not-load-chunks-for-pathfinding.patch
+++ b/Spigot-Server-Patches/0111-Do-not-load-chunks-for-pathfinding.patch
@@ -1,4 +1,4 @@
-From 4e72245ef416b9e944f5ab2db64458f4fde5c065 Mon Sep 17 00:00:00 2001
+From bc7f6e6e280068fc1cacb38f0fcca0902efe0597 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Jan 2016 00:13:19 -0500
 Subject: [PATCH] Do not load chunks for pathfinding
@@ -18,5 +18,5 @@ index ff740bc1a7..78adbf9062 100644
          }
  
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0113-Entity-Tracking-Improvements.patch b/Spigot-Server-Patches/0112-Entity-Tracking-Improvements.patch
similarity index 96%
rename from Spigot-Server-Patches/0113-Entity-Tracking-Improvements.patch
rename to Spigot-Server-Patches/0112-Entity-Tracking-Improvements.patch
index 4219a0921f..7750d24fdd 100644
--- a/Spigot-Server-Patches/0113-Entity-Tracking-Improvements.patch
+++ b/Spigot-Server-Patches/0112-Entity-Tracking-Improvements.patch
@@ -1,4 +1,4 @@
-From 60c4be3205cfad9d5c5253c083705fdfee0dd2be Mon Sep 17 00:00:00 2001
+From 72a1b85a6474a83316095da0c2cfe30cb1b365f5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 17 Jun 2013 01:24:00 -0400
 Subject: [PATCH] Entity Tracking Improvements
@@ -7,7 +7,7 @@ If any part of a Vehicle/Passenger relationship is visible to a player,
 send all passenger/vehicles to the player in the chain.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index d070d68d..4d2e9788 100644
+index 1474209a1e..5e5c241669 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -72,6 +72,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -19,7 +19,7 @@ index d070d68d..4d2e9788 100644
          if (bukkitEntity == null) {
              bukkitEntity = CraftEntity.getEntity(world.getServer(), this);
 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index 6120c63a..a9d51641 100644
+index 6120c63a38..a9d51641c1 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 @@ -49,6 +49,7 @@ public class EntityTrackerEntry {
@@ -99,5 +99,5 @@ index 6120c63a..a9d51641 100644
  
      }
 -- 
-2.18.0.windows.1
+2.19.0
 
diff --git a/Spigot-Server-Patches/0114-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/Spigot-Server-Patches/0113-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
similarity index 91%
rename from Spigot-Server-Patches/0114-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
rename to Spigot-Server-Patches/0113-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
index fda1e5520b..f42ff703cc 100644
--- a/Spigot-Server-Patches/0114-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
+++ b/Spigot-Server-Patches/0113-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
@@ -1,14 +1,14 @@
-From a307cfab4e99cd58eae334a625bd118d2cb6afda Mon Sep 17 00:00:00 2001
+From 188642430a7453eecdf6057b7fc60e4b4ffea7df Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 May 2016 23:33:08 -0400
 Subject: [PATCH] Don't save empty scoreboard teams to scoreboard.dat
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 24a3e94fc8..369f503532 100644
+index 93c964d315..6743d59f28 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -234,4 +234,9 @@ public class PaperConfig {
+@@ -229,4 +229,9 @@ public class PaperConfig {
      private static void enablePlayerCollisions() {
          enablePlayerCollisions = getBoolean("settings.enable-player-collisions", true);
      }
diff --git a/Spigot-Server-Patches/0115-System-property-for-disabling-watchdoge.patch b/Spigot-Server-Patches/0114-System-property-for-disabling-watchdoge.patch
similarity index 92%
rename from Spigot-Server-Patches/0115-System-property-for-disabling-watchdoge.patch
rename to Spigot-Server-Patches/0114-System-property-for-disabling-watchdoge.patch
index 1eb01c9116..d9962d5440 100644
--- a/Spigot-Server-Patches/0115-System-property-for-disabling-watchdoge.patch
+++ b/Spigot-Server-Patches/0114-System-property-for-disabling-watchdoge.patch
@@ -1,4 +1,4 @@
-From 5fe9a031a9a71250a64c76d8f5e754b767ac2f19 Mon Sep 17 00:00:00 2001
+From eb5ad71f7aec293a9a071dfabcc1fa76d74230b3 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 12 May 2016 23:02:58 -0500
 Subject: [PATCH] System property for disabling watchdoge
@@ -18,5 +18,5 @@ index 0c106ea9c5..57a4748a30 100644
                  Logger log = Bukkit.getServer().getLogger();
                  log.log( Level.SEVERE, "The server has stopped responding!" );
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0116-Optimize-EAR.patch b/Spigot-Server-Patches/0115-Optimize-EAR.patch
similarity index 96%
rename from Spigot-Server-Patches/0116-Optimize-EAR.patch
rename to Spigot-Server-Patches/0115-Optimize-EAR.patch
index 1433f6a26e..e7fb453a85 100644
--- a/Spigot-Server-Patches/0116-Optimize-EAR.patch
+++ b/Spigot-Server-Patches/0115-Optimize-EAR.patch
@@ -1,11 +1,11 @@
-From 1849db3a56ff8dff0d6eb4a6bd2825648e393a95 Mon Sep 17 00:00:00 2001
+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 27ec0f1d..454c1a58 100644
+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;
@@ -66,5 +66,5 @@ index 27ec0f1d..454c1a58 100644
                  }
              }
 -- 
-2.18.0.windows.1
+2.19.0
 
diff --git a/Spigot-Server-Patches/0117-Optimize-UserCache-Thread-Safe.patch b/Spigot-Server-Patches/0116-Optimize-UserCache-Thread-Safe.patch
similarity index 97%
rename from Spigot-Server-Patches/0117-Optimize-UserCache-Thread-Safe.patch
rename to Spigot-Server-Patches/0116-Optimize-UserCache-Thread-Safe.patch
index 125032c8b0..05864f16a4 100644
--- a/Spigot-Server-Patches/0117-Optimize-UserCache-Thread-Safe.patch
+++ b/Spigot-Server-Patches/0116-Optimize-UserCache-Thread-Safe.patch
@@ -1,4 +1,4 @@
-From a7a6e562a7b3335fd9550b0e14e1c02ca6da87fc Mon Sep 17 00:00:00 2001
+From 69dc8f855cc02a3f1b8016a9accd29960e48b796 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 16 May 2016 20:47:41 -0400
 Subject: [PATCH] Optimize UserCache / Thread Safe
@@ -10,7 +10,7 @@ Additionally, move Saving of the User cache to be done async, incase
 the user never changed the default setting for Spigot's save on stop only.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ca5e4cd65a..13d3315b9c 100644
+index eb6ada935f..04d8c108b4 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -691,7 +691,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -98,5 +98,5 @@ index 0e168ad349..f8b7d695c6 100644
      }
  
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0118-Avoid-blocking-on-Network-Manager-creation.patch b/Spigot-Server-Patches/0117-Avoid-blocking-on-Network-Manager-creation.patch
similarity index 97%
rename from Spigot-Server-Patches/0118-Avoid-blocking-on-Network-Manager-creation.patch
rename to Spigot-Server-Patches/0117-Avoid-blocking-on-Network-Manager-creation.patch
index 9ead008f01..a920ca0cac 100644
--- a/Spigot-Server-Patches/0118-Avoid-blocking-on-Network-Manager-creation.patch
+++ b/Spigot-Server-Patches/0117-Avoid-blocking-on-Network-Manager-creation.patch
@@ -1,4 +1,4 @@
-From 7df87e1be5fa99ab7bd6b364376e23073f72d41f Mon Sep 17 00:00:00 2001
+From 0e18207b7777c6f0c30703a5bf999b373c5e831e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 16 May 2016 23:19:16 -0400
 Subject: [PATCH] Avoid blocking on Network Manager creation
@@ -43,5 +43,5 @@ index 9cff011dac..f04ce2fb03 100644
              if ( org.spigotmc.SpigotConfig.playerShuffle > 0 && MinecraftServer.currentTick % org.spigotmc.SpigotConfig.playerShuffle == 0 )
              {
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0119-Optional-TNT-doesn-t-move-in-water.patch b/Spigot-Server-Patches/0118-Optional-TNT-doesn-t-move-in-water.patch
similarity index 98%
rename from Spigot-Server-Patches/0119-Optional-TNT-doesn-t-move-in-water.patch
rename to Spigot-Server-Patches/0118-Optional-TNT-doesn-t-move-in-water.patch
index e96ec160ab..b60a9b7734 100644
--- a/Spigot-Server-Patches/0119-Optional-TNT-doesn-t-move-in-water.patch
+++ b/Spigot-Server-Patches/0118-Optional-TNT-doesn-t-move-in-water.patch
@@ -1,4 +1,4 @@
-From 611a1ded44d2d8ec46252f67a0ab9e57b0ea2681 Mon Sep 17 00:00:00 2001
+From fd33332cf965cc89f246b3a1007ebb534c13476c Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 22 May 2016 20:20:55 -0500
 Subject: [PATCH] Optional TNT doesn't move in water
diff --git a/Spigot-Server-Patches/0120-Faster-redstone-torch-rapid-clock-removal.patch b/Spigot-Server-Patches/0119-Faster-redstone-torch-rapid-clock-removal.patch
similarity index 96%
rename from Spigot-Server-Patches/0120-Faster-redstone-torch-rapid-clock-removal.patch
rename to Spigot-Server-Patches/0119-Faster-redstone-torch-rapid-clock-removal.patch
index 17f84ae414..70706eab1d 100644
--- a/Spigot-Server-Patches/0120-Faster-redstone-torch-rapid-clock-removal.patch
+++ b/Spigot-Server-Patches/0119-Faster-redstone-torch-rapid-clock-removal.patch
@@ -1,4 +1,4 @@
-From dff6889d61088dc838be37a573ddf1429ebc1157 Mon Sep 17 00:00:00 2001
+From b0b8145ed696c7f8761e5f48077eba9429a4a6a1 Mon Sep 17 00:00:00 2001
 From: Martin Panzer <postremus1996@googlemail.com>
 Date: Mon, 23 May 2016 12:12:37 +0200
 Subject: [PATCH] Faster redstone torch rapid clock removal
@@ -39,5 +39,5 @@ index 35abdee5e5..42cb2d47ca 100644
          public RedstoneUpdateInfo(BlockPosition blockposition, long i) {
              this.a = blockposition;
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0121-Ensure-Chunks-never-ever-load-async.patch b/Spigot-Server-Patches/0120-Ensure-Chunks-never-ever-load-async.patch
similarity index 92%
rename from Spigot-Server-Patches/0121-Ensure-Chunks-never-ever-load-async.patch
rename to Spigot-Server-Patches/0120-Ensure-Chunks-never-ever-load-async.patch
index 3880eb34d7..ccd3accd4b 100644
--- a/Spigot-Server-Patches/0121-Ensure-Chunks-never-ever-load-async.patch
+++ b/Spigot-Server-Patches/0120-Ensure-Chunks-never-ever-load-async.patch
@@ -1,4 +1,4 @@
-From 2524c5992b465b4db1ccf20a94fd78e6decf5d53 Mon Sep 17 00:00:00 2001
+From b6cdf80b0353a657001aa33a1bf91d7c3f4a3cde Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 27 May 2016 21:41:26 -0400
 Subject: [PATCH] Ensure Chunks never ever load async
@@ -6,10 +6,10 @@ Subject: [PATCH] Ensure Chunks never ever load async
 Safely pushes the operation to main thread, then back to the posting thread
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
-index 7b7a3d01b9..9aaca21a79 100644
+index e4fd9bc604..7ffb8f6172 100644
 --- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
-@@ -4,6 +4,7 @@ import com.destroystokyo.paper.PaperConfig;
+@@ -3,6 +3,7 @@ package org.bukkit.craftbukkit.chunkio;
  import net.minecraft.server.Chunk;
  import net.minecraft.server.ChunkProviderServer;
  import net.minecraft.server.ChunkRegionLoader;
@@ -17,7 +17,7 @@ index 7b7a3d01b9..9aaca21a79 100644
  import net.minecraft.server.World;
  import org.bukkit.craftbukkit.util.AsynchronousExecutor;
  
-@@ -14,7 +15,7 @@ public class ChunkIOExecutor {
+@@ -13,7 +14,7 @@ public class ChunkIOExecutor {
      private static final AsynchronousExecutor<QueuedChunk, Chunk, Runnable, RuntimeException> instance = new AsynchronousExecutor<QueuedChunk, Chunk, Runnable, RuntimeException>(new ChunkIOProvider(), BASE_THREADS);
  
      public static Chunk syncChunkLoad(World world, ChunkRegionLoader loader, ChunkProviderServer provider, int x, int z) {
@@ -43,5 +43,5 @@ index 52a8c48fa4..4cfe24df15 100644
          }
          try (Timing ignored = queuedChunk.provider.world.timings.chunkIOStage2.startTimingIfSync()) { // Paper
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0122-Add-server-name-parameter.patch b/Spigot-Server-Patches/0121-Add-server-name-parameter.patch
similarity index 89%
rename from Spigot-Server-Patches/0122-Add-server-name-parameter.patch
rename to Spigot-Server-Patches/0121-Add-server-name-parameter.patch
index 128d375fa8..982c69fb2f 100644
--- a/Spigot-Server-Patches/0122-Add-server-name-parameter.patch
+++ b/Spigot-Server-Patches/0121-Add-server-name-parameter.patch
@@ -1,11 +1,11 @@
-From dcddb5eeb0da8166ae565f4c7b83edafdf57552b Mon Sep 17 00:00:00 2001
+From d44e4a028f3a138516a40480107df9594f91f41c Mon Sep 17 00:00:00 2001
 From: Martin Panzer <postremus1996@googlemail.com>
 Date: Sat, 28 May 2016 16:54:03 +0200
 Subject: [PATCH] Add server-name parameter
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index f7a4d53ede..5c26e78a71 100644
+index bbd5766a23..b726fe947a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -136,6 +136,14 @@ public class Main {
@@ -24,5 +24,5 @@ index f7a4d53ede..5c26e78a71 100644
          };
  
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0123-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch b/Spigot-Server-Patches/0122-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
similarity index 97%
rename from Spigot-Server-Patches/0123-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
rename to Spigot-Server-Patches/0122-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
index 80acfbceed..e8dd32923d 100644
--- a/Spigot-Server-Patches/0123-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
+++ b/Spigot-Server-Patches/0122-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
@@ -1,4 +1,4 @@
-From ac9156a326012ffc4bd53e63bed9531d22bb5005 Mon Sep 17 00:00:00 2001
+From ed13eb5bb8d20b48bf9b7000814258ed6b1dcc6f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 31 May 2016 22:53:50 -0400
 Subject: [PATCH] Only send Dragon/Wither Death sounds to same world
@@ -44,5 +44,5 @@ index b84e5728a0..485cac3240 100644
                      double deltaZ = this.locZ - player.locZ;
                      double distanceSquared = deltaX * deltaX + deltaZ * deltaZ;
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0124-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/Spigot-Server-Patches/0123-Delay-Chunk-Unloads-based-on-Player-Movement.patch
similarity index 98%
rename from Spigot-Server-Patches/0124-Delay-Chunk-Unloads-based-on-Player-Movement.patch
rename to Spigot-Server-Patches/0123-Delay-Chunk-Unloads-based-on-Player-Movement.patch
index 7189a376d5..20f4b0625f 100644
--- a/Spigot-Server-Patches/0124-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 a341e096df2f6447ad537792fea5a00111150460 Mon Sep 17 00:00:00 2001
+From e46d08efd3f5e429c3d0cabb76bf8456bd03324b 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
@@ -40,7 +40,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 9214b50b1c..2ec5b084fb 100644
+index 41d3aaa80b..824727ec66 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 {
diff --git a/Spigot-Server-Patches/0125-Fix-Double-World-Add-issues.patch b/Spigot-Server-Patches/0124-Fix-Double-World-Add-issues.patch
similarity index 96%
rename from Spigot-Server-Patches/0125-Fix-Double-World-Add-issues.patch
rename to Spigot-Server-Patches/0124-Fix-Double-World-Add-issues.patch
index 61bb7dd5f9..5a8f9536f2 100644
--- a/Spigot-Server-Patches/0125-Fix-Double-World-Add-issues.patch
+++ b/Spigot-Server-Patches/0124-Fix-Double-World-Add-issues.patch
@@ -1,4 +1,4 @@
-From e9a6944ae559c0a4a1bae5fae0dd0040cb11fc31 Mon Sep 17 00:00:00 2001
+From af3d6d625bbb57168b75bd1995f4135cf107c94e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 21 Jun 2016 22:54:34 -0400
 Subject: [PATCH] Fix Double World Add issues
diff --git a/Spigot-Server-Patches/0126-Fix-Old-Sign-Conversion.patch b/Spigot-Server-Patches/0125-Fix-Old-Sign-Conversion.patch
similarity index 98%
rename from Spigot-Server-Patches/0126-Fix-Old-Sign-Conversion.patch
rename to Spigot-Server-Patches/0125-Fix-Old-Sign-Conversion.patch
index 26909211f7..80fffc0e05 100644
--- a/Spigot-Server-Patches/0126-Fix-Old-Sign-Conversion.patch
+++ b/Spigot-Server-Patches/0125-Fix-Old-Sign-Conversion.patch
@@ -1,4 +1,4 @@
-From f272cc446d703160be856e5630def2168f8f002e Mon Sep 17 00:00:00 2001
+From 01f61b9f5d052ed0b5129a941d189fafb8fefcf1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 17 Jun 2016 20:50:11 -0400
 Subject: [PATCH] Fix Old Sign Conversion
@@ -58,5 +58,5 @@ index 00b6a3c16d..20dc3f272c 100644
                  if (this.world instanceof WorldServer) {
                      try {
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0127-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch b/Spigot-Server-Patches/0126-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
similarity index 93%
rename from Spigot-Server-Patches/0127-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
rename to Spigot-Server-Patches/0126-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
index b98a1d1f0e..b2487cda21 100644
--- a/Spigot-Server-Patches/0127-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
+++ b/Spigot-Server-Patches/0126-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
@@ -1,4 +1,4 @@
-From ad0fc24067501dccade31099a1cd96f049c9b280 Mon Sep 17 00:00:00 2001
+From d3d680ce20a615960678a5de765cf2eff66bf3d1 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 16 Jul 2016 19:11:17 -0500
 Subject: [PATCH] Don't lookup game profiles that have no UUID and no name
@@ -18,5 +18,5 @@ index f8b7d695c6..a47a51a412 100644
              GameProfile gameprofile = new GameProfile(uuid, s);
  
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0128-More-informative-vehicle-moved-wrongly-message.patch b/Spigot-Server-Patches/0127-More-informative-vehicle-moved-wrongly-message.patch
similarity index 94%
rename from Spigot-Server-Patches/0128-More-informative-vehicle-moved-wrongly-message.patch
rename to Spigot-Server-Patches/0127-More-informative-vehicle-moved-wrongly-message.patch
index 37c4014759..8b56395469 100644
--- a/Spigot-Server-Patches/0128-More-informative-vehicle-moved-wrongly-message.patch
+++ b/Spigot-Server-Patches/0127-More-informative-vehicle-moved-wrongly-message.patch
@@ -1,4 +1,4 @@
-From c6c82ca57a41053a7ef349c3677caff7c1a98c16 Mon Sep 17 00:00:00 2001
+From 6a0d67ee8558b708ee01c418fbcdefca8ee73638 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 28 Jul 2016 17:58:53 -0500
 Subject: [PATCH] More informative vehicle moved wrongly message
diff --git a/Spigot-Server-Patches/0129-Re-track-players-that-dismount-from-other-players.patch b/Spigot-Server-Patches/0128-Re-track-players-that-dismount-from-other-players.patch
similarity index 90%
rename from Spigot-Server-Patches/0129-Re-track-players-that-dismount-from-other-players.patch
rename to Spigot-Server-Patches/0128-Re-track-players-that-dismount-from-other-players.patch
index 0c71737094..1680518f0b 100644
--- a/Spigot-Server-Patches/0129-Re-track-players-that-dismount-from-other-players.patch
+++ b/Spigot-Server-Patches/0128-Re-track-players-that-dismount-from-other-players.patch
@@ -1,11 +1,11 @@
-From 3002b444e87e300c27e8e24b59baeff172044525 Mon Sep 17 00:00:00 2001
+From c8a0ffe71fcbaa237aaeeaea6fbedf39bd7c2edf Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 31 Jul 2016 16:33:03 -0500
 Subject: [PATCH] Re-track players that dismount from other players
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index a9fbb20f..3d839002 100644
+index a9fbb20f73..3d83900298 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -751,6 +751,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -23,5 +23,5 @@ index a9fbb20f..3d839002 100644
      }
  
 -- 
-2.18.0.windows.1
+2.19.0
 
diff --git a/Spigot-Server-Patches/0130-Add-setting-for-proxy-online-mode-status.patch b/Spigot-Server-Patches/0129-Add-setting-for-proxy-online-mode-status.patch
similarity index 94%
rename from Spigot-Server-Patches/0130-Add-setting-for-proxy-online-mode-status.patch
rename to Spigot-Server-Patches/0129-Add-setting-for-proxy-online-mode-status.patch
index 764b0c0993..086d0e7d46 100644
--- a/Spigot-Server-Patches/0130-Add-setting-for-proxy-online-mode-status.patch
+++ b/Spigot-Server-Patches/0129-Add-setting-for-proxy-online-mode-status.patch
@@ -1,14 +1,14 @@
-From c3a424cad8d3dad452fbd4b1e95aea766635d36c Mon Sep 17 00:00:00 2001
+From f0eaf43ef1bb3c22eae2971fc6ab747d1d6d7e77 Mon Sep 17 00:00:00 2001
 From: Gabriele C <sgdc3.mail@gmail.com>
 Date: Fri, 5 Aug 2016 01:03:08 +0200
 Subject: [PATCH] Add setting for proxy online mode status
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 369f503532..2fc6585c0e 100644
+index 6743d59f28..296601f21b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -239,4 +239,9 @@ public class PaperConfig {
+@@ -234,4 +234,9 @@ public class PaperConfig {
      private static void saveEmptyScoreboardTeams() {
          saveEmptyScoreboardTeams = getBoolean("settings.save-empty-scoreboard-teams", false);
      }
diff --git a/Spigot-Server-Patches/0131-Optimise-BlockStateEnum-hashCode-and-equals.patch b/Spigot-Server-Patches/0130-Optimise-BlockStateEnum-hashCode-and-equals.patch
similarity index 97%
rename from Spigot-Server-Patches/0131-Optimise-BlockStateEnum-hashCode-and-equals.patch
rename to Spigot-Server-Patches/0130-Optimise-BlockStateEnum-hashCode-and-equals.patch
index 71b0137073..2d246d1087 100644
--- a/Spigot-Server-Patches/0131-Optimise-BlockStateEnum-hashCode-and-equals.patch
+++ b/Spigot-Server-Patches/0130-Optimise-BlockStateEnum-hashCode-and-equals.patch
@@ -1,4 +1,4 @@
-From 6d92bd624a75098dfeae5b99362e4fd0e13df989 Mon Sep 17 00:00:00 2001
+From 454a4b007f6acbd522312c5dec9cc03b81ed396c Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Fri, 19 Aug 2016 01:52:56 +0100
 Subject: [PATCH] Optimise BlockStateEnum hashCode and equals
@@ -63,5 +63,5 @@ index 73623a21c5..9d8a03be8d 100644
  
      public static <T extends Enum<T> & INamable> BlockStateEnum<T> of(String s, Class<T> oclass) {
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0132-Disable-ticking-of-snow-blocks.patch b/Spigot-Server-Patches/0131-Disable-ticking-of-snow-blocks.patch
similarity index 92%
rename from Spigot-Server-Patches/0132-Disable-ticking-of-snow-blocks.patch
rename to Spigot-Server-Patches/0131-Disable-ticking-of-snow-blocks.patch
index 9a0fce8811..92cc957ea4 100644
--- a/Spigot-Server-Patches/0132-Disable-ticking-of-snow-blocks.patch
+++ b/Spigot-Server-Patches/0131-Disable-ticking-of-snow-blocks.patch
@@ -1,4 +1,4 @@
-From 6617595e82a4ab827e58be697668323dbbeb3b46 Mon Sep 17 00:00:00 2001
+From 97d5b2ac6eb096f2e3dd9b51337b8abc5cdfb594 Mon Sep 17 00:00:00 2001
 From: killme <killme-git@ibts.me>
 Date: Tue, 30 Aug 2016 16:39:48 +0200
 Subject: [PATCH] Disable ticking of snow blocks
@@ -25,5 +25,5 @@ index 0c8f9d37fd..44ed656263 100644
 +    //Paper end
  }
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0133-Fix-AIOOBE-in-inventory-handling.patch b/Spigot-Server-Patches/0132-Fix-AIOOBE-in-inventory-handling.patch
similarity index 94%
rename from Spigot-Server-Patches/0133-Fix-AIOOBE-in-inventory-handling.patch
rename to Spigot-Server-Patches/0132-Fix-AIOOBE-in-inventory-handling.patch
index bf64f68ea6..dabd6d713d 100644
--- a/Spigot-Server-Patches/0133-Fix-AIOOBE-in-inventory-handling.patch
+++ b/Spigot-Server-Patches/0132-Fix-AIOOBE-in-inventory-handling.patch
@@ -1,4 +1,4 @@
-From d1354d3543da02c852dd4a504a976e32ee17231d Mon Sep 17 00:00:00 2001
+From 11333f7c95d933a90522c37fa3579f2aee1fdaed Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Sun, 4 Sep 2016 16:35:43 -0500
 Subject: [PATCH] Fix AIOOBE in inventory handling
diff --git a/Spigot-Server-Patches/0134-Configurable-packet-in-spam-threshold.patch b/Spigot-Server-Patches/0133-Configurable-packet-in-spam-threshold.patch
similarity index 93%
rename from Spigot-Server-Patches/0134-Configurable-packet-in-spam-threshold.patch
rename to Spigot-Server-Patches/0133-Configurable-packet-in-spam-threshold.patch
index 7c7aff8067..15897250ee 100644
--- a/Spigot-Server-Patches/0134-Configurable-packet-in-spam-threshold.patch
+++ b/Spigot-Server-Patches/0133-Configurable-packet-in-spam-threshold.patch
@@ -1,14 +1,14 @@
-From 1e0f93b52900c0101dc51f4c99a768f9e5862a9b Mon Sep 17 00:00:00 2001
+From a3048a43d2a729ed7415b9b721a8d180855a4e4b Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 11 Sep 2016 14:30:57 -0500
 Subject: [PATCH] Configurable packet in spam threshold
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 2fc6585c0e..d78f6516e5 100644
+index 296601f21b..a702d1a286 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -244,4 +244,13 @@ public class PaperConfig {
+@@ -239,4 +239,13 @@ public class PaperConfig {
      private static void bungeeOnlineMode() {
          bungeeOnlineMode = getBoolean("settings.bungee-online-mode", true);
      }
diff --git a/Spigot-Server-Patches/0135-Configurable-flying-kick-messages.patch b/Spigot-Server-Patches/0134-Configurable-flying-kick-messages.patch
similarity index 92%
rename from Spigot-Server-Patches/0135-Configurable-flying-kick-messages.patch
rename to Spigot-Server-Patches/0134-Configurable-flying-kick-messages.patch
index ca0566e426..9b847f9b07 100644
--- a/Spigot-Server-Patches/0135-Configurable-flying-kick-messages.patch
+++ b/Spigot-Server-Patches/0134-Configurable-flying-kick-messages.patch
@@ -1,14 +1,14 @@
-From 4d4d3ce5358fe23f03ffb70d320b1321c75e8c26 Mon Sep 17 00:00:00 2001
+From 9560a14dd040af52c535402e62eb8bfc19e83307 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Tue, 20 Sep 2016 00:58:01 +0000
 Subject: [PATCH] Configurable flying kick messages
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index d78f6516e5..1db8e1f97a 100644
+index a702d1a286..4a91a9972d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -253,4 +253,11 @@ public class PaperConfig {
+@@ -248,4 +248,11 @@ public class PaperConfig {
          }
          packetInSpamThreshold = getInt("settings.incoming-packet-spam-threshold", 300);
      }
@@ -21,7 +21,7 @@ index d78f6516e5..1db8e1f97a 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index ef3c1260b0..37b3dd6971 100644
+index 598b747ec0..a1c878fb4a 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -146,6 +146,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
diff --git a/Spigot-Server-Patches/0136-Auto-Save-Improvements.patch b/Spigot-Server-Patches/0135-Auto-Save-Improvements.patch
similarity index 97%
rename from Spigot-Server-Patches/0136-Auto-Save-Improvements.patch
rename to Spigot-Server-Patches/0135-Auto-Save-Improvements.patch
index 18057693db..db7d2edeab 100644
--- a/Spigot-Server-Patches/0136-Auto-Save-Improvements.patch
+++ b/Spigot-Server-Patches/0135-Auto-Save-Improvements.patch
@@ -1,4 +1,4 @@
-From c1069c1fee52e5843abcd569f7cd81038e813812 Mon Sep 17 00:00:00 2001
+From 9d367609530f4ba8a89957561f23040e39b6a265 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 19 Sep 2016 23:16:39 -0400
 Subject: [PATCH] Auto Save Improvements
@@ -12,10 +12,10 @@ Re-introduce a cap per tick for auto save (Spigot disabled the vanilla cap) and
 Adds incremental player auto saving too
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 1db8e1f97a..cf31c4469a 100644
+index 4a91a9972d..ec2f0d269b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -260,4 +260,15 @@ public class PaperConfig {
+@@ -255,4 +255,15 @@ public class PaperConfig {
          flyingKickPlayerMessage = getString("messages.kick.flying-player", flyingKickPlayerMessage);
          flyingKickVehicleMessage = getString("messages.kick.flying-vehicle", flyingKickVehicleMessage);
      }
@@ -64,7 +64,7 @@ index 0cd15c17e8..c43152f456 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 2ec5b084fb..c76be9c668 100644
+index 824727ec66..5e6166cfe8 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -50,9 +50,9 @@ public class Chunk implements IChunkAccess {
@@ -79,7 +79,7 @@ index 2ec5b084fb..c76be9c668 100644
      private int y;
      private long z;
      private int A;
-@@ -1034,11 +1034,11 @@ public class Chunk implements IChunkAccess {
+@@ -1059,11 +1059,11 @@ public class Chunk implements IChunkAccess {
              if (this.v && this.world.getTime() != this.lastSaved || this.x) {
                  return true;
              }
diff --git a/Spigot-Server-Patches/0137-Chunk-registration-fixes.patch b/Spigot-Server-Patches/0136-Chunk-registration-fixes.patch
similarity index 93%
rename from Spigot-Server-Patches/0137-Chunk-registration-fixes.patch
rename to Spigot-Server-Patches/0136-Chunk-registration-fixes.patch
index 2c984f6326..192db2a909 100644
--- a/Spigot-Server-Patches/0137-Chunk-registration-fixes.patch
+++ b/Spigot-Server-Patches/0136-Chunk-registration-fixes.patch
@@ -1,4 +1,4 @@
-From 3e2bca5db612a593ee3a6319109f4c02b9193479 Mon Sep 17 00:00:00 2001
+From afbbf90dcb52b0a550cbeec5b56d0c5a793e0b9f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Sep 2016 22:54:28 -0400
 Subject: [PATCH] Chunk registration fixes
diff --git a/Spigot-Server-Patches/0138-Remove-FishingHook-reference-on-Craft-Entity-removal.patch b/Spigot-Server-Patches/0137-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
similarity index 92%
rename from Spigot-Server-Patches/0138-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
rename to Spigot-Server-Patches/0137-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
index 8b8c587b7e..8542e49356 100644
--- a/Spigot-Server-Patches/0138-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
+++ b/Spigot-Server-Patches/0137-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
@@ -1,4 +1,4 @@
-From b663976005788b111d310e41061728bb1f628e86 Mon Sep 17 00:00:00 2001
+From 0b96cb96112fa10a994a9881fd30e01f61622d1b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 16 Jun 2016 00:17:23 -0400
 Subject: [PATCH] Remove FishingHook reference on Craft Entity removal
@@ -25,5 +25,5 @@ index 8392b16b3b..752b56435d 100644
 +    
  }
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0139-Auto-fix-bad-Y-levels-on-player-login.patch b/Spigot-Server-Patches/0138-Auto-fix-bad-Y-levels-on-player-login.patch
similarity index 89%
rename from Spigot-Server-Patches/0139-Auto-fix-bad-Y-levels-on-player-login.patch
rename to Spigot-Server-Patches/0138-Auto-fix-bad-Y-levels-on-player-login.patch
index 0cd4c7056d..7a0398091a 100644
--- a/Spigot-Server-Patches/0139-Auto-fix-bad-Y-levels-on-player-login.patch
+++ b/Spigot-Server-Patches/0138-Auto-fix-bad-Y-levels-on-player-login.patch
@@ -1,4 +1,4 @@
-From fb7929aeefa445661d7c290db0bdc3c30bbd1095 Mon Sep 17 00:00:00 2001
+From 8cbc2d5c894b2051dd706642b2aaf11be1b97603 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Sep 2016 23:48:39 -0400
 Subject: [PATCH] Auto fix bad Y levels on player login
@@ -6,7 +6,7 @@ Subject: [PATCH] Auto fix bad Y levels on player login
 Bring down to a saner Y level if super high, as this can cause the server to crash
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 690cff88..d9ea222c 100644
+index 690cff8828..d9ea222c2b 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -189,6 +189,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -18,5 +18,5 @@ index 690cff88..d9ea222c 100644
              if (this.bK().getForceGamemode()) {
                  this.playerInteractManager.setGameMode(this.bK().getGamemode());
 -- 
-2.18.0.windows.1
+2.19.0
 
diff --git a/Spigot-Server-Patches/0140-Disable-Vanilla-Chunk-GC.patch b/Spigot-Server-Patches/0139-Disable-Vanilla-Chunk-GC.patch
similarity index 91%
rename from Spigot-Server-Patches/0140-Disable-Vanilla-Chunk-GC.patch
rename to Spigot-Server-Patches/0139-Disable-Vanilla-Chunk-GC.patch
index bdca132a81..9cfb06cfe2 100644
--- a/Spigot-Server-Patches/0140-Disable-Vanilla-Chunk-GC.patch
+++ b/Spigot-Server-Patches/0139-Disable-Vanilla-Chunk-GC.patch
@@ -1,4 +1,4 @@
-From 9445d84de84ff1a9bd3edf221db6995c8fb1ab74 Mon Sep 17 00:00:00 2001
+From b03a6b29d9398f78e843a25695269c8e774173e7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 26 Sep 2016 01:51:30 -0400
 Subject: [PATCH] Disable Vanilla Chunk GC
@@ -6,7 +6,7 @@ Subject: [PATCH] Disable Vanilla Chunk GC
 Bukkit has its own system for this.
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 59b5a04581..e58b21ae43 100644
+index ca2e027cda..f9b4f314ce 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -889,6 +889,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -28,5 +28,5 @@ index 59b5a04581..e58b21ae43 100644
          }
      }
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0141-Option-to-remove-corrupt-tile-entities.patch b/Spigot-Server-Patches/0140-Option-to-remove-corrupt-tile-entities.patch
similarity index 95%
rename from Spigot-Server-Patches/0141-Option-to-remove-corrupt-tile-entities.patch
rename to Spigot-Server-Patches/0140-Option-to-remove-corrupt-tile-entities.patch
index 660051a171..60bff92bcf 100644
--- a/Spigot-Server-Patches/0141-Option-to-remove-corrupt-tile-entities.patch
+++ b/Spigot-Server-Patches/0140-Option-to-remove-corrupt-tile-entities.patch
@@ -1,4 +1,4 @@
-From ed6c926fa07218cd3d49a058c7f2615aa0e18f9d Mon Sep 17 00:00:00 2001
+From 6064bc0431c7eacc56b8d7045632db0e0afd17f6 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 5 Oct 2016 16:27:36 -0500
 Subject: [PATCH] Option to remove corrupt tile entities
@@ -19,7 +19,7 @@ index c43152f456..0d456bcbac 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index c76be9c668..a8705776a6 100644
+index 5e6166cfe8..175a20e43c 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -839,6 +839,12 @@ public class Chunk implements IChunkAccess {
diff --git a/Spigot-Server-Patches/0142-Add-EntityZapEvent.patch b/Spigot-Server-Patches/0141-Add-EntityZapEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0142-Add-EntityZapEvent.patch
rename to Spigot-Server-Patches/0141-Add-EntityZapEvent.patch
index 937a5d0c10..3133006de4 100644
--- a/Spigot-Server-Patches/0142-Add-EntityZapEvent.patch
+++ b/Spigot-Server-Patches/0141-Add-EntityZapEvent.patch
@@ -1,11 +1,11 @@
-From e7414eb657029523360d06b5b799af2885ffeac1 Mon Sep 17 00:00:00 2001
+From 8ffd839379c77e9ce9e3a0cf3de9e3e4d27286b7 Mon Sep 17 00:00:00 2001
 From: AlphaBlend <whizkid3000@hotmail.com>
 Date: Sun, 16 Oct 2016 23:19:30 -0700
 Subject: [PATCH] Add EntityZapEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java
-index fecc7e154..b405e63e8 100644
+index fecc7e154d..b405e63e81 100644
 --- a/src/main/java/net/minecraft/server/EntityPig.java
 +++ b/src/main/java/net/minecraft/server/EntityPig.java
 @@ -152,6 +152,12 @@ public class EntityPig extends EntityAnimal {
@@ -22,7 +22,7 @@ index fecc7e154..b405e63e8 100644
              if (CraftEventFactory.callPigZapEvent(this, entitylightning, entitypigzombie).isCancelled()) {
                  return;
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 32e327e42..5aebdba56 100644
+index 32e327e42c..5aebdba56c 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -610,6 +610,12 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
@@ -48,7 +48,7 @@ index 32e327e42..5aebdba56 100644
          }
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 58b64a671..9a8bf6e74 100644
+index 58b64a6712..9a8bf6e74b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -711,6 +711,14 @@ public class CraftEventFactory {
diff --git a/Spigot-Server-Patches/0143-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/Spigot-Server-Patches/0142-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
similarity index 96%
rename from Spigot-Server-Patches/0143-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
rename to Spigot-Server-Patches/0142-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
index b14e05250f..66000106ef 100644
--- a/Spigot-Server-Patches/0143-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
+++ b/Spigot-Server-Patches/0142-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
@@ -1,4 +1,4 @@
-From 73c75f27648ff2c90326d37c4be63ca064278ea4 Mon Sep 17 00:00:00 2001
+From 6e156b6791b9e843c2e7fe9a06b05f55cd793119 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Nov 2016 20:28:12 -0400
 Subject: [PATCH] Don't load Chunks from Hoppers and other things
@@ -31,5 +31,5 @@ index 27e6d2b5f2..b3882930ea 100644
                      BlockPropertyChestType blockpropertychesttype1 = (BlockPropertyChestType)iblockdata1.get(b);
                      if (blockpropertychesttype1 != BlockPropertyChestType.SINGLE && blockpropertychesttype != blockpropertychesttype1 && iblockdata1.get(FACING) == iblockdata.get(FACING)) {
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0144-Prevent-Auto-Save-if-Save-Queue-is-full.patch b/Spigot-Server-Patches/0143-Prevent-Auto-Save-if-Save-Queue-is-full.patch
similarity index 97%
rename from Spigot-Server-Patches/0144-Prevent-Auto-Save-if-Save-Queue-is-full.patch
rename to Spigot-Server-Patches/0143-Prevent-Auto-Save-if-Save-Queue-is-full.patch
index 60c3bca0c0..ed6b7ff540 100644
--- a/Spigot-Server-Patches/0144-Prevent-Auto-Save-if-Save-Queue-is-full.patch
+++ b/Spigot-Server-Patches/0143-Prevent-Auto-Save-if-Save-Queue-is-full.patch
@@ -1,4 +1,4 @@
-From 89272c5e36c53839aff3a46f1708867131a356e9 Mon Sep 17 00:00:00 2001
+From 1558a2bb058ae4bc2efcdcbae2d89a789c093c7d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Nov 2016 21:52:22 -0400
 Subject: [PATCH] Prevent Auto Save if Save Queue is full
diff --git a/Spigot-Server-Patches/0145-Chunk-Save-Stats-Debug-Option.patch b/Spigot-Server-Patches/0144-Chunk-Save-Stats-Debug-Option.patch
similarity index 98%
rename from Spigot-Server-Patches/0145-Chunk-Save-Stats-Debug-Option.patch
rename to Spigot-Server-Patches/0144-Chunk-Save-Stats-Debug-Option.patch
index 85c68916f9..9d630da3f5 100644
--- a/Spigot-Server-Patches/0145-Chunk-Save-Stats-Debug-Option.patch
+++ b/Spigot-Server-Patches/0144-Chunk-Save-Stats-Debug-Option.patch
@@ -1,4 +1,4 @@
-From 2803838d0058fe88698e854f9fa2bff26baba686 Mon Sep 17 00:00:00 2001
+From c4a4536232e95b7dcfed31e713690cfec7326ab6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 4 Nov 2016 02:12:10 -0400
 Subject: [PATCH] Chunk Save Stats Debug Option
diff --git a/Spigot-Server-Patches/0146-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch b/Spigot-Server-Patches/0145-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
similarity index 97%
rename from Spigot-Server-Patches/0146-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
rename to Spigot-Server-Patches/0145-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
index 445637d18d..66cd7d640d 100644
--- a/Spigot-Server-Patches/0146-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
+++ b/Spigot-Server-Patches/0145-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
@@ -1,4 +1,4 @@
-From 5f1d379edbc0a4914ac5165ea714e305b28cfce4 Mon Sep 17 00:00:00 2001
+From db89aad42fed29154f0c27aa6cf8bbdc494da756 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 12 Nov 2016 23:25:22 -0600
 Subject: [PATCH] Filter bad data from ArmorStand and SpawnEgg items
diff --git a/Spigot-Server-Patches/0147-Cache-user-authenticator-threads.patch b/Spigot-Server-Patches/0146-Cache-user-authenticator-threads.patch
similarity index 97%
rename from Spigot-Server-Patches/0147-Cache-user-authenticator-threads.patch
rename to Spigot-Server-Patches/0146-Cache-user-authenticator-threads.patch
index 8d51849d38..0849021e4f 100644
--- a/Spigot-Server-Patches/0147-Cache-user-authenticator-threads.patch
+++ b/Spigot-Server-Patches/0146-Cache-user-authenticator-threads.patch
@@ -1,4 +1,4 @@
-From 8c8127501a72141fb7ee4ab3409810c47b859dcf Mon Sep 17 00:00:00 2001
+From 36b4f942b750fbc28be7fa74ea33510ca56b7222 Mon Sep 17 00:00:00 2001
 From: vemacs <d@nkmem.es>
 Date: Wed, 23 Nov 2016 08:31:45 -0500
 Subject: [PATCH] Cache user authenticator threads
@@ -66,5 +66,5 @@ index dea401c924..19ac21e385 100644
      }
  
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0148-Optimise-removeQueue.patch b/Spigot-Server-Patches/0147-Optimise-removeQueue.patch
similarity index 96%
rename from Spigot-Server-Patches/0148-Optimise-removeQueue.patch
rename to Spigot-Server-Patches/0147-Optimise-removeQueue.patch
index 603651451d..04667a48af 100644
--- a/Spigot-Server-Patches/0148-Optimise-removeQueue.patch
+++ b/Spigot-Server-Patches/0147-Optimise-removeQueue.patch
@@ -1,11 +1,11 @@
-From 1398fea4cc7fbff0f8178802a4c3b39a6be0bfb7 Mon Sep 17 00:00:00 2001
+From feba81e8881b93a60a312a9e37516b0434a55fe6 Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Fri, 25 Nov 2016 13:22:40 +0000
 Subject: [PATCH] Optimise removeQueue
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index d9ea222c..e3ac9eb7 100644
+index d9ea222c2b..e3ac9eb7d5 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -5,8 +5,10 @@ import com.mojang.authlib.GameProfile;
@@ -68,5 +68,5 @@ index d9ea222c..e3ac9eb7 100644
          this.cC = entityplayer.cC;
          this.setShoulderEntityLeft(entityplayer.getShoulderEntityLeft());
 -- 
-2.18.0.windows.1
+2.19.0
 
diff --git a/Spigot-Server-Patches/0149-Allow-Reloading-of-Command-Aliases.patch b/Spigot-Server-Patches/0148-Allow-Reloading-of-Command-Aliases.patch
similarity index 93%
rename from Spigot-Server-Patches/0149-Allow-Reloading-of-Command-Aliases.patch
rename to Spigot-Server-Patches/0148-Allow-Reloading-of-Command-Aliases.patch
index d968e8aa73..f43a977be4 100644
--- a/Spigot-Server-Patches/0149-Allow-Reloading-of-Command-Aliases.patch
+++ b/Spigot-Server-Patches/0148-Allow-Reloading-of-Command-Aliases.patch
@@ -1,4 +1,4 @@
-From 721564501f788c135e0bb4545ac4110d8b417011 Mon Sep 17 00:00:00 2001
+From 930ef109214853a2a13e798b1f1774865397d043 Mon Sep 17 00:00:00 2001
 From: willies952002 <admin@domnian.com>
 Date: Mon, 28 Nov 2016 10:21:52 -0500
 Subject: [PATCH] Allow Reloading of Command Aliases
@@ -6,7 +6,7 @@ Subject: [PATCH] Allow Reloading of Command Aliases
 Reload the aliases stored in commands.yml
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index fe2e22f67..73ab254aa 100644
+index fe2e22f67a..73ab254aa0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2032,5 +2032,24 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0150-Add-source-to-PlayerExpChangeEvent.patch b/Spigot-Server-Patches/0149-Add-source-to-PlayerExpChangeEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0150-Add-source-to-PlayerExpChangeEvent.patch
rename to Spigot-Server-Patches/0149-Add-source-to-PlayerExpChangeEvent.patch
index 4a675ea4cc..c13c726faf 100644
--- a/Spigot-Server-Patches/0150-Add-source-to-PlayerExpChangeEvent.patch
+++ b/Spigot-Server-Patches/0149-Add-source-to-PlayerExpChangeEvent.patch
@@ -1,11 +1,11 @@
-From 74c2079bb29c3189e14a810c2c8e2f1301fd9156 Mon Sep 17 00:00:00 2001
+From 182507a498555d7d1c141a3c354108234e6f0630 Mon Sep 17 00:00:00 2001
 From: AlphaBlend <whizkid3000@hotmail.com>
 Date: Thu, 8 Sep 2016 08:48:33 -0700
 Subject: [PATCH] Add source to PlayerExpChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index 33b24c833..880f49652 100644
+index 33b24c833b..880f496526 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -185,7 +185,7 @@ public class EntityExperienceOrb extends Entity {
@@ -18,7 +18,7 @@ index 33b24c833..880f49652 100644
  
                  this.die();
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 9a8bf6e74..07f47977f 100644
+index 9a8bf6e74b..07f47977f9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -49,6 +49,7 @@ import org.bukkit.entity.Player;
diff --git a/Spigot-Server-Patches/0151-Optimize-World.isLoaded-BlockPosition-Z.patch b/Spigot-Server-Patches/0150-Optimize-World.isLoaded-BlockPosition-Z.patch
similarity index 94%
rename from Spigot-Server-Patches/0151-Optimize-World.isLoaded-BlockPosition-Z.patch
rename to Spigot-Server-Patches/0150-Optimize-World.isLoaded-BlockPosition-Z.patch
index 08cc5857ae..05d3e1a744 100644
--- a/Spigot-Server-Patches/0151-Optimize-World.isLoaded-BlockPosition-Z.patch
+++ b/Spigot-Server-Patches/0150-Optimize-World.isLoaded-BlockPosition-Z.patch
@@ -1,4 +1,4 @@
-From 51ad0411273acff4528a2e9ed3668e0345403918 Mon Sep 17 00:00:00 2001
+From 903ef5f907601b6fb1283904e19700f4b1f76212 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 2 Dec 2016 00:11:43 -0500
 Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z
diff --git a/Spigot-Server-Patches/0152-Don-t-let-fishinghooks-use-portals.patch b/Spigot-Server-Patches/0151-Don-t-let-fishinghooks-use-portals.patch
similarity index 93%
rename from Spigot-Server-Patches/0152-Don-t-let-fishinghooks-use-portals.patch
rename to Spigot-Server-Patches/0151-Don-t-let-fishinghooks-use-portals.patch
index 1057801c6c..5bb313d8ae 100644
--- a/Spigot-Server-Patches/0152-Don-t-let-fishinghooks-use-portals.patch
+++ b/Spigot-Server-Patches/0151-Don-t-let-fishinghooks-use-portals.patch
@@ -1,11 +1,11 @@
-From 8d513424da1fcbd8b169d842586a0adf68658f9a Mon Sep 17 00:00:00 2001
+From edd57c33821768af20bf022dcce285cb205b41e6 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 16 Dec 2016 16:03:19 -0600
 Subject: [PATCH] Don't let fishinghooks use portals
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 5bd129bcaf..7f430e590f 100644
+index c17e41f128..a41dfb6e50 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -158,7 +158,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -35,5 +35,5 @@ index b52aaa57e3..62e8f27aa7 100644
      }
  
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0153-Add-ProjectileCollideEvent.patch b/Spigot-Server-Patches/0152-Add-ProjectileCollideEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0153-Add-ProjectileCollideEvent.patch
rename to Spigot-Server-Patches/0152-Add-ProjectileCollideEvent.patch
index cbc198b870..342e079c5a 100644
--- a/Spigot-Server-Patches/0153-Add-ProjectileCollideEvent.patch
+++ b/Spigot-Server-Patches/0152-Add-ProjectileCollideEvent.patch
@@ -1,11 +1,11 @@
-From 9702c25b3b10d921eaa19c92d0631b08ee806395 Mon Sep 17 00:00:00 2001
+From 9647c3032c5545e880b649a8dcc376f257a426a8 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Fri, 16 Dec 2016 21:25:39 -0600
 Subject: [PATCH] Add ProjectileCollideEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
-index c24225892..187f02d4e 100644
+index 74cf2ab68a..a82dc0a94e 100644
 --- a/src/main/java/net/minecraft/server/EntityArrow.java
 +++ b/src/main/java/net/minecraft/server/EntityArrow.java
 @@ -195,6 +195,16 @@ public abstract class EntityArrow extends Entity implements IProjectile {
@@ -26,7 +26,7 @@ index c24225892..187f02d4e 100644
                  this.a(movingobjectposition);
                  this.impulse = true;
 diff --git a/src/main/java/net/minecraft/server/EntityFireball.java b/src/main/java/net/minecraft/server/EntityFireball.java
-index 3e3619d79..58cc4824c 100644
+index 3e3619d79f..58cc4824cf 100644
 --- a/src/main/java/net/minecraft/server/EntityFireball.java
 +++ b/src/main/java/net/minecraft/server/EntityFireball.java
 @@ -68,6 +68,15 @@ public abstract class EntityFireball extends Entity {
@@ -46,7 +46,7 @@ index 3e3619d79..58cc4824c 100644
                  this.a(movingobjectposition);
  
 diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
-index 62e8f27aa..81de03084 100644
+index 62e8f27aa7..81de03084a 100644
 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
 @@ -245,6 +245,16 @@ public class EntityFishingHook extends Entity {
@@ -67,7 +67,7 @@ index 62e8f27aa..81de03084 100644
              vec3d1 = new Vec3D(movingobjectposition.pos.x, movingobjectposition.pos.y, movingobjectposition.pos.z);
          }
 diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java
-index ee402d414..fc8c0cab5 100644
+index ee402d4140..fc8c0cab55 100644
 --- a/src/main/java/net/minecraft/server/EntityProjectile.java
 +++ b/src/main/java/net/minecraft/server/EntityProjectile.java
 @@ -144,6 +144,15 @@ public abstract class EntityProjectile extends Entity implements IProjectile {
@@ -87,7 +87,7 @@ index ee402d414..fc8c0cab5 100644
              if (movingobjectposition.type == MovingObjectPosition.EnumMovingObjectType.BLOCK && this.world.getType(movingobjectposition.a()).getBlock() == Blocks.NETHER_PORTAL) {
                  this.e(movingobjectposition.a());
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 07f47977f..307b59a27 100644
+index 07f47977f9..307b59a27d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -815,6 +815,16 @@ public class CraftEventFactory {
diff --git a/Spigot-Server-Patches/0154-Prevent-Pathfinding-out-of-World-Border.patch b/Spigot-Server-Patches/0153-Prevent-Pathfinding-out-of-World-Border.patch
similarity index 96%
rename from Spigot-Server-Patches/0154-Prevent-Pathfinding-out-of-World-Border.patch
rename to Spigot-Server-Patches/0153-Prevent-Pathfinding-out-of-World-Border.patch
index 468b0e5197..9f785c3311 100644
--- a/Spigot-Server-Patches/0154-Prevent-Pathfinding-out-of-World-Border.patch
+++ b/Spigot-Server-Patches/0153-Prevent-Pathfinding-out-of-World-Border.patch
@@ -1,4 +1,4 @@
-From f35437d281706ae7e892fd454f2bd8035bbafde9 Mon Sep 17 00:00:00 2001
+From d9d01a96e3782d6b0f5911c509b0670c692c9f29 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
@@ -39,5 +39,5 @@ index acd76e13bb..1a87480f09 100644
      }
  
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0155-Bound-Treasure-Maps-to-World-Border.patch b/Spigot-Server-Patches/0154-Bound-Treasure-Maps-to-World-Border.patch
similarity index 96%
rename from Spigot-Server-Patches/0155-Bound-Treasure-Maps-to-World-Border.patch
rename to Spigot-Server-Patches/0154-Bound-Treasure-Maps-to-World-Border.patch
index cf5d81aa71..e763b06311 100644
--- a/Spigot-Server-Patches/0155-Bound-Treasure-Maps-to-World-Border.patch
+++ b/Spigot-Server-Patches/0154-Bound-Treasure-Maps-to-World-Border.patch
@@ -1,4 +1,4 @@
-From d5fa24ce4fb5599566b69cf8ccd2bfd27ffdd59c Mon Sep 17 00:00:00 2001
+From 53f9973a0970135fccddac14441c6ab2c3aee2a4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 20 Dec 2016 15:15:11 -0500
 Subject: [PATCH] Bound Treasure Maps to World Border
@@ -11,7 +11,7 @@ that is outside happens to be closer, but unreachable, yet another reachable
 one is in border that would of been missed.
 
 diff --git a/src/main/java/net/minecraft/server/StructureGenerator.java b/src/main/java/net/minecraft/server/StructureGenerator.java
-index 142655c57e..6c2899e84d 100644
+index aa640e27d4..44c742e643 100644
 --- a/src/main/java/net/minecraft/server/StructureGenerator.java
 +++ b/src/main/java/net/minecraft/server/StructureGenerator.java
 @@ -124,6 +124,7 @@ public abstract class StructureGenerator<C extends WorldGenFeatureConfiguration>
@@ -46,5 +46,5 @@ index 1a87480f09..057ea1c5ac 100644
          return (double) chunkcoordintpair.f() > this.b() && (double) chunkcoordintpair.d() < this.d() && (double) chunkcoordintpair.g() > this.c() && (double) chunkcoordintpair.e() < this.e();
      }
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0156-Configurable-Cartographer-Treasure-Maps.patch b/Spigot-Server-Patches/0155-Configurable-Cartographer-Treasure-Maps.patch
similarity index 97%
rename from Spigot-Server-Patches/0156-Configurable-Cartographer-Treasure-Maps.patch
rename to Spigot-Server-Patches/0155-Configurable-Cartographer-Treasure-Maps.patch
index 8f56ec84be..5204bce3d3 100644
--- a/Spigot-Server-Patches/0156-Configurable-Cartographer-Treasure-Maps.patch
+++ b/Spigot-Server-Patches/0155-Configurable-Cartographer-Treasure-Maps.patch
@@ -1,4 +1,4 @@
-From 2cac5ee4b1d489f95f107d1575c4a1a8f96ffbda Mon Sep 17 00:00:00 2001
+From 5d9e532c8ca78b64531e4ed45574da9f12805cd7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 20 Dec 2016 15:26:27 -0500
 Subject: [PATCH] Configurable Cartographer Treasure Maps
diff --git a/Spigot-Server-Patches/0157-Optimize-ItemStack.isEmpty.patch b/Spigot-Server-Patches/0156-Optimize-ItemStack.isEmpty.patch
similarity index 92%
rename from Spigot-Server-Patches/0157-Optimize-ItemStack.isEmpty.patch
rename to Spigot-Server-Patches/0156-Optimize-ItemStack.isEmpty.patch
index cb15a4e2c5..9c12a03e52 100644
--- a/Spigot-Server-Patches/0157-Optimize-ItemStack.isEmpty.patch
+++ b/Spigot-Server-Patches/0156-Optimize-ItemStack.isEmpty.patch
@@ -1,4 +1,4 @@
-From ec3d526bfbed7645787a228fe8fc105bcea37a98 Mon Sep 17 00:00:00 2001
+From 79703f23ddc633e8427f70dd84304f17a1af2387 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Dec 2016 03:48:29 -0500
 Subject: [PATCH] Optimize ItemStack.isEmpty()
@@ -19,5 +19,5 @@ index 56787ed25c..f71d9ee578 100644
  
      public ItemStack cloneAndSubtract(int i) {
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0158-Add-API-methods-to-control-if-armour-stands-can-move.patch b/Spigot-Server-Patches/0157-Add-API-methods-to-control-if-armour-stands-can-move.patch
similarity index 96%
rename from Spigot-Server-Patches/0158-Add-API-methods-to-control-if-armour-stands-can-move.patch
rename to Spigot-Server-Patches/0157-Add-API-methods-to-control-if-armour-stands-can-move.patch
index a816ea3204..6c94968b25 100644
--- a/Spigot-Server-Patches/0158-Add-API-methods-to-control-if-armour-stands-can-move.patch
+++ b/Spigot-Server-Patches/0157-Add-API-methods-to-control-if-armour-stands-can-move.patch
@@ -1,4 +1,4 @@
-From 72a2b862549a3b7c84d6842b88669ce8325df998 Mon Sep 17 00:00:00 2001
+From d041c357b3b534885061522f9ee31e5637d718dc Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 21 Dec 2016 11:47:25 -0600
 Subject: [PATCH] Add API methods to control if armour stands can move
@@ -52,5 +52,5 @@ index 2b66a08ade..124c3185bc 100644
 +    // Paper end
  }
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0159-Add-option-to-remove-invalid-statistics.patch b/Spigot-Server-Patches/0158-Add-option-to-remove-invalid-statistics.patch
similarity index 93%
rename from Spigot-Server-Patches/0159-Add-option-to-remove-invalid-statistics.patch
rename to Spigot-Server-Patches/0158-Add-option-to-remove-invalid-statistics.patch
index e9b0e1b711..3f0f982b46 100644
--- a/Spigot-Server-Patches/0159-Add-option-to-remove-invalid-statistics.patch
+++ b/Spigot-Server-Patches/0158-Add-option-to-remove-invalid-statistics.patch
@@ -1,14 +1,14 @@
-From 5f12d734792a8a72c05ae4e9a20355ad2b7cb72b Mon Sep 17 00:00:00 2001
+From 3037a0a752877e38b6b03ab95371a177ce898e4e Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 20 Dec 2016 23:09:21 -0600
 Subject: [PATCH] Add option to remove invalid statistics
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index cf31c4469a..eb1b803c4d 100644
+index ec2f0d269b..a848edfc10 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -271,4 +271,13 @@ public class PaperConfig {
+@@ -266,4 +266,13 @@ public class PaperConfig {
              maxPlayerAutoSavePerTick = (playerAutoSaveRate == -1 || playerAutoSaveRate > 100) ? 10 : 20;
          }
      }
diff --git a/Spigot-Server-Patches/0160-Properly-fix-item-duplication-bug.patch b/Spigot-Server-Patches/0159-Properly-fix-item-duplication-bug.patch
similarity index 95%
rename from Spigot-Server-Patches/0160-Properly-fix-item-duplication-bug.patch
rename to Spigot-Server-Patches/0159-Properly-fix-item-duplication-bug.patch
index 64ff4f1a02..cbaa4dabf5 100644
--- a/Spigot-Server-Patches/0160-Properly-fix-item-duplication-bug.patch
+++ b/Spigot-Server-Patches/0159-Properly-fix-item-duplication-bug.patch
@@ -1,4 +1,4 @@
-From 2d438b4f1bf1a3e6c38d09aa04a3db8539006e72 Mon Sep 17 00:00:00 2001
+From e40358127de60bb2a07b37b2b24a3fcdc6a7badb Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Tue, 27 Dec 2016 01:57:57 +0000
 Subject: [PATCH] Properly fix item duplication bug
diff --git a/Spigot-Server-Patches/0161-String-based-Action-Bar-API.patch b/Spigot-Server-Patches/0160-String-based-Action-Bar-API.patch
similarity index 94%
rename from Spigot-Server-Patches/0161-String-based-Action-Bar-API.patch
rename to Spigot-Server-Patches/0160-String-based-Action-Bar-API.patch
index bce2205a51..d4542a8638 100644
--- a/Spigot-Server-Patches/0161-String-based-Action-Bar-API.patch
+++ b/Spigot-Server-Patches/0160-String-based-Action-Bar-API.patch
@@ -1,11 +1,11 @@
-From 484984d8d5db033b3c01d63f37d89011e3d4879b Mon Sep 17 00:00:00 2001
+From 4327088027d158125707cbc83a6e8528359caf57 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 27 Dec 2016 15:02:42 -0500
 Subject: [PATCH] String based Action Bar API
 
 
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
-index faec94722..dce1417af 100644
+index faec947224..dce1417aff 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
 @@ -2,6 +2,7 @@ package net.minecraft.server;
@@ -42,7 +42,7 @@ index faec94722..dce1417af 100644
      public static boolean isMainThread() {
          return MinecraftServer.getServer().isMainThread();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 291b664b6..478f02784 100644
+index 7c1444dff2..1ddbb4329d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -209,6 +209,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -65,5 +65,5 @@ index 291b664b6..478f02784 100644
      public void setPlayerListHeaderFooter(BaseComponent[] header, BaseComponent[] footer) {
           if (header != null) {
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0162-Activation-Range-Improvements.patch b/Spigot-Server-Patches/0161-Activation-Range-Improvements.patch
similarity index 98%
rename from Spigot-Server-Patches/0162-Activation-Range-Improvements.patch
rename to Spigot-Server-Patches/0161-Activation-Range-Improvements.patch
index 6000ad52bc..b9d9f1833e 100644
--- a/Spigot-Server-Patches/0162-Activation-Range-Improvements.patch
+++ b/Spigot-Server-Patches/0161-Activation-Range-Improvements.patch
@@ -1,4 +1,4 @@
-From 9a2fb172b54d40c416117cb3c658adcb7d9a86fd Mon Sep 17 00:00:00 2001
+From 41be89ac350a161565254c71c675b9b3f06d6021 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 27 Dec 2016 22:38:06 -0500
 Subject: [PATCH] Activation Range Improvements
@@ -30,7 +30,7 @@ index a5c147b989..9e88897a07 100644
      private float b;
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index fd59710b2b..426c6ac68f 100644
+index 4fe91b5a2f..91f831326c 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -74,7 +74,7 @@ public abstract class EntityLiving extends Entity {
@@ -110,7 +110,7 @@ index 9a75cb63ba..cf10605aaa 100644
                          }
                      }
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 34d2f11f4f..958d15a6ba 100644
+index f9bb19fed6..03ca577b4c 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -20,6 +20,7 @@ import net.minecraft.server.EntityFireball;
@@ -169,5 +169,5 @@ index 34d2f11f4f..958d15a6ba 100644
          {
              isActive = false;
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0163-Firework-API-s.patch b/Spigot-Server-Patches/0162-Firework-API-s.patch
similarity index 98%
rename from Spigot-Server-Patches/0163-Firework-API-s.patch
rename to Spigot-Server-Patches/0162-Firework-API-s.patch
index 0b14ea37ce..f8419af2eb 100644
--- a/Spigot-Server-Patches/0163-Firework-API-s.patch
+++ b/Spigot-Server-Patches/0162-Firework-API-s.patch
@@ -1,4 +1,4 @@
-From ac66f2245259ac48df1900cb170f67b3c4b0571b Mon Sep 17 00:00:00 2001
+From 477f25944a48d6758127751c710a055ce38771a5 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
@@ -130,5 +130,5 @@ index 7b3b206823..b39e33f4f0 100644
 +    // Paper end
  }
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0164-PlayerTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/0163-PlayerTeleportEndGatewayEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0164-PlayerTeleportEndGatewayEvent.patch
rename to Spigot-Server-Patches/0163-PlayerTeleportEndGatewayEvent.patch
index 6a44c847d9..18ef3cc401 100644
--- a/Spigot-Server-Patches/0164-PlayerTeleportEndGatewayEvent.patch
+++ b/Spigot-Server-Patches/0163-PlayerTeleportEndGatewayEvent.patch
@@ -1,4 +1,4 @@
-From b5aa52013eeb8a676d7071f3cd8357877b9a4187 Mon Sep 17 00:00:00 2001
+From 57292e6bc72fced6acb39159d59c17238d9d5635 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 31 Dec 2016 21:44:50 -0500
 Subject: [PATCH] PlayerTeleportEndGatewayEvent
@@ -19,5 +19,5 @@ index 2a17115ac6..b36dcb4d7d 100644
                      if (teleEvent.isCancelled()) {
                          return;
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0165-ShulkerBox-Dupe-Prevention.patch b/Spigot-Server-Patches/0164-ShulkerBox-Dupe-Prevention.patch
similarity index 93%
rename from Spigot-Server-Patches/0165-ShulkerBox-Dupe-Prevention.patch
rename to Spigot-Server-Patches/0164-ShulkerBox-Dupe-Prevention.patch
index 8ca28b919e..a75a18bc4f 100644
--- a/Spigot-Server-Patches/0165-ShulkerBox-Dupe-Prevention.patch
+++ b/Spigot-Server-Patches/0164-ShulkerBox-Dupe-Prevention.patch
@@ -1,4 +1,4 @@
-From ca24c81230c4116ef5db72b222032c3d6b219078 Mon Sep 17 00:00:00 2001
+From 0595f09922334f3b66c5ceebbe875990dd4d1117 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
@@ -19,5 +19,5 @@ index 82b4d82c0e..d00bd9d610 100644
              }
              world.updateAdjacentComparators(blockposition, iblockdata.getBlock());
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0166-Provide-E-TE-Chunk-count-stat-methods.patch b/Spigot-Server-Patches/0165-Provide-E-TE-Chunk-count-stat-methods.patch
similarity index 93%
rename from Spigot-Server-Patches/0166-Provide-E-TE-Chunk-count-stat-methods.patch
rename to Spigot-Server-Patches/0165-Provide-E-TE-Chunk-count-stat-methods.patch
index a4b9afdc23..fe2e534fdc 100644
--- a/Spigot-Server-Patches/0166-Provide-E-TE-Chunk-count-stat-methods.patch
+++ b/Spigot-Server-Patches/0165-Provide-E-TE-Chunk-count-stat-methods.patch
@@ -1,4 +1,4 @@
-From 463437d11f2ed0f45aa0d3faa206c6323b169122 Mon Sep 17 00:00:00 2001
+From 112fbc9f04f10cb66099f635f93b8d8baf775402 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 Jan 2017 15:24:46 -0500
 Subject: [PATCH] Provide E/TE/Chunk count stat methods
@@ -7,7 +7,7 @@ Provides counts without the ineffeciency of using .getEntities().size()
 which creates copy of the collections.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 8421c397a..f39482696 100644
+index 3536433d14..f83a28dfda 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -82,6 +82,29 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0167-Enforce-Sync-Player-Saves.patch b/Spigot-Server-Patches/0166-Enforce-Sync-Player-Saves.patch
similarity index 93%
rename from Spigot-Server-Patches/0167-Enforce-Sync-Player-Saves.patch
rename to Spigot-Server-Patches/0166-Enforce-Sync-Player-Saves.patch
index 43f2357c88..8493674ee6 100644
--- a/Spigot-Server-Patches/0167-Enforce-Sync-Player-Saves.patch
+++ b/Spigot-Server-Patches/0166-Enforce-Sync-Player-Saves.patch
@@ -1,4 +1,4 @@
-From f15ccb3e2e5e02171f6106325fa92f3217019104 Mon Sep 17 00:00:00 2001
+From c64752d30a01b6780d3ade5c23a2e39a04aa2ccd 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
@@ -27,5 +27,5 @@ index 73d72ef7e3..cc0ed8546f 100644
      // Paper end
  
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0168-Enforce-Sync-Chunk-Unloads.patch b/Spigot-Server-Patches/0167-Enforce-Sync-Chunk-Unloads.patch
similarity index 95%
rename from Spigot-Server-Patches/0168-Enforce-Sync-Chunk-Unloads.patch
rename to Spigot-Server-Patches/0167-Enforce-Sync-Chunk-Unloads.patch
index 87d3fd0a6e..13142db232 100644
--- a/Spigot-Server-Patches/0168-Enforce-Sync-Chunk-Unloads.patch
+++ b/Spigot-Server-Patches/0167-Enforce-Sync-Chunk-Unloads.patch
@@ -1,4 +1,4 @@
-From e030fa78633b5f04e1fa8a54c811c08430babc74 Mon Sep 17 00:00:00 2001
+From 90196edf4705c485d9624b4d3a3b3ad067845ae1 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/0169-Don-t-allow-entities-to-ride-themselves-572.patch b/Spigot-Server-Patches/0168-Don-t-allow-entities-to-ride-themselves-572.patch
similarity index 93%
rename from Spigot-Server-Patches/0169-Don-t-allow-entities-to-ride-themselves-572.patch
rename to Spigot-Server-Patches/0168-Don-t-allow-entities-to-ride-themselves-572.patch
index 5e1fe6d51d..dddf6660d7 100644
--- a/Spigot-Server-Patches/0169-Don-t-allow-entities-to-ride-themselves-572.patch
+++ b/Spigot-Server-Patches/0168-Don-t-allow-entities-to-ride-themselves-572.patch
@@ -1,4 +1,4 @@
-From 55d44b2de264f4b08c1ee8ccdb61f3b4b3b6eaeb Mon Sep 17 00:00:00 2001
+From 6aba3bfbae99d2150d0af1695c5890cb936912b3 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/0170-Fix-block-break-desync.patch b/Spigot-Server-Patches/0169-Fix-block-break-desync.patch
similarity index 94%
rename from Spigot-Server-Patches/0170-Fix-block-break-desync.patch
rename to Spigot-Server-Patches/0169-Fix-block-break-desync.patch
index 0969c3724f..a96dd513d0 100644
--- a/Spigot-Server-Patches/0170-Fix-block-break-desync.patch
+++ b/Spigot-Server-Patches/0169-Fix-block-break-desync.patch
@@ -1,4 +1,4 @@
-From ab62f49cb56d09e6b0059c9a7207774c1d70c3bf Mon Sep 17 00:00:00 2001
+From 122218cc52a3284f0292c300c921f3c69d7f0b22 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/0171-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/Spigot-Server-Patches/0170-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
similarity index 99%
rename from Spigot-Server-Patches/0171-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
rename to Spigot-Server-Patches/0170-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
index 831a048821..467c1d5941 100644
--- a/Spigot-Server-Patches/0171-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/Spigot-Server-Patches/0170-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
@@ -1,4 +1,4 @@
-From 4950fa11a0b1880791c6424f0585497011de8013 Mon Sep 17 00:00:00 2001
+From 02a948a5869a2f0667e8024e141347e2fa323502 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/0172-Cap-Entity-Collisions.patch b/Spigot-Server-Patches/0171-Cap-Entity-Collisions.patch
similarity index 96%
rename from Spigot-Server-Patches/0172-Cap-Entity-Collisions.patch
rename to Spigot-Server-Patches/0171-Cap-Entity-Collisions.patch
index 3e3ee12fb7..fcf327b295 100644
--- a/Spigot-Server-Patches/0172-Cap-Entity-Collisions.patch
+++ b/Spigot-Server-Patches/0171-Cap-Entity-Collisions.patch
@@ -1,4 +1,4 @@
-From 4a7eb279f6b957a9194bbe3f658269d749038a92 Mon Sep 17 00:00:00 2001
+From d2ad4e7ad54b5fa9fc0120909acb500e68b9fd56 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
@@ -27,7 +27,7 @@ index 5d152af154..02d99aec43 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index f3422a097b..11dd946b44 100644
+index 45cd8dca16..c39e789529 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -184,6 +184,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
diff --git a/Spigot-Server-Patches/0173-Remove-CraftScheduler-Async-Task-Debugger.patch b/Spigot-Server-Patches/0172-Remove-CraftScheduler-Async-Task-Debugger.patch
similarity index 97%
rename from Spigot-Server-Patches/0173-Remove-CraftScheduler-Async-Task-Debugger.patch
rename to Spigot-Server-Patches/0172-Remove-CraftScheduler-Async-Task-Debugger.patch
index ba1a1e0b95..dc0d0acf06 100644
--- a/Spigot-Server-Patches/0173-Remove-CraftScheduler-Async-Task-Debugger.patch
+++ b/Spigot-Server-Patches/0172-Remove-CraftScheduler-Async-Task-Debugger.patch
@@ -1,4 +1,4 @@
-From 2ba326cb516eadbfd22cb637ddd9bfd4d15cc116 Mon Sep 17 00:00:00 2001
+From 94c6d1da37a9be67ae8745e85952a6269f0d1de6 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
@@ -58,5 +58,5 @@ index 26753fac5e..a2fadaf82c 100644
  
      @Deprecated
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0174-Shame-on-you-Mojang.patch b/Spigot-Server-Patches/0173-Shame-on-you-Mojang.patch
similarity index 94%
rename from Spigot-Server-Patches/0174-Shame-on-you-Mojang.patch
rename to Spigot-Server-Patches/0173-Shame-on-you-Mojang.patch
index 2bee188603..99ec15767d 100644
--- a/Spigot-Server-Patches/0174-Shame-on-you-Mojang.patch
+++ b/Spigot-Server-Patches/0173-Shame-on-you-Mojang.patch
@@ -1,4 +1,4 @@
-From 3dad1401f1bc22c4d037e64161992b62221a480f Mon Sep 17 00:00:00 2001
+From 6ee94db8532442e2ab30e3b7cb7739c7cdb7af23 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
@@ -34,5 +34,5 @@ index 7148ea3692..6d4e82b404 100644
      }
  }
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0175-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch b/Spigot-Server-Patches/0174-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
similarity index 91%
rename from Spigot-Server-Patches/0175-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
rename to Spigot-Server-Patches/0174-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
index 9cb13681e6..debdd945a7 100644
--- a/Spigot-Server-Patches/0175-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
+++ b/Spigot-Server-Patches/0174-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
@@ -1,11 +1,11 @@
-From bf0639fd7585002f204228976110c3a83d92c79c Mon Sep 17 00:00:00 2001
+From 281254c055ebd9657dec56034e3c46ed66f2e8e7 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Tue, 7 Feb 2017 16:55:35 -0600
 Subject: [PATCH] Make targetSize more aggressive in the chunk unload queue
 
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 355186c111..0ca071b879 100644
+index e4d2a3a0b5..c0d48c33fc 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -311,7 +311,7 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -18,5 +18,5 @@ index 355186c111..0ca071b879 100644
  
                  LongIterator longiterator = this.unloadQueue.iterator();
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0176-Do-not-let-armorstands-drown.patch b/Spigot-Server-Patches/0175-Do-not-let-armorstands-drown.patch
similarity index 94%
rename from Spigot-Server-Patches/0176-Do-not-let-armorstands-drown.patch
rename to Spigot-Server-Patches/0175-Do-not-let-armorstands-drown.patch
index 207a325a6d..8de5731d5e 100644
--- a/Spigot-Server-Patches/0176-Do-not-let-armorstands-drown.patch
+++ b/Spigot-Server-Patches/0175-Do-not-let-armorstands-drown.patch
@@ -1,4 +1,4 @@
-From 6a3b5203784f3a3498aa5f905578554c89d00868 Mon Sep 17 00:00:00 2001
+From 571465f5f4fdec7f27e5e4ad2af08f9bdf6e406d 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
@@ -20,7 +20,7 @@ index 00a46129b8..6628af7778 100644
      // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 8c56eeb11c..2ff82694b4 100644
+index d926cbb247..b9227f7a7f 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -202,6 +202,7 @@ public abstract class EntityLiving extends Entity {
@@ -41,5 +41,5 @@ index 8c56eeb11c..2ff82694b4 100644
                      if (this.getAirTicks() == -20) {
                          this.setAirTicks(0);
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0177-Properly-handle-async-calls-to-restart-the-server.patch b/Spigot-Server-Patches/0176-Properly-handle-async-calls-to-restart-the-server.patch
similarity index 99%
rename from Spigot-Server-Patches/0177-Properly-handle-async-calls-to-restart-the-server.patch
rename to Spigot-Server-Patches/0176-Properly-handle-async-calls-to-restart-the-server.patch
index c74415d291..fa09800b7f 100644
--- a/Spigot-Server-Patches/0177-Properly-handle-async-calls-to-restart-the-server.patch
+++ b/Spigot-Server-Patches/0176-Properly-handle-async-calls-to-restart-the-server.patch
@@ -1,4 +1,4 @@
-From 54b778131b6ee007d67077f0ec19fa67074a9ea9 Mon Sep 17 00:00:00 2001
+From ac8f86f1446a4f0731d3199173c38ed3bff0aa6b 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 a367cbf52b..08ce98d071 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
@@ -296,5 +296,5 @@ index 947c43a5d0..f15fd9f370 100644
      }
  }
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0178-Add-system-property-to-disable-book-size-limits.patch b/Spigot-Server-Patches/0177-Add-system-property-to-disable-book-size-limits.patch
similarity index 97%
rename from Spigot-Server-Patches/0178-Add-system-property-to-disable-book-size-limits.patch
rename to Spigot-Server-Patches/0177-Add-system-property-to-disable-book-size-limits.patch
index c478a93fd1..f815bdba9f 100644
--- a/Spigot-Server-Patches/0178-Add-system-property-to-disable-book-size-limits.patch
+++ b/Spigot-Server-Patches/0177-Add-system-property-to-disable-book-size-limits.patch
@@ -1,4 +1,4 @@
-From 703a23f2b92efc065861a675cca9cf28b3bf000e Mon Sep 17 00:00:00 2001
+From a5339fccea2bd59e7dff197d710845ab8f08656c 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
@@ -57,5 +57,5 @@ index 6ff1a2dcd6..64a9399527 100644
              }
  
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0179-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/Spigot-Server-Patches/0178-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
similarity index 97%
rename from Spigot-Server-Patches/0179-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
rename to Spigot-Server-Patches/0178-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
index 9230433f9d..6249b7d002 100644
--- a/Spigot-Server-Patches/0179-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
+++ b/Spigot-Server-Patches/0178-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
@@ -1,4 +1,4 @@
-From d9df5e2df8f110eb54185d952813d68f0abd129a Mon Sep 17 00:00:00 2001
+From cf0ef274d7d00e56af3759ab9f201b501f5c6f06 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/0180-Add-configuration-option-to-prevent-player-names-fro.patch b/Spigot-Server-Patches/0179-Add-configuration-option-to-prevent-player-names-fro.patch
similarity index 90%
rename from Spigot-Server-Patches/0180-Add-configuration-option-to-prevent-player-names-fro.patch
rename to Spigot-Server-Patches/0179-Add-configuration-option-to-prevent-player-names-fro.patch
index ccd9bec856..741483fc20 100644
--- a/Spigot-Server-Patches/0180-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/Spigot-Server-Patches/0179-Add-configuration-option-to-prevent-player-names-fro.patch
@@ -1,4 +1,4 @@
-From 7068366743806ceade7e865f3f40d8932c9ab510 Mon Sep 17 00:00:00 2001
+From e9e83c3e4f20724f7ee11f45ed055452c270f265 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,10 +6,10 @@ 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 eb1b803c4d..5eca32c341 100644
+index a848edfc10..ccbe1482fc 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -280,4 +280,9 @@ public class PaperConfig {
+@@ -275,4 +275,9 @@ public class PaperConfig {
          }
          removeInvalidStatistics = getBoolean("settings.remove-invalid-statistics", false);
      }
diff --git a/Spigot-Server-Patches/0181-Use-TerminalConsoleAppender-for-console-improvements.patch b/Spigot-Server-Patches/0180-Use-TerminalConsoleAppender-for-console-improvements.patch
similarity index 98%
rename from Spigot-Server-Patches/0181-Use-TerminalConsoleAppender-for-console-improvements.patch
rename to Spigot-Server-Patches/0180-Use-TerminalConsoleAppender-for-console-improvements.patch
index f35f2633c1..c99b20e976 100644
--- a/Spigot-Server-Patches/0181-Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/Spigot-Server-Patches/0180-Use-TerminalConsoleAppender-for-console-improvements.patch
@@ -1,4 +1,4 @@
-From f6355085c30b000c44bd6a5f7be7312cdcc0a0d6 Mon Sep 17 00:00:00 2001
+From 5144753ba0ed24d90a493cdd431df8445a2073f4 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Fri, 9 Jun 2017 19:03:43 +0200
 Subject: [PATCH] Use TerminalConsoleAppender for console improvements
@@ -19,7 +19,7 @@ Other changes:
     configuration
 
 diff --git a/pom.xml b/pom.xml
-index 17c3baaec..ced853423 100644
+index 235d5a1b9b..d93a180de9 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -40,10 +40,27 @@
@@ -75,7 +75,7 @@ index 17c3baaec..ced853423 100644
                  <groupId>org.apache.maven.plugins</groupId>
 diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
 new file mode 100644
-index 000000000..688b4715e
+index 0000000000..688b4715eb
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
 @@ -0,0 +1,40 @@
@@ -121,7 +121,7 @@ index 000000000..688b4715e
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java
 new file mode 100644
-index 000000000..685deaa0e
+index 0000000000..685deaa0e5
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java
 @@ -0,0 +1,17 @@
@@ -143,7 +143,7 @@ index 000000000..685deaa0e
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 22f3a08e9..9fdb6d100 100644
+index 22f3a08e98..9fdb6d100b 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -79,6 +79,9 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -185,7 +185,7 @@ index 22f3a08e9..9fdb6d100 100644
          System.setOut(new PrintStream(new LoggerOutputStream(logger, Level.INFO), true));
          System.setErr(new PrintStream(new LoggerOutputStream(logger, Level.WARN), true));
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 8d345a050..6a3d5fdff 100644
+index 8d345a0502..6a3d5fdff4 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -61,7 +61,6 @@ import org.apache.commons.lang3.Validate;
@@ -243,7 +243,7 @@ index 8d345a050..6a3d5fdff 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 a9906f03c..2f2f30138 100644
+index a9906f03c9..2f2f301383 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 {
@@ -257,7 +257,7 @@ index a9906f03c..2f2f30138 100644
  
          this.k = new GameProfileBanList(PlayerList.a);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 849dd19dc..c8d4e9395 100644
+index 849dd19dc0..c8d4e93951 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -142,8 +142,8 @@ import java.nio.ByteBuffer;
@@ -285,7 +285,7 @@ index 849dd19dc..c8d4e9395 100644
      @Override
      public PluginCommand getPluginCommand(String name) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index b726fe947..393a39fad 100644
+index b726fe947a..393a39fadc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -14,7 +14,7 @@ import java.util.logging.Logger;
@@ -327,7 +327,7 @@ index b726fe947..393a39fad 100644
                  if (Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java b/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java
 deleted file mode 100644
-index 26a2fb894..000000000
+index 26a2fb8942..0000000000
 --- a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java
 +++ /dev/null
 @@ -1,74 +0,0 @@
@@ -406,7 +406,7 @@ index 26a2fb894..000000000
 -    }
 -}
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
-index 33e8ea02c..1e3aae3b8 100644
+index 33e8ea02c4..1e3aae3b8f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
 +++ b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
 @@ -8,17 +8,27 @@ import java.util.logging.Level;
@@ -485,7 +485,7 @@ index 33e8ea02c..1e3aae3b8 100644
      }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
-index 984df4083..bbb5a84f3 100644
+index 984df4083d..bbb5a84f36 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
 @@ -20,7 +20,7 @@ public class ServerShutdownThread extends Thread {
@@ -499,7 +499,7 @@ index 984df4083..bbb5a84f3 100644
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java b/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java
 deleted file mode 100644
-index b64097113..000000000
+index b640971130..0000000000
 --- a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java
 +++ /dev/null
 @@ -1,54 +0,0 @@
@@ -558,7 +558,7 @@ index b64097113..000000000
 -    }
 -}
 diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index 5cee8f00e..08b6bb7f9 100644
+index 5cee8f00ef..08b6bb7f97 100644
 --- a/src/main/resources/log4j2.xml
 +++ b/src/main/resources/log4j2.xml
 @@ -1,12 +1,11 @@
diff --git a/Spigot-Server-Patches/0182-provide-a-configurable-option-to-disable-creeper-lin.patch b/Spigot-Server-Patches/0181-provide-a-configurable-option-to-disable-creeper-lin.patch
similarity index 96%
rename from Spigot-Server-Patches/0182-provide-a-configurable-option-to-disable-creeper-lin.patch
rename to Spigot-Server-Patches/0181-provide-a-configurable-option-to-disable-creeper-lin.patch
index 945be44295..346efcf617 100644
--- a/Spigot-Server-Patches/0182-provide-a-configurable-option-to-disable-creeper-lin.patch
+++ b/Spigot-Server-Patches/0181-provide-a-configurable-option-to-disable-creeper-lin.patch
@@ -1,4 +1,4 @@
-From cafd27b8fff95c34fac1d513e88b6012abf64a04 Mon Sep 17 00:00:00 2001
+From 185c041bc7f55e2b934a831ebaec2d9cd4475a6d 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/0183-Item-canEntityPickup.patch b/Spigot-Server-Patches/0182-Item-canEntityPickup.patch
similarity index 97%
rename from Spigot-Server-Patches/0183-Item-canEntityPickup.patch
rename to Spigot-Server-Patches/0182-Item-canEntityPickup.patch
index 0cdcbfbc00..434cefd7d2 100644
--- a/Spigot-Server-Patches/0183-Item-canEntityPickup.patch
+++ b/Spigot-Server-Patches/0182-Item-canEntityPickup.patch
@@ -1,4 +1,4 @@
-From b076d81196c1378797a0d37d050d0fc193590b82 Mon Sep 17 00:00:00 2001
+From a1ff462154e3c6e97e7a5cd380eb4ae9684aaf5c 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
@@ -54,5 +54,5 @@ index a17a537d69..1df17f09bb 100644
      public String toString() {
          return "CraftItem";
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0184-PlayerPickupItemEvent-setFlyAtPlayer.patch b/Spigot-Server-Patches/0183-PlayerPickupItemEvent-setFlyAtPlayer.patch
similarity index 96%
rename from Spigot-Server-Patches/0184-PlayerPickupItemEvent-setFlyAtPlayer.patch
rename to Spigot-Server-Patches/0183-PlayerPickupItemEvent-setFlyAtPlayer.patch
index 9fa436cc74..f452ebdba8 100644
--- a/Spigot-Server-Patches/0184-PlayerPickupItemEvent-setFlyAtPlayer.patch
+++ b/Spigot-Server-Patches/0183-PlayerPickupItemEvent-setFlyAtPlayer.patch
@@ -1,4 +1,4 @@
-From a0615a922ee10148521e6bd8db444064e739c9cb Mon Sep 17 00:00:00 2001
+From 883031f68dcfe2e1472f0b7b807d6b8481e0d750 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
@@ -43,5 +43,5 @@ index 3e70a06397..d9d52a63d8 100644
                      this.die();
                      itemstack.setCount(i);
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0185-PlayerAttemptPickupItemEvent.patch b/Spigot-Server-Patches/0184-PlayerAttemptPickupItemEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0185-PlayerAttemptPickupItemEvent.patch
rename to Spigot-Server-Patches/0184-PlayerAttemptPickupItemEvent.patch
index faf7d27150..7d06eb391a 100644
--- a/Spigot-Server-Patches/0185-PlayerAttemptPickupItemEvent.patch
+++ b/Spigot-Server-Patches/0184-PlayerAttemptPickupItemEvent.patch
@@ -1,4 +1,4 @@
-From 2e977a86bc5bdfcad0e652f585fe6e90289f3248 Mon Sep 17 00:00:00 2001
+From 650a13dedf3acdf0aab3792792e1465f2d3f8c83 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
@@ -40,5 +40,5 @@ index d9d52a63d8..946e59753e 100644
                  itemstack.setCount(canHold);
                  // Call legacy event
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0186-Add-UnknownCommandEvent.patch b/Spigot-Server-Patches/0185-Add-UnknownCommandEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0186-Add-UnknownCommandEvent.patch
rename to Spigot-Server-Patches/0185-Add-UnknownCommandEvent.patch
index 770a858445..dbe7458597 100644
--- a/Spigot-Server-Patches/0186-Add-UnknownCommandEvent.patch
+++ b/Spigot-Server-Patches/0185-Add-UnknownCommandEvent.patch
@@ -1,11 +1,11 @@
-From 71fd5fc008c37571da79c57ceb1f6d83af4edded Mon Sep 17 00:00:00 2001
+From 0890f45cf9facbda79b33156330c681321574888 Mon Sep 17 00:00:00 2001
 From: Sweepyoface <github@sweepy.pw>
 Date: Sat, 17 Jun 2017 18:48:21 -0400
 Subject: [PATCH] Add UnknownCommandEvent
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c8d4e9395..cabe0a745 100644
+index c8d4e93951..cabe0a7451 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -81,6 +81,7 @@ import org.bukkit.craftbukkit.util.Versioning;
diff --git a/Spigot-Server-Patches/0187-Basic-PlayerProfile-API.patch b/Spigot-Server-Patches/0186-Basic-PlayerProfile-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0187-Basic-PlayerProfile-API.patch
rename to Spigot-Server-Patches/0186-Basic-PlayerProfile-API.patch
index 2f04797557..4a8763751d 100644
--- a/Spigot-Server-Patches/0187-Basic-PlayerProfile-API.patch
+++ b/Spigot-Server-Patches/0186-Basic-PlayerProfile-API.patch
@@ -1,4 +1,4 @@
-From 60f2589eaa6d357fe7d5c2dc9148b55f9d81b447 Mon Sep 17 00:00:00 2001
+From d3729da16568052185ac4b37a547aa43ed840130 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 15 Jan 2018 22:11:48 -0500
 Subject: [PATCH] Basic PlayerProfile API
@@ -7,7 +7,7 @@ Establishes base extension of profile systems for future edits too
 
 diff --git a/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java
 new file mode 100644
-index 000000000..b151a13c1
+index 0000000000..b151a13c1b
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java
 @@ -0,0 +1,280 @@
@@ -293,7 +293,7 @@ index 000000000..b151a13c1
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperAuthenticationService.java b/src/main/java/com/destroystokyo/paper/profile/PaperAuthenticationService.java
 new file mode 100644
-index 000000000..25836b975
+index 0000000000..25836b975b
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperAuthenticationService.java
 @@ -0,0 +1,30 @@
@@ -329,7 +329,7 @@ index 000000000..25836b975
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java b/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java
 new file mode 100644
-index 000000000..3bcdb8f93
+index 0000000000..3bcdb8f93f
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java
 @@ -0,0 +1,17 @@
@@ -352,7 +352,7 @@ index 000000000..3bcdb8f93
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java
 new file mode 100644
-index 000000000..4b2a67423
+index 0000000000..4b2a67423f
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java
 @@ -0,0 +1,29 @@
@@ -387,7 +387,7 @@ index 000000000..4b2a67423
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperUserAuthentication.java b/src/main/java/com/destroystokyo/paper/profile/PaperUserAuthentication.java
 new file mode 100644
-index 000000000..3aceb0ea8
+index 0000000000..3aceb0ea8a
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperUserAuthentication.java
 @@ -0,0 +1,11 @@
@@ -403,7 +403,7 @@ index 000000000..3aceb0ea8
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
-index dce1417af..f7856897f 100644
+index dce1417aff..f7856897f6 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
 @@ -1,7 +1,10 @@
@@ -429,7 +429,7 @@ index dce1417af..f7856897f 100644
       * Calculates distance between 2 entities
       * @param e1
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 6a3d5fdff..65204c259 100644
+index 6a3d5fdff4..65204c259e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1189,7 +1189,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -450,7 +450,7 @@ index 6a3d5fdff..65204c259 100644
          return this.V;
      }
 diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java
-index a47a51a41..4c476f757 100644
+index a47a51a412..4c476f757c 100644
 --- a/src/main/java/net/minecraft/server/UserCache.java
 +++ b/src/main/java/net/minecraft/server/UserCache.java
 @@ -44,7 +44,7 @@ public class UserCache {
@@ -486,7 +486,7 @@ index a47a51a41..4c476f757 100644
  
          private UserCacheEntry(GameProfile gameprofile, Date date) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index cabe0a745..74e466d1f 100644
+index cabe0a7451..74e466d1f6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -159,6 +159,10 @@ import org.bukkit.event.server.ServerLoadEvent;
diff --git a/Spigot-Server-Patches/0188-Shoulder-Entities-Release-API.patch b/Spigot-Server-Patches/0187-Shoulder-Entities-Release-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0188-Shoulder-Entities-Release-API.patch
rename to Spigot-Server-Patches/0187-Shoulder-Entities-Release-API.patch
index b63fdfa15f..93c4a7e692 100644
--- a/Spigot-Server-Patches/0188-Shoulder-Entities-Release-API.patch
+++ b/Spigot-Server-Patches/0187-Shoulder-Entities-Release-API.patch
@@ -1,11 +1,11 @@
-From 3cef55a977f376a4e9670dcc437303c452b6d436 Mon Sep 17 00:00:00 2001
+From f174800be64d181520936fe4f2413764f698a1a1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 17 Jun 2017 15:18:30 -0400
 Subject: [PATCH] Shoulder Entities Release API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 0f00eece..504c9ad4 100644
+index 0f00eecead..504c9ad473 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -1824,21 +1824,48 @@ public abstract class EntityHuman extends EntityLiving {
@@ -62,7 +62,7 @@ index 0f00eece..504c9ad4 100644
      public abstract boolean isSpectator();
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 289e267b..38a886fb 100644
+index 289e267bdd..38a886fbd5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -455,6 +455,32 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@@ -99,5 +99,5 @@ index 289e267b..38a886fb 100644
      public org.bukkit.entity.Entity getShoulderEntityLeft() {
          if (!getHandle().getShoulderEntityLeft().isEmpty()) {
 -- 
-2.18.0.windows.1
+2.19.0
 
diff --git a/Spigot-Server-Patches/0189-Profile-Lookup-Events.patch b/Spigot-Server-Patches/0188-Profile-Lookup-Events.patch
similarity index 98%
rename from Spigot-Server-Patches/0189-Profile-Lookup-Events.patch
rename to Spigot-Server-Patches/0188-Profile-Lookup-Events.patch
index 5c9af08440..808a493cb8 100644
--- a/Spigot-Server-Patches/0189-Profile-Lookup-Events.patch
+++ b/Spigot-Server-Patches/0188-Profile-Lookup-Events.patch
@@ -1,4 +1,4 @@
-From 2f9c791a592bd0ee15b11bc736189c62979dd617 Mon Sep 17 00:00:00 2001
+From 27f330381e0cab43219fd7c414ca8c9d13383663 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
@@ -81,5 +81,5 @@ index 3bcdb8f93f..bb9894318e 100644
      }
  }
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0190-Block-player-logins-during-server-shutdown.patch b/Spigot-Server-Patches/0189-Block-player-logins-during-server-shutdown.patch
similarity index 93%
rename from Spigot-Server-Patches/0190-Block-player-logins-during-server-shutdown.patch
rename to Spigot-Server-Patches/0189-Block-player-logins-during-server-shutdown.patch
index 6e921ef6dc..08a59b954f 100644
--- a/Spigot-Server-Patches/0190-Block-player-logins-during-server-shutdown.patch
+++ b/Spigot-Server-Patches/0189-Block-player-logins-during-server-shutdown.patch
@@ -1,4 +1,4 @@
-From 94b386a46fa89e762cead571cdf3ccc0b3975532 Mon Sep 17 00:00:00 2001
+From ab6360e70dead0c0a2753ad324009898e6b9b7f4 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
@@ -22,5 +22,5 @@ index 19ac21e385..8bbea96240 100644
              this.b();
          } else if (this.g == LoginListener.EnumProtocolState.DELAY_ACCEPT) {
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0191-Entity-fromMobSpawner.patch b/Spigot-Server-Patches/0190-Entity-fromMobSpawner.patch
similarity index 98%
rename from Spigot-Server-Patches/0191-Entity-fromMobSpawner.patch
rename to Spigot-Server-Patches/0190-Entity-fromMobSpawner.patch
index 55af85852b..6a0f532a05 100644
--- a/Spigot-Server-Patches/0191-Entity-fromMobSpawner.patch
+++ b/Spigot-Server-Patches/0190-Entity-fromMobSpawner.patch
@@ -1,4 +1,4 @@
-From 3afc9e82754c1b48e6c2b9a34d03af445f290bad Mon Sep 17 00:00:00 2001
+From 000e3534b873ef7427de8b5e1b120b57df5f1d45 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/0192-Fix-Anvil-Level-sync-to-client.patch b/Spigot-Server-Patches/0191-Fix-Anvil-Level-sync-to-client.patch
similarity index 95%
rename from Spigot-Server-Patches/0192-Fix-Anvil-Level-sync-to-client.patch
rename to Spigot-Server-Patches/0191-Fix-Anvil-Level-sync-to-client.patch
index b26a96d7ce..368487d30f 100644
--- a/Spigot-Server-Patches/0192-Fix-Anvil-Level-sync-to-client.patch
+++ b/Spigot-Server-Patches/0191-Fix-Anvil-Level-sync-to-client.patch
@@ -1,4 +1,4 @@
-From 2fab2f4cddf28bbb8cf9a29cdd7f24a67df6bab4 Mon Sep 17 00:00:00 2001
+From a1da8594b29038f7fe5cafca15eef197424d0605 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
@@ -26,7 +26,7 @@ index a8a875fe11..f2e15fa545 100644
  
          this.lastLevelCost = this.levelCost;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 478f027848..99ae00785e 100644
+index 1ddbb4329d..a045ec3b22 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1431,6 +1431,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -42,5 +42,5 @@ index 478f027848..99ae00785e 100644
          return true;
      }
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0193-Add-missing-coverages-for-getTileEntity-in-order-to-.patch b/Spigot-Server-Patches/0192-Add-missing-coverages-for-getTileEntity-in-order-to-.patch
similarity index 90%
rename from Spigot-Server-Patches/0193-Add-missing-coverages-for-getTileEntity-in-order-to-.patch
rename to Spigot-Server-Patches/0192-Add-missing-coverages-for-getTileEntity-in-order-to-.patch
index bb0b2dc8ca..56b6593e00 100644
--- a/Spigot-Server-Patches/0193-Add-missing-coverages-for-getTileEntity-in-order-to-.patch
+++ b/Spigot-Server-Patches/0192-Add-missing-coverages-for-getTileEntity-in-order-to-.patch
@@ -1,4 +1,4 @@
-From aa533892a0d710314855e69f85c2cf10f09bc992 Mon Sep 17 00:00:00 2001
+From fd9f6e2cb6863164a3278578726543c6011140e0 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Add missing coverages for getTileEntity in order to attempt
 
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index e58b21ae43..e4ba13cec5 100644
+index f9b4f314ce..65fe50882b 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -234,6 +234,13 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -24,5 +24,5 @@ index e58b21ae43..e4ba13cec5 100644
          return result;
      }
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0194-Improve-the-Saddle-API-for-Horses.patch b/Spigot-Server-Patches/0193-Improve-the-Saddle-API-for-Horses.patch
similarity index 97%
rename from Spigot-Server-Patches/0194-Improve-the-Saddle-API-for-Horses.patch
rename to Spigot-Server-Patches/0193-Improve-the-Saddle-API-for-Horses.patch
index 869999a679..1de3fd1f57 100644
--- a/Spigot-Server-Patches/0194-Improve-the-Saddle-API-for-Horses.patch
+++ b/Spigot-Server-Patches/0193-Improve-the-Saddle-API-for-Horses.patch
@@ -1,4 +1,4 @@
-From 1b733d9f6239b8bf794a6f8333ce15cd49cf5c2d Mon Sep 17 00:00:00 2001
+From be7705d2b048f5b357227720f7a2d86dcd4dd661 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
@@ -61,5 +61,5 @@ index 0000000000..99cfbaf90b
 +
 +}
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0195-Implement-ensureServerConversions-API.patch b/Spigot-Server-Patches/0194-Implement-ensureServerConversions-API.patch
similarity index 90%
rename from Spigot-Server-Patches/0195-Implement-ensureServerConversions-API.patch
rename to Spigot-Server-Patches/0194-Implement-ensureServerConversions-API.patch
index 288335404d..b1516fd991 100644
--- a/Spigot-Server-Patches/0195-Implement-ensureServerConversions-API.patch
+++ b/Spigot-Server-Patches/0194-Implement-ensureServerConversions-API.patch
@@ -1,4 +1,4 @@
-From 9f5de8050e5b90630710b446ab20e501afadc369 Mon Sep 17 00:00:00 2001
+From 94434ffb86938335fd334e78244ccfe1b088c964 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 May 2016 22:43:12 -0400
 Subject: [PATCH] Implement ensureServerConversions API
@@ -7,7 +7,7 @@ This will take a Bukkit ItemStack and run it through any conversions a server pr
 to ensure it meets latest minecraft expectations.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-index 5fc0283b2..be5f922cb 100644
+index 5fc0283b22..be5f922cb6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 @@ -295,4 +295,10 @@ public final class CraftItemFactory implements ItemFactory {
@@ -22,5 +22,5 @@ index 5fc0283b2..be5f922cb 100644
 +    // Paper end
  }
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0196-Implement-getI18NDisplayName.patch b/Spigot-Server-Patches/0195-Implement-getI18NDisplayName.patch
similarity index 96%
rename from Spigot-Server-Patches/0196-Implement-getI18NDisplayName.patch
rename to Spigot-Server-Patches/0195-Implement-getI18NDisplayName.patch
index e00a8aba22..4ecf711555 100644
--- a/Spigot-Server-Patches/0196-Implement-getI18NDisplayName.patch
+++ b/Spigot-Server-Patches/0195-Implement-getI18NDisplayName.patch
@@ -1,4 +1,4 @@
-From 70189f3c39051e0bbd3a6fd2071b6aba7f089dfd Mon Sep 17 00:00:00 2001
+From 22fb079adf1464ff5748ede042ce08d3240475d6 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
@@ -48,5 +48,5 @@ index be5f922cb6..caaed7cf0b 100644
      // Paper end
  }
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0197-GH-806-Respect-saving-disabled-before-unloading-all-.patch b/Spigot-Server-Patches/0196-GH-806-Respect-saving-disabled-before-unloading-all-.patch
similarity index 90%
rename from Spigot-Server-Patches/0197-GH-806-Respect-saving-disabled-before-unloading-all-.patch
rename to Spigot-Server-Patches/0196-GH-806-Respect-saving-disabled-before-unloading-all-.patch
index 2eb8df9214..46ad21b2ff 100644
--- a/Spigot-Server-Patches/0197-GH-806-Respect-saving-disabled-before-unloading-all-.patch
+++ b/Spigot-Server-Patches/0196-GH-806-Respect-saving-disabled-before-unloading-all-.patch
@@ -1,4 +1,4 @@
-From d295278d6afa7785d9375cb4d0598d64a8ba7f60 Mon Sep 17 00:00:00 2001
+From 57a8cb1f914f889dc4a152de16a47ee1077d1040 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
@@ -9,7 +9,7 @@ This behavior causes a save to occur even though saving was supposed to be turne
 It's triggered when Hell/End worlds are empty of players.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index cf5c76a78e..bfe2d03a57 100644
+index 7b67fa3208..395b5a470f 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -194,7 +194,7 @@ public class PlayerChunkMap {
@@ -22,5 +22,5 @@ index cf5c76a78e..bfe2d03a57 100644
              }
              } // Paper timing
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0198-ProfileWhitelistVerifyEvent.patch b/Spigot-Server-Patches/0197-ProfileWhitelistVerifyEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0198-ProfileWhitelistVerifyEvent.patch
rename to Spigot-Server-Patches/0197-ProfileWhitelistVerifyEvent.patch
index 08512ce180..9f9f7f6f1f 100644
--- a/Spigot-Server-Patches/0198-ProfileWhitelistVerifyEvent.patch
+++ b/Spigot-Server-Patches/0197-ProfileWhitelistVerifyEvent.patch
@@ -1,4 +1,4 @@
-From 3d835ae5aeb97ff76826227264621bcaf5e23c9a Mon Sep 17 00:00:00 2001
+From ad10744ac7a24fc5cb4e4341bc748f5183f3690b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 3 Jul 2017 18:11:10 -0500
 Subject: [PATCH] ProfileWhitelistVerifyEvent
@@ -48,5 +48,5 @@ index 2f2f301383..304cae655d 100644
      public boolean isOp(GameProfile gameprofile) {
          return this.operators.d(gameprofile) || this.server.H() && this.server.getWorldServer(DimensionManager.OVERWORLD).getWorldData().u() && this.server.G().equalsIgnoreCase(gameprofile.getName()) || this.u;
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0199-Fix-this-stupid-bullshit.patch b/Spigot-Server-Patches/0198-Fix-this-stupid-bullshit.patch
similarity index 94%
rename from Spigot-Server-Patches/0199-Fix-this-stupid-bullshit.patch
rename to Spigot-Server-Patches/0198-Fix-this-stupid-bullshit.patch
index 19f3cec178..7dac069766 100644
--- a/Spigot-Server-Patches/0199-Fix-this-stupid-bullshit.patch
+++ b/Spigot-Server-Patches/0198-Fix-this-stupid-bullshit.patch
@@ -1,4 +1,4 @@
-From 364af9d792a8aa71c82ac5957fb0640b44b6f3b4 Mon Sep 17 00:00:00 2001
+From bbc344016aa6a90176f32a59a3e02ddd955ee075 Mon Sep 17 00:00:00 2001
 From: DemonWav <demonwav@gmail.com>
 Date: Sun, 6 Aug 2017 17:17:53 -0500
 Subject: [PATCH] Fix this stupid bullshit
@@ -9,7 +9,7 @@ modified in order to prevent merge conflicts when Spigot changes/disables the wa
 and to provide some level of hint without being disruptive.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 393a39fad..dd0c324ce 100644
+index 393a39fadc..dd0c324ce9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -217,10 +217,12 @@ public class Main {
diff --git a/Spigot-Server-Patches/0200-Ocelot-despawns-should-honor-nametags-and-leash.patch b/Spigot-Server-Patches/0199-Ocelot-despawns-should-honor-nametags-and-leash.patch
similarity index 92%
rename from Spigot-Server-Patches/0200-Ocelot-despawns-should-honor-nametags-and-leash.patch
rename to Spigot-Server-Patches/0199-Ocelot-despawns-should-honor-nametags-and-leash.patch
index 5c700f10a1..cdf7d39db3 100644
--- a/Spigot-Server-Patches/0200-Ocelot-despawns-should-honor-nametags-and-leash.patch
+++ b/Spigot-Server-Patches/0199-Ocelot-despawns-should-honor-nametags-and-leash.patch
@@ -1,4 +1,4 @@
-From 29a61a44f7c238b2b6df9e73c97ae992b2360d3d Mon Sep 17 00:00:00 2001
+From f257ecfad1be7ef00b623cc5c857bffb10641ce4 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
@@ -18,5 +18,5 @@ index 447e6c2d12..5431ef57ab 100644
  
      protected void initAttributes() {
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0201-Reset-spawner-timer-when-spawner-event-is-cancelled.patch b/Spigot-Server-Patches/0200-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
similarity index 95%
rename from Spigot-Server-Patches/0201-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
rename to Spigot-Server-Patches/0200-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
index 92f66145b5..ec71f4050d 100644
--- a/Spigot-Server-Patches/0201-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
+++ b/Spigot-Server-Patches/0200-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
@@ -1,4 +1,4 @@
-From 149f17e8532b98f9cb33ac5061035509aa3ae066 Mon Sep 17 00:00:00 2001
+From f31a64ff44e550e0fd66df4353a422b0cd7f3387 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/0202-Fix-MC-117075-TE-Unload-Lag-Spike.patch b/Spigot-Server-Patches/0201-Fix-MC-117075-TE-Unload-Lag-Spike.patch
similarity index 95%
rename from Spigot-Server-Patches/0202-Fix-MC-117075-TE-Unload-Lag-Spike.patch
rename to Spigot-Server-Patches/0201-Fix-MC-117075-TE-Unload-Lag-Spike.patch
index 59dc0c812f..fee346d387 100644
--- a/Spigot-Server-Patches/0202-Fix-MC-117075-TE-Unload-Lag-Spike.patch
+++ b/Spigot-Server-Patches/0201-Fix-MC-117075-TE-Unload-Lag-Spike.patch
@@ -1,4 +1,4 @@
-From 98c552a3eff39286f469e94894e6464d1443a604 Mon Sep 17 00:00:00 2001
+From 05b26d3750481e193a73014ff04a7a41fdefc34c 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/0203-Allow-specifying-a-custom-authentication-servers-dow.patch b/Spigot-Server-Patches/0202-Allow-specifying-a-custom-authentication-servers-dow.patch
similarity index 94%
rename from Spigot-Server-Patches/0203-Allow-specifying-a-custom-authentication-servers-dow.patch
rename to Spigot-Server-Patches/0202-Allow-specifying-a-custom-authentication-servers-dow.patch
index 0ee667e342..5ee2c6d1b1 100644
--- a/Spigot-Server-Patches/0203-Allow-specifying-a-custom-authentication-servers-dow.patch
+++ b/Spigot-Server-Patches/0202-Allow-specifying-a-custom-authentication-servers-dow.patch
@@ -1,4 +1,4 @@
-From d84d22927da15b875881f73ea5655935c742e33b Mon Sep 17 00:00:00 2001
+From d2bb273bac11d6ccc8889aa3cfd46298d98f448e 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 5eca32c341..2f3cfd4f0a 100644
+index ccbe1482fc..8a899ed40d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -1,5 +1,6 @@
@@ -16,7 +16,7 @@ index 5eca32c341..2f3cfd4f0a 100644
  import com.google.common.base.Throwables;
  
  import java.io.File;
-@@ -285,4 +286,9 @@ public class PaperConfig {
+@@ -280,4 +281,9 @@ public class PaperConfig {
      private static void suggestPlayersWhenNull() {
          suggestPlayersWhenNullTabCompletions = getBoolean("settings.suggest-player-names-when-null-tab-completions", suggestPlayersWhenNullTabCompletions);
      }
diff --git a/Spigot-Server-Patches/0204-LivingEntity-setKiller.patch b/Spigot-Server-Patches/0203-LivingEntity-setKiller.patch
similarity index 94%
rename from Spigot-Server-Patches/0204-LivingEntity-setKiller.patch
rename to Spigot-Server-Patches/0203-LivingEntity-setKiller.patch
index 4afad96911..bec54c9d29 100644
--- a/Spigot-Server-Patches/0204-LivingEntity-setKiller.patch
+++ b/Spigot-Server-Patches/0203-LivingEntity-setKiller.patch
@@ -1,4 +1,4 @@
-From df90c74841f68a91de827cd8f7ba0de5af40e120 Mon Sep 17 00:00:00 2001
+From bdbd3ab0d4fc6b37c94e8839152eedc1266c57fe 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
@@ -26,5 +26,5 @@ index 09cf843d46..9acafadbbf 100644
          return addPotionEffect(effect, false);
      }
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0205-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch b/Spigot-Server-Patches/0204-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
similarity index 93%
rename from Spigot-Server-Patches/0205-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
rename to Spigot-Server-Patches/0204-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
index 84f9cc9f1e..20e632c2a8 100644
--- a/Spigot-Server-Patches/0205-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
+++ b/Spigot-Server-Patches/0204-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
@@ -1,4 +1,4 @@
-From 30c1b3eda760b16ae8ab175f7811c70566851fe0 Mon Sep 17 00:00:00 2001
+From 726cdd87e6633caf1acbe1d50ba6cb5b36ccf452 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Mon, 18 Sep 2017 12:00:03 +0200
 Subject: [PATCH] Use Log4j IOStreams to redirect System.out/err to logger
@@ -12,7 +12,7 @@ results in a separate line, even though it should not result in
 a line break. Log4j's implementation handles it correctly.
 
 diff --git a/pom.xml b/pom.xml
-index ced853423d..5afd16d7fe 100644
+index d93a180de9..815f9ef393 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -62,6 +62,11 @@
@@ -28,7 +28,7 @@ index ced853423d..5afd16d7fe 100644
              <groupId>org.ow2.asm</groupId>
              <artifactId>asm</artifactId>
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index fc7e244f8b..50d7ef0b2a 100644
+index 9fdb6d100b..674609cad3 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -131,8 +131,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -45,5 +45,5 @@ index fc7e244f8b..50d7ef0b2a 100644
  
          thread.setDaemon(true);
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0206-Handle-plugin-prefixes-using-Log4J-configuration.patch b/Spigot-Server-Patches/0205-Handle-plugin-prefixes-using-Log4J-configuration.patch
similarity index 97%
rename from Spigot-Server-Patches/0206-Handle-plugin-prefixes-using-Log4J-configuration.patch
rename to Spigot-Server-Patches/0205-Handle-plugin-prefixes-using-Log4J-configuration.patch
index 9c6c94a1b1..349edcfb3c 100644
--- a/Spigot-Server-Patches/0206-Handle-plugin-prefixes-using-Log4J-configuration.patch
+++ b/Spigot-Server-Patches/0205-Handle-plugin-prefixes-using-Log4J-configuration.patch
@@ -1,4 +1,4 @@
-From 850c7f08feb2fd680eecddf1f9141a34e5053130 Mon Sep 17 00:00:00 2001
+From 2a5a7c0beb6078b743b7793e181bf26d56c03ef2 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Thu, 21 Sep 2017 16:14:55 +0200
 Subject: [PATCH] Handle plugin prefixes using Log4J configuration
@@ -15,7 +15,7 @@ This may cause additional prefixes to be disabled for plugins bypassing
 the plugin logger.
 
 diff --git a/pom.xml b/pom.xml
-index 5afd16d7fe..cb42202add 100644
+index 815f9ef393..ed920ac4a0 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -60,7 +60,7 @@
@@ -70,5 +70,5 @@ index 08b6bb7f97..9f8334376f 100644
                  <TimeBasedTriggeringPolicy />
                  <OnStartupTriggeringPolicy />
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0207-Include-Log4J2-SLF4J-implementation.patch b/Spigot-Server-Patches/0206-Include-Log4J2-SLF4J-implementation.patch
similarity index 86%
rename from Spigot-Server-Patches/0207-Include-Log4J2-SLF4J-implementation.patch
rename to Spigot-Server-Patches/0206-Include-Log4J2-SLF4J-implementation.patch
index 15e88b46c8..0c420ef6f9 100644
--- a/Spigot-Server-Patches/0207-Include-Log4J2-SLF4J-implementation.patch
+++ b/Spigot-Server-Patches/0206-Include-Log4J2-SLF4J-implementation.patch
@@ -1,11 +1,11 @@
-From 7c9f61c730535ac6471b6b58014810a90ca7d12f Mon Sep 17 00:00:00 2001
+From 0d0a000ad830d232e3d984de72a359cef23ec164 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Thu, 21 Sep 2017 16:33:35 +0200
 Subject: [PATCH] Include Log4J2 SLF4J implementation
 
 
 diff --git a/pom.xml b/pom.xml
-index cb42202add..3be49ee7f4 100644
+index ed920ac4a0..b28f8e0929 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -62,6 +62,12 @@
@@ -22,5 +22,5 @@ index cb42202add..3be49ee7f4 100644
              <groupId>org.apache.logging.log4j</groupId>
              <artifactId>log4j-iostreams</artifactId>
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0208-Disable-logger-prefix-for-various-plugins-bypassing-.patch b/Spigot-Server-Patches/0207-Disable-logger-prefix-for-various-plugins-bypassing-.patch
similarity index 96%
rename from Spigot-Server-Patches/0208-Disable-logger-prefix-for-various-plugins-bypassing-.patch
rename to Spigot-Server-Patches/0207-Disable-logger-prefix-for-various-plugins-bypassing-.patch
index 059b3c3745..65fcf31a9a 100644
--- a/Spigot-Server-Patches/0208-Disable-logger-prefix-for-various-plugins-bypassing-.patch
+++ b/Spigot-Server-Patches/0207-Disable-logger-prefix-for-various-plugins-bypassing-.patch
@@ -1,4 +1,4 @@
-From d00809c9fe5610482b4737825afcf56f6d9ce5b7 Mon Sep 17 00:00:00 2001
+From 4dc90edc20b18809969db18645ee3e127a5d59b5 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
@@ -35,5 +35,5 @@ index 9f8334376f..6711e6dff9 100644
                  </LoggerNamePatternSelector>
              </PatternLayout>
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0209-Add-PlayerJumpEvent.patch b/Spigot-Server-Patches/0208-Add-PlayerJumpEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0209-Add-PlayerJumpEvent.patch
rename to Spigot-Server-Patches/0208-Add-PlayerJumpEvent.patch
index b14fc3d49d..092cd084eb 100644
--- a/Spigot-Server-Patches/0209-Add-PlayerJumpEvent.patch
+++ b/Spigot-Server-Patches/0208-Add-PlayerJumpEvent.patch
@@ -1,4 +1,4 @@
-From 11d11e3eb36a88359c91a8c569c2405f0b2e620f Mon Sep 17 00:00:00 2001
+From 82112a7b1082bc2b609c0271ad6d5c0247215721 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/0210-handle-PacketPlayInKeepAlive-async.patch b/Spigot-Server-Patches/0209-handle-PacketPlayInKeepAlive-async.patch
similarity index 97%
rename from Spigot-Server-Patches/0210-handle-PacketPlayInKeepAlive-async.patch
rename to Spigot-Server-Patches/0209-handle-PacketPlayInKeepAlive-async.patch
index e6272d9d98..b831f4bf3c 100644
--- a/Spigot-Server-Patches/0210-handle-PacketPlayInKeepAlive-async.patch
+++ b/Spigot-Server-Patches/0209-handle-PacketPlayInKeepAlive-async.patch
@@ -1,4 +1,4 @@
-From 00a785fd5b99aa73fa110a44779c77e92db675fa Mon Sep 17 00:00:00 2001
+From 6d225b736db48fea5844559db1fbfad28b97524a 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/0211-Expose-client-protocol-version-and-virtual-host.patch b/Spigot-Server-Patches/0210-Expose-client-protocol-version-and-virtual-host.patch
similarity index 98%
rename from Spigot-Server-Patches/0211-Expose-client-protocol-version-and-virtual-host.patch
rename to Spigot-Server-Patches/0210-Expose-client-protocol-version-and-virtual-host.patch
index 58250659f6..69de9d2cad 100644
--- a/Spigot-Server-Patches/0211-Expose-client-protocol-version-and-virtual-host.patch
+++ b/Spigot-Server-Patches/0210-Expose-client-protocol-version-and-virtual-host.patch
@@ -1,4 +1,4 @@
-From e4086a415045c7f86ada6a640de0b2fff40cf4f7 Mon Sep 17 00:00:00 2001
+From 433e260dac80c0e76dc65b0efc2f68313ffaca1d 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
@@ -111,7 +111,7 @@ index 7acdac55e5..f1a3be69d0 100644
          return this.a;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b3479a6194..a89fbc6027 100644
+index a045ec3b22..0d76a42997 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -176,6 +176,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -136,5 +136,5 @@ index b3479a6194..a89fbc6027 100644
      public double getEyeHeight(boolean ignorePose) {
          if (ignorePose) {
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0212-revert-serverside-behavior-of-keepalives.patch b/Spigot-Server-Patches/0211-revert-serverside-behavior-of-keepalives.patch
similarity index 97%
rename from Spigot-Server-Patches/0212-revert-serverside-behavior-of-keepalives.patch
rename to Spigot-Server-Patches/0211-revert-serverside-behavior-of-keepalives.patch
index e079aaa452..1c0bc34191 100644
--- a/Spigot-Server-Patches/0212-revert-serverside-behavior-of-keepalives.patch
+++ b/Spigot-Server-Patches/0211-revert-serverside-behavior-of-keepalives.patch
@@ -1,4 +1,4 @@
-From c0478436a87952e21925c9a7429ce1b242e7648a Mon Sep 17 00:00:00 2001
+From d8b53e37b6aa868d28f229da08cca6ed6b00f34a Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 15 Oct 2017 00:29:07 +0100
 Subject: [PATCH] revert serverside behavior of keepalives
@@ -17,7 +17,7 @@ from networking or during connections flood of chunk packets on slower clients,
  at the cost of dead connections being kept open for longer.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 66d7d76d41..5ffe4b374e 100644
+index bf2656c74f..7270638f4a 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -71,7 +71,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -74,5 +74,5 @@ index 66d7d76d41..5ffe4b374e 100644
          this.minecraftServer.methodProfiler.e();
          // CraftBukkit start
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0213-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch b/Spigot-Server-Patches/0212-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch
similarity index 95%
rename from Spigot-Server-Patches/0213-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch
rename to Spigot-Server-Patches/0212-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch
index 06dd84e39a..f3307012bc 100644
--- a/Spigot-Server-Patches/0213-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch
+++ b/Spigot-Server-Patches/0212-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch
@@ -1,4 +1,4 @@
-From 55202d86e3df4ab6373ce7a4ea747f62e9641386 Mon Sep 17 00:00:00 2001
+From 4655ad979edf64817ec2b39c74440642a7bdf9a2 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
@@ -26,5 +26,5 @@ index 80a5c29f3b..cd864c4047 100644
  
      public HashTreeSet() {
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0214-Send-attack-SoundEffects-only-to-players-who-can-see.patch b/Spigot-Server-Patches/0213-Send-attack-SoundEffects-only-to-players-who-can-see.patch
similarity index 98%
rename from Spigot-Server-Patches/0214-Send-attack-SoundEffects-only-to-players-who-can-see.patch
rename to Spigot-Server-Patches/0213-Send-attack-SoundEffects-only-to-players-who-can-see.patch
index c4cdfb241b..a890872cd8 100644
--- a/Spigot-Server-Patches/0214-Send-attack-SoundEffects-only-to-players-who-can-see.patch
+++ b/Spigot-Server-Patches/0213-Send-attack-SoundEffects-only-to-players-who-can-see.patch
@@ -1,4 +1,4 @@
-From b8dbed69eb629dc2d14c9ea39035c46a81e9922f Mon Sep 17 00:00:00 2001
+From 369644a66dc653811818e3ebfadaff639e61c91b 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/0215-Option-for-maximum-exp-value-when-merging-orbs.patch b/Spigot-Server-Patches/0214-Option-for-maximum-exp-value-when-merging-orbs.patch
similarity index 98%
rename from Spigot-Server-Patches/0215-Option-for-maximum-exp-value-when-merging-orbs.patch
rename to Spigot-Server-Patches/0214-Option-for-maximum-exp-value-when-merging-orbs.patch
index 76db8d890f..aeb77ed4c3 100644
--- a/Spigot-Server-Patches/0215-Option-for-maximum-exp-value-when-merging-orbs.patch
+++ b/Spigot-Server-Patches/0214-Option-for-maximum-exp-value-when-merging-orbs.patch
@@ -1,4 +1,4 @@
-From 6250668e0ae8f57d79ed8ab867d472112bd5fcdd Mon Sep 17 00:00:00 2001
+From 63d4774615f8b5359ee87cf4e818d01ec9ff01cc 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/0216-Add-PlayerArmorChangeEvent.patch b/Spigot-Server-Patches/0215-Add-PlayerArmorChangeEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0216-Add-PlayerArmorChangeEvent.patch
rename to Spigot-Server-Patches/0215-Add-PlayerArmorChangeEvent.patch
index 837df2bc5f..9d3362877c 100644
--- a/Spigot-Server-Patches/0216-Add-PlayerArmorChangeEvent.patch
+++ b/Spigot-Server-Patches/0215-Add-PlayerArmorChangeEvent.patch
@@ -1,11 +1,11 @@
-From 9961d657e4eccc5d31266d52f8a8d3813ba45a19 Mon Sep 17 00:00:00 2001
+From 1efe46f056352cf6f8b11b654093dda41c091ef3 Mon Sep 17 00:00:00 2001
 From: pkt77 <parkerkt77@gmail.com>
 Date: Fri, 10 Nov 2017 23:46:34 -0500
 Subject: [PATCH] Add PlayerArmorChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index b9227f7a7..f5770884b 100644
+index b9227f7a7f..f5770884b0 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1,5 +1,6 @@
@@ -30,7 +30,7 @@ index b9227f7a7..f5770884b 100644
                      if (!itemstack.isEmpty()) {
                          this.getAttributeMap().a(itemstack.a(enumitemslot));
 diff --git a/src/main/java/net/minecraft/server/EnumItemSlot.java b/src/main/java/net/minecraft/server/EnumItemSlot.java
-index a90ac68c3..49592e557 100644
+index a90ac68c30..49592e5572 100644
 --- a/src/main/java/net/minecraft/server/EnumItemSlot.java
 +++ b/src/main/java/net/minecraft/server/EnumItemSlot.java
 @@ -20,6 +20,7 @@ public enum EnumItemSlot {
diff --git a/Spigot-Server-Patches/0217-Prevent-logins-from-being-processed-when-the-player-.patch b/Spigot-Server-Patches/0216-Prevent-logins-from-being-processed-when-the-player-.patch
similarity index 93%
rename from Spigot-Server-Patches/0217-Prevent-logins-from-being-processed-when-the-player-.patch
rename to Spigot-Server-Patches/0216-Prevent-logins-from-being-processed-when-the-player-.patch
index 28209d6277..eda8d75d39 100644
--- a/Spigot-Server-Patches/0217-Prevent-logins-from-being-processed-when-the-player-.patch
+++ b/Spigot-Server-Patches/0216-Prevent-logins-from-being-processed-when-the-player-.patch
@@ -1,4 +1,4 @@
-From fe33c9b37e6c35b64499e7241d73fa376296cf38 Mon Sep 17 00:00:00 2001
+From 8ead98df2a5d9887a8ac6ac91991b6647044c009 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
@@ -23,5 +23,5 @@ index 10c82107d4..1380a14274 100644
              EntityPlayer entityplayer = this.server.getPlayerList().a(this.i.getId());
  
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0218-use-CB-BlockState-implementations-for-captured-block.patch b/Spigot-Server-Patches/0217-use-CB-BlockState-implementations-for-captured-block.patch
similarity index 96%
rename from Spigot-Server-Patches/0218-use-CB-BlockState-implementations-for-captured-block.patch
rename to Spigot-Server-Patches/0217-use-CB-BlockState-implementations-for-captured-block.patch
index fa9fe8c8c8..54941df1a4 100644
--- a/Spigot-Server-Patches/0218-use-CB-BlockState-implementations-for-captured-block.patch
+++ b/Spigot-Server-Patches/0217-use-CB-BlockState-implementations-for-captured-block.patch
@@ -1,4 +1,4 @@
-From 17ae634a0b7c6e945ce69e452e9b033913a167ea Mon Sep 17 00:00:00 2001
+From 08867a799871fa47b23557ace702cfe77f54374d 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/0219-API-to-get-a-BlockState-without-a-snapshot.patch b/Spigot-Server-Patches/0218-API-to-get-a-BlockState-without-a-snapshot.patch
similarity index 96%
rename from Spigot-Server-Patches/0219-API-to-get-a-BlockState-without-a-snapshot.patch
rename to Spigot-Server-Patches/0218-API-to-get-a-BlockState-without-a-snapshot.patch
index d788477a12..8c53a9afbb 100644
--- a/Spigot-Server-Patches/0219-API-to-get-a-BlockState-without-a-snapshot.patch
+++ b/Spigot-Server-Patches/0218-API-to-get-a-BlockState-without-a-snapshot.patch
@@ -1,4 +1,4 @@
-From cf1e2c6930915e0804226f7e3d6e067bfcb43b33 Mon Sep 17 00:00:00 2001
+From b879d5e036766ef649d560aa1cd8ce8bb27834ae Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 6 Nov 2017 21:08:22 -0500
 Subject: [PATCH] API to get a BlockState without a snapshot
@@ -13,7 +13,7 @@ also Avoid NPE during CraftBlockEntityState load if could not get TE
 If Tile Entity was null, correct Sign to return empty lines instead of null
 
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index b3c5766a2..29fe031d8 100644
+index b3c5766a27..29fe031d85 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -206,7 +206,12 @@ public abstract class TileEntity implements KeyedObject { // Paper
@@ -39,7 +39,7 @@ index b3c5766a2..29fe031d8 100644
          return null;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index 922266441..96e188b3a 100644
+index 922266441d..96e188b3ad 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -267,6 +267,20 @@ public class CraftBlock implements Block {
@@ -64,7 +64,7 @@ index 922266441..96e188b3a 100644
  
          switch (material) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
-index 0558cafe3..d4d9c5fc5 100644
+index 0558cafe31..d4d9c5fc50 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 @@ -23,20 +23,40 @@ public class CraftBlockEntityState<T extends TileEntity> extends CraftBlockState
@@ -114,7 +114,7 @@ index 0558cafe3..d4d9c5fc5 100644
  
      private T createSnapshot(T tileEntity, World world) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
-index e6f86cc4b..3a8f64360 100644
+index e6f86cc4b1..3a8f643609 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
 @@ -15,10 +15,12 @@ public class CraftSign extends CraftBlockEntityState<TileEntitySign> implements
diff --git a/Spigot-Server-Patches/0220-AsyncTabCompleteEvent.patch b/Spigot-Server-Patches/0219-AsyncTabCompleteEvent.patch
similarity index 99%
rename from Spigot-Server-Patches/0220-AsyncTabCompleteEvent.patch
rename to Spigot-Server-Patches/0219-AsyncTabCompleteEvent.patch
index ea394d2198..5e91ad604b 100644
--- a/Spigot-Server-Patches/0220-AsyncTabCompleteEvent.patch
+++ b/Spigot-Server-Patches/0219-AsyncTabCompleteEvent.patch
@@ -1,4 +1,4 @@
-From cd39f3b42d334c383b0004ff9ae4466555b0f56f Mon Sep 17 00:00:00 2001
+From 83c1d973643f20430da29f935cfb205aa377f1e4 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/0221-Avoid-NPE-in-PathfinderGoalTempt.patch b/Spigot-Server-Patches/0220-Avoid-NPE-in-PathfinderGoalTempt.patch
similarity index 92%
rename from Spigot-Server-Patches/0221-Avoid-NPE-in-PathfinderGoalTempt.patch
rename to Spigot-Server-Patches/0220-Avoid-NPE-in-PathfinderGoalTempt.patch
index c77116b347..a01d9a7577 100644
--- a/Spigot-Server-Patches/0221-Avoid-NPE-in-PathfinderGoalTempt.patch
+++ b/Spigot-Server-Patches/0220-Avoid-NPE-in-PathfinderGoalTempt.patch
@@ -1,4 +1,4 @@
-From cb4108bd19b1858eba6660560f057a2ef32ae100 Mon Sep 17 00:00:00 2001
+From ad8dc8010bcf8e45f0c22f4cdd23d18ff626f599 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
@@ -18,5 +18,5 @@ index 8ca996e652..1b82479418 100644
          }
      }
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0222-PlayerPickupExperienceEvent.patch b/Spigot-Server-Patches/0221-PlayerPickupExperienceEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0222-PlayerPickupExperienceEvent.patch
rename to Spigot-Server-Patches/0221-PlayerPickupExperienceEvent.patch
index a5a9cadf16..c368c43f81 100644
--- a/Spigot-Server-Patches/0222-PlayerPickupExperienceEvent.patch
+++ b/Spigot-Server-Patches/0221-PlayerPickupExperienceEvent.patch
@@ -1,4 +1,4 @@
-From 06ddb8c6b47ebc7894162d3ac09d7650ebfa2087 Mon Sep 17 00:00:00 2001
+From 7fb904b9bdf314922f45def951681cd51d55a8e7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 22:02:53 -0500
 Subject: [PATCH] PlayerPickupExperienceEvent
@@ -19,5 +19,5 @@ index 31c8d4bc86..dcef63bb1f 100644
                  entityhuman.receive(this, 1);
                  ItemStack itemstack = EnchantmentManager.b(Enchantments.G, (EntityLiving) entityhuman);
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0223-ExperienceOrbMergeEvent.patch b/Spigot-Server-Patches/0222-ExperienceOrbMergeEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0223-ExperienceOrbMergeEvent.patch
rename to Spigot-Server-Patches/0222-ExperienceOrbMergeEvent.patch
index 50d08cb94f..a23b155c8b 100644
--- a/Spigot-Server-Patches/0223-ExperienceOrbMergeEvent.patch
+++ b/Spigot-Server-Patches/0222-ExperienceOrbMergeEvent.patch
@@ -1,4 +1,4 @@
-From e6432da62947acb92d51fdda1b4fb4993a856afc Mon Sep 17 00:00:00 2001
+From bb231385c0c0dfc5181cc942c34aa048093247b7 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/0224-Ability-to-apply-mending-to-XP-API.patch b/Spigot-Server-Patches/0223-Ability-to-apply-mending-to-XP-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0224-Ability-to-apply-mending-to-XP-API.patch
rename to Spigot-Server-Patches/0223-Ability-to-apply-mending-to-XP-API.patch
index 46056a83c3..ea28317615 100644
--- a/Spigot-Server-Patches/0224-Ability-to-apply-mending-to-XP-API.patch
+++ b/Spigot-Server-Patches/0223-Ability-to-apply-mending-to-XP-API.patch
@@ -1,4 +1,4 @@
-From e29e1efa974cfbf93d20d5b08b5effd6fc3eb67b Mon Sep 17 00:00:00 2001
+From 7b29c313c8795d2700da25e279a9377e57a4fe86 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
@@ -52,7 +52,7 @@ index dcef63bb1f..53cfc10017 100644
          return i * 2;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 00704e4ca9..ab7fa24c3d 100644
+index 0d76a42997..1c40f17ce9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1023,8 +1023,39 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -97,5 +97,5 @@ index 00704e4ca9..ab7fa24c3d 100644
      }
  
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0225-Configurable-Chunks-Sends-per-Tick-setting.patch b/Spigot-Server-Patches/0224-Configurable-Chunks-Sends-per-Tick-setting.patch
similarity index 96%
rename from Spigot-Server-Patches/0225-Configurable-Chunks-Sends-per-Tick-setting.patch
rename to Spigot-Server-Patches/0224-Configurable-Chunks-Sends-per-Tick-setting.patch
index 8fb8a7fdc7..a2d79286a7 100644
--- a/Spigot-Server-Patches/0225-Configurable-Chunks-Sends-per-Tick-setting.patch
+++ b/Spigot-Server-Patches/0224-Configurable-Chunks-Sends-per-Tick-setting.patch
@@ -1,4 +1,4 @@
-From e88d315dc2ee779aafad735d9fbc02de3022439f Mon Sep 17 00:00:00 2001
+From cfb497b52aa5b4c3620c53fa6db506f5210a4c1f 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/0226-Configurable-Max-Chunk-Gens-per-Tick.patch b/Spigot-Server-Patches/0225-Configurable-Max-Chunk-Gens-per-Tick.patch
similarity index 97%
rename from Spigot-Server-Patches/0226-Configurable-Max-Chunk-Gens-per-Tick.patch
rename to Spigot-Server-Patches/0225-Configurable-Max-Chunk-Gens-per-Tick.patch
index 4d924bcc53..2228e695b6 100644
--- a/Spigot-Server-Patches/0226-Configurable-Max-Chunk-Gens-per-Tick.patch
+++ b/Spigot-Server-Patches/0225-Configurable-Max-Chunk-Gens-per-Tick.patch
@@ -1,4 +1,4 @@
-From 6926ca16ef7d080a1de24ee8a1226862a1d3f791 Mon Sep 17 00:00:00 2001
+From bc339909a375acc1fcb613875ca508e0ae4cfb80 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
@@ -77,10 +77,10 @@ index 54f31349e9..d1a443ca8d 100644
                      if (playerchunk1.a(flag)) {
                          iterator1.remove();
 diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
-index 9aaca21a79..f50d55c8ee 100644
+index 7ffb8f6172..33d5fc7d5e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
-@@ -35,4 +35,10 @@ public class ChunkIOExecutor {
+@@ -34,4 +34,10 @@ public class ChunkIOExecutor {
      public static void tick() {
          instance.finishActive();
      }
diff --git a/Spigot-Server-Patches/0227-Make-max-squid-spawn-height-configurable.patch b/Spigot-Server-Patches/0226-Make-max-squid-spawn-height-configurable.patch
similarity index 96%
rename from Spigot-Server-Patches/0227-Make-max-squid-spawn-height-configurable.patch
rename to Spigot-Server-Patches/0226-Make-max-squid-spawn-height-configurable.patch
index 06692acc62..a09d127c34 100644
--- a/Spigot-Server-Patches/0227-Make-max-squid-spawn-height-configurable.patch
+++ b/Spigot-Server-Patches/0226-Make-max-squid-spawn-height-configurable.patch
@@ -1,4 +1,4 @@
-From 2237c270e021b6b166f77495c0d66ef22d3ca1fa Mon Sep 17 00:00:00 2001
+From 5b13362be9a779df6b65026f72995bf5ba0a668d 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/0228-PreCreatureSpawnEvent.patch b/Spigot-Server-Patches/0227-PreCreatureSpawnEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0228-PreCreatureSpawnEvent.patch
rename to Spigot-Server-Patches/0227-PreCreatureSpawnEvent.patch
index 5be44b3314..b807a8bb56 100644
--- a/Spigot-Server-Patches/0228-PreCreatureSpawnEvent.patch
+++ b/Spigot-Server-Patches/0227-PreCreatureSpawnEvent.patch
@@ -1,4 +1,4 @@
-From 0dcf8a51fa0da99cd6365c7cd376aa77b7e3074a Mon Sep 17 00:00:00 2001
+From 50a7ddacc14cd3f3cfbdd0b9639f5575b510c846 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 14 Jan 2018 17:01:31 -0500
 Subject: [PATCH] PreCreatureSpawnEvent
@@ -15,7 +15,7 @@ instead and save a lot of server resources.
 See: https://github.com/PaperMC/Paper/issues/917
 
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index e4598d8314..6ee069cd12 100644
+index 408ef423e9..79600cd73e 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -1,6 +1,7 @@
@@ -56,7 +56,7 @@ index e4598d8314..6ee069cd12 100644
  
                      if (entity == null) {
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index f32191c5a2..4a2153b68f 100644
+index cc0a884cd3..3f6bcbbd76 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -160,10 +160,30 @@ public final class SpawnerCreature {
@@ -92,5 +92,5 @@ index f32191c5a2..4a2153b68f 100644
                                                                  entityinsentient = (EntityInsentient) biomebase_biomemeta.b.a((World) worldserver);
                                                              } catch (Exception exception) {
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0229-PlayerNaturallySpawnCreaturesEvent.patch b/Spigot-Server-Patches/0228-PlayerNaturallySpawnCreaturesEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0229-PlayerNaturallySpawnCreaturesEvent.patch
rename to Spigot-Server-Patches/0228-PlayerNaturallySpawnCreaturesEvent.patch
index c6521c457a..5ded0a6023 100644
--- a/Spigot-Server-Patches/0229-PlayerNaturallySpawnCreaturesEvent.patch
+++ b/Spigot-Server-Patches/0228-PlayerNaturallySpawnCreaturesEvent.patch
@@ -1,4 +1,4 @@
-From 653f60768615a9e92c287b1e712a3a0764b4086c Mon Sep 17 00:00:00 2001
+From 8a4ee53008156f1eaed8961fce5e60db18c6585a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 14 Jan 2018 17:36:02 -0500
 Subject: [PATCH] PlayerNaturallySpawnCreaturesEvent
@@ -9,7 +9,7 @@ from triggering monster spawns on a server.
 Also a highly more effecient way to blanket block spawns in a world
 
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index 3f6bcbbd..95d98b65 100644
+index 3f6bcbbd76..95d98b65cf 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -47,6 +47,15 @@ public final class SpawnerCreature {
@@ -29,5 +29,5 @@ index 3f6bcbbd..95d98b65 100644
                      for (int i1 = -b0; i1 <= b0; ++i1) {
                          for (k = -b0; k <= b0; ++k) {
 -- 
-2.18.0.windows.1
+2.19.0
 
diff --git a/Spigot-Server-Patches/0230-Add-setPlayerProfile-API-for-Skulls.patch b/Spigot-Server-Patches/0229-Add-setPlayerProfile-API-for-Skulls.patch
similarity index 97%
rename from Spigot-Server-Patches/0230-Add-setPlayerProfile-API-for-Skulls.patch
rename to Spigot-Server-Patches/0229-Add-setPlayerProfile-API-for-Skulls.patch
index 6a4c1b82cc..e1f256e65e 100644
--- a/Spigot-Server-Patches/0230-Add-setPlayerProfile-API-for-Skulls.patch
+++ b/Spigot-Server-Patches/0229-Add-setPlayerProfile-API-for-Skulls.patch
@@ -1,4 +1,4 @@
-From ac73630f97d04bdd4fd32912d003adfca23759d3 Mon Sep 17 00:00:00 2001
+From ff7609807c3c69ad099fb67cc7fde75494090a99 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
@@ -90,5 +90,5 @@ index 2ea2a355ba..398cf958cc 100644
      public OfflinePlayer getOwningPlayer() {
          if (hasOwner()) {
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0231-Fill-Profile-Property-Events.patch b/Spigot-Server-Patches/0230-Fill-Profile-Property-Events.patch
similarity index 96%
rename from Spigot-Server-Patches/0231-Fill-Profile-Property-Events.patch
rename to Spigot-Server-Patches/0230-Fill-Profile-Property-Events.patch
index 7bae261849..8e47c8c3cf 100644
--- a/Spigot-Server-Patches/0231-Fill-Profile-Property-Events.patch
+++ b/Spigot-Server-Patches/0230-Fill-Profile-Property-Events.patch
@@ -1,4 +1,4 @@
-From a1da3b99382c6520db7cdbc74c7e06d2cc17b26c Mon Sep 17 00:00:00 2001
+From 8ec62ae1e5fe8a645abf7703443d7fe17aa23ecc 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
@@ -38,5 +38,5 @@ index 4b2a67423f..f83aa5ef0f 100644
  
      @Override
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0232-PlayerAdvancementCriterionGrantEvent.patch b/Spigot-Server-Patches/0231-PlayerAdvancementCriterionGrantEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0232-PlayerAdvancementCriterionGrantEvent.patch
rename to Spigot-Server-Patches/0231-PlayerAdvancementCriterionGrantEvent.patch
index bd5dd9f97c..5714cfd6bb 100644
--- a/Spigot-Server-Patches/0232-PlayerAdvancementCriterionGrantEvent.patch
+++ b/Spigot-Server-Patches/0231-PlayerAdvancementCriterionGrantEvent.patch
@@ -1,4 +1,4 @@
-From 2b5a80623f9e37895b767c3b8c827c1d91edcf8d Mon Sep 17 00:00:00 2001
+From 49980e61fc954682da770bdb4ba9d78c79e8c3d1 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
@@ -22,5 +22,5 @@ index eff9589320..26eaa9be90 100644
              this.i.add(advancement);
              flag = true;
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0233-Add-ArmorStand-Item-Meta.patch b/Spigot-Server-Patches/0232-Add-ArmorStand-Item-Meta.patch
similarity index 97%
rename from Spigot-Server-Patches/0233-Add-ArmorStand-Item-Meta.patch
rename to Spigot-Server-Patches/0232-Add-ArmorStand-Item-Meta.patch
index 699385a4d1..3e2e296980 100644
--- a/Spigot-Server-Patches/0233-Add-ArmorStand-Item-Meta.patch
+++ b/Spigot-Server-Patches/0232-Add-ArmorStand-Item-Meta.patch
@@ -1,4 +1,4 @@
-From f6c8bf4768c9cd63fe5525d97e8e44ef826b8833 Mon Sep 17 00:00:00 2001
+From 3d7b2fb8559f4b7e9a77cc5bf847fbbaa018975f Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 27 Jan 2018 17:04:14 -0500
 Subject: [PATCH] Add ArmorStand Item Meta
@@ -13,7 +13,7 @@ starting point for future additions in this area.
 Fixes GH-559
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-index caaed7cf0..2672b004d 100644
+index caaed7cf0b..2672b004db 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 @@ -191,6 +191,8 @@ public final class CraftItemFactory implements ItemFactory {
@@ -26,7 +26,7 @@ index caaed7cf0..2672b004d 100644
          case CHEST:
          case TRAPPED_CHEST:
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 2733cda40..e7daa9507 100644
+index 2733cda407..e7daa95078 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -403,6 +403,8 @@ public final class CraftItemStack extends ItemStack {
@@ -40,7 +40,7 @@ index 2733cda40..e7daa9507 100644
              case TRAPPED_CHEST:
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java
 new file mode 100644
-index 000000000..0e8acf12e
+index 0000000000..0e8acf12e4
 --- /dev/null
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java
 @@ -0,0 +1,309 @@
@@ -354,7 +354,7 @@ index 000000000..0e8acf12e
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 652866881..55afe8382 100644
+index 6528668816..55afe8382c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -152,6 +152,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
@@ -383,18 +383,18 @@ index 652866881..55afe8382 100644
              }
              return HANDLED_TAGS;
 diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
-index 00f89f229..ef9d40b8a 100644
+index d4f8e8c30c..e3065bf8d6 100644
 --- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
 +++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
-@@ -6,6 +6,7 @@ import static org.hamcrest.Matchers.*;
- import java.util.ArrayList;
- import java.util.Arrays;
+@@ -8,6 +8,7 @@ import java.util.Arrays;
  import java.util.List;
+ import java.util.UUID;
+ 
 +import com.destroystokyo.paper.inventory.meta.ArmorStandMeta; // Paper
  import net.minecraft.server.Block;
  import net.minecraft.server.IRegistry;
  import net.minecraft.server.ITileEntity;
-@@ -309,7 +310,18 @@ public class ItemMetaTest extends AbstractTestingBase {
+@@ -313,7 +314,18 @@ public class ItemMetaTest extends AbstractTestingBase {
                      cleanStack.setItemMeta(meta);
                      return cleanStack;
                  }
diff --git a/Spigot-Server-Patches/0234-Extend-Player-Interact-cancellation.patch b/Spigot-Server-Patches/0233-Extend-Player-Interact-cancellation.patch
similarity index 98%
rename from Spigot-Server-Patches/0234-Extend-Player-Interact-cancellation.patch
rename to Spigot-Server-Patches/0233-Extend-Player-Interact-cancellation.patch
index 2ce34b22de..8e14724868 100644
--- a/Spigot-Server-Patches/0234-Extend-Player-Interact-cancellation.patch
+++ b/Spigot-Server-Patches/0233-Extend-Player-Interact-cancellation.patch
@@ -1,4 +1,4 @@
-From 855dba495cb16d5b707c2eb03b7a682a5e6eeae4 Mon Sep 17 00:00:00 2001
+From ec15754c56022bd014cd5c6feb1380c4fb325b18 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
@@ -55,5 +55,5 @@ index 4e44180329..cae24961fd 100644
              enuminteractionresult = (event.useItemInHand() != Event.Result.ALLOW) ? EnumInteractionResult.SUCCESS : EnumInteractionResult.PASS;
          } else if (this.gamemode == EnumGamemode.SPECTATOR) {
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0235-Tameable-getOwnerUniqueId-API.patch b/Spigot-Server-Patches/0234-Tameable-getOwnerUniqueId-API.patch
similarity index 95%
rename from Spigot-Server-Patches/0235-Tameable-getOwnerUniqueId-API.patch
rename to Spigot-Server-Patches/0234-Tameable-getOwnerUniqueId-API.patch
index c0e20210f7..384197d3b4 100644
--- a/Spigot-Server-Patches/0235-Tameable-getOwnerUniqueId-API.patch
+++ b/Spigot-Server-Patches/0234-Tameable-getOwnerUniqueId-API.patch
@@ -1,4 +1,4 @@
-From fd3d87725db3ea0854be12e875e0a8d3134d039b Mon Sep 17 00:00:00 2001
+From 5b5466728902e005d72d2f8e51d87b6973e89008 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
@@ -35,5 +35,5 @@ index eaaebeab83..2e959321b5 100644
          try {
              return getHandle().getOwnerUUID();
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0236-Toggleable-player-crits-helps-mitigate-hacked-client.patch b/Spigot-Server-Patches/0235-Toggleable-player-crits-helps-mitigate-hacked-client.patch
similarity index 96%
rename from Spigot-Server-Patches/0236-Toggleable-player-crits-helps-mitigate-hacked-client.patch
rename to Spigot-Server-Patches/0235-Toggleable-player-crits-helps-mitigate-hacked-client.patch
index 381cfbfe93..aca3715278 100644
--- a/Spigot-Server-Patches/0236-Toggleable-player-crits-helps-mitigate-hacked-client.patch
+++ b/Spigot-Server-Patches/0235-Toggleable-player-crits-helps-mitigate-hacked-client.patch
@@ -1,4 +1,4 @@
-From f4c3477e8887eb1266030b98bb9fe96f350e00cb Mon Sep 17 00:00:00 2001
+From d3908c2872249433b4ffadda9f2c35cdd851a133 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/0237-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch b/Spigot-Server-Patches/0236-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
similarity index 94%
rename from Spigot-Server-Patches/0237-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
rename to Spigot-Server-Patches/0236-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
index f8cb2c2a42..f1079ce060 100644
--- a/Spigot-Server-Patches/0237-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
+++ b/Spigot-Server-Patches/0236-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
@@ -1,4 +1,4 @@
-From 9b347d1650adeea49d1093c698f8780bc47e1134 Mon Sep 17 00:00:00 2001
+From 4d8116a77923aebfa7d45af006b2dc0c4bf9babf 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
@@ -27,5 +27,5 @@ index ac81d3f86b..f50bae0123 100644
      }
  
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0238-Prevent-Frosted-Ice-from-loading-holding-chunks.patch b/Spigot-Server-Patches/0237-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
similarity index 96%
rename from Spigot-Server-Patches/0238-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
rename to Spigot-Server-Patches/0237-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
index 86befc06c6..ce8fcbaa8b 100644
--- a/Spigot-Server-Patches/0238-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
+++ b/Spigot-Server-Patches/0237-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
@@ -1,4 +1,4 @@
-From d98a2ce8557954a8e01732faa85d2e64995de321 Mon Sep 17 00:00:00 2001
+From a545c755665ffec6dbea81ab36f0245be40806d6 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
@@ -28,5 +28,5 @@ index 7bea86f52b..ea3a6f2fb1 100644
                      if (j >= i) {
                          boolean flag = false;
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0239-Disable-Explicit-Network-Manager-Flushing.patch b/Spigot-Server-Patches/0238-Disable-Explicit-Network-Manager-Flushing.patch
similarity index 95%
rename from Spigot-Server-Patches/0239-Disable-Explicit-Network-Manager-Flushing.patch
rename to Spigot-Server-Patches/0238-Disable-Explicit-Network-Manager-Flushing.patch
index b7e5de8ed0..a9cee7e43b 100644
--- a/Spigot-Server-Patches/0239-Disable-Explicit-Network-Manager-Flushing.patch
+++ b/Spigot-Server-Patches/0238-Disable-Explicit-Network-Manager-Flushing.patch
@@ -1,4 +1,4 @@
-From 436b8ca65261831566f75fcc279c317e6544ee73 Mon Sep 17 00:00:00 2001
+From 282ddad68b63ce73482aaad7d34013853af32289 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
@@ -33,5 +33,5 @@ index 4f3f88ff66..f8facddb40 100644
  
          if (this.u++ % 20 == 0) {
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0240-Implement-extended-PaperServerListPingEvent.patch b/Spigot-Server-Patches/0239-Implement-extended-PaperServerListPingEvent.patch
similarity index 99%
rename from Spigot-Server-Patches/0240-Implement-extended-PaperServerListPingEvent.patch
rename to Spigot-Server-Patches/0239-Implement-extended-PaperServerListPingEvent.patch
index 7069eadc65..3aca179906 100644
--- a/Spigot-Server-Patches/0240-Implement-extended-PaperServerListPingEvent.patch
+++ b/Spigot-Server-Patches/0239-Implement-extended-PaperServerListPingEvent.patch
@@ -1,4 +1,4 @@
-From b8cd035f90d7ba0fdcc33d98a62cae9bfd67d8b7 Mon Sep 17 00:00:00 2001
+From 77f8535b9c4b4ef7d24b8f23cb19d68624346542 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
@@ -60,7 +60,7 @@ index 0000000000..a2a409e635
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/network/StandardPaperServerListPingEventImpl.java b/src/main/java/com/destroystokyo/paper/network/StandardPaperServerListPingEventImpl.java
 new file mode 100644
-index 0000000000..350410527b
+index 0000000000..26e3031d28
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/StandardPaperServerListPingEventImpl.java
 @@ -0,0 +1,112 @@
diff --git a/Spigot-Server-Patches/0241-Improved-Async-Task-Scheduler.patch b/Spigot-Server-Patches/0240-Improved-Async-Task-Scheduler.patch
similarity index 99%
rename from Spigot-Server-Patches/0241-Improved-Async-Task-Scheduler.patch
rename to Spigot-Server-Patches/0240-Improved-Async-Task-Scheduler.patch
index b5531192ba..986b98effb 100644
--- a/Spigot-Server-Patches/0241-Improved-Async-Task-Scheduler.patch
+++ b/Spigot-Server-Patches/0240-Improved-Async-Task-Scheduler.patch
@@ -1,4 +1,4 @@
-From ce2c24d27c8338ead4b3a78be4434229076b4fb7 Mon Sep 17 00:00:00 2001
+From a15b5ec480aba287c3bda0cd06aa871a47746471 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
@@ -387,5 +387,5 @@ index a2fadaf82c..223afc7edc 100644
  
      private boolean isReady(final int currentTick) {
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0242-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/Spigot-Server-Patches/0241-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
similarity index 97%
rename from Spigot-Server-Patches/0242-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
rename to Spigot-Server-Patches/0241-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
index 5476162b3c..9360d5a86e 100644
--- a/Spigot-Server-Patches/0242-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
+++ b/Spigot-Server-Patches/0241-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
@@ -1,4 +1,4 @@
-From 92dcfcd94c4e61d784b7d1e6289187fce514a964 Mon Sep 17 00:00:00 2001
+From 5c2d7d6ffe3b1b05b007b7e66c4b4831b8039d25 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
@@ -44,5 +44,5 @@ index 1380a14274..ab85fd9a6e 100644
                              if (PlayerPreLoginEvent.getHandlerList().getRegisteredListeners().length != 0) {
                                  final PlayerPreLoginEvent event = new PlayerPreLoginEvent(playerName, address, uniqueId);
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0243-Call-PortalCreateEvent-for-exit-portals.patch b/Spigot-Server-Patches/0242-Call-PortalCreateEvent-for-exit-portals.patch
similarity index 98%
rename from Spigot-Server-Patches/0243-Call-PortalCreateEvent-for-exit-portals.patch
rename to Spigot-Server-Patches/0242-Call-PortalCreateEvent-for-exit-portals.patch
index dcb975b81f..fb45ead775 100644
--- a/Spigot-Server-Patches/0243-Call-PortalCreateEvent-for-exit-portals.patch
+++ b/Spigot-Server-Patches/0242-Call-PortalCreateEvent-for-exit-portals.patch
@@ -1,4 +1,4 @@
-From a680e60296b2326770e73fdd619db1c3521cf12a Mon Sep 17 00:00:00 2001
+From 0c86471b4b20265927a4b60e646b6d2a8a36a167 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
@@ -104,5 +104,5 @@ index 5e899e05cf..20f2a9197c 100644
      }
  
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0244-Player.setPlayerProfile-API.patch b/Spigot-Server-Patches/0243-Player.setPlayerProfile-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0244-Player.setPlayerProfile-API.patch
rename to Spigot-Server-Patches/0243-Player.setPlayerProfile-API.patch
index b012337664..a61c79798e 100644
--- a/Spigot-Server-Patches/0244-Player.setPlayerProfile-API.patch
+++ b/Spigot-Server-Patches/0243-Player.setPlayerProfile-API.patch
@@ -1,4 +1,4 @@
-From a22b8f915d6161b62f2cd0ef43082694d971f03e Mon Sep 17 00:00:00 2001
+From 9361263d0896b5fb7e856d7db593d8109a61f696 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 18 Mar 2018 12:29:48 -0400
 Subject: [PATCH] Player.setPlayerProfile API
@@ -6,7 +6,7 @@ Subject: [PATCH] Player.setPlayerProfile API
 This can be useful for changing name or skins after a player has logged in.
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 489888a26f..a68796030d 100644
+index a728507c54..5975578b38 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -67,7 +67,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -48,7 +48,7 @@ index ab85fd9a6e..5778a5201d 100644
                              uniqueId = i.getId();
                              // Paper end
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index ab7fa24c3d..0f2550d9e9 100644
+index 1c40f17ce9..ae28723ef2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1,6 +1,8 @@
@@ -139,5 +139,5 @@ index ab7fa24c3d..0f2550d9e9 100644
      public void removeDisconnectingPlayer(Player player) {
          hiddenPlayers.remove(player.getUniqueId());
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0245-Fix-Dragon-Server-Crashes.patch b/Spigot-Server-Patches/0244-Fix-Dragon-Server-Crashes.patch
similarity index 94%
rename from Spigot-Server-Patches/0245-Fix-Dragon-Server-Crashes.patch
rename to Spigot-Server-Patches/0244-Fix-Dragon-Server-Crashes.patch
index b6c8672628..9869c3dda1 100644
--- a/Spigot-Server-Patches/0245-Fix-Dragon-Server-Crashes.patch
+++ b/Spigot-Server-Patches/0244-Fix-Dragon-Server-Crashes.patch
@@ -1,4 +1,4 @@
-From 88efcbefbf681a65f0c9a7e87669f91cdc4f85fe Mon Sep 17 00:00:00 2001
+From 1ab4d56fede934397f12f3adad702a38a51ec536 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
@@ -20,5 +20,5 @@ index da89a69ed6..45f96078c5 100644
                  blockposition$mutableblockposition.c(MathHelper.floor(d0), MathHelper.floor(d2), MathHelper.floor(d1));
              }
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0246-getPlayerUniqueId-API.patch b/Spigot-Server-Patches/0245-getPlayerUniqueId-API.patch
similarity index 94%
rename from Spigot-Server-Patches/0246-getPlayerUniqueId-API.patch
rename to Spigot-Server-Patches/0245-getPlayerUniqueId-API.patch
index bb62035e82..aabe5be75a 100644
--- a/Spigot-Server-Patches/0246-getPlayerUniqueId-API.patch
+++ b/Spigot-Server-Patches/0245-getPlayerUniqueId-API.patch
@@ -1,4 +1,4 @@
-From 0914be268df147c0e0491ee8d8d1c6c952b425f4 Mon Sep 17 00:00:00 2001
+From debc7e10b92212db182c021c52b819143e511c45 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 22 Mar 2018 01:40:24 -0400
 Subject: [PATCH] getPlayerUniqueId API
@@ -9,7 +9,7 @@ In Offline Mode, will return an Offline UUID
 This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0e582e4e5..04a76802b 100644
+index 0e582e4e5c..04a76802b8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1412,6 +1412,26 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0247-Make-player-data-saving-configurable.patch b/Spigot-Server-Patches/0246-Make-player-data-saving-configurable.patch
similarity index 92%
rename from Spigot-Server-Patches/0247-Make-player-data-saving-configurable.patch
rename to Spigot-Server-Patches/0246-Make-player-data-saving-configurable.patch
index d13faccecd..a8a72627c6 100644
--- a/Spigot-Server-Patches/0247-Make-player-data-saving-configurable.patch
+++ b/Spigot-Server-Patches/0246-Make-player-data-saving-configurable.patch
@@ -1,14 +1,14 @@
-From fb98c623a0f21ae1e65cfa621d589aaed5a0e38d Mon Sep 17 00:00:00 2001
+From 9a4c167b01c3c4a4e896574bf45366a11095644a 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 2f3cfd4f0a..97a8fb0179 100644
+index 8a899ed40d..8b347a9b47 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -291,4 +291,13 @@ public class PaperConfig {
+@@ -286,4 +286,13 @@ public class PaperConfig {
      private static void authenticationServersDownKickMessage() {
          authenticationServersDownKickMessage = Strings.emptyToNull(getString("messages.kick.authentication-servers-down", authenticationServersDownKickMessage));
      }
diff --git a/Spigot-Server-Patches/0248-Make-legacy-ping-handler-more-reliable.patch b/Spigot-Server-Patches/0247-Make-legacy-ping-handler-more-reliable.patch
similarity index 98%
rename from Spigot-Server-Patches/0248-Make-legacy-ping-handler-more-reliable.patch
rename to Spigot-Server-Patches/0247-Make-legacy-ping-handler-more-reliable.patch
index cb60e39396..7e1b860e01 100644
--- a/Spigot-Server-Patches/0248-Make-legacy-ping-handler-more-reliable.patch
+++ b/Spigot-Server-Patches/0247-Make-legacy-ping-handler-more-reliable.patch
@@ -1,4 +1,4 @@
-From 564fbb85dd3c175df607e688011c4a9dbf82c71f Mon Sep 17 00:00:00 2001
+From f1dd4093f4e8f7d7ac4e82b2eb972e830913bf95 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
@@ -167,5 +167,5 @@ index 5691d0aeaf..aafca9c9c4 100644
          channelhandlercontext.pipeline().firstContext().writeAndFlush(bytebuf).addListener(ChannelFutureListener.CLOSE);
      }
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0249-Call-PaperServerListPingEvent-for-legacy-pings.patch b/Spigot-Server-Patches/0248-Call-PaperServerListPingEvent-for-legacy-pings.patch
similarity index 99%
rename from Spigot-Server-Patches/0249-Call-PaperServerListPingEvent-for-legacy-pings.patch
rename to Spigot-Server-Patches/0248-Call-PaperServerListPingEvent-for-legacy-pings.patch
index 2c18c4b4b9..d8018c1b1a 100644
--- a/Spigot-Server-Patches/0249-Call-PaperServerListPingEvent-for-legacy-pings.patch
+++ b/Spigot-Server-Patches/0248-Call-PaperServerListPingEvent-for-legacy-pings.patch
@@ -1,4 +1,4 @@
-From ab0a6d4deff47bdb159cb413bb4d93ab3dada3de Mon Sep 17 00:00:00 2001
+From df020f38cbecc35e57d92f1a528e3456e9e0e6be 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
@@ -151,5 +151,5 @@ index aafca9c9c4..860076fc23 100644
      }
  
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0250-Flag-to-disable-the-channel-limit.patch b/Spigot-Server-Patches/0249-Flag-to-disable-the-channel-limit.patch
similarity index 94%
rename from Spigot-Server-Patches/0250-Flag-to-disable-the-channel-limit.patch
rename to Spigot-Server-Patches/0249-Flag-to-disable-the-channel-limit.patch
index fd3d012cb7..143092f1de 100644
--- a/Spigot-Server-Patches/0250-Flag-to-disable-the-channel-limit.patch
+++ b/Spigot-Server-Patches/0249-Flag-to-disable-the-channel-limit.patch
@@ -1,4 +1,4 @@
-From a6713bd18fd57bcf8ea9e3185cd84193c84f089c Mon Sep 17 00:00:00 2001
+From 8f142191160c0c153d273f2ef8056c2ede7fa78d Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 31 Mar 2018 17:04:26 +0100
 Subject: [PATCH] Flag to disable the channel limit
@@ -9,7 +9,7 @@ e.g. servers which allow and support the usage of mod packs.
 provide an optional flag to disable this check, at your own risk.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 0f2550d9e9..40b590da36 100644
+index ae28723ef2..898371e5f4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -133,6 +133,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -30,5 +30,5 @@ index 0f2550d9e9..40b590da36 100644
          if (channels.add(channel)) {
              server.getPluginManager().callEvent(new PlayerRegisterChannelEvent(this, channel));
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0251-Add-method-to-open-already-placed-sign.patch b/Spigot-Server-Patches/0250-Add-method-to-open-already-placed-sign.patch
similarity index 94%
rename from Spigot-Server-Patches/0251-Add-method-to-open-already-placed-sign.patch
rename to Spigot-Server-Patches/0250-Add-method-to-open-already-placed-sign.patch
index b21cb89b7f..6949a9015b 100644
--- a/Spigot-Server-Patches/0251-Add-method-to-open-already-placed-sign.patch
+++ b/Spigot-Server-Patches/0250-Add-method-to-open-already-placed-sign.patch
@@ -1,4 +1,4 @@
-From 8a8d56752da4de54f7753a4c88c3a082b18638e8 Mon Sep 17 00:00:00 2001
+From 26f0befa44982506a8089658de7c06d69afdc342 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
@@ -27,5 +27,5 @@ index 38a886fbd5..92fe80316f 100644
 +    // Paper end
  }
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0252-Load-version-history-at-server-start.patch b/Spigot-Server-Patches/0251-Load-version-history-at-server-start.patch
similarity index 89%
rename from Spigot-Server-Patches/0252-Load-version-history-at-server-start.patch
rename to Spigot-Server-Patches/0251-Load-version-history-at-server-start.patch
index 8d73bef560..87b6ad3692 100644
--- a/Spigot-Server-Patches/0252-Load-version-history-at-server-start.patch
+++ b/Spigot-Server-Patches/0251-Load-version-history-at-server-start.patch
@@ -1,11 +1,11 @@
-From 3c313649674cd46c02f52d3826dae55a8653d174 Mon Sep 17 00:00:00 2001
+From ddf5a46a4f3f712a6ba773d837ea86e3946ebcfd 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/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 50d7ef0b2a..c4e99ef2a9 100644
+index 674609cad3..1a332909b2 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -207,6 +207,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -17,5 +17,5 @@ index 50d7ef0b2a..c4e99ef2a9 100644
  
              DedicatedServer.LOGGER.info("Generating keypair");
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0253-Configurable-sprint-interruption-on-attack.patch b/Spigot-Server-Patches/0252-Configurable-sprint-interruption-on-attack.patch
similarity index 96%
rename from Spigot-Server-Patches/0253-Configurable-sprint-interruption-on-attack.patch
rename to Spigot-Server-Patches/0252-Configurable-sprint-interruption-on-attack.patch
index 98c46416ec..ed8c0922d0 100644
--- a/Spigot-Server-Patches/0253-Configurable-sprint-interruption-on-attack.patch
+++ b/Spigot-Server-Patches/0252-Configurable-sprint-interruption-on-attack.patch
@@ -1,4 +1,4 @@
-From 999552c8c8404d598b59e7971a400d9daee78010 Mon Sep 17 00:00:00 2001
+From b80c14207336e5a32b4693e8d6a338438c645468 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/0254-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/Spigot-Server-Patches/0253-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
similarity index 94%
rename from Spigot-Server-Patches/0254-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
rename to Spigot-Server-Patches/0253-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
index bc11ccaeec..14a3ae1719 100644
--- a/Spigot-Server-Patches/0254-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
+++ b/Spigot-Server-Patches/0253-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
@@ -1,4 +1,4 @@
-From 7df86b0c44960ab5d8d080e15b8c4b7ea4ef30e2 Mon Sep 17 00:00:00 2001
+From 56d6b35951db8bca64c6180c17622e6449451a00 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/0255-EndermanEscapeEvent.patch b/Spigot-Server-Patches/0254-EndermanEscapeEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0255-EndermanEscapeEvent.patch
rename to Spigot-Server-Patches/0254-EndermanEscapeEvent.patch
index 1eb905d579..672981c448 100644
--- a/Spigot-Server-Patches/0255-EndermanEscapeEvent.patch
+++ b/Spigot-Server-Patches/0254-EndermanEscapeEvent.patch
@@ -1,4 +1,4 @@
-From acc5da67890d22807bc408a8d5f2a67de5405423 Mon Sep 17 00:00:00 2001
+From 3497bf47db1ca5e9f50d6a7e85d66f23ed8993e5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 13:15:55 -0400
 Subject: [PATCH] EndermanEscapeEvent
@@ -78,5 +78,5 @@ index 53a3819ee4..6abe45fd6f 100644
                          }
  
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0256-Enderman.teleportRandomly.patch b/Spigot-Server-Patches/0255-Enderman.teleportRandomly.patch
similarity index 95%
rename from Spigot-Server-Patches/0256-Enderman.teleportRandomly.patch
rename to Spigot-Server-Patches/0255-Enderman.teleportRandomly.patch
index 6f5ee5e2c1..bd988d43e7 100644
--- a/Spigot-Server-Patches/0256-Enderman.teleportRandomly.patch
+++ b/Spigot-Server-Patches/0255-Enderman.teleportRandomly.patch
@@ -1,4 +1,4 @@
-From 19fb8077e8a6ee70cf6d2c6dcfb8188f1685f3c0 Mon Sep 17 00:00:00 2001
+From a5cb74203f3a80c860ee9b724f4453762b4cd83d 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()
@@ -30,5 +30,5 @@ index b81693d9ff..9bc6a6c0c1 100644
          IBlockData blockData = getHandle().getCarried();
          return (blockData == null) ? Material.AIR.getNewData((byte) 0) : CraftMagicNumbers.getMaterial(blockData);
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0257-Block-Enderpearl-Travel-Exploit.patch b/Spigot-Server-Patches/0256-Block-Enderpearl-Travel-Exploit.patch
similarity index 97%
rename from Spigot-Server-Patches/0257-Block-Enderpearl-Travel-Exploit.patch
rename to Spigot-Server-Patches/0256-Block-Enderpearl-Travel-Exploit.patch
index b0ecd2970d..0ec9290297 100644
--- a/Spigot-Server-Patches/0257-Block-Enderpearl-Travel-Exploit.patch
+++ b/Spigot-Server-Patches/0256-Block-Enderpearl-Travel-Exploit.patch
@@ -1,4 +1,4 @@
-From b4f79801103adfdc249060cff44df623f10d84a8 Mon Sep 17 00:00:00 2001
+From 9ae96a4c39cb99a121e52e6960e2fbabab6c2fdb 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/0258-Expand-World.spawnParticle-API-and-add-Builder.patch b/Spigot-Server-Patches/0257-Expand-World.spawnParticle-API-and-add-Builder.patch
similarity index 98%
rename from Spigot-Server-Patches/0258-Expand-World.spawnParticle-API-and-add-Builder.patch
rename to Spigot-Server-Patches/0257-Expand-World.spawnParticle-API-and-add-Builder.patch
index 6882245c79..82d47e7631 100644
--- a/Spigot-Server-Patches/0258-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/Spigot-Server-Patches/0257-Expand-World.spawnParticle-API-and-add-Builder.patch
@@ -1,4 +1,4 @@
-From c92db259c1e28d3e3d400b4eeb750a0264b48ed5 Mon Sep 17 00:00:00 2001
+From a23ffd467b0f0795dc00383cb888c29bf5705d7b 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/0259-EndermanAttackPlayerEvent.patch b/Spigot-Server-Patches/0258-EndermanAttackPlayerEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0259-EndermanAttackPlayerEvent.patch
rename to Spigot-Server-Patches/0258-EndermanAttackPlayerEvent.patch
index 5193f45872..263bd77036 100644
--- a/Spigot-Server-Patches/0259-EndermanAttackPlayerEvent.patch
+++ b/Spigot-Server-Patches/0258-EndermanAttackPlayerEvent.patch
@@ -1,4 +1,4 @@
-From 853662a4c7ab407b9e74850ec19a49d8a3af097a Mon Sep 17 00:00:00 2001
+From aff5cc7cd13209576268258b6b525e1cdccc6a6d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 1 May 2018 20:18:54 -0400
 Subject: [PATCH] EndermanAttackPlayerEvent
@@ -28,5 +28,5 @@ index 5f636efb0c..e5ccd29a08 100644
  
          if (itemstack.getItem() == Blocks.CARVED_PUMPKIN.getItem()) {
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0260-WitchConsumePotionEvent.patch b/Spigot-Server-Patches/0259-WitchConsumePotionEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0260-WitchConsumePotionEvent.patch
rename to Spigot-Server-Patches/0259-WitchConsumePotionEvent.patch
index c6c6a2527c..24131a9875 100644
--- a/Spigot-Server-Patches/0260-WitchConsumePotionEvent.patch
+++ b/Spigot-Server-Patches/0259-WitchConsumePotionEvent.patch
@@ -1,4 +1,4 @@
-From b56263b8818ba17436b81cd612961a25bafda079 Mon Sep 17 00:00:00 2001
+From 71636f4142f5e0cda2863895be3e6e8553da4ce5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 16 May 2018 20:35:16 -0400
 Subject: [PATCH] WitchConsumePotionEvent
@@ -23,5 +23,5 @@ index a586689acf..6717d3c331 100644
                          if (list != null) {
                              Iterator iterator = list.iterator();
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0261-WitchThrowPotionEvent.patch b/Spigot-Server-Patches/0260-WitchThrowPotionEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0261-WitchThrowPotionEvent.patch
rename to Spigot-Server-Patches/0260-WitchThrowPotionEvent.patch
index 626510589f..cdf26d634f 100644
--- a/Spigot-Server-Patches/0261-WitchThrowPotionEvent.patch
+++ b/Spigot-Server-Patches/0260-WitchThrowPotionEvent.patch
@@ -1,4 +1,4 @@
-From cb8246cce7751f17e828bd96d1a9d45fd9ad9dbf Mon Sep 17 00:00:00 2001
+From 8dc80448adf526dc7bac7e1cc73b7e0a1a5dcd7e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 16 May 2018 20:44:58 -0400
 Subject: [PATCH] WitchThrowPotionEvent
@@ -27,5 +27,5 @@ index 6717d3c331..648ed17a30 100644
              entitypotion.pitch -= -20.0F;
              entitypotion.shoot(d1, d2 + (double) (f1 * 0.2F), d3, 0.75F, 8.0F);
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0262-Allow-spawning-Item-entities-with-World.spawnEntity.patch b/Spigot-Server-Patches/0261-Allow-spawning-Item-entities-with-World.spawnEntity.patch
similarity index 95%
rename from Spigot-Server-Patches/0262-Allow-spawning-Item-entities-with-World.spawnEntity.patch
rename to Spigot-Server-Patches/0261-Allow-spawning-Item-entities-with-World.spawnEntity.patch
index b6d5d03538..2fc31ab39c 100644
--- a/Spigot-Server-Patches/0262-Allow-spawning-Item-entities-with-World.spawnEntity.patch
+++ b/Spigot-Server-Patches/0261-Allow-spawning-Item-entities-with-World.spawnEntity.patch
@@ -1,4 +1,4 @@
-From a368a9ed6908324170bfe87966b193729207fc9c Mon Sep 17 00:00:00 2001
+From 31b1e549a6c1045187e4eac2d80911f474e518ec 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/0263-Don-t-load-chunks-for-villager-door-checks.patch b/Spigot-Server-Patches/0262-Don-t-load-chunks-for-villager-door-checks.patch
similarity index 92%
rename from Spigot-Server-Patches/0263-Don-t-load-chunks-for-villager-door-checks.patch
rename to Spigot-Server-Patches/0262-Don-t-load-chunks-for-villager-door-checks.patch
index 2a723d469d..cd20fa4e3a 100644
--- a/Spigot-Server-Patches/0263-Don-t-load-chunks-for-villager-door-checks.patch
+++ b/Spigot-Server-Patches/0262-Don-t-load-chunks-for-villager-door-checks.patch
@@ -1,4 +1,4 @@
-From 38175f7ba6ffd4237efc7c3e570ea22bb8ec9d23 Mon Sep 17 00:00:00 2001
+From ce89171a068d36aadae71218295a109b6c1130c1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Jun 2018 00:32:22 -0400
 Subject: [PATCH] Don't load chunks for villager door checks
@@ -23,5 +23,5 @@ index bda67faefe..955041e266 100644
  
          return block instanceof BlockDoor ? iblockdata.getMaterial() == Material.WOOD : false;
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0264-WitchReadyPotionEvent.patch b/Spigot-Server-Patches/0263-WitchReadyPotionEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0264-WitchReadyPotionEvent.patch
rename to Spigot-Server-Patches/0263-WitchReadyPotionEvent.patch
index efde55a520..6d459a1e93 100644
--- a/Spigot-Server-Patches/0264-WitchReadyPotionEvent.patch
+++ b/Spigot-Server-Patches/0263-WitchReadyPotionEvent.patch
@@ -1,4 +1,4 @@
-From e5b323663792e28b7436a7459ebb8fd7a807087f Mon Sep 17 00:00:00 2001
+From 7496a676d263099984ccca8829033c95ba113bda Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Jun 2018 22:47:26 -0400
 Subject: [PATCH] WitchReadyPotionEvent
@@ -22,5 +22,5 @@ index 648ed17a30..b5f676f045 100644
                      this.a(true);
                      this.world.a((EntityHuman) null, this.locX, this.locY, this.locZ, SoundEffects.ENTITY_WITCH_DRINK, this.bV(), 1.0F, 0.8F + this.random.nextFloat() * 0.4F);
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0265-ItemStack-getMaxItemUseDuration.patch b/Spigot-Server-Patches/0264-ItemStack-getMaxItemUseDuration.patch
similarity index 93%
rename from Spigot-Server-Patches/0265-ItemStack-getMaxItemUseDuration.patch
rename to Spigot-Server-Patches/0264-ItemStack-getMaxItemUseDuration.patch
index 1d34c17396..73f8610754 100644
--- a/Spigot-Server-Patches/0265-ItemStack-getMaxItemUseDuration.patch
+++ b/Spigot-Server-Patches/0264-ItemStack-getMaxItemUseDuration.patch
@@ -1,4 +1,4 @@
-From 286a5c3fbb41a4f0c602944c4c3087d4fc0065eb Mon Sep 17 00:00:00 2001
+From 78a35f7fe1d4c9611112459347dc0c083fba77a7 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
@@ -18,7 +18,7 @@ index f71d9ee578..a238388012 100644
          return this.getItem().c(this);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index bdd4bf5151..911463f5b2 100644
+index e7daa95078..d6e6b9bed4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -183,6 +183,13 @@ public final class CraftItemStack extends ItemStack {
@@ -36,5 +36,5 @@ index bdd4bf5151..911463f5b2 100644
      public void addUnsafeEnchantment(Enchantment ench, int level) {
          Validate.notNull(ench, "Cannot add null enchantment");
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0266-Implement-EntityTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/0265-Implement-EntityTeleportEndGatewayEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0266-Implement-EntityTeleportEndGatewayEvent.patch
rename to Spigot-Server-Patches/0265-Implement-EntityTeleportEndGatewayEvent.patch
index 692428e498..da5a1a534f 100644
--- a/Spigot-Server-Patches/0266-Implement-EntityTeleportEndGatewayEvent.patch
+++ b/Spigot-Server-Patches/0265-Implement-EntityTeleportEndGatewayEvent.patch
@@ -1,4 +1,4 @@
-From 90a35f26fc719b3fb0debe1d9718e82618304e46 Mon Sep 17 00:00:00 2001
+From 6497f7f23c35b54e1f661288a8fede7b5bcbf627 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
@@ -30,5 +30,5 @@ index b36dcb4d7d..268e4996bc 100644
  
              this.f();
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0267-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/Spigot-Server-Patches/0266-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
similarity index 95%
rename from Spigot-Server-Patches/0267-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
rename to Spigot-Server-Patches/0266-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
index dac08ab006..5a4ab2a064 100644
--- a/Spigot-Server-Patches/0267-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
+++ b/Spigot-Server-Patches/0266-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
@@ -1,4 +1,4 @@
-From 1f2c5cbbaf468db65d948aff8e0e0332add1a15d Mon Sep 17 00:00:00 2001
+From af4fe660fff1c67b0f4e981fbf414ebe5cbe367a 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
@@ -27,5 +27,5 @@ index 765123e3d2..19022b6e24 100644
              // CraftBukkit end
          }
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0268-Properly-remove-entities-on-dimension-teleport.patch b/Spigot-Server-Patches/0267-Properly-remove-entities-on-dimension-teleport.patch
similarity index 97%
rename from Spigot-Server-Patches/0268-Properly-remove-entities-on-dimension-teleport.patch
rename to Spigot-Server-Patches/0267-Properly-remove-entities-on-dimension-teleport.patch
index 1923d171c8..08b1c49d48 100644
--- a/Spigot-Server-Patches/0268-Properly-remove-entities-on-dimension-teleport.patch
+++ b/Spigot-Server-Patches/0267-Properly-remove-entities-on-dimension-teleport.patch
@@ -1,4 +1,4 @@
-From 9dbe03fbbbdd8e2474e9f3d4ffc0b9852cf4af53 Mon Sep 17 00:00:00 2001
+From c1ad42c1320658298476c0e0e18d7a43a9d8d3e1 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/0269-Fix-CraftEntity-hashCode.patch b/Spigot-Server-Patches/0268-Fix-CraftEntity-hashCode.patch
similarity index 96%
rename from Spigot-Server-Patches/0269-Fix-CraftEntity-hashCode.patch
rename to Spigot-Server-Patches/0268-Fix-CraftEntity-hashCode.patch
index 3b1ff27765..47776fb6ae 100644
--- a/Spigot-Server-Patches/0269-Fix-CraftEntity-hashCode.patch
+++ b/Spigot-Server-Patches/0268-Fix-CraftEntity-hashCode.patch
@@ -1,4 +1,4 @@
-From 49ddbf67c65ec58929bec051da47234e55e647ee Mon Sep 17 00:00:00 2001
+From 19e865b18de274d752ba9aeed4920baacdf33edd 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
@@ -45,5 +45,5 @@ index 4e818198b2..f4af6ea034 100644
  
      public void setMetadata(String metadataKey, MetadataValue newMetadataValue) {
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0270-Configurable-Alternative-LootPool-Luck-Formula.patch b/Spigot-Server-Patches/0269-Configurable-Alternative-LootPool-Luck-Formula.patch
similarity index 96%
rename from Spigot-Server-Patches/0270-Configurable-Alternative-LootPool-Luck-Formula.patch
rename to Spigot-Server-Patches/0269-Configurable-Alternative-LootPool-Luck-Formula.patch
index 6056191e2f..71b657d086 100644
--- a/Spigot-Server-Patches/0270-Configurable-Alternative-LootPool-Luck-Formula.patch
+++ b/Spigot-Server-Patches/0269-Configurable-Alternative-LootPool-Luck-Formula.patch
@@ -1,4 +1,4 @@
-From 437422d05c2c0b4b5be73a645446885b6eeddbba Mon Sep 17 00:00:00 2001
+From 6695076172d9271b952a86b997fa1e38a9c6449d 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,10 +36,10 @@ 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 97a8fb0179..72602be58a 100644
+index 8b347a9b47..ad031dedaa 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -300,4 +300,12 @@ public class PaperConfig {
+@@ -295,4 +295,12 @@ public class PaperConfig {
                      "such as inventories, experience points, advancements and the like will not be saved when they log out.");
          }
      }
diff --git a/Spigot-Server-Patches/0271-Print-Error-details-when-failing-to-save-player-data.patch b/Spigot-Server-Patches/0270-Print-Error-details-when-failing-to-save-player-data.patch
similarity index 92%
rename from Spigot-Server-Patches/0271-Print-Error-details-when-failing-to-save-player-data.patch
rename to Spigot-Server-Patches/0270-Print-Error-details-when-failing-to-save-player-data.patch
index 5cd1f64882..a55ebf5c32 100644
--- a/Spigot-Server-Patches/0271-Print-Error-details-when-failing-to-save-player-data.patch
+++ b/Spigot-Server-Patches/0270-Print-Error-details-when-failing-to-save-player-data.patch
@@ -1,4 +1,4 @@
-From 21d732869ca78a2868f964c18b9c6c88ea341e22 Mon Sep 17 00:00:00 2001
+From d294980e5507132eb6fe8de464f4f3556309f2eb 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
@@ -18,5 +18,5 @@ index 7553280d21..ab085788ab 100644
  
      }
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0272-Make-shield-blocking-delay-configurable.patch b/Spigot-Server-Patches/0271-Make-shield-blocking-delay-configurable.patch
similarity index 97%
rename from Spigot-Server-Patches/0272-Make-shield-blocking-delay-configurable.patch
rename to Spigot-Server-Patches/0271-Make-shield-blocking-delay-configurable.patch
index ed15109dd5..a1b3237e26 100644
--- a/Spigot-Server-Patches/0272-Make-shield-blocking-delay-configurable.patch
+++ b/Spigot-Server-Patches/0271-Make-shield-blocking-delay-configurable.patch
@@ -1,4 +1,4 @@
-From adb49645962ea1ad73a35f7ee0d120f929af05d5 Mon Sep 17 00:00:00 2001
+From c78f97b134af174507a4cb659970615d89100000 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/0273-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch b/Spigot-Server-Patches/0272-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
similarity index 95%
rename from Spigot-Server-Patches/0273-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
rename to Spigot-Server-Patches/0272-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
index 54d5d7e7d7..f64d4c7993 100644
--- a/Spigot-Server-Patches/0273-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
+++ b/Spigot-Server-Patches/0272-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
@@ -1,4 +1,4 @@
-From a1d6c6d4804c230258877a959278864f477778a6 Mon Sep 17 00:00:00 2001
+From 67fc38f3cdd7827e2bca2f4651cb41f7c35bdb2a 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
@@ -32,5 +32,5 @@ index b0c726be19..34e34b7855 100644
          }
  
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0274-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch b/Spigot-Server-Patches/0273-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
similarity index 96%
rename from Spigot-Server-Patches/0274-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
rename to Spigot-Server-Patches/0273-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
index 94b7e98b67..6a6c228d6a 100644
--- a/Spigot-Server-Patches/0274-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
+++ b/Spigot-Server-Patches/0273-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
@@ -1,4 +1,4 @@
-From 47c73c9e33d7ccabf5347e95f0b392c2bea6711b Mon Sep 17 00:00:00 2001
+From 629fa443244a41e1a71c7dcda35984b9d751fade Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 15 Jun 2013 19:51:17 -0400
 Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API
@@ -6,7 +6,7 @@ Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API
 Adds ability to get what arrow was shot, and control if it should be consumed.
 
 diff --git a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
-index c2bc8060a..1ae967d1c 100644
+index c2bc8060ac..1ae967d1c0 100644
 --- a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
 @@ -160,7 +160,7 @@ public abstract class EntitySkeletonAbstract extends EntityMonster implements IR
@@ -19,7 +19,7 @@ index c2bc8060a..1ae967d1c 100644
              event.getProjectile().remove();
              return;
 diff --git a/src/main/java/net/minecraft/server/ItemBow.java b/src/main/java/net/minecraft/server/ItemBow.java
-index b0f7649b8..152b179ce 100644
+index b0f7649b82..152b179ce1 100644
 --- a/src/main/java/net/minecraft/server/ItemBow.java
 +++ b/src/main/java/net/minecraft/server/ItemBow.java
 @@ -57,6 +57,7 @@ public class ItemBow extends Item {
@@ -58,7 +58,7 @@ index b0f7649b8..152b179ce 100644
                          if (itemstack1.isEmpty()) {
                              entityhuman.inventory.f(itemstack1);
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 307b59a27..8295a4c7a 100644
+index 307b59a27d..8295a4c7ae 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -245,7 +245,7 @@ public class CraftEventFactory {
diff --git a/Spigot-Server-Patches/0275-PlayerReadyArrowEvent.patch b/Spigot-Server-Patches/0274-PlayerReadyArrowEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0275-PlayerReadyArrowEvent.patch
rename to Spigot-Server-Patches/0274-PlayerReadyArrowEvent.patch
index 16e33365ab..6e4b97ea1b 100644
--- a/Spigot-Server-Patches/0275-PlayerReadyArrowEvent.patch
+++ b/Spigot-Server-Patches/0274-PlayerReadyArrowEvent.patch
@@ -1,4 +1,4 @@
-From cb33bee0e51b3f4066989130030a6fba79ad29ea Mon Sep 17 00:00:00 2001
+From e19c8c0bd3024b5c1abd42fe1ffb4468be4a8f6e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 18 Jun 2018 01:12:53 -0400
 Subject: [PATCH] PlayerReadyArrowEvent
@@ -75,5 +75,5 @@ index 152b179ce1..797e9ecf11 100644
          if (!entityhuman.abilities.canInstantlyBuild && !flag) {
              return flag ? new InteractionResultWrapper(EnumInteractionResult.PASS, itemstack) : new InteractionResultWrapper(EnumInteractionResult.FAIL, itemstack);
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0276-Fire-EntityShootBowEvent-for-Illusioner.patch b/Spigot-Server-Patches/0275-Fire-EntityShootBowEvent-for-Illusioner.patch
similarity index 95%
rename from Spigot-Server-Patches/0276-Fire-EntityShootBowEvent-for-Illusioner.patch
rename to Spigot-Server-Patches/0275-Fire-EntityShootBowEvent-for-Illusioner.patch
index 5ab3019b27..4811d320a9 100644
--- a/Spigot-Server-Patches/0276-Fire-EntityShootBowEvent-for-Illusioner.patch
+++ b/Spigot-Server-Patches/0275-Fire-EntityShootBowEvent-for-Illusioner.patch
@@ -1,4 +1,4 @@
-From dcf9d1e286718c711e03027623ee7cbcc3e64bc9 Mon Sep 17 00:00:00 2001
+From f32e563368a157390e9f434cf4d12bae9c1a4f78 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
@@ -29,5 +29,5 @@ index 54c7c95a3b..6db21668d4 100644
  
      protected EntityArrow v(float f) {
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0277-Implement-EntityKnockbackByEntityEvent.patch b/Spigot-Server-Patches/0276-Implement-EntityKnockbackByEntityEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0277-Implement-EntityKnockbackByEntityEvent.patch
rename to Spigot-Server-Patches/0276-Implement-EntityKnockbackByEntityEvent.patch
index 6a8e7b2559..129814c48c 100644
--- a/Spigot-Server-Patches/0277-Implement-EntityKnockbackByEntityEvent.patch
+++ b/Spigot-Server-Patches/0276-Implement-EntityKnockbackByEntityEvent.patch
@@ -1,4 +1,4 @@
-From d5bf06fc14a67c67a4b226f8e4725e29277c71ee Mon Sep 17 00:00:00 2001
+From b6869d7ec0479144f05aaf16ffed7ce74ffbc2d4 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Mon, 18 Jun 2018 15:46:23 +0200
 Subject: [PATCH] Implement EntityKnockbackByEntityEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement EntityKnockbackByEntityEvent
 This event is called when an entity receives knockback by another entity.
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index ef1a1e5790..9f0bc5a8e2 100644
+index 566f6e3a6a..a8f58a13fe 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1251,6 +1251,12 @@ public abstract class EntityLiving extends Entity {
@@ -42,5 +42,5 @@ index ef1a1e5790..9f0bc5a8e2 100644
      }
  
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0278-Expand-Explosions-API.patch b/Spigot-Server-Patches/0277-Expand-Explosions-API.patch
similarity index 95%
rename from Spigot-Server-Patches/0278-Expand-Explosions-API.patch
rename to Spigot-Server-Patches/0277-Expand-Explosions-API.patch
index c04d2e06c0..221b688248 100644
--- a/Spigot-Server-Patches/0278-Expand-Explosions-API.patch
+++ b/Spigot-Server-Patches/0277-Expand-Explosions-API.patch
@@ -1,4 +1,4 @@
-From 0ef3c404c567a437f2d54e5eb318a18b40f9d6e0 Mon Sep 17 00:00:00 2001
+From 2604ca02a5b5d941671a6e3c1497e966fa04294c 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/0279-LivingEntity-Hand-Raised-Item-Use-API.patch b/Spigot-Server-Patches/0278-LivingEntity-Hand-Raised-Item-Use-API.patch
similarity index 94%
rename from Spigot-Server-Patches/0279-LivingEntity-Hand-Raised-Item-Use-API.patch
rename to Spigot-Server-Patches/0278-LivingEntity-Hand-Raised-Item-Use-API.patch
index d314cb978b..d28f94c824 100644
--- a/Spigot-Server-Patches/0279-LivingEntity-Hand-Raised-Item-Use-API.patch
+++ b/Spigot-Server-Patches/0278-LivingEntity-Hand-Raised-Item-Use-API.patch
@@ -1,4 +1,4 @@
-From d0f62979bd534c691c6c0f9f7f29763881499a01 Mon Sep 17 00:00:00 2001
+From b952f295cbf428f7d024c1b378bd11e4d2292f9b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 29 Jun 2018 00:21:28 -0400
 Subject: [PATCH] LivingEntity Hand Raised/Item Use API
@@ -6,7 +6,7 @@ Subject: [PATCH] LivingEntity Hand Raised/Item Use API
 How long an entity has raised hands to charge an attack or use an item
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index a8f58a13f..c051200da 100644
+index a8f58a13fe..c051200da8 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -106,7 +106,7 @@ public abstract class EntityLiving extends Entity {
@@ -32,7 +32,7 @@ index a8f58a13f..c051200da 100644
          return this.isHandRaised() ? this.activeItem.k() - this.cX() : 0;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index a09cd0240..0860f2334 100644
+index a09cd02403..0860f2334d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -543,5 +543,25 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/Spigot-Server-Patches/0280-RangedEntity-API.patch b/Spigot-Server-Patches/0279-RangedEntity-API.patch
similarity index 99%
rename from Spigot-Server-Patches/0280-RangedEntity-API.patch
rename to Spigot-Server-Patches/0279-RangedEntity-API.patch
index 91823596b3..347ddb53a0 100644
--- a/Spigot-Server-Patches/0280-RangedEntity-API.patch
+++ b/Spigot-Server-Patches/0279-RangedEntity-API.patch
@@ -1,4 +1,4 @@
-From e95d340b6ab3c78e0aed42b131e18b1c7b262766 Mon Sep 17 00:00:00 2001
+From cd9a6e0e7c1860d07d33c2aa6f82a1e22b1f405f 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
@@ -157,5 +157,5 @@ index fad3db8af8..b9bb3a0d1b 100644
          super(server, entity);
      }
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0281-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch b/Spigot-Server-Patches/0280-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch
similarity index 92%
rename from Spigot-Server-Patches/0281-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch
rename to Spigot-Server-Patches/0280-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch
index e2ddf709bf..4e8c1b3a47 100644
--- a/Spigot-Server-Patches/0281-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch
+++ b/Spigot-Server-Patches/0280-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch
@@ -1,4 +1,4 @@
-From 0f0fd7a9745f505cd9bc4bc85ae658de25b33581 Mon Sep 17 00:00:00 2001
+From ca3afa9578f4a8347e8e30b85b11e9b426518f43 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Improve ProjectileHitEvent to include the BlockFace where the
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 8295a4c7a..29d8773f2 100644
+index 8295a4c7ae..29d8773f2e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -839,7 +839,7 @@ public class CraftEventFactory {
diff --git a/Spigot-Server-Patches/0282-Add-config-to-disable-ender-dragon-legacy-check.patch b/Spigot-Server-Patches/0281-Add-config-to-disable-ender-dragon-legacy-check.patch
similarity index 97%
rename from Spigot-Server-Patches/0282-Add-config-to-disable-ender-dragon-legacy-check.patch
rename to Spigot-Server-Patches/0281-Add-config-to-disable-ender-dragon-legacy-check.patch
index f8c3106b51..d0c584750c 100644
--- a/Spigot-Server-Patches/0282-Add-config-to-disable-ender-dragon-legacy-check.patch
+++ b/Spigot-Server-Patches/0281-Add-config-to-disable-ender-dragon-legacy-check.patch
@@ -1,4 +1,4 @@
-From d7c4de3a1d800bef9dd9fdb6e69599bb48317825 Mon Sep 17 00:00:00 2001
+From 8569f8f147058e487d661fa5a4daae699a155bcd 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/0283-Implement-World.getEntity-UUID-API.patch b/Spigot-Server-Patches/0282-Implement-World.getEntity-UUID-API.patch
similarity index 93%
rename from Spigot-Server-Patches/0283-Implement-World.getEntity-UUID-API.patch
rename to Spigot-Server-Patches/0282-Implement-World.getEntity-UUID-API.patch
index 57058a20e3..e7cb585fc7 100644
--- a/Spigot-Server-Patches/0283-Implement-World.getEntity-UUID-API.patch
+++ b/Spigot-Server-Patches/0282-Implement-World.getEntity-UUID-API.patch
@@ -1,4 +1,4 @@
-From 67453c9fb500929405b644d43da1bbff6528a928 Mon Sep 17 00:00:00 2001
+From 6fb6eaa3ed3eec1ca82a483f94c033416632b0c4 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/0284-InventoryCloseEvent-Reason-API.patch b/Spigot-Server-Patches/0283-InventoryCloseEvent-Reason-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0284-InventoryCloseEvent-Reason-API.patch
rename to Spigot-Server-Patches/0283-InventoryCloseEvent-Reason-API.patch
index 237113a1af..3ce1a906bf 100644
--- a/Spigot-Server-Patches/0284-InventoryCloseEvent-Reason-API.patch
+++ b/Spigot-Server-Patches/0283-InventoryCloseEvent-Reason-API.patch
@@ -1,4 +1,4 @@
-From 94a46fefc0d5a307953ae1c8b73a174484981330 Mon Sep 17 00:00:00 2001
+From 004b2a8aaf9d8905410907b4ab247ddeb159ac92 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,10 +7,10 @@ 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 a8705776a6..36f4231427 100644
+index 175a20e43c..9ba489f356 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
-@@ -906,7 +906,7 @@ public class Chunk implements IChunkAccess {
+@@ -931,7 +931,7 @@ public class Chunk implements IChunkAccess {
                  {
                      if ( h instanceof org.bukkit.craftbukkit.entity.CraftHumanEntity )
                      {
@@ -19,7 +19,7 @@ index a8705776a6..36f4231427 100644
                      }
                  }
              }
-@@ -931,7 +931,7 @@ public class Chunk implements IChunkAccess {
+@@ -956,7 +956,7 @@ public class Chunk implements IChunkAccess {
                      {
                          if ( h instanceof org.bukkit.craftbukkit.entity.CraftHumanEntity )
                          {
@@ -155,7 +155,7 @@ index 92fe80316f..70a4dbe26b 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 40b590da36..f372f19dec 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 {
diff --git a/Spigot-Server-Patches/0285-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch b/Spigot-Server-Patches/0284-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
similarity index 97%
rename from Spigot-Server-Patches/0285-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
rename to Spigot-Server-Patches/0284-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
index 4729f86351..7f50f4e9ee 100644
--- a/Spigot-Server-Patches/0285-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
+++ b/Spigot-Server-Patches/0284-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
@@ -1,4 +1,4 @@
-From e9cd3efda6cfbe48f2c343c4efbd63bb2fdfa894 Mon Sep 17 00:00:00 2001
+From 583609632906eff38271b61b6a7d080fae31b478 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 9f2a08b03d..0dab65c870 100644
+index 9ba489f356..321837811e 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/0286-Configurable-Bed-Search-Radius.patch b/Spigot-Server-Patches/0285-Configurable-Bed-Search-Radius.patch
similarity index 98%
rename from Spigot-Server-Patches/0286-Configurable-Bed-Search-Radius.patch
rename to Spigot-Server-Patches/0285-Configurable-Bed-Search-Radius.patch
index 22cb0483a8..46f7000cf1 100644
--- a/Spigot-Server-Patches/0286-Configurable-Bed-Search-Radius.patch
+++ b/Spigot-Server-Patches/0285-Configurable-Bed-Search-Radius.patch
@@ -1,4 +1,4 @@
-From 23183906000064c2de97bdb7c29fc757372770ff Mon Sep 17 00:00:00 2001
+From b02b8e33cdaf1d11a1a89f8c515cb4cdd8bddea8 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/0287-Vex-getSummoner-API.patch b/Spigot-Server-Patches/0286-Vex-getSummoner-API.patch
similarity index 95%
rename from Spigot-Server-Patches/0287-Vex-getSummoner-API.patch
rename to Spigot-Server-Patches/0286-Vex-getSummoner-API.patch
index 138eec7171..5c314d295c 100644
--- a/Spigot-Server-Patches/0287-Vex-getSummoner-API.patch
+++ b/Spigot-Server-Patches/0286-Vex-getSummoner-API.patch
@@ -1,4 +1,4 @@
-From c4ca9f930e0b992c6c92ae7ec4c48c83e1a03894 Mon Sep 17 00:00:00 2001
+From 051fb03eeb07f62c0a96d6c6c1741576a0073e82 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
@@ -47,5 +47,5 @@ index 787a41e015..927ed9a9a8 100644
      public String toString() {
          return "CraftVex";
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0288-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/Spigot-Server-Patches/0287-Refresh-player-inventory-when-cancelling-PlayerInter.patch
similarity index 95%
rename from Spigot-Server-Patches/0288-Refresh-player-inventory-when-cancelling-PlayerInter.patch
rename to Spigot-Server-Patches/0287-Refresh-player-inventory-when-cancelling-PlayerInter.patch
index c7e44ff9f3..66236e5d0d 100644
--- a/Spigot-Server-Patches/0288-Refresh-player-inventory-when-cancelling-PlayerInter.patch
+++ b/Spigot-Server-Patches/0287-Refresh-player-inventory-when-cancelling-PlayerInter.patch
@@ -1,4 +1,4 @@
-From 3f1126300352795e952d6784a67e50ea1e18b456 Mon Sep 17 00:00:00 2001
+From ba1cb9f73490d3b1d748e8ecd40c5ddc54a8b271 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/0289-Don-t-change-the-Entity-Random-seed-for-squids.patch b/Spigot-Server-Patches/0288-Don-t-change-the-Entity-Random-seed-for-squids.patch
similarity index 91%
rename from Spigot-Server-Patches/0289-Don-t-change-the-Entity-Random-seed-for-squids.patch
rename to Spigot-Server-Patches/0288-Don-t-change-the-Entity-Random-seed-for-squids.patch
index 36f30f7672..39f8be1b2a 100644
--- a/Spigot-Server-Patches/0289-Don-t-change-the-Entity-Random-seed-for-squids.patch
+++ b/Spigot-Server-Patches/0288-Don-t-change-the-Entity-Random-seed-for-squids.patch
@@ -1,4 +1,4 @@
-From e529a591e153fd45fdf6fed065a2ed03f6a93d44 Mon Sep 17 00:00:00 2001
+From d16c6f5c1f93734f221c943a494052986672bd60 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
@@ -18,5 +18,5 @@ index 2dfa794a3f..522ce36cba 100644
      }
  
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0290-Re-add-vanilla-entity-warnings-for-duplicates.patch b/Spigot-Server-Patches/0289-Re-add-vanilla-entity-warnings-for-duplicates.patch
similarity index 94%
rename from Spigot-Server-Patches/0290-Re-add-vanilla-entity-warnings-for-duplicates.patch
rename to Spigot-Server-Patches/0289-Re-add-vanilla-entity-warnings-for-duplicates.patch
index e936fb5ba0..3b60c6f457 100644
--- a/Spigot-Server-Patches/0290-Re-add-vanilla-entity-warnings-for-duplicates.patch
+++ b/Spigot-Server-Patches/0289-Re-add-vanilla-entity-warnings-for-duplicates.patch
@@ -1,4 +1,4 @@
-From 546db42ce5fc34676e0c072fb35b879d2b6b9791 Mon Sep 17 00:00:00 2001
+From 6a67fa1b1d88393b696722bcc806fb6c8c0feeb3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 19 Jul 2018 01:08:05 -0400
 Subject: [PATCH] Re-add vanilla entity warnings for duplicates
@@ -8,7 +8,7 @@ These are a critical sign that somethin went wrong, and you've lost some data...
 We should kind of know about these things you know.
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 3b3ace52b0..6987d9423c 100644
+index b939c31b23..b76b8dbf5d 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -974,7 +974,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -31,5 +31,5 @@ index 3b3ace52b0..6987d9423c 100644
                      }
  
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0291-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch b/Spigot-Server-Patches/0290-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch
similarity index 94%
rename from Spigot-Server-Patches/0291-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch
rename to Spigot-Server-Patches/0290-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch
index 96f9884462..160b303c5b 100644
--- a/Spigot-Server-Patches/0291-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch
+++ b/Spigot-Server-Patches/0290-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch
@@ -1,4 +1,4 @@
-From 2bdea8b9e4d2c2450e2a4fe8e414764dcb9266cf Mon Sep 17 00:00:00 2001
+From 39348ad7fde2ce97d3e9f9d59325f5bee42595dd 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
@@ -25,5 +25,5 @@ index 04a1218ed9..141db48f16 100644
  
              if (entityhuman != null && entityhuman.affectsSpawning) { // Paper - Affects Spawning API
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0292-Avoid-item-merge-if-stack-size-above-max-stack-size.patch b/Spigot-Server-Patches/0291-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
similarity index 92%
rename from Spigot-Server-Patches/0292-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
rename to Spigot-Server-Patches/0291-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
index 2d79068222..0e12e1edeb 100644
--- a/Spigot-Server-Patches/0292-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
+++ b/Spigot-Server-Patches/0291-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
@@ -1,4 +1,4 @@
-From be48296836606dd109f71db805c9389d0c27268b Mon Sep 17 00:00:00 2001
+From 2ec58768016b4ff5934e282d8077d23c7b47c4d4 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
@@ -20,5 +20,5 @@ index 946e59753e..f596b4351b 100644
          double radius = world.spigotConfig.itemMerge;
          Iterator iterator = this.world.a(EntityItem.class, this.getBoundingBox().grow(radius, radius, radius)).iterator();
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0293-Use-asynchronous-Log4j-2-loggers.patch b/Spigot-Server-Patches/0292-Use-asynchronous-Log4j-2-loggers.patch
similarity index 90%
rename from Spigot-Server-Patches/0293-Use-asynchronous-Log4j-2-loggers.patch
rename to Spigot-Server-Patches/0292-Use-asynchronous-Log4j-2-loggers.patch
index 84eda8594c..79e68baa14 100644
--- a/Spigot-Server-Patches/0293-Use-asynchronous-Log4j-2-loggers.patch
+++ b/Spigot-Server-Patches/0292-Use-asynchronous-Log4j-2-loggers.patch
@@ -1,11 +1,11 @@
-From f167d9d6bdf144edbae9b3349e1a774dc7328410 Mon Sep 17 00:00:00 2001
+From 8b890db5ab561306a00fdf5e89c609de4d69e800 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Tue, 17 Jul 2018 16:42:17 +0200
 Subject: [PATCH] Use asynchronous Log4j 2 loggers
 
 
 diff --git a/pom.xml b/pom.xml
-index 3be49ee7f4..1e7d2b5506 100644
+index b28f8e0929..6d8b27e927 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -73,6 +73,13 @@
@@ -30,5 +30,5 @@ index 0000000000..ee7c90784c
 @@ -0,0 +1 @@
 +Log4jContextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0294-add-more-information-to-Entity.toString.patch b/Spigot-Server-Patches/0293-add-more-information-to-Entity.toString.patch
similarity index 95%
rename from Spigot-Server-Patches/0294-add-more-information-to-Entity.toString.patch
rename to Spigot-Server-Patches/0293-add-more-information-to-Entity.toString.patch
index 26ff6f786b..95bc49ae42 100644
--- a/Spigot-Server-Patches/0294-add-more-information-to-Entity.toString.patch
+++ b/Spigot-Server-Patches/0293-add-more-information-to-Entity.toString.patch
@@ -1,4 +1,4 @@
-From ac603b982b9f06e915b58593d719849c2223096e Mon Sep 17 00:00:00 2001
+From c91cbe2d3522234d29247eac89269d847119e95c 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/0295-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/Spigot-Server-Patches/0294-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
similarity index 96%
rename from Spigot-Server-Patches/0295-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
rename to Spigot-Server-Patches/0294-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
index 3a31eb8de8..4c5a7db7bc 100644
--- a/Spigot-Server-Patches/0295-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
+++ b/Spigot-Server-Patches/0294-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
@@ -1,4 +1,4 @@
-From d1635cbba84d8963e9930db2a967df7e311c9be2 Mon Sep 17 00:00:00 2001
+From 13ef375a527f72393b88a6aef14b2ddbd2113677 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 21 Jul 2018 08:25:40 -0400
 Subject: [PATCH] Add Debug Entities option to debug dupe uuid issues
@@ -6,7 +6,7 @@ Subject: [PATCH] Add Debug Entities option to debug dupe uuid issues
 Add -Ddebug.entities=true to your JVM flags to gain more information
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 064bd4133a..7d8f723968 100644
+index 42c1c47c58..3606c78843 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -73,6 +73,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -18,7 +18,7 @@ index 064bd4133a..7d8f723968 100644
          if (bukkitEntity == null) {
              bukkitEntity = CraftEntity.getEntity(world.getServer(), this);
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 6987d9423c..8e8cf659f8 100644
+index b76b8dbf5d..709f3e525c 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -55,6 +55,10 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -84,5 +84,5 @@ index 6987d9423c..8e8cf659f8 100644
  
          if (aentity != null) {
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0296-EnderDragon-Events.patch b/Spigot-Server-Patches/0295-EnderDragon-Events.patch
similarity index 98%
rename from Spigot-Server-Patches/0296-EnderDragon-Events.patch
rename to Spigot-Server-Patches/0295-EnderDragon-Events.patch
index 4a84c82d8f..daac80d1f6 100644
--- a/Spigot-Server-Patches/0296-EnderDragon-Events.patch
+++ b/Spigot-Server-Patches/0295-EnderDragon-Events.patch
@@ -1,4 +1,4 @@
-From 788553e0245c1df064ccea0ffe5e66754cba6bd9 Mon Sep 17 00:00:00 2001
+From 34a08b36a0774cba74c90fe025e48106b243cf81 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
@@ -56,5 +56,5 @@ index e746a6a0da..366ebb8d2d 100644
              }
  
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0297-PlayerElytraBoostEvent.patch b/Spigot-Server-Patches/0296-PlayerElytraBoostEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0297-PlayerElytraBoostEvent.patch
rename to Spigot-Server-Patches/0296-PlayerElytraBoostEvent.patch
index 1edc1a5f3f..a73590586d 100644
--- a/Spigot-Server-Patches/0297-PlayerElytraBoostEvent.patch
+++ b/Spigot-Server-Patches/0296-PlayerElytraBoostEvent.patch
@@ -1,4 +1,4 @@
-From 8790989ae27d534a733be291f45d2f840cca9259 Mon Sep 17 00:00:00 2001
+From d87458828b5340bd8fc06aac91450efe96983543 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
@@ -28,5 +28,5 @@ index d971bbc76c..4ce9c60895 100644
              }
  
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0298-PlayerLaunchProjectileEvent.patch b/Spigot-Server-Patches/0297-PlayerLaunchProjectileEvent.patch
similarity index 99%
rename from Spigot-Server-Patches/0298-PlayerLaunchProjectileEvent.patch
rename to Spigot-Server-Patches/0297-PlayerLaunchProjectileEvent.patch
index 4810a06865..6abdef5c4a 100644
--- a/Spigot-Server-Patches/0298-PlayerLaunchProjectileEvent.patch
+++ b/Spigot-Server-Patches/0297-PlayerLaunchProjectileEvent.patch
@@ -1,4 +1,4 @@
-From 5db9f5cec37287aadff02842e15cf321933e4dfd Mon Sep 17 00:00:00 2001
+From 5641056a15138f51b65f1f7ebf4179ec2553a4c9 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
@@ -263,5 +263,5 @@ index 426b42a12c..a4e2f70c7c 100644
  
          entityhuman.b(StatisticList.ITEM_USED.b(this));
 -- 
-2.18.0
+2.19.0
 
diff --git a/Spigot-Server-Patches/0299-Duplicate-UUID-Resolve-Option.patch b/Spigot-Server-Patches/0298-Duplicate-UUID-Resolve-Option.patch
similarity index 99%
rename from Spigot-Server-Patches/0299-Duplicate-UUID-Resolve-Option.patch
rename to Spigot-Server-Patches/0298-Duplicate-UUID-Resolve-Option.patch
index e7af4ab553..e82a8a63e7 100644
--- a/Spigot-Server-Patches/0299-Duplicate-UUID-Resolve-Option.patch
+++ b/Spigot-Server-Patches/0298-Duplicate-UUID-Resolve-Option.patch
@@ -1,4 +1,4 @@
-From 8f520dfcfc935c3a5e6fba1d4e9d6d10192bfadd Mon Sep 17 00:00:00 2001
+From ecec84b91157aa460e0591d1c93eb359cbb3a581 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 99986bac97..1bfa9ad567 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 91684b4fe9..0c27b90183 100644
+index 321837811e..cd87f0c241 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/0300-Speedup-BlockPos-by-fixing-inlining.patch b/Spigot-Server-Patches/0299-Speedup-BlockPos-by-fixing-inlining.patch
similarity index 99%
rename from Spigot-Server-Patches/0300-Speedup-BlockPos-by-fixing-inlining.patch
rename to Spigot-Server-Patches/0299-Speedup-BlockPos-by-fixing-inlining.patch
index f70afaa666..8b7da237ce 100644
--- a/Spigot-Server-Patches/0300-Speedup-BlockPos-by-fixing-inlining.patch
+++ b/Spigot-Server-Patches/0299-Speedup-BlockPos-by-fixing-inlining.patch
@@ -1,4 +1,4 @@
-From ed96918de0d813b82c67db2fc245376bd51d51f6 Mon Sep 17 00:00:00 2001
+From 065e7c9f13c0749ea89c4928db3512550d365b01 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
diff --git a/Spigot-Server-Patches/0301-Don-t-save-Proto-Chunks.patch b/Spigot-Server-Patches/0300-Don-t-save-Proto-Chunks.patch
similarity index 97%
rename from Spigot-Server-Patches/0301-Don-t-save-Proto-Chunks.patch
rename to Spigot-Server-Patches/0300-Don-t-save-Proto-Chunks.patch
index e49c12f4e0..86273f03a8 100644
--- a/Spigot-Server-Patches/0301-Don-t-save-Proto-Chunks.patch
+++ b/Spigot-Server-Patches/0300-Don-t-save-Proto-Chunks.patch
@@ -1,4 +1,4 @@
-From 627b7140147b526cb50653b9d53cf01a120b7d07 Mon Sep 17 00:00:00 2001
+From ef04639136c63dc275c50894c2ba0de88c3f0bc6 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/0302-Optimize-RegistryID.c.patch b/Spigot-Server-Patches/0301-Optimize-RegistryID.c.patch
similarity index 96%
rename from Spigot-Server-Patches/0302-Optimize-RegistryID.c.patch
rename to Spigot-Server-Patches/0301-Optimize-RegistryID.c.patch
index b0b37f0733..463236d5e6 100644
--- a/Spigot-Server-Patches/0302-Optimize-RegistryID.c.patch
+++ b/Spigot-Server-Patches/0301-Optimize-RegistryID.c.patch
@@ -1,4 +1,4 @@
-From d7257593d68d82a105f007a16dcae0bf82374bf2 Mon Sep 17 00:00:00 2001
+From 7fbc8773c73f1e54b047a43056b23503f1109d3f 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/0303-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/Spigot-Server-Patches/0302-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
similarity index 96%
rename from Spigot-Server-Patches/0303-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
rename to Spigot-Server-Patches/0302-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
index 6e390b4045..6fcdd121f2 100644
--- a/Spigot-Server-Patches/0303-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
+++ b/Spigot-Server-Patches/0302-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
@@ -1,4 +1,4 @@
-From 709c949dabcbe200d9ee126d166bba74d1a92df1 Mon Sep 17 00:00:00 2001
+From ec1efbb791942e526c80d2b70ffbd2d899b22cff 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/Spigot-Server-Patches/0304-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0303-Vanished-players-don-t-have-rights.patch
similarity index 99%
rename from Spigot-Server-Patches/0304-Vanished-players-don-t-have-rights.patch
rename to Spigot-Server-Patches/0303-Vanished-players-don-t-have-rights.patch
index afc85275fb..70adaf4d4f 100644
--- a/Spigot-Server-Patches/0304-Vanished-players-don-t-have-rights.patch
+++ b/Spigot-Server-Patches/0303-Vanished-players-don-t-have-rights.patch
@@ -1,4 +1,4 @@
-From 725923a7b4616817e6dec0b439ca574f74878467 Mon Sep 17 00:00:00 2001
+From c771459635b4e7ffcd54006e8bd6aab894fb3206 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/0305-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch b/Spigot-Server-Patches/0304-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
similarity index 90%
rename from Spigot-Server-Patches/0305-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
rename to Spigot-Server-Patches/0304-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
index aab0809e81..3d2f72b333 100644
--- a/Spigot-Server-Patches/0305-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
+++ b/Spigot-Server-Patches/0304-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
@@ -1,4 +1,4 @@
-From c191218c2bde350f0acd631afc48995a0048a67b Mon Sep 17 00:00:00 2001
+From aa6cffc960979224fa6e2f8170637de1303e537f 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 0c27b90183..a1ccabda6d 100644
+index cd87f0c241..17f1e71d48 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/0306-Add-some-Debug-to-Chunk-Entity-slices.patch b/Spigot-Server-Patches/0305-Add-some-Debug-to-Chunk-Entity-slices.patch
similarity index 95%
rename from Spigot-Server-Patches/0306-Add-some-Debug-to-Chunk-Entity-slices.patch
rename to Spigot-Server-Patches/0305-Add-some-Debug-to-Chunk-Entity-slices.patch
index 22a10e6342..43e0fa6c86 100644
--- a/Spigot-Server-Patches/0306-Add-some-Debug-to-Chunk-Entity-slices.patch
+++ b/Spigot-Server-Patches/0305-Add-some-Debug-to-Chunk-Entity-slices.patch
@@ -1,4 +1,4 @@
-From 22874f0f44ef4a0a9518b649e398e62bddc004aa Mon Sep 17 00:00:00 2001
+From f73262650a77e5b3300a76bc932eb6c96b0b60b8 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 a1ccabda6d..18faa52d41 100644
+index 17f1e71d48..a75b058e2a 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 {
@@ -64,7 +64,7 @@ index a1ccabda6d..18faa52d41 100644
          this.markDirty();
          if (entity instanceof EntityItem) {
              itemCounts[i]--;
-@@ -992,6 +1022,7 @@ public class Chunk implements IChunkAccess {
+@@ -1017,6 +1047,7 @@ public class Chunk implements IChunkAccess {
                  }
                  // Spigot End
                  entity.setCurrentChunk(null); // Paper
diff --git a/Spigot-Server-Patches/0307-Optimize-Region-File-Cache.patch b/Spigot-Server-Patches/0306-Optimize-Region-File-Cache.patch
similarity index 97%
rename from Spigot-Server-Patches/0307-Optimize-Region-File-Cache.patch
rename to Spigot-Server-Patches/0306-Optimize-Region-File-Cache.patch
index a9cc9e0f37..9b82c409d7 100644
--- a/Spigot-Server-Patches/0307-Optimize-Region-File-Cache.patch
+++ b/Spigot-Server-Patches/0306-Optimize-Region-File-Cache.patch
@@ -1,4 +1,4 @@
-From 2ec638b622c01b61fd6d67d43fc566c42e66b9b8 Mon Sep 17 00:00:00 2001
+From f8945eb1a5cce6fc1a4b55a34efb14fc03b3c387 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/0308-EntityTransformedEvent.patch b/Spigot-Server-Patches/0307-EntityTransformedEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0308-EntityTransformedEvent.patch
rename to Spigot-Server-Patches/0307-EntityTransformedEvent.patch
index e6214bc1a7..0b43452862 100644
--- a/Spigot-Server-Patches/0308-EntityTransformedEvent.patch
+++ b/Spigot-Server-Patches/0307-EntityTransformedEvent.patch
@@ -1,4 +1,4 @@
-From 77674401169a1e811c87a180492e4b682dae7cb8 Mon Sep 17 00:00:00 2001
+From a697b22e43b3c614f251d1d45cd9f8867297c7c1 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/0309-SkeletonHorse-Additions.patch b/Spigot-Server-Patches/0308-SkeletonHorse-Additions.patch
similarity index 97%
rename from Spigot-Server-Patches/0309-SkeletonHorse-Additions.patch
rename to Spigot-Server-Patches/0308-SkeletonHorse-Additions.patch
index 5ab383b06c..e188b0424a 100644
--- a/Spigot-Server-Patches/0309-SkeletonHorse-Additions.patch
+++ b/Spigot-Server-Patches/0308-SkeletonHorse-Additions.patch
@@ -1,4 +1,4 @@
-From f131c3e9f7448f2ce5b058b39f4250e6a3fc270e Mon Sep 17 00:00:00 2001
+From bc5d3f088236be6bf87c277517df739b8527f9f3 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/0310-Prevent-Saving-Bad-entities-to-chunks.patch b/Spigot-Server-Patches/0309-Prevent-Saving-Bad-entities-to-chunks.patch
similarity index 97%
rename from Spigot-Server-Patches/0310-Prevent-Saving-Bad-entities-to-chunks.patch
rename to Spigot-Server-Patches/0309-Prevent-Saving-Bad-entities-to-chunks.patch
index db34e0ca8e..a1688a51fc 100644
--- a/Spigot-Server-Patches/0310-Prevent-Saving-Bad-entities-to-chunks.patch
+++ b/Spigot-Server-Patches/0309-Prevent-Saving-Bad-entities-to-chunks.patch
@@ -1,4 +1,4 @@
-From fb88b169444615df90c320481befdc3309aea0cd Mon Sep 17 00:00:00 2001
+From 799f61153c06ca66649e7d0fde50328f472d932f 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/0311-Don-t-call-getItemMeta-on-hasItemMeta.patch b/Spigot-Server-Patches/0310-Don-t-call-getItemMeta-on-hasItemMeta.patch
similarity index 94%
rename from Spigot-Server-Patches/0311-Don-t-call-getItemMeta-on-hasItemMeta.patch
rename to Spigot-Server-Patches/0310-Don-t-call-getItemMeta-on-hasItemMeta.patch
index 23fc195324..f726b1bd16 100644
--- a/Spigot-Server-Patches/0311-Don-t-call-getItemMeta-on-hasItemMeta.patch
+++ b/Spigot-Server-Patches/0310-Don-t-call-getItemMeta-on-hasItemMeta.patch
@@ -1,4 +1,4 @@
-From 79081a523e2a4efbda4684d02761d8a33681daf5 Mon Sep 17 00:00:00 2001
+From c5fea884215816933aca601888fd54404640700a 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
@@ -24,7 +24,7 @@ index d6e6b9bed4..3966769c5f 100644
  
      static boolean hasItemMeta(net.minecraft.server.ItemStack item) {
 diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
-index ef9d40b8a0..a161993876 100644
+index e3065bf8d6..1b7790bf7e 100644
 --- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
 +++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
 @@ -5,6 +5,7 @@ import static org.hamcrest.Matchers.*;
@@ -33,9 +33,9 @@ index ef9d40b8a0..a161993876 100644
  import java.util.Arrays;
 +import java.util.Collections; // Paper
  import java.util.List;
- import com.destroystokyo.paper.inventory.meta.ArmorStandMeta; // Paper
- import net.minecraft.server.Block;
-@@ -155,8 +156,47 @@ public class ItemMetaTest extends AbstractTestingBase {
+ import java.util.UUID;
+ 
+@@ -159,8 +160,47 @@ public class ItemMetaTest extends AbstractTestingBase {
          ItemStack pureBukkit = new ItemStack(Material.SHEARS);
          assertThat("Bukkit and craft stacks should be similar", craft.isSimilar(pureBukkit), is(true));
          assertThat("Bukkit and craft stacks should be equal", craft.equals(pureBukkit), is(true));
diff --git a/Spigot-Server-Patches/0312-Always-process-chunk-removal-in-removeEntity.patch b/Spigot-Server-Patches/0311-Always-process-chunk-removal-in-removeEntity.patch
similarity index 95%
rename from Spigot-Server-Patches/0312-Always-process-chunk-removal-in-removeEntity.patch
rename to Spigot-Server-Patches/0311-Always-process-chunk-removal-in-removeEntity.patch
index f242ccd889..af4f2bf37f 100644
--- a/Spigot-Server-Patches/0312-Always-process-chunk-removal-in-removeEntity.patch
+++ b/Spigot-Server-Patches/0311-Always-process-chunk-removal-in-removeEntity.patch
@@ -1,4 +1,4 @@
-From ccb19883a20710b960cf3eb6e1e4d190e94b3116 Mon Sep 17 00:00:00 2001
+From d1494196b284ecc7640f065c43f9131567ca6b22 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/0313-Ignore-Dead-Entities-in-entityList-iteration.patch b/Spigot-Server-Patches/0312-Ignore-Dead-Entities-in-entityList-iteration.patch
similarity index 98%
rename from Spigot-Server-Patches/0313-Ignore-Dead-Entities-in-entityList-iteration.patch
rename to Spigot-Server-Patches/0312-Ignore-Dead-Entities-in-entityList-iteration.patch
index 8db2f3a93c..2e03984b3f 100644
--- a/Spigot-Server-Patches/0313-Ignore-Dead-Entities-in-entityList-iteration.patch
+++ b/Spigot-Server-Patches/0312-Ignore-Dead-Entities-in-entityList-iteration.patch
@@ -1,4 +1,4 @@
-From 5feff7d866b455244eca6f48ec55c5afeb16706a Mon Sep 17 00:00:00 2001
+From 1f5c157d77d0a9dcf226d7842456de466ff579da 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/0314-Provide-option-to-use-a-versioned-world-folder-for-t.patch b/Spigot-Server-Patches/0313-Provide-option-to-use-a-versioned-world-folder-for-t.patch
similarity index 98%
rename from Spigot-Server-Patches/0314-Provide-option-to-use-a-versioned-world-folder-for-t.patch
rename to Spigot-Server-Patches/0313-Provide-option-to-use-a-versioned-world-folder-for-t.patch
index 91102b4f74..094f6c35dd 100644
--- a/Spigot-Server-Patches/0314-Provide-option-to-use-a-versioned-world-folder-for-t.patch
+++ b/Spigot-Server-Patches/0313-Provide-option-to-use-a-versioned-world-folder-for-t.patch
@@ -1,4 +1,4 @@
-From 555c8cf7825f78ffad6d0fb864f494b6bb8ca61b Mon Sep 17 00:00:00 2001
+From 1c88f287d37594e783c43e4e12ee3e6aadc3ba35 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 72602be58a..85b74994aa 100644
+index ad031dedaa..b32e75ae9a 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;
@@ -30,7 +30,7 @@ index 72602be58a..85b74994aa 100644
  import java.util.regex.Pattern;
  
  import com.google.common.collect.Lists;
-@@ -308,4 +309,27 @@ public class PaperConfig {
+@@ -303,4 +304,27 @@ public class PaperConfig {
              Bukkit.getLogger().log(Level.INFO, "Using Aikar's Alternative Luck Formula to apply Luck attribute to all loot pool calculations. See https://luckformula.emc.gs");
          }
      }
diff --git a/Spigot-Server-Patches/0315-MC-111480-Start-Entity-ID-s-at-1.patch b/Spigot-Server-Patches/0314-MC-111480-Start-Entity-ID-s-at-1.patch
similarity index 94%
rename from Spigot-Server-Patches/0315-MC-111480-Start-Entity-ID-s-at-1.patch
rename to Spigot-Server-Patches/0314-MC-111480-Start-Entity-ID-s-at-1.patch
index d5bdb1f3fd..7518b809af 100644
--- a/Spigot-Server-Patches/0315-MC-111480-Start-Entity-ID-s-at-1.patch
+++ b/Spigot-Server-Patches/0314-MC-111480-Start-Entity-ID-s-at-1.patch
@@ -1,4 +1,4 @@
-From a6cc211cabcde63d81a1d739bd51a70cdb39648f Mon Sep 17 00:00:00 2001
+From 30b20b6870c1ea6571d916c38beeb3ba590327c9 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/0316-Implement-Expanded-ArmorStand-API.patch b/Spigot-Server-Patches/0315-Implement-Expanded-ArmorStand-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0316-Implement-Expanded-ArmorStand-API.patch
rename to Spigot-Server-Patches/0315-Implement-Expanded-ArmorStand-API.patch
index 64becd7105..dc146f8e1b 100644
--- a/Spigot-Server-Patches/0316-Implement-Expanded-ArmorStand-API.patch
+++ b/Spigot-Server-Patches/0315-Implement-Expanded-ArmorStand-API.patch
@@ -1,4 +1,4 @@
-From 2fd3f99debda330db60ff562f7215b90a4309836 Mon Sep 17 00:00:00 2001
+From 3e600e2f11b41c27cd1676280b112d2700bc3a06 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/0317-AnvilDamageEvent.patch b/Spigot-Server-Patches/0316-AnvilDamageEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0317-AnvilDamageEvent.patch
rename to Spigot-Server-Patches/0316-AnvilDamageEvent.patch
index d0c5a34278..bcdd5ef345 100644
--- a/Spigot-Server-Patches/0317-AnvilDamageEvent.patch
+++ b/Spigot-Server-Patches/0316-AnvilDamageEvent.patch
@@ -1,4 +1,4 @@
-From f85ac6e7ed0e5011b40cbabeff227f9bce5a523d Mon Sep 17 00:00:00 2001
+From c00fed6fb8704f5e05ac2d5c9c09caafaea4cbfd 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/0318-World-EntityHuman-Lookup-Optimizations.patch b/Spigot-Server-Patches/0317-World-EntityHuman-Lookup-Optimizations.patch
similarity index 98%
rename from Spigot-Server-Patches/0318-World-EntityHuman-Lookup-Optimizations.patch
rename to Spigot-Server-Patches/0317-World-EntityHuman-Lookup-Optimizations.patch
index caa402418a..b6e973f0ff 100644
--- a/Spigot-Server-Patches/0318-World-EntityHuman-Lookup-Optimizations.patch
+++ b/Spigot-Server-Patches/0317-World-EntityHuman-Lookup-Optimizations.patch
@@ -1,4 +1,4 @@
-From b4a0ee91b6438d5bd1f2d92aee64a4a6fded636c Mon Sep 17 00:00:00 2001
+From b5fce661d635a0dc22d0b0502b7a7ad9ffe7dfe0 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/0319-Add-TNTPrimeEvent.patch b/Spigot-Server-Patches/0318-Add-TNTPrimeEvent.patch
similarity index 99%
rename from Spigot-Server-Patches/0319-Add-TNTPrimeEvent.patch
rename to Spigot-Server-Patches/0318-Add-TNTPrimeEvent.patch
index d793ce8895..6c0394adab 100644
--- a/Spigot-Server-Patches/0319-Add-TNTPrimeEvent.patch
+++ b/Spigot-Server-Patches/0318-Add-TNTPrimeEvent.patch
@@ -1,4 +1,4 @@
-From 024c7585d9b1e74bf5c4b2a7dde0701b3af2e948 Mon Sep 17 00:00:00 2001
+From b4841ff955cc1223c70fecf891a4951f7518acbc 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/0320-Break-up-and-make-tab-spam-limits-configurable.patch b/Spigot-Server-Patches/0319-Break-up-and-make-tab-spam-limits-configurable.patch
similarity index 96%
rename from Spigot-Server-Patches/0320-Break-up-and-make-tab-spam-limits-configurable.patch
rename to Spigot-Server-Patches/0319-Break-up-and-make-tab-spam-limits-configurable.patch
index 11cbacd158..cbb41e744a 100644
--- a/Spigot-Server-Patches/0320-Break-up-and-make-tab-spam-limits-configurable.patch
+++ b/Spigot-Server-Patches/0319-Break-up-and-make-tab-spam-limits-configurable.patch
@@ -1,4 +1,4 @@
-From 882081cb9d7769ecc69139be766947f0221118bc Mon Sep 17 00:00:00 2001
+From a3955c05b1cd607ec7b32ab33ef150344e2ead37 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,10 +22,10 @@ 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 85b74994aa..f74148b8a3 100644
+index b32e75ae9a..3419847e34 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -332,4 +332,18 @@ public class PaperConfig {
+@@ -327,4 +327,18 @@ public class PaperConfig {
              logger.log(Level.INFO, "******************************************************");
          }
      }
diff --git a/Spigot-Server-Patches/0321-Make-portal-teleportation-adjustment-math-more-accur.patch b/Spigot-Server-Patches/0320-Make-portal-teleportation-adjustment-math-more-accur.patch
similarity index 98%
rename from Spigot-Server-Patches/0321-Make-portal-teleportation-adjustment-math-more-accur.patch
rename to Spigot-Server-Patches/0320-Make-portal-teleportation-adjustment-math-more-accur.patch
index 71e877374e..543ce45483 100644
--- a/Spigot-Server-Patches/0321-Make-portal-teleportation-adjustment-math-more-accur.patch
+++ b/Spigot-Server-Patches/0320-Make-portal-teleportation-adjustment-math-more-accur.patch
@@ -1,4 +1,4 @@
-From 75bb97425391159e71032182e3494bc19bae3f65 Mon Sep 17 00:00:00 2001
+From 921f30bc3afaba7d60be1a9f6190c260b88ab761 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/0322-Add-hand-to-bucket-events.patch b/Spigot-Server-Patches/0321-Add-hand-to-bucket-events.patch
similarity index 99%
rename from Spigot-Server-Patches/0322-Add-hand-to-bucket-events.patch
rename to Spigot-Server-Patches/0321-Add-hand-to-bucket-events.patch
index a273559541..15f8286821 100644
--- a/Spigot-Server-Patches/0322-Add-hand-to-bucket-events.patch
+++ b/Spigot-Server-Patches/0321-Add-hand-to-bucket-events.patch
@@ -1,4 +1,4 @@
-From 8692b36f4d2a24595ddc5e031f2e2d7ae6caa2a8 Mon Sep 17 00:00:00 2001
+From 601c85f158329ba06bd564052de4d67350453015 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/0323-MC-135506-Experience-should-save-as-Integers.patch b/Spigot-Server-Patches/0322-MC-135506-Experience-should-save-as-Integers.patch
similarity index 95%
rename from Spigot-Server-Patches/0323-MC-135506-Experience-should-save-as-Integers.patch
rename to Spigot-Server-Patches/0322-MC-135506-Experience-should-save-as-Integers.patch
index fd11dd3dfc..84d22bcf61 100644
--- a/Spigot-Server-Patches/0323-MC-135506-Experience-should-save-as-Integers.patch
+++ b/Spigot-Server-Patches/0322-MC-135506-Experience-should-save-as-Integers.patch
@@ -1,4 +1,4 @@
-From 37946bb90997fbe0bfffebd99822da5466c9e2ed Mon Sep 17 00:00:00 2001
+From 3cc25f923009c34eef3d7e6715b9afcd33261807 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/0324-Entity-add-to-world-fixes.patch b/Spigot-Server-Patches/0323-Entity-add-to-world-fixes.patch
similarity index 97%
rename from Spigot-Server-Patches/0324-Entity-add-to-world-fixes.patch
rename to Spigot-Server-Patches/0323-Entity-add-to-world-fixes.patch
index b8b8addf93..012f25e976 100644
--- a/Spigot-Server-Patches/0324-Entity-add-to-world-fixes.patch
+++ b/Spigot-Server-Patches/0323-Entity-add-to-world-fixes.patch
@@ -1,4 +1,4 @@
-From 5fda497be64e89c51ec700b001432f858a870a19 Mon Sep 17 00:00:00 2001
+From 7368c841c5a2c43e02bdb3f56cbd99274a324212 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 18faa52d41..3be0a18a0a 100644
+index a75b058e2a..56116ae170 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/0325-Fix-client-rendering-skulls-from-same-user.patch b/Spigot-Server-Patches/0324-Fix-client-rendering-skulls-from-same-user.patch
similarity index 98%
rename from Spigot-Server-Patches/0325-Fix-client-rendering-skulls-from-same-user.patch
rename to Spigot-Server-Patches/0324-Fix-client-rendering-skulls-from-same-user.patch
index cd64d629d2..62f9c5acf0 100644
--- a/Spigot-Server-Patches/0325-Fix-client-rendering-skulls-from-same-user.patch
+++ b/Spigot-Server-Patches/0324-Fix-client-rendering-skulls-from-same-user.patch
@@ -1,4 +1,4 @@
-From 2a842c4256ab5b3c55a76ac3902a7c9cb7062b27 Mon Sep 17 00:00:00 2001
+From 8af723e221f15c221cb2521df57e872a5cf38cf5 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/0326-Add-Early-Warning-Feature-to-WatchDog.patch b/Spigot-Server-Patches/0325-Add-Early-Warning-Feature-to-WatchDog.patch
similarity index 98%
rename from Spigot-Server-Patches/0326-Add-Early-Warning-Feature-to-WatchDog.patch
rename to Spigot-Server-Patches/0325-Add-Early-Warning-Feature-to-WatchDog.patch
index e6feb8cf6f..9c3323379c 100644
--- a/Spigot-Server-Patches/0326-Add-Early-Warning-Feature-to-WatchDog.patch
+++ b/Spigot-Server-Patches/0325-Add-Early-Warning-Feature-to-WatchDog.patch
@@ -1,4 +1,4 @@
-From 23509e56cd0adf47b57de8998a95cd9b47af0e10 Mon Sep 17 00:00:00 2001
+From bed655aa8c024e85ad522b4863180292f3bc3c93 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 f74148b8a3..2a0ce06212 100644
+index 3419847e34..4bb81a09a8 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;
@@ -21,7 +21,7 @@ index f74148b8a3..2a0ce06212 100644
  
  public class PaperConfig {
  
-@@ -333,6 +335,14 @@ public class PaperConfig {
+@@ -328,6 +330,14 @@ public class PaperConfig {
          }
      }
  
diff --git a/Spigot-Server-Patches/0327-Make-EnderDragon-implement-Mob.patch b/Spigot-Server-Patches/0326-Make-EnderDragon-implement-Mob.patch
similarity index 95%
rename from Spigot-Server-Patches/0327-Make-EnderDragon-implement-Mob.patch
rename to Spigot-Server-Patches/0326-Make-EnderDragon-implement-Mob.patch
index 735bfca076..638219b06b 100644
--- a/Spigot-Server-Patches/0327-Make-EnderDragon-implement-Mob.patch
+++ b/Spigot-Server-Patches/0326-Make-EnderDragon-implement-Mob.patch
@@ -1,4 +1,4 @@
-From 937febe97159acedb73ae99fcd77dce55e758bb4 Mon Sep 17 00:00:00 2001
+From 20b2f3ae314b9567f3a739d5553966b9e71752f8 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/0328-Detect-and-repair-corrupt-Region-Files.patch b/Spigot-Server-Patches/0327-Detect-and-repair-corrupt-Region-Files.patch
similarity index 96%
rename from Spigot-Server-Patches/0328-Detect-and-repair-corrupt-Region-Files.patch
rename to Spigot-Server-Patches/0327-Detect-and-repair-corrupt-Region-Files.patch
index 119ed149e4..749e8e579e 100644
--- a/Spigot-Server-Patches/0328-Detect-and-repair-corrupt-Region-Files.patch
+++ b/Spigot-Server-Patches/0327-Detect-and-repair-corrupt-Region-Files.patch
@@ -1,4 +1,4 @@
-From a78afbc2ce603e2addfd54b8614758bf400077fe Mon Sep 17 00:00:00 2001
+From c1479920cb39b85e9dc4993c9c425dae8a22acb1 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/0329-Use-ConcurrentHashMap-in-JsonList.patch b/Spigot-Server-Patches/0328-Use-ConcurrentHashMap-in-JsonList.patch
similarity index 98%
rename from Spigot-Server-Patches/0329-Use-ConcurrentHashMap-in-JsonList.patch
rename to Spigot-Server-Patches/0328-Use-ConcurrentHashMap-in-JsonList.patch
index fd9f0671f6..c0559d3c63 100644
--- a/Spigot-Server-Patches/0329-Use-ConcurrentHashMap-in-JsonList.patch
+++ b/Spigot-Server-Patches/0328-Use-ConcurrentHashMap-in-JsonList.patch
@@ -1,4 +1,4 @@
-From 6da557ad9a1a07c2b3a019f229c243ac252882c9 Mon Sep 17 00:00:00 2001
+From 1cd1b16cf3e1b39a0d43f3f904ddcc8155f59d40 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/0330-Use-a-Queue-for-Queueing-Commands.patch b/Spigot-Server-Patches/0329-Use-a-Queue-for-Queueing-Commands.patch
similarity index 96%
rename from Spigot-Server-Patches/0330-Use-a-Queue-for-Queueing-Commands.patch
rename to Spigot-Server-Patches/0329-Use-a-Queue-for-Queueing-Commands.patch
index 3d8c73c662..00b9c4c0c5 100644
--- a/Spigot-Server-Patches/0330-Use-a-Queue-for-Queueing-Commands.patch
+++ b/Spigot-Server-Patches/0329-Use-a-Queue-for-Queueing-Commands.patch
@@ -1,4 +1,4 @@
-From 8cf82461ddd5c4898297f465ff4b7d24ff409116 Mon Sep 17 00:00:00 2001
+From c91a1efe34437425995ccd3f71afa040ef3b526e 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/0331-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/Spigot-Server-Patches/0330-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
similarity index 95%
rename from Spigot-Server-Patches/0331-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
rename to Spigot-Server-Patches/0330-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
index 0e8b90b85f..ad875517ab 100644
--- a/Spigot-Server-Patches/0331-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
+++ b/Spigot-Server-Patches/0330-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
@@ -1,4 +1,4 @@
-From f03d2efe67fdb18e52f82d689a34b3a965ccb252 Mon Sep 17 00:00:00 2001
+From a053053de86c590dc6f65b0f9746fe8e40a26509 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/0332-Allow-disabling-armour-stand-ticking.patch b/Spigot-Server-Patches/0331-Allow-disabling-armour-stand-ticking.patch
similarity index 97%
rename from Spigot-Server-Patches/0332-Allow-disabling-armour-stand-ticking.patch
rename to Spigot-Server-Patches/0331-Allow-disabling-armour-stand-ticking.patch
index fc963a951f..532fe57648 100644
--- a/Spigot-Server-Patches/0332-Allow-disabling-armour-stand-ticking.patch
+++ b/Spigot-Server-Patches/0331-Allow-disabling-armour-stand-ticking.patch
@@ -1,4 +1,4 @@
-From f999fc0ab505fe2f95cbfce2b39434e798eb7141 Mon Sep 17 00:00:00 2001
+From ae7f77a162d760cc7b724fcc9df73c7955b0d838 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/0333-Optimize-BlockPosition-helper-methods.patch b/Spigot-Server-Patches/0332-Optimize-BlockPosition-helper-methods.patch
similarity index 98%
rename from Spigot-Server-Patches/0333-Optimize-BlockPosition-helper-methods.patch
rename to Spigot-Server-Patches/0332-Optimize-BlockPosition-helper-methods.patch
index 1959707264..9c6bc2b479 100644
--- a/Spigot-Server-Patches/0333-Optimize-BlockPosition-helper-methods.patch
+++ b/Spigot-Server-Patches/0332-Optimize-BlockPosition-helper-methods.patch
@@ -1,4 +1,4 @@
-From 1fe6a44f34257dde4d9c480011acd97f90ae516e Mon Sep 17 00:00:00 2001
+From 5487faf5715f545c2c3199f94e388d03f85cc73b 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
diff --git a/Spigot-Server-Patches/0334-Send-nearby-packets-from-world-player-list-not-serve.patch b/Spigot-Server-Patches/0333-Send-nearby-packets-from-world-player-list-not-serve.patch
similarity index 99%
rename from Spigot-Server-Patches/0334-Send-nearby-packets-from-world-player-list-not-serve.patch
rename to Spigot-Server-Patches/0333-Send-nearby-packets-from-world-player-list-not-serve.patch
index dc6620b5d0..efbed09f4e 100644
--- a/Spigot-Server-Patches/0334-Send-nearby-packets-from-world-player-list-not-serve.patch
+++ b/Spigot-Server-Patches/0333-Send-nearby-packets-from-world-player-list-not-serve.patch
@@ -1,4 +1,4 @@
-From 97984d4ca59b2676ef7dd55e8c34da033c6e6c13 Mon Sep 17 00:00:00 2001
+From 96edac555c303a226e584b85f9084ebac1d47be7 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/Spigot-Server-Patches/0335-Cache-World-Entity-Type-counts.patch b/Spigot-Server-Patches/0334-Cache-World-Entity-Type-counts.patch
similarity index 99%
rename from Spigot-Server-Patches/0335-Cache-World-Entity-Type-counts.patch
rename to Spigot-Server-Patches/0334-Cache-World-Entity-Type-counts.patch
index 0b7658fb5c..b79423f8bc 100644
--- a/Spigot-Server-Patches/0335-Cache-World-Entity-Type-counts.patch
+++ b/Spigot-Server-Patches/0334-Cache-World-Entity-Type-counts.patch
@@ -1,4 +1,4 @@
-From 910f2676375b4a5af9294bfd15bcc469d2755350 Mon Sep 17 00:00:00 2001
+From 80766964f2dee726b83d594c94362939f5628a7a 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/0336-Restore-vanlla-default-mob-spawn-range.patch b/Spigot-Server-Patches/0335-Restore-vanlla-default-mob-spawn-range.patch
similarity index 92%
rename from Spigot-Server-Patches/0336-Restore-vanlla-default-mob-spawn-range.patch
rename to Spigot-Server-Patches/0335-Restore-vanlla-default-mob-spawn-range.patch
index c3c210a843..2b4dd845b1 100644
--- a/Spigot-Server-Patches/0336-Restore-vanlla-default-mob-spawn-range.patch
+++ b/Spigot-Server-Patches/0335-Restore-vanlla-default-mob-spawn-range.patch
@@ -1,4 +1,4 @@
-From 37a3f37597bf66aa1b233d29e56940215061d706 Mon Sep 17 00:00:00 2001
+From 7b18a99972e162d3ef31c7192a77fffc31666d77 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/Spigot-Server-Patches/0337-Optimize-Hoppers.patch b/Spigot-Server-Patches/0336-Optimize-Hoppers.patch
similarity index 99%
rename from Spigot-Server-Patches/0337-Optimize-Hoppers.patch
rename to Spigot-Server-Patches/0336-Optimize-Hoppers.patch
index 005714f1f0..25816913a6 100644
--- a/Spigot-Server-Patches/0337-Optimize-Hoppers.patch
+++ b/Spigot-Server-Patches/0336-Optimize-Hoppers.patch
@@ -1,4 +1,4 @@
-From 5fc23486add9cb6e4300cd928ec7542b90badbeb Mon Sep 17 00:00:00 2001
+From f67b0dce5c66b50b5c1516cdf838caa259d31b2e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 27 Apr 2016 22:09:52 -0400
 Subject: [PATCH] Optimize Hoppers
diff --git a/Spigot-Server-Patches/0338-Optimize-CraftBlockData-Creation.patch b/Spigot-Server-Patches/0337-Optimize-CraftBlockData-Creation.patch
similarity index 98%
rename from Spigot-Server-Patches/0338-Optimize-CraftBlockData-Creation.patch
rename to Spigot-Server-Patches/0337-Optimize-CraftBlockData-Creation.patch
index b03573589d..d22f441937 100644
--- a/Spigot-Server-Patches/0338-Optimize-CraftBlockData-Creation.patch
+++ b/Spigot-Server-Patches/0337-Optimize-CraftBlockData-Creation.patch
@@ -1,4 +1,4 @@
-From eda4e5cc46dd7581de017e16bc4002f3ed10b5a6 Mon Sep 17 00:00:00 2001
+From bd4d2145c1328fd5fbfe25d29bb080447aa199a5 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/0339-Fix-MC-124320.patch b/Spigot-Server-Patches/0338-Fix-MC-124320.patch
similarity index 97%
rename from Spigot-Server-Patches/0339-Fix-MC-124320.patch
rename to Spigot-Server-Patches/0338-Fix-MC-124320.patch
index 775219da14..50dc7d89f2 100644
--- a/Spigot-Server-Patches/0339-Fix-MC-124320.patch
+++ b/Spigot-Server-Patches/0338-Fix-MC-124320.patch
@@ -1,4 +1,4 @@
-From 65ac97e183c52ccbe7e0f9f3153f7966c43a2d06 Mon Sep 17 00:00:00 2001
+From 663011368c8066bd5156e59914507f351eb098b6 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/0340-Slime-Pathfinder-Events.patch b/Spigot-Server-Patches/0339-Slime-Pathfinder-Events.patch
similarity index 98%
rename from Spigot-Server-Patches/0340-Slime-Pathfinder-Events.patch
rename to Spigot-Server-Patches/0339-Slime-Pathfinder-Events.patch
index 545aeeec07..ac311516ff 100644
--- a/Spigot-Server-Patches/0340-Slime-Pathfinder-Events.patch
+++ b/Spigot-Server-Patches/0339-Slime-Pathfinder-Events.patch
@@ -1,4 +1,4 @@
-From bb7584b6f00163c9be56a5530997a936c53219f9 Mon Sep 17 00:00:00 2001
+From b128c99c11c451eb05ae62b6585e565e90939db5 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/Spigot-Server-Patches/0341-Add-source-block-to-BlockPhysicsEvent.patch b/Spigot-Server-Patches/0340-Add-source-block-to-BlockPhysicsEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0341-Add-source-block-to-BlockPhysicsEvent.patch
rename to Spigot-Server-Patches/0340-Add-source-block-to-BlockPhysicsEvent.patch
index 9e28df6be1..51fd7be0f9 100644
--- a/Spigot-Server-Patches/0341-Add-source-block-to-BlockPhysicsEvent.patch
+++ b/Spigot-Server-Patches/0340-Add-source-block-to-BlockPhysicsEvent.patch
@@ -1,4 +1,4 @@
-From 478ed3a7a3ea26de8743a0f93b15d16372a5aee3 Mon Sep 17 00:00:00 2001
+From 0365084d4f66cd4cf52417b580f2aba4c1b311b1 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/0342-Anti-Xray.patch b/Spigot-Server-Patches/0341-Anti-Xray.patch
similarity index 98%
rename from Spigot-Server-Patches/0342-Anti-Xray.patch
rename to Spigot-Server-Patches/0341-Anti-Xray.patch
index c8464bd216..78629ceb7f 100644
--- a/Spigot-Server-Patches/0342-Anti-Xray.patch
+++ b/Spigot-Server-Patches/0341-Anti-Xray.patch
@@ -1,4 +1,4 @@
-From dcacc5ffb1a192fec54778a9a1bed0ed835f569c Mon Sep 17 00:00:00 2001
+From 2346990844cd6dc58d010ecc5387e773d3c772b4 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 3be0a18a0a..c006cc9778 100644
+index 56116ae170..6f8e6db820 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 {
@@ -1462,19 +1462,18 @@ index cae24961fd..a9690fb1c3 100644
  
      public void a(BlockPosition blockposition) {
 diff --git a/src/main/java/net/minecraft/server/ProtoChunk.java b/src/main/java/net/minecraft/server/ProtoChunk.java
-index 688b4ab8be..f78d5fbb86 100644
+index 9242b95a52..395ce2e4ad 100644
 --- a/src/main/java/net/minecraft/server/ProtoChunk.java
 +++ b/src/main/java/net/minecraft/server/ProtoChunk.java
-@@ -40,12 +40,25 @@ public class ProtoChunk implements IChunkAccess {
-     private long s;
-     private final Map<WorldGenStage.Features, BitSet> t;
+@@ -46,11 +46,23 @@ public class ProtoChunk implements IChunkAccess {
      private boolean u;
-+    private final GeneratorAccess world; // Paper - Anti-Xray
+     public boolean needsDecoration; // CraftBukkit
  
-+
+-    public ProtoChunk(int i, int j, ChunkConverter chunkconverter) {
+-        this(new ChunkCoordIntPair(i, j), chunkconverter);
++    private final GeneratorAccess world; // Paper - Anti-Xray
 +    // Paper start - Anti-Xray - Support default constructors
-     public ProtoChunk(int ix, int jx, ChunkConverter chunkconverter) {
--        this(new ChunkCoordIntPair(ix, jx), chunkconverter);
++    public ProtoChunk(int ix, int jx, ChunkConverter chunkconverter) {
 +        this(ix, jx, chunkconverter, null);
      }
  
@@ -1492,16 +1491,16 @@ index 688b4ab8be..f78d5fbb86 100644
          this.d = new AtomicInteger();
          this.f = Maps.newEnumMap(HeightMap.Type.class);
          this.g = ChunkStatus.EMPTY;
-@@ -132,7 +145,7 @@ public class ProtoChunk implements IChunkAccess {
+@@ -153,7 +165,7 @@ public class ProtoChunk implements IChunkAccess {
                      return iblockdata;
                  }
  
--                this.j[jx >> 4] = new ChunkSection(jx >> 4 << 4, this.x());
-+                this.j[jx >> 4] = new ChunkSection(jx >> 4 << 4, this.x(), this, this.world, true); // Paper - Anti-Xray
+-                this.j[j >> 4] = new ChunkSection(j >> 4 << 4, this.x());
++                this.j[j >> 4] = new ChunkSection(j >> 4 << 4, this.x(), this, this.world, true); // Paper - Anti-Xray
              }
  
-             IBlockData iblockdata1 = this.j[jx >> 4].getType(ix & 15, jx & 15, kx & 15);
-@@ -375,7 +388,7 @@ public class ProtoChunk implements IChunkAccess {
+             IBlockData iblockdata1 = this.j[j >> 4].getType(i & 15, j & 15, k & 15);
+@@ -407,7 +419,7 @@ public class ProtoChunk implements IChunkAccess {
                      return;
                  }
  
diff --git a/Spigot-Server-Patches/0343-Configurable-speed-for-water-flowing-over-lava.patch b/Spigot-Server-Patches/0342-Configurable-speed-for-water-flowing-over-lava.patch
similarity index 98%
rename from Spigot-Server-Patches/0343-Configurable-speed-for-water-flowing-over-lava.patch
rename to Spigot-Server-Patches/0342-Configurable-speed-for-water-flowing-over-lava.patch
index 3c5bc109a1..a78fdf70c9 100644
--- a/Spigot-Server-Patches/0343-Configurable-speed-for-water-flowing-over-lava.patch
+++ b/Spigot-Server-Patches/0342-Configurable-speed-for-water-flowing-over-lava.patch
@@ -1,4 +1,4 @@
-From bd0e725d1262c94ed700e54efb8837b23f716a12 Mon Sep 17 00:00:00 2001
+From 58d72c67a7c9a72473d5e2bb9d58f40b95e804e0 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/0344-Optimize-RegistryMaterials.patch b/Spigot-Server-Patches/0343-Optimize-RegistryMaterials.patch
similarity index 94%
rename from Spigot-Server-Patches/0344-Optimize-RegistryMaterials.patch
rename to Spigot-Server-Patches/0343-Optimize-RegistryMaterials.patch
index 3cd79c0659..45e515162b 100644
--- a/Spigot-Server-Patches/0344-Optimize-RegistryMaterials.patch
+++ b/Spigot-Server-Patches/0343-Optimize-RegistryMaterials.patch
@@ -1,4 +1,4 @@
-From b75ab3f3e18bc6a798970e8dc7b1811b39da3f7c Mon Sep 17 00:00:00 2001
+From 34afe0971637852760abc1aa363833ab3fb88f4b 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/0345-Add-PhantomPreSpawnEvent.patch b/Spigot-Server-Patches/0344-Add-PhantomPreSpawnEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0345-Add-PhantomPreSpawnEvent.patch
rename to Spigot-Server-Patches/0344-Add-PhantomPreSpawnEvent.patch
index 0efd66210f..fba3a16ce0 100644
--- a/Spigot-Server-Patches/0345-Add-PhantomPreSpawnEvent.patch
+++ b/Spigot-Server-Patches/0344-Add-PhantomPreSpawnEvent.patch
@@ -1,4 +1,4 @@
-From 86aaf33f89d6a6483fbf24570cd6d2ae8bcfeec1 Mon Sep 17 00:00:00 2001
+From dd5d7473b0c1a10572abe04e974ce504be12270a 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/0346-Add-More-Creeper-API.patch b/Spigot-Server-Patches/0345-Add-More-Creeper-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0346-Add-More-Creeper-API.patch
rename to Spigot-Server-Patches/0345-Add-More-Creeper-API.patch
index 54898cbb2d..b2db323670 100644
--- a/Spigot-Server-Patches/0346-Add-More-Creeper-API.patch
+++ b/Spigot-Server-Patches/0345-Add-More-Creeper-API.patch
@@ -1,4 +1,4 @@
-From 2119c70bba9ab8b30512b576b6f9f157adb7fe0d Mon Sep 17 00:00:00 2001
+From 74c0ccbb939db48c2e3c10af810630132b2d7d74 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/0347-Optimize-Chunk-getPos.patch b/Spigot-Server-Patches/0346-Optimize-Chunk-getPos.patch
similarity index 83%
rename from Spigot-Server-Patches/0347-Optimize-Chunk-getPos.patch
rename to Spigot-Server-Patches/0346-Optimize-Chunk-getPos.patch
index 6534e04815..a70d54cc73 100644
--- a/Spigot-Server-Patches/0347-Optimize-Chunk-getPos.patch
+++ b/Spigot-Server-Patches/0346-Optimize-Chunk-getPos.patch
@@ -1,4 +1,4 @@
-From f0b1febe6c35af1f97da719744d9949c81b1f92d Mon Sep 17 00:00:00 2001
+From 5479183572b20794e13a31078bb9e15b04252a18 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 c006cc9778..e90ce79a97 100644
+index 6f8e6db820..82d8aca47f 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 {
@@ -19,8 +19,8 @@ index c006cc9778..e90ce79a97 100644
 +    private final ChunkCoordIntPair chunkCoords; // Paper
      public org.bukkit.Chunk bukkitChunk;
      public boolean mustSave;
-     public boolean newChunk;
-@@ -1173,7 +1174,7 @@ public class Chunk implements IChunkAccess {
+     private boolean needsDecoration;
+@@ -1198,7 +1199,7 @@ public class Chunk implements IChunkAccess {
      }
  
      public ChunkCoordIntPair getPos() {
diff --git a/Spigot-Server-Patches/0348-Use-an-EnumMap-for-Chunk-Height-Maps.patch b/Spigot-Server-Patches/0347-Use-an-EnumMap-for-Chunk-Height-Maps.patch
similarity index 88%
rename from Spigot-Server-Patches/0348-Use-an-EnumMap-for-Chunk-Height-Maps.patch
rename to Spigot-Server-Patches/0347-Use-an-EnumMap-for-Chunk-Height-Maps.patch
index 922b0a704d..a6f170293c 100644
--- a/Spigot-Server-Patches/0348-Use-an-EnumMap-for-Chunk-Height-Maps.patch
+++ b/Spigot-Server-Patches/0347-Use-an-EnumMap-for-Chunk-Height-Maps.patch
@@ -1,11 +1,11 @@
-From 8185aa6e6a07b058ebccba63a1ff495dd5561346 Mon Sep 17 00:00:00 2001
+From d220b6642224cbc4b6f2d901112592930e489b17 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 e90ce79a97..c168714411 100644
+index 82d8aca47f..84df69a00d 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/0349-Implement-Force-Loaded-Chunk-API.patch b/Spigot-Server-Patches/0348-Implement-Force-Loaded-Chunk-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0349-Implement-Force-Loaded-Chunk-API.patch
rename to Spigot-Server-Patches/0348-Implement-Force-Loaded-Chunk-API.patch
index 847b60c185..61c3da7179 100644
--- a/Spigot-Server-Patches/0349-Implement-Force-Loaded-Chunk-API.patch
+++ b/Spigot-Server-Patches/0348-Implement-Force-Loaded-Chunk-API.patch
@@ -1,4 +1,4 @@
-From c307438d3b9ac25b1f0ef0098db3efecf42f9058 Mon Sep 17 00:00:00 2001
+From 9757e7bf49913195d2867fd0d2d343cec1728054 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/0350-Inventory-removeItemAnySlot.patch b/Spigot-Server-Patches/0349-Inventory-removeItemAnySlot.patch
similarity index 97%
rename from Spigot-Server-Patches/0350-Inventory-removeItemAnySlot.patch
rename to Spigot-Server-Patches/0349-Inventory-removeItemAnySlot.patch
index 9e21f3f442..765e15aadd 100644
--- a/Spigot-Server-Patches/0350-Inventory-removeItemAnySlot.patch
+++ b/Spigot-Server-Patches/0349-Inventory-removeItemAnySlot.patch
@@ -1,4 +1,4 @@
-From e7c1c4daa76270e2e084477d2143aa3d76f9f108 Mon Sep 17 00:00:00 2001
+From 892f96e546a94d2428b5f44ff25a8f8be6978792 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/0351-Optimize-getChunkIfLoaded-type-calls.patch b/Spigot-Server-Patches/0350-Optimize-getChunkIfLoaded-type-calls.patch
similarity index 98%
rename from Spigot-Server-Patches/0351-Optimize-getChunkIfLoaded-type-calls.patch
rename to Spigot-Server-Patches/0350-Optimize-getChunkIfLoaded-type-calls.patch
index 3891254c18..2cd0f50299 100644
--- a/Spigot-Server-Patches/0351-Optimize-getChunkIfLoaded-type-calls.patch
+++ b/Spigot-Server-Patches/0350-Optimize-getChunkIfLoaded-type-calls.patch
@@ -1,4 +1,4 @@
-From f9d9e18d4f417f736a1db5a26add8ccd0498dfae Mon Sep 17 00:00:00 2001
+From d797aa17c60b25db601bf11249a7f7f4a50525ae 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/0352-Don-t-double-add-golems-to-world.patch b/Spigot-Server-Patches/0351-Don-t-double-add-golems-to-world.patch
similarity index 93%
rename from Spigot-Server-Patches/0352-Don-t-double-add-golems-to-world.patch
rename to Spigot-Server-Patches/0351-Don-t-double-add-golems-to-world.patch
index 2406360ac1..df869fb58f 100644
--- a/Spigot-Server-Patches/0352-Don-t-double-add-golems-to-world.patch
+++ b/Spigot-Server-Patches/0351-Don-t-double-add-golems-to-world.patch
@@ -1,4 +1,4 @@
-From c95185732a9e8093bb039092e5f663a1d2cabdcd Mon Sep 17 00:00:00 2001
+From 447e870f1658adb0b69fa54b9bd0282fb8637931 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
diff --git a/Spigot-Server-Patches/0353-fix-newlines-in-spigot-tab-list-API.patch b/Spigot-Server-Patches/0352-fix-newlines-in-spigot-tab-list-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0353-fix-newlines-in-spigot-tab-list-API.patch
rename to Spigot-Server-Patches/0352-fix-newlines-in-spigot-tab-list-API.patch
index 4274f62b57..176b825359 100644
--- a/Spigot-Server-Patches/0353-fix-newlines-in-spigot-tab-list-API.patch
+++ b/Spigot-Server-Patches/0352-fix-newlines-in-spigot-tab-list-API.patch
@@ -1,4 +1,4 @@
-From da4818fdaa1cfe8a528a1b2fc3bf81b3b11da253 Mon Sep 17 00:00:00 2001
+From 2d071eb90398dfd39229ed09c2b0f8383b484740 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
@@ -7,7 +7,7 @@ Spigots implementation around the header/footer strips newlines from the
 header/footer, this patch allows the tab list header/footer to retain newlines.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index f372f19dec..b6cf96e187 100644
+index 912b2e6284..6c78c2e823 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -370,20 +370,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0354-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/Spigot-Server-Patches/0353-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
similarity index 93%
rename from Spigot-Server-Patches/0354-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
rename to Spigot-Server-Patches/0353-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
index 3cf6350896..e16bb05ccd 100644
--- a/Spigot-Server-Patches/0354-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
+++ b/Spigot-Server-Patches/0353-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
@@ -1,4 +1,4 @@
-From 9b59314f27147a9fafdb72a79ed342b9d490f236 Mon Sep 17 00:00:00 2001
+From bb545ec01c987bda349ad566a357ffd156d27fc2 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/0355-Add-ray-tracing-methods-to-LivingEntity.patch b/Spigot-Server-Patches/0354-Add-ray-tracing-methods-to-LivingEntity.patch
similarity index 98%
rename from Spigot-Server-Patches/0355-Add-ray-tracing-methods-to-LivingEntity.patch
rename to Spigot-Server-Patches/0354-Add-ray-tracing-methods-to-LivingEntity.patch
index 5bf992c168..310040a379 100644
--- a/Spigot-Server-Patches/0355-Add-ray-tracing-methods-to-LivingEntity.patch
+++ b/Spigot-Server-Patches/0354-Add-ray-tracing-methods-to-LivingEntity.patch
@@ -1,4 +1,4 @@
-From 1534c8e99596ef82c5ddc970766bb61ec70fad2f Mon Sep 17 00:00:00 2001
+From 49bb1bff3fa47cdfc21ea8969f09a81547fb163f 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/0356-Fix-concurrency-and-performance-issues-in-DataFixers.patch b/Spigot-Server-Patches/0355-Fix-concurrency-and-performance-issues-in-DataFixers.patch
similarity index 99%
rename from Spigot-Server-Patches/0356-Fix-concurrency-and-performance-issues-in-DataFixers.patch
rename to Spigot-Server-Patches/0355-Fix-concurrency-and-performance-issues-in-DataFixers.patch
index 989c1f189b..844e1fddd3 100644
--- a/Spigot-Server-Patches/0356-Fix-concurrency-and-performance-issues-in-DataFixers.patch
+++ b/Spigot-Server-Patches/0355-Fix-concurrency-and-performance-issues-in-DataFixers.patch
@@ -1,4 +1,4 @@
-From 0e2f5e014cc3c60ca147438cfadc46d2ba35af18 Mon Sep 17 00:00:00 2001
+From 80d19bcec8e7e1f21557b903d9f7dc6707595bc5 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/0357-Expose-attack-cooldown-methods-for-Player.patch b/Spigot-Server-Patches/0356-Expose-attack-cooldown-methods-for-Player.patch
similarity index 95%
rename from Spigot-Server-Patches/0357-Expose-attack-cooldown-methods-for-Player.patch
rename to Spigot-Server-Patches/0356-Expose-attack-cooldown-methods-for-Player.patch
index 08a705e8b5..49da32e3f8 100644
--- a/Spigot-Server-Patches/0357-Expose-attack-cooldown-methods-for-Player.patch
+++ b/Spigot-Server-Patches/0356-Expose-attack-cooldown-methods-for-Player.patch
@@ -1,4 +1,4 @@
-From 21d3bda2506312892a2973ba2fa89e07cbdd62af Mon Sep 17 00:00:00 2001
+From 737b3741e2a934d12b78b38c6fecc782e13e6b64 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
@@ -27,7 +27,7 @@ index c7dc6fe0ef..3df3d5bbef 100644
          this.aH = 0;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b6cf96e187..44ee86ceec 100644
+index 6c78c2e823..2f9cff6e71 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1912,6 +1912,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0358-Fix-1420.patch b/Spigot-Server-Patches/0357-Fix-1420.patch
similarity index 97%
rename from Spigot-Server-Patches/0358-Fix-1420.patch
rename to Spigot-Server-Patches/0357-Fix-1420.patch
index c23c46225d..da385e2c52 100644
--- a/Spigot-Server-Patches/0358-Fix-1420.patch
+++ b/Spigot-Server-Patches/0357-Fix-1420.patch
@@ -1,4 +1,4 @@
-From 6f04f7a892215d899ffab167889decb91646f910 Mon Sep 17 00:00:00 2001
+From e06803bd62e09787db83ae3506c2785a567a83db 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/0359-MC-2025-Save-and-load-entity-AABB-to-prevent-wobble.patch b/Spigot-Server-Patches/0358-MC-2025-Save-and-load-entity-AABB-to-prevent-wobble.patch
similarity index 98%
rename from Spigot-Server-Patches/0359-MC-2025-Save-and-load-entity-AABB-to-prevent-wobble.patch
rename to Spigot-Server-Patches/0358-MC-2025-Save-and-load-entity-AABB-to-prevent-wobble.patch
index 38dd232365..3a76cf16b3 100644
--- a/Spigot-Server-Patches/0359-MC-2025-Save-and-load-entity-AABB-to-prevent-wobble.patch
+++ b/Spigot-Server-Patches/0358-MC-2025-Save-and-load-entity-AABB-to-prevent-wobble.patch
@@ -1,4 +1,4 @@
-From 06760ae0e6944c59417ca06dc8d8f3a0d4966c2b Mon Sep 17 00:00:00 2001
+From 5f45339526005282340d8f3f34f73a81b9f9d8ae 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/0360-Improve-death-events.patch b/Spigot-Server-Patches/0359-Improve-death-events.patch
similarity index 99%
rename from Spigot-Server-Patches/0360-Improve-death-events.patch
rename to Spigot-Server-Patches/0359-Improve-death-events.patch
index e33ce1f308..1c3135edb7 100644
--- a/Spigot-Server-Patches/0360-Improve-death-events.patch
+++ b/Spigot-Server-Patches/0359-Improve-death-events.patch
@@ -1,4 +1,4 @@
-From 1a5a911f338ba258f0f7f3c2c0a62c3ad7944ad1 Mon Sep 17 00:00:00 2001
+From d245361a96aedce40893a891bf4794177f4deb1a 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
@@ -285,7 +285,7 @@ index 17fab031b4..ee8219e3ba 100644
          this.minecraftKey = minecraftKey;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 44ee86ceec..bfb2f1a13c 100644
+index 2f9cff6e71..ac7fc0ef3e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1711,7 +1711,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0361-Allow-chests-to-be-placed-with-NBT-data.patch b/Spigot-Server-Patches/0360-Allow-chests-to-be-placed-with-NBT-data.patch
similarity index 91%
rename from Spigot-Server-Patches/0361-Allow-chests-to-be-placed-with-NBT-data.patch
rename to Spigot-Server-Patches/0360-Allow-chests-to-be-placed-with-NBT-data.patch
index 1d01bcd9e6..8f5a639ace 100644
--- a/Spigot-Server-Patches/0361-Allow-chests-to-be-placed-with-NBT-data.patch
+++ b/Spigot-Server-Patches/0360-Allow-chests-to-be-placed-with-NBT-data.patch
@@ -1,4 +1,4 @@
-From 3a42f991779ffb95f0b5c1b085ff93c4f42b82b2 Mon Sep 17 00:00:00 2001
+From 82a16bea42eb290e7b63fc376477140857a71bf6 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/Spigot-Server-Patches/0362-Mob-Pathfinding-API.patch b/Spigot-Server-Patches/0361-Mob-Pathfinding-API.patch
similarity index 99%
rename from Spigot-Server-Patches/0362-Mob-Pathfinding-API.patch
rename to Spigot-Server-Patches/0361-Mob-Pathfinding-API.patch
index 9e145b808f..2c7649fc19 100644
--- a/Spigot-Server-Patches/0362-Mob-Pathfinding-API.patch
+++ b/Spigot-Server-Patches/0361-Mob-Pathfinding-API.patch
@@ -1,4 +1,4 @@
-From 1d5af51b01ba30d990268c656d3a1491bf93a602 Mon Sep 17 00:00:00 2001
+From 6fc1ce9f3d6da7e3e418bfa524740713dd757ac0 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
diff --git a/Spigot-Server-Patches/0363-Prevent-chunk-loading-from-Fluid-Flowing.patch b/Spigot-Server-Patches/0362-Prevent-chunk-loading-from-Fluid-Flowing.patch
similarity index 98%
rename from Spigot-Server-Patches/0363-Prevent-chunk-loading-from-Fluid-Flowing.patch
rename to Spigot-Server-Patches/0362-Prevent-chunk-loading-from-Fluid-Flowing.patch
index 7cff7b849e..d90bcff04e 100644
--- a/Spigot-Server-Patches/0363-Prevent-chunk-loading-from-Fluid-Flowing.patch
+++ b/Spigot-Server-Patches/0362-Prevent-chunk-loading-from-Fluid-Flowing.patch
@@ -1,4 +1,4 @@
-From 60b335c4c30b65c189ec92f9d206ab27f509c819 Mon Sep 17 00:00:00 2001
+From c67be096b478f6cd80c274133e10a73f66320cb3 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-Prevent-pathfinding-from-loading-chunks.patch b/Spigot-Server-Patches/0363-Prevent-pathfinding-from-loading-chunks.patch
similarity index 99%
rename from Spigot-Server-Patches/0364-Prevent-pathfinding-from-loading-chunks.patch
rename to Spigot-Server-Patches/0363-Prevent-pathfinding-from-loading-chunks.patch
index d6327a6575..4b95ae928a 100644
--- a/Spigot-Server-Patches/0364-Prevent-pathfinding-from-loading-chunks.patch
+++ b/Spigot-Server-Patches/0363-Prevent-pathfinding-from-loading-chunks.patch
@@ -1,4 +1,4 @@
-From 7ae53ed7437264f2eaafc89bac6335aa08426080 Mon Sep 17 00:00:00 2001
+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/Spigot-Server-Patches/0365-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/Spigot-Server-Patches/0364-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
similarity index 98%
rename from Spigot-Server-Patches/0365-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
rename to Spigot-Server-Patches/0364-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
index fb588d4f47..78afecd9f5 100644
--- a/Spigot-Server-Patches/0365-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
+++ b/Spigot-Server-Patches/0364-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
@@ -1,4 +1,4 @@
-From ff23354e4d2492b02ac7ebc9031d2f572225edf1 Mon Sep 17 00:00:00 2001
+From c7cba25fff8b3dacf6a6ac702169f308be67770b 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/0366-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/Spigot-Server-Patches/0365-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
similarity index 98%
rename from Spigot-Server-Patches/0366-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
rename to Spigot-Server-Patches/0365-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
index 0a0ad1a866..e293062efa 100644
--- a/Spigot-Server-Patches/0366-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
+++ b/Spigot-Server-Patches/0365-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
@@ -1,11 +1,11 @@
-From 375de81611edaa5e75db81350c4bb68a7cd7ef20 Mon Sep 17 00:00:00 2001
+From 218e4454bb4c8e5f56a0d46a289f1621ea24fb6e 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 c168714411..1a1536f6cc 100644
+index 84df69a00d..63e7ba9a9a 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/0367-Prevent-mob-spawning-from-loading-generating-chunks.patch b/Spigot-Server-Patches/0366-Prevent-mob-spawning-from-loading-generating-chunks.patch
similarity index 97%
rename from Spigot-Server-Patches/0367-Prevent-mob-spawning-from-loading-generating-chunks.patch
rename to Spigot-Server-Patches/0366-Prevent-mob-spawning-from-loading-generating-chunks.patch
index eda8a4036a..2bbdbd84e6 100644
--- a/Spigot-Server-Patches/0367-Prevent-mob-spawning-from-loading-generating-chunks.patch
+++ b/Spigot-Server-Patches/0366-Prevent-mob-spawning-from-loading-generating-chunks.patch
@@ -1,4 +1,4 @@
-From e72b359ef8b673a1800aefb1724dce0257935750 Mon Sep 17 00:00:00 2001
+From 7ec849dea852e5a0cabe8f50a086bdfc0636b78b 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/0368-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/Spigot-Server-Patches/0367-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 98%
rename from Spigot-Server-Patches/0368-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to Spigot-Server-Patches/0367-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
index 9b316e6fd4..6eefd835d5 100644
--- a/Spigot-Server-Patches/0368-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
+++ b/Spigot-Server-Patches/0367-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
@@ -1,4 +1,4 @@
-From cf98648bd5d08bd79ea1a6b518a76ea503a2b11e Mon Sep 17 00:00:00 2001
+From 39ac4e554ae280c1dd3a3cfb6be744c15ec0b266 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/0369-Optimize-and-Fix-ExpiringMap-Issues.patch b/Spigot-Server-Patches/0368-Optimize-and-Fix-ExpiringMap-Issues.patch
similarity index 99%
rename from Spigot-Server-Patches/0369-Optimize-and-Fix-ExpiringMap-Issues.patch
rename to Spigot-Server-Patches/0368-Optimize-and-Fix-ExpiringMap-Issues.patch
index edd02f135b..3d3b1d3d09 100644
--- a/Spigot-Server-Patches/0369-Optimize-and-Fix-ExpiringMap-Issues.patch
+++ b/Spigot-Server-Patches/0368-Optimize-and-Fix-ExpiringMap-Issues.patch
@@ -1,4 +1,4 @@
-From 2656fdb27028522ddd965a5e7ffbec05e0c00892 Mon Sep 17 00:00:00 2001
+From 1fe8b3bfa12c02879dc017cfa6435ac9225fdf5e 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/0370-Implement-furnace-cook-speed-multiplier-API.patch b/Spigot-Server-Patches/0369-Implement-furnace-cook-speed-multiplier-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0370-Implement-furnace-cook-speed-multiplier-API.patch
rename to Spigot-Server-Patches/0369-Implement-furnace-cook-speed-multiplier-API.patch
index 38c8613021..e7a4eb058d 100644
--- a/Spigot-Server-Patches/0370-Implement-furnace-cook-speed-multiplier-API.patch
+++ b/Spigot-Server-Patches/0369-Implement-furnace-cook-speed-multiplier-API.patch
@@ -1,4 +1,4 @@
-From 838c1ae863a5485fb9d229eaa79b55e699cb3d5a Mon Sep 17 00:00:00 2001
+From 2db7829c9a28d4c3029e83d3a90f918dc16ce870 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/0371-Support-Overriding-World-Seeds.patch b/Spigot-Server-Patches/0370-Support-Overriding-World-Seeds.patch
similarity index 97%
rename from Spigot-Server-Patches/0371-Support-Overriding-World-Seeds.patch
rename to Spigot-Server-Patches/0370-Support-Overriding-World-Seeds.patch
index 9e6ec36d5e..58e68fb1b7 100644
--- a/Spigot-Server-Patches/0371-Support-Overriding-World-Seeds.patch
+++ b/Spigot-Server-Patches/0370-Support-Overriding-World-Seeds.patch
@@ -1,4 +1,4 @@
-From 2562c8931380955bc4255ff5d004824f043452f6 Mon Sep 17 00:00:00 2001
+From af345c69a55e2a31773cfb44df7b1301f8f43c44 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 2a0ce06212..fca18fbb81 100644
+index 4bb81a09a8..da710cc6fe 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;
@@ -34,7 +34,7 @@ index 2a0ce06212..fca18fbb81 100644
  import org.bukkit.configuration.InvalidConfigurationException;
  import org.bukkit.configuration.file.YamlConfiguration;
  import co.aikar.timings.Timings;
-@@ -356,4 +358,23 @@ public class PaperConfig {
+@@ -351,4 +353,23 @@ public class PaperConfig {
          }
          tabSpamLimit = getInt("settings.spam-limiter.tab-spam-limit", tabSpamLimit);
      }
diff --git a/Spigot-Server-Patches/0372-Optimize-Server-World-Map.patch b/Spigot-Server-Patches/0371-Optimize-Server-World-Map.patch
similarity index 99%
rename from Spigot-Server-Patches/0372-Optimize-Server-World-Map.patch
rename to Spigot-Server-Patches/0371-Optimize-Server-World-Map.patch
index 557a2a4060..d77754ec04 100644
--- a/Spigot-Server-Patches/0372-Optimize-Server-World-Map.patch
+++ b/Spigot-Server-Patches/0371-Optimize-Server-World-Map.patch
@@ -1,4 +1,4 @@
-From 30328eb22c58af758c294a0f708aba4fa3dd15e9 Mon Sep 17 00:00:00 2001
+From 821db2216e06dc3d67fb3baaffa213cf7eae7f51 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/0373-PreSpawnerSpawnEvent.patch b/Spigot-Server-Patches/0372-PreSpawnerSpawnEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0373-PreSpawnerSpawnEvent.patch
rename to Spigot-Server-Patches/0372-PreSpawnerSpawnEvent.patch
index 4a86f73fbe..d18d33e72d 100644
--- a/Spigot-Server-Patches/0373-PreSpawnerSpawnEvent.patch
+++ b/Spigot-Server-Patches/0372-PreSpawnerSpawnEvent.patch
@@ -1,4 +1,4 @@
-From ea811dc6ea87571032471d66be272a2e7dadc67b Mon Sep 17 00:00:00 2001
+From 259f5a016d4058c012a8a303459e2016b4f00724 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/0374-MC-134115-Fix-Double-Chest-Conversion-Error.patch b/Spigot-Server-Patches/0373-MC-134115-Fix-Double-Chest-Conversion-Error.patch
similarity index 97%
rename from Spigot-Server-Patches/0374-MC-134115-Fix-Double-Chest-Conversion-Error.patch
rename to Spigot-Server-Patches/0373-MC-134115-Fix-Double-Chest-Conversion-Error.patch
index f3b6bc7847..1b802ec5a0 100644
--- a/Spigot-Server-Patches/0374-MC-134115-Fix-Double-Chest-Conversion-Error.patch
+++ b/Spigot-Server-Patches/0373-MC-134115-Fix-Double-Chest-Conversion-Error.patch
@@ -1,4 +1,4 @@
-From 27162b901293a5b7fb8c4f0ed5478d87820413e4 Mon Sep 17 00:00:00 2001
+From f76e3c781a1cadadc69bb96ba9d74ef4f2e6d746 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 1a1536f6cc..a0d08a89a3 100644
+index 63e7ba9a9a..53aab97866 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/0375-Catch-JsonParseException-in-Entity-and-TE-names.patch b/Spigot-Server-Patches/0374-Catch-JsonParseException-in-Entity-and-TE-names.patch
similarity index 99%
rename from Spigot-Server-Patches/0375-Catch-JsonParseException-in-Entity-and-TE-names.patch
rename to Spigot-Server-Patches/0374-Catch-JsonParseException-in-Entity-and-TE-names.patch
index 8cd16061e7..5c9f551ca0 100644
--- a/Spigot-Server-Patches/0375-Catch-JsonParseException-in-Entity-and-TE-names.patch
+++ b/Spigot-Server-Patches/0374-Catch-JsonParseException-in-Entity-and-TE-names.patch
@@ -1,4 +1,4 @@
-From cf485d4bf8b9b36444afdecb12a41edb3901f400 Mon Sep 17 00:00:00 2001
+From d1f048e1a9846bf688bd9f099cdb00ae37fb4990 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
diff --git a/Spigot-Server-Patches/0377-Avoid-dimension-id-collisions.patch b/Spigot-Server-Patches/0375-Avoid-dimension-id-collisions.patch
similarity index 94%
rename from Spigot-Server-Patches/0377-Avoid-dimension-id-collisions.patch
rename to Spigot-Server-Patches/0375-Avoid-dimension-id-collisions.patch
index b198afe46a..f24e1d33c7 100644
--- a/Spigot-Server-Patches/0377-Avoid-dimension-id-collisions.patch
+++ b/Spigot-Server-Patches/0375-Avoid-dimension-id-collisions.patch
@@ -1,4 +1,4 @@
-From 2b2384045aafaf4dfeafc598a5bb92c830918a54 Mon Sep 17 00:00:00 2001
+From 724231fe16ef4bf8df4ac0841d87856f67f8d21b 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-Enable-experimental-ASM-support-for-Java-11-plugins.patch b/Spigot-Server-Patches/0376-Enable-experimental-ASM-support-for-Java-11-plugins.patch
deleted file mode 100644
index 6af6f6b5f6..0000000000
--- a/Spigot-Server-Patches/0376-Enable-experimental-ASM-support-for-Java-11-plugins.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From ebeed82ef328c09d7247d0c4b8e6d436c95498dc Mon Sep 17 00:00:00 2001
-From: Kyle Wood <demonwav@gmail.com>
-Date: Sun, 23 Sep 2018 12:52:21 -0500
-Subject: [PATCH] Enable experimental ASM support for Java 11 plugins
-
-JEP 181 brings a new bytecode format for nest mates. ASM API 7 supports
-this, but API 7 is still experimental. Attempting to load a Java 11
-class that contains nest mates will cause an
-UnsupportedOperationException, as API 6 can't handle them. This doesn't
-really require any changes to the rest of the code, since this is just
-related to ASM's visitor.
-
-We want to use the stable API 6 for all other plugins, only using the
-experimental API when required, so we check the class version first.
-
-This should be removed as soon as ASM API 7 is stable.
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
-index d172a1aebc..7f2a73d6f8 100644
---- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
-+++ b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
-@@ -127,7 +127,16 @@ public class Commodore
-         ClassReader cr = new ClassReader( b );
-         ClassWriter cw = new ClassWriter( cr, 0 );
- 
--        cr.accept( new ClassVisitor( Opcodes.ASM6, cw )
-+        // Paper start - experimental support of Java 11
-+        final int apiVersion;
-+        if ( cr.readShort(6) == Opcodes.V11 ) {
-+            apiVersion = Opcodes.ASM7_EXPERIMENTAL;
-+        } else {
-+            apiVersion = Opcodes.ASM6;
-+        }
-+
-+        cr.accept( new ClassVisitor( apiVersion, cw )
-+        // Paper end - experimental support of Java 11
-         {
-             @Override
-             public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions)
--- 
-2.19.0
-
diff --git a/Spigot-Server-Patches/0378-Honor-EntityAgeable.ageLock.patch b/Spigot-Server-Patches/0376-Honor-EntityAgeable.ageLock.patch
similarity index 91%
rename from Spigot-Server-Patches/0378-Honor-EntityAgeable.ageLock.patch
rename to Spigot-Server-Patches/0376-Honor-EntityAgeable.ageLock.patch
index 7ba81bcf9b..5f180ced26 100644
--- a/Spigot-Server-Patches/0378-Honor-EntityAgeable.ageLock.patch
+++ b/Spigot-Server-Patches/0376-Honor-EntityAgeable.ageLock.patch
@@ -1,4 +1,4 @@
-From 5cae988d74542611a68c0b657ec3fb5c277dc6f2 Mon Sep 17 00:00:00 2001
+From 38e55d08998ee1d472135e3fe9e32628ec176e34 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/0379-Async-Chunk-Loading-and-Generation.patch b/Spigot-Server-Patches/0377-Async-Chunk-Loading-and-Generation.patch
similarity index 97%
rename from Spigot-Server-Patches/0379-Async-Chunk-Loading-and-Generation.patch
rename to Spigot-Server-Patches/0377-Async-Chunk-Loading-and-Generation.patch
index 18175ee4cf..71b7d14715 100644
--- a/Spigot-Server-Patches/0379-Async-Chunk-Loading-and-Generation.patch
+++ b/Spigot-Server-Patches/0377-Async-Chunk-Loading-and-Generation.patch
@@ -1,4 +1,4 @@
-From 0748d98c1a276904da0c772e8117026d7e3662ef Mon Sep 17 00:00:00 2001
+From bce7593da2a2876e500cc9404bb898fe2fd276a2 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
@@ -43,10 +43,10 @@ reading or writing to the chunk will be safe, so plugins still
 should not be touching chunks asynchronously!
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index fca18fbb81..ce52733840 100644
+index da710cc6fe..6b65364e22 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -377,4 +377,15 @@ public class PaperConfig {
+@@ -372,4 +372,15 @@ public class PaperConfig {
              }
          }
      }
@@ -345,47 +345,8 @@ index 0000000000..8dfed1a8cf
 +    };
 +
 +}
-diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index a0d08a89a3..e885dd5755 100644
---- a/src/main/java/net/minecraft/server/Chunk.java
-+++ b/src/main/java/net/minecraft/server/Chunk.java
-@@ -929,6 +929,7 @@ public class Chunk implements IChunkAccess {
-     }
- 
-     public void addEntities() {
-+        ChunkMap.onPostLoad(this); // Paper
-         this.i = true;
-         this.world.a(this.tileEntities.values());
-         List[] aentityslice = this.entitySlices; // Spigot
-diff --git a/src/main/java/net/minecraft/server/ChunkMap.java b/src/main/java/net/minecraft/server/ChunkMap.java
-index b941676829..1b85520775 100644
---- a/src/main/java/net/minecraft/server/ChunkMap.java
-+++ b/src/main/java/net/minecraft/server/ChunkMap.java
-@@ -48,7 +48,13 @@ public class ChunkMap extends Long2ObjectOpenHashMap<Chunk> {
-                 }
-             }
-         }
-+
-         chunk.world.timings.syncChunkLoadPostTimer.stopTiming(); // Paper
-+        // Paper start
-+        return chunk1;
-+    }
-+    static void onPostLoad(Chunk chunk) {
-+        // Paper end
- 
-         if (chunk.newChunk) {
-             chunk.world.timings.syncChunkLoadPopulateTimer.startTiming(); // Paper
-@@ -76,7 +82,7 @@ public class ChunkMap extends Long2ObjectOpenHashMap<Chunk> {
-         }
-         // CraftBukkit end
- 
--        return chunk1;
-+        //return chunk1; // Paper
-     }
- 
-     public Chunk a(Long olong, Chunk chunk) {
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 5b57ea93c8..4f36ddc042 100644
+index 5b57ea93c8..5d5834ba7f 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -38,9 +38,9 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -515,12 +476,6 @@ index 5b57ea93c8..4f36ddc042 100644
  
      }
  
-@@ -430,4 +487,5 @@ public class ChunkProviderServer implements IChunkProvider {
-     public boolean isLoaded(int i, int j) {
-         return this.chunks.containsKey(ChunkCoordIntPair.a(i, j));
-     }
-+
- }
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 index c233b7e903..edd0742527 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -670,14 +625,14 @@ index 4698ee99f8..dfb45cc4ea 100644
      Chunk a(GeneratorAccess generatoraccess, int i, int j, Consumer<Chunk> consumer) throws IOException;
  
 diff --git a/src/main/java/net/minecraft/server/MathHelper.java b/src/main/java/net/minecraft/server/MathHelper.java
-index 49fba0979e..c6661851d1 100644
+index 49fba0979e..9ad646f8d4 100644
 --- a/src/main/java/net/minecraft/server/MathHelper.java
 +++ b/src/main/java/net/minecraft/server/MathHelper.java
 @@ -142,6 +142,7 @@ public class MathHelper {
          return Math.floorMod(i, j);
      }
  
-+    public static float normalizeYaw(float fx) { return g(fx); } // Paper
++    public static float normalizeYaw(float fx) { return g(fx); } // Paper - OBFHELPER
      public static float g(float fx) {
          fx = fx % 360.0F;
          if (fx >= 180.0F) {
@@ -780,10 +735,10 @@ index 98d182fdb8..487d98eb1b 100644
  
 diff --git a/src/main/java/net/minecraft/server/PaperAsyncChunkProvider.java b/src/main/java/net/minecraft/server/PaperAsyncChunkProvider.java
 new file mode 100644
-index 0000000000..604f1db287
+index 0000000000..47d9ecdbf1
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/PaperAsyncChunkProvider.java
-@@ -0,0 +1,478 @@
+@@ -0,0 +1,475 @@
 +/*
 + * This file is licensed under the MIT License (MIT).
 + *
@@ -1189,9 +1144,6 @@ index 0000000000..604f1db287
 +                    chunkLoader.loadEntities(pendingLevel, chunk);
 +                    pendingLevel = null;
 +                }
-+                if (!chunk.newChunk) {
-+                    chunk.setLastSaved(chunk.world.getTime());
-+                }
 +                synchronized (chunks) {
 +                    final Chunk other = chunks.get(key);
 +                    if (other != null) {
diff --git a/Spigot-Server-Patches/0380-Ignore-Dimension-NBT-field-in-Entity-data.patch b/Spigot-Server-Patches/0378-Ignore-Dimension-NBT-field-in-Entity-data.patch
similarity index 97%
rename from Spigot-Server-Patches/0380-Ignore-Dimension-NBT-field-in-Entity-data.patch
rename to Spigot-Server-Patches/0378-Ignore-Dimension-NBT-field-in-Entity-data.patch
index e10d4f78fc..3a1113922d 100644
--- a/Spigot-Server-Patches/0380-Ignore-Dimension-NBT-field-in-Entity-data.patch
+++ b/Spigot-Server-Patches/0378-Ignore-Dimension-NBT-field-in-Entity-data.patch
@@ -1,4 +1,4 @@
-From e46e19ead9f4a448a08718c466bade12cb589794 Mon Sep 17 00:00:00 2001
+From d5fbc8011efa46a6a01adffe0d2d308e785b0e14 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/0381-Fix-turtle-lag.patch b/Spigot-Server-Patches/0379-Fix-turtle-lag.patch
similarity index 91%
rename from Spigot-Server-Patches/0381-Fix-turtle-lag.patch
rename to Spigot-Server-Patches/0379-Fix-turtle-lag.patch
index c323b4d320..74cec66197 100644
--- a/Spigot-Server-Patches/0381-Fix-turtle-lag.patch
+++ b/Spigot-Server-Patches/0379-Fix-turtle-lag.patch
@@ -1,11 +1,11 @@
-From 91dc08eca1f9c64aa2f8f712a314e2b8d57faf0f Mon Sep 17 00:00:00 2001
+From 22d541c4acb10c02491d426d9d43961369d6a7a0 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..b515eeb23 100644
+index 1b09f577e9..b515eeb230 100644
 --- a/src/main/java/net/minecraft/server/EntityTurtle.java
 +++ b/src/main/java/net/minecraft/server/EntityTurtle.java
 @@ -68,6 +68,7 @@ public class EntityTurtle extends EntityAnimal {
diff --git a/work/Bukkit b/work/Bukkit
index 0812ce2cce..39ce5d3a8a 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 0812ce2ccec4dce83fe382965242e35ec4022fac
+Subproject commit 39ce5d3a8ab15140d51a186670f8d31f18d31fae
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 4824655c89..1cf8b5dc1b 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 4824655c8972cc9b6dbfb152767e33aa90628d33
+Subproject commit 1cf8b5dc1b55459f9a470860f820310294b48787