From 84c98c2ba846e3198713b9006cf7c4c4b47b5d35 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Thu, 19 Jul 2018 05:42:43 +0100
Subject: [PATCH] NOT FINISHED! She compiles, and she... suffers the wrath of
 chunkgen...

---
 ...API.patch => 0006-Entity-Origin-API.patch} |    2 +-
 ....patch => 0007-Check-Paper-versions.patch} |    4 +-
 ...=> 0008-Add-PlayerLocaleChangeEvent.patch} |    4 +-
 ...> 0009-Add-player-view-distance-API.patch} |    4 +-
 ...patch => 0010-Add-BeaconEffectEvent.patch} |    6 +-
 ...=> 0011-Add-PlayerInitialSpawnEvent.patch} |    6 +-
 ...ade-EntityDismountEvent-Cancellable.patch} |    6 +-
 ...y-disable-plugins-that-fail-to-load.patch} |    2 +-
 ...ch => 0014-Expose-server-CommandMap.patch} |    2 +-
 ...ord-chat-API-from-spigot-subclasses.patch} |    4 +-
 ...0016-Player-Tab-List-and-Title-APIs.patch} |    4 +-
 ... 0017-Add-exception-reporting-event.patch} |    4 +-
 ...rverListPingEvent-flagging-as-Async.patch} |    4 +-
 ...-sendMessage-methods-to-CommandSend.patch} |    4 +-
 ...orking-with-arrows-stuck-in-living-.patch} |    2 +-
 ... => 0021-Complete-resource-pack-API.patch} |    2 +-
 ...=> 0022-Use-ASM-for-event-executors.patch} |    2 +-
 ... => 0023-Add-a-call-helper-to-Event.patch} |    6 +-
 ...er-name-to-commands.yml-replacement.patch} |    4 +-
 ...load-permissions.yml-and-require-co.patch} |    2 +-
 ...-Custom-replacement-for-eaten-items.patch} |    4 +-
 ... 0027-Access-items-by-EquipmentSlot.patch} |    2 +-
 ...ntity-AddTo-RemoveFrom-World-Events.patch} |    8 +-
 ...t.patch => 0029-EntityPathfindEvent.patch} |    2 +-
 ...ynchronization-in-MetadataStoreBase.patch} |    6 +-
 ...-MetadataStoreBase.removeAll-Plugin.patch} |    4 +-
 ...032-Add-PlayerUseUnknownEntityEvent.patch} |    4 +-
 ...nt-to-allow-plugins-to-handle-clien.patch} |    4 +-
 ...patch => 0034-Arrow-pickup-rule-API.patch} |    4 +-
 ...tyRegainHealthEvent-isFastRegen-API.patch} |    4 +-
 ...ble-API.patch => 0036-LootTable-API.patch} |    4 +-
 ...nt.patch => 0037-Add-EntityZapEvent.patch} |    4 +-
 ...Misc-Utils.patch => 0038-Misc-Utils.patch} |    4 +-
 ...-Allow-Reloading-of-Command-Aliases.patch} |    2 +-
 ...-Add-source-to-PlayerExpChangeEvent.patch} |    4 +-
 ... => 0041-Add-ProjectileCollideEvent.patch} |    4 +-
 ...042-Add-String-based-Action-Bar-API.patch} |    2 +-
 ...o-control-if-armour-stands-can-move.patch} |    4 +-
 ...nt.patch => 0044-IllegalPacketEvent.patch} |    4 +-
 ...API-s.patch => 0045-Fireworks-API-s.patch} |    6 +-
 ... 0046-PlayerTeleportEndGatewayEvent.patch} |    4 +-
 ...ovide-E-TE-Chunk-count-stat-methods.patch} |    4 +-
 ...I-for-Reason-Source-Triggering-play.patch} |    4 +-
 ...rldBorder-isInBounds-Location-check.patch} |    6 +-
 ...-option-to-prevent-player-names-fro.patch} |    2 +-
 ...pstream-javadoc-warnings-and-errors.patch} |   18 +-
 ....patch => 0052-Item-canEntityPickup.patch} |    4 +-
 ...layerPickupItemEvent-setFlyAtPlayer.patch} |    4 +-
 ...> 0054-PlayerAttemptPickupItemEvent.patch} |    4 +-
 ...tch => 0055-Add-UnknownCommandEvent.patch} |    4 +-
 ...tch => 0056-Basic-PlayerProfile-API.patch} |    2 +-
 ... 0057-Shoulder-Entities-Release-API.patch} |    4 +-
 ...patch => 0058-Profile-Lookup-Events.patch} |    4 +-
 ...patch => 0059-Entity-fromMobSpawner.patch} |    6 +-
 ...0-Improve-the-Saddle-API-for-Horses.patch} |    2 +-
 ...=> 0061-ensureServerConversions-API.patch} |   15 +-
 ... => 0062-Add-getI18NDisplayName-API.patch} |    6 +-
 ...=> 0063-ProfileWhitelistVerifyEvent.patch} |    2 +-
 ...0064-Make-plugins-list-alphabetical.patch} |    2 +-
 ...atch => 0065-LivingEntity-setKiller.patch} |    4 +-
 ...fixes-in-implementation-logging-con.patch} |    2 +-
 ...ow-plugins-to-use-SLF4J-for-logging.patch} |    2 +-
 ...r-plugins-modifying-the-parent-of-t.patch} |    2 +-
 ...t.patch => 0069-Add-PlayerJumpEvent.patch} |    2 +-
 ...t-protocol-version-and-virtual-host.patch} |    2 +-
 ... => 0071-Add-PlayerArmorChangeEvent.patch} |    2 +-
 ...get-a-BlockState-without-a-snapshot.patch} |    6 +-
 ...patch => 0073-AsyncTabCompleteEvent.patch} |    2 +-
 ...ay-warning-on-deprecated-recipe-API.patch} |    2 +-
 ...=> 0075-PlayerPickupExperienceEvent.patch} |    2 +-
 ...tch => 0076-ExperienceOrbMergeEvent.patch} |    2 +-
 ...-Ability-to-apply-mending-to-XP-API.patch} |    2 +-
 ...patch => 0078-PreCreatureSpawnEvent.patch} |    2 +-
 ...-PlayerNaturallySpawnCreaturesEvent.patch} |    2 +-
 ...-Add-SkullMeta.setPlayerProfile-API.patch} |    2 +-
 ...> 0081-Fill-Profile-Property-Events.patch} |    2 +-
 ...layerAdvancementCriterionGrantEvent.patch} |    2 +-
 ...ch => 0083-Add-ArmorStand-Item-Meta.patch} |    2 +-
 ...pers.patch => 0084-Optimize-Hoppers.patch} |    2 +-
 ... 0085-Tameable-getOwnerUniqueId-API.patch} |    2 +-
 ...-PlayerProfile-in-AsyncPreLoginEven.patch} |    2 +-
 ...d-extended-PaperServerListPingEvent.patch} |    2 +-
 ...=> 0088-Player.setPlayerProfile-API.patch} |    2 +-
 ...patch => 0089-getPlayerUniqueId-API.patch} |    2 +-
 ...support-to-PaperServerListPingEvent.patch} |    2 +-
 ...-method-to-open-already-placed-sign.patch} |    2 +-
 ...-version-history-to-version-command.patch} |    2 +-
 ...3-Add-Ban-Methods-to-Player-Objects.patch} |    2 +-
 ...t.patch => 0094-EndermanEscapeEvent.patch} |    2 +-
 ...h => 0095-Enderman.teleportRandomly.patch} |    2 +-
 ...ional-world.getNearbyEntities-API-s.patch} |    6 +-
 ... => 0097-Location.isChunkLoaded-API.patch} |    2 +-
 ...d.spawnParticle-API-and-add-Builder.patch} |    6 +-
 ...h => 0099-EndermanAttackPlayerEvent.patch} |    2 +-
 ...ose-Plugin-Class-Loaders-on-Disable.patch} |    2 +-
 ...tch => 0101-WitchConsumePotionEvent.patch} |    2 +-
 ...patch => 0102-WitchThrowPotionEvent.patch} |    2 +-
 ...on.toBlockLocation-toCenterLocation.patch} |    2 +-
 ... => 0104-PotionEffect-clone-methods.patch} |    2 +-
 ...patch => 0105-WitchReadyPotionEvent.patch} |    2 +-
 ...106-ItemStack-getMaxItemUseDuration.patch} |    6 +-
 ...7-Add-EntityTeleportEndGatewayEvent.patch} |    2 +-
 ...d-SentientNPC-Interface-to-Entities.patch} |    2 +-
 ...-shield-blocking-delay-configurable.patch} |    2 +-
 ...nt-consumeArrow-and-getArrowItem-AP.patch} |    2 +-
 ...dd-getNearbyXXX-methods-to-Location.patch} |    2 +-
 ...patch => 0112-PlayerReadyArrowEvent.patch} |    2 +-
 ...13-Add-EntityKnockbackByEntityEvent.patch} |    2 +-
 ...patch => 0114-Expand-Explosions-API.patch} |    6 +-
 ...I-additions-for-quantity-flags-lore.patch} |    6 +-
 ...vingEntity-Hand-Raised-Item-Use-API.patch} |    2 +-
 ...-API.patch => 0117-RangedEntity-API.patch} |    2 +-
 ...eHitEvent-to-include-the-BlockFace-.patch} |    2 +-
 ...> 0119-Add-World.getEntity-UUID-API.patch} |    6 +-
 ...0120-InventoryCloseEvent-Reason-API.patch} |    2 +-
 ...I.patch => 0121-Entity-getChunk-API.patch} |    2 +-
 ...-API.patch => 0122-Vex-getOwner-API.patch} |    2 +-
 Spigot-Server-Patches/0008-MC-Utils.patch     |  192 ++-
 Spigot-Server-Patches/0009-Timings-v2.patch   |  137 +-
 ...ck-and-tnt-entities-at-the-specified.patch |    8 +-
 ...API.patch => 0023-Entity-Origin-API.patch} |   10 +-
 ...vent-tile-entity-and-entity-crashes.patch} |    2 +-
 ...figurable-top-of-nether-void-damage.patch} |    4 +-
 ...-before-converting-and-renaming-pla.patch} |    2 +-
 ... => 0027-Always-tick-falling-blocks.patch} |    2 +-
 ...-Queue.patch => 0028-Lighting-Queue.patch} |    4 +-
 ...ch => 0029-Configurable-end-credits.patch} |    4 +-
 ...explosions-processing-dead-entities.patch} |    6 +-
 ...s.patch => 0031-Optimize-explosions.patch} |    4 +-
 ...> 0032-Add-player-view-distance-API.patch} |    4 +-
 ...=> 0033-Disable-explosion-knockback.patch} |    4 +-
 ...under.patch => 0034-Disable-thunder.patch} |    4 +-
 ....patch => 0035-Disable-ice-and-snow.patch} |    4 +-
 ...-Configurable-mob-spawner-tick-rate.patch} |    2 +-
 ...ition-the-first-time-an-entity-is-s.patch} |    2 +-
 ...patch => 0038-Add-BeaconEffectEvent.patch} |    2 +-
 ...igurable-container-update-tick-rate.patch} |    4 +-
 ...0040-Use-UserCache-for-player-heads.patch} |    2 +-
 ...> 0041-Disable-spigot-tick-limiters.patch} |    2 +-
 ...igurable-Chunk-IO-Thread-Base-Count.patch} |    2 +-
 ...=> 0043-Add-PlayerInitialSpawnEvent.patch} |    2 +-
 ...=> 0044-Disable-chest-cat-detection.patch} |    2 +-
 ...5-Ensure-commands-are-not-ran-async.patch} |    4 +-
 ...hunks-are-slime-spawn-chunks-toggle.patch} |    2 +-
 ....patch => 0047-Optimize-Pathfinding.patch} |    2 +-
 ...pper-searches-if-there-are-no-items.patch} |    4 +-
 ...ch => 0049-Expose-server-CommandMap.patch} |    2 +-
 ...-informative-in-maxHealth-exception.patch} |    4 +-
 ...0051-Player-Tab-List-and-Title-APIs.patch} |    2 +-
 ...> 0052-Ensure-inv-drag-is-in-bounds.patch} |    2 +-
 ...ntation-of-tile-entity-removal-list.patch} |    2 +-
 ...d-configurable-portal-search-radius.patch} |    2 +-
 ...patch => 0055-Add-velocity-warnings.patch} |    6 +-
 ...le-inter-world-teleportation-safety.patch} |    2 +-
 ... 0057-Add-exception-reporting-event.patch} |    4 +-
 ...don-t-need-to-when-cerealising-text.patch} |    2 +-
 ...reboards-for-non-players-by-default.patch} |    2 +-
 ...orking-with-arrows-stuck-in-living-.patch} |    2 +-
 ... => 0061-Complete-resource-pack-API.patch} |    2 +-
 ... 0062-Chunk-save-queue-improvements.patch} |   14 +-
 ....patch => 0063-Chunk-Save-Reattempt.patch} |    6 +-
 ...ding-permissions.yml-before-plugins.patch} |    4 +-
 ...low-Reloading-of-Custom-Permissions.patch} |    2 +-
 ...h => 0066-Remove-Metadata-on-reload.patch} |    2 +-
 ...patch => 0067-Undead-horse-leashing.patch} |    2 +-
 ...h => 0068-Fix-Furnace-cook-time-bug.patch} |    2 +-
 ...69-Handle-Item-Meta-Inconsistencies.patch} |   12 +-
 ...rable-Non-Player-Arrow-Despawn-Rate.patch} |    2 +-
 ...atch => 0071-Add-World-Util-Methods.patch} |    8 +-
 ...2-Optimized-Light-Level-Comparisons.patch} |    2 +-
 ...0073-Pass-world-to-Village-creation.patch} |    2 +-
 ...-Custom-replacement-for-eaten-items.patch} |    2 +-
 ...h-absorb-values-and-repair-bad-data.patch} |    2 +-
 ...tch-Async-PlayerChunkMap-operations.patch} |    2 +-
 ...ch => 0077-Waving-banner-workaround.patch} |    2 +-
 ...78-Use-a-Shared-Random-for-Entities.patch} |    2 +-
 ...> 0079-Don-t-teleport-dead-entities.patch} |    2 +-
 ...patch => 0080-Optimize-Chunk-Access.patch} |    2 +-
 ...e-spawn-chances-for-skeleton-horses.patch} |    2 +-
 ...ocation-getType-and-getBlockData-fo.patch} |    6 +-
 ... 0083-Access-items-by-EquipmentSlot.patch} |    2 +-
 ...able-BlockPhysicsEvent-for-Redstone.patch} |    4 +-
 ...ntity-AddTo-RemoveFrom-World-Events.patch} |    4 +-
 ...-Configurable-Chunk-Inhabited-Timer.patch} |    4 +-
 ...t.patch => 0087-EntityPathfindEvent.patch} |    2 +-
 ...ce-IO-ops-opening-a-new-region-file.patch} |    2 +-
 ...gionFileCache-and-make-configurable.patch} |    2 +-
 ...h => 0090-Use-Optimized-Collections.patch} |    2 +-
 ...Do-not-load-chunks-for-light-checks.patch} |    4 +-
 ...092-Add-PlayerUseUnknownEntityEvent.patch} |    6 +-
 ...DebugInfo-not-initialized-on-client.patch} |    2 +-
 ...Configurable-Grass-Spread-Tick-Rate.patch} |    2 +-
 ...e-Keep-Spawn-Loaded-range-per-world.patch} |    8 +-
 ...-BlockPlaceEvent-triggering-physics.patch} |    4 +-
 ...m-reload-spawn-chunks-in-nether-end.patch} |    4 +-
 ...8-Remove-Debug-checks-from-DataBits.patch} |    2 +-
 ...illa-per-world-scoreboard-coloring-.patch} |    4 +-
 ...d-for-setting-passengers-on-players.patch} |    2 +-
 ...emove-unused-World-Tile-Entity-List.patch} |    4 +-
 ... 0102-Don-t-tick-Skulls-unused-code.patch} |    2 +-
 ... 0103-Configurable-Player-Collision.patch} |   21 +-
 ...nt-to-allow-plugins-to-handle-clien.patch} |    2 +-
 ...> 0105-Configurable-RCON-IP-address.patch} |    2 +-
 ...06-Prevent-Fire-from-loading-chunks.patch} |    2 +-
 ...7-Implement-PlayerLocaleChangeEvent.patch} |    2 +-
 ...tyRegainHealthEvent-isFastRegen-API.patch} |    2 +-
 ...to-configure-frosted_ice-properties.patch} |    4 +-
 ...-Vehicle-Event-Cancellation-Changes.patch} |    4 +-
 ...possibility-for-getServer-singleton.patch} |    4 +-
 ...tem-frames-performance-and-bug-fixe.patch} |    4 +-
 ...API-Replenishable-Lootables-Feature.patch} |    4 +-
 ...-Do-not-load-chunks-for-pathfinding.patch} |    4 +-
 ...> 0115-Entity-Tracking-Improvements.patch} |    6 +-
 ...-scoreboard-teams-to-scoreboard.dat.patch} |    4 +-
 ... 0117-Fix-Chunk-Unload-Queue-Issues.patch} |    6 +-
 ...em-property-for-disabling-watchdoge.patch} |    4 +-
 ...mize-EAR.patch => 0119-Optimize-EAR.patch} |    4 +-
 ...0120-Optimize-UserCache-Thread-Safe.patch} |    4 +-
 ...locking-on-Network-Manager-creation.patch} |    4 +-
 ...-Optional-TNT-doesn-t-move-in-water.patch} |    6 +-
 ...-redstone-torch-rapid-clock-removal.patch} |    4 +-
 ...Ensure-Chunks-never-ever-load-async.patch} |    2 +-
 ...h => 0125-Add-server-name-parameter.patch} |    4 +-
 ...n-Wither-Death-sounds-to-same-world.patch} |    4 +-
 ...nk-Unloads-based-on-Player-Movement.patch} |    8 +-
 ...=> 0128-Fix-Double-World-Add-issues.patch} |    8 +-
 ...tch => 0129-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} |    2 +-
 ...-BlockStateEnum-hashCode-and-equals.patch} |    2 +-
 ...0135-Disable-ticking-of-snow-blocks.patch} |    2 +-
 ...36-Fix-AIOOBE-in-inventory-handling.patch} |    6 +-
 ...nfigurable-packet-in-spam-threshold.patch} |    4 +-
 ...8-Configurable-flying-kick-messages.patch} |    4 +-
 ...atch => 0139-Auto-Save-Improvements.patch} |    8 +-
 ...ch => 0140-Chunk-registration-fixes.patch} |    4 +-
 ...k-reference-on-Craft-Entity-removal.patch} |    2 +-
 ...to-fix-bad-Y-levels-on-player-login.patch} |    2 +-
 ...ch => 0143-Disable-Vanilla-Chunk-GC.patch} |    2 +-
 ...ion-to-remove-corrupt-tile-entities.patch} |    2 +-
 ...nt.patch => 0145-Add-EntityZapEvent.patch} |    2 +-
 ...hunks-from-Hoppers-and-other-things.patch} |    2 +-
 ...ent-Auto-Save-if-Save-Queue-is-full.patch} |    6 +-
 ... 0148-Chunk-Save-Stats-Debug-Option.patch} |   10 +-
 ...-from-ArmorStand-and-SpawnEgg-items.patch} |    4 +-
 ...50-Cache-user-authenticator-threads.patch} |    2 +-
 ...atch => 0151-Optimize-Network-Queue.patch} |    2 +-
 ....patch => 0152-Optimise-removeQueue.patch} |    2 +-
 ...-Allow-Reloading-of-Command-Aliases.patch} |    2 +-
 ...-Add-source-to-PlayerExpChangeEvent.patch} |    2 +-
 ...mize-World.isLoaded-BlockPosition-Z.patch} |    4 +-
 ...-Don-t-let-fishinghooks-use-portals.patch} |    2 +-
 ... => 0157-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} |    2 +-
 ... => 0161-Optimize-ItemStack.isEmpty.patch} |    6 +-
 ...o-control-if-armour-stands-can-move.patch} |    2 +-
 ...option-to-remove-invalid-statistics.patch} |    2 +-
 ...4-Properly-fix-item-duplication-bug.patch} |    6 +-
 ...=> 0165-String-based-Action-Bar-API.patch} |    6 +-
 ... 0166-Activation-Range-Improvements.patch} |    2 +-
 ...-API-s.patch => 0167-Firework-API-s.patch} |    6 +-
 ... 0168-PlayerTeleportEndGatewayEvent.patch} |    2 +-
 ... => 0169-ShulkerBox-Dupe-Prevention.patch} |    2 +-
 ...ovide-E-TE-Chunk-count-stat-methods.patch} |    4 +-
 ...h => 0171-Enforce-Sync-Player-Saves.patch} |    8 +-
 ... => 0172-Enforce-Sync-Chunk-Unloads.patch} |    8 +-
 ...low-entities-to-ride-themselves-572.patch} |    2 +-
 ...atch => 0174-Fix-block-break-desync.patch} |    4 +-
 ...I-for-Reason-Source-Triggering-play.patch} |    6 +-
 ...sign-the-World-in-WorldGenStronghold.patch |   22 -
 ...patch => 0176-Cap-Entity-Collisions.patch} |    2 +-
 ...-CraftScheduler-Async-Task-Debugger.patch} |    2 +-
 ...g.patch => 0178-Shame-on-you-Mojang.patch} |    2 +-
 ...ore-aggressive-in-the-chunk-unload-.patch} |    2 +-
 ...> 0180-Do-not-let-armorstands-drown.patch} |    2 +-
 ...e-async-calls-to-restart-the-server.patch} |    8 +-
 ...roperty-to-disable-book-size-limits.patch} |    2 +-
 ...e-parrots-stay-on-shoulders-despite.patch} |    6 +-
 ...-option-to-prevent-player-names-fro.patch} |    2 +-
 ...leAppender-for-console-improvements.patch} |    8 +-
 ...rable-option-to-disable-creeper-lin.patch} |    2 +-
 ....patch => 0187-Item-canEntityPickup.patch} |    2 +-
 ...layerPickupItemEvent-setFlyAtPlayer.patch} |    2 +-
 ...> 0189-PlayerAttemptPickupItemEvent.patch} |    2 +-
 ...tch => 0190-Add-UnknownCommandEvent.patch} |    2 +-
 ...tch => 0191-Basic-PlayerProfile-API.patch} |    2 +-
 ... 0192-Shoulder-Entities-Release-API.patch} |    4 +-
 ...patch => 0193-Profile-Lookup-Events.patch} |    2 +-
 ...layer-logins-during-server-shutdown.patch} |    2 +-
 ...patch => 0195-Entity-fromMobSpawner.patch} |    2 +-
 ...0196-Fix-Anvil-Level-sync-to-client.patch} |    6 +-
 ...ages-for-getTileEntity-in-order-to-.patch} |    2 +-
 ...8-Improve-the-Saddle-API-for-Horses.patch} |    2 +-
 ...plement-ensureServerConversions-API.patch} |    2 +-
 ...> 0200-Implement-getI18NDisplayName.patch} |    2 +-
 ...ving-disabled-before-unloading-all-.patch} |    2 +-
 ...=> 0202-ProfileWhitelistVerifyEvent.patch} |    8 +-
 ...ch => 0203-Fix-this-stupid-bullshit.patch} |    2 +-
 ...wns-should-honor-nametags-and-leash.patch} |    2 +-
 ...mer-when-spawner-event-is-cancelled.patch} |    2 +-
 ...6-Fix-MC-117075-TE-Unload-Lag-Spike.patch} |    4 +-
 ...a-custom-authentication-servers-dow.patch} |    2 +-
 ...atch => 0208-LivingEntity-setKiller.patch} |    2 +-
 ...ms-to-redirect-System.out-err-to-lo.patch} |    4 +-
 ...-prefixes-using-Log4J-configuration.patch} |    4 +-
 Spigot-Server-Patches/0211-Anti-Xray.patch    | 1173 -----------------
 ...Include-Log4J2-SLF4J-implementation.patch} |    4 +-
 ...efix-for-various-plugins-bypassing-.patch} |    2 +-
 ...t.patch => 0213-Add-PlayerJumpEvent.patch} |    4 +-
 ...-handle-PacketPlayInKeepAlive-async.patch} |    6 +-
 ...t-protocol-version-and-virtual-host.patch} |    4 +-
 ...t-serverside-behavior-of-keepalives.patch} |    6 +-
 ...ith-fastutil-s-ObjectOpenHashSet-in.patch} |    2 +-
 ...Effects-only-to-players-who-can-see.patch} |    8 +-
 ...maximum-exp-value-when-merging-orbs.patch} |   14 +-
 ... => 0220-Add-PlayerArmorChangeEvent.patch} |    2 +-
 ...om-being-processed-when-the-player-.patch} |    2 +-
 ...-implementations-for-captured-block.patch} |    6 +-
 ...get-a-BlockState-without-a-snapshot.patch} |    6 +-
 ...patch => 0224-AsyncTabCompleteEvent.patch} |    4 +-
 ...25-Avoid-NPE-in-PathfinderGoalTempt.patch} |    2 +-
 ...=> 0226-PlayerPickupExperienceEvent.patch} |    2 +-
 ...tch => 0227-ExperienceOrbMergeEvent.patch} |    6 +-
 ...-Ability-to-apply-mending-to-XP-API.patch} |   10 +-
 ...rable-Chunks-Sends-per-Tick-setting.patch} |    6 +-
 ...max-squid-spawn-height-configurable.patch} |    6 +-
 ...patch => 0231-PreCreatureSpawnEvent.patch} |    2 +-
 ...-PlayerNaturallySpawnCreaturesEvent.patch} |    2 +-
 ...-Add-SkullMeta.setPlayerProfile-API.patch} |    2 +-
 ...> 0234-Fill-Profile-Property-Events.patch} |    2 +-
 ...layerAdvancementCriterionGrantEvent.patch} |    2 +-
 ...ch => 0236-Add-ArmorStand-Item-Meta.patch} |   14 +-
 ...Extend-Player-Interact-cancellation.patch} |   10 +-
 ... 0238-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} |    4 +-
 ... 0244-Improved-Async-Task-Scheduler.patch} |    2 +-
 ...-PlayerProfile-in-AsyncPreLoginEven.patch} |    2 +-
 ...-PortalCreateEvent-for-exit-portals.patch} |    2 +-
 ...=> 0247-Player.setPlayerProfile-API.patch} |    4 +-
 ...h => 0248-Fix-Dragon-Server-Crashes.patch} |    2 +-
 ...patch => 0249-getPlayerUniqueId-API.patch} |    2 +-
 ...ake-player-data-saving-configurable.patch} |    2 +-
 ...e-legacy-ping-handler-more-reliable.patch} |    2 +-
 ...erverListPingEvent-for-legacy-pings.patch} |    2 +-
 ...3-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} |    6 +-
 ...t.patch => 0258-EndermanEscapeEvent.patch} |    2 +-
 ...h => 0259-Enderman.teleportRandomly.patch} |    2 +-
 ...260-Block-Enderpearl-Travel-Exploit.patch} |   10 +-
 ...d.spawnParticle-API-and-add-Builder.patch} |    6 +-
 ...h => 0262-EndermanAttackPlayerEvent.patch} |    2 +-
 ...tch => 0263-WitchConsumePotionEvent.patch} |    2 +-
 ...patch => 0264-WitchThrowPotionEvent.patch} |    2 +-
 ...tem-entities-with-World.spawnEntity.patch} |    6 +-
 ...oad-chunks-for-villager-door-checks.patch} |    2 +-
 ...patch => 0267-WitchReadyPotionEvent.patch} |    2 +-
 ...268-ItemStack-getMaxItemUseDuration.patch} |    6 +-
 ...ement-EntityTeleportEndGatewayEvent.patch} |    2 +-
 ...d-flag-on-cancel-of-Explosion-Event.patch} |    2 +-
 ...move-entities-on-dimension-teleport.patch} |    2 +-
 ...ch => 0272-Fix-CraftEntity-hashCode.patch} |    2 +-
 ...e-Alternative-LootPool-Luck-Formula.patch} |    4 +-
 ...ls-when-failing-to-save-player-data.patch} |    2 +-
 ...-shield-blocking-delay-configurable.patch} |    6 +-
 ...cipes-in-RecipeBook-to-avoid-data-e.patch} |    2 +-
 ...nt-consumeArrow-and-getArrowItem-AP.patch} |    2 +-
 ...patch => 0278-PlayerReadyArrowEvent.patch} |    2 +-
 ...-EntityShootBowEvent-for-Illusioner.patch} |    2 +-
 ...lement-EntityKnockbackByEntityEvent.patch} |    2 +-
 ...patch => 0281-Expand-Explosions-API.patch} |    6 +-
 ...vingEntity-Hand-Raised-Item-Use-API.patch} |    2 +-
 ...-API.patch => 0283-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} |    6 +-
 ...0288-InventoryCloseEvent-Reason-API.patch} |   12 +-
 ...ps-for-Entity-TileEntity-Current-Ch.patch} |   12 +-
 ...0290-Configurable-Bed-Search-Radius.patch} |    6 +-
 ...-API.patch => 0291-Vex-getOwner-API.patch} |    2 +-
 ...ventory-when-cancelling-PlayerInter.patch} |    6 +-
 .../api}/0006-Add-async-chunk-load-API.patch  |    0
 ...le-speed-for-water-flowing-over-lava.patch |    0
 .../0023-Add-async-chunk-load-API.patch       |    0
 .../0033-Generator-Settings.patch             |    0
 ...lowing-block-if-material-has-changed.patch |    0
 removed/{ => server}/0036-Fast-draining.patch |    0
 .../0037-Configurable-lava-flow-speed.patch   |    0
 ...0-Custom-replacement-for-eaten-items.patch |    0
 ...w-BlockFromToEvent-from-loading-chun.patch |    0
 ...-mobs-should-only-spawn-in-the-water.patch |    0
 ...-dispenser-dropper-furnace-placement.patch |    0
 ...hunks-as-active-for-neighbor-updates.patch |    0
 ...-Speedup-BlockPos-by-fixing-inlining.patch |    0
 ...7-Vanished-players-don-t-have-rights.patch |    0
 ...t-armor-stands-from-doing-entity-loo.patch |    0
 ...-option-to-remove-invalid-statistics.patch |    0
 .../0185-IllegalPacketEvent.patch             |    0
 ...sign-the-World-in-WorldGenStronghold.patch |    0
 ...low-a-zero-max-height-in-BiomeJungle.patch |    0
 ...ix-dragon-egg-falling-in-lazy-chunks.patch |    0
 removed/{ => server}/0235-Anti-Xray.patch     |    0
 .../0248-Improve-Structures-Checking.patch    |    0
 ...Configurable-Max-Chunk-Gens-per-Tick.patch |    0
 .../{ => server}/0269-Optimize-Hoppers.patch  |    0
 ...0280-Configurable-Unrestricted-Signs.patch |    0
 ...90-Handle-bad-chunks-more-gracefully.patch |    0
 ...Allowance-of-Permanent-Chunk-Loaders.patch |    0
 scripts/importmcdev.sh                        |    2 +-
 work/Bukkit                                   |    2 +-
 work/CraftBukkit                              |    2 +-
 422 files changed, 972 insertions(+), 1950 deletions(-)
 rename Spigot-API-Patches/{0007-Entity-Origin-API.patch => 0006-Entity-Origin-API.patch} (97%)
 rename Spigot-API-Patches/{0008-Check-Paper-versions.patch => 0007-Check-Paper-versions.patch} (98%)
 rename Spigot-API-Patches/{0009-Add-PlayerLocaleChangeEvent.patch => 0008-Add-PlayerLocaleChangeEvent.patch} (95%)
 rename Spigot-API-Patches/{0010-Add-player-view-distance-API.patch => 0009-Add-player-view-distance-API.patch} (90%)
 rename Spigot-API-Patches/{0011-Add-BeaconEffectEvent.patch => 0010-Add-BeaconEffectEvent.patch} (95%)
 rename Spigot-API-Patches/{0012-Add-PlayerInitialSpawnEvent.patch => 0011-Add-PlayerInitialSpawnEvent.patch} (94%)
 rename Spigot-API-Patches/{0013-Made-EntityDismountEvent-Cancellable.patch => 0012-Made-EntityDismountEvent-Cancellable.patch} (92%)
 rename Spigot-API-Patches/{0014-Automatically-disable-plugins-that-fail-to-load.patch => 0013-Automatically-disable-plugins-that-fail-to-load.patch} (94%)
 rename Spigot-API-Patches/{0015-Expose-server-CommandMap.patch => 0014-Expose-server-CommandMap.patch} (97%)
 rename Spigot-API-Patches/{0016-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch => 0015-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch} (97%)
 rename Spigot-API-Patches/{0017-Player-Tab-List-and-Title-APIs.patch => 0016-Player-Tab-List-and-Title-APIs.patch} (99%)
 rename Spigot-API-Patches/{0018-Add-exception-reporting-event.patch => 0017-Add-exception-reporting-event.patch} (99%)
 rename Spigot-API-Patches/{0019-Fix-ServerListPingEvent-flagging-as-Async.patch => 0018-Fix-ServerListPingEvent-flagging-as-Async.patch} (96%)
 rename Spigot-API-Patches/{0020-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch => 0019-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch} (95%)
 rename Spigot-API-Patches/{0021-Add-methods-for-working-with-arrows-stuck-in-living-.patch => 0020-Add-methods-for-working-with-arrows-stuck-in-living-.patch} (93%)
 rename Spigot-API-Patches/{0022-Complete-resource-pack-API.patch => 0021-Complete-resource-pack-API.patch} (98%)
 rename Spigot-API-Patches/{0023-Use-ASM-for-event-executors.patch => 0022-Use-ASM-for-event-executors.patch} (99%)
 rename Spigot-API-Patches/{0024-Add-a-call-helper-to-Event.patch => 0023-Add-a-call-helper-to-Event.patch} (91%)
 rename Spigot-API-Patches/{0025-Add-sender-name-to-commands.yml-replacement.patch => 0024-Add-sender-name-to-commands.yml-replacement.patch} (96%)
 rename Spigot-API-Patches/{0026-Add-command-to-reload-permissions.yml-and-require-co.patch => 0025-Add-command-to-reload-permissions.yml-and-require-co.patch} (98%)
 rename Spigot-API-Patches/{0027-Custom-replacement-for-eaten-items.patch => 0026-Custom-replacement-for-eaten-items.patch} (96%)
 rename Spigot-API-Patches/{0028-Access-items-by-EquipmentSlot.patch => 0027-Access-items-by-EquipmentSlot.patch} (94%)
 rename Spigot-API-Patches/{0029-Entity-AddTo-RemoveFrom-World-Events.patch => 0028-Entity-AddTo-RemoveFrom-World-Events.patch} (94%)
 rename Spigot-API-Patches/{0030-EntityPathfindEvent.patch => 0029-EntityPathfindEvent.patch} (97%)
 rename Spigot-API-Patches/{0031-Reduce-thread-synchronization-in-MetadataStoreBase.patch => 0030-Reduce-thread-synchronization-in-MetadataStoreBase.patch} (97%)
 rename Spigot-API-Patches/{0032-Add-MetadataStoreBase.removeAll-Plugin.patch => 0031-Add-MetadataStoreBase.removeAll-Plugin.patch} (95%)
 rename Spigot-API-Patches/{0033-Add-PlayerUseUnknownEntityEvent.patch => 0032-Add-PlayerUseUnknownEntityEvent.patch} (95%)
 rename Spigot-API-Patches/{0034-Add-handshake-event-to-allow-plugins-to-handle-clien.patch => 0033-Add-handshake-event-to-allow-plugins-to-handle-clien.patch} (98%)
 rename Spigot-API-Patches/{0035-Arrow-pickup-rule-API.patch => 0034-Arrow-pickup-rule-API.patch} (95%)
 rename Spigot-API-Patches/{0036-EntityRegainHealthEvent-isFastRegen-API.patch => 0035-EntityRegainHealthEvent-isFastRegen-API.patch} (95%)
 rename Spigot-API-Patches/{0037-LootTable-API.patch => 0036-LootTable-API.patch} (99%)
 rename Spigot-API-Patches/{0038-Add-EntityZapEvent.patch => 0037-Add-EntityZapEvent.patch} (98%)
 rename Spigot-API-Patches/{0039-Misc-Utils.patch => 0038-Misc-Utils.patch} (94%)
 rename Spigot-API-Patches/{0040-Allow-Reloading-of-Command-Aliases.patch => 0039-Allow-Reloading-of-Command-Aliases.patch} (98%)
 rename Spigot-API-Patches/{0041-Add-source-to-PlayerExpChangeEvent.patch => 0040-Add-source-to-PlayerExpChangeEvent.patch} (95%)
 rename Spigot-API-Patches/{0042-Add-ProjectileCollideEvent.patch => 0041-Add-ProjectileCollideEvent.patch} (96%)
 rename Spigot-API-Patches/{0043-Add-String-based-Action-Bar-API.patch => 0042-Add-String-based-Action-Bar-API.patch} (98%)
 rename Spigot-API-Patches/{0044-Add-API-methods-to-control-if-armour-stands-can-move.patch => 0043-Add-API-methods-to-control-if-armour-stands-can-move.patch} (93%)
 rename Spigot-API-Patches/{0045-IllegalPacketEvent.patch => 0044-IllegalPacketEvent.patch} (97%)
 rename Spigot-API-Patches/{0046-Fireworks-API-s.patch => 0045-Fireworks-API-s.patch} (89%)
 rename Spigot-API-Patches/{0047-PlayerTeleportEndGatewayEvent.patch => 0046-PlayerTeleportEndGatewayEvent.patch} (94%)
 rename Spigot-API-Patches/{0048-Provide-E-TE-Chunk-count-stat-methods.patch => 0047-Provide-E-TE-Chunk-count-stat-methods.patch} (92%)
 rename Spigot-API-Patches/{0049-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch => 0048-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch} (98%)
 rename Spigot-API-Patches/{0050-Expose-WorldBorder-isInBounds-Location-check.patch => 0049-Expose-WorldBorder-isInBounds-Location-check.patch} (90%)
 rename Spigot-API-Patches/{0051-Add-configuration-option-to-prevent-player-names-fro.patch => 0050-Add-configuration-option-to-prevent-player-names-fro.patch} (97%)
 rename Spigot-API-Patches/{0052-Fix-upstream-javadoc-warnings-and-errors.patch => 0051-Fix-upstream-javadoc-warnings-and-errors.patch} (96%)
 rename Spigot-API-Patches/{0053-Item-canEntityPickup.patch => 0052-Item-canEntityPickup.patch} (92%)
 rename Spigot-API-Patches/{0054-PlayerPickupItemEvent-setFlyAtPlayer.patch => 0053-PlayerPickupItemEvent-setFlyAtPlayer.patch} (96%)
 rename Spigot-API-Patches/{0055-PlayerAttemptPickupItemEvent.patch => 0054-PlayerAttemptPickupItemEvent.patch} (97%)
 rename Spigot-API-Patches/{0056-Add-UnknownCommandEvent.patch => 0055-Add-UnknownCommandEvent.patch} (96%)
 rename Spigot-API-Patches/{0057-Basic-PlayerProfile-API.patch => 0056-Basic-PlayerProfile-API.patch} (99%)
 rename Spigot-API-Patches/{0058-Shoulder-Entities-Release-API.patch => 0057-Shoulder-Entities-Release-API.patch} (94%)
 rename Spigot-API-Patches/{0059-Profile-Lookup-Events.patch => 0058-Profile-Lookup-Events.patch} (98%)
 rename Spigot-API-Patches/{0060-Entity-fromMobSpawner.patch => 0059-Entity-fromMobSpawner.patch} (87%)
 rename Spigot-API-Patches/{0061-Improve-the-Saddle-API-for-Horses.patch => 0060-Improve-the-Saddle-API-for-Horses.patch} (97%)
 rename Spigot-API-Patches/{0062-ensureServerConversions-API.patch => 0061-ensureServerConversions-API.patch} (83%)
 rename Spigot-API-Patches/{0063-Add-getI18NDisplayName-API.patch => 0062-Add-getI18NDisplayName-API.patch} (92%)
 rename Spigot-API-Patches/{0064-ProfileWhitelistVerifyEvent.patch => 0063-ProfileWhitelistVerifyEvent.patch} (98%)
 rename Spigot-API-Patches/{0065-Make-plugins-list-alphabetical.patch => 0064-Make-plugins-list-alphabetical.patch} (96%)
 rename Spigot-API-Patches/{0066-LivingEntity-setKiller.patch => 0065-LivingEntity-setKiller.patch} (91%)
 rename Spigot-API-Patches/{0067-Handle-plugin-prefixes-in-implementation-logging-con.patch => 0066-Handle-plugin-prefixes-in-implementation-logging-con.patch} (96%)
 rename Spigot-API-Patches/{0068-Allow-plugins-to-use-SLF4J-for-logging.patch => 0067-Allow-plugins-to-use-SLF4J-for-logging.patch} (96%)
 rename Spigot-API-Patches/{0069-Add-workaround-for-plugins-modifying-the-parent-of-t.patch => 0068-Add-workaround-for-plugins-modifying-the-parent-of-t.patch} (98%)
 rename Spigot-API-Patches/{0070-Add-PlayerJumpEvent.patch => 0069-Add-PlayerJumpEvent.patch} (98%)
 rename Spigot-API-Patches/{0071-Expose-client-protocol-version-and-virtual-host.patch => 0070-Expose-client-protocol-version-and-virtual-host.patch} (97%)
 rename Spigot-API-Patches/{0072-Add-PlayerArmorChangeEvent.patch => 0071-Add-PlayerArmorChangeEvent.patch} (98%)
 rename Spigot-API-Patches/{0073-API-to-get-a-BlockState-without-a-snapshot.patch => 0072-API-to-get-a-BlockState-without-a-snapshot.patch} (85%)
 rename Spigot-API-Patches/{0074-AsyncTabCompleteEvent.patch => 0073-AsyncTabCompleteEvent.patch} (99%)
 rename Spigot-API-Patches/{0075-Display-warning-on-deprecated-recipe-API.patch => 0074-Display-warning-on-deprecated-recipe-API.patch} (97%)
 rename Spigot-API-Patches/{0076-PlayerPickupExperienceEvent.patch => 0075-PlayerPickupExperienceEvent.patch} (98%)
 rename Spigot-API-Patches/{0077-ExperienceOrbMergeEvent.patch => 0076-ExperienceOrbMergeEvent.patch} (98%)
 rename Spigot-API-Patches/{0078-Ability-to-apply-mending-to-XP-API.patch => 0077-Ability-to-apply-mending-to-XP-API.patch} (96%)
 rename Spigot-API-Patches/{0079-PreCreatureSpawnEvent.patch => 0078-PreCreatureSpawnEvent.patch} (98%)
 rename Spigot-API-Patches/{0080-PlayerNaturallySpawnCreaturesEvent.patch => 0079-PlayerNaturallySpawnCreaturesEvent.patch} (97%)
 rename Spigot-API-Patches/{0081-Add-SkullMeta.setPlayerProfile-API.patch => 0080-Add-SkullMeta.setPlayerProfile-API.patch} (95%)
 rename Spigot-API-Patches/{0082-Fill-Profile-Property-Events.patch => 0081-Fill-Profile-Property-Events.patch} (98%)
 rename Spigot-API-Patches/{0083-PlayerAdvancementCriterionGrantEvent.patch => 0082-PlayerAdvancementCriterionGrantEvent.patch} (97%)
 rename Spigot-API-Patches/{0084-Add-ArmorStand-Item-Meta.patch => 0083-Add-ArmorStand-Item-Meta.patch} (97%)
 rename Spigot-API-Patches/{0085-Optimize-Hoppers.patch => 0084-Optimize-Hoppers.patch} (96%)
 rename Spigot-API-Patches/{0086-Tameable-getOwnerUniqueId-API.patch => 0085-Tameable-getOwnerUniqueId-API.patch} (94%)
 rename Spigot-API-Patches/{0087-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch => 0086-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch} (96%)
 rename Spigot-API-Patches/{0088-Add-extended-PaperServerListPingEvent.patch => 0087-Add-extended-PaperServerListPingEvent.patch} (99%)
 rename Spigot-API-Patches/{0089-Player.setPlayerProfile-API.patch => 0088-Player.setPlayerProfile-API.patch} (95%)
 rename Spigot-API-Patches/{0090-getPlayerUniqueId-API.patch => 0089-getPlayerUniqueId-API.patch} (97%)
 rename Spigot-API-Patches/{0091-Add-legacy-ping-support-to-PaperServerListPingEvent.patch => 0090-Add-legacy-ping-support-to-PaperServerListPingEvent.patch} (94%)
 rename Spigot-API-Patches/{0092-Add-method-to-open-already-placed-sign.patch => 0091-Add-method-to-open-already-placed-sign.patch} (92%)
 rename Spigot-API-Patches/{0093-Add-version-history-to-version-command.patch => 0092-Add-version-history-to-version-command.patch} (99%)
 rename Spigot-API-Patches/{0094-Add-Ban-Methods-to-Player-Objects.patch => 0093-Add-Ban-Methods-to-Player-Objects.patch} (99%)
 rename Spigot-API-Patches/{0095-EndermanEscapeEvent.patch => 0094-EndermanEscapeEvent.patch} (97%)
 rename Spigot-API-Patches/{0096-Enderman.teleportRandomly.patch => 0095-Enderman.teleportRandomly.patch} (93%)
 rename Spigot-API-Patches/{0097-Additional-world.getNearbyEntities-API-s.patch => 0096-Additional-world.getNearbyEntities-API-s.patch} (98%)
 rename Spigot-API-Patches/{0098-Location.isChunkLoaded-API.patch => 0097-Location.isChunkLoaded-API.patch} (91%)
 rename Spigot-API-Patches/{0099-Expand-World.spawnParticle-API-and-add-Builder.patch => 0098-Expand-World.spawnParticle-API-and-add-Builder.patch} (99%)
 rename Spigot-API-Patches/{0100-EndermanAttackPlayerEvent.patch => 0099-EndermanAttackPlayerEvent.patch} (98%)
 rename Spigot-API-Patches/{0101-Close-Plugin-Class-Loaders-on-Disable.patch => 0100-Close-Plugin-Class-Loaders-on-Disable.patch} (99%)
 rename Spigot-API-Patches/{0102-WitchConsumePotionEvent.patch => 0101-WitchConsumePotionEvent.patch} (98%)
 rename Spigot-API-Patches/{0103-WitchThrowPotionEvent.patch => 0102-WitchThrowPotionEvent.patch} (97%)
 rename Spigot-API-Patches/{0104-Location.toBlockLocation-toCenterLocation.patch => 0103-Location.toBlockLocation-toCenterLocation.patch} (95%)
 rename Spigot-API-Patches/{0105-PotionEffect-clone-methods.patch => 0104-PotionEffect-clone-methods.patch} (96%)
 rename Spigot-API-Patches/{0106-WitchReadyPotionEvent.patch => 0105-WitchReadyPotionEvent.patch} (97%)
 rename Spigot-API-Patches/{0107-ItemStack-getMaxItemUseDuration.patch => 0106-ItemStack-getMaxItemUseDuration.patch} (84%)
 rename Spigot-API-Patches/{0108-Add-EntityTeleportEndGatewayEvent.patch => 0107-Add-EntityTeleportEndGatewayEvent.patch} (95%)
 rename Spigot-API-Patches/{0109-Add-SentientNPC-Interface-to-Entities.patch => 0108-Add-SentientNPC-Interface-to-Entities.patch} (99%)
 rename Spigot-API-Patches/{0110-Make-shield-blocking-delay-configurable.patch => 0109-Make-shield-blocking-delay-configurable.patch} (94%)
 rename Spigot-API-Patches/{0111-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch => 0110-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch} (96%)
 rename Spigot-API-Patches/{0112-Add-getNearbyXXX-methods-to-Location.patch => 0111-Add-getNearbyXXX-methods-to-Location.patch} (99%)
 rename Spigot-API-Patches/{0113-PlayerReadyArrowEvent.patch => 0112-PlayerReadyArrowEvent.patch} (98%)
 rename Spigot-API-Patches/{0114-Add-EntityKnockbackByEntityEvent.patch => 0113-Add-EntityKnockbackByEntityEvent.patch} (97%)
 rename Spigot-API-Patches/{0115-Expand-Explosions-API.patch => 0114-Expand-Explosions-API.patch} (98%)
 rename Spigot-API-Patches/{0116-ItemStack-API-additions-for-quantity-flags-lore.patch => 0115-ItemStack-API-additions-for-quantity-flags-lore.patch} (96%)
 rename Spigot-API-Patches/{0117-LivingEntity-Hand-Raised-Item-Use-API.patch => 0116-LivingEntity-Hand-Raised-Item-Use-API.patch} (96%)
 rename Spigot-API-Patches/{0118-RangedEntity-API.patch => 0117-RangedEntity-API.patch} (98%)
 rename Spigot-API-Patches/{0119-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch => 0118-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch} (96%)
 rename Spigot-API-Patches/{0120-Add-World.getEntity-UUID-API.patch => 0119-Add-World.getEntity-UUID-API.patch} (83%)
 rename Spigot-API-Patches/{0121-InventoryCloseEvent-Reason-API.patch => 0120-InventoryCloseEvent-Reason-API.patch} (97%)
 rename Spigot-API-Patches/{0122-Entity-getChunk-API.patch => 0121-Entity-getChunk-API.patch} (93%)
 rename Spigot-API-Patches/{0123-Vex-getOwner-API.patch => 0122-Vex-getOwner-API.patch} (92%)
 rename Spigot-Server-Patches/{0024-Entity-Origin-API.patch => 0023-Entity-Origin-API.patch} (97%)
 rename Spigot-Server-Patches/{0025-Prevent-tile-entity-and-entity-crashes.patch => 0024-Prevent-tile-entity-and-entity-crashes.patch} (98%)
 rename Spigot-Server-Patches/{0026-Configurable-top-of-nether-void-damage.patch => 0025-Configurable-top-of-nether-void-damage.patch} (97%)
 rename Spigot-Server-Patches/{0027-Check-online-mode-before-converting-and-renaming-pla.patch => 0026-Check-online-mode-before-converting-and-renaming-pla.patch} (94%)
 rename Spigot-Server-Patches/{0028-Always-tick-falling-blocks.patch => 0027-Always-tick-falling-blocks.patch} (95%)
 rename Spigot-Server-Patches/{0029-Lighting-Queue.patch => 0028-Lighting-Queue.patch} (99%)
 rename Spigot-Server-Patches/{0030-Configurable-end-credits.patch => 0029-Configurable-end-credits.patch} (95%)
 rename Spigot-Server-Patches/{0031-Fix-lag-from-explosions-processing-dead-entities.patch => 0030-Fix-lag-from-explosions-processing-dead-entities.patch} (88%)
 rename Spigot-Server-Patches/{0032-Optimize-explosions.patch => 0031-Optimize-explosions.patch} (98%)
 rename Spigot-Server-Patches/{0033-Add-player-view-distance-API.patch => 0032-Add-player-view-distance-API.patch} (98%)
 rename Spigot-Server-Patches/{0034-Disable-explosion-knockback.patch => 0033-Disable-explosion-knockback.patch} (97%)
 rename Spigot-Server-Patches/{0035-Disable-thunder.patch => 0034-Disable-thunder.patch} (94%)
 rename Spigot-Server-Patches/{0036-Disable-ice-and-snow.patch => 0035-Disable-ice-and-snow.patch} (94%)
 rename Spigot-Server-Patches/{0037-Configurable-mob-spawner-tick-rate.patch => 0036-Configurable-mob-spawner-tick-rate.patch} (97%)
 rename Spigot-Server-Patches/{0038-Send-absolute-position-the-first-time-an-entity-is-s.patch => 0037-Send-absolute-position-the-first-time-an-entity-is-s.patch} (98%)
 rename Spigot-Server-Patches/{0039-Add-BeaconEffectEvent.patch => 0038-Add-BeaconEffectEvent.patch} (97%)
 rename Spigot-Server-Patches/{0040-Configurable-container-update-tick-rate.patch => 0039-Configurable-container-update-tick-rate.patch} (95%)
 rename Spigot-Server-Patches/{0041-Use-UserCache-for-player-heads.patch => 0040-Use-UserCache-for-player-heads.patch} (95%)
 rename Spigot-Server-Patches/{0042-Disable-spigot-tick-limiters.patch => 0041-Disable-spigot-tick-limiters.patch} (97%)
 rename Spigot-Server-Patches/{0043-Configurable-Chunk-IO-Thread-Base-Count.patch => 0042-Configurable-Chunk-IO-Thread-Base-Count.patch} (96%)
 rename Spigot-Server-Patches/{0044-Add-PlayerInitialSpawnEvent.patch => 0043-Add-PlayerInitialSpawnEvent.patch} (96%)
 rename Spigot-Server-Patches/{0045-Disable-chest-cat-detection.patch => 0044-Disable-chest-cat-detection.patch} (96%)
 rename Spigot-Server-Patches/{0046-Ensure-commands-are-not-ran-async.patch => 0045-Ensure-commands-are-not-ran-async.patch} (98%)
 rename Spigot-Server-Patches/{0047-All-chunks-are-slime-spawn-chunks-toggle.patch => 0046-All-chunks-are-slime-spawn-chunks-toggle.patch} (96%)
 rename Spigot-Server-Patches/{0048-Optimize-Pathfinding.patch => 0047-Optimize-Pathfinding.patch} (96%)
 rename Spigot-Server-Patches/{0049-Avoid-hopper-searches-if-there-are-no-items.patch => 0048-Avoid-hopper-searches-if-there-are-no-items.patch} (97%)
 rename Spigot-Server-Patches/{0050-Expose-server-CommandMap.patch => 0049-Expose-server-CommandMap.patch} (90%)
 rename Spigot-Server-Patches/{0051-Be-a-bit-more-informative-in-maxHealth-exception.patch => 0050-Be-a-bit-more-informative-in-maxHealth-exception.patch} (92%)
 rename Spigot-Server-Patches/{0052-Player-Tab-List-and-Title-APIs.patch => 0051-Player-Tab-List-and-Title-APIs.patch} (99%)
 rename Spigot-Server-Patches/{0053-Ensure-inv-drag-is-in-bounds.patch => 0052-Ensure-inv-drag-is-in-bounds.patch} (93%)
 rename Spigot-Server-Patches/{0054-Change-implementation-of-tile-entity-removal-list.patch => 0053-Change-implementation-of-tile-entity-removal-list.patch} (97%)
 rename Spigot-Server-Patches/{0055-Add-configurable-portal-search-radius.patch => 0054-Add-configurable-portal-search-radius.patch} (97%)
 rename Spigot-Server-Patches/{0056-Add-velocity-warnings.patch => 0055-Add-velocity-warnings.patch} (97%)
 rename Spigot-Server-Patches/{0057-Configurable-inter-world-teleportation-safety.patch => 0056-Configurable-inter-world-teleportation-safety.patch} (98%)
 rename Spigot-Server-Patches/{0058-Add-exception-reporting-event.patch => 0057-Add-exception-reporting-event.patch} (99%)
 rename Spigot-Server-Patches/{0059-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch => 0058-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch} (95%)
 rename Spigot-Server-Patches/{0060-Disable-Scoreboards-for-non-players-by-default.patch => 0059-Disable-Scoreboards-for-non-players-by-default.patch} (97%)
 rename Spigot-Server-Patches/{0061-Add-methods-for-working-with-arrows-stuck-in-living-.patch => 0060-Add-methods-for-working-with-arrows-stuck-in-living-.patch} (93%)
 rename Spigot-Server-Patches/{0062-Complete-resource-pack-API.patch => 0061-Complete-resource-pack-API.patch} (97%)
 rename Spigot-Server-Patches/{0063-Chunk-save-queue-improvements.patch => 0062-Chunk-save-queue-improvements.patch} (95%)
 rename Spigot-Server-Patches/{0064-Chunk-Save-Reattempt.patch => 0063-Chunk-Save-Reattempt.patch} (93%)
 rename Spigot-Server-Patches/{0065-Default-loading-permissions.yml-before-plugins.patch => 0064-Default-loading-permissions.yml-before-plugins.patch} (96%)
 rename Spigot-Server-Patches/{0066-Allow-Reloading-of-Custom-Permissions.patch => 0065-Allow-Reloading-of-Custom-Permissions.patch} (95%)
 rename Spigot-Server-Patches/{0067-Remove-Metadata-on-reload.patch => 0066-Remove-Metadata-on-reload.patch} (95%)
 rename Spigot-Server-Patches/{0068-Undead-horse-leashing.patch => 0067-Undead-horse-leashing.patch} (96%)
 rename Spigot-Server-Patches/{0069-Fix-Furnace-cook-time-bug.patch => 0068-Fix-Furnace-cook-time-bug.patch} (94%)
 rename Spigot-Server-Patches/{0070-Handle-Item-Meta-Inconsistencies.patch => 0069-Handle-Item-Meta-Inconsistencies.patch} (98%)
 rename Spigot-Server-Patches/{0071-Configurable-Non-Player-Arrow-Despawn-Rate.patch => 0070-Configurable-Non-Player-Arrow-Despawn-Rate.patch} (96%)
 rename Spigot-Server-Patches/{0072-Add-World-Util-Methods.patch => 0071-Add-World-Util-Methods.patch} (93%)
 rename Spigot-Server-Patches/{0073-Optimized-Light-Level-Comparisons.patch => 0072-Optimized-Light-Level-Comparisons.patch} (98%)
 rename Spigot-Server-Patches/{0074-Pass-world-to-Village-creation.patch => 0073-Pass-world-to-Village-creation.patch} (95%)
 rename Spigot-Server-Patches/{0075-Custom-replacement-for-eaten-items.patch => 0074-Custom-replacement-for-eaten-items.patch} (97%)
 rename Spigot-Server-Patches/{0076-handle-NaN-health-absorb-values-and-repair-bad-data.patch => 0075-handle-NaN-health-absorb-values-and-repair-bad-data.patch} (97%)
 rename Spigot-Server-Patches/{0077-Catch-Async-PlayerChunkMap-operations.patch => 0076-Catch-Async-PlayerChunkMap-operations.patch} (93%)
 rename Spigot-Server-Patches/{0078-Waving-banner-workaround.patch => 0077-Waving-banner-workaround.patch} (95%)
 rename Spigot-Server-Patches/{0079-Use-a-Shared-Random-for-Entities.patch => 0078-Use-a-Shared-Random-for-Entities.patch} (95%)
 rename Spigot-Server-Patches/{0080-Don-t-teleport-dead-entities.patch => 0079-Don-t-teleport-dead-entities.patch} (93%)
 rename Spigot-Server-Patches/{0081-Optimize-Chunk-Access.patch => 0080-Optimize-Chunk-Access.patch} (95%)
 rename Spigot-Server-Patches/{0082-Configurable-spawn-chances-for-skeleton-horses.patch => 0081-Configurable-spawn-chances-for-skeleton-horses.patch} (96%)
 rename Spigot-Server-Patches/{0083-Optimize-isValidLocation-getType-and-getBlockData-fo.patch => 0082-Optimize-isValidLocation-getType-and-getBlockData-fo.patch} (98%)
 rename Spigot-Server-Patches/{0084-Access-items-by-EquipmentSlot.patch => 0083-Access-items-by-EquipmentSlot.patch} (97%)
 rename Spigot-Server-Patches/{0085-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch => 0084-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch} (97%)
 rename Spigot-Server-Patches/{0086-Entity-AddTo-RemoveFrom-World-Events.patch => 0085-Entity-AddTo-RemoveFrom-World-Events.patch} (91%)
 rename Spigot-Server-Patches/{0087-Configurable-Chunk-Inhabited-Timer.patch => 0086-Configurable-Chunk-Inhabited-Timer.patch} (94%)
 rename Spigot-Server-Patches/{0088-EntityPathfindEvent.patch => 0087-EntityPathfindEvent.patch} (96%)
 rename Spigot-Server-Patches/{0089-Reduce-IO-ops-opening-a-new-region-file.patch => 0088-Reduce-IO-ops-opening-a-new-region-file.patch} (96%)
 rename Spigot-Server-Patches/{0090-Sanitise-RegionFileCache-and-make-configurable.patch => 0089-Sanitise-RegionFileCache-and-make-configurable.patch} (98%)
 rename Spigot-Server-Patches/{0091-Use-Optimized-Collections.patch => 0090-Use-Optimized-Collections.patch} (96%)
 rename Spigot-Server-Patches/{0092-Do-not-load-chunks-for-light-checks.patch => 0091-Do-not-load-chunks-for-light-checks.patch} (90%)
 rename Spigot-Server-Patches/{0093-Add-PlayerUseUnknownEntityEvent.patch => 0092-Add-PlayerUseUnknownEntityEvent.patch} (91%)
 rename Spigot-Server-Patches/{0094-Fix-reducedDebugInfo-not-initialized-on-client.patch => 0093-Fix-reducedDebugInfo-not-initialized-on-client.patch} (94%)
 rename Spigot-Server-Patches/{0095-Configurable-Grass-Spread-Tick-Rate.patch => 0094-Configurable-Grass-Spread-Tick-Rate.patch} (96%)
 rename Spigot-Server-Patches/{0096-Configurable-Keep-Spawn-Loaded-range-per-world.patch => 0095-Configurable-Keep-Spawn-Loaded-range-per-world.patch} (95%)
 rename Spigot-Server-Patches/{0097-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch => 0096-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch} (89%)
 rename Spigot-Server-Patches/{0098-Don-t-spam-reload-spawn-chunks-in-nether-end.patch => 0097-Don-t-spam-reload-spawn-chunks-in-nether-end.patch} (92%)
 rename Spigot-Server-Patches/{0099-Remove-Debug-checks-from-DataBits.patch => 0098-Remove-Debug-checks-from-DataBits.patch} (96%)
 rename Spigot-Server-Patches/{0100-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch => 0099-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch} (96%)
 rename Spigot-Server-Patches/{0101-Workaround-for-setting-passengers-on-players.patch => 0100-Workaround-for-setting-passengers-on-players.patch} (94%)
 rename Spigot-Server-Patches/{0102-Remove-unused-World-Tile-Entity-List.patch => 0101-Remove-unused-World-Tile-Entity-List.patch} (97%)
 rename Spigot-Server-Patches/{0103-Don-t-tick-Skulls-unused-code.patch => 0102-Don-t-tick-Skulls-unused-code.patch} (92%)
 rename Spigot-Server-Patches/{0104-Configurable-Player-Collision.patch => 0103-Configurable-Player-Collision.patch} (90%)
 rename Spigot-Server-Patches/{0105-Add-handshake-event-to-allow-plugins-to-handle-clien.patch => 0104-Add-handshake-event-to-allow-plugins-to-handle-clien.patch} (97%)
 rename Spigot-Server-Patches/{0106-Configurable-RCON-IP-address.patch => 0105-Configurable-RCON-IP-address.patch} (93%)
 rename Spigot-Server-Patches/{0107-Prevent-Fire-from-loading-chunks.patch => 0106-Prevent-Fire-from-loading-chunks.patch} (97%)
 rename Spigot-Server-Patches/{0108-Implement-PlayerLocaleChangeEvent.patch => 0107-Implement-PlayerLocaleChangeEvent.patch} (98%)
 rename Spigot-Server-Patches/{0109-EntityRegainHealthEvent-isFastRegen-API.patch => 0108-EntityRegainHealthEvent-isFastRegen-API.patch} (97%)
 rename Spigot-Server-Patches/{0110-Add-ability-to-configure-frosted_ice-properties.patch => 0109-Add-ability-to-configure-frosted_ice-properties.patch} (97%)
 rename Spigot-Server-Patches/{0111-Vehicle-Event-Cancellation-Changes.patch => 0110-Vehicle-Event-Cancellation-Changes.patch} (95%)
 rename Spigot-Server-Patches/{0112-remove-null-possibility-for-getServer-singleton.patch => 0111-remove-null-possibility-for-getServer-singleton.patch} (96%)
 rename Spigot-Server-Patches/{0113-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch => 0112-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch} (98%)
 rename Spigot-Server-Patches/{0114-LootTable-API-Replenishable-Lootables-Feature.patch => 0113-LootTable-API-Replenishable-Lootables-Feature.patch} (99%)
 rename Spigot-Server-Patches/{0115-Do-not-load-chunks-for-pathfinding.patch => 0114-Do-not-load-chunks-for-pathfinding.patch} (91%)
 rename Spigot-Server-Patches/{0116-Entity-Tracking-Improvements.patch => 0115-Entity-Tracking-Improvements.patch} (97%)
 rename Spigot-Server-Patches/{0117-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch => 0116-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch} (95%)
 rename Spigot-Server-Patches/{0118-Fix-Chunk-Unload-Queue-Issues.patch => 0117-Fix-Chunk-Unload-Queue-Issues.patch} (94%)
 rename Spigot-Server-Patches/{0119-System-property-for-disabling-watchdoge.patch => 0118-System-property-for-disabling-watchdoge.patch} (92%)
 rename Spigot-Server-Patches/{0120-Optimize-EAR.patch => 0119-Optimize-EAR.patch} (97%)
 rename Spigot-Server-Patches/{0121-Optimize-UserCache-Thread-Safe.patch => 0120-Optimize-UserCache-Thread-Safe.patch} (98%)
 rename Spigot-Server-Patches/{0122-Avoid-blocking-on-Network-Manager-creation.patch => 0121-Avoid-blocking-on-Network-Manager-creation.patch} (96%)
 rename Spigot-Server-Patches/{0123-Optional-TNT-doesn-t-move-in-water.patch => 0122-Optional-TNT-doesn-t-move-in-water.patch} (97%)
 rename Spigot-Server-Patches/{0124-Faster-redstone-torch-rapid-clock-removal.patch => 0123-Faster-redstone-torch-rapid-clock-removal.patch} (96%)
 rename Spigot-Server-Patches/{0125-Ensure-Chunks-never-ever-load-async.patch => 0124-Ensure-Chunks-never-ever-load-async.patch} (97%)
 rename Spigot-Server-Patches/{0126-Add-server-name-parameter.patch => 0125-Add-server-name-parameter.patch} (92%)
 rename Spigot-Server-Patches/{0127-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch => 0126-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch} (97%)
 rename Spigot-Server-Patches/{0128-Delay-Chunk-Unloads-based-on-Player-Movement.patch => 0127-Delay-Chunk-Unloads-based-on-Player-Movement.patch} (97%)
 rename Spigot-Server-Patches/{0129-Fix-Double-World-Add-issues.patch => 0128-Fix-Double-World-Add-issues.patch} (90%)
 rename Spigot-Server-Patches/{0130-Fix-Old-Sign-Conversion.patch => 0129-Fix-Old-Sign-Conversion.patch} (99%)
 rename Spigot-Server-Patches/{0131-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch => 0130-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch} (93%)
 rename Spigot-Server-Patches/{0132-More-informative-vehicle-moved-wrongly-message.patch => 0131-More-informative-vehicle-moved-wrongly-message.patch} (91%)
 rename Spigot-Server-Patches/{0133-Re-track-players-that-dismount-from-other-players.patch => 0132-Re-track-players-that-dismount-from-other-players.patch} (94%)
 rename Spigot-Server-Patches/{0134-Add-setting-for-proxy-online-mode-status.patch => 0133-Add-setting-for-proxy-online-mode-status.patch} (97%)
 rename Spigot-Server-Patches/{0135-Optimise-BlockStateEnum-hashCode-and-equals.patch => 0134-Optimise-BlockStateEnum-hashCode-and-equals.patch} (97%)
 rename Spigot-Server-Patches/{0136-Disable-ticking-of-snow-blocks.patch => 0135-Disable-ticking-of-snow-blocks.patch} (93%)
 rename Spigot-Server-Patches/{0137-Fix-AIOOBE-in-inventory-handling.patch => 0136-Fix-AIOOBE-in-inventory-handling.patch} (85%)
 rename Spigot-Server-Patches/{0138-Configurable-packet-in-spam-threshold.patch => 0137-Configurable-packet-in-spam-threshold.patch} (95%)
 rename Spigot-Server-Patches/{0139-Configurable-flying-kick-messages.patch => 0138-Configurable-flying-kick-messages.patch} (96%)
 rename Spigot-Server-Patches/{0140-Auto-Save-Improvements.patch => 0139-Auto-Save-Improvements.patch} (98%)
 rename Spigot-Server-Patches/{0141-Chunk-registration-fixes.patch => 0140-Chunk-registration-fixes.patch} (90%)
 rename Spigot-Server-Patches/{0142-Remove-FishingHook-reference-on-Craft-Entity-removal.patch => 0141-Remove-FishingHook-reference-on-Craft-Entity-removal.patch} (93%)
 rename Spigot-Server-Patches/{0143-Auto-fix-bad-Y-levels-on-player-login.patch => 0142-Auto-fix-bad-Y-levels-on-player-login.patch} (93%)
 rename Spigot-Server-Patches/{0144-Disable-Vanilla-Chunk-GC.patch => 0143-Disable-Vanilla-Chunk-GC.patch} (95%)
 rename Spigot-Server-Patches/{0145-Option-to-remove-corrupt-tile-entities.patch => 0144-Option-to-remove-corrupt-tile-entities.patch} (97%)
 rename Spigot-Server-Patches/{0146-Add-EntityZapEvent.patch => 0145-Add-EntityZapEvent.patch} (98%)
 rename Spigot-Server-Patches/{0147-Don-t-load-Chunks-from-Hoppers-and-other-things.patch => 0146-Don-t-load-Chunks-from-Hoppers-and-other-things.patch} (96%)
 rename Spigot-Server-Patches/{0148-Prevent-Auto-Save-if-Save-Queue-is-full.patch => 0147-Prevent-Auto-Save-if-Save-Queue-is-full.patch} (94%)
 rename Spigot-Server-Patches/{0149-Chunk-Save-Stats-Debug-Option.patch => 0148-Chunk-Save-Stats-Debug-Option.patch} (93%)
 rename Spigot-Server-Patches/{0150-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch => 0149-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch} (96%)
 rename Spigot-Server-Patches/{0151-Cache-user-authenticator-threads.patch => 0150-Cache-user-authenticator-threads.patch} (97%)
 rename Spigot-Server-Patches/{0152-Optimize-Network-Queue.patch => 0151-Optimize-Network-Queue.patch} (93%)
 rename Spigot-Server-Patches/{0153-Optimise-removeQueue.patch => 0152-Optimise-removeQueue.patch} (97%)
 rename Spigot-Server-Patches/{0154-Allow-Reloading-of-Command-Aliases.patch => 0153-Allow-Reloading-of-Command-Aliases.patch} (95%)
 rename Spigot-Server-Patches/{0155-Add-source-to-PlayerExpChangeEvent.patch => 0154-Add-source-to-PlayerExpChangeEvent.patch} (97%)
 rename Spigot-Server-Patches/{0156-Optimize-World.isLoaded-BlockPosition-Z.patch => 0155-Optimize-World.isLoaded-BlockPosition-Z.patch} (90%)
 rename Spigot-Server-Patches/{0157-Don-t-let-fishinghooks-use-portals.patch => 0156-Don-t-let-fishinghooks-use-portals.patch} (95%)
 rename Spigot-Server-Patches/{0158-Add-ProjectileCollideEvent.patch => 0157-Add-ProjectileCollideEvent.patch} (98%)
 rename Spigot-Server-Patches/{0159-Prevent-Pathfinding-out-of-World-Border.patch => 0158-Prevent-Pathfinding-out-of-World-Border.patch} (97%)
 rename Spigot-Server-Patches/{0160-Bound-Treasure-Maps-to-World-Border.patch => 0159-Bound-Treasure-Maps-to-World-Border.patch} (97%)
 rename Spigot-Server-Patches/{0161-Configurable-Cartographer-Treasure-Maps.patch => 0160-Configurable-Cartographer-Treasure-Maps.patch} (97%)
 rename Spigot-Server-Patches/{0162-Optimize-ItemStack.isEmpty.patch => 0161-Optimize-ItemStack.isEmpty.patch} (83%)
 rename Spigot-Server-Patches/{0163-Add-API-methods-to-control-if-armour-stands-can-move.patch => 0162-Add-API-methods-to-control-if-armour-stands-can-move.patch} (96%)
 rename Spigot-Server-Patches/{0164-Add-option-to-remove-invalid-statistics.patch => 0163-Add-option-to-remove-invalid-statistics.patch} (97%)
 rename Spigot-Server-Patches/{0165-Properly-fix-item-duplication-bug.patch => 0164-Properly-fix-item-duplication-bug.patch} (89%)
 rename Spigot-Server-Patches/{0166-String-based-Action-Bar-API.patch => 0165-String-based-Action-Bar-API.patch} (93%)
 rename Spigot-Server-Patches/{0167-Activation-Range-Improvements.patch => 0166-Activation-Range-Improvements.patch} (99%)
 rename Spigot-Server-Patches/{0168-Firework-API-s.patch => 0167-Firework-API-s.patch} (96%)
 rename Spigot-Server-Patches/{0169-PlayerTeleportEndGatewayEvent.patch => 0168-PlayerTeleportEndGatewayEvent.patch} (95%)
 rename Spigot-Server-Patches/{0170-ShulkerBox-Dupe-Prevention.patch => 0169-ShulkerBox-Dupe-Prevention.patch} (94%)
 rename Spigot-Server-Patches/{0171-Provide-E-TE-Chunk-count-stat-methods.patch => 0170-Provide-E-TE-Chunk-count-stat-methods.patch} (94%)
 rename Spigot-Server-Patches/{0172-Enforce-Sync-Player-Saves.patch => 0171-Enforce-Sync-Player-Saves.patch} (81%)
 rename Spigot-Server-Patches/{0173-Enforce-Sync-Chunk-Unloads.patch => 0172-Enforce-Sync-Chunk-Unloads.patch} (83%)
 rename Spigot-Server-Patches/{0174-Don-t-allow-entities-to-ride-themselves-572.patch => 0173-Don-t-allow-entities-to-ride-themselves-572.patch} (93%)
 rename Spigot-Server-Patches/{0175-Fix-block-break-desync.patch => 0174-Fix-block-break-desync.patch} (91%)
 rename Spigot-Server-Patches/{0177-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch => 0175-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch} (98%)
 delete mode 100644 Spigot-Server-Patches/0176-Assign-the-World-in-WorldGenStronghold.patch
 rename Spigot-Server-Patches/{0178-Cap-Entity-Collisions.patch => 0176-Cap-Entity-Collisions.patch} (97%)
 rename Spigot-Server-Patches/{0179-Remove-CraftScheduler-Async-Task-Debugger.patch => 0177-Remove-CraftScheduler-Async-Task-Debugger.patch} (97%)
 rename Spigot-Server-Patches/{0180-Shame-on-you-Mojang.patch => 0178-Shame-on-you-Mojang.patch} (94%)
 rename Spigot-Server-Patches/{0181-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch => 0179-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch} (94%)
 rename Spigot-Server-Patches/{0182-Do-not-let-armorstands-drown.patch => 0180-Do-not-let-armorstands-drown.patch} (96%)
 rename Spigot-Server-Patches/{0183-Properly-handle-async-calls-to-restart-the-server.patch => 0181-Properly-handle-async-calls-to-restart-the-server.patch} (98%)
 rename Spigot-Server-Patches/{0184-Add-system-property-to-disable-book-size-limits.patch => 0182-Add-system-property-to-disable-book-size-limits.patch} (97%)
 rename Spigot-Server-Patches/{0185-Add-option-to-make-parrots-stay-on-shoulders-despite.patch => 0183-Add-option-to-make-parrots-stay-on-shoulders-despite.patch} (95%)
 rename Spigot-Server-Patches/{0186-Add-configuration-option-to-prevent-player-names-fro.patch => 0184-Add-configuration-option-to-prevent-player-names-fro.patch} (95%)
 rename Spigot-Server-Patches/{0187-Use-TerminalConsoleAppender-for-console-improvements.patch => 0185-Use-TerminalConsoleAppender-for-console-improvements.patch} (99%)
 rename Spigot-Server-Patches/{0188-provide-a-configurable-option-to-disable-creeper-lin.patch => 0186-provide-a-configurable-option-to-disable-creeper-lin.patch} (96%)
 rename Spigot-Server-Patches/{0189-Item-canEntityPickup.patch => 0187-Item-canEntityPickup.patch} (97%)
 rename Spigot-Server-Patches/{0190-PlayerPickupItemEvent-setFlyAtPlayer.patch => 0188-PlayerPickupItemEvent-setFlyAtPlayer.patch} (97%)
 rename Spigot-Server-Patches/{0191-PlayerAttemptPickupItemEvent.patch => 0189-PlayerAttemptPickupItemEvent.patch} (96%)
 rename Spigot-Server-Patches/{0192-Add-UnknownCommandEvent.patch => 0190-Add-UnknownCommandEvent.patch} (95%)
 rename Spigot-Server-Patches/{0193-Basic-PlayerProfile-API.patch => 0191-Basic-PlayerProfile-API.patch} (99%)
 rename Spigot-Server-Patches/{0194-Shoulder-Entities-Release-API.patch => 0192-Shoulder-Entities-Release-API.patch} (97%)
 rename Spigot-Server-Patches/{0195-Profile-Lookup-Events.patch => 0193-Profile-Lookup-Events.patch} (98%)
 rename Spigot-Server-Patches/{0196-Block-player-logins-during-server-shutdown.patch => 0194-Block-player-logins-during-server-shutdown.patch} (94%)
 rename Spigot-Server-Patches/{0197-Entity-fromMobSpawner.patch => 0195-Entity-fromMobSpawner.patch} (98%)
 rename Spigot-Server-Patches/{0198-Fix-Anvil-Level-sync-to-client.patch => 0196-Fix-Anvil-Level-sync-to-client.patch} (91%)
 rename Spigot-Server-Patches/{0199-Add-missing-coverages-for-getTileEntity-in-order-to-.patch => 0197-Add-missing-coverages-for-getTileEntity-in-order-to-.patch} (94%)
 rename Spigot-Server-Patches/{0200-Improve-the-Saddle-API-for-Horses.patch => 0198-Improve-the-Saddle-API-for-Horses.patch} (97%)
 rename Spigot-Server-Patches/{0201-Implement-ensureServerConversions-API.patch => 0199-Implement-ensureServerConversions-API.patch} (94%)
 rename Spigot-Server-Patches/{0202-Implement-getI18NDisplayName.patch => 0200-Implement-getI18NDisplayName.patch} (95%)
 rename Spigot-Server-Patches/{0203-GH-806-Respect-saving-disabled-before-unloading-all-.patch => 0201-GH-806-Respect-saving-disabled-before-unloading-all-.patch} (94%)
 rename Spigot-Server-Patches/{0204-ProfileWhitelistVerifyEvent.patch => 0202-ProfileWhitelistVerifyEvent.patch} (92%)
 rename Spigot-Server-Patches/{0205-Fix-this-stupid-bullshit.patch => 0203-Fix-this-stupid-bullshit.patch} (96%)
 rename Spigot-Server-Patches/{0206-Ocelot-despawns-should-honor-nametags-and-leash.patch => 0204-Ocelot-despawns-should-honor-nametags-and-leash.patch} (93%)
 rename Spigot-Server-Patches/{0207-Reset-spawner-timer-when-spawner-event-is-cancelled.patch => 0205-Reset-spawner-timer-when-spawner-event-is-cancelled.patch} (95%)
 rename Spigot-Server-Patches/{0208-Fix-MC-117075-TE-Unload-Lag-Spike.patch => 0206-Fix-MC-117075-TE-Unload-Lag-Spike.patch} (92%)
 rename Spigot-Server-Patches/{0209-Allow-specifying-a-custom-authentication-servers-dow.patch => 0207-Allow-specifying-a-custom-authentication-servers-dow.patch} (97%)
 rename Spigot-Server-Patches/{0210-LivingEntity-setKiller.patch => 0208-LivingEntity-setKiller.patch} (95%)
 rename Spigot-Server-Patches/{0212-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch => 0209-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch} (95%)
 rename Spigot-Server-Patches/{0213-Handle-plugin-prefixes-using-Log4J-configuration.patch => 0210-Handle-plugin-prefixes-using-Log4J-configuration.patch} (97%)
 delete mode 100644 Spigot-Server-Patches/0211-Anti-Xray.patch
 rename Spigot-Server-Patches/{0214-Include-Log4J2-SLF4J-implementation.patch => 0211-Include-Log4J2-SLF4J-implementation.patch} (87%)
 rename Spigot-Server-Patches/{0215-Disable-logger-prefix-for-various-plugins-bypassing-.patch => 0212-Disable-logger-prefix-for-various-plugins-bypassing-.patch} (97%)
 rename Spigot-Server-Patches/{0216-Add-PlayerJumpEvent.patch => 0213-Add-PlayerJumpEvent.patch} (97%)
 rename Spigot-Server-Patches/{0217-handle-PacketPlayInKeepAlive-async.patch => 0214-handle-PacketPlayInKeepAlive-async.patch} (92%)
 rename Spigot-Server-Patches/{0218-Expose-client-protocol-version-and-virtual-host.patch => 0215-Expose-client-protocol-version-and-virtual-host.patch} (98%)
 rename Spigot-Server-Patches/{0219-revert-serverside-behavior-of-keepalives.patch => 0216-revert-serverside-behavior-of-keepalives.patch} (92%)
 rename Spigot-Server-Patches/{0220-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch => 0217-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch} (95%)
 rename Spigot-Server-Patches/{0221-Send-attack-SoundEffects-only-to-players-who-can-see.patch => 0218-Send-attack-SoundEffects-only-to-players-who-can-see.patch} (96%)
 rename Spigot-Server-Patches/{0222-Option-for-maximum-exp-value-when-merging-orbs.patch => 0219-Option-for-maximum-exp-value-when-merging-orbs.patch} (80%)
 rename Spigot-Server-Patches/{0223-Add-PlayerArmorChangeEvent.patch => 0220-Add-PlayerArmorChangeEvent.patch} (97%)
 rename Spigot-Server-Patches/{0224-Prevent-logins-from-being-processed-when-the-player-.patch => 0221-Prevent-logins-from-being-processed-when-the-player-.patch} (94%)
 rename Spigot-Server-Patches/{0225-use-CB-BlockState-implementations-for-captured-block.patch => 0222-use-CB-BlockState-implementations-for-captured-block.patch} (91%)
 rename Spigot-Server-Patches/{0226-API-to-get-a-BlockState-without-a-snapshot.patch => 0223-API-to-get-a-BlockState-without-a-snapshot.patch} (97%)
 rename Spigot-Server-Patches/{0227-AsyncTabCompleteEvent.patch => 0224-AsyncTabCompleteEvent.patch} (98%)
 rename Spigot-Server-Patches/{0228-Avoid-NPE-in-PathfinderGoalTempt.patch => 0225-Avoid-NPE-in-PathfinderGoalTempt.patch} (93%)
 rename Spigot-Server-Patches/{0229-PlayerPickupExperienceEvent.patch => 0226-PlayerPickupExperienceEvent.patch} (94%)
 rename Spigot-Server-Patches/{0230-ExperienceOrbMergeEvent.patch => 0227-ExperienceOrbMergeEvent.patch} (89%)
 rename Spigot-Server-Patches/{0231-Ability-to-apply-mending-to-XP-API.patch => 0228-Ability-to-apply-mending-to-XP-API.patch} (89%)
 rename Spigot-Server-Patches/{0232-Configurable-Chunks-Sends-per-Tick-setting.patch => 0229-Configurable-Chunks-Sends-per-Tick-setting.patch} (91%)
 rename Spigot-Server-Patches/{0233-Make-max-squid-spawn-height-configurable.patch => 0230-Make-max-squid-spawn-height-configurable.patch} (93%)
 rename Spigot-Server-Patches/{0234-PreCreatureSpawnEvent.patch => 0231-PreCreatureSpawnEvent.patch} (98%)
 rename Spigot-Server-Patches/{0235-PlayerNaturallySpawnCreaturesEvent.patch => 0232-PlayerNaturallySpawnCreaturesEvent.patch} (96%)
 rename Spigot-Server-Patches/{0236-Add-SkullMeta.setPlayerProfile-API.patch => 0233-Add-SkullMeta.setPlayerProfile-API.patch} (96%)
 rename Spigot-Server-Patches/{0237-Fill-Profile-Property-Events.patch => 0234-Fill-Profile-Property-Events.patch} (96%)
 rename Spigot-Server-Patches/{0238-PlayerAdvancementCriterionGrantEvent.patch => 0235-PlayerAdvancementCriterionGrantEvent.patch} (94%)
 rename Spigot-Server-Patches/{0239-Add-ArmorStand-Item-Meta.patch => 0236-Add-ArmorStand-Item-Meta.patch} (96%)
 rename Spigot-Server-Patches/{0240-Extend-Player-Interact-cancellation.patch => 0237-Extend-Player-Interact-cancellation.patch} (95%)
 rename Spigot-Server-Patches/{0241-Tameable-getOwnerUniqueId-API.patch => 0238-Tameable-getOwnerUniqueId-API.patch} (96%)
 rename Spigot-Server-Patches/{0242-Toggleable-player-crits-helps-mitigate-hacked-client.patch => 0239-Toggleable-player-crits-helps-mitigate-hacked-client.patch} (91%)
 rename Spigot-Server-Patches/{0243-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch => 0240-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch} (95%)
 rename Spigot-Server-Patches/{0244-Prevent-Frosted-Ice-from-loading-holding-chunks.patch => 0241-Prevent-Frosted-Ice-from-loading-holding-chunks.patch} (96%)
 rename Spigot-Server-Patches/{0245-Disable-Explicit-Network-Manager-Flushing.patch => 0242-Disable-Explicit-Network-Manager-Flushing.patch} (96%)
 rename Spigot-Server-Patches/{0246-Implement-extended-PaperServerListPingEvent.patch => 0243-Implement-extended-PaperServerListPingEvent.patch} (99%)
 rename Spigot-Server-Patches/{0247-Improved-Async-Task-Scheduler.patch => 0244-Improved-Async-Task-Scheduler.patch} (99%)
 rename Spigot-Server-Patches/{0248-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch => 0245-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch} (97%)
 rename Spigot-Server-Patches/{0249-Call-PortalCreateEvent-for-exit-portals.patch => 0246-Call-PortalCreateEvent-for-exit-portals.patch} (98%)
 rename Spigot-Server-Patches/{0250-Player.setPlayerProfile-API.patch => 0247-Player.setPlayerProfile-API.patch} (98%)
 rename Spigot-Server-Patches/{0251-Fix-Dragon-Server-Crashes.patch => 0248-Fix-Dragon-Server-Crashes.patch} (95%)
 rename Spigot-Server-Patches/{0252-getPlayerUniqueId-API.patch => 0249-getPlayerUniqueId-API.patch} (96%)
 rename Spigot-Server-Patches/{0253-Make-player-data-saving-configurable.patch => 0250-Make-player-data-saving-configurable.patch} (96%)
 rename Spigot-Server-Patches/{0254-Make-legacy-ping-handler-more-reliable.patch => 0251-Make-legacy-ping-handler-more-reliable.patch} (98%)
 rename Spigot-Server-Patches/{0255-Call-PaperServerListPingEvent-for-legacy-pings.patch => 0252-Call-PaperServerListPingEvent-for-legacy-pings.patch} (99%)
 rename Spigot-Server-Patches/{0256-Flag-to-disable-the-channel-limit.patch => 0253-Flag-to-disable-the-channel-limit.patch} (94%)
 rename Spigot-Server-Patches/{0257-Add-method-to-open-already-placed-sign.patch => 0254-Add-method-to-open-already-placed-sign.patch} (95%)
 rename Spigot-Server-Patches/{0258-Load-version-history-at-server-start.patch => 0255-Load-version-history-at-server-start.patch} (93%)
 rename Spigot-Server-Patches/{0259-Configurable-sprint-interruption-on-attack.patch => 0256-Configurable-sprint-interruption-on-attack.patch} (92%)
 rename Spigot-Server-Patches/{0260-Fix-exploit-that-allowed-colored-signs-to-be-created.patch => 0257-Fix-exploit-that-allowed-colored-signs-to-be-created.patch} (87%)
 rename Spigot-Server-Patches/{0261-EndermanEscapeEvent.patch => 0258-EndermanEscapeEvent.patch} (98%)
 rename Spigot-Server-Patches/{0262-Enderman.teleportRandomly.patch => 0259-Enderman.teleportRandomly.patch} (96%)
 rename Spigot-Server-Patches/{0263-Block-Enderpearl-Travel-Exploit.patch => 0260-Block-Enderpearl-Travel-Exploit.patch} (86%)
 rename Spigot-Server-Patches/{0264-Expand-World.spawnParticle-API-and-add-Builder.patch => 0261-Expand-World.spawnParticle-API-and-add-Builder.patch} (96%)
 rename Spigot-Server-Patches/{0265-EndermanAttackPlayerEvent.patch => 0262-EndermanAttackPlayerEvent.patch} (95%)
 rename Spigot-Server-Patches/{0266-WitchConsumePotionEvent.patch => 0263-WitchConsumePotionEvent.patch} (95%)
 rename Spigot-Server-Patches/{0267-WitchThrowPotionEvent.patch => 0264-WitchThrowPotionEvent.patch} (96%)
 rename Spigot-Server-Patches/{0268-Allow-spawning-Item-entities-with-World.spawnEntity.patch => 0265-Allow-spawning-Item-entities-with-World.spawnEntity.patch} (88%)
 rename Spigot-Server-Patches/{0269-Don-t-load-chunks-for-villager-door-checks.patch => 0266-Don-t-load-chunks-for-villager-door-checks.patch} (93%)
 rename Spigot-Server-Patches/{0270-WitchReadyPotionEvent.patch => 0267-WitchReadyPotionEvent.patch} (95%)
 rename Spigot-Server-Patches/{0271-ItemStack-getMaxItemUseDuration.patch => 0268-ItemStack-getMaxItemUseDuration.patch} (90%)
 rename Spigot-Server-Patches/{0272-Implement-EntityTeleportEndGatewayEvent.patch => 0269-Implement-EntityTeleportEndGatewayEvent.patch} (96%)
 rename Spigot-Server-Patches/{0273-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch => 0270-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch} (95%)
 rename Spigot-Server-Patches/{0274-Properly-remove-entities-on-dimension-teleport.patch => 0271-Properly-remove-entities-on-dimension-teleport.patch} (97%)
 rename Spigot-Server-Patches/{0275-Fix-CraftEntity-hashCode.patch => 0272-Fix-CraftEntity-hashCode.patch} (96%)
 rename Spigot-Server-Patches/{0276-Configurable-Alternative-LootPool-Luck-Formula.patch => 0273-Configurable-Alternative-LootPool-Luck-Formula.patch} (97%)
 rename Spigot-Server-Patches/{0277-Print-Error-details-when-failing-to-save-player-data.patch => 0274-Print-Error-details-when-failing-to-save-player-data.patch} (93%)
 rename Spigot-Server-Patches/{0278-Make-shield-blocking-delay-configurable.patch => 0275-Make-shield-blocking-delay-configurable.patch} (95%)
 rename Spigot-Server-Patches/{0279-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch => 0276-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch} (96%)
 rename Spigot-Server-Patches/{0280-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch => 0277-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch} (98%)
 rename Spigot-Server-Patches/{0281-PlayerReadyArrowEvent.patch => 0278-PlayerReadyArrowEvent.patch} (98%)
 rename Spigot-Server-Patches/{0282-Fire-EntityShootBowEvent-for-Illusioner.patch => 0279-Fire-EntityShootBowEvent-for-Illusioner.patch} (95%)
 rename Spigot-Server-Patches/{0283-Implement-EntityKnockbackByEntityEvent.patch => 0280-Implement-EntityKnockbackByEntityEvent.patch} (96%)
 rename Spigot-Server-Patches/{0284-Expand-Explosions-API.patch => 0281-Expand-Explosions-API.patch} (87%)
 rename Spigot-Server-Patches/{0285-LivingEntity-Hand-Raised-Item-Use-API.patch => 0282-LivingEntity-Hand-Raised-Item-Use-API.patch} (96%)
 rename Spigot-Server-Patches/{0286-RangedEntity-API.patch => 0283-RangedEntity-API.patch} (99%)
 rename Spigot-Server-Patches/{0287-Add-SentientNPC-Interface-to-Entities.patch => 0284-Add-SentientNPC-Interface-to-Entities.patch} (99%)
 rename Spigot-Server-Patches/{0288-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch => 0285-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch} (95%)
 rename Spigot-Server-Patches/{0289-Add-config-to-disable-ender-dragon-legacy-check.patch => 0286-Add-config-to-disable-ender-dragon-legacy-check.patch} (94%)
 rename Spigot-Server-Patches/{0290-Implement-World.getEntity-UUID-API.patch => 0287-Implement-World.getEntity-UUID-API.patch} (82%)
 rename Spigot-Server-Patches/{0291-InventoryCloseEvent-Reason-API.patch => 0288-InventoryCloseEvent-Reason-API.patch} (97%)
 rename Spigot-Server-Patches/{0292-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch => 0289-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch} (91%)
 rename Spigot-Server-Patches/{0293-Configurable-Bed-Search-Radius.patch => 0290-Configurable-Bed-Search-Radius.patch} (96%)
 rename Spigot-Server-Patches/{0294-Vex-getOwner-API.patch => 0291-Vex-getOwner-API.patch} (96%)
 rename Spigot-Server-Patches/{0295-Refresh-player-inventory-when-cancelling-PlayerInter.patch => 0292-Refresh-player-inventory-when-cancelling-PlayerInter.patch} (88%)
 rename {Spigot-API-Patches => removed/api}/0006-Add-async-chunk-load-API.patch (100%)
 rename removed/{ => server}/0017-Configurable-speed-for-water-flowing-over-lava.patch (100%)
 rename {Spigot-Server-Patches => removed/server}/0023-Add-async-chunk-load-API.patch (100%)
 rename removed/{ => server}/0033-Generator-Settings.patch (100%)
 rename removed/{ => server}/0035-Stop-updating-flowing-block-if-material-has-changed.patch (100%)
 rename removed/{ => server}/0036-Fast-draining.patch (100%)
 rename removed/{ => server}/0037-Configurable-lava-flow-speed.patch (100%)
 rename removed/{ => server}/0080-Custom-replacement-for-eaten-items.patch (100%)
 rename removed/{ => server}/0097-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch (100%)
 rename removed/{ => server}/0115-Water-mobs-should-only-spawn-in-the-water.patch (100%)
 rename removed/{ => server}/0123-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch (100%)
 rename removed/{ => server}/0130-Do-not-mark-chunks-as-active-for-neighbor-updates.patch (100%)
 rename removed/{ => server}/0174-Speedup-BlockPos-by-fixing-inlining.patch (100%)
 rename removed/{ => server}/0177-Vanished-players-don-t-have-rights.patch (100%)
 rename removed/{ => server}/0183-Option-to-prevent-armor-stands-from-doing-entity-loo.patch (100%)
 rename removed/{ => server}/0184-Add-option-to-remove-invalid-statistics.patch (100%)
 rename removed/{ => server}/0185-IllegalPacketEvent.patch (100%)
 rename removed/{ => server}/0197-Assign-the-World-in-WorldGenStronghold.patch (100%)
 rename removed/{ => server}/0200-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch (100%)
 rename removed/{ => server}/0231-MC-94186-Fix-dragon-egg-falling-in-lazy-chunks.patch (100%)
 rename removed/{ => server}/0235-Anti-Xray.patch (100%)
 rename removed/{ => server}/0248-Improve-Structures-Checking.patch (100%)
 rename removed/{ => server}/0259-Configurable-Max-Chunk-Gens-per-Tick.patch (100%)
 rename removed/{ => server}/0269-Optimize-Hoppers.patch (100%)
 rename removed/{ => server}/0280-Configurable-Unrestricted-Signs.patch (100%)
 rename removed/{ => server}/0290-Handle-bad-chunks-more-gracefully.patch (100%)
 rename removed/{ => server}/0292-Configurable-Allowance-of-Permanent-Chunk-Loaders.patch (100%)

diff --git a/Spigot-API-Patches/0007-Entity-Origin-API.patch b/Spigot-API-Patches/0006-Entity-Origin-API.patch
similarity index 97%
rename from Spigot-API-Patches/0007-Entity-Origin-API.patch
rename to Spigot-API-Patches/0006-Entity-Origin-API.patch
index d6d800d532..afc96b456b 100644
--- a/Spigot-API-Patches/0007-Entity-Origin-API.patch
+++ b/Spigot-API-Patches/0006-Entity-Origin-API.patch
@@ -1,4 +1,4 @@
-From 6930a5ac9c5a9fba958a9d72769f6be40c406fd0 Mon Sep 17 00:00:00 2001
+From 4e2445c63fba52523da6ce11e8cf8a241cf593f3 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Mon, 29 Feb 2016 17:50:31 -0600
 Subject: [PATCH] Entity Origin API
diff --git a/Spigot-API-Patches/0008-Check-Paper-versions.patch b/Spigot-API-Patches/0007-Check-Paper-versions.patch
similarity index 98%
rename from Spigot-API-Patches/0008-Check-Paper-versions.patch
rename to Spigot-API-Patches/0007-Check-Paper-versions.patch
index 0460ad0725..db86794a81 100644
--- a/Spigot-API-Patches/0008-Check-Paper-versions.patch
+++ b/Spigot-API-Patches/0007-Check-Paper-versions.patch
@@ -1,4 +1,4 @@
-From 5a25f66a6e73b622258aeee69d25128aed24693a Mon Sep 17 00:00:00 2001
+From e620711210aa3c63c7db3c39154cfecd9acc9e08 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 29 Feb 2016 17:58:01 -0600
 Subject: [PATCH] Check Paper versions
@@ -148,5 +148,5 @@ index 760d58eb..044361af 100644
 +    // Paper end
  }
 -- 
-2.17.0
+2.18.0
 
diff --git a/Spigot-API-Patches/0009-Add-PlayerLocaleChangeEvent.patch b/Spigot-API-Patches/0008-Add-PlayerLocaleChangeEvent.patch
similarity index 95%
rename from Spigot-API-Patches/0009-Add-PlayerLocaleChangeEvent.patch
rename to Spigot-API-Patches/0008-Add-PlayerLocaleChangeEvent.patch
index d98baa00cd..d9c29d8322 100644
--- a/Spigot-API-Patches/0009-Add-PlayerLocaleChangeEvent.patch
+++ b/Spigot-API-Patches/0008-Add-PlayerLocaleChangeEvent.patch
@@ -1,4 +1,4 @@
-From c05775d4577ba7f7af96d9cb1328fb26319b68aa Mon Sep 17 00:00:00 2001
+From 501e01d868ec3f41f8aa3a1bebc83b4305723b42 Mon Sep 17 00:00:00 2001
 From: Isaac Moore <rmsy@me.com>
 Date: Mon, 29 Feb 2016 18:02:25 -0600
 Subject: [PATCH] Add PlayerLocaleChangeEvent
@@ -61,5 +61,5 @@ index 00000000..29dd763a
 +    }
 +}
 -- 
-2.13.0.windows.1
+2.18.0
 
diff --git a/Spigot-API-Patches/0010-Add-player-view-distance-API.patch b/Spigot-API-Patches/0009-Add-player-view-distance-API.patch
similarity index 90%
rename from Spigot-API-Patches/0010-Add-player-view-distance-API.patch
rename to Spigot-API-Patches/0009-Add-player-view-distance-API.patch
index 0ee4320d73..8f757a13b6 100644
--- a/Spigot-API-Patches/0010-Add-player-view-distance-API.patch
+++ b/Spigot-API-Patches/0009-Add-player-view-distance-API.patch
@@ -1,11 +1,11 @@
-From 94631204e639719102979cff8ef0d8445543d40c Mon Sep 17 00:00:00 2001
+From a046e06ee22190a42f8ec203d7b106a9271c09f2 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Mon, 29 Feb 2016 18:05:37 -0600
 Subject: [PATCH] Add player view distance API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 0481f15b..868d0374 100644
+index 25e44028..7f215f1a 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1450,6 +1450,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
diff --git a/Spigot-API-Patches/0011-Add-BeaconEffectEvent.patch b/Spigot-API-Patches/0010-Add-BeaconEffectEvent.patch
similarity index 95%
rename from Spigot-API-Patches/0011-Add-BeaconEffectEvent.patch
rename to Spigot-API-Patches/0010-Add-BeaconEffectEvent.patch
index 2a346c3cc5..ad3b9b75cd 100644
--- a/Spigot-API-Patches/0011-Add-BeaconEffectEvent.patch
+++ b/Spigot-API-Patches/0010-Add-BeaconEffectEvent.patch
@@ -1,4 +1,4 @@
-From 0aa465c3441c5e1668d2437c0c6cf5dc15b1744d Mon Sep 17 00:00:00 2001
+From e9e1ec6471574850b8eb0cd61bb019a05d7adbb2 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Mon, 29 Feb 2016 18:09:40 -0600
 Subject: [PATCH] Add BeaconEffectEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] Add BeaconEffectEvent
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/block/BeaconEffectEvent.java b/src/main/java/com/destroystokyo/paper/event/block/BeaconEffectEvent.java
 new file mode 100644
-index 0000000..6579ae9
+index 00000000..6579ae99
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/block/BeaconEffectEvent.java
 @@ -0,0 +1,81 @@
@@ -92,5 +92,5 @@ index 0000000..6579ae9
 +    }
 +}
 -- 
-2.9.2.windows.1
+2.18.0
 
diff --git a/Spigot-API-Patches/0012-Add-PlayerInitialSpawnEvent.patch b/Spigot-API-Patches/0011-Add-PlayerInitialSpawnEvent.patch
similarity index 94%
rename from Spigot-API-Patches/0012-Add-PlayerInitialSpawnEvent.patch
rename to Spigot-API-Patches/0011-Add-PlayerInitialSpawnEvent.patch
index b203f65f42..f7df8de7fc 100644
--- a/Spigot-API-Patches/0012-Add-PlayerInitialSpawnEvent.patch
+++ b/Spigot-API-Patches/0011-Add-PlayerInitialSpawnEvent.patch
@@ -1,4 +1,4 @@
-From f41fd8808accbe9c7771647d3beddc54fc5e7036 Mon Sep 17 00:00:00 2001
+From facd6dc1bbfc8a8f13398666f37d86892ce761cc Mon Sep 17 00:00:00 2001
 From: Steve Anton <anxuiz.nx@gmail.com>
 Date: Mon, 29 Feb 2016 18:13:58 -0600
 Subject: [PATCH] Add PlayerInitialSpawnEvent
@@ -7,7 +7,7 @@ For modifying a player's initial spawn location as they join the server
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerInitialSpawnEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerInitialSpawnEvent.java
 new file mode 100644
-index 0000000..d1d6f33
+index 00000000..d1d6f33c
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerInitialSpawnEvent.java
 @@ -0,0 +1,43 @@
@@ -55,5 +55,5 @@ index 0000000..d1d6f33
 +    }
 +}
 -- 
-2.10.0.windows.1
+2.18.0
 
diff --git a/Spigot-API-Patches/0013-Made-EntityDismountEvent-Cancellable.patch b/Spigot-API-Patches/0012-Made-EntityDismountEvent-Cancellable.patch
similarity index 92%
rename from Spigot-API-Patches/0013-Made-EntityDismountEvent-Cancellable.patch
rename to Spigot-API-Patches/0012-Made-EntityDismountEvent-Cancellable.patch
index 5e3a5c90e8..3b8d8a99cd 100644
--- a/Spigot-API-Patches/0013-Made-EntityDismountEvent-Cancellable.patch
+++ b/Spigot-API-Patches/0012-Made-EntityDismountEvent-Cancellable.patch
@@ -1,11 +1,11 @@
-From c5908bf5ae2b8e9dc4058efb952dc182561ec098 Mon Sep 17 00:00:00 2001
+From 8afe8ac5e2901bf492b1465e4a5ec43117bebdc2 Mon Sep 17 00:00:00 2001
 From: Nik Gil <nikmanG@users.noreply.github.com>
 Date: Mon, 29 Feb 2016 19:42:10 -0600
 Subject: [PATCH] Made EntityDismountEvent Cancellable
 
 
 diff --git a/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java b/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java
-index 24d4942..ce989bb 100644
+index 24d4942a..ce989bb1 100644
 --- a/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java
 +++ b/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java
 @@ -1,6 +1,7 @@
@@ -43,5 +43,5 @@ index 24d4942..ce989bb 100644
 +    // Paper end
  }
 -- 
-2.9.2.windows.1
+2.18.0
 
diff --git a/Spigot-API-Patches/0014-Automatically-disable-plugins-that-fail-to-load.patch b/Spigot-API-Patches/0013-Automatically-disable-plugins-that-fail-to-load.patch
similarity index 94%
rename from Spigot-API-Patches/0014-Automatically-disable-plugins-that-fail-to-load.patch
rename to Spigot-API-Patches/0013-Automatically-disable-plugins-that-fail-to-load.patch
index fc6a5cc467..eef236b0a7 100644
--- a/Spigot-API-Patches/0014-Automatically-disable-plugins-that-fail-to-load.patch
+++ b/Spigot-API-Patches/0013-Automatically-disable-plugins-that-fail-to-load.patch
@@ -1,4 +1,4 @@
-From a550e7f0f5f00bea6d9b453614818877a470ebb6 Mon Sep 17 00:00:00 2001
+From 283da38a9b2ea8a978ea570e8446f487caaf6f10 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 29 Feb 2016 19:45:21 -0600
 Subject: [PATCH] Automatically disable plugins that fail to load
diff --git a/Spigot-API-Patches/0015-Expose-server-CommandMap.patch b/Spigot-API-Patches/0014-Expose-server-CommandMap.patch
similarity index 97%
rename from Spigot-API-Patches/0015-Expose-server-CommandMap.patch
rename to Spigot-API-Patches/0014-Expose-server-CommandMap.patch
index f843bb2cf5..1294089752 100644
--- a/Spigot-API-Patches/0015-Expose-server-CommandMap.patch
+++ b/Spigot-API-Patches/0014-Expose-server-CommandMap.patch
@@ -1,4 +1,4 @@
-From 4c420ccc71dd397e1a2de5a060165442d05a2a94 Mon Sep 17 00:00:00 2001
+From d7b3294ee2ca409a7de9da69d863974ee1823872 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Mon, 29 Feb 2016 19:48:59 -0600
 Subject: [PATCH] Expose server CommandMap
diff --git a/Spigot-API-Patches/0016-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch b/Spigot-API-Patches/0015-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
similarity index 97%
rename from Spigot-API-Patches/0016-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
rename to Spigot-API-Patches/0015-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
index 8cfa8f262c..7786d2feda 100644
--- a/Spigot-API-Patches/0016-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
+++ b/Spigot-API-Patches/0015-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
@@ -1,4 +1,4 @@
-From dacfc488e4c39d47f1abd93ced7ec81d92909d38 Mon Sep 17 00:00:00 2001
+From 3b0d21ce147ba8825a3e5b64923a11d1a81fdbbf Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 29 Feb 2016 19:54:32 -0600
 Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
@@ -68,7 +68,7 @@ index 2b43ac1f..d8ce8173 100644
       * Gets the name of the update folder. The update folder is used to safely
       * update plugins at the right moment on a plugin load.
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 868d0374..c2977dc4 100644
+index 7f215f1a..f4d1ade5 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -392,6 +392,36 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
diff --git a/Spigot-API-Patches/0017-Player-Tab-List-and-Title-APIs.patch b/Spigot-API-Patches/0016-Player-Tab-List-and-Title-APIs.patch
similarity index 99%
rename from Spigot-API-Patches/0017-Player-Tab-List-and-Title-APIs.patch
rename to Spigot-API-Patches/0016-Player-Tab-List-and-Title-APIs.patch
index 7c5de59fd7..ae28c173df 100644
--- a/Spigot-API-Patches/0017-Player-Tab-List-and-Title-APIs.patch
+++ b/Spigot-API-Patches/0016-Player-Tab-List-and-Title-APIs.patch
@@ -1,4 +1,4 @@
-From f92adf1fcee4fba200652a7cc9fea03897c26bb4 Mon Sep 17 00:00:00 2001
+From e5ee86a01a83c6c38f2ad58a4e534af73d54847c Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Mon, 29 Feb 2016 20:02:40 -0600
 Subject: [PATCH] Player Tab List and Title APIs
@@ -369,7 +369,7 @@ index 00000000..3c2b63db
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index c2977dc4..5dbec412 100644
+index f4d1ade5..65b7a076 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -2,6 +2,7 @@ package org.bukkit.entity;
diff --git a/Spigot-API-Patches/0018-Add-exception-reporting-event.patch b/Spigot-API-Patches/0017-Add-exception-reporting-event.patch
similarity index 99%
rename from Spigot-API-Patches/0018-Add-exception-reporting-event.patch
rename to Spigot-API-Patches/0017-Add-exception-reporting-event.patch
index 5bb2894202..55e970ab15 100644
--- a/Spigot-API-Patches/0018-Add-exception-reporting-event.patch
+++ b/Spigot-API-Patches/0017-Add-exception-reporting-event.patch
@@ -1,4 +1,4 @@
-From b8567d82eae818cbf98656b6107c703d49d19916 Mon Sep 17 00:00:00 2001
+From ec5c5dcdcd3e5a6dd7a4d5620c73274f94071b80 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 29 Feb 2016 20:24:35 -0600
 Subject: [PATCH] Add exception reporting event
@@ -592,5 +592,5 @@ index 80c152ba..b88f31ca 100644
          }
      }
 -- 
-2.17.0 (Apple Git-106)
+2.18.0
 
diff --git a/Spigot-API-Patches/0019-Fix-ServerListPingEvent-flagging-as-Async.patch b/Spigot-API-Patches/0018-Fix-ServerListPingEvent-flagging-as-Async.patch
similarity index 96%
rename from Spigot-API-Patches/0019-Fix-ServerListPingEvent-flagging-as-Async.patch
rename to Spigot-API-Patches/0018-Fix-ServerListPingEvent-flagging-as-Async.patch
index e6b305ad21..c2d3275ff6 100644
--- a/Spigot-API-Patches/0019-Fix-ServerListPingEvent-flagging-as-Async.patch
+++ b/Spigot-API-Patches/0018-Fix-ServerListPingEvent-flagging-as-Async.patch
@@ -1,4 +1,4 @@
-From 1e93486b23234fe77e28702c767735e6e1bc4c77 Mon Sep 17 00:00:00 2001
+From 8f1e66f25039c51d7e83c9c9ffae25ac434acb2b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 29 Feb 2016 20:26:39 -0600
 Subject: [PATCH] Fix ServerListPingEvent flagging as Async
@@ -50,5 +50,5 @@ index 343f238f..3c38d857 100644
          this.address = address;
          this.motd = motd;
 -- 
-2.17.0.windows.1
+2.18.0
 
diff --git a/Spigot-API-Patches/0020-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch b/Spigot-API-Patches/0019-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
similarity index 95%
rename from Spigot-API-Patches/0020-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
rename to Spigot-API-Patches/0019-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
index ba5a178072..35f5789451 100644
--- a/Spigot-API-Patches/0020-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
+++ b/Spigot-API-Patches/0019-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch
@@ -1,4 +1,4 @@
-From 59307ee0a977ee3d99fd9e44acb1bd3e5b040fc4 Mon Sep 17 00:00:00 2001
+From 4d1f4491596b61d5a58c4446d1a58954e53b1f1d Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Tue, 8 Mar 2016 13:05:59 -0800
 Subject: [PATCH] Add BaseComponent sendMessage methods to CommandSender
@@ -40,7 +40,7 @@ index abf68a2c..fcb03b83 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 5dbec412..5955b20c 100644
+index 65b7a076..1837a14c 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -399,6 +399,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
diff --git a/Spigot-API-Patches/0021-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/Spigot-API-Patches/0020-Add-methods-for-working-with-arrows-stuck-in-living-.patch
similarity index 93%
rename from Spigot-API-Patches/0021-Add-methods-for-working-with-arrows-stuck-in-living-.patch
rename to Spigot-API-Patches/0020-Add-methods-for-working-with-arrows-stuck-in-living-.patch
index 6b2b6a7a39..a29ca0659d 100644
--- a/Spigot-API-Patches/0021-Add-methods-for-working-with-arrows-stuck-in-living-.patch
+++ b/Spigot-API-Patches/0020-Add-methods-for-working-with-arrows-stuck-in-living-.patch
@@ -1,4 +1,4 @@
-From 627bc079ead8a9849e8b0046a4045aa8ff3a69f8 Mon Sep 17 00:00:00 2001
+From 70a25e1acdf0f9edfdde947fdb97aef644535ee3 Mon Sep 17 00:00:00 2001
 From: mrapple <tony@oc.tc>
 Date: Sun, 25 Nov 2012 13:47:27 -0600
 Subject: [PATCH] Add methods for working with arrows stuck in living entities
diff --git a/Spigot-API-Patches/0022-Complete-resource-pack-API.patch b/Spigot-API-Patches/0021-Complete-resource-pack-API.patch
similarity index 98%
rename from Spigot-API-Patches/0022-Complete-resource-pack-API.patch
rename to Spigot-API-Patches/0021-Complete-resource-pack-API.patch
index 18a18ad6ce..e01f783736 100644
--- a/Spigot-API-Patches/0022-Complete-resource-pack-API.patch
+++ b/Spigot-API-Patches/0021-Complete-resource-pack-API.patch
@@ -1,4 +1,4 @@
-From 25ab827755fbe15e9f3c4165140a16be9689ed81 Mon Sep 17 00:00:00 2001
+From 1d993cf07f29d709b5cae8a3e04528675d7e7aea Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 4 Apr 2015 22:59:54 -0400
 Subject: [PATCH] Complete resource pack API
diff --git a/Spigot-API-Patches/0023-Use-ASM-for-event-executors.patch b/Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch
similarity index 99%
rename from Spigot-API-Patches/0023-Use-ASM-for-event-executors.patch
rename to Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch
index a0fc6b1aae..278d0a07b6 100644
--- a/Spigot-API-Patches/0023-Use-ASM-for-event-executors.patch
+++ b/Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch
@@ -1,4 +1,4 @@
-From 39bd1036ea8a04cd417c8bab59421ef5e7ba6e0c Mon Sep 17 00:00:00 2001
+From 1469b97863ed5e841689d1347d6183189fef27cb Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Thu, 3 Mar 2016 13:20:33 -0700
 Subject: [PATCH] Use ASM for event executors.
diff --git a/Spigot-API-Patches/0024-Add-a-call-helper-to-Event.patch b/Spigot-API-Patches/0023-Add-a-call-helper-to-Event.patch
similarity index 91%
rename from Spigot-API-Patches/0024-Add-a-call-helper-to-Event.patch
rename to Spigot-API-Patches/0023-Add-a-call-helper-to-Event.patch
index 0b21618ce3..0224e527a2 100644
--- a/Spigot-API-Patches/0024-Add-a-call-helper-to-Event.patch
+++ b/Spigot-API-Patches/0023-Add-a-call-helper-to-Event.patch
@@ -1,4 +1,4 @@
-From 544b5f21dd978f9b7ecd0a546421aa11b5c3a159 Mon Sep 17 00:00:00 2001
+From e9cc1e95622f2b2f51b02a3a0b32911c3c760613 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 19 May 2013 20:36:58 -0400
 Subject: [PATCH] Add a call helper to Event
@@ -6,7 +6,7 @@ Subject: [PATCH] Add a call helper to Event
 Reduces diff in Server patches
 
 diff --git a/src/main/java/org/bukkit/event/Event.java b/src/main/java/org/bukkit/event/Event.java
-index 6677e1b..eaf6c49 100644
+index 6677e1bd..e7061112 100644
 --- a/src/main/java/org/bukkit/event/Event.java
 +++ b/src/main/java/org/bukkit/event/Event.java
 @@ -1,5 +1,6 @@
@@ -40,5 +40,5 @@ index 6677e1b..eaf6c49 100644
       * Convenience method for providing a user-friendly identifier. By
       * default, it is the event's class's {@linkplain Class#getSimpleName()
 -- 
-2.9.2.windows.1
+2.18.0
 
diff --git a/Spigot-API-Patches/0025-Add-sender-name-to-commands.yml-replacement.patch b/Spigot-API-Patches/0024-Add-sender-name-to-commands.yml-replacement.patch
similarity index 96%
rename from Spigot-API-Patches/0025-Add-sender-name-to-commands.yml-replacement.patch
rename to Spigot-API-Patches/0024-Add-sender-name-to-commands.yml-replacement.patch
index 379d03f7b1..0323eec35a 100644
--- a/Spigot-API-Patches/0025-Add-sender-name-to-commands.yml-replacement.patch
+++ b/Spigot-API-Patches/0024-Add-sender-name-to-commands.yml-replacement.patch
@@ -1,4 +1,4 @@
-From dc7ba2b869b5b5eefdac16a147446461bb40538f Mon Sep 17 00:00:00 2001
+From b5c4f4748f637c8ddccffbcdef249b4abe7f4401 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 22 Jul 2015 18:50:41 -0400
 Subject: [PATCH] Add sender name to commands.yml replacement
@@ -42,5 +42,5 @@ index 9c80f464..631be1cb 100644
          while (index != -1) {
              int start = index;
 -- 
-2.14.3
+2.18.0
 
diff --git a/Spigot-API-Patches/0026-Add-command-to-reload-permissions.yml-and-require-co.patch b/Spigot-API-Patches/0025-Add-command-to-reload-permissions.yml-and-require-co.patch
similarity index 98%
rename from Spigot-API-Patches/0026-Add-command-to-reload-permissions.yml-and-require-co.patch
rename to Spigot-API-Patches/0025-Add-command-to-reload-permissions.yml-and-require-co.patch
index 04c366c966..48cf1aabc7 100644
--- a/Spigot-API-Patches/0026-Add-command-to-reload-permissions.yml-and-require-co.patch
+++ b/Spigot-API-Patches/0025-Add-command-to-reload-permissions.yml-and-require-co.patch
@@ -1,4 +1,4 @@
-From 82464080bcceeb115e6255fdf6054bd6a1c42ed8 Mon Sep 17 00:00:00 2001
+From 2a58c6ce3ba2b1829a250a3a66ed0e2ebba73f79 Mon Sep 17 00:00:00 2001
 From: William <admin@domnian.com>
 Date: Fri, 18 Mar 2016 03:28:07 -0400
 Subject: [PATCH] Add command to reload permissions.yml and require confirm to
diff --git a/Spigot-API-Patches/0027-Custom-replacement-for-eaten-items.patch b/Spigot-API-Patches/0026-Custom-replacement-for-eaten-items.patch
similarity index 96%
rename from Spigot-API-Patches/0027-Custom-replacement-for-eaten-items.patch
rename to Spigot-API-Patches/0026-Custom-replacement-for-eaten-items.patch
index 0f115f74f2..ad908ee6fc 100644
--- a/Spigot-API-Patches/0027-Custom-replacement-for-eaten-items.patch
+++ b/Spigot-API-Patches/0026-Custom-replacement-for-eaten-items.patch
@@ -1,4 +1,4 @@
-From be5afd90beb1063d903d94f39ad8ce38c8545536 Mon Sep 17 00:00:00 2001
+From c92da34fc23a3a8c4bd298cf1e752b43ce81a88a Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 21 Jun 2015 15:05:21 -0400
 Subject: [PATCH] Custom replacement for eaten items
@@ -56,5 +56,5 @@ index 8ab76b1d..7d28155b 100644
          return this.isCancelled;
      }
 -- 
-2.13.0.windows.1
+2.18.0
 
diff --git a/Spigot-API-Patches/0028-Access-items-by-EquipmentSlot.patch b/Spigot-API-Patches/0027-Access-items-by-EquipmentSlot.patch
similarity index 94%
rename from Spigot-API-Patches/0028-Access-items-by-EquipmentSlot.patch
rename to Spigot-API-Patches/0027-Access-items-by-EquipmentSlot.patch
index 743837afc8..d2e3318656 100644
--- a/Spigot-API-Patches/0028-Access-items-by-EquipmentSlot.patch
+++ b/Spigot-API-Patches/0027-Access-items-by-EquipmentSlot.patch
@@ -1,4 +1,4 @@
-From f80aa26f12eced5a3b9c74ef82fa4696dab218de Mon Sep 17 00:00:00 2001
+From ad5444f104e8943b5cd8fe2110dfa6e74c47ab0c Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 20 Mar 2016 06:44:49 -0400
 Subject: [PATCH] Access items by EquipmentSlot
diff --git a/Spigot-API-Patches/0029-Entity-AddTo-RemoveFrom-World-Events.patch b/Spigot-API-Patches/0028-Entity-AddTo-RemoveFrom-World-Events.patch
similarity index 94%
rename from Spigot-API-Patches/0029-Entity-AddTo-RemoveFrom-World-Events.patch
rename to Spigot-API-Patches/0028-Entity-AddTo-RemoveFrom-World-Events.patch
index 1c318dd271..5312eab728 100644
--- a/Spigot-API-Patches/0029-Entity-AddTo-RemoveFrom-World-Events.patch
+++ b/Spigot-API-Patches/0028-Entity-AddTo-RemoveFrom-World-Events.patch
@@ -1,4 +1,4 @@
-From afba862bcba12099ebab00ff767bf8d8ff49610b Mon Sep 17 00:00:00 2001
+From d66b6b3d8cf42eee8c7d432bfeeb8618eb1c3125 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 20:26:34 -0400
 Subject: [PATCH] Entity AddTo/RemoveFrom World Events
@@ -6,7 +6,7 @@ Subject: [PATCH] Entity AddTo/RemoveFrom World Events
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityAddToWorldEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityAddToWorldEvent.java
 new file mode 100644
-index 0000000..18b158c
+index 00000000..18b158cd
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityAddToWorldEvent.java
 @@ -0,0 +1,29 @@
@@ -41,7 +41,7 @@ index 0000000..18b158c
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityRemoveFromWorldEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityRemoveFromWorldEvent.java
 new file mode 100644
-index 0000000..800be6a
+index 00000000..800be6aa
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityRemoveFromWorldEvent.java
 @@ -0,0 +1,26 @@
@@ -72,5 +72,5 @@ index 0000000..800be6a
 +    }
 +}
 -- 
-2.9.2.windows.1
+2.18.0
 
diff --git a/Spigot-API-Patches/0030-EntityPathfindEvent.patch b/Spigot-API-Patches/0029-EntityPathfindEvent.patch
similarity index 97%
rename from Spigot-API-Patches/0030-EntityPathfindEvent.patch
rename to Spigot-API-Patches/0029-EntityPathfindEvent.patch
index 882bbf02dc..d2ca317f0a 100644
--- a/Spigot-API-Patches/0030-EntityPathfindEvent.patch
+++ b/Spigot-API-Patches/0029-EntityPathfindEvent.patch
@@ -1,4 +1,4 @@
-From 93eda7e71ee827d84d3d670f01d6c25388e7578f Mon Sep 17 00:00:00 2001
+From e3f57f03c3b0a7dfb8399bc60c9854d7c5369397 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 21:15:34 -0400
 Subject: [PATCH] EntityPathfindEvent
diff --git a/Spigot-API-Patches/0031-Reduce-thread-synchronization-in-MetadataStoreBase.patch b/Spigot-API-Patches/0030-Reduce-thread-synchronization-in-MetadataStoreBase.patch
similarity index 97%
rename from Spigot-API-Patches/0031-Reduce-thread-synchronization-in-MetadataStoreBase.patch
rename to Spigot-API-Patches/0030-Reduce-thread-synchronization-in-MetadataStoreBase.patch
index 2fea1f0e3e..7700b6e156 100644
--- a/Spigot-API-Patches/0031-Reduce-thread-synchronization-in-MetadataStoreBase.patch
+++ b/Spigot-API-Patches/0030-Reduce-thread-synchronization-in-MetadataStoreBase.patch
@@ -1,4 +1,4 @@
-From 270a57e64ae5f5a383b35a424dab9a45aa781eaf Mon Sep 17 00:00:00 2001
+From c0a5945074128db7e77a353aa9035b7d0f01acb7 Mon Sep 17 00:00:00 2001
 From: crast <contact@jamescrasta.com>
 Date: Sat, 1 Jun 2013 13:52:30 -0600
 Subject: [PATCH] Reduce thread synchronization in MetadataStoreBase
@@ -8,7 +8,7 @@ limited synchronized portions to allow much higher concurrency in
 MetadataStore as well as far less locking, especially on reads
 
 diff --git a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java b/src/main/java/org/bukkit/metadata/MetadataStoreBase.java
-index 093c144..64c0f0a 100644
+index 093c1445..64c0f0a7 100644
 --- a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java
 +++ b/src/main/java/org/bukkit/metadata/MetadataStoreBase.java
 @@ -4,9 +4,10 @@ import org.apache.commons.lang.Validate;
@@ -101,5 +101,5 @@ index 093c144..64c0f0a 100644
          for (Map<Plugin, MetadataValue> values : metadataMap.values()) {
              if (values.containsKey(owningPlugin)) {
 -- 
-2.9.2.windows.1
+2.18.0
 
diff --git a/Spigot-API-Patches/0032-Add-MetadataStoreBase.removeAll-Plugin.patch b/Spigot-API-Patches/0031-Add-MetadataStoreBase.removeAll-Plugin.patch
similarity index 95%
rename from Spigot-API-Patches/0032-Add-MetadataStoreBase.removeAll-Plugin.patch
rename to Spigot-API-Patches/0031-Add-MetadataStoreBase.removeAll-Plugin.patch
index f4eef4b0d9..446d41d4a3 100644
--- a/Spigot-API-Patches/0032-Add-MetadataStoreBase.removeAll-Plugin.patch
+++ b/Spigot-API-Patches/0031-Add-MetadataStoreBase.removeAll-Plugin.patch
@@ -1,4 +1,4 @@
-From 132974ff5e4f0932c730ed93725812e52c234bd7 Mon Sep 17 00:00:00 2001
+From ff8d88096d58f9f801a4d6b49ef0eede65667989 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 16 Jul 2013 21:26:50 -0400
 Subject: [PATCH] Add MetadataStoreBase.removeAll(Plugin)
@@ -37,5 +37,5 @@ index 64c0f0a7..6da6abd8 100644
       * Creates a unique name for the object receiving metadata by combining
       * unique data from the subject with a metadataKey.
 -- 
-2.16.2
+2.18.0
 
diff --git a/Spigot-API-Patches/0033-Add-PlayerUseUnknownEntityEvent.patch b/Spigot-API-Patches/0032-Add-PlayerUseUnknownEntityEvent.patch
similarity index 95%
rename from Spigot-API-Patches/0033-Add-PlayerUseUnknownEntityEvent.patch
rename to Spigot-API-Patches/0032-Add-PlayerUseUnknownEntityEvent.patch
index c5991b4c04..e6eaf9ebaf 100644
--- a/Spigot-API-Patches/0033-Add-PlayerUseUnknownEntityEvent.patch
+++ b/Spigot-API-Patches/0032-Add-PlayerUseUnknownEntityEvent.patch
@@ -1,4 +1,4 @@
-From f63d0416b0cfb04ee48688f93db07c1c439e4c1c Mon Sep 17 00:00:00 2001
+From 97a35e82ddb729fd74ce6d252a2c928a24b39d55 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 2 Apr 2016 05:08:36 -0400
 Subject: [PATCH] Add PlayerUseUnknownEntityEvent
@@ -53,5 +53,5 @@ index 00000000..70eeaf5c
 +    }
 +}
 -- 
-2.12.2
+2.18.0
 
diff --git a/Spigot-API-Patches/0034-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/Spigot-API-Patches/0033-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
similarity index 98%
rename from Spigot-API-Patches/0034-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
rename to Spigot-API-Patches/0033-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
index 9c256ccbc3..872f0177d0 100644
--- a/Spigot-API-Patches/0034-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
+++ b/Spigot-API-Patches/0033-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
@@ -1,4 +1,4 @@
-From c2d3f644f72d2928e2196f19aedcebf30669b505 Mon Sep 17 00:00:00 2001
+From 7c3fcd8ee8df766361c426d25955b626eac60d88 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 13 Apr 2016 20:20:18 -0700
 Subject: [PATCH] Add handshake event to allow plugins to handle client
@@ -223,5 +223,5 @@ index 00000000..e44d03a2
 +    }
 +}
 -- 
-2.16.2
+2.18.0
 
diff --git a/Spigot-API-Patches/0035-Arrow-pickup-rule-API.patch b/Spigot-API-Patches/0034-Arrow-pickup-rule-API.patch
similarity index 95%
rename from Spigot-API-Patches/0035-Arrow-pickup-rule-API.patch
rename to Spigot-API-Patches/0034-Arrow-pickup-rule-API.patch
index db6be7454e..55b5f46885 100644
--- a/Spigot-API-Patches/0035-Arrow-pickup-rule-API.patch
+++ b/Spigot-API-Patches/0034-Arrow-pickup-rule-API.patch
@@ -1,4 +1,4 @@
-From 4c38a0b7c20bd533e8ca2f93edd4e1657aba85fe Mon Sep 17 00:00:00 2001
+From 19fcaea4b23887be2eaa4d5e5bded0fa3ceca3ab Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Fri, 4 Mar 2016 03:13:18 -0500
 Subject: [PATCH] Arrow pickup rule API
@@ -48,5 +48,5 @@ index 99814eee..34dde443 100644
 +    // Paper end
  }
 -- 
-2.17.0
+2.18.0
 
diff --git a/Spigot-API-Patches/0036-EntityRegainHealthEvent-isFastRegen-API.patch b/Spigot-API-Patches/0035-EntityRegainHealthEvent-isFastRegen-API.patch
similarity index 95%
rename from Spigot-API-Patches/0036-EntityRegainHealthEvent-isFastRegen-API.patch
rename to Spigot-API-Patches/0035-EntityRegainHealthEvent-isFastRegen-API.patch
index a8ad09ec3a..e1661cae07 100644
--- a/Spigot-API-Patches/0036-EntityRegainHealthEvent-isFastRegen-API.patch
+++ b/Spigot-API-Patches/0035-EntityRegainHealthEvent-isFastRegen-API.patch
@@ -1,4 +1,4 @@
-From 0d97df2900c479d7713b9b02c3eaeb6624c6a1c1 Mon Sep 17 00:00:00 2001
+From 49a798ea1efd88482f5860292339b3229ebbf877 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
@@ -41,5 +41,5 @@ index 1dd50c56..74fc12e9 100644
      /**
       * Gets the amount of regained health
 -- 
-2.13.2
+2.18.0
 
diff --git a/Spigot-API-Patches/0037-LootTable-API.patch b/Spigot-API-Patches/0036-LootTable-API.patch
similarity index 99%
rename from Spigot-API-Patches/0037-LootTable-API.patch
rename to Spigot-API-Patches/0036-LootTable-API.patch
index fc14ccdb5b..467e51b016 100644
--- a/Spigot-API-Patches/0037-LootTable-API.patch
+++ b/Spigot-API-Patches/0036-LootTable-API.patch
@@ -1,4 +1,4 @@
-From 75943d87ca42348d2b2e4bc29498717ec1390150 Mon Sep 17 00:00:00 2001
+From 47d3999f281a9271cec4bdec2cc226b05d3ebf40 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 1 May 2016 15:19:49 -0400
 Subject: [PATCH] LootTable API
@@ -368,5 +368,5 @@ index 4c1740e7..aa1109c4 100644
      /**
       * Get the {@link DyeColor} corresponding to this ShulkerBox
 -- 
-2.13.4
+2.18.0
 
diff --git a/Spigot-API-Patches/0038-Add-EntityZapEvent.patch b/Spigot-API-Patches/0037-Add-EntityZapEvent.patch
similarity index 98%
rename from Spigot-API-Patches/0038-Add-EntityZapEvent.patch
rename to Spigot-API-Patches/0037-Add-EntityZapEvent.patch
index 5b0c5db221..bba41a875d 100644
--- a/Spigot-API-Patches/0038-Add-EntityZapEvent.patch
+++ b/Spigot-API-Patches/0037-Add-EntityZapEvent.patch
@@ -1,4 +1,4 @@
-From 2b3054eda2cfa7dd47f019fa1d1eda5537c73266 Mon Sep 17 00:00:00 2001
+From fa59003d856eb5f54a4a9bf0a26b7e55ae3a0713 Mon Sep 17 00:00:00 2001
 From: AlphaBlend <whizkid3000@hotmail.com>
 Date: Sun, 16 Oct 2016 23:19:34 -0700
 Subject: [PATCH] Add EntityZapEvent
@@ -119,5 +119,5 @@ index aa80ebf1..73844b8f 100644
 +    // Paper end
  }
 -- 
-2.12.2
+2.18.0
 
diff --git a/Spigot-API-Patches/0039-Misc-Utils.patch b/Spigot-API-Patches/0038-Misc-Utils.patch
similarity index 94%
rename from Spigot-API-Patches/0039-Misc-Utils.patch
rename to Spigot-API-Patches/0038-Misc-Utils.patch
index 0c7b232611..d18b1edcb5 100644
--- a/Spigot-API-Patches/0039-Misc-Utils.patch
+++ b/Spigot-API-Patches/0038-Misc-Utils.patch
@@ -1,4 +1,4 @@
-From a5a7153cde37ce84714514cd647693113fdea266 Mon Sep 17 00:00:00 2001
+From ae850cec0afe270d11a66245c0d9e46a16339283 Mon Sep 17 00:00:00 2001
 From: vemacs <d@nkmem.es>
 Date: Wed, 23 Nov 2016 12:53:43 -0500
 Subject: [PATCH] Misc Utils
@@ -42,5 +42,5 @@ index 00000000..d60ecbb1
 +    }
 +}
 -- 
-2.12.2
+2.18.0
 
diff --git a/Spigot-API-Patches/0040-Allow-Reloading-of-Command-Aliases.patch b/Spigot-API-Patches/0039-Allow-Reloading-of-Command-Aliases.patch
similarity index 98%
rename from Spigot-API-Patches/0040-Allow-Reloading-of-Command-Aliases.patch
rename to Spigot-API-Patches/0039-Allow-Reloading-of-Command-Aliases.patch
index 7738689452..cd3756fd84 100644
--- a/Spigot-API-Patches/0040-Allow-Reloading-of-Command-Aliases.patch
+++ b/Spigot-API-Patches/0039-Allow-Reloading-of-Command-Aliases.patch
@@ -1,4 +1,4 @@
-From a26f4d70297afac3b04e84ed6ad1b2b1c97558ef Mon Sep 17 00:00:00 2001
+From f6f33b7c1532051a557eb8aba788a930f031243b Mon Sep 17 00:00:00 2001
 From: willies952002 <admin@domnian.com>
 Date: Mon, 28 Nov 2016 10:16:39 -0500
 Subject: [PATCH] Allow Reloading of Command Aliases
diff --git a/Spigot-API-Patches/0041-Add-source-to-PlayerExpChangeEvent.patch b/Spigot-API-Patches/0040-Add-source-to-PlayerExpChangeEvent.patch
similarity index 95%
rename from Spigot-API-Patches/0041-Add-source-to-PlayerExpChangeEvent.patch
rename to Spigot-API-Patches/0040-Add-source-to-PlayerExpChangeEvent.patch
index a112035d23..6263fac243 100644
--- a/Spigot-API-Patches/0041-Add-source-to-PlayerExpChangeEvent.patch
+++ b/Spigot-API-Patches/0040-Add-source-to-PlayerExpChangeEvent.patch
@@ -1,4 +1,4 @@
-From 94fda1a0b58189116a33dfb887a88e141fb5cad6 Mon Sep 17 00:00:00 2001
+From e08937fe0886d2dbce1bdb74980b7cdbc778e628 Mon Sep 17 00:00:00 2001
 From: AlphaBlend <whizkid3000@hotmail.com>
 Date: Thu, 8 Sep 2016 08:47:08 -0700
 Subject: [PATCH] Add source to PlayerExpChangeEvent
@@ -52,5 +52,5 @@ index f37491d7..30882559 100644
       * Get the amount of experience the player will receive
       *
 -- 
-2.16.2
+2.18.0
 
diff --git a/Spigot-API-Patches/0042-Add-ProjectileCollideEvent.patch b/Spigot-API-Patches/0041-Add-ProjectileCollideEvent.patch
similarity index 96%
rename from Spigot-API-Patches/0042-Add-ProjectileCollideEvent.patch
rename to Spigot-API-Patches/0041-Add-ProjectileCollideEvent.patch
index 128c7e3040..83205aeec3 100644
--- a/Spigot-API-Patches/0042-Add-ProjectileCollideEvent.patch
+++ b/Spigot-API-Patches/0041-Add-ProjectileCollideEvent.patch
@@ -1,4 +1,4 @@
-From 8a1678e60bc1ddc67b3b8cacbb6761daf1a97fc6 Mon Sep 17 00:00:00 2001
+From da74019f26ab71c97991b2cf3474bc40a2c63bce 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
@@ -73,5 +73,5 @@ index 00000000..f42e9851
 +    }
 +}
 -- 
-2.12.2
+2.18.0
 
diff --git a/Spigot-API-Patches/0043-Add-String-based-Action-Bar-API.patch b/Spigot-API-Patches/0042-Add-String-based-Action-Bar-API.patch
similarity index 98%
rename from Spigot-API-Patches/0043-Add-String-based-Action-Bar-API.patch
rename to Spigot-API-Patches/0042-Add-String-based-Action-Bar-API.patch
index 33e0bb4b0f..0d2d159fce 100644
--- a/Spigot-API-Patches/0043-Add-String-based-Action-Bar-API.patch
+++ b/Spigot-API-Patches/0042-Add-String-based-Action-Bar-API.patch
@@ -1,4 +1,4 @@
-From 08d440055e45edea4106415945fcfe5b7c3d1318 Mon Sep 17 00:00:00 2001
+From d1c10cb8d00c3b6e9c8612bc30e9e7a715dd1ecf Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 20 Dec 2016 15:55:55 -0500
 Subject: [PATCH] Add String based Action Bar API
diff --git a/Spigot-API-Patches/0044-Add-API-methods-to-control-if-armour-stands-can-move.patch b/Spigot-API-Patches/0043-Add-API-methods-to-control-if-armour-stands-can-move.patch
similarity index 93%
rename from Spigot-API-Patches/0044-Add-API-methods-to-control-if-armour-stands-can-move.patch
rename to Spigot-API-Patches/0043-Add-API-methods-to-control-if-armour-stands-can-move.patch
index 9aac53ef0f..061c3f1db3 100644
--- a/Spigot-API-Patches/0044-Add-API-methods-to-control-if-armour-stands-can-move.patch
+++ b/Spigot-API-Patches/0043-Add-API-methods-to-control-if-armour-stands-can-move.patch
@@ -1,4 +1,4 @@
-From 85ee642fb344d3aa7bb5a256cd1edcb1ab6a673b Mon Sep 17 00:00:00 2001
+From 3c437859f9ef78609aac37e3afe173588ae67ee9 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
@@ -32,5 +32,5 @@ index b4f04517..099da6ce 100644
 +    // Paper end
  }
 -- 
-2.12.2
+2.18.0
 
diff --git a/Spigot-API-Patches/0045-IllegalPacketEvent.patch b/Spigot-API-Patches/0044-IllegalPacketEvent.patch
similarity index 97%
rename from Spigot-API-Patches/0045-IllegalPacketEvent.patch
rename to Spigot-API-Patches/0044-IllegalPacketEvent.patch
index 31ddef04d9..5ebf8914fb 100644
--- a/Spigot-API-Patches/0045-IllegalPacketEvent.patch
+++ b/Spigot-API-Patches/0044-IllegalPacketEvent.patch
@@ -1,4 +1,4 @@
-From 89165c8a70cce041d5daead1b9aadc8f214798a9 Mon Sep 17 00:00:00 2001
+From dea71c291e5e4139c86b7570e6eed8897bde2e94 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 4 Dec 2016 01:19:14 -0500
 Subject: [PATCH] IllegalPacketEvent
@@ -77,5 +77,5 @@ index 00000000..e11f74fc
 +    }
 +}
 -- 
-2.12.2
+2.18.0
 
diff --git a/Spigot-API-Patches/0046-Fireworks-API-s.patch b/Spigot-API-Patches/0045-Fireworks-API-s.patch
similarity index 89%
rename from Spigot-API-Patches/0046-Fireworks-API-s.patch
rename to Spigot-API-Patches/0045-Fireworks-API-s.patch
index 7cddfca04e..2c02d41dd5 100644
--- a/Spigot-API-Patches/0046-Fireworks-API-s.patch
+++ b/Spigot-API-Patches/0045-Fireworks-API-s.patch
@@ -1,4 +1,4 @@
-From f65a6ec0915047f1a5c30e467c5782bae67113d2 Mon Sep 17 00:00:00 2001
+From 6705469275b33dd3cbb08048e0226fbca6c8599d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 28 Dec 2016 01:18:55 -0500
 Subject: [PATCH] Fireworks API's
@@ -7,7 +7,7 @@ Get the Entity being boosted
 Get the firework launcher
 
 diff --git a/src/main/java/org/bukkit/entity/Firework.java b/src/main/java/org/bukkit/entity/Firework.java
-index b8a8c07..8c087bb 100644
+index b8a8c075..8c087bb7 100644
 --- a/src/main/java/org/bukkit/entity/Firework.java
 +++ b/src/main/java/org/bukkit/entity/Firework.java
 @@ -2,6 +2,8 @@ package org.bukkit.entity;
@@ -34,5 +34,5 @@ index b8a8c07..8c087bb 100644
 +    // Paper end
  }
 -- 
-2.9.3
+2.18.0
 
diff --git a/Spigot-API-Patches/0047-PlayerTeleportEndGatewayEvent.patch b/Spigot-API-Patches/0046-PlayerTeleportEndGatewayEvent.patch
similarity index 94%
rename from Spigot-API-Patches/0047-PlayerTeleportEndGatewayEvent.patch
rename to Spigot-API-Patches/0046-PlayerTeleportEndGatewayEvent.patch
index d0eb6e095a..c69e7cb9b2 100644
--- a/Spigot-API-Patches/0047-PlayerTeleportEndGatewayEvent.patch
+++ b/Spigot-API-Patches/0046-PlayerTeleportEndGatewayEvent.patch
@@ -1,4 +1,4 @@
-From 5a007aa00644c0fc23b76553bd92756e5517eaf1 Mon Sep 17 00:00:00 2001
+From f0f71311d0761cfb9c8ba1c5901f3e29223994ad Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 31 Dec 2016 20:29:33 -0500
 Subject: [PATCH] PlayerTeleportEndGatewayEvent
@@ -39,5 +39,5 @@ index 00000000..bdefbc9f
 +    }
 +}
 -- 
-2.13.0.windows.1
+2.18.0
 
diff --git a/Spigot-API-Patches/0048-Provide-E-TE-Chunk-count-stat-methods.patch b/Spigot-API-Patches/0047-Provide-E-TE-Chunk-count-stat-methods.patch
similarity index 92%
rename from Spigot-API-Patches/0048-Provide-E-TE-Chunk-count-stat-methods.patch
rename to Spigot-API-Patches/0047-Provide-E-TE-Chunk-count-stat-methods.patch
index d609f0347a..39e8776cd4 100644
--- a/Spigot-API-Patches/0048-Provide-E-TE-Chunk-count-stat-methods.patch
+++ b/Spigot-API-Patches/0047-Provide-E-TE-Chunk-count-stat-methods.patch
@@ -1,4 +1,4 @@
-From 22068d059027d02e6931f229dfa65987ca73871f Mon Sep 17 00:00:00 2001
+From 33b64ea35d49023c95c359e7c8664335e202f7c0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 Jan 2017 15:23:03 -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/World.java b/src/main/java/org/bukkit/World.java
-index 22ab4633..65156e80 100644
+index 91ad39a8..7875a71a 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -25,6 +25,33 @@ import org.bukkit.util.Vector;
diff --git a/Spigot-API-Patches/0049-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/Spigot-API-Patches/0048-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
similarity index 98%
rename from Spigot-API-Patches/0049-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
rename to Spigot-API-Patches/0048-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
index d2df9a483f..1d8537586c 100644
--- a/Spigot-API-Patches/0049-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/Spigot-API-Patches/0048-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
@@ -1,4 +1,4 @@
-From 80c13ed0dab738b2741d02291129c231a6e415a6 Mon Sep 17 00:00:00 2001
+From 0e3f92f938875e2030ff8e1b7f559ecddca777f7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 16:28:32 -0500
 Subject: [PATCH] ExperienceOrbs API for Reason/Source/Triggering player
@@ -115,5 +115,5 @@ index c286edfd..f847543b 100644
 +    // Paper end
  }
 -- 
-2.15.1
+2.18.0
 
diff --git a/Spigot-API-Patches/0050-Expose-WorldBorder-isInBounds-Location-check.patch b/Spigot-API-Patches/0049-Expose-WorldBorder-isInBounds-Location-check.patch
similarity index 90%
rename from Spigot-API-Patches/0050-Expose-WorldBorder-isInBounds-Location-check.patch
rename to Spigot-API-Patches/0049-Expose-WorldBorder-isInBounds-Location-check.patch
index ccab7a2a09..133dc7c0b2 100644
--- a/Spigot-API-Patches/0050-Expose-WorldBorder-isInBounds-Location-check.patch
+++ b/Spigot-API-Patches/0049-Expose-WorldBorder-isInBounds-Location-check.patch
@@ -1,11 +1,11 @@
-From 3f1104eade7370f1304f56444a1b5e0d694ada62 Mon Sep 17 00:00:00 2001
+From 0187592c026f6b460628219f3f2c4e48e9413bfc Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 21 Jan 2017 17:03:10 -0600
 Subject: [PATCH] Expose WorldBorder#isInBounds(Location) check
 
 
 diff --git a/src/main/java/org/bukkit/WorldBorder.java b/src/main/java/org/bukkit/WorldBorder.java
-index 4dc18ed..41b7fae 100644
+index 4dc18edc..41b7fae6 100644
 --- a/src/main/java/org/bukkit/WorldBorder.java
 +++ b/src/main/java/org/bukkit/WorldBorder.java
 @@ -114,4 +114,18 @@ public interface WorldBorder {
@@ -28,5 +28,5 @@ index 4dc18ed..41b7fae 100644
 +    // Paper end
  }
 -- 
-2.9.3
+2.18.0
 
diff --git a/Spigot-API-Patches/0051-Add-configuration-option-to-prevent-player-names-fro.patch b/Spigot-API-Patches/0050-Add-configuration-option-to-prevent-player-names-fro.patch
similarity index 97%
rename from Spigot-API-Patches/0051-Add-configuration-option-to-prevent-player-names-fro.patch
rename to Spigot-API-Patches/0050-Add-configuration-option-to-prevent-player-names-fro.patch
index ec81ebf2c1..9f0a524495 100644
--- a/Spigot-API-Patches/0051-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/Spigot-API-Patches/0050-Add-configuration-option-to-prevent-player-names-fro.patch
@@ -1,4 +1,4 @@
-From f4d2b6475d9965998e22ea9a072fbcb2231fca90 Mon Sep 17 00:00:00 2001
+From 7d4cb175afd6bfc4763dd709865dbccd3ace51e7 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Fri, 9 Jun 2017 07:24:24 -0700
 Subject: [PATCH] Add configuration option to prevent player names from being
diff --git a/Spigot-API-Patches/0052-Fix-upstream-javadoc-warnings-and-errors.patch b/Spigot-API-Patches/0051-Fix-upstream-javadoc-warnings-and-errors.patch
similarity index 96%
rename from Spigot-API-Patches/0052-Fix-upstream-javadoc-warnings-and-errors.patch
rename to Spigot-API-Patches/0051-Fix-upstream-javadoc-warnings-and-errors.patch
index 1a1134f9ec..438ba4bd5a 100644
--- a/Spigot-API-Patches/0052-Fix-upstream-javadoc-warnings-and-errors.patch
+++ b/Spigot-API-Patches/0051-Fix-upstream-javadoc-warnings-and-errors.patch
@@ -1,4 +1,4 @@
-From bc65fcc9a464b4c8d7b28758d6fad8d98eefa05d Mon Sep 17 00:00:00 2001
+From 95cc7e013040f4cc243d1d421ec2d8a62dacbfa2 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 10 Jun 2017 16:59:40 -0500
 Subject: [PATCH] Fix upstream javadoc warnings and errors
@@ -21,10 +21,10 @@ index 1ed8f7e4..bd5238ce 100644
       */
      @Deprecated
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 1e980d2d..4cc70326 100644
+index 7875a71a..e14098fa 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -1376,6 +1376,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1304,6 +1304,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       * @param count the number of particles
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -32,7 +32,7 @@ index 1e980d2d..4cc70326 100644
       */
      public <T> void spawnParticle(Particle particle, Location location, int count, T data);
  
-@@ -1391,6 +1392,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1319,6 +1320,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       * @param count the number of particles
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -40,7 +40,7 @@ index 1e980d2d..4cc70326 100644
       */
      public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, T data);
  
-@@ -1440,6 +1442,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1368,6 +1370,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       * @param offsetZ the maximum random offset on the Z axis
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -48,7 +48,7 @@ index 1e980d2d..4cc70326 100644
       */
      public <T> void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ, T data);
  
-@@ -1459,6 +1462,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1387,6 +1390,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       * @param offsetZ the maximum random offset on the Z axis
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -56,7 +56,7 @@ index 1e980d2d..4cc70326 100644
       */
      public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, T data);
  
-@@ -1514,6 +1518,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1442,6 +1446,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       *              particle used (normally speed)
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -64,7 +64,7 @@ index 1e980d2d..4cc70326 100644
       */
      public <T> void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, T data);
  
-@@ -1535,6 +1540,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1463,6 +1468,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       *              particle used (normally speed)
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -335,7 +335,7 @@ index 034421a7..f1a54c23 100644
       */
      @Deprecated
 diff --git a/src/main/java/org/bukkit/scoreboard/Team.java b/src/main/java/org/bukkit/scoreboard/Team.java
-index 92174e81..ac5cc32c 100644
+index ab71f3c3..358ea386 100644
 --- a/src/main/java/org/bukkit/scoreboard/Team.java
 +++ b/src/main/java/org/bukkit/scoreboard/Team.java
 @@ -84,7 +84,7 @@ public interface Team {
diff --git a/Spigot-API-Patches/0053-Item-canEntityPickup.patch b/Spigot-API-Patches/0052-Item-canEntityPickup.patch
similarity index 92%
rename from Spigot-API-Patches/0053-Item-canEntityPickup.patch
rename to Spigot-API-Patches/0052-Item-canEntityPickup.patch
index 1104b95c0e..08748d15b3 100644
--- a/Spigot-API-Patches/0053-Item-canEntityPickup.patch
+++ b/Spigot-API-Patches/0052-Item-canEntityPickup.patch
@@ -1,4 +1,4 @@
-From be61a682cc9453b4372ac821c4aea25ba90ba606 Mon Sep 17 00:00:00 2001
+From dc66c4f09cb93dc94893badd5da732ed2178aa45 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 5 May 2017 03:57:08 -0500
 Subject: [PATCH] Item#canEntityPickup
@@ -30,5 +30,5 @@ index 90260b7e..2e98e4f9 100644
 +    // Paper end
  }
 -- 
-2.17.1
+2.18.0
 
diff --git a/Spigot-API-Patches/0054-PlayerPickupItemEvent-setFlyAtPlayer.patch b/Spigot-API-Patches/0053-PlayerPickupItemEvent-setFlyAtPlayer.patch
similarity index 96%
rename from Spigot-API-Patches/0054-PlayerPickupItemEvent-setFlyAtPlayer.patch
rename to Spigot-API-Patches/0053-PlayerPickupItemEvent-setFlyAtPlayer.patch
index 6344dd1e49..3bbe8f5d9e 100644
--- a/Spigot-API-Patches/0054-PlayerPickupItemEvent-setFlyAtPlayer.patch
+++ b/Spigot-API-Patches/0053-PlayerPickupItemEvent-setFlyAtPlayer.patch
@@ -1,4 +1,4 @@
-From 409f5510dda42a7cfd18698436fc766df133c4e2 Mon Sep 17 00:00:00 2001
+From d9917e835f1e81e0b7d84ffc7ea4b60ca08eb3c4 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 May 2017 06:26:01 -0500
 Subject: [PATCH] PlayerPickupItemEvent#setFlyAtPlayer
@@ -52,5 +52,5 @@ index c76f423e..46c6d519 100644
  
      @Override
 -- 
-2.13.0
+2.18.0
 
diff --git a/Spigot-API-Patches/0055-PlayerAttemptPickupItemEvent.patch b/Spigot-API-Patches/0054-PlayerAttemptPickupItemEvent.patch
similarity index 97%
rename from Spigot-API-Patches/0055-PlayerAttemptPickupItemEvent.patch
rename to Spigot-API-Patches/0054-PlayerAttemptPickupItemEvent.patch
index 2af7b4654c..97de3e04a3 100644
--- a/Spigot-API-Patches/0055-PlayerAttemptPickupItemEvent.patch
+++ b/Spigot-API-Patches/0054-PlayerAttemptPickupItemEvent.patch
@@ -1,4 +1,4 @@
-From d4c410f78c5e5fd8c0a6760d878843080572f49a Mon Sep 17 00:00:00 2001
+From 1f46a8b98f035e8a17ccef525526dc0d02b7acbb Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 11 Jun 2017 16:30:37 -0500
 Subject: [PATCH] PlayerAttemptPickupItemEvent
@@ -96,5 +96,5 @@ index 00000000..480293e9
 +    }
 +}
 -- 
-2.17.0
+2.18.0
 
diff --git a/Spigot-API-Patches/0056-Add-UnknownCommandEvent.patch b/Spigot-API-Patches/0055-Add-UnknownCommandEvent.patch
similarity index 96%
rename from Spigot-API-Patches/0056-Add-UnknownCommandEvent.patch
rename to Spigot-API-Patches/0055-Add-UnknownCommandEvent.patch
index d9a6ef0a28..67133ccd70 100644
--- a/Spigot-API-Patches/0056-Add-UnknownCommandEvent.patch
+++ b/Spigot-API-Patches/0055-Add-UnknownCommandEvent.patch
@@ -1,4 +1,4 @@
-From f57a4ab8a98fe14d6591558f0eb061caf775b542 Mon Sep 17 00:00:00 2001
+From d8cb5d408bac83ef3e7e83da92cc90904d4cd379 Mon Sep 17 00:00:00 2001
 From: Sweepyoface <github@sweepy.pw>
 Date: Sat, 17 Jun 2017 18:48:06 -0400
 Subject: [PATCH] Add UnknownCommandEvent
@@ -88,5 +88,5 @@ index 00000000..19d634c3
 +}
 +
 -- 
-2.13.3
+2.18.0
 
diff --git a/Spigot-API-Patches/0057-Basic-PlayerProfile-API.patch b/Spigot-API-Patches/0056-Basic-PlayerProfile-API.patch
similarity index 99%
rename from Spigot-API-Patches/0057-Basic-PlayerProfile-API.patch
rename to Spigot-API-Patches/0056-Basic-PlayerProfile-API.patch
index f97a8438f7..a0b61100fd 100644
--- a/Spigot-API-Patches/0057-Basic-PlayerProfile-API.patch
+++ b/Spigot-API-Patches/0056-Basic-PlayerProfile-API.patch
@@ -1,4 +1,4 @@
-From fad181fcd8dcc38ff7dad667ec655c473844947a Mon Sep 17 00:00:00 2001
+From 3d0560ecda8605d6932dd13669f315111764e724 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 15 Jan 2018 21:46:46 -0500
 Subject: [PATCH] Basic PlayerProfile API
diff --git a/Spigot-API-Patches/0058-Shoulder-Entities-Release-API.patch b/Spigot-API-Patches/0057-Shoulder-Entities-Release-API.patch
similarity index 94%
rename from Spigot-API-Patches/0058-Shoulder-Entities-Release-API.patch
rename to Spigot-API-Patches/0057-Shoulder-Entities-Release-API.patch
index e3c32ab7be..8f92ff7868 100644
--- a/Spigot-API-Patches/0058-Shoulder-Entities-Release-API.patch
+++ b/Spigot-API-Patches/0057-Shoulder-Entities-Release-API.patch
@@ -1,4 +1,4 @@
-From 4ca727fe10c32507bd208efbecc6cb500fbf2534 Mon Sep 17 00:00:00 2001
+From 495ea88275a4d9b96efb1db20a52c4566f3458e5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 17 Jun 2017 15:04:51 -0400
 Subject: [PATCH] Shoulder Entities Release API
@@ -34,5 +34,5 @@ index 518aa2a9..3939d4af 100644
       * Gets the entity currently perched on the left shoulder or null if no
       * entity.
 -- 
-2.15.1
+2.18.0
 
diff --git a/Spigot-API-Patches/0059-Profile-Lookup-Events.patch b/Spigot-API-Patches/0058-Profile-Lookup-Events.patch
similarity index 98%
rename from Spigot-API-Patches/0059-Profile-Lookup-Events.patch
rename to Spigot-API-Patches/0058-Profile-Lookup-Events.patch
index 5abe122994..e35ead083f 100644
--- a/Spigot-API-Patches/0059-Profile-Lookup-Events.patch
+++ b/Spigot-API-Patches/0058-Profile-Lookup-Events.patch
@@ -1,4 +1,4 @@
-From 6eb60d6f87fcc5b3ff0417a30fd5c79a51df2fa1 Mon Sep 17 00:00:00 2001
+From c836087cd8822e93732c4f292489a13b77223a89 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 17 Jun 2017 16:30:44 -0400
 Subject: [PATCH] Profile Lookup Events
@@ -7,7 +7,7 @@ Adds a Pre Lookup Event and a Post Lookup Event so that plugins may prefill in p
 profiles that had to be looked up.
 
 diff --git a/pom.xml b/pom.xml
-index dfc6c9b5..e1a39bfe 100644
+index bd9146dd..44a8b2a5 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -61,6 +61,13 @@
diff --git a/Spigot-API-Patches/0060-Entity-fromMobSpawner.patch b/Spigot-API-Patches/0059-Entity-fromMobSpawner.patch
similarity index 87%
rename from Spigot-API-Patches/0060-Entity-fromMobSpawner.patch
rename to Spigot-API-Patches/0059-Entity-fromMobSpawner.patch
index baa63729fc..d31fd8b335 100644
--- a/Spigot-API-Patches/0060-Entity-fromMobSpawner.patch
+++ b/Spigot-API-Patches/0059-Entity-fromMobSpawner.patch
@@ -1,11 +1,11 @@
-From b6a1a9c6c4cec87d0234bc858239e1f0d0db36c1 Mon Sep 17 00:00:00 2001
+From 0a3125353c085b5a16edb538480d5f712a6afde3 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/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 69fbdb3c..6fc00fdf 100644
+index 9b0f97f1..3ae4de7a 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -507,5 +507,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
@@ -22,5 +22,5 @@ index 69fbdb3c..6fc00fdf 100644
      // Paper end
  }
 -- 
-2.15.1
+2.18.0
 
diff --git a/Spigot-API-Patches/0061-Improve-the-Saddle-API-for-Horses.patch b/Spigot-API-Patches/0060-Improve-the-Saddle-API-for-Horses.patch
similarity index 97%
rename from Spigot-API-Patches/0061-Improve-the-Saddle-API-for-Horses.patch
rename to Spigot-API-Patches/0060-Improve-the-Saddle-API-for-Horses.patch
index 377b3c316e..f8848466ce 100644
--- a/Spigot-API-Patches/0061-Improve-the-Saddle-API-for-Horses.patch
+++ b/Spigot-API-Patches/0060-Improve-the-Saddle-API-for-Horses.patch
@@ -1,4 +1,4 @@
-From d64ec328014274efa75dfacaf6b37cb11f642f69 Mon Sep 17 00:00:00 2001
+From 233f6d000f7fa14bd2de6d6c5ba88cd4b9dc4170 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 10 Dec 2016 16:12:48 -0500
 Subject: [PATCH] Improve the Saddle API for Horses
diff --git a/Spigot-API-Patches/0062-ensureServerConversions-API.patch b/Spigot-API-Patches/0061-ensureServerConversions-API.patch
similarity index 83%
rename from Spigot-API-Patches/0062-ensureServerConversions-API.patch
rename to Spigot-API-Patches/0061-ensureServerConversions-API.patch
index f99c9f8ed2..fb4d2dd571 100644
--- a/Spigot-API-Patches/0062-ensureServerConversions-API.patch
+++ b/Spigot-API-Patches/0061-ensureServerConversions-API.patch
@@ -1,4 +1,4 @@
-From ac29eaf3c0dc567bfbe8e20a323cdfaefd6242b8 Mon Sep 17 00:00:00 2001
+From 4f36318d8921ffa44333a86eac125200caad51d5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 May 2016 23:55:48 -0400
 Subject: [PATCH] ensureServerConversions API
@@ -28,19 +28,24 @@ index 762c43d6..045c26d9 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 6324044d..6df4b97a 100644
+index 73f79b22..14b6b6b3 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
-@@ -479,7 +479,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
-             result.setDurability(damage);
+@@ -487,7 +487,12 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
+             }
          }
  
 -        return result;
++        // Set damage again incase meta overwrote it
++        if (args.containsKey("damage")) {
++            result.setDurability(damage);
++        }
++
 +        return result.ensureServerConversions(); // Paper
      }
  
      /**
-@@ -537,4 +537,18 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
+@@ -545,4 +550,18 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
  
          return true;
      }
diff --git a/Spigot-API-Patches/0063-Add-getI18NDisplayName-API.patch b/Spigot-API-Patches/0062-Add-getI18NDisplayName-API.patch
similarity index 92%
rename from Spigot-API-Patches/0063-Add-getI18NDisplayName-API.patch
rename to Spigot-API-Patches/0062-Add-getI18NDisplayName-API.patch
index 71cfc8b218..773172c197 100644
--- a/Spigot-API-Patches/0063-Add-getI18NDisplayName-API.patch
+++ b/Spigot-API-Patches/0062-Add-getI18NDisplayName-API.patch
@@ -1,4 +1,4 @@
-From b2d5adef80eed3964ab16df2c98789763d150fd7 Mon Sep 17 00:00:00 2001
+From c1dbeb3ae74907b1336b1d68f76279b883bb35e3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 May 2016 23:55:48 -0400
 Subject: [PATCH] Add getI18NDisplayName API
@@ -28,10 +28,10 @@ index 045c26d9..47bbc0f9 100644
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 6df4b97a..864b16b1 100644
+index 14b6b6b3..ca7a958f 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
-@@ -550,5 +550,16 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
+@@ -563,5 +563,16 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
      public ItemStack ensureServerConversions() {
          return Bukkit.getServer().getItemFactory().ensureServerConversions(this);
      }
diff --git a/Spigot-API-Patches/0064-ProfileWhitelistVerifyEvent.patch b/Spigot-API-Patches/0063-ProfileWhitelistVerifyEvent.patch
similarity index 98%
rename from Spigot-API-Patches/0064-ProfileWhitelistVerifyEvent.patch
rename to Spigot-API-Patches/0063-ProfileWhitelistVerifyEvent.patch
index ea1fa9cb34..082630f5e6 100644
--- a/Spigot-API-Patches/0064-ProfileWhitelistVerifyEvent.patch
+++ b/Spigot-API-Patches/0063-ProfileWhitelistVerifyEvent.patch
@@ -1,4 +1,4 @@
-From 1dfa87d569f72303f04c3a29130145c91f25f506 Mon Sep 17 00:00:00 2001
+From 285c68e987f4db6db40f653a723754b5793dc6e8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 3 Jul 2017 18:11:34 -0500
 Subject: [PATCH] ProfileWhitelistVerifyEvent
diff --git a/Spigot-API-Patches/0065-Make-plugins-list-alphabetical.patch b/Spigot-API-Patches/0064-Make-plugins-list-alphabetical.patch
similarity index 96%
rename from Spigot-API-Patches/0065-Make-plugins-list-alphabetical.patch
rename to Spigot-API-Patches/0064-Make-plugins-list-alphabetical.patch
index d4c4bdb34a..f21470f756 100644
--- a/Spigot-API-Patches/0065-Make-plugins-list-alphabetical.patch
+++ b/Spigot-API-Patches/0064-Make-plugins-list-alphabetical.patch
@@ -1,4 +1,4 @@
-From 86390176ccf85c98f464e5ff6bb90f27952ae60a Mon Sep 17 00:00:00 2001
+From 03867368971fb3bfad36b8ebe68d5948fd20ce0a Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 31 Jul 2017 02:08:55 -0500
 Subject: [PATCH] Make /plugins list alphabetical
diff --git a/Spigot-API-Patches/0066-LivingEntity-setKiller.patch b/Spigot-API-Patches/0065-LivingEntity-setKiller.patch
similarity index 91%
rename from Spigot-API-Patches/0066-LivingEntity-setKiller.patch
rename to Spigot-API-Patches/0065-LivingEntity-setKiller.patch
index 0958b7fff9..0302725a89 100644
--- a/Spigot-API-Patches/0066-LivingEntity-setKiller.patch
+++ b/Spigot-API-Patches/0065-LivingEntity-setKiller.patch
@@ -1,11 +1,11 @@
-From 7963cbbdb5c04bb9f749576c89573aaf1c2279bb Mon Sep 17 00:00:00 2001
+From 054913afc1358179ae54b96956bce518334591ae Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 31 Jul 2017 01:49:43 -0500
 Subject: [PATCH] LivingEntity#setKiller
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 4fafedc9..42cf95e1 100644
+index f6ae0a6d..700ed29f 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -14,6 +14,8 @@ import org.bukkit.potion.PotionEffect;
diff --git a/Spigot-API-Patches/0067-Handle-plugin-prefixes-in-implementation-logging-con.patch b/Spigot-API-Patches/0066-Handle-plugin-prefixes-in-implementation-logging-con.patch
similarity index 96%
rename from Spigot-API-Patches/0067-Handle-plugin-prefixes-in-implementation-logging-con.patch
rename to Spigot-API-Patches/0066-Handle-plugin-prefixes-in-implementation-logging-con.patch
index a2afc77712..79ffabc76f 100644
--- a/Spigot-API-Patches/0067-Handle-plugin-prefixes-in-implementation-logging-con.patch
+++ b/Spigot-API-Patches/0066-Handle-plugin-prefixes-in-implementation-logging-con.patch
@@ -1,4 +1,4 @@
-From 99c169a9b437e6bd0088d70cb74c81a221808521 Mon Sep 17 00:00:00 2001
+From ffdbb97e00e44a8d86086aee473e45fa54e0b281 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Thu, 21 Sep 2017 16:14:13 +0200
 Subject: [PATCH] Handle plugin prefixes in implementation logging
diff --git a/Spigot-API-Patches/0068-Allow-plugins-to-use-SLF4J-for-logging.patch b/Spigot-API-Patches/0067-Allow-plugins-to-use-SLF4J-for-logging.patch
similarity index 96%
rename from Spigot-API-Patches/0068-Allow-plugins-to-use-SLF4J-for-logging.patch
rename to Spigot-API-Patches/0067-Allow-plugins-to-use-SLF4J-for-logging.patch
index 2088c28880..167db2a6ea 100644
--- a/Spigot-API-Patches/0068-Allow-plugins-to-use-SLF4J-for-logging.patch
+++ b/Spigot-API-Patches/0067-Allow-plugins-to-use-SLF4J-for-logging.patch
@@ -1,4 +1,4 @@
-From 78649d9322cf676aeca08d8f43053600d34a619d Mon Sep 17 00:00:00 2001
+From f9af8335c02b21624aeee8ac4cb1909d31bbff56 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Thu, 21 Sep 2017 16:33:12 +0200
 Subject: [PATCH] Allow plugins to use SLF4J for logging
diff --git a/Spigot-API-Patches/0069-Add-workaround-for-plugins-modifying-the-parent-of-t.patch b/Spigot-API-Patches/0068-Add-workaround-for-plugins-modifying-the-parent-of-t.patch
similarity index 98%
rename from Spigot-API-Patches/0069-Add-workaround-for-plugins-modifying-the-parent-of-t.patch
rename to Spigot-API-Patches/0068-Add-workaround-for-plugins-modifying-the-parent-of-t.patch
index 8c87429084..dd2b7d9194 100644
--- a/Spigot-API-Patches/0069-Add-workaround-for-plugins-modifying-the-parent-of-t.patch
+++ b/Spigot-API-Patches/0068-Add-workaround-for-plugins-modifying-the-parent-of-t.patch
@@ -1,4 +1,4 @@
-From 0f5f1f61e5e6128993289722564719846613ed1b Mon Sep 17 00:00:00 2001
+From df23e00168bf3e3ff97132c082e03cc7c1728649 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Thu, 21 Sep 2017 19:41:20 +0200
 Subject: [PATCH] Add workaround for plugins modifying the parent of the plugin
diff --git a/Spigot-API-Patches/0070-Add-PlayerJumpEvent.patch b/Spigot-API-Patches/0069-Add-PlayerJumpEvent.patch
similarity index 98%
rename from Spigot-API-Patches/0070-Add-PlayerJumpEvent.patch
rename to Spigot-API-Patches/0069-Add-PlayerJumpEvent.patch
index 655b8acb66..a8659d45fd 100644
--- a/Spigot-API-Patches/0070-Add-PlayerJumpEvent.patch
+++ b/Spigot-API-Patches/0069-Add-PlayerJumpEvent.patch
@@ -1,4 +1,4 @@
-From cb37a11f62d5ad49044c57e9364911f5914708d9 Mon Sep 17 00:00:00 2001
+From 9f1f05d5857e0ce2cd806931ce4db9230c379989 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 28 Sep 2017 17:21:32 -0400
 Subject: [PATCH] Add PlayerJumpEvent
diff --git a/Spigot-API-Patches/0071-Expose-client-protocol-version-and-virtual-host.patch b/Spigot-API-Patches/0070-Expose-client-protocol-version-and-virtual-host.patch
similarity index 97%
rename from Spigot-API-Patches/0071-Expose-client-protocol-version-and-virtual-host.patch
rename to Spigot-API-Patches/0070-Expose-client-protocol-version-and-virtual-host.patch
index bb7824783e..602c3789c0 100644
--- a/Spigot-API-Patches/0071-Expose-client-protocol-version-and-virtual-host.patch
+++ b/Spigot-API-Patches/0070-Expose-client-protocol-version-and-virtual-host.patch
@@ -1,4 +1,4 @@
-From e3792c13f6e712593072cb31dc951110ff1e6632 Mon Sep 17 00:00:00 2001
+From 4a4df5cf1adcaa8a25be2876c550c2ff2a517a67 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Tue, 10 Oct 2017 18:44:42 +0200
 Subject: [PATCH] Expose client protocol version and virtual host
diff --git a/Spigot-API-Patches/0072-Add-PlayerArmorChangeEvent.patch b/Spigot-API-Patches/0071-Add-PlayerArmorChangeEvent.patch
similarity index 98%
rename from Spigot-API-Patches/0072-Add-PlayerArmorChangeEvent.patch
rename to Spigot-API-Patches/0071-Add-PlayerArmorChangeEvent.patch
index 22fdb88e4b..30fe3ec790 100644
--- a/Spigot-API-Patches/0072-Add-PlayerArmorChangeEvent.patch
+++ b/Spigot-API-Patches/0071-Add-PlayerArmorChangeEvent.patch
@@ -1,4 +1,4 @@
-From a19dc4df4d2e6230616f78cc0eec847092cded18 Mon Sep 17 00:00:00 2001
+From e7a01ce105a27097d7f08442b7db2aad136bcd7f Mon Sep 17 00:00:00 2001
 From: pkt77 <parkerkt77@gmail.com>
 Date: Fri, 10 Nov 2017 23:45:59 -0500
 Subject: [PATCH] Add PlayerArmorChangeEvent
diff --git a/Spigot-API-Patches/0073-API-to-get-a-BlockState-without-a-snapshot.patch b/Spigot-API-Patches/0072-API-to-get-a-BlockState-without-a-snapshot.patch
similarity index 85%
rename from Spigot-API-Patches/0073-API-to-get-a-BlockState-without-a-snapshot.patch
rename to Spigot-API-Patches/0072-API-to-get-a-BlockState-without-a-snapshot.patch
index 2f844fa647..cefb98c0fa 100644
--- a/Spigot-API-Patches/0073-API-to-get-a-BlockState-without-a-snapshot.patch
+++ b/Spigot-API-Patches/0072-API-to-get-a-BlockState-without-a-snapshot.patch
@@ -1,4 +1,4 @@
-From 5b78e31d0aeb0cfcf2d3e108326c660d3cfd7aa1 Mon Sep 17 00:00:00 2001
+From 1cb04b32f151759c17629a384fa8547a255334a6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 6 Nov 2017 21:10:01 -0500
 Subject: [PATCH] API to get a BlockState without a snapshot
@@ -9,10 +9,10 @@ on the real tile entity.
 This is useful for where performance is needed
 
 diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
-index 1aa3373f..9aab043c 100644
+index 679c29cf..238de6f0 100644
 --- a/src/main/java/org/bukkit/block/Block.java
 +++ b/src/main/java/org/bukkit/block/Block.java
-@@ -242,6 +242,15 @@ public interface Block extends Metadatable {
+@@ -223,6 +223,15 @@ public interface Block extends Metadatable {
       */
      BlockState getState();
  
diff --git a/Spigot-API-Patches/0074-AsyncTabCompleteEvent.patch b/Spigot-API-Patches/0073-AsyncTabCompleteEvent.patch
similarity index 99%
rename from Spigot-API-Patches/0074-AsyncTabCompleteEvent.patch
rename to Spigot-API-Patches/0073-AsyncTabCompleteEvent.patch
index b2f8ed36a7..7713ebb31f 100644
--- a/Spigot-API-Patches/0074-AsyncTabCompleteEvent.patch
+++ b/Spigot-API-Patches/0073-AsyncTabCompleteEvent.patch
@@ -1,4 +1,4 @@
-From 2fe82eb2c39bc39aa0264a02db45e8bf643d1d26 Mon Sep 17 00:00:00 2001
+From c98afebdb0e60908d750e33e33c06ad612ac6434 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 26 Nov 2017 13:17:09 -0500
 Subject: [PATCH] AsyncTabCompleteEvent
diff --git a/Spigot-API-Patches/0075-Display-warning-on-deprecated-recipe-API.patch b/Spigot-API-Patches/0074-Display-warning-on-deprecated-recipe-API.patch
similarity index 97%
rename from Spigot-API-Patches/0075-Display-warning-on-deprecated-recipe-API.patch
rename to Spigot-API-Patches/0074-Display-warning-on-deprecated-recipe-API.patch
index 599b38ac7c..046b029460 100644
--- a/Spigot-API-Patches/0075-Display-warning-on-deprecated-recipe-API.patch
+++ b/Spigot-API-Patches/0074-Display-warning-on-deprecated-recipe-API.patch
@@ -1,4 +1,4 @@
-From 92fba1efc29b3550577a18bcf74cb41327f59019 Mon Sep 17 00:00:00 2001
+From 120a11417f9d48ca7ae42393b88e4751583391ef Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 9 Dec 2017 12:40:25 -0500
 Subject: [PATCH] Display warning on deprecated recipe API
diff --git a/Spigot-API-Patches/0076-PlayerPickupExperienceEvent.patch b/Spigot-API-Patches/0075-PlayerPickupExperienceEvent.patch
similarity index 98%
rename from Spigot-API-Patches/0076-PlayerPickupExperienceEvent.patch
rename to Spigot-API-Patches/0075-PlayerPickupExperienceEvent.patch
index 1cb06e31a5..f04a712c73 100644
--- a/Spigot-API-Patches/0076-PlayerPickupExperienceEvent.patch
+++ b/Spigot-API-Patches/0075-PlayerPickupExperienceEvent.patch
@@ -1,4 +1,4 @@
-From 6acec34388a520536f958b9c92c632892c2cef27 Mon Sep 17 00:00:00 2001
+From 7583b7eef0eb813aa2a79d214dea15eaab1b6dc7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 22:00:41 -0500
 Subject: [PATCH] PlayerPickupExperienceEvent
diff --git a/Spigot-API-Patches/0077-ExperienceOrbMergeEvent.patch b/Spigot-API-Patches/0076-ExperienceOrbMergeEvent.patch
similarity index 98%
rename from Spigot-API-Patches/0077-ExperienceOrbMergeEvent.patch
rename to Spigot-API-Patches/0076-ExperienceOrbMergeEvent.patch
index a483ca9363..be8b56e8aa 100644
--- a/Spigot-API-Patches/0077-ExperienceOrbMergeEvent.patch
+++ b/Spigot-API-Patches/0076-ExperienceOrbMergeEvent.patch
@@ -1,4 +1,4 @@
-From 51c1f56626683e98d9c9728d6ebc399e0123a91b Mon Sep 17 00:00:00 2001
+From ac086d03f6617bcc272e6d9d7547ed7d1e94c808 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 22:56:24 -0500
 Subject: [PATCH] ExperienceOrbMergeEvent
diff --git a/Spigot-API-Patches/0078-Ability-to-apply-mending-to-XP-API.patch b/Spigot-API-Patches/0077-Ability-to-apply-mending-to-XP-API.patch
similarity index 96%
rename from Spigot-API-Patches/0078-Ability-to-apply-mending-to-XP-API.patch
rename to Spigot-API-Patches/0077-Ability-to-apply-mending-to-XP-API.patch
index e0c592a60f..5e006a0631 100644
--- a/Spigot-API-Patches/0078-Ability-to-apply-mending-to-XP-API.patch
+++ b/Spigot-API-Patches/0077-Ability-to-apply-mending-to-XP-API.patch
@@ -1,4 +1,4 @@
-From 468f4768ac979bb546fe16cc286ed533ac26e04e Mon Sep 17 00:00:00 2001
+From a4490dff8b9cf87a9efbc8bbe807b629de2df02b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 20 Dec 2017 17:38:07 -0500
 Subject: [PATCH] Ability to apply mending to XP API
diff --git a/Spigot-API-Patches/0079-PreCreatureSpawnEvent.patch b/Spigot-API-Patches/0078-PreCreatureSpawnEvent.patch
similarity index 98%
rename from Spigot-API-Patches/0079-PreCreatureSpawnEvent.patch
rename to Spigot-API-Patches/0078-PreCreatureSpawnEvent.patch
index 523147f3f6..c05dfa30a5 100644
--- a/Spigot-API-Patches/0079-PreCreatureSpawnEvent.patch
+++ b/Spigot-API-Patches/0078-PreCreatureSpawnEvent.patch
@@ -1,4 +1,4 @@
-From 4171ce67cc2901442e728da492533f9fec795711 Mon Sep 17 00:00:00 2001
+From d96e899da4fd2b553148ba115ac5b68ee27952ad Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 14 Jan 2018 16:59:43 -0500
 Subject: [PATCH] PreCreatureSpawnEvent
diff --git a/Spigot-API-Patches/0080-PlayerNaturallySpawnCreaturesEvent.patch b/Spigot-API-Patches/0079-PlayerNaturallySpawnCreaturesEvent.patch
similarity index 97%
rename from Spigot-API-Patches/0080-PlayerNaturallySpawnCreaturesEvent.patch
rename to Spigot-API-Patches/0079-PlayerNaturallySpawnCreaturesEvent.patch
index 68a449a916..81743e5478 100644
--- a/Spigot-API-Patches/0080-PlayerNaturallySpawnCreaturesEvent.patch
+++ b/Spigot-API-Patches/0079-PlayerNaturallySpawnCreaturesEvent.patch
@@ -1,4 +1,4 @@
-From ce4a90e4f24108e85f7c66050711c1b5667085bb Mon Sep 17 00:00:00 2001
+From c5154039ff463f366dae9a072e0c014f92eabedb Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 14 Jan 2018 17:31:37 -0500
 Subject: [PATCH] PlayerNaturallySpawnCreaturesEvent
diff --git a/Spigot-API-Patches/0081-Add-SkullMeta.setPlayerProfile-API.patch b/Spigot-API-Patches/0080-Add-SkullMeta.setPlayerProfile-API.patch
similarity index 95%
rename from Spigot-API-Patches/0081-Add-SkullMeta.setPlayerProfile-API.patch
rename to Spigot-API-Patches/0080-Add-SkullMeta.setPlayerProfile-API.patch
index 354a062fa4..c50c7a0b61 100644
--- a/Spigot-API-Patches/0081-Add-SkullMeta.setPlayerProfile-API.patch
+++ b/Spigot-API-Patches/0080-Add-SkullMeta.setPlayerProfile-API.patch
@@ -1,4 +1,4 @@
-From fd43f9fb69c2e0792c33ee16e007134728a3df2d Mon Sep 17 00:00:00 2001
+From 956b151ae68497ff34ebf1f4dc540cc88754f276 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 19 Jan 2018 00:29:28 -0500
 Subject: [PATCH] Add SkullMeta.setPlayerProfile API
diff --git a/Spigot-API-Patches/0082-Fill-Profile-Property-Events.patch b/Spigot-API-Patches/0081-Fill-Profile-Property-Events.patch
similarity index 98%
rename from Spigot-API-Patches/0082-Fill-Profile-Property-Events.patch
rename to Spigot-API-Patches/0081-Fill-Profile-Property-Events.patch
index d72966c05e..c5cf7243f1 100644
--- a/Spigot-API-Patches/0082-Fill-Profile-Property-Events.patch
+++ b/Spigot-API-Patches/0081-Fill-Profile-Property-Events.patch
@@ -1,4 +1,4 @@
-From f932e1e9c552db09887c010fbb179ddf05d4a416 Mon Sep 17 00:00:00 2001
+From c3ae932f11c94cfa5b46fc5b11b04a283260708f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 2 Jan 2018 00:31:08 -0500
 Subject: [PATCH] Fill Profile Property Events
diff --git a/Spigot-API-Patches/0083-PlayerAdvancementCriterionGrantEvent.patch b/Spigot-API-Patches/0082-PlayerAdvancementCriterionGrantEvent.patch
similarity index 97%
rename from Spigot-API-Patches/0083-PlayerAdvancementCriterionGrantEvent.patch
rename to Spigot-API-Patches/0082-PlayerAdvancementCriterionGrantEvent.patch
index 7975c6c45e..5c6f84294f 100644
--- a/Spigot-API-Patches/0083-PlayerAdvancementCriterionGrantEvent.patch
+++ b/Spigot-API-Patches/0082-PlayerAdvancementCriterionGrantEvent.patch
@@ -1,4 +1,4 @@
-From b19e61438f5405ee5e004322bed0fea411f18924 Mon Sep 17 00:00:00 2001
+From c74290391d661bac5694c965fdd19e56cb6c9e42 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 19 Jan 2018 08:15:14 -0600
 Subject: [PATCH] PlayerAdvancementCriterionGrantEvent
diff --git a/Spigot-API-Patches/0084-Add-ArmorStand-Item-Meta.patch b/Spigot-API-Patches/0083-Add-ArmorStand-Item-Meta.patch
similarity index 97%
rename from Spigot-API-Patches/0084-Add-ArmorStand-Item-Meta.patch
rename to Spigot-API-Patches/0083-Add-ArmorStand-Item-Meta.patch
index 88d1069f99..dc184d0c03 100644
--- a/Spigot-API-Patches/0084-Add-ArmorStand-Item-Meta.patch
+++ b/Spigot-API-Patches/0083-Add-ArmorStand-Item-Meta.patch
@@ -1,4 +1,4 @@
-From 68d7994d386398bd6ad0a51efbb58f1d1357ba0d Mon Sep 17 00:00:00 2001
+From d49f8976711a2afe8d57cf0a546332f8c95df6ad Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 27 Jan 2018 17:06:24 -0500
 Subject: [PATCH] Add ArmorStand Item Meta
diff --git a/Spigot-API-Patches/0085-Optimize-Hoppers.patch b/Spigot-API-Patches/0084-Optimize-Hoppers.patch
similarity index 96%
rename from Spigot-API-Patches/0085-Optimize-Hoppers.patch
rename to Spigot-API-Patches/0084-Optimize-Hoppers.patch
index 39edb6f613..bbc05ec122 100644
--- a/Spigot-API-Patches/0085-Optimize-Hoppers.patch
+++ b/Spigot-API-Patches/0084-Optimize-Hoppers.patch
@@ -1,4 +1,4 @@
-From 3d903c7ed998ce99c37f5b392021b982b9283955 Mon Sep 17 00:00:00 2001
+From ad00ddb857bd631a9ae93eaabe76c044436f51d1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 18 Jan 2018 01:00:27 -0500
 Subject: [PATCH] Optimize Hoppers
diff --git a/Spigot-API-Patches/0086-Tameable-getOwnerUniqueId-API.patch b/Spigot-API-Patches/0085-Tameable-getOwnerUniqueId-API.patch
similarity index 94%
rename from Spigot-API-Patches/0086-Tameable-getOwnerUniqueId-API.patch
rename to Spigot-API-Patches/0085-Tameable-getOwnerUniqueId-API.patch
index f9a4857e47..2b73ed654b 100644
--- a/Spigot-API-Patches/0086-Tameable-getOwnerUniqueId-API.patch
+++ b/Spigot-API-Patches/0085-Tameable-getOwnerUniqueId-API.patch
@@ -1,4 +1,4 @@
-From bc63e16534cb5f723604669f5acb8b70ad600eab Mon Sep 17 00:00:00 2001
+From 49e9ab9b0b462f724ac9f77fbf6dd7c0c319225d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 24 Feb 2018 00:55:52 -0500
 Subject: [PATCH] Tameable#getOwnerUniqueId API
diff --git a/Spigot-API-Patches/0087-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/Spigot-API-Patches/0086-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
similarity index 96%
rename from Spigot-API-Patches/0087-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
rename to Spigot-API-Patches/0086-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
index 2edaf26818..29a6bbac14 100644
--- a/Spigot-API-Patches/0087-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
+++ b/Spigot-API-Patches/0086-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
@@ -1,4 +1,4 @@
-From c438100df0d0e3f2210c8a932e596c0dd327ca29 Mon Sep 17 00:00:00 2001
+From 03d67fdc4e326c291edce8d26e66146c8d1dd111 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 18 Mar 2018 11:43:30 -0400
 Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent
diff --git a/Spigot-API-Patches/0088-Add-extended-PaperServerListPingEvent.patch b/Spigot-API-Patches/0087-Add-extended-PaperServerListPingEvent.patch
similarity index 99%
rename from Spigot-API-Patches/0088-Add-extended-PaperServerListPingEvent.patch
rename to Spigot-API-Patches/0087-Add-extended-PaperServerListPingEvent.patch
index 25bfa6180f..1dbc2dc12d 100644
--- a/Spigot-API-Patches/0088-Add-extended-PaperServerListPingEvent.patch
+++ b/Spigot-API-Patches/0087-Add-extended-PaperServerListPingEvent.patch
@@ -1,4 +1,4 @@
-From cbeaccc81b0cf819614ee7f57c7ec2f63aa3477f Mon Sep 17 00:00:00 2001
+From e983285e16c5833593ce8aaa6f806219cc08a641 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Wed, 11 Oct 2017 15:55:38 +0200
 Subject: [PATCH] Add extended PaperServerListPingEvent
diff --git a/Spigot-API-Patches/0089-Player.setPlayerProfile-API.patch b/Spigot-API-Patches/0088-Player.setPlayerProfile-API.patch
similarity index 95%
rename from Spigot-API-Patches/0089-Player.setPlayerProfile-API.patch
rename to Spigot-API-Patches/0088-Player.setPlayerProfile-API.patch
index b808653e89..966aa8d13b 100644
--- a/Spigot-API-Patches/0089-Player.setPlayerProfile-API.patch
+++ b/Spigot-API-Patches/0088-Player.setPlayerProfile-API.patch
@@ -1,4 +1,4 @@
-From dff56416f41aa3ed9bfe8eb38174279b2c189ac4 Mon Sep 17 00:00:00 2001
+From f2bc9bc75a61d71a627a18f57f66a965ba99f1c3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 18 Mar 2018 12:28:55 -0400
 Subject: [PATCH] Player.setPlayerProfile API
diff --git a/Spigot-API-Patches/0090-getPlayerUniqueId-API.patch b/Spigot-API-Patches/0089-getPlayerUniqueId-API.patch
similarity index 97%
rename from Spigot-API-Patches/0090-getPlayerUniqueId-API.patch
rename to Spigot-API-Patches/0089-getPlayerUniqueId-API.patch
index 3cf09f19b1..d6c19d057a 100644
--- a/Spigot-API-Patches/0090-getPlayerUniqueId-API.patch
+++ b/Spigot-API-Patches/0089-getPlayerUniqueId-API.patch
@@ -1,4 +1,4 @@
-From 9a6d0e5ca85f0cc9a82b7eaa2dc4435cffc6c3d7 Mon Sep 17 00:00:00 2001
+From 4f4d3dad507842141ff628337284fdd59deb9ab8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 22 Mar 2018 01:39:28 -0400
 Subject: [PATCH] getPlayerUniqueId API
diff --git a/Spigot-API-Patches/0091-Add-legacy-ping-support-to-PaperServerListPingEvent.patch b/Spigot-API-Patches/0090-Add-legacy-ping-support-to-PaperServerListPingEvent.patch
similarity index 94%
rename from Spigot-API-Patches/0091-Add-legacy-ping-support-to-PaperServerListPingEvent.patch
rename to Spigot-API-Patches/0090-Add-legacy-ping-support-to-PaperServerListPingEvent.patch
index a69fa1af2b..b480566aff 100644
--- a/Spigot-API-Patches/0091-Add-legacy-ping-support-to-PaperServerListPingEvent.patch
+++ b/Spigot-API-Patches/0090-Add-legacy-ping-support-to-PaperServerListPingEvent.patch
@@ -1,4 +1,4 @@
-From 9889b9a859949be8666d55e15aeff843c5a80d2b Mon Sep 17 00:00:00 2001
+From 1a2033967ffb93634c6d4cd0af4e9d27d5d27b6e Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Wed, 11 Oct 2017 19:30:20 +0200
 Subject: [PATCH] Add legacy ping support to PaperServerListPingEvent
diff --git a/Spigot-API-Patches/0092-Add-method-to-open-already-placed-sign.patch b/Spigot-API-Patches/0091-Add-method-to-open-already-placed-sign.patch
similarity index 92%
rename from Spigot-API-Patches/0092-Add-method-to-open-already-placed-sign.patch
rename to Spigot-API-Patches/0091-Add-method-to-open-already-placed-sign.patch
index b3f95de743..41e083f71c 100644
--- a/Spigot-API-Patches/0092-Add-method-to-open-already-placed-sign.patch
+++ b/Spigot-API-Patches/0091-Add-method-to-open-already-placed-sign.patch
@@ -1,4 +1,4 @@
-From c8afd6a6b8a7485805ed3eab9cd3b5faf59f6b28 Mon Sep 17 00:00:00 2001
+From 82828abda963ddcea2a0df4c15a8f0d3bb2f20c8 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Sun, 1 Apr 2018 02:28:43 +0300
 Subject: [PATCH] Add method to open already placed sign
diff --git a/Spigot-API-Patches/0093-Add-version-history-to-version-command.patch b/Spigot-API-Patches/0092-Add-version-history-to-version-command.patch
similarity index 99%
rename from Spigot-API-Patches/0093-Add-version-history-to-version-command.patch
rename to Spigot-API-Patches/0092-Add-version-history-to-version-command.patch
index 24d4472a2e..a85be8779b 100644
--- a/Spigot-API-Patches/0093-Add-version-history-to-version-command.patch
+++ b/Spigot-API-Patches/0092-Add-version-history-to-version-command.patch
@@ -1,4 +1,4 @@
-From df28e17f5f2d148f78f8ae0c03a3a7b51da7b081 Mon Sep 17 00:00:00 2001
+From f4043d993253dd4c573166dd6cc91347bf85bbcf Mon Sep 17 00:00:00 2001
 From: Kyle Wood <demonwav@gmail.com>
 Date: Thu, 1 Mar 2018 19:37:52 -0600
 Subject: [PATCH] Add version history to version command
diff --git a/Spigot-API-Patches/0094-Add-Ban-Methods-to-Player-Objects.patch b/Spigot-API-Patches/0093-Add-Ban-Methods-to-Player-Objects.patch
similarity index 99%
rename from Spigot-API-Patches/0094-Add-Ban-Methods-to-Player-Objects.patch
rename to Spigot-API-Patches/0093-Add-Ban-Methods-to-Player-Objects.patch
index 0d338fefc9..4d98eb9bef 100644
--- a/Spigot-API-Patches/0094-Add-Ban-Methods-to-Player-Objects.patch
+++ b/Spigot-API-Patches/0093-Add-Ban-Methods-to-Player-Objects.patch
@@ -1,4 +1,4 @@
-From 78be1ecf7b7a0c39cef11e710ab52f7257805913 Mon Sep 17 00:00:00 2001
+From 6514d05e7994ca64d84829f5ea5f08881d896143 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 28 Apr 2018 10:28:50 -0400
 Subject: [PATCH] Add Ban Methods to Player Objects
diff --git a/Spigot-API-Patches/0095-EndermanEscapeEvent.patch b/Spigot-API-Patches/0094-EndermanEscapeEvent.patch
similarity index 97%
rename from Spigot-API-Patches/0095-EndermanEscapeEvent.patch
rename to Spigot-API-Patches/0094-EndermanEscapeEvent.patch
index dfc8e6bf56..ed8c92b565 100644
--- a/Spigot-API-Patches/0095-EndermanEscapeEvent.patch
+++ b/Spigot-API-Patches/0094-EndermanEscapeEvent.patch
@@ -1,4 +1,4 @@
-From a76bc604a4fc380fd9fbadf1c30959c6724bc8e0 Mon Sep 17 00:00:00 2001
+From f6de564e86fa93c0f80a7f13fea4c725fde220a7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 13:14:30 -0400
 Subject: [PATCH] EndermanEscapeEvent
diff --git a/Spigot-API-Patches/0096-Enderman.teleportRandomly.patch b/Spigot-API-Patches/0095-Enderman.teleportRandomly.patch
similarity index 93%
rename from Spigot-API-Patches/0096-Enderman.teleportRandomly.patch
rename to Spigot-API-Patches/0095-Enderman.teleportRandomly.patch
index 7dcd6a62ac..66ffe6baaa 100644
--- a/Spigot-API-Patches/0096-Enderman.teleportRandomly.patch
+++ b/Spigot-API-Patches/0095-Enderman.teleportRandomly.patch
@@ -1,4 +1,4 @@
-From ae31d989fe8cdbe48cb5f36db3e9fd7e1a913a97 Mon Sep 17 00:00:00 2001
+From 1ec75ba436761bb918589563fcd3b71d19846ce0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 13:29:15 -0400
 Subject: [PATCH] Enderman.teleportRandomly()
diff --git a/Spigot-API-Patches/0097-Additional-world.getNearbyEntities-API-s.patch b/Spigot-API-Patches/0096-Additional-world.getNearbyEntities-API-s.patch
similarity index 98%
rename from Spigot-API-Patches/0097-Additional-world.getNearbyEntities-API-s.patch
rename to Spigot-API-Patches/0096-Additional-world.getNearbyEntities-API-s.patch
index a1c4f3a45b..25ba151fa2 100644
--- a/Spigot-API-Patches/0097-Additional-world.getNearbyEntities-API-s.patch
+++ b/Spigot-API-Patches/0096-Additional-world.getNearbyEntities-API-s.patch
@@ -1,4 +1,4 @@
-From 5dbaacdda092901a3fbc3dc89d42fa53f9869cfe Mon Sep 17 00:00:00 2001
+From 684b4b13045cf9a8ed1c8246539feb43afd55cee Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 17:55:28 -0400
 Subject: [PATCH] Additional world.getNearbyEntities API's
@@ -6,7 +6,7 @@ Subject: [PATCH] Additional world.getNearbyEntities API's
 Provides more methods to get nearby entities, and filter by types and predicates
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 4cc70326..97badc63 100644
+index e14098fa..ac32195d 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -2,11 +2,14 @@ package org.bukkit;
@@ -24,7 +24,7 @@ index 4cc70326..97badc63 100644
  
  import org.bukkit.block.Biome;
  import org.bukkit.block.Block;
-@@ -503,6 +506,205 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -431,6 +434,205 @@ public interface World extends PluginMessageRecipient, Metadatable {
       */
      public Collection<Entity> getEntitiesByClasses(Class<?>... classes);
  
diff --git a/Spigot-API-Patches/0098-Location.isChunkLoaded-API.patch b/Spigot-API-Patches/0097-Location.isChunkLoaded-API.patch
similarity index 91%
rename from Spigot-API-Patches/0098-Location.isChunkLoaded-API.patch
rename to Spigot-API-Patches/0097-Location.isChunkLoaded-API.patch
index 288e0e9ed3..db72eb50fc 100644
--- a/Spigot-API-Patches/0098-Location.isChunkLoaded-API.patch
+++ b/Spigot-API-Patches/0097-Location.isChunkLoaded-API.patch
@@ -1,4 +1,4 @@
-From 35e2de767d021fbac9df464ada1422955342bfd6 Mon Sep 17 00:00:00 2001
+From 5d998b54fbc373ae8d50dd5c19ddb64cd5db3e2c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 19:27:31 -0400
 Subject: [PATCH] Location.isChunkLoaded() API
diff --git a/Spigot-API-Patches/0099-Expand-World.spawnParticle-API-and-add-Builder.patch b/Spigot-API-Patches/0098-Expand-World.spawnParticle-API-and-add-Builder.patch
similarity index 99%
rename from Spigot-API-Patches/0099-Expand-World.spawnParticle-API-and-add-Builder.patch
rename to Spigot-API-Patches/0098-Expand-World.spawnParticle-API-and-add-Builder.patch
index 6db406028a..537a9e5072 100644
--- a/Spigot-API-Patches/0099-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/Spigot-API-Patches/0098-Expand-World.spawnParticle-API-and-add-Builder.patch
@@ -1,4 +1,4 @@
-From c6a4a37ea77dbc070c7c5297f41a2331a519968a Mon Sep 17 00:00:00 2001
+From 16fae4609fea741833ed1b7936b260fc18628cee Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 29 Aug 2017 23:58:48 -0400
 Subject: [PATCH] Expand World.spawnParticle API and add Builder
@@ -410,10 +410,10 @@ index 4d0acaf5..0ae85d85 100644
       * Options which can be applied to redstone dust particles - a particle
       * color and size.
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 97badc63..a22e47ea 100644
+index ac32195d..d2b3e192 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -1744,7 +1744,31 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1672,7 +1672,31 @@ public interface World extends PluginMessageRecipient, Metadatable {
       *             the type of this depends on {@link Particle#getDataType()}
       * @param <T> Type
       */
diff --git a/Spigot-API-Patches/0100-EndermanAttackPlayerEvent.patch b/Spigot-API-Patches/0099-EndermanAttackPlayerEvent.patch
similarity index 98%
rename from Spigot-API-Patches/0100-EndermanAttackPlayerEvent.patch
rename to Spigot-API-Patches/0099-EndermanAttackPlayerEvent.patch
index c18675116c..0846cc6edf 100644
--- a/Spigot-API-Patches/0100-EndermanAttackPlayerEvent.patch
+++ b/Spigot-API-Patches/0099-EndermanAttackPlayerEvent.patch
@@ -1,4 +1,4 @@
-From 954a377e0960f18820e9ef8a3098d5f0358a284d Mon Sep 17 00:00:00 2001
+From 6c6a2ce230f36f7b42b89b2ba7be407dc28c3a3c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 1 May 2018 20:17:44 -0400
 Subject: [PATCH] EndermanAttackPlayerEvent
diff --git a/Spigot-API-Patches/0101-Close-Plugin-Class-Loaders-on-Disable.patch b/Spigot-API-Patches/0100-Close-Plugin-Class-Loaders-on-Disable.patch
similarity index 99%
rename from Spigot-API-Patches/0101-Close-Plugin-Class-Loaders-on-Disable.patch
rename to Spigot-API-Patches/0100-Close-Plugin-Class-Loaders-on-Disable.patch
index 753dc343c9..4025c46b3d 100644
--- a/Spigot-API-Patches/0101-Close-Plugin-Class-Loaders-on-Disable.patch
+++ b/Spigot-API-Patches/0100-Close-Plugin-Class-Loaders-on-Disable.patch
@@ -1,4 +1,4 @@
-From 9e505b4488cc6cb5a94d213092c949a2895c7cad Mon Sep 17 00:00:00 2001
+From 7fde4c2352b99a7f57694bdae89f691ecc656c68 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 1 May 2018 21:33:35 -0400
 Subject: [PATCH] Close Plugin Class Loaders on Disable
diff --git a/Spigot-API-Patches/0102-WitchConsumePotionEvent.patch b/Spigot-API-Patches/0101-WitchConsumePotionEvent.patch
similarity index 98%
rename from Spigot-API-Patches/0102-WitchConsumePotionEvent.patch
rename to Spigot-API-Patches/0101-WitchConsumePotionEvent.patch
index 8f325aa2c2..efe6ff9b09 100644
--- a/Spigot-API-Patches/0102-WitchConsumePotionEvent.patch
+++ b/Spigot-API-Patches/0101-WitchConsumePotionEvent.patch
@@ -1,4 +1,4 @@
-From be2efe30ca0ea347d901f873e416d2e9b4973156 Mon Sep 17 00:00:00 2001
+From aad0ca777756d4b341f053bd70ffce06d04b3206 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 16 May 2018 20:26:16 -0400
 Subject: [PATCH] WitchConsumePotionEvent
diff --git a/Spigot-API-Patches/0103-WitchThrowPotionEvent.patch b/Spigot-API-Patches/0102-WitchThrowPotionEvent.patch
similarity index 97%
rename from Spigot-API-Patches/0103-WitchThrowPotionEvent.patch
rename to Spigot-API-Patches/0102-WitchThrowPotionEvent.patch
index d04653f5e1..a541c585e2 100644
--- a/Spigot-API-Patches/0103-WitchThrowPotionEvent.patch
+++ b/Spigot-API-Patches/0102-WitchThrowPotionEvent.patch
@@ -1,4 +1,4 @@
-From 4b9da1b2e0d668e73dba9a673984af7d0be648cd Mon Sep 17 00:00:00 2001
+From 541ae193668500d017ebe33cda73a44121ee3455 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 16 May 2018 20:39:09 -0400
 Subject: [PATCH] WitchThrowPotionEvent
diff --git a/Spigot-API-Patches/0104-Location.toBlockLocation-toCenterLocation.patch b/Spigot-API-Patches/0103-Location.toBlockLocation-toCenterLocation.patch
similarity index 95%
rename from Spigot-API-Patches/0104-Location.toBlockLocation-toCenterLocation.patch
rename to Spigot-API-Patches/0103-Location.toBlockLocation-toCenterLocation.patch
index 2a046aae94..63fdf01fea 100644
--- a/Spigot-API-Patches/0104-Location.toBlockLocation-toCenterLocation.patch
+++ b/Spigot-API-Patches/0103-Location.toBlockLocation-toCenterLocation.patch
@@ -1,4 +1,4 @@
-From fedd7fd91d2e697183c38f16f58ba29791a4ab28 Mon Sep 17 00:00:00 2001
+From a6bcc9478c95e056ec412ed1317f4d597b0a7017 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 24 May 2018 21:01:13 -0400
 Subject: [PATCH] Location.toBlockLocation/toCenterLocation()
diff --git a/Spigot-API-Patches/0105-PotionEffect-clone-methods.patch b/Spigot-API-Patches/0104-PotionEffect-clone-methods.patch
similarity index 96%
rename from Spigot-API-Patches/0105-PotionEffect-clone-methods.patch
rename to Spigot-API-Patches/0104-PotionEffect-clone-methods.patch
index 50e3684671..e3c0c81d48 100644
--- a/Spigot-API-Patches/0105-PotionEffect-clone-methods.patch
+++ b/Spigot-API-Patches/0104-PotionEffect-clone-methods.patch
@@ -1,4 +1,4 @@
-From c6aee3dcccadea3bd3d205b5a57976282695ffd6 Mon Sep 17 00:00:00 2001
+From cc7e0cbb65f4290788d5f4864898611eb01d38ca Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 3 Jun 2018 04:10:13 -0400
 Subject: [PATCH] PotionEffect clone methods
diff --git a/Spigot-API-Patches/0106-WitchReadyPotionEvent.patch b/Spigot-API-Patches/0105-WitchReadyPotionEvent.patch
similarity index 97%
rename from Spigot-API-Patches/0106-WitchReadyPotionEvent.patch
rename to Spigot-API-Patches/0105-WitchReadyPotionEvent.patch
index 30099bc76e..3665efcdaf 100644
--- a/Spigot-API-Patches/0106-WitchReadyPotionEvent.patch
+++ b/Spigot-API-Patches/0105-WitchReadyPotionEvent.patch
@@ -1,4 +1,4 @@
-From 22191113338e641960b5fa666940463514f187cb Mon Sep 17 00:00:00 2001
+From aa70385f1487c465957bf670526c427fe9a31f57 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Jun 2018 22:47:08 -0400
 Subject: [PATCH] WitchReadyPotionEvent
diff --git a/Spigot-API-Patches/0107-ItemStack-getMaxItemUseDuration.patch b/Spigot-API-Patches/0106-ItemStack-getMaxItemUseDuration.patch
similarity index 84%
rename from Spigot-API-Patches/0107-ItemStack-getMaxItemUseDuration.patch
rename to Spigot-API-Patches/0106-ItemStack-getMaxItemUseDuration.patch
index 950f9000dd..c8999a1a6c 100644
--- a/Spigot-API-Patches/0107-ItemStack-getMaxItemUseDuration.patch
+++ b/Spigot-API-Patches/0106-ItemStack-getMaxItemUseDuration.patch
@@ -1,4 +1,4 @@
-From a51daa61f1e96d6ddce2e5a205da53be66293ba2 Mon Sep 17 00:00:00 2001
+From e336f7984ef9c18c49bfe743e7f33e9201c4fc24 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Jun 2018 22:59:50 -0400
 Subject: [PATCH] ItemStack#getMaxItemUseDuration
@@ -6,10 +6,10 @@ Subject: [PATCH] ItemStack#getMaxItemUseDuration
 Allows you to determine how long it takes to use a usable/consumable item
 
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 864b16b1..e9f25924 100644
+index ca7a958f..a240311e 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
-@@ -561,5 +561,13 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
+@@ -574,5 +574,13 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
      public String getI18NDisplayName() {
          return Bukkit.getServer().getItemFactory().getI18NDisplayName(this);
      }
diff --git a/Spigot-API-Patches/0108-Add-EntityTeleportEndGatewayEvent.patch b/Spigot-API-Patches/0107-Add-EntityTeleportEndGatewayEvent.patch
similarity index 95%
rename from Spigot-API-Patches/0108-Add-EntityTeleportEndGatewayEvent.patch
rename to Spigot-API-Patches/0107-Add-EntityTeleportEndGatewayEvent.patch
index 445fe7c342..09be9b67fe 100644
--- a/Spigot-API-Patches/0108-Add-EntityTeleportEndGatewayEvent.patch
+++ b/Spigot-API-Patches/0107-Add-EntityTeleportEndGatewayEvent.patch
@@ -1,4 +1,4 @@
-From 15c16def63477471b46d0e8620061f60a87afb9e Mon Sep 17 00:00:00 2001
+From 7886764d86b2cbb9c33aaa5b57d103adf51482ba Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 9 Jun 2018 13:08:21 +0100
 Subject: [PATCH] Add EntityTeleportEndGatewayEvent
diff --git a/Spigot-API-Patches/0109-Add-SentientNPC-Interface-to-Entities.patch b/Spigot-API-Patches/0108-Add-SentientNPC-Interface-to-Entities.patch
similarity index 99%
rename from Spigot-API-Patches/0109-Add-SentientNPC-Interface-to-Entities.patch
rename to Spigot-API-Patches/0108-Add-SentientNPC-Interface-to-Entities.patch
index 8b1e2cde25..587b69b5f4 100644
--- a/Spigot-API-Patches/0109-Add-SentientNPC-Interface-to-Entities.patch
+++ b/Spigot-API-Patches/0108-Add-SentientNPC-Interface-to-Entities.patch
@@ -1,4 +1,4 @@
-From 3945a9c95cb03bb2b784ca479a563e7c58dcfeb8 Mon Sep 17 00:00:00 2001
+From ae233d1060a039c57855d6b48ad29ee9f16534e5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 16 Jun 2018 13:41:00 -0400
 Subject: [PATCH] Add SentientNPC Interface to Entities
diff --git a/Spigot-API-Patches/0110-Make-shield-blocking-delay-configurable.patch b/Spigot-API-Patches/0109-Make-shield-blocking-delay-configurable.patch
similarity index 94%
rename from Spigot-API-Patches/0110-Make-shield-blocking-delay-configurable.patch
rename to Spigot-API-Patches/0109-Make-shield-blocking-delay-configurable.patch
index fa75bd794c..8b34c8407e 100644
--- a/Spigot-API-Patches/0110-Make-shield-blocking-delay-configurable.patch
+++ b/Spigot-API-Patches/0109-Make-shield-blocking-delay-configurable.patch
@@ -1,4 +1,4 @@
-From 118e1b69d8392749b045d2022d9acc9ccef3de5e Mon Sep 17 00:00:00 2001
+From af11f7559e3f9bf8f9862caecff1e2fa97495ae3 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 16 Jun 2018 01:17:39 -0500
 Subject: [PATCH] Make shield blocking delay configurable
diff --git a/Spigot-API-Patches/0111-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch b/Spigot-API-Patches/0110-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
similarity index 96%
rename from Spigot-API-Patches/0111-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
rename to Spigot-API-Patches/0110-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
index 9d83c76d71..dc61a1ee4e 100644
--- a/Spigot-API-Patches/0111-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
+++ b/Spigot-API-Patches/0110-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
@@ -1,4 +1,4 @@
-From c80d0e0381e3d1b215422e47bb2d3006a14eaf92 Mon Sep 17 00:00:00 2001
+From 66bb665b7640a43ad6eeca4479360a07b3be11d3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 15 Jun 2013 19:52:04 -0400
 Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API
diff --git a/Spigot-API-Patches/0112-Add-getNearbyXXX-methods-to-Location.patch b/Spigot-API-Patches/0111-Add-getNearbyXXX-methods-to-Location.patch
similarity index 99%
rename from Spigot-API-Patches/0112-Add-getNearbyXXX-methods-to-Location.patch
rename to Spigot-API-Patches/0111-Add-getNearbyXXX-methods-to-Location.patch
index a50888a255..75cd402a7d 100644
--- a/Spigot-API-Patches/0112-Add-getNearbyXXX-methods-to-Location.patch
+++ b/Spigot-API-Patches/0111-Add-getNearbyXXX-methods-to-Location.patch
@@ -1,4 +1,4 @@
-From a709f75d9481442be8e2c93a1aea4d952ae0ea0b Mon Sep 17 00:00:00 2001
+From 440009ac512a6ce127c556e999cea1e45804eab8 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 18 Jun 2018 00:41:46 -0500
 Subject: [PATCH] Add "getNearbyXXX" methods to Location
diff --git a/Spigot-API-Patches/0113-PlayerReadyArrowEvent.patch b/Spigot-API-Patches/0112-PlayerReadyArrowEvent.patch
similarity index 98%
rename from Spigot-API-Patches/0113-PlayerReadyArrowEvent.patch
rename to Spigot-API-Patches/0112-PlayerReadyArrowEvent.patch
index ba6aa6a05b..d915c073be 100644
--- a/Spigot-API-Patches/0113-PlayerReadyArrowEvent.patch
+++ b/Spigot-API-Patches/0112-PlayerReadyArrowEvent.patch
@@ -1,4 +1,4 @@
-From 92facfd2330948fd4cce26393a114a210833044c Mon Sep 17 00:00:00 2001
+From 3b93e8bc7dc2bbdd6056c88375614f626c24ac3b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 18 Jun 2018 01:09:27 -0400
 Subject: [PATCH] PlayerReadyArrowEvent
diff --git a/Spigot-API-Patches/0114-Add-EntityKnockbackByEntityEvent.patch b/Spigot-API-Patches/0113-Add-EntityKnockbackByEntityEvent.patch
similarity index 97%
rename from Spigot-API-Patches/0114-Add-EntityKnockbackByEntityEvent.patch
rename to Spigot-API-Patches/0113-Add-EntityKnockbackByEntityEvent.patch
index 1e5f9ae91b..e89370a22b 100644
--- a/Spigot-API-Patches/0114-Add-EntityKnockbackByEntityEvent.patch
+++ b/Spigot-API-Patches/0113-Add-EntityKnockbackByEntityEvent.patch
@@ -1,4 +1,4 @@
-From 09c65738e9deb67f2f09af03f8fdf7e55030239a Mon Sep 17 00:00:00 2001
+From 73104eda9ba4087e6bf0460769ae4c6894bb6740 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Mon, 18 Jun 2018 15:40:39 +0200
 Subject: [PATCH] Add EntityKnockbackByEntityEvent
diff --git a/Spigot-API-Patches/0115-Expand-Explosions-API.patch b/Spigot-API-Patches/0114-Expand-Explosions-API.patch
similarity index 98%
rename from Spigot-API-Patches/0115-Expand-Explosions-API.patch
rename to Spigot-API-Patches/0114-Expand-Explosions-API.patch
index bc64fbf3f7..eb2c5e7c15 100644
--- a/Spigot-API-Patches/0115-Expand-Explosions-API.patch
+++ b/Spigot-API-Patches/0114-Expand-Explosions-API.patch
@@ -1,4 +1,4 @@
-From fecce987f570eaaf23ffd3482a77dd263e98060f Mon Sep 17 00:00:00 2001
+From 88204b64c1d28285d937ec1c7a85dd9e4e2d4a83 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 16:24:42 -0500
 Subject: [PATCH] Expand Explosions API
@@ -95,10 +95,10 @@ index c1689168..d0d86e1a 100644
      @Override
      public boolean equals(Object obj) {
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index a22e47ea..04c174f7 100644
+index d2b3e192..7a6728fb 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -925,6 +925,99 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -853,6 +853,99 @@ public interface World extends PluginMessageRecipient, Metadatable {
       */
      public boolean createExplosion(Location loc, float power, boolean setFire);
  
diff --git a/Spigot-API-Patches/0116-ItemStack-API-additions-for-quantity-flags-lore.patch b/Spigot-API-Patches/0115-ItemStack-API-additions-for-quantity-flags-lore.patch
similarity index 96%
rename from Spigot-API-Patches/0116-ItemStack-API-additions-for-quantity-flags-lore.patch
rename to Spigot-API-Patches/0115-ItemStack-API-additions-for-quantity-flags-lore.patch
index d8da7feb28..f2cfed82fc 100644
--- a/Spigot-API-Patches/0116-ItemStack-API-additions-for-quantity-flags-lore.patch
+++ b/Spigot-API-Patches/0115-ItemStack-API-additions-for-quantity-flags-lore.patch
@@ -1,11 +1,11 @@
-From 88883a05c172e4fcf52f583bee5640675156df5b Mon Sep 17 00:00:00 2001
+From 656a16565559bb80edf1f4cf49f007132c16650e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 22 Jun 2018 22:59:18 -0400
 Subject: [PATCH] ItemStack API additions for quantity/flags/lore
 
 
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index e9f25924..7689c00a 100644
+index a240311e..c5befd8c 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -2,7 +2,9 @@ package org.bukkit.inventory;
@@ -27,7 +27,7 @@ index e9f25924..7689c00a 100644
  /**
   * Represents a stack of items
   */
-@@ -569,5 +573,133 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
+@@ -582,5 +586,133 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
          // Requires access to NMS
          return ensureServerConversions().getMaxItemUseDuration();
      }
diff --git a/Spigot-API-Patches/0117-LivingEntity-Hand-Raised-Item-Use-API.patch b/Spigot-API-Patches/0116-LivingEntity-Hand-Raised-Item-Use-API.patch
similarity index 96%
rename from Spigot-API-Patches/0117-LivingEntity-Hand-Raised-Item-Use-API.patch
rename to Spigot-API-Patches/0116-LivingEntity-Hand-Raised-Item-Use-API.patch
index 4ad598d7e6..a4bc45cfbb 100644
--- a/Spigot-API-Patches/0117-LivingEntity-Hand-Raised-Item-Use-API.patch
+++ b/Spigot-API-Patches/0116-LivingEntity-Hand-Raised-Item-Use-API.patch
@@ -1,4 +1,4 @@
-From b438ad8c47194fc97e310672e407a79feeee73dd Mon Sep 17 00:00:00 2001
+From cf99646a663b14d01ef54e22020b8faa8fa555f0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 29 Jun 2018 00:19:19 -0400
 Subject: [PATCH] LivingEntity Hand Raised/Item Use API
diff --git a/Spigot-API-Patches/0118-RangedEntity-API.patch b/Spigot-API-Patches/0117-RangedEntity-API.patch
similarity index 98%
rename from Spigot-API-Patches/0118-RangedEntity-API.patch
rename to Spigot-API-Patches/0117-RangedEntity-API.patch
index 3517621da3..96d82b9ddf 100644
--- a/Spigot-API-Patches/0118-RangedEntity-API.patch
+++ b/Spigot-API-Patches/0117-RangedEntity-API.patch
@@ -1,4 +1,4 @@
-From c803b354f0aafbc01e813d8c2c1dae0c933251ba Mon Sep 17 00:00:00 2001
+From 3dfec6aa624fc7663fa0d677c115efe822c05171 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 26 Jun 2018 21:34:40 -0400
 Subject: [PATCH] RangedEntity API
diff --git a/Spigot-API-Patches/0119-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch b/Spigot-API-Patches/0118-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch
similarity index 96%
rename from Spigot-API-Patches/0119-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch
rename to Spigot-API-Patches/0118-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch
index 68394d20c3..d91a09c712 100644
--- a/Spigot-API-Patches/0119-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch
+++ b/Spigot-API-Patches/0118-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch
@@ -1,4 +1,4 @@
-From 24a9e71e950ac0ff3a753f35aed71fa638f71290 Mon Sep 17 00:00:00 2001
+From 1026157cdfadb0aa749625df4fa4bd1c7dfd2a2c Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Sat, 30 Jun 2018 05:45:04 +0200
 Subject: [PATCH] Improve ProjectileHitEvent to include the BlockFace where the
diff --git a/Spigot-API-Patches/0120-Add-World.getEntity-UUID-API.patch b/Spigot-API-Patches/0119-Add-World.getEntity-UUID-API.patch
similarity index 83%
rename from Spigot-API-Patches/0120-Add-World.getEntity-UUID-API.patch
rename to Spigot-API-Patches/0119-Add-World.getEntity-UUID-API.patch
index 61bcc34f16..b3ef285261 100644
--- a/Spigot-API-Patches/0120-Add-World.getEntity-UUID-API.patch
+++ b/Spigot-API-Patches/0119-Add-World.getEntity-UUID-API.patch
@@ -1,14 +1,14 @@
-From e4c6eec43f3bdf6061fd52063aeb259f0de63da2 Mon Sep 17 00:00:00 2001
+From e4b5d675c5e8bb6aab767b25b2cf9ef27476b655 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Tue, 3 Jul 2018 16:07:16 +0200
 Subject: [PATCH] Add World.getEntity(UUID) API
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 04c174f7..121033e9 100644
+index 7a6728fb..550c26be 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -725,6 +725,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -653,6 +653,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
       */
      public Collection<Entity> getNearbyEntities(Location location, double x, double y, double z);
  
diff --git a/Spigot-API-Patches/0121-InventoryCloseEvent-Reason-API.patch b/Spigot-API-Patches/0120-InventoryCloseEvent-Reason-API.patch
similarity index 97%
rename from Spigot-API-Patches/0121-InventoryCloseEvent-Reason-API.patch
rename to Spigot-API-Patches/0120-InventoryCloseEvent-Reason-API.patch
index 85790fc418..206164d44a 100644
--- a/Spigot-API-Patches/0121-InventoryCloseEvent-Reason-API.patch
+++ b/Spigot-API-Patches/0120-InventoryCloseEvent-Reason-API.patch
@@ -1,4 +1,4 @@
-From 97af6ce4d4a8a8b3fdf945fb6c9b7e474def6c4c Mon Sep 17 00:00:00 2001
+From 4deb6973896972f14c56e83e4ef64ca3beee04e9 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 3 Jul 2018 21:52:52 -0400
 Subject: [PATCH] InventoryCloseEvent Reason API
diff --git a/Spigot-API-Patches/0122-Entity-getChunk-API.patch b/Spigot-API-Patches/0121-Entity-getChunk-API.patch
similarity index 93%
rename from Spigot-API-Patches/0122-Entity-getChunk-API.patch
rename to Spigot-API-Patches/0121-Entity-getChunk-API.patch
index ab597021b6..071d8d7175 100644
--- a/Spigot-API-Patches/0122-Entity-getChunk-API.patch
+++ b/Spigot-API-Patches/0121-Entity-getChunk-API.patch
@@ -1,4 +1,4 @@
-From 094ab21aca5c9ccbd61e95bf8f247a7f51526c03 Mon Sep 17 00:00:00 2001
+From 5a3a031ef1c7d8f9023f94a7c514f210afe0c1c4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 Jul 2018 02:25:48 -0400
 Subject: [PATCH] Entity#getChunk API
diff --git a/Spigot-API-Patches/0123-Vex-getOwner-API.patch b/Spigot-API-Patches/0122-Vex-getOwner-API.patch
similarity index 92%
rename from Spigot-API-Patches/0123-Vex-getOwner-API.patch
rename to Spigot-API-Patches/0122-Vex-getOwner-API.patch
index 3471cbd129..b2be59228c 100644
--- a/Spigot-API-Patches/0123-Vex-getOwner-API.patch
+++ b/Spigot-API-Patches/0122-Vex-getOwner-API.patch
@@ -1,4 +1,4 @@
-From b906caf7828cd434767fed31635d853b077d7d09 Mon Sep 17 00:00:00 2001
+From 9e4176114616d5b73fa13fcb5736cc5d2ff5bc52 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 Jul 2018 15:29:21 -0400
 Subject: [PATCH] Vex#getOwner API
diff --git a/Spigot-Server-Patches/0008-MC-Utils.patch b/Spigot-Server-Patches/0008-MC-Utils.patch
index da3a9dfaae..b27358e130 100644
--- a/Spigot-Server-Patches/0008-MC-Utils.patch
+++ b/Spigot-Server-Patches/0008-MC-Utils.patch
@@ -1,4 +1,4 @@
-From 602dc96cc78e46affde033a48393ca3c722a7c75 Mon Sep 17 00:00:00 2001
+From 68857c2aac1bd54c01818909cbcd0ca010e2affa Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 20:55:47 -0400
 Subject: [PATCH] MC Utils
@@ -18,7 +18,7 @@ index c3e990bdf..e2a7b4be2 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index 002da2a19..80cdf5528 100644
+index 002da2a19..70a7edf57 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -10,7 +10,7 @@ import org.apache.logging.log4j.Logger;
@@ -38,6 +38,22 @@ index 002da2a19..80cdf5528 100644
      public BlockPosition a(int i, int j, int k) {
          return i == 0 && j == 0 && k == 0 ? this : new BlockPosition(this.getX() + i, this.getY() + j, this.getZ() + k);
      }
+@@ -382,6 +383,7 @@ public class BlockPosition extends BaseBlockPosition {
+             return this.d;
+         }
+ 
++        public BlockPosition.MutableBlockPosition setValues(int i, int j, int k) { return c(i, j, k);} // Paper - OBFHELPER
+         public BlockPosition.MutableBlockPosition c(int i, int j, int k) {
+             this.b = i;
+             this.c = j;
+@@ -389,6 +391,7 @@ public class BlockPosition extends BaseBlockPosition {
+             return this;
+         }
+ 
++        public BlockPosition.MutableBlockPosition setValues(double d0, double d1, double d2) { return c(d0, d1, d2);} // Paper - OBFHELPER
+         public BlockPosition.MutableBlockPosition c(double d0, double d1, double d2) {
+             return this.c(MathHelper.floor(d0), MathHelper.floor(d1), MathHelper.floor(d2));
+         }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
 index 0ae780c8e..3b97981bc 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
@@ -73,7 +89,7 @@ index 00a530c51..2947d9ff6 100644
          return (long) i & 4294967295L | ((long) j & 4294967295L) << 32;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
-index 97cfd6695..05ed0abe7 100644
+index 97cfd6695..81605b10f 100644
 --- a/src/main/java/net/minecraft/server/EntityTypes.java
 +++ b/src/main/java/net/minecraft/server/EntityTypes.java
 @@ -3,6 +3,7 @@ package net.minecraft.server;
@@ -84,12 +100,15 @@ index 97cfd6695..05ed0abe7 100644
  import java.util.Set;
  import java.util.UUID;
  import java.util.function.Function;
-@@ -121,9 +122,17 @@ public class EntityTypes<T extends Entity> {
+@@ -121,9 +122,20 @@ public class EntityTypes<T extends Entity> {
      public static <T extends Entity> EntityTypes<T> a(String s, EntityTypes.a<T> entitytypes_a) {
          EntityTypes entitytypes = entitytypes_a.a(s);
  
 -        EntityTypes.REGISTRY.a(new MinecraftKey(s), entitytypes);
 +        // Paper start
++        if (clsToKeyMap == null ) clsToKeyMap = new java.util.HashMap<>();
++        if (clsToTypeMap == null ) clsToTypeMap = new java.util.HashMap<>();
++
 +        MinecraftKey key = new MinecraftKey(s);
 +        Class<? extends T> entityClass = entitytypes_a.getEntityClass();
 +        EntityTypes.REGISTRY.a(key, entitytypes);
@@ -97,13 +116,13 @@ index 97cfd6695..05ed0abe7 100644
 +        clsToTypeMap.put(entityClass, org.bukkit.entity.EntityType.fromName(s));
          return entitytypes;
      }
-+    public static Map<Class<? extends Entity>, MinecraftKey> clsToKeyMap = new java.util.HashMap<>();
-+    public static Map<Class<? extends Entity>, org.bukkit.entity.EntityType> clsToTypeMap = new java.util.HashMap<>();
++    public static Map<Class<? extends Entity>, MinecraftKey> clsToKeyMap;
++    public static Map<Class<? extends Entity>, org.bukkit.entity.EntityType> clsToTypeMap;
 +    // Paper end
  
      @Nullable
      public static MinecraftKey getName(EntityTypes<?> entitytypes) {
-@@ -278,7 +287,7 @@ public class EntityTypes<T extends Entity> {
+@@ -278,7 +290,7 @@ public class EntityTypes<T extends Entity> {
  
      public static class a<T extends Entity> {
  
@@ -113,7 +132,7 @@ index 97cfd6695..05ed0abe7 100644
          private boolean c = true;
          private boolean d = true;
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index cc96294f4..7f249a975 100644
+index 3f0c5d7dd..68a59e708 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -25,6 +25,7 @@ import org.bukkit.Location;
@@ -124,7 +143,7 @@ index cc96294f4..7f249a975 100644
  import org.bukkit.craftbukkit.util.CraftMagicNumbers;
  import org.bukkit.entity.Player;
  import org.bukkit.event.world.StructureGrowEvent;
-@@ -547,6 +548,17 @@ public final class ItemStack {
+@@ -553,6 +554,17 @@ public final class ItemStack {
          return this.tag != null ? this.tag.getList("Enchantments", 10) : new NBTTagList();
      }
  
@@ -142,6 +161,24 @@ index cc96294f4..7f249a975 100644
      public void setTag(@Nullable NBTTagCompound nbttagcompound) {
          this.tag = nbttagcompound;
      }
+diff --git a/src/main/java/net/minecraft/server/LotoSelectorEntry.java b/src/main/java/net/minecraft/server/LotoSelectorEntry.java
+index a540167d6..add618866 100644
+--- a/src/main/java/net/minecraft/server/LotoSelectorEntry.java
++++ b/src/main/java/net/minecraft/server/LotoSelectorEntry.java
+@@ -85,11 +85,11 @@ public abstract class LotoSelectorEntry {
+             return jsonobject;
+         }
+ 
+-        public JsonElement serialize(Object object, Type type, JsonSerializationContext jsonserializationcontext) {
++        public JsonElement serialize(LotoSelectorEntry object, Type type, JsonSerializationContext jsonserializationcontext) { // Paper - decompile fix
+             return this.a((LotoSelectorEntry) object, type, jsonserializationcontext);
+         }
+ 
+-        public Object deserialize(JsonElement jsonelement, Type type, JsonDeserializationContext jsondeserializationcontext) throws JsonParseException {
++        public LotoSelectorEntry deserialize(JsonElement jsonelement, Type type, JsonDeserializationContext jsondeserializationcontext) throws JsonParseException { // Paper - decompile fix
+             return this.a(jsonelement, type, jsondeserializationcontext);
+         }
+     }
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
 new file mode 100644
 index 000000000..a4b0901cf
@@ -349,8 +386,30 @@ index 000000000..a4b0901cf
 +        return null;
 +    }
 +}
+diff --git a/src/main/java/net/minecraft/server/NBTBase.java b/src/main/java/net/minecraft/server/NBTBase.java
+index 8170a8428..e21e60b00 100644
+--- a/src/main/java/net/minecraft/server/NBTBase.java
++++ b/src/main/java/net/minecraft/server/NBTBase.java
+@@ -20,7 +20,7 @@ public interface NBTBase {
+ 
+     byte getTypeId();
+ 
+-    static default NBTBase createTag(byte b0) {
++    static NBTBase createTag(byte b0) { // Paper - decompile fix
+         switch (b0) {
+         case 0:
+             return new NBTTagEnd();
+@@ -66,7 +66,7 @@ public interface NBTBase {
+         }
+     }
+ 
+-    static default String n(int i) {
++    static String n(int i) { // Paper - decompile fix
+         switch (i) {
+         case 0:
+             return "TAG_End";
 diff --git a/src/main/java/net/minecraft/server/NBTList.java b/src/main/java/net/minecraft/server/NBTList.java
-index 1a81d8e5f..08db5e332 100644
+index 1a81d8e5f..057c2077a 100644
 --- a/src/main/java/net/minecraft/server/NBTList.java
 +++ b/src/main/java/net/minecraft/server/NBTList.java
 @@ -13,7 +13,7 @@ public abstract class NBTList<T extends NBTBase> extends AbstractList<T> impleme
@@ -362,11 +421,10 @@ index 1a81d8e5f..08db5e332 100644
  
          this.a(i, t0);
          return nbtbase;
-@@ -24,12 +24,4 @@ public abstract class NBTList<T extends NBTBase> extends AbstractList<T> impleme
-     public abstract void a(int i, NBTBase nbtbase);
+@@ -25,11 +25,5 @@ public abstract class NBTList<T extends NBTBase> extends AbstractList<T> impleme
  
      public abstract void b(int i);
--
+ 
 -    public Object set(int i, Object object) {
 -        return this.set(i, (NBTBase) object);
 -    }
@@ -374,7 +432,22 @@ index 1a81d8e5f..08db5e332 100644
 -    public Object get(int i) {
 -        return this.get(i);
 -    }
++    public abstract NBTList<T> clone(); // Paper - decompile fix
  }
+diff --git a/src/main/java/net/minecraft/server/NBTTagByteArray.java b/src/main/java/net/minecraft/server/NBTTagByteArray.java
+index 11ffa6c34..3ff3a2983 100644
+--- a/src/main/java/net/minecraft/server/NBTTagByteArray.java
++++ b/src/main/java/net/minecraft/server/NBTTagByteArray.java
+@@ -66,7 +66,8 @@ public class NBTTagByteArray extends NBTList<NBTTagByte> {
+         return stringbuilder.append(']').toString();
+     }
+ 
+-    public NBTBase clone() {
++    @Override
++    public NBTTagByteArray clone() {
+         byte[] abyte = new byte[this.data.length];
+ 
+         System.arraycopy(this.data, 0, abyte, 0, this.data.length);
 diff --git a/src/main/java/net/minecraft/server/NBTTagCompound.java b/src/main/java/net/minecraft/server/NBTTagCompound.java
 index 7fc9b5ff3..e658816c2 100644
 --- a/src/main/java/net/minecraft/server/NBTTagCompound.java
@@ -411,8 +484,21 @@ index 7fc9b5ff3..e658816c2 100644
 -        return this.clone();
 -    }
  }
+diff --git a/src/main/java/net/minecraft/server/NBTTagIntArray.java b/src/main/java/net/minecraft/server/NBTTagIntArray.java
+index f5c9b97d5..d121ad4f7 100644
+--- a/src/main/java/net/minecraft/server/NBTTagIntArray.java
++++ b/src/main/java/net/minecraft/server/NBTTagIntArray.java
+@@ -132,7 +132,7 @@ public class NBTTagIntArray extends NBTList<NBTTagInt> {
+         return this.a(i);
+     }
+ 
+-    public NBTBase clone() {
++    public NBTTagIntArray clone() { // Paper - decompile fix
+         return this.c();
+     }
+ }
 diff --git a/src/main/java/net/minecraft/server/NBTTagList.java b/src/main/java/net/minecraft/server/NBTTagList.java
-index b3c944d70..e56d4836d 100644
+index b3c944d70..a8280acf9 100644
 --- a/src/main/java/net/minecraft/server/NBTTagList.java
 +++ b/src/main/java/net/minecraft/server/NBTTagList.java
 @@ -14,7 +14,7 @@ import org.apache.logging.log4j.Logger;
@@ -424,8 +510,12 @@ index b3c944d70..e56d4836d 100644
      private byte type = 0;
  
      public NBTTagList() {}
-@@ -297,20 +297,4 @@ public class NBTTagList extends NBTList<NBTBase> {
-     public NBTBase clone() {
+@@ -294,23 +294,7 @@ public class NBTTagList extends NBTList<NBTBase> {
+         return this.type;
+     }
+ 
+-    public NBTBase clone() {
++    public NBTTagList clone() {
          return this.c();
      }
 -
@@ -446,7 +536,7 @@ index b3c944d70..e56d4836d 100644
 -    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index fa4a7fa63..749be86fe 100644
+index 2fb86aa19..6f21b01a8 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -66,9 +66,9 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -462,6 +552,74 @@ index fa4a7fa63..749be86fe 100644
      // CraftBukkit start - multithreaded fields
      private volatile int chatThrottle;
      private static final AtomicIntegerFieldUpdater chatSpamField = AtomicIntegerFieldUpdater.newUpdater(PlayerConnection.class, "chatThrottle");
+diff --git a/src/main/java/net/minecraft/server/RegistryBlockID.java b/src/main/java/net/minecraft/server/RegistryBlockID.java
+index ef332d651..7cc7eb773 100644
+--- a/src/main/java/net/minecraft/server/RegistryBlockID.java
++++ b/src/main/java/net/minecraft/server/RegistryBlockID.java
+@@ -8,7 +8,7 @@ import java.util.Iterator;
+ import java.util.List;
+ import javax.annotation.Nullable;
+ 
+-public class RegistryBlockID<T> implements Registry<T> {
++public class RegistryBlockID<T> implements Registry { // Paper - decompile fix
+ 
+     private int a;
+     private final IdentityHashMap<T, Integer> b;
+@@ -27,7 +27,7 @@ public class RegistryBlockID<T> implements Registry<T> {
+         this.b.put(t0, Integer.valueOf(i));
+ 
+         while (this.c.size() <= i) {
+-            this.c.add((Object) null);
++            this.c.add(null); // Paper - decompile fix
+         }
+ 
+         this.c.set(i, t0);
+diff --git a/src/main/java/net/minecraft/server/ServerPing.java b/src/main/java/net/minecraft/server/ServerPing.java
+index 2179664a0..d7e1ecc03 100644
+--- a/src/main/java/net/minecraft/server/ServerPing.java
++++ b/src/main/java/net/minecraft/server/ServerPing.java
+@@ -102,11 +102,11 @@ public class ServerPing {
+             return jsonobject;
+         }
+ 
+-        public JsonElement serialize(Object object, Type type, JsonSerializationContext jsonserializationcontext) {
++        public JsonElement serialize(ServerPing object, Type type, JsonSerializationContext jsonserializationcontext) { // Paper - decompile fix
+             return this.a((ServerPing) object, type, jsonserializationcontext);
+         }
+ 
+-        public Object deserialize(JsonElement jsonelement, Type type, JsonDeserializationContext jsondeserializationcontext) throws JsonParseException {
++        public ServerPing deserialize(JsonElement jsonelement, Type type, JsonDeserializationContext jsondeserializationcontext) throws JsonParseException { // Paper - decompile fix
+             return this.a(jsonelement, type, jsondeserializationcontext);
+         }
+     }
+@@ -147,11 +147,11 @@ public class ServerPing {
+                 return jsonobject;
+             }
+ 
+-            public JsonElement serialize(Object object, Type type, JsonSerializationContext jsonserializationcontext) {
++            public JsonElement serialize(ServerPing.ServerData object, Type type, JsonSerializationContext jsonserializationcontext) { // Paper - decompile fix
+                 return this.a((ServerPing.ServerData) object, type, jsonserializationcontext);
+             }
+ 
+-            public Object deserialize(JsonElement jsonelement, Type type, JsonDeserializationContext jsondeserializationcontext) throws JsonParseException {
++            public ServerPing.ServerData deserialize(JsonElement jsonelement, Type type, JsonDeserializationContext jsondeserializationcontext) throws JsonParseException { // Paper - decompile fix
+                 return this.a(jsonelement, type, jsondeserializationcontext);
+             }
+         }
+@@ -235,11 +235,11 @@ public class ServerPing {
+                 return jsonobject;
+             }
+ 
+-            public JsonElement serialize(Object object, Type type, JsonSerializationContext jsonserializationcontext) {
++            public JsonElement serialize(ServerPing.ServerPingPlayerSample object, Type type, JsonSerializationContext jsonserializationcontext) { // Paper - decompile fix
+                 return this.a((ServerPing.ServerPingPlayerSample) object, type, jsonserializationcontext);
+             }
+ 
+-            public Object deserialize(JsonElement jsonelement, Type type, JsonDeserializationContext jsondeserializationcontext) throws JsonParseException {
++            public ServerPing.ServerPingPlayerSample deserialize(JsonElement jsonelement, Type type, JsonDeserializationContext jsondeserializationcontext) throws JsonParseException { // Paper - decompile fix
+                 return this.a(jsonelement, type, jsondeserializationcontext);
+             }
+         }
 -- 
 2.18.0
 
diff --git a/Spigot-Server-Patches/0009-Timings-v2.patch b/Spigot-Server-Patches/0009-Timings-v2.patch
index 667055094e..f0e6bba9c5 100644
--- a/Spigot-Server-Patches/0009-Timings-v2.patch
+++ b/Spigot-Server-Patches/0009-Timings-v2.patch
@@ -1,4 +1,4 @@
-From 7ac235f6e19a3c24fa6d3e8bef538626e3aac1fe Mon Sep 17 00:00:00 2001
+From 52b1fafdb9623e6c1bc74b830a5acf51f70b5ffb Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 04:00:11 -0600
 Subject: [PATCH] Timings v2
@@ -137,10 +137,10 @@ index 000000000..4f624e39c
 +}
 diff --git a/src/main/java/co/aikar/timings/TimedChunkGenerator.java b/src/main/java/co/aikar/timings/TimedChunkGenerator.java
 new file mode 100644
-index 000000000..089154f62
+index 000000000..0bb63600f
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimedChunkGenerator.java
-@@ -0,0 +1,131 @@
+@@ -0,0 +1,180 @@
 +/*
 + * This file is licensed under the MIT License (MIT).
 + *
@@ -167,11 +167,20 @@ index 000000000..089154f62
 +
 +package co.aikar.timings;
 +
++import net.minecraft.server.BiomeBase;
 +import net.minecraft.server.BiomeBase.BiomeMeta;
 +import net.minecraft.server.BlockPosition;
 +import net.minecraft.server.Chunk;
 +import net.minecraft.server.EnumCreatureType;
++import net.minecraft.server.GeneratorSettings;
++import net.minecraft.server.IChunkAccess;
++import net.minecraft.server.RegionLimitedWorldAccess;
++import net.minecraft.server.StructureGenerator;
++import net.minecraft.server.StructureStart;
 +import net.minecraft.server.World;
++import net.minecraft.server.WorldChunkManager;
++import net.minecraft.server.WorldGenFeatureConfiguration;
++import net.minecraft.server.WorldGenStage;
 +import net.minecraft.server.WorldServer;
 +import org.bukkit.Location;
 +import org.bukkit.craftbukkit.generator.InternalChunkGenerator;
@@ -181,6 +190,10 @@ index 000000000..089154f62
 +import java.util.List;
 +import java.util.Random;
 +
++import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
++import it.unimi.dsi.fastutil.longs.LongSet;
++
++// TODO: timing handlers
 +public class TimedChunkGenerator extends InternalChunkGenerator {
 +    private final WorldServer world;
 +    private final InternalChunkGenerator timedGenerator;
@@ -190,25 +203,6 @@ index 000000000..089154f62
 +        timedGenerator = gen;
 +    }
 +
-+    @Override
-+    @Deprecated
-+    public byte[] generate(org.bukkit.World world, Random random, int x, int z) {
-+        return timedGenerator.generate(world, random, x, z);
-+    }
-+
-+    @Override
-+    @Deprecated
-+    public short[][] generateExtBlockSections(org.bukkit.World world, Random random, int x, int z,
-+                                              BiomeGrid biomes) {
-+        return timedGenerator.generateExtBlockSections(world, random, x, z, biomes);
-+    }
-+
-+    @Override
-+    @Deprecated
-+    public byte[][] generateBlockSections(org.bukkit.World world, Random random, int x, int z,
-+                                          BiomeGrid biomes) {
-+        return timedGenerator.generateBlockSections(world, random, x, z, biomes);
-+    }
 +
 +    @Override
 +    public ChunkData generateChunkData(org.bukkit.World world, Random random, int x, int z, BiomeGrid biome) {
@@ -229,47 +223,102 @@ index 000000000..089154f62
 +    public Location getFixedSpawnLocation(org.bukkit.World world, Random random) {
 +        return timedGenerator.getFixedSpawnLocation(world, random);
 +    }
-+
++    /*
 +    @Override
 +    public Chunk getOrCreateChunk(int i, int j) {
 +        try (Timing ignored = world.timings.chunkGeneration.startTiming()) {
 +            return timedGenerator.getOrCreateChunk(i, j);
 +        }
 +    }
++    */
 +
 +    @Override
-+    public void recreateStructures(int i, int j) {
-+        try (Timing ignored = world.timings.syncChunkLoadStructuresTimer.startTiming()) {
-+            timedGenerator.recreateStructures(i, j);
++    public void createChunk(IChunkAccess ichunkaccess) {
++        try (Timing ignored = world.timings.chunkGeneration.startTiming()) {
++            timedGenerator.createChunk(ichunkaccess);
 +        }
 +    }
 +
 +    @Override
-+    public boolean a(Chunk chunk, int i, int j) {
-+        return timedGenerator.a(chunk, i, j);
++    public void addFeatures(RegionLimitedWorldAccess regionlimitedworldaccess, WorldGenStage.Features worldgenstage_features) {
++        timedGenerator.addFeatures(regionlimitedworldaccess, worldgenstage_features);
 +    }
 +
 +    @Override
-+    public List<BiomeMeta> getMobsFor(EnumCreatureType enumcreaturetype, BlockPosition blockposition) {
++    public void addDecorations(RegionLimitedWorldAccess regionlimitedworldaccess) {
++        timedGenerator.addDecorations(regionlimitedworldaccess);
++    }
++
++    @Override
++    public void addMobs(RegionLimitedWorldAccess regionlimitedworldaccess) {
++        timedGenerator.addMobs(regionlimitedworldaccess);
++    }
++
++    @Override
++    public List<BiomeBase.BiomeMeta> getMobsFor(EnumCreatureType enumcreaturetype, BlockPosition blockposition) {
 +        return timedGenerator.getMobsFor(enumcreaturetype, blockposition);
 +    }
 +
-+    @Override
 +    @Nullable
-+    public BlockPosition findNearestMapFeature(World world, String s, BlockPosition blockposition, boolean flag) {
-+        return timedGenerator.findNearestMapFeature(world, s, blockposition, flag);
++    @Override
++    public BlockPosition findNearestMapFeature(World world, String s, BlockPosition blockposition, int i) {
++        return timedGenerator.findNearestMapFeature(world, s, blockposition, i);
 +    }
 +
 +    @Override
-+    public void recreateStructures(Chunk chunk, int i, int j) {
-+        try (Timing ignored = world.timings.syncChunkLoadStructuresTimer.startTiming()) {
-+            timedGenerator.recreateStructures(chunk, i, j);
-+        }
++    public GeneratorSettings getSettings() {
++        return timedGenerator.getSettings();
 +    }
 +
 +    @Override
-+    public boolean a(World world, String s, BlockPosition blockPosition) {
-+        return timedGenerator.a(world, s, blockPosition);
++    public int a(World world, boolean flag, boolean flag1) {
++        return timedGenerator.a(world, flag, flag1);
++    }
++
++    @Override
++    public WorldChunkManager getWorldChunkManager() {
++        return timedGenerator.getWorldChunkManager();
++    }
++
++    @Override
++    public long getSeed() {
++        return timedGenerator.getSeed();
++    }
++
++    @Override
++    public int getSpawnHeight() {
++        return timedGenerator.getSpawnHeight();
++    }
++
++    @Override
++    public int e() {
++        return timedGenerator.e();
++    }
++
++    @Override
++    public World getWorld() {
++        return timedGenerator.getWorld();
++    }
++
++    @Override
++    public Long2ObjectMap<LongSet> getStructureCache(StructureGenerator structuregenerator) {
++        return timedGenerator.getStructureCache(structuregenerator);
++    }
++
++    @Override
++    public Long2ObjectMap<StructureStart> getStructureStartCache(StructureGenerator structuregenerator) {
++        return timedGenerator.getStructureStartCache(structuregenerator);
++    }
++
++    @Nullable
++    @Override
++    public WorldGenFeatureConfiguration getFeatureConfiguration(BiomeBase biomebase, StructureGenerator structuregenerator) {
++        return timedGenerator.getFeatureConfiguration(biomebase, structuregenerator);
++    }
++
++    @Override
++    public boolean canSpawnStructure(BiomeBase biomebase, StructureGenerator structuregenerator) {
++        return timedGenerator.canSpawnStructure(biomebase, structuregenerator);
 +    }
 +}
 diff --git a/src/main/java/co/aikar/timings/WorldTimingsHandler.java b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
@@ -495,7 +544,7 @@ index 0296d3ef0..badfe86b2 100644
              this.chunkLoader.saveChunk(this.world, ichunkaccess, unloaded); // Spigot
          } catch (IOException ioexception) {
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 42050f06d..e26860516 100644
+index 90d857105..3a0e52d88 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -1,5 +1,6 @@
@@ -505,7 +554,7 @@ index 42050f06d..e26860516 100644
  import com.google.common.collect.Maps;
  import com.mojang.datafixers.DataFixTypes;
  import com.mojang.datafixers.DataFixer;
-@@ -650,7 +651,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+@@ -688,7 +689,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
      public void loadEntities(NBTTagCompound nbttagcompound, Chunk chunk) {
          NBTTagList nbttaglist = nbttagcompound.getList("Entities", 10);
          World world = chunk.getWorld();
@@ -514,7 +563,7 @@ index 42050f06d..e26860516 100644
  
          for (int i = 0; i < nbttaglist.size(); ++i) {
              NBTTagCompound nbttagcompound1 = nbttaglist.getCompound(i);
-@@ -659,8 +660,6 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+@@ -697,8 +698,6 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
              chunk.f(true);
          }
  
@@ -523,7 +572,7 @@ index 42050f06d..e26860516 100644
          NBTTagList nbttaglist1 = nbttagcompound.getList("TileEntities", 10);
  
          for (int j = 0; j < nbttaglist1.size(); ++j) {
-@@ -677,8 +676,6 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+@@ -715,8 +714,6 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
                  }
              }
          }
@@ -532,7 +581,7 @@ index 42050f06d..e26860516 100644
  
          if (nbttagcompound.hasKeyOfType("TileTicks", 9) && world.I() instanceof TickListServer) {
              ((TickListServer) world.I()).a(nbttagcompound.getList("TileTicks", 10));
-@@ -687,7 +684,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+@@ -725,7 +722,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
          if (nbttagcompound.hasKeyOfType("LiquidTicks", 9) && world.H() instanceof TickListServer) {
              ((TickListServer) world.H()).a(nbttagcompound.getList("LiquidTicks", 10));
          }
@@ -989,7 +1038,7 @@ index ac6d8cc6e..d975c2ccf 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 749be86fe..c2eb3a58d 100644
+index 6f21b01a8..359aa3997 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -57,6 +57,7 @@ import org.bukkit.inventory.CraftingInventory;
diff --git a/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch b/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch
index 7c9ce42196..43a7b87e3a 100644
--- a/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch
+++ b/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch
@@ -1,4 +1,4 @@
-From 4f9c5ca52e2e58476694f0cacdb66b2669e552ab Mon Sep 17 00:00:00 2001
+From d5144d6679ef94b9546b0f81bd9dfd3bd747b6e6 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Tue, 1 Mar 2016 14:14:15 -0600
 Subject: [PATCH] Drop falling block and tnt entities at the specified height
@@ -24,7 +24,7 @@ index 0094d1a87..4da846719 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index a5d0ae1de..12b86ab75 100644
+index 2ed362791..20248de7e 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1885,6 +1885,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -36,7 +36,7 @@ index a5d0ae1de..12b86ab75 100644
      public EntityItem a(ItemStack itemstack, float f) {
          if (itemstack.isEmpty()) {
 diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-index 850436d42..7aa12c3b4 100644
+index 850436d42..8d47b58c9 100644
 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
 +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
 @@ -86,6 +86,17 @@ public class EntityFallingBlock extends Entity {
@@ -47,7 +47,7 @@ index 850436d42..7aa12c3b4 100644
 +            // Paper start - Configurable EntityFallingBlock height nerf
 +            if (this.world.paperConfig.fallingBlockHeightNerf != 0 && this.locY > this.world.paperConfig.fallingBlockHeightNerf) {
 +                if (this.dropItem && this.world.getGameRules().getBoolean("doEntityDrops")) {
-+                    this.dropItem(new ItemStack(block, 1, block.getDropData(this.block)), 0.0F);
++                    this.dropItem(new ItemStack(block), 0.0F);
 +                }
 +
 +                this.die();
diff --git a/Spigot-Server-Patches/0024-Entity-Origin-API.patch b/Spigot-Server-Patches/0023-Entity-Origin-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0024-Entity-Origin-API.patch
rename to Spigot-Server-Patches/0023-Entity-Origin-API.patch
index febd01aee8..61f94451ff 100644
--- a/Spigot-Server-Patches/0024-Entity-Origin-API.patch
+++ b/Spigot-Server-Patches/0023-Entity-Origin-API.patch
@@ -1,4 +1,4 @@
-From 5c858f71d8de97fd30722aadac29e55925f707c1 Mon Sep 17 00:00:00 2001
+From e1421e0812ad47128d28ec5b99ebd0c2ae5d65ca Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Tue, 1 Mar 2016 23:45:08 -0600
 Subject: [PATCH] Entity Origin API
@@ -51,7 +51,7 @@ index 20248de7e..6bb4cf48e 100644
          NBTTagList nbttaglist = new NBTTagList();
          double[] adouble1 = adouble;
 diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-index 7aa12c3b4..1d4a7b64d 100644
+index 8d47b58c9..7e5a2775a 100644
 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
 +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
 @@ -249,6 +249,14 @@ public class EntityFallingBlock extends Entity {
@@ -89,7 +89,7 @@ index 5ceb3f206..87f3205f8 100644
  
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/NBTTagList.java b/src/main/java/net/minecraft/server/NBTTagList.java
-index e56d4836d..0bf8d15d7 100644
+index a8280acf9..38dd8f17a 100644
 --- a/src/main/java/net/minecraft/server/NBTTagList.java
 +++ b/src/main/java/net/minecraft/server/NBTTagList.java
 @@ -182,6 +182,7 @@ public class NBTTagList extends NBTList<NBTBase> {
@@ -118,7 +118,7 @@ index fd64b75ed..3f0b6ac26 100644
              flag = true;
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index f4edde236..9882fe466 100644
+index f09251eec..34246369c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -777,4 +777,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -135,5 +135,5 @@ index f4edde236..9882fe466 100644
 +    // Paper end
  }
 -- 
-2.17.1
+2.18.0
 
diff --git a/Spigot-Server-Patches/0025-Prevent-tile-entity-and-entity-crashes.patch b/Spigot-Server-Patches/0024-Prevent-tile-entity-and-entity-crashes.patch
similarity index 98%
rename from Spigot-Server-Patches/0025-Prevent-tile-entity-and-entity-crashes.patch
rename to Spigot-Server-Patches/0024-Prevent-tile-entity-and-entity-crashes.patch
index f93fc6ca8a..a0cbdf41ca 100644
--- a/Spigot-Server-Patches/0025-Prevent-tile-entity-and-entity-crashes.patch
+++ b/Spigot-Server-Patches/0024-Prevent-tile-entity-and-entity-crashes.patch
@@ -1,4 +1,4 @@
-From c25380700dff93018c14a133e3b1ab252516d495 Mon Sep 17 00:00:00 2001
+From 3b55d88bdefa6b3479ff0e0ee21da64912d24f0b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 1 Mar 2016 23:52:34 -0600
 Subject: [PATCH] Prevent tile entity and entity crashes
diff --git a/Spigot-Server-Patches/0026-Configurable-top-of-nether-void-damage.patch b/Spigot-Server-Patches/0025-Configurable-top-of-nether-void-damage.patch
similarity index 97%
rename from Spigot-Server-Patches/0026-Configurable-top-of-nether-void-damage.patch
rename to Spigot-Server-Patches/0025-Configurable-top-of-nether-void-damage.patch
index 2294976bd1..cd28f2150b 100644
--- a/Spigot-Server-Patches/0026-Configurable-top-of-nether-void-damage.patch
+++ b/Spigot-Server-Patches/0025-Configurable-top-of-nether-void-damage.patch
@@ -1,4 +1,4 @@
-From 288de182d84b0380c328c4c4590c5d0a83d74a8e Mon Sep 17 00:00:00 2001
+From 93cc4b95be1d52ac3f84b30a07ad93bd756584b5 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 23:58:50 -0600
 Subject: [PATCH] Configurable top of nether void damage
@@ -20,7 +20,7 @@ index 4da846719..a340866f3 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 2288df268..111eeeecc 100644
+index 6bb4cf48e..d378f1a9d 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -464,9 +464,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
diff --git a/Spigot-Server-Patches/0027-Check-online-mode-before-converting-and-renaming-pla.patch b/Spigot-Server-Patches/0026-Check-online-mode-before-converting-and-renaming-pla.patch
similarity index 94%
rename from Spigot-Server-Patches/0027-Check-online-mode-before-converting-and-renaming-pla.patch
rename to Spigot-Server-Patches/0026-Check-online-mode-before-converting-and-renaming-pla.patch
index 471354d135..7ba1d5947f 100644
--- a/Spigot-Server-Patches/0027-Check-online-mode-before-converting-and-renaming-pla.patch
+++ b/Spigot-Server-Patches/0026-Check-online-mode-before-converting-and-renaming-pla.patch
@@ -1,4 +1,4 @@
-From e22a475ba3127f333d314118e9a1bb956334ac8d Mon Sep 17 00:00:00 2001
+From 08717b8b84b939304bea31bc003e1ee04a3d30fc Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 2 Mar 2016 00:03:55 -0600
 Subject: [PATCH] Check online mode before converting and renaming player data
diff --git a/Spigot-Server-Patches/0028-Always-tick-falling-blocks.patch b/Spigot-Server-Patches/0027-Always-tick-falling-blocks.patch
similarity index 95%
rename from Spigot-Server-Patches/0028-Always-tick-falling-blocks.patch
rename to Spigot-Server-Patches/0027-Always-tick-falling-blocks.patch
index e2c3eca105..a25e8dc8b5 100644
--- a/Spigot-Server-Patches/0028-Always-tick-falling-blocks.patch
+++ b/Spigot-Server-Patches/0027-Always-tick-falling-blocks.patch
@@ -1,4 +1,4 @@
-From 0ded699fa2af784c8866b92e86dca3d5cd3b321b Mon Sep 17 00:00:00 2001
+From a6178a71228bfa2e44befadaf43a8ff9ce0b1a9e Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 2 Mar 2016 00:32:25 -0600
 Subject: [PATCH] Always tick falling blocks
diff --git a/Spigot-Server-Patches/0029-Lighting-Queue.patch b/Spigot-Server-Patches/0028-Lighting-Queue.patch
similarity index 99%
rename from Spigot-Server-Patches/0029-Lighting-Queue.patch
rename to Spigot-Server-Patches/0028-Lighting-Queue.patch
index b77b6db454..98de27d7d7 100644
--- a/Spigot-Server-Patches/0029-Lighting-Queue.patch
+++ b/Spigot-Server-Patches/0028-Lighting-Queue.patch
@@ -1,4 +1,4 @@
-From a3a7edec34bd96d3265f4af61927aeab46f195c9 Mon Sep 17 00:00:00 2001
+From fe837b054c13a5ef4ad79e3111af573ff28c2bca Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 00:52:31 -0600
 Subject: [PATCH] Lighting Queue
@@ -43,7 +43,7 @@ index a340866f3..1e3405cc1 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 36ea4ad47..e5567701e 100644
+index 4a4cc6c59..b0060c363 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -91,6 +91,7 @@ public class Chunk implements IChunkAccess {
diff --git a/Spigot-Server-Patches/0030-Configurable-end-credits.patch b/Spigot-Server-Patches/0029-Configurable-end-credits.patch
similarity index 95%
rename from Spigot-Server-Patches/0030-Configurable-end-credits.patch
rename to Spigot-Server-Patches/0029-Configurable-end-credits.patch
index 3a5a425ff3..e1e8151309 100644
--- a/Spigot-Server-Patches/0030-Configurable-end-credits.patch
+++ b/Spigot-Server-Patches/0029-Configurable-end-credits.patch
@@ -1,4 +1,4 @@
-From 5b727c50fb330b282c3b6b23576ca0f5e552e2a5 Mon Sep 17 00:00:00 2001
+From 57383fb576aa72fde6d72aa34d7c7f60e8984c52 Mon Sep 17 00:00:00 2001
 From: DoctorDark <doctordark11@gmail.com>
 Date: Wed, 16 Mar 2016 02:21:39 -0500
 Subject: [PATCH] Configurable end credits
@@ -20,7 +20,7 @@ index 1e3405cc1..dccccbf5b 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index e035025f0..cb44bf3a7 100644
+index d4e9f489d..ace6db1fa 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -62,7 +62,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0031-Fix-lag-from-explosions-processing-dead-entities.patch b/Spigot-Server-Patches/0030-Fix-lag-from-explosions-processing-dead-entities.patch
similarity index 88%
rename from Spigot-Server-Patches/0031-Fix-lag-from-explosions-processing-dead-entities.patch
rename to Spigot-Server-Patches/0030-Fix-lag-from-explosions-processing-dead-entities.patch
index 0dde6c3f06..30b68399bc 100644
--- a/Spigot-Server-Patches/0031-Fix-lag-from-explosions-processing-dead-entities.patch
+++ b/Spigot-Server-Patches/0030-Fix-lag-from-explosions-processing-dead-entities.patch
@@ -1,11 +1,11 @@
-From ca823da1187da71d1c8e6d179dfdb81166043332 Mon Sep 17 00:00:00 2001
+From 9b56f5d637b6d50dc41d75c71e609141ae9174a7 Mon Sep 17 00:00:00 2001
 From: Iceee <andrew@opticgaming.tv>
 Date: Wed, 2 Mar 2016 01:39:52 -0600
 Subject: [PATCH] Fix lag from explosions processing dead entities
 
 
 diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
-index 37e6e5922..e30219258 100644
+index 37e6e5922..6b9f6c956 100644
 --- a/src/main/java/net/minecraft/server/Explosion.java
 +++ b/src/main/java/net/minecraft/server/Explosion.java
 @@ -110,7 +110,14 @@ public class Explosion {
@@ -17,7 +17,7 @@ index 37e6e5922..e30219258 100644
 +        List list = this.world.getEntities(this.source, new AxisAlignedBB((double) i, (double) l, (double) j1, (double) j, (double) i1, (double) k1), new com.google.common.base.Predicate<Entity>() {
 +            @Override
 +            public boolean apply(Entity entity) {
-+                return IEntitySelector.d.apply(entity) && !entity.dead;
++                return IEntitySelector.d.test(entity) && !entity.dead;
 +            }
 +        });
 +        // Paper end
diff --git a/Spigot-Server-Patches/0032-Optimize-explosions.patch b/Spigot-Server-Patches/0031-Optimize-explosions.patch
similarity index 98%
rename from Spigot-Server-Patches/0032-Optimize-explosions.patch
rename to Spigot-Server-Patches/0031-Optimize-explosions.patch
index 513210ae6d..ec7be6e19e 100644
--- a/Spigot-Server-Patches/0032-Optimize-explosions.patch
+++ b/Spigot-Server-Patches/0031-Optimize-explosions.patch
@@ -1,4 +1,4 @@
-From 51fa8a93b0548bb469018d71ee6adcf7123f6ccc Mon Sep 17 00:00:00 2001
+From 46d962a94e8bfe83e54319f47e57da34b4e7f741 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 11:59:48 -0600
 Subject: [PATCH] Optimize explosions
@@ -25,7 +25,7 @@ index dccccbf5b..3626aa717 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
-index e30219258..ddbf667c4 100644
+index 6b9f6c956..8fdcd52b2 100644
 --- a/src/main/java/net/minecraft/server/Explosion.java
 +++ b/src/main/java/net/minecraft/server/Explosion.java
 @@ -136,7 +136,7 @@ public class Explosion {
diff --git a/Spigot-Server-Patches/0033-Add-player-view-distance-API.patch b/Spigot-Server-Patches/0032-Add-player-view-distance-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0033-Add-player-view-distance-API.patch
rename to Spigot-Server-Patches/0032-Add-player-view-distance-API.patch
index a4be69b6bc..d198024b6d 100644
--- a/Spigot-Server-Patches/0033-Add-player-view-distance-API.patch
+++ b/Spigot-Server-Patches/0032-Add-player-view-distance-API.patch
@@ -1,11 +1,11 @@
-From 9ef5da712e0601ac690b564f05fc90837caff795 Mon Sep 17 00:00:00 2001
+From 23f348fd5953c9c2c9b9356f91697671403e08f6 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 14:35:27 -0600
 Subject: [PATCH] Add player view distance API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index cb44bf3a7..0531812fb 100644
+index ace6db1fa..8ca7da336 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -72,6 +72,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0034-Disable-explosion-knockback.patch b/Spigot-Server-Patches/0033-Disable-explosion-knockback.patch
similarity index 97%
rename from Spigot-Server-Patches/0034-Disable-explosion-knockback.patch
rename to Spigot-Server-Patches/0033-Disable-explosion-knockback.patch
index e50d24f287..8df72b258c 100644
--- a/Spigot-Server-Patches/0034-Disable-explosion-knockback.patch
+++ b/Spigot-Server-Patches/0033-Disable-explosion-knockback.patch
@@ -1,4 +1,4 @@
-From 708fa230efe63dcc4d1ab4f42f956002e27443c6 Mon Sep 17 00:00:00 2001
+From f3da5a191daee26c438c3fc2d9e804ad66f6b090 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 14:48:03 -0600
 Subject: [PATCH] Disable explosion knockback
@@ -48,7 +48,7 @@ index 1ee54fa45..43715902e 100644
                      if (!this.e(damagesource)) {
                          SoundEffect soundeffect = this.cr();
 diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
-index ddbf667c4..2652b1575 100644
+index 8fdcd52b2..75b21010b 100644
 --- a/src/main/java/net/minecraft/server/Explosion.java
 +++ b/src/main/java/net/minecraft/server/Explosion.java
 @@ -152,7 +152,7 @@ public class Explosion {
diff --git a/Spigot-Server-Patches/0035-Disable-thunder.patch b/Spigot-Server-Patches/0034-Disable-thunder.patch
similarity index 94%
rename from Spigot-Server-Patches/0035-Disable-thunder.patch
rename to Spigot-Server-Patches/0034-Disable-thunder.patch
index 747ad2beca..4de1ad026e 100644
--- a/Spigot-Server-Patches/0035-Disable-thunder.patch
+++ b/Spigot-Server-Patches/0034-Disable-thunder.patch
@@ -1,4 +1,4 @@
-From fa2fd885d88a3298213da1a7fb2e5375ac473f7b Mon Sep 17 00:00:00 2001
+From cd9a4513e386b038109e500412c6c2c6d8a93849 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 14:52:43 -0600
 Subject: [PATCH] Disable thunder
@@ -19,7 +19,7 @@ index be92c1af6..efacd5ea0 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 420cbee6a..7a9cd1398 100644
+index d7f86bf76..a4003896d 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -491,7 +491,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
diff --git a/Spigot-Server-Patches/0036-Disable-ice-and-snow.patch b/Spigot-Server-Patches/0035-Disable-ice-and-snow.patch
similarity index 94%
rename from Spigot-Server-Patches/0036-Disable-ice-and-snow.patch
rename to Spigot-Server-Patches/0035-Disable-ice-and-snow.patch
index 269b8917e1..5d0dc78511 100644
--- a/Spigot-Server-Patches/0036-Disable-ice-and-snow.patch
+++ b/Spigot-Server-Patches/0035-Disable-ice-and-snow.patch
@@ -1,4 +1,4 @@
-From e10462c97a334a255b9f38c8d95997a700004b05 Mon Sep 17 00:00:00 2001
+From cab788edd773fc1a581a521107226a7696be225d Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 14:57:24 -0600
 Subject: [PATCH] Disable ice and snow
@@ -19,7 +19,7 @@ index efacd5ea0..0130e5860 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 7a9cd1398..21b8a1dd9 100644
+index a4003896d..9bd11a5fd 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -513,7 +513,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
diff --git a/Spigot-Server-Patches/0037-Configurable-mob-spawner-tick-rate.patch b/Spigot-Server-Patches/0036-Configurable-mob-spawner-tick-rate.patch
similarity index 97%
rename from Spigot-Server-Patches/0037-Configurable-mob-spawner-tick-rate.patch
rename to Spigot-Server-Patches/0036-Configurable-mob-spawner-tick-rate.patch
index d8d276be71..1c50fd959e 100644
--- a/Spigot-Server-Patches/0037-Configurable-mob-spawner-tick-rate.patch
+++ b/Spigot-Server-Patches/0036-Configurable-mob-spawner-tick-rate.patch
@@ -1,4 +1,4 @@
-From a44894177052ab64b102687ed47812440f2289b7 Mon Sep 17 00:00:00 2001
+From a38f27e8f25f8c3abdd17a3637544e15c42d87fc Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 15:03:53 -0600
 Subject: [PATCH] Configurable mob spawner tick rate
diff --git a/Spigot-Server-Patches/0038-Send-absolute-position-the-first-time-an-entity-is-s.patch b/Spigot-Server-Patches/0037-Send-absolute-position-the-first-time-an-entity-is-s.patch
similarity index 98%
rename from Spigot-Server-Patches/0038-Send-absolute-position-the-first-time-an-entity-is-s.patch
rename to Spigot-Server-Patches/0037-Send-absolute-position-the-first-time-an-entity-is-s.patch
index b54460f1b8..2ac8e83ad9 100644
--- a/Spigot-Server-Patches/0038-Send-absolute-position-the-first-time-an-entity-is-s.patch
+++ b/Spigot-Server-Patches/0037-Send-absolute-position-the-first-time-an-entity-is-s.patch
@@ -1,4 +1,4 @@
-From 6fd7638017aa2ac3c12fd9499df14b0f3cd6b9cf Mon Sep 17 00:00:00 2001
+From 6c52b93ddc7893987c26ac9eab4f2ddbd86f50e6 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Wed, 2 Mar 2016 23:13:07 -0600
 Subject: [PATCH] Send absolute position the first time an entity is seen
diff --git a/Spigot-Server-Patches/0039-Add-BeaconEffectEvent.patch b/Spigot-Server-Patches/0038-Add-BeaconEffectEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0039-Add-BeaconEffectEvent.patch
rename to Spigot-Server-Patches/0038-Add-BeaconEffectEvent.patch
index f3c490d614..942057dd36 100644
--- a/Spigot-Server-Patches/0039-Add-BeaconEffectEvent.patch
+++ b/Spigot-Server-Patches/0038-Add-BeaconEffectEvent.patch
@@ -1,4 +1,4 @@
-From 39777e20f300912b4d94472e7b627c0c33bca485 Mon Sep 17 00:00:00 2001
+From fbe8dee64d19c1cf190701395ebc83d94de3d92d Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 23:30:53 -0600
 Subject: [PATCH] Add BeaconEffectEvent
diff --git a/Spigot-Server-Patches/0040-Configurable-container-update-tick-rate.patch b/Spigot-Server-Patches/0039-Configurable-container-update-tick-rate.patch
similarity index 95%
rename from Spigot-Server-Patches/0040-Configurable-container-update-tick-rate.patch
rename to Spigot-Server-Patches/0039-Configurable-container-update-tick-rate.patch
index b0266f8654..c9bc1c10db 100644
--- a/Spigot-Server-Patches/0040-Configurable-container-update-tick-rate.patch
+++ b/Spigot-Server-Patches/0039-Configurable-container-update-tick-rate.patch
@@ -1,4 +1,4 @@
-From b0906baff3e381342e84d50728bbeebb32c4bf30 Mon Sep 17 00:00:00 2001
+From 46a15c4b0cd3a9491acf600f25d0cf791c6462c2 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 23:34:44 -0600
 Subject: [PATCH] Configurable container update tick rate
@@ -19,7 +19,7 @@ index 47f391243..26d8dbb60 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 0531812fb..5ca0dec1f 100644
+index 8ca7da336..55eaa89f6 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -81,6 +81,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0041-Use-UserCache-for-player-heads.patch b/Spigot-Server-Patches/0040-Use-UserCache-for-player-heads.patch
similarity index 95%
rename from Spigot-Server-Patches/0041-Use-UserCache-for-player-heads.patch
rename to Spigot-Server-Patches/0040-Use-UserCache-for-player-heads.patch
index 5e50bac730..1cd6556105 100644
--- a/Spigot-Server-Patches/0041-Use-UserCache-for-player-heads.patch
+++ b/Spigot-Server-Patches/0040-Use-UserCache-for-player-heads.patch
@@ -1,4 +1,4 @@
-From ba521991598460ec18a75a28a25efc76404927af Mon Sep 17 00:00:00 2001
+From 522f622aa3d885d5b3bd892b89dec52866b0a273 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Wed, 2 Mar 2016 23:42:37 -0600
 Subject: [PATCH] Use UserCache for player heads
diff --git a/Spigot-Server-Patches/0042-Disable-spigot-tick-limiters.patch b/Spigot-Server-Patches/0041-Disable-spigot-tick-limiters.patch
similarity index 97%
rename from Spigot-Server-Patches/0042-Disable-spigot-tick-limiters.patch
rename to Spigot-Server-Patches/0041-Disable-spigot-tick-limiters.patch
index 33efdd1869..ee7b6454f6 100644
--- a/Spigot-Server-Patches/0042-Disable-spigot-tick-limiters.patch
+++ b/Spigot-Server-Patches/0041-Disable-spigot-tick-limiters.patch
@@ -1,4 +1,4 @@
-From bae9f32e5b3c4025e471f44ffb7a431ea750826d Mon Sep 17 00:00:00 2001
+From 9195e6d1dda8fbd2f6092064ac7a1381e2d8036c Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 2 Mar 2016 23:45:17 -0600
 Subject: [PATCH] Disable spigot tick limiters
diff --git a/Spigot-Server-Patches/0043-Configurable-Chunk-IO-Thread-Base-Count.patch b/Spigot-Server-Patches/0042-Configurable-Chunk-IO-Thread-Base-Count.patch
similarity index 96%
rename from Spigot-Server-Patches/0043-Configurable-Chunk-IO-Thread-Base-Count.patch
rename to Spigot-Server-Patches/0042-Configurable-Chunk-IO-Thread-Base-Count.patch
index 9c7b5a436d..5edee63477 100644
--- a/Spigot-Server-Patches/0043-Configurable-Chunk-IO-Thread-Base-Count.patch
+++ b/Spigot-Server-Patches/0042-Configurable-Chunk-IO-Thread-Base-Count.patch
@@ -1,4 +1,4 @@
-From 8902eebead1a655e38adf0a099873f77f4d76374 Mon Sep 17 00:00:00 2001
+From 2f4912d0c8eec5bad1fcda1233ac3457c68fb86c Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 2 Mar 2016 23:46:57 -0600
 Subject: [PATCH] Configurable Chunk IO Thread Base Count
diff --git a/Spigot-Server-Patches/0044-Add-PlayerInitialSpawnEvent.patch b/Spigot-Server-Patches/0043-Add-PlayerInitialSpawnEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0044-Add-PlayerInitialSpawnEvent.patch
rename to Spigot-Server-Patches/0043-Add-PlayerInitialSpawnEvent.patch
index 0f8adfee53..e126da7bb1 100644
--- a/Spigot-Server-Patches/0044-Add-PlayerInitialSpawnEvent.patch
+++ b/Spigot-Server-Patches/0043-Add-PlayerInitialSpawnEvent.patch
@@ -1,4 +1,4 @@
-From 53913c2c055fcc06fd10b3a19756ba50b7db68f9 Mon Sep 17 00:00:00 2001
+From c0e32dfbeb3b1371d3a0e9d3b5fcba34af4d2ff8 Mon Sep 17 00:00:00 2001
 From: Steve Anton <anxuiz.nx@gmail.com>
 Date: Thu, 3 Mar 2016 00:09:38 -0600
 Subject: [PATCH] Add PlayerInitialSpawnEvent
diff --git a/Spigot-Server-Patches/0045-Disable-chest-cat-detection.patch b/Spigot-Server-Patches/0044-Disable-chest-cat-detection.patch
similarity index 96%
rename from Spigot-Server-Patches/0045-Disable-chest-cat-detection.patch
rename to Spigot-Server-Patches/0044-Disable-chest-cat-detection.patch
index 9e8c51bd4f..c4e1113278 100644
--- a/Spigot-Server-Patches/0045-Disable-chest-cat-detection.patch
+++ b/Spigot-Server-Patches/0044-Disable-chest-cat-detection.patch
@@ -1,4 +1,4 @@
-From e5ba54d156defe2e5ef5376a394ed5901136db0e Mon Sep 17 00:00:00 2001
+From 0a6e431075e7177f15c75f170b214b3957ed37de Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 01:13:45 -0600
 Subject: [PATCH] Disable chest cat detection
diff --git a/Spigot-Server-Patches/0046-Ensure-commands-are-not-ran-async.patch b/Spigot-Server-Patches/0045-Ensure-commands-are-not-ran-async.patch
similarity index 98%
rename from Spigot-Server-Patches/0046-Ensure-commands-are-not-ran-async.patch
rename to Spigot-Server-Patches/0045-Ensure-commands-are-not-ran-async.patch
index ea5d8dbb1d..bf309e979c 100644
--- a/Spigot-Server-Patches/0046-Ensure-commands-are-not-ran-async.patch
+++ b/Spigot-Server-Patches/0045-Ensure-commands-are-not-ran-async.patch
@@ -1,4 +1,4 @@
-From ab1bae7a2ab47f6b7af31ac4a92e6135ff84c490 Mon Sep 17 00:00:00 2001
+From d580113b141bff72bf56e052480927f606b34ae2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 01:17:12 -0600
 Subject: [PATCH] Ensure commands are not ran async
@@ -14,7 +14,7 @@ big slowdown in execution but throwing an exception at same time to raise awaren
 that it is happening so that plugin authors can fix their code to stop executing commands async.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index c2eb3a58d..9c27966ea 100644
+index 359aa3997..88b761d27 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1548,6 +1548,29 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
diff --git a/Spigot-Server-Patches/0047-All-chunks-are-slime-spawn-chunks-toggle.patch b/Spigot-Server-Patches/0046-All-chunks-are-slime-spawn-chunks-toggle.patch
similarity index 96%
rename from Spigot-Server-Patches/0047-All-chunks-are-slime-spawn-chunks-toggle.patch
rename to Spigot-Server-Patches/0046-All-chunks-are-slime-spawn-chunks-toggle.patch
index 634769d6c9..81758b1ebc 100644
--- a/Spigot-Server-Patches/0047-All-chunks-are-slime-spawn-chunks-toggle.patch
+++ b/Spigot-Server-Patches/0046-All-chunks-are-slime-spawn-chunks-toggle.patch
@@ -1,4 +1,4 @@
-From 130efdb434d880b1a4bdcb43579e72273f59c5ef Mon Sep 17 00:00:00 2001
+From 5a999ec5367ea0c9db12b34d098b39d8ff86404b Mon Sep 17 00:00:00 2001
 From: vemacs <d@nkmem.es>
 Date: Thu, 3 Mar 2016 01:19:22 -0600
 Subject: [PATCH] All chunks are slime spawn chunks toggle
diff --git a/Spigot-Server-Patches/0048-Optimize-Pathfinding.patch b/Spigot-Server-Patches/0047-Optimize-Pathfinding.patch
similarity index 96%
rename from Spigot-Server-Patches/0048-Optimize-Pathfinding.patch
rename to Spigot-Server-Patches/0047-Optimize-Pathfinding.patch
index c9496b2a78..dc3f59b879 100644
--- a/Spigot-Server-Patches/0048-Optimize-Pathfinding.patch
+++ b/Spigot-Server-Patches/0047-Optimize-Pathfinding.patch
@@ -1,4 +1,4 @@
-From add330cbad4d620b15e610e7df6f692ce69560df Mon Sep 17 00:00:00 2001
+From 77d4e20f2d1dcbac4798b664c809dbcf3819dbf2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 02:02:07 -0600
 Subject: [PATCH] Optimize Pathfinding
diff --git a/Spigot-Server-Patches/0049-Avoid-hopper-searches-if-there-are-no-items.patch b/Spigot-Server-Patches/0048-Avoid-hopper-searches-if-there-are-no-items.patch
similarity index 97%
rename from Spigot-Server-Patches/0049-Avoid-hopper-searches-if-there-are-no-items.patch
rename to Spigot-Server-Patches/0048-Avoid-hopper-searches-if-there-are-no-items.patch
index b872e9be42..645e874428 100644
--- a/Spigot-Server-Patches/0049-Avoid-hopper-searches-if-there-are-no-items.patch
+++ b/Spigot-Server-Patches/0048-Avoid-hopper-searches-if-there-are-no-items.patch
@@ -1,4 +1,4 @@
-From 0316b4817e772abdbef722b4a3f85619fa16cbdc Mon Sep 17 00:00:00 2001
+From ea3bad289da996b408a4296df89f75f24925f97e Mon Sep 17 00:00:00 2001
 From: CullanP <cullanpage@gmail.com>
 Date: Thu, 3 Mar 2016 02:13:38 -0600
 Subject: [PATCH] Avoid hopper searches if there are no items
@@ -14,7 +14,7 @@ And since minecart hoppers are used _very_ rarely near we can avoid alot of sear
 Combined, this adds up a lot.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index e5567701e..32f467b37 100644
+index b0060c363..2d55abd7a 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -92,6 +92,10 @@ public class Chunk implements IChunkAccess {
diff --git a/Spigot-Server-Patches/0050-Expose-server-CommandMap.patch b/Spigot-Server-Patches/0049-Expose-server-CommandMap.patch
similarity index 90%
rename from Spigot-Server-Patches/0050-Expose-server-CommandMap.patch
rename to Spigot-Server-Patches/0049-Expose-server-CommandMap.patch
index 4c6f4f74bd..72c0fd7576 100644
--- a/Spigot-Server-Patches/0050-Expose-server-CommandMap.patch
+++ b/Spigot-Server-Patches/0049-Expose-server-CommandMap.patch
@@ -1,4 +1,4 @@
-From ae3186b04c366d0b9b11b9c98955a51c48fee46d Mon Sep 17 00:00:00 2001
+From 7ad52fafe34a337de31950cfcb5714b42936672c Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 3 Mar 2016 02:15:57 -0600
 Subject: [PATCH] Expose server CommandMap
diff --git a/Spigot-Server-Patches/0051-Be-a-bit-more-informative-in-maxHealth-exception.patch b/Spigot-Server-Patches/0050-Be-a-bit-more-informative-in-maxHealth-exception.patch
similarity index 92%
rename from Spigot-Server-Patches/0051-Be-a-bit-more-informative-in-maxHealth-exception.patch
rename to Spigot-Server-Patches/0050-Be-a-bit-more-informative-in-maxHealth-exception.patch
index f0064f13aa..5a8f1d106e 100644
--- a/Spigot-Server-Patches/0051-Be-a-bit-more-informative-in-maxHealth-exception.patch
+++ b/Spigot-Server-Patches/0050-Be-a-bit-more-informative-in-maxHealth-exception.patch
@@ -1,11 +1,11 @@
-From 6cff21d27c465708ea0e5689d00205a776f3b73a Mon Sep 17 00:00:00 2001
+From afb80cf6f2d3354fd369ae76af88d5e79a158634 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 3 Mar 2016 02:18:39 -0600
 Subject: [PATCH] Be a bit more informative in maxHealth exception
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 0b12ed819..83e6276b8 100644
+index 382b8028a..2ef1433a7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -96,7 +96,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/Spigot-Server-Patches/0052-Player-Tab-List-and-Title-APIs.patch b/Spigot-Server-Patches/0051-Player-Tab-List-and-Title-APIs.patch
similarity index 99%
rename from Spigot-Server-Patches/0052-Player-Tab-List-and-Title-APIs.patch
rename to Spigot-Server-Patches/0051-Player-Tab-List-and-Title-APIs.patch
index c41927f1de..2678dbc914 100644
--- a/Spigot-Server-Patches/0052-Player-Tab-List-and-Title-APIs.patch
+++ b/Spigot-Server-Patches/0051-Player-Tab-List-and-Title-APIs.patch
@@ -1,4 +1,4 @@
-From 64863607d2317dded8dcdd1cc126638b42564c53 Mon Sep 17 00:00:00 2001
+From 69e892bc19c0af9ee9f8a683405970993b95811f Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Thu, 3 Mar 2016 02:32:10 -0600
 Subject: [PATCH] Player Tab List and Title APIs
diff --git a/Spigot-Server-Patches/0053-Ensure-inv-drag-is-in-bounds.patch b/Spigot-Server-Patches/0052-Ensure-inv-drag-is-in-bounds.patch
similarity index 93%
rename from Spigot-Server-Patches/0053-Ensure-inv-drag-is-in-bounds.patch
rename to Spigot-Server-Patches/0052-Ensure-inv-drag-is-in-bounds.patch
index e1bf41c72a..3debd842c1 100644
--- a/Spigot-Server-Patches/0053-Ensure-inv-drag-is-in-bounds.patch
+++ b/Spigot-Server-Patches/0052-Ensure-inv-drag-is-in-bounds.patch
@@ -1,4 +1,4 @@
-From c3b31381ddd19fbbb3fa8e456c819c03e01ce91a Mon Sep 17 00:00:00 2001
+From 54b195686cf6fb4e7669f2f823b5da49e7bf7155 Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:33:53 -0600
 Subject: [PATCH] Ensure inv drag is in bounds
diff --git a/Spigot-Server-Patches/0054-Change-implementation-of-tile-entity-removal-list.patch b/Spigot-Server-Patches/0053-Change-implementation-of-tile-entity-removal-list.patch
similarity index 97%
rename from Spigot-Server-Patches/0054-Change-implementation-of-tile-entity-removal-list.patch
rename to Spigot-Server-Patches/0053-Change-implementation-of-tile-entity-removal-list.patch
index bb3395d0ab..bcb0c61bde 100644
--- a/Spigot-Server-Patches/0054-Change-implementation-of-tile-entity-removal-list.patch
+++ b/Spigot-Server-Patches/0053-Change-implementation-of-tile-entity-removal-list.patch
@@ -1,4 +1,4 @@
-From 6188ea1fe10d05fd67558cb270221a06e981b1f2 Mon Sep 17 00:00:00 2001
+From 82d53de53acbc9f283632689ef1496ed27110369 Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:39:54 -0600
 Subject: [PATCH] Change implementation of (tile)entity removal list
diff --git a/Spigot-Server-Patches/0055-Add-configurable-portal-search-radius.patch b/Spigot-Server-Patches/0054-Add-configurable-portal-search-radius.patch
similarity index 97%
rename from Spigot-Server-Patches/0055-Add-configurable-portal-search-radius.patch
rename to Spigot-Server-Patches/0054-Add-configurable-portal-search-radius.patch
index d09c864b8e..5e2de32209 100644
--- a/Spigot-Server-Patches/0055-Add-configurable-portal-search-radius.patch
+++ b/Spigot-Server-Patches/0054-Add-configurable-portal-search-radius.patch
@@ -1,4 +1,4 @@
-From c82e590f3e79ebef289b3af8bcfdd1fa6505c1a7 Mon Sep 17 00:00:00 2001
+From 74a7ab25d619909662d40a3c39e68fc40f87bc97 Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:46:17 -0600
 Subject: [PATCH] Add configurable portal search radius
diff --git a/Spigot-Server-Patches/0056-Add-velocity-warnings.patch b/Spigot-Server-Patches/0055-Add-velocity-warnings.patch
similarity index 97%
rename from Spigot-Server-Patches/0056-Add-velocity-warnings.patch
rename to Spigot-Server-Patches/0055-Add-velocity-warnings.patch
index 11298758f0..3da580a0ff 100644
--- a/Spigot-Server-Patches/0056-Add-velocity-warnings.patch
+++ b/Spigot-Server-Patches/0055-Add-velocity-warnings.patch
@@ -1,11 +1,11 @@
-From 65aee21930eec551b399471716a9252863124d57 Mon Sep 17 00:00:00 2001
+From 76cf594d89a46249517f0ba6ce8fbc613fbf0cc8 Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:48:12 -0600
 Subject: [PATCH] Add velocity warnings
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 32a05ca18..eaac1430e 100644
+index 703d38f0c..a9d60b8d2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -189,6 +189,7 @@ public final class CraftServer implements Server {
@@ -17,7 +17,7 @@ index 32a05ca18..eaac1430e 100644
      private final class BooleanWrapper {
          private boolean value = true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 0daa15f1b..2b9c571ca 100644
+index 34246369c..03a3328b0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -262,12 +262,44 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/Spigot-Server-Patches/0057-Configurable-inter-world-teleportation-safety.patch b/Spigot-Server-Patches/0056-Configurable-inter-world-teleportation-safety.patch
similarity index 98%
rename from Spigot-Server-Patches/0057-Configurable-inter-world-teleportation-safety.patch
rename to Spigot-Server-Patches/0056-Configurable-inter-world-teleportation-safety.patch
index c8b3e9eba2..650e6d785f 100644
--- a/Spigot-Server-Patches/0057-Configurable-inter-world-teleportation-safety.patch
+++ b/Spigot-Server-Patches/0056-Configurable-inter-world-teleportation-safety.patch
@@ -1,4 +1,4 @@
-From a83d01f64fcfef076c79ea5da00a7663fd2b2c32 Mon Sep 17 00:00:00 2001
+From 7d4cc359892f4167574b00e9ae7bb76c528545d6 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Thu, 3 Mar 2016 02:50:31 -0600
 Subject: [PATCH] Configurable inter-world teleportation safety
diff --git a/Spigot-Server-Patches/0058-Add-exception-reporting-event.patch b/Spigot-Server-Patches/0057-Add-exception-reporting-event.patch
similarity index 99%
rename from Spigot-Server-Patches/0058-Add-exception-reporting-event.patch
rename to Spigot-Server-Patches/0057-Add-exception-reporting-event.patch
index 26edf5de2a..152ceab6e7 100644
--- a/Spigot-Server-Patches/0058-Add-exception-reporting-event.patch
+++ b/Spigot-Server-Patches/0057-Add-exception-reporting-event.patch
@@ -1,4 +1,4 @@
-From 7ec9bf1e72944794b4ede33f140c763b46317740 Mon Sep 17 00:00:00 2001
+From 8dbd8eba1f8a7f3c7dc31d92225602ea6438fb91 Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 03:15:41 -0600
 Subject: [PATCH] Add exception reporting event
@@ -50,7 +50,7 @@ index 000000000..93397188b
 +}
 \ No newline at end of file
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 32f467b37..fa500e93f 100644
+index 2d55abd7a..7ea4b9b5c 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -1,5 +1,6 @@
diff --git a/Spigot-Server-Patches/0059-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch b/Spigot-Server-Patches/0058-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
similarity index 95%
rename from Spigot-Server-Patches/0059-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
rename to Spigot-Server-Patches/0058-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
index 2db386c7ab..5c4ce6cbd6 100644
--- a/Spigot-Server-Patches/0059-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
+++ b/Spigot-Server-Patches/0058-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
@@ -1,4 +1,4 @@
-From 480711c6cb6bc009d27b889b36c6f3cfd7567fe6 Mon Sep 17 00:00:00 2001
+From 7e5e4e0ac9f03e3ae15e7840536e99d085745778 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Tue, 8 Mar 2016 18:28:43 -0800
 Subject: [PATCH] Don't nest if we don't need to when cerealising text
diff --git a/Spigot-Server-Patches/0060-Disable-Scoreboards-for-non-players-by-default.patch b/Spigot-Server-Patches/0059-Disable-Scoreboards-for-non-players-by-default.patch
similarity index 97%
rename from Spigot-Server-Patches/0060-Disable-Scoreboards-for-non-players-by-default.patch
rename to Spigot-Server-Patches/0059-Disable-Scoreboards-for-non-players-by-default.patch
index 4405a74e7e..33e6184858 100644
--- a/Spigot-Server-Patches/0060-Disable-Scoreboards-for-non-players-by-default.patch
+++ b/Spigot-Server-Patches/0059-Disable-Scoreboards-for-non-players-by-default.patch
@@ -1,4 +1,4 @@
-From 404f2ace454d6e15c3b60664b9a2d62a96a73d7e Mon Sep 17 00:00:00 2001
+From c52630d4105a9443cd2bcea8fc09db888850a3d3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 8 Mar 2016 23:25:45 -0500
 Subject: [PATCH] Disable Scoreboards for non players by default
diff --git a/Spigot-Server-Patches/0061-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/Spigot-Server-Patches/0060-Add-methods-for-working-with-arrows-stuck-in-living-.patch
similarity index 93%
rename from Spigot-Server-Patches/0061-Add-methods-for-working-with-arrows-stuck-in-living-.patch
rename to Spigot-Server-Patches/0060-Add-methods-for-working-with-arrows-stuck-in-living-.patch
index 6e1513e91d..a537c81436 100644
--- a/Spigot-Server-Patches/0061-Add-methods-for-working-with-arrows-stuck-in-living-.patch
+++ b/Spigot-Server-Patches/0060-Add-methods-for-working-with-arrows-stuck-in-living-.patch
@@ -1,4 +1,4 @@
-From d622a5fb50a1cf10a6334eaae7e2036bbe929728 Mon Sep 17 00:00:00 2001
+From 6b7551898b105a68759159e515f0f388a65cb9a5 Mon Sep 17 00:00:00 2001
 From: mrapple <tony@oc.tc>
 Date: Sun, 25 Nov 2012 13:43:39 -0600
 Subject: [PATCH] Add methods for working with arrows stuck in living entities
diff --git a/Spigot-Server-Patches/0062-Complete-resource-pack-API.patch b/Spigot-Server-Patches/0061-Complete-resource-pack-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0062-Complete-resource-pack-API.patch
rename to Spigot-Server-Patches/0061-Complete-resource-pack-API.patch
index bbd3272f60..db8237629a 100644
--- a/Spigot-Server-Patches/0062-Complete-resource-pack-API.patch
+++ b/Spigot-Server-Patches/0061-Complete-resource-pack-API.patch
@@ -1,4 +1,4 @@
-From be350e0077e7b6c99d9117bc35e9ac3715fca21b Mon Sep 17 00:00:00 2001
+From a394c4fd0a35570536680339b8dfb67c9c32b464 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 4 Apr 2015 23:17:52 -0400
 Subject: [PATCH] Complete resource pack API
diff --git a/Spigot-Server-Patches/0063-Chunk-save-queue-improvements.patch b/Spigot-Server-Patches/0062-Chunk-save-queue-improvements.patch
similarity index 95%
rename from Spigot-Server-Patches/0063-Chunk-save-queue-improvements.patch
rename to Spigot-Server-Patches/0062-Chunk-save-queue-improvements.patch
index 9c820fab1a..7521d504a1 100644
--- a/Spigot-Server-Patches/0063-Chunk-save-queue-improvements.patch
+++ b/Spigot-Server-Patches/0062-Chunk-save-queue-improvements.patch
@@ -1,4 +1,4 @@
-From dcb8cb2a5d04086bb7e7b7870c8db52fddecc418 Mon Sep 17 00:00:00 2001
+From ac2e096b98ab349ce20eb01bb7543fa3aaf4f4ee Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 4 Mar 2016 18:18:37 -0600
 Subject: [PATCH] Chunk save queue improvements
@@ -41,7 +41,7 @@ index 36689db74..3898ad8fa 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index e26860516..17996af9c 100644
+index 3a0e52d88..8701777cc 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -25,6 +25,7 @@ import java.util.function.Consumer;
@@ -75,7 +75,7 @@ index e26860516..17996af9c 100644
      private final File c;
      private final DataFixer d;
      private PersistentStructureLegacy e;
-@@ -247,7 +261,13 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+@@ -285,7 +299,13 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
                      }
                  };
              } else {
@@ -90,7 +90,7 @@ index e26860516..17996af9c 100644
                      return;
                  }
  
-@@ -258,8 +278,8 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+@@ -296,8 +316,8 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
                      }
                  };
              }
@@ -101,7 +101,7 @@ index e26860516..17996af9c 100644
              // Spigot end
          } catch (Exception exception) {
              ChunkRegionLoader.a.error("Failed to save chunk", exception);
-@@ -268,18 +288,22 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+@@ -306,18 +326,22 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
      }
  
      protected synchronized void a(ChunkCoordIntPair chunkcoordintpair, Supplier<NBTTagCompound> nbttagcompound) { // Spigot
@@ -128,7 +128,7 @@ index e26860516..17996af9c 100644
              if (logCompletion) {
                  // CraftBukkit end
                  ChunkRegionLoader.a.info("ThreadedAnvilChunkStorage ({}): All chunks are saved", this.c.getName());
-@@ -287,17 +311,13 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+@@ -325,17 +349,13 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
  
              return false;
          } else {
@@ -148,7 +148,7 @@ index e26860516..17996af9c 100644
  
                  if (nbttagcompound != null) {
                      try {
-@@ -309,7 +329,14 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+@@ -347,7 +367,14 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
  
                  flag = true;
              } finally {
diff --git a/Spigot-Server-Patches/0064-Chunk-Save-Reattempt.patch b/Spigot-Server-Patches/0063-Chunk-Save-Reattempt.patch
similarity index 93%
rename from Spigot-Server-Patches/0064-Chunk-Save-Reattempt.patch
rename to Spigot-Server-Patches/0063-Chunk-Save-Reattempt.patch
index d876b89fd7..bcd919ae19 100644
--- a/Spigot-Server-Patches/0064-Chunk-Save-Reattempt.patch
+++ b/Spigot-Server-Patches/0063-Chunk-Save-Reattempt.patch
@@ -1,4 +1,4 @@
-From 5cdbcf814615e02e10b10126bcad50a7d29fa787 Mon Sep 17 00:00:00 2001
+From 2fafede916dc83820145ee9a6663fa1f9725d8da Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 4 Mar 2013 23:46:10 -0500
 Subject: [PATCH] Chunk Save Reattempt
@@ -6,10 +6,10 @@ Subject: [PATCH] Chunk Save Reattempt
 We commonly have "Stream Closed" errors on chunk saving, so this code should re-try to save the chunk in the event of failure and hopefully prevent rollbacks.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 17996af9c..faaa1b36b 100644
+index 8701777cc..ad3bd3808 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-@@ -320,11 +320,16 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+@@ -358,11 +358,16 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
                  NBTTagCompound nbttagcompound = SupplierUtils.getIfExists(chunk.compoundSupplier); // Spigot // Paper
  
                  if (nbttagcompound != null) {
diff --git a/Spigot-Server-Patches/0065-Default-loading-permissions.yml-before-plugins.patch b/Spigot-Server-Patches/0064-Default-loading-permissions.yml-before-plugins.patch
similarity index 96%
rename from Spigot-Server-Patches/0065-Default-loading-permissions.yml-before-plugins.patch
rename to Spigot-Server-Patches/0064-Default-loading-permissions.yml-before-plugins.patch
index fd44844540..155cff833f 100644
--- a/Spigot-Server-Patches/0065-Default-loading-permissions.yml-before-plugins.patch
+++ b/Spigot-Server-Patches/0064-Default-loading-permissions.yml-before-plugins.patch
@@ -1,4 +1,4 @@
-From 8dd09a05d4ebb0fa6a8ab1d267baf9f0a07ef836 Mon Sep 17 00:00:00 2001
+From 5a623a83533bb34b25140ad0d0e91f8000e7ce0f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 13:17:38 -0400
 Subject: [PATCH] Default loading permissions.yml before plugins
@@ -30,7 +30,7 @@ index 3898ad8fa..2f6e169f5 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index eaac1430e..6dae117ac 100644
+index a9d60b8d2..4db5aacc4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -330,6 +330,7 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0066-Allow-Reloading-of-Custom-Permissions.patch b/Spigot-Server-Patches/0065-Allow-Reloading-of-Custom-Permissions.patch
similarity index 95%
rename from Spigot-Server-Patches/0066-Allow-Reloading-of-Custom-Permissions.patch
rename to Spigot-Server-Patches/0065-Allow-Reloading-of-Custom-Permissions.patch
index aa3870b5de..327c6df06f 100644
--- a/Spigot-Server-Patches/0066-Allow-Reloading-of-Custom-Permissions.patch
+++ b/Spigot-Server-Patches/0065-Allow-Reloading-of-Custom-Permissions.patch
@@ -1,4 +1,4 @@
-From 17106878d61a4014f256fb538e80ec6efdadc788 Mon Sep 17 00:00:00 2001
+From 63781dcbca84f8aa63d89c21777f46521465843f Mon Sep 17 00:00:00 2001
 From: William <admin@domnian.com>
 Date: Fri, 18 Mar 2016 03:30:17 -0400
 Subject: [PATCH] Allow Reloading of Custom Permissions
diff --git a/Spigot-Server-Patches/0067-Remove-Metadata-on-reload.patch b/Spigot-Server-Patches/0066-Remove-Metadata-on-reload.patch
similarity index 95%
rename from Spigot-Server-Patches/0067-Remove-Metadata-on-reload.patch
rename to Spigot-Server-Patches/0066-Remove-Metadata-on-reload.patch
index d3e68f2bc1..7be6ed6ba7 100644
--- a/Spigot-Server-Patches/0067-Remove-Metadata-on-reload.patch
+++ b/Spigot-Server-Patches/0066-Remove-Metadata-on-reload.patch
@@ -1,4 +1,4 @@
-From ed96bba4daeabf7326e2caaabbc0d29b1412a1e9 Mon Sep 17 00:00:00 2001
+From 9143857ff7220c7c81e4ed9aa68f1a077b053001 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 13:50:14 -0400
 Subject: [PATCH] Remove Metadata on reload
diff --git a/Spigot-Server-Patches/0068-Undead-horse-leashing.patch b/Spigot-Server-Patches/0067-Undead-horse-leashing.patch
similarity index 96%
rename from Spigot-Server-Patches/0068-Undead-horse-leashing.patch
rename to Spigot-Server-Patches/0067-Undead-horse-leashing.patch
index 7b39be99c5..89c84c87d7 100644
--- a/Spigot-Server-Patches/0068-Undead-horse-leashing.patch
+++ b/Spigot-Server-Patches/0067-Undead-horse-leashing.patch
@@ -1,4 +1,4 @@
-From 87c9b3d8b44cb3769bdff1d66b9990a164a3671d Mon Sep 17 00:00:00 2001
+From f69028b687e1bd6a11652475c83091366a7ebf5c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 14:19:19 -0400
 Subject: [PATCH] Undead horse leashing
diff --git a/Spigot-Server-Patches/0069-Fix-Furnace-cook-time-bug.patch b/Spigot-Server-Patches/0068-Fix-Furnace-cook-time-bug.patch
similarity index 94%
rename from Spigot-Server-Patches/0069-Fix-Furnace-cook-time-bug.patch
rename to Spigot-Server-Patches/0068-Fix-Furnace-cook-time-bug.patch
index 7364f57652..2b39eb7d3d 100644
--- a/Spigot-Server-Patches/0069-Fix-Furnace-cook-time-bug.patch
+++ b/Spigot-Server-Patches/0068-Fix-Furnace-cook-time-bug.patch
@@ -1,4 +1,4 @@
-From 6c0ee073774c89e031563dcbb9bc01837b02aaef Mon Sep 17 00:00:00 2001
+From 2223947a61cc98c1e2b2c3e52c5e0bad7399dceb 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
diff --git a/Spigot-Server-Patches/0070-Handle-Item-Meta-Inconsistencies.patch b/Spigot-Server-Patches/0069-Handle-Item-Meta-Inconsistencies.patch
similarity index 98%
rename from Spigot-Server-Patches/0070-Handle-Item-Meta-Inconsistencies.patch
rename to Spigot-Server-Patches/0069-Handle-Item-Meta-Inconsistencies.patch
index 03729376a9..9e8d20b63f 100644
--- a/Spigot-Server-Patches/0070-Handle-Item-Meta-Inconsistencies.patch
+++ b/Spigot-Server-Patches/0069-Handle-Item-Meta-Inconsistencies.patch
@@ -1,4 +1,4 @@
-From 2f906444609e41acee8780cf662686805c586cd0 Mon Sep 17 00:00:00 2001
+From 8025896d1051dc63efd41729fc4433bc18f66e61 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 28 May 2015 23:00:19 -0400
 Subject: [PATCH] Handle Item Meta Inconsistencies
@@ -18,7 +18,7 @@ For consistency, the old API methods now forward to use the
 ItemMeta API equivalents, and should deprecate the old API's.
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 7f249a975..70f2dcc9e 100644
+index 68a59e708..ed714c2cc 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -7,6 +7,8 @@ import com.mojang.brigadier.StringReader;
@@ -53,7 +53,7 @@ index 7f249a975..70f2dcc9e 100644
  
      public ItemStack(IMaterial imaterial) {
          this(imaterial, 1);
-@@ -90,6 +108,7 @@ public final class ItemStack {
+@@ -96,6 +114,7 @@ public final class ItemStack {
          if (nbttagcompound.hasKeyOfType("tag", 10)) {
              // CraftBukkit start - make defensive copy as this data may be coming from the save thread
              this.tag = (NBTTagCompound) nbttagcompound.getCompound("tag").clone();
@@ -61,7 +61,7 @@ index 7f249a975..70f2dcc9e 100644
              this.getItem().a(this.tag);
              // CraftBukkit end
          }
-@@ -561,6 +580,7 @@ public final class ItemStack {
+@@ -567,6 +586,7 @@ public final class ItemStack {
      // Paper end
      public void setTag(@Nullable NBTTagCompound nbttagcompound) {
          this.tag = nbttagcompound;
@@ -69,7 +69,7 @@ index 7f249a975..70f2dcc9e 100644
      }
  
      public IChatBaseComponent getName() {
-@@ -637,6 +657,7 @@ public final class ItemStack {
+@@ -643,6 +663,7 @@ public final class ItemStack {
          nbttagcompound.setString("id", String.valueOf(Enchantment.enchantments.b(enchantment)));
          nbttagcompound.setShort("lvl", (short) ((byte) i));
          nbttaglist.add((NBTBase) nbttagcompound);
@@ -78,7 +78,7 @@ index 7f249a975..70f2dcc9e 100644
  
      public boolean hasEnchantments() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 4c4f04557..cb3b952e2 100644
+index d41459ef0..cadff64bf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -4,6 +4,7 @@ import static org.bukkit.craftbukkit.inventory.CraftMetaItem.ENCHANTMENTS;
diff --git a/Spigot-Server-Patches/0071-Configurable-Non-Player-Arrow-Despawn-Rate.patch b/Spigot-Server-Patches/0070-Configurable-Non-Player-Arrow-Despawn-Rate.patch
similarity index 96%
rename from Spigot-Server-Patches/0071-Configurable-Non-Player-Arrow-Despawn-Rate.patch
rename to Spigot-Server-Patches/0070-Configurable-Non-Player-Arrow-Despawn-Rate.patch
index ba937169d7..2e75de092f 100644
--- a/Spigot-Server-Patches/0071-Configurable-Non-Player-Arrow-Despawn-Rate.patch
+++ b/Spigot-Server-Patches/0070-Configurable-Non-Player-Arrow-Despawn-Rate.patch
@@ -1,4 +1,4 @@
-From 0aa551410860a14b627f6e8cba52b2b2c64f83f9 Mon Sep 17 00:00:00 2001
+From 15e60f77a6867cd52694f9283af1e6e795315e79 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 15:12:22 -0400
 Subject: [PATCH] Configurable Non Player Arrow Despawn Rate
diff --git a/Spigot-Server-Patches/0072-Add-World-Util-Methods.patch b/Spigot-Server-Patches/0071-Add-World-Util-Methods.patch
similarity index 93%
rename from Spigot-Server-Patches/0072-Add-World-Util-Methods.patch
rename to Spigot-Server-Patches/0071-Add-World-Util-Methods.patch
index 05a0e79055..15ec05b7b5 100644
--- a/Spigot-Server-Patches/0072-Add-World-Util-Methods.patch
+++ b/Spigot-Server-Patches/0071-Add-World-Util-Methods.patch
@@ -1,4 +1,4 @@
-From 33b09d0b5df953307a34e27ebeeffe4953f37484 Mon Sep 17 00:00:00 2001
+From 9270fa048bd8ae7bcb97a9a0fa9c9b101772affc 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 fa500e93f..f376b3a34 100644
+index 7ea4b9b5c..fb27dcac2 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 fa500e93f..f376b3a34 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..1c939e523 100644
+index d51ed0f80..d3785f73b 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
@@ -26,7 +26,7 @@ index d51ed0f80..1c939e523 100644
      protected final IntHashMap<Entity> entitiesById = new IntHashMap();
      private final long G = 16777215L;
 -    private int H;
-+    private int H; private int getSkylightSubtracted() { return this.H; } // Paper - OBFHELPER
++    private int H; public int getSkylightSubtracted() { return this.H; } public void setSkylightSubtracted(int value) { this.H = value;} // Paper - OBFHELPER
      protected int m = (new Random()).nextInt();
      protected final int n = 1013904223;
      protected float o;
diff --git a/Spigot-Server-Patches/0073-Optimized-Light-Level-Comparisons.patch b/Spigot-Server-Patches/0072-Optimized-Light-Level-Comparisons.patch
similarity index 98%
rename from Spigot-Server-Patches/0073-Optimized-Light-Level-Comparisons.patch
rename to Spigot-Server-Patches/0072-Optimized-Light-Level-Comparisons.patch
index e4ed371af8..53cc71b7f5 100644
--- a/Spigot-Server-Patches/0073-Optimized-Light-Level-Comparisons.patch
+++ b/Spigot-Server-Patches/0072-Optimized-Light-Level-Comparisons.patch
@@ -1,4 +1,4 @@
-From 8c2726ab77974922d93dfec069139e06d3b4853b Mon Sep 17 00:00:00 2001
+From b13a9f38c46d3600d2b142d3b69bee8e8c6f5cd4 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/0074-Pass-world-to-Village-creation.patch b/Spigot-Server-Patches/0073-Pass-world-to-Village-creation.patch
similarity index 95%
rename from Spigot-Server-Patches/0074-Pass-world-to-Village-creation.patch
rename to Spigot-Server-Patches/0073-Pass-world-to-Village-creation.patch
index bbadb93522..502033fa5b 100644
--- a/Spigot-Server-Patches/0074-Pass-world-to-Village-creation.patch
+++ b/Spigot-Server-Patches/0073-Pass-world-to-Village-creation.patch
@@ -1,4 +1,4 @@
-From c83f024c86f2b96c27f4892fdab2cdafed02e9de Mon Sep 17 00:00:00 2001
+From fe8a705410d94b93222d61216dd2323ad85bc3f9 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
diff --git a/Spigot-Server-Patches/0075-Custom-replacement-for-eaten-items.patch b/Spigot-Server-Patches/0074-Custom-replacement-for-eaten-items.patch
similarity index 97%
rename from Spigot-Server-Patches/0075-Custom-replacement-for-eaten-items.patch
rename to Spigot-Server-Patches/0074-Custom-replacement-for-eaten-items.patch
index cc18538521..f9becfbc77 100644
--- a/Spigot-Server-Patches/0075-Custom-replacement-for-eaten-items.patch
+++ b/Spigot-Server-Patches/0074-Custom-replacement-for-eaten-items.patch
@@ -1,4 +1,4 @@
-From da54731dadf31eda89e05a97c378e2ca37c217d5 Mon Sep 17 00:00:00 2001
+From 2269c05cd5259851ea31bd0f141ff8607521007b 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/0076-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/Spigot-Server-Patches/0075-handle-NaN-health-absorb-values-and-repair-bad-data.patch
similarity index 97%
rename from Spigot-Server-Patches/0076-handle-NaN-health-absorb-values-and-repair-bad-data.patch
rename to Spigot-Server-Patches/0075-handle-NaN-health-absorb-values-and-repair-bad-data.patch
index f6203af49e..fa61a6bb99 100644
--- a/Spigot-Server-Patches/0076-handle-NaN-health-absorb-values-and-repair-bad-data.patch
+++ b/Spigot-Server-Patches/0075-handle-NaN-health-absorb-values-and-repair-bad-data.patch
@@ -1,4 +1,4 @@
-From 5871d2878dd1896e28e792f64e8be8345b9aca4f Mon Sep 17 00:00:00 2001
+From 6088c0beba9d12b66a767590c698b54e5e1cecb2 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/0077-Catch-Async-PlayerChunkMap-operations.patch b/Spigot-Server-Patches/0076-Catch-Async-PlayerChunkMap-operations.patch
similarity index 93%
rename from Spigot-Server-Patches/0077-Catch-Async-PlayerChunkMap-operations.patch
rename to Spigot-Server-Patches/0076-Catch-Async-PlayerChunkMap-operations.patch
index fbd7e228b7..43a128219f 100644
--- a/Spigot-Server-Patches/0077-Catch-Async-PlayerChunkMap-operations.patch
+++ b/Spigot-Server-Patches/0076-Catch-Async-PlayerChunkMap-operations.patch
@@ -1,4 +1,4 @@
-From 944a34bbc6cbfe42ca5f51d0a7751af51b7b2bfa Mon Sep 17 00:00:00 2001
+From e6e8be0132a9f4e4c4b4b2fd92e6e3a18a8fd805 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/Spigot-Server-Patches/0078-Waving-banner-workaround.patch b/Spigot-Server-Patches/0077-Waving-banner-workaround.patch
similarity index 95%
rename from Spigot-Server-Patches/0078-Waving-banner-workaround.patch
rename to Spigot-Server-Patches/0077-Waving-banner-workaround.patch
index 7a780aebd8..c8ae613ee8 100644
--- a/Spigot-Server-Patches/0078-Waving-banner-workaround.patch
+++ b/Spigot-Server-Patches/0077-Waving-banner-workaround.patch
@@ -1,4 +1,4 @@
-From a6cfcd582092205a3cc16876f512319aa6e3659b Mon Sep 17 00:00:00 2001
+From 5f67b25a27935227c89946213d7c1b9241b20cb9 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
diff --git a/Spigot-Server-Patches/0079-Use-a-Shared-Random-for-Entities.patch b/Spigot-Server-Patches/0078-Use-a-Shared-Random-for-Entities.patch
similarity index 95%
rename from Spigot-Server-Patches/0079-Use-a-Shared-Random-for-Entities.patch
rename to Spigot-Server-Patches/0078-Use-a-Shared-Random-for-Entities.patch
index 0280e0d2a2..5d6622ad57 100644
--- a/Spigot-Server-Patches/0079-Use-a-Shared-Random-for-Entities.patch
+++ b/Spigot-Server-Patches/0078-Use-a-Shared-Random-for-Entities.patch
@@ -1,4 +1,4 @@
-From e8130f30b3ccaa96576a1a9f8ab34ec9e01ff0eb Mon Sep 17 00:00:00 2001
+From 39039bfaab07bf1d1c0eec274aac6a6187a8781b 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
diff --git a/Spigot-Server-Patches/0080-Don-t-teleport-dead-entities.patch b/Spigot-Server-Patches/0079-Don-t-teleport-dead-entities.patch
similarity index 93%
rename from Spigot-Server-Patches/0080-Don-t-teleport-dead-entities.patch
rename to Spigot-Server-Patches/0079-Don-t-teleport-dead-entities.patch
index 009ff59ff6..42f0912b06 100644
--- a/Spigot-Server-Patches/0080-Don-t-teleport-dead-entities.patch
+++ b/Spigot-Server-Patches/0079-Don-t-teleport-dead-entities.patch
@@ -1,4 +1,4 @@
-From fe002b9182ad3501cf49a62a7628886ca334eb42 Mon Sep 17 00:00:00 2001
+From 22bc88a7734d7cd8f0e59448076b9f781b60cc59 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 22 Mar 2016 00:55:23 -0400
 Subject: [PATCH] Don't teleport dead entities
diff --git a/Spigot-Server-Patches/0081-Optimize-Chunk-Access.patch b/Spigot-Server-Patches/0080-Optimize-Chunk-Access.patch
similarity index 95%
rename from Spigot-Server-Patches/0081-Optimize-Chunk-Access.patch
rename to Spigot-Server-Patches/0080-Optimize-Chunk-Access.patch
index 898131b21a..91ffe2add0 100644
--- a/Spigot-Server-Patches/0081-Optimize-Chunk-Access.patch
+++ b/Spigot-Server-Patches/0080-Optimize-Chunk-Access.patch
@@ -1,4 +1,4 @@
-From cdb7534af1e2b9eccff805ba33c17dbe7173b8bf Mon Sep 17 00:00:00 2001
+From 196ffe1d3f60888cdd167fab8e5e514254f2eb55 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/0082-Configurable-spawn-chances-for-skeleton-horses.patch b/Spigot-Server-Patches/0081-Configurable-spawn-chances-for-skeleton-horses.patch
similarity index 96%
rename from Spigot-Server-Patches/0082-Configurable-spawn-chances-for-skeleton-horses.patch
rename to Spigot-Server-Patches/0081-Configurable-spawn-chances-for-skeleton-horses.patch
index 77889de4f5..403edcd421 100644
--- a/Spigot-Server-Patches/0082-Configurable-spawn-chances-for-skeleton-horses.patch
+++ b/Spigot-Server-Patches/0081-Configurable-spawn-chances-for-skeleton-horses.patch
@@ -1,4 +1,4 @@
-From 80270bef8a4e821f22b5da1aeee36822fde9150b Mon Sep 17 00:00:00 2001
+From b03e35486eb18d15d0e8e46d3ac4a6e198931453 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 22 Mar 2016 12:04:28 -0500
 Subject: [PATCH] Configurable spawn chances for skeleton horses
diff --git a/Spigot-Server-Patches/0083-Optimize-isValidLocation-getType-and-getBlockData-fo.patch b/Spigot-Server-Patches/0082-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
similarity index 98%
rename from Spigot-Server-Patches/0083-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
rename to Spigot-Server-Patches/0082-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
index b1121bdcad..8c7364fb4b 100644
--- a/Spigot-Server-Patches/0083-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
+++ b/Spigot-Server-Patches/0082-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
@@ -1,4 +1,4 @@
-From d251f7e298b065e5da84fe228f169a2437a09823 Mon Sep 17 00:00:00 2001
+From 4710b24774a3e974f01b1db6348dcc36a4d2ded7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 02:07:55 -0600
 Subject: [PATCH] Optimize isValidLocation, getType and getBlockData for inling
@@ -31,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 80cdf5528..39252ad9a 100644
+index 70a7edf57..fff08f09d 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -339,6 +339,16 @@ public class BlockPosition extends BaseBlockPosition {
@@ -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 1c939e523..9e56b046f 100644
+index d3785f73b..f8e4cd14c 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/0084-Access-items-by-EquipmentSlot.patch b/Spigot-Server-Patches/0083-Access-items-by-EquipmentSlot.patch
similarity index 97%
rename from Spigot-Server-Patches/0084-Access-items-by-EquipmentSlot.patch
rename to Spigot-Server-Patches/0083-Access-items-by-EquipmentSlot.patch
index 28775abcf9..4adbf6ef83 100644
--- a/Spigot-Server-Patches/0084-Access-items-by-EquipmentSlot.patch
+++ b/Spigot-Server-Patches/0083-Access-items-by-EquipmentSlot.patch
@@ -1,4 +1,4 @@
-From ff5e0a9bbb04c9d508bdeb1a01746c12f08701d7 Mon Sep 17 00:00:00 2001
+From a3603d62b1e1066a3e8b4ef5d5d3fe9bec5911a3 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/Spigot-Server-Patches/0085-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch b/Spigot-Server-Patches/0084-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
similarity index 97%
rename from Spigot-Server-Patches/0085-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
rename to Spigot-Server-Patches/0084-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
index 9dcaddb902..0a7ac87bf8 100644
--- a/Spigot-Server-Patches/0085-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
+++ b/Spigot-Server-Patches/0084-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
@@ -1,4 +1,4 @@
-From bb5082dc3d9b53d91ff31abd7ce59e2fd9f85c7f Mon Sep 17 00:00:00 2001
+From b89267bd8d1f5a2ba7b23efb6064e12b1f38f5b9 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
@@ -25,7 +25,7 @@ index 9f586774d..1c2209270 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 9e56b046f..c9d0c22d5 100644
+index f8e4cd14c..11012360b 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -582,7 +582,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
diff --git a/Spigot-Server-Patches/0086-Entity-AddTo-RemoveFrom-World-Events.patch b/Spigot-Server-Patches/0085-Entity-AddTo-RemoveFrom-World-Events.patch
similarity index 91%
rename from Spigot-Server-Patches/0086-Entity-AddTo-RemoveFrom-World-Events.patch
rename to Spigot-Server-Patches/0085-Entity-AddTo-RemoveFrom-World-Events.patch
index f8af43d627..96fe94f84f 100644
--- a/Spigot-Server-Patches/0086-Entity-AddTo-RemoveFrom-World-Events.patch
+++ b/Spigot-Server-Patches/0085-Entity-AddTo-RemoveFrom-World-Events.patch
@@ -1,11 +1,11 @@
-From 3eb77c1663b1d445903206370ceec40558d6ca71 Mon Sep 17 00:00:00 2001
+From 385963651b17a13011618cf326c14f5084f303cb 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 c9d0c22d5..e88baae1d 100644
+index 11012360b..307539199 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1037,6 +1037,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
diff --git a/Spigot-Server-Patches/0087-Configurable-Chunk-Inhabited-Timer.patch b/Spigot-Server-Patches/0086-Configurable-Chunk-Inhabited-Timer.patch
similarity index 94%
rename from Spigot-Server-Patches/0087-Configurable-Chunk-Inhabited-Timer.patch
rename to Spigot-Server-Patches/0086-Configurable-Chunk-Inhabited-Timer.patch
index 169e3c92a1..43118563eb 100644
--- a/Spigot-Server-Patches/0087-Configurable-Chunk-Inhabited-Timer.patch
+++ b/Spigot-Server-Patches/0086-Configurable-Chunk-Inhabited-Timer.patch
@@ -1,4 +1,4 @@
-From 79c231e9a63f78d87f1042415362779abee394af Mon Sep 17 00:00:00 2001
+From 1ab4c742c0d8d9b7da4be54e6228aca0471342e9 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 20:46:14 -0400
 Subject: [PATCH] Configurable Chunk Inhabited Timer
@@ -23,7 +23,7 @@ index 1c2209270..17fb883f6 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 75fcc693d..aaa65582b 100644
+index 1c0580f79..744b5bc6d 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -55,7 +55,7 @@ public class Chunk implements IChunkAccess {
diff --git a/Spigot-Server-Patches/0088-EntityPathfindEvent.patch b/Spigot-Server-Patches/0087-EntityPathfindEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0088-EntityPathfindEvent.patch
rename to Spigot-Server-Patches/0087-EntityPathfindEvent.patch
index 117da38482..56d56bbf1c 100644
--- a/Spigot-Server-Patches/0088-EntityPathfindEvent.patch
+++ b/Spigot-Server-Patches/0087-EntityPathfindEvent.patch
@@ -1,4 +1,4 @@
-From 31f50d7cd6e30d27b06ff85e3e3b16a1c294951e Mon Sep 17 00:00:00 2001
+From 6455ce561b9117bf7b6752c1553f5159fb3712f3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 21:22:26 -0400
 Subject: [PATCH] EntityPathfindEvent
diff --git a/Spigot-Server-Patches/0089-Reduce-IO-ops-opening-a-new-region-file.patch b/Spigot-Server-Patches/0088-Reduce-IO-ops-opening-a-new-region-file.patch
similarity index 96%
rename from Spigot-Server-Patches/0089-Reduce-IO-ops-opening-a-new-region-file.patch
rename to Spigot-Server-Patches/0088-Reduce-IO-ops-opening-a-new-region-file.patch
index c82e50f232..7f51071306 100644
--- a/Spigot-Server-Patches/0089-Reduce-IO-ops-opening-a-new-region-file.patch
+++ b/Spigot-Server-Patches/0088-Reduce-IO-ops-opening-a-new-region-file.patch
@@ -1,4 +1,4 @@
-From 2d8c5299e664122b08b135fa309307b150d551ee Mon Sep 17 00:00:00 2001
+From d1b56fb71f1165a2f50706cef0f4676cc3a29a21 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/Spigot-Server-Patches/0090-Sanitise-RegionFileCache-and-make-configurable.patch b/Spigot-Server-Patches/0089-Sanitise-RegionFileCache-and-make-configurable.patch
similarity index 98%
rename from Spigot-Server-Patches/0090-Sanitise-RegionFileCache-and-make-configurable.patch
rename to Spigot-Server-Patches/0089-Sanitise-RegionFileCache-and-make-configurable.patch
index 728b5128b2..062b801f63 100644
--- a/Spigot-Server-Patches/0090-Sanitise-RegionFileCache-and-make-configurable.patch
+++ b/Spigot-Server-Patches/0089-Sanitise-RegionFileCache-and-make-configurable.patch
@@ -1,4 +1,4 @@
-From eb06649c441f9bae0b3db6b27584f2ef490297f5 Mon Sep 17 00:00:00 2001
+From 2441c587560e34e5b7252b89a3b5234911e5b641 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.
diff --git a/Spigot-Server-Patches/0091-Use-Optimized-Collections.patch b/Spigot-Server-Patches/0090-Use-Optimized-Collections.patch
similarity index 96%
rename from Spigot-Server-Patches/0091-Use-Optimized-Collections.patch
rename to Spigot-Server-Patches/0090-Use-Optimized-Collections.patch
index 462a346dcc..57406de167 100644
--- a/Spigot-Server-Patches/0091-Use-Optimized-Collections.patch
+++ b/Spigot-Server-Patches/0090-Use-Optimized-Collections.patch
@@ -1,4 +1,4 @@
-From a298bd1caa168fd3ede25b2419e0888c4007ebb9 Mon Sep 17 00:00:00 2001
+From 577370cdcd50969b88062f39cf1dffb067264883 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
diff --git a/Spigot-Server-Patches/0092-Do-not-load-chunks-for-light-checks.patch b/Spigot-Server-Patches/0091-Do-not-load-chunks-for-light-checks.patch
similarity index 90%
rename from Spigot-Server-Patches/0092-Do-not-load-chunks-for-light-checks.patch
rename to Spigot-Server-Patches/0091-Do-not-load-chunks-for-light-checks.patch
index 7c19d5c08c..2ffb7fd9d5 100644
--- a/Spigot-Server-Patches/0092-Do-not-load-chunks-for-light-checks.patch
+++ b/Spigot-Server-Patches/0091-Do-not-load-chunks-for-light-checks.patch
@@ -1,4 +1,4 @@
-From 7e7897a420565c84d951cc87d921a71b00d32f13 Mon Sep 17 00:00:00 2001
+From f21316e52457b25d3b0341df545496364d28664a 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 e88baae1d..e42a334bc 100644
+index 307539199..cc1492e4d 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -625,6 +625,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
diff --git a/Spigot-Server-Patches/0093-Add-PlayerUseUnknownEntityEvent.patch b/Spigot-Server-Patches/0092-Add-PlayerUseUnknownEntityEvent.patch
similarity index 91%
rename from Spigot-Server-Patches/0093-Add-PlayerUseUnknownEntityEvent.patch
rename to Spigot-Server-Patches/0092-Add-PlayerUseUnknownEntityEvent.patch
index 2b70606a63..58e45788c7 100644
--- a/Spigot-Server-Patches/0093-Add-PlayerUseUnknownEntityEvent.patch
+++ b/Spigot-Server-Patches/0092-Add-PlayerUseUnknownEntityEvent.patch
@@ -1,4 +1,4 @@
-From 3632af99628eb8d4102b22dce1b6c2a073da52ba Mon Sep 17 00:00:00 2001
+From 023266ca8f49d694c4e425ab6b7475b195ccb38e 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
@@ -18,10 +18,10 @@ 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 9c27966ea..5c70a4a9b 100644
+index 88b761d27..a3486bd46 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1888,6 +1888,16 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1893,6 +1893,16 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                  }
              }
          }
diff --git a/Spigot-Server-Patches/0094-Fix-reducedDebugInfo-not-initialized-on-client.patch b/Spigot-Server-Patches/0093-Fix-reducedDebugInfo-not-initialized-on-client.patch
similarity index 94%
rename from Spigot-Server-Patches/0094-Fix-reducedDebugInfo-not-initialized-on-client.patch
rename to Spigot-Server-Patches/0093-Fix-reducedDebugInfo-not-initialized-on-client.patch
index dcd74c9c43..73e63f8002 100644
--- a/Spigot-Server-Patches/0094-Fix-reducedDebugInfo-not-initialized-on-client.patch
+++ b/Spigot-Server-Patches/0093-Fix-reducedDebugInfo-not-initialized-on-client.patch
@@ -1,4 +1,4 @@
-From 52309a5ebc1db4b00122113b4a5323ecc1a2d51a Mon Sep 17 00:00:00 2001
+From 9ef42a2b51fae0e453e1184787bf985d2a1f8223 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/Spigot-Server-Patches/0095-Configurable-Grass-Spread-Tick-Rate.patch b/Spigot-Server-Patches/0094-Configurable-Grass-Spread-Tick-Rate.patch
similarity index 96%
rename from Spigot-Server-Patches/0095-Configurable-Grass-Spread-Tick-Rate.patch
rename to Spigot-Server-Patches/0094-Configurable-Grass-Spread-Tick-Rate.patch
index 7587147136..dd644078f0 100644
--- a/Spigot-Server-Patches/0095-Configurable-Grass-Spread-Tick-Rate.patch
+++ b/Spigot-Server-Patches/0094-Configurable-Grass-Spread-Tick-Rate.patch
@@ -1,4 +1,4 @@
-From f7491b43e43d1a84ac5ba371a65c3e7d6d3fb3aa Mon Sep 17 00:00:00 2001
+From aa81b601a06d1482b03985113d4bfe799307ce36 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 3 Apr 2016 16:28:17 -0400
 Subject: [PATCH] Configurable Grass Spread Tick Rate
diff --git a/Spigot-Server-Patches/0096-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0095-Configurable-Keep-Spawn-Loaded-range-per-world.patch
similarity index 95%
rename from Spigot-Server-Patches/0096-Configurable-Keep-Spawn-Loaded-range-per-world.patch
rename to Spigot-Server-Patches/0095-Configurable-Keep-Spawn-Loaded-range-per-world.patch
index d8dc26aa7a..d9ec20d082 100644
--- a/Spigot-Server-Patches/0096-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/Spigot-Server-Patches/0095-Configurable-Keep-Spawn-Loaded-range-per-world.patch
@@ -1,4 +1,4 @@
-From 45ab5aca8f811f11099ff7d2eeca2edcf0fe376a Mon Sep 17 00:00:00 2001
+From a064f1ff86cfe2af3e4659d3b4ab7191c1bbdee5 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
@@ -39,7 +39,7 @@ index 1027b0588..b7aa9e869 100644
                  }
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index e42a334bc..d15afd595 100644
+index cc1492e4d..2c6774082 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -2821,8 +2821,9 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@@ -67,10 +67,10 @@ index f90dc11f2..06b59657f 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 4df849eef..9d88b9ddb 100644
+index 0b2a9d09d..ff3558363 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1305,8 +1305,9 @@ public class CraftWorld implements World {
+@@ -1285,8 +1285,9 @@ public class CraftWorld implements World {
          int chunkCoordX = chunkcoordinates.getX() >> 4;
          int chunkCoordZ = chunkcoordinates.getZ() >> 4;
          // Cycle through the 25x25 Chunks around it to load/unload the chunks.
diff --git a/Spigot-Server-Patches/0097-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/Spigot-Server-Patches/0096-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
similarity index 89%
rename from Spigot-Server-Patches/0097-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
rename to Spigot-Server-Patches/0096-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
index 067a822224..d69792a407 100644
--- a/Spigot-Server-Patches/0097-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
+++ b/Spigot-Server-Patches/0096-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
@@ -1,11 +1,11 @@
-From 3e8cb3c6253665e96ccc32e6c082951c56395c77 Mon Sep 17 00:00:00 2001
+From e0c21d538164861f973f9ac5aa0d3b5f32f29ad7 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 d15afd595..9fdedc2d7 100644
+index 2c6774082..5b2d67260 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -540,6 +540,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
diff --git a/Spigot-Server-Patches/0098-Don-t-spam-reload-spawn-chunks-in-nether-end.patch b/Spigot-Server-Patches/0097-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
similarity index 92%
rename from Spigot-Server-Patches/0098-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
rename to Spigot-Server-Patches/0097-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
index bbe1311641..49cae9e035 100644
--- a/Spigot-Server-Patches/0098-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
+++ b/Spigot-Server-Patches/0097-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
@@ -1,11 +1,11 @@
-From 25f92cc47e0b7f71bd08f03787a8c1fcb353d536 Mon Sep 17 00:00:00 2001
+From 0fcdea66258db413a6b24290ed64dbe31665a343 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 9fdedc2d7..3bf2cb8d0 100644
+index 5b2d67260..3aecf7a5d 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -2817,6 +2817,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
diff --git a/Spigot-Server-Patches/0099-Remove-Debug-checks-from-DataBits.patch b/Spigot-Server-Patches/0098-Remove-Debug-checks-from-DataBits.patch
similarity index 96%
rename from Spigot-Server-Patches/0099-Remove-Debug-checks-from-DataBits.patch
rename to Spigot-Server-Patches/0098-Remove-Debug-checks-from-DataBits.patch
index e7f467a0bc..17c50b598b 100644
--- a/Spigot-Server-Patches/0099-Remove-Debug-checks-from-DataBits.patch
+++ b/Spigot-Server-Patches/0098-Remove-Debug-checks-from-DataBits.patch
@@ -1,4 +1,4 @@
-From 774b04c0fba71b85a554183e04cc07cf47b0cfa1 Mon Sep 17 00:00:00 2001
+From 815ec2a31b886837709faf3317b3016274f43606 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
diff --git a/Spigot-Server-Patches/0100-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/Spigot-Server-Patches/0099-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
similarity index 96%
rename from Spigot-Server-Patches/0100-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
rename to Spigot-Server-Patches/0099-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
index 86f4a387dc..39e315ae22 100644
--- a/Spigot-Server-Patches/0100-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
+++ b/Spigot-Server-Patches/0099-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
@@ -1,4 +1,4 @@
-From 165e6010c2951073c778f6d62469189754781c94 Mon Sep 17 00:00:00 2001
+From 9cfa1f4bdd459c8f829f60b971a5af65fb5ecb0c 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
@@ -31,7 +31,7 @@ index c37c46e71..88092d823 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 553011d88..65fa09a01 100644
+index a3486bd46..79fddc866 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1622,7 +1622,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
diff --git a/Spigot-Server-Patches/0101-Workaround-for-setting-passengers-on-players.patch b/Spigot-Server-Patches/0100-Workaround-for-setting-passengers-on-players.patch
similarity index 94%
rename from Spigot-Server-Patches/0101-Workaround-for-setting-passengers-on-players.patch
rename to Spigot-Server-Patches/0100-Workaround-for-setting-passengers-on-players.patch
index f43a4601fb..e2967289e2 100644
--- a/Spigot-Server-Patches/0101-Workaround-for-setting-passengers-on-players.patch
+++ b/Spigot-Server-Patches/0100-Workaround-for-setting-passengers-on-players.patch
@@ -1,4 +1,4 @@
-From eec3163a764f422f16126cfdfe4118005448d36b Mon Sep 17 00:00:00 2001
+From 8618df486d8bf3c9e36a99962d98f038de5b7242 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
diff --git a/Spigot-Server-Patches/0102-Remove-unused-World-Tile-Entity-List.patch b/Spigot-Server-Patches/0101-Remove-unused-World-Tile-Entity-List.patch
similarity index 97%
rename from Spigot-Server-Patches/0102-Remove-unused-World-Tile-Entity-List.patch
rename to Spigot-Server-Patches/0101-Remove-unused-World-Tile-Entity-List.patch
index f51f08b416..7cd2cd6a6d 100644
--- a/Spigot-Server-Patches/0102-Remove-unused-World-Tile-Entity-List.patch
+++ b/Spigot-Server-Patches/0101-Remove-unused-World-Tile-Entity-List.patch
@@ -1,4 +1,4 @@
-From 3e338b0485e7e2979327199b68dfa566eb12a64b Mon Sep 17 00:00:00 2001
+From e2d1cd0843677e1a8e8dea3ed851c5c8e2e94e69 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 3bf2cb8d0..3b3cc69de 100644
+index 3aecf7a5d..e5ecfdbf0 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/0103-Don-t-tick-Skulls-unused-code.patch b/Spigot-Server-Patches/0102-Don-t-tick-Skulls-unused-code.patch
similarity index 92%
rename from Spigot-Server-Patches/0103-Don-t-tick-Skulls-unused-code.patch
rename to Spigot-Server-Patches/0102-Don-t-tick-Skulls-unused-code.patch
index e61c3c7c31..8b0e2cd31d 100644
--- a/Spigot-Server-Patches/0103-Don-t-tick-Skulls-unused-code.patch
+++ b/Spigot-Server-Patches/0102-Don-t-tick-Skulls-unused-code.patch
@@ -1,4 +1,4 @@
-From 2656f524d7bc6d8a806dce43790024bceba5d288 Mon Sep 17 00:00:00 2001
+From 3577a2539471e163fd082cf8e5d277ce4a4dd71c 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/Spigot-Server-Patches/0104-Configurable-Player-Collision.patch b/Spigot-Server-Patches/0103-Configurable-Player-Collision.patch
similarity index 90%
rename from Spigot-Server-Patches/0104-Configurable-Player-Collision.patch
rename to Spigot-Server-Patches/0103-Configurable-Player-Collision.patch
index e09396ebb8..f9dc5f7b25 100644
--- a/Spigot-Server-Patches/0104-Configurable-Player-Collision.patch
+++ b/Spigot-Server-Patches/0103-Configurable-Player-Collision.patch
@@ -1,4 +1,4 @@
-From f5f4102b6341f818aef3ccb79a0edc839174a2b8 Mon Sep 17 00:00:00 2001
+From 9f2f1b9ab1eed83663f5141642da3ed16f93bdaf 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
@@ -57,7 +57,7 @@ index 5f54e7b9c..759288b97 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 8e1edde31..801a147f0 100644
+index 8e1edde31..6b7d81933 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 {
@@ -68,26 +68,27 @@ index 8e1edde31..801a147f0 100644
  
      public PlayerList(MinecraftServer minecraftserver) {
          this.cserver = minecraftserver.server = new CraftServer(minecraftserver, this);
-@@ -231,6 +232,12 @@ public abstract class PlayerList {
+@@ -231,6 +232,13 @@ public abstract class PlayerList {
          }
  
          entityplayer.syncInventory();
 +        // Paper start - Add to collideRule team if needed
-+        final Scoreboard scoreboard = this.getServer().getWorld().getScoreboard();
-+        if (this.collideRuleTeamName != null && scoreboard.getTeam(collideRuleTeamName) != null && entityplayer.getTeam() == null) {
-+            scoreboard.addPlayerToTeam(entityplayer.getName(), collideRuleTeamName);
++        final Scoreboard scoreboard = this.getServer().getWorldServer(0).getScoreboard();
++        final ScoreboardTeam collideRuleTeam = scoreboard.getTeam(collideRuleTeamName);
++        if (this.collideRuleTeamName != null && collideRuleTeam != null && entityplayer.getTeam() == null) {
++            scoreboard.addPlayerToTeam(entityplayer.getName(), collideRuleTeam);
 +        }
 +        // Paper end
          // CraftBukkit - Moved from above, added world
          PlayerList.f.info("{}[{}] logged in with entity id {} at ([{}]{}, {}, {})", entityplayer.getDisplayName().getString(), s1, Integer.valueOf(entityplayer.getId()), entityplayer.world.worldData.getName(), Double.valueOf(entityplayer.locX), Double.valueOf(entityplayer.locY), Double.valueOf(entityplayer.locZ));
      }
-@@ -423,6 +430,16 @@ public abstract class PlayerList {
+@@ -423,6 +431,16 @@ public abstract class PlayerList {
          entityplayer.playerTick();// SPIGOT-924
          // CraftBukkit end
  
 +        // Paper start - Remove from collideRule team if needed
 +        if (this.collideRuleTeamName != null) {
-+            final Scoreboard scoreBoard = this.server.getWorld().getScoreboard();
++            final Scoreboard scoreBoard = this.server.getWorldServer(0).getScoreboard();
 +            final ScoreboardTeam team = scoreBoard.getTeam(this.collideRuleTeamName);
 +            if (entityplayer.getTeam() == team && team != null) {
 +                scoreBoard.removePlayerFromTeam(entityplayer.getName(), team);
@@ -98,14 +99,14 @@ index 8e1edde31..801a147f0 100644
          this.savePlayerFile(entityplayer);
          if (entityplayer.isPassenger()) {
              Entity entity = entityplayer.getRootVehicle();
-@@ -1318,7 +1335,13 @@ public abstract class PlayerList {
+@@ -1318,7 +1336,13 @@ public abstract class PlayerList {
              player.playerConnection.disconnect(this.server.server.getShutdownMessage()); // CraftBukkit - add custom shutdown message
          }
          // CraftBukkit end
 -
 +        // Paper start - Remove collideRule team if it exists
 +        if (this.collideRuleTeamName != null) {
-+            final Scoreboard scoreboard = this.getServer().getWorld().getScoreboard();
++            final Scoreboard scoreboard = this.getServer().getWorldServer(0).getScoreboard();
 +            final ScoreboardTeam team = scoreboard.getTeam(this.collideRuleTeamName);
 +            if (team != null) scoreboard.removeTeam(team);
 +        }
diff --git a/Spigot-Server-Patches/0105-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/Spigot-Server-Patches/0104-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
similarity index 97%
rename from Spigot-Server-Patches/0105-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
rename to Spigot-Server-Patches/0104-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
index 1feddd68ff..499643f0ce 100644
--- a/Spigot-Server-Patches/0105-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
+++ b/Spigot-Server-Patches/0104-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
@@ -1,4 +1,4 @@
-From 0f9759f4dd921364dd71b1a71c813e2d22176add Mon Sep 17 00:00:00 2001
+From 0d03db270cc3bde0d73293c739cf16653cb7357a 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
diff --git a/Spigot-Server-Patches/0106-Configurable-RCON-IP-address.patch b/Spigot-Server-Patches/0105-Configurable-RCON-IP-address.patch
similarity index 93%
rename from Spigot-Server-Patches/0106-Configurable-RCON-IP-address.patch
rename to Spigot-Server-Patches/0105-Configurable-RCON-IP-address.patch
index 75f4f37661..f4c56ee177 100644
--- a/Spigot-Server-Patches/0106-Configurable-RCON-IP-address.patch
+++ b/Spigot-Server-Patches/0105-Configurable-RCON-IP-address.patch
@@ -1,4 +1,4 @@
-From 8f40f7624b7a906dc0d09295b88bada5f0f97aa4 Mon Sep 17 00:00:00 2001
+From 34fc50dad287d6b268931ec670644fe4e6ffcc50 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
diff --git a/Spigot-Server-Patches/0107-Prevent-Fire-from-loading-chunks.patch b/Spigot-Server-Patches/0106-Prevent-Fire-from-loading-chunks.patch
similarity index 97%
rename from Spigot-Server-Patches/0107-Prevent-Fire-from-loading-chunks.patch
rename to Spigot-Server-Patches/0106-Prevent-Fire-from-loading-chunks.patch
index 918b6ec702..f1aafd560f 100644
--- a/Spigot-Server-Patches/0107-Prevent-Fire-from-loading-chunks.patch
+++ b/Spigot-Server-Patches/0106-Prevent-Fire-from-loading-chunks.patch
@@ -1,4 +1,4 @@
-From 0b5b0ef90ca93ca68ab9de1e93ece64799f32d4e Mon Sep 17 00:00:00 2001
+From 934f9f6f3306dbe1b0c95e38a3f2dc0d4279053c 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
diff --git a/Spigot-Server-Patches/0108-Implement-PlayerLocaleChangeEvent.patch b/Spigot-Server-Patches/0107-Implement-PlayerLocaleChangeEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0108-Implement-PlayerLocaleChangeEvent.patch
rename to Spigot-Server-Patches/0107-Implement-PlayerLocaleChangeEvent.patch
index 3873a1a605..95f1459dd9 100644
--- a/Spigot-Server-Patches/0108-Implement-PlayerLocaleChangeEvent.patch
+++ b/Spigot-Server-Patches/0107-Implement-PlayerLocaleChangeEvent.patch
@@ -1,4 +1,4 @@
-From 3fc405ea7cc11069a684deb236861ad238e41efd Mon Sep 17 00:00:00 2001
+From 35743db29502ae20ea069937d69df3e213d8d1d0 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/0109-EntityRegainHealthEvent-isFastRegen-API.patch b/Spigot-Server-Patches/0108-EntityRegainHealthEvent-isFastRegen-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0109-EntityRegainHealthEvent-isFastRegen-API.patch
rename to Spigot-Server-Patches/0108-EntityRegainHealthEvent-isFastRegen-API.patch
index 2483b052db..981e469d27 100644
--- a/Spigot-Server-Patches/0109-EntityRegainHealthEvent-isFastRegen-API.patch
+++ b/Spigot-Server-Patches/0108-EntityRegainHealthEvent-isFastRegen-API.patch
@@ -1,4 +1,4 @@
-From 618b1abbe1fcbc0eb1277dcaae3fe013f7934b3d Mon Sep 17 00:00:00 2001
+From 71bc8c77ee39148ca29785b0433e95fcd59eebf4 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/0110-Add-ability-to-configure-frosted_ice-properties.patch b/Spigot-Server-Patches/0109-Add-ability-to-configure-frosted_ice-properties.patch
similarity index 97%
rename from Spigot-Server-Patches/0110-Add-ability-to-configure-frosted_ice-properties.patch
rename to Spigot-Server-Patches/0109-Add-ability-to-configure-frosted_ice-properties.patch
index 620a2fcad4..bddc4a57ad 100644
--- a/Spigot-Server-Patches/0110-Add-ability-to-configure-frosted_ice-properties.patch
+++ b/Spigot-Server-Patches/0109-Add-ability-to-configure-frosted_ice-properties.patch
@@ -1,4 +1,4 @@
-From 434dc56dd20d8354389d021209ca13482f41c1de Mon Sep 17 00:00:00 2001
+From fd07a26f0eccd02458943d5b15c84a6951a8a3ee 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
@@ -47,5 +47,5 @@ index 1d5c24c7a..77cf6b8e9 100644
                  }
              } catch (Throwable throwable1) {
 -- 
-2.17.1
+2.18.0
 
diff --git a/Spigot-Server-Patches/0111-Vehicle-Event-Cancellation-Changes.patch b/Spigot-Server-Patches/0110-Vehicle-Event-Cancellation-Changes.patch
similarity index 95%
rename from Spigot-Server-Patches/0111-Vehicle-Event-Cancellation-Changes.patch
rename to Spigot-Server-Patches/0110-Vehicle-Event-Cancellation-Changes.patch
index 07193c63f5..8619f48037 100644
--- a/Spigot-Server-Patches/0111-Vehicle-Event-Cancellation-Changes.patch
+++ b/Spigot-Server-Patches/0110-Vehicle-Event-Cancellation-Changes.patch
@@ -1,11 +1,11 @@
-From 47d3cf8ea0a9e7d17cf085f1489ecb34c1331407 Mon Sep 17 00:00:00 2001
+From 3813dcf8105186f2ad6b22b3e3c8e129656c6dbb Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 22 Apr 2016 18:20:05 -0500
 Subject: [PATCH] Vehicle Event Cancellation Changes
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index fecf29710..85e5a0a4c 100644
+index 88092d823..9af242380 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -80,7 +80,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
diff --git a/Spigot-Server-Patches/0112-remove-null-possibility-for-getServer-singleton.patch b/Spigot-Server-Patches/0111-remove-null-possibility-for-getServer-singleton.patch
similarity index 96%
rename from Spigot-Server-Patches/0112-remove-null-possibility-for-getServer-singleton.patch
rename to Spigot-Server-Patches/0111-remove-null-possibility-for-getServer-singleton.patch
index 0100e1a69d..851bfbb263 100644
--- a/Spigot-Server-Patches/0112-remove-null-possibility-for-getServer-singleton.patch
+++ b/Spigot-Server-Patches/0111-remove-null-possibility-for-getServer-singleton.patch
@@ -1,4 +1,4 @@
-From 2d68b62e5d00ca7d2ad4c9773f33304070f53f75 Mon Sep 17 00:00:00 2001
+From 6b309368c52f9b4108b0a3619f0b7089abad52bd 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
@@ -35,5 +35,5 @@ index c5670fe8d..e11289217 100644
      // CraftBukkit end
  }
 -- 
-2.17.1
+2.18.0
 
diff --git a/Spigot-Server-Patches/0113-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/Spigot-Server-Patches/0112-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
similarity index 98%
rename from Spigot-Server-Patches/0113-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
rename to Spigot-Server-Patches/0112-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
index 468f7274d3..61a0032634 100644
--- a/Spigot-Server-Patches/0113-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
+++ b/Spigot-Server-Patches/0112-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
@@ -1,4 +1,4 @@
-From 3ae97c4b74a8a3e42b84e5fffe41d84ec489cf18 Mon Sep 17 00:00:00 2001
+From 1b250f7abc586467c2a08285ab380754c75fc64e 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
@@ -43,7 +43,7 @@ index 6ae576a2e..af1981967 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 3b3cc69de..4588df4b1 100644
+index e5ecfdbf0..5102f24ed 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1075,6 +1075,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
diff --git a/Spigot-Server-Patches/0114-LootTable-API-Replenishable-Lootables-Feature.patch b/Spigot-Server-Patches/0113-LootTable-API-Replenishable-Lootables-Feature.patch
similarity index 99%
rename from Spigot-Server-Patches/0114-LootTable-API-Replenishable-Lootables-Feature.patch
rename to Spigot-Server-Patches/0113-LootTable-API-Replenishable-Lootables-Feature.patch
index d8488530b0..6192979185 100644
--- a/Spigot-Server-Patches/0114-LootTable-API-Replenishable-Lootables-Feature.patch
+++ b/Spigot-Server-Patches/0113-LootTable-API-Replenishable-Lootables-Feature.patch
@@ -1,4 +1,4 @@
-From 1ccbd86167f75dcdfa7824285a9b772ae1b8dcfb Mon Sep 17 00:00:00 2001
+From 9d96b8545503e22d3196831671b54fc1a5e80009 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
@@ -791,5 +791,5 @@ index e9963e21c..acb4dee04 100644
  
      CraftMinecartHopper(CraftServer server, EntityMinecartHopper entity) {
 -- 
-2.17.1
+2.18.0
 
diff --git a/Spigot-Server-Patches/0115-Do-not-load-chunks-for-pathfinding.patch b/Spigot-Server-Patches/0114-Do-not-load-chunks-for-pathfinding.patch
similarity index 91%
rename from Spigot-Server-Patches/0115-Do-not-load-chunks-for-pathfinding.patch
rename to Spigot-Server-Patches/0114-Do-not-load-chunks-for-pathfinding.patch
index 497ce09c07..13d0f956d4 100644
--- a/Spigot-Server-Patches/0115-Do-not-load-chunks-for-pathfinding.patch
+++ b/Spigot-Server-Patches/0114-Do-not-load-chunks-for-pathfinding.patch
@@ -1,4 +1,4 @@
-From 02a8ef4ee2f4d3efc01255a137a232fa5f974352 Mon Sep 17 00:00:00 2001
+From 8377c919dfb9fe70801510f6e077bbf6a9847d8f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Jan 2016 00:13:19 -0500
 Subject: [PATCH] Do not load chunks for pathfinding
@@ -18,5 +18,5 @@ index 6d153e431..07444a86a 100644
          }
  
 -- 
-2.17.1
+2.18.0
 
diff --git a/Spigot-Server-Patches/0116-Entity-Tracking-Improvements.patch b/Spigot-Server-Patches/0115-Entity-Tracking-Improvements.patch
similarity index 97%
rename from Spigot-Server-Patches/0116-Entity-Tracking-Improvements.patch
rename to Spigot-Server-Patches/0115-Entity-Tracking-Improvements.patch
index 25a47c2680..dd8c333b09 100644
--- a/Spigot-Server-Patches/0116-Entity-Tracking-Improvements.patch
+++ b/Spigot-Server-Patches/0115-Entity-Tracking-Improvements.patch
@@ -1,4 +1,4 @@
-From e138c0afb73cd67fdc728c5fb0d20bc9f82b578a Mon Sep 17 00:00:00 2001
+From be50c643cdcb8dc000e4a1bc88c37232418fbd0d 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 115504bf6..509254b35 100644
+index 9af242380..70694c8e5 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -57,6 +57,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -99,5 +99,5 @@ index af1981967..e054ae905 100644
  
      }
 -- 
-2.17.1
+2.18.0
 
diff --git a/Spigot-Server-Patches/0117-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/Spigot-Server-Patches/0116-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
similarity index 95%
rename from Spigot-Server-Patches/0117-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
rename to Spigot-Server-Patches/0116-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
index a5924c50ce..7a2d842aae 100644
--- a/Spigot-Server-Patches/0117-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
+++ b/Spigot-Server-Patches/0116-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
@@ -1,4 +1,4 @@
-From 0564a6de9dfcd2be9f73d342a46a610210e4ae32 Mon Sep 17 00:00:00 2001
+From e1f368e70c67a8656883a4a1025adfce7f085a83 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
@@ -31,5 +31,5 @@ index 81afa3195..ed3d5c889 100644
  
              nbttagcompound.setString("Name", scoreboardteam.getName());
 -- 
-2.17.1
+2.18.0
 
diff --git a/Spigot-Server-Patches/0118-Fix-Chunk-Unload-Queue-Issues.patch b/Spigot-Server-Patches/0117-Fix-Chunk-Unload-Queue-Issues.patch
similarity index 94%
rename from Spigot-Server-Patches/0118-Fix-Chunk-Unload-Queue-Issues.patch
rename to Spigot-Server-Patches/0117-Fix-Chunk-Unload-Queue-Issues.patch
index 0d3b49fff0..3929c98595 100644
--- a/Spigot-Server-Patches/0118-Fix-Chunk-Unload-Queue-Issues.patch
+++ b/Spigot-Server-Patches/0117-Fix-Chunk-Unload-Queue-Issues.patch
@@ -1,4 +1,4 @@
-From 73a66676b80b85ce66c2fb365c6c361a219a0491 Mon Sep 17 00:00:00 2001
+From 5f52336745925855acb58d3b4f55fc404c5a1766 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 aaa65582b..8ecdf7a5b 100644
+index 744b5bc6d..718ebfea0 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 {
@@ -34,5 +34,5 @@ index bb96a7392..7825dc91b 100644
                              continue;
                          }
 -- 
-2.17.1
+2.18.0
 
diff --git a/Spigot-Server-Patches/0119-System-property-for-disabling-watchdoge.patch b/Spigot-Server-Patches/0118-System-property-for-disabling-watchdoge.patch
similarity index 92%
rename from Spigot-Server-Patches/0119-System-property-for-disabling-watchdoge.patch
rename to Spigot-Server-Patches/0118-System-property-for-disabling-watchdoge.patch
index 817d2d6c28..47d08c74a8 100644
--- a/Spigot-Server-Patches/0119-System-property-for-disabling-watchdoge.patch
+++ b/Spigot-Server-Patches/0118-System-property-for-disabling-watchdoge.patch
@@ -1,4 +1,4 @@
-From 8d20e9bc7ae7d6fa474f5afa0823368327d65fd4 Mon Sep 17 00:00:00 2001
+From 2c589fea6f44a9eceb5240d226fab7a8aa65879d Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 12 May 2016 23:02:58 -0500
 Subject: [PATCH] System property for disabling watchdoge
@@ -18,5 +18,5 @@ index 0c106ea9c..57a4748a3 100644
                  Logger log = Bukkit.getServer().getLogger();
                  log.log( Level.SEVERE, "The server has stopped responding!" );
 -- 
-2.17.1
+2.18.0
 
diff --git a/Spigot-Server-Patches/0120-Optimize-EAR.patch b/Spigot-Server-Patches/0119-Optimize-EAR.patch
similarity index 97%
rename from Spigot-Server-Patches/0120-Optimize-EAR.patch
rename to Spigot-Server-Patches/0119-Optimize-EAR.patch
index a6c67bffd1..92cee707e8 100644
--- a/Spigot-Server-Patches/0120-Optimize-EAR.patch
+++ b/Spigot-Server-Patches/0119-Optimize-EAR.patch
@@ -1,4 +1,4 @@
-From 72b6d02ca1dc326e89a88ea9fbd0333e3df1f20e Mon Sep 17 00:00:00 2001
+From 85b6d5e7f7854bd7803c2b5afc06a7250039fed7 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
@@ -66,5 +66,5 @@ index 1aade75f3..a9b84fdec 100644
                  }
              }
 -- 
-2.17.1
+2.18.0
 
diff --git a/Spigot-Server-Patches/0121-Optimize-UserCache-Thread-Safe.patch b/Spigot-Server-Patches/0120-Optimize-UserCache-Thread-Safe.patch
similarity index 98%
rename from Spigot-Server-Patches/0121-Optimize-UserCache-Thread-Safe.patch
rename to Spigot-Server-Patches/0120-Optimize-UserCache-Thread-Safe.patch
index a442386cfe..1c77511768 100644
--- a/Spigot-Server-Patches/0121-Optimize-UserCache-Thread-Safe.patch
+++ b/Spigot-Server-Patches/0120-Optimize-UserCache-Thread-Safe.patch
@@ -1,4 +1,4 @@
-From 554c388f9f637afab8f6c877cf81c456037d505a Mon Sep 17 00:00:00 2001
+From 6a9d38a4159ce7e437079963862bfbf5baf9c766 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
@@ -98,5 +98,5 @@ index 0e168ad34..f8b7d695c 100644
      }
  
 -- 
-2.17.1
+2.18.0
 
diff --git a/Spigot-Server-Patches/0122-Avoid-blocking-on-Network-Manager-creation.patch b/Spigot-Server-Patches/0121-Avoid-blocking-on-Network-Manager-creation.patch
similarity index 96%
rename from Spigot-Server-Patches/0122-Avoid-blocking-on-Network-Manager-creation.patch
rename to Spigot-Server-Patches/0121-Avoid-blocking-on-Network-Manager-creation.patch
index c4fdb851c9..6a818385e9 100644
--- a/Spigot-Server-Patches/0122-Avoid-blocking-on-Network-Manager-creation.patch
+++ b/Spigot-Server-Patches/0121-Avoid-blocking-on-Network-Manager-creation.patch
@@ -1,4 +1,4 @@
-From d942862dba8093d6d712a08f72e134d53ced4e58 Mon Sep 17 00:00:00 2001
+From deba31c66ed0416d8104a2e2c82d7673fd66af11 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
@@ -42,5 +42,5 @@ index be8d07f41..ad49673c1 100644
              if ( org.spigotmc.SpigotConfig.playerShuffle > 0 && MinecraftServer.currentTick % org.spigotmc.SpigotConfig.playerShuffle == 0 )
              {
 -- 
-2.17.1
+2.18.0
 
diff --git a/Spigot-Server-Patches/0123-Optional-TNT-doesn-t-move-in-water.patch b/Spigot-Server-Patches/0122-Optional-TNT-doesn-t-move-in-water.patch
similarity index 97%
rename from Spigot-Server-Patches/0123-Optional-TNT-doesn-t-move-in-water.patch
rename to Spigot-Server-Patches/0122-Optional-TNT-doesn-t-move-in-water.patch
index acd164b084..f9f4198b54 100644
--- a/Spigot-Server-Patches/0123-Optional-TNT-doesn-t-move-in-water.patch
+++ b/Spigot-Server-Patches/0122-Optional-TNT-doesn-t-move-in-water.patch
@@ -1,4 +1,4 @@
-From f1d0ebbcfd08ddec06753cc6fc2d008f2c8c57ca Mon Sep 17 00:00:00 2001
+From 4a54757b19677e73932cc2db44dd47a907d8f82b 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
@@ -32,7 +32,7 @@ index 38de48ebc..321da3be3 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 509254b35..1aa4519a6 100644
+index 70694c8e5..51b42933d 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1182,6 +1182,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -115,5 +115,5 @@ index 87f3205f8..8c1d25979 100644
 +    // Paper end
  }
 -- 
-2.17.1
+2.18.0
 
diff --git a/Spigot-Server-Patches/0124-Faster-redstone-torch-rapid-clock-removal.patch b/Spigot-Server-Patches/0123-Faster-redstone-torch-rapid-clock-removal.patch
similarity index 96%
rename from Spigot-Server-Patches/0124-Faster-redstone-torch-rapid-clock-removal.patch
rename to Spigot-Server-Patches/0123-Faster-redstone-torch-rapid-clock-removal.patch
index c8aa9dc3cd..1b04bbceba 100644
--- a/Spigot-Server-Patches/0124-Faster-redstone-torch-rapid-clock-removal.patch
+++ b/Spigot-Server-Patches/0123-Faster-redstone-torch-rapid-clock-removal.patch
@@ -1,4 +1,4 @@
-From fd74417cf92dd20fe65e116cef1b7ba61ad81f6c Mon Sep 17 00:00:00 2001
+From 0ab83c3fcfa7cba9f3436c814c560124d4013e2a Mon Sep 17 00:00:00 2001
 From: Martin Panzer <postremus1996@googlemail.com>
 Date: Mon, 23 May 2016 12:12:37 +0200
 Subject: [PATCH] Faster redstone torch rapid clock removal
@@ -39,5 +39,5 @@ index 6a54da4d6..ebd47196b 100644
          public RedstoneUpdateInfo(BlockPosition blockposition, long i) {
              this.a = blockposition;
 -- 
-2.17.1
+2.18.0
 
diff --git a/Spigot-Server-Patches/0125-Ensure-Chunks-never-ever-load-async.patch b/Spigot-Server-Patches/0124-Ensure-Chunks-never-ever-load-async.patch
similarity index 97%
rename from Spigot-Server-Patches/0125-Ensure-Chunks-never-ever-load-async.patch
rename to Spigot-Server-Patches/0124-Ensure-Chunks-never-ever-load-async.patch
index 484969f6e6..dc00202cc8 100644
--- a/Spigot-Server-Patches/0125-Ensure-Chunks-never-ever-load-async.patch
+++ b/Spigot-Server-Patches/0124-Ensure-Chunks-never-ever-load-async.patch
@@ -1,4 +1,4 @@
-From a9063e4c96a63299f95371c012667bef2f741867 Mon Sep 17 00:00:00 2001
+From eca617fa0198e46fcf7d2b215ab9c3661546ad39 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/0126-Add-server-name-parameter.patch b/Spigot-Server-Patches/0125-Add-server-name-parameter.patch
similarity index 92%
rename from Spigot-Server-Patches/0126-Add-server-name-parameter.patch
rename to Spigot-Server-Patches/0125-Add-server-name-parameter.patch
index 4309a114c8..c41a320171 100644
--- a/Spigot-Server-Patches/0126-Add-server-name-parameter.patch
+++ b/Spigot-Server-Patches/0125-Add-server-name-parameter.patch
@@ -1,4 +1,4 @@
-From c5c43856ddc210fc3dea226e2790e609a3ad4f94 Mon Sep 17 00:00:00 2001
+From 6b56636274fd02421525e8c2000511fe4cf89272 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
@@ -24,5 +24,5 @@ index d9059129d..aad208f47 100644
          };
  
 -- 
-2.17.1
+2.18.0
 
diff --git a/Spigot-Server-Patches/0127-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch b/Spigot-Server-Patches/0126-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
similarity index 97%
rename from Spigot-Server-Patches/0127-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
rename to Spigot-Server-Patches/0126-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
index d5eebb51ae..23408ddcf4 100644
--- a/Spigot-Server-Patches/0127-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
+++ b/Spigot-Server-Patches/0126-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
@@ -1,4 +1,4 @@
-From 0d6099080531c44b5b9c4c310bf9a18c2da8b4c6 Mon Sep 17 00:00:00 2001
+From 75a746991400c961cb2e2e48ffc77195d999a16d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 31 May 2016 22:53:50 -0400
 Subject: [PATCH] Only send Dragon/Wither Death sounds to same world
@@ -44,5 +44,5 @@ index e9d9ec239..28f524468 100644
                      double deltaZ = this.locZ - player.locZ;
                      double distanceSquared = deltaX * deltaX + deltaZ * deltaZ;
 -- 
-2.17.1
+2.18.0
 
diff --git a/Spigot-Server-Patches/0128-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/Spigot-Server-Patches/0127-Delay-Chunk-Unloads-based-on-Player-Movement.patch
similarity index 97%
rename from Spigot-Server-Patches/0128-Delay-Chunk-Unloads-based-on-Player-Movement.patch
rename to Spigot-Server-Patches/0127-Delay-Chunk-Unloads-based-on-Player-Movement.patch
index 3fca908c6c..f841ac3ee6 100644
--- a/Spigot-Server-Patches/0128-Delay-Chunk-Unloads-based-on-Player-Movement.patch
+++ b/Spigot-Server-Patches/0127-Delay-Chunk-Unloads-based-on-Player-Movement.patch
@@ -1,4 +1,4 @@
-From 9ea3a3e7a7eb8e3e4d3c6289684125f195081e0e Mon Sep 17 00:00:00 2001
+From 8b0ebf88191276c87b61235e51405887463861a3 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
@@ -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 4588df4b1..c34f42efc 100644
+index 5102f24ed..c9b6b57af 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1294,7 +1294,13 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@@ -150,10 +150,10 @@ index 4588df4b1..c34f42efc 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 9d88b9ddb..e516ec603 100644
+index ff3558363..90e260f3b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1601,7 +1601,7 @@ public class CraftWorld implements World {
+@@ -1581,7 +1581,7 @@ public class CraftWorld implements World {
          ChunkProviderServer cps = world.getChunkProviderServer();
          for (net.minecraft.server.Chunk chunk : cps.chunks.values()) {
              // If in use, skip it
diff --git a/Spigot-Server-Patches/0129-Fix-Double-World-Add-issues.patch b/Spigot-Server-Patches/0128-Fix-Double-World-Add-issues.patch
similarity index 90%
rename from Spigot-Server-Patches/0129-Fix-Double-World-Add-issues.patch
rename to Spigot-Server-Patches/0128-Fix-Double-World-Add-issues.patch
index 9ffcdcd412..9ebbe36217 100644
--- a/Spigot-Server-Patches/0129-Fix-Double-World-Add-issues.patch
+++ b/Spigot-Server-Patches/0128-Fix-Double-World-Add-issues.patch
@@ -1,4 +1,4 @@
-From 26d160c73d35a95a6684b1423daf224d7878a82e Mon Sep 17 00:00:00 2001
+From c4546f54875964aa47af70957bae0bc9a8840b28 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,10 +8,10 @@ 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 faaa1b36b..063d53f1c 100644
+index ad3bd3808..e70c2184c 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-@@ -1020,7 +1020,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+@@ -1058,7 +1058,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
      }
  
      public static void a(Entity entity, GeneratorAccess generatoraccess, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason reason) {
@@ -21,7 +21,7 @@ index faaa1b36b..063d53f1c 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 c34f42efc..a8ef9e337 100644
+index c9b6b57af..067b92f3e 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -955,6 +955,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
diff --git a/Spigot-Server-Patches/0130-Fix-Old-Sign-Conversion.patch b/Spigot-Server-Patches/0129-Fix-Old-Sign-Conversion.patch
similarity index 99%
rename from Spigot-Server-Patches/0130-Fix-Old-Sign-Conversion.patch
rename to Spigot-Server-Patches/0129-Fix-Old-Sign-Conversion.patch
index a35d54be6d..3d2b9089bb 100644
--- a/Spigot-Server-Patches/0130-Fix-Old-Sign-Conversion.patch
+++ b/Spigot-Server-Patches/0129-Fix-Old-Sign-Conversion.patch
@@ -1,4 +1,4 @@
-From 62dd445f7cb912223bd98f9be51823bb9ebb49ad Mon Sep 17 00:00:00 2001
+From bd9c2d042a9a05c79cda70d8b86cb7108a88fb69 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/0131-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch b/Spigot-Server-Patches/0130-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
similarity index 93%
rename from Spigot-Server-Patches/0131-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
rename to Spigot-Server-Patches/0130-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
index 123aa3edca..867723c393 100644
--- a/Spigot-Server-Patches/0131-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
+++ b/Spigot-Server-Patches/0130-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
@@ -1,4 +1,4 @@
-From 346d6a77e1974d7f4765f616c06cad3746ed4039 Mon Sep 17 00:00:00 2001
+From 52368f047b0365b4b14565ec92e5770fcf62c463 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/0132-More-informative-vehicle-moved-wrongly-message.patch b/Spigot-Server-Patches/0131-More-informative-vehicle-moved-wrongly-message.patch
similarity index 91%
rename from Spigot-Server-Patches/0132-More-informative-vehicle-moved-wrongly-message.patch
rename to Spigot-Server-Patches/0131-More-informative-vehicle-moved-wrongly-message.patch
index ca9fae3bf8..2fed575944 100644
--- a/Spigot-Server-Patches/0132-More-informative-vehicle-moved-wrongly-message.patch
+++ b/Spigot-Server-Patches/0131-More-informative-vehicle-moved-wrongly-message.patch
@@ -1,11 +1,11 @@
-From cb692770973181e52d95b3f1616a8e07667832d3 Mon Sep 17 00:00:00 2001
+From 62b82aafb470f62c90f6b4af01f863508532a0c1 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 d61ce6461..e4f28b8ac 100644
+index 79fddc866..32cef8e30 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/0133-Re-track-players-that-dismount-from-other-players.patch b/Spigot-Server-Patches/0132-Re-track-players-that-dismount-from-other-players.patch
similarity index 94%
rename from Spigot-Server-Patches/0133-Re-track-players-that-dismount-from-other-players.patch
rename to Spigot-Server-Patches/0132-Re-track-players-that-dismount-from-other-players.patch
index 8ef864a836..89fe9ca76b 100644
--- a/Spigot-Server-Patches/0133-Re-track-players-that-dismount-from-other-players.patch
+++ b/Spigot-Server-Patches/0132-Re-track-players-that-dismount-from-other-players.patch
@@ -1,4 +1,4 @@
-From edd50cef4c8769d05a85ebfb88e0b85d88af36ab Mon Sep 17 00:00:00 2001
+From 4bea6aa92d099eca90ad5acad6cba3724c67deed 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/0134-Add-setting-for-proxy-online-mode-status.patch b/Spigot-Server-Patches/0133-Add-setting-for-proxy-online-mode-status.patch
similarity index 97%
rename from Spigot-Server-Patches/0134-Add-setting-for-proxy-online-mode-status.patch
rename to Spigot-Server-Patches/0133-Add-setting-for-proxy-online-mode-status.patch
index 3a384dbc71..b78841f5d7 100644
--- a/Spigot-Server-Patches/0134-Add-setting-for-proxy-online-mode-status.patch
+++ b/Spigot-Server-Patches/0133-Add-setting-for-proxy-online-mode-status.patch
@@ -1,4 +1,4 @@
-From 2062affcd6a91a4412d256001eddf48c20ba4bb0 Mon Sep 17 00:00:00 2001
+From 3345a0866470144d0accf25736ef329d09bdf279 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/Spigot-Server-Patches/0135-Optimise-BlockStateEnum-hashCode-and-equals.patch b/Spigot-Server-Patches/0134-Optimise-BlockStateEnum-hashCode-and-equals.patch
similarity index 97%
rename from Spigot-Server-Patches/0135-Optimise-BlockStateEnum-hashCode-and-equals.patch
rename to Spigot-Server-Patches/0134-Optimise-BlockStateEnum-hashCode-and-equals.patch
index 9b52971132..dbfc695357 100644
--- a/Spigot-Server-Patches/0135-Optimise-BlockStateEnum-hashCode-and-equals.patch
+++ b/Spigot-Server-Patches/0134-Optimise-BlockStateEnum-hashCode-and-equals.patch
@@ -1,4 +1,4 @@
-From 7c023b2177ae11b64004ab1ab12096db67d4352d Mon Sep 17 00:00:00 2001
+From 8581e708e437ba0aedfd536cef77fcd7cadf7abe 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/0136-Disable-ticking-of-snow-blocks.patch b/Spigot-Server-Patches/0135-Disable-ticking-of-snow-blocks.patch
similarity index 93%
rename from Spigot-Server-Patches/0136-Disable-ticking-of-snow-blocks.patch
rename to Spigot-Server-Patches/0135-Disable-ticking-of-snow-blocks.patch
index 940505fd4a..d4756dbaed 100644
--- a/Spigot-Server-Patches/0136-Disable-ticking-of-snow-blocks.patch
+++ b/Spigot-Server-Patches/0135-Disable-ticking-of-snow-blocks.patch
@@ -1,4 +1,4 @@
-From 093f67662e108285ca05b0485d6ff14d2c73323d Mon Sep 17 00:00:00 2001
+From 27d2d5a316ab5a3c70afafb1fec9c236c35b02ab 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/0137-Fix-AIOOBE-in-inventory-handling.patch b/Spigot-Server-Patches/0136-Fix-AIOOBE-in-inventory-handling.patch
similarity index 85%
rename from Spigot-Server-Patches/0137-Fix-AIOOBE-in-inventory-handling.patch
rename to Spigot-Server-Patches/0136-Fix-AIOOBE-in-inventory-handling.patch
index 0d76ffc1e4..84d61a6ec1 100644
--- a/Spigot-Server-Patches/0137-Fix-AIOOBE-in-inventory-handling.patch
+++ b/Spigot-Server-Patches/0136-Fix-AIOOBE-in-inventory-handling.patch
@@ -1,14 +1,14 @@
-From 6ad7cbab0516dc2372b5a23e12f64abc400ca6a3 Mon Sep 17 00:00:00 2001
+From 6fabf2f21ad94320e5e9a0ce4662598185a03b2e 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/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index e4f28b8ac..c09620b37 100644
+index 32cef8e30..b17540ecb 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2080,7 +2080,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2085,7 +2085,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                      case CLONE:
                          if (packetplayinwindowclick.d() == 2) {
                              click = ClickType.MIDDLE;
diff --git a/Spigot-Server-Patches/0138-Configurable-packet-in-spam-threshold.patch b/Spigot-Server-Patches/0137-Configurable-packet-in-spam-threshold.patch
similarity index 95%
rename from Spigot-Server-Patches/0138-Configurable-packet-in-spam-threshold.patch
rename to Spigot-Server-Patches/0137-Configurable-packet-in-spam-threshold.patch
index 8e14b08dbb..c4ff8687da 100644
--- a/Spigot-Server-Patches/0138-Configurable-packet-in-spam-threshold.patch
+++ b/Spigot-Server-Patches/0137-Configurable-packet-in-spam-threshold.patch
@@ -1,4 +1,4 @@
-From e3b16b09f178839a08a58cabb3c7b8a3a04933ae Mon Sep 17 00:00:00 2001
+From d7bbea2686479f0573da09c114879cc3c4768962 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
@@ -23,7 +23,7 @@ index cf06f8ac3..2001175bf 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index e9ce81bfc..c757881b7 100644
+index b17540ecb..a41fa05ee 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/0139-Configurable-flying-kick-messages.patch b/Spigot-Server-Patches/0138-Configurable-flying-kick-messages.patch
similarity index 96%
rename from Spigot-Server-Patches/0139-Configurable-flying-kick-messages.patch
rename to Spigot-Server-Patches/0138-Configurable-flying-kick-messages.patch
index 75684ef781..b307c26aca 100644
--- a/Spigot-Server-Patches/0139-Configurable-flying-kick-messages.patch
+++ b/Spigot-Server-Patches/0138-Configurable-flying-kick-messages.patch
@@ -1,4 +1,4 @@
-From 1bc0a231c368f5dbfb900443a1532d7cf547e328 Mon Sep 17 00:00:00 2001
+From 1f456ac80600eb29d13fd5f4eeec395f6a3a98bb 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
@@ -21,7 +21,7 @@ index 2001175bf..621c585e7 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index aa7c019ab..be0322941 100644
+index a41fa05ee..1f2cfbc92 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/0140-Auto-Save-Improvements.patch b/Spigot-Server-Patches/0139-Auto-Save-Improvements.patch
similarity index 98%
rename from Spigot-Server-Patches/0140-Auto-Save-Improvements.patch
rename to Spigot-Server-Patches/0139-Auto-Save-Improvements.patch
index 0a86e59016..78c7024f63 100644
--- a/Spigot-Server-Patches/0140-Auto-Save-Improvements.patch
+++ b/Spigot-Server-Patches/0139-Auto-Save-Improvements.patch
@@ -1,4 +1,4 @@
-From 9c20a3d7127f062b7270bafc120ccb55f69e3900 Mon Sep 17 00:00:00 2001
+From 221b6fda013cdc465dcf73d3765655e8c1d7522e 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
@@ -161,10 +161,10 @@ index 49b2c27c6..bf020293d 100644
          this.methodProfiler.a("snooper");
          if (getSnooperEnabled() && !this.j.d() && this.ticks > 100) { // Spigot
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 801a147f0..1f2265231 100644
+index 6b7d81933..3ee587014 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -340,6 +340,7 @@ public abstract class PlayerList {
+@@ -341,6 +341,7 @@ public abstract class PlayerList {
      }
  
      protected void savePlayerFile(EntityPlayer entityplayer) {
@@ -172,7 +172,7 @@ index 801a147f0..1f2265231 100644
          this.playerFileData.save(entityplayer);
          ServerStatisticManager serverstatisticmanager = (ServerStatisticManager) entityplayer.getStatisticManager(); // CraftBukkit
  
-@@ -1219,13 +1220,25 @@ public abstract class PlayerList {
+@@ -1220,13 +1221,25 @@ public abstract class PlayerList {
  
      }
  
diff --git a/Spigot-Server-Patches/0141-Chunk-registration-fixes.patch b/Spigot-Server-Patches/0140-Chunk-registration-fixes.patch
similarity index 90%
rename from Spigot-Server-Patches/0141-Chunk-registration-fixes.patch
rename to Spigot-Server-Patches/0140-Chunk-registration-fixes.patch
index d173157efe..78a3f71998 100644
--- a/Spigot-Server-Patches/0141-Chunk-registration-fixes.patch
+++ b/Spigot-Server-Patches/0140-Chunk-registration-fixes.patch
@@ -1,4 +1,4 @@
-From 25b0a8a99230a59bf4252825e53800faad6e5368 Mon Sep 17 00:00:00 2001
+From 977d7d2021db60c67df0f9fa5fa7fc5ae5089144 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
@@ -8,7 +8,7 @@ World checks and the Chunk Add logic are inconsistent on how Y > 256, < 0, is tr
 Keep them consistent
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index a8ef9e337..3b2de1f31 100644
+index 067b92f3e..04b5521cd 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1470,7 +1470,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
diff --git a/Spigot-Server-Patches/0142-Remove-FishingHook-reference-on-Craft-Entity-removal.patch b/Spigot-Server-Patches/0141-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
similarity index 93%
rename from Spigot-Server-Patches/0142-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
rename to Spigot-Server-Patches/0141-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
index 33585a0b3c..6f49382da0 100644
--- a/Spigot-Server-Patches/0142-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
+++ b/Spigot-Server-Patches/0141-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
@@ -1,4 +1,4 @@
-From b25b163404c102ab0e30bec1af51a85ac8dc13f1 Mon Sep 17 00:00:00 2001
+From e05148f8cd85509c3dfa6580961b625e76b5ba9e 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/0143-Auto-fix-bad-Y-levels-on-player-login.patch b/Spigot-Server-Patches/0142-Auto-fix-bad-Y-levels-on-player-login.patch
similarity index 93%
rename from Spigot-Server-Patches/0143-Auto-fix-bad-Y-levels-on-player-login.patch
rename to Spigot-Server-Patches/0142-Auto-fix-bad-Y-levels-on-player-login.patch
index 719fe37f4e..767b7f982a 100644
--- a/Spigot-Server-Patches/0143-Auto-fix-bad-Y-levels-on-player-login.patch
+++ b/Spigot-Server-Patches/0142-Auto-fix-bad-Y-levels-on-player-login.patch
@@ -1,4 +1,4 @@
-From 7267f517bb9c00b59b8d441d00a286d15fd55d0d Mon Sep 17 00:00:00 2001
+From 14bdfe423406bd73328a42edff706d053538a9e9 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
diff --git a/Spigot-Server-Patches/0144-Disable-Vanilla-Chunk-GC.patch b/Spigot-Server-Patches/0143-Disable-Vanilla-Chunk-GC.patch
similarity index 95%
rename from Spigot-Server-Patches/0144-Disable-Vanilla-Chunk-GC.patch
rename to Spigot-Server-Patches/0143-Disable-Vanilla-Chunk-GC.patch
index 272b163164..ebbf325fc7 100644
--- a/Spigot-Server-Patches/0144-Disable-Vanilla-Chunk-GC.patch
+++ b/Spigot-Server-Patches/0143-Disable-Vanilla-Chunk-GC.patch
@@ -1,4 +1,4 @@
-From 3e0826f735fb80823d60d8fc9bc6100dfd3e8644 Mon Sep 17 00:00:00 2001
+From 42f903c1bbf57ab046c7bb5b730bc04b9ea9f691 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/0145-Option-to-remove-corrupt-tile-entities.patch b/Spigot-Server-Patches/0144-Option-to-remove-corrupt-tile-entities.patch
similarity index 97%
rename from Spigot-Server-Patches/0145-Option-to-remove-corrupt-tile-entities.patch
rename to Spigot-Server-Patches/0144-Option-to-remove-corrupt-tile-entities.patch
index 9d6624b294..445794536d 100644
--- a/Spigot-Server-Patches/0145-Option-to-remove-corrupt-tile-entities.patch
+++ b/Spigot-Server-Patches/0144-Option-to-remove-corrupt-tile-entities.patch
@@ -1,4 +1,4 @@
-From 972bafac578a82a102ff389e5faf3b35d3b58e72 Mon Sep 17 00:00:00 2001
+From 04a43a703bb0f5eef6a82418f681d69837c38f6e 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/Spigot-Server-Patches/0146-Add-EntityZapEvent.patch b/Spigot-Server-Patches/0145-Add-EntityZapEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0146-Add-EntityZapEvent.patch
rename to Spigot-Server-Patches/0145-Add-EntityZapEvent.patch
index e71df31516..aacbb22779 100644
--- a/Spigot-Server-Patches/0146-Add-EntityZapEvent.patch
+++ b/Spigot-Server-Patches/0145-Add-EntityZapEvent.patch
@@ -1,4 +1,4 @@
-From c66ad22a6abf417c552de63b264628c814f718c1 Mon Sep 17 00:00:00 2001
+From 1d5fa873154845f70214ed708125d80ac1ebc22c 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/0147-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/Spigot-Server-Patches/0146-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
similarity index 96%
rename from Spigot-Server-Patches/0147-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
rename to Spigot-Server-Patches/0146-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
index 89cd70d6e2..f6a69ab83d 100644
--- a/Spigot-Server-Patches/0147-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
+++ b/Spigot-Server-Patches/0146-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
@@ -1,4 +1,4 @@
-From 3fae37b400f05dba3d1ca15ad221ac4127ba2c20 Mon Sep 17 00:00:00 2001
+From 86f5120f1974823a7b6aa8ffd62575bfcdb812fb 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/0148-Prevent-Auto-Save-if-Save-Queue-is-full.patch b/Spigot-Server-Patches/0147-Prevent-Auto-Save-if-Save-Queue-is-full.patch
similarity index 94%
rename from Spigot-Server-Patches/0148-Prevent-Auto-Save-if-Save-Queue-is-full.patch
rename to Spigot-Server-Patches/0147-Prevent-Auto-Save-if-Save-Queue-is-full.patch
index 8dc51fd742..043c5072d9 100644
--- a/Spigot-Server-Patches/0148-Prevent-Auto-Save-if-Save-Queue-is-full.patch
+++ b/Spigot-Server-Patches/0147-Prevent-Auto-Save-if-Save-Queue-is-full.patch
@@ -1,4 +1,4 @@
-From 55d61d596dd28c87be9a6885282a21abc2caff4f Mon Sep 17 00:00:00 2001
+From 3efd56fcbb76e3a5ed65644d6040c9e030f641b7 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
@@ -51,10 +51,10 @@ index 1e6ea3084..9145401bc 100644
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 063d53f1c..071e8a196 100644
+index e70c2184c..20aa20a98 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-@@ -99,6 +99,8 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+@@ -137,6 +137,8 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
          }
      }
  
diff --git a/Spigot-Server-Patches/0149-Chunk-Save-Stats-Debug-Option.patch b/Spigot-Server-Patches/0148-Chunk-Save-Stats-Debug-Option.patch
similarity index 93%
rename from Spigot-Server-Patches/0149-Chunk-Save-Stats-Debug-Option.patch
rename to Spigot-Server-Patches/0148-Chunk-Save-Stats-Debug-Option.patch
index af4f2f903e..e625c95f63 100644
--- a/Spigot-Server-Patches/0149-Chunk-Save-Stats-Debug-Option.patch
+++ b/Spigot-Server-Patches/0148-Chunk-Save-Stats-Debug-Option.patch
@@ -1,4 +1,4 @@
-From 6e299603426bfed427e4ae7bded471d86ab70a0b Mon Sep 17 00:00:00 2001
+From 2180b64ba27758854a3d43a078e959ae159b8a8d 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
@@ -55,10 +55,10 @@ index 9145401bc..ef35eb7ec 100644
              return false;
          }
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 071e8a196..fedc38dc1 100644
+index 20aa20a98..de2231bb0 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-@@ -99,7 +99,13 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+@@ -137,7 +137,13 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
          }
      }
  
@@ -73,7 +73,7 @@ index 071e8a196..fedc38dc1 100644
  
      // CraftBukkit start - Add async variant, provide compatibility
      @Nullable
-@@ -291,6 +297,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+@@ -329,6 +335,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
  
      protected synchronized void a(ChunkCoordIntPair chunkcoordintpair, Supplier<NBTTagCompound> nbttagcompound) { // Spigot
          queue.add(new QueuedChunk(chunkcoordintpair, nbttagcompound)); // Paper - Chunk queue improvements
@@ -81,7 +81,7 @@ index 071e8a196..fedc38dc1 100644
          this.b.put(chunkcoordintpair, nbttagcompound);
          FileIOThread.a().a(this);
      }
-@@ -314,6 +321,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+@@ -352,6 +359,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
              return false;
          } else {
              ChunkCoordIntPair chunkcoordintpair = chunk.coords; // Paper - Chunk queue improvements
diff --git a/Spigot-Server-Patches/0150-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch b/Spigot-Server-Patches/0149-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
similarity index 96%
rename from Spigot-Server-Patches/0150-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
rename to Spigot-Server-Patches/0149-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
index a18e8f7884..ffeb24b9a2 100644
--- a/Spigot-Server-Patches/0150-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
+++ b/Spigot-Server-Patches/0149-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
@@ -1,4 +1,4 @@
-From fe49df954c155646594c102bbf909fbbcc55a37d Mon Sep 17 00:00:00 2001
+From ede8e8d3f9e7c61a406433dd867cb320b744d3e1 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
@@ -30,7 +30,7 @@ index f88444c7e..f64a5ef35 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-index 1d4a7b64d..c4a25bd87 100644
+index 7e5a2775a..ad5ac66ac 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/0151-Cache-user-authenticator-threads.patch b/Spigot-Server-Patches/0150-Cache-user-authenticator-threads.patch
similarity index 97%
rename from Spigot-Server-Patches/0151-Cache-user-authenticator-threads.patch
rename to Spigot-Server-Patches/0150-Cache-user-authenticator-threads.patch
index fb6e8338f3..c370520266 100644
--- a/Spigot-Server-Patches/0151-Cache-user-authenticator-threads.patch
+++ b/Spigot-Server-Patches/0150-Cache-user-authenticator-threads.patch
@@ -1,4 +1,4 @@
-From a2e44a310b6d7c52649acda35aba0cd677d3a7e7 Mon Sep 17 00:00:00 2001
+From 85f2e0489f30bf8ab598150d903f060544c593ea 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/0152-Optimize-Network-Queue.patch b/Spigot-Server-Patches/0151-Optimize-Network-Queue.patch
similarity index 93%
rename from Spigot-Server-Patches/0152-Optimize-Network-Queue.patch
rename to Spigot-Server-Patches/0151-Optimize-Network-Queue.patch
index c1a6ea2a7b..70a98027dd 100644
--- a/Spigot-Server-Patches/0152-Optimize-Network-Queue.patch
+++ b/Spigot-Server-Patches/0151-Optimize-Network-Queue.patch
@@ -1,4 +1,4 @@
-From 146ed7d9845c818bcf091214784ba462f02ae69e Mon Sep 17 00:00:00 2001
+From 2f10cd1f97fd59757d6e3d452cc8afe6e36fb3ab 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/Spigot-Server-Patches/0153-Optimise-removeQueue.patch b/Spigot-Server-Patches/0152-Optimise-removeQueue.patch
similarity index 97%
rename from Spigot-Server-Patches/0153-Optimise-removeQueue.patch
rename to Spigot-Server-Patches/0152-Optimise-removeQueue.patch
index b1965051ad..d9556926df 100644
--- a/Spigot-Server-Patches/0153-Optimise-removeQueue.patch
+++ b/Spigot-Server-Patches/0152-Optimise-removeQueue.patch
@@ -1,4 +1,4 @@
-From 1e1c86320251ddee4d47d350d6aeafba60214f49 Mon Sep 17 00:00:00 2001
+From 79801a202521b7cd79bdb5e0c2389e6993677099 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/0154-Allow-Reloading-of-Command-Aliases.patch b/Spigot-Server-Patches/0153-Allow-Reloading-of-Command-Aliases.patch
similarity index 95%
rename from Spigot-Server-Patches/0154-Allow-Reloading-of-Command-Aliases.patch
rename to Spigot-Server-Patches/0153-Allow-Reloading-of-Command-Aliases.patch
index 10b5d2beb8..c3205942bd 100644
--- a/Spigot-Server-Patches/0154-Allow-Reloading-of-Command-Aliases.patch
+++ b/Spigot-Server-Patches/0153-Allow-Reloading-of-Command-Aliases.patch
@@ -1,4 +1,4 @@
-From b8aacaf96f78054dfc5e2882462375d3b491e087 Mon Sep 17 00:00:00 2001
+From 21a06c5a111434636227935f23120b53773e3316 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
diff --git a/Spigot-Server-Patches/0155-Add-source-to-PlayerExpChangeEvent.patch b/Spigot-Server-Patches/0154-Add-source-to-PlayerExpChangeEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0155-Add-source-to-PlayerExpChangeEvent.patch
rename to Spigot-Server-Patches/0154-Add-source-to-PlayerExpChangeEvent.patch
index 507e131bf6..41366a0487 100644
--- a/Spigot-Server-Patches/0155-Add-source-to-PlayerExpChangeEvent.patch
+++ b/Spigot-Server-Patches/0154-Add-source-to-PlayerExpChangeEvent.patch
@@ -1,4 +1,4 @@
-From 6ad2b5f736ba163164761a7ef91c718e52aaddfa Mon Sep 17 00:00:00 2001
+From a6304856a1c405b5cc9141933a54229e477fb544 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/0156-Optimize-World.isLoaded-BlockPosition-Z.patch b/Spigot-Server-Patches/0155-Optimize-World.isLoaded-BlockPosition-Z.patch
similarity index 90%
rename from Spigot-Server-Patches/0156-Optimize-World.isLoaded-BlockPosition-Z.patch
rename to Spigot-Server-Patches/0155-Optimize-World.isLoaded-BlockPosition-Z.patch
index 19bd382473..256435b374 100644
--- a/Spigot-Server-Patches/0156-Optimize-World.isLoaded-BlockPosition-Z.patch
+++ b/Spigot-Server-Patches/0155-Optimize-World.isLoaded-BlockPosition-Z.patch
@@ -1,4 +1,4 @@
-From 449f4ed9e6999fef7cb2a95bbde1eaba7894e946 Mon Sep 17 00:00:00 2001
+From 28b408d7f00001f367ebc48d66e6cc33510fafdc 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 3b2de1f31..0ba99bcbc 100644
+index 04b5521cd..ca7c23f54 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/0157-Don-t-let-fishinghooks-use-portals.patch b/Spigot-Server-Patches/0156-Don-t-let-fishinghooks-use-portals.patch
similarity index 95%
rename from Spigot-Server-Patches/0157-Don-t-let-fishinghooks-use-portals.patch
rename to Spigot-Server-Patches/0156-Don-t-let-fishinghooks-use-portals.patch
index a07e15c55d..f1720f02d1 100644
--- a/Spigot-Server-Patches/0157-Don-t-let-fishinghooks-use-portals.patch
+++ b/Spigot-Server-Patches/0156-Don-t-let-fishinghooks-use-portals.patch
@@ -1,4 +1,4 @@
-From 3ff34f57ccb9cc01fe8512784f15a6b2cefff8fb Mon Sep 17 00:00:00 2001
+From cfd9c680af983aa5d1f25a5dc51d505beaa229be 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/Spigot-Server-Patches/0158-Add-ProjectileCollideEvent.patch b/Spigot-Server-Patches/0157-Add-ProjectileCollideEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0158-Add-ProjectileCollideEvent.patch
rename to Spigot-Server-Patches/0157-Add-ProjectileCollideEvent.patch
index dc7525a240..20d409eb27 100644
--- a/Spigot-Server-Patches/0158-Add-ProjectileCollideEvent.patch
+++ b/Spigot-Server-Patches/0157-Add-ProjectileCollideEvent.patch
@@ -1,4 +1,4 @@
-From 1fde28664611a9d358932373b047810dd1f48acd Mon Sep 17 00:00:00 2001
+From 45f4590f8d234db018eac2d5b2b59fd65e3e03fb 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/0159-Prevent-Pathfinding-out-of-World-Border.patch b/Spigot-Server-Patches/0158-Prevent-Pathfinding-out-of-World-Border.patch
similarity index 97%
rename from Spigot-Server-Patches/0159-Prevent-Pathfinding-out-of-World-Border.patch
rename to Spigot-Server-Patches/0158-Prevent-Pathfinding-out-of-World-Border.patch
index 9a4814ce93..2c7d94bbb1 100644
--- a/Spigot-Server-Patches/0159-Prevent-Pathfinding-out-of-World-Border.patch
+++ b/Spigot-Server-Patches/0158-Prevent-Pathfinding-out-of-World-Border.patch
@@ -1,4 +1,4 @@
-From a320a06499b1e0c8089eaaa36fcbd1a8f71f7d09 Mon Sep 17 00:00:00 2001
+From 4bfd853ce5f453c11bf3376a7c25a66964be68be 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/0160-Bound-Treasure-Maps-to-World-Border.patch b/Spigot-Server-Patches/0159-Bound-Treasure-Maps-to-World-Border.patch
similarity index 97%
rename from Spigot-Server-Patches/0160-Bound-Treasure-Maps-to-World-Border.patch
rename to Spigot-Server-Patches/0159-Bound-Treasure-Maps-to-World-Border.patch
index 5905f1c0e1..981283a738 100644
--- a/Spigot-Server-Patches/0160-Bound-Treasure-Maps-to-World-Border.patch
+++ b/Spigot-Server-Patches/0159-Bound-Treasure-Maps-to-World-Border.patch
@@ -1,4 +1,4 @@
-From 6a37edaf0197147075c033b77c864f8d3de94a07 Mon Sep 17 00:00:00 2001
+From c562348ff2e519c8f456cdf7966730a3391cea5b 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/0161-Configurable-Cartographer-Treasure-Maps.patch b/Spigot-Server-Patches/0160-Configurable-Cartographer-Treasure-Maps.patch
similarity index 97%
rename from Spigot-Server-Patches/0161-Configurable-Cartographer-Treasure-Maps.patch
rename to Spigot-Server-Patches/0160-Configurable-Cartographer-Treasure-Maps.patch
index 26e94a7f42..edc9d45512 100644
--- a/Spigot-Server-Patches/0161-Configurable-Cartographer-Treasure-Maps.patch
+++ b/Spigot-Server-Patches/0160-Configurable-Cartographer-Treasure-Maps.patch
@@ -1,4 +1,4 @@
-From 08a801e72f6cac422d809de13137806bfec8e3ea Mon Sep 17 00:00:00 2001
+From ec6f484932e8d2c5f039245e18942fa4c02fc7fb Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 20 Dec 2016 15:26:27 -0500
 Subject: [PATCH] Configurable Cartographer Treasure Maps
diff --git a/Spigot-Server-Patches/0162-Optimize-ItemStack.isEmpty.patch b/Spigot-Server-Patches/0161-Optimize-ItemStack.isEmpty.patch
similarity index 83%
rename from Spigot-Server-Patches/0162-Optimize-ItemStack.isEmpty.patch
rename to Spigot-Server-Patches/0161-Optimize-ItemStack.isEmpty.patch
index adb42fe687..6a20ec00f1 100644
--- a/Spigot-Server-Patches/0162-Optimize-ItemStack.isEmpty.patch
+++ b/Spigot-Server-Patches/0161-Optimize-ItemStack.isEmpty.patch
@@ -1,4 +1,4 @@
-From 928e3728f86fc9571a913643714c8af71344bf93 Mon Sep 17 00:00:00 2001
+From a568807b1275842ccd23458e723c4bcaac760497 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,10 +6,10 @@ 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 70f2dcc9e..be6205275 100644
+index ed714c2cc..ca169e113 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
-@@ -134,7 +134,7 @@ public final class ItemStack {
+@@ -140,7 +140,7 @@ public final class ItemStack {
      }
  
      public boolean isEmpty() {
diff --git a/Spigot-Server-Patches/0163-Add-API-methods-to-control-if-armour-stands-can-move.patch b/Spigot-Server-Patches/0162-Add-API-methods-to-control-if-armour-stands-can-move.patch
similarity index 96%
rename from Spigot-Server-Patches/0163-Add-API-methods-to-control-if-armour-stands-can-move.patch
rename to Spigot-Server-Patches/0162-Add-API-methods-to-control-if-armour-stands-can-move.patch
index 360d4dd816..2f14a6ed2e 100644
--- a/Spigot-Server-Patches/0163-Add-API-methods-to-control-if-armour-stands-can-move.patch
+++ b/Spigot-Server-Patches/0162-Add-API-methods-to-control-if-armour-stands-can-move.patch
@@ -1,4 +1,4 @@
-From 82856d9550300acb55b93cdb1b79913f19089673 Mon Sep 17 00:00:00 2001
+From c454c72a987b25fdfd7dd8a651f4aa4beb8b891e 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/Spigot-Server-Patches/0164-Add-option-to-remove-invalid-statistics.patch b/Spigot-Server-Patches/0163-Add-option-to-remove-invalid-statistics.patch
similarity index 97%
rename from Spigot-Server-Patches/0164-Add-option-to-remove-invalid-statistics.patch
rename to Spigot-Server-Patches/0163-Add-option-to-remove-invalid-statistics.patch
index 5743efbd20..fe6c6d90d5 100644
--- a/Spigot-Server-Patches/0164-Add-option-to-remove-invalid-statistics.patch
+++ b/Spigot-Server-Patches/0163-Add-option-to-remove-invalid-statistics.patch
@@ -1,4 +1,4 @@
-From cb943190b9136ef3fc873e413a73ee7c45c5744b Mon Sep 17 00:00:00 2001
+From 2544e5bd92cf9529f315cd485c63960ee5bb9658 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/Spigot-Server-Patches/0165-Properly-fix-item-duplication-bug.patch b/Spigot-Server-Patches/0164-Properly-fix-item-duplication-bug.patch
similarity index 89%
rename from Spigot-Server-Patches/0165-Properly-fix-item-duplication-bug.patch
rename to Spigot-Server-Patches/0164-Properly-fix-item-duplication-bug.patch
index 482d7b5cdc..56963e80d3 100644
--- a/Spigot-Server-Patches/0165-Properly-fix-item-duplication-bug.patch
+++ b/Spigot-Server-Patches/0164-Properly-fix-item-duplication-bug.patch
@@ -1,4 +1,4 @@
-From 4a71e35c105f2d8c83b679090c6eceaed46b2c30 Mon Sep 17 00:00:00 2001
+From 905fa22f222f8547b63412650bc2927850fa8382 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
@@ -19,10 +19,10 @@ index cf2a39384..c91caf578 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 53d3e9775..b69c194bb 100644
+index 1f2cfbc92..f26636e30 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2499,7 +2499,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2504,7 +2504,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
      }
  
      public final boolean isDisconnected() {
diff --git a/Spigot-Server-Patches/0166-String-based-Action-Bar-API.patch b/Spigot-Server-Patches/0165-String-based-Action-Bar-API.patch
similarity index 93%
rename from Spigot-Server-Patches/0166-String-based-Action-Bar-API.patch
rename to Spigot-Server-Patches/0165-String-based-Action-Bar-API.patch
index 3a52d347a5..3a4684e68c 100644
--- a/Spigot-Server-Patches/0166-String-based-Action-Bar-API.patch
+++ b/Spigot-Server-Patches/0165-String-based-Action-Bar-API.patch
@@ -1,4 +1,4 @@
-From 34125d9dac2db4cc51b0411293a97f5070d81714 Mon Sep 17 00:00:00 2001
+From 470c28710bb1546fec26de9724cad439462497a7 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
@@ -62,7 +62,7 @@ index a4b0901cf..02940d697 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 7d4355439..3c1f02c18 100644
+index 7d4355439..1c8c364d3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -208,6 +208,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -72,7 +72,7 @@ index 7d4355439..3c1f02c18 100644
 +    @Override
 +    public void sendActionBar(String message) {
 +        if (getHandle().playerConnection == null || message == null || message.isEmpty()) return;
-+        getHandle().playerConnection.sendPacket(new PacketPlayOutChat(new ChatComponentText(message), ChatMessageType.GAME_INFO));
++        getHandle().playerConnection.sendPacket(new PacketPlayOutChat(new net.minecraft.server.ChatComponentText(message), net.minecraft.server.ChatMessageType.GAME_INFO));
 +    }
 +
 +    @Override
diff --git a/Spigot-Server-Patches/0167-Activation-Range-Improvements.patch b/Spigot-Server-Patches/0166-Activation-Range-Improvements.patch
similarity index 99%
rename from Spigot-Server-Patches/0167-Activation-Range-Improvements.patch
rename to Spigot-Server-Patches/0166-Activation-Range-Improvements.patch
index e56341a8b0..93b4cfc2a8 100644
--- a/Spigot-Server-Patches/0167-Activation-Range-Improvements.patch
+++ b/Spigot-Server-Patches/0166-Activation-Range-Improvements.patch
@@ -1,4 +1,4 @@
-From d44c3c626673c4d10d9e15823fe3f7abadacfcb3 Mon Sep 17 00:00:00 2001
+From c00538327ef08d018ab2aa559a4a4e332c312005 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/0168-Firework-API-s.patch b/Spigot-Server-Patches/0167-Firework-API-s.patch
similarity index 96%
rename from Spigot-Server-Patches/0168-Firework-API-s.patch
rename to Spigot-Server-Patches/0167-Firework-API-s.patch
index 4f509a30d8..c6ab9a39c7 100644
--- a/Spigot-Server-Patches/0168-Firework-API-s.patch
+++ b/Spigot-Server-Patches/0167-Firework-API-s.patch
@@ -1,4 +1,4 @@
-From d7ce58b548fbbf9db858847057dc7e1d2ab961c7 Mon Sep 17 00:00:00 2001
+From 03ba9d6471507f90f994c073cb953104b14a9bf9 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
@@ -53,14 +53,14 @@ index 4c2cdd4bc..abf8799c4 100644
  
      public boolean bk() {
 diff --git a/src/main/java/net/minecraft/server/ItemFireworks.java b/src/main/java/net/minecraft/server/ItemFireworks.java
-index 7b1d51e5a..b0863b4db 100644
+index 7b1d51e5a..1493d0999 100644
 --- a/src/main/java/net/minecraft/server/ItemFireworks.java
 +++ b/src/main/java/net/minecraft/server/ItemFireworks.java
 @@ -19,6 +19,7 @@ public class ItemFireworks extends Item {
              ItemStack itemstack = itemactioncontext.getItemStack();
              EntityFireworks entityfireworks = new EntityFireworks(world, (double) ((float) blockposition.getX() + itemactioncontext.m()), (double) ((float) blockposition.getY() + itemactioncontext.n()), (double) ((float) blockposition.getZ() + itemactioncontext.o()), itemstack);
  
-+            entityfireworks.spawningEntity = entityhuman.getUniqueID(); // Paper
++            entityfireworks.spawningEntity = itemactioncontext.b.getUniqueID(); // Paper
              world.addEntity(entityfireworks);
              itemstack.subtract(1);
          }
diff --git a/Spigot-Server-Patches/0169-PlayerTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/0168-PlayerTeleportEndGatewayEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0169-PlayerTeleportEndGatewayEvent.patch
rename to Spigot-Server-Patches/0168-PlayerTeleportEndGatewayEvent.patch
index 32fe5edf30..357eec5680 100644
--- a/Spigot-Server-Patches/0169-PlayerTeleportEndGatewayEvent.patch
+++ b/Spigot-Server-Patches/0168-PlayerTeleportEndGatewayEvent.patch
@@ -1,4 +1,4 @@
-From 36ef4c96b2b0b383b236263c46315cddf4027b1d Mon Sep 17 00:00:00 2001
+From dcd26cf78eb1be638e65f503ec57c45ad15a6b0b 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/0170-ShulkerBox-Dupe-Prevention.patch b/Spigot-Server-Patches/0169-ShulkerBox-Dupe-Prevention.patch
similarity index 94%
rename from Spigot-Server-Patches/0170-ShulkerBox-Dupe-Prevention.patch
rename to Spigot-Server-Patches/0169-ShulkerBox-Dupe-Prevention.patch
index 528274daa1..1464ff67b4 100644
--- a/Spigot-Server-Patches/0170-ShulkerBox-Dupe-Prevention.patch
+++ b/Spigot-Server-Patches/0169-ShulkerBox-Dupe-Prevention.patch
@@ -1,4 +1,4 @@
-From 394e5e84f0310ea3992761cda1895646bbc1d24a Mon Sep 17 00:00:00 2001
+From aad88b0533769c7d6b63acdd216dda85afc81ffc 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/0171-Provide-E-TE-Chunk-count-stat-methods.patch b/Spigot-Server-Patches/0170-Provide-E-TE-Chunk-count-stat-methods.patch
similarity index 94%
rename from Spigot-Server-Patches/0171-Provide-E-TE-Chunk-count-stat-methods.patch
rename to Spigot-Server-Patches/0170-Provide-E-TE-Chunk-count-stat-methods.patch
index c81a147da0..fdae65a9ac 100644
--- a/Spigot-Server-Patches/0171-Provide-E-TE-Chunk-count-stat-methods.patch
+++ b/Spigot-Server-Patches/0170-Provide-E-TE-Chunk-count-stat-methods.patch
@@ -1,4 +1,4 @@
-From d01eef55a17b0d2c9ebec24bec84ed17299ad4de Mon Sep 17 00:00:00 2001
+From 7fd2743b54acb9d73497c60fac89f8c2ab7b783d 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 e516ec603..4fd6d3dbf 100644
+index 90e260f3b..8b63192cf 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/0172-Enforce-Sync-Player-Saves.patch b/Spigot-Server-Patches/0171-Enforce-Sync-Player-Saves.patch
similarity index 81%
rename from Spigot-Server-Patches/0172-Enforce-Sync-Player-Saves.patch
rename to Spigot-Server-Patches/0171-Enforce-Sync-Player-Saves.patch
index 6840b79df1..e72a606c44 100644
--- a/Spigot-Server-Patches/0172-Enforce-Sync-Player-Saves.patch
+++ b/Spigot-Server-Patches/0171-Enforce-Sync-Player-Saves.patch
@@ -1,4 +1,4 @@
-From 2a5803386edd8ea650fe2d1da9363103c4058c1d Mon Sep 17 00:00:00 2001
+From 61d3c06b65d8a1032845bff14e2dbfc071cd9906 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 Jan 2017 15:41:58 -0500
 Subject: [PATCH] Enforce Sync Player Saves
@@ -7,10 +7,10 @@ Saving players async is extremely dangerous. This will force it to main
 the same way we handle async chunk loads.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 1f2265231..e41850742 100644
+index 3ee587014..fdbc01792 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -1226,6 +1226,7 @@ public abstract class PlayerList {
+@@ -1227,6 +1227,7 @@ public abstract class PlayerList {
      }
  
      public void savePlayers(Integer interval) {
@@ -18,7 +18,7 @@ index 1f2265231..e41850742 100644
          long now = MinecraftServer.currentTick;
          MinecraftTimings.savePlayers.startTiming(); // Paper
          int numSaved = 0; // Paper
-@@ -1237,6 +1238,7 @@ public abstract class PlayerList {
+@@ -1238,6 +1239,7 @@ public abstract class PlayerList {
              }
          }
          MinecraftTimings.savePlayers.stopTiming(); // Paper
diff --git a/Spigot-Server-Patches/0173-Enforce-Sync-Chunk-Unloads.patch b/Spigot-Server-Patches/0172-Enforce-Sync-Chunk-Unloads.patch
similarity index 83%
rename from Spigot-Server-Patches/0173-Enforce-Sync-Chunk-Unloads.patch
rename to Spigot-Server-Patches/0172-Enforce-Sync-Chunk-Unloads.patch
index c1ba8e1a38..73e150c0d3 100644
--- a/Spigot-Server-Patches/0173-Enforce-Sync-Chunk-Unloads.patch
+++ b/Spigot-Server-Patches/0172-Enforce-Sync-Chunk-Unloads.patch
@@ -1,4 +1,4 @@
-From 3007709ef27aefc2029b6501e852a56d0fcca914 Mon Sep 17 00:00:00 2001
+From 52a8c651983adc960cd9028d41fad58b1db2e468 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,10 +7,10 @@ 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 4fd6d3dbf..013c5b4cf 100644
+index 8b63192cf..86848543d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -244,6 +244,7 @@ public class CraftWorld implements World {
+@@ -224,6 +224,7 @@ public class CraftWorld implements World {
      }
  
      private boolean unloadChunk0(int x, int z, boolean save) {
@@ -18,7 +18,7 @@ index 4fd6d3dbf..013c5b4cf 100644
          net.minecraft.server.Chunk chunk = world.getChunkProviderServer().getChunkIfLoaded(x, z);
          if (chunk == null) {
              return true;
-@@ -251,6 +252,7 @@ public class CraftWorld implements World {
+@@ -231,6 +232,7 @@ public class CraftWorld implements World {
  
          // If chunk had previously been queued to save, must do save to avoid loss of that data
          return world.getChunkProviderServer().unloadChunk(chunk, chunk.mustSave || save);
diff --git a/Spigot-Server-Patches/0174-Don-t-allow-entities-to-ride-themselves-572.patch b/Spigot-Server-Patches/0173-Don-t-allow-entities-to-ride-themselves-572.patch
similarity index 93%
rename from Spigot-Server-Patches/0174-Don-t-allow-entities-to-ride-themselves-572.patch
rename to Spigot-Server-Patches/0173-Don-t-allow-entities-to-ride-themselves-572.patch
index a1b7ccd976..3f9b65cd3b 100644
--- a/Spigot-Server-Patches/0174-Don-t-allow-entities-to-ride-themselves-572.patch
+++ b/Spigot-Server-Patches/0173-Don-t-allow-entities-to-ride-themselves-572.patch
@@ -1,4 +1,4 @@
-From 9e606fa80e1d93abf95a23b48e459a04e9d6e67e Mon Sep 17 00:00:00 2001
+From 3798ecd4669a3bb7d592d3cc5834b4f717f97cce Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Sun, 8 Jan 2017 04:31:36 +0000
 Subject: [PATCH] Don't allow entities to ride themselves - #572
diff --git a/Spigot-Server-Patches/0175-Fix-block-break-desync.patch b/Spigot-Server-Patches/0174-Fix-block-break-desync.patch
similarity index 91%
rename from Spigot-Server-Patches/0175-Fix-block-break-desync.patch
rename to Spigot-Server-Patches/0174-Fix-block-break-desync.patch
index bfcc53cd5b..04985407af 100644
--- a/Spigot-Server-Patches/0175-Fix-block-break-desync.patch
+++ b/Spigot-Server-Patches/0174-Fix-block-break-desync.patch
@@ -1,11 +1,11 @@
-From d05c7f07de546d123328cbbb9ab4dd39c8e18090 Mon Sep 17 00:00:00 2001
+From feaed1650da900539a197d0403b66ca40a450f76 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 a7132427a..32c99085f 100644
+index f26636e30..aa93b5945 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/0177-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/Spigot-Server-Patches/0175-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
similarity index 98%
rename from Spigot-Server-Patches/0177-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
rename to Spigot-Server-Patches/0175-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
index 62c67f168c..5eb8ca6c57 100644
--- a/Spigot-Server-Patches/0177-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/Spigot-Server-Patches/0175-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
@@ -1,4 +1,4 @@
-From bd7f8afbd3193a6cfc3d65665f0afd251097c023 Mon Sep 17 00:00:00 2001
+From a960bbf4893aca1c08b525a125a9059811080a53 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
@@ -221,10 +221,10 @@ index 998662d9e..6b4eb7f05 100644
              }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 013c5b4cf..817e29474 100644
+index 86848543d..7004f1176 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1240,7 +1240,7 @@ public class CraftWorld implements World {
+@@ -1220,7 +1220,7 @@ public class CraftWorld implements World {
          } else if (TNTPrimed.class.isAssignableFrom(clazz)) {
              entity = new EntityTNTPrimed(world, x, y, z, null);
          } else if (ExperienceOrb.class.isAssignableFrom(clazz)) {
diff --git a/Spigot-Server-Patches/0176-Assign-the-World-in-WorldGenStronghold.patch b/Spigot-Server-Patches/0176-Assign-the-World-in-WorldGenStronghold.patch
deleted file mode 100644
index a10661895a..0000000000
--- a/Spigot-Server-Patches/0176-Assign-the-World-in-WorldGenStronghold.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From eb5e873163442ce0fe19f3f1d9563c834542fd5d Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Sat, 14 Jan 2017 01:22:07 -0600
-Subject: [PATCH] Assign the World in WorldGenStronghold
-
-
-diff --git a/src/main/java/net/minecraft/server/WorldGenStronghold.java b/src/main/java/net/minecraft/server/WorldGenStronghold.java
-index 8b285bdd4..b6e60e9df 100644
---- a/src/main/java/net/minecraft/server/WorldGenStronghold.java
-+++ b/src/main/java/net/minecraft/server/WorldGenStronghold.java
-@@ -80,7 +80,7 @@ public class WorldGenStronghold extends StructureGenerator<WorldGenFeatureStrong
-             if (this.d != world.getSeed()) {
-                 this.c();
-             }
--
-+            this.g = world; // Paper
-             if (!this.b) {
-                 this.a(chunkgenerator);
-                 this.b = true;
--- 
-2.18.0
-
diff --git a/Spigot-Server-Patches/0178-Cap-Entity-Collisions.patch b/Spigot-Server-Patches/0176-Cap-Entity-Collisions.patch
similarity index 97%
rename from Spigot-Server-Patches/0178-Cap-Entity-Collisions.patch
rename to Spigot-Server-Patches/0176-Cap-Entity-Collisions.patch
index 5e24c5218f..3126128432 100644
--- a/Spigot-Server-Patches/0178-Cap-Entity-Collisions.patch
+++ b/Spigot-Server-Patches/0176-Cap-Entity-Collisions.patch
@@ -1,4 +1,4 @@
-From a5b81e93f93c2ec4cb9b7ea55d5c20a40d3da2c4 Mon Sep 17 00:00:00 2001
+From 696285387c1d5a59682cfa9871b34daf2a0d9ec2 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/0179-Remove-CraftScheduler-Async-Task-Debugger.patch b/Spigot-Server-Patches/0177-Remove-CraftScheduler-Async-Task-Debugger.patch
similarity index 97%
rename from Spigot-Server-Patches/0179-Remove-CraftScheduler-Async-Task-Debugger.patch
rename to Spigot-Server-Patches/0177-Remove-CraftScheduler-Async-Task-Debugger.patch
index 80c5fb5fa2..f272c93d28 100644
--- a/Spigot-Server-Patches/0179-Remove-CraftScheduler-Async-Task-Debugger.patch
+++ b/Spigot-Server-Patches/0177-Remove-CraftScheduler-Async-Task-Debugger.patch
@@ -1,4 +1,4 @@
-From cebe88d5b404e9e0e94b3fbec08b59bac8014975 Mon Sep 17 00:00:00 2001
+From 3c7ffb3fef36441da8f59ccf6c81417fa9f778d0 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/0180-Shame-on-you-Mojang.patch b/Spigot-Server-Patches/0178-Shame-on-you-Mojang.patch
similarity index 94%
rename from Spigot-Server-Patches/0180-Shame-on-you-Mojang.patch
rename to Spigot-Server-Patches/0178-Shame-on-you-Mojang.patch
index 0dc2855510..390748f29e 100644
--- a/Spigot-Server-Patches/0180-Shame-on-you-Mojang.patch
+++ b/Spigot-Server-Patches/0178-Shame-on-you-Mojang.patch
@@ -1,4 +1,4 @@
-From a4ff835aa4422f15ab43ff2474f6c8ae16088515 Mon Sep 17 00:00:00 2001
+From 21ca8f525d11b73f64bc64b3017576d4d203c250 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/0181-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch b/Spigot-Server-Patches/0179-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
similarity index 94%
rename from Spigot-Server-Patches/0181-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
rename to Spigot-Server-Patches/0179-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
index ed93b143ce..494b33aa0b 100644
--- a/Spigot-Server-Patches/0181-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
+++ b/Spigot-Server-Patches/0179-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
@@ -1,4 +1,4 @@
-From cbb0e17bb9d0d316bb1c8caa8c28d13e1bf74b8e Mon Sep 17 00:00:00 2001
+From faf6f763e5a248c321b43f9227a7f2d89d0e48be 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/0182-Do-not-let-armorstands-drown.patch b/Spigot-Server-Patches/0180-Do-not-let-armorstands-drown.patch
similarity index 96%
rename from Spigot-Server-Patches/0182-Do-not-let-armorstands-drown.patch
rename to Spigot-Server-Patches/0180-Do-not-let-armorstands-drown.patch
index 9a82d7169b..8a24eca22f 100644
--- a/Spigot-Server-Patches/0182-Do-not-let-armorstands-drown.patch
+++ b/Spigot-Server-Patches/0180-Do-not-let-armorstands-drown.patch
@@ -1,4 +1,4 @@
-From 1fb8166d8d2bc377f13189beda50e4b920635325 Mon Sep 17 00:00:00 2001
+From 3be96fb3c8235713a60358332f0d6b8f54158997 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/0183-Properly-handle-async-calls-to-restart-the-server.patch b/Spigot-Server-Patches/0181-Properly-handle-async-calls-to-restart-the-server.patch
similarity index 98%
rename from Spigot-Server-Patches/0183-Properly-handle-async-calls-to-restart-the-server.patch
rename to Spigot-Server-Patches/0181-Properly-handle-async-calls-to-restart-the-server.patch
index 20d570b4ed..78cdd136ff 100644
--- a/Spigot-Server-Patches/0183-Properly-handle-async-calls-to-restart-the-server.patch
+++ b/Spigot-Server-Patches/0181-Properly-handle-async-calls-to-restart-the-server.patch
@@ -1,4 +1,4 @@
-From a12f6eee7782c6895adb1a01063a7b0cb1fafa8c Mon Sep 17 00:00:00 2001
+From 03f4427d9e549ee29a7bb47b9a1493bcebbf6f8d 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
@@ -78,10 +78,10 @@ index f81ff5628..f679c6bc2 100644
          return this.serverThread;
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index e41850742..5e833c378 100644
+index fdbc01792..4c9ff8c29 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -1344,10 +1344,15 @@ public abstract class PlayerList {
+@@ -1345,10 +1345,15 @@ public abstract class PlayerList {
          entityplayer.playerInteractManager.b(generatoraccess.getWorldData().getGameType());
      }
  
@@ -98,7 +98,7 @@ index e41850742..5e833c378 100644
          }
          // CraftBukkit end
          // Paper start - Remove collideRule team if it exists
-@@ -1358,6 +1363,7 @@ public abstract class PlayerList {
+@@ -1359,6 +1364,7 @@ public abstract class PlayerList {
          }
          // Paper end
      }
diff --git a/Spigot-Server-Patches/0184-Add-system-property-to-disable-book-size-limits.patch b/Spigot-Server-Patches/0182-Add-system-property-to-disable-book-size-limits.patch
similarity index 97%
rename from Spigot-Server-Patches/0184-Add-system-property-to-disable-book-size-limits.patch
rename to Spigot-Server-Patches/0182-Add-system-property-to-disable-book-size-limits.patch
index 9be13c8b1c..074df68f29 100644
--- a/Spigot-Server-Patches/0184-Add-system-property-to-disable-book-size-limits.patch
+++ b/Spigot-Server-Patches/0182-Add-system-property-to-disable-book-size-limits.patch
@@ -1,4 +1,4 @@
-From f5d754ba5f4de0b4a9f40cbccdf2f14201bf2058 Mon Sep 17 00:00:00 2001
+From ab71ec1b00d9f4ae7cac3170b138661f31b89fa5 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/0185-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/Spigot-Server-Patches/0183-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
similarity index 95%
rename from Spigot-Server-Patches/0185-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
rename to Spigot-Server-Patches/0183-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
index 7f7aa82e86..9d07be7581 100644
--- a/Spigot-Server-Patches/0185-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
+++ b/Spigot-Server-Patches/0183-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
@@ -1,4 +1,4 @@
-From caddde982286e1f722cf4cd8a422b58159e96b31 Mon Sep 17 00:00:00 2001
+From ae5ea9831fce8e583f76f7f39513e5ee4475b617 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 0b748d402..99fe720e8 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 36a961cb7..0da76b268 100644
+index 83bfb6611..0486dee2c 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 {
@@ -39,7 +39,7 @@ index 36a961cb7..0da76b268 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 25e3d6423..128b2beb5 100644
+index aa93b5945..383ef87ba 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1746,6 +1746,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
diff --git a/Spigot-Server-Patches/0186-Add-configuration-option-to-prevent-player-names-fro.patch b/Spigot-Server-Patches/0184-Add-configuration-option-to-prevent-player-names-fro.patch
similarity index 95%
rename from Spigot-Server-Patches/0186-Add-configuration-option-to-prevent-player-names-fro.patch
rename to Spigot-Server-Patches/0184-Add-configuration-option-to-prevent-player-names-fro.patch
index 2997e16d00..f1902243ad 100644
--- a/Spigot-Server-Patches/0186-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/Spigot-Server-Patches/0184-Add-configuration-option-to-prevent-player-names-fro.patch
@@ -1,4 +1,4 @@
-From 782de6915346ade4415e251417b825f9d5027dac Mon Sep 17 00:00:00 2001
+From 7c1020f87381d93af07c2ac419e8780a643c7405 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
diff --git a/Spigot-Server-Patches/0187-Use-TerminalConsoleAppender-for-console-improvements.patch b/Spigot-Server-Patches/0185-Use-TerminalConsoleAppender-for-console-improvements.patch
similarity index 99%
rename from Spigot-Server-Patches/0187-Use-TerminalConsoleAppender-for-console-improvements.patch
rename to Spigot-Server-Patches/0185-Use-TerminalConsoleAppender-for-console-improvements.patch
index 504dba63c0..5ea2a6c041 100644
--- a/Spigot-Server-Patches/0187-Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/Spigot-Server-Patches/0185-Use-TerminalConsoleAppender-for-console-improvements.patch
@@ -1,4 +1,4 @@
-From eeac8ed81a52cd19d1af1f4d7d26c9fb333d1dec Mon Sep 17 00:00:00 2001
+From 4cff56d987e64872e5e78fd37d175ec5332710ba 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
@@ -113,7 +113,7 @@ index 000000000..685deaa0e
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/console/TerminalHandler.java b/src/main/java/com/destroystokyo/paper/console/TerminalHandler.java
 new file mode 100644
-index 000000000..626bfeec8
+index 000000000..d013bc047
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/console/TerminalHandler.java
 @@ -0,0 +1,61 @@
@@ -165,7 +165,7 @@ index 000000000..626bfeec8
 +
 +                line = line.trim();
 +                if (!line.isEmpty()) {
-+                    server.issueCommand(line, server);
++                    server.issueCommand(line, server.getServerCommandListener());
 +                }
 +            }
 +        } catch (UserInterruptException e) {
@@ -290,7 +290,7 @@ index f679c6bc2..39a8b1d69 100644
  
      public KeyPair G() {
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 5e833c378..0f39fa49f 100644
+index 4c9ff8c29..9e403d625 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -78,8 +78,7 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0188-provide-a-configurable-option-to-disable-creeper-lin.patch b/Spigot-Server-Patches/0186-provide-a-configurable-option-to-disable-creeper-lin.patch
similarity index 96%
rename from Spigot-Server-Patches/0188-provide-a-configurable-option-to-disable-creeper-lin.patch
rename to Spigot-Server-Patches/0186-provide-a-configurable-option-to-disable-creeper-lin.patch
index dd5cec9238..9bcf342695 100644
--- a/Spigot-Server-Patches/0188-provide-a-configurable-option-to-disable-creeper-lin.patch
+++ b/Spigot-Server-Patches/0186-provide-a-configurable-option-to-disable-creeper-lin.patch
@@ -1,4 +1,4 @@
-From cb3b9596a91e1f987ddd0a50ee318ae0d50daad0 Mon Sep 17 00:00:00 2001
+From bf87bdd3574f5c1a208ffe8ea73199994905069c Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 11 Jun 2017 21:01:18 +0100
 Subject: [PATCH] provide a configurable option to disable creeper lingering
diff --git a/Spigot-Server-Patches/0189-Item-canEntityPickup.patch b/Spigot-Server-Patches/0187-Item-canEntityPickup.patch
similarity index 97%
rename from Spigot-Server-Patches/0189-Item-canEntityPickup.patch
rename to Spigot-Server-Patches/0187-Item-canEntityPickup.patch
index 9b03960ba4..f26d366ba4 100644
--- a/Spigot-Server-Patches/0189-Item-canEntityPickup.patch
+++ b/Spigot-Server-Patches/0187-Item-canEntityPickup.patch
@@ -1,4 +1,4 @@
-From 3582ab1f823cdaaddfb902895911730387101c78 Mon Sep 17 00:00:00 2001
+From 11478e1b753667087f079de9c6aa568c7c40efd8 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/0190-PlayerPickupItemEvent-setFlyAtPlayer.patch b/Spigot-Server-Patches/0188-PlayerPickupItemEvent-setFlyAtPlayer.patch
similarity index 97%
rename from Spigot-Server-Patches/0190-PlayerPickupItemEvent-setFlyAtPlayer.patch
rename to Spigot-Server-Patches/0188-PlayerPickupItemEvent-setFlyAtPlayer.patch
index d6ddcbae8c..22c8b779a1 100644
--- a/Spigot-Server-Patches/0190-PlayerPickupItemEvent-setFlyAtPlayer.patch
+++ b/Spigot-Server-Patches/0188-PlayerPickupItemEvent-setFlyAtPlayer.patch
@@ -1,4 +1,4 @@
-From 31fb189f19914490ec51f8e994f3f167540369e0 Mon Sep 17 00:00:00 2001
+From 96319109ec641f4aca1b0267122c18112b42bf46 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/0191-PlayerAttemptPickupItemEvent.patch b/Spigot-Server-Patches/0189-PlayerAttemptPickupItemEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0191-PlayerAttemptPickupItemEvent.patch
rename to Spigot-Server-Patches/0189-PlayerAttemptPickupItemEvent.patch
index ddc56bbd41..d4086ff75d 100644
--- a/Spigot-Server-Patches/0191-PlayerAttemptPickupItemEvent.patch
+++ b/Spigot-Server-Patches/0189-PlayerAttemptPickupItemEvent.patch
@@ -1,4 +1,4 @@
-From 0caff079245dcf29a713e485c3062dcd45d28167 Mon Sep 17 00:00:00 2001
+From a245aa5dfbedac9d105b7d507a4d180ca22108f2 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/0192-Add-UnknownCommandEvent.patch b/Spigot-Server-Patches/0190-Add-UnknownCommandEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0192-Add-UnknownCommandEvent.patch
rename to Spigot-Server-Patches/0190-Add-UnknownCommandEvent.patch
index 15dce7d0b0..ca27bdfab7 100644
--- a/Spigot-Server-Patches/0192-Add-UnknownCommandEvent.patch
+++ b/Spigot-Server-Patches/0190-Add-UnknownCommandEvent.patch
@@ -1,4 +1,4 @@
-From 48e60197f559cbbedc2e69fc36de72626c1553a8 Mon Sep 17 00:00:00 2001
+From be4afd9ab09714e4d71ad135da08502529867317 Mon Sep 17 00:00:00 2001
 From: Sweepyoface <github@sweepy.pw>
 Date: Sat, 17 Jun 2017 18:48:21 -0400
 Subject: [PATCH] Add UnknownCommandEvent
diff --git a/Spigot-Server-Patches/0193-Basic-PlayerProfile-API.patch b/Spigot-Server-Patches/0191-Basic-PlayerProfile-API.patch
similarity index 99%
rename from Spigot-Server-Patches/0193-Basic-PlayerProfile-API.patch
rename to Spigot-Server-Patches/0191-Basic-PlayerProfile-API.patch
index 21a5f6efc1..06663bfeb0 100644
--- a/Spigot-Server-Patches/0193-Basic-PlayerProfile-API.patch
+++ b/Spigot-Server-Patches/0191-Basic-PlayerProfile-API.patch
@@ -1,4 +1,4 @@
-From 7adc17f9b34a0fc2365f72f04462d4e902a9919e Mon Sep 17 00:00:00 2001
+From 7e4b09409f3d9851a51215a840be880c73a0c7f1 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/0194-Shoulder-Entities-Release-API.patch b/Spigot-Server-Patches/0192-Shoulder-Entities-Release-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0194-Shoulder-Entities-Release-API.patch
rename to Spigot-Server-Patches/0192-Shoulder-Entities-Release-API.patch
index a969eaa1cc..ee25d0253d 100644
--- a/Spigot-Server-Patches/0194-Shoulder-Entities-Release-API.patch
+++ b/Spigot-Server-Patches/0192-Shoulder-Entities-Release-API.patch
@@ -1,11 +1,11 @@
-From ad7c9344e0fcb1d4b7ce6e78fab6be0b1b2f89b1 Mon Sep 17 00:00:00 2001
+From 7c4e663b965bd364495f89ac6677c07779ddd659 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 17 Jun 2017 15:18:30 -0400
 Subject: [PATCH] Shoulder Entities Release API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 0da76b268..85e617979 100644
+index 0486dee2c..f08c0ba60 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -1819,21 +1819,48 @@ public abstract class EntityHuman extends EntityLiving {
diff --git a/Spigot-Server-Patches/0195-Profile-Lookup-Events.patch b/Spigot-Server-Patches/0193-Profile-Lookup-Events.patch
similarity index 98%
rename from Spigot-Server-Patches/0195-Profile-Lookup-Events.patch
rename to Spigot-Server-Patches/0193-Profile-Lookup-Events.patch
index 413b26478a..6a6aaaf850 100644
--- a/Spigot-Server-Patches/0195-Profile-Lookup-Events.patch
+++ b/Spigot-Server-Patches/0193-Profile-Lookup-Events.patch
@@ -1,4 +1,4 @@
-From 6564411af8c8e297d2045b8ad2cb4f9dff87c67c Mon Sep 17 00:00:00 2001
+From 1f1911f9fa39fa1662ea475f1d3cb3705fae9478 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/0196-Block-player-logins-during-server-shutdown.patch b/Spigot-Server-Patches/0194-Block-player-logins-during-server-shutdown.patch
similarity index 94%
rename from Spigot-Server-Patches/0196-Block-player-logins-during-server-shutdown.patch
rename to Spigot-Server-Patches/0194-Block-player-logins-during-server-shutdown.patch
index 0c71d8e3a7..93755a20f3 100644
--- a/Spigot-Server-Patches/0196-Block-player-logins-during-server-shutdown.patch
+++ b/Spigot-Server-Patches/0194-Block-player-logins-during-server-shutdown.patch
@@ -1,4 +1,4 @@
-From 7a52f09bc7a5b4c1f06b5554eabd35d088ac98f6 Mon Sep 17 00:00:00 2001
+From 147cea6aa1decfdcbf1f3d7fc2bca8f22fdaae5a Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 2 Jul 2017 21:35:56 -0500
 Subject: [PATCH] Block player logins during server shutdown
diff --git a/Spigot-Server-Patches/0197-Entity-fromMobSpawner.patch b/Spigot-Server-Patches/0195-Entity-fromMobSpawner.patch
similarity index 98%
rename from Spigot-Server-Patches/0197-Entity-fromMobSpawner.patch
rename to Spigot-Server-Patches/0195-Entity-fromMobSpawner.patch
index e9147026b2..8cd57f47d3 100644
--- a/Spigot-Server-Patches/0197-Entity-fromMobSpawner.patch
+++ b/Spigot-Server-Patches/0195-Entity-fromMobSpawner.patch
@@ -1,4 +1,4 @@
-From 941e2d6ee2fddc3c265f37cc7868f4bcefd2c91b Mon Sep 17 00:00:00 2001
+From e199a3a50ef50a8cb6818a7b18871b3dfdac874c Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 18 Jun 2017 18:17:05 -0500
 Subject: [PATCH] Entity#fromMobSpawner()
diff --git a/Spigot-Server-Patches/0198-Fix-Anvil-Level-sync-to-client.patch b/Spigot-Server-Patches/0196-Fix-Anvil-Level-sync-to-client.patch
similarity index 91%
rename from Spigot-Server-Patches/0198-Fix-Anvil-Level-sync-to-client.patch
rename to Spigot-Server-Patches/0196-Fix-Anvil-Level-sync-to-client.patch
index 8d4e85915c..4207682cab 100644
--- a/Spigot-Server-Patches/0198-Fix-Anvil-Level-sync-to-client.patch
+++ b/Spigot-Server-Patches/0196-Fix-Anvil-Level-sync-to-client.patch
@@ -1,4 +1,4 @@
-From 11cea7c95bac2bf2450c1c93246dad8416d796ce Mon Sep 17 00:00:00 2001
+From 4a7821dd77549bcdfd5bde075bb5057dfe2ca86f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 11 Jul 2017 23:17:57 -0400
 Subject: [PATCH] Fix Anvil Level sync to client
@@ -26,7 +26,7 @@ index 845ec2250..c252ff6d5 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 3c1f02c18..d7eb4af83 100644
+index 1c8c364d3..019fd4b48 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1378,6 +1378,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -35,7 +35,7 @@ index 3c1f02c18..d7eb4af83 100644
          }
 +        // Paper start
 +        if (prop == Property.REPAIR_COST && container instanceof net.minecraft.server.ContainerAnvil) {
-+            ((ContainerAnvil) container).levelCost = value;
++            ((net.minecraft.server.ContainerAnvil) container).levelCost = value;
 +        }
 +        // Paper end
          getHandle().setContainerData(container, prop.getId(), value);
diff --git a/Spigot-Server-Patches/0199-Add-missing-coverages-for-getTileEntity-in-order-to-.patch b/Spigot-Server-Patches/0197-Add-missing-coverages-for-getTileEntity-in-order-to-.patch
similarity index 94%
rename from Spigot-Server-Patches/0199-Add-missing-coverages-for-getTileEntity-in-order-to-.patch
rename to Spigot-Server-Patches/0197-Add-missing-coverages-for-getTileEntity-in-order-to-.patch
index b6675c1619..ee80c26c4d 100644
--- a/Spigot-Server-Patches/0199-Add-missing-coverages-for-getTileEntity-in-order-to-.patch
+++ b/Spigot-Server-Patches/0197-Add-missing-coverages-for-getTileEntity-in-order-to-.patch
@@ -1,4 +1,4 @@
-From ed98da62a8120c8914c77aa0cf02410343641fd5 Mon Sep 17 00:00:00 2001
+From 4ecc569661a1bba81809d640be36e55f827e6fe4 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/0200-Improve-the-Saddle-API-for-Horses.patch b/Spigot-Server-Patches/0198-Improve-the-Saddle-API-for-Horses.patch
similarity index 97%
rename from Spigot-Server-Patches/0200-Improve-the-Saddle-API-for-Horses.patch
rename to Spigot-Server-Patches/0198-Improve-the-Saddle-API-for-Horses.patch
index c6243275b1..b62df91004 100644
--- a/Spigot-Server-Patches/0200-Improve-the-Saddle-API-for-Horses.patch
+++ b/Spigot-Server-Patches/0198-Improve-the-Saddle-API-for-Horses.patch
@@ -1,4 +1,4 @@
-From c9f1909700cbc7fef19be5167ecd178b35abef4e Mon Sep 17 00:00:00 2001
+From d5fae2a8f82bdf07f4d23afeb78e13d26180b350 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/0201-Implement-ensureServerConversions-API.patch b/Spigot-Server-Patches/0199-Implement-ensureServerConversions-API.patch
similarity index 94%
rename from Spigot-Server-Patches/0201-Implement-ensureServerConversions-API.patch
rename to Spigot-Server-Patches/0199-Implement-ensureServerConversions-API.patch
index 2a8e0f4ec4..4b544f3521 100644
--- a/Spigot-Server-Patches/0201-Implement-ensureServerConversions-API.patch
+++ b/Spigot-Server-Patches/0199-Implement-ensureServerConversions-API.patch
@@ -1,4 +1,4 @@
-From 941c7fed4bfadedf10f30caf187e3f86a43e1e0a Mon Sep 17 00:00:00 2001
+From 4d681ce123b48ae324efb5883474c0c4317d4328 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 May 2016 22:43:12 -0400
 Subject: [PATCH] Implement ensureServerConversions API
diff --git a/Spigot-Server-Patches/0202-Implement-getI18NDisplayName.patch b/Spigot-Server-Patches/0200-Implement-getI18NDisplayName.patch
similarity index 95%
rename from Spigot-Server-Patches/0202-Implement-getI18NDisplayName.patch
rename to Spigot-Server-Patches/0200-Implement-getI18NDisplayName.patch
index 58c79977e7..3bf83cad58 100644
--- a/Spigot-Server-Patches/0202-Implement-getI18NDisplayName.patch
+++ b/Spigot-Server-Patches/0200-Implement-getI18NDisplayName.patch
@@ -1,4 +1,4 @@
-From 7e2d632e56746887a6524793b2e17150e67202ae Mon Sep 17 00:00:00 2001
+From 2a4dd5bde33fc980cfb0b74f7330461f74bea81d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 May 2016 23:59:38 -0400
 Subject: [PATCH] Implement getI18NDisplayName
diff --git a/Spigot-Server-Patches/0203-GH-806-Respect-saving-disabled-before-unloading-all-.patch b/Spigot-Server-Patches/0201-GH-806-Respect-saving-disabled-before-unloading-all-.patch
similarity index 94%
rename from Spigot-Server-Patches/0203-GH-806-Respect-saving-disabled-before-unloading-all-.patch
rename to Spigot-Server-Patches/0201-GH-806-Respect-saving-disabled-before-unloading-all-.patch
index 21ec3c7725..4d39493b3c 100644
--- a/Spigot-Server-Patches/0203-GH-806-Respect-saving-disabled-before-unloading-all-.patch
+++ b/Spigot-Server-Patches/0201-GH-806-Respect-saving-disabled-before-unloading-all-.patch
@@ -1,4 +1,4 @@
-From 33770d32be91ffa84e65d5276198a5023117242c Mon Sep 17 00:00:00 2001
+From d8b44f39e8fefbad27e051d8d8ad1b52d687409e 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/0204-ProfileWhitelistVerifyEvent.patch b/Spigot-Server-Patches/0202-ProfileWhitelistVerifyEvent.patch
similarity index 92%
rename from Spigot-Server-Patches/0204-ProfileWhitelistVerifyEvent.patch
rename to Spigot-Server-Patches/0202-ProfileWhitelistVerifyEvent.patch
index 41811d920a..5edff7a999 100644
--- a/Spigot-Server-Patches/0204-ProfileWhitelistVerifyEvent.patch
+++ b/Spigot-Server-Patches/0202-ProfileWhitelistVerifyEvent.patch
@@ -1,14 +1,14 @@
-From a25aa26eb6453f256ec025fd0f2bd4d7e9693dba Mon Sep 17 00:00:00 2001
+From 29abeacb899601637af19e18457fff1ba671f470 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 3 Jul 2017 18:11:10 -0500
 Subject: [PATCH] ProfileWhitelistVerifyEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 0f39fa49f..c1de6564a 100644
+index 9e403d625..879780c5b 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -542,9 +542,9 @@ public abstract class PlayerList {
+@@ -543,9 +543,9 @@ public abstract class PlayerList {
  
              // return chatmessage;
              if (!gameprofilebanentry.hasExpired()) event.disallow(PlayerLoginEvent.Result.KICK_BANNED, CraftChatMessage.fromComponent(chatmessage)); // Spigot
@@ -20,7 +20,7 @@ index 0f39fa49f..c1de6564a 100644
          } else if (getIPBans().isBanned(socketaddress) && !getIPBans().get(socketaddress).hasExpired()) {
              IpBanEntry ipbanentry = this.l.get(socketaddress);
  
-@@ -1183,9 +1183,25 @@ public abstract class PlayerList {
+@@ -1184,9 +1184,25 @@ public abstract class PlayerList {
          this.server.getCommandDispatcher().a(entityplayer);
      }
  
diff --git a/Spigot-Server-Patches/0205-Fix-this-stupid-bullshit.patch b/Spigot-Server-Patches/0203-Fix-this-stupid-bullshit.patch
similarity index 96%
rename from Spigot-Server-Patches/0205-Fix-this-stupid-bullshit.patch
rename to Spigot-Server-Patches/0203-Fix-this-stupid-bullshit.patch
index a648cd26cb..074d34b953 100644
--- a/Spigot-Server-Patches/0205-Fix-this-stupid-bullshit.patch
+++ b/Spigot-Server-Patches/0203-Fix-this-stupid-bullshit.patch
@@ -1,4 +1,4 @@
-From 5a776bba23f0a2dbbaff057f807a79d773625065 Mon Sep 17 00:00:00 2001
+From 65acab73c8ed9963f274dd34e30d183069604441 Mon Sep 17 00:00:00 2001
 From: DemonWav <demonwav@gmail.com>
 Date: Sun, 6 Aug 2017 17:17:53 -0500
 Subject: [PATCH] Fix this stupid bullshit
diff --git a/Spigot-Server-Patches/0206-Ocelot-despawns-should-honor-nametags-and-leash.patch b/Spigot-Server-Patches/0204-Ocelot-despawns-should-honor-nametags-and-leash.patch
similarity index 93%
rename from Spigot-Server-Patches/0206-Ocelot-despawns-should-honor-nametags-and-leash.patch
rename to Spigot-Server-Patches/0204-Ocelot-despawns-should-honor-nametags-and-leash.patch
index 5b9aba03f7..9079618866 100644
--- a/Spigot-Server-Patches/0206-Ocelot-despawns-should-honor-nametags-and-leash.patch
+++ b/Spigot-Server-Patches/0204-Ocelot-despawns-should-honor-nametags-and-leash.patch
@@ -1,4 +1,4 @@
-From 2cf62bc719ebd8587ce2ec6971c34c82273e0e63 Mon Sep 17 00:00:00 2001
+From 0b24486b1491cb7f560baf2b753fcbc4111369fe 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/0207-Reset-spawner-timer-when-spawner-event-is-cancelled.patch b/Spigot-Server-Patches/0205-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
similarity index 95%
rename from Spigot-Server-Patches/0207-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
rename to Spigot-Server-Patches/0205-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
index 00e9ce89ad..e9e25e798e 100644
--- a/Spigot-Server-Patches/0207-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
+++ b/Spigot-Server-Patches/0205-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
@@ -1,4 +1,4 @@
-From 7671826b2ecad3ea76c794af68e6b3c5af3413ce Mon Sep 17 00:00:00 2001
+From e175a2606aa41ccdd34359e8ed80506380c74ae1 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/0208-Fix-MC-117075-TE-Unload-Lag-Spike.patch b/Spigot-Server-Patches/0206-Fix-MC-117075-TE-Unload-Lag-Spike.patch
similarity index 92%
rename from Spigot-Server-Patches/0208-Fix-MC-117075-TE-Unload-Lag-Spike.patch
rename to Spigot-Server-Patches/0206-Fix-MC-117075-TE-Unload-Lag-Spike.patch
index 75c323fa8a..b65cd4600c 100644
--- a/Spigot-Server-Patches/0208-Fix-MC-117075-TE-Unload-Lag-Spike.patch
+++ b/Spigot-Server-Patches/0206-Fix-MC-117075-TE-Unload-Lag-Spike.patch
@@ -1,11 +1,11 @@
-From b69d46e941e9c3325ea3d85e3a0a667122ea3081 Mon Sep 17 00:00:00 2001
+From 17637d37ab1940aa043270746f079f79afaca09e 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 0ba99bcbc..49e7c1589 100644
+index ca7c23f54..d0ce6b363 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1275,7 +1275,11 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
diff --git a/Spigot-Server-Patches/0209-Allow-specifying-a-custom-authentication-servers-dow.patch b/Spigot-Server-Patches/0207-Allow-specifying-a-custom-authentication-servers-dow.patch
similarity index 97%
rename from Spigot-Server-Patches/0209-Allow-specifying-a-custom-authentication-servers-dow.patch
rename to Spigot-Server-Patches/0207-Allow-specifying-a-custom-authentication-servers-dow.patch
index 6b4201f128..0929a5195f 100644
--- a/Spigot-Server-Patches/0209-Allow-specifying-a-custom-authentication-servers-dow.patch
+++ b/Spigot-Server-Patches/0207-Allow-specifying-a-custom-authentication-servers-dow.patch
@@ -1,4 +1,4 @@
-From 86fe3712509d345c377af5fd44f3615fc02db11f Mon Sep 17 00:00:00 2001
+From 0dcddd2985a9c7a7b64d4c84c900b84c4929bcfb 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
diff --git a/Spigot-Server-Patches/0210-LivingEntity-setKiller.patch b/Spigot-Server-Patches/0208-LivingEntity-setKiller.patch
similarity index 95%
rename from Spigot-Server-Patches/0210-LivingEntity-setKiller.patch
rename to Spigot-Server-Patches/0208-LivingEntity-setKiller.patch
index c48cb75248..23113153e2 100644
--- a/Spigot-Server-Patches/0210-LivingEntity-setKiller.patch
+++ b/Spigot-Server-Patches/0208-LivingEntity-setKiller.patch
@@ -1,4 +1,4 @@
-From 19824800f84c6e52c474bff8108d627c3395afec Mon Sep 17 00:00:00 2001
+From 136175b47766a1f0cf576459703e71bd94a72d5f Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 31 Jul 2017 01:49:48 -0500
 Subject: [PATCH] LivingEntity#setKiller
diff --git a/Spigot-Server-Patches/0212-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch b/Spigot-Server-Patches/0209-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
similarity index 95%
rename from Spigot-Server-Patches/0212-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
rename to Spigot-Server-Patches/0209-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
index 3298fe0a47..f0b3e185a3 100644
--- a/Spigot-Server-Patches/0212-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
+++ b/Spigot-Server-Patches/0209-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
@@ -1,4 +1,4 @@
-From 6cc7c93bda7908b2e6ae798ec6d95e8fc93aab97 Mon Sep 17 00:00:00 2001
+From 0e62d99829b081db8d0554601b468a3361d7ca30 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Mon, 18 Sep 2017 12:00:03 +0200
 Subject: [PATCH] Use Log4j IOStreams to redirect System.out/err to logger
@@ -12,7 +12,7 @@ results in a separate line, even though it should not result in
 a line break. Log4j's implementation handles it correctly.
 
 diff --git a/pom.xml b/pom.xml
-index 4dd5fed25..1b4877868 100644
+index f9e225b73..9d2473317 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -90,6 +90,13 @@
diff --git a/Spigot-Server-Patches/0213-Handle-plugin-prefixes-using-Log4J-configuration.patch b/Spigot-Server-Patches/0210-Handle-plugin-prefixes-using-Log4J-configuration.patch
similarity index 97%
rename from Spigot-Server-Patches/0213-Handle-plugin-prefixes-using-Log4J-configuration.patch
rename to Spigot-Server-Patches/0210-Handle-plugin-prefixes-using-Log4J-configuration.patch
index 9a6b2bf25c..344e696fb9 100644
--- a/Spigot-Server-Patches/0213-Handle-plugin-prefixes-using-Log4J-configuration.patch
+++ b/Spigot-Server-Patches/0210-Handle-plugin-prefixes-using-Log4J-configuration.patch
@@ -1,4 +1,4 @@
-From 55ceed112f6f100a68cb3e3e57eedcdb352252ac Mon Sep 17 00:00:00 2001
+From 3b947e0656877c19c211ce7680e3937ae5dea267 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Thu, 21 Sep 2017 16:14:55 +0200
 Subject: [PATCH] Handle plugin prefixes using Log4J configuration
@@ -15,7 +15,7 @@ This may cause additional prefixes to be disabled for plugins bypassing
 the plugin logger.
 
 diff --git a/pom.xml b/pom.xml
-index 1b4877868..a98abca8e 100644
+index 9d2473317..eb2cdf129 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -87,7 +87,7 @@
diff --git a/Spigot-Server-Patches/0211-Anti-Xray.patch b/Spigot-Server-Patches/0211-Anti-Xray.patch
deleted file mode 100644
index 077ed7a4cf..0000000000
--- a/Spigot-Server-Patches/0211-Anti-Xray.patch
+++ /dev/null
@@ -1,1173 +0,0 @@
-From b82dea6633d58d47574612205e7181b4147ef162 Mon Sep 17 00:00:00 2001
-From: stonar96 <minecraft.stonar96@gmail.com>
-Date: Thu, 21 Sep 2017 00:38:47 +0200
-Subject: [PATCH] Anti-Xray
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index c80d84b9b..6344537ec 100644
---- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -1,7 +1,10 @@
- package com.destroystokyo.paper;
- 
-+import java.util.Arrays;
- import java.util.List;
- 
-+import com.destroystokyo.paper.antixray.ChunkPacketBlockControllerAntiXray.ChunkEdgeMode;
-+import com.destroystokyo.paper.antixray.ChunkPacketBlockControllerAntiXray.EngineMode;
- import net.minecraft.server.MinecraftServer;
- import org.bukkit.Bukkit;
- import org.bukkit.configuration.file.YamlConfiguration;
-@@ -361,4 +364,27 @@ public class PaperWorldConfig {
-         disableCreeperLingeringEffect = getBoolean("disable-creeper-lingering-effect", false);
-         log("Creeper lingering effect: " + disableCreeperLingeringEffect);
-     }
-+
-+    public boolean antiXray;
-+    public boolean asynchronous;
-+    public EngineMode engineMode;
-+    public ChunkEdgeMode chunkEdgeMode;
-+    public int maxChunkSectionIndex;
-+    public int updateRadius;
-+    public List<Object> hiddenBlocks;
-+    public List<Object> replacementBlocks;
-+    private void antiXray() {
-+        antiXray = getBoolean("anti-xray.enabled", false);
-+        asynchronous = true;
-+        engineMode = EngineMode.getById(getInt("anti-xray.engine-mode", EngineMode.HIDE.getId()));
-+        engineMode = engineMode == null ? EngineMode.HIDE : engineMode;
-+        chunkEdgeMode = ChunkEdgeMode.getById(getInt("anti-xray.chunk-edge-mode", ChunkEdgeMode.DEFAULT.getId()));
-+        chunkEdgeMode = chunkEdgeMode == null ? ChunkEdgeMode.DEFAULT : chunkEdgeMode;
-+        maxChunkSectionIndex = getInt("anti-xray.max-chunk-section-index", 3);
-+        maxChunkSectionIndex = maxChunkSectionIndex > 15 ? 15 : maxChunkSectionIndex;
-+        updateRadius = getInt("anti-xray.update-radius", 2);
-+        hiddenBlocks = getList("anti-xray.hidden-blocks", Arrays.asList((Object) "gold_ore", "iron_ore", "coal_ore", "lapis_ore", "mossy_cobblestone", "obsidian", "chest", "diamond_ore", "redstone_ore", "lit_redstone_ore", "clay", "emerald_ore", "ender_chest"));
-+        replacementBlocks = getList("anti-xray.replacement-blocks", Arrays.asList((Object) "stone", "planks"));
-+        log("Anti-Xray: " + (antiXray ? "enabled" : "disabled") + " / Engine Mode: " + engineMode.getDescription() + " / Chunk Edge Mode: " + chunkEdgeMode.getDescription() + " / Up to " + ((maxChunkSectionIndex + 1) * 16) + " blocks / Update Radius: " + updateRadius);
-+    }
- }
-diff --git a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockController.java b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockController.java
-new file mode 100644
-index 000000000..6833cfad2
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockController.java
-@@ -0,0 +1,36 @@
-+package com.destroystokyo.paper.antixray;
-+
-+import net.minecraft.server.BlockPosition;
-+import net.minecraft.server.Chunk;
-+import net.minecraft.server.IBlockData;
-+import net.minecraft.server.PacketPlayOutMapChunk;
-+import net.minecraft.server.World;
-+
-+public class ChunkPacketBlockController {
-+
-+    public static final ChunkPacketBlockController NO_OPERATION_INSTANCE = new ChunkPacketBlockController();
-+
-+    protected ChunkPacketBlockController() {
-+        
-+    }
-+
-+    public IBlockData[] getPredefinedBlockData(Chunk chunk, int chunkSectionIndex) {
-+        return null;
-+    }
-+
-+    public boolean onChunkPacketCreate(Chunk chunk, int chunkSectionSelector, boolean force) {
-+        return true;
-+    }
-+
-+    public PacketPlayOutMapChunkInfo getPacketPlayOutMapChunkInfo(PacketPlayOutMapChunk packetPlayOutMapChunk, Chunk chunk, int chunkSectionSelector) {
-+        return null;
-+    }
-+
-+    public void modifyBlocks(PacketPlayOutMapChunk packetPlayOutMapChunk, PacketPlayOutMapChunkInfo packetPlayOutMapChunkInfo) {
-+        packetPlayOutMapChunk.setReady(true);
-+    }
-+
-+    public void updateNearbyBlocks(World world, BlockPosition blockPosition) {
-+
-+    }
-+}
-diff --git a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java
-new file mode 100644
-index 000000000..2dc0655a9
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java
-@@ -0,0 +1,640 @@
-+package com.destroystokyo.paper.antixray;
-+
-+import java.util.HashSet;
-+import java.util.Set;
-+import java.util.concurrent.Executors;
-+import java.util.concurrent.ExecutorService;
-+
-+import com.destroystokyo.paper.PaperWorldConfig;
-+
-+import net.minecraft.server.Block;
-+import net.minecraft.server.BlockPosition;
-+import net.minecraft.server.Blocks;
-+import net.minecraft.server.Chunk;
-+import net.minecraft.server.ChunkSection;
-+import net.minecraft.server.DataPalette;
-+import net.minecraft.server.DataPaletteBlock;
-+import net.minecraft.server.DataPaletteGlobal;
-+import net.minecraft.server.IBlockData;
-+import net.minecraft.server.PacketPlayOutMapChunk;
-+import net.minecraft.server.World;
-+
-+import org.bukkit.World.Environment;
-+
-+public class ChunkPacketBlockControllerAntiXray extends ChunkPacketBlockController {
-+
-+    private static ExecutorService executorServiceInstance = null;
-+    private final ExecutorService executorService;
-+    private final boolean asynchronous;
-+    private final EngineMode engineMode;
-+    private final ChunkEdgeMode chunkEdgeMode;
-+    private final int maxChunkSectionIndex;
-+    private final int updateRadius;
-+    private final IBlockData[] predefinedBlockData;
-+    private final IBlockData[] predefinedBlockDataStone;
-+    private final IBlockData[] predefinedBlockDataNetherrack;
-+    private final IBlockData[] predefinedBlockDataEndStone;
-+    private final int[] predefinedBlockDataBits;
-+    private final int[] predefinedBlockDataBitsGlobal;
-+    private final int[] predefinedBlockDataBitsStoneGlobal;
-+    private final int[] predefinedBlockDataBitsNetherrackGlobal;
-+    private final int[] predefinedBlockDataBitsEndStoneGlobal;
-+    private final boolean[] solidGlobal = new boolean[Block.REGISTRY_ID.size()];
-+    private final boolean[] obfuscateGlobal = new boolean[Block.REGISTRY_ID.size()];
-+    private final ChunkSection[] emptyNearbyChunkSections = {Chunk.EMPTY_CHUNK_SECTION, Chunk.EMPTY_CHUNK_SECTION, Chunk.EMPTY_CHUNK_SECTION, Chunk.EMPTY_CHUNK_SECTION};
-+
-+    public ChunkPacketBlockControllerAntiXray(PaperWorldConfig paperWorldConfig) {
-+        asynchronous = paperWorldConfig.asynchronous;
-+        engineMode = paperWorldConfig.engineMode;
-+        chunkEdgeMode = paperWorldConfig.chunkEdgeMode;
-+        maxChunkSectionIndex = paperWorldConfig.maxChunkSectionIndex;
-+        updateRadius = paperWorldConfig.updateRadius;
-+
-+        if (asynchronous) {
-+            executorService = getExecutorServiceInstance();
-+        } else {
-+            executorService = null;
-+        }
-+
-+        if (engineMode == EngineMode.HIDE) {
-+            predefinedBlockData = null;
-+            predefinedBlockDataStone = new IBlockData[] {Blocks.STONE.getBlockData()};
-+            predefinedBlockDataNetherrack = new IBlockData[] {Blocks.NETHERRACK.getBlockData()};
-+            predefinedBlockDataEndStone = new IBlockData[] {Blocks.END_STONE.getBlockData()};
-+            predefinedBlockDataBits = new int[] {1};
-+            predefinedBlockDataBitsGlobal = null;
-+            predefinedBlockDataBitsStoneGlobal = new int[] {Block.REGISTRY_ID.getId(Blocks.STONE.getBlockData())};
-+            predefinedBlockDataBitsNetherrackGlobal = new int[] {Block.REGISTRY_ID.getId(Blocks.NETHERRACK.getBlockData())};
-+            predefinedBlockDataBitsEndStoneGlobal = new int[] {Block.REGISTRY_ID.getId(Blocks.END_STONE.getBlockData())};
-+        } else {
-+            Set<IBlockData> predefinedBlockDataSet = new HashSet<IBlockData>();
-+
-+            for (Object id : paperWorldConfig.hiddenBlocks) {
-+                Block block = Block.getByName(String.valueOf(id));
-+
-+                if (block != null && !block.isTileEntity()) {
-+                    predefinedBlockDataSet.add(block.getBlockData());
-+                }
-+            }
-+
-+            predefinedBlockData = predefinedBlockDataSet.size() == 0 ? new IBlockData[] {Blocks.DIAMOND_ORE.getBlockData()} : predefinedBlockDataSet.toArray(new IBlockData[predefinedBlockDataSet.size()]);
-+            predefinedBlockDataStone = null;
-+            predefinedBlockDataNetherrack = null;
-+            predefinedBlockDataEndStone = null;
-+            predefinedBlockDataBits = new int[predefinedBlockData.length];
-+            predefinedBlockDataBitsGlobal = new int[predefinedBlockData.length];
-+            boolean containsDefaultBlockData = false;
-+
-+            for (int i = 0; i < predefinedBlockData.length; i++) {
-+                predefinedBlockDataBits[i] = containsDefaultBlockData ? i : (containsDefaultBlockData = predefinedBlockData[i] == DataPaletteBlock.DEFAULT_BLOCK_DATA) ? 0 : i + 1;
-+                predefinedBlockDataBitsGlobal[i] = Block.REGISTRY_ID.getId(predefinedBlockData[i]);
-+            }
-+
-+            predefinedBlockDataBitsStoneGlobal = null;
-+            predefinedBlockDataBitsNetherrackGlobal = null;
-+            predefinedBlockDataBitsEndStoneGlobal = null;
-+        }
-+
-+        for (Object id : (engineMode == EngineMode.HIDE) ? paperWorldConfig.hiddenBlocks : paperWorldConfig.replacementBlocks) {
-+            Block block = Block.getByName(String.valueOf(id));
-+
-+            if (block != null) {
-+                obfuscateGlobal[Block.REGISTRY_ID.getId(block.getBlockData())] = true;
-+            }
-+        }
-+
-+        for (int i = 0; i < solidGlobal.length; i++) {
-+            IBlockData blockData = Block.REGISTRY_ID.fromId(i);
-+
-+            if (blockData != null) {
-+                solidGlobal[i] = blockData.getBlock().isOccluding(blockData) && blockData.getBlock() != Blocks.MOB_SPAWNER && blockData.getBlock() != Blocks.BARRIER;
-+            }
-+        }
-+    }
-+
-+    private static ExecutorService getExecutorServiceInstance() {
-+        if (executorServiceInstance == null) {
-+            executorServiceInstance = Executors.newSingleThreadExecutor();
-+        }
-+
-+        return executorServiceInstance;
-+    }
-+
-+    @Override
-+    public IBlockData[] getPredefinedBlockData(Chunk chunk, int chunkSectionIndex) {
-+        //Return the block data which should be added to the data palettes so that they can be used for the obfuscation
-+        if (chunkSectionIndex <= maxChunkSectionIndex) {
-+            switch (engineMode) {
-+                case HIDE:
-+                    switch (chunk.world.getWorld().getEnvironment()) {
-+                        case NETHER:
-+                            return predefinedBlockDataNetherrack;
-+                        case THE_END:
-+                            return predefinedBlockDataEndStone;
-+                        default:
-+                            return predefinedBlockDataStone;
-+                    }
-+                default:
-+                    return predefinedBlockData;
-+            }
-+        }
-+
-+        return null;
-+    }
-+
-+    @Override
-+    public boolean onChunkPacketCreate(Chunk chunk, int chunkSectionSelector, boolean force) {
-+        //Load nearby chunks if necessary
-+        if (chunkEdgeMode == ChunkEdgeMode.WAIT && !force) {
-+            if (chunk.world.getChunkIfLoaded(chunk.locX - 1, chunk.locZ) == null || chunk.world.getChunkIfLoaded(chunk.locX + 1, chunk.locZ) == null || chunk.world.getChunkIfLoaded(chunk.locX, chunk.locZ - 1) == null || chunk.world.getChunkIfLoaded(chunk.locX, chunk.locZ + 1) == null) {
-+                //Don't create the chunk packet now, wait until nearby chunks are loaded and create it later
-+                return false;
-+            }
-+        } else if (chunkEdgeMode == ChunkEdgeMode.LOAD || chunkEdgeMode == ChunkEdgeMode.WAIT) {
-+            chunk.world.getChunkAt(chunk.locX - 1, chunk.locZ);
-+            chunk.world.getChunkAt(chunk.locX + 1, chunk.locZ);
-+            chunk.world.getChunkAt(chunk.locX, chunk.locZ - 1);
-+            chunk.world.getChunkAt(chunk.locX, chunk.locZ + 1);
-+        }
-+
-+        //Create the chunk packet now
-+        return true;
-+    }
-+
-+    @Override
-+    public PacketPlayOutMapChunkInfoAntiXray getPacketPlayOutMapChunkInfo(PacketPlayOutMapChunk packetPlayOutMapChunk, Chunk chunk, int chunkSectionSelector) {
-+        //Return a new instance to collect data and objects in the right state while creating the chunk packet for thread safe access later
-+        PacketPlayOutMapChunkInfoAntiXray packetPlayOutMapChunkInfoAntiXray = new PacketPlayOutMapChunkInfoAntiXray(packetPlayOutMapChunk, chunk, chunkSectionSelector, this);
-+        packetPlayOutMapChunkInfoAntiXray.setNearbyChunks(chunk.world.getChunkIfLoaded(chunk.locX - 1, chunk.locZ), chunk.world.getChunkIfLoaded(chunk.locX + 1, chunk.locZ), chunk.world.getChunkIfLoaded(chunk.locX, chunk.locZ - 1), chunk.world.getChunkIfLoaded(chunk.locX, chunk.locZ + 1));
-+        return packetPlayOutMapChunkInfoAntiXray;
-+    }
-+
-+    @Override
-+    public void modifyBlocks(PacketPlayOutMapChunk packetPlayOutMapChunk, PacketPlayOutMapChunkInfo packetPlayOutMapChunkInfo) {
-+        if (asynchronous) {
-+            executorService.submit((PacketPlayOutMapChunkInfoAntiXray) packetPlayOutMapChunkInfo);
-+        } else {
-+            obfuscate((PacketPlayOutMapChunkInfoAntiXray) packetPlayOutMapChunkInfo);
-+        }
-+    }
-+
-+    //Actually these fields should be variables inside the obfuscate method but in sync mode or with SingleThreadExecutor in async mode it's okay
-+    private final boolean[] solid = new boolean[Block.REGISTRY_ID.size()];
-+    private final boolean[] obfuscate = new boolean[Block.REGISTRY_ID.size()];
-+    //These boolean arrays represent chunk layers, true means don't obfuscate, false means obfuscate
-+    private boolean[][] current = new boolean[16][16];
-+    private boolean[][] next = new boolean[16][16];
-+    private boolean[][] nextNext = new boolean[16][16];
-+    private final DataBitsReader dataBitsReader = new DataBitsReader();
-+    private final DataBitsWriter dataBitsWriter = new DataBitsWriter();
-+    private final ChunkSection[] nearbyChunkSections = new ChunkSection[4];
-+
-+    public void obfuscate(PacketPlayOutMapChunkInfoAntiXray packetPlayOutMapChunkInfoAntiXray) {
-+        boolean[] solidTemp = null;
-+        boolean[] obfuscateTemp = null;
-+        dataBitsReader.setDataBits(packetPlayOutMapChunkInfoAntiXray.getData());
-+        dataBitsWriter.setDataBits(packetPlayOutMapChunkInfoAntiXray.getData());
-+        int counter = 0;
-+
-+        for (int chunkSectionIndex = 0; chunkSectionIndex <= maxChunkSectionIndex; chunkSectionIndex++) {
-+            if (packetPlayOutMapChunkInfoAntiXray.isWritten(chunkSectionIndex) && packetPlayOutMapChunkInfoAntiXray.getPredefinedBlockData(chunkSectionIndex) != null) {
-+                int[] predefinedBlockDataBitsTemp = packetPlayOutMapChunkInfoAntiXray.getDataPalette(chunkSectionIndex) instanceof DataPaletteGlobal ? engineMode == EngineMode.HIDE ? packetPlayOutMapChunkInfoAntiXray.getChunk().world.getWorld().getEnvironment() == Environment.NETHER ? predefinedBlockDataBitsNetherrackGlobal : packetPlayOutMapChunkInfoAntiXray.getChunk().world.getWorld().getEnvironment() == Environment.THE_END ? predefinedBlockDataBitsEndStoneGlobal : predefinedBlockDataBitsStoneGlobal : predefinedBlockDataBitsGlobal : predefinedBlockDataBits;
-+                dataBitsWriter.setIndex(packetPlayOutMapChunkInfoAntiXray.getDataBitsIndex(chunkSectionIndex));
-+
-+                //Check if the chunk section below was not obfuscated
-+                if (chunkSectionIndex == 0 || !packetPlayOutMapChunkInfoAntiXray.isWritten(chunkSectionIndex - 1) || packetPlayOutMapChunkInfoAntiXray.getPredefinedBlockData(chunkSectionIndex - 1) == null) {
-+                    //If so, initialize some stuff
-+                    dataBitsReader.setBitsPerValue(packetPlayOutMapChunkInfoAntiXray.getBitsPerValue(chunkSectionIndex));
-+                    dataBitsReader.setIndex(packetPlayOutMapChunkInfoAntiXray.getDataBitsIndex(chunkSectionIndex));
-+                    solidTemp = readDataPalette(packetPlayOutMapChunkInfoAntiXray.getDataPalette(chunkSectionIndex), solid, solidGlobal);
-+                    obfuscateTemp = readDataPalette(packetPlayOutMapChunkInfoAntiXray.getDataPalette(chunkSectionIndex), obfuscate, obfuscateGlobal);
-+                    //Read the blocks of the upper layer of the chunk section below if it exists
-+                    ChunkSection belowChunkSection = null;
-+                    boolean skipFirstLayer = chunkSectionIndex == 0 || (belowChunkSection = packetPlayOutMapChunkInfoAntiXray.getChunk().getSections()[chunkSectionIndex - 1]) == Chunk.EMPTY_CHUNK_SECTION;
-+
-+                    for (int z = 0; z < 16; z++) {
-+                        for (int x = 0; x < 16; x++) {
-+                            current[z][x] = true;
-+                            next[z][x] = skipFirstLayer || !solidGlobal[Block.REGISTRY_ID.getId(belowChunkSection.getType(x, 15, z))];
-+                        }
-+                    }
-+
-+                    //Abuse the obfuscateLayer method to read the blocks of the first layer of the current chunk section
-+                    dataBitsWriter.setBitsPerValue(0);
-+                    obfuscateLayer(-1, dataBitsReader, dataBitsWriter, solidTemp, obfuscateTemp, predefinedBlockDataBitsTemp, current, next, nextNext, emptyNearbyChunkSections, counter);
-+                }
-+
-+                dataBitsWriter.setBitsPerValue(packetPlayOutMapChunkInfoAntiXray.getBitsPerValue(chunkSectionIndex));
-+                nearbyChunkSections[0] = packetPlayOutMapChunkInfoAntiXray.getNearbyChunks()[0] == null ? Chunk.EMPTY_CHUNK_SECTION : packetPlayOutMapChunkInfoAntiXray.getNearbyChunks()[0].getSections()[chunkSectionIndex];
-+                nearbyChunkSections[1] = packetPlayOutMapChunkInfoAntiXray.getNearbyChunks()[1] == null ? Chunk.EMPTY_CHUNK_SECTION : packetPlayOutMapChunkInfoAntiXray.getNearbyChunks()[1].getSections()[chunkSectionIndex];
-+                nearbyChunkSections[2] = packetPlayOutMapChunkInfoAntiXray.getNearbyChunks()[2] == null ? Chunk.EMPTY_CHUNK_SECTION : packetPlayOutMapChunkInfoAntiXray.getNearbyChunks()[2].getSections()[chunkSectionIndex];
-+                nearbyChunkSections[3] = packetPlayOutMapChunkInfoAntiXray.getNearbyChunks()[3] == null ? Chunk.EMPTY_CHUNK_SECTION : packetPlayOutMapChunkInfoAntiXray.getNearbyChunks()[3].getSections()[chunkSectionIndex];
-+
-+                //Obfuscate all layers of the current chunk section except the upper one
-+                for (int y = 0; y < 15; y++) {
-+                    boolean[][] temp = current;
-+                    current = next;
-+                    next = nextNext;
-+                    nextNext = temp;
-+                    counter = obfuscateLayer(y, dataBitsReader, dataBitsWriter, solidTemp, obfuscateTemp, predefinedBlockDataBitsTemp, current, next, nextNext, nearbyChunkSections, counter);
-+                }
-+
-+                //Check if the chunk section above doesn't need obfuscation
-+                if (chunkSectionIndex == maxChunkSectionIndex || !packetPlayOutMapChunkInfoAntiXray.isWritten(chunkSectionIndex + 1) || packetPlayOutMapChunkInfoAntiXray.getPredefinedBlockData(chunkSectionIndex + 1) == null) {
-+                    //If so, obfuscate the upper layer of the current chunk section by reading blocks of the first layer from the chunk section above if it exists
-+                    ChunkSection aboveChunkSection;
-+
-+                    if (chunkSectionIndex != 15 && (aboveChunkSection = packetPlayOutMapChunkInfoAntiXray.getChunk().getSections()[chunkSectionIndex + 1]) != Chunk.EMPTY_CHUNK_SECTION) {
-+                        boolean[][] temp = current;
-+                        current = next;
-+                        next = nextNext;
-+                        nextNext = temp;
-+
-+                        for (int z = 0; z < 16; z++) {
-+                            for (int x = 0; x < 16; x++) {
-+                                if (!solidGlobal[Block.REGISTRY_ID.getId(aboveChunkSection.getType(x, 0, z))]) {
-+                                    current[z][x] = true;
-+                                }
-+                            }
-+                        }
-+
-+                        //There is nothing to read anymore
-+                        dataBitsReader.setBitsPerValue(0);
-+                        solid[0] = true;
-+                        counter = obfuscateLayer(15, dataBitsReader, dataBitsWriter, solid, obfuscateTemp, predefinedBlockDataBitsTemp, current, next, nextNext, nearbyChunkSections, counter);
-+                    }
-+                } else {
-+                    //If not, initialize the reader and other stuff for the chunk section above to obfuscate the upper layer of the current chunk section
-+                    dataBitsReader.setBitsPerValue(packetPlayOutMapChunkInfoAntiXray.getBitsPerValue(chunkSectionIndex + 1));
-+                    dataBitsReader.setIndex(packetPlayOutMapChunkInfoAntiXray.getDataBitsIndex(chunkSectionIndex + 1));
-+                    solidTemp = readDataPalette(packetPlayOutMapChunkInfoAntiXray.getDataPalette(chunkSectionIndex + 1), solid, solidGlobal);
-+                    obfuscateTemp = readDataPalette(packetPlayOutMapChunkInfoAntiXray.getDataPalette(chunkSectionIndex + 1), obfuscate, obfuscateGlobal);
-+                    boolean[][] temp = current;
-+                    current = next;
-+                    next = nextNext;
-+                    nextNext = temp;
-+                    counter = obfuscateLayer(15, dataBitsReader, dataBitsWriter, solidTemp, obfuscateTemp, predefinedBlockDataBitsTemp, current, next, nextNext, nearbyChunkSections, counter);
-+                }
-+
-+                dataBitsWriter.finish();
-+            }
-+        }
-+
-+        packetPlayOutMapChunkInfoAntiXray.getPacketPlayOutMapChunk().setReady(true);
-+    }
-+
-+    private int obfuscateLayer(int y, DataBitsReader dataBitsReader, DataBitsWriter dataBitsWriter, boolean[] solid, boolean[] obfuscate, int[] predefinedBlockDataBits, boolean[][] current, boolean[][] next, boolean[][] nextNext, ChunkSection[] nearbyChunkSections, int counter) {
-+        //First block of first line
-+        int dataBits = dataBitsReader.read();
-+
-+        if (nextNext[0][0] = !solid[dataBits]) {
-+            dataBitsWriter.skip();
-+            next[0][1] = true;
-+            next[1][0] = true;
-+        } else {
-+            if (nearbyChunkSections[2] == Chunk.EMPTY_CHUNK_SECTION || !solidGlobal[Block.REGISTRY_ID.getId(nearbyChunkSections[2].getType(0, y, 15))] || nearbyChunkSections[0] == Chunk.EMPTY_CHUNK_SECTION || !solidGlobal[Block.REGISTRY_ID.getId(nearbyChunkSections[0].getType(15, y, 0))] || current[0][0]) {
-+                dataBitsWriter.skip();
-+            } else {
-+                if (counter >= predefinedBlockDataBits.length) {
-+                    counter = 0;
-+                }
-+
-+                dataBitsWriter.write(predefinedBlockDataBits[counter++]);
-+            }
-+        }
-+
-+        if (!obfuscate[dataBits]) {
-+            next[0][0] = true;
-+        }
-+
-+        //First line
-+        for (int x = 1; x < 15; x++) {
-+            dataBits = dataBitsReader.read();
-+
-+            if (nextNext[0][x] = !solid[dataBits]) {
-+                dataBitsWriter.skip();
-+                next[0][x - 1] = true;
-+                next[0][x + 1] = true;
-+                next[1][x] = true;
-+            } else {
-+                if (nearbyChunkSections[2] == Chunk.EMPTY_CHUNK_SECTION || !solidGlobal[Block.REGISTRY_ID.getId(nearbyChunkSections[2].getType(x, y, 15))] || current[0][x]) {
-+                    dataBitsWriter.skip();
-+                } else {
-+                    if (counter >= predefinedBlockDataBits.length) {
-+                        counter = 0;
-+                    }
-+
-+                    dataBitsWriter.write(predefinedBlockDataBits[counter++]);
-+                }
-+            }
-+
-+            if (!obfuscate[dataBits]) {
-+                next[0][x] = true;
-+            }
-+        }
-+
-+        //Last block of first line
-+        dataBits = dataBitsReader.read();
-+
-+        if (nextNext[0][15] = !solid[dataBits]) {
-+            dataBitsWriter.skip();
-+            next[0][14] = true;
-+            next[1][15] = true;
-+        } else {
-+            if (nearbyChunkSections[2] == Chunk.EMPTY_CHUNK_SECTION || !solidGlobal[Block.REGISTRY_ID.getId(nearbyChunkSections[2].getType(15, y, 15))] || nearbyChunkSections[1] == Chunk.EMPTY_CHUNK_SECTION || !solidGlobal[Block.REGISTRY_ID.getId(nearbyChunkSections[1].getType(0, y, 0))] || current[0][15]) {
-+                dataBitsWriter.skip();
-+            } else {
-+                if (counter >= predefinedBlockDataBits.length) {
-+                    counter = 0;
-+                }
-+
-+                dataBitsWriter.write(predefinedBlockDataBits[counter++]);
-+            }
-+        }
-+
-+        if (!obfuscate[dataBits]) {
-+            next[0][15] = true;
-+        }
-+
-+        //All inner lines
-+        for (int z = 1; z < 15; z++) {
-+            //First block
-+            dataBits = dataBitsReader.read();
-+
-+            if (nextNext[z][0] = !solid[dataBits]) {
-+                dataBitsWriter.skip();
-+                next[z][1] = true;
-+                next[z - 1][0] = true;
-+                next[z + 1][0] = true;
-+            } else {
-+                if (nearbyChunkSections[0] == Chunk.EMPTY_CHUNK_SECTION || !solidGlobal[Block.REGISTRY_ID.getId(nearbyChunkSections[0].getType(15, y, z))] || current[z][0]) {
-+                    dataBitsWriter.skip();
-+                } else {
-+                    if (counter >= predefinedBlockDataBits.length) {
-+                        counter = 0;
-+                    }
-+
-+                    dataBitsWriter.write(predefinedBlockDataBits[counter++]);
-+                }
-+            }
-+
-+            if (!obfuscate[dataBits]) {
-+                next[z][0] = true;
-+            }
-+
-+            //All inner blocks
-+            for (int x = 1; x < 15; x++) {
-+                dataBits = dataBitsReader.read();
-+
-+                if (nextNext[z][x] = !solid[dataBits]) {
-+                    dataBitsWriter.skip();
-+                    next[z][x - 1] = true;
-+                    next[z][x + 1] = true;
-+                    next[z - 1][x] = true;
-+                    next[z + 1][x] = true;
-+                } else {
-+                    if (current[z][x]) {
-+                        dataBitsWriter.skip();
-+                    } else {
-+                        if (counter >= predefinedBlockDataBits.length) {
-+                            counter = 0;
-+                        }
-+
-+                        dataBitsWriter.write(predefinedBlockDataBits[counter++]);
-+                    }
-+                }
-+
-+                if (!obfuscate[dataBits]) {
-+                    next[z][x] = true;
-+                }
-+            }
-+
-+            //Last block
-+            dataBits = dataBitsReader.read();
-+
-+            if (nextNext[z][15] = !solid[dataBits]) {
-+                dataBitsWriter.skip();
-+                next[z][14] = true;
-+                next[z - 1][15] = true;
-+                next[z + 1][15] = true;
-+            } else {
-+                if (nearbyChunkSections[1] == Chunk.EMPTY_CHUNK_SECTION || !solidGlobal[Block.REGISTRY_ID.getId(nearbyChunkSections[1].getType(0, y, z))] || current[z][15]) {
-+                    dataBitsWriter.skip();
-+                } else {
-+                    if (counter >= predefinedBlockDataBits.length) {
-+                        counter = 0;
-+                    }
-+
-+                    dataBitsWriter.write(predefinedBlockDataBits[counter++]);
-+                }
-+            }
-+
-+            if (!obfuscate[dataBits]) {
-+                next[z][15] = true;
-+            }
-+        }
-+
-+        //First block of last line
-+        dataBits = dataBitsReader.read();
-+
-+        if (nextNext[15][0] = !solid[dataBits]) {
-+            dataBitsWriter.skip();
-+            next[15][1] = true;
-+            next[14][0] = true;
-+        } else {
-+            if (nearbyChunkSections[3] == Chunk.EMPTY_CHUNK_SECTION || !solidGlobal[Block.REGISTRY_ID.getId(nearbyChunkSections[3].getType(0, y, 0))] || nearbyChunkSections[0] == Chunk.EMPTY_CHUNK_SECTION || !solidGlobal[Block.REGISTRY_ID.getId(nearbyChunkSections[0].getType(15, y, 15))] || current[15][0]) {
-+                dataBitsWriter.skip();
-+            } else {
-+                if (counter >= predefinedBlockDataBits.length) {
-+                    counter = 0;
-+                }
-+
-+                dataBitsWriter.write(predefinedBlockDataBits[counter++]);
-+            }
-+        }
-+
-+        if (!obfuscate[dataBits]) {
-+            next[15][0] = true;
-+        }
-+
-+        //Last line
-+        for (int x = 1; x < 15; x++) {
-+            dataBits = dataBitsReader.read();
-+
-+            if (nextNext[15][x] = !solid[dataBits]) {
-+                dataBitsWriter.skip();
-+                next[15][x - 1] = true;
-+                next[15][x + 1] = true;
-+                next[14][x] = true;
-+            } else {
-+                if (nearbyChunkSections[3] == Chunk.EMPTY_CHUNK_SECTION || !solidGlobal[Block.REGISTRY_ID.getId(nearbyChunkSections[3].getType(x, y, 0))] || current[15][x]) {
-+                    dataBitsWriter.skip();
-+                } else {
-+                    if (counter >= predefinedBlockDataBits.length) {
-+                        counter = 0;
-+                    }
-+
-+                    dataBitsWriter.write(predefinedBlockDataBits[counter++]);
-+                }
-+            }
-+
-+            if (!obfuscate[dataBits]) {
-+                next[15][x] = true;
-+            }
-+        }
-+
-+        //Last block of last line
-+        dataBits = dataBitsReader.read();
-+
-+        if (nextNext[15][15] = !solid[dataBits]) {
-+            dataBitsWriter.skip();
-+            next[15][14] = true;
-+            next[14][15] = true;
-+        } else {
-+            if (nearbyChunkSections[3] == Chunk.EMPTY_CHUNK_SECTION || !solidGlobal[Block.REGISTRY_ID.getId(nearbyChunkSections[3].getType(15, y, 0))] || nearbyChunkSections[1] == Chunk.EMPTY_CHUNK_SECTION || !solidGlobal[Block.REGISTRY_ID.getId(nearbyChunkSections[1].getType(0, y, 15))] || current[15][15]) {
-+                dataBitsWriter.skip();
-+            } else {
-+                if (counter >= predefinedBlockDataBits.length) {
-+                    counter = 0;
-+                }
-+
-+                dataBitsWriter.write(predefinedBlockDataBits[counter++]);
-+            }
-+        }
-+
-+        if (!obfuscate[dataBits]) {
-+            next[15][15] = true;
-+        }
-+
-+        return counter;
-+    }
-+
-+    private boolean[] readDataPalette(DataPalette dataPalette, boolean[] temp, boolean[] global) {
-+        if (dataPalette instanceof DataPaletteGlobal) {
-+            return global;
-+        }
-+
-+        IBlockData blockData;
-+
-+        for (int i = 0; (blockData = dataPalette.getBlockData(i)) != null; i++) {
-+            temp[i] = global[Block.REGISTRY_ID.getId(blockData)];
-+        }
-+
-+        return temp;
-+    }
-+
-+    @Override
-+    public void updateNearbyBlocks(World world, BlockPosition blockPosition) {
-+        if (updateRadius >= 2) {
-+            BlockPosition temp = blockPosition.west();
-+            updateBlock(world, temp);
-+            updateBlock(world, temp.west());
-+            updateBlock(world, temp.down());
-+            updateBlock(world, temp.up());
-+            updateBlock(world, temp.north());
-+            updateBlock(world, temp.south());
-+            updateBlock(world, temp = blockPosition.east());
-+            updateBlock(world, temp.east());
-+            updateBlock(world, temp.down());
-+            updateBlock(world, temp.up());
-+            updateBlock(world, temp.north());
-+            updateBlock(world, temp.south());
-+            updateBlock(world, temp = blockPosition.down());
-+            updateBlock(world, temp.down());
-+            updateBlock(world, temp.north());
-+            updateBlock(world, temp.south());
-+            updateBlock(world, temp = blockPosition.up());
-+            updateBlock(world, temp.up());
-+            updateBlock(world, temp.north());
-+            updateBlock(world, temp.south());
-+            updateBlock(world, temp = blockPosition.north());
-+            updateBlock(world, temp.north());
-+            updateBlock(world, temp = blockPosition.south());
-+            updateBlock(world, temp.south());
-+        } else if (updateRadius == 1) {
-+            updateBlock(world, blockPosition.west());
-+            updateBlock(world, blockPosition.east());
-+            updateBlock(world, blockPosition.down());
-+            updateBlock(world, blockPosition.up());
-+            updateBlock(world, blockPosition.north());
-+            updateBlock(world, blockPosition.south());
-+        } else {
-+            //Do nothing if updateRadius <= 0 (test mode)
-+        }
-+    }
-+
-+    private void updateBlock(World world, BlockPosition blockPosition) {
-+        if (world.isLoaded(blockPosition)) {
-+            IBlockData blockData = world.getType(blockPosition);
-+
-+            if (obfuscateGlobal[Block.REGISTRY_ID.getId(blockData)]) {
-+                world.notify(blockPosition, blockData, blockData, 3);
-+            }
-+        }
-+    }
-+
-+    public enum EngineMode {
-+
-+        HIDE(1, "hide ores"),
-+        OBFUSCATE(2, "obfuscate");
-+
-+        private final int id;
-+        private final String description;
-+
-+        EngineMode(int id, String description) {
-+            this.id = id;
-+            this.description = description;
-+        }
-+
-+        public static EngineMode getById(int id) {
-+            for (EngineMode engineMode : values()) {
-+                if (engineMode.id == id) {
-+                    return engineMode;
-+                }
-+            }
-+
-+            return null;
-+        }
-+
-+        public int getId() {
-+            return id;
-+        }
-+
-+        public String getDescription() {
-+            return description;
-+        }
-+    }
-+
-+    public enum ChunkEdgeMode {
-+
-+        DEFAULT(1, "default"),
-+        WAIT(2, "wait until nearby chunks are loaded"),
-+        LOAD(3, "load nearby chunks");
-+
-+        private final int id;
-+        private final String description;
-+
-+        ChunkEdgeMode(int id, String description) {
-+            this.id = id;
-+            this.description = description;
-+        }
-+
-+        public static ChunkEdgeMode getById(int id) {
-+            for (ChunkEdgeMode chunkEdgeMode : values()) {
-+                if (chunkEdgeMode.id == id) {
-+                    return chunkEdgeMode;
-+                }
-+            }
-+
-+            return null;
-+        }
-+
-+        public int getId() {
-+            return id;
-+        }
-+
-+        public String getDescription() {
-+            return description;
-+        }
-+    }
-+}
-diff --git a/src/main/java/com/destroystokyo/paper/antixray/DataBitsReader.java b/src/main/java/com/destroystokyo/paper/antixray/DataBitsReader.java
-new file mode 100644
-index 000000000..92399318c
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/antixray/DataBitsReader.java
-@@ -0,0 +1,56 @@
-+package com.destroystokyo.paper.antixray;
-+
-+public class DataBitsReader {
-+
-+    private byte[] dataBits;
-+    private int bitsPerValue;
-+    private int mask;
-+    private int longInDataBitsIndex;
-+    private int bitInLongIndex;
-+    private long current;
-+
-+    public void setDataBits(byte[] dataBits) {
-+        this.dataBits = dataBits;
-+    }
-+
-+    public void setBitsPerValue(int bitsPerValue) {
-+        this.bitsPerValue = bitsPerValue;
-+        mask = (1 << bitsPerValue) - 1;
-+    }
-+
-+    public void setIndex(int index) {
-+        this.longInDataBitsIndex = index;
-+        bitInLongIndex = 0;
-+        init();
-+    }
-+
-+    private void init() {
-+        if (dataBits.length > longInDataBitsIndex + 7) {
-+            current = ((((long) dataBits[longInDataBitsIndex]) << 56)
-+                    | (((long) dataBits[longInDataBitsIndex + 1] & 0xff) << 48)
-+                    | (((long) dataBits[longInDataBitsIndex + 2] & 0xff) << 40)
-+                    | (((long) dataBits[longInDataBitsIndex + 3] & 0xff) << 32)
-+                    | (((long) dataBits[longInDataBitsIndex + 4] & 0xff) << 24)
-+                    | (((long) dataBits[longInDataBitsIndex + 5] & 0xff) << 16)
-+                    | (((long) dataBits[longInDataBitsIndex + 6] & 0xff) << 8)
-+                    | (((long) dataBits[longInDataBitsIndex + 7] & 0xff)));
-+        }
-+    }
-+
-+    public int read() {
-+        int value = (int) (current >>> bitInLongIndex) & mask;
-+        bitInLongIndex += bitsPerValue;
-+
-+        if (bitInLongIndex > 63) {
-+            bitInLongIndex -= 64;
-+            longInDataBitsIndex += 8;
-+            init();
-+
-+            if (bitInLongIndex > 0) {
-+                value |= current << bitsPerValue - bitInLongIndex & mask;
-+            }
-+        }
-+
-+        return value;
-+    }
-+}
-diff --git a/src/main/java/com/destroystokyo/paper/antixray/DataBitsWriter.java b/src/main/java/com/destroystokyo/paper/antixray/DataBitsWriter.java
-new file mode 100644
-index 000000000..aca0b9d71
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/antixray/DataBitsWriter.java
-@@ -0,0 +1,84 @@
-+package com.destroystokyo.paper.antixray;
-+
-+public class DataBitsWriter {
-+
-+    private byte[] dataBits;
-+    private int bitsPerValue;
-+    private long mask;
-+    private int longInDataBitsIndex;
-+    private int bitInLongIndex;
-+    private long current;
-+    private boolean dirty;
-+
-+    public void setDataBits(byte[] dataBits) {
-+        this.dataBits = dataBits;
-+    }
-+
-+    public void setBitsPerValue(int bitsPerValue) {
-+        this.bitsPerValue = bitsPerValue;
-+        mask = (1 << bitsPerValue) - 1;
-+    }
-+
-+    public void setIndex(int index) {
-+        this.longInDataBitsIndex = index;
-+        bitInLongIndex = 0;
-+        init();
-+    }
-+
-+    private void init() {
-+        if (dataBits.length > longInDataBitsIndex + 7) {
-+            current = ((((long) dataBits[longInDataBitsIndex]) << 56)
-+                    | (((long) dataBits[longInDataBitsIndex + 1] & 0xff) << 48)
-+                    | (((long) dataBits[longInDataBitsIndex + 2] & 0xff) << 40)
-+                    | (((long) dataBits[longInDataBitsIndex + 3] & 0xff) << 32)
-+                    | (((long) dataBits[longInDataBitsIndex + 4] & 0xff) << 24)
-+                    | (((long) dataBits[longInDataBitsIndex + 5] & 0xff) << 16)
-+                    | (((long) dataBits[longInDataBitsIndex + 6] & 0xff) << 8)
-+                    | (((long) dataBits[longInDataBitsIndex + 7] & 0xff)));
-+        }
-+
-+        dirty = false;
-+    }
-+
-+    public void finish() {
-+        if (dirty && dataBits.length > longInDataBitsIndex + 7) {
-+            dataBits[longInDataBitsIndex] = (byte) (current >> 56 & 0xff);
-+            dataBits[longInDataBitsIndex + 1] = (byte) (current >> 48 & 0xff);
-+            dataBits[longInDataBitsIndex + 2] = (byte) (current >> 40 & 0xff);
-+            dataBits[longInDataBitsIndex + 3] = (byte) (current >> 32 & 0xff);
-+            dataBits[longInDataBitsIndex + 4] = (byte) (current >> 24 & 0xff);
-+            dataBits[longInDataBitsIndex + 5] = (byte) (current >> 16 & 0xff);
-+            dataBits[longInDataBitsIndex + 6] = (byte) (current >> 8 & 0xff);
-+            dataBits[longInDataBitsIndex + 7] = (byte) (current & 0xff);
-+        }
-+    }
-+
-+    public void write(int value) {
-+        current = current & ~(mask << bitInLongIndex) | (value & mask) << bitInLongIndex;
-+        dirty = true;
-+        bitInLongIndex += bitsPerValue;
-+
-+        if (bitInLongIndex > 63) {
-+            finish();
-+            bitInLongIndex -= 64;
-+            longInDataBitsIndex += 8;
-+            init();
-+
-+            if (bitInLongIndex > 0) {
-+                current = current & ~(mask >>> bitsPerValue - bitInLongIndex) | (value & mask) >>> bitsPerValue - bitInLongIndex;
-+                dirty = true;
-+            }
-+        }
-+    }
-+
-+    public void skip() {
-+        bitInLongIndex += bitsPerValue;
-+
-+        if (bitInLongIndex > 63) {
-+            finish();
-+            bitInLongIndex -= 64;
-+            longInDataBitsIndex += 8;
-+            init();
-+        }
-+    }
-+}
-diff --git a/src/main/java/com/destroystokyo/paper/antixray/PacketPlayOutMapChunkInfo.java b/src/main/java/com/destroystokyo/paper/antixray/PacketPlayOutMapChunkInfo.java
-new file mode 100644
-index 000000000..0bd269a07
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/antixray/PacketPlayOutMapChunkInfo.java
-@@ -0,0 +1,80 @@
-+package com.destroystokyo.paper.antixray;
-+
-+import net.minecraft.server.Chunk;
-+import net.minecraft.server.DataPalette;
-+import net.minecraft.server.IBlockData;
-+import net.minecraft.server.PacketPlayOutMapChunk;
-+
-+public class PacketPlayOutMapChunkInfo {
-+
-+    private final PacketPlayOutMapChunk packetPlayOutMapChunk;
-+    private final Chunk chunk;
-+    private final int chunkSectionSelector;
-+    private byte[] data;
-+    private final int[] bitsPerValue = new int[16];
-+    private final DataPalette[] dataPalettes = new DataPalette[16];
-+    private final int[] dataBitsIndexes = new int[16];
-+    private final IBlockData[][] predefinedBlockData = new IBlockData[16][];
-+
-+    public PacketPlayOutMapChunkInfo(PacketPlayOutMapChunk packetPlayOutMapChunk, Chunk chunk, int chunkSectionSelector) {
-+        this.packetPlayOutMapChunk = packetPlayOutMapChunk;
-+        this.chunk = chunk;
-+        this.chunkSectionSelector = chunkSectionSelector;
-+    }
-+
-+    public PacketPlayOutMapChunk getPacketPlayOutMapChunk() {
-+        return packetPlayOutMapChunk;
-+    }
-+
-+    public Chunk getChunk() {
-+        return chunk;
-+    }
-+
-+    public int getChunkSectionSelector() {
-+        return chunkSectionSelector;
-+    }
-+
-+    public byte[] getData() {
-+        return data;
-+    }
-+
-+    public void setData(byte[] data) {
-+        this.data = data;
-+    }
-+
-+    public int getBitsPerValue(int chunkSectionIndex) {
-+        return bitsPerValue[chunkSectionIndex];
-+    }
-+
-+    public void setBitsPerValue(int chunkSectionIndex, int bitsPerValue) {
-+        this.bitsPerValue[chunkSectionIndex] = bitsPerValue;
-+    }
-+
-+    public DataPalette getDataPalette(int chunkSectionIndex) {
-+        return dataPalettes[chunkSectionIndex];
-+    }
-+
-+    public void setDataPalette(int chunkSectionIndex, DataPalette dataPalette) {
-+        dataPalettes[chunkSectionIndex] = dataPalette;
-+    }
-+
-+    public int getDataBitsIndex(int chunkSectionIndex) {
-+        return dataBitsIndexes[chunkSectionIndex];
-+    }
-+
-+    public void setDataBitsIndex(int chunkSectionIndex, int dataBitsIndex) {
-+        dataBitsIndexes[chunkSectionIndex] = dataBitsIndex;
-+    }
-+
-+    public IBlockData[] getPredefinedBlockData(int chunkSectionIndex) {
-+        return predefinedBlockData[chunkSectionIndex];
-+    }
-+
-+    public void setPredefinedBlockData(int chunkSectionIndex, IBlockData[] predefinedBlockData) {
-+        this.predefinedBlockData[chunkSectionIndex] = predefinedBlockData;
-+    }
-+
-+    public boolean isWritten(int chunkSectionIndex) {
-+        return bitsPerValue[chunkSectionIndex] != 0;
-+    }
-+}
-diff --git a/src/main/java/com/destroystokyo/paper/antixray/PacketPlayOutMapChunkInfoAntiXray.java b/src/main/java/com/destroystokyo/paper/antixray/PacketPlayOutMapChunkInfoAntiXray.java
-new file mode 100644
-index 000000000..8ea2beb59
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/antixray/PacketPlayOutMapChunkInfoAntiXray.java
-@@ -0,0 +1,28 @@
-+package com.destroystokyo.paper.antixray;
-+
-+import net.minecraft.server.Chunk;
-+import net.minecraft.server.PacketPlayOutMapChunk;
-+
-+public class PacketPlayOutMapChunkInfoAntiXray extends PacketPlayOutMapChunkInfo implements Runnable {
-+
-+    private Chunk[] nearbyChunks;
-+    private final ChunkPacketBlockControllerAntiXray chunkPacketBlockControllerAntiXray;
-+
-+    public PacketPlayOutMapChunkInfoAntiXray(PacketPlayOutMapChunk packetPlayOutMapChunk, Chunk chunk, int chunkSectionSelector, ChunkPacketBlockControllerAntiXray chunkPacketBlockControllerAntiXray) {
-+        super(packetPlayOutMapChunk, chunk, chunkSectionSelector);
-+        this.chunkPacketBlockControllerAntiXray = chunkPacketBlockControllerAntiXray;
-+    }
-+
-+    public Chunk[] getNearbyChunks() {
-+        return nearbyChunks;
-+    }
-+
-+    public void setNearbyChunks(Chunk... nearbyChunks) {
-+        this.nearbyChunks = nearbyChunks;
-+    }
-+
-+    @Override
-+    public void run() {
-+        chunkPacketBlockControllerAntiXray.obfuscate(this);
-+    }
-+}
-diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index fedc38dc1..a96a2a28d 100644
---- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-@@ -862,7 +862,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
-         for (int i = 0; i < nbttaglist.size(); ++i) {
-             NBTTagCompound nbttagcompound = nbttaglist.getCompound(i);
-             byte b0 = nbttagcompound.getByte("Y");
--            ChunkSection chunksection = new ChunkSection(b0 << 4, flag1);
-+            ChunkSection chunksection = new ChunkSection(b0 << 4, flag1, world.chunkPacketBlockController.getPredefinedBlockData(chunk, b0)); // Paper - Anti-Xray - Add predefined block data
- 
-             chunksection.getBlocks().a(nbttagcompound, "Palette", "BlockStates");
-             chunksection.a(new NibbleArray(nbttagcompound.getByteArray("BlockLight")));
-diff --git a/src/main/java/net/minecraft/server/DataBits.java b/src/main/java/net/minecraft/server/DataBits.java
-index 0fb3162e6..54df71404 100644
---- a/src/main/java/net/minecraft/server/DataBits.java
-+++ b/src/main/java/net/minecraft/server/DataBits.java
-@@ -60,6 +60,7 @@ public class DataBits {
-         }
-     }
- 
-+    public long[] getDataBits() { return this.a(); } // Paper - Anti-Xray - OBFHELPER
-     public long[] a() {
-         return this.a;
-     }
-diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-index c4a25bd87..b92432d50 100644
---- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
-+++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-@@ -75,6 +75,7 @@ public class EntityFallingBlock extends Entity {
-                 blockposition = new BlockPosition(this);
-                 if (this.world.getType(blockposition).getBlock() == block && !CraftEventFactory.callEntityChangeBlockEvent(this, blockposition, Blocks.AIR.getBlockData()).isCancelled()) {
-                     this.world.setAir(blockposition);
-+                    this.world.chunkPacketBlockController.updateNearbyBlocks(this.world, blockposition); // Paper - Anti-Xray
-                 } else if (!this.world.isClientSide) {
-                     this.die();
-                     return;
-@@ -140,6 +141,7 @@ public class EntityFallingBlock extends Entity {
-                                     return;
-                                 }
-                                 this.world.setTypeAndData(blockposition, this.block, 3);
-+                                this.world.chunkPacketBlockController.updateNearbyBlocks(this.world, blockposition); // Paper - Anti-Xray
-                                 // CraftBukkit end
-                                 if (block instanceof BlockFalling) {
-                                     ((BlockFalling) block).a(this.world, blockposition, this.block, iblockdata);
-diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
-index 2652b1575..09f90450a 100644
---- a/src/main/java/net/minecraft/server/Explosion.java
-+++ b/src/main/java/net/minecraft/server/Explosion.java
-@@ -234,6 +234,7 @@ public class Explosion {
-                 blockposition = (BlockPosition) iterator.next();
-                 IBlockData iblockdata = this.world.getType(blockposition);
-                 Block block = iblockdata.getBlock();
-+                this.world.chunkPacketBlockController.updateNearbyBlocks(this.world, blockposition); // Paper - Anti-Xray
- 
-                 if (flag) {
-                     double d0 = (double) ((float) blockposition.getX() + this.world.random.nextFloat());
-diff --git a/src/main/java/net/minecraft/server/PacketDataSerializer.java b/src/main/java/net/minecraft/server/PacketDataSerializer.java
-index d04afceb7..02ab42a64 100644
---- a/src/main/java/net/minecraft/server/PacketDataSerializer.java
-+++ b/src/main/java/net/minecraft/server/PacketDataSerializer.java
-@@ -33,6 +33,7 @@ public class PacketDataSerializer extends ByteBuf {
-         this.a = bytebuf;
-     }
- 
-+    public static int countBytes(int i) { return PacketDataSerializer.a(i); } // Paper - Anti-Xray - OBFHELPER
-     public static int a(int i) {
-         for (int j = 1; j < 5; ++j) {
-             if ((i & -1 << j * 7) == 0) {
-diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index 344b95233..32b790397 100644
---- a/src/main/java/net/minecraft/server/PlayerChunk.java
-+++ b/src/main/java/net/minecraft/server/PlayerChunk.java
-@@ -108,6 +108,8 @@ public class PlayerChunk {
-             return false;
-         } else if (!this.chunk.isReady()) {
-             return false;
-+        } else if (!this.chunk.world.chunkPacketBlockController.onChunkPacketCreate(this.chunk, '\uffff', false)) { // Paper - Anti-Xray - Load nearby chunks if necessary
-+            return false; // Paper - Anti-Xray - Wait and try again later
-         } else {
-             this.dirtyCount = 0;
-             this.h = 0;
-@@ -128,6 +130,7 @@ public class PlayerChunk {
- 
-     public void sendChunk(EntityPlayer entityplayer) {
-         if (this.done) {
-+            this.chunk.world.chunkPacketBlockController.onChunkPacketCreate(this.chunk, '\uffff', true); // Paper - Anti-Xray - Load nearby chunks if necessary
-             entityplayer.playerConnection.sendPacket(new PacketPlayOutMapChunk(this.chunk, '\uffff'));
-             this.playerChunkMap.getWorld().getTracker().a(entityplayer, this.chunk);
-         }
-@@ -192,6 +195,8 @@ public class PlayerChunk {
-                         this.a(this.playerChunkMap.getWorld().getTileEntity(blockposition));
-                     }
-                 } else if (this.dirtyCount == 64) {
-+                    // Paper - Anti-Xray - Loading chunks here could cause a ConcurrentModificationException #1104
-+                    //this.chunk.world.chunkPacketBlockController.onChunkPacketCreate(this.chunk, this.h, true); // Paper - Anti-Xray - Load nearby chunks if necessary
-                     this.a((Packet) (new PacketPlayOutMapChunk(this.chunk, this.h)));
-                 } else {
-                     this.a((Packet) (new PacketPlayOutMultiBlockChange(this.dirtyCount, this.dirtyBlocks, this.chunk)));
-diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index e34198e40..ce8f76871 100644
---- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
-+++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-@@ -201,6 +201,8 @@ public class PlayerInteractManager {
-             }
- 
-         }
-+
-+        this.world.chunkPacketBlockController.updateNearbyBlocks(this.world, blockposition); // Paper - Anti-Xray
-     }
- 
-     public void a(BlockPosition blockposition) {
-diff --git a/src/main/java/net/minecraft/server/RegistryBlockID.java b/src/main/java/net/minecraft/server/RegistryBlockID.java
-index ef332d651..35c3edca4 100644
---- a/src/main/java/net/minecraft/server/RegistryBlockID.java
-+++ b/src/main/java/net/minecraft/server/RegistryBlockID.java
-@@ -56,6 +56,7 @@ public class RegistryBlockID<T> implements Registry<T> {
-         return Iterators.filter(this.c.iterator(), Predicates.notNull());
-     }
- 
-+    public int size() { return this.a(); } // Paper - Anti-Xray - OBFHELPER
-     public int a() {
-         return this.b.size();
-     }
-diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 49e7c1589..62fd2e503 100644
---- a/src/main/java/net/minecraft/server/World.java
-+++ b/src/main/java/net/minecraft/server/World.java
-@@ -39,6 +39,8 @@ import org.bukkit.generator.ChunkGenerator;
- // CraftBukkit end
- // Paper start
- import java.util.Set;
-+import com.destroystokyo.paper.antixray.ChunkPacketBlockController; // Anti-Xray
-+import com.destroystokyo.paper.antixray.ChunkPacketBlockControllerAntiXray; // Anti-Xray
- import com.google.common.collect.Sets;
- // Paper end
- public abstract class World implements GeneratorAccess, IIBlockAccess, AutoCloseable {
-@@ -136,6 +138,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
-     public final org.spigotmc.SpigotWorldConfig spigotConfig; // Spigot
- 
-     public final com.destroystokyo.paper.PaperWorldConfig paperConfig; // Paper
-+    public final ChunkPacketBlockController chunkPacketBlockController; // Paper - Anti-Xray
- 
-     public final co.aikar.timings.WorldTimingsHandler timings; // Paper
-     private boolean guardEntityList; // Spigot
-@@ -161,6 +164,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
-     protected World(IDataManager idatamanager, WorldData worlddata, WorldProvider worldprovider, MethodProfiler methodprofiler, boolean flag, ChunkGenerator gen, org.bukkit.World.Environment env) {
-         this.spigotConfig = new org.spigotmc.SpigotWorldConfig( worlddata.getName() ); // Spigot
-         this.paperConfig = new com.destroystokyo.paper.PaperWorldConfig(worlddata.getName(), this.spigotConfig); // Paper
-+        this.chunkPacketBlockController = this.paperConfig.antiXray ? new ChunkPacketBlockControllerAntiXray(this.paperConfig) : ChunkPacketBlockController.NO_OPERATION_INSTANCE; // Paper - Anti-Xray
-         this.generator = gen;
-         this.world = new CraftWorld((WorldServer) this, gen, env);
-         this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
-@@ -500,6 +504,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
-             ((IWorldAccess) this.v.get(j)).a(this, blockposition, iblockdata, iblockdata1, i);
-         }
- 
-+        this.chunkPacketBlockController.updateNearbyBlocks(this, blockposition); // Paper - Anti-Xray
-     }
- 
-     public void update(BlockPosition blockposition, Block block) {
--- 
-2.18.0
-
diff --git a/Spigot-Server-Patches/0214-Include-Log4J2-SLF4J-implementation.patch b/Spigot-Server-Patches/0211-Include-Log4J2-SLF4J-implementation.patch
similarity index 87%
rename from Spigot-Server-Patches/0214-Include-Log4J2-SLF4J-implementation.patch
rename to Spigot-Server-Patches/0211-Include-Log4J2-SLF4J-implementation.patch
index 40f5861a19..9f1d8cf8c7 100644
--- a/Spigot-Server-Patches/0214-Include-Log4J2-SLF4J-implementation.patch
+++ b/Spigot-Server-Patches/0211-Include-Log4J2-SLF4J-implementation.patch
@@ -1,11 +1,11 @@
-From a42bf6eda3c9b215f4cd88153370471bcb7c1588 Mon Sep 17 00:00:00 2001
+From edb75eca4cd2549499d4475155065a2e73d4b9c0 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Thu, 21 Sep 2017 16:33:35 +0200
 Subject: [PATCH] Include Log4J2 SLF4J implementation
 
 
 diff --git a/pom.xml b/pom.xml
-index a98abca8e..9354f6edf 100644
+index eb2cdf129..353a5560e 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -91,6 +91,12 @@
diff --git a/Spigot-Server-Patches/0215-Disable-logger-prefix-for-various-plugins-bypassing-.patch b/Spigot-Server-Patches/0212-Disable-logger-prefix-for-various-plugins-bypassing-.patch
similarity index 97%
rename from Spigot-Server-Patches/0215-Disable-logger-prefix-for-various-plugins-bypassing-.patch
rename to Spigot-Server-Patches/0212-Disable-logger-prefix-for-various-plugins-bypassing-.patch
index 93ffd4eb0d..e84d0ea243 100644
--- a/Spigot-Server-Patches/0215-Disable-logger-prefix-for-various-plugins-bypassing-.patch
+++ b/Spigot-Server-Patches/0212-Disable-logger-prefix-for-various-plugins-bypassing-.patch
@@ -1,4 +1,4 @@
-From b008d0b333f3e32534337fb21f75c9f69ee42298 Mon Sep 17 00:00:00 2001
+From f0482df655443d55ca6c3af38ad3fdc16e60273b 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/0216-Add-PlayerJumpEvent.patch b/Spigot-Server-Patches/0213-Add-PlayerJumpEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0216-Add-PlayerJumpEvent.patch
rename to Spigot-Server-Patches/0213-Add-PlayerJumpEvent.patch
index d48db6436b..70a5eb21b1 100644
--- a/Spigot-Server-Patches/0216-Add-PlayerJumpEvent.patch
+++ b/Spigot-Server-Patches/0213-Add-PlayerJumpEvent.patch
@@ -1,4 +1,4 @@
-From 7cc2935836c4f7c33e12958c81a9855b0e087540 Mon Sep 17 00:00:00 2001
+From dd4f541fca1b685e85db063ff2813f6d552cb262 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
@@ -17,7 +17,7 @@ index f08c0ba60..1b944abea 100644
          super.cG();
          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 bf549bfed..25c38f3bb 100644
+index 383ef87ba..480b93aa0 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/0217-handle-PacketPlayInKeepAlive-async.patch b/Spigot-Server-Patches/0214-handle-PacketPlayInKeepAlive-async.patch
similarity index 92%
rename from Spigot-Server-Patches/0217-handle-PacketPlayInKeepAlive-async.patch
rename to Spigot-Server-Patches/0214-handle-PacketPlayInKeepAlive-async.patch
index c9b5679ad6..16314c9032 100644
--- a/Spigot-Server-Patches/0217-handle-PacketPlayInKeepAlive-async.patch
+++ b/Spigot-Server-Patches/0214-handle-PacketPlayInKeepAlive-async.patch
@@ -1,4 +1,4 @@
-From 178e48e8c8947d049eff7f417a7ad7bce60abcf3 Mon Sep 17 00:00:00 2001
+From 05eb39bf369cc2a0267af54bead833e5fccfec1e Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Thu, 5 Oct 2017 01:54:07 +0100
 Subject: [PATCH] handle PacketPlayInKeepAlive async
@@ -15,10 +15,10 @@ also adding some additional logging in order to help work out what is causing
 random disconnections for clients.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 2255b8ccb..20bac8bc3 100644
+index 480b93aa0..9f7443ef0 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2465,14 +2465,18 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2470,14 +2470,18 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
      }
  
      public void a(PacketPlayInKeepAlive packetplayinkeepalive) {
diff --git a/Spigot-Server-Patches/0218-Expose-client-protocol-version-and-virtual-host.patch b/Spigot-Server-Patches/0215-Expose-client-protocol-version-and-virtual-host.patch
similarity index 98%
rename from Spigot-Server-Patches/0218-Expose-client-protocol-version-and-virtual-host.patch
rename to Spigot-Server-Patches/0215-Expose-client-protocol-version-and-virtual-host.patch
index 7d8ec0e044..7070c28631 100644
--- a/Spigot-Server-Patches/0218-Expose-client-protocol-version-and-virtual-host.patch
+++ b/Spigot-Server-Patches/0215-Expose-client-protocol-version-and-virtual-host.patch
@@ -1,4 +1,4 @@
-From 5b0a2495dcd70a2f5d5930a2d2b77eb42476b696 Mon Sep 17 00:00:00 2001
+From 3541b3881a5ed15147bc2f89d8802dd32b52249b Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Tue, 10 Oct 2017 18:45:20 +0200
 Subject: [PATCH] Expose client protocol version and virtual host
@@ -111,7 +111,7 @@ index 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 d7eb4af83..9f9002dd8 100644
+index 019fd4b48..43e357e39 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -175,6 +175,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0219-revert-serverside-behavior-of-keepalives.patch b/Spigot-Server-Patches/0216-revert-serverside-behavior-of-keepalives.patch
similarity index 92%
rename from Spigot-Server-Patches/0219-revert-serverside-behavior-of-keepalives.patch
rename to Spigot-Server-Patches/0216-revert-serverside-behavior-of-keepalives.patch
index b2b510b320..7886df176c 100644
--- a/Spigot-Server-Patches/0219-revert-serverside-behavior-of-keepalives.patch
+++ b/Spigot-Server-Patches/0216-revert-serverside-behavior-of-keepalives.patch
@@ -1,4 +1,4 @@
-From 0c1e2c1ae8251496de7141704807b7c6f7ee82fd Mon Sep 17 00:00:00 2001
+From 536039aa33410910fde48d002df8528fa25c3db0 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 15 Oct 2017 00:29:07 +0100
 Subject: [PATCH] revert serverside behavior of keepalives
@@ -17,7 +17,7 @@ from networking or during connections flood of chunk packets on slower clients,
  at the cost of dead connections being kept open for longer.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 20bac8bc3..4f9b4afdf 100644
+index 9f7443ef0..7e96c4eb4 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -69,7 +69,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -25,7 +25,7 @@ index 20bac8bc3..4f9b4afdf 100644
      public EntityPlayer player;
      private int e;
 -    private long f; private void setLastPing(long lastPing) { this.f = lastPing;}; private long getLastPing() { return this.f;}; // Paper - OBFHELPER
-+    private long f = getCurrentMillis(); private void setLastPing(long lastPing) { this.f = lastPing;}; private long getLastPing() { return this.f;}; // Paper - OBFHELPER - set ping to delay initial
++    private long f = System.currentTimeMillis(); private void setLastPing(long lastPing) { this.f = lastPing;}; private long getLastPing() { return this.f;}; // Paper - OBFHELPER - set ping to delay initial
      private boolean g; private void setPendingPing(boolean isPending) { this.g = isPending;}; private boolean isPendingPing() { return this.g;}; // Paper - OBFHELPER
      private long h; private void setKeepAliveID(long keepAliveID) { this.h = keepAliveID;}; private long getKeepAliveID() {return this.h; };  // Paper - OBFHELPER
      // CraftBukkit start - multithreaded fields
diff --git a/Spigot-Server-Patches/0220-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch b/Spigot-Server-Patches/0217-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch
similarity index 95%
rename from Spigot-Server-Patches/0220-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch
rename to Spigot-Server-Patches/0217-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch
index f422c5388b..8e6b230f73 100644
--- a/Spigot-Server-Patches/0220-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch
+++ b/Spigot-Server-Patches/0217-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch
@@ -1,4 +1,4 @@
-From e4db85ca803dca548540899a64b1a3cb998a9f34 Mon Sep 17 00:00:00 2001
+From 02485329579ce13c80b522e35a9dbf9602e0d82e 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/0221-Send-attack-SoundEffects-only-to-players-who-can-see.patch b/Spigot-Server-Patches/0218-Send-attack-SoundEffects-only-to-players-who-can-see.patch
similarity index 96%
rename from Spigot-Server-Patches/0221-Send-attack-SoundEffects-only-to-players-who-can-see.patch
rename to Spigot-Server-Patches/0218-Send-attack-SoundEffects-only-to-players-who-can-see.patch
index 0dbcdc9d44..c4ec08e7d0 100644
--- a/Spigot-Server-Patches/0221-Send-attack-SoundEffects-only-to-players-who-can-see.patch
+++ b/Spigot-Server-Patches/0218-Send-attack-SoundEffects-only-to-players-who-can-see.patch
@@ -1,4 +1,4 @@
-From 93f41c5654fff04e051aa2e2879a0dc47d58eb36 Mon Sep 17 00:00:00 2001
+From 6ded5c4dfe33c7a2da270fb889d550c0f89afcc2 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 8cf082d2e..34e79e7ca 100644
+index 1b944abea..ae4dd621d 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,10 +72,10 @@ index 8cf082d2e..34e79e7ca 100644
                              entity.extinguish();
                          }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 62fd2e503..b9472dddb 100644
+index d0ce6b363..56292fad9 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -921,6 +921,12 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
+@@ -916,6 +916,12 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
          this.a(entityhuman, (double) blockposition.getX() + 0.5D, (double) blockposition.getY() + 0.5D, (double) blockposition.getZ() + 0.5D, soundeffect, soundcategory, f, f1);
      }
  
diff --git a/Spigot-Server-Patches/0222-Option-for-maximum-exp-value-when-merging-orbs.patch b/Spigot-Server-Patches/0219-Option-for-maximum-exp-value-when-merging-orbs.patch
similarity index 80%
rename from Spigot-Server-Patches/0222-Option-for-maximum-exp-value-when-merging-orbs.patch
rename to Spigot-Server-Patches/0219-Option-for-maximum-exp-value-when-merging-orbs.patch
index 4a1996ab95..c6c966b6f3 100644
--- a/Spigot-Server-Patches/0222-Option-for-maximum-exp-value-when-merging-orbs.patch
+++ b/Spigot-Server-Patches/0219-Option-for-maximum-exp-value-when-merging-orbs.patch
@@ -1,16 +1,16 @@
-From c52d751e0ac64d6c3226967fade0c7f8a3477abb Mon Sep 17 00:00:00 2001
+From 15caeb73f605a58c3988eba2faba786ec1de8850 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 10 Nov 2017 23:03:12 -0500
 Subject: [PATCH] Option for maximum exp value when merging orbs
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 6344537ec..33743f8fd 100644
+index c80d84b9b..605e84173 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -387,4 +387,10 @@ public class PaperWorldConfig {
-         replacementBlocks = getList("anti-xray.replacement-blocks", Arrays.asList((Object) "stone", "planks"));
-         log("Anti-Xray: " + (antiXray ? "enabled" : "disabled") + " / Engine Mode: " + engineMode.getDescription() + " / Chunk Edge Mode: " + chunkEdgeMode.getDescription() + " / Up to " + ((maxChunkSectionIndex + 1) * 16) + " blocks / Update Radius: " + updateRadius);
+@@ -361,4 +361,10 @@ public class PaperWorldConfig {
+         disableCreeperLingeringEffect = getBoolean("disable-creeper-lingering-effect", false);
+         log("Creeper lingering effect: " + disableCreeperLingeringEffect);
      }
 +
 +    public int expMergeMaxValue;
@@ -20,10 +20,10 @@ index 6344537ec..33743f8fd 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index b9472dddb..d28d4a9a7 100644
+index 56292fad9..d5c509733 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -999,16 +999,30 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
+@@ -994,16 +994,30 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
              EntityExperienceOrb xp = (EntityExperienceOrb) entity;
              double radius = spigotConfig.expMerge;
              if (radius > 0) {
diff --git a/Spigot-Server-Patches/0223-Add-PlayerArmorChangeEvent.patch b/Spigot-Server-Patches/0220-Add-PlayerArmorChangeEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0223-Add-PlayerArmorChangeEvent.patch
rename to Spigot-Server-Patches/0220-Add-PlayerArmorChangeEvent.patch
index d9cea86ad0..bf55875be5 100644
--- a/Spigot-Server-Patches/0223-Add-PlayerArmorChangeEvent.patch
+++ b/Spigot-Server-Patches/0220-Add-PlayerArmorChangeEvent.patch
@@ -1,4 +1,4 @@
-From 568b43a97065e32c9d26cf7c18f800f92ea1a2e6 Mon Sep 17 00:00:00 2001
+From 3ffcf52cb5875fb50fbb430a6f295b4aa78a7c4e 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/0224-Prevent-logins-from-being-processed-when-the-player-.patch b/Spigot-Server-Patches/0221-Prevent-logins-from-being-processed-when-the-player-.patch
similarity index 94%
rename from Spigot-Server-Patches/0224-Prevent-logins-from-being-processed-when-the-player-.patch
rename to Spigot-Server-Patches/0221-Prevent-logins-from-being-processed-when-the-player-.patch
index 570605b594..2574c762d0 100644
--- a/Spigot-Server-Patches/0224-Prevent-logins-from-being-processed-when-the-player-.patch
+++ b/Spigot-Server-Patches/0221-Prevent-logins-from-being-processed-when-the-player-.patch
@@ -1,4 +1,4 @@
-From 4f82679db4ed81dfc4163a485d432942cf91b666 Mon Sep 17 00:00:00 2001
+From 9bdee54edd28ee7085c421af0183d3b196c9954e Mon Sep 17 00:00:00 2001
 From: killme <killme-git@ibts.me>
 Date: Sun, 12 Nov 2017 19:40:01 +0100
 Subject: [PATCH] Prevent logins from being processed when the player has
diff --git a/Spigot-Server-Patches/0225-use-CB-BlockState-implementations-for-captured-block.patch b/Spigot-Server-Patches/0222-use-CB-BlockState-implementations-for-captured-block.patch
similarity index 91%
rename from Spigot-Server-Patches/0225-use-CB-BlockState-implementations-for-captured-block.patch
rename to Spigot-Server-Patches/0222-use-CB-BlockState-implementations-for-captured-block.patch
index a02b098eb8..62da1619b4 100644
--- a/Spigot-Server-Patches/0225-use-CB-BlockState-implementations-for-captured-block.patch
+++ b/Spigot-Server-Patches/0222-use-CB-BlockState-implementations-for-captured-block.patch
@@ -1,4 +1,4 @@
-From 2cd84e469938fb0e15b04c28eadcfeadb4c52116 Mon Sep 17 00:00:00 2001
+From bd84d6b81f6ed4ad32b47fca3e98a50dac4b1822 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Thu, 16 Nov 2017 12:12:41 +0000
 Subject: [PATCH] use CB BlockState implementations for captured blocks
@@ -18,10 +18,10 @@ the blockstate that will be valid for restoration, as opposed to dropping
 information on restoration when the event is cancelled.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index d28d4a9a7..069ba83db 100644
+index d5c509733..b96511804 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -378,7 +378,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
+@@ -374,7 +374,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
              // CraftBukkit start - capture blockstates
              CraftBlockState blockstate = null;
              if (this.captureBlockStates) {
diff --git a/Spigot-Server-Patches/0226-API-to-get-a-BlockState-without-a-snapshot.patch b/Spigot-Server-Patches/0223-API-to-get-a-BlockState-without-a-snapshot.patch
similarity index 97%
rename from Spigot-Server-Patches/0226-API-to-get-a-BlockState-without-a-snapshot.patch
rename to Spigot-Server-Patches/0223-API-to-get-a-BlockState-without-a-snapshot.patch
index 8f3c53032e..7d0f77ea4c 100644
--- a/Spigot-Server-Patches/0226-API-to-get-a-BlockState-without-a-snapshot.patch
+++ b/Spigot-Server-Patches/0223-API-to-get-a-BlockState-without-a-snapshot.patch
@@ -1,4 +1,4 @@
-From f8f600aca85e9770c953f6264c789d368377cee3 Mon Sep 17 00:00:00 2001
+From 94d006f44ba2bb5da02873d81d82a0f0fe833300 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,10 +39,10 @@ index 2cfe2202e..909432d51 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 bfed2d988..d1eea2133 100644
+index bbf7b5088..c94b5c817 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 {
+@@ -263,6 +263,20 @@ public class CraftBlock implements Block {
      }
  
      public BlockState getState() {
diff --git a/Spigot-Server-Patches/0227-AsyncTabCompleteEvent.patch b/Spigot-Server-Patches/0224-AsyncTabCompleteEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0227-AsyncTabCompleteEvent.patch
rename to Spigot-Server-Patches/0224-AsyncTabCompleteEvent.patch
index 63a1be1a0f..9b522cc50a 100644
--- a/Spigot-Server-Patches/0227-AsyncTabCompleteEvent.patch
+++ b/Spigot-Server-Patches/0224-AsyncTabCompleteEvent.patch
@@ -1,4 +1,4 @@
-From 4d3673f412e0f7bffbe4535345d9710736aa3899 Mon Sep 17 00:00:00 2001
+From 9b2ecdc4d560d69dfd41dad01498207a3ef040f9 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 d47805962..ea29b1b2a 100644
+index 7e96c4eb4..ab2bd6dae 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -504,18 +504,59 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
diff --git a/Spigot-Server-Patches/0228-Avoid-NPE-in-PathfinderGoalTempt.patch b/Spigot-Server-Patches/0225-Avoid-NPE-in-PathfinderGoalTempt.patch
similarity index 93%
rename from Spigot-Server-Patches/0228-Avoid-NPE-in-PathfinderGoalTempt.patch
rename to Spigot-Server-Patches/0225-Avoid-NPE-in-PathfinderGoalTempt.patch
index 2141448224..de264175cf 100644
--- a/Spigot-Server-Patches/0228-Avoid-NPE-in-PathfinderGoalTempt.patch
+++ b/Spigot-Server-Patches/0225-Avoid-NPE-in-PathfinderGoalTempt.patch
@@ -1,4 +1,4 @@
-From fe8bfba5b4261ca168861e7015077de0f245c2db Mon Sep 17 00:00:00 2001
+From 66b8e5de50e36ee6f046f28135d963376827f17e 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/0229-PlayerPickupExperienceEvent.patch b/Spigot-Server-Patches/0226-PlayerPickupExperienceEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0229-PlayerPickupExperienceEvent.patch
rename to Spigot-Server-Patches/0226-PlayerPickupExperienceEvent.patch
index b3d8959314..18338e14c7 100644
--- a/Spigot-Server-Patches/0229-PlayerPickupExperienceEvent.patch
+++ b/Spigot-Server-Patches/0226-PlayerPickupExperienceEvent.patch
@@ -1,4 +1,4 @@
-From b4d0bde98db80bfe668ce7aaa663f0a28ab6f7b7 Mon Sep 17 00:00:00 2001
+From 8bed7b19ff45041aeeb92705f05366a3b2a15cff 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/0230-ExperienceOrbMergeEvent.patch b/Spigot-Server-Patches/0227-ExperienceOrbMergeEvent.patch
similarity index 89%
rename from Spigot-Server-Patches/0230-ExperienceOrbMergeEvent.patch
rename to Spigot-Server-Patches/0227-ExperienceOrbMergeEvent.patch
index d65430714c..c0ee601c88 100644
--- a/Spigot-Server-Patches/0230-ExperienceOrbMergeEvent.patch
+++ b/Spigot-Server-Patches/0227-ExperienceOrbMergeEvent.patch
@@ -1,4 +1,4 @@
-From 74074907e815897a829332df3e128f981cf653a1 Mon Sep 17 00:00:00 2001
+From be8638c45049455649276f1af83033d7eb7760d2 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,10 +8,10 @@ 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 069ba83db..ee061d693 100644
+index b96511804..d8ce3efc9 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1008,7 +1008,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
+@@ -1003,7 +1003,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
                  for (Entity e : entities) {
                      if (e instanceof EntityExperienceOrb) {
                          EntityExperienceOrb loopItem = (EntityExperienceOrb) e;
diff --git a/Spigot-Server-Patches/0231-Ability-to-apply-mending-to-XP-API.patch b/Spigot-Server-Patches/0228-Ability-to-apply-mending-to-XP-API.patch
similarity index 89%
rename from Spigot-Server-Patches/0231-Ability-to-apply-mending-to-XP-API.patch
rename to Spigot-Server-Patches/0228-Ability-to-apply-mending-to-XP-API.patch
index 9279803606..5c849a7ebc 100644
--- a/Spigot-Server-Patches/0231-Ability-to-apply-mending-to-XP-API.patch
+++ b/Spigot-Server-Patches/0228-Ability-to-apply-mending-to-XP-API.patch
@@ -1,4 +1,4 @@
-From 07b82eb3e7d10b50aedf8b73f80d3952fd65536c Mon Sep 17 00:00:00 2001
+From efe7ce57afb0a73e514ce0c788a111757e7ac7ae Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 20 Dec 2017 17:36:49 -0500
 Subject: [PATCH] Ability to apply mending to XP API
@@ -52,7 +52,7 @@ index 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 9f9002dd8..c2cd5ac4b 100644
+index 43e357e39..7021a81be 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -970,8 +970,39 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -65,10 +65,10 @@ index 9f9002dd8..c2cd5ac4b 100644
 +    public int applyMending(int amount) {
 +        EntityPlayer handle = getHandle();
 +        // Logic copied from EntityExperienceOrb and remapped to unobfuscated methods/properties
-+        ItemStack itemstack = EnchantmentManager.getRandomEquippedItemWithEnchant(Enchantments.MENDING, handle);
-+        if (!itemstack.isEmpty() && itemstack.hasDamage()) {
++        net.minecraft.server.ItemStack itemstack = net.minecraft.server.EnchantmentManager.getRandomEquippedItemWithEnchant(net.minecraft.server.Enchantments.MENDING, handle);
++        if (!itemstack.isEmpty() && itemstack.getItem().usesDurability()) {
 +
-+            EntityExperienceOrb orb = new EntityExperienceOrb(handle.world);
++            net.minecraft.server.EntityExperienceOrb orb = new net.minecraft.server.EntityExperienceOrb(handle.world);
 +            orb.value = amount;
 +            orb.spawnReason = org.bukkit.entity.ExperienceOrb.SpawnReason.CUSTOM;
 +            orb.locX = handle.locX;
diff --git a/Spigot-Server-Patches/0232-Configurable-Chunks-Sends-per-Tick-setting.patch b/Spigot-Server-Patches/0229-Configurable-Chunks-Sends-per-Tick-setting.patch
similarity index 91%
rename from Spigot-Server-Patches/0232-Configurable-Chunks-Sends-per-Tick-setting.patch
rename to Spigot-Server-Patches/0229-Configurable-Chunks-Sends-per-Tick-setting.patch
index 3c19be3dde..5e917c3629 100644
--- a/Spigot-Server-Patches/0232-Configurable-Chunks-Sends-per-Tick-setting.patch
+++ b/Spigot-Server-Patches/0229-Configurable-Chunks-Sends-per-Tick-setting.patch
@@ -1,4 +1,4 @@
-From b317d6346419650c31540d2e7d2998107dabe890 Mon Sep 17 00:00:00 2001
+From f833988ed04cab6d37a5e4fe6e0e011709bb0444 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,10 +8,10 @@ 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 33743f8fd..49f282332 100644
+index 605e84173..703642c0b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -393,4 +393,13 @@ public class PaperWorldConfig {
+@@ -367,4 +367,13 @@ public class PaperWorldConfig {
          expMergeMaxValue = getInt("experience-merge-max-value", -1);
          log("Experience Merge Max Value: " + expMergeMaxValue);
      }
diff --git a/Spigot-Server-Patches/0233-Make-max-squid-spawn-height-configurable.patch b/Spigot-Server-Patches/0230-Make-max-squid-spawn-height-configurable.patch
similarity index 93%
rename from Spigot-Server-Patches/0233-Make-max-squid-spawn-height-configurable.patch
rename to Spigot-Server-Patches/0230-Make-max-squid-spawn-height-configurable.patch
index ac984ec185..f988d9e677 100644
--- a/Spigot-Server-Patches/0233-Make-max-squid-spawn-height-configurable.patch
+++ b/Spigot-Server-Patches/0230-Make-max-squid-spawn-height-configurable.patch
@@ -1,4 +1,4 @@
-From 23aceaa82824bf66c20245da5ec07a076fb92ee4 Mon Sep 17 00:00:00 2001
+From a7d52d9da454870e13059c9cee1ea2b09943c662 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,10 +7,10 @@ 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 49f282332..d80cd60ab 100644
+index 703642c0b..a33c55f41 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -402,4 +402,21 @@ public class PaperWorldConfig {
+@@ -376,4 +376,21 @@ public class PaperWorldConfig {
          }
          log("Max Chunk Sends Per Tick: " + maxChunkSendsPerTick);
      }
diff --git a/Spigot-Server-Patches/0234-PreCreatureSpawnEvent.patch b/Spigot-Server-Patches/0231-PreCreatureSpawnEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0234-PreCreatureSpawnEvent.patch
rename to Spigot-Server-Patches/0231-PreCreatureSpawnEvent.patch
index 5f2929d2ca..260691a08e 100644
--- a/Spigot-Server-Patches/0234-PreCreatureSpawnEvent.patch
+++ b/Spigot-Server-Patches/0231-PreCreatureSpawnEvent.patch
@@ -1,4 +1,4 @@
-From 171f872bb3e15d27684344335d6b651520cd303d Mon Sep 17 00:00:00 2001
+From 6e4911557836aeeaf25a0ee89018de637d0149a9 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/0235-PlayerNaturallySpawnCreaturesEvent.patch b/Spigot-Server-Patches/0232-PlayerNaturallySpawnCreaturesEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0235-PlayerNaturallySpawnCreaturesEvent.patch
rename to Spigot-Server-Patches/0232-PlayerNaturallySpawnCreaturesEvent.patch
index f017711fc7..1c7a7787cc 100644
--- a/Spigot-Server-Patches/0235-PlayerNaturallySpawnCreaturesEvent.patch
+++ b/Spigot-Server-Patches/0232-PlayerNaturallySpawnCreaturesEvent.patch
@@ -1,4 +1,4 @@
-From ac250076349e8ce8ab3869b3cb1d653036d1b90c Mon Sep 17 00:00:00 2001
+From d3c65296d8baec00ffccc097fbd32c984eda341e 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/0236-Add-SkullMeta.setPlayerProfile-API.patch b/Spigot-Server-Patches/0233-Add-SkullMeta.setPlayerProfile-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0236-Add-SkullMeta.setPlayerProfile-API.patch
rename to Spigot-Server-Patches/0233-Add-SkullMeta.setPlayerProfile-API.patch
index 5437736050..f9904783ab 100644
--- a/Spigot-Server-Patches/0236-Add-SkullMeta.setPlayerProfile-API.patch
+++ b/Spigot-Server-Patches/0233-Add-SkullMeta.setPlayerProfile-API.patch
@@ -1,4 +1,4 @@
-From 8091a3d4dafb4742d6c378f6f222321cf2e89eb3 Mon Sep 17 00:00:00 2001
+From 50b9db3c2112d6d203c3ba1d3ce14e0e494e3c44 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
diff --git a/Spigot-Server-Patches/0237-Fill-Profile-Property-Events.patch b/Spigot-Server-Patches/0234-Fill-Profile-Property-Events.patch
similarity index 96%
rename from Spigot-Server-Patches/0237-Fill-Profile-Property-Events.patch
rename to Spigot-Server-Patches/0234-Fill-Profile-Property-Events.patch
index 04da12fb3c..0ece840c7d 100644
--- a/Spigot-Server-Patches/0237-Fill-Profile-Property-Events.patch
+++ b/Spigot-Server-Patches/0234-Fill-Profile-Property-Events.patch
@@ -1,4 +1,4 @@
-From 0da84cefeb2c91c603e41defbf16bd6d35b1dc9e Mon Sep 17 00:00:00 2001
+From 4e3afed7ad46f7fb12501512b3b056d43845b225 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/0238-PlayerAdvancementCriterionGrantEvent.patch b/Spigot-Server-Patches/0235-PlayerAdvancementCriterionGrantEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0238-PlayerAdvancementCriterionGrantEvent.patch
rename to Spigot-Server-Patches/0235-PlayerAdvancementCriterionGrantEvent.patch
index 5b8d317eeb..0e2b81d2de 100644
--- a/Spigot-Server-Patches/0238-PlayerAdvancementCriterionGrantEvent.patch
+++ b/Spigot-Server-Patches/0235-PlayerAdvancementCriterionGrantEvent.patch
@@ -1,4 +1,4 @@
-From b46830ad887a5f55ea011faaf83b99d8f9a69da1 Mon Sep 17 00:00:00 2001
+From 746b48fb737927fc6f25497d06fdbb40ef59be9b 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/0239-Add-ArmorStand-Item-Meta.patch b/Spigot-Server-Patches/0236-Add-ArmorStand-Item-Meta.patch
similarity index 96%
rename from Spigot-Server-Patches/0239-Add-ArmorStand-Item-Meta.patch
rename to Spigot-Server-Patches/0236-Add-ArmorStand-Item-Meta.patch
index 6b9aa2c441..9ff4b2c843 100644
--- a/Spigot-Server-Patches/0239-Add-ArmorStand-Item-Meta.patch
+++ b/Spigot-Server-Patches/0236-Add-ArmorStand-Item-Meta.patch
@@ -1,4 +1,4 @@
-From 54dbc7e31f0938139214ce0e2591c9589ab7f119 Mon Sep 17 00:00:00 2001
+From 3cdab27e9d5d15730d83f109ca6428e725e80c5e 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
@@ -40,20 +40,24 @@ index cadff64bf..b1e0d6185 100644
              case TRAPPED_CHEST:
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java
 new file mode 100644
-index 000000000..dc372f6db
+index 000000000..30941c7b0
 --- /dev/null
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java
-@@ -0,0 +1,305 @@
+@@ -0,0 +1,309 @@
 +package org.bukkit.craftbukkit.inventory;
 +
 +import com.destroystokyo.paper.inventory.meta.ArmorStandMeta;
 +import com.google.common.collect.ImmutableMap;
++import com.mojang.datafixers.Dynamic;
++
 +import net.minecraft.server.DataConverterTypes;
++import net.minecraft.server.DynamicOpsNBT;
 +import net.minecraft.server.MinecraftServer;
 +import net.minecraft.server.NBTBase;
 +import net.minecraft.server.NBTTagCompound;
 +import org.bukkit.Material;
 +import org.bukkit.configuration.serialization.DelegateDeserialization;
++import org.bukkit.craftbukkit.util.CraftMagicNumbers;
 +
 +import java.util.Map;
 +
@@ -220,7 +224,7 @@ index 000000000..dc372f6db
 +
 +        if (tag.hasKey(ENTITY_TAG.NBT)) {
 +            entityTag = tag.getCompound(ENTITY_TAG.NBT);
-+            MinecraftServer.getServer().dataConverterManager.a(DataConverterTypes.ENTITY, entityTag); // PAIL: convert
++            MinecraftServer.getServer().dataConverterManager.update(DataConverterTypes.ENTITY, new Dynamic(DynamicOpsNBT.a, entityTag), -1, CraftMagicNumbers.DATA_VERSION);
 +
 +            if (entityTag.hasKey(INVISIBLE.NBT)) {
 +                invisible = entityTag.getBoolean(INVISIBLE.NBT);
@@ -343,7 +347,7 @@ index 000000000..dc372f6db
 +        CraftMetaArmorStand clone = (CraftMetaArmorStand) super.clone();
 +
 +        if (entityTag != null) {
-+            clone.entityTag = entityTag.g();
++            clone.entityTag = entityTag.clone();
 +        }
 +
 +        return clone;
diff --git a/Spigot-Server-Patches/0240-Extend-Player-Interact-cancellation.patch b/Spigot-Server-Patches/0237-Extend-Player-Interact-cancellation.patch
similarity index 95%
rename from Spigot-Server-Patches/0240-Extend-Player-Interact-cancellation.patch
rename to Spigot-Server-Patches/0237-Extend-Player-Interact-cancellation.patch
index bc44753599..a9617aeea1 100644
--- a/Spigot-Server-Patches/0240-Extend-Player-Interact-cancellation.patch
+++ b/Spigot-Server-Patches/0237-Extend-Player-Interact-cancellation.patch
@@ -1,4 +1,4 @@
-From 2693e4099bc86fa04f9ea27d357ba5fe079d0133 Mon Sep 17 00:00:00 2001
+From 8ee7700cdaccb5163a9398141a29fc19c30e0eea Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 11 Feb 2018 10:43:46 +0000
 Subject: [PATCH] Extend Player Interact cancellation
@@ -13,7 +13,7 @@ Update adjacent blocks of doors, double plants, pistons and beds
 when cancelling interaction.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index ce8f76871..126c17d1b 100644
+index e34198e40..620efb1ac 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
 @@ -110,6 +110,7 @@ public class PlayerInteractManager {
@@ -24,7 +24,7 @@ index ce8f76871..126c17d1b 100644
              // Update any tile entity data for this block
              TileEntity tileentity = this.world.getTileEntity(blockposition);
              if (tileentity != null) {
-@@ -251,6 +252,34 @@ public class PlayerInteractManager {
+@@ -249,6 +250,34 @@ public class PlayerInteractManager {
          return flag;
      }
  
@@ -59,7 +59,7 @@ index ce8f76871..126c17d1b 100644
      public boolean breakBlock(BlockPosition blockposition) {
          IBlockData iblockdata = this.world.getType(blockposition);
          // CraftBukkit start - fire BlockBreakEvent
-@@ -299,11 +328,7 @@ public class PlayerInteractManager {
+@@ -297,11 +326,7 @@ public class PlayerInteractManager {
                  }
                  // Let the client know the block still exists
                  ((EntityPlayer) this.player).playerConnection.sendPacket(new PacketPlayOutBlockChange(this.world, blockposition));
@@ -72,7 +72,7 @@ index ce8f76871..126c17d1b 100644
                  // Update any tile entity data for this block
                  TileEntity tileentity = this.world.getTileEntity(blockposition);
                  if (tileentity != null) {
-@@ -461,7 +486,25 @@ public class PlayerInteractManager {
+@@ -459,7 +484,25 @@ public class PlayerInteractManager {
                  ((EntityPlayer) entityhuman).playerConnection.sendPacket(new PacketPlayOutBlockChange(world, bottom ? blockposition.up() : blockposition.down()));
              } else if (iblockdata.getBlock() instanceof BlockCake) {
                  ((EntityPlayer) entityhuman).getBukkitEntity().sendHealthUpdate(); // SPIGOT-1341 - reset health for cake
diff --git a/Spigot-Server-Patches/0241-Tameable-getOwnerUniqueId-API.patch b/Spigot-Server-Patches/0238-Tameable-getOwnerUniqueId-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0241-Tameable-getOwnerUniqueId-API.patch
rename to Spigot-Server-Patches/0238-Tameable-getOwnerUniqueId-API.patch
index 9f9c22e96c..a751268120 100644
--- a/Spigot-Server-Patches/0241-Tameable-getOwnerUniqueId-API.patch
+++ b/Spigot-Server-Patches/0238-Tameable-getOwnerUniqueId-API.patch
@@ -1,4 +1,4 @@
-From c96eff12be30c749b2571ac7d834fc2612402a0b Mon Sep 17 00:00:00 2001
+From b88bf8f54e70c80c89c723a466518a0a0bc7881d 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/0242-Toggleable-player-crits-helps-mitigate-hacked-client.patch b/Spigot-Server-Patches/0239-Toggleable-player-crits-helps-mitigate-hacked-client.patch
similarity index 91%
rename from Spigot-Server-Patches/0242-Toggleable-player-crits-helps-mitigate-hacked-client.patch
rename to Spigot-Server-Patches/0239-Toggleable-player-crits-helps-mitigate-hacked-client.patch
index 6214ca1d21..418f3c8bee 100644
--- a/Spigot-Server-Patches/0242-Toggleable-player-crits-helps-mitigate-hacked-client.patch
+++ b/Spigot-Server-Patches/0239-Toggleable-player-crits-helps-mitigate-hacked-client.patch
@@ -1,14 +1,14 @@
-From e402212a84679d84734f72481807a00cad6f71a8 Mon Sep 17 00:00:00 2001
+From c343647c7c1da02fcf1fb959638cdf50c4517dbf 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 d80cd60ab..830b99cd7 100644
+index a33c55f41..4ca31c8eb 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -182,6 +182,11 @@ public class PaperWorldConfig {
+@@ -179,6 +179,11 @@ public class PaperWorldConfig {
          disableChestCatDetection = getBoolean("game-mechanics.disable-chest-cat-detection", false);
      }
  
diff --git a/Spigot-Server-Patches/0243-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch b/Spigot-Server-Patches/0240-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
similarity index 95%
rename from Spigot-Server-Patches/0243-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
rename to Spigot-Server-Patches/0240-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
index e80dddaec6..2efcc95866 100644
--- a/Spigot-Server-Patches/0243-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
+++ b/Spigot-Server-Patches/0240-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
@@ -1,4 +1,4 @@
-From 075334edd39aa0e1e1ac778032caea4ad9e6f4bc Mon Sep 17 00:00:00 2001
+From 60e36541916056a066dfbad3f6cba828ad68fd88 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/0244-Prevent-Frosted-Ice-from-loading-holding-chunks.patch b/Spigot-Server-Patches/0241-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
similarity index 96%
rename from Spigot-Server-Patches/0244-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
rename to Spigot-Server-Patches/0241-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
index 6b2677d6cd..a585a3e97a 100644
--- a/Spigot-Server-Patches/0244-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
+++ b/Spigot-Server-Patches/0241-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
@@ -1,4 +1,4 @@
-From ab69b644e187d1ddfe69ff12be345f5d29a3f294 Mon Sep 17 00:00:00 2001
+From 566c2f52f198e39d6ba6c4c94a0242ffc7e2d7a1 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/0245-Disable-Explicit-Network-Manager-Flushing.patch b/Spigot-Server-Patches/0242-Disable-Explicit-Network-Manager-Flushing.patch
similarity index 96%
rename from Spigot-Server-Patches/0245-Disable-Explicit-Network-Manager-Flushing.patch
rename to Spigot-Server-Patches/0242-Disable-Explicit-Network-Manager-Flushing.patch
index 911ae66f4d..d41ff3a3b0 100644
--- a/Spigot-Server-Patches/0245-Disable-Explicit-Network-Manager-Flushing.patch
+++ b/Spigot-Server-Patches/0242-Disable-Explicit-Network-Manager-Flushing.patch
@@ -1,4 +1,4 @@
-From 983d36016f7b3064b7a04143e990c790965a838b Mon Sep 17 00:00:00 2001
+From 63e1dbdab75cf30b185ca29a91c5ce9f106f9da7 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/0246-Implement-extended-PaperServerListPingEvent.patch b/Spigot-Server-Patches/0243-Implement-extended-PaperServerListPingEvent.patch
similarity index 99%
rename from Spigot-Server-Patches/0246-Implement-extended-PaperServerListPingEvent.patch
rename to Spigot-Server-Patches/0243-Implement-extended-PaperServerListPingEvent.patch
index fdc07a37a0..ba80269169 100644
--- a/Spigot-Server-Patches/0246-Implement-extended-PaperServerListPingEvent.patch
+++ b/Spigot-Server-Patches/0243-Implement-extended-PaperServerListPingEvent.patch
@@ -1,4 +1,4 @@
-From bf57920113426fb120ded5d0a7e25304dd7948b6 Mon Sep 17 00:00:00 2001
+From 557f91f2d60f8facf05cd18160e6c1d87ec5949e 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
@@ -226,7 +226,7 @@ index c9edd289a..8aa121e2f 100644
          // CraftBukkit end
      }
 diff --git a/src/main/java/net/minecraft/server/ServerPing.java b/src/main/java/net/minecraft/server/ServerPing.java
-index 2179664a0..616fcbf13 100644
+index d7e1ecc03..f20cddc41 100644
 --- a/src/main/java/net/minecraft/server/ServerPing.java
 +++ b/src/main/java/net/minecraft/server/ServerPing.java
 @@ -29,6 +29,7 @@ public class ServerPing {
diff --git a/Spigot-Server-Patches/0247-Improved-Async-Task-Scheduler.patch b/Spigot-Server-Patches/0244-Improved-Async-Task-Scheduler.patch
similarity index 99%
rename from Spigot-Server-Patches/0247-Improved-Async-Task-Scheduler.patch
rename to Spigot-Server-Patches/0244-Improved-Async-Task-Scheduler.patch
index 44af697aae..b0cd01a2ea 100644
--- a/Spigot-Server-Patches/0247-Improved-Async-Task-Scheduler.patch
+++ b/Spigot-Server-Patches/0244-Improved-Async-Task-Scheduler.patch
@@ -1,4 +1,4 @@
-From d16134eac30d00f1045815dab121d243f25310d8 Mon Sep 17 00:00:00 2001
+From f476b5d557791b1d72e162a31a0d6c1ba6225039 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/0248-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/Spigot-Server-Patches/0245-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
similarity index 97%
rename from Spigot-Server-Patches/0248-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
rename to Spigot-Server-Patches/0245-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
index 540fc4447b..58adc7536e 100644
--- a/Spigot-Server-Patches/0248-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
+++ b/Spigot-Server-Patches/0245-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
@@ -1,4 +1,4 @@
-From 67709b897f88439ceea818e724fb08d91212b97b Mon Sep 17 00:00:00 2001
+From 4603e7767cf800889109614583659c4824185d35 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/0249-Call-PortalCreateEvent-for-exit-portals.patch b/Spigot-Server-Patches/0246-Call-PortalCreateEvent-for-exit-portals.patch
similarity index 98%
rename from Spigot-Server-Patches/0249-Call-PortalCreateEvent-for-exit-portals.patch
rename to Spigot-Server-Patches/0246-Call-PortalCreateEvent-for-exit-portals.patch
index 56d157239d..e8a31552d2 100644
--- a/Spigot-Server-Patches/0249-Call-PortalCreateEvent-for-exit-portals.patch
+++ b/Spigot-Server-Patches/0246-Call-PortalCreateEvent-for-exit-portals.patch
@@ -1,4 +1,4 @@
-From 772d05f6f0ea7b1618a3b09a976f96f896ba347b Mon Sep 17 00:00:00 2001
+From 3d002d32e0ca98b0fe7dde739c78504adc12da55 Mon Sep 17 00:00:00 2001
 From: MiniDigger <admin@minidigger.me>
 Date: Sun, 18 Mar 2018 15:44:44 +0100
 Subject: [PATCH] Call PortalCreateEvent for exit portals
diff --git a/Spigot-Server-Patches/0250-Player.setPlayerProfile-API.patch b/Spigot-Server-Patches/0247-Player.setPlayerProfile-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0250-Player.setPlayerProfile-API.patch
rename to Spigot-Server-Patches/0247-Player.setPlayerProfile-API.patch
index 4fcf4e3807..5a8ed4aad6 100644
--- a/Spigot-Server-Patches/0250-Player.setPlayerProfile-API.patch
+++ b/Spigot-Server-Patches/0247-Player.setPlayerProfile-API.patch
@@ -1,4 +1,4 @@
-From 91ffaff0c7c58bb3cb3e6be558a3885e768adfac Mon Sep 17 00:00:00 2001
+From b1272fc90f5669440ddbcb89feeb838d83930742 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
@@ -48,7 +48,7 @@ index 02bbb0d1d..e73b07f42 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 c2cd5ac4b..12af78209 100644
+index 7021a81be..c0b484177 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/0251-Fix-Dragon-Server-Crashes.patch b/Spigot-Server-Patches/0248-Fix-Dragon-Server-Crashes.patch
similarity index 95%
rename from Spigot-Server-Patches/0251-Fix-Dragon-Server-Crashes.patch
rename to Spigot-Server-Patches/0248-Fix-Dragon-Server-Crashes.patch
index 480474ff3e..c5fb7eafd2 100644
--- a/Spigot-Server-Patches/0251-Fix-Dragon-Server-Crashes.patch
+++ b/Spigot-Server-Patches/0248-Fix-Dragon-Server-Crashes.patch
@@ -1,4 +1,4 @@
-From a301af865d9f1156ef56ff89782acc29abafc24b Mon Sep 17 00:00:00 2001
+From f115c470c9ec36d4a124b3ce10a655f0b4a1a6ea 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/0252-getPlayerUniqueId-API.patch b/Spigot-Server-Patches/0249-getPlayerUniqueId-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0252-getPlayerUniqueId-API.patch
rename to Spigot-Server-Patches/0249-getPlayerUniqueId-API.patch
index d2c54bc63c..6dcfbb5119 100644
--- a/Spigot-Server-Patches/0252-getPlayerUniqueId-API.patch
+++ b/Spigot-Server-Patches/0249-getPlayerUniqueId-API.patch
@@ -1,4 +1,4 @@
-From 5f0ce62baa4376aafa88151d7368bf7f7fd18b42 Mon Sep 17 00:00:00 2001
+From 8b072f7bcac5a64cbeb681a56c0a70d3b1760e45 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 22 Mar 2018 01:40:24 -0400
 Subject: [PATCH] getPlayerUniqueId API
diff --git a/Spigot-Server-Patches/0253-Make-player-data-saving-configurable.patch b/Spigot-Server-Patches/0250-Make-player-data-saving-configurable.patch
similarity index 96%
rename from Spigot-Server-Patches/0253-Make-player-data-saving-configurable.patch
rename to Spigot-Server-Patches/0250-Make-player-data-saving-configurable.patch
index 715203badc..ca1337a2c2 100644
--- a/Spigot-Server-Patches/0253-Make-player-data-saving-configurable.patch
+++ b/Spigot-Server-Patches/0250-Make-player-data-saving-configurable.patch
@@ -1,4 +1,4 @@
-From f10e8a5ef24dc16f21bcd5dd130133f2e67d5cca Mon Sep 17 00:00:00 2001
+From 252500c4df07e3b9ddca3342251edfc69eba13e2 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/Spigot-Server-Patches/0254-Make-legacy-ping-handler-more-reliable.patch b/Spigot-Server-Patches/0251-Make-legacy-ping-handler-more-reliable.patch
similarity index 98%
rename from Spigot-Server-Patches/0254-Make-legacy-ping-handler-more-reliable.patch
rename to Spigot-Server-Patches/0251-Make-legacy-ping-handler-more-reliable.patch
index 8a600bd4ca..c9f70a20f3 100644
--- a/Spigot-Server-Patches/0254-Make-legacy-ping-handler-more-reliable.patch
+++ b/Spigot-Server-Patches/0251-Make-legacy-ping-handler-more-reliable.patch
@@ -1,4 +1,4 @@
-From ea72b8b34d10d9f02cf2be8e5f7794398e5f5b6d Mon Sep 17 00:00:00 2001
+From d9e2a3cf0ea3d161fe6ec584a55cefdffc86b308 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/0255-Call-PaperServerListPingEvent-for-legacy-pings.patch b/Spigot-Server-Patches/0252-Call-PaperServerListPingEvent-for-legacy-pings.patch
similarity index 99%
rename from Spigot-Server-Patches/0255-Call-PaperServerListPingEvent-for-legacy-pings.patch
rename to Spigot-Server-Patches/0252-Call-PaperServerListPingEvent-for-legacy-pings.patch
index 4c5f276557..03eeca3008 100644
--- a/Spigot-Server-Patches/0255-Call-PaperServerListPingEvent-for-legacy-pings.patch
+++ b/Spigot-Server-Patches/0252-Call-PaperServerListPingEvent-for-legacy-pings.patch
@@ -1,4 +1,4 @@
-From 7cf04502231cc70d52e9c3e0ac1c51b472bae3db Mon Sep 17 00:00:00 2001
+From 3cfed1cabdc149a5016551c477c05fea9dab436d 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/0256-Flag-to-disable-the-channel-limit.patch b/Spigot-Server-Patches/0253-Flag-to-disable-the-channel-limit.patch
similarity index 94%
rename from Spigot-Server-Patches/0256-Flag-to-disable-the-channel-limit.patch
rename to Spigot-Server-Patches/0253-Flag-to-disable-the-channel-limit.patch
index 77a58e8083..157b1c236c 100644
--- a/Spigot-Server-Patches/0256-Flag-to-disable-the-channel-limit.patch
+++ b/Spigot-Server-Patches/0253-Flag-to-disable-the-channel-limit.patch
@@ -1,4 +1,4 @@
-From f86f71a94e99da011a39ed9a64eab9061f32fdb0 Mon Sep 17 00:00:00 2001
+From cfcc5a751071bb5a3d54c5147ed2d0b1ce0652fc 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 12af78209..3b76c7080 100644
+index c0b484177..60bc6d331 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -132,6 +132,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0257-Add-method-to-open-already-placed-sign.patch b/Spigot-Server-Patches/0254-Add-method-to-open-already-placed-sign.patch
similarity index 95%
rename from Spigot-Server-Patches/0257-Add-method-to-open-already-placed-sign.patch
rename to Spigot-Server-Patches/0254-Add-method-to-open-already-placed-sign.patch
index 7869a5ec54..9f87557093 100644
--- a/Spigot-Server-Patches/0257-Add-method-to-open-already-placed-sign.patch
+++ b/Spigot-Server-Patches/0254-Add-method-to-open-already-placed-sign.patch
@@ -1,4 +1,4 @@
-From 56a8afcb50c96195f362c2437f93e18f4e0c084c Mon Sep 17 00:00:00 2001
+From 0f0a1e0abec3f8dd616b1356ff2fd571fa693d28 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/0258-Load-version-history-at-server-start.patch b/Spigot-Server-Patches/0255-Load-version-history-at-server-start.patch
similarity index 93%
rename from Spigot-Server-Patches/0258-Load-version-history-at-server-start.patch
rename to Spigot-Server-Patches/0255-Load-version-history-at-server-start.patch
index 37e4c97e65..8c188f57f4 100644
--- a/Spigot-Server-Patches/0258-Load-version-history-at-server-start.patch
+++ b/Spigot-Server-Patches/0255-Load-version-history-at-server-start.patch
@@ -1,4 +1,4 @@
-From c087731552e99e275dd9e77406c2047402cc000e Mon Sep 17 00:00:00 2001
+From c258c11325b05c25e869b4f3f8cd073734829f69 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/0259-Configurable-sprint-interruption-on-attack.patch b/Spigot-Server-Patches/0256-Configurable-sprint-interruption-on-attack.patch
similarity index 92%
rename from Spigot-Server-Patches/0259-Configurable-sprint-interruption-on-attack.patch
rename to Spigot-Server-Patches/0256-Configurable-sprint-interruption-on-attack.patch
index f8c05aa72a..3b4e09befa 100644
--- a/Spigot-Server-Patches/0259-Configurable-sprint-interruption-on-attack.patch
+++ b/Spigot-Server-Patches/0256-Configurable-sprint-interruption-on-attack.patch
@@ -1,4 +1,4 @@
-From 3769a500e46acd96215769b0495c589417820678 Mon Sep 17 00:00:00 2001
+From 272351def6380d58c578121249084b58c33fb005 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,10 +6,10 @@ 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 830b99cd7..87d2dd131 100644
+index 4ca31c8eb..b07ff9587 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -424,4 +424,8 @@ public class PaperWorldConfig {
+@@ -398,4 +398,8 @@ public class PaperWorldConfig {
          squidMaxSpawnHeight = getDouble("squid-spawn-height.maximum", 0.0D);
      }
  
diff --git a/Spigot-Server-Patches/0260-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/Spigot-Server-Patches/0257-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
similarity index 87%
rename from Spigot-Server-Patches/0260-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
rename to Spigot-Server-Patches/0257-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
index 6997e7ea62..99f743eada 100644
--- a/Spigot-Server-Patches/0260-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
+++ b/Spigot-Server-Patches/0257-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
@@ -1,14 +1,14 @@
-From 287e5fb213e2806e4e9ecfc08d7d98e55bdb6a12 Mon Sep 17 00:00:00 2001
+From 6728452343b99a6782ba86e8f06c8efc541ec1ce 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 d71efd62f..5fe01e7ef 100644
+index ab2bd6dae..067f7b990 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2497,7 +2497,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2502,7 +2502,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
              String[] lines = new String[4];
  
              for (int i = 0; i < astring.length; ++i) {
diff --git a/Spigot-Server-Patches/0261-EndermanEscapeEvent.patch b/Spigot-Server-Patches/0258-EndermanEscapeEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0261-EndermanEscapeEvent.patch
rename to Spigot-Server-Patches/0258-EndermanEscapeEvent.patch
index 2dbc6e1c27..2170459097 100644
--- a/Spigot-Server-Patches/0261-EndermanEscapeEvent.patch
+++ b/Spigot-Server-Patches/0258-EndermanEscapeEvent.patch
@@ -1,4 +1,4 @@
-From 716a9a72b32bac7bb06d4b971a4ad877c69aed57 Mon Sep 17 00:00:00 2001
+From eff134b277d169c072ec4e9e4a625b4eed570ad8 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/0262-Enderman.teleportRandomly.patch b/Spigot-Server-Patches/0259-Enderman.teleportRandomly.patch
similarity index 96%
rename from Spigot-Server-Patches/0262-Enderman.teleportRandomly.patch
rename to Spigot-Server-Patches/0259-Enderman.teleportRandomly.patch
index f049c6c304..02dca261fd 100644
--- a/Spigot-Server-Patches/0262-Enderman.teleportRandomly.patch
+++ b/Spigot-Server-Patches/0259-Enderman.teleportRandomly.patch
@@ -1,4 +1,4 @@
-From a458c0efb737ec62b90c43fa2c0b98d61a821a2c Mon Sep 17 00:00:00 2001
+From 4aa456490016a276e95bc4671452be27080de984 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/0263-Block-Enderpearl-Travel-Exploit.patch b/Spigot-Server-Patches/0260-Block-Enderpearl-Travel-Exploit.patch
similarity index 86%
rename from Spigot-Server-Patches/0263-Block-Enderpearl-Travel-Exploit.patch
rename to Spigot-Server-Patches/0260-Block-Enderpearl-Travel-Exploit.patch
index 36c3e48857..6213a84d88 100644
--- a/Spigot-Server-Patches/0263-Block-Enderpearl-Travel-Exploit.patch
+++ b/Spigot-Server-Patches/0260-Block-Enderpearl-Travel-Exploit.patch
@@ -1,4 +1,4 @@
-From ddfb42a51f7d673527b1b54e5ca22574f7cd417c Mon Sep 17 00:00:00 2001
+From 1a3f838cf2b440c14f09906a39b4ce9d3296c3b0 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,10 +12,10 @@ 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 87d2dd131..5a9c68e4f 100644
+index b07ff9587..f1db4becd 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -428,4 +428,10 @@ public class PaperWorldConfig {
+@@ -402,4 +402,10 @@ public class PaperWorldConfig {
      private void disableSprintInterruptionOnAttack() {
          disableSprintInterruptionOnAttack = getBoolean("game-mechanics.disable-sprint-interruption-on-attack", false);
      }
@@ -27,14 +27,14 @@ index 87d2dd131..5a9c68e4f 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java
-index fc8c0cab5..b3323aa8e 100644
+index fc8c0cab5..dd8af4be8 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 {
          if (nbttagcompound.hasKeyOfType("owner", 10)) {
              this.shooterId = GameProfileSerializer.b(nbttagcompound.getCompound("owner"));
          }
-+        if (this instanceof EntityEnderPearl && this.world != null && this.world.paperConfig.disableEnderpearlExploit) { this.shooterName = null; } // Paper - Don't store shooter name for pearls to block enderpearl travel exploit
++        if (this instanceof EntityEnderPearl && this.world != null && this.world.paperConfig.disableEnderpearlExploit) { this.shooterId = null; } // Paper - Don't store shooter name for pearls to block enderpearl travel exploit
  
      }
  
diff --git a/Spigot-Server-Patches/0264-Expand-World.spawnParticle-API-and-add-Builder.patch b/Spigot-Server-Patches/0261-Expand-World.spawnParticle-API-and-add-Builder.patch
similarity index 96%
rename from Spigot-Server-Patches/0264-Expand-World.spawnParticle-API-and-add-Builder.patch
rename to Spigot-Server-Patches/0261-Expand-World.spawnParticle-API-and-add-Builder.patch
index ee2baf3fe0..09660ae013 100644
--- a/Spigot-Server-Patches/0264-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/Spigot-Server-Patches/0261-Expand-World.spawnParticle-API-and-add-Builder.patch
@@ -1,4 +1,4 @@
-From b994e6878b8b8ad432be2825adfbe0418b93321f Mon Sep 17 00:00:00 2001
+From c2a083674e1af22455c5b81ea3d35a854280b245 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
@@ -37,10 +37,10 @@ index c5da2cde3..4ac2d39c5 100644
  
              if (this.a(entityplayer, false, d0, d1, d2, packetplayoutworldparticles)) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 817e29474..3ee663293 100644
+index 7004f1176..1afb480f8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1596,13 +1596,17 @@ public class CraftWorld implements World {
+@@ -1576,13 +1576,17 @@ public class CraftWorld implements World {
          spawnParticle(particle, location.getX(), location.getY(), location.getZ(), count, offsetX, offsetY, offsetZ, extra, data);
      }
  
diff --git a/Spigot-Server-Patches/0265-EndermanAttackPlayerEvent.patch b/Spigot-Server-Patches/0262-EndermanAttackPlayerEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0265-EndermanAttackPlayerEvent.patch
rename to Spigot-Server-Patches/0262-EndermanAttackPlayerEvent.patch
index 1b486b2b5c..ef4ff0ca64 100644
--- a/Spigot-Server-Patches/0265-EndermanAttackPlayerEvent.patch
+++ b/Spigot-Server-Patches/0262-EndermanAttackPlayerEvent.patch
@@ -1,4 +1,4 @@
-From bd1fc6d404b1757f48cf368e015fa2cd926ddc41 Mon Sep 17 00:00:00 2001
+From c021ee56772971a27376c93715633f054136944d 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/0266-WitchConsumePotionEvent.patch b/Spigot-Server-Patches/0263-WitchConsumePotionEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0266-WitchConsumePotionEvent.patch
rename to Spigot-Server-Patches/0263-WitchConsumePotionEvent.patch
index 5fbd70298b..7e191df73b 100644
--- a/Spigot-Server-Patches/0266-WitchConsumePotionEvent.patch
+++ b/Spigot-Server-Patches/0263-WitchConsumePotionEvent.patch
@@ -1,4 +1,4 @@
-From 78e4b1a11e9bbbff769024b2c6b03f53703c4c96 Mon Sep 17 00:00:00 2001
+From b8489746b3b8239af444718a14db63df9a013f9e 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/0267-WitchThrowPotionEvent.patch b/Spigot-Server-Patches/0264-WitchThrowPotionEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0267-WitchThrowPotionEvent.patch
rename to Spigot-Server-Patches/0264-WitchThrowPotionEvent.patch
index 58edc2c8f7..9ddd0df2cd 100644
--- a/Spigot-Server-Patches/0267-WitchThrowPotionEvent.patch
+++ b/Spigot-Server-Patches/0264-WitchThrowPotionEvent.patch
@@ -1,4 +1,4 @@
-From 65cfb1a62b8a056b7df0cf88f36c9d1f91e794d7 Mon Sep 17 00:00:00 2001
+From 29d89398140ce66b1a3209076b0c1928e6998cef 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/0268-Allow-spawning-Item-entities-with-World.spawnEntity.patch b/Spigot-Server-Patches/0265-Allow-spawning-Item-entities-with-World.spawnEntity.patch
similarity index 88%
rename from Spigot-Server-Patches/0268-Allow-spawning-Item-entities-with-World.spawnEntity.patch
rename to Spigot-Server-Patches/0265-Allow-spawning-Item-entities-with-World.spawnEntity.patch
index 00a3b48ed7..fb10bea3a9 100644
--- a/Spigot-Server-Patches/0268-Allow-spawning-Item-entities-with-World.spawnEntity.patch
+++ b/Spigot-Server-Patches/0265-Allow-spawning-Item-entities-with-World.spawnEntity.patch
@@ -1,4 +1,4 @@
-From be82462fb805084618fd8d81ff669d755683b5f8 Mon Sep 17 00:00:00 2001
+From dc479ddb30269b2192d02a677dfee75596be4123 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 4 Jun 2018 20:39:20 -0400
 Subject: [PATCH] Allow spawning Item entities with World.spawnEntity
@@ -8,10 +8,10 @@ This API has more capabilities than .dropItem with the Consumer function
 Item can be set inside of the Consumer pre spawn function.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 3ee663293..65ad8e588 100644
+index 1afb480f8..f7eaecb3f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -956,6 +956,10 @@ public class CraftWorld implements World {
+@@ -936,6 +936,10 @@ public class CraftWorld implements World {
          if (Boat.class.isAssignableFrom(clazz)) {
              entity = new EntityBoat(world, x, y, z);
              entity.setPositionRotation(x, y, z, yaw, pitch);
diff --git a/Spigot-Server-Patches/0269-Don-t-load-chunks-for-villager-door-checks.patch b/Spigot-Server-Patches/0266-Don-t-load-chunks-for-villager-door-checks.patch
similarity index 93%
rename from Spigot-Server-Patches/0269-Don-t-load-chunks-for-villager-door-checks.patch
rename to Spigot-Server-Patches/0266-Don-t-load-chunks-for-villager-door-checks.patch
index 1475ebc87b..427bec202d 100644
--- a/Spigot-Server-Patches/0269-Don-t-load-chunks-for-villager-door-checks.patch
+++ b/Spigot-Server-Patches/0266-Don-t-load-chunks-for-villager-door-checks.patch
@@ -1,4 +1,4 @@
-From 167ec27d5b5c5e20f65383f55148e8594a74e71c Mon Sep 17 00:00:00 2001
+From c84eb9a263bf5bf86b6ed453989bce78ef18670f 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/0270-WitchReadyPotionEvent.patch b/Spigot-Server-Patches/0267-WitchReadyPotionEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0270-WitchReadyPotionEvent.patch
rename to Spigot-Server-Patches/0267-WitchReadyPotionEvent.patch
index dfef5d1f42..053fc0e3e0 100644
--- a/Spigot-Server-Patches/0270-WitchReadyPotionEvent.patch
+++ b/Spigot-Server-Patches/0267-WitchReadyPotionEvent.patch
@@ -1,4 +1,4 @@
-From c595540dc8bbe9c2513d490d4f24da14ac678e90 Mon Sep 17 00:00:00 2001
+From 6a0a12787818097574820822ec616173d555934d 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/0271-ItemStack-getMaxItemUseDuration.patch b/Spigot-Server-Patches/0268-ItemStack-getMaxItemUseDuration.patch
similarity index 90%
rename from Spigot-Server-Patches/0271-ItemStack-getMaxItemUseDuration.patch
rename to Spigot-Server-Patches/0268-ItemStack-getMaxItemUseDuration.patch
index 491c6ffcec..9dd3a1a678 100644
--- a/Spigot-Server-Patches/0271-ItemStack-getMaxItemUseDuration.patch
+++ b/Spigot-Server-Patches/0268-ItemStack-getMaxItemUseDuration.patch
@@ -1,4 +1,4 @@
-From 742b78090e01bf2da099c7aa1cfb579b55a22404 Mon Sep 17 00:00:00 2001
+From 2447f92f25673681de873f0f7c2c828e66749b07 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Jun 2018 23:00:29 -0400
 Subject: [PATCH] ItemStack#getMaxItemUseDuration
@@ -6,10 +6,10 @@ Subject: [PATCH] ItemStack#getMaxItemUseDuration
 Allows you to determine how long it takes to use a usable/consumable item
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index be6205275..a4a5058da 100644
+index ca169e113..dad883054 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
-@@ -508,6 +508,7 @@ public final class ItemStack {
+@@ -514,6 +514,7 @@ public final class ItemStack {
          this.getItem().b(this, world, entityhuman);
      }
  
diff --git a/Spigot-Server-Patches/0272-Implement-EntityTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/0269-Implement-EntityTeleportEndGatewayEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0272-Implement-EntityTeleportEndGatewayEvent.patch
rename to Spigot-Server-Patches/0269-Implement-EntityTeleportEndGatewayEvent.patch
index ac92743375..f69b679ecb 100644
--- a/Spigot-Server-Patches/0272-Implement-EntityTeleportEndGatewayEvent.patch
+++ b/Spigot-Server-Patches/0269-Implement-EntityTeleportEndGatewayEvent.patch
@@ -1,4 +1,4 @@
-From b62ffab61e8f8a6ca78f1acb1da95db871cf408d Mon Sep 17 00:00:00 2001
+From 94174eb07753ceb680c9deb800186df594922629 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/0273-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/Spigot-Server-Patches/0270-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
similarity index 95%
rename from Spigot-Server-Patches/0273-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
rename to Spigot-Server-Patches/0270-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
index 0dd3f46c22..ac233bfe7d 100644
--- a/Spigot-Server-Patches/0273-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
+++ b/Spigot-Server-Patches/0270-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
@@ -1,4 +1,4 @@
-From bb4b850e8fbe86ec7922235c37213b0fef34992c Mon Sep 17 00:00:00 2001
+From d8cc785ed1c99aaa99a903e700fd4af772fc8622 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/0274-Properly-remove-entities-on-dimension-teleport.patch b/Spigot-Server-Patches/0271-Properly-remove-entities-on-dimension-teleport.patch
similarity index 97%
rename from Spigot-Server-Patches/0274-Properly-remove-entities-on-dimension-teleport.patch
rename to Spigot-Server-Patches/0271-Properly-remove-entities-on-dimension-teleport.patch
index f5290c1c23..5f960a0c1d 100644
--- a/Spigot-Server-Patches/0274-Properly-remove-entities-on-dimension-teleport.patch
+++ b/Spigot-Server-Patches/0271-Properly-remove-entities-on-dimension-teleport.patch
@@ -1,4 +1,4 @@
-From 0eda9304279c487452a245265cbe6424c3ffe621 Mon Sep 17 00:00:00 2001
+From 014b84371464966ee131a8b52ddf87154e02343e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 10 Jun 2018 20:04:42 -0400
 Subject: [PATCH] Properly remove entities on dimension teleport
diff --git a/Spigot-Server-Patches/0275-Fix-CraftEntity-hashCode.patch b/Spigot-Server-Patches/0272-Fix-CraftEntity-hashCode.patch
similarity index 96%
rename from Spigot-Server-Patches/0275-Fix-CraftEntity-hashCode.patch
rename to Spigot-Server-Patches/0272-Fix-CraftEntity-hashCode.patch
index 7d76d726e6..fa3f914f4e 100644
--- a/Spigot-Server-Patches/0275-Fix-CraftEntity-hashCode.patch
+++ b/Spigot-Server-Patches/0272-Fix-CraftEntity-hashCode.patch
@@ -1,4 +1,4 @@
-From 911bd570a1600cea8bd2063db8034d5f6ce2abf1 Mon Sep 17 00:00:00 2001
+From 401b1eabffdb3192c2f5d29b2ae00ed856bc6f19 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/0276-Configurable-Alternative-LootPool-Luck-Formula.patch b/Spigot-Server-Patches/0273-Configurable-Alternative-LootPool-Luck-Formula.patch
similarity index 97%
rename from Spigot-Server-Patches/0276-Configurable-Alternative-LootPool-Luck-Formula.patch
rename to Spigot-Server-Patches/0273-Configurable-Alternative-LootPool-Luck-Formula.patch
index bf31b38ed9..8a0e58e8ca 100644
--- a/Spigot-Server-Patches/0276-Configurable-Alternative-LootPool-Luck-Formula.patch
+++ b/Spigot-Server-Patches/0273-Configurable-Alternative-LootPool-Luck-Formula.patch
@@ -1,4 +1,4 @@
-From 54edbfe52febfcb3b7c58362af32cfcab27a5121 Mon Sep 17 00:00:00 2001
+From 0bd14e1218f146e26524a3c799209482a53e99e0 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
@@ -53,7 +53,7 @@ index b602bbf12..62bce1806 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/LotoSelectorEntry.java b/src/main/java/net/minecraft/server/LotoSelectorEntry.java
-index a540167d6..d8a882191 100644
+index add618866..9f8e17b9d 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/0277-Print-Error-details-when-failing-to-save-player-data.patch b/Spigot-Server-Patches/0274-Print-Error-details-when-failing-to-save-player-data.patch
similarity index 93%
rename from Spigot-Server-Patches/0277-Print-Error-details-when-failing-to-save-player-data.patch
rename to Spigot-Server-Patches/0274-Print-Error-details-when-failing-to-save-player-data.patch
index eec1084830..f28db80a53 100644
--- a/Spigot-Server-Patches/0277-Print-Error-details-when-failing-to-save-player-data.patch
+++ b/Spigot-Server-Patches/0274-Print-Error-details-when-failing-to-save-player-data.patch
@@ -1,4 +1,4 @@
-From 1264d06b00fbafc737c7ca4f6baf8b2276352e9a Mon Sep 17 00:00:00 2001
+From f20915ce41068548c77552bce50c39b26cf2a669 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/0278-Make-shield-blocking-delay-configurable.patch b/Spigot-Server-Patches/0275-Make-shield-blocking-delay-configurable.patch
similarity index 95%
rename from Spigot-Server-Patches/0278-Make-shield-blocking-delay-configurable.patch
rename to Spigot-Server-Patches/0275-Make-shield-blocking-delay-configurable.patch
index d031f39bee..42b955e636 100644
--- a/Spigot-Server-Patches/0278-Make-shield-blocking-delay-configurable.patch
+++ b/Spigot-Server-Patches/0275-Make-shield-blocking-delay-configurable.patch
@@ -1,14 +1,14 @@
-From e3a3b4b4a047ad0c09193b186e6345da16427ef2 Mon Sep 17 00:00:00 2001
+From 5ddbd4a96ffef506dc4eb009c32e3a7b74e35559 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 16 Jun 2018 01:18:16 -0500
 Subject: [PATCH] Make shield blocking delay configurable
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 5a9c68e4f..650addb84 100644
+index f1db4becd..ef4bfb480 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -434,4 +434,9 @@ public class PaperWorldConfig {
+@@ -408,4 +408,9 @@ public class PaperWorldConfig {
          disableEnderpearlExploit = getBoolean("game-mechanics.disable-unloaded-chunk-enderpearl-exploit", disableEnderpearlExploit);
          log("Disable Unloaded Chunk Enderpearl Exploit: " + (disableEnderpearlExploit ? "enabled" : "disabled"));
      }
diff --git a/Spigot-Server-Patches/0279-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch b/Spigot-Server-Patches/0276-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
similarity index 96%
rename from Spigot-Server-Patches/0279-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
rename to Spigot-Server-Patches/0276-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
index 7cd5073d1d..7e8c08286c 100644
--- a/Spigot-Server-Patches/0279-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
+++ b/Spigot-Server-Patches/0276-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
@@ -1,4 +1,4 @@
-From b78f84d7b123adda716195bf9f2374f78ff92dcd Mon Sep 17 00:00:00 2001
+From 4d81780db6fefcf2f2854874aaff39f758fd2c23 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/0280-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch b/Spigot-Server-Patches/0277-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
similarity index 98%
rename from Spigot-Server-Patches/0280-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
rename to Spigot-Server-Patches/0277-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
index 8c815639e5..5c7f5fee15 100644
--- a/Spigot-Server-Patches/0280-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
+++ b/Spigot-Server-Patches/0277-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
@@ -1,4 +1,4 @@
-From 33ad36b25fb1f912a2f7c9af192694bcc0caf386 Mon Sep 17 00:00:00 2001
+From d48edab130718f13d7a03c11d90dbe20fd5f5666 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/0281-PlayerReadyArrowEvent.patch b/Spigot-Server-Patches/0278-PlayerReadyArrowEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0281-PlayerReadyArrowEvent.patch
rename to Spigot-Server-Patches/0278-PlayerReadyArrowEvent.patch
index 267ac99bea..c83835479a 100644
--- a/Spigot-Server-Patches/0281-PlayerReadyArrowEvent.patch
+++ b/Spigot-Server-Patches/0278-PlayerReadyArrowEvent.patch
@@ -1,4 +1,4 @@
-From cfa73fb04d7d4cdaba5282465c28d6abeed5f533 Mon Sep 17 00:00:00 2001
+From afc01323c53932b9808ec3b3b386bf5bc371b41d 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/0282-Fire-EntityShootBowEvent-for-Illusioner.patch b/Spigot-Server-Patches/0279-Fire-EntityShootBowEvent-for-Illusioner.patch
similarity index 95%
rename from Spigot-Server-Patches/0282-Fire-EntityShootBowEvent-for-Illusioner.patch
rename to Spigot-Server-Patches/0279-Fire-EntityShootBowEvent-for-Illusioner.patch
index bf66a0bf58..5aa81da5d7 100644
--- a/Spigot-Server-Patches/0282-Fire-EntityShootBowEvent-for-Illusioner.patch
+++ b/Spigot-Server-Patches/0279-Fire-EntityShootBowEvent-for-Illusioner.patch
@@ -1,4 +1,4 @@
-From f1f4d49df927e056071d0adf4b9bfafdab70d248 Mon Sep 17 00:00:00 2001
+From 6bdfc29966cb4da65d45841001ec76f154cbf34c 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/0283-Implement-EntityKnockbackByEntityEvent.patch b/Spigot-Server-Patches/0280-Implement-EntityKnockbackByEntityEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0283-Implement-EntityKnockbackByEntityEvent.patch
rename to Spigot-Server-Patches/0280-Implement-EntityKnockbackByEntityEvent.patch
index f6f733b898..6f7fca6eda 100644
--- a/Spigot-Server-Patches/0283-Implement-EntityKnockbackByEntityEvent.patch
+++ b/Spigot-Server-Patches/0280-Implement-EntityKnockbackByEntityEvent.patch
@@ -1,4 +1,4 @@
-From 8388c79bcacf4deee2c48182f5e38a22cf27b937 Mon Sep 17 00:00:00 2001
+From fc3410f5aeb5f6b421aed828b1086bfc7729d5bf 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/0284-Expand-Explosions-API.patch b/Spigot-Server-Patches/0281-Expand-Explosions-API.patch
similarity index 87%
rename from Spigot-Server-Patches/0284-Expand-Explosions-API.patch
rename to Spigot-Server-Patches/0281-Expand-Explosions-API.patch
index de8ff2f469..657174bad2 100644
--- a/Spigot-Server-Patches/0284-Expand-Explosions-API.patch
+++ b/Spigot-Server-Patches/0281-Expand-Explosions-API.patch
@@ -1,4 +1,4 @@
-From 26362a9e57b185137802bd03984d13350fbb1c66 Mon Sep 17 00:00:00 2001
+From 72cd1ffe96f7827b81fbbca604f1e55ffe645d8e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 20 Jun 2018 23:17:24 -0400
 Subject: [PATCH] Expand Explosions API
@@ -6,10 +6,10 @@ Subject: [PATCH] Expand Explosions API
 Add Entity as a Source capability, and add more API choices, and on Location.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 65ad8e588..0640ca094 100644
+index f7eaecb3f..e8290759b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -568,6 +568,11 @@ public class CraftWorld implements World {
+@@ -548,6 +548,11 @@ public class CraftWorld implements World {
      public boolean createExplosion(double x, double y, double z, float power, boolean setFire, boolean breakBlocks) {
          return !world.createExplosion(null, x, y, z, power, setFire, breakBlocks).wasCanceled;
      }
diff --git a/Spigot-Server-Patches/0285-LivingEntity-Hand-Raised-Item-Use-API.patch b/Spigot-Server-Patches/0282-LivingEntity-Hand-Raised-Item-Use-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0285-LivingEntity-Hand-Raised-Item-Use-API.patch
rename to Spigot-Server-Patches/0282-LivingEntity-Hand-Raised-Item-Use-API.patch
index 83b7e15f55..8cbbe2e413 100644
--- a/Spigot-Server-Patches/0285-LivingEntity-Hand-Raised-Item-Use-API.patch
+++ b/Spigot-Server-Patches/0282-LivingEntity-Hand-Raised-Item-Use-API.patch
@@ -1,4 +1,4 @@
-From 35c788a70a57c803f5042576501d679b63acac95 Mon Sep 17 00:00:00 2001
+From ea25e60618789c9bbcd9435a8865985fa6d00b94 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/0286-RangedEntity-API.patch b/Spigot-Server-Patches/0283-RangedEntity-API.patch
similarity index 99%
rename from Spigot-Server-Patches/0286-RangedEntity-API.patch
rename to Spigot-Server-Patches/0283-RangedEntity-API.patch
index dd034abcd0..4623d4a41f 100644
--- a/Spigot-Server-Patches/0286-RangedEntity-API.patch
+++ b/Spigot-Server-Patches/0283-RangedEntity-API.patch
@@ -1,4 +1,4 @@
-From c763b60d79c10df70c2010fd45cfc5c614ea4989 Mon Sep 17 00:00:00 2001
+From a00c8433613cb510195c2a63ac60ce2f14c41a6b 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/0287-Add-SentientNPC-Interface-to-Entities.patch b/Spigot-Server-Patches/0284-Add-SentientNPC-Interface-to-Entities.patch
similarity index 99%
rename from Spigot-Server-Patches/0287-Add-SentientNPC-Interface-to-Entities.patch
rename to Spigot-Server-Patches/0284-Add-SentientNPC-Interface-to-Entities.patch
index ffb7b18cae..f4ec0220b7 100644
--- a/Spigot-Server-Patches/0287-Add-SentientNPC-Interface-to-Entities.patch
+++ b/Spigot-Server-Patches/0284-Add-SentientNPC-Interface-to-Entities.patch
@@ -1,4 +1,4 @@
-From 923fa0b5285af72441ed22be05ac210c2a88ea2d Mon Sep 17 00:00:00 2001
+From ac0823ffa12e8a2db3761180150b1eb95ce4f15b 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/0288-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch b/Spigot-Server-Patches/0285-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch
similarity index 95%
rename from Spigot-Server-Patches/0288-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch
rename to Spigot-Server-Patches/0285-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch
index c7f3ceac9e..0a28b6107e 100644
--- a/Spigot-Server-Patches/0288-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch
+++ b/Spigot-Server-Patches/0285-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch
@@ -1,4 +1,4 @@
-From 2d3a37ac2163232c2248522bb60d1df3c5debeab Mon Sep 17 00:00:00 2001
+From c8a8053717442079fad265a3d1aa23ae1c39a794 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/0289-Add-config-to-disable-ender-dragon-legacy-check.patch b/Spigot-Server-Patches/0286-Add-config-to-disable-ender-dragon-legacy-check.patch
similarity index 94%
rename from Spigot-Server-Patches/0289-Add-config-to-disable-ender-dragon-legacy-check.patch
rename to Spigot-Server-Patches/0286-Add-config-to-disable-ender-dragon-legacy-check.patch
index 30fbf72e3b..e7b52d9c76 100644
--- a/Spigot-Server-Patches/0289-Add-config-to-disable-ender-dragon-legacy-check.patch
+++ b/Spigot-Server-Patches/0286-Add-config-to-disable-ender-dragon-legacy-check.patch
@@ -1,14 +1,14 @@
-From 5c3b9b90ff445eb042d1153c33ee12c99abe7320 Mon Sep 17 00:00:00 2001
+From 0caefe772325cd5a57cffef2e691f1be25a4deee 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 650addb84..b2855f3ca 100644
+index ef4bfb480..1607619bd 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -439,4 +439,9 @@ public class PaperWorldConfig {
+@@ -413,4 +413,9 @@ public class PaperWorldConfig {
      private void shieldBlockingDelay() {
          shieldBlockingDelay = getInt("game-mechanics.shield-blocking-delay", 5);
      }
diff --git a/Spigot-Server-Patches/0290-Implement-World.getEntity-UUID-API.patch b/Spigot-Server-Patches/0287-Implement-World.getEntity-UUID-API.patch
similarity index 82%
rename from Spigot-Server-Patches/0290-Implement-World.getEntity-UUID-API.patch
rename to Spigot-Server-Patches/0287-Implement-World.getEntity-UUID-API.patch
index 2cfa36cca6..d599c424dc 100644
--- a/Spigot-Server-Patches/0290-Implement-World.getEntity-UUID-API.patch
+++ b/Spigot-Server-Patches/0287-Implement-World.getEntity-UUID-API.patch
@@ -1,14 +1,14 @@
-From d1cd6c4e02129546254dadf0314ac6da5c3027e5 Mon Sep 17 00:00:00 2001
+From 4a50c881283ee28bd0e56a8072dfb5dfb0001b73 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Tue, 3 Jul 2018 16:08:14 +0200
 Subject: [PATCH] Implement World.getEntity(UUID) API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 0640ca094..6705864a7 100644
+index e8290759b..0f4a894eb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -776,6 +776,14 @@ public class CraftWorld implements World {
+@@ -756,6 +756,14 @@ public class CraftWorld implements World {
          return list;
      }
  
diff --git a/Spigot-Server-Patches/0291-InventoryCloseEvent-Reason-API.patch b/Spigot-Server-Patches/0288-InventoryCloseEvent-Reason-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0291-InventoryCloseEvent-Reason-API.patch
rename to Spigot-Server-Patches/0288-InventoryCloseEvent-Reason-API.patch
index 717ce7dcbb..4025f6190f 100644
--- a/Spigot-Server-Patches/0291-InventoryCloseEvent-Reason-API.patch
+++ b/Spigot-Server-Patches/0288-InventoryCloseEvent-Reason-API.patch
@@ -1,4 +1,4 @@
-From 99179af42801ba828a667ca89553996a07dc5389 Mon Sep 17 00:00:00 2001
+From d3cbb67dbd5fb2332756a6fd14f59ce70125147a 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
@@ -110,10 +110,10 @@ index c91caf578..59dc239b8 100644
          this.m();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 5fe01e7ef..4ed107eac 100644
+index 067f7b990..97b315bca 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2033,7 +2033,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2038,7 +2038,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
          PlayerConnectionUtils.ensureMainThread(packetplayinclosewindow, this, this.player.getWorldServer());
  
          if (this.player.isFrozen()) return; // CraftBukkit
@@ -123,10 +123,10 @@ index 5fe01e7ef..4ed107eac 100644
          this.player.m();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index c1de6564a..d397c6c74 100644
+index 879780c5b..907f0232b 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -421,7 +421,7 @@ public abstract class PlayerList {
+@@ -422,7 +422,7 @@ public abstract class PlayerList {
          entityplayer.a(StatisticList.LEAVE_GAME);
  
          // CraftBukkit start - Quitting must be before we do final save of data, in case plugins need to modify it
@@ -155,7 +155,7 @@ index 4b9ecb4a6..b602a5d1b 100644
      public boolean isBlocking() {
          return getHandle().isBlocking();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 3b76c7080..79ade89c5 100644
+index 60bc6d331..b25980027 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -687,7 +687,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0292-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch b/Spigot-Server-Patches/0289-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
similarity index 91%
rename from Spigot-Server-Patches/0292-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
rename to Spigot-Server-Patches/0289-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
index 45daaeb21a..0c7e5df307 100644
--- a/Spigot-Server-Patches/0292-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
+++ b/Spigot-Server-Patches/0289-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
@@ -1,4 +1,4 @@
-From 9a8a8ceae6eaf17fa915b512f1ec3596e06973c7 Mon Sep 17 00:00:00 2001
+From b774b0ac70ae00b43fd54c2c65648d60e096175c 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,10 +22,10 @@ index 2612d4207..b3cdc0b7d 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 ee061d693..1b9013ab4 100644
+index d8ce3efc9..35db0e184 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1213,12 +1213,15 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
+@@ -1208,12 +1208,15 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
          int j;
          // Paper start - Set based removal lists
          for (Entity e : this.g) {
@@ -42,7 +42,7 @@ index ee061d693..1b9013ab4 100644
          }
  
          for (Entity e : this.g) {
-@@ -1279,12 +1282,17 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
+@@ -1274,12 +1277,17 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
              this.methodProfiler.e();
              this.methodProfiler.a("remove");
              if (entity.dead) {
@@ -61,7 +61,7 @@ index ee061d693..1b9013ab4 100644
  
                  guardEntityList = false; // Spigot
                  this.entityList.remove(this.tickPosition--); // CraftBukkit - Use field for loop variable
-@@ -1329,7 +1337,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
+@@ -1324,7 +1332,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
                  BlockPosition blockposition = tileentity.getPosition();
  
                  // Paper start - Skip ticking in chunks scheduled for unload
@@ -70,7 +70,7 @@ index ee061d693..1b9013ab4 100644
                  boolean shouldTick = chunk != null;
                  if(this.paperConfig.skipEntityTickingInChunksScheduledForUnload)
                      shouldTick = shouldTick && !chunk.isUnloading() && chunk.scheduledForUnload == null;
-@@ -1365,8 +1373,11 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
+@@ -1360,8 +1368,11 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
                  tilesThisCycle--;
                  this.tileEntityListTick.remove(tileTickPosition--);
                  //this.tileEntityList.remove(tileentity); // Paper - remove unused list
diff --git a/Spigot-Server-Patches/0293-Configurable-Bed-Search-Radius.patch b/Spigot-Server-Patches/0290-Configurable-Bed-Search-Radius.patch
similarity index 96%
rename from Spigot-Server-Patches/0293-Configurable-Bed-Search-Radius.patch
rename to Spigot-Server-Patches/0290-Configurable-Bed-Search-Radius.patch
index 17a8ecd3a7..d9d0bed451 100644
--- a/Spigot-Server-Patches/0293-Configurable-Bed-Search-Radius.patch
+++ b/Spigot-Server-Patches/0290-Configurable-Bed-Search-Radius.patch
@@ -1,4 +1,4 @@
-From ddc34e5fcf2fe579484ac244370c4bca24a5adc7 Mon Sep 17 00:00:00 2001
+From a597b4290dec2a27e9682b460854fecab8a225a3 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,10 +10,10 @@ 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 b2855f3ca..d30a8ff6c 100644
+index 1607619bd..692206127 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -444,4 +444,15 @@ public class PaperWorldConfig {
+@@ -418,4 +418,15 @@ public class PaperWorldConfig {
      private void scanForLegacyEnderDragon() {
          scanForLegacyEnderDragon = getBoolean("game-mechanics.scan-for-legacy-ender-dragon", true);
      }
diff --git a/Spigot-Server-Patches/0294-Vex-getOwner-API.patch b/Spigot-Server-Patches/0291-Vex-getOwner-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0294-Vex-getOwner-API.patch
rename to Spigot-Server-Patches/0291-Vex-getOwner-API.patch
index e36e18e031..96597b48e4 100644
--- a/Spigot-Server-Patches/0294-Vex-getOwner-API.patch
+++ b/Spigot-Server-Patches/0291-Vex-getOwner-API.patch
@@ -1,4 +1,4 @@
-From 2de376809dbe86316ab433888c0591c299dc6186 Mon Sep 17 00:00:00 2001
+From d1b09605870a98731d5ea3f2cf15f20c60969243 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/0295-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/Spigot-Server-Patches/0292-Refresh-player-inventory-when-cancelling-PlayerInter.patch
similarity index 88%
rename from Spigot-Server-Patches/0295-Refresh-player-inventory-when-cancelling-PlayerInter.patch
rename to Spigot-Server-Patches/0292-Refresh-player-inventory-when-cancelling-PlayerInter.patch
index b7f4f016f7..dc61bce635 100644
--- a/Spigot-Server-Patches/0295-Refresh-player-inventory-when-cancelling-PlayerInter.patch
+++ b/Spigot-Server-Patches/0292-Refresh-player-inventory-when-cancelling-PlayerInter.patch
@@ -1,4 +1,4 @@
-From 4070e274a65887963631e09cf88e08da8d644bcc Mon Sep 17 00:00:00 2001
+From 82702cb25e3b6fb831782517c7c57c4733876eab 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,10 +16,10 @@ 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 4ed107eac..472f40709 100644
+index 97b315bca..d9d11a531 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1947,6 +1947,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1952,6 +1952,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                      }
  
                      if (event.isCancelled()) {
diff --git a/Spigot-API-Patches/0006-Add-async-chunk-load-API.patch b/removed/api/0006-Add-async-chunk-load-API.patch
similarity index 100%
rename from Spigot-API-Patches/0006-Add-async-chunk-load-API.patch
rename to removed/api/0006-Add-async-chunk-load-API.patch
diff --git a/removed/0017-Configurable-speed-for-water-flowing-over-lava.patch b/removed/server/0017-Configurable-speed-for-water-flowing-over-lava.patch
similarity index 100%
rename from removed/0017-Configurable-speed-for-water-flowing-over-lava.patch
rename to removed/server/0017-Configurable-speed-for-water-flowing-over-lava.patch
diff --git a/Spigot-Server-Patches/0023-Add-async-chunk-load-API.patch b/removed/server/0023-Add-async-chunk-load-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0023-Add-async-chunk-load-API.patch
rename to removed/server/0023-Add-async-chunk-load-API.patch
diff --git a/removed/0033-Generator-Settings.patch b/removed/server/0033-Generator-Settings.patch
similarity index 100%
rename from removed/0033-Generator-Settings.patch
rename to removed/server/0033-Generator-Settings.patch
diff --git a/removed/0035-Stop-updating-flowing-block-if-material-has-changed.patch b/removed/server/0035-Stop-updating-flowing-block-if-material-has-changed.patch
similarity index 100%
rename from removed/0035-Stop-updating-flowing-block-if-material-has-changed.patch
rename to removed/server/0035-Stop-updating-flowing-block-if-material-has-changed.patch
diff --git a/removed/0036-Fast-draining.patch b/removed/server/0036-Fast-draining.patch
similarity index 100%
rename from removed/0036-Fast-draining.patch
rename to removed/server/0036-Fast-draining.patch
diff --git a/removed/0037-Configurable-lava-flow-speed.patch b/removed/server/0037-Configurable-lava-flow-speed.patch
similarity index 100%
rename from removed/0037-Configurable-lava-flow-speed.patch
rename to removed/server/0037-Configurable-lava-flow-speed.patch
diff --git a/removed/0080-Custom-replacement-for-eaten-items.patch b/removed/server/0080-Custom-replacement-for-eaten-items.patch
similarity index 100%
rename from removed/0080-Custom-replacement-for-eaten-items.patch
rename to removed/server/0080-Custom-replacement-for-eaten-items.patch
diff --git a/removed/0097-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch b/removed/server/0097-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
similarity index 100%
rename from removed/0097-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
rename to removed/server/0097-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
diff --git a/removed/0115-Water-mobs-should-only-spawn-in-the-water.patch b/removed/server/0115-Water-mobs-should-only-spawn-in-the-water.patch
similarity index 100%
rename from removed/0115-Water-mobs-should-only-spawn-in-the-water.patch
rename to removed/server/0115-Water-mobs-should-only-spawn-in-the-water.patch
diff --git a/removed/0123-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch b/removed/server/0123-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch
similarity index 100%
rename from removed/0123-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch
rename to removed/server/0123-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch
diff --git a/removed/0130-Do-not-mark-chunks-as-active-for-neighbor-updates.patch b/removed/server/0130-Do-not-mark-chunks-as-active-for-neighbor-updates.patch
similarity index 100%
rename from removed/0130-Do-not-mark-chunks-as-active-for-neighbor-updates.patch
rename to removed/server/0130-Do-not-mark-chunks-as-active-for-neighbor-updates.patch
diff --git a/removed/0174-Speedup-BlockPos-by-fixing-inlining.patch b/removed/server/0174-Speedup-BlockPos-by-fixing-inlining.patch
similarity index 100%
rename from removed/0174-Speedup-BlockPos-by-fixing-inlining.patch
rename to removed/server/0174-Speedup-BlockPos-by-fixing-inlining.patch
diff --git a/removed/0177-Vanished-players-don-t-have-rights.patch b/removed/server/0177-Vanished-players-don-t-have-rights.patch
similarity index 100%
rename from removed/0177-Vanished-players-don-t-have-rights.patch
rename to removed/server/0177-Vanished-players-don-t-have-rights.patch
diff --git a/removed/0183-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/removed/server/0183-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
similarity index 100%
rename from removed/0183-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
rename to removed/server/0183-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
diff --git a/removed/0184-Add-option-to-remove-invalid-statistics.patch b/removed/server/0184-Add-option-to-remove-invalid-statistics.patch
similarity index 100%
rename from removed/0184-Add-option-to-remove-invalid-statistics.patch
rename to removed/server/0184-Add-option-to-remove-invalid-statistics.patch
diff --git a/removed/0185-IllegalPacketEvent.patch b/removed/server/0185-IllegalPacketEvent.patch
similarity index 100%
rename from removed/0185-IllegalPacketEvent.patch
rename to removed/server/0185-IllegalPacketEvent.patch
diff --git a/removed/0197-Assign-the-World-in-WorldGenStronghold.patch b/removed/server/0197-Assign-the-World-in-WorldGenStronghold.patch
similarity index 100%
rename from removed/0197-Assign-the-World-in-WorldGenStronghold.patch
rename to removed/server/0197-Assign-the-World-in-WorldGenStronghold.patch
diff --git a/removed/0200-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch b/removed/server/0200-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch
similarity index 100%
rename from removed/0200-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch
rename to removed/server/0200-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch
diff --git a/removed/0231-MC-94186-Fix-dragon-egg-falling-in-lazy-chunks.patch b/removed/server/0231-MC-94186-Fix-dragon-egg-falling-in-lazy-chunks.patch
similarity index 100%
rename from removed/0231-MC-94186-Fix-dragon-egg-falling-in-lazy-chunks.patch
rename to removed/server/0231-MC-94186-Fix-dragon-egg-falling-in-lazy-chunks.patch
diff --git a/removed/0235-Anti-Xray.patch b/removed/server/0235-Anti-Xray.patch
similarity index 100%
rename from removed/0235-Anti-Xray.patch
rename to removed/server/0235-Anti-Xray.patch
diff --git a/removed/0248-Improve-Structures-Checking.patch b/removed/server/0248-Improve-Structures-Checking.patch
similarity index 100%
rename from removed/0248-Improve-Structures-Checking.patch
rename to removed/server/0248-Improve-Structures-Checking.patch
diff --git a/removed/0259-Configurable-Max-Chunk-Gens-per-Tick.patch b/removed/server/0259-Configurable-Max-Chunk-Gens-per-Tick.patch
similarity index 100%
rename from removed/0259-Configurable-Max-Chunk-Gens-per-Tick.patch
rename to removed/server/0259-Configurable-Max-Chunk-Gens-per-Tick.patch
diff --git a/removed/0269-Optimize-Hoppers.patch b/removed/server/0269-Optimize-Hoppers.patch
similarity index 100%
rename from removed/0269-Optimize-Hoppers.patch
rename to removed/server/0269-Optimize-Hoppers.patch
diff --git a/removed/0280-Configurable-Unrestricted-Signs.patch b/removed/server/0280-Configurable-Unrestricted-Signs.patch
similarity index 100%
rename from removed/0280-Configurable-Unrestricted-Signs.patch
rename to removed/server/0280-Configurable-Unrestricted-Signs.patch
diff --git a/removed/0290-Handle-bad-chunks-more-gracefully.patch b/removed/server/0290-Handle-bad-chunks-more-gracefully.patch
similarity index 100%
rename from removed/0290-Handle-bad-chunks-more-gracefully.patch
rename to removed/server/0290-Handle-bad-chunks-more-gracefully.patch
diff --git a/removed/0292-Configurable-Allowance-of-Permanent-Chunk-Loaders.patch b/removed/server/0292-Configurable-Allowance-of-Permanent-Chunk-Loaders.patch
similarity index 100%
rename from removed/0292-Configurable-Allowance-of-Permanent-Chunk-Loaders.patch
rename to removed/server/0292-Configurable-Allowance-of-Permanent-Chunk-Loaders.patch
diff --git a/scripts/importmcdev.sh b/scripts/importmcdev.sh
index 3c54ffbbd3..255d8b25f4 100755
--- a/scripts/importmcdev.sh
+++ b/scripts/importmcdev.sh
@@ -70,7 +70,7 @@ for f in $files; do
 done
 
 import NBTList
-import TileEntityTypes
+import NBTBase
 
 set -e
 cd "$workdir/Spigot/Spigot-Server/"
diff --git a/work/Bukkit b/work/Bukkit
index 1d21dc022e..0bfac352ec 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 1d21dc022e7e6905ef64f54b165e7559dfa40ade
+Subproject commit 0bfac352ece5fd5bca7b8476eb233579a0772fab
diff --git a/work/CraftBukkit b/work/CraftBukkit
index de019a35f0..6c944b2163 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit de019a35f009518bbabb3f39383e374cf8aae799
+Subproject commit 6c944b2163bdff312a1bccd01529124674aca7e4