From 05466e3b476a2d223f8f88fe163612c9aa396817 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 5 Aug 2018 19:46:43 -0400
Subject: [PATCH] [Auto] Update Upstream

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

Bukkit Changes:
d2834556 SPIGOT-4219: Event for PigZombies angering.

CraftBukkit Changes:
a9c796f1 SPIGOT-4184: Fix furnaces not matching Vanilla smelt or animations
195f071e SPIGOT-4219: Event for PigZombies angering.
5e3082c7 SPIGOT-4230: Improve legacy block types
---
 .../0068-Fix-Furnace-cook-time-bug.patch      | 26 ---------------
 ...68-Handle-Item-Meta-Inconsistencies.patch} |  2 +-
 ...rable-Non-Player-Arrow-Despawn-Rate.patch} |  6 ++--
 ...atch => 0070-Add-World-Util-Methods.patch} |  6 ++--
 ...1-Optimized-Light-Level-Comparisons.patch} |  2 +-
 ...0072-Pass-world-to-Village-creation.patch} |  6 ++--
 ...-Custom-replacement-for-eaten-items.patch} |  2 +-
 ...h-absorb-values-and-repair-bad-data.patch} |  2 +-
 ...tch-Async-PlayerChunkMap-operations.patch} |  4 +--
 ...ch => 0076-Waving-banner-workaround.patch} |  4 +--
 ...77-Use-a-Shared-Random-for-Entities.patch} |  6 ++--
 ...> 0078-Don-t-teleport-dead-entities.patch} |  6 ++--
 ...patch => 0079-Optimize-Chunk-Access.patch} |  2 +-
 ...e-spawn-chances-for-skeleton-horses.patch} |  6 ++--
 ...ocation-getType-and-getBlockData-fo.patch} | 12 +++----
 ... 0082-Access-items-by-EquipmentSlot.patch} |  4 +--
 ...able-BlockPhysicsEvent-for-Redstone.patch} |  8 ++---
 ...ntity-AddTo-RemoveFrom-World-Events.patch} |  4 +--
 ...-Configurable-Chunk-Inhabited-Timer.patch} |  2 +-
 ...t.patch => 0086-EntityPathfindEvent.patch} |  4 +--
 ...ce-IO-ops-opening-a-new-region-file.patch} |  4 +--
 ...gionFileCache-and-make-configurable.patch} |  6 ++--
 ...h => 0089-Use-Optimized-Collections.patch} |  4 +--
 ...Do-not-load-chunks-for-light-checks.patch} |  4 +--
 ...091-Add-PlayerUseUnknownEntityEvent.patch} |  6 ++--
 ...DebugInfo-not-initialized-on-client.patch} |  4 +--
 ...Configurable-Grass-Spread-Tick-Rate.patch} |  6 ++--
 ...e-Keep-Spawn-Loaded-range-per-world.patch} | 12 +++----
 ...-BlockPlaceEvent-triggering-physics.patch} |  4 +--
 ...m-reload-spawn-chunks-in-nether-end.patch} |  6 ++--
 ...7-Remove-Debug-checks-from-DataBits.patch} |  4 +--
 ...illa-per-world-scoreboard-coloring-.patch} | 10 +++---
 ...d-for-setting-passengers-on-players.patch} |  4 +--
 ...emove-unused-World-Tile-Entity-List.patch} |  4 +--
 ... 0101-Don-t-tick-Skulls-unused-code.patch} |  4 +--
 ... 0102-Configurable-Player-Collision.patch} | 10 +++---
 ...nt-to-allow-plugins-to-handle-clien.patch} |  4 +--
 ...> 0104-Configurable-RCON-IP-address.patch} |  6 ++--
 ...05-Prevent-Fire-from-loading-chunks.patch} |  4 +--
 ...6-Implement-PlayerLocaleChangeEvent.patch} |  2 +-
 ...tyRegainHealthEvent-isFastRegen-API.patch} |  2 +-
 ...to-configure-frosted_ice-properties.patch} |  6 ++--
 ...possibility-for-getServer-singleton.patch} |  4 +--
 ...tem-frames-performance-and-bug-fixe.patch} | 12 +++----
 ...API-Replenishable-Lootables-Feature.patch} | 32 +++++++++----------
 ...-Do-not-load-chunks-for-pathfinding.patch} |  2 +-
 ...> 0113-Entity-Tracking-Improvements.patch} |  8 ++---
 ...-scoreboard-teams-to-scoreboard.dat.patch} |  6 ++--
 ... 0115-Fix-Chunk-Unload-Queue-Issues.patch} |  4 +--
 ...em-property-for-disabling-watchdoge.patch} |  2 +-
 ...mize-EAR.patch => 0117-Optimize-EAR.patch} |  2 +-
 ...0118-Optimize-UserCache-Thread-Safe.patch} |  4 +--
 ...locking-on-Network-Manager-creation.patch} |  2 +-
 ...-Optional-TNT-doesn-t-move-in-water.patch} | 10 +++---
 ...-redstone-torch-rapid-clock-removal.patch} |  2 +-
 ...Ensure-Chunks-never-ever-load-async.patch} |  2 +-
 ...h => 0123-Add-server-name-parameter.patch} |  4 +--
 ...n-Wither-Death-sounds-to-same-world.patch} |  2 +-
 ...nk-Unloads-based-on-Player-Movement.patch} | 18 +++++------
 ...=> 0126-Fix-Double-World-Add-issues.patch} |  6 ++--
 ...tch => 0127-Fix-Old-Sign-Conversion.patch} |  2 +-
 ...-profiles-that-have-no-UUID-and-no-.patch} |  2 +-
 ...ative-vehicle-moved-wrongly-message.patch} |  4 +--
 ...rs-that-dismount-from-other-players.patch} |  2 +-
 ...etting-for-proxy-online-mode-status.patch} |  6 ++--
 ...-BlockStateEnum-hashCode-and-equals.patch} |  2 +-
 ...0133-Disable-ticking-of-snow-blocks.patch} |  2 +-
 ...34-Fix-AIOOBE-in-inventory-handling.patch} |  2 +-
 ...nfigurable-packet-in-spam-threshold.patch} |  6 ++--
 ...6-Configurable-flying-kick-messages.patch} |  6 ++--
 ...atch => 0137-Auto-Save-Improvements.patch} |  4 +--
 ...ch => 0138-Chunk-registration-fixes.patch} |  2 +-
 ...k-reference-on-Craft-Entity-removal.patch} |  2 +-
 ...to-fix-bad-Y-levels-on-player-login.patch} |  4 +--
 ...ch => 0141-Disable-Vanilla-Chunk-GC.patch} |  2 +-
 ...ion-to-remove-corrupt-tile-entities.patch} |  6 ++--
 ...nt.patch => 0143-Add-EntityZapEvent.patch} |  2 +-
 ...hunks-from-Hoppers-and-other-things.patch} |  2 +-
 ...ent-Auto-Save-if-Save-Queue-is-full.patch} |  2 +-
 ... 0146-Chunk-Save-Stats-Debug-Option.patch} |  2 +-
 ...-from-ArmorStand-and-SpawnEgg-items.patch} |  6 ++--
 ...48-Cache-user-authenticator-threads.patch} |  2 +-
 ...atch => 0149-Optimize-Network-Queue.patch} |  4 +--
 ....patch => 0150-Optimise-removeQueue.patch} |  2 +-
 ...-Allow-Reloading-of-Command-Aliases.patch} |  4 +--
 ...-Add-source-to-PlayerExpChangeEvent.patch} |  2 +-
 ...mize-World.isLoaded-BlockPosition-Z.patch} |  4 +--
 ...-Don-t-let-fishinghooks-use-portals.patch} |  8 ++---
 ... => 0155-Add-ProjectileCollideEvent.patch} |  2 +-
 ...ent-Pathfinding-out-of-World-Border.patch} |  2 +-
 ...Bound-Treasure-Maps-to-World-Border.patch} |  2 +-
 ...igurable-Cartographer-Treasure-Maps.patch} |  6 ++--
 ... => 0159-Optimize-ItemStack.isEmpty.patch} |  4 +--
 ...o-control-if-armour-stands-can-move.patch} |  6 ++--
 ...option-to-remove-invalid-statistics.patch} |  6 ++--
 ...2-Properly-fix-item-duplication-bug.patch} |  2 +-
 ...=> 0163-String-based-Action-Bar-API.patch} |  6 ++--
 ... 0164-Activation-Range-Improvements.patch} |  2 +-
 ...-API-s.patch => 0165-Firework-API-s.patch} |  2 +-
 ... 0166-PlayerTeleportEndGatewayEvent.patch} |  2 +-
 ... => 0167-ShulkerBox-Dupe-Prevention.patch} |  2 +-
 ...ovide-E-TE-Chunk-count-stat-methods.patch} |  4 +--
 ...h => 0169-Enforce-Sync-Player-Saves.patch} |  2 +-
 ... => 0170-Enforce-Sync-Chunk-Unloads.patch} |  4 +--
 ...low-entities-to-ride-themselves-572.patch} |  6 ++--
 ...atch => 0172-Fix-block-break-desync.patch} |  4 +--
 ...I-for-Reason-Source-Triggering-play.patch} |  2 +-
 ...patch => 0174-Cap-Entity-Collisions.patch} |  2 +-
 ...-CraftScheduler-Async-Task-Debugger.patch} |  2 +-
 ...g.patch => 0176-Shame-on-you-Mojang.patch} |  2 +-
 ...ore-aggressive-in-the-chunk-unload-.patch} |  2 +-
 ...> 0178-Do-not-let-armorstands-drown.patch} |  2 +-
 ...e-async-calls-to-restart-the-server.patch} |  4 +--
 ...roperty-to-disable-book-size-limits.patch} |  2 +-
 ...e-parrots-stay-on-shoulders-despite.patch} |  4 +--
 ...-option-to-prevent-player-names-fro.patch} |  6 ++--
 ...leAppender-for-console-improvements.patch} |  8 ++---
 ...rable-option-to-disable-creeper-lin.patch} |  6 ++--
 ....patch => 0185-Item-canEntityPickup.patch} |  2 +-
 ...layerPickupItemEvent-setFlyAtPlayer.patch} |  2 +-
 ...> 0187-PlayerAttemptPickupItemEvent.patch} |  2 +-
 ...tch => 0188-Add-UnknownCommandEvent.patch} |  4 +--
 ...tch => 0189-Basic-PlayerProfile-API.patch} |  2 +-
 ... 0190-Shoulder-Entities-Release-API.patch} |  2 +-
 ...patch => 0191-Profile-Lookup-Events.patch} |  2 +-
 ...layer-logins-during-server-shutdown.patch} |  4 +--
 ...patch => 0193-Entity-fromMobSpawner.patch} | 10 +++---
 ...0194-Fix-Anvil-Level-sync-to-client.patch} |  6 ++--
 ...ages-for-getTileEntity-in-order-to-.patch} |  2 +-
 ...6-Improve-the-Saddle-API-for-Horses.patch} |  2 +-
 ...plement-ensureServerConversions-API.patch} |  4 +--
 ...> 0198-Implement-getI18NDisplayName.patch} |  8 ++---
 ...ving-disabled-before-unloading-all-.patch} |  2 +-
 ...=> 0200-ProfileWhitelistVerifyEvent.patch} |  2 +-
 ...ch => 0201-Fix-this-stupid-bullshit.patch} |  4 +--
 ...wns-should-honor-nametags-and-leash.patch} |  2 +-
 ...mer-when-spawner-event-is-cancelled.patch} |  2 +-
 ...4-Fix-MC-117075-TE-Unload-Lag-Spike.patch} |  4 +--
 ...a-custom-authentication-servers-dow.patch} |  4 +--
 ...atch => 0206-LivingEntity-setKiller.patch} |  4 +--
 ...ms-to-redirect-System.out-err-to-lo.patch} |  2 +-
 ...-prefixes-using-Log4J-configuration.patch} |  4 +--
 ...Include-Log4J2-SLF4J-implementation.patch} |  2 +-
 ...efix-for-various-plugins-bypassing-.patch} |  2 +-
 ...t.patch => 0211-Add-PlayerJumpEvent.patch} |  6 ++--
 ...-handle-PacketPlayInKeepAlive-async.patch} |  2 +-
 ...t-protocol-version-and-virtual-host.patch} | 12 +++----
 ...t-serverside-behavior-of-keepalives.patch} |  2 +-
 ...ith-fastutil-s-ObjectOpenHashSet-in.patch} |  2 +-
 ...Effects-only-to-players-who-can-see.patch} |  6 ++--
 ...maximum-exp-value-when-merging-orbs.patch} |  4 +--
 ... => 0218-Add-PlayerArmorChangeEvent.patch} |  2 +-
 ...om-being-processed-when-the-player-.patch} |  4 +--
 ...-implementations-for-captured-block.patch} |  4 +--
 ...get-a-BlockState-without-a-snapshot.patch} |  4 +--
 ...patch => 0222-AsyncTabCompleteEvent.patch} |  6 ++--
 ...23-Avoid-NPE-in-PathfinderGoalTempt.patch} |  2 +-
 ...=> 0224-PlayerPickupExperienceEvent.patch} |  2 +-
 ...tch => 0225-ExperienceOrbMergeEvent.patch} |  4 +--
 ...-Ability-to-apply-mending-to-XP-API.patch} | 10 +++---
 ...rable-Chunks-Sends-per-Tick-setting.patch} |  6 ++--
 ...onfigurable-Max-Chunk-Gens-per-Tick.patch} | 12 +++----
 ...max-squid-spawn-height-configurable.patch} |  6 ++--
 ...patch => 0230-PreCreatureSpawnEvent.patch} |  2 +-
 ...-PlayerNaturallySpawnCreaturesEvent.patch} |  2 +-
 ...-Add-SkullMeta.setPlayerProfile-API.patch} |  4 +--
 ...> 0233-Fill-Profile-Property-Events.patch} |  2 +-
 ...layerAdvancementCriterionGrantEvent.patch} |  2 +-
 ...ch => 0235-Add-ArmorStand-Item-Meta.patch} |  2 +-
 ...Extend-Player-Interact-cancellation.patch} |  2 +-
 ... 0237-Tameable-getOwnerUniqueId-API.patch} |  2 +-
 ...-crits-helps-mitigate-hacked-client.patch} |  6 ++--
 ...ing-location-from-InventoryEnderChe.patch} |  2 +-
 ...ted-Ice-from-loading-holding-chunks.patch} |  2 +-
 ...e-Explicit-Network-Manager-Flushing.patch} |  2 +-
 ...t-extended-PaperServerListPingEvent.patch} |  6 ++--
 ... 0243-Improved-Async-Task-Scheduler.patch} |  2 +-
 ...-PlayerProfile-in-AsyncPreLoginEven.patch} |  2 +-
 ...-PortalCreateEvent-for-exit-portals.patch} |  4 +--
 ...=> 0246-Player.setPlayerProfile-API.patch} |  8 ++---
 ...h => 0247-Fix-Dragon-Server-Crashes.patch} |  2 +-
 ...patch => 0248-getPlayerUniqueId-API.patch} |  4 +--
 ...ake-player-data-saving-configurable.patch} |  6 ++--
 ...e-legacy-ping-handler-more-reliable.patch} |  2 +-
 ...erverListPingEvent-for-legacy-pings.patch} |  2 +-
 ...2-Flag-to-disable-the-channel-limit.patch} |  4 +--
 ...-method-to-open-already-placed-sign.patch} |  2 +-
 ...oad-version-history-at-server-start.patch} |  2 +-
 ...rable-sprint-interruption-on-attack.patch} |  6 ++--
 ...allowed-colored-signs-to-be-created.patch} |  4 +--
 ...t.patch => 0257-EndermanEscapeEvent.patch} |  2 +-
 ...h => 0258-Enderman.teleportRandomly.patch} |  2 +-
 ...259-Block-Enderpearl-Travel-Exploit.patch} |  6 ++--
 ...d.spawnParticle-API-and-add-Builder.patch} |  2 +-
 ...h => 0261-EndermanAttackPlayerEvent.patch} |  2 +-
 ...tch => 0262-WitchConsumePotionEvent.patch} |  2 +-
 ...patch => 0263-WitchThrowPotionEvent.patch} |  2 +-
 ...tem-entities-with-World.spawnEntity.patch} |  2 +-
 ...oad-chunks-for-villager-door-checks.patch} |  2 +-
 ...patch => 0266-WitchReadyPotionEvent.patch} |  2 +-
 ...267-ItemStack-getMaxItemUseDuration.patch} |  4 +--
 ...ement-EntityTeleportEndGatewayEvent.patch} |  2 +-
 ...d-flag-on-cancel-of-Explosion-Event.patch} |  2 +-
 ...move-entities-on-dimension-teleport.patch} |  8 ++---
 ...ch => 0271-Fix-CraftEntity-hashCode.patch} |  2 +-
 ...e-Alternative-LootPool-Luck-Formula.patch} |  6 ++--
 ...ls-when-failing-to-save-player-data.patch} |  2 +-
 ...-shield-blocking-delay-configurable.patch} |  2 +-
 ...cipes-in-RecipeBook-to-avoid-data-e.patch} |  2 +-
 ...nt-consumeArrow-and-getArrowItem-AP.patch} |  2 +-
 ...patch => 0277-PlayerReadyArrowEvent.patch} |  2 +-
 ...-EntityShootBowEvent-for-Illusioner.patch} |  2 +-
 ...lement-EntityKnockbackByEntityEvent.patch} |  2 +-
 ...patch => 0280-Expand-Explosions-API.patch} |  2 +-
 ...vingEntity-Hand-Raised-Item-Use-API.patch} |  2 +-
 ...-API.patch => 0282-RangedEntity-API.patch} |  2 +-
 ...d-SentientNPC-Interface-to-Entities.patch} |  2 +-
 ...eHitEvent-to-include-the-BlockFace-.patch} |  2 +-
 ...o-disable-ender-dragon-legacy-check.patch} |  6 ++--
 ...-Implement-World.getEntity-UUID-API.patch} |  2 +-
 ...0287-InventoryCloseEvent-Reason-API.patch} |  2 +-
 ...ps-for-Entity-TileEntity-Current-Ch.patch} |  4 +--
 ...0289-Configurable-Bed-Search-Radius.patch} |  6 ++--
 ...-API.patch => 0290-Vex-getOwner-API.patch} |  2 +-
 ...ventory-when-cancelling-PlayerInter.patch} |  4 +--
 ...e-the-Entity-Random-seed-for-squids.patch} |  2 +-
 ...illa-entity-warnings-for-duplicates.patch} |  2 +-
 ...pawn-if-entity-is-in-a-chunk-schedu.patch} |  2 +-
 ...-if-stack-size-above-max-stack-size.patch} |  2 +-
 ...96-Use-asynchronous-Log4j-2-loggers.patch} |  2 +-
 ...more-information-to-Entity.toString.patch} |  6 ++--
 ...es-option-to-debug-dupe-uuid-issues.patch} |  8 ++---
 ...ts.patch => 0299-EnderDragon-Events.patch} |  8 ++---
 ...atch => 0300-PlayerElytraBoostEvent.patch} |  4 +--
 ... 0301-Duplicate-UUID-Resolve-Option.patch} |  4 +--
 ...ch => 0302-Add-async-chunk-load-API.patch} |  4 +--
 ...llowance-of-Permanent-Chunk-Loaders.patch} |  2 +-
 ...Speedup-BlockPos-by-fixing-inlining.patch} |  6 ++--
 ...tch => 0305-Don-t-save-Proto-Chunks.patch} |  6 ++--
 ...patch => 0306-Optimize-RegistryID.c.patch} |  4 +--
 ...-armor-stands-from-doing-entity-loo.patch} |  6 ++--
 ...-Vanished-players-don-t-have-rights.patch} |  4 +--
 ...d-Safe-Iteration-of-Chunk-Scheduler.patch} |  4 +--
 ...anytime-entities-change-to-guarante.patch} |  4 +--
 ...d-some-Debug-to-Chunk-Entity-slices.patch} |  4 +--
 ... => 0312-Optimize-Region-File-Cache.patch} |  4 +--
 ...ir-bad-rcon.ip-settings-temporarily.patch} |  4 +--
 ...atch => 0314-EntityTransformedEvent.patch} |  2 +-
 ...tch => 0315-SkeletonHorse-Additions.patch} |  8 ++---
 ...event-Saving-Bad-entities-to-chunks.patch} |  4 +--
 ...n-t-call-getItemMeta-on-hasItemMeta.patch} |  6 ++--
 ...ocess-chunk-removal-in-removeEntity.patch} |  4 +--
 ...ad-Entities-in-entityList-iteration.patch} | 10 +++---
 ...ess-chunk-registration-after-moving.patch} |  8 ++---
 ...-use-a-versioned-world-folder-for-t.patch} | 10 +++---
 ...22-MC-111480-Start-Entity-ID-s-at-1.patch} |  4 +--
 ...3-Implement-Expanded-ArmorStand-API.patch} |  6 ++--
 ...vent.patch => 0324-AnvilDamageEvent.patch} |  4 +--
 ...ld-EntityHuman-Lookup-Optimizations.patch} |  4 +--
 ...ent.patch => 0326-Add-TNTPrimeEvent.patch} |  8 ++---
 ...d-make-tab-spam-limits-configurable.patch} |  6 ++--
 ...ortation-adjustment-math-more-accur.patch} | 10 +++---
 ...-Experience-should-save-as-Integers.patch} |  4 +--
 ...h => 0330-Entity-add-to-world-fixes.patch} |  8 ++---
 ...ent-rendering-skulls-from-same-user.patch} | 10 +++---
 work/Bukkit                                   |  2 +-
 work/CraftBukkit                              |  2 +-
 267 files changed, 552 insertions(+), 578 deletions(-)
 delete mode 100644 Spigot-Server-Patches/0068-Fix-Furnace-cook-time-bug.patch
 rename Spigot-Server-Patches/{0069-Handle-Item-Meta-Inconsistencies.patch => 0068-Handle-Item-Meta-Inconsistencies.patch} (99%)
 rename Spigot-Server-Patches/{0070-Configurable-Non-Player-Arrow-Despawn-Rate.patch => 0069-Configurable-Non-Player-Arrow-Despawn-Rate.patch} (92%)
 rename Spigot-Server-Patches/{0071-Add-World-Util-Methods.patch => 0070-Add-World-Util-Methods.patch} (96%)
 rename Spigot-Server-Patches/{0072-Optimized-Light-Level-Comparisons.patch => 0071-Optimized-Light-Level-Comparisons.patch} (98%)
 rename Spigot-Server-Patches/{0073-Pass-world-to-Village-creation.patch => 0072-Pass-world-to-Village-creation.patch} (90%)
 rename Spigot-Server-Patches/{0074-Custom-replacement-for-eaten-items.patch => 0073-Custom-replacement-for-eaten-items.patch} (97%)
 rename Spigot-Server-Patches/{0075-handle-NaN-health-absorb-values-and-repair-bad-data.patch => 0074-handle-NaN-health-absorb-values-and-repair-bad-data.patch} (97%)
 rename Spigot-Server-Patches/{0076-Catch-Async-PlayerChunkMap-operations.patch => 0075-Catch-Async-PlayerChunkMap-operations.patch} (89%)
 rename Spigot-Server-Patches/{0077-Waving-banner-workaround.patch => 0076-Waving-banner-workaround.patch} (92%)
 rename Spigot-Server-Patches/{0078-Use-a-Shared-Random-for-Entities.patch => 0077-Use-a-Shared-Random-for-Entities.patch} (94%)
 rename Spigot-Server-Patches/{0079-Don-t-teleport-dead-entities.patch => 0078-Don-t-teleport-dead-entities.patch} (89%)
 rename Spigot-Server-Patches/{0080-Optimize-Chunk-Access.patch => 0079-Optimize-Chunk-Access.patch} (95%)
 rename Spigot-Server-Patches/{0081-Configurable-spawn-chances-for-skeleton-horses.patch => 0080-Configurable-spawn-chances-for-skeleton-horses.patch} (92%)
 rename Spigot-Server-Patches/{0082-Optimize-isValidLocation-getType-and-getBlockData-fo.patch => 0081-Optimize-isValidLocation-getType-and-getBlockData-fo.patch} (97%)
 rename Spigot-Server-Patches/{0083-Access-items-by-EquipmentSlot.patch => 0082-Access-items-by-EquipmentSlot.patch} (95%)
 rename Spigot-Server-Patches/{0084-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch => 0083-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch} (94%)
 rename Spigot-Server-Patches/{0085-Entity-AddTo-RemoveFrom-World-Events.patch => 0084-Entity-AddTo-RemoveFrom-World-Events.patch} (91%)
 rename Spigot-Server-Patches/{0086-Configurable-Chunk-Inhabited-Timer.patch => 0085-Configurable-Chunk-Inhabited-Timer.patch} (96%)
 rename Spigot-Server-Patches/{0087-EntityPathfindEvent.patch => 0086-EntityPathfindEvent.patch} (94%)
 rename Spigot-Server-Patches/{0088-Reduce-IO-ops-opening-a-new-region-file.patch => 0087-Reduce-IO-ops-opening-a-new-region-file.patch} (94%)
 rename Spigot-Server-Patches/{0089-Sanitise-RegionFileCache-and-make-configurable.patch => 0088-Sanitise-RegionFileCache-and-make-configurable.patch} (95%)
 rename Spigot-Server-Patches/{0090-Use-Optimized-Collections.patch => 0089-Use-Optimized-Collections.patch} (94%)
 rename Spigot-Server-Patches/{0091-Do-not-load-chunks-for-light-checks.patch => 0090-Do-not-load-chunks-for-light-checks.patch} (90%)
 rename Spigot-Server-Patches/{0092-Add-PlayerUseUnknownEntityEvent.patch => 0091-Add-PlayerUseUnknownEntityEvent.patch} (92%)
 rename Spigot-Server-Patches/{0093-Fix-reducedDebugInfo-not-initialized-on-client.patch => 0092-Fix-reducedDebugInfo-not-initialized-on-client.patch} (91%)
 rename Spigot-Server-Patches/{0094-Configurable-Grass-Spread-Tick-Rate.patch => 0093-Configurable-Grass-Spread-Tick-Rate.patch} (92%)
 rename Spigot-Server-Patches/{0095-Configurable-Keep-Spawn-Loaded-range-per-world.patch => 0094-Configurable-Keep-Spawn-Loaded-range-per-world.patch} (96%)
 rename Spigot-Server-Patches/{0096-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch => 0095-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch} (89%)
 rename Spigot-Server-Patches/{0097-Don-t-spam-reload-spawn-chunks-in-nether-end.patch => 0096-Don-t-spam-reload-spawn-chunks-in-nether-end.patch} (90%)
 rename Spigot-Server-Patches/{0098-Remove-Debug-checks-from-DataBits.patch => 0097-Remove-Debug-checks-from-DataBits.patch} (94%)
 rename Spigot-Server-Patches/{0099-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch => 0098-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch} (94%)
 rename Spigot-Server-Patches/{0100-Workaround-for-setting-passengers-on-players.patch => 0099-Workaround-for-setting-passengers-on-players.patch} (91%)
 rename Spigot-Server-Patches/{0101-Remove-unused-World-Tile-Entity-List.patch => 0100-Remove-unused-World-Tile-Entity-List.patch} (97%)
 rename Spigot-Server-Patches/{0102-Don-t-tick-Skulls-unused-code.patch => 0101-Don-t-tick-Skulls-unused-code.patch} (88%)
 rename Spigot-Server-Patches/{0103-Configurable-Player-Collision.patch => 0102-Configurable-Player-Collision.patch} (96%)
 rename Spigot-Server-Patches/{0104-Add-handshake-event-to-allow-plugins-to-handle-clien.patch => 0103-Add-handshake-event-to-allow-plugins-to-handle-clien.patch} (96%)
 rename Spigot-Server-Patches/{0105-Configurable-RCON-IP-address.patch => 0104-Configurable-RCON-IP-address.patch} (90%)
 rename Spigot-Server-Patches/{0106-Prevent-Fire-from-loading-chunks.patch => 0105-Prevent-Fire-from-loading-chunks.patch} (95%)
 rename Spigot-Server-Patches/{0107-Implement-PlayerLocaleChangeEvent.patch => 0106-Implement-PlayerLocaleChangeEvent.patch} (98%)
 rename Spigot-Server-Patches/{0108-EntityRegainHealthEvent-isFastRegen-API.patch => 0107-EntityRegainHealthEvent-isFastRegen-API.patch} (97%)
 rename Spigot-Server-Patches/{0109-Add-ability-to-configure-frosted_ice-properties.patch => 0108-Add-ability-to-configure-frosted_ice-properties.patch} (95%)
 rename Spigot-Server-Patches/{0110-remove-null-possibility-for-getServer-singleton.patch => 0109-remove-null-possibility-for-getServer-singleton.patch} (95%)
 rename Spigot-Server-Patches/{0111-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch => 0110-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch} (96%)
 rename Spigot-Server-Patches/{0112-LootTable-API-Replenishable-Lootables-Feature.patch => 0111-LootTable-API-Replenishable-Lootables-Feature.patch} (98%)
 rename Spigot-Server-Patches/{0113-Do-not-load-chunks-for-pathfinding.patch => 0112-Do-not-load-chunks-for-pathfinding.patch} (92%)
 rename Spigot-Server-Patches/{0114-Entity-Tracking-Improvements.patch => 0113-Entity-Tracking-Improvements.patch} (96%)
 rename Spigot-Server-Patches/{0115-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch => 0114-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch} (92%)
 rename Spigot-Server-Patches/{0116-Fix-Chunk-Unload-Queue-Issues.patch => 0115-Fix-Chunk-Unload-Queue-Issues.patch} (94%)
 rename Spigot-Server-Patches/{0117-System-property-for-disabling-watchdoge.patch => 0116-System-property-for-disabling-watchdoge.patch} (93%)
 rename Spigot-Server-Patches/{0118-Optimize-EAR.patch => 0117-Optimize-EAR.patch} (97%)
 rename Spigot-Server-Patches/{0119-Optimize-UserCache-Thread-Safe.patch => 0118-Optimize-UserCache-Thread-Safe.patch} (97%)
 rename Spigot-Server-Patches/{0120-Avoid-blocking-on-Network-Manager-creation.patch => 0119-Avoid-blocking-on-Network-Manager-creation.patch} (97%)
 rename Spigot-Server-Patches/{0121-Optional-TNT-doesn-t-move-in-water.patch => 0120-Optional-TNT-doesn-t-move-in-water.patch} (95%)
 rename Spigot-Server-Patches/{0122-Faster-redstone-torch-rapid-clock-removal.patch => 0121-Faster-redstone-torch-rapid-clock-removal.patch} (96%)
 rename Spigot-Server-Patches/{0123-Ensure-Chunks-never-ever-load-async.patch => 0122-Ensure-Chunks-never-ever-load-async.patch} (97%)
 rename Spigot-Server-Patches/{0124-Add-server-name-parameter.patch => 0123-Add-server-name-parameter.patch} (90%)
 rename Spigot-Server-Patches/{0125-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch => 0124-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch} (97%)
 rename Spigot-Server-Patches/{0126-Delay-Chunk-Unloads-based-on-Player-Movement.patch => 0125-Delay-Chunk-Unloads-based-on-Player-Movement.patch} (96%)
 rename Spigot-Server-Patches/{0127-Fix-Double-World-Add-issues.patch => 0126-Fix-Double-World-Add-issues.patch} (93%)
 rename Spigot-Server-Patches/{0128-Fix-Old-Sign-Conversion.patch => 0127-Fix-Old-Sign-Conversion.patch} (98%)
 rename Spigot-Server-Patches/{0129-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch => 0128-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch} (93%)
 rename Spigot-Server-Patches/{0130-More-informative-vehicle-moved-wrongly-message.patch => 0129-More-informative-vehicle-moved-wrongly-message.patch} (90%)
 rename Spigot-Server-Patches/{0131-Re-track-players-that-dismount-from-other-players.patch => 0130-Re-track-players-that-dismount-from-other-players.patch} (94%)
 rename Spigot-Server-Patches/{0132-Add-setting-for-proxy-online-mode-status.patch => 0131-Add-setting-for-proxy-online-mode-status.patch} (95%)
 rename Spigot-Server-Patches/{0133-Optimise-BlockStateEnum-hashCode-and-equals.patch => 0132-Optimise-BlockStateEnum-hashCode-and-equals.patch} (97%)
 rename Spigot-Server-Patches/{0134-Disable-ticking-of-snow-blocks.patch => 0133-Disable-ticking-of-snow-blocks.patch} (93%)
 rename Spigot-Server-Patches/{0135-Fix-AIOOBE-in-inventory-handling.patch => 0134-Fix-AIOOBE-in-inventory-handling.patch} (94%)
 rename Spigot-Server-Patches/{0136-Configurable-packet-in-spam-threshold.patch => 0135-Configurable-packet-in-spam-threshold.patch} (94%)
 rename Spigot-Server-Patches/{0137-Configurable-flying-kick-messages.patch => 0136-Configurable-flying-kick-messages.patch} (94%)
 rename Spigot-Server-Patches/{0138-Auto-Save-Improvements.patch => 0137-Auto-Save-Improvements.patch} (99%)
 rename Spigot-Server-Patches/{0139-Chunk-registration-fixes.patch => 0138-Chunk-registration-fixes.patch} (93%)
 rename Spigot-Server-Patches/{0140-Remove-FishingHook-reference-on-Craft-Entity-removal.patch => 0139-Remove-FishingHook-reference-on-Craft-Entity-removal.patch} (93%)
 rename Spigot-Server-Patches/{0141-Auto-fix-bad-Y-levels-on-player-login.patch => 0140-Auto-fix-bad-Y-levels-on-player-login.patch} (90%)
 rename Spigot-Server-Patches/{0142-Disable-Vanilla-Chunk-GC.patch => 0141-Disable-Vanilla-Chunk-GC.patch} (95%)
 rename Spigot-Server-Patches/{0143-Option-to-remove-corrupt-tile-entities.patch => 0142-Option-to-remove-corrupt-tile-entities.patch} (93%)
 rename Spigot-Server-Patches/{0144-Add-EntityZapEvent.patch => 0143-Add-EntityZapEvent.patch} (98%)
 rename Spigot-Server-Patches/{0145-Don-t-load-Chunks-from-Hoppers-and-other-things.patch => 0144-Don-t-load-Chunks-from-Hoppers-and-other-things.patch} (96%)
 rename Spigot-Server-Patches/{0146-Prevent-Auto-Save-if-Save-Queue-is-full.patch => 0145-Prevent-Auto-Save-if-Save-Queue-is-full.patch} (98%)
 rename Spigot-Server-Patches/{0147-Chunk-Save-Stats-Debug-Option.patch => 0146-Chunk-Save-Stats-Debug-Option.patch} (98%)
 rename Spigot-Server-Patches/{0148-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch => 0147-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch} (94%)
 rename Spigot-Server-Patches/{0149-Cache-user-authenticator-threads.patch => 0148-Cache-user-authenticator-threads.patch} (97%)
 rename Spigot-Server-Patches/{0150-Optimize-Network-Queue.patch => 0149-Optimize-Network-Queue.patch} (90%)
 rename Spigot-Server-Patches/{0151-Optimise-removeQueue.patch => 0150-Optimise-removeQueue.patch} (97%)
 rename Spigot-Server-Patches/{0152-Allow-Reloading-of-Command-Aliases.patch => 0151-Allow-Reloading-of-Command-Aliases.patch} (93%)
 rename Spigot-Server-Patches/{0153-Add-source-to-PlayerExpChangeEvent.patch => 0152-Add-source-to-PlayerExpChangeEvent.patch} (97%)
 rename Spigot-Server-Patches/{0154-Optimize-World.isLoaded-BlockPosition-Z.patch => 0153-Optimize-World.isLoaded-BlockPosition-Z.patch} (90%)
 rename Spigot-Server-Patches/{0155-Don-t-let-fishinghooks-use-portals.patch => 0154-Don-t-let-fishinghooks-use-portals.patch} (90%)
 rename Spigot-Server-Patches/{0156-Add-ProjectileCollideEvent.patch => 0155-Add-ProjectileCollideEvent.patch} (98%)
 rename Spigot-Server-Patches/{0157-Prevent-Pathfinding-out-of-World-Border.patch => 0156-Prevent-Pathfinding-out-of-World-Border.patch} (97%)
 rename Spigot-Server-Patches/{0158-Bound-Treasure-Maps-to-World-Border.patch => 0157-Bound-Treasure-Maps-to-World-Border.patch} (97%)
 rename Spigot-Server-Patches/{0159-Configurable-Cartographer-Treasure-Maps.patch => 0158-Configurable-Cartographer-Treasure-Maps.patch} (93%)
 rename Spigot-Server-Patches/{0160-Optimize-ItemStack.isEmpty.patch => 0159-Optimize-ItemStack.isEmpty.patch} (89%)
 rename Spigot-Server-Patches/{0161-Add-API-methods-to-control-if-armour-stands-can-move.patch => 0160-Add-API-methods-to-control-if-armour-stands-can-move.patch} (92%)
 rename Spigot-Server-Patches/{0162-Add-option-to-remove-invalid-statistics.patch => 0161-Add-option-to-remove-invalid-statistics.patch} (94%)
 rename Spigot-Server-Patches/{0163-Properly-fix-item-duplication-bug.patch => 0162-Properly-fix-item-duplication-bug.patch} (95%)
 rename Spigot-Server-Patches/{0164-String-based-Action-Bar-API.patch => 0163-String-based-Action-Bar-API.patch} (95%)
 rename Spigot-Server-Patches/{0165-Activation-Range-Improvements.patch => 0164-Activation-Range-Improvements.patch} (99%)
 rename Spigot-Server-Patches/{0166-Firework-API-s.patch => 0165-Firework-API-s.patch} (98%)
 rename Spigot-Server-Patches/{0167-PlayerTeleportEndGatewayEvent.patch => 0166-PlayerTeleportEndGatewayEvent.patch} (95%)
 rename Spigot-Server-Patches/{0168-ShulkerBox-Dupe-Prevention.patch => 0167-ShulkerBox-Dupe-Prevention.patch} (94%)
 rename Spigot-Server-Patches/{0169-Provide-E-TE-Chunk-count-stat-methods.patch => 0168-Provide-E-TE-Chunk-count-stat-methods.patch} (93%)
 rename Spigot-Server-Patches/{0170-Enforce-Sync-Player-Saves.patch => 0169-Enforce-Sync-Player-Saves.patch} (94%)
 rename Spigot-Server-Patches/{0171-Enforce-Sync-Chunk-Unloads.patch => 0170-Enforce-Sync-Chunk-Unloads.patch} (92%)
 rename Spigot-Server-Patches/{0172-Don-t-allow-entities-to-ride-themselves-572.patch => 0171-Don-t-allow-entities-to-ride-themselves-572.patch} (88%)
 rename Spigot-Server-Patches/{0173-Fix-block-break-desync.patch => 0172-Fix-block-break-desync.patch} (91%)
 rename Spigot-Server-Patches/{0174-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch => 0173-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch} (99%)
 rename Spigot-Server-Patches/{0175-Cap-Entity-Collisions.patch => 0174-Cap-Entity-Collisions.patch} (97%)
 rename Spigot-Server-Patches/{0176-Remove-CraftScheduler-Async-Task-Debugger.patch => 0175-Remove-CraftScheduler-Async-Task-Debugger.patch} (97%)
 rename Spigot-Server-Patches/{0177-Shame-on-you-Mojang.patch => 0176-Shame-on-you-Mojang.patch} (94%)
 rename Spigot-Server-Patches/{0178-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch => 0177-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch} (94%)
 rename Spigot-Server-Patches/{0179-Do-not-let-armorstands-drown.patch => 0178-Do-not-let-armorstands-drown.patch} (96%)
 rename Spigot-Server-Patches/{0180-Properly-handle-async-calls-to-restart-the-server.patch => 0179-Properly-handle-async-calls-to-restart-the-server.patch} (99%)
 rename Spigot-Server-Patches/{0181-Add-system-property-to-disable-book-size-limits.patch => 0180-Add-system-property-to-disable-book-size-limits.patch} (97%)
 rename Spigot-Server-Patches/{0182-Add-option-to-make-parrots-stay-on-shoulders-despite.patch => 0181-Add-option-to-make-parrots-stay-on-shoulders-despite.patch} (96%)
 rename Spigot-Server-Patches/{0183-Add-configuration-option-to-prevent-player-names-fro.patch => 0182-Add-configuration-option-to-prevent-player-names-fro.patch} (91%)
 rename Spigot-Server-Patches/{0184-Use-TerminalConsoleAppender-for-console-improvements.patch => 0183-Use-TerminalConsoleAppender-for-console-improvements.patch} (99%)
 rename Spigot-Server-Patches/{0185-provide-a-configurable-option-to-disable-creeper-lin.patch => 0184-provide-a-configurable-option-to-disable-creeper-lin.patch} (92%)
 rename Spigot-Server-Patches/{0186-Item-canEntityPickup.patch => 0185-Item-canEntityPickup.patch} (97%)
 rename Spigot-Server-Patches/{0187-PlayerPickupItemEvent-setFlyAtPlayer.patch => 0186-PlayerPickupItemEvent-setFlyAtPlayer.patch} (97%)
 rename Spigot-Server-Patches/{0188-PlayerAttemptPickupItemEvent.patch => 0187-PlayerAttemptPickupItemEvent.patch} (96%)
 rename Spigot-Server-Patches/{0189-Add-UnknownCommandEvent.patch => 0188-Add-UnknownCommandEvent.patch} (93%)
 rename Spigot-Server-Patches/{0190-Basic-PlayerProfile-API.patch => 0189-Basic-PlayerProfile-API.patch} (99%)
 rename Spigot-Server-Patches/{0191-Shoulder-Entities-Release-API.patch => 0190-Shoulder-Entities-Release-API.patch} (98%)
 rename Spigot-Server-Patches/{0192-Profile-Lookup-Events.patch => 0191-Profile-Lookup-Events.patch} (98%)
 rename Spigot-Server-Patches/{0193-Block-player-logins-during-server-shutdown.patch => 0192-Block-player-logins-during-server-shutdown.patch} (90%)
 rename Spigot-Server-Patches/{0194-Entity-fromMobSpawner.patch => 0193-Entity-fromMobSpawner.patch} (94%)
 rename Spigot-Server-Patches/{0195-Fix-Anvil-Level-sync-to-client.patch => 0194-Fix-Anvil-Level-sync-to-client.patch} (93%)
 rename Spigot-Server-Patches/{0196-Add-missing-coverages-for-getTileEntity-in-order-to-.patch => 0195-Add-missing-coverages-for-getTileEntity-in-order-to-.patch} (94%)
 rename Spigot-Server-Patches/{0197-Improve-the-Saddle-API-for-Horses.patch => 0196-Improve-the-Saddle-API-for-Horses.patch} (97%)
 rename Spigot-Server-Patches/{0198-Implement-ensureServerConversions-API.patch => 0197-Implement-ensureServerConversions-API.patch} (91%)
 rename Spigot-Server-Patches/{0199-Implement-getI18NDisplayName.patch => 0198-Implement-getI18NDisplayName.patch} (93%)
 rename Spigot-Server-Patches/{0200-GH-806-Respect-saving-disabled-before-unloading-all-.patch => 0199-GH-806-Respect-saving-disabled-before-unloading-all-.patch} (94%)
 rename Spigot-Server-Patches/{0201-ProfileWhitelistVerifyEvent.patch => 0200-ProfileWhitelistVerifyEvent.patch} (97%)
 rename Spigot-Server-Patches/{0202-Fix-this-stupid-bullshit.patch => 0201-Fix-this-stupid-bullshit.patch} (94%)
 rename Spigot-Server-Patches/{0203-Ocelot-despawns-should-honor-nametags-and-leash.patch => 0202-Ocelot-despawns-should-honor-nametags-and-leash.patch} (93%)
 rename Spigot-Server-Patches/{0204-Reset-spawner-timer-when-spawner-event-is-cancelled.patch => 0203-Reset-spawner-timer-when-spawner-event-is-cancelled.patch} (95%)
 rename Spigot-Server-Patches/{0205-Fix-MC-117075-TE-Unload-Lag-Spike.patch => 0204-Fix-MC-117075-TE-Unload-Lag-Spike.patch} (92%)
 rename Spigot-Server-Patches/{0206-Allow-specifying-a-custom-authentication-servers-dow.patch => 0205-Allow-specifying-a-custom-authentication-servers-dow.patch} (96%)
 rename Spigot-Server-Patches/{0207-LivingEntity-setKiller.patch => 0206-LivingEntity-setKiller.patch} (92%)
 rename Spigot-Server-Patches/{0208-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch => 0207-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch} (96%)
 rename Spigot-Server-Patches/{0209-Handle-plugin-prefixes-using-Log4J-configuration.patch => 0208-Handle-plugin-prefixes-using-Log4J-configuration.patch} (97%)
 rename Spigot-Server-Patches/{0210-Include-Log4J2-SLF4J-implementation.patch => 0209-Include-Log4J2-SLF4J-implementation.patch} (91%)
 rename Spigot-Server-Patches/{0211-Disable-logger-prefix-for-various-plugins-bypassing-.patch => 0210-Disable-logger-prefix-for-various-plugins-bypassing-.patch} (97%)
 rename Spigot-Server-Patches/{0212-Add-PlayerJumpEvent.patch => 0211-Add-PlayerJumpEvent.patch} (96%)
 rename Spigot-Server-Patches/{0213-handle-PacketPlayInKeepAlive-async.patch => 0212-handle-PacketPlayInKeepAlive-async.patch} (97%)
 rename Spigot-Server-Patches/{0214-Expose-client-protocol-version-and-virtual-host.patch => 0213-Expose-client-protocol-version-and-virtual-host.patch} (95%)
 rename Spigot-Server-Patches/{0215-revert-serverside-behavior-of-keepalives.patch => 0214-revert-serverside-behavior-of-keepalives.patch} (98%)
 rename Spigot-Server-Patches/{0216-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch => 0215-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch} (95%)
 rename Spigot-Server-Patches/{0217-Send-attack-SoundEffects-only-to-players-who-can-see.patch => 0216-Send-attack-SoundEffects-only-to-players-who-can-see.patch} (97%)
 rename Spigot-Server-Patches/{0218-Option-for-maximum-exp-value-when-merging-orbs.patch => 0217-Option-for-maximum-exp-value-when-merging-orbs.patch} (96%)
 rename Spigot-Server-Patches/{0219-Add-PlayerArmorChangeEvent.patch => 0218-Add-PlayerArmorChangeEvent.patch} (97%)
 rename Spigot-Server-Patches/{0220-Prevent-logins-from-being-processed-when-the-player-.patch => 0219-Prevent-logins-from-being-processed-when-the-player-.patch} (91%)
 rename Spigot-Server-Patches/{0221-use-CB-BlockState-implementations-for-captured-block.patch => 0220-use-CB-BlockState-implementations-for-captured-block.patch} (94%)
 rename Spigot-Server-Patches/{0222-API-to-get-a-BlockState-without-a-snapshot.patch => 0221-API-to-get-a-BlockState-without-a-snapshot.patch} (98%)
 rename Spigot-Server-Patches/{0223-AsyncTabCompleteEvent.patch => 0222-AsyncTabCompleteEvent.patch} (98%)
 rename Spigot-Server-Patches/{0224-Avoid-NPE-in-PathfinderGoalTempt.patch => 0223-Avoid-NPE-in-PathfinderGoalTempt.patch} (93%)
 rename Spigot-Server-Patches/{0225-PlayerPickupExperienceEvent.patch => 0224-PlayerPickupExperienceEvent.patch} (94%)
 rename Spigot-Server-Patches/{0226-ExperienceOrbMergeEvent.patch => 0225-ExperienceOrbMergeEvent.patch} (93%)
 rename Spigot-Server-Patches/{0227-Ability-to-apply-mending-to-XP-API.patch => 0226-Ability-to-apply-mending-to-XP-API.patch} (95%)
 rename Spigot-Server-Patches/{0228-Configurable-Chunks-Sends-per-Tick-setting.patch => 0227-Configurable-Chunks-Sends-per-Tick-setting.patch} (92%)
 rename Spigot-Server-Patches/{0229-Configurable-Max-Chunk-Gens-per-Tick.patch => 0228-Configurable-Max-Chunk-Gens-per-Tick.patch} (95%)
 rename Spigot-Server-Patches/{0230-Make-max-squid-spawn-height-configurable.patch => 0229-Make-max-squid-spawn-height-configurable.patch} (92%)
 rename Spigot-Server-Patches/{0231-PreCreatureSpawnEvent.patch => 0230-PreCreatureSpawnEvent.patch} (98%)
 rename Spigot-Server-Patches/{0232-PlayerNaturallySpawnCreaturesEvent.patch => 0231-PlayerNaturallySpawnCreaturesEvent.patch} (96%)
 rename Spigot-Server-Patches/{0233-Add-SkullMeta.setPlayerProfile-API.patch => 0232-Add-SkullMeta.setPlayerProfile-API.patch} (94%)
 rename Spigot-Server-Patches/{0234-Fill-Profile-Property-Events.patch => 0233-Fill-Profile-Property-Events.patch} (96%)
 rename Spigot-Server-Patches/{0235-PlayerAdvancementCriterionGrantEvent.patch => 0234-PlayerAdvancementCriterionGrantEvent.patch} (94%)
 rename Spigot-Server-Patches/{0236-Add-ArmorStand-Item-Meta.patch => 0235-Add-ArmorStand-Item-Meta.patch} (99%)
 rename Spigot-Server-Patches/{0237-Extend-Player-Interact-cancellation.patch => 0236-Extend-Player-Interact-cancellation.patch} (98%)
 rename Spigot-Server-Patches/{0238-Tameable-getOwnerUniqueId-API.patch => 0237-Tameable-getOwnerUniqueId-API.patch} (96%)
 rename Spigot-Server-Patches/{0239-Toggleable-player-crits-helps-mitigate-hacked-client.patch => 0238-Toggleable-player-crits-helps-mitigate-hacked-client.patch} (92%)
 rename Spigot-Server-Patches/{0240-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch => 0239-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch} (95%)
 rename Spigot-Server-Patches/{0241-Prevent-Frosted-Ice-from-loading-holding-chunks.patch => 0240-Prevent-Frosted-Ice-from-loading-holding-chunks.patch} (96%)
 rename Spigot-Server-Patches/{0242-Disable-Explicit-Network-Manager-Flushing.patch => 0241-Disable-Explicit-Network-Manager-Flushing.patch} (96%)
 rename Spigot-Server-Patches/{0243-Implement-extended-PaperServerListPingEvent.patch => 0242-Implement-extended-PaperServerListPingEvent.patch} (98%)
 rename Spigot-Server-Patches/{0244-Improved-Async-Task-Scheduler.patch => 0243-Improved-Async-Task-Scheduler.patch} (99%)
 rename Spigot-Server-Patches/{0245-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch => 0244-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch} (97%)
 rename Spigot-Server-Patches/{0246-Call-PortalCreateEvent-for-exit-portals.patch => 0245-Call-PortalCreateEvent-for-exit-portals.patch} (98%)
 rename Spigot-Server-Patches/{0247-Player.setPlayerProfile-API.patch => 0246-Player.setPlayerProfile-API.patch} (97%)
 rename Spigot-Server-Patches/{0248-Fix-Dragon-Server-Crashes.patch => 0247-Fix-Dragon-Server-Crashes.patch} (95%)
 rename Spigot-Server-Patches/{0249-getPlayerUniqueId-API.patch => 0248-getPlayerUniqueId-API.patch} (94%)
 rename Spigot-Server-Patches/{0250-Make-player-data-saving-configurable.patch => 0249-Make-player-data-saving-configurable.patch} (93%)
 rename Spigot-Server-Patches/{0251-Make-legacy-ping-handler-more-reliable.patch => 0250-Make-legacy-ping-handler-more-reliable.patch} (98%)
 rename Spigot-Server-Patches/{0252-Call-PaperServerListPingEvent-for-legacy-pings.patch => 0251-Call-PaperServerListPingEvent-for-legacy-pings.patch} (99%)
 rename Spigot-Server-Patches/{0253-Flag-to-disable-the-channel-limit.patch => 0252-Flag-to-disable-the-channel-limit.patch} (94%)
 rename Spigot-Server-Patches/{0254-Add-method-to-open-already-placed-sign.patch => 0253-Add-method-to-open-already-placed-sign.patch} (95%)
 rename Spigot-Server-Patches/{0255-Load-version-history-at-server-start.patch => 0254-Load-version-history-at-server-start.patch} (93%)
 rename Spigot-Server-Patches/{0256-Configurable-sprint-interruption-on-attack.patch => 0255-Configurable-sprint-interruption-on-attack.patch} (92%)
 rename Spigot-Server-Patches/{0257-Fix-exploit-that-allowed-colored-signs-to-be-created.patch => 0256-Fix-exploit-that-allowed-colored-signs-to-be-created.patch} (92%)
 rename Spigot-Server-Patches/{0258-EndermanEscapeEvent.patch => 0257-EndermanEscapeEvent.patch} (98%)
 rename Spigot-Server-Patches/{0259-Enderman.teleportRandomly.patch => 0258-Enderman.teleportRandomly.patch} (96%)
 rename Spigot-Server-Patches/{0260-Block-Enderpearl-Travel-Exploit.patch => 0259-Block-Enderpearl-Travel-Exploit.patch} (93%)
 rename Spigot-Server-Patches/{0261-Expand-World.spawnParticle-API-and-add-Builder.patch => 0260-Expand-World.spawnParticle-API-and-add-Builder.patch} (98%)
 rename Spigot-Server-Patches/{0262-EndermanAttackPlayerEvent.patch => 0261-EndermanAttackPlayerEvent.patch} (95%)
 rename Spigot-Server-Patches/{0263-WitchConsumePotionEvent.patch => 0262-WitchConsumePotionEvent.patch} (95%)
 rename Spigot-Server-Patches/{0264-WitchThrowPotionEvent.patch => 0263-WitchThrowPotionEvent.patch} (96%)
 rename Spigot-Server-Patches/{0265-Allow-spawning-Item-entities-with-World.spawnEntity.patch => 0264-Allow-spawning-Item-entities-with-World.spawnEntity.patch} (95%)
 rename Spigot-Server-Patches/{0266-Don-t-load-chunks-for-villager-door-checks.patch => 0265-Don-t-load-chunks-for-villager-door-checks.patch} (93%)
 rename Spigot-Server-Patches/{0267-WitchReadyPotionEvent.patch => 0266-WitchReadyPotionEvent.patch} (95%)
 rename Spigot-Server-Patches/{0268-ItemStack-getMaxItemUseDuration.patch => 0267-ItemStack-getMaxItemUseDuration.patch} (93%)
 rename Spigot-Server-Patches/{0269-Implement-EntityTeleportEndGatewayEvent.patch => 0268-Implement-EntityTeleportEndGatewayEvent.patch} (96%)
 rename Spigot-Server-Patches/{0270-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch => 0269-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch} (95%)
 rename Spigot-Server-Patches/{0271-Properly-remove-entities-on-dimension-teleport.patch => 0270-Properly-remove-entities-on-dimension-teleport.patch} (94%)
 rename Spigot-Server-Patches/{0272-Fix-CraftEntity-hashCode.patch => 0271-Fix-CraftEntity-hashCode.patch} (96%)
 rename Spigot-Server-Patches/{0273-Configurable-Alternative-LootPool-Luck-Formula.patch => 0272-Configurable-Alternative-LootPool-Luck-Formula.patch} (97%)
 rename Spigot-Server-Patches/{0274-Print-Error-details-when-failing-to-save-player-data.patch => 0273-Print-Error-details-when-failing-to-save-player-data.patch} (93%)
 rename Spigot-Server-Patches/{0275-Make-shield-blocking-delay-configurable.patch => 0274-Make-shield-blocking-delay-configurable.patch} (97%)
 rename Spigot-Server-Patches/{0276-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch => 0275-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch} (96%)
 rename Spigot-Server-Patches/{0277-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch => 0276-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch} (98%)
 rename Spigot-Server-Patches/{0278-PlayerReadyArrowEvent.patch => 0277-PlayerReadyArrowEvent.patch} (98%)
 rename Spigot-Server-Patches/{0279-Fire-EntityShootBowEvent-for-Illusioner.patch => 0278-Fire-EntityShootBowEvent-for-Illusioner.patch} (95%)
 rename Spigot-Server-Patches/{0280-Implement-EntityKnockbackByEntityEvent.patch => 0279-Implement-EntityKnockbackByEntityEvent.patch} (96%)
 rename Spigot-Server-Patches/{0281-Expand-Explosions-API.patch => 0280-Expand-Explosions-API.patch} (95%)
 rename Spigot-Server-Patches/{0282-LivingEntity-Hand-Raised-Item-Use-API.patch => 0281-LivingEntity-Hand-Raised-Item-Use-API.patch} (97%)
 rename Spigot-Server-Patches/{0283-RangedEntity-API.patch => 0282-RangedEntity-API.patch} (99%)
 rename Spigot-Server-Patches/{0284-Add-SentientNPC-Interface-to-Entities.patch => 0283-Add-SentientNPC-Interface-to-Entities.patch} (99%)
 rename Spigot-Server-Patches/{0285-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch => 0284-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch} (95%)
 rename Spigot-Server-Patches/{0286-Add-config-to-disable-ender-dragon-legacy-check.patch => 0285-Add-config-to-disable-ender-dragon-legacy-check.patch} (94%)
 rename Spigot-Server-Patches/{0287-Implement-World.getEntity-UUID-API.patch => 0286-Implement-World.getEntity-UUID-API.patch} (93%)
 rename Spigot-Server-Patches/{0288-InventoryCloseEvent-Reason-API.patch => 0287-InventoryCloseEvent-Reason-API.patch} (99%)
 rename Spigot-Server-Patches/{0289-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch => 0288-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch} (97%)
 rename Spigot-Server-Patches/{0290-Configurable-Bed-Search-Radius.patch => 0289-Configurable-Bed-Search-Radius.patch} (96%)
 rename Spigot-Server-Patches/{0291-Vex-getOwner-API.patch => 0290-Vex-getOwner-API.patch} (96%)
 rename Spigot-Server-Patches/{0292-Refresh-player-inventory-when-cancelling-PlayerInter.patch => 0291-Refresh-player-inventory-when-cancelling-PlayerInter.patch} (92%)
 rename Spigot-Server-Patches/{0293-Don-t-change-the-Entity-Random-seed-for-squids.patch => 0292-Don-t-change-the-Entity-Random-seed-for-squids.patch} (92%)
 rename Spigot-Server-Patches/{0294-Re-add-vanilla-entity-warnings-for-duplicates.patch => 0293-Re-add-vanilla-entity-warnings-for-duplicates.patch} (96%)
 rename Spigot-Server-Patches/{0295-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch => 0294-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch} (95%)
 rename Spigot-Server-Patches/{0296-Avoid-item-merge-if-stack-size-above-max-stack-size.patch => 0295-Avoid-item-merge-if-stack-size-above-max-stack-size.patch} (93%)
 rename Spigot-Server-Patches/{0297-Use-asynchronous-Log4j-2-loggers.patch => 0296-Use-asynchronous-Log4j-2-loggers.patch} (93%)
 rename Spigot-Server-Patches/{0298-add-more-information-to-Entity.toString.patch => 0297-add-more-information-to-Entity.toString.patch} (93%)
 rename Spigot-Server-Patches/{0299-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch => 0298-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch} (96%)
 rename Spigot-Server-Patches/{0300-EnderDragon-Events.patch => 0299-EnderDragon-Events.patch} (95%)
 rename Spigot-Server-Patches/{0301-PlayerElytraBoostEvent.patch => 0300-PlayerElytraBoostEvent.patch} (94%)
 rename Spigot-Server-Patches/{0302-Duplicate-UUID-Resolve-Option.patch => 0301-Duplicate-UUID-Resolve-Option.patch} (99%)
 rename Spigot-Server-Patches/{0303-Add-async-chunk-load-API.patch => 0302-Add-async-chunk-load-API.patch} (93%)
 rename Spigot-Server-Patches/{0304-Configurable-Allowance-of-Permanent-Chunk-Loaders.patch => 0303-Configurable-Allowance-of-Permanent-Chunk-Loaders.patch} (96%)
 rename Spigot-Server-Patches/{0305-Speedup-BlockPos-by-fixing-inlining.patch => 0304-Speedup-BlockPos-by-fixing-inlining.patch} (98%)
 rename Spigot-Server-Patches/{0306-Don-t-save-Proto-Chunks.patch => 0305-Don-t-save-Proto-Chunks.patch} (92%)
 rename Spigot-Server-Patches/{0307-Optimize-RegistryID.c.patch => 0306-Optimize-RegistryID.c.patch} (95%)
 rename Spigot-Server-Patches/{0308-Option-to-prevent-armor-stands-from-doing-entity-loo.patch => 0307-Option-to-prevent-armor-stands-from-doing-entity-loo.patch} (93%)
 rename Spigot-Server-Patches/{0309-Vanished-players-don-t-have-rights.patch => 0308-Vanished-players-don-t-have-rights.patch} (98%)
 rename Spigot-Server-Patches/{0310-Thread-Safe-Iteration-of-Chunk-Scheduler.patch => 0309-Thread-Safe-Iteration-of-Chunk-Scheduler.patch} (94%)
 rename Spigot-Server-Patches/{0311-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch => 0310-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch} (90%)
 rename Spigot-Server-Patches/{0312-Add-some-Debug-to-Chunk-Entity-slices.patch => 0311-Add-some-Debug-to-Chunk-Entity-slices.patch} (97%)
 rename Spigot-Server-Patches/{0313-Optimize-Region-File-Cache.patch => 0312-Optimize-Region-File-Cache.patch} (96%)
 rename Spigot-Server-Patches/{0314-repair-bad-rcon.ip-settings-temporarily.patch => 0313-repair-bad-rcon.ip-settings-temporarily.patch} (92%)
 rename Spigot-Server-Patches/{0315-EntityTransformedEvent.patch => 0314-EntityTransformedEvent.patch} (98%)
 rename Spigot-Server-Patches/{0316-SkeletonHorse-Additions.patch => 0315-SkeletonHorse-Additions.patch} (94%)
 rename Spigot-Server-Patches/{0317-Prevent-Saving-Bad-entities-to-chunks.patch => 0316-Prevent-Saving-Bad-entities-to-chunks.patch} (96%)
 rename Spigot-Server-Patches/{0318-Don-t-call-getItemMeta-on-hasItemMeta.patch => 0317-Don-t-call-getItemMeta-on-hasItemMeta.patch} (97%)
 rename Spigot-Server-Patches/{0319-Always-process-chunk-removal-in-removeEntity.patch => 0318-Always-process-chunk-removal-in-removeEntity.patch} (93%)
 rename Spigot-Server-Patches/{0320-Ignore-Dead-Entities-in-entityList-iteration.patch => 0319-Ignore-Dead-Entities-in-entityList-iteration.patch} (96%)
 rename Spigot-Server-Patches/{0321-Always-process-chunk-registration-after-moving.patch => 0320-Always-process-chunk-registration-after-moving.patch} (94%)
 rename Spigot-Server-Patches/{0322-Provide-option-to-use-a-versioned-world-folder-for-t.patch => 0321-Provide-option-to-use-a-versioned-world-folder-for-t.patch} (98%)
 rename Spigot-Server-Patches/{0323-MC-111480-Start-Entity-ID-s-at-1.patch => 0322-MC-111480-Start-Entity-ID-s-at-1.patch} (91%)
 rename Spigot-Server-Patches/{0324-Implement-Expanded-ArmorStand-API.patch => 0323-Implement-Expanded-ArmorStand-API.patch} (97%)
 rename Spigot-Server-Patches/{0325-AnvilDamageEvent.patch => 0324-AnvilDamageEvent.patch} (94%)
 rename Spigot-Server-Patches/{0326-World-EntityHuman-Lookup-Optimizations.patch => 0325-World-EntityHuman-Lookup-Optimizations.patch} (97%)
 rename Spigot-Server-Patches/{0327-Add-TNTPrimeEvent.patch => 0326-Add-TNTPrimeEvent.patch} (97%)
 rename Spigot-Server-Patches/{0328-Break-up-and-make-tab-spam-limits-configurable.patch => 0327-Break-up-and-make-tab-spam-limits-configurable.patch} (97%)
 rename Spigot-Server-Patches/{0329-Make-portal-teleportation-adjustment-math-more-accur.patch => 0328-Make-portal-teleportation-adjustment-math-more-accur.patch} (95%)
 rename Spigot-Server-Patches/{0330-MC-135506-Experience-should-save-as-Integers.patch => 0329-MC-135506-Experience-should-save-as-Integers.patch} (92%)
 rename Spigot-Server-Patches/{0331-Entity-add-to-world-fixes.patch => 0330-Entity-add-to-world-fixes.patch} (95%)
 rename Spigot-Server-Patches/{0332-Fix-client-rendering-skulls-from-same-user.patch => 0331-Fix-client-rendering-skulls-from-same-user.patch} (96%)

diff --git a/Spigot-Server-Patches/0068-Fix-Furnace-cook-time-bug.patch b/Spigot-Server-Patches/0068-Fix-Furnace-cook-time-bug.patch
deleted file mode 100644
index 6da7d4e90..000000000
--- a/Spigot-Server-Patches/0068-Fix-Furnace-cook-time-bug.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From db448a33d090f16e94422a122727963472d771a1 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Fri, 18 Mar 2016 14:24:53 -0400
-Subject: [PATCH] Fix Furnace cook time bug
-
-If the server lags out and skips multiple ticks, Furnace cooking behavior would not
-cook in the expected amount of time as the cook time was not decremented correctly.
-
-This patch ensures that furnaces cook to the correct wall time expectation.
-
-diff --git a/src/main/java/net/minecraft/server/TileEntityFurnace.java b/src/main/java/net/minecraft/server/TileEntityFurnace.java
-index b484fc721..bc158b877 100644
---- a/src/main/java/net/minecraft/server/TileEntityFurnace.java
-+++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java
-@@ -267,7 +267,7 @@ public class TileEntityFurnace extends TileEntityContainer implements IWorldInve
-         if (this.isBurning() && this.canBurn(irecipe)) {
-             this.cookTime += elapsedTicks;
-             if (this.cookTime >= this.cookTimeTotal) {
--                this.cookTime = 0;
-+                this.cookTime -= this.cookTimeTotal; // Paper
-                 this.cookTimeTotal = this.s();
-                 this.burn(irecipe);
-                 flag1 = true;
--- 
-2.18.0
-
diff --git a/Spigot-Server-Patches/0069-Handle-Item-Meta-Inconsistencies.patch b/Spigot-Server-Patches/0068-Handle-Item-Meta-Inconsistencies.patch
similarity index 99%
rename from Spigot-Server-Patches/0069-Handle-Item-Meta-Inconsistencies.patch
rename to Spigot-Server-Patches/0068-Handle-Item-Meta-Inconsistencies.patch
index 224dba863..808ec09b0 100644
--- a/Spigot-Server-Patches/0069-Handle-Item-Meta-Inconsistencies.patch
+++ b/Spigot-Server-Patches/0068-Handle-Item-Meta-Inconsistencies.patch
@@ -1,4 +1,4 @@
-From 0e6cf5edaab921a3d54b27009c13a0a304e4db41 Mon Sep 17 00:00:00 2001
+From 21d32208d1330db3a24876d99358f248ae04eb52 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
diff --git a/Spigot-Server-Patches/0070-Configurable-Non-Player-Arrow-Despawn-Rate.patch b/Spigot-Server-Patches/0069-Configurable-Non-Player-Arrow-Despawn-Rate.patch
similarity index 92%
rename from Spigot-Server-Patches/0070-Configurable-Non-Player-Arrow-Despawn-Rate.patch
rename to Spigot-Server-Patches/0069-Configurable-Non-Player-Arrow-Despawn-Rate.patch
index d43903a50..c94e46787 100644
--- a/Spigot-Server-Patches/0070-Configurable-Non-Player-Arrow-Despawn-Rate.patch
+++ b/Spigot-Server-Patches/0069-Configurable-Non-Player-Arrow-Despawn-Rate.patch
@@ -1,4 +1,4 @@
-From e6a1c83e22ebf7b1ccff924966d57c88588796ae Mon Sep 17 00:00:00 2001
+From 97b7c45703828056ac98602df86d699dd14efa52 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Non Player Arrow Despawn Rate
 Can set a much shorter despawn rate for arrows that players can not pick up.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 6f96627a2..0de300739 100644
+index 6f96627a2e..0de3007392 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -203,4 +203,13 @@ public class PaperWorldConfig {
@@ -24,7 +24,7 @@ index 6f96627a2..0de300739 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
-index e16c8e8d9..75445b00d 100644
+index e16c8e8d98..75445b00dc 100644
 --- a/src/main/java/net/minecraft/server/EntityArrow.java
 +++ b/src/main/java/net/minecraft/server/EntityArrow.java
 @@ -258,7 +258,7 @@ public abstract class EntityArrow extends Entity implements IProjectile {
diff --git a/Spigot-Server-Patches/0071-Add-World-Util-Methods.patch b/Spigot-Server-Patches/0070-Add-World-Util-Methods.patch
similarity index 96%
rename from Spigot-Server-Patches/0071-Add-World-Util-Methods.patch
rename to Spigot-Server-Patches/0070-Add-World-Util-Methods.patch
index 15ec05b7b..33b38f59c 100644
--- a/Spigot-Server-Patches/0071-Add-World-Util-Methods.patch
+++ b/Spigot-Server-Patches/0070-Add-World-Util-Methods.patch
@@ -1,4 +1,4 @@
-From 9270fa048bd8ae7bcb97a9a0fa9c9b101772affc Mon Sep 17 00:00:00 2001
+From c896d823498f07c8b105f0f84936ff10cbf6736a 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 7ea4b9b5c..fb27dcac2 100644
+index eb6f900c39..ef6a54bcae 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -635,6 +635,7 @@ public class Chunk implements IChunkAccess {
@@ -18,7 +18,7 @@ index 7ea4b9b5c..fb27dcac2 100644
          return this.a(blockposition, i, this.world.o().g());
      }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index d51ed0f80..d3785f73b 100644
+index e0fe05a0b1..72c0c92ec1 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -81,7 +81,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
diff --git a/Spigot-Server-Patches/0072-Optimized-Light-Level-Comparisons.patch b/Spigot-Server-Patches/0071-Optimized-Light-Level-Comparisons.patch
similarity index 98%
rename from Spigot-Server-Patches/0072-Optimized-Light-Level-Comparisons.patch
rename to Spigot-Server-Patches/0071-Optimized-Light-Level-Comparisons.patch
index 0679afa45..318656a42 100644
--- a/Spigot-Server-Patches/0072-Optimized-Light-Level-Comparisons.patch
+++ b/Spigot-Server-Patches/0071-Optimized-Light-Level-Comparisons.patch
@@ -1,4 +1,4 @@
-From b6b6798de1a749716668630b22eaac2cd1b37a20 Mon Sep 17 00:00:00 2001
+From eacfdadd2d81da65924f23d25f0f08a0e94179b4 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
diff --git a/Spigot-Server-Patches/0073-Pass-world-to-Village-creation.patch b/Spigot-Server-Patches/0072-Pass-world-to-Village-creation.patch
similarity index 90%
rename from Spigot-Server-Patches/0073-Pass-world-to-Village-creation.patch
rename to Spigot-Server-Patches/0072-Pass-world-to-Village-creation.patch
index 502033fa5..cfa00ebf9 100644
--- a/Spigot-Server-Patches/0073-Pass-world-to-Village-creation.patch
+++ b/Spigot-Server-Patches/0072-Pass-world-to-Village-creation.patch
@@ -1,4 +1,4 @@
-From fe8a705410d94b93222d61216dd2323ad85bc3f9 Mon Sep 17 00:00:00 2001
+From ea8fdac269a25dbe9984c82bbe321a61a079f16e 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Pass world to Village creation
 fixes NPE bug #95
 
 diff --git a/src/main/java/net/minecraft/server/PersistentVillage.java b/src/main/java/net/minecraft/server/PersistentVillage.java
-index c09326636..3219ccca4 100644
+index c09326636c..3219ccca40 100644
 --- a/src/main/java/net/minecraft/server/PersistentVillage.java
 +++ b/src/main/java/net/minecraft/server/PersistentVillage.java
 @@ -234,7 +234,7 @@ public class PersistentVillage extends PersistentBase {
@@ -19,7 +19,7 @@ index c09326636..3219ccca4 100644
              village.a(nbttagcompound1);
              this.villages.add(village);
 diff --git a/src/main/java/net/minecraft/server/Village.java b/src/main/java/net/minecraft/server/Village.java
-index e742cbe12..dfcabb83a 100644
+index e742cbe120..dfcabb83a1 100644
 --- a/src/main/java/net/minecraft/server/Village.java
 +++ b/src/main/java/net/minecraft/server/Village.java
 @@ -24,7 +24,7 @@ public class Village {
diff --git a/Spigot-Server-Patches/0074-Custom-replacement-for-eaten-items.patch b/Spigot-Server-Patches/0073-Custom-replacement-for-eaten-items.patch
similarity index 97%
rename from Spigot-Server-Patches/0074-Custom-replacement-for-eaten-items.patch
rename to Spigot-Server-Patches/0073-Custom-replacement-for-eaten-items.patch
index 629d6b4db..8b285330f 100644
--- a/Spigot-Server-Patches/0074-Custom-replacement-for-eaten-items.patch
+++ b/Spigot-Server-Patches/0073-Custom-replacement-for-eaten-items.patch
@@ -1,4 +1,4 @@
-From 1bc1148cbc2b01c71098683b2b89449f35791f7c Mon Sep 17 00:00:00 2001
+From daf02c8da838148c6d5e145c4b89c8d64063168d 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/Spigot-Server-Patches/0075-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/Spigot-Server-Patches/0074-handle-NaN-health-absorb-values-and-repair-bad-data.patch
similarity index 97%
rename from Spigot-Server-Patches/0075-handle-NaN-health-absorb-values-and-repair-bad-data.patch
rename to Spigot-Server-Patches/0074-handle-NaN-health-absorb-values-and-repair-bad-data.patch
index 152a09490..24ccfb278 100644
--- a/Spigot-Server-Patches/0075-handle-NaN-health-absorb-values-and-repair-bad-data.patch
+++ b/Spigot-Server-Patches/0074-handle-NaN-health-absorb-values-and-repair-bad-data.patch
@@ -1,4 +1,4 @@
-From c9c2f8e5d9b59d0956a2369bd59141ae6e78608b Mon Sep 17 00:00:00 2001
+From 31531d85e46c9c7c17eecd323aec769aa572cabb 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/Spigot-Server-Patches/0076-Catch-Async-PlayerChunkMap-operations.patch b/Spigot-Server-Patches/0075-Catch-Async-PlayerChunkMap-operations.patch
similarity index 89%
rename from Spigot-Server-Patches/0076-Catch-Async-PlayerChunkMap-operations.patch
rename to Spigot-Server-Patches/0075-Catch-Async-PlayerChunkMap-operations.patch
index 43a128219..5f10841d4 100644
--- a/Spigot-Server-Patches/0076-Catch-Async-PlayerChunkMap-operations.patch
+++ b/Spigot-Server-Patches/0075-Catch-Async-PlayerChunkMap-operations.patch
@@ -1,11 +1,11 @@
-From e6e8be0132a9f4e4c4b4b2fd92e6e3a18a8fd805 Mon Sep 17 00:00:00 2001
+From afaa481d091edf3f654b0f5aafa4f01ba92499b1 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 6ece565c5..4d888d6d4 100644
+index 6ece565c51..4d888d6d4f 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -443,10 +443,12 @@ public class PlayerChunkMap {
diff --git a/Spigot-Server-Patches/0077-Waving-banner-workaround.patch b/Spigot-Server-Patches/0076-Waving-banner-workaround.patch
similarity index 92%
rename from Spigot-Server-Patches/0077-Waving-banner-workaround.patch
rename to Spigot-Server-Patches/0076-Waving-banner-workaround.patch
index c8ae613ee..cf2674599 100644
--- a/Spigot-Server-Patches/0077-Waving-banner-workaround.patch
+++ b/Spigot-Server-Patches/0076-Waving-banner-workaround.patch
@@ -1,4 +1,4 @@
-From 5f67b25a27935227c89946213d7c1b9241b20cb9 Mon Sep 17 00:00:00 2001
+From 2a68d81ec369c7a193a9c0923daddb9f92db523d 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Waving banner workaround
 This patch is a workaround for MC-63720
 
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java b/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java
-index c5c3f40ce..6413f76e7 100644
+index c5c3f40ce0..6413f76e78 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java
 @@ -4,7 +4,13 @@ import java.io.IOException;
diff --git a/Spigot-Server-Patches/0078-Use-a-Shared-Random-for-Entities.patch b/Spigot-Server-Patches/0077-Use-a-Shared-Random-for-Entities.patch
similarity index 94%
rename from Spigot-Server-Patches/0078-Use-a-Shared-Random-for-Entities.patch
rename to Spigot-Server-Patches/0077-Use-a-Shared-Random-for-Entities.patch
index 823b8c14c..917089ba8 100644
--- a/Spigot-Server-Patches/0078-Use-a-Shared-Random-for-Entities.patch
+++ b/Spigot-Server-Patches/0077-Use-a-Shared-Random-for-Entities.patch
@@ -1,4 +1,4 @@
-From 368053f43ba373d4b5c106fcd7390d8ea5fedfea Mon Sep 17 00:00:00 2001
+From d9e146f01679a6389ff7838846ff6530b8333a55 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 27020c7e2..07172d3dd 100644
+index 27020c7e29..07172d3dd8 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 27020c7e2..07172d3dd 100644
          this.justCreated = true;
          this.uniqueID = MathHelper.a(this.random);
 -- 
-2.17.1
+2.18.0
 
diff --git a/Spigot-Server-Patches/0079-Don-t-teleport-dead-entities.patch b/Spigot-Server-Patches/0078-Don-t-teleport-dead-entities.patch
similarity index 89%
rename from Spigot-Server-Patches/0079-Don-t-teleport-dead-entities.patch
rename to Spigot-Server-Patches/0078-Don-t-teleport-dead-entities.patch
index 4ab5930e1..f5e347945 100644
--- a/Spigot-Server-Patches/0079-Don-t-teleport-dead-entities.patch
+++ b/Spigot-Server-Patches/0078-Don-t-teleport-dead-entities.patch
@@ -1,4 +1,4 @@
-From 910a0f2540abd19874fa2bff7109b5006b195846 Mon Sep 17 00:00:00 2001
+From 968690c2207317f77f0b933b4a12d4c712de3c20 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
@@ -7,7 +7,7 @@ Had some issue with this in past, and this is the vanilla logic.
 Potentially an old CB change that's no longer needed.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 07172d3dd..53ef6b0ed 100644
+index 07172d3dd8..53ef6b0ed6 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2565,7 +2565,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -20,5 +20,5 @@ index 07172d3dd..53ef6b0ed 100644
              WorldServer worldserver1 = ((CraftWorld) exit.getWorld()).getHandle();
              int i = worldserver1.dimension;
 -- 
-2.17.1
+2.18.0
 
diff --git a/Spigot-Server-Patches/0080-Optimize-Chunk-Access.patch b/Spigot-Server-Patches/0079-Optimize-Chunk-Access.patch
similarity index 95%
rename from Spigot-Server-Patches/0080-Optimize-Chunk-Access.patch
rename to Spigot-Server-Patches/0079-Optimize-Chunk-Access.patch
index 335dc7d21..7519542b0 100644
--- a/Spigot-Server-Patches/0080-Optimize-Chunk-Access.patch
+++ b/Spigot-Server-Patches/0079-Optimize-Chunk-Access.patch
@@ -1,4 +1,4 @@
-From 44f37fdd16c122b143b05d4a1c0e6aaaa4b84e34 Mon Sep 17 00:00:00 2001
+From 4849096581eda2911fc4f3dd36f58e4678e5dc29 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
diff --git a/Spigot-Server-Patches/0081-Configurable-spawn-chances-for-skeleton-horses.patch b/Spigot-Server-Patches/0080-Configurable-spawn-chances-for-skeleton-horses.patch
similarity index 92%
rename from Spigot-Server-Patches/0081-Configurable-spawn-chances-for-skeleton-horses.patch
rename to Spigot-Server-Patches/0080-Configurable-spawn-chances-for-skeleton-horses.patch
index f9803b9dd..ad2a004d9 100644
--- a/Spigot-Server-Patches/0081-Configurable-spawn-chances-for-skeleton-horses.patch
+++ b/Spigot-Server-Patches/0080-Configurable-spawn-chances-for-skeleton-horses.patch
@@ -1,11 +1,11 @@
-From 67ea6458bbbc22760d99d38cf8f310c0be092846 Mon Sep 17 00:00:00 2001
+From c186b41eb75af263e81c093dc4bc3a7db435a8ab 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/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 0de300739..c2c33d75b 100644
+index 0de3007392..c2c33d75bf 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -212,4 +212,9 @@ public class PaperWorldConfig {
@@ -19,7 +19,7 @@ index 0de300739..c2c33d75b 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index dd09ab20e..ecee3b406 100644
+index dd09ab20e7..ecee3b4064 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -498,7 +498,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
diff --git a/Spigot-Server-Patches/0082-Optimize-isValidLocation-getType-and-getBlockData-fo.patch b/Spigot-Server-Patches/0081-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
similarity index 97%
rename from Spigot-Server-Patches/0082-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
rename to Spigot-Server-Patches/0081-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
index f50e147ec..ab49dfd88 100644
--- a/Spigot-Server-Patches/0082-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
+++ b/Spigot-Server-Patches/0081-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
@@ -1,4 +1,4 @@
-From ed048596459f752d8eeca4eb1393acd137e0b0f9 Mon Sep 17 00:00:00 2001
+From 42f660596a1ac2e6830fb330b21147014495a687 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
@@ -12,7 +12,7 @@ Replace all calls to the new place to the unnecessary forward.
 Optimize getType and getBlockData to manually inline and optimize the calls
 
 diff --git a/src/main/java/net/minecraft/server/BaseBlockPosition.java b/src/main/java/net/minecraft/server/BaseBlockPosition.java
-index e2a7b4be2..58f8b4b72 100644
+index e2a7b4be2c..58f8b4b720 100644
 --- a/src/main/java/net/minecraft/server/BaseBlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BaseBlockPosition.java
 @@ -10,6 +10,14 @@ public class BaseBlockPosition implements Comparable<BaseBlockPosition> {
@@ -31,7 +31,7 @@ index e2a7b4be2..58f8b4b72 100644
      public BaseBlockPosition(int i, int j, int k) {
          this.a = i;
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index 7dbea9090..252e00e16 100644
+index 7dbea90902..252e00e166 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -341,6 +341,16 @@ public class BlockPosition extends BaseBlockPosition {
@@ -52,7 +52,7 @@ index 7dbea9090..252e00e16 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 7622e9afb..a832e3855 100644
+index ef6a54bcae..4b440c7077 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -430,12 +430,24 @@ public class Chunk implements IChunkAccess {
@@ -83,7 +83,7 @@ index 7622e9afb..a832e3855 100644
              IBlockData iblockdata = null;
  
 diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java
-index 7c6308dbe..880058a9e 100644
+index 35aea4829f..233cbb6d60 100644
 --- a/src/main/java/net/minecraft/server/ChunkSection.java
 +++ b/src/main/java/net/minecraft/server/ChunkSection.java
 @@ -9,7 +9,7 @@ public class ChunkSection {
@@ -96,7 +96,7 @@ index 7c6308dbe..880058a9e 100644
      private NibbleArray skyLight;
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 72c0c92ec..1df752894 100644
+index 72c0c92ec1..1df7528949 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -262,11 +262,11 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
diff --git a/Spigot-Server-Patches/0083-Access-items-by-EquipmentSlot.patch b/Spigot-Server-Patches/0082-Access-items-by-EquipmentSlot.patch
similarity index 95%
rename from Spigot-Server-Patches/0083-Access-items-by-EquipmentSlot.patch
rename to Spigot-Server-Patches/0082-Access-items-by-EquipmentSlot.patch
index 4adbf6ef8..10785d3d4 100644
--- a/Spigot-Server-Patches/0083-Access-items-by-EquipmentSlot.patch
+++ b/Spigot-Server-Patches/0082-Access-items-by-EquipmentSlot.patch
@@ -1,11 +1,11 @@
-From a3603d62b1e1066a3e8b4ef5d5d3fe9bec5911a3 Mon Sep 17 00:00:00 2001
+From 0afff1632941d3adfb13808187d1578188c96c74 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
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
-index 6cbe06956..7b62f26d7 100644
+index 6cbe069562..7b62f26d7c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
 @@ -250,4 +250,54 @@ public class CraftInventoryPlayer extends CraftInventory implements org.bukkit.i
diff --git a/Spigot-Server-Patches/0084-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch b/Spigot-Server-Patches/0083-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
similarity index 94%
rename from Spigot-Server-Patches/0084-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
rename to Spigot-Server-Patches/0083-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
index 9e5e40682..4a631c94e 100644
--- a/Spigot-Server-Patches/0084-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
+++ b/Spigot-Server-Patches/0083-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
@@ -1,4 +1,4 @@
-From 1fc8618476847297afeb47f861ed17b738be465e Mon Sep 17 00:00:00 2001
+From 47b1de18f9769b9514bdfa76a274b617af51a8a8 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
@@ -11,7 +11,7 @@ Defaulting this to false will provide substantial performance improvement
 by saving millions of event calls on redstone heavy servers.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index c2c33d75b..b3b3baddc 100644
+index c2c33d75bf..b3b3baddc0 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -217,4 +217,9 @@ public class PaperWorldConfig {
@@ -25,7 +25,7 @@ index c2c33d75b..b3b3baddc 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 1df752894..87fd23c7f 100644
+index 1df7528949..87fd23c7f8 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -593,7 +593,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@@ -38,7 +38,7 @@ index 1df752894..87fd23c7f 100644
                      this.getServer().getPluginManager().callEvent(event);
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index ecee3b406..96002184b 100644
+index ecee3b4064..96002184bb 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -36,6 +36,7 @@ import org.bukkit.event.weather.LightningStrikeEvent;
diff --git a/Spigot-Server-Patches/0085-Entity-AddTo-RemoveFrom-World-Events.patch b/Spigot-Server-Patches/0084-Entity-AddTo-RemoveFrom-World-Events.patch
similarity index 91%
rename from Spigot-Server-Patches/0085-Entity-AddTo-RemoveFrom-World-Events.patch
rename to Spigot-Server-Patches/0084-Entity-AddTo-RemoveFrom-World-Events.patch
index 428051d55..fad5bb29c 100644
--- a/Spigot-Server-Patches/0085-Entity-AddTo-RemoveFrom-World-Events.patch
+++ b/Spigot-Server-Patches/0084-Entity-AddTo-RemoveFrom-World-Events.patch
@@ -1,11 +1,11 @@
-From 5aafa835b8a924d393945a7795bf1ab0a7524cda Mon Sep 17 00:00:00 2001
+From 3c1a47e5259a7de1ea0fa2e0d6cfbdda0e3990ba 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/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 87fd23c7f..83955fdd8 100644
+index 87fd23c7f8..83955fdd81 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1048,6 +1048,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
diff --git a/Spigot-Server-Patches/0086-Configurable-Chunk-Inhabited-Timer.patch b/Spigot-Server-Patches/0085-Configurable-Chunk-Inhabited-Timer.patch
similarity index 96%
rename from Spigot-Server-Patches/0086-Configurable-Chunk-Inhabited-Timer.patch
rename to Spigot-Server-Patches/0085-Configurable-Chunk-Inhabited-Timer.patch
index 2fe77fad8..aabcfb1a1 100644
--- a/Spigot-Server-Patches/0086-Configurable-Chunk-Inhabited-Timer.patch
+++ b/Spigot-Server-Patches/0085-Configurable-Chunk-Inhabited-Timer.patch
@@ -1,4 +1,4 @@
-From ec0220446f2d37c7138941ebd903fb1f49849fa9 Mon Sep 17 00:00:00 2001
+From eb14acc9a6e994a5003d6f2650bbb85b0605d937 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
diff --git a/Spigot-Server-Patches/0087-EntityPathfindEvent.patch b/Spigot-Server-Patches/0086-EntityPathfindEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0087-EntityPathfindEvent.patch
rename to Spigot-Server-Patches/0086-EntityPathfindEvent.patch
index db0929341..1918380c3 100644
--- a/Spigot-Server-Patches/0087-EntityPathfindEvent.patch
+++ b/Spigot-Server-Patches/0086-EntityPathfindEvent.patch
@@ -1,4 +1,4 @@
-From 6f900d976e49e29d9a3cfd377e94d7121ddb6e65 Mon Sep 17 00:00:00 2001
+From da0eaa98bb3f62b2ddc2b3c3b4a29719605594da Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 21:22:26 -0400
 Subject: [PATCH] EntityPathfindEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] EntityPathfindEvent
 Fires when an Entity decides to start moving to a location.
 
 diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
-index 8111317e3..76d1f4bd2 100644
+index 8111317e31..76d1f4bd21 100644
 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java
 +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
 @@ -4,7 +4,7 @@ import javax.annotation.Nullable;
diff --git a/Spigot-Server-Patches/0088-Reduce-IO-ops-opening-a-new-region-file.patch b/Spigot-Server-Patches/0087-Reduce-IO-ops-opening-a-new-region-file.patch
similarity index 94%
rename from Spigot-Server-Patches/0088-Reduce-IO-ops-opening-a-new-region-file.patch
rename to Spigot-Server-Patches/0087-Reduce-IO-ops-opening-a-new-region-file.patch
index 7f5107130..ca23a1e80 100644
--- a/Spigot-Server-Patches/0088-Reduce-IO-ops-opening-a-new-region-file.patch
+++ b/Spigot-Server-Patches/0087-Reduce-IO-ops-opening-a-new-region-file.patch
@@ -1,11 +1,11 @@
-From d1b56fb71f1165a2f50706cef0f4676cc3a29a21 Mon Sep 17 00:00:00 2001
+From 37a926f3964c8a76bead6516f01cf84b75646f00 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.
 
 
 diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
-index 3f9aa5923..4acb6df5d 100644
+index b8b514c874..cba2373125 100644
 --- a/src/main/java/net/minecraft/server/RegionFile.java
 +++ b/src/main/java/net/minecraft/server/RegionFile.java
 @@ -8,9 +8,12 @@ import java.io.ByteArrayInputStream;
diff --git a/Spigot-Server-Patches/0089-Sanitise-RegionFileCache-and-make-configurable.patch b/Spigot-Server-Patches/0088-Sanitise-RegionFileCache-and-make-configurable.patch
similarity index 95%
rename from Spigot-Server-Patches/0089-Sanitise-RegionFileCache-and-make-configurable.patch
rename to Spigot-Server-Patches/0088-Sanitise-RegionFileCache-and-make-configurable.patch
index c934c061f..9bb420621 100644
--- a/Spigot-Server-Patches/0089-Sanitise-RegionFileCache-and-make-configurable.patch
+++ b/Spigot-Server-Patches/0088-Sanitise-RegionFileCache-and-make-configurable.patch
@@ -1,4 +1,4 @@
-From fd6ccdfc2049340dd24439852e20e25a9dd7c9bb Mon Sep 17 00:00:00 2001
+From 3c28cee211dd1246032623ac8b6c39a617213ad1 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,7 +11,7 @@ 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 40c5ea474..7d29ad369 100644
+index 620f23f4f0..a6042ca607 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 {
@@ -25,7 +25,7 @@ index 40c5ea474..7d29ad369 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index ff473a263..3b8d01ea1 100644
+index ff473a263f..3b8d01ea1a 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
 @@ -9,10 +9,12 @@ import java.io.IOException;
diff --git a/Spigot-Server-Patches/0090-Use-Optimized-Collections.patch b/Spigot-Server-Patches/0089-Use-Optimized-Collections.patch
similarity index 94%
rename from Spigot-Server-Patches/0090-Use-Optimized-Collections.patch
rename to Spigot-Server-Patches/0089-Use-Optimized-Collections.patch
index 57406de16..4915b0835 100644
--- a/Spigot-Server-Patches/0090-Use-Optimized-Collections.patch
+++ b/Spigot-Server-Patches/0089-Use-Optimized-Collections.patch
@@ -1,4 +1,4 @@
-From 577370cdcd50969b88062f39cf1dffb067264883 Mon Sep 17 00:00:00 2001
+From 7acdaa46de379b7d8fc5e33700adbbffdcae5816 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
@@ -13,7 +13,7 @@ These collections are super fast as seen
 http://java-performance.info/hashmap-overview-jdk-fastutil-goldman-sachs-hppc-koloboke-trove-january-2015/
 
 diff --git a/src/main/java/net/minecraft/server/DataWatcher.java b/src/main/java/net/minecraft/server/DataWatcher.java
-index 2b27ae797..7191185ba 100644
+index 2b27ae7973..7191185ba7 100644
 --- a/src/main/java/net/minecraft/server/DataWatcher.java
 +++ b/src/main/java/net/minecraft/server/DataWatcher.java
 @@ -12,6 +12,7 @@ import java.util.Map;
diff --git a/Spigot-Server-Patches/0091-Do-not-load-chunks-for-light-checks.patch b/Spigot-Server-Patches/0090-Do-not-load-chunks-for-light-checks.patch
similarity index 90%
rename from Spigot-Server-Patches/0091-Do-not-load-chunks-for-light-checks.patch
rename to Spigot-Server-Patches/0090-Do-not-load-chunks-for-light-checks.patch
index 95ae9bf7c..063e67b6c 100644
--- a/Spigot-Server-Patches/0091-Do-not-load-chunks-for-light-checks.patch
+++ b/Spigot-Server-Patches/0090-Do-not-load-chunks-for-light-checks.patch
@@ -1,4 +1,4 @@
-From 565362b9c7429010d87432c451e51a1519029b88 Mon Sep 17 00:00:00 2001
+From a11649b5e8780aa5325a96eb2632b0b35d9156c0 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
@@ -7,7 +7,7 @@ Should only happen for blocks on the edge that uses neighbors light level
 (certain blocks). In that case, there will be 3-4 other neighbors to get a light level from.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 83955fdd8..dcc1d08b1 100644
+index 83955fdd81..dcc1d08b16 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -636,6 +636,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
diff --git a/Spigot-Server-Patches/0092-Add-PlayerUseUnknownEntityEvent.patch b/Spigot-Server-Patches/0091-Add-PlayerUseUnknownEntityEvent.patch
similarity index 92%
rename from Spigot-Server-Patches/0092-Add-PlayerUseUnknownEntityEvent.patch
rename to Spigot-Server-Patches/0091-Add-PlayerUseUnknownEntityEvent.patch
index 58e45788c..e59fc7b24 100644
--- a/Spigot-Server-Patches/0092-Add-PlayerUseUnknownEntityEvent.patch
+++ b/Spigot-Server-Patches/0091-Add-PlayerUseUnknownEntityEvent.patch
@@ -1,11 +1,11 @@
-From 023266ca8f49d694c4e425ab6b7475b195ccb38e Mon Sep 17 00:00:00 2001
+From d5dc1be98794dc8986745880f7a6ab802fbf8e93 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/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java b/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java
-index 77440ac81..8711462e1 100644
+index 77440ac81f..8711462e16 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java
 @@ -5,7 +5,7 @@ import javax.annotation.Nullable;
@@ -18,7 +18,7 @@ index 77440ac81..8711462e1 100644
      private Vec3D c;
      private EnumHand d;
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 88b761d27..a3486bd46 100644
+index dc38e4e043..90ab7f065f 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1893,6 +1893,16 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
diff --git a/Spigot-Server-Patches/0093-Fix-reducedDebugInfo-not-initialized-on-client.patch b/Spigot-Server-Patches/0092-Fix-reducedDebugInfo-not-initialized-on-client.patch
similarity index 91%
rename from Spigot-Server-Patches/0093-Fix-reducedDebugInfo-not-initialized-on-client.patch
rename to Spigot-Server-Patches/0092-Fix-reducedDebugInfo-not-initialized-on-client.patch
index 73e63f800..cce3f7c67 100644
--- a/Spigot-Server-Patches/0093-Fix-reducedDebugInfo-not-initialized-on-client.patch
+++ b/Spigot-Server-Patches/0092-Fix-reducedDebugInfo-not-initialized-on-client.patch
@@ -1,11 +1,11 @@
-From 9ef42a2b51fae0e453e1184787bf985d2a1f8223 Mon Sep 17 00:00:00 2001
+From bf2f558773207bf9d83d115bb4a6edce244d4d30 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 23cab725d..8e1edde31 100644
+index 8b3c2d2874..7f324a9c0f 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 {
diff --git a/Spigot-Server-Patches/0094-Configurable-Grass-Spread-Tick-Rate.patch b/Spigot-Server-Patches/0093-Configurable-Grass-Spread-Tick-Rate.patch
similarity index 92%
rename from Spigot-Server-Patches/0094-Configurable-Grass-Spread-Tick-Rate.patch
rename to Spigot-Server-Patches/0093-Configurable-Grass-Spread-Tick-Rate.patch
index 9b93a29c4..80a1ba47d 100644
--- a/Spigot-Server-Patches/0094-Configurable-Grass-Spread-Tick-Rate.patch
+++ b/Spigot-Server-Patches/0093-Configurable-Grass-Spread-Tick-Rate.patch
@@ -1,11 +1,11 @@
-From f5381978161686a8bc5c898c9a74cb4319bd7236 Mon Sep 17 00:00:00 2001
+From ccb7c36c3b7bec200c4a6d5182f1bc8d8bc9632a 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/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 613964ce0..bb1c1c57c 100644
+index 613964ce04..bb1c1c57cc 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -227,4 +227,10 @@ public class PaperWorldConfig {
@@ -20,7 +20,7 @@ index 613964ce0..bb1c1c57c 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/BlockDirtSnowSpreadable.java b/src/main/java/net/minecraft/server/BlockDirtSnowSpreadable.java
-index 6343fb1e0..903e8241b 100644
+index 6343fb1e0d..903e8241b8 100644
 --- a/src/main/java/net/minecraft/server/BlockDirtSnowSpreadable.java
 +++ b/src/main/java/net/minecraft/server/BlockDirtSnowSpreadable.java
 @@ -21,6 +21,7 @@ public abstract class BlockDirtSnowSpreadable extends BlockDirtSnow {
diff --git a/Spigot-Server-Patches/0095-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0094-Configurable-Keep-Spawn-Loaded-range-per-world.patch
similarity index 96%
rename from Spigot-Server-Patches/0095-Configurable-Keep-Spawn-Loaded-range-per-world.patch
rename to Spigot-Server-Patches/0094-Configurable-Keep-Spawn-Loaded-range-per-world.patch
index 96c384567..1cf75fb00 100644
--- a/Spigot-Server-Patches/0095-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/Spigot-Server-Patches/0094-Configurable-Keep-Spawn-Loaded-range-per-world.patch
@@ -1,4 +1,4 @@
-From 3106868b36a4a6fa5a92ab7be64230e090d9a1a4 Mon Sep 17 00:00:00 2001
+From 057291c909254cc8c64bfb6e936fd0548b9f583f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 13 Sep 2014 23:14:43 -0400
 Subject: [PATCH] Configurable Keep Spawn Loaded range per world
@@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Keep Spawn Loaded range per world
 This lets you disable it for some worlds and lower it for others.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index bb1c1c57c..667a0dde8 100644
+index bb1c1c57cc..667a0dde8c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -233,4 +233,10 @@ public class PaperWorldConfig {
@@ -21,7 +21,7 @@ index bb1c1c57c..667a0dde8 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 9fcc8c782..204cf4f64 100644
+index 9fcc8c782d..204cf4f648 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -485,13 +485,21 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -63,7 +63,7 @@ index 9fcc8c782..204cf4f64 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index dcc1d08b1..4c33c331f 100644
+index dcc1d08b16..4c33c331f0 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -2836,8 +2836,9 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@@ -78,7 +78,7 @@ index dcc1d08b1..4c33c331f 100644
  
      public void a(Packet<?> packet) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5634b1c85..6e3539ab8 100644
+index 5634b1c85e..6e3539ab8d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -991,7 +991,7 @@ public final class CraftServer implements Server {
@@ -91,7 +91,7 @@ index 5634b1c85..6e3539ab8 100644
              for (int j = -short1; j <= short1; j += 16) {
                  for (int k = -short1; k <= short1; k += 16) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 29a5ac639..e3e45ed48 100644
+index 29a5ac639e..e3e45ed48a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1281,8 +1281,9 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0096-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/Spigot-Server-Patches/0095-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
similarity index 89%
rename from Spigot-Server-Patches/0096-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
rename to Spigot-Server-Patches/0095-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
index 4d678f44e..550b9d112 100644
--- a/Spigot-Server-Patches/0096-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
+++ b/Spigot-Server-Patches/0095-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
@@ -1,11 +1,11 @@
-From 15b2bd0be92109b6de6e36db8d778eacd65a1c72 Mon Sep 17 00:00:00 2001
+From 64e9589f1843077c2fa08b83ffe6b69e7941fed8 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/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 4c33c331f..e693b43a2 100644
+index 4c33c331f0..e693b43a23 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -551,6 +551,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
diff --git a/Spigot-Server-Patches/0097-Don-t-spam-reload-spawn-chunks-in-nether-end.patch b/Spigot-Server-Patches/0096-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
similarity index 90%
rename from Spigot-Server-Patches/0097-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
rename to Spigot-Server-Patches/0096-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
index 8a1c2fedf..91c9f3ddf 100644
--- a/Spigot-Server-Patches/0097-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
+++ b/Spigot-Server-Patches/0096-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
@@ -1,11 +1,11 @@
-From 66c1fe97c1459f56e2e9ddcb686fadd5430b0bdf Mon Sep 17 00:00:00 2001
+From dc943703d601afe8a65e5af90b9cac08fbbdf837 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
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index e693b43a2..e75ce9b4f 100644
+index e693b43a23..e75ce9b4f5 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -2832,6 +2832,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@@ -17,7 +17,7 @@ index e693b43a2..e75ce9b4f 100644
          BlockPosition blockposition = this.getSpawn();
          int k = i * 16 + 8 - blockposition.getX();
 diff --git a/src/main/java/net/minecraft/server/WorldProvider.java b/src/main/java/net/minecraft/server/WorldProvider.java
-index 6b62235e5..26ef3a41f 100644
+index 6b62235e54..26ef3a41f2 100644
 --- a/src/main/java/net/minecraft/server/WorldProvider.java
 +++ b/src/main/java/net/minecraft/server/WorldProvider.java
 @@ -69,7 +69,7 @@ public abstract class WorldProvider {
diff --git a/Spigot-Server-Patches/0098-Remove-Debug-checks-from-DataBits.patch b/Spigot-Server-Patches/0097-Remove-Debug-checks-from-DataBits.patch
similarity index 94%
rename from Spigot-Server-Patches/0098-Remove-Debug-checks-from-DataBits.patch
rename to Spigot-Server-Patches/0097-Remove-Debug-checks-from-DataBits.patch
index 17c50b598..65e95ca3f 100644
--- a/Spigot-Server-Patches/0098-Remove-Debug-checks-from-DataBits.patch
+++ b/Spigot-Server-Patches/0097-Remove-Debug-checks-from-DataBits.patch
@@ -1,4 +1,4 @@
-From 815ec2a31b886837709faf3317b3016274f43606 Mon Sep 17 00:00:00 2001
+From ca661277ab0b0df75c267368ac65590de2561fff 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
@@ -9,7 +9,7 @@ Before: http://i.imgur.com/nQsMzAE.png
 After: http://i.imgur.com/nJ46crB.png
 
 diff --git a/src/main/java/net/minecraft/server/DataBits.java b/src/main/java/net/minecraft/server/DataBits.java
-index d24ec3d53..0fb3162e6 100644
+index d24ec3d53c..0fb3162e65 100644
 --- a/src/main/java/net/minecraft/server/DataBits.java
 +++ b/src/main/java/net/minecraft/server/DataBits.java
 @@ -14,7 +14,7 @@ public class DataBits {
diff --git a/Spigot-Server-Patches/0099-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/Spigot-Server-Patches/0098-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
similarity index 94%
rename from Spigot-Server-Patches/0099-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
rename to Spigot-Server-Patches/0098-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
index 82aad63de..b0e28edc3 100644
--- a/Spigot-Server-Patches/0099-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
+++ b/Spigot-Server-Patches/0098-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
@@ -1,11 +1,11 @@
-From 3123ef38d15374e24c3991a323acd6dda9c13ce9 Mon Sep 17 00:00:00 2001
+From 0196b87208cca641f06a4503905e9623833eb756 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/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 667a0dde8..b6ef1d437 100644
+index 667a0dde8c..b6ef1d4378 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -239,4 +239,9 @@ public class PaperWorldConfig {
@@ -19,7 +19,7 @@ index 667a0dde8..b6ef1d437 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 53ef6b0ed..da1254f5e 100644
+index 53ef6b0ed6..da1254f5e1 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2260,6 +2260,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -31,7 +31,7 @@ index 53ef6b0ed..da1254f5e 100644
      public ScoreboardTeamBase be() {
          if (!this.world.paperConfig.nonPlayerEntitiesOnScoreboards && !(this instanceof EntityHuman)) { return null; } // Paper
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 90ab7f065..1ca3c87c7 100644
+index 90ab7f065f..1ca3c87c7a 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1622,7 +1622,15 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -52,5 +52,5 @@ index 90ab7f065..1ca3c87c7 100644
                  if (((LazyPlayerSet) event.getRecipients()).isLazy()) {
                      for (Object recipient : minecraftServer.getPlayerList().players) {
 -- 
-2.17.1
+2.18.0
 
diff --git a/Spigot-Server-Patches/0100-Workaround-for-setting-passengers-on-players.patch b/Spigot-Server-Patches/0099-Workaround-for-setting-passengers-on-players.patch
similarity index 91%
rename from Spigot-Server-Patches/0100-Workaround-for-setting-passengers-on-players.patch
rename to Spigot-Server-Patches/0099-Workaround-for-setting-passengers-on-players.patch
index cac924688..5f82e58e6 100644
--- a/Spigot-Server-Patches/0100-Workaround-for-setting-passengers-on-players.patch
+++ b/Spigot-Server-Patches/0099-Workaround-for-setting-passengers-on-players.patch
@@ -1,4 +1,4 @@
-From aa7dad05c9aedd3421ebe601e2994f52b88a94b4 Mon Sep 17 00:00:00 2001
+From 7d20dbe3b794e0c62991f9f38a0d598c6201e567 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 be29f85a0..a84f1a055 100644
+index be29f85a05..a84f1a055c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -713,6 +713,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0101-Remove-unused-World-Tile-Entity-List.patch b/Spigot-Server-Patches/0100-Remove-unused-World-Tile-Entity-List.patch
similarity index 97%
rename from Spigot-Server-Patches/0101-Remove-unused-World-Tile-Entity-List.patch
rename to Spigot-Server-Patches/0100-Remove-unused-World-Tile-Entity-List.patch
index 64cb76897..885ebdf5f 100644
--- a/Spigot-Server-Patches/0101-Remove-unused-World-Tile-Entity-List.patch
+++ b/Spigot-Server-Patches/0100-Remove-unused-World-Tile-Entity-List.patch
@@ -1,4 +1,4 @@
-From 2c55dcfe813664b984f3ffa0c5f4a3c6ed83554e Mon Sep 17 00:00:00 2001
+From 7b61d5fb71384b095cc802986071aca677e507cf 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Remove unused World Tile Entity List
 Massive hit to performance and it is completely unnecessary.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index e75ce9b4f..f314925b6 100644
+index e75ce9b4f5..f314925b6b 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -73,7 +73,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
diff --git a/Spigot-Server-Patches/0102-Don-t-tick-Skulls-unused-code.patch b/Spigot-Server-Patches/0101-Don-t-tick-Skulls-unused-code.patch
similarity index 88%
rename from Spigot-Server-Patches/0102-Don-t-tick-Skulls-unused-code.patch
rename to Spigot-Server-Patches/0101-Don-t-tick-Skulls-unused-code.patch
index 8b0e2cd31..6180b0ad1 100644
--- a/Spigot-Server-Patches/0102-Don-t-tick-Skulls-unused-code.patch
+++ b/Spigot-Server-Patches/0101-Don-t-tick-Skulls-unused-code.patch
@@ -1,11 +1,11 @@
-From 3577a2539471e163fd082cf8e5d277ce4a4dd71c Mon Sep 17 00:00:00 2001
+From bc669d463febf4e1a5f4e4200fdedc4cf4b5ca00 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 db4967f24..804236547 100644
+index af5e4093cc..85fd8dab60 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;
diff --git a/Spigot-Server-Patches/0103-Configurable-Player-Collision.patch b/Spigot-Server-Patches/0102-Configurable-Player-Collision.patch
similarity index 96%
rename from Spigot-Server-Patches/0103-Configurable-Player-Collision.patch
rename to Spigot-Server-Patches/0102-Configurable-Player-Collision.patch
index 389d00db2..1de92d7cb 100644
--- a/Spigot-Server-Patches/0103-Configurable-Player-Collision.patch
+++ b/Spigot-Server-Patches/0102-Configurable-Player-Collision.patch
@@ -1,11 +1,11 @@
-From 5af22f227e6bf0613e322053e4f50c714c19dd28 Mon Sep 17 00:00:00 2001
+From e1b199e4583897d7f4ae1afcb31174fb9fa70c6f 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 7d29ad369..bd9f03a76 100644
+index a6042ca607..9fe1311143 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 {
@@ -19,7 +19,7 @@ index 7d29ad369..bd9f03a76 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 071a1e30f..f88105382 100644
+index 204cf4f648..67c60be6f7 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -418,6 +418,20 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -44,7 +44,7 @@ index 071a1e30f..f88105382 100644
  
      protected void a(File file, WorldData worlddata) {
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java b/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java
-index a6aed2531..575e3762b 100644
+index a6aed2531f..575e3762b2 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java
 @@ -94,7 +94,7 @@ public class PacketPlayOutScoreboardTeam implements Packet<PacketListenerPlayOut
@@ -57,7 +57,7 @@ index a6aed2531..575e3762b 100644
              packetdataserializer.a(this.c);
              packetdataserializer.a(this.d);
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 7f324a9c0..d0c547cc9 100644
+index 7f324a9c0f..d0c547cc99 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -74,6 +74,7 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0104-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/Spigot-Server-Patches/0103-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
similarity index 96%
rename from Spigot-Server-Patches/0104-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
rename to Spigot-Server-Patches/0103-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
index 499643f0c..57687b766 100644
--- a/Spigot-Server-Patches/0104-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
+++ b/Spigot-Server-Patches/0103-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
@@ -1,4 +1,4 @@
-From 0d03db270cc3bde0d73293c739cf16653cb7357a Mon Sep 17 00:00:00 2001
+From fcaa96c04e21424f4853ee85135b726a78a3d2c9 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 7c75433f5..088ec198e 100644
+index 5b784002f5..2d57bdf40e 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 {
diff --git a/Spigot-Server-Patches/0105-Configurable-RCON-IP-address.patch b/Spigot-Server-Patches/0104-Configurable-RCON-IP-address.patch
similarity index 90%
rename from Spigot-Server-Patches/0105-Configurable-RCON-IP-address.patch
rename to Spigot-Server-Patches/0104-Configurable-RCON-IP-address.patch
index 5144d53aa..1368b350e 100644
--- a/Spigot-Server-Patches/0105-Configurable-RCON-IP-address.patch
+++ b/Spigot-Server-Patches/0104-Configurable-RCON-IP-address.patch
@@ -1,4 +1,4 @@
-From be4311568ddb5dfe4be686cec3907e7ac9018ae3 Mon Sep 17 00:00:00 2001
+From bfb9f37286c82a166bde5dc26bff46a34572442d 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Configurable RCON IP address
 For servers with multiple IP's, ability to bind to a specific interface.
 
 diff --git a/src/main/java/net/minecraft/server/RemoteControlListener.java b/src/main/java/net/minecraft/server/RemoteControlListener.java
-index 6f0176f6f..c237f239f 100644
+index 6f0176f6ff..c237f239f3 100644
 --- a/src/main/java/net/minecraft/server/RemoteControlListener.java
 +++ b/src/main/java/net/minecraft/server/RemoteControlListener.java
 @@ -24,7 +24,7 @@ public class RemoteControlListener extends RemoteConnectionThread {
@@ -19,5 +19,5 @@ index 6f0176f6f..c237f239f 100644
          if (0 == this.h) {
              this.h = this.i + 10;
 -- 
-2.17.0
+2.18.0
 
diff --git a/Spigot-Server-Patches/0106-Prevent-Fire-from-loading-chunks.patch b/Spigot-Server-Patches/0105-Prevent-Fire-from-loading-chunks.patch
similarity index 95%
rename from Spigot-Server-Patches/0106-Prevent-Fire-from-loading-chunks.patch
rename to Spigot-Server-Patches/0105-Prevent-Fire-from-loading-chunks.patch
index f1aafd560..e761879e4 100644
--- a/Spigot-Server-Patches/0106-Prevent-Fire-from-loading-chunks.patch
+++ b/Spigot-Server-Patches/0105-Prevent-Fire-from-loading-chunks.patch
@@ -1,4 +1,4 @@
-From 934f9f6f3306dbe1b0c95e38a3f2dc0d4279053c Mon Sep 17 00:00:00 2001
+From 90bf2f4b99dcb11f07cb5152a27bc38d4e0e1118 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 b6caf4c8a..f3a278c0b 100644
+index 8339d6f056..25a8a1afdf 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 {
diff --git a/Spigot-Server-Patches/0107-Implement-PlayerLocaleChangeEvent.patch b/Spigot-Server-Patches/0106-Implement-PlayerLocaleChangeEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0107-Implement-PlayerLocaleChangeEvent.patch
rename to Spigot-Server-Patches/0106-Implement-PlayerLocaleChangeEvent.patch
index 33f4d0988..1185f05dc 100644
--- a/Spigot-Server-Patches/0107-Implement-PlayerLocaleChangeEvent.patch
+++ b/Spigot-Server-Patches/0106-Implement-PlayerLocaleChangeEvent.patch
@@ -1,4 +1,4 @@
-From 131ee1008d2dfd177be70bf14d7b1741b1b2094b Mon Sep 17 00:00:00 2001
+From fbc8b24584e63ba28bdbb16a9d8c50eb39bf1709 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/Spigot-Server-Patches/0108-EntityRegainHealthEvent-isFastRegen-API.patch b/Spigot-Server-Patches/0107-EntityRegainHealthEvent-isFastRegen-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0108-EntityRegainHealthEvent-isFastRegen-API.patch
rename to Spigot-Server-Patches/0107-EntityRegainHealthEvent-isFastRegen-API.patch
index a60376744..740b13044 100644
--- a/Spigot-Server-Patches/0108-EntityRegainHealthEvent-isFastRegen-API.patch
+++ b/Spigot-Server-Patches/0107-EntityRegainHealthEvent-isFastRegen-API.patch
@@ -1,4 +1,4 @@
-From d675b7ce31a8ccc14c6a028d6a371bb30ee94fed Mon Sep 17 00:00:00 2001
+From 65bc80f63ed83da9b191f3cd555cd6321aa482f9 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
diff --git a/Spigot-Server-Patches/0109-Add-ability-to-configure-frosted_ice-properties.patch b/Spigot-Server-Patches/0108-Add-ability-to-configure-frosted_ice-properties.patch
similarity index 95%
rename from Spigot-Server-Patches/0109-Add-ability-to-configure-frosted_ice-properties.patch
rename to Spigot-Server-Patches/0108-Add-ability-to-configure-frosted_ice-properties.patch
index 5a6844477..e124d318e 100644
--- a/Spigot-Server-Patches/0109-Add-ability-to-configure-frosted_ice-properties.patch
+++ b/Spigot-Server-Patches/0108-Add-ability-to-configure-frosted_ice-properties.patch
@@ -1,11 +1,11 @@
-From 90aeab4e9f63ccbfff85966e96b7c95afa07182a Mon Sep 17 00:00:00 2001
+From 569009f4f6ccf61ecf805a6e9c8e71331b8473cf 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/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index b6ef1d437..8d54af6bb 100644
+index b6ef1d4378..8d54af6bb7 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -244,4 +244,14 @@ public class PaperWorldConfig {
@@ -24,7 +24,7 @@ index b6ef1d437..8d54af6bb 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/BlockIceFrost.java b/src/main/java/net/minecraft/server/BlockIceFrost.java
-index 1d5c24c7a..77cf6b8e9 100644
+index 1d5c24c7a7..77cf6b8e9b 100644
 --- a/src/main/java/net/minecraft/server/BlockIceFrost.java
 +++ b/src/main/java/net/minecraft/server/BlockIceFrost.java
 @@ -12,6 +12,7 @@ public class BlockIceFrost extends BlockIce {
diff --git a/Spigot-Server-Patches/0110-remove-null-possibility-for-getServer-singleton.patch b/Spigot-Server-Patches/0109-remove-null-possibility-for-getServer-singleton.patch
similarity index 95%
rename from Spigot-Server-Patches/0110-remove-null-possibility-for-getServer-singleton.patch
rename to Spigot-Server-Patches/0109-remove-null-possibility-for-getServer-singleton.patch
index 64f9a4b97..385a529a8 100644
--- a/Spigot-Server-Patches/0110-remove-null-possibility-for-getServer-singleton.patch
+++ b/Spigot-Server-Patches/0109-remove-null-possibility-for-getServer-singleton.patch
@@ -1,4 +1,4 @@
-From bf2bd153e0203883f109de1266912090918f6b5d Mon Sep 17 00:00:00 2001
+From f45a5c9addc227e73e61f4afd6fe88ff3bf4f92c 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
@@ -6,7 +6,7 @@ Subject: [PATCH] remove null possibility for getServer singleton
 to stop IDE complaining about potential NPE
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c181acd991..6de0b22f72 100644
+index 67c60be6f7..b41e7badff 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -68,6 +68,7 @@ import co.aikar.timings.MinecraftTimings; // Paper
diff --git a/Spigot-Server-Patches/0111-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/Spigot-Server-Patches/0110-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
similarity index 96%
rename from Spigot-Server-Patches/0111-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
rename to Spigot-Server-Patches/0110-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
index 6731a695f..6c6de0353 100644
--- a/Spigot-Server-Patches/0111-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
+++ b/Spigot-Server-Patches/0110-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
@@ -1,4 +1,4 @@
-From 51c9e48269337867f03c9078b06f85e30be71629 Mon Sep 17 00:00:00 2001
+From 0fdb56f20d6b3b075cfafbdff871e27aedfe96cb 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
@@ -13,7 +13,7 @@ custom renderers are in use, defaulting to the much simpler Vanilla system.
 Additionally, numerous issues to player position tracking on maps has been fixed.
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index a47ef2ca5..06b663c4d 100644
+index ca14080ccd..9814075d6d 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -610,6 +610,12 @@ public abstract class EntityHuman extends EntityLiving {
@@ -30,7 +30,7 @@ index a47ef2ca5..06b663c4d 100644
              ItemStack itemstack1 = this.a(entityitem);
  
 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index 40e0bd7ce..a04a06f3b 100644
+index 40e0bd7ce2..a04a06f3bf 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 @@ -90,7 +90,7 @@ public class EntityTrackerEntry {
@@ -43,7 +43,7 @@ index 40e0bd7ce..a04a06f3b 100644
              ItemStack itemstack = entityitemframe.getItem();
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index f314925b6..7dae87199 100644
+index f314925b6b..7dae87199e 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1086,6 +1086,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@@ -55,7 +55,7 @@ index f314925b6..7dae87199 100644
                          }
                      }
 diff --git a/src/main/java/net/minecraft/server/WorldMap.java b/src/main/java/net/minecraft/server/WorldMap.java
-index c73ffc3bc..14754bbeb 100644
+index c73ffc3bc2..14754bbeb2 100644
 --- a/src/main/java/net/minecraft/server/WorldMap.java
 +++ b/src/main/java/net/minecraft/server/WorldMap.java
 @@ -29,6 +29,7 @@ public class WorldMap extends PersistentBase {
@@ -127,7 +127,7 @@ index c73ffc3bc..14754bbeb 100644
              for ( org.bukkit.map.MapCursor cursor : render.cursors) {
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/map/RenderData.java b/src/main/java/org/bukkit/craftbukkit/map/RenderData.java
-index 256a13178..5768cd512 100644
+index 256a131781..5768cd512e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/map/RenderData.java
 +++ b/src/main/java/org/bukkit/craftbukkit/map/RenderData.java
 @@ -5,7 +5,7 @@ import org.bukkit.map.MapCursor;
diff --git a/Spigot-Server-Patches/0112-LootTable-API-Replenishable-Lootables-Feature.patch b/Spigot-Server-Patches/0111-LootTable-API-Replenishable-Lootables-Feature.patch
similarity index 98%
rename from Spigot-Server-Patches/0112-LootTable-API-Replenishable-Lootables-Feature.patch
rename to Spigot-Server-Patches/0111-LootTable-API-Replenishable-Lootables-Feature.patch
index f2030bd9c..40cba5f70 100644
--- a/Spigot-Server-Patches/0112-LootTable-API-Replenishable-Lootables-Feature.patch
+++ b/Spigot-Server-Patches/0111-LootTable-API-Replenishable-Lootables-Feature.patch
@@ -1,4 +1,4 @@
-From 5adbcec5141acf1e524b36ac8667998cff3f10d8 Mon Sep 17 00:00:00 2001
+From ebb3f2d170d70881d4f7a210e3f7c110839cc945 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
@@ -11,7 +11,7 @@ This feature is good for long term worlds so that newer players
 do not suffer with "Every chest has been looted"
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 8d54af6bb..a3823408c 100644
+index 8d54af6bb7..a3823408ca 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -254,4 +254,26 @@ public class PaperWorldConfig {
@@ -43,7 +43,7 @@ index 8d54af6bb..a3823408c 100644
  }
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/CraftLootable.java b/src/main/java/com/destroystokyo/paper/loottable/CraftLootable.java
 new file mode 100644
-index 000000000..36c36d158
+index 0000000000..36c36d158f
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/CraftLootable.java
 @@ -0,0 +1,12 @@
@@ -61,7 +61,7 @@ index 000000000..36c36d158
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/CraftLootableBlockInventory.java b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableBlockInventory.java
 new file mode 100644
-index 000000000..20d236c45
+index 0000000000..20d236c451
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableBlockInventory.java
 @@ -0,0 +1,33 @@
@@ -100,7 +100,7 @@ index 000000000..20d236c45
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/CraftLootableEntityInventory.java b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableEntityInventory.java
 new file mode 100644
-index 000000000..1150dee01
+index 0000000000..1150dee01e
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableEntityInventory.java
 @@ -0,0 +1,31 @@
@@ -137,7 +137,7 @@ index 000000000..1150dee01
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/CraftLootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableInventory.java
 new file mode 100644
-index 000000000..668097620
+index 0000000000..668097620f
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableInventory.java
 @@ -0,0 +1,88 @@
@@ -231,7 +231,7 @@ index 000000000..668097620
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/CraftLootableInventoryData.java b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableInventoryData.java
 new file mode 100644
-index 000000000..9a65603bc
+index 0000000000..9a65603bcb
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableInventoryData.java
 @@ -0,0 +1,182 @@
@@ -418,7 +418,7 @@ index 000000000..9a65603bc
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/EntityMinecartContainer.java b/src/main/java/net/minecraft/server/EntityMinecartContainer.java
-index 9ec73ac06..8bd7976f9 100644
+index 9ec73ac06a..8bd7976f97 100644
 --- a/src/main/java/net/minecraft/server/EntityMinecartContainer.java
 +++ b/src/main/java/net/minecraft/server/EntityMinecartContainer.java
 @@ -6,17 +6,21 @@ import javax.annotation.Nullable;
@@ -540,7 +540,7 @@ index 9ec73ac06..8bd7976f9 100644
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/TileEntityLootable.java b/src/main/java/net/minecraft/server/TileEntityLootable.java
-index fbda02b32..e6fc1ae92 100644
+index fbda02b321..e6fc1ae923 100644
 --- a/src/main/java/net/minecraft/server/TileEntityLootable.java
 +++ b/src/main/java/net/minecraft/server/TileEntityLootable.java
 @@ -1,12 +1,16 @@
@@ -657,7 +657,7 @@ index fbda02b32..e6fc1ae92 100644
 +
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
-index ac9b4297b..0558cafe3 100644
+index ac9b4297b2..0558cafe31 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 @@ -61,7 +61,7 @@ public class CraftBlockEntityState<T extends TileEntity> extends CraftBlockState
@@ -670,7 +670,7 @@ index ac9b4297b..0558cafe3 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java b/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
-index 6a54f2a16..a94c78512 100644
+index dff5bb5171..e7b719b43d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
 @@ -1,6 +1,7 @@
@@ -691,7 +691,7 @@ index 6a54f2a16..a94c78512 100644
      public CraftChest(final Block block) {
          super(block, TileEntityChest.class);
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftDispenser.java b/src/main/java/org/bukkit/craftbukkit/block/CraftDispenser.java
-index 1dc8bfecd..bfcf9b6c4 100644
+index 1dc8bfecd2..bfcf9b6c4d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftDispenser.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftDispenser.java
 @@ -1,5 +1,6 @@
@@ -711,7 +711,7 @@ index 1dc8bfecd..bfcf9b6c4 100644
      public CraftDispenser(final Block block) {
          super(block, TileEntityDispenser.class);
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java b/src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java
-index 6566554ab..df156d0d9 100644
+index 6566554ab6..df156d0d92 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java
 @@ -1,5 +1,6 @@
@@ -731,7 +731,7 @@ index 6566554ab..df156d0d9 100644
      public CraftHopper(final Block block) {
          super(block, TileEntityHopper.class);
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java b/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java
-index c029a1244..c26f0b5af 100644
+index c029a12441..c26f0b5afc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java
 @@ -1,5 +1,6 @@
@@ -751,7 +751,7 @@ index c029a1244..c26f0b5af 100644
      public CraftShulkerBox(final Block block) {
          super(block, TileEntityShulkerBox.class);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java
-index 69435c457..4291edf25 100644
+index 69435c4576..4291edf252 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java
 @@ -1,5 +1,6 @@
@@ -771,7 +771,7 @@ index 69435c457..4291edf25 100644
  
      public CraftMinecartChest(CraftServer server, EntityMinecartChest entity) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java
-index e9963e21c..acb4dee04 100644
+index e9963e21cd..acb4dee04f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java
 @@ -1,5 +1,6 @@
diff --git a/Spigot-Server-Patches/0113-Do-not-load-chunks-for-pathfinding.patch b/Spigot-Server-Patches/0112-Do-not-load-chunks-for-pathfinding.patch
similarity index 92%
rename from Spigot-Server-Patches/0113-Do-not-load-chunks-for-pathfinding.patch
rename to Spigot-Server-Patches/0112-Do-not-load-chunks-for-pathfinding.patch
index 66c88d73a..776ccf121 100644
--- a/Spigot-Server-Patches/0113-Do-not-load-chunks-for-pathfinding.patch
+++ b/Spigot-Server-Patches/0112-Do-not-load-chunks-for-pathfinding.patch
@@ -1,4 +1,4 @@
-From bc7a01c2d7b9be7bfabb73c3ead9364433e5fee1 Mon Sep 17 00:00:00 2001
+From 75a20e9c139b7789214b2e974441005d917b6870 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
diff --git a/Spigot-Server-Patches/0114-Entity-Tracking-Improvements.patch b/Spigot-Server-Patches/0113-Entity-Tracking-Improvements.patch
similarity index 96%
rename from Spigot-Server-Patches/0114-Entity-Tracking-Improvements.patch
rename to Spigot-Server-Patches/0113-Entity-Tracking-Improvements.patch
index bd86198f8..401d83569 100644
--- a/Spigot-Server-Patches/0114-Entity-Tracking-Improvements.patch
+++ b/Spigot-Server-Patches/0113-Entity-Tracking-Improvements.patch
@@ -1,4 +1,4 @@
-From 694f896ba3bde5f9ad486dd58a1539808807026e Mon Sep 17 00:00:00 2001
+From d73a40f069529206aaa5365608272d6bfb902162 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 da1254f5e..428eaca37 100644
+index da1254f5e1..428eaca37a 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -71,6 +71,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -19,7 +19,7 @@ index da1254f5e..428eaca37 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 a04a06f3b..c405cc74b 100644
+index a04a06f3bf..c405cc74ba 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 a04a06f3b..c405cc74b 100644
  
      }
 -- 
-2.17.1
+2.18.0
 
diff --git a/Spigot-Server-Patches/0115-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/Spigot-Server-Patches/0114-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
similarity index 92%
rename from Spigot-Server-Patches/0115-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
rename to Spigot-Server-Patches/0114-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
index a4dc202e6..6a88392d2 100644
--- a/Spigot-Server-Patches/0115-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
+++ b/Spigot-Server-Patches/0114-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
@@ -1,11 +1,11 @@
-From 0d46f1966984e67b959aaf94ab2beccf1cf48dcf Mon Sep 17 00:00:00 2001
+From b4fa1d376f3a2981f359620f3b5814a1bd71fc98 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 bd9f03a76..5538dfd9d 100644
+index 9fe1311143..a1110da38e 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 {
@@ -19,7 +19,7 @@ index bd9f03a76..5538dfd9d 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PersistentScoreboard.java b/src/main/java/net/minecraft/server/PersistentScoreboard.java
-index 0260fb7ec..45d8de1b7 100644
+index 0260fb7ec9..45d8de1b7b 100644
 --- a/src/main/java/net/minecraft/server/PersistentScoreboard.java
 +++ b/src/main/java/net/minecraft/server/PersistentScoreboard.java
 @@ -177,6 +177,7 @@ public class PersistentScoreboard extends PersistentBase {
diff --git a/Spigot-Server-Patches/0116-Fix-Chunk-Unload-Queue-Issues.patch b/Spigot-Server-Patches/0115-Fix-Chunk-Unload-Queue-Issues.patch
similarity index 94%
rename from Spigot-Server-Patches/0116-Fix-Chunk-Unload-Queue-Issues.patch
rename to Spigot-Server-Patches/0115-Fix-Chunk-Unload-Queue-Issues.patch
index 472fa9178..013fe148c 100644
--- a/Spigot-Server-Patches/0116-Fix-Chunk-Unload-Queue-Issues.patch
+++ b/Spigot-Server-Patches/0115-Fix-Chunk-Unload-Queue-Issues.patch
@@ -1,4 +1,4 @@
-From 5f487664b0a7c81473babc61ebcb4d2b577b2405 Mon Sep 17 00:00:00 2001
+From 88ae26f30c72f35356d81d68a6556611f3e050ea Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 12 May 2016 02:03:56 -0400
 Subject: [PATCH] Fix Chunk Unload Queue Issues
@@ -9,7 +9,7 @@ has not resolved all the bugs with the changes.
 This patch fixes known issues and really should be applied by Spigot team.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 695c6d3b70..acc21aec02 100644
+index e8a943cf74..63ca61c1d6 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -58,7 +58,7 @@ public class Chunk implements IChunkAccess {
diff --git a/Spigot-Server-Patches/0117-System-property-for-disabling-watchdoge.patch b/Spigot-Server-Patches/0116-System-property-for-disabling-watchdoge.patch
similarity index 93%
rename from Spigot-Server-Patches/0117-System-property-for-disabling-watchdoge.patch
rename to Spigot-Server-Patches/0116-System-property-for-disabling-watchdoge.patch
index c5593b5ea..1e0c347c7 100644
--- a/Spigot-Server-Patches/0117-System-property-for-disabling-watchdoge.patch
+++ b/Spigot-Server-Patches/0116-System-property-for-disabling-watchdoge.patch
@@ -1,4 +1,4 @@
-From d898f0e91a714338c156db3161c150ec25996761 Mon Sep 17 00:00:00 2001
+From 150dac76cd7357e6026832f7263c55c3cc87f587 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
diff --git a/Spigot-Server-Patches/0118-Optimize-EAR.patch b/Spigot-Server-Patches/0117-Optimize-EAR.patch
similarity index 97%
rename from Spigot-Server-Patches/0118-Optimize-EAR.patch
rename to Spigot-Server-Patches/0117-Optimize-EAR.patch
index 31e1f7903..b6280a8a8 100644
--- a/Spigot-Server-Patches/0118-Optimize-EAR.patch
+++ b/Spigot-Server-Patches/0117-Optimize-EAR.patch
@@ -1,4 +1,4 @@
-From c8e46d2dfb85a7fb46d51d433b842e9d195139eb Mon Sep 17 00:00:00 2001
+From 032c328ab00e31daa453fa8aa02b823545b47146 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/Spigot-Server-Patches/0119-Optimize-UserCache-Thread-Safe.patch b/Spigot-Server-Patches/0118-Optimize-UserCache-Thread-Safe.patch
similarity index 97%
rename from Spigot-Server-Patches/0119-Optimize-UserCache-Thread-Safe.patch
rename to Spigot-Server-Patches/0118-Optimize-UserCache-Thread-Safe.patch
index 1cb4f75ed..d7b5a304e 100644
--- a/Spigot-Server-Patches/0119-Optimize-UserCache-Thread-Safe.patch
+++ b/Spigot-Server-Patches/0118-Optimize-UserCache-Thread-Safe.patch
@@ -1,4 +1,4 @@
-From b2db33ed633fd55ba4fe042e9f24bc90bf378979 Mon Sep 17 00:00:00 2001
+From c15b6afc0cf108c0a9da3655bdf3a6d0620231da 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 6de0b22f72..5f17ec1e9d 100644
+index b41e7badff..e3469cacff 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -676,7 +676,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
diff --git a/Spigot-Server-Patches/0120-Avoid-blocking-on-Network-Manager-creation.patch b/Spigot-Server-Patches/0119-Avoid-blocking-on-Network-Manager-creation.patch
similarity index 97%
rename from Spigot-Server-Patches/0120-Avoid-blocking-on-Network-Manager-creation.patch
rename to Spigot-Server-Patches/0119-Avoid-blocking-on-Network-Manager-creation.patch
index 715f6cfce..acaea0988 100644
--- a/Spigot-Server-Patches/0120-Avoid-blocking-on-Network-Manager-creation.patch
+++ b/Spigot-Server-Patches/0119-Avoid-blocking-on-Network-Manager-creation.patch
@@ -1,4 +1,4 @@
-From a883b4d3d653824a53997fa6971ef99341f807b0 Mon Sep 17 00:00:00 2001
+From 425a37a0337ea93768d697b40b31625f56d6774c 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
diff --git a/Spigot-Server-Patches/0121-Optional-TNT-doesn-t-move-in-water.patch b/Spigot-Server-Patches/0120-Optional-TNT-doesn-t-move-in-water.patch
similarity index 95%
rename from Spigot-Server-Patches/0121-Optional-TNT-doesn-t-move-in-water.patch
rename to Spigot-Server-Patches/0120-Optional-TNT-doesn-t-move-in-water.patch
index 92711995a..eef40427b 100644
--- a/Spigot-Server-Patches/0121-Optional-TNT-doesn-t-move-in-water.patch
+++ b/Spigot-Server-Patches/0120-Optional-TNT-doesn-t-move-in-water.patch
@@ -1,11 +1,11 @@
-From 06776dc5112fcd1549743f82548ec21ac49fdc86 Mon Sep 17 00:00:00 2001
+From 6d9962a0cf301943ff52739267c5c4435fad6fa4 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/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index a3823408c..41e73b340 100644
+index a3823408ca..41e73b3409 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -2,7 +2,6 @@ package com.destroystokyo.paper;
@@ -32,7 +32,7 @@ index a3823408c..41e73b340 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 428eaca37..964caa080 100644
+index 428eaca37a..964caa080c 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1173,6 +1173,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -61,7 +61,7 @@ index 428eaca37..964caa080 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
-index 87f3205f8..8c1d25979 100644
+index 87f3205f82..8c1d25979f 100644
 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 @@ -147,4 +147,49 @@ public class EntityTNTPrimed extends Entity {
@@ -115,5 +115,5 @@ index 87f3205f8..8c1d25979 100644
 +    // Paper end
  }
 -- 
-2.17.1
+2.18.0
 
diff --git a/Spigot-Server-Patches/0122-Faster-redstone-torch-rapid-clock-removal.patch b/Spigot-Server-Patches/0121-Faster-redstone-torch-rapid-clock-removal.patch
similarity index 96%
rename from Spigot-Server-Patches/0122-Faster-redstone-torch-rapid-clock-removal.patch
rename to Spigot-Server-Patches/0121-Faster-redstone-torch-rapid-clock-removal.patch
index 2633e8dc4..a1421990c 100644
--- a/Spigot-Server-Patches/0122-Faster-redstone-torch-rapid-clock-removal.patch
+++ b/Spigot-Server-Patches/0121-Faster-redstone-torch-rapid-clock-removal.patch
@@ -1,4 +1,4 @@
-From bd9abe1adfe269fd95965e845ff7b18f9edc7d2a Mon Sep 17 00:00:00 2001
+From 0380647a8678e5285fb4191882e587197fd82bf3 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
diff --git a/Spigot-Server-Patches/0123-Ensure-Chunks-never-ever-load-async.patch b/Spigot-Server-Patches/0122-Ensure-Chunks-never-ever-load-async.patch
similarity index 97%
rename from Spigot-Server-Patches/0123-Ensure-Chunks-never-ever-load-async.patch
rename to Spigot-Server-Patches/0122-Ensure-Chunks-never-ever-load-async.patch
index b9ecbbcde..243b17273 100644
--- a/Spigot-Server-Patches/0123-Ensure-Chunks-never-ever-load-async.patch
+++ b/Spigot-Server-Patches/0122-Ensure-Chunks-never-ever-load-async.patch
@@ -1,4 +1,4 @@
-From 36c2a934001480dd1365190147d4e70a1f791018 Mon Sep 17 00:00:00 2001
+From 4aa4c8c762cbd75a985bd1bacfafe54507a38ece 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
diff --git a/Spigot-Server-Patches/0124-Add-server-name-parameter.patch b/Spigot-Server-Patches/0123-Add-server-name-parameter.patch
similarity index 90%
rename from Spigot-Server-Patches/0124-Add-server-name-parameter.patch
rename to Spigot-Server-Patches/0123-Add-server-name-parameter.patch
index c021a833d..7c8b31f29 100644
--- a/Spigot-Server-Patches/0124-Add-server-name-parameter.patch
+++ b/Spigot-Server-Patches/0123-Add-server-name-parameter.patch
@@ -1,11 +1,11 @@
-From cf48b3196d4f28b7ba27d4224610c7c538b6b420 Mon Sep 17 00:00:00 2001
+From 127d86acb4f7b4088c62625044d02ca86aaecc2c 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 38e696aa94..c552c624e5 100644
+index f7a4d53ede..5c26e78a71 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 {
diff --git a/Spigot-Server-Patches/0125-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch b/Spigot-Server-Patches/0124-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
similarity index 97%
rename from Spigot-Server-Patches/0125-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
rename to Spigot-Server-Patches/0124-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
index 31b3e96d9..3d252d260 100644
--- a/Spigot-Server-Patches/0125-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
+++ b/Spigot-Server-Patches/0124-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
@@ -1,4 +1,4 @@
-From dd0d1f30603f537e6468a4fa50fbc416e5c49d1b Mon Sep 17 00:00:00 2001
+From fbd7b7751b67c1eeb439ea000ebb706f6a2897ef 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
diff --git a/Spigot-Server-Patches/0126-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/Spigot-Server-Patches/0125-Delay-Chunk-Unloads-based-on-Player-Movement.patch
similarity index 96%
rename from Spigot-Server-Patches/0126-Delay-Chunk-Unloads-based-on-Player-Movement.patch
rename to Spigot-Server-Patches/0125-Delay-Chunk-Unloads-based-on-Player-Movement.patch
index 0e9292db7..d74581db0 100644
--- a/Spigot-Server-Patches/0126-Delay-Chunk-Unloads-based-on-Player-Movement.patch
+++ b/Spigot-Server-Patches/0125-Delay-Chunk-Unloads-based-on-Player-Movement.patch
@@ -1,4 +1,4 @@
-From eafc6ada7b329bf53e8c088bed1c237d95a08538 Mon Sep 17 00:00:00 2001
+From 15087609882f8372870b8dfe7f6cf033071fc532 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
@@ -17,7 +17,7 @@ This allows servers with smaller worlds who do less long distance exploring to s
 wasting cpu cycles on saving/unloading/reloading chunks repeatedly.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 41e73b340..ec6b550ff 100644
+index 41e73b3409..ec6b550ff6 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -285,4 +285,18 @@ public class PaperWorldConfig {
@@ -40,7 +40,7 @@ index 41e73b340..ec6b550ff 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index fe69ea4c9..cdff2a50b 100644
+index 63ca61c1d6..ace64c0345 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -39,6 +39,7 @@ public class Chunk implements IChunkAccess {
@@ -52,7 +52,7 @@ index fe69ea4c9..cdff2a50b 100644
      public final int locZ;
      private boolean m;
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 2925c345a..a5139b0b0 100644
+index 2925c345a1..a5139b0b0d 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -328,6 +328,19 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -76,7 +76,7 @@ index 2925c345a..a5139b0b0 100644
              this.f.a();
              this.chunkLoader.b();
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index ffff87dc0..344b95233 100644
+index ffff87dc03..344b95233f 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
 @@ -33,14 +33,23 @@ public class PlayerChunk {
@@ -112,7 +112,7 @@ index ffff87dc0..344b95233 100644
  
              return this.chunk != null;
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 4d888d6d4..cf5c76a78 100644
+index 4d888d6d4f..cf5c76a78e 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -461,7 +461,13 @@ public class PlayerChunkMap {
@@ -131,7 +131,7 @@ index 4d888d6d4..cf5c76a78 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 7dae87199..b6efd8506 100644
+index 7dae87199e..b6efd8506b 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1305,7 +1305,13 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@@ -150,7 +150,7 @@ index 7dae87199..b6efd8506 100644
                          this.methodProfiler.a(() -> {
                              return String.valueOf(TileEntityTypes.a(tileentity.C()));
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index e3e45ed48..d4851dd2a 100644
+index e3e45ed48a..d4851dd2a6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1577,7 +1577,7 @@ public class CraftWorld implements World {
@@ -163,7 +163,7 @@ index e3e45ed48..d4851dd2a 100644
              }
  
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index a9b84fdec..e02647f80 100644
+index a9b84fdec4..e02647f806 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -284,6 +284,10 @@ public class ActivationRange
diff --git a/Spigot-Server-Patches/0127-Fix-Double-World-Add-issues.patch b/Spigot-Server-Patches/0126-Fix-Double-World-Add-issues.patch
similarity index 93%
rename from Spigot-Server-Patches/0127-Fix-Double-World-Add-issues.patch
rename to Spigot-Server-Patches/0126-Fix-Double-World-Add-issues.patch
index a2526c037..89101dce7 100644
--- a/Spigot-Server-Patches/0127-Fix-Double-World-Add-issues.patch
+++ b/Spigot-Server-Patches/0126-Fix-Double-World-Add-issues.patch
@@ -1,4 +1,4 @@
-From 6cfcac4ce43f629bdd36407b5450ec87b0b9d986 Mon Sep 17 00:00:00 2001
+From c259b0b0cc6e23351d7f7a1ad344791a31eb8125 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
@@ -8,7 +8,7 @@ Vanilla will double add Spider Jockeys to the world, so ignore already added.
 Also add debug if something else tries to, and abort before world gets bad state
 
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index f007af2e1..2f1488ee5 100644
+index f007af2e1a..2f1488ee53 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -1050,7 +1050,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -21,7 +21,7 @@ index f007af2e1..2f1488ee5 100644
              Iterator iterator = entity.bP().iterator();
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index b6efd8506..e74b53c48 100644
+index b6efd8506b..e74b53c483 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -966,6 +966,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
diff --git a/Spigot-Server-Patches/0128-Fix-Old-Sign-Conversion.patch b/Spigot-Server-Patches/0127-Fix-Old-Sign-Conversion.patch
similarity index 98%
rename from Spigot-Server-Patches/0128-Fix-Old-Sign-Conversion.patch
rename to Spigot-Server-Patches/0127-Fix-Old-Sign-Conversion.patch
index 40fc2a9f3..ec7a04d5f 100644
--- a/Spigot-Server-Patches/0128-Fix-Old-Sign-Conversion.patch
+++ b/Spigot-Server-Patches/0127-Fix-Old-Sign-Conversion.patch
@@ -1,4 +1,4 @@
-From 0a7286e77c225d7801d81c1e635f632c6a125693 Mon Sep 17 00:00:00 2001
+From bded4f3172edb734e59f253a5c4fa12c8e7d0e7c 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
diff --git a/Spigot-Server-Patches/0129-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch b/Spigot-Server-Patches/0128-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
similarity index 93%
rename from Spigot-Server-Patches/0129-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
rename to Spigot-Server-Patches/0128-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
index e208ea63c..2b886fa70 100644
--- a/Spigot-Server-Patches/0129-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
+++ b/Spigot-Server-Patches/0128-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
@@ -1,4 +1,4 @@
-From c0b4e3b3ba563f5560520a639f972179352c3418 Mon Sep 17 00:00:00 2001
+From 5292db9778ec4db6344cc8eebb6bf00c4f772c88 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
diff --git a/Spigot-Server-Patches/0130-More-informative-vehicle-moved-wrongly-message.patch b/Spigot-Server-Patches/0129-More-informative-vehicle-moved-wrongly-message.patch
similarity index 90%
rename from Spigot-Server-Patches/0130-More-informative-vehicle-moved-wrongly-message.patch
rename to Spigot-Server-Patches/0129-More-informative-vehicle-moved-wrongly-message.patch
index 3ecc36059..c2790ad2c 100644
--- a/Spigot-Server-Patches/0130-More-informative-vehicle-moved-wrongly-message.patch
+++ b/Spigot-Server-Patches/0129-More-informative-vehicle-moved-wrongly-message.patch
@@ -1,11 +1,11 @@
-From 5fe385d1c9048225ddd1b55d874c0782d527d01f Mon Sep 17 00:00:00 2001
+From 1b983e43aa6d3233a451b027d8b2a0b52e65bd9a 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/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 9d705ed7d1..fc33baf2bf 100644
+index 1ca3c87c7a..0fe8d1c3f1 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -354,7 +354,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
diff --git a/Spigot-Server-Patches/0131-Re-track-players-that-dismount-from-other-players.patch b/Spigot-Server-Patches/0130-Re-track-players-that-dismount-from-other-players.patch
similarity index 94%
rename from Spigot-Server-Patches/0131-Re-track-players-that-dismount-from-other-players.patch
rename to Spigot-Server-Patches/0130-Re-track-players-that-dismount-from-other-players.patch
index 082a54d3f..18552ff27 100644
--- a/Spigot-Server-Patches/0131-Re-track-players-that-dismount-from-other-players.patch
+++ b/Spigot-Server-Patches/0130-Re-track-players-that-dismount-from-other-players.patch
@@ -1,4 +1,4 @@
-From 296fbd3b2fcdd172ac1ed1afdbbfe5b80324fb2a Mon Sep 17 00:00:00 2001
+From 749742bd1afd6adb09686bc546a9c1884e94a469 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/Spigot-Server-Patches/0132-Add-setting-for-proxy-online-mode-status.patch b/Spigot-Server-Patches/0131-Add-setting-for-proxy-online-mode-status.patch
similarity index 95%
rename from Spigot-Server-Patches/0132-Add-setting-for-proxy-online-mode-status.patch
rename to Spigot-Server-Patches/0131-Add-setting-for-proxy-online-mode-status.patch
index 800469bbd..e035648ae 100644
--- a/Spigot-Server-Patches/0132-Add-setting-for-proxy-online-mode-status.patch
+++ b/Spigot-Server-Patches/0131-Add-setting-for-proxy-online-mode-status.patch
@@ -1,11 +1,11 @@
-From b81234662dc8a123760b733872fc6341c1cdb723 Mon Sep 17 00:00:00 2001
+From 8ac446a7e1845926d3af8d6f6d57abf10fcc9071 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 5538dfd9d8..0e5773bae4 100644
+index a1110da38e..0a8fc7927a 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 {
@@ -33,7 +33,7 @@ index f135349174..85c7a96c5a 100644
          } else {
              String[] astring1 = astring;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 761db58b29..3bbf9b0189 100644
+index 6e3539ab8d..7a7617750e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1358,7 +1358,8 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0133-Optimise-BlockStateEnum-hashCode-and-equals.patch b/Spigot-Server-Patches/0132-Optimise-BlockStateEnum-hashCode-and-equals.patch
similarity index 97%
rename from Spigot-Server-Patches/0133-Optimise-BlockStateEnum-hashCode-and-equals.patch
rename to Spigot-Server-Patches/0132-Optimise-BlockStateEnum-hashCode-and-equals.patch
index 407fd4450..85527a842 100644
--- a/Spigot-Server-Patches/0133-Optimise-BlockStateEnum-hashCode-and-equals.patch
+++ b/Spigot-Server-Patches/0132-Optimise-BlockStateEnum-hashCode-and-equals.patch
@@ -1,4 +1,4 @@
-From 300e97ecdb34c2c837b4610065ce834de7be0afb Mon Sep 17 00:00:00 2001
+From 5954bc01e73be3868d879fe2fa37c67819cacb61 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
diff --git a/Spigot-Server-Patches/0134-Disable-ticking-of-snow-blocks.patch b/Spigot-Server-Patches/0133-Disable-ticking-of-snow-blocks.patch
similarity index 93%
rename from Spigot-Server-Patches/0134-Disable-ticking-of-snow-blocks.patch
rename to Spigot-Server-Patches/0133-Disable-ticking-of-snow-blocks.patch
index 6839453fc..efe60b583 100644
--- a/Spigot-Server-Patches/0134-Disable-ticking-of-snow-blocks.patch
+++ b/Spigot-Server-Patches/0133-Disable-ticking-of-snow-blocks.patch
@@ -1,4 +1,4 @@
-From 5f1f0cd80117d5f1a165875516edbd0a6f44510f Mon Sep 17 00:00:00 2001
+From 8f03e0871060fbb45113907da543f4ef32e3fc65 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
diff --git a/Spigot-Server-Patches/0135-Fix-AIOOBE-in-inventory-handling.patch b/Spigot-Server-Patches/0134-Fix-AIOOBE-in-inventory-handling.patch
similarity index 94%
rename from Spigot-Server-Patches/0135-Fix-AIOOBE-in-inventory-handling.patch
rename to Spigot-Server-Patches/0134-Fix-AIOOBE-in-inventory-handling.patch
index 0f1ebf9e1..4cf7eec17 100644
--- a/Spigot-Server-Patches/0135-Fix-AIOOBE-in-inventory-handling.patch
+++ b/Spigot-Server-Patches/0134-Fix-AIOOBE-in-inventory-handling.patch
@@ -1,4 +1,4 @@
-From ee51f2d2b90389e0e916203dcbb96bf63d83d8b0 Mon Sep 17 00:00:00 2001
+From a01021102b786403cb71a732788e62ec111eee75 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/0136-Configurable-packet-in-spam-threshold.patch b/Spigot-Server-Patches/0135-Configurable-packet-in-spam-threshold.patch
similarity index 94%
rename from Spigot-Server-Patches/0136-Configurable-packet-in-spam-threshold.patch
rename to Spigot-Server-Patches/0135-Configurable-packet-in-spam-threshold.patch
index 45cbce3de..99572dfce 100644
--- a/Spigot-Server-Patches/0136-Configurable-packet-in-spam-threshold.patch
+++ b/Spigot-Server-Patches/0135-Configurable-packet-in-spam-threshold.patch
@@ -1,11 +1,11 @@
-From 9f53223bbee1f9a9c355d6db7f8526b5bbb300e1 Mon Sep 17 00:00:00 2001
+From 819150dc95ef61cb172647bd8eb4d73dd57252ea 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 0e5773bae..ed9ae4df3 100644
+index 0a8fc7927a..b496bc3869 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -239,4 +239,13 @@ public class PaperConfig {
@@ -23,7 +23,7 @@ index 0e5773bae..ed9ae4df3 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 47554df42..c9613bf2d 100644
+index ed02cd7a7a..eec02ba0e9 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1186,13 +1186,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
diff --git a/Spigot-Server-Patches/0137-Configurable-flying-kick-messages.patch b/Spigot-Server-Patches/0136-Configurable-flying-kick-messages.patch
similarity index 94%
rename from Spigot-Server-Patches/0137-Configurable-flying-kick-messages.patch
rename to Spigot-Server-Patches/0136-Configurable-flying-kick-messages.patch
index 59aa95a9c..82227561f 100644
--- a/Spigot-Server-Patches/0137-Configurable-flying-kick-messages.patch
+++ b/Spigot-Server-Patches/0136-Configurable-flying-kick-messages.patch
@@ -1,11 +1,11 @@
-From db73402e6e13134db182d0dde9f1174efe995fbf Mon Sep 17 00:00:00 2001
+From e98e5640f208339d4204374704bbd2e10a9495cb 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 ed9ae4df3..4bdb0a5f9 100644
+index b496bc3869..aa0e3c757d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -248,4 +248,11 @@ public class PaperConfig {
@@ -21,7 +21,7 @@ index ed9ae4df3..4bdb0a5f9 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index c9613bf2d..4ccebb3f9 100644
+index eec02ba0e9..969e28c3b2 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -144,6 +144,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
diff --git a/Spigot-Server-Patches/0138-Auto-Save-Improvements.patch b/Spigot-Server-Patches/0137-Auto-Save-Improvements.patch
similarity index 99%
rename from Spigot-Server-Patches/0138-Auto-Save-Improvements.patch
rename to Spigot-Server-Patches/0137-Auto-Save-Improvements.patch
index 5f1d49e8e..165324417 100644
--- a/Spigot-Server-Patches/0138-Auto-Save-Improvements.patch
+++ b/Spigot-Server-Patches/0137-Auto-Save-Improvements.patch
@@ -1,4 +1,4 @@
-From 06fde62d101a14f97ad1a3b537c28345e6ca2807 Mon Sep 17 00:00:00 2001
+From 4f3ee27d644d6d032c9d1d1d2f8c12c621fa7908 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,7 +12,7 @@ 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 4bdb0a5f9c..315d85090a 100644
+index aa0e3c757d..c1845d6811 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -255,4 +255,15 @@ public class PaperConfig {
diff --git a/Spigot-Server-Patches/0139-Chunk-registration-fixes.patch b/Spigot-Server-Patches/0138-Chunk-registration-fixes.patch
similarity index 93%
rename from Spigot-Server-Patches/0139-Chunk-registration-fixes.patch
rename to Spigot-Server-Patches/0138-Chunk-registration-fixes.patch
index e11ec7cee..8f53b8283 100644
--- a/Spigot-Server-Patches/0139-Chunk-registration-fixes.patch
+++ b/Spigot-Server-Patches/0138-Chunk-registration-fixes.patch
@@ -1,4 +1,4 @@
-From f73d69ae1fe48058ff0764e110a09429773ec48a Mon Sep 17 00:00:00 2001
+From 09a9396af01295aa2445f6bcce8db8160d696d59 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/0140-Remove-FishingHook-reference-on-Craft-Entity-removal.patch b/Spigot-Server-Patches/0139-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
similarity index 93%
rename from Spigot-Server-Patches/0140-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
rename to Spigot-Server-Patches/0139-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
index 56a80ece4..596dae784 100644
--- a/Spigot-Server-Patches/0140-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
+++ b/Spigot-Server-Patches/0139-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
@@ -1,4 +1,4 @@
-From 1a602000612c28f2376c093593250ff851542acb Mon Sep 17 00:00:00 2001
+From 7f9d1dd37e9eec7aa35da37945d67e42b73e3fae 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
diff --git a/Spigot-Server-Patches/0141-Auto-fix-bad-Y-levels-on-player-login.patch b/Spigot-Server-Patches/0140-Auto-fix-bad-Y-levels-on-player-login.patch
similarity index 90%
rename from Spigot-Server-Patches/0141-Auto-fix-bad-Y-levels-on-player-login.patch
rename to Spigot-Server-Patches/0140-Auto-fix-bad-Y-levels-on-player-login.patch
index b16c02adc..26fd3fe81 100644
--- a/Spigot-Server-Patches/0141-Auto-fix-bad-Y-levels-on-player-login.patch
+++ b/Spigot-Server-Patches/0140-Auto-fix-bad-Y-levels-on-player-login.patch
@@ -1,4 +1,4 @@
-From a079a95c1d916ad191338fb5fad68745d9cf1558 Mon Sep 17 00:00:00 2001
+From f62f97c0dc44c38568c8b22e84f122d0281e82bb 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 1879c32381..b76c28147b 100644
+index 9c04fa4a6f..9bb70c151d 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -199,6 +199,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0142-Disable-Vanilla-Chunk-GC.patch b/Spigot-Server-Patches/0141-Disable-Vanilla-Chunk-GC.patch
similarity index 95%
rename from Spigot-Server-Patches/0142-Disable-Vanilla-Chunk-GC.patch
rename to Spigot-Server-Patches/0141-Disable-Vanilla-Chunk-GC.patch
index 559e3669c..0fcf679aa 100644
--- a/Spigot-Server-Patches/0142-Disable-Vanilla-Chunk-GC.patch
+++ b/Spigot-Server-Patches/0141-Disable-Vanilla-Chunk-GC.patch
@@ -1,4 +1,4 @@
-From 0f4827d2c74c4372c38edf9a701a45ed926c67b7 Mon Sep 17 00:00:00 2001
+From f46ee99721efcc27aebf7ad253a341f469316360 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
diff --git a/Spigot-Server-Patches/0143-Option-to-remove-corrupt-tile-entities.patch b/Spigot-Server-Patches/0142-Option-to-remove-corrupt-tile-entities.patch
similarity index 93%
rename from Spigot-Server-Patches/0143-Option-to-remove-corrupt-tile-entities.patch
rename to Spigot-Server-Patches/0142-Option-to-remove-corrupt-tile-entities.patch
index 9094fad9b..118930e5c 100644
--- a/Spigot-Server-Patches/0143-Option-to-remove-corrupt-tile-entities.patch
+++ b/Spigot-Server-Patches/0142-Option-to-remove-corrupt-tile-entities.patch
@@ -1,11 +1,11 @@
-From ebe77e76a5d76ad93b286e6a654d8e4b78c85c93 Mon Sep 17 00:00:00 2001
+From acf15675a88a8b5969eb038d22b49e5cd5cf3e0c 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
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 499230af6..189ec79f0 100644
+index 499230af60..189ec79f05 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -315,4 +315,9 @@ public class PaperWorldConfig {
@@ -19,7 +19,7 @@ index 499230af6..189ec79f0 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 06d6814b8..7a797bef0 100644
+index 229215180b..f6beb6886d 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -829,6 +829,12 @@ public class Chunk implements IChunkAccess {
diff --git a/Spigot-Server-Patches/0144-Add-EntityZapEvent.patch b/Spigot-Server-Patches/0143-Add-EntityZapEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0144-Add-EntityZapEvent.patch
rename to Spigot-Server-Patches/0143-Add-EntityZapEvent.patch
index 755037568..2e9fef3b3 100644
--- a/Spigot-Server-Patches/0144-Add-EntityZapEvent.patch
+++ b/Spigot-Server-Patches/0143-Add-EntityZapEvent.patch
@@ -1,4 +1,4 @@
-From e858d6c03e2ac879054dceb8daa3ea41be42c4ca Mon Sep 17 00:00:00 2001
+From faf970b94899cf3982625094f4068a6234035e09 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/Spigot-Server-Patches/0145-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/Spigot-Server-Patches/0144-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
similarity index 96%
rename from Spigot-Server-Patches/0145-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
rename to Spigot-Server-Patches/0144-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
index 9eaee7704..f3fcd775f 100644
--- a/Spigot-Server-Patches/0145-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
+++ b/Spigot-Server-Patches/0144-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
@@ -1,4 +1,4 @@
-From 6f5410680ed1d35082625a9c84be695294046115 Mon Sep 17 00:00:00 2001
+From 9047a61c9f88a72ba5b3eb8757040b86c1be3951 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
diff --git a/Spigot-Server-Patches/0146-Prevent-Auto-Save-if-Save-Queue-is-full.patch b/Spigot-Server-Patches/0145-Prevent-Auto-Save-if-Save-Queue-is-full.patch
similarity index 98%
rename from Spigot-Server-Patches/0146-Prevent-Auto-Save-if-Save-Queue-is-full.patch
rename to Spigot-Server-Patches/0145-Prevent-Auto-Save-if-Save-Queue-is-full.patch
index 8c9cb69be..0d7500407 100644
--- a/Spigot-Server-Patches/0146-Prevent-Auto-Save-if-Save-Queue-is-full.patch
+++ b/Spigot-Server-Patches/0145-Prevent-Auto-Save-if-Save-Queue-is-full.patch
@@ -1,4 +1,4 @@
-From a5933b1c3c740f9eb59ce6db6ea847ee2a588a26 Mon Sep 17 00:00:00 2001
+From 611b7ca3705d1bbddc52ce5b54239609b31dbb28 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/0147-Chunk-Save-Stats-Debug-Option.patch b/Spigot-Server-Patches/0146-Chunk-Save-Stats-Debug-Option.patch
similarity index 98%
rename from Spigot-Server-Patches/0147-Chunk-Save-Stats-Debug-Option.patch
rename to Spigot-Server-Patches/0146-Chunk-Save-Stats-Debug-Option.patch
index dfb1d2a0e..e2759332f 100644
--- a/Spigot-Server-Patches/0147-Chunk-Save-Stats-Debug-Option.patch
+++ b/Spigot-Server-Patches/0146-Chunk-Save-Stats-Debug-Option.patch
@@ -1,4 +1,4 @@
-From 8281788d504c1618e1129a3dc19ce80b64d1c22c Mon Sep 17 00:00:00 2001
+From 4acb687be9e81d3882d1dcc889a97acc566f8eb3 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/0148-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch b/Spigot-Server-Patches/0147-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
similarity index 94%
rename from Spigot-Server-Patches/0148-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
rename to Spigot-Server-Patches/0147-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
index eb7e22f2e..7e30ef4e0 100644
--- a/Spigot-Server-Patches/0148-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
+++ b/Spigot-Server-Patches/0147-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
@@ -1,11 +1,11 @@
-From 4134a60719294c89762a82aa1ed2141094d07b7a Mon Sep 17 00:00:00 2001
+From 69ebaca79e2c169b0db6b464beaf1b8a384ae0ed 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/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 4d0f2051a..872001d04 100644
+index 4d0f2051aa..872001d041 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -3,6 +3,7 @@ package com.destroystokyo.paper;
@@ -30,7 +30,7 @@ index 4d0f2051a..872001d04 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-index 33bc46b05..4e1b74ebe 100644
+index 33bc46b054..4e1b74ebe4 100644
 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
 +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
 @@ -228,6 +228,15 @@ public class EntityFallingBlock extends Entity {
diff --git a/Spigot-Server-Patches/0149-Cache-user-authenticator-threads.patch b/Spigot-Server-Patches/0148-Cache-user-authenticator-threads.patch
similarity index 97%
rename from Spigot-Server-Patches/0149-Cache-user-authenticator-threads.patch
rename to Spigot-Server-Patches/0148-Cache-user-authenticator-threads.patch
index 071e6161d..197427c33 100644
--- a/Spigot-Server-Patches/0149-Cache-user-authenticator-threads.patch
+++ b/Spigot-Server-Patches/0148-Cache-user-authenticator-threads.patch
@@ -1,4 +1,4 @@
-From 1462c435b911a715894e8eeb1e3974b90d2263c6 Mon Sep 17 00:00:00 2001
+From b38249ab76ae2e8e2b755b638a6f33c10b388258 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
diff --git a/Spigot-Server-Patches/0150-Optimize-Network-Queue.patch b/Spigot-Server-Patches/0149-Optimize-Network-Queue.patch
similarity index 90%
rename from Spigot-Server-Patches/0150-Optimize-Network-Queue.patch
rename to Spigot-Server-Patches/0149-Optimize-Network-Queue.patch
index 13bfaab9f..bccc4bf6d 100644
--- a/Spigot-Server-Patches/0150-Optimize-Network-Queue.patch
+++ b/Spigot-Server-Patches/0149-Optimize-Network-Queue.patch
@@ -1,11 +1,11 @@
-From e1b901c4c6129afd133c9364c4996e61b03ab618 Mon Sep 17 00:00:00 2001
+From 4d7709bdec846b2845277b058b0fee0c2afb580d Mon Sep 17 00:00:00 2001
 From: vemacs <d@nkmem.es>
 Date: Wed, 23 Nov 2016 12:54:56 -0500
 Subject: [PATCH] Optimize Network Queue
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 94df23c31f..c97953a2fd 100644
+index 02daa43c68..0560882314 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -118,7 +118,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
diff --git a/Spigot-Server-Patches/0151-Optimise-removeQueue.patch b/Spigot-Server-Patches/0150-Optimise-removeQueue.patch
similarity index 97%
rename from Spigot-Server-Patches/0151-Optimise-removeQueue.patch
rename to Spigot-Server-Patches/0150-Optimise-removeQueue.patch
index a405fd83c..1c9325e11 100644
--- a/Spigot-Server-Patches/0151-Optimise-removeQueue.patch
+++ b/Spigot-Server-Patches/0150-Optimise-removeQueue.patch
@@ -1,4 +1,4 @@
-From e9debd0d37b58e79725dbb5f4bc8029f23ee63f5 Mon Sep 17 00:00:00 2001
+From ebb301f7d984c0b8b4e17421060351a161896c9b 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/Spigot-Server-Patches/0152-Allow-Reloading-of-Command-Aliases.patch b/Spigot-Server-Patches/0151-Allow-Reloading-of-Command-Aliases.patch
similarity index 93%
rename from Spigot-Server-Patches/0152-Allow-Reloading-of-Command-Aliases.patch
rename to Spigot-Server-Patches/0151-Allow-Reloading-of-Command-Aliases.patch
index 59b13decc..23fba2362 100644
--- a/Spigot-Server-Patches/0152-Allow-Reloading-of-Command-Aliases.patch
+++ b/Spigot-Server-Patches/0151-Allow-Reloading-of-Command-Aliases.patch
@@ -1,4 +1,4 @@
-From 89bbc27aa798aaa73dc9a5774b44560541178f04 Mon Sep 17 00:00:00 2001
+From 62fe788b0effcd22b0855348cf12920c3d3b9c91 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 7a7617750..6470135f7 100644
+index 7a7617750e..6470135f77 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1972,5 +1972,24 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0153-Add-source-to-PlayerExpChangeEvent.patch b/Spigot-Server-Patches/0152-Add-source-to-PlayerExpChangeEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0153-Add-source-to-PlayerExpChangeEvent.patch
rename to Spigot-Server-Patches/0152-Add-source-to-PlayerExpChangeEvent.patch
index 1b69b6135..a6d140a0f 100644
--- a/Spigot-Server-Patches/0153-Add-source-to-PlayerExpChangeEvent.patch
+++ b/Spigot-Server-Patches/0152-Add-source-to-PlayerExpChangeEvent.patch
@@ -1,4 +1,4 @@
-From fb639b8ca21b61e7043169b518c47f59b200e512 Mon Sep 17 00:00:00 2001
+From f0e15ef75b19d01a56fc793b28d3bb65478358de 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/Spigot-Server-Patches/0154-Optimize-World.isLoaded-BlockPosition-Z.patch b/Spigot-Server-Patches/0153-Optimize-World.isLoaded-BlockPosition-Z.patch
similarity index 90%
rename from Spigot-Server-Patches/0154-Optimize-World.isLoaded-BlockPosition-Z.patch
rename to Spigot-Server-Patches/0153-Optimize-World.isLoaded-BlockPosition-Z.patch
index 425a04ac3..f49228d96 100644
--- a/Spigot-Server-Patches/0154-Optimize-World.isLoaded-BlockPosition-Z.patch
+++ b/Spigot-Server-Patches/0153-Optimize-World.isLoaded-BlockPosition-Z.patch
@@ -1,4 +1,4 @@
-From 7a5bea01249d8a9da6a2ac09ae808e0baeb1e9fa Mon Sep 17 00:00:00 2001
+From 7b189ce3b0d490e5193f148241f783ed19d40033 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 2 Dec 2016 00:11:43 -0500
 Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z
 Reduce method invocations for World.isLoaded(BlockPosition)Z
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 5d3378be0b..92070c9325 100644
+index 20e52fbcc8..6fe8ce96aa 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -273,6 +273,10 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
diff --git a/Spigot-Server-Patches/0155-Don-t-let-fishinghooks-use-portals.patch b/Spigot-Server-Patches/0154-Don-t-let-fishinghooks-use-portals.patch
similarity index 90%
rename from Spigot-Server-Patches/0155-Don-t-let-fishinghooks-use-portals.patch
rename to Spigot-Server-Patches/0154-Don-t-let-fishinghooks-use-portals.patch
index 44573cbef..1fb32863c 100644
--- a/Spigot-Server-Patches/0155-Don-t-let-fishinghooks-use-portals.patch
+++ b/Spigot-Server-Patches/0154-Don-t-let-fishinghooks-use-portals.patch
@@ -1,11 +1,11 @@
-From cb853229070f909198c981bb8c5e2f832cfb0a0b Mon Sep 17 00:00:00 2001
+From 0caccdfd0545a6b148266d891c7918effde93a12 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 964caa080..c28723158 100644
+index 964caa080c..c287231584 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -157,7 +157,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -18,7 +18,7 @@ index 964caa080..c28723158 100644
      public int dimension;
      protected BlockPosition aq;
 diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
-index 7c119282b..4f801e8fe 100644
+index 7c119282b9..4f801e8fec 100644
 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
 @@ -190,6 +190,12 @@ public class EntityFishingHook extends Entity {
@@ -35,5 +35,5 @@ index 7c119282b..4f801e8fe 100644
      }
  
 -- 
-2.17.1
+2.18.0
 
diff --git a/Spigot-Server-Patches/0156-Add-ProjectileCollideEvent.patch b/Spigot-Server-Patches/0155-Add-ProjectileCollideEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0156-Add-ProjectileCollideEvent.patch
rename to Spigot-Server-Patches/0155-Add-ProjectileCollideEvent.patch
index f1bb4181d..288c15507 100644
--- a/Spigot-Server-Patches/0156-Add-ProjectileCollideEvent.patch
+++ b/Spigot-Server-Patches/0155-Add-ProjectileCollideEvent.patch
@@ -1,4 +1,4 @@
-From 7b0507da629c3fcacfddd3c1da01a7bbf86fd8d8 Mon Sep 17 00:00:00 2001
+From dcd8262480ab5d1b2cfa2c232d16c345c48bf1de 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/Spigot-Server-Patches/0157-Prevent-Pathfinding-out-of-World-Border.patch b/Spigot-Server-Patches/0156-Prevent-Pathfinding-out-of-World-Border.patch
similarity index 97%
rename from Spigot-Server-Patches/0157-Prevent-Pathfinding-out-of-World-Border.patch
rename to Spigot-Server-Patches/0156-Prevent-Pathfinding-out-of-World-Border.patch
index 46042786a..ea6164285 100644
--- a/Spigot-Server-Patches/0157-Prevent-Pathfinding-out-of-World-Border.patch
+++ b/Spigot-Server-Patches/0156-Prevent-Pathfinding-out-of-World-Border.patch
@@ -1,4 +1,4 @@
-From 44e9f98e750fe8171d75df30354e63ef03e5b5ba Mon Sep 17 00:00:00 2001
+From 142065759260b7302dcdd7abf73aff114fe2aba5 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
diff --git a/Spigot-Server-Patches/0158-Bound-Treasure-Maps-to-World-Border.patch b/Spigot-Server-Patches/0157-Bound-Treasure-Maps-to-World-Border.patch
similarity index 97%
rename from Spigot-Server-Patches/0158-Bound-Treasure-Maps-to-World-Border.patch
rename to Spigot-Server-Patches/0157-Bound-Treasure-Maps-to-World-Border.patch
index a092defa2..daa6f6664 100644
--- a/Spigot-Server-Patches/0158-Bound-Treasure-Maps-to-World-Border.patch
+++ b/Spigot-Server-Patches/0157-Bound-Treasure-Maps-to-World-Border.patch
@@ -1,4 +1,4 @@
-From 2251066897e6922fa76254032d8420e91fb16eca Mon Sep 17 00:00:00 2001
+From 9d310106114ee82c53fbcf15191d7ada9fa69cf3 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
diff --git a/Spigot-Server-Patches/0159-Configurable-Cartographer-Treasure-Maps.patch b/Spigot-Server-Patches/0158-Configurable-Cartographer-Treasure-Maps.patch
similarity index 93%
rename from Spigot-Server-Patches/0159-Configurable-Cartographer-Treasure-Maps.patch
rename to Spigot-Server-Patches/0158-Configurable-Cartographer-Treasure-Maps.patch
index 3863159bb..fcbe594c6 100644
--- a/Spigot-Server-Patches/0159-Configurable-Cartographer-Treasure-Maps.patch
+++ b/Spigot-Server-Patches/0158-Configurable-Cartographer-Treasure-Maps.patch
@@ -1,4 +1,4 @@
-From 39a196741c1700fa0eb36c211f9a2656e89fe58f Mon Sep 17 00:00:00 2001
+From 016a2ae644aa7f14306cfa9a71fd9b86637a5d34 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 20 Dec 2016 15:26:27 -0500
 Subject: [PATCH] Configurable Cartographer Treasure Maps
@@ -9,7 +9,7 @@ Also allow turning off treasure maps all together as they can eat up Map ID's
 which are limited in quantity.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 872001d04..b95f259a9 100644
+index 872001d041..b95f259a9a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -334,4 +334,14 @@ public class PaperWorldConfig {
@@ -28,7 +28,7 @@ index 872001d04..b95f259a9 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 45df38bad..e8fdf8625 100644
+index 45df38bad4..e8fdf86250 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -755,6 +755,7 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
diff --git a/Spigot-Server-Patches/0160-Optimize-ItemStack.isEmpty.patch b/Spigot-Server-Patches/0159-Optimize-ItemStack.isEmpty.patch
similarity index 89%
rename from Spigot-Server-Patches/0160-Optimize-ItemStack.isEmpty.patch
rename to Spigot-Server-Patches/0159-Optimize-ItemStack.isEmpty.patch
index 143e6e46e..8f9009c4d 100644
--- a/Spigot-Server-Patches/0160-Optimize-ItemStack.isEmpty.patch
+++ b/Spigot-Server-Patches/0159-Optimize-ItemStack.isEmpty.patch
@@ -1,4 +1,4 @@
-From 766b2224cc263eb3f5d84aedae774f89cc97afdc Mon Sep 17 00:00:00 2001
+From f71f7c99f39e17afaa189ddb74c6ff65d58231d8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Dec 2016 03:48:29 -0500
 Subject: [PATCH] Optimize ItemStack.isEmpty()
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize ItemStack.isEmpty()
 Remove hashMap lookup every check, simplify code to remove ternary
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 6e7b2e721d..33e82f5377 100644
+index c7ef9c6890..4f230975aa 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -142,7 +142,7 @@ public final class ItemStack {
diff --git a/Spigot-Server-Patches/0161-Add-API-methods-to-control-if-armour-stands-can-move.patch b/Spigot-Server-Patches/0160-Add-API-methods-to-control-if-armour-stands-can-move.patch
similarity index 92%
rename from Spigot-Server-Patches/0161-Add-API-methods-to-control-if-armour-stands-can-move.patch
rename to Spigot-Server-Patches/0160-Add-API-methods-to-control-if-armour-stands-can-move.patch
index 98ab58e12..941557399 100644
--- a/Spigot-Server-Patches/0161-Add-API-methods-to-control-if-armour-stands-can-move.patch
+++ b/Spigot-Server-Patches/0160-Add-API-methods-to-control-if-armour-stands-can-move.patch
@@ -1,11 +1,11 @@
-From 9552638e5117ea211b9a4d0f6104982070a79281 Mon Sep 17 00:00:00 2001
+From dd4923a11f20976061fbd0f9bfcbf2d688bd1eb8 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 21 Dec 2016 11:47:25 -0600
 Subject: [PATCH] Add API methods to control if armour stands can move
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index cf11a2225..578d96640 100644
+index cf11a2225b..578d966401 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -44,6 +44,7 @@ public class EntityArmorStand extends EntityLiving {
@@ -31,7 +31,7 @@ index cf11a2225..578d96640 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
-index 2b66a08ad..124c3185b 100644
+index 2b66a08ade..124c3185bc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 @@ -211,4 +211,16 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
diff --git a/Spigot-Server-Patches/0162-Add-option-to-remove-invalid-statistics.patch b/Spigot-Server-Patches/0161-Add-option-to-remove-invalid-statistics.patch
similarity index 94%
rename from Spigot-Server-Patches/0162-Add-option-to-remove-invalid-statistics.patch
rename to Spigot-Server-Patches/0161-Add-option-to-remove-invalid-statistics.patch
index 847e71d03..412485007 100644
--- a/Spigot-Server-Patches/0162-Add-option-to-remove-invalid-statistics.patch
+++ b/Spigot-Server-Patches/0161-Add-option-to-remove-invalid-statistics.patch
@@ -1,11 +1,11 @@
-From 76c7552376cc1589c2638fc771b9267878df9f51 Mon Sep 17 00:00:00 2001
+From 91cc5d3990869c146ee076d44d79fa05d39a83d0 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 315d85090..644e01101 100644
+index c1845d6811..9f1182c723 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -266,4 +266,13 @@ public class PaperConfig {
@@ -23,7 +23,7 @@ index 315d85090..644e01101 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/ServerStatisticManager.java b/src/main/java/net/minecraft/server/ServerStatisticManager.java
-index 07e7db455..34c57e26f 100644
+index 07e7db455b..34c57e26f4 100644
 --- a/src/main/java/net/minecraft/server/ServerStatisticManager.java
 +++ b/src/main/java/net/minecraft/server/ServerStatisticManager.java
 @@ -83,6 +83,7 @@ public class ServerStatisticManager extends StatisticManager {
diff --git a/Spigot-Server-Patches/0163-Properly-fix-item-duplication-bug.patch b/Spigot-Server-Patches/0162-Properly-fix-item-duplication-bug.patch
similarity index 95%
rename from Spigot-Server-Patches/0163-Properly-fix-item-duplication-bug.patch
rename to Spigot-Server-Patches/0162-Properly-fix-item-duplication-bug.patch
index 7d95f6179..d9ce1e301 100644
--- a/Spigot-Server-Patches/0163-Properly-fix-item-duplication-bug.patch
+++ b/Spigot-Server-Patches/0162-Properly-fix-item-duplication-bug.patch
@@ -1,4 +1,4 @@
-From d7f1fa572f569e45b105296e0dfd07c0eb661cb3 Mon Sep 17 00:00:00 2001
+From 24ecc3817771126c2d7976e868d27eed874baba7 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/0164-String-based-Action-Bar-API.patch b/Spigot-Server-Patches/0163-String-based-Action-Bar-API.patch
similarity index 95%
rename from Spigot-Server-Patches/0164-String-based-Action-Bar-API.patch
rename to Spigot-Server-Patches/0163-String-based-Action-Bar-API.patch
index ac22d957e..b3923f296 100644
--- a/Spigot-Server-Patches/0164-String-based-Action-Bar-API.patch
+++ b/Spigot-Server-Patches/0163-String-based-Action-Bar-API.patch
@@ -1,11 +1,11 @@
-From 4cc0c78d2e772137aa7230ea36c01823f5845af6 Mon Sep 17 00:00:00 2001
+From 2a36c0293be0e894d2fb7531a905844308ce4a32 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 70cdc3f10..381542e0d 100644
+index 70cdc3f102..381542e0d2 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
 @@ -1,10 +1,13 @@
@@ -62,7 +62,7 @@ index 70cdc3f10..381542e0d 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 6f23ef5b8..63341ec77 100644
+index 6f23ef5b81..63341ec778 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 {
diff --git a/Spigot-Server-Patches/0165-Activation-Range-Improvements.patch b/Spigot-Server-Patches/0164-Activation-Range-Improvements.patch
similarity index 99%
rename from Spigot-Server-Patches/0165-Activation-Range-Improvements.patch
rename to Spigot-Server-Patches/0164-Activation-Range-Improvements.patch
index 8a66e974c..2973371b1 100644
--- a/Spigot-Server-Patches/0165-Activation-Range-Improvements.patch
+++ b/Spigot-Server-Patches/0164-Activation-Range-Improvements.patch
@@ -1,4 +1,4 @@
-From 34be4ecc0e2f22775476b1525df4a1d6b66aaa52 Mon Sep 17 00:00:00 2001
+From 9f4b4b473e9497c4d41e4a7c3797b2b352d4acfe 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
diff --git a/Spigot-Server-Patches/0166-Firework-API-s.patch b/Spigot-Server-Patches/0165-Firework-API-s.patch
similarity index 98%
rename from Spigot-Server-Patches/0166-Firework-API-s.patch
rename to Spigot-Server-Patches/0165-Firework-API-s.patch
index 6b9f90930..3a0a247d9 100644
--- a/Spigot-Server-Patches/0166-Firework-API-s.patch
+++ b/Spigot-Server-Patches/0165-Firework-API-s.patch
@@ -1,4 +1,4 @@
-From 9e4afcd7dd8a13723ed96074ecc3f71bef52f7d1 Mon Sep 17 00:00:00 2001
+From 19b9fd7bebcb2b56fcfd4d48a77d58ae4cde4731 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 28 Dec 2016 01:18:33 -0500
 Subject: [PATCH] Firework API's
diff --git a/Spigot-Server-Patches/0167-PlayerTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/0166-PlayerTeleportEndGatewayEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0167-PlayerTeleportEndGatewayEvent.patch
rename to Spigot-Server-Patches/0166-PlayerTeleportEndGatewayEvent.patch
index c4df78a8f..ed9c59735 100644
--- a/Spigot-Server-Patches/0167-PlayerTeleportEndGatewayEvent.patch
+++ b/Spigot-Server-Patches/0166-PlayerTeleportEndGatewayEvent.patch
@@ -1,4 +1,4 @@
-From e2f315dc84a82b3d7a612787b73136bcb502495e Mon Sep 17 00:00:00 2001
+From 10a014c690c95c33e9ff9aa5667fe820fc2e9a06 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 31 Dec 2016 21:44:50 -0500
 Subject: [PATCH] PlayerTeleportEndGatewayEvent
diff --git a/Spigot-Server-Patches/0168-ShulkerBox-Dupe-Prevention.patch b/Spigot-Server-Patches/0167-ShulkerBox-Dupe-Prevention.patch
similarity index 94%
rename from Spigot-Server-Patches/0168-ShulkerBox-Dupe-Prevention.patch
rename to Spigot-Server-Patches/0167-ShulkerBox-Dupe-Prevention.patch
index 7928c2ed6..0fe03ad56 100644
--- a/Spigot-Server-Patches/0168-ShulkerBox-Dupe-Prevention.patch
+++ b/Spigot-Server-Patches/0167-ShulkerBox-Dupe-Prevention.patch
@@ -1,4 +1,4 @@
-From 14c4520470eb40961776f706ffb916db46f2128e Mon Sep 17 00:00:00 2001
+From 09e0e636a258cd813f6833d95c9c226037644891 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 2 Jan 2017 16:32:56 -0500
 Subject: [PATCH] ShulkerBox Dupe Prevention
diff --git a/Spigot-Server-Patches/0169-Provide-E-TE-Chunk-count-stat-methods.patch b/Spigot-Server-Patches/0168-Provide-E-TE-Chunk-count-stat-methods.patch
similarity index 93%
rename from Spigot-Server-Patches/0169-Provide-E-TE-Chunk-count-stat-methods.patch
rename to Spigot-Server-Patches/0168-Provide-E-TE-Chunk-count-stat-methods.patch
index 92908aaaa..bbf94c405 100644
--- a/Spigot-Server-Patches/0169-Provide-E-TE-Chunk-count-stat-methods.patch
+++ b/Spigot-Server-Patches/0168-Provide-E-TE-Chunk-count-stat-methods.patch
@@ -1,4 +1,4 @@
-From fc7de1415a8052d3d1eb76f878c5bcd34258c9bb Mon Sep 17 00:00:00 2001
+From 232d01433fe37bfda7b651b7070ddc53655592db 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 90e260f3b3..8b63192cf9 100644
+index d4851dd2a6..84fcebd710 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -81,6 +81,29 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0170-Enforce-Sync-Player-Saves.patch b/Spigot-Server-Patches/0169-Enforce-Sync-Player-Saves.patch
similarity index 94%
rename from Spigot-Server-Patches/0170-Enforce-Sync-Player-Saves.patch
rename to Spigot-Server-Patches/0169-Enforce-Sync-Player-Saves.patch
index 904a4a8ae..14d620c3b 100644
--- a/Spigot-Server-Patches/0170-Enforce-Sync-Player-Saves.patch
+++ b/Spigot-Server-Patches/0169-Enforce-Sync-Player-Saves.patch
@@ -1,4 +1,4 @@
-From c8cb88449adba448d0c187dca5d998dd2f22a236 Mon Sep 17 00:00:00 2001
+From 72379254cb1a9ed6e70ae8769b40fcbb8b86f562 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
diff --git a/Spigot-Server-Patches/0171-Enforce-Sync-Chunk-Unloads.patch b/Spigot-Server-Patches/0170-Enforce-Sync-Chunk-Unloads.patch
similarity index 92%
rename from Spigot-Server-Patches/0171-Enforce-Sync-Chunk-Unloads.patch
rename to Spigot-Server-Patches/0170-Enforce-Sync-Chunk-Unloads.patch
index 0ee1099ac..61a618ef5 100644
--- a/Spigot-Server-Patches/0171-Enforce-Sync-Chunk-Unloads.patch
+++ b/Spigot-Server-Patches/0170-Enforce-Sync-Chunk-Unloads.patch
@@ -1,4 +1,4 @@
-From 43dcb62043ee21ca98b65960606e890140287243 Mon Sep 17 00:00:00 2001
+From c2d1aef7ed491a82d01740c0a1de7b458ba1358e 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
@@ -7,7 +7,7 @@ Unloading Chunks async is extremely dangerous. This will force it to main
 the same way we handle async chunk loads.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 8b63192cf9..86848543d0 100644
+index 84fcebd710..9cd991c3e7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -224,6 +224,7 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0172-Don-t-allow-entities-to-ride-themselves-572.patch b/Spigot-Server-Patches/0171-Don-t-allow-entities-to-ride-themselves-572.patch
similarity index 88%
rename from Spigot-Server-Patches/0172-Don-t-allow-entities-to-ride-themselves-572.patch
rename to Spigot-Server-Patches/0171-Don-t-allow-entities-to-ride-themselves-572.patch
index e019dddfc..55ec55e18 100644
--- a/Spigot-Server-Patches/0172-Don-t-allow-entities-to-ride-themselves-572.patch
+++ b/Spigot-Server-Patches/0171-Don-t-allow-entities-to-ride-themselves-572.patch
@@ -1,11 +1,11 @@
-From f9d2d9f925eb02c27f49d8d87515ce82eaad0488 Mon Sep 17 00:00:00 2001
+From 490f80cc952730f9b5974295f680abcde76b1d3c Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Sun, 8 Jan 2017 04:31:36 +0000
 Subject: [PATCH] Don't allow entities to ride themselves - #572
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index c28723158..3955884e1 100644
+index c287231584..3955884e10 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2077,6 +2077,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -17,5 +17,5 @@ index c28723158..3955884e1 100644
              throw new IllegalStateException("Use x.startRiding(y), not y.addPassenger(x)");
          } else {
 -- 
-2.17.1
+2.18.0
 
diff --git a/Spigot-Server-Patches/0173-Fix-block-break-desync.patch b/Spigot-Server-Patches/0172-Fix-block-break-desync.patch
similarity index 91%
rename from Spigot-Server-Patches/0173-Fix-block-break-desync.patch
rename to Spigot-Server-Patches/0172-Fix-block-break-desync.patch
index d63d4d442..36516270e 100644
--- a/Spigot-Server-Patches/0173-Fix-block-break-desync.patch
+++ b/Spigot-Server-Patches/0172-Fix-block-break-desync.patch
@@ -1,11 +1,11 @@
-From e84c33f296ef5dda7c89380053e5609ea81c9736 Mon Sep 17 00:00:00 2001
+From 8a7de9d244d1ba40567f71a5e09e3b4d43122611 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/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 9ac86f7af2..62b7d86e17 100644
+index 3885c8628c..08ef17dfe1 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1145,6 +1145,8 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
diff --git a/Spigot-Server-Patches/0174-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/Spigot-Server-Patches/0173-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
similarity index 99%
rename from Spigot-Server-Patches/0174-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
rename to Spigot-Server-Patches/0173-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
index 996cdd769..88afe12f4 100644
--- a/Spigot-Server-Patches/0174-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/Spigot-Server-Patches/0173-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
@@ -1,4 +1,4 @@
-From 25760dfd08e13f5a5d6b79136baada17f741aace Mon Sep 17 00:00:00 2001
+From 8c55114fb8480e5ec9da06926509ac8864ad2762 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/0175-Cap-Entity-Collisions.patch b/Spigot-Server-Patches/0174-Cap-Entity-Collisions.patch
similarity index 97%
rename from Spigot-Server-Patches/0175-Cap-Entity-Collisions.patch
rename to Spigot-Server-Patches/0174-Cap-Entity-Collisions.patch
index b23993b4c..27aee6de5 100644
--- a/Spigot-Server-Patches/0175-Cap-Entity-Collisions.patch
+++ b/Spigot-Server-Patches/0174-Cap-Entity-Collisions.patch
@@ -1,4 +1,4 @@
-From d5dcafc4a816b3bfb10b92beb388035abb19ec63 Mon Sep 17 00:00:00 2001
+From b641b0729bb684eed8ca532e9f36b60197926e07 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 22 Jan 2017 18:07:56 -0500
 Subject: [PATCH] Cap Entity Collisions
diff --git a/Spigot-Server-Patches/0176-Remove-CraftScheduler-Async-Task-Debugger.patch b/Spigot-Server-Patches/0175-Remove-CraftScheduler-Async-Task-Debugger.patch
similarity index 97%
rename from Spigot-Server-Patches/0176-Remove-CraftScheduler-Async-Task-Debugger.patch
rename to Spigot-Server-Patches/0175-Remove-CraftScheduler-Async-Task-Debugger.patch
index f615dba08..f965ddaa0 100644
--- a/Spigot-Server-Patches/0176-Remove-CraftScheduler-Async-Task-Debugger.patch
+++ b/Spigot-Server-Patches/0175-Remove-CraftScheduler-Async-Task-Debugger.patch
@@ -1,4 +1,4 @@
-From 41d4fcb5e9244eeb5cbd7da27dd7e9917b6b5ad6 Mon Sep 17 00:00:00 2001
+From 62d4ba558bbd6bdb3ef28b071fdfffa90af9eb93 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 5 Feb 2017 00:04:04 -0500
 Subject: [PATCH] Remove CraftScheduler Async Task Debugger
diff --git a/Spigot-Server-Patches/0177-Shame-on-you-Mojang.patch b/Spigot-Server-Patches/0176-Shame-on-you-Mojang.patch
similarity index 94%
rename from Spigot-Server-Patches/0177-Shame-on-you-Mojang.patch
rename to Spigot-Server-Patches/0176-Shame-on-you-Mojang.patch
index 8cb01c0a4..84b294f29 100644
--- a/Spigot-Server-Patches/0177-Shame-on-you-Mojang.patch
+++ b/Spigot-Server-Patches/0176-Shame-on-you-Mojang.patch
@@ -1,4 +1,4 @@
-From a1b78315b821502b8462d4d2dab70bfb154ed863 Mon Sep 17 00:00:00 2001
+From 03255394631407b2ffe0d99996aaf5373bc6d94d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 5 Feb 2017 19:17:28 -0500
 Subject: [PATCH] Shame on you Mojang
diff --git a/Spigot-Server-Patches/0178-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch b/Spigot-Server-Patches/0177-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
similarity index 94%
rename from Spigot-Server-Patches/0178-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
rename to Spigot-Server-Patches/0177-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
index f64a690a2..17df9067c 100644
--- a/Spigot-Server-Patches/0178-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
+++ b/Spigot-Server-Patches/0177-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
@@ -1,4 +1,4 @@
-From 658b49a1c546172fd548a57b28ebc14b5f47ff54 Mon Sep 17 00:00:00 2001
+From 0fea4b74b91d8ce4a6e5069773a8e345363569e8 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Tue, 7 Feb 2017 16:55:35 -0600
 Subject: [PATCH] Make targetSize more aggressive in the chunk unload queue
diff --git a/Spigot-Server-Patches/0179-Do-not-let-armorstands-drown.patch b/Spigot-Server-Patches/0178-Do-not-let-armorstands-drown.patch
similarity index 96%
rename from Spigot-Server-Patches/0179-Do-not-let-armorstands-drown.patch
rename to Spigot-Server-Patches/0178-Do-not-let-armorstands-drown.patch
index 95cbdd8bf..a06399502 100644
--- a/Spigot-Server-Patches/0179-Do-not-let-armorstands-drown.patch
+++ b/Spigot-Server-Patches/0178-Do-not-let-armorstands-drown.patch
@@ -1,4 +1,4 @@
-From 68dd2f248cc7e8ac0f3fc7aae5a87f9520ea8b16 Mon Sep 17 00:00:00 2001
+From 5de4b721abc005b58dd8b4bfb1025fb8df9ba9e5 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 18 Feb 2017 19:29:58 -0600
 Subject: [PATCH] Do not let armorstands drown
diff --git a/Spigot-Server-Patches/0180-Properly-handle-async-calls-to-restart-the-server.patch b/Spigot-Server-Patches/0179-Properly-handle-async-calls-to-restart-the-server.patch
similarity index 99%
rename from Spigot-Server-Patches/0180-Properly-handle-async-calls-to-restart-the-server.patch
rename to Spigot-Server-Patches/0179-Properly-handle-async-calls-to-restart-the-server.patch
index a9ce3c73c..1270408e8 100644
--- a/Spigot-Server-Patches/0180-Properly-handle-async-calls-to-restart-the-server.patch
+++ b/Spigot-Server-Patches/0179-Properly-handle-async-calls-to-restart-the-server.patch
@@ -1,4 +1,4 @@
-From 2290cb8d1859a89dc6b1a8e9a6783c76a782849b Mon Sep 17 00:00:00 2001
+From b9074e0ad5743326d4ccab91a38999cae8f89e74 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 c97953a2fd..8576545bb7 100644
+index 0560882314..7a7893c4df 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -85,6 +85,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
diff --git a/Spigot-Server-Patches/0181-Add-system-property-to-disable-book-size-limits.patch b/Spigot-Server-Patches/0180-Add-system-property-to-disable-book-size-limits.patch
similarity index 97%
rename from Spigot-Server-Patches/0181-Add-system-property-to-disable-book-size-limits.patch
rename to Spigot-Server-Patches/0180-Add-system-property-to-disable-book-size-limits.patch
index b2354bb46..a4eb0398a 100644
--- a/Spigot-Server-Patches/0181-Add-system-property-to-disable-book-size-limits.patch
+++ b/Spigot-Server-Patches/0180-Add-system-property-to-disable-book-size-limits.patch
@@ -1,4 +1,4 @@
-From 58676fef1f3ff751dc347888740ef41c7407e0cd Mon Sep 17 00:00:00 2001
+From 97d5e2fa2bc33147c60d9788b9d424e22037d5b7 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 13 May 2017 20:11:21 -0500
 Subject: [PATCH] Add system property to disable book size limits
diff --git a/Spigot-Server-Patches/0182-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/Spigot-Server-Patches/0181-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
similarity index 96%
rename from Spigot-Server-Patches/0182-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
rename to Spigot-Server-Patches/0181-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
index 9cd40da89..ab5d399ae 100644
--- a/Spigot-Server-Patches/0182-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
+++ b/Spigot-Server-Patches/0181-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
@@ -1,4 +1,4 @@
-From 9578efb4818e086eadd5b51ea7d33f5d2fb0afbf Mon Sep 17 00:00:00 2001
+From 2cd2c05c82e8c8fc0b70d0bcebeb900dd4c5fe07 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
@@ -26,7 +26,7 @@ index 4991138dfe..87c599338a 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 06b663c4db..42c6249535 100644
+index 9814075d6d..814202286c 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -460,7 +460,7 @@ public abstract class EntityHuman extends EntityLiving {
diff --git a/Spigot-Server-Patches/0183-Add-configuration-option-to-prevent-player-names-fro.patch b/Spigot-Server-Patches/0182-Add-configuration-option-to-prevent-player-names-fro.patch
similarity index 91%
rename from Spigot-Server-Patches/0183-Add-configuration-option-to-prevent-player-names-fro.patch
rename to Spigot-Server-Patches/0182-Add-configuration-option-to-prevent-player-names-fro.patch
index bc9196fb1..87bb41318 100644
--- a/Spigot-Server-Patches/0183-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/Spigot-Server-Patches/0182-Add-configuration-option-to-prevent-player-names-fro.patch
@@ -1,4 +1,4 @@
-From 0ca83d3dcffbc61f0f29decab8528308f592e813 Mon Sep 17 00:00:00 2001
+From 63c522730c8175d870a29e856abf59d886a6cb8c Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Fri, 9 Jun 2017 07:24:34 -0700
 Subject: [PATCH] Add configuration option to prevent player names from being
@@ -6,7 +6,7 @@ Subject: [PATCH] Add configuration option to prevent player names from being
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 644e01101..329950802 100644
+index 9f1182c723..e97dbaf8e3 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -275,4 +275,9 @@ public class PaperConfig {
@@ -20,7 +20,7 @@ index 644e01101..329950802 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6470135f7..f1a4f4529 100644
+index 6470135f77..f1a4f4529c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1991,5 +1991,10 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0184-Use-TerminalConsoleAppender-for-console-improvements.patch b/Spigot-Server-Patches/0183-Use-TerminalConsoleAppender-for-console-improvements.patch
similarity index 99%
rename from Spigot-Server-Patches/0184-Use-TerminalConsoleAppender-for-console-improvements.patch
rename to Spigot-Server-Patches/0183-Use-TerminalConsoleAppender-for-console-improvements.patch
index b889a532b..969dfeb72 100644
--- a/Spigot-Server-Patches/0184-Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/Spigot-Server-Patches/0183-Use-TerminalConsoleAppender-for-console-improvements.patch
@@ -1,4 +1,4 @@
-From c1dafcce6dd2f9cd431fd85a44036602e7013fbf Mon Sep 17 00:00:00 2001
+From d00567ab4a5596562e6c10f8c55ba07aa7afce3b 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
@@ -199,7 +199,7 @@ index bf1fffcfee..af430b73f0 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 db09d391ea..41ee97b1a4 100644
+index 7a7893c4df..f88ba7db7f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -57,7 +57,6 @@ import org.apache.commons.lang3.Validate;
@@ -271,7 +271,7 @@ index 0b0d996523..4cbe148010 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 8412e71d71..47b4c01067 100644
+index f1a4f4529c..4da2ada651 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -137,8 +137,8 @@ import java.nio.ByteBuffer;
@@ -299,7 +299,7 @@ index 8412e71d71..47b4c01067 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 c552c624e5..3245fded9b 100644
+index 5c26e78a71..69a7c5205e 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;
diff --git a/Spigot-Server-Patches/0185-provide-a-configurable-option-to-disable-creeper-lin.patch b/Spigot-Server-Patches/0184-provide-a-configurable-option-to-disable-creeper-lin.patch
similarity index 92%
rename from Spigot-Server-Patches/0185-provide-a-configurable-option-to-disable-creeper-lin.patch
rename to Spigot-Server-Patches/0184-provide-a-configurable-option-to-disable-creeper-lin.patch
index e4c158e7e..5ea199a97 100644
--- a/Spigot-Server-Patches/0185-provide-a-configurable-option-to-disable-creeper-lin.patch
+++ b/Spigot-Server-Patches/0184-provide-a-configurable-option-to-disable-creeper-lin.patch
@@ -1,4 +1,4 @@
-From 588438d85b874d5d68a5abfe77c3ab961e773eb9 Mon Sep 17 00:00:00 2001
+From e9981fa3ef4ec3f077afbffe264b88718385fc88 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 11 Jun 2017 21:01:18 +0100
 Subject: [PATCH] provide a configurable option to disable creeper lingering
@@ -6,7 +6,7 @@ Subject: [PATCH] provide a configurable option to disable creeper lingering
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 87c599338..23cb3feef 100644
+index 87c599338a..23cb3feef0 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -356,4 +356,10 @@ public class PaperWorldConfig {
@@ -21,7 +21,7 @@ index 87c599338..23cb3feef 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
-index 8b0134ecd..0147054df 100644
+index 8b0134ecdb..0147054dff 100644
 --- a/src/main/java/net/minecraft/server/EntityCreeper.java
 +++ b/src/main/java/net/minecraft/server/EntityCreeper.java
 @@ -214,7 +214,7 @@ public class EntityCreeper extends EntityMonster {
diff --git a/Spigot-Server-Patches/0186-Item-canEntityPickup.patch b/Spigot-Server-Patches/0185-Item-canEntityPickup.patch
similarity index 97%
rename from Spigot-Server-Patches/0186-Item-canEntityPickup.patch
rename to Spigot-Server-Patches/0185-Item-canEntityPickup.patch
index 6b06b44ef..04babd16d 100644
--- a/Spigot-Server-Patches/0186-Item-canEntityPickup.patch
+++ b/Spigot-Server-Patches/0185-Item-canEntityPickup.patch
@@ -1,4 +1,4 @@
-From d59a01eaa5f962e8616dd5b2916f194ca8636432 Mon Sep 17 00:00:00 2001
+From 04e49d289aee8314333ad28e4479065062f876db Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 5 May 2017 03:57:17 -0500
 Subject: [PATCH] Item#canEntityPickup
diff --git a/Spigot-Server-Patches/0187-PlayerPickupItemEvent-setFlyAtPlayer.patch b/Spigot-Server-Patches/0186-PlayerPickupItemEvent-setFlyAtPlayer.patch
similarity index 97%
rename from Spigot-Server-Patches/0187-PlayerPickupItemEvent-setFlyAtPlayer.patch
rename to Spigot-Server-Patches/0186-PlayerPickupItemEvent-setFlyAtPlayer.patch
index 156f2e7b0..dfa50d2fb 100644
--- a/Spigot-Server-Patches/0187-PlayerPickupItemEvent-setFlyAtPlayer.patch
+++ b/Spigot-Server-Patches/0186-PlayerPickupItemEvent-setFlyAtPlayer.patch
@@ -1,4 +1,4 @@
-From a7b7ab149feb1f3dca1cb24e0d88e43118021449 Mon Sep 17 00:00:00 2001
+From f989d3289e2f07075a08f3bb146301470a89f3fe Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 May 2017 06:26:09 -0500
 Subject: [PATCH] PlayerPickupItemEvent#setFlyAtPlayer
diff --git a/Spigot-Server-Patches/0188-PlayerAttemptPickupItemEvent.patch b/Spigot-Server-Patches/0187-PlayerAttemptPickupItemEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0188-PlayerAttemptPickupItemEvent.patch
rename to Spigot-Server-Patches/0187-PlayerAttemptPickupItemEvent.patch
index 1f7a657ec..ae160895d 100644
--- a/Spigot-Server-Patches/0188-PlayerAttemptPickupItemEvent.patch
+++ b/Spigot-Server-Patches/0187-PlayerAttemptPickupItemEvent.patch
@@ -1,4 +1,4 @@
-From e7685d8e92926c91d7704389eedf46fd90446b3c Mon Sep 17 00:00:00 2001
+From 97bc66e2114ac535c2ec75a55635bac26ea93db5 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 11 Jun 2017 16:30:30 -0500
 Subject: [PATCH] PlayerAttemptPickupItemEvent
diff --git a/Spigot-Server-Patches/0189-Add-UnknownCommandEvent.patch b/Spigot-Server-Patches/0188-Add-UnknownCommandEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0189-Add-UnknownCommandEvent.patch
rename to Spigot-Server-Patches/0188-Add-UnknownCommandEvent.patch
index 9ed1dc72b..d66ba59e4 100644
--- a/Spigot-Server-Patches/0189-Add-UnknownCommandEvent.patch
+++ b/Spigot-Server-Patches/0188-Add-UnknownCommandEvent.patch
@@ -1,11 +1,11 @@
-From 43a73429e4e31a393e524f7b3068e54b6de79597 Mon Sep 17 00:00:00 2001
+From 8f05198ed4b3eee4f2d681524fa12c8c9e4ab6e5 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 47b4c01067..ca696b2417 100644
+index 4da2ada651..237d7696c7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -79,6 +79,7 @@ import org.bukkit.craftbukkit.util.Versioning;
diff --git a/Spigot-Server-Patches/0190-Basic-PlayerProfile-API.patch b/Spigot-Server-Patches/0189-Basic-PlayerProfile-API.patch
similarity index 99%
rename from Spigot-Server-Patches/0190-Basic-PlayerProfile-API.patch
rename to Spigot-Server-Patches/0189-Basic-PlayerProfile-API.patch
index 34aada145..2e3dbf3f5 100644
--- a/Spigot-Server-Patches/0190-Basic-PlayerProfile-API.patch
+++ b/Spigot-Server-Patches/0189-Basic-PlayerProfile-API.patch
@@ -1,4 +1,4 @@
-From f5ea9812a6d2bd99c63c9935127f9a700f3656bc Mon Sep 17 00:00:00 2001
+From d7cf0a4d66360b40292de3fd0f041488468a958a 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
diff --git a/Spigot-Server-Patches/0191-Shoulder-Entities-Release-API.patch b/Spigot-Server-Patches/0190-Shoulder-Entities-Release-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0191-Shoulder-Entities-Release-API.patch
rename to Spigot-Server-Patches/0190-Shoulder-Entities-Release-API.patch
index 1b77c74b7..0b541cbcf 100644
--- a/Spigot-Server-Patches/0191-Shoulder-Entities-Release-API.patch
+++ b/Spigot-Server-Patches/0190-Shoulder-Entities-Release-API.patch
@@ -1,4 +1,4 @@
-From c4c29f13492aa4c90973421cb6a7fd7697e37994 Mon Sep 17 00:00:00 2001
+From d33bc2c9cfecea2a6c4d007cef97daafcaaa1360 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 17 Jun 2017 15:18:30 -0400
 Subject: [PATCH] Shoulder Entities Release API
diff --git a/Spigot-Server-Patches/0192-Profile-Lookup-Events.patch b/Spigot-Server-Patches/0191-Profile-Lookup-Events.patch
similarity index 98%
rename from Spigot-Server-Patches/0192-Profile-Lookup-Events.patch
rename to Spigot-Server-Patches/0191-Profile-Lookup-Events.patch
index 8db514e7c..4eca02d3a 100644
--- a/Spigot-Server-Patches/0192-Profile-Lookup-Events.patch
+++ b/Spigot-Server-Patches/0191-Profile-Lookup-Events.patch
@@ -1,4 +1,4 @@
-From d1090b257a18d039d63dde81cca6bb2fb7a1dc2b Mon Sep 17 00:00:00 2001
+From 9de3dab38948bea6b6251204e18b27a77120b583 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 17 Jun 2017 17:00:32 -0400
 Subject: [PATCH] Profile Lookup Events
diff --git a/Spigot-Server-Patches/0193-Block-player-logins-during-server-shutdown.patch b/Spigot-Server-Patches/0192-Block-player-logins-during-server-shutdown.patch
similarity index 90%
rename from Spigot-Server-Patches/0193-Block-player-logins-during-server-shutdown.patch
rename to Spigot-Server-Patches/0192-Block-player-logins-during-server-shutdown.patch
index e21f236c0..746086ab3 100644
--- a/Spigot-Server-Patches/0193-Block-player-logins-during-server-shutdown.patch
+++ b/Spigot-Server-Patches/0192-Block-player-logins-during-server-shutdown.patch
@@ -1,11 +1,11 @@
-From a1e1fd273bd4c01c575f6cea31f72219187b536d Mon Sep 17 00:00:00 2001
+From b4bec1df3b0d1eaaa07b969dd8cd6494c88782c7 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 2 Jul 2017 21:35:56 -0500
 Subject: [PATCH] Block player logins during server shutdown
 
 
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index b6e8296824..85eff6e2dd 100644
+index fae8a13973..005efbc111 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -50,6 +50,12 @@ public class LoginListener implements PacketLoginInListener, ITickable {
diff --git a/Spigot-Server-Patches/0194-Entity-fromMobSpawner.patch b/Spigot-Server-Patches/0193-Entity-fromMobSpawner.patch
similarity index 94%
rename from Spigot-Server-Patches/0194-Entity-fromMobSpawner.patch
rename to Spigot-Server-Patches/0193-Entity-fromMobSpawner.patch
index b3d5ed92c..ebba0a411 100644
--- a/Spigot-Server-Patches/0194-Entity-fromMobSpawner.patch
+++ b/Spigot-Server-Patches/0193-Entity-fromMobSpawner.patch
@@ -1,11 +1,11 @@
-From 7b0a57312cfc84e35752507c500844cd7d949f3b Mon Sep 17 00:00:00 2001
+From 138911e0ab52c942ed20ed80b3ac6a2c8c7b8ded Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 18 Jun 2017 18:17:05 -0500
 Subject: [PATCH] Entity#fromMobSpawner()
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 33683301b..aba517a71 100644
+index 33683301b2..aba517a710 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -183,6 +183,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -37,7 +37,7 @@ index 33683301b..aba517a71 100644
  
          } catch (Throwable throwable) {
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index 61472a0eb..2b6b062c6 100644
+index 61472a0eb2..2b6b062c61 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -115,6 +115,7 @@ public abstract class MobSpawnerAbstract {
@@ -49,7 +49,7 @@ index 61472a0eb..2b6b062c6 100644
                          if ( entity.world.spigotConfig.nerfSpawnerMobs )
                          {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index dedf1526e..2801e34f6 100644
+index dedf1526e6..2801e34f6b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -826,5 +826,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -64,5 +64,5 @@ index dedf1526e..2801e34f6 100644
      // Paper end
  }
 -- 
-2.17.1
+2.18.0
 
diff --git a/Spigot-Server-Patches/0195-Fix-Anvil-Level-sync-to-client.patch b/Spigot-Server-Patches/0194-Fix-Anvil-Level-sync-to-client.patch
similarity index 93%
rename from Spigot-Server-Patches/0195-Fix-Anvil-Level-sync-to-client.patch
rename to Spigot-Server-Patches/0194-Fix-Anvil-Level-sync-to-client.patch
index 6c361ffeb..02ea5ac6e 100644
--- a/Spigot-Server-Patches/0195-Fix-Anvil-Level-sync-to-client.patch
+++ b/Spigot-Server-Patches/0194-Fix-Anvil-Level-sync-to-client.patch
@@ -1,4 +1,4 @@
-From ff7ede81722bc1ff864970eae73376190abd1dea Mon Sep 17 00:00:00 2001
+From d7d65dc85cb3518324f27df6192d707fd664d562 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
@@ -10,7 +10,7 @@ Was done incorrectly and is now causing level desyncs to client.
 Always send current level to the client, and instead make setWindowProperty set the level.
 
 diff --git a/src/main/java/net/minecraft/server/ContainerAnvil.java b/src/main/java/net/minecraft/server/ContainerAnvil.java
-index 229f4f882..fb3413d81 100644
+index 229f4f8829..fb3413d81e 100644
 --- a/src/main/java/net/minecraft/server/ContainerAnvil.java
 +++ b/src/main/java/net/minecraft/server/ContainerAnvil.java
 @@ -377,9 +377,9 @@ public class ContainerAnvil extends Container {
@@ -26,7 +26,7 @@ index 229f4f882..fb3413d81 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 63341ec77..bf7bfb427 100644
+index 63341ec778..bf7bfb427b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1420,6 +1420,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0196-Add-missing-coverages-for-getTileEntity-in-order-to-.patch b/Spigot-Server-Patches/0195-Add-missing-coverages-for-getTileEntity-in-order-to-.patch
similarity index 94%
rename from Spigot-Server-Patches/0196-Add-missing-coverages-for-getTileEntity-in-order-to-.patch
rename to Spigot-Server-Patches/0195-Add-missing-coverages-for-getTileEntity-in-order-to-.patch
index bda1f660e..732fce645 100644
--- a/Spigot-Server-Patches/0196-Add-missing-coverages-for-getTileEntity-in-order-to-.patch
+++ b/Spigot-Server-Patches/0195-Add-missing-coverages-for-getTileEntity-in-order-to-.patch
@@ -1,4 +1,4 @@
-From 6abcfc52f3b1140bf55d775ef2083c3bc17c0797 Mon Sep 17 00:00:00 2001
+From ff5fed386f5e6482a0e6479e31ee5ba4557d2b66 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 22 Jul 2017 15:22:59 +0100
 Subject: [PATCH] Add missing coverages for getTileEntity in order to attempt
diff --git a/Spigot-Server-Patches/0197-Improve-the-Saddle-API-for-Horses.patch b/Spigot-Server-Patches/0196-Improve-the-Saddle-API-for-Horses.patch
similarity index 97%
rename from Spigot-Server-Patches/0197-Improve-the-Saddle-API-for-Horses.patch
rename to Spigot-Server-Patches/0196-Improve-the-Saddle-API-for-Horses.patch
index 8fed37f46..1ad7b9434 100644
--- a/Spigot-Server-Patches/0197-Improve-the-Saddle-API-for-Horses.patch
+++ b/Spigot-Server-Patches/0196-Improve-the-Saddle-API-for-Horses.patch
@@ -1,4 +1,4 @@
-From 8e0eed18f7b4b54add9bdf23b0ecad8b38cc77c5 Mon Sep 17 00:00:00 2001
+From d293eb84fe13d44b756fb6bb9c905450470bd70e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 10 Dec 2016 16:24:06 -0500
 Subject: [PATCH] Improve the Saddle API for Horses
diff --git a/Spigot-Server-Patches/0198-Implement-ensureServerConversions-API.patch b/Spigot-Server-Patches/0197-Implement-ensureServerConversions-API.patch
similarity index 91%
rename from Spigot-Server-Patches/0198-Implement-ensureServerConversions-API.patch
rename to Spigot-Server-Patches/0197-Implement-ensureServerConversions-API.patch
index d3327ad92..8203d43d6 100644
--- a/Spigot-Server-Patches/0198-Implement-ensureServerConversions-API.patch
+++ b/Spigot-Server-Patches/0197-Implement-ensureServerConversions-API.patch
@@ -1,4 +1,4 @@
-From 27d25274373a6f4533ce86ef73351e049c0f127b Mon Sep 17 00:00:00 2001
+From f1ddcf43d9f099679c60da978685f782b4548f1d 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 0fb3c238a..e98e1ed72 100644
+index 0fb3c238ae..e98e1ed72c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 @@ -287,4 +287,10 @@ public final class CraftItemFactory implements ItemFactory {
diff --git a/Spigot-Server-Patches/0199-Implement-getI18NDisplayName.patch b/Spigot-Server-Patches/0198-Implement-getI18NDisplayName.patch
similarity index 93%
rename from Spigot-Server-Patches/0199-Implement-getI18NDisplayName.patch
rename to Spigot-Server-Patches/0198-Implement-getI18NDisplayName.patch
index 4ae734988..5776832f2 100644
--- a/Spigot-Server-Patches/0199-Implement-getI18NDisplayName.patch
+++ b/Spigot-Server-Patches/0198-Implement-getI18NDisplayName.patch
@@ -1,4 +1,4 @@
-From fb596b3a8df6a1332aff27d428bb4de583b6bef8 Mon Sep 17 00:00:00 2001
+From 6211c63ca93cdb6b867189ed20e7fa477190bec6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 May 2016 23:59:38 -0400
 Subject: [PATCH] Implement getI18NDisplayName
@@ -8,7 +8,7 @@ Currently the server only supports the English language. To override this,
 You must replace the language file embedded in the server jar.
 
 diff --git a/src/main/java/net/minecraft/server/LocaleLanguage.java b/src/main/java/net/minecraft/server/LocaleLanguage.java
-index 4361b2cee..f81887c66 100644
+index 4361b2cee5..f81887c661 100644
 --- a/src/main/java/net/minecraft/server/LocaleLanguage.java
 +++ b/src/main/java/net/minecraft/server/LocaleLanguage.java
 @@ -44,10 +44,12 @@ public class LocaleLanguage {
@@ -25,7 +25,7 @@ index 4361b2cee..f81887c66 100644
          return this.c(s);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-index e98e1ed72..35eb3181d 100644
+index e98e1ed72c..35eb3181dd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 @@ -292,5 +292,18 @@ public final class CraftItemFactory implements ItemFactory {
@@ -48,5 +48,5 @@ index e98e1ed72..35eb3181d 100644
      // Paper end
  }
 -- 
-2.17.1
+2.18.0
 
diff --git a/Spigot-Server-Patches/0200-GH-806-Respect-saving-disabled-before-unloading-all-.patch b/Spigot-Server-Patches/0199-GH-806-Respect-saving-disabled-before-unloading-all-.patch
similarity index 94%
rename from Spigot-Server-Patches/0200-GH-806-Respect-saving-disabled-before-unloading-all-.patch
rename to Spigot-Server-Patches/0199-GH-806-Respect-saving-disabled-before-unloading-all-.patch
index 652f58925..a597d9b84 100644
--- a/Spigot-Server-Patches/0200-GH-806-Respect-saving-disabled-before-unloading-all-.patch
+++ b/Spigot-Server-Patches/0199-GH-806-Respect-saving-disabled-before-unloading-all-.patch
@@ -1,4 +1,4 @@
-From f7d2dff64466b07794f828ff7f3f0e9d632a2a07 Mon Sep 17 00:00:00 2001
+From 2d521b50b05f62a77cd6109a50cee90788186f29 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 27 Jul 2017 00:06:43 -0400
 Subject: [PATCH] GH-806: Respect saving disabled before unloading all chunks
diff --git a/Spigot-Server-Patches/0201-ProfileWhitelistVerifyEvent.patch b/Spigot-Server-Patches/0200-ProfileWhitelistVerifyEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0201-ProfileWhitelistVerifyEvent.patch
rename to Spigot-Server-Patches/0200-ProfileWhitelistVerifyEvent.patch
index c1c11f4c8..4fbe20b3a 100644
--- a/Spigot-Server-Patches/0201-ProfileWhitelistVerifyEvent.patch
+++ b/Spigot-Server-Patches/0200-ProfileWhitelistVerifyEvent.patch
@@ -1,4 +1,4 @@
-From dab3a07d152b33b5d5751aa2ea340d5f365c8a86 Mon Sep 17 00:00:00 2001
+From d2e6f1a46ad82e4c7f839f5b3efaef96a479377b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 3 Jul 2017 18:11:10 -0500
 Subject: [PATCH] ProfileWhitelistVerifyEvent
diff --git a/Spigot-Server-Patches/0202-Fix-this-stupid-bullshit.patch b/Spigot-Server-Patches/0201-Fix-this-stupid-bullshit.patch
similarity index 94%
rename from Spigot-Server-Patches/0202-Fix-this-stupid-bullshit.patch
rename to Spigot-Server-Patches/0201-Fix-this-stupid-bullshit.patch
index 48d465f8f..b52f19010 100644
--- a/Spigot-Server-Patches/0202-Fix-this-stupid-bullshit.patch
+++ b/Spigot-Server-Patches/0201-Fix-this-stupid-bullshit.patch
@@ -1,4 +1,4 @@
-From 1d88edec1929e59dc4560ba2d8116ffe4ccd243e Mon Sep 17 00:00:00 2001
+From 9a1b31f7fd87a9d85dcc314008ea87dab210eb57 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 69a7c5205..654f976a0 100644
+index 69a7c5205e..654f976a01 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/0203-Ocelot-despawns-should-honor-nametags-and-leash.patch b/Spigot-Server-Patches/0202-Ocelot-despawns-should-honor-nametags-and-leash.patch
similarity index 93%
rename from Spigot-Server-Patches/0203-Ocelot-despawns-should-honor-nametags-and-leash.patch
rename to Spigot-Server-Patches/0202-Ocelot-despawns-should-honor-nametags-and-leash.patch
index ffa130547..48f4a51c3 100644
--- a/Spigot-Server-Patches/0203-Ocelot-despawns-should-honor-nametags-and-leash.patch
+++ b/Spigot-Server-Patches/0202-Ocelot-despawns-should-honor-nametags-and-leash.patch
@@ -1,4 +1,4 @@
-From 25b46dccb550d0d2f16157b10a9da455ae7e8d43 Mon Sep 17 00:00:00 2001
+From afb4de1022909548147905e64811aeff915d6b3a Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 31 Jul 2017 01:54:40 -0500
 Subject: [PATCH] Ocelot despawns should honor nametags and leash
diff --git a/Spigot-Server-Patches/0204-Reset-spawner-timer-when-spawner-event-is-cancelled.patch b/Spigot-Server-Patches/0203-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
similarity index 95%
rename from Spigot-Server-Patches/0204-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
rename to Spigot-Server-Patches/0203-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
index fbca4658d..b55bb4631 100644
--- a/Spigot-Server-Patches/0204-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
+++ b/Spigot-Server-Patches/0203-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
@@ -1,4 +1,4 @@
-From f43818ecbd951f93007a6112564c338f7aa42db7 Mon Sep 17 00:00:00 2001
+From 820705561359a30a115356f6e750af261c6f770b 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/0205-Fix-MC-117075-TE-Unload-Lag-Spike.patch b/Spigot-Server-Patches/0204-Fix-MC-117075-TE-Unload-Lag-Spike.patch
similarity index 92%
rename from Spigot-Server-Patches/0205-Fix-MC-117075-TE-Unload-Lag-Spike.patch
rename to Spigot-Server-Patches/0204-Fix-MC-117075-TE-Unload-Lag-Spike.patch
index 24f1e4fe0..df248ec9a 100644
--- a/Spigot-Server-Patches/0205-Fix-MC-117075-TE-Unload-Lag-Spike.patch
+++ b/Spigot-Server-Patches/0204-Fix-MC-117075-TE-Unload-Lag-Spike.patch
@@ -1,11 +1,11 @@
-From 0cd3f392cf4ca45edc0cc757d7f69b97dd2207f0 Mon Sep 17 00:00:00 2001
+From b9797501f8ee9331f216cf6fd44327bcef579c94 Mon Sep 17 00:00:00 2001
 From: mezz <tehgeek@gmail.com>
 Date: Wed, 9 Aug 2017 17:51:22 -0500
 Subject: [PATCH] Fix MC-117075: TE Unload Lag Spike
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 6fe8ce96a..6d314a712 100644
+index 6fe8ce96aa..6d314a7124 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1286,7 +1286,11 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
diff --git a/Spigot-Server-Patches/0206-Allow-specifying-a-custom-authentication-servers-dow.patch b/Spigot-Server-Patches/0205-Allow-specifying-a-custom-authentication-servers-dow.patch
similarity index 96%
rename from Spigot-Server-Patches/0206-Allow-specifying-a-custom-authentication-servers-dow.patch
rename to Spigot-Server-Patches/0205-Allow-specifying-a-custom-authentication-servers-dow.patch
index 8204ff50c..0014dc5dd 100644
--- a/Spigot-Server-Patches/0206-Allow-specifying-a-custom-authentication-servers-dow.patch
+++ b/Spigot-Server-Patches/0205-Allow-specifying-a-custom-authentication-servers-dow.patch
@@ -1,4 +1,4 @@
-From 2b552c360f4a543cadc543d179f25a88f4ccd3e7 Mon Sep 17 00:00:00 2001
+From ba56e59de1c80d48ff61b963108ba3031091f2ec 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 329950802f..7a2c703022 100644
+index e97dbaf8e3..45863c017c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -1,5 +1,6 @@
diff --git a/Spigot-Server-Patches/0207-LivingEntity-setKiller.patch b/Spigot-Server-Patches/0206-LivingEntity-setKiller.patch
similarity index 92%
rename from Spigot-Server-Patches/0207-LivingEntity-setKiller.patch
rename to Spigot-Server-Patches/0206-LivingEntity-setKiller.patch
index 2d468a9c7..5888915e8 100644
--- a/Spigot-Server-Patches/0207-LivingEntity-setKiller.patch
+++ b/Spigot-Server-Patches/0206-LivingEntity-setKiller.patch
@@ -1,11 +1,11 @@
-From dbe597643719f35822ae46e6e32feb03333214b3 Mon Sep 17 00:00:00 2001
+From 499738f52c8435fa5f33492d0fd2b46f4048c14b Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 31 Jul 2017 01:49:48 -0500
 Subject: [PATCH] LivingEntity#setKiller
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index b25ce0c58f..71b9b45f10 100644
+index ac301d379b..49f515d868 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -253,6 +253,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/Spigot-Server-Patches/0208-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch b/Spigot-Server-Patches/0207-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
similarity index 96%
rename from Spigot-Server-Patches/0208-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
rename to Spigot-Server-Patches/0207-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
index 527e292b3..8de73ff84 100644
--- a/Spigot-Server-Patches/0208-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
+++ b/Spigot-Server-Patches/0207-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
@@ -1,4 +1,4 @@
-From bbc9db021b60dd6257e0efc1acb190c28f0a023c Mon Sep 17 00:00:00 2001
+From 4aac22aa465248aaabd4292bf6804bf8c88d60fe Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Mon, 18 Sep 2017 12:00:03 +0200
 Subject: [PATCH] Use Log4j IOStreams to redirect System.out/err to logger
diff --git a/Spigot-Server-Patches/0209-Handle-plugin-prefixes-using-Log4J-configuration.patch b/Spigot-Server-Patches/0208-Handle-plugin-prefixes-using-Log4J-configuration.patch
similarity index 97%
rename from Spigot-Server-Patches/0209-Handle-plugin-prefixes-using-Log4J-configuration.patch
rename to Spigot-Server-Patches/0208-Handle-plugin-prefixes-using-Log4J-configuration.patch
index 3942f1a3c..ebd5f761f 100644
--- a/Spigot-Server-Patches/0209-Handle-plugin-prefixes-using-Log4J-configuration.patch
+++ b/Spigot-Server-Patches/0208-Handle-plugin-prefixes-using-Log4J-configuration.patch
@@ -1,4 +1,4 @@
-From 0cb27d53aa22f145a8515ee04760f587a64dc4bf Mon Sep 17 00:00:00 2001
+From e1a7de8e88cc6bba3ddc27270d1bf6d592c24e2d 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
@@ -28,7 +28,7 @@ index a93ed45df9..bb32cb749d 100644
  
          <!-- Paper - Add additional Log4J dependencies -->
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index ffbb1e894a..7f3543970f 100644
+index ff85d45ab1..abf281c748 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -292,7 +292,7 @@ public class SpigotConfig
diff --git a/Spigot-Server-Patches/0210-Include-Log4J2-SLF4J-implementation.patch b/Spigot-Server-Patches/0209-Include-Log4J2-SLF4J-implementation.patch
similarity index 91%
rename from Spigot-Server-Patches/0210-Include-Log4J2-SLF4J-implementation.patch
rename to Spigot-Server-Patches/0209-Include-Log4J2-SLF4J-implementation.patch
index 86ca74b56..4e5098b4e 100644
--- a/Spigot-Server-Patches/0210-Include-Log4J2-SLF4J-implementation.patch
+++ b/Spigot-Server-Patches/0209-Include-Log4J2-SLF4J-implementation.patch
@@ -1,4 +1,4 @@
-From a56190cc108317d133af9fa00a0e7ed0ad0ae60e Mon Sep 17 00:00:00 2001
+From 866b60f01910710276920494602e62743f83436f Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Thu, 21 Sep 2017 16:33:35 +0200
 Subject: [PATCH] Include Log4J2 SLF4J implementation
diff --git a/Spigot-Server-Patches/0211-Disable-logger-prefix-for-various-plugins-bypassing-.patch b/Spigot-Server-Patches/0210-Disable-logger-prefix-for-various-plugins-bypassing-.patch
similarity index 97%
rename from Spigot-Server-Patches/0211-Disable-logger-prefix-for-various-plugins-bypassing-.patch
rename to Spigot-Server-Patches/0210-Disable-logger-prefix-for-various-plugins-bypassing-.patch
index f39b34a29..c5f1fb704 100644
--- a/Spigot-Server-Patches/0211-Disable-logger-prefix-for-various-plugins-bypassing-.patch
+++ b/Spigot-Server-Patches/0210-Disable-logger-prefix-for-various-plugins-bypassing-.patch
@@ -1,4 +1,4 @@
-From 302c4c748fcecce67136bb6784edec39bed38d40 Mon Sep 17 00:00:00 2001
+From 104d89a68c3610578d3840103d37171411077515 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Sat, 23 Sep 2017 21:07:20 +0200
 Subject: [PATCH] Disable logger prefix for various plugins bypassing the
diff --git a/Spigot-Server-Patches/0212-Add-PlayerJumpEvent.patch b/Spigot-Server-Patches/0211-Add-PlayerJumpEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0212-Add-PlayerJumpEvent.patch
rename to Spigot-Server-Patches/0211-Add-PlayerJumpEvent.patch
index 840a5ff83..1bcd2fe76 100644
--- a/Spigot-Server-Patches/0212-Add-PlayerJumpEvent.patch
+++ b/Spigot-Server-Patches/0211-Add-PlayerJumpEvent.patch
@@ -1,11 +1,11 @@
-From 79fc93dd4ff1dd0556c676f32dcd539d6e2104b1 Mon Sep 17 00:00:00 2001
+From 5b5bb14c14b7a713d52340838fc20760613a7026 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 28 Sep 2017 17:21:44 -0400
 Subject: [PATCH] Add PlayerJumpEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index b20cab58b1..1bfe9d0e7a 100644
+index d9f81e6348..8aad37b9be 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -1460,6 +1460,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -17,7 +17,7 @@ index b20cab58b1..1bfe9d0e7a 100644
          super.cH();
          this.a(StatisticList.JUMP);
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 932eeb19db..7465c548af 100644
+index d4701d8d56..c1dd2db89d 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -57,6 +57,8 @@ import org.bukkit.inventory.CraftingInventory;
diff --git a/Spigot-Server-Patches/0213-handle-PacketPlayInKeepAlive-async.patch b/Spigot-Server-Patches/0212-handle-PacketPlayInKeepAlive-async.patch
similarity index 97%
rename from Spigot-Server-Patches/0213-handle-PacketPlayInKeepAlive-async.patch
rename to Spigot-Server-Patches/0212-handle-PacketPlayInKeepAlive-async.patch
index 7d37c7131..eb994f026 100644
--- a/Spigot-Server-Patches/0213-handle-PacketPlayInKeepAlive-async.patch
+++ b/Spigot-Server-Patches/0212-handle-PacketPlayInKeepAlive-async.patch
@@ -1,4 +1,4 @@
-From ed81845dc311a451e16ea4cc3fa247dbb80c8f76 Mon Sep 17 00:00:00 2001
+From 402578e7374284a7fcf9e856ea73afde425701cd 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/0214-Expose-client-protocol-version-and-virtual-host.patch b/Spigot-Server-Patches/0213-Expose-client-protocol-version-and-virtual-host.patch
similarity index 95%
rename from Spigot-Server-Patches/0214-Expose-client-protocol-version-and-virtual-host.patch
rename to Spigot-Server-Patches/0213-Expose-client-protocol-version-and-virtual-host.patch
index a92484019..637ed787c 100644
--- a/Spigot-Server-Patches/0214-Expose-client-protocol-version-and-virtual-host.patch
+++ b/Spigot-Server-Patches/0213-Expose-client-protocol-version-and-virtual-host.patch
@@ -1,4 +1,4 @@
-From fb6ac0e9411cdb6ff2031c124f661943a29f6252 Mon Sep 17 00:00:00 2001
+From 4956bbfb58c4377b69d4290d5a17d5865671e254 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Tue, 10 Oct 2017 18:45:20 +0200
 Subject: [PATCH] Expose client protocol version and virtual host
@@ -6,7 +6,7 @@ Subject: [PATCH] Expose client protocol version and virtual host
 
 diff --git a/src/main/java/com/destroystokyo/paper/network/PaperNetworkClient.java b/src/main/java/com/destroystokyo/paper/network/PaperNetworkClient.java
 new file mode 100644
-index 000000000..5caca6439
+index 0000000000..5caca6439d
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/PaperNetworkClient.java
 @@ -0,0 +1,50 @@
@@ -61,7 +61,7 @@ index 000000000..5caca6439
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
-index 2d57bdf40..816210fb9 100644
+index 2d57bdf40e..816210fb91 100644
 --- a/src/main/java/net/minecraft/server/HandshakeListener.java
 +++ b/src/main/java/net/minecraft/server/HandshakeListener.java
 @@ -15,6 +15,7 @@ public class HandshakeListener implements PacketHandshakingInListener {
@@ -84,7 +84,7 @@ index 2d57bdf40..816210fb9 100644
  
      public void a(IChatBaseComponent ichatbasecomponent) {}
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 0afaea810..61f9eb3e6 100644
+index 0afaea8109..61f9eb3e64 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -63,6 +63,10 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -99,7 +99,7 @@ index 0afaea810..61f9eb3e6 100644
      public NetworkManager(EnumProtocolDirection enumprotocoldirection) {
          this.h = enumprotocoldirection;
 diff --git a/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java b/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java
-index 7acdac55e..f1a3be69d 100644
+index 7acdac55e5..f1a3be69d0 100644
 --- a/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java
 +++ b/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java
 @@ -33,6 +33,7 @@ public class PacketHandshakingInSetProtocol implements Packet<PacketHandshakingI
@@ -111,7 +111,7 @@ index 7acdac55e..f1a3be69d 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 bf7bfb427..b455d8e28 100644
+index bf7bfb427b..b455d8e287 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 {
diff --git a/Spigot-Server-Patches/0215-revert-serverside-behavior-of-keepalives.patch b/Spigot-Server-Patches/0214-revert-serverside-behavior-of-keepalives.patch
similarity index 98%
rename from Spigot-Server-Patches/0215-revert-serverside-behavior-of-keepalives.patch
rename to Spigot-Server-Patches/0214-revert-serverside-behavior-of-keepalives.patch
index 342b6b6b5..38bb0a084 100644
--- a/Spigot-Server-Patches/0215-revert-serverside-behavior-of-keepalives.patch
+++ b/Spigot-Server-Patches/0214-revert-serverside-behavior-of-keepalives.patch
@@ -1,4 +1,4 @@
-From 362e23402aaa442d707e2589f8541d39e4734a51 Mon Sep 17 00:00:00 2001
+From 23904660de3a66149fe2c666a2ae7d4c43634f65 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 15 Oct 2017 00:29:07 +0100
 Subject: [PATCH] revert serverside behavior of keepalives
diff --git a/Spigot-Server-Patches/0216-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch b/Spigot-Server-Patches/0215-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch
similarity index 95%
rename from Spigot-Server-Patches/0216-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch
rename to Spigot-Server-Patches/0215-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch
index 22538c69a..aaa1a36c7 100644
--- a/Spigot-Server-Patches/0216-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch
+++ b/Spigot-Server-Patches/0215-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch
@@ -1,4 +1,4 @@
-From b088e781bdb0c1f995db5e4865791f7aeb6c401e Mon Sep 17 00:00:00 2001
+From 4fa048db1658629e71132678cc4e754b3e55597e Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Fri, 20 Oct 2017 04:33:45 +0200
 Subject: [PATCH] Replace HashSet with fastutil's ObjectOpenHashSet in
diff --git a/Spigot-Server-Patches/0217-Send-attack-SoundEffects-only-to-players-who-can-see.patch b/Spigot-Server-Patches/0216-Send-attack-SoundEffects-only-to-players-who-can-see.patch
similarity index 97%
rename from Spigot-Server-Patches/0217-Send-attack-SoundEffects-only-to-players-who-can-see.patch
rename to Spigot-Server-Patches/0216-Send-attack-SoundEffects-only-to-players-who-can-see.patch
index 6d2f54010..1002e0040 100644
--- a/Spigot-Server-Patches/0217-Send-attack-SoundEffects-only-to-players-who-can-see.patch
+++ b/Spigot-Server-Patches/0216-Send-attack-SoundEffects-only-to-players-who-can-see.patch
@@ -1,4 +1,4 @@
-From 566d68adefbfda816777c8951e1974f8fe7feaf4 Mon Sep 17 00:00:00 2001
+From ac77e2ea99df9d12f958f288f46154ffb5655dbc Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Tue, 31 Oct 2017 03:26:18 +0100
 Subject: [PATCH] Send attack SoundEffects only to players who can see the
@@ -6,7 +6,7 @@ Subject: [PATCH] Send attack SoundEffects only to players who can see the
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 1bfe9d0e7..cd3e021a0 100644
+index 8aad37b9be..686c61133d 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -981,6 +981,15 @@ public abstract class EntityHuman extends EntityLiving {
@@ -72,7 +72,7 @@ index 1bfe9d0e7..cd3e021a0 100644
                              entity.extinguish();
                          }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 6d314a712..412300fbb 100644
+index 6d314a7124..412300fbb5 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -927,6 +927,12 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
diff --git a/Spigot-Server-Patches/0218-Option-for-maximum-exp-value-when-merging-orbs.patch b/Spigot-Server-Patches/0217-Option-for-maximum-exp-value-when-merging-orbs.patch
similarity index 96%
rename from Spigot-Server-Patches/0218-Option-for-maximum-exp-value-when-merging-orbs.patch
rename to Spigot-Server-Patches/0217-Option-for-maximum-exp-value-when-merging-orbs.patch
index 1d1cb2816..ade3776b3 100644
--- a/Spigot-Server-Patches/0218-Option-for-maximum-exp-value-when-merging-orbs.patch
+++ b/Spigot-Server-Patches/0217-Option-for-maximum-exp-value-when-merging-orbs.patch
@@ -1,4 +1,4 @@
-From 519a8bbe176159ac61beec2e7c5e11073bd42186 Mon Sep 17 00:00:00 2001
+From 4cb92bb43d9c51c89afbc109b2f465957e9c68a8 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
@@ -20,7 +20,7 @@ index 23cb3feef0..1c642e6364 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index ed21614e0b..5a7a2443c4 100644
+index 412300fbb5..f740328183 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1005,16 +1005,32 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
diff --git a/Spigot-Server-Patches/0219-Add-PlayerArmorChangeEvent.patch b/Spigot-Server-Patches/0218-Add-PlayerArmorChangeEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0219-Add-PlayerArmorChangeEvent.patch
rename to Spigot-Server-Patches/0218-Add-PlayerArmorChangeEvent.patch
index c792372d5..603fe5508 100644
--- a/Spigot-Server-Patches/0219-Add-PlayerArmorChangeEvent.patch
+++ b/Spigot-Server-Patches/0218-Add-PlayerArmorChangeEvent.patch
@@ -1,4 +1,4 @@
-From 88f384b7721b3f2139be42f8617ed1dd3177f5a2 Mon Sep 17 00:00:00 2001
+From 5143d41a1c355e2d6776b45b81c07f0b454d8a12 Mon Sep 17 00:00:00 2001
 From: pkt77 <parkerkt77@gmail.com>
 Date: Fri, 10 Nov 2017 23:46:34 -0500
 Subject: [PATCH] Add PlayerArmorChangeEvent
diff --git a/Spigot-Server-Patches/0220-Prevent-logins-from-being-processed-when-the-player-.patch b/Spigot-Server-Patches/0219-Prevent-logins-from-being-processed-when-the-player-.patch
similarity index 91%
rename from Spigot-Server-Patches/0220-Prevent-logins-from-being-processed-when-the-player-.patch
rename to Spigot-Server-Patches/0219-Prevent-logins-from-being-processed-when-the-player-.patch
index 883dc3b6b..11bb000c3 100644
--- a/Spigot-Server-Patches/0220-Prevent-logins-from-being-processed-when-the-player-.patch
+++ b/Spigot-Server-Patches/0219-Prevent-logins-from-being-processed-when-the-player-.patch
@@ -1,4 +1,4 @@
-From c456212ffebb223d42fc2f3c9faf162477427caf Mon Sep 17 00:00:00 2001
+From 06ac9de078e849e33432685b46fd5e2094f88d0f Mon Sep 17 00:00:00 2001
 From: killme <killme-git@ibts.me>
 Date: Sun, 12 Nov 2017 19:40:01 +0100
 Subject: [PATCH] Prevent logins from being processed when the player has
@@ -6,7 +6,7 @@ Subject: [PATCH] Prevent logins from being processed when the player has
 
 
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index 3464af6791..ae10cd89c1 100644
+index 6249b0e686..91cd6e0f61 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -57,7 +57,11 @@ public class LoginListener implements PacketLoginInListener, ITickable {
diff --git a/Spigot-Server-Patches/0221-use-CB-BlockState-implementations-for-captured-block.patch b/Spigot-Server-Patches/0220-use-CB-BlockState-implementations-for-captured-block.patch
similarity index 94%
rename from Spigot-Server-Patches/0221-use-CB-BlockState-implementations-for-captured-block.patch
rename to Spigot-Server-Patches/0220-use-CB-BlockState-implementations-for-captured-block.patch
index 1685eb4af..c4fd48fd4 100644
--- a/Spigot-Server-Patches/0221-use-CB-BlockState-implementations-for-captured-block.patch
+++ b/Spigot-Server-Patches/0220-use-CB-BlockState-implementations-for-captured-block.patch
@@ -1,4 +1,4 @@
-From 871572c7cb06159e032d17dcaf629252fd3ba907 Mon Sep 17 00:00:00 2001
+From 52436b3658cfae5889419adb6d1cd690c41bea8e Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Thu, 16 Nov 2017 12:12:41 +0000
 Subject: [PATCH] use CB BlockState implementations for captured blocks
@@ -18,7 +18,7 @@ the blockstate that will be valid for restoration, as opposed to dropping
 information on restoration when the event is cancelled.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 142b6cc033..642a504d4f 100644
+index f740328183..7cd07112a3 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -374,7 +374,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
diff --git a/Spigot-Server-Patches/0222-API-to-get-a-BlockState-without-a-snapshot.patch b/Spigot-Server-Patches/0221-API-to-get-a-BlockState-without-a-snapshot.patch
similarity index 98%
rename from Spigot-Server-Patches/0222-API-to-get-a-BlockState-without-a-snapshot.patch
rename to Spigot-Server-Patches/0221-API-to-get-a-BlockState-without-a-snapshot.patch
index 70deeed65..4257ea80e 100644
--- a/Spigot-Server-Patches/0222-API-to-get-a-BlockState-without-a-snapshot.patch
+++ b/Spigot-Server-Patches/0221-API-to-get-a-BlockState-without-a-snapshot.patch
@@ -1,4 +1,4 @@
-From 98c5390586b96cb1cd7ee97cc42abceed0d85e4e Mon Sep 17 00:00:00 2001
+From 237dda00e5b8bb9e5e81c021a7562fec179388a2 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
@@ -39,7 +39,7 @@ index 6021a3401f..536fd37254 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 c48b394d52..7ccfa93b94 100644
+index dfddbaf825..4aaf14e8ce 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 {
diff --git a/Spigot-Server-Patches/0223-AsyncTabCompleteEvent.patch b/Spigot-Server-Patches/0222-AsyncTabCompleteEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0223-AsyncTabCompleteEvent.patch
rename to Spigot-Server-Patches/0222-AsyncTabCompleteEvent.patch
index 0eca4f1e7..1145bfcc7 100644
--- a/Spigot-Server-Patches/0223-AsyncTabCompleteEvent.patch
+++ b/Spigot-Server-Patches/0222-AsyncTabCompleteEvent.patch
@@ -1,4 +1,4 @@
-From a521466350c33583f337ec4eb7ae52362b594861 Mon Sep 17 00:00:00 2001
+From f9962b92be43ed952bc249a3ad5e91998d4bf2b1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 26 Nov 2017 13:19:58 -0500
 Subject: [PATCH] AsyncTabCompleteEvent
@@ -14,7 +14,7 @@ completion, such as offline players.
 Also adds isCommand and getLocation to the sync TabCompleteEvent
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index bfaeaa7559..90ac83b5b1 100644
+index 60d9f5706a..a912fb3414 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -504,18 +504,60 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -85,7 +85,7 @@ index bfaeaa7559..90ac83b5b1 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 213eb3f4aa..ed8d0de9fa 100644
+index 7157a5b136..76679a4231 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1669,7 +1669,7 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0224-Avoid-NPE-in-PathfinderGoalTempt.patch b/Spigot-Server-Patches/0223-Avoid-NPE-in-PathfinderGoalTempt.patch
similarity index 93%
rename from Spigot-Server-Patches/0224-Avoid-NPE-in-PathfinderGoalTempt.patch
rename to Spigot-Server-Patches/0223-Avoid-NPE-in-PathfinderGoalTempt.patch
index 439c9cdcf..035f9f80c 100644
--- a/Spigot-Server-Patches/0224-Avoid-NPE-in-PathfinderGoalTempt.patch
+++ b/Spigot-Server-Patches/0223-Avoid-NPE-in-PathfinderGoalTempt.patch
@@ -1,4 +1,4 @@
-From a36a3ffd0d1048e5e1cc7e74f46ae7a1d54289f6 Mon Sep 17 00:00:00 2001
+From 8d6e94abf1d507f277f931627d3c89cff95577e5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 29 Nov 2017 22:18:54 -0500
 Subject: [PATCH] Avoid NPE in PathfinderGoalTempt
diff --git a/Spigot-Server-Patches/0225-PlayerPickupExperienceEvent.patch b/Spigot-Server-Patches/0224-PlayerPickupExperienceEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0225-PlayerPickupExperienceEvent.patch
rename to Spigot-Server-Patches/0224-PlayerPickupExperienceEvent.patch
index 19c4cc4dd..b7db37f01 100644
--- a/Spigot-Server-Patches/0225-PlayerPickupExperienceEvent.patch
+++ b/Spigot-Server-Patches/0224-PlayerPickupExperienceEvent.patch
@@ -1,4 +1,4 @@
-From 9849a550cb90b5d34fb6d2a4882175a8e055460a Mon Sep 17 00:00:00 2001
+From 0141073e6731a1a73a7ecce095cdc418e6c161ea Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 22:02:53 -0500
 Subject: [PATCH] PlayerPickupExperienceEvent
diff --git a/Spigot-Server-Patches/0226-ExperienceOrbMergeEvent.patch b/Spigot-Server-Patches/0225-ExperienceOrbMergeEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0226-ExperienceOrbMergeEvent.patch
rename to Spigot-Server-Patches/0225-ExperienceOrbMergeEvent.patch
index c2ac48451..a25cc70d0 100644
--- a/Spigot-Server-Patches/0226-ExperienceOrbMergeEvent.patch
+++ b/Spigot-Server-Patches/0225-ExperienceOrbMergeEvent.patch
@@ -1,4 +1,4 @@
-From 6a546a82b514bd47a5c58f2f211ff2730217d0c1 Mon Sep 17 00:00:00 2001
+From d9cc2b9aa6ff6b68198dc8948be78ef1ca309e1b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 22:57:26 -0500
 Subject: [PATCH] ExperienceOrbMergeEvent
@@ -8,7 +8,7 @@ Plugins can cancel this if they want to ensure experience orbs do not lose impor
 metadata such as spawn reason, or conditionally move data from source to target.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 4c42dad5f6..3569e209c2 100644
+index 7cd07112a3..852977cab3 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1015,7 +1015,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
diff --git a/Spigot-Server-Patches/0227-Ability-to-apply-mending-to-XP-API.patch b/Spigot-Server-Patches/0226-Ability-to-apply-mending-to-XP-API.patch
similarity index 95%
rename from Spigot-Server-Patches/0227-Ability-to-apply-mending-to-XP-API.patch
rename to Spigot-Server-Patches/0226-Ability-to-apply-mending-to-XP-API.patch
index dadb0d2d6..f19983487 100644
--- a/Spigot-Server-Patches/0227-Ability-to-apply-mending-to-XP-API.patch
+++ b/Spigot-Server-Patches/0226-Ability-to-apply-mending-to-XP-API.patch
@@ -1,4 +1,4 @@
-From b51beb63d9dc503e850b4615187aaa5bd7c549e2 Mon Sep 17 00:00:00 2001
+From 2d5fd7c000d0c8f28019f1bcfb5b0a675d57c821 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 20 Dec 2017 17:36:49 -0500
 Subject: [PATCH] Ability to apply mending to XP API
@@ -10,7 +10,7 @@ of giving the player experience points.
 Both an API To standalone mend, and apply mending logic to .giveExp has been added.
 
 diff --git a/src/main/java/net/minecraft/server/EnchantmentManager.java b/src/main/java/net/minecraft/server/EnchantmentManager.java
-index 3204d94c5..e4ed9e206 100644
+index 3204d94c54..e4ed9e2066 100644
 --- a/src/main/java/net/minecraft/server/EnchantmentManager.java
 +++ b/src/main/java/net/minecraft/server/EnchantmentManager.java
 @@ -245,6 +245,7 @@ public class EnchantmentManager {
@@ -22,7 +22,7 @@ index 3204d94c5..e4ed9e206 100644
          List list = enchantment.a(entityliving);
  
 diff --git a/src/main/java/net/minecraft/server/Enchantments.java b/src/main/java/net/minecraft/server/Enchantments.java
-index 0f4aad20f..3a5263fd9 100644
+index 0f4aad20fe..3a5263fd9f 100644
 --- a/src/main/java/net/minecraft/server/Enchantments.java
 +++ b/src/main/java/net/minecraft/server/Enchantments.java
 @@ -36,7 +36,7 @@ public class Enchantments {
@@ -35,7 +35,7 @@ index 0f4aad20f..3a5263fd9 100644
  
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index a87ef5fb8..b8bfc7577 100644
+index a87ef5fb8c..b8bfc75771 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -246,10 +246,12 @@ public class EntityExperienceOrb extends Entity {
@@ -52,7 +52,7 @@ index a87ef5fb8..b8bfc7577 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 b455d8e28..c7adfaad9 100644
+index b455d8e287..c7adfaad91 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1012,8 +1012,39 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0228-Configurable-Chunks-Sends-per-Tick-setting.patch b/Spigot-Server-Patches/0227-Configurable-Chunks-Sends-per-Tick-setting.patch
similarity index 92%
rename from Spigot-Server-Patches/0228-Configurable-Chunks-Sends-per-Tick-setting.patch
rename to Spigot-Server-Patches/0227-Configurable-Chunks-Sends-per-Tick-setting.patch
index 3ef3e3454..8a779c810 100644
--- a/Spigot-Server-Patches/0228-Configurable-Chunks-Sends-per-Tick-setting.patch
+++ b/Spigot-Server-Patches/0227-Configurable-Chunks-Sends-per-Tick-setting.patch
@@ -1,4 +1,4 @@
-From eb6289939059668071131cd9acee2ee6c026caf7 Mon Sep 17 00:00:00 2001
+From 9d046f9a244e2e04a90005fcee94495532ffb1c5 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
@@ -8,7 +8,7 @@ Vanilla already had this limited, make it configurable.
 Limit how much exploration lags the server
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 1c642e636..87c0feb25 100644
+index 1c642e6364..87c0feb25e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -368,4 +368,13 @@ public class PaperWorldConfig {
@@ -26,7 +26,7 @@ index 1c642e636..87c0feb25 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index bfe2d03a5..9fd07f859 100644
+index bfe2d03a57..9fd07f8596 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -172,7 +172,7 @@ public class PlayerChunkMap {
diff --git a/Spigot-Server-Patches/0229-Configurable-Max-Chunk-Gens-per-Tick.patch b/Spigot-Server-Patches/0228-Configurable-Max-Chunk-Gens-per-Tick.patch
similarity index 95%
rename from Spigot-Server-Patches/0229-Configurable-Max-Chunk-Gens-per-Tick.patch
rename to Spigot-Server-Patches/0228-Configurable-Max-Chunk-Gens-per-Tick.patch
index 13e780dbe..735371a40 100644
--- a/Spigot-Server-Patches/0229-Configurable-Max-Chunk-Gens-per-Tick.patch
+++ b/Spigot-Server-Patches/0228-Configurable-Max-Chunk-Gens-per-Tick.patch
@@ -1,4 +1,4 @@
-From 463a09fd84f4d456094bbaf1608897879de235ff Mon Sep 17 00:00:00 2001
+From 7214b3b26ab8afcff9c1211da9cbe380200bd705 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
@@ -13,7 +13,7 @@ This should result in no noticeable speed reduction in generation for servers no
 lagging, and let larger servers reduce this value according to their own desires.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 87c0feb25..f3ab146d3 100644
+index 87c0feb25e..f3ab146d3b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -377,4 +377,15 @@ public class PaperWorldConfig {
@@ -33,7 +33,7 @@ index 87c0feb25..f3ab146d3 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index 344b95233..fcd9f5491 100644
+index 344b95233f..fcd9f5491f 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
 @@ -28,6 +28,7 @@ public class PlayerChunk {
@@ -53,7 +53,7 @@ index 344b95233..fcd9f5491 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 9fd07f859..e29aaab2d 100644
+index 9fd07f8596..e29aaab2da 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -140,6 +140,7 @@ public class PlayerChunkMap {
@@ -77,7 +77,7 @@ index 9fd07f859..e29aaab2d 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 9aaca21a7..f50d55c8e 100644
+index 9aaca21a79..f50d55c8ee 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 {
@@ -92,7 +92,7 @@ index 9aaca21a7..f50d55c8e 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/AsynchronousExecutor.java b/src/main/java/org/bukkit/craftbukkit/util/AsynchronousExecutor.java
-index 193c3621c..cf1258c55 100644
+index 193c3621c6..cf1258c559 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/AsynchronousExecutor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/AsynchronousExecutor.java
 @@ -351,4 +351,10 @@ public final class AsynchronousExecutor<P, T, C, E extends Throwable> {
diff --git a/Spigot-Server-Patches/0230-Make-max-squid-spawn-height-configurable.patch b/Spigot-Server-Patches/0229-Make-max-squid-spawn-height-configurable.patch
similarity index 92%
rename from Spigot-Server-Patches/0230-Make-max-squid-spawn-height-configurable.patch
rename to Spigot-Server-Patches/0229-Make-max-squid-spawn-height-configurable.patch
index 4caf92718..1394d75fe 100644
--- a/Spigot-Server-Patches/0230-Make-max-squid-spawn-height-configurable.patch
+++ b/Spigot-Server-Patches/0229-Make-max-squid-spawn-height-configurable.patch
@@ -1,4 +1,4 @@
-From d28ac9662ec743cf08fb7978e1033b1ecf267d31 Mon Sep 17 00:00:00 2001
+From 842de20cbb7483504c2cea5400a2fa7cfcfd839b Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 11 Jan 2018 16:47:28 -0600
 Subject: [PATCH] Make max squid spawn height configurable
@@ -7,7 +7,7 @@ I don't know why upstream made only the minimum height configurable but
 whatever
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index f3ab146d3..128034dbb 100644
+index f3ab146d3b..128034dbb2 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -388,4 +388,9 @@ public class PaperWorldConfig {
@@ -21,7 +21,7 @@ index f3ab146d3..128034dbb 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java
-index 97de169de..3099f6aa7 100644
+index 97de169de2..3099f6aa7a 100644
 --- a/src/main/java/net/minecraft/server/EntitySquid.java
 +++ b/src/main/java/net/minecraft/server/EntitySquid.java
 @@ -167,7 +167,10 @@ public class EntitySquid extends EntityWaterAnimal {
diff --git a/Spigot-Server-Patches/0231-PreCreatureSpawnEvent.patch b/Spigot-Server-Patches/0230-PreCreatureSpawnEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0231-PreCreatureSpawnEvent.patch
rename to Spigot-Server-Patches/0230-PreCreatureSpawnEvent.patch
index 4407b5607..2ffdb96e1 100644
--- a/Spigot-Server-Patches/0231-PreCreatureSpawnEvent.patch
+++ b/Spigot-Server-Patches/0230-PreCreatureSpawnEvent.patch
@@ -1,4 +1,4 @@
-From 9a0a56e528db31e6d9a887b2b3ac7cb408fd8210 Mon Sep 17 00:00:00 2001
+From 99a4cccfb5bafd478e1aa01bfce9d15fc60045fb Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 14 Jan 2018 17:01:31 -0500
 Subject: [PATCH] PreCreatureSpawnEvent
diff --git a/Spigot-Server-Patches/0232-PlayerNaturallySpawnCreaturesEvent.patch b/Spigot-Server-Patches/0231-PlayerNaturallySpawnCreaturesEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0232-PlayerNaturallySpawnCreaturesEvent.patch
rename to Spigot-Server-Patches/0231-PlayerNaturallySpawnCreaturesEvent.patch
index 230d9dab5..43a9275c6 100644
--- a/Spigot-Server-Patches/0232-PlayerNaturallySpawnCreaturesEvent.patch
+++ b/Spigot-Server-Patches/0231-PlayerNaturallySpawnCreaturesEvent.patch
@@ -1,4 +1,4 @@
-From 7834dbeef5d2f49dbed7721ff35dd583e2b84356 Mon Sep 17 00:00:00 2001
+From ab7876c48f88df9f243aa3741e46267c3e56444a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 14 Jan 2018 17:36:02 -0500
 Subject: [PATCH] PlayerNaturallySpawnCreaturesEvent
diff --git a/Spigot-Server-Patches/0233-Add-SkullMeta.setPlayerProfile-API.patch b/Spigot-Server-Patches/0232-Add-SkullMeta.setPlayerProfile-API.patch
similarity index 94%
rename from Spigot-Server-Patches/0233-Add-SkullMeta.setPlayerProfile-API.patch
rename to Spigot-Server-Patches/0232-Add-SkullMeta.setPlayerProfile-API.patch
index 380faaba2..bbdb513c5 100644
--- a/Spigot-Server-Patches/0233-Add-SkullMeta.setPlayerProfile-API.patch
+++ b/Spigot-Server-Patches/0232-Add-SkullMeta.setPlayerProfile-API.patch
@@ -1,4 +1,4 @@
-From 5419d733dfcb2453954fa596166dd20e45ca00ef Mon Sep 17 00:00:00 2001
+From df8ebfaa4210ab08be4e6555bd8ebd08353a8a39 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 19 Jan 2018 00:36:25 -0500
 Subject: [PATCH] Add SkullMeta.setPlayerProfile API
@@ -7,7 +7,7 @@ This allows you to create already filled textures on Skulls to avoid texture loo
 which commonly cause rate limit issues with Mojang API
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
-index e9e2c1445..d894fadef 100644
+index 7984c68cb0..14d8dd65ac 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
 @@ -2,6 +2,8 @@ package org.bukkit.craftbukkit.inventory;
diff --git a/Spigot-Server-Patches/0234-Fill-Profile-Property-Events.patch b/Spigot-Server-Patches/0233-Fill-Profile-Property-Events.patch
similarity index 96%
rename from Spigot-Server-Patches/0234-Fill-Profile-Property-Events.patch
rename to Spigot-Server-Patches/0233-Fill-Profile-Property-Events.patch
index 7fe590d1a..fdbd31062 100644
--- a/Spigot-Server-Patches/0234-Fill-Profile-Property-Events.patch
+++ b/Spigot-Server-Patches/0233-Fill-Profile-Property-Events.patch
@@ -1,4 +1,4 @@
-From 58025f5c89a85bf0b61e258b8a7c49d485b44e06 Mon Sep 17 00:00:00 2001
+From eb99da9cb92561c3f666a1bf94f6a648aa2aa992 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 2 Jan 2018 00:31:26 -0500
 Subject: [PATCH] Fill Profile Property Events
diff --git a/Spigot-Server-Patches/0235-PlayerAdvancementCriterionGrantEvent.patch b/Spigot-Server-Patches/0234-PlayerAdvancementCriterionGrantEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0235-PlayerAdvancementCriterionGrantEvent.patch
rename to Spigot-Server-Patches/0234-PlayerAdvancementCriterionGrantEvent.patch
index e84202c87..5789e8218 100644
--- a/Spigot-Server-Patches/0235-PlayerAdvancementCriterionGrantEvent.patch
+++ b/Spigot-Server-Patches/0234-PlayerAdvancementCriterionGrantEvent.patch
@@ -1,4 +1,4 @@
-From 460396241443a00d258da20fd6e6717649361f94 Mon Sep 17 00:00:00 2001
+From 1540a3dc588cc6eea7741d4728abcd8b6f051e15 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 19 Jan 2018 08:15:29 -0600
 Subject: [PATCH] PlayerAdvancementCriterionGrantEvent
diff --git a/Spigot-Server-Patches/0236-Add-ArmorStand-Item-Meta.patch b/Spigot-Server-Patches/0235-Add-ArmorStand-Item-Meta.patch
similarity index 99%
rename from Spigot-Server-Patches/0236-Add-ArmorStand-Item-Meta.patch
rename to Spigot-Server-Patches/0235-Add-ArmorStand-Item-Meta.patch
index de610a61f..f4ca899da 100644
--- a/Spigot-Server-Patches/0236-Add-ArmorStand-Item-Meta.patch
+++ b/Spigot-Server-Patches/0235-Add-ArmorStand-Item-Meta.patch
@@ -1,4 +1,4 @@
-From fe0e0b94143faddc431dfd3c8b400605f0de0069 Mon Sep 17 00:00:00 2001
+From e70dede949dc8c684b7325092e8d1f3356469460 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 27 Jan 2018 17:04:14 -0500
 Subject: [PATCH] Add ArmorStand Item Meta
diff --git a/Spigot-Server-Patches/0237-Extend-Player-Interact-cancellation.patch b/Spigot-Server-Patches/0236-Extend-Player-Interact-cancellation.patch
similarity index 98%
rename from Spigot-Server-Patches/0237-Extend-Player-Interact-cancellation.patch
rename to Spigot-Server-Patches/0236-Extend-Player-Interact-cancellation.patch
index 18b7ce465..c432d3e74 100644
--- a/Spigot-Server-Patches/0237-Extend-Player-Interact-cancellation.patch
+++ b/Spigot-Server-Patches/0236-Extend-Player-Interact-cancellation.patch
@@ -1,4 +1,4 @@
-From 189ca2b6a44c55f33026500be2199f843abe2112 Mon Sep 17 00:00:00 2001
+From 861c3fa189510a3970d34c35bd7bf053a6be433e Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 11 Feb 2018 10:43:46 +0000
 Subject: [PATCH] Extend Player Interact cancellation
diff --git a/Spigot-Server-Patches/0238-Tameable-getOwnerUniqueId-API.patch b/Spigot-Server-Patches/0237-Tameable-getOwnerUniqueId-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0238-Tameable-getOwnerUniqueId-API.patch
rename to Spigot-Server-Patches/0237-Tameable-getOwnerUniqueId-API.patch
index 61c7072cf..0e84073f3 100644
--- a/Spigot-Server-Patches/0238-Tameable-getOwnerUniqueId-API.patch
+++ b/Spigot-Server-Patches/0237-Tameable-getOwnerUniqueId-API.patch
@@ -1,4 +1,4 @@
-From 4109edb37b1ec2944247d97c29d71195ac9ba911 Mon Sep 17 00:00:00 2001
+From 7e815733a7a41f10d0b3c836a3a30980d515fba8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 24 Feb 2018 01:14:55 -0500
 Subject: [PATCH] Tameable#getOwnerUniqueId API
diff --git a/Spigot-Server-Patches/0239-Toggleable-player-crits-helps-mitigate-hacked-client.patch b/Spigot-Server-Patches/0238-Toggleable-player-crits-helps-mitigate-hacked-client.patch
similarity index 92%
rename from Spigot-Server-Patches/0239-Toggleable-player-crits-helps-mitigate-hacked-client.patch
rename to Spigot-Server-Patches/0238-Toggleable-player-crits-helps-mitigate-hacked-client.patch
index 5df27bf6f..a09d399f0 100644
--- a/Spigot-Server-Patches/0239-Toggleable-player-crits-helps-mitigate-hacked-client.patch
+++ b/Spigot-Server-Patches/0238-Toggleable-player-crits-helps-mitigate-hacked-client.patch
@@ -1,11 +1,11 @@
-From 03bde12d5856ae2c86d660a0e14b4e3d272c82c3 Mon Sep 17 00:00:00 2001
+From 72bccb47d2ff01d38810adfb8698b5b03a303b11 Mon Sep 17 00:00:00 2001
 From: MiniDigger <admin@minidigger.me>
 Date: Sat, 10 Mar 2018 00:50:24 +0100
 Subject: [PATCH] Toggleable player crits, helps mitigate hacked clients.
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 128034dbb..2ce60eb05 100644
+index 128034dbb2..2ce60eb05d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -180,6 +180,11 @@ public class PaperWorldConfig {
@@ -21,7 +21,7 @@ index 128034dbb..2ce60eb05 100644
      private void allChunksAreSlimeChunks() {
          allChunksAreSlimeChunks = getBoolean("all-chunks-are-slime-chunks", false);
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index cd3e021a0..d04f9b380 100644
+index 686c61133d..bd25a00d82 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -1021,6 +1021,7 @@ public abstract class EntityHuman extends EntityLiving {
diff --git a/Spigot-Server-Patches/0240-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch b/Spigot-Server-Patches/0239-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
similarity index 95%
rename from Spigot-Server-Patches/0240-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
rename to Spigot-Server-Patches/0239-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
index 84dab040b..626e6d42d 100644
--- a/Spigot-Server-Patches/0240-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
+++ b/Spigot-Server-Patches/0239-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
@@ -1,4 +1,4 @@
-From 5db29b1d9b5e59cb0f75c5e2716ace221aae5989 Mon Sep 17 00:00:00 2001
+From dd5dd86e613a7935327b88a5700f202c941c4872 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 10 Mar 2018 13:03:49 +0000
 Subject: [PATCH] Fix NPE when getting location from InventoryEnderChest opened
diff --git a/Spigot-Server-Patches/0241-Prevent-Frosted-Ice-from-loading-holding-chunks.patch b/Spigot-Server-Patches/0240-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
similarity index 96%
rename from Spigot-Server-Patches/0241-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
rename to Spigot-Server-Patches/0240-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
index 8e7e29100..ae4336d3b 100644
--- a/Spigot-Server-Patches/0241-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
+++ b/Spigot-Server-Patches/0240-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
@@ -1,4 +1,4 @@
-From f3e8233ea031d161f9fb5a92a019cd34f4ac7081 Mon Sep 17 00:00:00 2001
+From dd92ca49c7d0e57a4962cda11cad24affab46e5b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 10 Mar 2018 16:33:15 -0500
 Subject: [PATCH] Prevent Frosted Ice from loading/holding chunks
diff --git a/Spigot-Server-Patches/0242-Disable-Explicit-Network-Manager-Flushing.patch b/Spigot-Server-Patches/0241-Disable-Explicit-Network-Manager-Flushing.patch
similarity index 96%
rename from Spigot-Server-Patches/0242-Disable-Explicit-Network-Manager-Flushing.patch
rename to Spigot-Server-Patches/0241-Disable-Explicit-Network-Manager-Flushing.patch
index b80039b3f..cbea1821c 100644
--- a/Spigot-Server-Patches/0242-Disable-Explicit-Network-Manager-Flushing.patch
+++ b/Spigot-Server-Patches/0241-Disable-Explicit-Network-Manager-Flushing.patch
@@ -1,4 +1,4 @@
-From 83268ebeef5e977ab9b5d81b7e1851cf10c4abb5 Mon Sep 17 00:00:00 2001
+From 1e1413f50f5a67afcf8a7a2d53f85af1b349aa32 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 11 Mar 2018 14:13:33 -0400
 Subject: [PATCH] Disable Explicit Network Manager Flushing
diff --git a/Spigot-Server-Patches/0243-Implement-extended-PaperServerListPingEvent.patch b/Spigot-Server-Patches/0242-Implement-extended-PaperServerListPingEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0243-Implement-extended-PaperServerListPingEvent.patch
rename to Spigot-Server-Patches/0242-Implement-extended-PaperServerListPingEvent.patch
index 8cf52e859..33dfe892e 100644
--- a/Spigot-Server-Patches/0243-Implement-extended-PaperServerListPingEvent.patch
+++ b/Spigot-Server-Patches/0242-Implement-extended-PaperServerListPingEvent.patch
@@ -1,4 +1,4 @@
-From ce7b02aacbd7529f9bffc562a9a24d7fb2a988c4 Mon Sep 17 00:00:00 2001
+From 4044f790f6d30ec1c2299647be9200cbe7d76758 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
@@ -177,7 +177,7 @@ index 0000000000..350410527b
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 8e72220f37..90b1871196 100644
+index a2e685acf7..d6b56d685e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -915,7 +915,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -251,7 +251,7 @@ index d7e1ecc031..f20cddc41c 100644
              this.c = agameprofile;
          }
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 7f3543970f..6cc48258dc 100644
+index abf281c748..4ac0ab9974 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -291,7 +291,7 @@ public class SpigotConfig
diff --git a/Spigot-Server-Patches/0244-Improved-Async-Task-Scheduler.patch b/Spigot-Server-Patches/0243-Improved-Async-Task-Scheduler.patch
similarity index 99%
rename from Spigot-Server-Patches/0244-Improved-Async-Task-Scheduler.patch
rename to Spigot-Server-Patches/0243-Improved-Async-Task-Scheduler.patch
index c0a7889f3..4b2472517 100644
--- a/Spigot-Server-Patches/0244-Improved-Async-Task-Scheduler.patch
+++ b/Spigot-Server-Patches/0243-Improved-Async-Task-Scheduler.patch
@@ -1,4 +1,4 @@
-From fde7de079c6f314161efb3c36c58ba96fb90e6b9 Mon Sep 17 00:00:00 2001
+From d58c36a41bbd9ae83d44e3e59a43e5cbf0cd8878 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 16 Mar 2018 22:59:43 -0400
 Subject: [PATCH] Improved Async Task Scheduler
diff --git a/Spigot-Server-Patches/0245-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/Spigot-Server-Patches/0244-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
similarity index 97%
rename from Spigot-Server-Patches/0245-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
rename to Spigot-Server-Patches/0244-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
index 36c2cf430..a6f01fb50 100644
--- a/Spigot-Server-Patches/0245-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
+++ b/Spigot-Server-Patches/0244-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
@@ -1,4 +1,4 @@
-From dbf5e0efaf13ef601966eafd9c58768f22b17f2d Mon Sep 17 00:00:00 2001
+From 9f47650e1c37410c3b7bf1effb399a5d1a2672d4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 18 Mar 2018 11:45:57 -0400
 Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent
diff --git a/Spigot-Server-Patches/0246-Call-PortalCreateEvent-for-exit-portals.patch b/Spigot-Server-Patches/0245-Call-PortalCreateEvent-for-exit-portals.patch
similarity index 98%
rename from Spigot-Server-Patches/0246-Call-PortalCreateEvent-for-exit-portals.patch
rename to Spigot-Server-Patches/0245-Call-PortalCreateEvent-for-exit-portals.patch
index 23620384e..73a49377e 100644
--- a/Spigot-Server-Patches/0246-Call-PortalCreateEvent-for-exit-portals.patch
+++ b/Spigot-Server-Patches/0245-Call-PortalCreateEvent-for-exit-portals.patch
@@ -1,11 +1,11 @@
-From aede0a63093907f88b869b485c595bf1c8cb1efe Mon Sep 17 00:00:00 2001
+From 53121b6463406e4fa83e4f49da16b28cf25f400a Mon Sep 17 00:00:00 2001
 From: MiniDigger <admin@minidigger.me>
 Date: Sun, 18 Mar 2018 15:44:44 +0100
 Subject: [PATCH] Call PortalCreateEvent for exit portals
 
 
 diff --git a/src/main/java/net/minecraft/server/PortalTravelAgent.java b/src/main/java/net/minecraft/server/PortalTravelAgent.java
-index 402d8d7d6..ba8d15431 100644
+index 402d8d7d63..7444f4621e 100644
 --- a/src/main/java/net/minecraft/server/PortalTravelAgent.java
 +++ b/src/main/java/net/minecraft/server/PortalTravelAgent.java
 @@ -48,6 +48,9 @@ public class PortalTravelAgent {
diff --git a/Spigot-Server-Patches/0247-Player.setPlayerProfile-API.patch b/Spigot-Server-Patches/0246-Player.setPlayerProfile-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0247-Player.setPlayerProfile-API.patch
rename to Spigot-Server-Patches/0246-Player.setPlayerProfile-API.patch
index 2432adf6b..59847d271 100644
--- a/Spigot-Server-Patches/0247-Player.setPlayerProfile-API.patch
+++ b/Spigot-Server-Patches/0246-Player.setPlayerProfile-API.patch
@@ -1,4 +1,4 @@
-From 53e2459fd0a219d8812e4dae1350f2b4dad066e2 Mon Sep 17 00:00:00 2001
+From 8095a0224d0740e6fcd2cee575bac1488d3aab67 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 d04f9b380..5015bd071 100644
+index bd25a00d82..55c45973e1 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 {
@@ -19,7 +19,7 @@ index d04f9b380..5015bd071 100644
      private final ItemCooldown ce;
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index f02b28059..bb33cf302 100644
+index f02b28059c..bb33cf3029 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -38,7 +38,7 @@ public class LoginListener implements PacketLoginInListener, ITickable {
@@ -48,7 +48,7 @@ index f02b28059..bb33cf302 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 c7adfaad9..349afa3f3 100644
+index c7adfaad91..349afa3f33 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 @@
diff --git a/Spigot-Server-Patches/0248-Fix-Dragon-Server-Crashes.patch b/Spigot-Server-Patches/0247-Fix-Dragon-Server-Crashes.patch
similarity index 95%
rename from Spigot-Server-Patches/0248-Fix-Dragon-Server-Crashes.patch
rename to Spigot-Server-Patches/0247-Fix-Dragon-Server-Crashes.patch
index 98efff037..66e383ad2 100644
--- a/Spigot-Server-Patches/0248-Fix-Dragon-Server-Crashes.patch
+++ b/Spigot-Server-Patches/0247-Fix-Dragon-Server-Crashes.patch
@@ -1,4 +1,4 @@
-From e2fb3d62635848c82a99efb75ad353a6c389a88b Mon Sep 17 00:00:00 2001
+From 93d93fef7d1bb9521cfdbf2d5dce725da68aaf36 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Mar 2018 20:52:07 -0400
 Subject: [PATCH] Fix Dragon Server Crashes
diff --git a/Spigot-Server-Patches/0249-getPlayerUniqueId-API.patch b/Spigot-Server-Patches/0248-getPlayerUniqueId-API.patch
similarity index 94%
rename from Spigot-Server-Patches/0249-getPlayerUniqueId-API.patch
rename to Spigot-Server-Patches/0248-getPlayerUniqueId-API.patch
index 78d0d0bb3..66956e581 100644
--- a/Spigot-Server-Patches/0249-getPlayerUniqueId-API.patch
+++ b/Spigot-Server-Patches/0248-getPlayerUniqueId-API.patch
@@ -1,4 +1,4 @@
-From bd5033a7e28d0ad24b413b011cfda0ad8d05ad2d Mon Sep 17 00:00:00 2001
+From e5c019b839c1557a9260b559d08d171689d6da04 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 ed8d0de9fa..6d23320e6c 100644
+index 76679a4231..8a58479f4d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1362,6 +1362,26 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0250-Make-player-data-saving-configurable.patch b/Spigot-Server-Patches/0249-Make-player-data-saving-configurable.patch
similarity index 93%
rename from Spigot-Server-Patches/0250-Make-player-data-saving-configurable.patch
rename to Spigot-Server-Patches/0249-Make-player-data-saving-configurable.patch
index 0b93612bb..1827e2b8c 100644
--- a/Spigot-Server-Patches/0250-Make-player-data-saving-configurable.patch
+++ b/Spigot-Server-Patches/0249-Make-player-data-saving-configurable.patch
@@ -1,11 +1,11 @@
-From 1a71c96aa9cb6788c37d8c728f6f264c51d6556f Mon Sep 17 00:00:00 2001
+From 7a7dd5a48e5b9da6221ea84661d82e459d8510b0 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 7a2c70302..03846919f 100644
+index 45863c017c..9bfbaf61e5 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -286,4 +286,13 @@ public class PaperConfig {
@@ -23,7 +23,7 @@ index 7a2c70302..03846919f 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java
-index a562e1e46..cbfdb3cf7 100644
+index a562e1e46c..cbfdb3cf79 100644
 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
 +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java
 @@ -144,6 +144,7 @@ public class WorldNBTStorage implements IDataManager, IPlayerFileData {
diff --git a/Spigot-Server-Patches/0251-Make-legacy-ping-handler-more-reliable.patch b/Spigot-Server-Patches/0250-Make-legacy-ping-handler-more-reliable.patch
similarity index 98%
rename from Spigot-Server-Patches/0251-Make-legacy-ping-handler-more-reliable.patch
rename to Spigot-Server-Patches/0250-Make-legacy-ping-handler-more-reliable.patch
index 71c17545d..2d380c8e7 100644
--- a/Spigot-Server-Patches/0251-Make-legacy-ping-handler-more-reliable.patch
+++ b/Spigot-Server-Patches/0250-Make-legacy-ping-handler-more-reliable.patch
@@ -1,4 +1,4 @@
-From 7ed9f30f128f27736c38ab140dca2ac2ff0d6889 Mon Sep 17 00:00:00 2001
+From 9c4cb9f0158e6b8a28e5984d91b57381824b38a1 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Wed, 11 Oct 2017 18:22:50 +0200
 Subject: [PATCH] Make legacy ping handler more reliable
diff --git a/Spigot-Server-Patches/0252-Call-PaperServerListPingEvent-for-legacy-pings.patch b/Spigot-Server-Patches/0251-Call-PaperServerListPingEvent-for-legacy-pings.patch
similarity index 99%
rename from Spigot-Server-Patches/0252-Call-PaperServerListPingEvent-for-legacy-pings.patch
rename to Spigot-Server-Patches/0251-Call-PaperServerListPingEvent-for-legacy-pings.patch
index 043c57b42..4b8e2ff3c 100644
--- a/Spigot-Server-Patches/0252-Call-PaperServerListPingEvent-for-legacy-pings.patch
+++ b/Spigot-Server-Patches/0251-Call-PaperServerListPingEvent-for-legacy-pings.patch
@@ -1,4 +1,4 @@
-From b63089a639307fd34b01ccb97374fb59873f6e79 Mon Sep 17 00:00:00 2001
+From 23918472ceeac090b7d1dc1cacc894ca722fc0a7 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Wed, 11 Oct 2017 19:30:51 +0200
 Subject: [PATCH] Call PaperServerListPingEvent for legacy pings
diff --git a/Spigot-Server-Patches/0253-Flag-to-disable-the-channel-limit.patch b/Spigot-Server-Patches/0252-Flag-to-disable-the-channel-limit.patch
similarity index 94%
rename from Spigot-Server-Patches/0253-Flag-to-disable-the-channel-limit.patch
rename to Spigot-Server-Patches/0252-Flag-to-disable-the-channel-limit.patch
index f090de4eb..8643adb5d 100644
--- a/Spigot-Server-Patches/0253-Flag-to-disable-the-channel-limit.patch
+++ b/Spigot-Server-Patches/0252-Flag-to-disable-the-channel-limit.patch
@@ -1,4 +1,4 @@
-From 342bd2aadfecf627049570637de1202ffea68053 Mon Sep 17 00:00:00 2001
+From 21cfeb957f9c4c40feb75b5a2b450dd103db5e0e 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 349afa3f3..b768327bb 100644
+index 349afa3f33..b768327bbb 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 {
diff --git a/Spigot-Server-Patches/0254-Add-method-to-open-already-placed-sign.patch b/Spigot-Server-Patches/0253-Add-method-to-open-already-placed-sign.patch
similarity index 95%
rename from Spigot-Server-Patches/0254-Add-method-to-open-already-placed-sign.patch
rename to Spigot-Server-Patches/0253-Add-method-to-open-already-placed-sign.patch
index 6632eaab7..7c7ca2a0f 100644
--- a/Spigot-Server-Patches/0254-Add-method-to-open-already-placed-sign.patch
+++ b/Spigot-Server-Patches/0253-Add-method-to-open-already-placed-sign.patch
@@ -1,4 +1,4 @@
-From d5e4178fb083c3010357aa2faa32dcf4cbb5e0d2 Mon Sep 17 00:00:00 2001
+From 75bf1009398fa01cc65fbebd7c42fcef5ca4c138 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Sun, 1 Apr 2018 02:29:37 +0300
 Subject: [PATCH] Add method to open already placed sign
diff --git a/Spigot-Server-Patches/0255-Load-version-history-at-server-start.patch b/Spigot-Server-Patches/0254-Load-version-history-at-server-start.patch
similarity index 93%
rename from Spigot-Server-Patches/0255-Load-version-history-at-server-start.patch
rename to Spigot-Server-Patches/0254-Load-version-history-at-server-start.patch
index 69f6affbf..119538c38 100644
--- a/Spigot-Server-Patches/0255-Load-version-history-at-server-start.patch
+++ b/Spigot-Server-Patches/0254-Load-version-history-at-server-start.patch
@@ -1,4 +1,4 @@
-From 5819bb6f428681e72e0a2c1b5f2521de4b8d3555 Mon Sep 17 00:00:00 2001
+From cd1c078948a4a287bee0d0e1d1beb7ea4d983eb1 Mon Sep 17 00:00:00 2001
 From: Kyle Wood <demonwav@gmail.com>
 Date: Thu, 1 Mar 2018 19:38:14 -0600
 Subject: [PATCH] Load version history at server start
diff --git a/Spigot-Server-Patches/0256-Configurable-sprint-interruption-on-attack.patch b/Spigot-Server-Patches/0255-Configurable-sprint-interruption-on-attack.patch
similarity index 92%
rename from Spigot-Server-Patches/0256-Configurable-sprint-interruption-on-attack.patch
rename to Spigot-Server-Patches/0255-Configurable-sprint-interruption-on-attack.patch
index 4299b1398..4b2359dfe 100644
--- a/Spigot-Server-Patches/0256-Configurable-sprint-interruption-on-attack.patch
+++ b/Spigot-Server-Patches/0255-Configurable-sprint-interruption-on-attack.patch
@@ -1,4 +1,4 @@
-From 2d83beeb89c8ab579c3069503d3a404cd87058c9 Mon Sep 17 00:00:00 2001
+From bf1f15f2a196b2a87d6e0c8601a472090be4fceb Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Sat, 14 Apr 2018 20:20:46 +0200
 Subject: [PATCH] Configurable sprint interruption on attack
@@ -6,7 +6,7 @@ Subject: [PATCH] Configurable sprint interruption on attack
 If the sprint interruption is disabled players continue sprinting when they attack entities.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 2ce60eb05..9daa8f66a 100644
+index 2ce60eb05d..9daa8f66a1 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -398,4 +398,9 @@ public class PaperWorldConfig {
@@ -20,7 +20,7 @@ index 2ce60eb05..9daa8f66a 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 5015bd071..738ac8570 100644
+index 55c45973e1..015cd553dd 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -1073,7 +1073,11 @@ public abstract class EntityHuman extends EntityLiving {
diff --git a/Spigot-Server-Patches/0257-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/Spigot-Server-Patches/0256-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
similarity index 92%
rename from Spigot-Server-Patches/0257-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
rename to Spigot-Server-Patches/0256-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
index 3091bc79b..7e39329aa 100644
--- a/Spigot-Server-Patches/0257-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
+++ b/Spigot-Server-Patches/0256-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
@@ -1,11 +1,11 @@
-From be2b54d1a53f9197e5864aaebfca7b9bd94b8c3d Mon Sep 17 00:00:00 2001
+From c3434440b096cce951c436d885782e49e87f9e92 Mon Sep 17 00:00:00 2001
 From: 0x22 <0x22@futureclient.net>
 Date: Thu, 26 Apr 2018 04:41:11 -0400
 Subject: [PATCH] Fix exploit that allowed colored signs to be created
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 90ac83b5b1..7bf99cae1b 100644
+index a912fb3414..ce8170ea9f 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2504,7 +2504,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
diff --git a/Spigot-Server-Patches/0258-EndermanEscapeEvent.patch b/Spigot-Server-Patches/0257-EndermanEscapeEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0258-EndermanEscapeEvent.patch
rename to Spigot-Server-Patches/0257-EndermanEscapeEvent.patch
index ee91bfa82..d7cf0e5d6 100644
--- a/Spigot-Server-Patches/0258-EndermanEscapeEvent.patch
+++ b/Spigot-Server-Patches/0257-EndermanEscapeEvent.patch
@@ -1,4 +1,4 @@
-From 521528b63eccb2a3d5a1e6fe68bb24cc2761b182 Mon Sep 17 00:00:00 2001
+From 412430f9e37c921e7aab7cc69a6785c87fa509b9 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 13:15:55 -0400
 Subject: [PATCH] EndermanEscapeEvent
diff --git a/Spigot-Server-Patches/0259-Enderman.teleportRandomly.patch b/Spigot-Server-Patches/0258-Enderman.teleportRandomly.patch
similarity index 96%
rename from Spigot-Server-Patches/0259-Enderman.teleportRandomly.patch
rename to Spigot-Server-Patches/0258-Enderman.teleportRandomly.patch
index 82c5d6c8b..251d7f352 100644
--- a/Spigot-Server-Patches/0259-Enderman.teleportRandomly.patch
+++ b/Spigot-Server-Patches/0258-Enderman.teleportRandomly.patch
@@ -1,4 +1,4 @@
-From bba39e03862eb5a4cc461cf03483e8947b833cbf Mon Sep 17 00:00:00 2001
+From 4e46fdb4d4dd7840a38112aae13fbb25c6170d9c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 13:29:44 -0400
 Subject: [PATCH] Enderman.teleportRandomly()
diff --git a/Spigot-Server-Patches/0260-Block-Enderpearl-Travel-Exploit.patch b/Spigot-Server-Patches/0259-Block-Enderpearl-Travel-Exploit.patch
similarity index 93%
rename from Spigot-Server-Patches/0260-Block-Enderpearl-Travel-Exploit.patch
rename to Spigot-Server-Patches/0259-Block-Enderpearl-Travel-Exploit.patch
index f965cc179..f9e830c11 100644
--- a/Spigot-Server-Patches/0260-Block-Enderpearl-Travel-Exploit.patch
+++ b/Spigot-Server-Patches/0259-Block-Enderpearl-Travel-Exploit.patch
@@ -1,4 +1,4 @@
-From 09e45ce6ab61d7e5c112db870bf4595d1b849fab Mon Sep 17 00:00:00 2001
+From a8c1bf72e67267ee2321ec81a276806b6ecab226 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 17:15:26 -0400
 Subject: [PATCH] Block Enderpearl Travel Exploit
@@ -12,7 +12,7 @@ This disables that by not saving the thrower when the chunk is unloaded.
 This is mainly useful for survival servers that do not allow freeform teleporting.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 9daa8f66a..3467da7c8 100644
+index 9daa8f66a1..3467da7c8e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -403,4 +403,10 @@ public class PaperWorldConfig {
@@ -27,7 +27,7 @@ index 9daa8f66a..3467da7c8 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java
-index fc8c0cab5..dd8af4be8 100644
+index fc8c0cab55..dd8af4be80 100644
 --- a/src/main/java/net/minecraft/server/EntityProjectile.java
 +++ b/src/main/java/net/minecraft/server/EntityProjectile.java
 @@ -242,6 +242,7 @@ public abstract class EntityProjectile extends Entity implements IProjectile {
diff --git a/Spigot-Server-Patches/0261-Expand-World.spawnParticle-API-and-add-Builder.patch b/Spigot-Server-Patches/0260-Expand-World.spawnParticle-API-and-add-Builder.patch
similarity index 98%
rename from Spigot-Server-Patches/0261-Expand-World.spawnParticle-API-and-add-Builder.patch
rename to Spigot-Server-Patches/0260-Expand-World.spawnParticle-API-and-add-Builder.patch
index 86d8eb5dd..fe50d7529 100644
--- a/Spigot-Server-Patches/0261-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/Spigot-Server-Patches/0260-Expand-World.spawnParticle-API-and-add-Builder.patch
@@ -1,4 +1,4 @@
-From cdf38ff5f4faa5cb5d280968ba11078321ea8c54 Mon Sep 17 00:00:00 2001
+From d15bc5a9b6f530852b89e1a8c53597c7652d8580 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/0262-EndermanAttackPlayerEvent.patch b/Spigot-Server-Patches/0261-EndermanAttackPlayerEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0262-EndermanAttackPlayerEvent.patch
rename to Spigot-Server-Patches/0261-EndermanAttackPlayerEvent.patch
index d8de3ee81..8435c9666 100644
--- a/Spigot-Server-Patches/0262-EndermanAttackPlayerEvent.patch
+++ b/Spigot-Server-Patches/0261-EndermanAttackPlayerEvent.patch
@@ -1,4 +1,4 @@
-From 9ee9f23739ae7fe7599a3eb8c43d4195a6a6735c Mon Sep 17 00:00:00 2001
+From a2696a78ce247412f99754292f111edd3c29aa28 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 1 May 2018 20:18:54 -0400
 Subject: [PATCH] EndermanAttackPlayerEvent
diff --git a/Spigot-Server-Patches/0263-WitchConsumePotionEvent.patch b/Spigot-Server-Patches/0262-WitchConsumePotionEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0263-WitchConsumePotionEvent.patch
rename to Spigot-Server-Patches/0262-WitchConsumePotionEvent.patch
index 4e6f87d5e..4819dbad8 100644
--- a/Spigot-Server-Patches/0263-WitchConsumePotionEvent.patch
+++ b/Spigot-Server-Patches/0262-WitchConsumePotionEvent.patch
@@ -1,4 +1,4 @@
-From a986b34be653bc35d35d30c824015d1b4b9bc71f Mon Sep 17 00:00:00 2001
+From cd75b8fd7c9934a2be702d44325832c739fa7247 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 16 May 2018 20:35:16 -0400
 Subject: [PATCH] WitchConsumePotionEvent
diff --git a/Spigot-Server-Patches/0264-WitchThrowPotionEvent.patch b/Spigot-Server-Patches/0263-WitchThrowPotionEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0264-WitchThrowPotionEvent.patch
rename to Spigot-Server-Patches/0263-WitchThrowPotionEvent.patch
index 7d56710ad..7e0419ca3 100644
--- a/Spigot-Server-Patches/0264-WitchThrowPotionEvent.patch
+++ b/Spigot-Server-Patches/0263-WitchThrowPotionEvent.patch
@@ -1,4 +1,4 @@
-From bd0fa8018b2603d1f15fb90546d9666e04f03450 Mon Sep 17 00:00:00 2001
+From bc07d9c6a79d5f349e261bd83b9af5d948fba703 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 16 May 2018 20:44:58 -0400
 Subject: [PATCH] WitchThrowPotionEvent
diff --git a/Spigot-Server-Patches/0265-Allow-spawning-Item-entities-with-World.spawnEntity.patch b/Spigot-Server-Patches/0264-Allow-spawning-Item-entities-with-World.spawnEntity.patch
similarity index 95%
rename from Spigot-Server-Patches/0265-Allow-spawning-Item-entities-with-World.spawnEntity.patch
rename to Spigot-Server-Patches/0264-Allow-spawning-Item-entities-with-World.spawnEntity.patch
index d8e690230..96bbcbf0c 100644
--- a/Spigot-Server-Patches/0265-Allow-spawning-Item-entities-with-World.spawnEntity.patch
+++ b/Spigot-Server-Patches/0264-Allow-spawning-Item-entities-with-World.spawnEntity.patch
@@ -1,4 +1,4 @@
-From a05cc2ae56fad0c73d3bd41977a09ef3ec6c4d1f Mon Sep 17 00:00:00 2001
+From 9ffde873101035886f75407eeea2eddbf74113ff 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/0266-Don-t-load-chunks-for-villager-door-checks.patch b/Spigot-Server-Patches/0265-Don-t-load-chunks-for-villager-door-checks.patch
similarity index 93%
rename from Spigot-Server-Patches/0266-Don-t-load-chunks-for-villager-door-checks.patch
rename to Spigot-Server-Patches/0265-Don-t-load-chunks-for-villager-door-checks.patch
index e929e750d..5d1c8c78a 100644
--- a/Spigot-Server-Patches/0266-Don-t-load-chunks-for-villager-door-checks.patch
+++ b/Spigot-Server-Patches/0265-Don-t-load-chunks-for-villager-door-checks.patch
@@ -1,4 +1,4 @@
-From 837badd75f18ba3bb4eaa964fb3476cfeaf22c90 Mon Sep 17 00:00:00 2001
+From 5e95a59523567260ef94f2ef996f48fc93992cab 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
diff --git a/Spigot-Server-Patches/0267-WitchReadyPotionEvent.patch b/Spigot-Server-Patches/0266-WitchReadyPotionEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0267-WitchReadyPotionEvent.patch
rename to Spigot-Server-Patches/0266-WitchReadyPotionEvent.patch
index 2a9e321bb..0a31c62c6 100644
--- a/Spigot-Server-Patches/0267-WitchReadyPotionEvent.patch
+++ b/Spigot-Server-Patches/0266-WitchReadyPotionEvent.patch
@@ -1,4 +1,4 @@
-From 2fbd924ddeb8078f8241b35933e14e35a220767d Mon Sep 17 00:00:00 2001
+From 3dd0c3878333c899a63bd3067484ea28f6ef84f4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Jun 2018 22:47:26 -0400
 Subject: [PATCH] WitchReadyPotionEvent
diff --git a/Spigot-Server-Patches/0268-ItemStack-getMaxItemUseDuration.patch b/Spigot-Server-Patches/0267-ItemStack-getMaxItemUseDuration.patch
similarity index 93%
rename from Spigot-Server-Patches/0268-ItemStack-getMaxItemUseDuration.patch
rename to Spigot-Server-Patches/0267-ItemStack-getMaxItemUseDuration.patch
index 492e51ddc..85f9b3741 100644
--- a/Spigot-Server-Patches/0268-ItemStack-getMaxItemUseDuration.patch
+++ b/Spigot-Server-Patches/0267-ItemStack-getMaxItemUseDuration.patch
@@ -1,4 +1,4 @@
-From 72c1b0bb47630ecb83b57985995078b808c6cbd3 Mon Sep 17 00:00:00 2001
+From c26f3de491029cd013ce5d6c7d9c9733375fa0ba 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 4f230975aa..e52014fd8f 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 aad380c3b7..5f3331de13 100644
+index 83f89a2365..8ca161f0ed 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 {
diff --git a/Spigot-Server-Patches/0269-Implement-EntityTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/0268-Implement-EntityTeleportEndGatewayEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0269-Implement-EntityTeleportEndGatewayEvent.patch
rename to Spigot-Server-Patches/0268-Implement-EntityTeleportEndGatewayEvent.patch
index db9f94e07..74eff699b 100644
--- a/Spigot-Server-Patches/0269-Implement-EntityTeleportEndGatewayEvent.patch
+++ b/Spigot-Server-Patches/0268-Implement-EntityTeleportEndGatewayEvent.patch
@@ -1,4 +1,4 @@
-From d75aa9bc0f292cc70f7fd674acda2e705ca169cf Mon Sep 17 00:00:00 2001
+From e6d906a6fbe688cc6883541abd473760ebf460ec Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 9 Jun 2018 14:08:39 +0200
 Subject: [PATCH] Implement EntityTeleportEndGatewayEvent
diff --git a/Spigot-Server-Patches/0270-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/Spigot-Server-Patches/0269-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
similarity index 95%
rename from Spigot-Server-Patches/0270-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
rename to Spigot-Server-Patches/0269-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
index 400735e51..9878c57fb 100644
--- a/Spigot-Server-Patches/0270-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
+++ b/Spigot-Server-Patches/0269-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
@@ -1,4 +1,4 @@
-From d1bada03a8ddbe7c0ca4054c6c8fc5e4342935c5 Mon Sep 17 00:00:00 2001
+From 3141bee0865858ff4f1214a2c78d7347a8cfb255 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 10 Jun 2018 01:18:49 -0400
 Subject: [PATCH] Unset Ignited flag on cancel of Explosion Event
diff --git a/Spigot-Server-Patches/0271-Properly-remove-entities-on-dimension-teleport.patch b/Spigot-Server-Patches/0270-Properly-remove-entities-on-dimension-teleport.patch
similarity index 94%
rename from Spigot-Server-Patches/0271-Properly-remove-entities-on-dimension-teleport.patch
rename to Spigot-Server-Patches/0270-Properly-remove-entities-on-dimension-teleport.patch
index b59407cf8..8d0e6696f 100644
--- a/Spigot-Server-Patches/0271-Properly-remove-entities-on-dimension-teleport.patch
+++ b/Spigot-Server-Patches/0270-Properly-remove-entities-on-dimension-teleport.patch
@@ -1,4 +1,4 @@
-From b21ff381ce087be18a69f1285ac39e6a5bf3a8b6 Mon Sep 17 00:00:00 2001
+From 33aa68e9488c4bc9998080f9d743ace73fcb472a 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
@@ -22,7 +22,7 @@ requirement, but plugins (such as my own) use this method to
 trigger a "reload" of the entity on the client.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index aba517a71..20c2bf16b 100644
+index aba517a710..20c2bf16be 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2596,7 +2596,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -35,7 +35,7 @@ index aba517a71..20c2bf16b 100644
              this.world.methodProfiler.a("reposition");
              /* CraftBukkit start - Handled in calculateTarget
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index d506503e9..697296acd 100644
+index d506503e93..697296acd0 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1025,6 +1025,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -47,5 +47,5 @@ index d506503e9..697296acd 100644
          this.entitiesById.d(entity.getId());
          this.entitiesByUUID.remove(entity.getUniqueID());
 -- 
-2.17.1
+2.18.0
 
diff --git a/Spigot-Server-Patches/0272-Fix-CraftEntity-hashCode.patch b/Spigot-Server-Patches/0271-Fix-CraftEntity-hashCode.patch
similarity index 96%
rename from Spigot-Server-Patches/0272-Fix-CraftEntity-hashCode.patch
rename to Spigot-Server-Patches/0271-Fix-CraftEntity-hashCode.patch
index 23b52c8f4..a0130f384 100644
--- a/Spigot-Server-Patches/0272-Fix-CraftEntity-hashCode.patch
+++ b/Spigot-Server-Patches/0271-Fix-CraftEntity-hashCode.patch
@@ -1,4 +1,4 @@
-From fd9f7d8ba57935af3e3126cc41e5910ac3bd9f7f Mon Sep 17 00:00:00 2001
+From b4761b06b68b93e1e714d4edeb6b9af9061fa285 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 10 Jun 2018 20:20:15 -0400
 Subject: [PATCH] Fix CraftEntity hashCode
diff --git a/Spigot-Server-Patches/0273-Configurable-Alternative-LootPool-Luck-Formula.patch b/Spigot-Server-Patches/0272-Configurable-Alternative-LootPool-Luck-Formula.patch
similarity index 97%
rename from Spigot-Server-Patches/0273-Configurable-Alternative-LootPool-Luck-Formula.patch
rename to Spigot-Server-Patches/0272-Configurable-Alternative-LootPool-Luck-Formula.patch
index d35394c79..4c554ec10 100644
--- a/Spigot-Server-Patches/0273-Configurable-Alternative-LootPool-Luck-Formula.patch
+++ b/Spigot-Server-Patches/0272-Configurable-Alternative-LootPool-Luck-Formula.patch
@@ -1,4 +1,4 @@
-From 2c64129f6d08bbf3d89edebe4c9c5c0ae61849b3 Mon Sep 17 00:00:00 2001
+From 5d0719fe7bd51917d60360673ff1a2019635b87b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 15 Jun 2018 00:30:32 -0400
 Subject: [PATCH] Configurable Alternative LootPool Luck Formula
@@ -36,7 +36,7 @@ This change will result in some major changes to fishing formulas.
 I would love to see this change in Vanilla, so Mojang please pull :)
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 03846919f..5a17ce3d2 100644
+index 9bfbaf61e5..bcdf4f91d8 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -295,4 +295,12 @@ public class PaperConfig {
@@ -53,7 +53,7 @@ index 03846919f..5a17ce3d2 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/LotoSelectorEntry.java b/src/main/java/net/minecraft/server/LotoSelectorEntry.java
-index add618866..9f8e17b9d 100644
+index add618866b..9f8e17b9d3 100644
 --- a/src/main/java/net/minecraft/server/LotoSelectorEntry.java
 +++ b/src/main/java/net/minecraft/server/LotoSelectorEntry.java
 @@ -14,8 +14,8 @@ import java.util.Random;
diff --git a/Spigot-Server-Patches/0274-Print-Error-details-when-failing-to-save-player-data.patch b/Spigot-Server-Patches/0273-Print-Error-details-when-failing-to-save-player-data.patch
similarity index 93%
rename from Spigot-Server-Patches/0274-Print-Error-details-when-failing-to-save-player-data.patch
rename to Spigot-Server-Patches/0273-Print-Error-details-when-failing-to-save-player-data.patch
index 4690cc3a9..1c067f741 100644
--- a/Spigot-Server-Patches/0274-Print-Error-details-when-failing-to-save-player-data.patch
+++ b/Spigot-Server-Patches/0273-Print-Error-details-when-failing-to-save-player-data.patch
@@ -1,4 +1,4 @@
-From 3b1a296bedbe1651e82c0c07801a4d6da256ba4e Mon Sep 17 00:00:00 2001
+From c6bba334512bd4940f97b853d693527b9ea18e26 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 15 Jun 2018 20:37:03 -0400
 Subject: [PATCH] Print Error details when failing to save player data
diff --git a/Spigot-Server-Patches/0275-Make-shield-blocking-delay-configurable.patch b/Spigot-Server-Patches/0274-Make-shield-blocking-delay-configurable.patch
similarity index 97%
rename from Spigot-Server-Patches/0275-Make-shield-blocking-delay-configurable.patch
rename to Spigot-Server-Patches/0274-Make-shield-blocking-delay-configurable.patch
index 820ab9538..19d74d93c 100644
--- a/Spigot-Server-Patches/0275-Make-shield-blocking-delay-configurable.patch
+++ b/Spigot-Server-Patches/0274-Make-shield-blocking-delay-configurable.patch
@@ -1,4 +1,4 @@
-From 2da4e5b07c352a019dd586f2b22afc864412c9b0 Mon Sep 17 00:00:00 2001
+From 87d2f3be5e69f57374b963a58765bb9e923f5619 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/0276-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch b/Spigot-Server-Patches/0275-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
similarity index 96%
rename from Spigot-Server-Patches/0276-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
rename to Spigot-Server-Patches/0275-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
index 28812d69b..97c70c484 100644
--- a/Spigot-Server-Patches/0276-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
+++ b/Spigot-Server-Patches/0275-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
@@ -1,4 +1,4 @@
-From 50eb40a8a5203c8aa84d94d24148d7c4acf3c16c Mon Sep 17 00:00:00 2001
+From b38aa03f85f1c5e8c3f47b269fd8b7d59c71c6c0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 16 Jun 2018 16:23:38 -0400
 Subject: [PATCH] Ignore Missing Recipes in RecipeBook to avoid data errors
diff --git a/Spigot-Server-Patches/0277-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch b/Spigot-Server-Patches/0276-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
similarity index 98%
rename from Spigot-Server-Patches/0277-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
rename to Spigot-Server-Patches/0276-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
index 76878be90..494f8cd6e 100644
--- a/Spigot-Server-Patches/0277-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
+++ b/Spigot-Server-Patches/0276-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
@@ -1,4 +1,4 @@
-From c40eeffb614580d924ea6b00a3e3d05e614365ed Mon Sep 17 00:00:00 2001
+From d40788608fa5891d426c26bfc4b4e92832501108 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 15 Jun 2013 19:51:17 -0400
 Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API
diff --git a/Spigot-Server-Patches/0278-PlayerReadyArrowEvent.patch b/Spigot-Server-Patches/0277-PlayerReadyArrowEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0278-PlayerReadyArrowEvent.patch
rename to Spigot-Server-Patches/0277-PlayerReadyArrowEvent.patch
index f99990ee8..d06cb938a 100644
--- a/Spigot-Server-Patches/0278-PlayerReadyArrowEvent.patch
+++ b/Spigot-Server-Patches/0277-PlayerReadyArrowEvent.patch
@@ -1,4 +1,4 @@
-From 637bff64eeaaf0fc7af097f126863f0b81da9240 Mon Sep 17 00:00:00 2001
+From 73d7eb479aefb2c9551ac611ddacd39482407cec Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 18 Jun 2018 01:12:53 -0400
 Subject: [PATCH] PlayerReadyArrowEvent
diff --git a/Spigot-Server-Patches/0279-Fire-EntityShootBowEvent-for-Illusioner.patch b/Spigot-Server-Patches/0278-Fire-EntityShootBowEvent-for-Illusioner.patch
similarity index 95%
rename from Spigot-Server-Patches/0279-Fire-EntityShootBowEvent-for-Illusioner.patch
rename to Spigot-Server-Patches/0278-Fire-EntityShootBowEvent-for-Illusioner.patch
index 35ddbe5f8..5fc30dbd3 100644
--- a/Spigot-Server-Patches/0279-Fire-EntityShootBowEvent-for-Illusioner.patch
+++ b/Spigot-Server-Patches/0278-Fire-EntityShootBowEvent-for-Illusioner.patch
@@ -1,4 +1,4 @@
-From ba6a4bd84e793af70eef53160e5308825978314b Mon Sep 17 00:00:00 2001
+From e30165f6d7809de56e2df7da8df73cc945590395 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 18 Jun 2018 22:19:36 -0400
 Subject: [PATCH] Fire EntityShootBowEvent for Illusioner
diff --git a/Spigot-Server-Patches/0280-Implement-EntityKnockbackByEntityEvent.patch b/Spigot-Server-Patches/0279-Implement-EntityKnockbackByEntityEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0280-Implement-EntityKnockbackByEntityEvent.patch
rename to Spigot-Server-Patches/0279-Implement-EntityKnockbackByEntityEvent.patch
index 5e37a1fb7..3ce1d5218 100644
--- a/Spigot-Server-Patches/0280-Implement-EntityKnockbackByEntityEvent.patch
+++ b/Spigot-Server-Patches/0279-Implement-EntityKnockbackByEntityEvent.patch
@@ -1,4 +1,4 @@
-From 5cf01d5f61e156c14d59c12c89759e46edee5e3f Mon Sep 17 00:00:00 2001
+From 87ab4349feac20b74c3fd1f299dc4e982ae4127d Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Mon, 18 Jun 2018 15:46:23 +0200
 Subject: [PATCH] Implement EntityKnockbackByEntityEvent
diff --git a/Spigot-Server-Patches/0281-Expand-Explosions-API.patch b/Spigot-Server-Patches/0280-Expand-Explosions-API.patch
similarity index 95%
rename from Spigot-Server-Patches/0281-Expand-Explosions-API.patch
rename to Spigot-Server-Patches/0280-Expand-Explosions-API.patch
index 072de8c39..4c77feb91 100644
--- a/Spigot-Server-Patches/0281-Expand-Explosions-API.patch
+++ b/Spigot-Server-Patches/0280-Expand-Explosions-API.patch
@@ -1,4 +1,4 @@
-From 067f19f3dc53dc4a36ac8914fe3a868f3baf5542 Mon Sep 17 00:00:00 2001
+From de69a0ffb252b3635df0fbf16115a725311215d3 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/0282-LivingEntity-Hand-Raised-Item-Use-API.patch b/Spigot-Server-Patches/0281-LivingEntity-Hand-Raised-Item-Use-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0282-LivingEntity-Hand-Raised-Item-Use-API.patch
rename to Spigot-Server-Patches/0281-LivingEntity-Hand-Raised-Item-Use-API.patch
index a4762d764..7c9fb0950 100644
--- a/Spigot-Server-Patches/0282-LivingEntity-Hand-Raised-Item-Use-API.patch
+++ b/Spigot-Server-Patches/0281-LivingEntity-Hand-Raised-Item-Use-API.patch
@@ -1,4 +1,4 @@
-From 723172f97310e253f316640feddddbd5a325e8ff Mon Sep 17 00:00:00 2001
+From 1053725441b357e85f66472abe1b61358e7fe550 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 29 Jun 2018 00:21:28 -0400
 Subject: [PATCH] LivingEntity Hand Raised/Item Use API
diff --git a/Spigot-Server-Patches/0283-RangedEntity-API.patch b/Spigot-Server-Patches/0282-RangedEntity-API.patch
similarity index 99%
rename from Spigot-Server-Patches/0283-RangedEntity-API.patch
rename to Spigot-Server-Patches/0282-RangedEntity-API.patch
index 1cc516ee4..b0138f271 100644
--- a/Spigot-Server-Patches/0283-RangedEntity-API.patch
+++ b/Spigot-Server-Patches/0282-RangedEntity-API.patch
@@ -1,4 +1,4 @@
-From 57df4b5405ec6348656973b78db6d86cadb57dc0 Mon Sep 17 00:00:00 2001
+From 86799475254c4eb7a87e6877465d93d7a88d72e0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 26 Jun 2018 22:00:49 -0400
 Subject: [PATCH] RangedEntity API
diff --git a/Spigot-Server-Patches/0284-Add-SentientNPC-Interface-to-Entities.patch b/Spigot-Server-Patches/0283-Add-SentientNPC-Interface-to-Entities.patch
similarity index 99%
rename from Spigot-Server-Patches/0284-Add-SentientNPC-Interface-to-Entities.patch
rename to Spigot-Server-Patches/0283-Add-SentientNPC-Interface-to-Entities.patch
index 694b37369..41c750080 100644
--- a/Spigot-Server-Patches/0284-Add-SentientNPC-Interface-to-Entities.patch
+++ b/Spigot-Server-Patches/0283-Add-SentientNPC-Interface-to-Entities.patch
@@ -1,4 +1,4 @@
-From 30f3ac826503f83cca607b290996357ebd24e6a1 Mon Sep 17 00:00:00 2001
+From 08a589cb3acd47ab831c3c1e1236821f94b86de0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 1 Jul 2018 22:06:29 -0400
 Subject: [PATCH] Add SentientNPC Interface to Entities
diff --git a/Spigot-Server-Patches/0285-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch b/Spigot-Server-Patches/0284-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch
similarity index 95%
rename from Spigot-Server-Patches/0285-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch
rename to Spigot-Server-Patches/0284-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch
index 3a050e078..fc43efe20 100644
--- a/Spigot-Server-Patches/0285-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch
+++ b/Spigot-Server-Patches/0284-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch
@@ -1,4 +1,4 @@
-From 808e9e3d527ba62ca052f7d2cfb327c189c39137 Mon Sep 17 00:00:00 2001
+From 4be68b5417b29394d592ed9f100bddcf5e72277d Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Sat, 30 Jun 2018 05:45:39 +0200
 Subject: [PATCH] Improve ProjectileHitEvent to include the BlockFace where the
diff --git a/Spigot-Server-Patches/0286-Add-config-to-disable-ender-dragon-legacy-check.patch b/Spigot-Server-Patches/0285-Add-config-to-disable-ender-dragon-legacy-check.patch
similarity index 94%
rename from Spigot-Server-Patches/0286-Add-config-to-disable-ender-dragon-legacy-check.patch
rename to Spigot-Server-Patches/0285-Add-config-to-disable-ender-dragon-legacy-check.patch
index 2b3610285..e72e5e146 100644
--- a/Spigot-Server-Patches/0286-Add-config-to-disable-ender-dragon-legacy-check.patch
+++ b/Spigot-Server-Patches/0285-Add-config-to-disable-ender-dragon-legacy-check.patch
@@ -1,11 +1,11 @@
-From 15430aff83e4e6c4898c73d44039ce3e8ef05064 Mon Sep 17 00:00:00 2001
+From 4ff1afe950dede0cd610bf97923f15bbcd7afd44 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 22 Jun 2018 10:38:31 -0500
 Subject: [PATCH] Add config to disable ender dragon legacy check
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index ddb5ced79..270138804 100644
+index ddb5ced79d..2701388043 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -414,4 +414,9 @@ public class PaperWorldConfig {
@@ -19,7 +19,7 @@ index ddb5ced79..270138804 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EnderDragonBattle.java b/src/main/java/net/minecraft/server/EnderDragonBattle.java
-index a20d54ee3..48bcda0f5 100644
+index a20d54ee34..48bcda0f50 100644
 --- a/src/main/java/net/minecraft/server/EnderDragonBattle.java
 +++ b/src/main/java/net/minecraft/server/EnderDragonBattle.java
 @@ -29,9 +29,12 @@ public class EnderDragonBattle {
diff --git a/Spigot-Server-Patches/0287-Implement-World.getEntity-UUID-API.patch b/Spigot-Server-Patches/0286-Implement-World.getEntity-UUID-API.patch
similarity index 93%
rename from Spigot-Server-Patches/0287-Implement-World.getEntity-UUID-API.patch
rename to Spigot-Server-Patches/0286-Implement-World.getEntity-UUID-API.patch
index ffcab3a02..62f91c1f0 100644
--- a/Spigot-Server-Patches/0287-Implement-World.getEntity-UUID-API.patch
+++ b/Spigot-Server-Patches/0286-Implement-World.getEntity-UUID-API.patch
@@ -1,4 +1,4 @@
-From d5f1f0035b77ba250cb2f94108088f729b0ba670 Mon Sep 17 00:00:00 2001
+From 5e80c475af8206d99c10f11d62f64e30f2ffb94f 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/0288-InventoryCloseEvent-Reason-API.patch b/Spigot-Server-Patches/0287-InventoryCloseEvent-Reason-API.patch
similarity index 99%
rename from Spigot-Server-Patches/0288-InventoryCloseEvent-Reason-API.patch
rename to Spigot-Server-Patches/0287-InventoryCloseEvent-Reason-API.patch
index 18b42880f..1a7d322c0 100644
--- a/Spigot-Server-Patches/0288-InventoryCloseEvent-Reason-API.patch
+++ b/Spigot-Server-Patches/0287-InventoryCloseEvent-Reason-API.patch
@@ -1,4 +1,4 @@
-From 774190c57320a6ef813fa2b05cb4a728f8ff7a2f Mon Sep 17 00:00:00 2001
+From 5d76dfe88bc7b828b9a61752e550e413645fd08f 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
diff --git a/Spigot-Server-Patches/0289-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch b/Spigot-Server-Patches/0288-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
similarity index 97%
rename from Spigot-Server-Patches/0289-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
rename to Spigot-Server-Patches/0288-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
index f7e47530e..9b781934c 100644
--- a/Spigot-Server-Patches/0289-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
+++ b/Spigot-Server-Patches/0288-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
@@ -1,4 +1,4 @@
-From f6f856f0baa6e8abef1664fc3b32767c01ba8b08 Mon Sep 17 00:00:00 2001
+From aa8a90ef5eb5cca3f80f32372e57e32ef42d595c 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
@@ -22,7 +22,7 @@ index d2e87693fa..1997cbdc65 100644
          this.a(entity, entity.af);
      }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 3569e209c2..a8b317cee3 100644
+index 852977cab3..fbca973225 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1221,12 +1221,15 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
diff --git a/Spigot-Server-Patches/0290-Configurable-Bed-Search-Radius.patch b/Spigot-Server-Patches/0289-Configurable-Bed-Search-Radius.patch
similarity index 96%
rename from Spigot-Server-Patches/0290-Configurable-Bed-Search-Radius.patch
rename to Spigot-Server-Patches/0289-Configurable-Bed-Search-Radius.patch
index 8c0cf4215..b49e9649b 100644
--- a/Spigot-Server-Patches/0290-Configurable-Bed-Search-Radius.patch
+++ b/Spigot-Server-Patches/0289-Configurable-Bed-Search-Radius.patch
@@ -1,4 +1,4 @@
-From 27e79afaee379c27cfeebbbe409643abff6b530a Mon Sep 17 00:00:00 2001
+From 7df9641c274ac790438bf2172cdf02d8dcfb9624 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 Jul 2018 15:22:06 -0400
 Subject: [PATCH] Configurable Bed Search Radius
@@ -10,7 +10,7 @@ player at their bed should it of became obstructed.
 Defaults to vanilla 1.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 270138804..7bd7aa0d9 100644
+index 2701388043..7bd7aa0d94 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -419,4 +419,15 @@ public class PaperWorldConfig {
@@ -30,7 +30,7 @@ index 270138804..7bd7aa0d9 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/BlockBed.java b/src/main/java/net/minecraft/server/BlockBed.java
-index 6832eaac5..b9cb59fa7 100644
+index 6832eaac5d..b9cb59fa72 100644
 --- a/src/main/java/net/minecraft/server/BlockBed.java
 +++ b/src/main/java/net/minecraft/server/BlockBed.java
 @@ -172,7 +172,54 @@ public class BlockBed extends BlockFacingHorizontal implements ITileEntity {
diff --git a/Spigot-Server-Patches/0291-Vex-getOwner-API.patch b/Spigot-Server-Patches/0290-Vex-getOwner-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0291-Vex-getOwner-API.patch
rename to Spigot-Server-Patches/0290-Vex-getOwner-API.patch
index 8ce81b0fc..733fe19ea 100644
--- a/Spigot-Server-Patches/0291-Vex-getOwner-API.patch
+++ b/Spigot-Server-Patches/0290-Vex-getOwner-API.patch
@@ -1,4 +1,4 @@
-From 767ec9898c4a8360d40b39d18029d157a9e64ac7 Mon Sep 17 00:00:00 2001
+From 1b4118e0e938196c4d6cfc58a94580714127b813 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 Jul 2018 15:30:22 -0400
 Subject: [PATCH] Vex#getOwner API
diff --git a/Spigot-Server-Patches/0292-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/Spigot-Server-Patches/0291-Refresh-player-inventory-when-cancelling-PlayerInter.patch
similarity index 92%
rename from Spigot-Server-Patches/0292-Refresh-player-inventory-when-cancelling-PlayerInter.patch
rename to Spigot-Server-Patches/0291-Refresh-player-inventory-when-cancelling-PlayerInter.patch
index e6a3abcec..43bd5db70 100644
--- a/Spigot-Server-Patches/0292-Refresh-player-inventory-when-cancelling-PlayerInter.patch
+++ b/Spigot-Server-Patches/0291-Refresh-player-inventory-when-cancelling-PlayerInter.patch
@@ -1,4 +1,4 @@
-From 856d2898d092f8955c5403ef95c88dcfa07e8d28 Mon Sep 17 00:00:00 2001
+From f1b5e30bf792b0fcaae09cd0a6c22a3e51188e76 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Fri, 13 Jul 2018 14:54:43 +0200
 Subject: [PATCH] Refresh player inventory when cancelling
@@ -16,7 +16,7 @@ Refresh the player inventory when PlayerInteractEntityEvent is
 cancelled to avoid this problem.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 5ffc4fccd0..a405cc0a2a 100644
+index da501a1c5f..f7401f5c98 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1954,6 +1954,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
diff --git a/Spigot-Server-Patches/0293-Don-t-change-the-Entity-Random-seed-for-squids.patch b/Spigot-Server-Patches/0292-Don-t-change-the-Entity-Random-seed-for-squids.patch
similarity index 92%
rename from Spigot-Server-Patches/0293-Don-t-change-the-Entity-Random-seed-for-squids.patch
rename to Spigot-Server-Patches/0292-Don-t-change-the-Entity-Random-seed-for-squids.patch
index e6bc230c2..eb84ac5fa 100644
--- a/Spigot-Server-Patches/0293-Don-t-change-the-Entity-Random-seed-for-squids.patch
+++ b/Spigot-Server-Patches/0292-Don-t-change-the-Entity-Random-seed-for-squids.patch
@@ -1,4 +1,4 @@
-From dfc6c7b5b887052a5c2911ee20bc8a473249a50b Mon Sep 17 00:00:00 2001
+From 4be5975af24a20284578325f9598757ac8e1de7d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 19 Jul 2018 01:05:00 -0400
 Subject: [PATCH] Don't change the Entity Random seed for squids
diff --git a/Spigot-Server-Patches/0294-Re-add-vanilla-entity-warnings-for-duplicates.patch b/Spigot-Server-Patches/0293-Re-add-vanilla-entity-warnings-for-duplicates.patch
similarity index 96%
rename from Spigot-Server-Patches/0294-Re-add-vanilla-entity-warnings-for-duplicates.patch
rename to Spigot-Server-Patches/0293-Re-add-vanilla-entity-warnings-for-duplicates.patch
index d6c218bb3..907b4bef5 100644
--- a/Spigot-Server-Patches/0294-Re-add-vanilla-entity-warnings-for-duplicates.patch
+++ b/Spigot-Server-Patches/0293-Re-add-vanilla-entity-warnings-for-duplicates.patch
@@ -1,4 +1,4 @@
-From 4a2e8aceb015706daadd73f26286ba2baf3c9b32 Mon Sep 17 00:00:00 2001
+From 4e6eb81a70dc35d842ff8937311d7c5a55cc75bb Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 19 Jul 2018 01:08:05 -0400
 Subject: [PATCH] Re-add vanilla entity warnings for duplicates
diff --git a/Spigot-Server-Patches/0295-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch b/Spigot-Server-Patches/0294-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch
similarity index 95%
rename from Spigot-Server-Patches/0295-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch
rename to Spigot-Server-Patches/0294-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch
index 3d243189a..496411219 100644
--- a/Spigot-Server-Patches/0295-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch
+++ b/Spigot-Server-Patches/0294-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch
@@ -1,4 +1,4 @@
-From 3780df5dee4adf98b8ab4468c605979f989d04e7 Mon Sep 17 00:00:00 2001
+From 9519f6cc764272dafbe7c8ccd336be8f039712c3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 19 Jul 2018 01:23:00 -0400
 Subject: [PATCH] Don't process despawn if entity is in a chunk scheduled for
diff --git a/Spigot-Server-Patches/0296-Avoid-item-merge-if-stack-size-above-max-stack-size.patch b/Spigot-Server-Patches/0295-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
similarity index 93%
rename from Spigot-Server-Patches/0296-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
rename to Spigot-Server-Patches/0295-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
index 3696adc13..918997ea6 100644
--- a/Spigot-Server-Patches/0296-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
+++ b/Spigot-Server-Patches/0295-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
@@ -1,4 +1,4 @@
-From 7981e61b9a6dddd2e982f421b94e98e2d146eab2 Mon Sep 17 00:00:00 2001
+From b91850e15408ce5836f52498593015d311ab3ed1 Mon Sep 17 00:00:00 2001
 From: Hugo Manrique <hugmanrique@gmail.com>
 Date: Mon, 16 Jul 2018 12:42:20 +0200
 Subject: [PATCH] Avoid item merge if stack size above max stack size
diff --git a/Spigot-Server-Patches/0297-Use-asynchronous-Log4j-2-loggers.patch b/Spigot-Server-Patches/0296-Use-asynchronous-Log4j-2-loggers.patch
similarity index 93%
rename from Spigot-Server-Patches/0297-Use-asynchronous-Log4j-2-loggers.patch
rename to Spigot-Server-Patches/0296-Use-asynchronous-Log4j-2-loggers.patch
index a6dbd4903..d5baa65a1 100644
--- a/Spigot-Server-Patches/0297-Use-asynchronous-Log4j-2-loggers.patch
+++ b/Spigot-Server-Patches/0296-Use-asynchronous-Log4j-2-loggers.patch
@@ -1,4 +1,4 @@
-From 7964f140f23edfbb3b70f1e70d785db5f5cdfec9 Mon Sep 17 00:00:00 2001
+From 34f4d5718d450dd805c09424efc680518c916db7 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Tue, 17 Jul 2018 16:42:17 +0200
 Subject: [PATCH] Use asynchronous Log4j 2 loggers
diff --git a/Spigot-Server-Patches/0298-add-more-information-to-Entity.toString.patch b/Spigot-Server-Patches/0297-add-more-information-to-Entity.toString.patch
similarity index 93%
rename from Spigot-Server-Patches/0298-add-more-information-to-Entity.toString.patch
rename to Spigot-Server-Patches/0297-add-more-information-to-Entity.toString.patch
index 5866f5317..475268a78 100644
--- a/Spigot-Server-Patches/0298-add-more-information-to-Entity.toString.patch
+++ b/Spigot-Server-Patches/0297-add-more-information-to-Entity.toString.patch
@@ -1,4 +1,4 @@
-From 3a1524a0f125d522af37f20b2df0d44861ba3eaf Mon Sep 17 00:00:00 2001
+From 5aacc5e50fdefecde0b50294c1649b134b03c127 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 19 Jul 2018 01:13:28 -0400
 Subject: [PATCH] add more information to Entity.toString()
@@ -6,7 +6,7 @@ Subject: [PATCH] add more information to Entity.toString()
 UUID, ticks lived, valid, dead
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 20c2bf16b..835d329f9 100644
+index 20c2bf16be..835d329f91 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2495,7 +2495,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -19,5 +19,5 @@ index 20c2bf16b..835d329f9 100644
  
      public boolean isInvulnerable(DamageSource damagesource) {
 -- 
-2.17.1
+2.18.0
 
diff --git a/Spigot-Server-Patches/0299-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/Spigot-Server-Patches/0298-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
similarity index 96%
rename from Spigot-Server-Patches/0299-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
rename to Spigot-Server-Patches/0298-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
index f20a148a3..f8b09bc95 100644
--- a/Spigot-Server-Patches/0299-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
+++ b/Spigot-Server-Patches/0298-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
@@ -1,4 +1,4 @@
-From 6b67d1f666bc517ea49fd5822edc2f5cfb08f36c Mon Sep 17 00:00:00 2001
+From a99895fc43c41d8ec5e6cbe9a3ba41829fad6870 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 835d329f9..ff22feee4 100644
+index 835d329f91..ff22feee4d 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
@@ -18,7 +18,7 @@ index 835d329f9..ff22feee4 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 b048343b7..747d99dbe 100644
+index b048343b7c..747d99dbe6 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -53,6 +53,10 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -84,5 +84,5 @@ index b048343b7..747d99dbe 100644
  
          if (aentity != null) {
 -- 
-2.17.1
+2.18.0
 
diff --git a/Spigot-Server-Patches/0300-EnderDragon-Events.patch b/Spigot-Server-Patches/0299-EnderDragon-Events.patch
similarity index 95%
rename from Spigot-Server-Patches/0300-EnderDragon-Events.patch
rename to Spigot-Server-Patches/0299-EnderDragon-Events.patch
index bfe2a3afb..e9828b916 100644
--- a/Spigot-Server-Patches/0300-EnderDragon-Events.patch
+++ b/Spigot-Server-Patches/0299-EnderDragon-Events.patch
@@ -1,11 +1,11 @@
-From 9cd2508d37c8f597d2a53043abf6380310117ee9 Mon Sep 17 00:00:00 2001
+From 8831a7a29b006b6669d1641a57cab2267f31be82 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 21 Jul 2018 01:51:27 -0500
 Subject: [PATCH] EnderDragon Events
 
 
 diff --git a/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java b/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
-index b78d3fe50..ef8b0e765 100644
+index b78d3fe508..ef8b0e765f 100644
 --- a/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
 +++ b/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
 @@ -63,7 +63,9 @@ public class DragonControllerLandedFlame extends AbstractDragonControllerLanded
@@ -27,7 +27,7 @@ index b78d3fe50..ef8b0e765 100644
          if (this.d != null) {
              this.d.die();
 diff --git a/src/main/java/net/minecraft/server/DragonControllerStrafe.java b/src/main/java/net/minecraft/server/DragonControllerStrafe.java
-index f741ada67..a9954c12e 100644
+index f741ada670..a9954c12e9 100644
 --- a/src/main/java/net/minecraft/server/DragonControllerStrafe.java
 +++ b/src/main/java/net/minecraft/server/DragonControllerStrafe.java
 @@ -67,7 +67,9 @@ public class DragonControllerStrafe extends AbstractDragonController {
@@ -41,7 +41,7 @@ index f741ada67..a9954c12e 100644
                          if (this.d != null) {
                              while (!this.d.b()) {
 diff --git a/src/main/java/net/minecraft/server/EntityDragonFireball.java b/src/main/java/net/minecraft/server/EntityDragonFireball.java
-index 862ffc954..2b55cc68b 100644
+index 862ffc9543..2b55cc68b5 100644
 --- a/src/main/java/net/minecraft/server/EntityDragonFireball.java
 +++ b/src/main/java/net/minecraft/server/EntityDragonFireball.java
 @@ -39,8 +39,10 @@ public class EntityDragonFireball extends EntityFireball {
diff --git a/Spigot-Server-Patches/0301-PlayerElytraBoostEvent.patch b/Spigot-Server-Patches/0300-PlayerElytraBoostEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0301-PlayerElytraBoostEvent.patch
rename to Spigot-Server-Patches/0300-PlayerElytraBoostEvent.patch
index 0b0aaba7f..1bffdb94d 100644
--- a/Spigot-Server-Patches/0301-PlayerElytraBoostEvent.patch
+++ b/Spigot-Server-Patches/0300-PlayerElytraBoostEvent.patch
@@ -1,11 +1,11 @@
-From 793183b28ee32da269a98ad02dffdc7750147477 Mon Sep 17 00:00:00 2001
+From d5fa9f005964a2b6c72f72f804dfa4d2f94caae5 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 21 Jul 2018 01:59:59 -0500
 Subject: [PATCH] PlayerElytraBoostEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/ItemFireworks.java b/src/main/java/net/minecraft/server/ItemFireworks.java
-index d4420e68f..82da8dd38 100644
+index d4420e68fb..82da8dd387 100644
 --- a/src/main/java/net/minecraft/server/ItemFireworks.java
 +++ b/src/main/java/net/minecraft/server/ItemFireworks.java
 @@ -35,9 +35,15 @@ public class ItemFireworks extends Item {
diff --git a/Spigot-Server-Patches/0302-Duplicate-UUID-Resolve-Option.patch b/Spigot-Server-Patches/0301-Duplicate-UUID-Resolve-Option.patch
similarity index 99%
rename from Spigot-Server-Patches/0302-Duplicate-UUID-Resolve-Option.patch
rename to Spigot-Server-Patches/0301-Duplicate-UUID-Resolve-Option.patch
index 0b618bfb7..57b591d34 100644
--- a/Spigot-Server-Patches/0302-Duplicate-UUID-Resolve-Option.patch
+++ b/Spigot-Server-Patches/0301-Duplicate-UUID-Resolve-Option.patch
@@ -1,4 +1,4 @@
-From b33ba2c65078dfc4d47efb00482d1ac0907d282a Mon Sep 17 00:00:00 2001
+From cafeea8266c8558075d3efb4d9758f664e884df4 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
@@ -179,7 +179,7 @@ index ff22feee4d..9ab6350587 100644
          this.uniqueID = uuid;
          this.au = this.uniqueID.toString();
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index a8b317cee3..d5ec209feb 100644
+index fbca973225..064c31c035 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -72,7 +72,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
diff --git a/Spigot-Server-Patches/0303-Add-async-chunk-load-API.patch b/Spigot-Server-Patches/0302-Add-async-chunk-load-API.patch
similarity index 93%
rename from Spigot-Server-Patches/0303-Add-async-chunk-load-API.patch
rename to Spigot-Server-Patches/0302-Add-async-chunk-load-API.patch
index c147426a1..4d7750a3a 100644
--- a/Spigot-Server-Patches/0303-Add-async-chunk-load-API.patch
+++ b/Spigot-Server-Patches/0302-Add-async-chunk-load-API.patch
@@ -1,11 +1,11 @@
-From dbe867db8a7ff77474d2e899ea93587654d3de41 Mon Sep 17 00:00:00 2001
+From 35783dd499e0ca36931e371b18f56a03414bb1e0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 21 Jul 2018 16:55:04 -0400
 Subject: [PATCH] Add async chunk load API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 54a605f9b..f4dc7e4ac 100644
+index 54a605f9b9..f4dc7e4ac6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -156,6 +156,27 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0304-Configurable-Allowance-of-Permanent-Chunk-Loaders.patch b/Spigot-Server-Patches/0303-Configurable-Allowance-of-Permanent-Chunk-Loaders.patch
similarity index 96%
rename from Spigot-Server-Patches/0304-Configurable-Allowance-of-Permanent-Chunk-Loaders.patch
rename to Spigot-Server-Patches/0303-Configurable-Allowance-of-Permanent-Chunk-Loaders.patch
index 5ba2911b3..6bae6e69b 100644
--- a/Spigot-Server-Patches/0304-Configurable-Allowance-of-Permanent-Chunk-Loaders.patch
+++ b/Spigot-Server-Patches/0303-Configurable-Allowance-of-Permanent-Chunk-Loaders.patch
@@ -1,4 +1,4 @@
-From 8fa25b04317e850b5612233ece8241b6c7cc7938 Mon Sep 17 00:00:00 2001
+From 6aece268010bb66538ac901004a4723293fed632 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 21 Apr 2018 11:21:48 -0400
 Subject: [PATCH] Configurable Allowance of Permanent Chunk Loaders
diff --git a/Spigot-Server-Patches/0305-Speedup-BlockPos-by-fixing-inlining.patch b/Spigot-Server-Patches/0304-Speedup-BlockPos-by-fixing-inlining.patch
similarity index 98%
rename from Spigot-Server-Patches/0305-Speedup-BlockPos-by-fixing-inlining.patch
rename to Spigot-Server-Patches/0304-Speedup-BlockPos-by-fixing-inlining.patch
index 9c50a55b8..39a3c4a73 100644
--- a/Spigot-Server-Patches/0305-Speedup-BlockPos-by-fixing-inlining.patch
+++ b/Spigot-Server-Patches/0304-Speedup-BlockPos-by-fixing-inlining.patch
@@ -1,4 +1,4 @@
-From a6489b7ad504d1f5609ff1cf0e3c86f25eac0ba0 Mon Sep 17 00:00:00 2001
+From 1831ba9a8382cd486200bf502041b587e1b83da6 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Wed, 30 Nov 2016 20:56:58 -0600
 Subject: [PATCH] Speedup BlockPos by fixing inlining
@@ -21,7 +21,7 @@ This is based upon conclusions drawn from inspecting the assenmbly generated byt
 They had 'callq' (invoke) instead of 'mov' (get from memory) instructions.
 
 diff --git a/src/main/java/net/minecraft/server/BaseBlockPosition.java b/src/main/java/net/minecraft/server/BaseBlockPosition.java
-index 58f8b4b72..98992513d 100644
+index 58f8b4b720..98992513da 100644
 --- a/src/main/java/net/minecraft/server/BaseBlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BaseBlockPosition.java
 @@ -7,22 +7,22 @@ import javax.annotation.concurrent.Immutable;
@@ -80,7 +80,7 @@ index 58f8b4b72..98992513d 100644
      public BaseBlockPosition d(BaseBlockPosition baseblockposition) {
          return new BaseBlockPosition(this.getY() * baseblockposition.getZ() - this.getZ() * baseblockposition.getY(), this.getZ() * baseblockposition.getX() - this.getX() * baseblockposition.getZ(), this.getX() * baseblockposition.getY() - this.getY() * baseblockposition.getX());
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index 252e00e16..f769b178c 100644
+index 252e00e166..f769b178c6 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -207,18 +207,20 @@ public class BlockPosition extends BaseBlockPosition {
diff --git a/Spigot-Server-Patches/0306-Don-t-save-Proto-Chunks.patch b/Spigot-Server-Patches/0305-Don-t-save-Proto-Chunks.patch
similarity index 92%
rename from Spigot-Server-Patches/0306-Don-t-save-Proto-Chunks.patch
rename to Spigot-Server-Patches/0305-Don-t-save-Proto-Chunks.patch
index dd2cf3d3e..99eafb8b5 100644
--- a/Spigot-Server-Patches/0306-Don-t-save-Proto-Chunks.patch
+++ b/Spigot-Server-Patches/0305-Don-t-save-Proto-Chunks.patch
@@ -1,4 +1,4 @@
-From e6ffecf6a16799cae2af4f817492acbc1f0c988f Mon Sep 17 00:00:00 2001
+From b57811ddf6cad35a978efa7e457152a3546ec806 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
@@ -8,7 +8,7 @@ the loadChunk method refuses to acknoledge they exists, and will restart
 a new chunk generation process to begin with, so saving them serves no benefit.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index ea8684747..a97e024ec 100644
+index ea8684747d..a97e024ec4 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -282,6 +282,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -20,7 +20,7 @@ index ea8684747..a97e024ec 100644
          world.checkSession();
  
 diff --git a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
-index 5d9118daa..7629e0d05 100644
+index 5d9118daa8..7629e0d054 100644
 --- a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
 +++ b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
 @@ -23,7 +23,7 @@ public class ChunkTaskScheduler extends Scheduler<ChunkCoordIntPair, ChunkStatus
diff --git a/Spigot-Server-Patches/0307-Optimize-RegistryID.c.patch b/Spigot-Server-Patches/0306-Optimize-RegistryID.c.patch
similarity index 95%
rename from Spigot-Server-Patches/0307-Optimize-RegistryID.c.patch
rename to Spigot-Server-Patches/0306-Optimize-RegistryID.c.patch
index 83a5a4d3c..cde0b4974 100644
--- a/Spigot-Server-Patches/0307-Optimize-RegistryID.c.patch
+++ b/Spigot-Server-Patches/0306-Optimize-RegistryID.c.patch
@@ -1,4 +1,4 @@
-From 8304026780eabec29b8dbd47497190bce6cff29f Mon Sep 17 00:00:00 2001
+From 9c353373373975d32ebe850456c5eba4d3b1cb95 Mon Sep 17 00:00:00 2001
 From: Andrew Steinborn <git@steinborn.me>
 Date: Mon, 23 Jul 2018 13:08:19 -0400
 Subject: [PATCH] Optimize RegistryID.c()
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize RegistryID.c()
 This is a frequent hotspot for world loading/saving.
 
 diff --git a/src/main/java/net/minecraft/server/RegistryID.java b/src/main/java/net/minecraft/server/RegistryID.java
-index bde5714dd..a01cda9d8 100644
+index bde5714dd6..a01cda9d81 100644
 --- a/src/main/java/net/minecraft/server/RegistryID.java
 +++ b/src/main/java/net/minecraft/server/RegistryID.java
 @@ -14,12 +14,14 @@ public class RegistryID<K> implements Registry { // Paper - decompile fix
diff --git a/Spigot-Server-Patches/0308-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/Spigot-Server-Patches/0307-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
similarity index 93%
rename from Spigot-Server-Patches/0308-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
rename to Spigot-Server-Patches/0307-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
index f1e95633e..003b689d6 100644
--- a/Spigot-Server-Patches/0308-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
+++ b/Spigot-Server-Patches/0307-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
@@ -1,11 +1,11 @@
-From bbffbcb0c9638847a91349590dcd2abcc2e2ed02 Mon Sep 17 00:00:00 2001
+From ee07497ef4bca2d22e4f8dfa6b8d98d5c8b83b21 Mon Sep 17 00:00:00 2001
 From: Hugo Manrique <hugmanrique@gmail.com>
 Date: Mon, 23 Jul 2018 12:57:39 +0200
 Subject: [PATCH] Option to prevent armor stands from doing entity lookups
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 4a135d84db..e9b024ad65 100644
+index 044da2754d..61c8b58b16 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -350,6 +350,11 @@ public class PaperWorldConfig {
@@ -21,7 +21,7 @@ index 4a135d84db..e9b024ad65 100644
      private void maxEntityCollision() {
          maxCollisionsPerEntity = getInt( "max-entity-collisions", this.spigotConfig.getInt("max-entity-collisions", 8) );
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index d5ec209feb..6ed5cbb096 100644
+index 064c31c035..4b03f19659 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -11,6 +11,7 @@ import java.util.Iterator;
diff --git a/Spigot-Server-Patches/0309-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0308-Vanished-players-don-t-have-rights.patch
similarity index 98%
rename from Spigot-Server-Patches/0309-Vanished-players-don-t-have-rights.patch
rename to Spigot-Server-Patches/0308-Vanished-players-don-t-have-rights.patch
index 9a10c49c0..d2ce009d3 100644
--- a/Spigot-Server-Patches/0309-Vanished-players-don-t-have-rights.patch
+++ b/Spigot-Server-Patches/0308-Vanished-players-don-t-have-rights.patch
@@ -1,4 +1,4 @@
-From 4a4c12137482311b3bef9e78fa3a43a3a5f4c74d Mon Sep 17 00:00:00 2001
+From 8d0e648fd512c24ca2bd4ae7454aeea400f10c17 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
@@ -64,7 +64,7 @@ index 53c9f21887..71e4084320 100644
          return this.a.a();
      }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 6ed5cbb096..3c9d9f1ab0 100644
+index 4b03f19659..921add1dcb 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1558,6 +1558,37 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
diff --git a/Spigot-Server-Patches/0310-Thread-Safe-Iteration-of-Chunk-Scheduler.patch b/Spigot-Server-Patches/0309-Thread-Safe-Iteration-of-Chunk-Scheduler.patch
similarity index 94%
rename from Spigot-Server-Patches/0310-Thread-Safe-Iteration-of-Chunk-Scheduler.patch
rename to Spigot-Server-Patches/0309-Thread-Safe-Iteration-of-Chunk-Scheduler.patch
index 96ccd2c1b..48fa33ea0 100644
--- a/Spigot-Server-Patches/0310-Thread-Safe-Iteration-of-Chunk-Scheduler.patch
+++ b/Spigot-Server-Patches/0309-Thread-Safe-Iteration-of-Chunk-Scheduler.patch
@@ -1,11 +1,11 @@
-From 5a79c151ef16461c449db1fb33918b3730ca2a7f Mon Sep 17 00:00:00 2001
+From fda8059a53d601af423ce122c823c21d32c359ff Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 23 Jul 2018 19:13:06 -0400
 Subject: [PATCH] Thread Safe Iteration of Chunk Scheduler
 
 
 diff --git a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
-index 7629e0d05..5ee8bedf3 100644
+index 7629e0d054..5ee8bedf34 100644
 --- a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
 +++ b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
 @@ -1,8 +1,10 @@
diff --git a/Spigot-Server-Patches/0311-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch b/Spigot-Server-Patches/0310-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
similarity index 90%
rename from Spigot-Server-Patches/0311-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
rename to Spigot-Server-Patches/0310-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
index 51ab45bb2..48136552c 100644
--- a/Spigot-Server-Patches/0311-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
+++ b/Spigot-Server-Patches/0310-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
@@ -1,4 +1,4 @@
-From 39a41205a9973d04f85c3a1dbbeff86970c764b8 Mon Sep 17 00:00:00 2001
+From 5cbd36d62762550418ec853d7dda2fbd865e5575 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 ba2aeb432..7f882bdca 100644
+index 724c1f5720..67e2158ca1 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -714,6 +714,7 @@ public class Chunk implements IChunkAccess {
diff --git a/Spigot-Server-Patches/0312-Add-some-Debug-to-Chunk-Entity-slices.patch b/Spigot-Server-Patches/0311-Add-some-Debug-to-Chunk-Entity-slices.patch
similarity index 97%
rename from Spigot-Server-Patches/0312-Add-some-Debug-to-Chunk-Entity-slices.patch
rename to Spigot-Server-Patches/0311-Add-some-Debug-to-Chunk-Entity-slices.patch
index d1ea12a64..a5d10412a 100644
--- a/Spigot-Server-Patches/0312-Add-some-Debug-to-Chunk-Entity-slices.patch
+++ b/Spigot-Server-Patches/0311-Add-some-Debug-to-Chunk-Entity-slices.patch
@@ -1,4 +1,4 @@
-From 7770668b1869f7a081c3e33a64e977d30f4d9237 Mon Sep 17 00:00:00 2001
+From 7f0811889bd2f657478e6ab5390369a9105f4f17 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 2461b5cdd1..eb728f66aa 100644
+index 67e2158ca1..e510940ab3 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -712,8 +712,33 @@ public class Chunk implements IChunkAccess {
diff --git a/Spigot-Server-Patches/0313-Optimize-Region-File-Cache.patch b/Spigot-Server-Patches/0312-Optimize-Region-File-Cache.patch
similarity index 96%
rename from Spigot-Server-Patches/0313-Optimize-Region-File-Cache.patch
rename to Spigot-Server-Patches/0312-Optimize-Region-File-Cache.patch
index 2894de91e..a4cb5f117 100644
--- a/Spigot-Server-Patches/0313-Optimize-Region-File-Cache.patch
+++ b/Spigot-Server-Patches/0312-Optimize-Region-File-Cache.patch
@@ -1,4 +1,4 @@
-From 5dfc40de4f511338753732ca910361c6e4c17e58 Mon Sep 17 00:00:00 2001
+From 2f984c6405cb18c32b1be885586269bad0a36bbe 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
@@ -32,7 +32,7 @@ synchronized context, reducing lock times.
 Ultimately: This brings us back to Vanilla, which has had no indication of region file loss.
 
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index 3b8d01ea1..609d6c355 100644
+index 3b8d01ea1a..609d6c3550 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
 @@ -97,7 +97,7 @@ public class RegionFileCache {
diff --git a/Spigot-Server-Patches/0314-repair-bad-rcon.ip-settings-temporarily.patch b/Spigot-Server-Patches/0313-repair-bad-rcon.ip-settings-temporarily.patch
similarity index 92%
rename from Spigot-Server-Patches/0314-repair-bad-rcon.ip-settings-temporarily.patch
rename to Spigot-Server-Patches/0313-repair-bad-rcon.ip-settings-temporarily.patch
index d8b24e948..2b1661470 100644
--- a/Spigot-Server-Patches/0314-repair-bad-rcon.ip-settings-temporarily.patch
+++ b/Spigot-Server-Patches/0313-repair-bad-rcon.ip-settings-temporarily.patch
@@ -1,4 +1,4 @@
-From 32957fe782636f84064ac1182d4f31dcc7d18ed0 Mon Sep 17 00:00:00 2001
+From d5c713111cdb3557021204293bbbf25e1867c679 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 25 Jul 2018 01:21:05 -0400
 Subject: [PATCH] repair bad rcon.ip settings temporarily
@@ -8,7 +8,7 @@ accidently missed mapping change, and we defaulted rcon.ip to the server.propert
 clean up values for people, drop this patch after like 2 weeks.
 
 diff --git a/src/main/java/net/minecraft/server/RemoteControlListener.java b/src/main/java/net/minecraft/server/RemoteControlListener.java
-index c237f239f..1319b3b91 100644
+index c237f239f3..1319b3b916 100644
 --- a/src/main/java/net/minecraft/server/RemoteControlListener.java
 +++ b/src/main/java/net/minecraft/server/RemoteControlListener.java
 @@ -25,6 +25,7 @@ public class RemoteControlListener extends RemoteConnectionThread {
diff --git a/Spigot-Server-Patches/0315-EntityTransformedEvent.patch b/Spigot-Server-Patches/0314-EntityTransformedEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0315-EntityTransformedEvent.patch
rename to Spigot-Server-Patches/0314-EntityTransformedEvent.patch
index 679503e01..c067dad79 100644
--- a/Spigot-Server-Patches/0315-EntityTransformedEvent.patch
+++ b/Spigot-Server-Patches/0314-EntityTransformedEvent.patch
@@ -1,4 +1,4 @@
-From 25140e07725982114ac1f109f9de3dcdf8a823d4 Mon Sep 17 00:00:00 2001
+From a1ebbc58e252b9294afd2dd8557ebf1ddfcbad7e 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/0316-SkeletonHorse-Additions.patch b/Spigot-Server-Patches/0315-SkeletonHorse-Additions.patch
similarity index 94%
rename from Spigot-Server-Patches/0316-SkeletonHorse-Additions.patch
rename to Spigot-Server-Patches/0315-SkeletonHorse-Additions.patch
index aaf0a26ad..cb4e0b2fd 100644
--- a/Spigot-Server-Patches/0316-SkeletonHorse-Additions.patch
+++ b/Spigot-Server-Patches/0315-SkeletonHorse-Additions.patch
@@ -1,11 +1,11 @@
-From 284660a2c1fdcdbdb93b49104ce21c04d473c93c Mon Sep 17 00:00:00 2001
+From b35aab417fa86d548c90ca1426c50321466a2f68 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 27 Jul 2018 22:36:31 -0500
 Subject: [PATCH] SkeletonHorse Additions
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
-index 70985bf5..9fb86eef 100644
+index 70985bf528..9fb86eefde 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
 @@ -6,7 +6,7 @@ public class EntityHorseSkeleton extends EntityHorseAbstract {
@@ -31,7 +31,7 @@ index 70985bf5..9fb86eef 100644
          if (flag != this.bN) {
              this.bN = flag;
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
-index f6917055..cba8b91e 100644
+index f69170559c..cba8b91e55 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
 @@ -13,6 +13,7 @@ public class PathfinderGoalHorseTrap extends PathfinderGoal {
@@ -43,7 +43,7 @@ index f6917055..cba8b91e 100644
  
          this.a.s(false);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java
-index e822c220..496d0c0c 100644
+index e822c2200d..496d0c0cac 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java
 @@ -26,4 +26,23 @@ public class CraftSkeletonHorse extends CraftAbstractHorse implements SkeletonHo
diff --git a/Spigot-Server-Patches/0317-Prevent-Saving-Bad-entities-to-chunks.patch b/Spigot-Server-Patches/0316-Prevent-Saving-Bad-entities-to-chunks.patch
similarity index 96%
rename from Spigot-Server-Patches/0317-Prevent-Saving-Bad-entities-to-chunks.patch
rename to Spigot-Server-Patches/0316-Prevent-Saving-Bad-entities-to-chunks.patch
index 6eb90c4f4..6f7c512c3 100644
--- a/Spigot-Server-Patches/0317-Prevent-Saving-Bad-entities-to-chunks.patch
+++ b/Spigot-Server-Patches/0316-Prevent-Saving-Bad-entities-to-chunks.patch
@@ -1,4 +1,4 @@
-From 6bd58c3df2c3fb451f419dcacd438c2208381867 Mon Sep 17 00:00:00 2001
+From 8f7833aafc25460c7d84db690eeeeed35cf0d662 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 26 Jul 2018 00:11:12 -0400
 Subject: [PATCH] Prevent Saving Bad entities to chunks
@@ -18,7 +18,7 @@ an invalid entity.
 This should reduce log occurrences of dupe uuid messages.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index a97e024e..bd52bf65 100644
+index a97e024ec4..bd52bf6561 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -561,11 +561,22 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
diff --git a/Spigot-Server-Patches/0318-Don-t-call-getItemMeta-on-hasItemMeta.patch b/Spigot-Server-Patches/0317-Don-t-call-getItemMeta-on-hasItemMeta.patch
similarity index 97%
rename from Spigot-Server-Patches/0318-Don-t-call-getItemMeta-on-hasItemMeta.patch
rename to Spigot-Server-Patches/0317-Don-t-call-getItemMeta-on-hasItemMeta.patch
index 8fd07a18e..aa8b5c195 100644
--- a/Spigot-Server-Patches/0318-Don-t-call-getItemMeta-on-hasItemMeta.patch
+++ b/Spigot-Server-Patches/0317-Don-t-call-getItemMeta-on-hasItemMeta.patch
@@ -1,4 +1,4 @@
-From 382ea8e7c49227b584971b8f3d29bdc93505dd7c Mon Sep 17 00:00:00 2001
+From aeb97616ee5f98448d04f6a61ec3209299a93a23 Mon Sep 17 00:00:00 2001
 From: Hugo Manrique <hugmanrique@gmail.com>
 Date: Thu, 26 Jul 2018 14:10:23 +0200
 Subject: [PATCH] Don't call getItemMeta on hasItemMeta
@@ -11,7 +11,7 @@ Returns true if getDamage() == 0 or has damage tag or other tag is set.
 Check the `ItemMetaTest#testTaggedButNotMeta` method to see how this method behaves.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 8ca161f0..e9bef85c 100644
+index 8ca161f0ed..e9bef85c8b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -514,7 +514,7 @@ public final class CraftItemStack extends ItemStack {
@@ -24,7 +24,7 @@ index 8ca161f0..e9bef85c 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 eb6cf1bb..79ce3752 100644
+index eb6cf1bb33..79ce3752e8 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.*;
diff --git a/Spigot-Server-Patches/0319-Always-process-chunk-removal-in-removeEntity.patch b/Spigot-Server-Patches/0318-Always-process-chunk-removal-in-removeEntity.patch
similarity index 93%
rename from Spigot-Server-Patches/0319-Always-process-chunk-removal-in-removeEntity.patch
rename to Spigot-Server-Patches/0318-Always-process-chunk-removal-in-removeEntity.patch
index 11ad3cf86..9c3dd5cab 100644
--- a/Spigot-Server-Patches/0319-Always-process-chunk-removal-in-removeEntity.patch
+++ b/Spigot-Server-Patches/0318-Always-process-chunk-removal-in-removeEntity.patch
@@ -1,4 +1,4 @@
-From a52bf404ca97594f73558a6cd477bdc6adb1f4e6 Mon Sep 17 00:00:00 2001
+From 3801ecdcf2c8ecd45b5a8689ee0368365fb7bda1 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
@@ -8,7 +8,7 @@ which can keep them in the chunk when they shouldnt be if done
 during entity ticking.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 921add1d..ff0112c5 100644
+index 921add1dcb..ff0112c52a 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1136,7 +1136,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
diff --git a/Spigot-Server-Patches/0320-Ignore-Dead-Entities-in-entityList-iteration.patch b/Spigot-Server-Patches/0319-Ignore-Dead-Entities-in-entityList-iteration.patch
similarity index 96%
rename from Spigot-Server-Patches/0320-Ignore-Dead-Entities-in-entityList-iteration.patch
rename to Spigot-Server-Patches/0319-Ignore-Dead-Entities-in-entityList-iteration.patch
index 3e80a74eb..421abf9c9 100644
--- a/Spigot-Server-Patches/0320-Ignore-Dead-Entities-in-entityList-iteration.patch
+++ b/Spigot-Server-Patches/0319-Ignore-Dead-Entities-in-entityList-iteration.patch
@@ -1,4 +1,4 @@
-From 0b35c943d3d7f72d70e6de72ef394fdb6816cf68 Mon Sep 17 00:00:00 2001
+From 7c85d9fd4a96d659e3cffce2bd80eb3432c5be3a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 28 Jul 2018 12:18:27 -0400
 Subject: [PATCH] Ignore Dead Entities in entityList iteration
@@ -11,7 +11,7 @@ This will ensure that dead entities are skipped from iteration since
 they shouldn't of been in the list in the first place.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-index 7ff8e70b..4e854c6d 100644
+index 7ff8e70b24..4e854c6dbe 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
 @@ -172,6 +172,7 @@ public class PaperCommand extends Command {
@@ -23,7 +23,7 @@ index 7ff8e70b..4e854c6d 100644
                      MutablePair<Integer, Map<ChunkCoordIntPair, Integer>> info = list.computeIfAbsent(key, k -> MutablePair.of(0, Maps.newHashMap()));
                      ChunkCoordIntPair chunk = new ChunkCoordIntPair(e.getChunkX(), e.getChunkZ());
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 785c3108..6b0ca4eb 100644
+index 785c31089e..6b0ca4eb98 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -122,6 +122,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -35,7 +35,7 @@ index 785c3108..6b0ca4eb 100644
      public float length;
      public float J;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index ff0112c5..82f4f00a 100644
+index ff0112c52a..82f4f00a76 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1078,6 +1078,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@@ -71,7 +71,7 @@ index ff0112c5..82f4f00a 100644
              if (entity instanceof EntityInsentient) {
                  EntityInsentient entityinsentient = (EntityInsentient) entity;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index f4dc7e4a..8923df89 100644
+index f4dc7e4ac6..8923df898f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -660,6 +660,7 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0321-Always-process-chunk-registration-after-moving.patch b/Spigot-Server-Patches/0320-Always-process-chunk-registration-after-moving.patch
similarity index 94%
rename from Spigot-Server-Patches/0321-Always-process-chunk-registration-after-moving.patch
rename to Spigot-Server-Patches/0320-Always-process-chunk-registration-after-moving.patch
index c6d219126..34d2ec9d6 100644
--- a/Spigot-Server-Patches/0321-Always-process-chunk-registration-after-moving.patch
+++ b/Spigot-Server-Patches/0320-Always-process-chunk-registration-after-moving.patch
@@ -1,4 +1,4 @@
-From 850efc703ad3dbde1bce388cacba59d30c6435dd Mon Sep 17 00:00:00 2001
+From 6a67e26019ad94f74dc2f1a9d6b92cf4930f8f68 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 29 Jul 2018 11:58:05 -0400
 Subject: [PATCH] Always process chunk registration after moving
@@ -7,7 +7,7 @@ This will help guarantee that entities are always in the
 chunk that they are currently located at.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 6b0ca4eb..68b4a902 100644
+index 6b0ca4eb98..68b4a902eb 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -340,6 +340,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -27,7 +27,7 @@ index 6b0ca4eb..68b4a902 100644
  
      protected SoundEffect ad() {
 diff --git a/src/main/java/net/minecraft/server/EntityLeash.java b/src/main/java/net/minecraft/server/EntityLeash.java
-index f2d3d0b4..f2006061 100644
+index f2d3d0b4c7..f20060614d 100644
 --- a/src/main/java/net/minecraft/server/EntityLeash.java
 +++ b/src/main/java/net/minecraft/server/EntityLeash.java
 @@ -31,6 +31,7 @@ public class EntityLeash extends EntityHanging {
@@ -39,7 +39,7 @@ index f2d3d0b4..f2006061 100644
  
      public void setDirection(EnumDirection enumdirection) {}
 diff --git a/src/main/java/net/minecraft/server/EntityShulker.java b/src/main/java/net/minecraft/server/EntityShulker.java
-index 95c6cd89..bc11e7da 100644
+index 95c6cd8971..bc11e7da2b 100644
 --- a/src/main/java/net/minecraft/server/EntityShulker.java
 +++ b/src/main/java/net/minecraft/server/EntityShulker.java
 @@ -385,6 +385,7 @@ public class EntityShulker extends EntityGolem implements IMonster {
diff --git a/Spigot-Server-Patches/0322-Provide-option-to-use-a-versioned-world-folder-for-t.patch b/Spigot-Server-Patches/0321-Provide-option-to-use-a-versioned-world-folder-for-t.patch
similarity index 98%
rename from Spigot-Server-Patches/0322-Provide-option-to-use-a-versioned-world-folder-for-t.patch
rename to Spigot-Server-Patches/0321-Provide-option-to-use-a-versioned-world-folder-for-t.patch
index 82ee666dc..40c1a8284 100644
--- a/Spigot-Server-Patches/0322-Provide-option-to-use-a-versioned-world-folder-for-t.patch
+++ b/Spigot-Server-Patches/0321-Provide-option-to-use-a-versioned-world-folder-for-t.patch
@@ -1,4 +1,4 @@
-From 2acb3f399afdec8d5434220c7098e50b513d42c8 Mon Sep 17 00:00:00 2001
+From 6474e903c1e6963f0bde42ec166c51c6d7f91c83 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 bcdf4f91..c457d071 100644
+index bcdf4f91d8..c457d07110 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;
@@ -59,7 +59,7 @@ index bcdf4f91..c457d071 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index bd52bf65..54840851 100644
+index bd52bf6561..54840851ba 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -55,8 +55,56 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -146,7 +146,7 @@ index bd52bf65..54840851 100644
  
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index 609d6c35..f1fa7c71 100644
+index 609d6c3550..f1fa7c7177 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
 @@ -74,6 +74,13 @@ public class RegionFileCache {
@@ -164,7 +164,7 @@ index 609d6c35..f1fa7c71 100644
  
      public static synchronized void a() {
 diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java
-index 9a243010..3fabbe94 100644
+index 9a243010d0..3fabbe94f9 100644
 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
 +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java
 @@ -33,6 +33,58 @@ public class WorldNBTStorage implements IDataManager, IPlayerFileData {
diff --git a/Spigot-Server-Patches/0323-MC-111480-Start-Entity-ID-s-at-1.patch b/Spigot-Server-Patches/0322-MC-111480-Start-Entity-ID-s-at-1.patch
similarity index 91%
rename from Spigot-Server-Patches/0323-MC-111480-Start-Entity-ID-s-at-1.patch
rename to Spigot-Server-Patches/0322-MC-111480-Start-Entity-ID-s-at-1.patch
index 975d09f5b..01b6ec078 100644
--- a/Spigot-Server-Patches/0323-MC-111480-Start-Entity-ID-s-at-1.patch
+++ b/Spigot-Server-Patches/0322-MC-111480-Start-Entity-ID-s-at-1.patch
@@ -1,4 +1,4 @@
-From 9af17d5047c9f2c8ed932832e91c87df656cb1bd Mon Sep 17 00:00:00 2001
+From 24e2d607bc3e0037cf02ff59d705e4143e11b327 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 29 Jul 2018 22:58:47 -0400
 Subject: [PATCH] MC-111480: Start Entity ID's at 1
@@ -7,7 +7,7 @@ DataWatchers that store Entity ID's treat 0 as special,
 and can break things such as Elytra Fireworks.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 68b4a902..ce33cd5b 100644
+index 68b4a902eb..ce33cd5b83 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -91,7 +91,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
diff --git a/Spigot-Server-Patches/0324-Implement-Expanded-ArmorStand-API.patch b/Spigot-Server-Patches/0323-Implement-Expanded-ArmorStand-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0324-Implement-Expanded-ArmorStand-API.patch
rename to Spigot-Server-Patches/0323-Implement-Expanded-ArmorStand-API.patch
index b861b2f33..5f26ba6a4 100644
--- a/Spigot-Server-Patches/0324-Implement-Expanded-ArmorStand-API.patch
+++ b/Spigot-Server-Patches/0323-Implement-Expanded-ArmorStand-API.patch
@@ -1,4 +1,4 @@
-From 4de2b34d5e061b131e5c506f81880d9a8c93691c Mon Sep 17 00:00:00 2001
+From 62062d51dc14fc95198b6edded0c255d2285dea2 Mon Sep 17 00:00:00 2001
 From: willies952002 <admin@domnian.com>
 Date: Thu, 26 Jul 2018 02:25:46 -0400
 Subject: [PATCH] Implement Expanded ArmorStand API
@@ -8,7 +8,7 @@ Add the following:
 - Enable/Disable slot interactions
 
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index e9a746f1..3b2b94d8 100644
+index e9a746f138..3b2b94d8c6 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -36,7 +36,7 @@ public class EntityArmorStand extends EntityLiving {
@@ -29,7 +29,7 @@ index e9a746f1..3b2b94d8 100644
          return (this.bH & 1 << enumitemslot.c()) != 0;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
-index 124c3185..9f5c3b92 100644
+index 124c3185bc..9f5c3b92e3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 @@ -30,11 +30,13 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
diff --git a/Spigot-Server-Patches/0325-AnvilDamageEvent.patch b/Spigot-Server-Patches/0324-AnvilDamageEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0325-AnvilDamageEvent.patch
rename to Spigot-Server-Patches/0324-AnvilDamageEvent.patch
index f161dd765..68e549fb1 100644
--- a/Spigot-Server-Patches/0325-AnvilDamageEvent.patch
+++ b/Spigot-Server-Patches/0324-AnvilDamageEvent.patch
@@ -1,11 +1,11 @@
-From a51c1c92fd1c655e287f0e78164c61c894266c73 Mon Sep 17 00:00:00 2001
+From 30f58491e4db22f80a13caf4b02932c04fc9cf50 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 20 Jul 2018 23:37:03 -0500
 Subject: [PATCH] AnvilDamageEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/ContainerAnvil.java b/src/main/java/net/minecraft/server/ContainerAnvil.java
-index fb3413d8..9f20348d 100644
+index fb3413d81e..9f20348d0c 100644
 --- a/src/main/java/net/minecraft/server/ContainerAnvil.java
 +++ b/src/main/java/net/minecraft/server/ContainerAnvil.java
 @@ -73,6 +73,16 @@ public class ContainerAnvil extends Container {
diff --git a/Spigot-Server-Patches/0326-World-EntityHuman-Lookup-Optimizations.patch b/Spigot-Server-Patches/0325-World-EntityHuman-Lookup-Optimizations.patch
similarity index 97%
rename from Spigot-Server-Patches/0326-World-EntityHuman-Lookup-Optimizations.patch
rename to Spigot-Server-Patches/0325-World-EntityHuman-Lookup-Optimizations.patch
index 41c0754f4..9497f67cc 100644
--- a/Spigot-Server-Patches/0326-World-EntityHuman-Lookup-Optimizations.patch
+++ b/Spigot-Server-Patches/0325-World-EntityHuman-Lookup-Optimizations.patch
@@ -1,11 +1,11 @@
-From ac0033b8223c425d0c0830737002b387d547b36c Mon Sep 17 00:00:00 2001
+From 248bcfe53b0112bd22daa062b8cf3c9dc2a4dec1 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/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 82f4f00a..b0053e5e 100644
+index 82f4f00a76..b0053e5e63 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -79,6 +79,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
diff --git a/Spigot-Server-Patches/0327-Add-TNTPrimeEvent.patch b/Spigot-Server-Patches/0326-Add-TNTPrimeEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0327-Add-TNTPrimeEvent.patch
rename to Spigot-Server-Patches/0326-Add-TNTPrimeEvent.patch
index e0b51cedc..0565c1322 100644
--- a/Spigot-Server-Patches/0327-Add-TNTPrimeEvent.patch
+++ b/Spigot-Server-Patches/0326-Add-TNTPrimeEvent.patch
@@ -1,11 +1,11 @@
-From f5d469b41ad50cd2225a1a308dab1700507f82b3 Mon Sep 17 00:00:00 2001
+From 869bac2d45c873bc19de02ec97c09a8a4ffa67ec Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Mon, 16 Jul 2018 00:05:05 +0300
 Subject: [PATCH] Add TNTPrimeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockFire.java b/src/main/java/net/minecraft/server/BlockFire.java
-index 25a8a1af..108006d5 100644
+index 25a8a1afdf..108006d580 100644
 --- a/src/main/java/net/minecraft/server/BlockFire.java
 +++ b/src/main/java/net/minecraft/server/BlockFire.java
 @@ -2,6 +2,7 @@ package net.minecraft.server;
@@ -37,7 +37,7 @@ index 25a8a1af..108006d5 100644
              }
          }
 diff --git a/src/main/java/net/minecraft/server/BlockTNT.java b/src/main/java/net/minecraft/server/BlockTNT.java
-index 0c48a0cf..c3eeee26 100644
+index 0c48a0cfe6..c3eeee2634 100644
 --- a/src/main/java/net/minecraft/server/BlockTNT.java
 +++ b/src/main/java/net/minecraft/server/BlockTNT.java
 @@ -1,6 +1,7 @@
@@ -110,7 +110,7 @@ index 0c48a0cf..c3eeee26 100644
                  world.setAir(blockposition);
              }
 diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index d8ab87e2..d5e2a025 100644
+index d8ab87e216..d5e2a02516 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
 @@ -9,6 +9,7 @@ import org.apache.logging.log4j.Logger;
diff --git a/Spigot-Server-Patches/0328-Break-up-and-make-tab-spam-limits-configurable.patch b/Spigot-Server-Patches/0327-Break-up-and-make-tab-spam-limits-configurable.patch
similarity index 97%
rename from Spigot-Server-Patches/0328-Break-up-and-make-tab-spam-limits-configurable.patch
rename to Spigot-Server-Patches/0327-Break-up-and-make-tab-spam-limits-configurable.patch
index 2778b850c..fe4a2773c 100644
--- a/Spigot-Server-Patches/0328-Break-up-and-make-tab-spam-limits-configurable.patch
+++ b/Spigot-Server-Patches/0327-Break-up-and-make-tab-spam-limits-configurable.patch
@@ -1,4 +1,4 @@
-From e0cdf659da7f722372944ac41f54f8ecd39d088a Mon Sep 17 00:00:00 2001
+From cd05d2802f3933e758c93d505af2372ac02472d8 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 29 Jul 2018 05:02:15 +0100
 Subject: [PATCH] Break up and make tab spam limits configurable
@@ -22,7 +22,7 @@ to take the burden of this into their own hand without having to rely on
 plugins doing unsafe things.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index c457d071..046bf33f 100644
+index c457d07110..046bf33f66 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -327,4 +327,18 @@ public class PaperConfig {
@@ -45,7 +45,7 @@ index c457d071..046bf33f 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index f7401f5c..6ebc0a95 100644
+index f7401f5c98..6ebc0a95e2 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -75,6 +75,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
diff --git a/Spigot-Server-Patches/0329-Make-portal-teleportation-adjustment-math-more-accur.patch b/Spigot-Server-Patches/0328-Make-portal-teleportation-adjustment-math-more-accur.patch
similarity index 95%
rename from Spigot-Server-Patches/0329-Make-portal-teleportation-adjustment-math-more-accur.patch
rename to Spigot-Server-Patches/0328-Make-portal-teleportation-adjustment-math-more-accur.patch
index 6d40d6d4b..c17e1b8f6 100644
--- a/Spigot-Server-Patches/0329-Make-portal-teleportation-adjustment-math-more-accur.patch
+++ b/Spigot-Server-Patches/0328-Make-portal-teleportation-adjustment-math-more-accur.patch
@@ -1,11 +1,11 @@
-From 5a571e2f843a929a40427366952f72d8ddabee02 Mon Sep 17 00:00:00 2001
+From f16f6209402ab43846255aabbbce6e4dbfca6197 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/src/main/java/net/minecraft/server/EnumDirection.java b/src/main/java/net/minecraft/server/EnumDirection.java
-index 854ad49b..3ee310a9 100644
+index 854ad49b6c..3ee310a9aa 100644
 --- a/src/main/java/net/minecraft/server/EnumDirection.java
 +++ b/src/main/java/net/minecraft/server/EnumDirection.java
 @@ -85,6 +85,7 @@ public enum EnumDirection implements INamable {
@@ -33,7 +33,7 @@ index 854ad49b..3ee310a9 100644
              return this.c;
          }
 diff --git a/src/main/java/net/minecraft/server/MathHelper.java b/src/main/java/net/minecraft/server/MathHelper.java
-index f52b9c6f..3adbfb82 100644
+index f52b9c6f0a..3adbfb8209 100644
 --- a/src/main/java/net/minecraft/server/MathHelper.java
 +++ b/src/main/java/net/minecraft/server/MathHelper.java
 @@ -82,6 +82,7 @@ public class MathHelper {
@@ -45,7 +45,7 @@ index f52b9c6f..3adbfb82 100644
          return d0 < d1 ? d1 : (d0 > d2 ? d2 : d0);
      }
 diff --git a/src/main/java/net/minecraft/server/PortalTravelAgent.java b/src/main/java/net/minecraft/server/PortalTravelAgent.java
-index 7444f462..16ca3209 100644
+index 7444f4621e..16ca3209cd 100644
 --- a/src/main/java/net/minecraft/server/PortalTravelAgent.java
 +++ b/src/main/java/net/minecraft/server/PortalTravelAgent.java
 @@ -208,11 +208,27 @@ public class PortalTravelAgent {
@@ -79,7 +79,7 @@ index 7444f462..16ca3209 100644
              float f1 = 0.0F;
              float f2 = 0.0F;
 diff --git a/src/main/java/net/minecraft/server/ShapeDetector.java b/src/main/java/net/minecraft/server/ShapeDetector.java
-index 3faf74a2..4e1f8c21 100644
+index 3faf74a22f..4e1f8c211d 100644
 --- a/src/main/java/net/minecraft/server/ShapeDetector.java
 +++ b/src/main/java/net/minecraft/server/ShapeDetector.java
 @@ -140,6 +140,7 @@ public class ShapeDetector {
diff --git a/Spigot-Server-Patches/0330-MC-135506-Experience-should-save-as-Integers.patch b/Spigot-Server-Patches/0329-MC-135506-Experience-should-save-as-Integers.patch
similarity index 92%
rename from Spigot-Server-Patches/0330-MC-135506-Experience-should-save-as-Integers.patch
rename to Spigot-Server-Patches/0329-MC-135506-Experience-should-save-as-Integers.patch
index 0f5bfef53..d23235bb5 100644
--- a/Spigot-Server-Patches/0330-MC-135506-Experience-should-save-as-Integers.patch
+++ b/Spigot-Server-Patches/0329-MC-135506-Experience-should-save-as-Integers.patch
@@ -1,11 +1,11 @@
-From b79a1e7ca1b0417b3d83c65b956f1a28e421ddc2 Mon Sep 17 00:00:00 2001
+From b69638bbdc2a5ee083b492643e8e63d66dfba96e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 3 Aug 2018 00:04:54 -0400
 Subject: [PATCH] MC-135506: Experience should save as Integers
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index b8bfc757..13299ad1 100644
+index b8bfc75771..13299ad102 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -205,14 +205,14 @@ public class EntityExperienceOrb extends Entity {
diff --git a/Spigot-Server-Patches/0331-Entity-add-to-world-fixes.patch b/Spigot-Server-Patches/0330-Entity-add-to-world-fixes.patch
similarity index 95%
rename from Spigot-Server-Patches/0331-Entity-add-to-world-fixes.patch
rename to Spigot-Server-Patches/0330-Entity-add-to-world-fixes.patch
index adb950e11..bebdb24c2 100644
--- a/Spigot-Server-Patches/0331-Entity-add-to-world-fixes.patch
+++ b/Spigot-Server-Patches/0330-Entity-add-to-world-fixes.patch
@@ -1,4 +1,4 @@
-From 389137b60458b371a3c7bc2c691c6212b85252f2 Mon Sep 17 00:00:00 2001
+From 65f1544c78789ea0348d7059d8d6f82f130155e4 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 e510940a..db8fbc00 100644
+index e510940ab3..db8fbc006d 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -902,6 +902,7 @@ public class Chunk implements IChunkAccess {
@@ -41,7 +41,7 @@ index e510940a..db8fbc00 100644
          // CraftBukkit start
          org.bukkit.Server server = this.world.getServer();
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index b0053e5e..004c3ec4 100644
+index b0053e5e63..004c3ec474 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1069,6 +1069,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@@ -70,7 +70,7 @@ index b0053e5e..004c3ec4 100644
              }
              this.entityList.add(entity);
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 7a9f2842..6412715b 100644
+index 7a9f28421b..6412715b78 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -992,7 +992,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
diff --git a/Spigot-Server-Patches/0332-Fix-client-rendering-skulls-from-same-user.patch b/Spigot-Server-Patches/0331-Fix-client-rendering-skulls-from-same-user.patch
similarity index 96%
rename from Spigot-Server-Patches/0332-Fix-client-rendering-skulls-from-same-user.patch
rename to Spigot-Server-Patches/0331-Fix-client-rendering-skulls-from-same-user.patch
index 229e3cca0..a709f62ac 100644
--- a/Spigot-Server-Patches/0332-Fix-client-rendering-skulls-from-same-user.patch
+++ b/Spigot-Server-Patches/0331-Fix-client-rendering-skulls-from-same-user.patch
@@ -1,4 +1,4 @@
-From faa0e4486a3d5be538b1d82b13518c4b00d47681 Mon Sep 17 00:00:00 2001
+From b5439078d7f958538efb240ff77b43e3a3d7250c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 22 Nov 2016 00:40:42 -0500
 Subject: [PATCH] Fix client rendering skulls from same user
@@ -12,7 +12,7 @@ This allows the client to render multiple skull textures from the same user,
 for when different skins were used when skull was made.
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index e52014fd..da11ec16 100644
+index e52014fd8f..da11ec1672 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -44,7 +44,7 @@ public final class ItemStack {
@@ -25,7 +25,7 @@ index e52014fd..da11ec16 100644
      private EntityItemFrame i;
      private ShapeDetectorBlock j;
 diff --git a/src/main/java/net/minecraft/server/PacketDataSerializer.java b/src/main/java/net/minecraft/server/PacketDataSerializer.java
-index d04afceb..b0e8ffc4 100644
+index d04afceb70..b0e8ffc4b1 100644
 --- a/src/main/java/net/minecraft/server/PacketDataSerializer.java
 +++ b/src/main/java/net/minecraft/server/PacketDataSerializer.java
 @@ -251,6 +251,15 @@ public class PacketDataSerializer extends ByteBuf {
@@ -62,7 +62,7 @@ index d04afceb..b0e8ffc4 100644
              }
              // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
-index 1aa36156..c5f0b853 100644
+index 1aa36156a8..c5f0b85309 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 @@ -38,6 +38,7 @@ public class PacketPlayOutMapChunk implements Packet<PacketListenerPlayOut> {
@@ -83,7 +83,7 @@ index 1aa36156..c5f0b853 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/TileEntitySkull.java b/src/main/java/net/minecraft/server/TileEntitySkull.java
-index 85fd8dab..16a5537c 100644
+index 85fd8dab60..16a5537ce0 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySkull.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySkull.java
 @@ -143,9 +143,37 @@ public class TileEntitySkull extends TileEntity /*implements ITickable*/ { // Pa
diff --git a/work/Bukkit b/work/Bukkit
index e07c38325..d2834556b 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit e07c38325891cfaf6915881b4998c39b830ab6ea
+Subproject commit d2834556b1032e98f2ff3125340e792bf19b0ec1
diff --git a/work/CraftBukkit b/work/CraftBukkit
index ec2095d9c..a9c796f12 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit ec2095d9c6dc466bf9be6b515fc7cc40739f89d8
+Subproject commit a9c796f12cf00276e4e22de8a54138235c1cea72