From 094bb03a37668fdf8803e81f7ade87b8a1f90752 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 18 Jan 2018 01:00:51 -0500
Subject: [PATCH] Optimize Hoppers

- Lots of itemstack cloning removed. Only clone if the item is actually moved
- Return true when a plugin cancels inventory move item event instead of false, as false causes pulls to cycle through all items.
  However, pushes do not exhibit the same behavior, so this is not something plugins could of been relying on.
- Add option (Default on) to cooldown hoppers when they fail to move an item due to full inventory
- Skip subsequent InventoryMoveItemEvents if a plugin does not use the item after first event fire for an iteration
---
 .../0087-Optimize-Hoppers.patch               |  42 +++
 ...Improve-Minecraft-Hopper-Performance.patch |  90 ------
 ...possibility-for-getServer-singleton.patch} |   6 +-
 ...tem-frames-performance-and-bug-fixe.patch} |  14 +-
 ...API-Replenishable-Lootables-Feature.patch} |   4 +-
 ...-Do-not-load-chunks-for-pathfinding.patch} |   6 +-
 ...> 0125-Entity-Tracking-Improvements.patch} |   8 +-
 ...-scoreboard-teams-to-scoreboard.dat.patch} |   8 +-
 ...unks-as-active-for-neighbor-updates.patch} |   6 +-
 ... 0128-Fix-Chunk-Unload-Queue-Issues.patch} |   8 +-
 ...em-property-for-disabling-watchdoge.patch} |   6 +-
 ...mize-EAR.patch => 0130-Optimize-EAR.patch} |   6 +-
 ...0131-Optimize-UserCache-Thread-Safe.patch} |   8 +-
 ...locking-on-Network-Manager-creation.patch} |   6 +-
 ...-Optional-TNT-doesn-t-move-in-water.patch} |   4 +-
 ...-redstone-torch-rapid-clock-removal.patch} |   6 +-
 ...Ensure-Chunks-never-ever-load-async.patch} |   8 +-
 ...h => 0136-Add-server-name-parameter.patch} |   6 +-
 ...n-Wither-Death-sounds-to-same-world.patch} |   8 +-
 ...FallingBlocks-being-stuck-on-fences.patch} |   4 +-
 ...0139-Make-entities-look-for-hoppers.patch} |  16 +-
 ...nk-Unloads-based-on-Player-Movement.patch} |   4 +-
 ... 0141-Toggleable-Elytra-Wall-Damage.patch} |   4 +-
 ...=> 0142-Fix-Double-World-Add-issues.patch} |   8 +-
 ...tch => 0143-Fix-Old-Sign-Conversion.patch} |  10 +-
 ...-profiles-that-have-no-UUID-and-no-.patch} |   6 +-
 ...ative-vehicle-moved-wrongly-message.patch} |   6 +-
 ...rs-that-dismount-from-other-players.patch} |   6 +-
 ...etting-for-proxy-online-mode-status.patch} |  10 +-
 ...-BlockStateEnum-hashCode-and-equals.patch} |   6 +-
 ...0149-Disable-ticking-of-snow-blocks.patch} |   6 +-
 ...50-Fix-AIOOBE-in-inventory-handling.patch} |   6 +-
 ...nfigurable-packet-in-spam-threshold.patch} |   8 +-
 ...2-Configurable-flying-kick-messages.patch} |   8 +-
 ...atch => 0153-Auto-Save-Improvements.patch} |   4 +-
 ...ch => 0154-Chunk-registration-fixes.patch} |   6 +-
 ...k-reference-on-Craft-Entity-removal.patch} |   6 +-
 ...to-fix-bad-Y-levels-on-player-login.patch} |   6 +-
 ...ring-limit-for-packet-serialization.patch} |   6 +-
 ...ch => 0158-Disable-Vanilla-Chunk-GC.patch} |   6 +-
 ...ion-to-remove-corrupt-tile-entities.patch} |   4 +-
 ...nt.patch => 0160-Add-EntityZapEvent.patch} |  10 +-
 ...hunks-from-Hoppers-and-other-things.patch} |   6 +-
 ...ent-Auto-Save-if-Save-Queue-is-full.patch} |   4 +-
 ... 0163-Chunk-Save-Stats-Debug-Option.patch} |   8 +-
 ...-from-ArmorStand-and-SpawnEgg-items.patch} |   4 +-
 ...65-Cache-user-authenticator-threads.patch} |   6 +-
 ...atch => 0166-Optimize-Network-Queue.patch} |   6 +-
 ....patch => 0167-Optimise-removeQueue.patch} |   6 +-
 ...-Allow-Reloading-of-Command-Aliases.patch} |   6 +-
 ...-Add-source-to-PlayerExpChangeEvent.patch} |   8 +-
 ...mize-World.isLoaded-BlockPosition-Z.patch} |   6 +-
 ...Speedup-BlockPos-by-fixing-inlining.patch} |   8 +-
 ...-Don-t-let-fishinghooks-use-portals.patch} |   8 +-
 ... => 0173-Add-ProjectileCollideEvent.patch} |  14 +-
 ...-Vanished-players-don-t-have-rights.patch} |  12 +-
 ...ent-Pathfinding-out-of-World-Border.patch} |   8 +-
 ...Bound-Treasure-Maps-to-World-Border.patch} |   8 +-
 ...igurable-Cartographer-Treasure-Maps.patch} |   4 +-
 ... => 0178-Optimize-ItemStack.isEmpty.patch} |   6 +-
 ...o-control-if-armour-stands-can-move.patch} |   8 +-
 ...-armor-stands-from-doing-entity-loo.patch} |   4 +-
 ...option-to-remove-invalid-statistics.patch} |   8 +-
 ...nt.patch => 0182-IllegalPacketEvent.patch} |   6 +-
 ...3-Properly-fix-item-duplication-bug.patch} |   8 +-
 ...=> 0184-String-based-Action-Bar-API.patch} |   2 +-
 ... 0185-Activation-Range-Improvements.patch} |  16 +-
 ...-API-s.patch => 0186-Firework-API-s.patch} |  12 +-
 ... 0187-PlayerTeleportEndGatewayEvent.patch} |   6 +-
 ... => 0188-ShulkerBox-Dupe-Prevention.patch} |   6 +-
 ...ovide-E-TE-Chunk-count-stat-methods.patch} |   6 +-
 ...h => 0190-Enforce-Sync-Player-Saves.patch} |   2 +-
 ... => 0191-Enforce-Sync-Chunk-Unloads.patch} |   6 +-
 ...low-entities-to-ride-themselves-572.patch} |   6 +-
 ...atch => 0193-Fix-block-break-desync.patch} |   6 +-
 ...ign-the-World-in-WorldGenStronghold.patch} |   6 +-
 ...I-for-Reason-Source-Triggering-play.patch} |  28 +-
 ...-Remove-the-Vanilla-Method-Profiler.patch} |   8 +-
 ...patch => 0197-Cap-Entity-Collisions.patch} |   4 +-
 ...ow-a-zero-max-height-in-BiomeJungle.patch} |   8 +-
 ...-CraftScheduler-Async-Task-Debugger.patch} |   6 +-
 ...g.patch => 0200-Shame-on-you-Mojang.patch} |   6 +-
 ...ore-aggressive-in-the-chunk-unload-.patch} |   6 +-
 ...> 0202-Do-not-let-armorstands-drown.patch} |   8 +-
 ...-attempting-to-read-EMPTY-ItemStack.patch} |   6 +-
 ...e-async-calls-to-restart-the-server.patch} |   2 +-
 ...roperty-to-disable-book-size-limits.patch} |   6 +-
 ...e-parrots-stay-on-shoulders-despite.patch} |   4 +-
 ...-option-to-prevent-player-names-fro.patch} |   8 +-
 ...leAppender-for-console-improvements.patch} |  30 +-
 ...rable-option-to-disable-creeper-lin.patch} |   4 +-
 ....patch => 0210-Item-canEntityPickup.patch} |  10 +-
 ...layerPickupItemEvent-setFlyAtPlayer.patch} |   6 +-
 ...> 0212-PlayerAttemptPickupItemEvent.patch} |   6 +-
 ...tch => 0213-Add-UnknownCommandEvent.patch} |   6 +-
 ...tch => 0214-Basic-PlayerProfile-API.patch} |   4 +-
 ... 0215-Shoulder-Entities-Release-API.patch} |   4 +-
 ...patch => 0216-Profile-Lookup-Events.patch} |   4 +-
 ...layer-logins-during-server-shutdown.patch} |   4 +-
 ...patch => 0218-Entity-fromMobSpawner.patch} |   6 +-
 ...0219-Fix-Anvil-Level-sync-to-client.patch} |   2 +-
 ...ages-for-getTileEntity-in-order-to-.patch} |   4 +-
 ...-Player-Sample-in-ServerListPingEve.patch} |   4 +-
 ...2-Improve-the-Saddle-API-for-Horses.patch} |   2 +-
 ...plement-ensureServerConversions-API.patch} |   4 +-
 ...> 0224-Implement-getI18NDisplayName.patch} |   4 +-
 ...ving-disabled-before-unloading-all-.patch} |   4 +-
 ...=> 0226-ProfileWhitelistVerifyEvent.patch} |   2 +-
 ...ch => 0227-Fix-this-stupid-bullshit.patch} |   4 +-
 ...wns-should-honor-nametags-and-leash.patch} |   4 +-
 ...mer-when-spawner-event-is-cancelled.patch} |   6 +-
 ...x-dragon-egg-falling-in-lazy-chunks.patch} |   4 +-
 ...1-Fix-MC-117075-TE-Unload-Lag-Spike.patch} |   4 +-
 ...a-custom-authentication-servers-dow.patch} |   4 +-
 ...atch => 0233-LivingEntity-setKiller.patch} |   6 +-
 ...E-during-CraftBlockEntityState-load.patch} |   4 +-
 ...6-Anti-Xray.patch => 0235-Anti-Xray.patch} |   4 +-
 ...ms-to-redirect-System.out-err-to-lo.patch} |   6 +-
 ...-prefixes-using-Log4J-configuration.patch} |   6 +-
 ...Include-Log4J2-SLF4J-implementation.patch} |   6 +-
 ...efix-for-various-plugins-bypassing-.patch} |   4 +-
 ...t.patch => 0240-Add-PlayerJumpEvent.patch} |   4 +-
 ...-handle-PacketPlayInKeepAlive-async.patch} |   4 +-
 ...t-protocol-version-and-virtual-host.patch} |   2 +-
 ...t-serverside-behavior-of-keepalives.patch} |   4 +-
 ...ith-fastutil-s-ObjectOpenHashSet-in.patch} |   4 +-
 ...Effects-only-to-players-who-can-see.patch} |   4 +-
 ...maximum-exp-value-when-merging-orbs.patch} |   4 +-
 ... => 0247-Add-PlayerArmorChangeEvent.patch} |   6 +-
 ...=> 0248-Improve-Structures-Checking.patch} |   4 +-
 ...om-being-processed-when-the-player-.patch} |   4 +-
 ...-implementations-for-captured-block.patch} |   4 +-
 ...get-a-BlockState-without-a-snapshot.patch} |  10 +-
 ...patch => 0252-AsyncTabCompleteEvent.patch} |   6 +-
 ...53-Avoid-NPE-in-PathfinderGoalTempt.patch} |   4 +-
 ...53-Do-not-use-a-snapshot-for-hoppers.patch |  67 -----
 ...d-unlit-chunks-when-lighting-update.patch} |   4 +-
 ...=> 0255-PlayerPickupExperienceEvent.patch} |   4 +-
 ...tch => 0256-ExperienceOrbMergeEvent.patch} |   4 +-
 ...-Ability-to-apply-mending-to-XP-API.patch} |   2 +-
 ...rable-Chunks-Sends-per-Tick-setting.patch} |   4 +-
 ...onfigurable-Max-Chunk-Gens-per-Tick.patch} |   4 +-
 ...max-squid-spawn-height-configurable.patch} |   4 +-
 ...patch => 0261-PreCreatureSpawnEvent.patch} |   4 +-
 ...-PlayerNaturallySpawnCreaturesEvent.patch} |   6 +-
 ...-Add-SkullMeta.setPlayerProfile-API.patch} |   4 +-
 ...> 0264-Fill-Profile-Property-Events.patch} |   4 +-
 ...layerAdvancementCriterionGrantEvent.patch} |   6 +-
 ...ck-for-blocked-double-chest-for-hop.patch} |   4 +-
 ...ch => 0267-Add-ArmorStand-Item-Meta.patch} |   4 +-
 ...indow-when-PlayerInteractEvent-is-c.patch} |   2 +-
 .../0269-Optimize-Hoppers.patch               | 283 ++++++++++++++++++
 152 files changed, 778 insertions(+), 610 deletions(-)
 create mode 100644 Spigot-API-Patches/0087-Optimize-Hoppers.patch
 delete mode 100644 Spigot-Server-Patches/0121-Improve-Minecraft-Hopper-Performance.patch
 rename Spigot-Server-Patches/{0122-remove-null-possibility-for-getServer-singleton.patch => 0121-remove-null-possibility-for-getServer-singleton.patch} (94%)
 rename Spigot-Server-Patches/{0123-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch => 0122-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch} (96%)
 rename Spigot-Server-Patches/{0124-LootTable-API-Replenishable-Lootables-Feature.patch => 0123-LootTable-API-Replenishable-Lootables-Feature.patch} (99%)
 rename Spigot-Server-Patches/{0125-Do-not-load-chunks-for-pathfinding.patch => 0124-Do-not-load-chunks-for-pathfinding.patch} (87%)
 rename Spigot-Server-Patches/{0126-Entity-Tracking-Improvements.patch => 0125-Entity-Tracking-Improvements.patch} (96%)
 rename Spigot-Server-Patches/{0127-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch => 0126-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch} (91%)
 rename Spigot-Server-Patches/{0128-Do-not-mark-chunks-as-active-for-neighbor-updates.patch => 0127-Do-not-mark-chunks-as-active-for-neighbor-updates.patch} (96%)
 rename Spigot-Server-Patches/{0129-Fix-Chunk-Unload-Queue-Issues.patch => 0128-Fix-Chunk-Unload-Queue-Issues.patch} (92%)
 rename Spigot-Server-Patches/{0130-System-property-for-disabling-watchdoge.patch => 0129-System-property-for-disabling-watchdoge.patch} (89%)
 rename Spigot-Server-Patches/{0131-Optimize-EAR.patch => 0130-Optimize-EAR.patch} (96%)
 rename Spigot-Server-Patches/{0132-Optimize-UserCache-Thread-Safe.patch => 0131-Optimize-UserCache-Thread-Safe.patch} (96%)
 rename Spigot-Server-Patches/{0133-Avoid-blocking-on-Network-Manager-creation.patch => 0132-Avoid-blocking-on-Network-Manager-creation.patch} (96%)
 rename Spigot-Server-Patches/{0134-Optional-TNT-doesn-t-move-in-water.patch => 0133-Optional-TNT-doesn-t-move-in-water.patch} (98%)
 rename Spigot-Server-Patches/{0135-Faster-redstone-torch-rapid-clock-removal.patch => 0134-Faster-redstone-torch-rapid-clock-removal.patch} (94%)
 rename Spigot-Server-Patches/{0136-Ensure-Chunks-never-ever-load-async.patch => 0135-Ensure-Chunks-never-ever-load-async.patch} (95%)
 rename Spigot-Server-Patches/{0137-Add-server-name-parameter.patch => 0136-Add-server-name-parameter.patch} (89%)
 rename Spigot-Server-Patches/{0138-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch => 0137-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch} (95%)
 rename Spigot-Server-Patches/{0139-Fix-FallingBlocks-being-stuck-on-fences.patch => 0138-Fix-FallingBlocks-being-stuck-on-fences.patch} (98%)
 rename Spigot-Server-Patches/{0140-Make-entities-look-for-hoppers.patch => 0139-Make-entities-look-for-hoppers.patch} (97%)
 rename Spigot-Server-Patches/{0141-Delay-Chunk-Unloads-based-on-Player-Movement.patch => 0140-Delay-Chunk-Unloads-based-on-Player-Movement.patch} (98%)
 rename Spigot-Server-Patches/{0142-Toggleable-Elytra-Wall-Damage.patch => 0141-Toggleable-Elytra-Wall-Damage.patch} (96%)
 rename Spigot-Server-Patches/{0143-Fix-Double-World-Add-issues.patch => 0142-Fix-Double-World-Add-issues.patch} (92%)
 rename Spigot-Server-Patches/{0144-Fix-Old-Sign-Conversion.patch => 0143-Fix-Old-Sign-Conversion.patch} (95%)
 rename Spigot-Server-Patches/{0145-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch => 0144-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch} (89%)
 rename Spigot-Server-Patches/{0146-More-informative-vehicle-moved-wrongly-message.patch => 0145-More-informative-vehicle-moved-wrongly-message.patch} (90%)
 rename Spigot-Server-Patches/{0147-Re-track-players-that-dismount-from-other-players.patch => 0146-Re-track-players-that-dismount-from-other-players.patch} (90%)
 rename Spigot-Server-Patches/{0148-Add-setting-for-proxy-online-mode-status.patch => 0147-Add-setting-for-proxy-online-mode-status.patch} (93%)
 rename Spigot-Server-Patches/{0149-Optimise-BlockStateEnum-hashCode-and-equals.patch => 0148-Optimise-BlockStateEnum-hashCode-and-equals.patch} (95%)
 rename Spigot-Server-Patches/{0150-Disable-ticking-of-snow-blocks.patch => 0149-Disable-ticking-of-snow-blocks.patch} (91%)
 rename Spigot-Server-Patches/{0151-Fix-AIOOBE-in-inventory-handling.patch => 0150-Fix-AIOOBE-in-inventory-handling.patch} (90%)
 rename Spigot-Server-Patches/{0152-Configurable-packet-in-spam-threshold.patch => 0151-Configurable-packet-in-spam-threshold.patch} (94%)
 rename Spigot-Server-Patches/{0153-Configurable-flying-kick-messages.patch => 0152-Configurable-flying-kick-messages.patch} (94%)
 rename Spigot-Server-Patches/{0154-Auto-Save-Improvements.patch => 0153-Auto-Save-Improvements.patch} (99%)
 rename Spigot-Server-Patches/{0155-Chunk-registration-fixes.patch => 0154-Chunk-registration-fixes.patch} (89%)
 rename Spigot-Server-Patches/{0156-Remove-FishingHook-reference-on-Craft-Entity-removal.patch => 0155-Remove-FishingHook-reference-on-Craft-Entity-removal.patch} (89%)
 rename Spigot-Server-Patches/{0157-Auto-fix-bad-Y-levels-on-player-login.patch => 0156-Auto-fix-bad-Y-levels-on-player-login.patch} (89%)
 rename Spigot-Server-Patches/{0158-Raise-string-limit-for-packet-serialization.patch => 0157-Raise-string-limit-for-packet-serialization.patch} (92%)
 rename Spigot-Server-Patches/{0159-Disable-Vanilla-Chunk-GC.patch => 0158-Disable-Vanilla-Chunk-GC.patch} (92%)
 rename Spigot-Server-Patches/{0160-Option-to-remove-corrupt-tile-entities.patch => 0159-Option-to-remove-corrupt-tile-entities.patch} (96%)
 rename Spigot-Server-Patches/{0161-Add-EntityZapEvent.patch => 0160-Add-EntityZapEvent.patch} (95%)
 rename Spigot-Server-Patches/{0162-Don-t-load-Chunks-from-Hoppers-and-other-things.patch => 0161-Don-t-load-Chunks-from-Hoppers-and-other-things.patch} (94%)
 rename Spigot-Server-Patches/{0163-Prevent-Auto-Save-if-Save-Queue-is-full.patch => 0162-Prevent-Auto-Save-if-Save-Queue-is-full.patch} (97%)
 rename Spigot-Server-Patches/{0164-Chunk-Save-Stats-Debug-Option.patch => 0163-Chunk-Save-Stats-Debug-Option.patch} (96%)
 rename Spigot-Server-Patches/{0165-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch => 0164-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch} (97%)
 rename Spigot-Server-Patches/{0166-Cache-user-authenticator-threads.patch => 0165-Cache-user-authenticator-threads.patch} (96%)
 rename Spigot-Server-Patches/{0167-Optimize-Network-Queue.patch => 0166-Optimize-Network-Queue.patch} (90%)
 rename Spigot-Server-Patches/{0168-Optimise-removeQueue.patch => 0167-Optimise-removeQueue.patch} (96%)
 rename Spigot-Server-Patches/{0169-Allow-Reloading-of-Command-Aliases.patch => 0168-Allow-Reloading-of-Command-Aliases.patch} (92%)
 rename Spigot-Server-Patches/{0170-Add-source-to-PlayerExpChangeEvent.patch => 0169-Add-source-to-PlayerExpChangeEvent.patch} (94%)
 rename Spigot-Server-Patches/{0171-Optimize-World.isLoaded-BlockPosition-Z.patch => 0170-Optimize-World.isLoaded-BlockPosition-Z.patch} (88%)
 rename Spigot-Server-Patches/{0172-Speedup-BlockPos-by-fixing-inlining.patch => 0171-Speedup-BlockPos-by-fixing-inlining.patch} (98%)
 rename Spigot-Server-Patches/{0173-Don-t-let-fishinghooks-use-portals.patch => 0172-Don-t-let-fishinghooks-use-portals.patch} (90%)
 rename Spigot-Server-Patches/{0174-Add-ProjectileCollideEvent.patch => 0173-Add-ProjectileCollideEvent.patch} (95%)
 rename Spigot-Server-Patches/{0175-Vanished-players-don-t-have-rights.patch => 0174-Vanished-players-don-t-have-rights.patch} (96%)
 rename Spigot-Server-Patches/{0176-Prevent-Pathfinding-out-of-World-Border.patch => 0175-Prevent-Pathfinding-out-of-World-Border.patch} (93%)
 rename Spigot-Server-Patches/{0177-Bound-Treasure-Maps-to-World-Border.patch => 0176-Bound-Treasure-Maps-to-World-Border.patch} (94%)
 rename Spigot-Server-Patches/{0178-Configurable-Cartographer-Treasure-Maps.patch => 0177-Configurable-Cartographer-Treasure-Maps.patch} (97%)
 rename Spigot-Server-Patches/{0179-Optimize-ItemStack.isEmpty.patch => 0178-Optimize-ItemStack.isEmpty.patch} (92%)
 rename Spigot-Server-Patches/{0180-Add-API-methods-to-control-if-armour-stands-can-move.patch => 0179-Add-API-methods-to-control-if-armour-stands-can-move.patch} (92%)
 rename Spigot-Server-Patches/{0181-Option-to-prevent-armor-stands-from-doing-entity-loo.patch => 0180-Option-to-prevent-armor-stands-from-doing-entity-loo.patch} (95%)
 rename Spigot-Server-Patches/{0182-Add-option-to-remove-invalid-statistics.patch => 0181-Add-option-to-remove-invalid-statistics.patch} (94%)
 rename Spigot-Server-Patches/{0183-IllegalPacketEvent.patch => 0182-IllegalPacketEvent.patch} (97%)
 rename Spigot-Server-Patches/{0184-Properly-fix-item-duplication-bug.patch => 0183-Properly-fix-item-duplication-bug.patch} (91%)
 rename Spigot-Server-Patches/{0185-String-based-Action-Bar-API.patch => 0184-String-based-Action-Bar-API.patch} (97%)
 rename Spigot-Server-Patches/{0186-Activation-Range-Improvements.patch => 0185-Activation-Range-Improvements.patch} (95%)
 rename Spigot-Server-Patches/{0187-Firework-API-s.patch => 0186-Firework-API-s.patch} (96%)
 rename Spigot-Server-Patches/{0188-PlayerTeleportEndGatewayEvent.patch => 0187-PlayerTeleportEndGatewayEvent.patch} (92%)
 rename Spigot-Server-Patches/{0189-ShulkerBox-Dupe-Prevention.patch => 0188-ShulkerBox-Dupe-Prevention.patch} (90%)
 rename Spigot-Server-Patches/{0190-Provide-E-TE-Chunk-count-stat-methods.patch => 0189-Provide-E-TE-Chunk-count-stat-methods.patch} (93%)
 rename Spigot-Server-Patches/{0191-Enforce-Sync-Player-Saves.patch => 0190-Enforce-Sync-Player-Saves.patch} (94%)
 rename Spigot-Server-Patches/{0192-Enforce-Sync-Chunk-Unloads.patch => 0191-Enforce-Sync-Chunk-Unloads.patch} (92%)
 rename Spigot-Server-Patches/{0193-Don-t-allow-entities-to-ride-themselves-572.patch => 0192-Don-t-allow-entities-to-ride-themselves-572.patch} (88%)
 rename Spigot-Server-Patches/{0194-Fix-block-break-desync.patch => 0193-Fix-block-break-desync.patch} (88%)
 rename Spigot-Server-Patches/{0195-Assign-the-World-in-WorldGenStronghold.patch => 0194-Assign-the-World-in-WorldGenStronghold.patch} (87%)
 rename Spigot-Server-Patches/{0196-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch => 0195-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch} (96%)
 rename Spigot-Server-Patches/{0197-Remove-the-Vanilla-Method-Profiler.patch => 0196-Remove-the-Vanilla-Method-Profiler.patch} (96%)
 rename Spigot-Server-Patches/{0198-Cap-Entity-Collisions.patch => 0197-Cap-Entity-Collisions.patch} (97%)
 rename Spigot-Server-Patches/{0199-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch => 0198-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch} (92%)
 rename Spigot-Server-Patches/{0200-Remove-CraftScheduler-Async-Task-Debugger.patch => 0199-Remove-CraftScheduler-Async-Task-Debugger.patch} (96%)
 rename Spigot-Server-Patches/{0201-Shame-on-you-Mojang.patch => 0200-Shame-on-you-Mojang.patch} (95%)
 rename Spigot-Server-Patches/{0202-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch => 0201-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch} (91%)
 rename Spigot-Server-Patches/{0203-Do-not-let-armorstands-drown.patch => 0202-Do-not-let-armorstands-drown.patch} (92%)
 rename Spigot-Server-Patches/{0204-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch => 0203-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch} (90%)
 rename Spigot-Server-Patches/{0205-Properly-handle-async-calls-to-restart-the-server.patch => 0204-Properly-handle-async-calls-to-restart-the-server.patch} (99%)
 rename Spigot-Server-Patches/{0206-Add-system-property-to-disable-book-size-limits.patch => 0205-Add-system-property-to-disable-book-size-limits.patch} (96%)
 rename Spigot-Server-Patches/{0207-Add-option-to-make-parrots-stay-on-shoulders-despite.patch => 0206-Add-option-to-make-parrots-stay-on-shoulders-despite.patch} (97%)
 rename Spigot-Server-Patches/{0208-Add-configuration-option-to-prevent-player-names-fro.patch => 0207-Add-configuration-option-to-prevent-player-names-fro.patch} (91%)
 rename Spigot-Server-Patches/{0209-Use-TerminalConsoleAppender-for-console-improvements.patch => 0208-Use-TerminalConsoleAppender-for-console-improvements.patch} (98%)
 rename Spigot-Server-Patches/{0210-provide-a-configurable-option-to-disable-creeper-lin.patch => 0209-provide-a-configurable-option-to-disable-creeper-lin.patch} (96%)
 rename Spigot-Server-Patches/{0211-Item-canEntityPickup.patch => 0210-Item-canEntityPickup.patch} (92%)
 rename Spigot-Server-Patches/{0212-PlayerPickupItemEvent-setFlyAtPlayer.patch => 0211-PlayerPickupItemEvent-setFlyAtPlayer.patch} (95%)
 rename Spigot-Server-Patches/{0213-PlayerAttemptPickupItemEvent.patch => 0212-PlayerAttemptPickupItemEvent.patch} (94%)
 rename Spigot-Server-Patches/{0214-Add-UnknownCommandEvent.patch => 0213-Add-UnknownCommandEvent.patch} (93%)
 rename Spigot-Server-Patches/{0215-Basic-PlayerProfile-API.patch => 0214-Basic-PlayerProfile-API.patch} (99%)
 rename Spigot-Server-Patches/{0216-Shoulder-Entities-Release-API.patch => 0215-Shoulder-Entities-Release-API.patch} (98%)
 rename Spigot-Server-Patches/{0217-Profile-Lookup-Events.patch => 0216-Profile-Lookup-Events.patch} (98%)
 rename Spigot-Server-Patches/{0218-Block-player-logins-during-server-shutdown.patch => 0217-Block-player-logins-during-server-shutdown.patch} (93%)
 rename Spigot-Server-Patches/{0219-Entity-fromMobSpawner.patch => 0218-Entity-fromMobSpawner.patch} (96%)
 rename Spigot-Server-Patches/{0220-Fix-Anvil-Level-sync-to-client.patch => 0219-Fix-Anvil-Level-sync-to-client.patch} (97%)
 rename Spigot-Server-Patches/{0221-Add-missing-coverages-for-getTileEntity-in-order-to-.patch => 0220-Add-missing-coverages-for-getTileEntity-in-order-to-.patch} (93%)
 rename Spigot-Server-Patches/{0222-Allow-Changing-of-Player-Sample-in-ServerListPingEve.patch => 0221-Allow-Changing-of-Player-Sample-in-ServerListPingEve.patch} (97%)
 rename Spigot-Server-Patches/{0223-Improve-the-Saddle-API-for-Horses.patch => 0222-Improve-the-Saddle-API-for-Horses.patch} (97%)
 rename Spigot-Server-Patches/{0224-Implement-ensureServerConversions-API.patch => 0223-Implement-ensureServerConversions-API.patch} (93%)
 rename Spigot-Server-Patches/{0225-Implement-getI18NDisplayName.patch => 0224-Implement-getI18NDisplayName.patch} (94%)
 rename Spigot-Server-Patches/{0226-GH-806-Respect-saving-disabled-before-unloading-all-.patch => 0225-GH-806-Respect-saving-disabled-before-unloading-all-.patch} (93%)
 rename Spigot-Server-Patches/{0227-ProfileWhitelistVerifyEvent.patch => 0226-ProfileWhitelistVerifyEvent.patch} (97%)
 rename Spigot-Server-Patches/{0228-Fix-this-stupid-bullshit.patch => 0227-Fix-this-stupid-bullshit.patch} (95%)
 rename Spigot-Server-Patches/{0229-Ocelot-despawns-should-honor-nametags-and-leash.patch => 0228-Ocelot-despawns-should-honor-nametags-and-leash.patch} (92%)
 rename Spigot-Server-Patches/{0230-Reset-spawner-timer-when-spawner-event-is-cancelled.patch => 0229-Reset-spawner-timer-when-spawner-event-is-cancelled.patch} (91%)
 rename Spigot-Server-Patches/{0231-MC-94186-Fix-dragon-egg-falling-in-lazy-chunks.patch => 0230-MC-94186-Fix-dragon-egg-falling-in-lazy-chunks.patch} (93%)
 rename Spigot-Server-Patches/{0232-Fix-MC-117075-TE-Unload-Lag-Spike.patch => 0231-Fix-MC-117075-TE-Unload-Lag-Spike.patch} (94%)
 rename Spigot-Server-Patches/{0233-Allow-specifying-a-custom-authentication-servers-dow.patch => 0232-Allow-specifying-a-custom-authentication-servers-dow.patch} (97%)
 rename Spigot-Server-Patches/{0234-LivingEntity-setKiller.patch => 0233-LivingEntity-setKiller.patch} (91%)
 rename Spigot-Server-Patches/{0235-Avoid-NPE-during-CraftBlockEntityState-load.patch => 0234-Avoid-NPE-during-CraftBlockEntityState-load.patch} (95%)
 rename Spigot-Server-Patches/{0236-Anti-Xray.patch => 0235-Anti-Xray.patch} (99%)
 rename Spigot-Server-Patches/{0237-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch => 0236-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch} (94%)
 rename Spigot-Server-Patches/{0238-Handle-plugin-prefixes-using-Log4J-configuration.patch => 0237-Handle-plugin-prefixes-using-Log4J-configuration.patch} (97%)
 rename Spigot-Server-Patches/{0239-Include-Log4J2-SLF4J-implementation.patch => 0238-Include-Log4J2-SLF4J-implementation.patch} (86%)
 rename Spigot-Server-Patches/{0240-Disable-logger-prefix-for-various-plugins-bypassing-.patch => 0239-Disable-logger-prefix-for-various-plugins-bypassing-.patch} (96%)
 rename Spigot-Server-Patches/{0241-Add-PlayerJumpEvent.patch => 0240-Add-PlayerJumpEvent.patch} (98%)
 rename Spigot-Server-Patches/{0242-handle-PacketPlayInKeepAlive-async.patch => 0241-handle-PacketPlayInKeepAlive-async.patch} (96%)
 rename Spigot-Server-Patches/{0243-Expose-client-protocol-version-and-virtual-host.patch => 0242-Expose-client-protocol-version-and-virtual-host.patch} (98%)
 rename Spigot-Server-Patches/{0244-revert-serverside-behavior-of-keepalives.patch => 0243-revert-serverside-behavior-of-keepalives.patch} (98%)
 rename Spigot-Server-Patches/{0245-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch => 0244-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch} (94%)
 rename Spigot-Server-Patches/{0246-Send-attack-SoundEffects-only-to-players-who-can-see.patch => 0245-Send-attack-SoundEffects-only-to-players-who-can-see.patch} (98%)
 rename Spigot-Server-Patches/{0247-Option-for-maximum-exp-value-when-merging-orbs.patch => 0246-Option-for-maximum-exp-value-when-merging-orbs.patch} (97%)
 rename Spigot-Server-Patches/{0248-Add-PlayerArmorChangeEvent.patch => 0247-Add-PlayerArmorChangeEvent.patch} (95%)
 rename Spigot-Server-Patches/{0249-Improve-Structures-Checking.patch => 0248-Improve-Structures-Checking.patch} (99%)
 rename Spigot-Server-Patches/{0250-Prevent-logins-from-being-processed-when-the-player-.patch => 0249-Prevent-logins-from-being-processed-when-the-player-.patch} (93%)
 rename Spigot-Server-Patches/{0251-use-CB-BlockState-implementations-for-captured-block.patch => 0250-use-CB-BlockState-implementations-for-captured-block.patch} (96%)
 rename Spigot-Server-Patches/{0252-API-to-get-a-BlockState-without-a-snapshot.patch => 0251-API-to-get-a-BlockState-without-a-snapshot.patch} (94%)
 rename Spigot-Server-Patches/{0254-AsyncTabCompleteEvent.patch => 0252-AsyncTabCompleteEvent.patch} (98%)
 rename Spigot-Server-Patches/{0255-Avoid-NPE-in-PathfinderGoalTempt.patch => 0253-Avoid-NPE-in-PathfinderGoalTempt.patch} (92%)
 delete mode 100644 Spigot-Server-Patches/0253-Do-not-use-a-snapshot-for-hoppers.patch
 rename Spigot-Server-Patches/{0256-Don-t-blindly-send-unlit-chunks-when-lighting-update.patch => 0254-Don-t-blindly-send-unlit-chunks-when-lighting-update.patch} (96%)
 rename Spigot-Server-Patches/{0257-PlayerPickupExperienceEvent.patch => 0255-PlayerPickupExperienceEvent.patch} (94%)
 rename Spigot-Server-Patches/{0258-ExperienceOrbMergeEvent.patch => 0256-ExperienceOrbMergeEvent.patch} (95%)
 rename Spigot-Server-Patches/{0259-Ability-to-apply-mending-to-XP-API.patch => 0257-Ability-to-apply-mending-to-XP-API.patch} (98%)
 rename Spigot-Server-Patches/{0260-Configurable-Chunks-Sends-per-Tick-setting.patch => 0258-Configurable-Chunks-Sends-per-Tick-setting.patch} (96%)
 rename Spigot-Server-Patches/{0261-Configurable-Max-Chunk-Gens-per-Tick.patch => 0259-Configurable-Max-Chunk-Gens-per-Tick.patch} (98%)
 rename Spigot-Server-Patches/{0262-Make-max-squid-spawn-height-configurable.patch => 0260-Make-max-squid-spawn-height-configurable.patch} (95%)
 rename Spigot-Server-Patches/{0263-PreCreatureSpawnEvent.patch => 0261-PreCreatureSpawnEvent.patch} (98%)
 rename Spigot-Server-Patches/{0264-PlayerNaturallySpawnCreaturesEvent.patch => 0262-PlayerNaturallySpawnCreaturesEvent.patch} (93%)
 rename Spigot-Server-Patches/{0265-Add-SkullMeta.setPlayerProfile-API.patch => 0263-Add-SkullMeta.setPlayerProfile-API.patch} (96%)
 rename Spigot-Server-Patches/{0266-Fill-Profile-Property-Events.patch => 0264-Fill-Profile-Property-Events.patch} (98%)
 rename Spigot-Server-Patches/{0267-PlayerAdvancementCriterionGrantEvent.patch => 0265-PlayerAdvancementCriterionGrantEvent.patch} (90%)
 rename Spigot-Server-Patches/{0268-MC-99321-Dont-check-for-blocked-double-chest-for-hop.patch => 0266-MC-99321-Dont-check-for-blocked-double-chest-for-hop.patch} (93%)
 rename Spigot-Server-Patches/{0269-Add-ArmorStand-Item-Meta.patch => 0267-Add-ArmorStand-Item-Meta.patch} (99%)
 rename Spigot-Server-Patches/{0270-Close-Structure-Window-when-PlayerInteractEvent-is-c.patch => 0268-Close-Structure-Window-when-PlayerInteractEvent-is-c.patch} (96%)
 create mode 100644 Spigot-Server-Patches/0269-Optimize-Hoppers.patch

diff --git a/Spigot-API-Patches/0087-Optimize-Hoppers.patch b/Spigot-API-Patches/0087-Optimize-Hoppers.patch
new file mode 100644
index 000000000..e89f3607b
--- /dev/null
+++ b/Spigot-API-Patches/0087-Optimize-Hoppers.patch
@@ -0,0 +1,42 @@
+From 4e2c715cb4a31b2fa1c1d2fd441ea6fef3864cad 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
+
+Adds data about what Item related methods were used in InventoryMoveItem event
+so that the server can improve the performance of this event.
+
+diff --git a/src/main/java/org/bukkit/event/inventory/InventoryMoveItemEvent.java b/src/main/java/org/bukkit/event/inventory/InventoryMoveItemEvent.java
+index 06ec99ae..b44cc45b 100644
+--- a/src/main/java/org/bukkit/event/inventory/InventoryMoveItemEvent.java
++++ b/src/main/java/org/bukkit/event/inventory/InventoryMoveItemEvent.java
+@@ -30,6 +30,8 @@ public class InventoryMoveItemEvent extends Event implements Cancellable {
+     private final Inventory destinationInventory;
+     private ItemStack itemStack;
+     private final boolean didSourceInitiate;
++    public boolean calledGetItem; // Paper
++    public boolean calledSetItem; // Paper
+ 
+     public InventoryMoveItemEvent(final Inventory sourceInventory, final ItemStack itemStack, final Inventory destinationInventory, final boolean didSourceInitiate) {
+         Validate.notNull(itemStack, "ItemStack cannot be null");
+@@ -55,7 +57,8 @@ public class InventoryMoveItemEvent extends Event implements Cancellable {
+      * @return ItemStack
+      */
+     public ItemStack getItem() {
+-        return itemStack.clone();
++        calledGetItem = true; // Paper - record this method was used for auto detection of mode
++        return itemStack; // Paper - Removed clone, handled better in Server
+     }
+ 
+     /**
+@@ -67,6 +70,7 @@ public class InventoryMoveItemEvent extends Event implements Cancellable {
+      */
+     public void setItem(ItemStack itemStack) {
+         Validate.notNull(itemStack, "ItemStack cannot be null.  Cancel the event if you want nothing to be transferred.");
++        calledSetItem = true; // Paper - record this method was used for auto detection of mode
+         this.itemStack = itemStack.clone();
+     }
+ 
+-- 
+2.16.1
+
diff --git a/Spigot-Server-Patches/0121-Improve-Minecraft-Hopper-Performance.patch b/Spigot-Server-Patches/0121-Improve-Minecraft-Hopper-Performance.patch
deleted file mode 100644
index f4e76f3c2..000000000
--- a/Spigot-Server-Patches/0121-Improve-Minecraft-Hopper-Performance.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From 3543fc728e16feb241d8244c4f4ba953c182fd65 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Wed, 27 Apr 2016 22:09:52 -0400
-Subject: [PATCH] Improve Minecraft Hopper Performance
-
-Removes unnecessary extra calls to .update() that are very expensive
-Also reset cooldown each hopper tick that a hopper is full.
-Also don't constantly clone ItemStacks without merit
-
-diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 65297a76..393c9089 100644
---- a/src/main/java/net/minecraft/server/TileEntity.java
-+++ b/src/main/java/net/minecraft/server/TileEntity.java
-@@ -33,6 +33,7 @@ public abstract class TileEntity {
-         return (MinecraftKey) TileEntity.f.b(oclass);
-     }
- 
-+    static boolean IGNORE_TILE_UPDATES = false; // Paper
-     public World getWorld() {
-         return this.world;
-     }
-@@ -111,6 +112,7 @@ public abstract class TileEntity {
- 
-     public void update() {
-         if (this.world != null) {
-+            if (IGNORE_TILE_UPDATES) return; // Paper
-             IBlockData iblockdata = this.world.getType(this.position);
- 
-             this.g = iblockdata.getBlock().toLegacyData(iblockdata);
-diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java
-index 98551351..53584b25 100644
---- a/src/main/java/net/minecraft/server/TileEntityHopper.java
-+++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
-@@ -220,11 +220,13 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
-                             this.setCooldown(world.spigotConfig.hopperTransfer); // Spigot
-                             return false;
-                         }
--                        int origCount = event.getItem().getAmount(); // Spigot
--                        ItemStack itemstack1 = addItem(this, iinventory, CraftItemStack.asNMSCopy(event.getItem()), enumdirection);
--
-+                        // Paper start
-+                        org.bukkit.inventory.ItemStack eventStack = event.getItem();
-+                        int origCount = eventStack.getAmount(); // Spigot
-+                        ItemStack itemstack1 = addItem(this, iinventory, CraftItemStack.asNMSCopy(eventStack), enumdirection);
-+                        // Paper end
-                         if (itemstack1.isEmpty()) {
--                            if (event.getItem().equals(oitemstack)) {
-+                            if (eventStack.equals(oitemstack)) { // Paper
-                                 iinventory.update();
-                             } else {
-                                 this.setItem(i, itemstack);
-@@ -377,11 +379,13 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
-                 }
-                 return false;
-             }
--            int origCount = event.getItem().getAmount(); // Spigot
--            ItemStack itemstack2 = addItem(iinventory, ihopper, CraftItemStack.asNMSCopy(event.getItem()), null);
--
-+            // Paper start
-+            org.bukkit.inventory.ItemStack eventStack = event.getItem();
-+            int origCount = eventStack.getAmount(); // Spigot
-+            ItemStack itemstack2 = addItem(iinventory, ihopper, CraftItemStack.asNMSCopy(eventStack), null);
-+            // Paper end
-             if (itemstack2.isEmpty()) {
--                if (event.getItem().equals(oitemstack)) {
-+                if (eventStack.equals(oitemstack)) { // Paper
-                     iinventory.update();
-                 } else {
-                     iinventory.setItem(i, itemstack1);
-@@ -459,7 +463,9 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
-             boolean flag1 = iinventory1.x_();
- 
-             if (itemstack1.isEmpty()) {
-+                IGNORE_TILE_UPDATES = true; // Paper
-                 iinventory1.setItem(i, itemstack);
-+                IGNORE_TILE_UPDATES = false; // Paper
-                 itemstack = ItemStack.a;
-                 flag = true;
-             } else if (a(itemstack1, itemstack)) {
-@@ -562,6 +568,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
-         this.f = i;
-     }
- 
-+    boolean isCooledDown() { return J(); } // Paper - OBFHELPER
-     private boolean J() {
-         return this.f > 0;
-     }
--- 
-2.14.3
-
diff --git a/Spigot-Server-Patches/0122-remove-null-possibility-for-getServer-singleton.patch b/Spigot-Server-Patches/0121-remove-null-possibility-for-getServer-singleton.patch
similarity index 94%
rename from Spigot-Server-Patches/0122-remove-null-possibility-for-getServer-singleton.patch
rename to Spigot-Server-Patches/0121-remove-null-possibility-for-getServer-singleton.patch
index f340972c8..15664b000 100644
--- a/Spigot-Server-Patches/0122-remove-null-possibility-for-getServer-singleton.patch
+++ b/Spigot-Server-Patches/0121-remove-null-possibility-for-getServer-singleton.patch
@@ -1,4 +1,4 @@
-From 01df906a57e1cfd688312b4b0802e6e48ea17b42 Mon Sep 17 00:00:00 2001
+From d1693e5d0d5a5f9ac242ae9eaa7ce0d11370fe6d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 28 Apr 2016 00:57:27 -0400
 Subject: [PATCH] remove null possibility for getServer singleton
@@ -6,7 +6,7 @@ Subject: [PATCH] remove null possibility for getServer singleton
 to stop IDE complaining about potential NPE
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b6c4d98f..45d3dbde 100644
+index b6c4d98fd..45d3dbde2 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -53,6 +53,7 @@ import co.aikar.timings.MinecraftTimings; // Paper
@@ -35,5 +35,5 @@ index b6c4d98f..45d3dbde 100644
      // CraftBukkit end
  }
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0123-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/Spigot-Server-Patches/0122-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
similarity index 96%
rename from Spigot-Server-Patches/0123-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
rename to Spigot-Server-Patches/0122-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
index 366d06b90..a42a5986f 100644
--- a/Spigot-Server-Patches/0123-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
+++ b/Spigot-Server-Patches/0122-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
@@ -1,4 +1,4 @@
-From 6e0ae25024ea3e186640f499bb8ffb2371f0646b Mon Sep 17 00:00:00 2001
+From 6d9bbac5afa53ccf67c0d239a43d7afec78dcd62 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 29 Apr 2016 20:02:00 -0400
 Subject: [PATCH] Improve Maps (in item frames) performance and bug fixes
@@ -13,7 +13,7 @@ custom renderers are in use, defaulting to the much simpler Vanilla system.
 Additionally, numerous issues to player position tracking on maps has been fixed.
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 467c5bf1..0f1d9963 100644
+index 467c5bf1a..0f1d99636 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -548,6 +548,12 @@ public abstract class EntityHuman extends EntityLiving {
@@ -30,7 +30,7 @@ index 467c5bf1..0f1d9963 100644
              ItemStack itemstack1 = this.a(entityitem);
  
 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index 4c6eb6ed..759dacba 100644
+index 4c6eb6ed1..759dacba7 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 @@ -90,11 +90,11 @@ public class EntityTrackerEntry {
@@ -48,7 +48,7 @@ index 4c6eb6ed..759dacba 100644
                  Iterator iterator = this.trackedPlayers.iterator(); // CraftBukkit
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index aae2d578..bce3fca8 100644
+index aae2d5786..bce3fca84 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1223,6 +1223,7 @@ public abstract class World implements IBlockAccess {
@@ -60,7 +60,7 @@ index aae2d578..bce3fca8 100644
                          }
                      }
 diff --git a/src/main/java/net/minecraft/server/WorldMap.java b/src/main/java/net/minecraft/server/WorldMap.java
-index 1096b5c1..59173605 100644
+index 1096b5c1f..59173605e 100644
 --- a/src/main/java/net/minecraft/server/WorldMap.java
 +++ b/src/main/java/net/minecraft/server/WorldMap.java
 @@ -28,6 +28,7 @@ public class WorldMap extends PersistentBase {
@@ -132,7 +132,7 @@ index 1096b5c1..59173605 100644
              for ( org.bukkit.map.MapCursor cursor : render.cursors) {
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/map/RenderData.java b/src/main/java/org/bukkit/craftbukkit/map/RenderData.java
-index 256a1317..5768cd51 100644
+index 256a13178..5768cd512 100644
 --- a/src/main/java/org/bukkit/craftbukkit/map/RenderData.java
 +++ b/src/main/java/org/bukkit/craftbukkit/map/RenderData.java
 @@ -5,7 +5,7 @@ import org.bukkit.map.MapCursor;
@@ -145,5 +145,5 @@ index 256a1317..5768cd51 100644
  
      public RenderData() {
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0124-LootTable-API-Replenishable-Lootables-Feature.patch b/Spigot-Server-Patches/0123-LootTable-API-Replenishable-Lootables-Feature.patch
similarity index 99%
rename from Spigot-Server-Patches/0124-LootTable-API-Replenishable-Lootables-Feature.patch
rename to Spigot-Server-Patches/0123-LootTable-API-Replenishable-Lootables-Feature.patch
index e8b81f5ff..dbf31441d 100644
--- a/Spigot-Server-Patches/0124-LootTable-API-Replenishable-Lootables-Feature.patch
+++ b/Spigot-Server-Patches/0123-LootTable-API-Replenishable-Lootables-Feature.patch
@@ -1,4 +1,4 @@
-From b6087c2f60a85fa5845870bf99ce585aa9c34a42 Mon Sep 17 00:00:00 2001
+From 5819a09940af69a152ca201f2d8ad27a19508928 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.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0125-Do-not-load-chunks-for-pathfinding.patch b/Spigot-Server-Patches/0124-Do-not-load-chunks-for-pathfinding.patch
similarity index 87%
rename from Spigot-Server-Patches/0125-Do-not-load-chunks-for-pathfinding.patch
rename to Spigot-Server-Patches/0124-Do-not-load-chunks-for-pathfinding.patch
index c35fbb540..3671d31b1 100644
--- a/Spigot-Server-Patches/0125-Do-not-load-chunks-for-pathfinding.patch
+++ b/Spigot-Server-Patches/0124-Do-not-load-chunks-for-pathfinding.patch
@@ -1,11 +1,11 @@
-From 1ff76b3906c4b5289dce01052f2d14aa766328bf Mon Sep 17 00:00:00 2001
+From ebc4bbdd5d6af533fc0d756001be9381e14040ef Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Jan 2016 00:13:19 -0500
 Subject: [PATCH] Do not load chunks for pathfinding
 
 
 diff --git a/src/main/java/net/minecraft/server/ChunkCache.java b/src/main/java/net/minecraft/server/ChunkCache.java
-index 08b986fd..786d1dd2 100644
+index 08b986fd7..786d1dd22 100644
 --- a/src/main/java/net/minecraft/server/ChunkCache.java
 +++ b/src/main/java/net/minecraft/server/ChunkCache.java
 @@ -25,7 +25,7 @@ public class ChunkCache implements IBlockAccess {
@@ -18,5 +18,5 @@ index 08b986fd..786d1dd2 100644
          }
  
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0126-Entity-Tracking-Improvements.patch b/Spigot-Server-Patches/0125-Entity-Tracking-Improvements.patch
similarity index 96%
rename from Spigot-Server-Patches/0126-Entity-Tracking-Improvements.patch
rename to Spigot-Server-Patches/0125-Entity-Tracking-Improvements.patch
index 408896a54..1352761d3 100644
--- a/Spigot-Server-Patches/0126-Entity-Tracking-Improvements.patch
+++ b/Spigot-Server-Patches/0125-Entity-Tracking-Improvements.patch
@@ -1,4 +1,4 @@
-From 91fac793cbda420b078bd9c54874cca33086c3fb Mon Sep 17 00:00:00 2001
+From 82da4ef5cf6e0a31cb82050e5fc868706ae9292f 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 06857c48..ef096ef6 100644
+index 06857c483..ef096ef65 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -53,6 +53,7 @@ public abstract class Entity implements ICommandListener {
@@ -19,7 +19,7 @@ index 06857c48..ef096ef6 100644
          if (bukkitEntity == null) {
              bukkitEntity = CraftEntity.getEntity(world.getServer(), this);
 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index 759dacba..efc4c79a 100644
+index 759dacba7..efc4c79ab 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 @@ -49,6 +49,7 @@ public class EntityTrackerEntry {
@@ -99,5 +99,5 @@ index 759dacba..efc4c79a 100644
  
      }
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0127-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/Spigot-Server-Patches/0126-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
similarity index 91%
rename from Spigot-Server-Patches/0127-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
rename to Spigot-Server-Patches/0126-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
index ad87bfaf6..bcadca8ef 100644
--- a/Spigot-Server-Patches/0127-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
+++ b/Spigot-Server-Patches/0126-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
@@ -1,11 +1,11 @@
-From f4915e4676b3b5cfba3b91c26d9d484f293b1fe5 Mon Sep 17 00:00:00 2001
+From 65ca23df75fa2cb76fcb5bd81019d04fe882701a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 May 2016 23:33:08 -0400
 Subject: [PATCH] Don't save empty scoreboard teams to scoreboard.dat
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 430b5d0c..011cbf5e 100644
+index 430b5d0cd..011cbf5e3 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -225,4 +225,9 @@ public class PaperConfig {
@@ -19,7 +19,7 @@ index 430b5d0c..011cbf5e 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PersistentScoreboard.java b/src/main/java/net/minecraft/server/PersistentScoreboard.java
-index c9c01fad..89c8d045 100644
+index c9c01fad9..89c8d045b 100644
 --- a/src/main/java/net/minecraft/server/PersistentScoreboard.java
 +++ b/src/main/java/net/minecraft/server/PersistentScoreboard.java
 @@ -184,6 +184,7 @@ public class PersistentScoreboard extends PersistentBase {
@@ -31,5 +31,5 @@ index c9c01fad..89c8d045 100644
  
              nbttagcompound.setString("Name", scoreboardteam.getName());
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0128-Do-not-mark-chunks-as-active-for-neighbor-updates.patch b/Spigot-Server-Patches/0127-Do-not-mark-chunks-as-active-for-neighbor-updates.patch
similarity index 96%
rename from Spigot-Server-Patches/0128-Do-not-mark-chunks-as-active-for-neighbor-updates.patch
rename to Spigot-Server-Patches/0127-Do-not-mark-chunks-as-active-for-neighbor-updates.patch
index 072023fc2..3217c306b 100644
--- a/Spigot-Server-Patches/0128-Do-not-mark-chunks-as-active-for-neighbor-updates.patch
+++ b/Spigot-Server-Patches/0127-Do-not-mark-chunks-as-active-for-neighbor-updates.patch
@@ -1,4 +1,4 @@
-From 0cf99c270c5b53a3d3a31efaab59b4aa6dbd42b8 Mon Sep 17 00:00:00 2001
+From d38e09c6e22123caab480c278a119d57883a9d0b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 12 May 2016 01:55:17 -0400
 Subject: [PATCH] Do not mark chunks as active for neighbor updates
@@ -6,7 +6,7 @@ Subject: [PATCH] Do not mark chunks as active for neighbor updates
 Fixes chunk unload issues
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index ecc76a88..f1bcdef5 100644
+index ecc76a885..f1bcdef5b 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -1007,25 +1007,25 @@ public class Chunk {
@@ -44,5 +44,5 @@ index ecc76a88..f1bcdef5 100644
              if (chunk4 != null) {
                  chunk4.a(chunkgenerator);
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0129-Fix-Chunk-Unload-Queue-Issues.patch b/Spigot-Server-Patches/0128-Fix-Chunk-Unload-Queue-Issues.patch
similarity index 92%
rename from Spigot-Server-Patches/0129-Fix-Chunk-Unload-Queue-Issues.patch
rename to Spigot-Server-Patches/0128-Fix-Chunk-Unload-Queue-Issues.patch
index 9e80cc2bb..4db70d103 100644
--- a/Spigot-Server-Patches/0129-Fix-Chunk-Unload-Queue-Issues.patch
+++ b/Spigot-Server-Patches/0128-Fix-Chunk-Unload-Queue-Issues.patch
@@ -1,4 +1,4 @@
-From 15a4ee90217c0cb16b07296f8facbe028cb2c415 Mon Sep 17 00:00:00 2001
+From 57983d778eae935b45189b8ead413a8617a64067 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 f1bcdef5..a847aa07 100644
+index f1bcdef5b..a847aa079 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -46,7 +46,7 @@ public class Chunk {
@@ -22,7 +22,7 @@ index f1bcdef5..a847aa07 100644
  
      // Paper start
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 15814f66..c7af8da6 100644
+index 15814f665..c7af8da61 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -299,6 +299,7 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -34,5 +34,5 @@ index 15814f66..c7af8da6 100644
                              continue;
                          }
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0130-System-property-for-disabling-watchdoge.patch b/Spigot-Server-Patches/0129-System-property-for-disabling-watchdoge.patch
similarity index 89%
rename from Spigot-Server-Patches/0130-System-property-for-disabling-watchdoge.patch
rename to Spigot-Server-Patches/0129-System-property-for-disabling-watchdoge.patch
index 3e23013e3..012ca2c53 100644
--- a/Spigot-Server-Patches/0130-System-property-for-disabling-watchdoge.patch
+++ b/Spigot-Server-Patches/0129-System-property-for-disabling-watchdoge.patch
@@ -1,11 +1,11 @@
-From 36276f65b32064cd04b801f0f4a51ae1946b3db0 Mon Sep 17 00:00:00 2001
+From 0eae5e0db2a838536e032e3059d00a4198d60e26 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 12 May 2016 23:02:58 -0500
 Subject: [PATCH] System property for disabling watchdoge
 
 
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index 6384d50e..cb1fcf0f 100644
+index 6384d50e7..cb1fcf0f4 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
 @@ -52,7 +52,7 @@ public class WatchdogThread extends Thread
@@ -18,5 +18,5 @@ index 6384d50e..cb1fcf0f 100644
                  Logger log = Bukkit.getServer().getLogger();
                  log.log( Level.SEVERE, "The server has stopped responding!" );
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0131-Optimize-EAR.patch b/Spigot-Server-Patches/0130-Optimize-EAR.patch
similarity index 96%
rename from Spigot-Server-Patches/0131-Optimize-EAR.patch
rename to Spigot-Server-Patches/0130-Optimize-EAR.patch
index 7bbc79b9c..0dce7851b 100644
--- a/Spigot-Server-Patches/0131-Optimize-EAR.patch
+++ b/Spigot-Server-Patches/0130-Optimize-EAR.patch
@@ -1,11 +1,11 @@
-From e24bed49fcd2628e2ed3ab1598aadc34f876b7a0 Mon Sep 17 00:00:00 2001
+From 5b42fc0ee3bca8df20a41a7f5bf9815a624ff2f7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 13 May 2016 01:38:06 -0400
 Subject: [PATCH] Optimize EAR
 
 
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 3265a6c2..47865c02 100644
+index 3265a6c25..47865c027 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -2,6 +2,8 @@ package org.spigotmc;
@@ -65,5 +65,5 @@ index 3265a6c2..47865c02 100644
                  }
              }
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0132-Optimize-UserCache-Thread-Safe.patch b/Spigot-Server-Patches/0131-Optimize-UserCache-Thread-Safe.patch
similarity index 96%
rename from Spigot-Server-Patches/0132-Optimize-UserCache-Thread-Safe.patch
rename to Spigot-Server-Patches/0131-Optimize-UserCache-Thread-Safe.patch
index 1d8f55158..5f3f74dfb 100644
--- a/Spigot-Server-Patches/0132-Optimize-UserCache-Thread-Safe.patch
+++ b/Spigot-Server-Patches/0131-Optimize-UserCache-Thread-Safe.patch
@@ -1,4 +1,4 @@
-From b2d6f011c1e3f4c42b42a9fe36258ce99d534da6 Mon Sep 17 00:00:00 2001
+From 5a73d0282b24f09156533a66c32aa2f86ba00541 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 16 May 2016 20:47:41 -0400
 Subject: [PATCH] Optimize UserCache / Thread Safe
@@ -10,7 +10,7 @@ Additionally, move Saving of the User cache to be done async, incase
 the user never changed the default setting for Spigot's save on stop only.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 45d3dbde..ab793307 100644
+index 45d3dbde2..ab7933079 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -528,7 +528,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -23,7 +23,7 @@ index 45d3dbde..ab793307 100644
          // Spigot end
      }
 diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java
-index 487fc11f..924dc63a 100644
+index 487fc11f1..924dc63a4 100644
 --- a/src/main/java/net/minecraft/server/UserCache.java
 +++ b/src/main/java/net/minecraft/server/UserCache.java
 @@ -109,7 +109,7 @@ public class UserCache {
@@ -96,5 +96,5 @@ index 487fc11f..924dc63a 100644
      }
  
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0133-Avoid-blocking-on-Network-Manager-creation.patch b/Spigot-Server-Patches/0132-Avoid-blocking-on-Network-Manager-creation.patch
similarity index 96%
rename from Spigot-Server-Patches/0133-Avoid-blocking-on-Network-Manager-creation.patch
rename to Spigot-Server-Patches/0132-Avoid-blocking-on-Network-Manager-creation.patch
index 589af10d2..b55442f48 100644
--- a/Spigot-Server-Patches/0133-Avoid-blocking-on-Network-Manager-creation.patch
+++ b/Spigot-Server-Patches/0132-Avoid-blocking-on-Network-Manager-creation.patch
@@ -1,4 +1,4 @@
-From adcbfe820185e2f44f33c9f4054c34b82841a23d Mon Sep 17 00:00:00 2001
+From fd13f361279b4531c48c427bfb82ea88842f15db 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Avoid blocking on Network Manager creation
 Per Paper issue 294
 
 diff --git a/src/main/java/net/minecraft/server/ServerConnection.java b/src/main/java/net/minecraft/server/ServerConnection.java
-index 567edb30..4a629aaa 100644
+index 567edb300..4a629aaa1 100644
 --- a/src/main/java/net/minecraft/server/ServerConnection.java
 +++ b/src/main/java/net/minecraft/server/ServerConnection.java
 @@ -60,6 +60,15 @@ public class ServerConnection {
@@ -43,5 +43,5 @@ index 567edb30..4a629aaa 100644
              if ( org.spigotmc.SpigotConfig.playerShuffle > 0 && MinecraftServer.currentTick % org.spigotmc.SpigotConfig.playerShuffle == 0 )
              {
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0134-Optional-TNT-doesn-t-move-in-water.patch b/Spigot-Server-Patches/0133-Optional-TNT-doesn-t-move-in-water.patch
similarity index 98%
rename from Spigot-Server-Patches/0134-Optional-TNT-doesn-t-move-in-water.patch
rename to Spigot-Server-Patches/0133-Optional-TNT-doesn-t-move-in-water.patch
index 7e0b70008..770081ccc 100644
--- a/Spigot-Server-Patches/0134-Optional-TNT-doesn-t-move-in-water.patch
+++ b/Spigot-Server-Patches/0133-Optional-TNT-doesn-t-move-in-water.patch
@@ -1,4 +1,4 @@
-From e31db57ece1f54e5d574ed74be45120a704449ef Mon Sep 17 00:00:00 2001
+From 11ee9ef43abf1fcbe413d402b90df411ea4d02e8 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
@@ -114,5 +114,5 @@ index bb0904f86..50811852a 100644
 +    // Paper end
  }
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0135-Faster-redstone-torch-rapid-clock-removal.patch b/Spigot-Server-Patches/0134-Faster-redstone-torch-rapid-clock-removal.patch
similarity index 94%
rename from Spigot-Server-Patches/0135-Faster-redstone-torch-rapid-clock-removal.patch
rename to Spigot-Server-Patches/0134-Faster-redstone-torch-rapid-clock-removal.patch
index cb8482963..6f2c94eb7 100644
--- a/Spigot-Server-Patches/0135-Faster-redstone-torch-rapid-clock-removal.patch
+++ b/Spigot-Server-Patches/0134-Faster-redstone-torch-rapid-clock-removal.patch
@@ -1,4 +1,4 @@
-From 3d6cb4ebf342f11117a6c6952be569b6f6a610d5 Mon Sep 17 00:00:00 2001
+From 0721e7d031b98d56a0271d84de6e6dcddc6eaef8 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Faster redstone torch rapid clock removal
 Only resize the the redstone torch list once, since resizing arrays / lists is costly
 
 diff --git a/src/main/java/net/minecraft/server/BlockRedstoneTorch.java b/src/main/java/net/minecraft/server/BlockRedstoneTorch.java
-index 5b0028a7..429f26ed 100644
+index 5b0028a78..429f26ed5 100644
 --- a/src/main/java/net/minecraft/server/BlockRedstoneTorch.java
 +++ b/src/main/java/net/minecraft/server/BlockRedstoneTorch.java
 @@ -94,9 +94,17 @@ public class BlockRedstoneTorch extends BlockTorch {
@@ -39,5 +39,5 @@ index 5b0028a7..429f26ed 100644
          public RedstoneUpdateInfo(BlockPosition blockposition, long i) {
              this.a = blockposition;
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0136-Ensure-Chunks-never-ever-load-async.patch b/Spigot-Server-Patches/0135-Ensure-Chunks-never-ever-load-async.patch
similarity index 95%
rename from Spigot-Server-Patches/0136-Ensure-Chunks-never-ever-load-async.patch
rename to Spigot-Server-Patches/0135-Ensure-Chunks-never-ever-load-async.patch
index dd9da19c8..323193270 100644
--- a/Spigot-Server-Patches/0136-Ensure-Chunks-never-ever-load-async.patch
+++ b/Spigot-Server-Patches/0135-Ensure-Chunks-never-ever-load-async.patch
@@ -1,4 +1,4 @@
-From 84a754633b0040c0d9b09a895bb3c38232097025 Mon Sep 17 00:00:00 2001
+From 48b70d5e4a6b5cc7470d2bd282eaa54cae5c4af6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 27 May 2016 21:41:26 -0400
 Subject: [PATCH] Ensure Chunks never ever load async
@@ -6,7 +6,7 @@ Subject: [PATCH] Ensure Chunks never ever load async
 Safely pushes the operation to main thread, then back to the posting thread
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
-index 7b7a3d01..9aaca21a 100644
+index 7b7a3d01b..9aaca21a7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
 @@ -4,6 +4,7 @@ import com.destroystokyo.paper.PaperConfig;
@@ -27,7 +27,7 @@ index 7b7a3d01..9aaca21a 100644
  
      public static void queueChunkLoad(World world, ChunkRegionLoader loader, ChunkProviderServer provider, int x, int z, Runnable runnable) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
-index b5efb9c3..ef9529ad 100644
+index b5efb9c3f..ef9529add 100644
 --- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
 +++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
 @@ -35,8 +35,8 @@ class ChunkIOProvider implements AsynchronousExecutor.CallBackProvider<QueuedChu
@@ -42,5 +42,5 @@ index b5efb9c3..ef9529ad 100644
              return;
          }
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0137-Add-server-name-parameter.patch b/Spigot-Server-Patches/0136-Add-server-name-parameter.patch
similarity index 89%
rename from Spigot-Server-Patches/0137-Add-server-name-parameter.patch
rename to Spigot-Server-Patches/0136-Add-server-name-parameter.patch
index a882c3610..02bbf5988 100644
--- a/Spigot-Server-Patches/0137-Add-server-name-parameter.patch
+++ b/Spigot-Server-Patches/0136-Add-server-name-parameter.patch
@@ -1,11 +1,11 @@
-From 14d6c91a4b0dcb2106e3d71bdd28bbe90edb7827 Mon Sep 17 00:00:00 2001
+From 7c7a7574d99c36e181f1041526437d2b1ec901af Mon Sep 17 00:00:00 2001
 From: Martin Panzer <postremus1996@googlemail.com>
 Date: Sat, 28 May 2016 16:54:03 +0200
 Subject: [PATCH] Add server-name parameter
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index e3667e55..ec9508e9 100644
+index e3667e558..ec9508e90 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -134,6 +134,14 @@ public class Main {
@@ -24,5 +24,5 @@ index e3667e55..ec9508e9 100644
          };
  
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0138-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch b/Spigot-Server-Patches/0137-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
similarity index 95%
rename from Spigot-Server-Patches/0138-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
rename to Spigot-Server-Patches/0137-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
index 8535db600..82556d497 100644
--- a/Spigot-Server-Patches/0138-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
+++ b/Spigot-Server-Patches/0137-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
@@ -1,4 +1,4 @@
-From 7dfd7e6301c85ac9f0ee88d4796f7e00fb60f34b Mon Sep 17 00:00:00 2001
+From 6cdb3095b6aa1b2ba0eb5d591db550f2b784db99 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Only send Dragon/Wither Death sounds to same world
 Also fix view distance lookup
 
 diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index 0f94d2f0..a8cc6b61 100644
+index 0f94d2f0a..a8cc6b61a 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
 @@ -573,8 +573,12 @@ public class EntityEnderDragon extends EntityInsentient implements IComplex, IMo
@@ -25,7 +25,7 @@ index 0f94d2f0..a8cc6b61 100644
                      double deltaZ = this.locZ - player.locZ;
                      double distanceSquared = deltaX * deltaX + deltaZ * deltaZ;
 diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java
-index 97cf75b9..96785260 100644
+index 97cf75b9f..967852605 100644
 --- a/src/main/java/net/minecraft/server/EntityWither.java
 +++ b/src/main/java/net/minecraft/server/EntityWither.java
 @@ -210,8 +210,12 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
@@ -44,5 +44,5 @@ index 97cf75b9..96785260 100644
                      double deltaZ = this.locZ - player.locZ;
                      double distanceSquared = deltaX * deltaX + deltaZ * deltaZ;
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0139-Fix-FallingBlocks-being-stuck-on-fences.patch b/Spigot-Server-Patches/0138-Fix-FallingBlocks-being-stuck-on-fences.patch
similarity index 98%
rename from Spigot-Server-Patches/0139-Fix-FallingBlocks-being-stuck-on-fences.patch
rename to Spigot-Server-Patches/0138-Fix-FallingBlocks-being-stuck-on-fences.patch
index 66eed7477..3b38aeef9 100644
--- a/Spigot-Server-Patches/0139-Fix-FallingBlocks-being-stuck-on-fences.patch
+++ b/Spigot-Server-Patches/0138-Fix-FallingBlocks-being-stuck-on-fences.patch
@@ -1,4 +1,4 @@
-From b399333aa55b91e79d5e43d11541302c178ca8ec Mon Sep 17 00:00:00 2001
+From d9a0d6e2fcf3e9ecfcf88e72efcbba07e55359da Mon Sep 17 00:00:00 2001
 From: Martin Panzer <postremus1996@googlemail.com>
 Date: Fri, 3 Jun 2016 23:13:39 +0200
 Subject: [PATCH] Fix FallingBlocks being stuck on fences
@@ -101,5 +101,5 @@ index abdc2dea9..59acc9088 100644
          Block block = this.block.getBlock();
  
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0140-Make-entities-look-for-hoppers.patch b/Spigot-Server-Patches/0139-Make-entities-look-for-hoppers.patch
similarity index 97%
rename from Spigot-Server-Patches/0140-Make-entities-look-for-hoppers.patch
rename to Spigot-Server-Patches/0139-Make-entities-look-for-hoppers.patch
index a425ef82f..7b3b2f015 100644
--- a/Spigot-Server-Patches/0140-Make-entities-look-for-hoppers.patch
+++ b/Spigot-Server-Patches/0139-Make-entities-look-for-hoppers.patch
@@ -1,4 +1,4 @@
-From cb53968694c97cfa498c287c913d102d39431d9c Mon Sep 17 00:00:00 2001
+From 1cbfa6cbaddedefe15fccdf12c0427b1727ac4dc Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Sat, 18 Jun 2016 01:01:37 -0500
 Subject: [PATCH] Make entities look for hoppers
@@ -250,7 +250,7 @@ index 804215a1c..e830d8390 100644
 +    double G(); default double getZ() { return G(); } // Paper - OBFHELPER
  }
 diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java
-index 53584b257..8ad081316 100644
+index 985513511..e9315f2d5 100644
 --- a/src/main/java/net/minecraft/server/TileEntityHopper.java
 +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
 @@ -126,6 +126,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
@@ -284,7 +284,7 @@ index 53584b257..8ad081316 100644
      private boolean p() {
          Iterator iterator = this.items.iterator();
  
-@@ -302,8 +312,15 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
+@@ -300,8 +310,15 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
          return true;
      }
  
@@ -301,7 +301,7 @@ index 53584b257..8ad081316 100644
  
          if (iinventory != null) {
              EnumDirection enumdirection = EnumDirection.DOWN;
-@@ -334,8 +351,8 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
+@@ -332,8 +349,8 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
                      }
                  }
              }
@@ -312,7 +312,7 @@ index 53584b257..8ad081316 100644
  
              while (iterator.hasNext()) {
                  EntityItem entityitem = (EntityItem) iterator.next();
-@@ -401,6 +418,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
+@@ -397,6 +414,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
          return false;
      }
  
@@ -320,7 +320,7 @@ index 53584b257..8ad081316 100644
      public static boolean a(IInventory iinventory, IInventory iinventory1, EntityItem entityitem) {
          boolean flag = false;
  
-@@ -506,18 +524,44 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
+@@ -500,18 +518,44 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
      private IInventory I() {
          EnumDirection enumdirection = BlockHopper.b(this.v());
  
@@ -369,7 +369,7 @@ index 53584b257..8ad081316 100644
          Object object = null;
          int i = MathHelper.floor(d0);
          int j = MathHelper.floor(d1);
-@@ -537,7 +581,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
+@@ -531,7 +575,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
              }
          }
  
@@ -379,5 +379,5 @@ index 53584b257..8ad081316 100644
  
              if (!list.isEmpty()) {
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0141-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/Spigot-Server-Patches/0140-Delay-Chunk-Unloads-based-on-Player-Movement.patch
similarity index 98%
rename from Spigot-Server-Patches/0141-Delay-Chunk-Unloads-based-on-Player-Movement.patch
rename to Spigot-Server-Patches/0140-Delay-Chunk-Unloads-based-on-Player-Movement.patch
index 3db34928b..bdbce2ed9 100644
--- a/Spigot-Server-Patches/0141-Delay-Chunk-Unloads-based-on-Player-Movement.patch
+++ b/Spigot-Server-Patches/0140-Delay-Chunk-Unloads-based-on-Player-Movement.patch
@@ -1,4 +1,4 @@
-From a375ecc6d74a5d1788f0cc55f139a0c64ed1c4b0 Mon Sep 17 00:00:00 2001
+From d83312daee696d0883b12842fc5b72cf4fd11508 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
@@ -140,5 +140,5 @@ index 69dc11e2b..284dc6391 100644
              }
  
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0142-Toggleable-Elytra-Wall-Damage.patch b/Spigot-Server-Patches/0141-Toggleable-Elytra-Wall-Damage.patch
similarity index 96%
rename from Spigot-Server-Patches/0142-Toggleable-Elytra-Wall-Damage.patch
rename to Spigot-Server-Patches/0141-Toggleable-Elytra-Wall-Damage.patch
index b1685ec13..30f614c69 100644
--- a/Spigot-Server-Patches/0142-Toggleable-Elytra-Wall-Damage.patch
+++ b/Spigot-Server-Patches/0141-Toggleable-Elytra-Wall-Damage.patch
@@ -1,4 +1,4 @@
-From bf276b4e333709788d646c540756080a388d30c3 Mon Sep 17 00:00:00 2001
+From 8533cbf80b03340e72c47c47f97f7d26f916adf7 Mon Sep 17 00:00:00 2001
 From: Jadon Fowler <jadonflower@gmail.com>
 Date: Sat, 18 Jun 2016 23:13:59 -0700
 Subject: [PATCH] Toggleable Elytra Wall Damage
@@ -41,5 +41,5 @@ index edc9d94b7..f76be4da0 100644
                  if (this.onGround && !this.world.isClientSide) {
                      if (getFlag(7) && !CraftEventFactory.callToggleGlideEvent(this, false).isCancelled()) // CraftBukkit
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0143-Fix-Double-World-Add-issues.patch b/Spigot-Server-Patches/0142-Fix-Double-World-Add-issues.patch
similarity index 92%
rename from Spigot-Server-Patches/0143-Fix-Double-World-Add-issues.patch
rename to Spigot-Server-Patches/0142-Fix-Double-World-Add-issues.patch
index 8fa23a775..3570135f0 100644
--- a/Spigot-Server-Patches/0143-Fix-Double-World-Add-issues.patch
+++ b/Spigot-Server-Patches/0142-Fix-Double-World-Add-issues.patch
@@ -1,4 +1,4 @@
-From 74ed2a678f478fc695ac8e94f4c474c355eaaa6b Mon Sep 17 00:00:00 2001
+From 515c84ad14227a87322dafd2b981dfacb68145ee Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 21 Jun 2016 22:54:34 -0400
 Subject: [PATCH] Fix Double World Add issues
@@ -8,7 +8,7 @@ Vanilla will double add Spider Jockeys to the world, so ignore already added.
 Also add debug if something else tries to, and abort before world gets bad state
 
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 12bd558a..8747d9a4 100644
+index 12bd558a7..8747d9a45 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -546,7 +546,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -21,7 +21,7 @@ index 12bd558a..8747d9a4 100644
              Iterator iterator = entity.bF().iterator();
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index bce3fca8..bafa37f6 100644
+index bce3fca84..bafa37f64 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1103,6 +1103,7 @@ public abstract class World implements IBlockAccess {
@@ -33,5 +33,5 @@ index bce3fca8..bafa37f6 100644
          org.bukkit.event.Cancellable event = null;
          if (entity instanceof EntityLiving && !(entity instanceof EntityPlayer)) {
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0144-Fix-Old-Sign-Conversion.patch b/Spigot-Server-Patches/0143-Fix-Old-Sign-Conversion.patch
similarity index 95%
rename from Spigot-Server-Patches/0144-Fix-Old-Sign-Conversion.patch
rename to Spigot-Server-Patches/0143-Fix-Old-Sign-Conversion.patch
index 4bda335d8..b2156bd00 100644
--- a/Spigot-Server-Patches/0144-Fix-Old-Sign-Conversion.patch
+++ b/Spigot-Server-Patches/0143-Fix-Old-Sign-Conversion.patch
@@ -1,4 +1,4 @@
-From 35d6721b68c1c5c2dafcfb575dc1cd4d4045764b Mon Sep 17 00:00:00 2001
+From 01f6e54cec4cf6a75c6c2d8c55d701b26709302e 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
@@ -9,7 +9,7 @@ Subject: [PATCH] Fix Old Sign Conversion
    This causes Igloos and such to render broken signs. We fix this by ignoring sign conversion for Defined Structures
 
 diff --git a/src/main/java/net/minecraft/server/DefinedStructure.java b/src/main/java/net/minecraft/server/DefinedStructure.java
-index 9f314204..23da9467 100644
+index 9f314204b..23da9467e 100644
 --- a/src/main/java/net/minecraft/server/DefinedStructure.java
 +++ b/src/main/java/net/minecraft/server/DefinedStructure.java
 @@ -203,9 +203,11 @@ public class DefinedStructure {
@@ -34,7 +34,7 @@ index 9f314204..23da9467 100644
  
          public Iterator<IBlockData> iterator() {
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 393c9089..237f7e6f 100644
+index 65297a761..537e4b155 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -11,6 +11,7 @@ import org.bukkit.inventory.InventoryHolder; // CraftBukkit
@@ -46,7 +46,7 @@ index 393c9089..237f7e6f 100644
      private static final RegistryMaterials<MinecraftKey, Class<? extends TileEntity>> f = new RegistryMaterials();
      protected World world;
 diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
-index 77a7b445..54b719d9 100644
+index 77a7b4458..54b719d91 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySign.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySign.java
 @@ -77,13 +77,14 @@ public class TileEntitySign extends TileEntity {
@@ -67,5 +67,5 @@ index 77a7b445..54b719d9 100644
                  try {
                      this.lines[i] = ChatComponentUtils.filterForDisplay(icommandlistener, ichatbasecomponent, (Entity) null);
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0145-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch b/Spigot-Server-Patches/0144-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
similarity index 89%
rename from Spigot-Server-Patches/0145-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
rename to Spigot-Server-Patches/0144-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
index d4cede7ff..96467ba76 100644
--- a/Spigot-Server-Patches/0145-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
+++ b/Spigot-Server-Patches/0144-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
@@ -1,11 +1,11 @@
-From f1c9af7136e370f3adaa51bdce24eff92da4f049 Mon Sep 17 00:00:00 2001
+From 696b29b37a7d9be204f1a60dd22761a23a37c514 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/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java
-index 924dc63a..07d39d46 100644
+index 924dc63a4..07d39d46a 100644
 --- a/src/main/java/net/minecraft/server/UserCache.java
 +++ b/src/main/java/net/minecraft/server/UserCache.java
 @@ -87,7 +87,7 @@ public class UserCache {
@@ -18,5 +18,5 @@ index 924dc63a..07d39d46 100644
              GameProfile gameprofile = new GameProfile(uuid, s);
  
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0146-More-informative-vehicle-moved-wrongly-message.patch b/Spigot-Server-Patches/0145-More-informative-vehicle-moved-wrongly-message.patch
similarity index 90%
rename from Spigot-Server-Patches/0146-More-informative-vehicle-moved-wrongly-message.patch
rename to Spigot-Server-Patches/0145-More-informative-vehicle-moved-wrongly-message.patch
index 055e6f4c6..0c998a1bb 100644
--- a/Spigot-Server-Patches/0146-More-informative-vehicle-moved-wrongly-message.patch
+++ b/Spigot-Server-Patches/0145-More-informative-vehicle-moved-wrongly-message.patch
@@ -1,11 +1,11 @@
-From d5289fd7076ab2d8a87722594dde384751f5fe2a Mon Sep 17 00:00:00 2001
+From 90aefd7cfcae77d4aead8571213f172eacd51e5e 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 187e59a0..98cb8440 100644
+index 187e59a08..98cb84409 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -357,7 +357,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -18,5 +18,5 @@ index 187e59a0..98cb8440 100644
  
                  entity.setLocation(d3, d4, d5, f, f1);
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0147-Re-track-players-that-dismount-from-other-players.patch b/Spigot-Server-Patches/0146-Re-track-players-that-dismount-from-other-players.patch
similarity index 90%
rename from Spigot-Server-Patches/0147-Re-track-players-that-dismount-from-other-players.patch
rename to Spigot-Server-Patches/0146-Re-track-players-that-dismount-from-other-players.patch
index 25ba3371b..eb91da932 100644
--- a/Spigot-Server-Patches/0147-Re-track-players-that-dismount-from-other-players.patch
+++ b/Spigot-Server-Patches/0146-Re-track-players-that-dismount-from-other-players.patch
@@ -1,11 +1,11 @@
-From 56c9efa484e336792fdb17028e088ea99acfa54f Mon Sep 17 00:00:00 2001
+From 96c2dfd042ce83b16d21bdc757b4665add7f2093 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 31 Jul 2016 16:33:03 -0500
 Subject: [PATCH] Re-track players that dismount from other players
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 24d3b29a..b937b6d0 100644
+index 24d3b29a5..b937b6d0d 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -715,6 +715,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -23,5 +23,5 @@ index 24d3b29a..b937b6d0 100644
      }
  
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0148-Add-setting-for-proxy-online-mode-status.patch b/Spigot-Server-Patches/0147-Add-setting-for-proxy-online-mode-status.patch
similarity index 93%
rename from Spigot-Server-Patches/0148-Add-setting-for-proxy-online-mode-status.patch
rename to Spigot-Server-Patches/0147-Add-setting-for-proxy-online-mode-status.patch
index 884662125..c89c6cb49 100644
--- a/Spigot-Server-Patches/0148-Add-setting-for-proxy-online-mode-status.patch
+++ b/Spigot-Server-Patches/0147-Add-setting-for-proxy-online-mode-status.patch
@@ -1,11 +1,11 @@
-From be25757edf3268e570523a3fcc59626ffbd31553 Mon Sep 17 00:00:00 2001
+From c6c16b3ec097088127b2957eab7a0ebcd15e7921 Mon Sep 17 00:00:00 2001
 From: Gabriele C <sgdc3.mail@gmail.com>
 Date: Fri, 5 Aug 2016 01:03:08 +0200
 Subject: [PATCH] Add setting for proxy online mode status
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 011cbf5e..cf06f8ac 100644
+index 011cbf5e3..cf06f8ac3 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -230,4 +230,9 @@ public class PaperConfig {
@@ -19,7 +19,7 @@ index 011cbf5e..cf06f8ac 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
-index b943a9b2..8f3b93dc 100644
+index b943a9b20..8f3b93dc1 100644
 --- a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
 +++ b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
 @@ -66,7 +66,8 @@ public class NameReferencingFileConverter {
@@ -33,7 +33,7 @@ index b943a9b2..8f3b93dc 100644
          } else {
              String[] astring1 = astring;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index bc048f29..c8cb4f22 100644
+index bc048f292..c8cb4f226 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1335,7 +1335,8 @@ public final class CraftServer implements Server {
@@ -47,5 +47,5 @@ index bc048f29..c8cb4f22 100644
                  profile = console.getUserCache().getProfile( name );
              }
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0149-Optimise-BlockStateEnum-hashCode-and-equals.patch b/Spigot-Server-Patches/0148-Optimise-BlockStateEnum-hashCode-and-equals.patch
similarity index 95%
rename from Spigot-Server-Patches/0149-Optimise-BlockStateEnum-hashCode-and-equals.patch
rename to Spigot-Server-Patches/0148-Optimise-BlockStateEnum-hashCode-and-equals.patch
index e336442de..091ef7b07 100644
--- a/Spigot-Server-Patches/0149-Optimise-BlockStateEnum-hashCode-and-equals.patch
+++ b/Spigot-Server-Patches/0148-Optimise-BlockStateEnum-hashCode-and-equals.patch
@@ -1,11 +1,11 @@
-From dbb88dfd57e4f65f1a4948a41858dcbbf4a79e67 Mon Sep 17 00:00:00 2001
+From 3b529d552d25189d507d8de8f5631281e0542a39 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/src/main/java/net/minecraft/server/BlockStateEnum.java b/src/main/java/net/minecraft/server/BlockStateEnum.java
-index 21ac1e06..a241d7d8 100644
+index 21ac1e066..a241d7d8c 100644
 --- a/src/main/java/net/minecraft/server/BlockStateEnum.java
 +++ b/src/main/java/net/minecraft/server/BlockStateEnum.java
 @@ -16,6 +16,11 @@ public class BlockStateEnum<T extends Enum<T> & INamable> extends BlockState<T>
@@ -66,5 +66,5 @@ index 21ac1e06..a241d7d8 100644
      public static <T extends Enum<T> & INamable> BlockStateEnum<T> of(String s, Class<T> oclass) {
          return a(s, oclass, Predicates.alwaysTrue());
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0150-Disable-ticking-of-snow-blocks.patch b/Spigot-Server-Patches/0149-Disable-ticking-of-snow-blocks.patch
similarity index 91%
rename from Spigot-Server-Patches/0150-Disable-ticking-of-snow-blocks.patch
rename to Spigot-Server-Patches/0149-Disable-ticking-of-snow-blocks.patch
index 1800e3728..9d034f4e0 100644
--- a/Spigot-Server-Patches/0150-Disable-ticking-of-snow-blocks.patch
+++ b/Spigot-Server-Patches/0149-Disable-ticking-of-snow-blocks.patch
@@ -1,11 +1,11 @@
-From adb19085efa7237cde7e6f5ddf7baee09eada051 Mon Sep 17 00:00:00 2001
+From 7cdf6159c7563b5463296ce8bbb40c2e6eceb4e3 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/src/main/java/net/minecraft/server/BlockSnowBlock.java b/src/main/java/net/minecraft/server/BlockSnowBlock.java
-index 8123d729..b6765e5b 100644
+index 8123d7295..b6765e5bc 100644
 --- a/src/main/java/net/minecraft/server/BlockSnowBlock.java
 +++ b/src/main/java/net/minecraft/server/BlockSnowBlock.java
 @@ -6,7 +6,7 @@ public class BlockSnowBlock extends Block {
@@ -34,5 +34,5 @@ index 8123d729..b6765e5b 100644
 +    //Paper end
  }
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0151-Fix-AIOOBE-in-inventory-handling.patch b/Spigot-Server-Patches/0150-Fix-AIOOBE-in-inventory-handling.patch
similarity index 90%
rename from Spigot-Server-Patches/0151-Fix-AIOOBE-in-inventory-handling.patch
rename to Spigot-Server-Patches/0150-Fix-AIOOBE-in-inventory-handling.patch
index fcec0b487..8af876d03 100644
--- a/Spigot-Server-Patches/0151-Fix-AIOOBE-in-inventory-handling.patch
+++ b/Spigot-Server-Patches/0150-Fix-AIOOBE-in-inventory-handling.patch
@@ -1,11 +1,11 @@
-From 19cf5ca05896d79209fcbfbf4209e217f9b0e487 Mon Sep 17 00:00:00 2001
+From 89ff4cf85bdfee0627ec4a7d5261b83e6984e385 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 98cb8440..5e0e5a3c 100644
+index 98cb84409..5e0e5a3c1 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1849,7 +1849,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -18,5 +18,5 @@ index 98cb8440..5e0e5a3c 100644
                              } else {
                                  Slot slot = this.player.activeContainer.getSlot(packetplayinwindowclick.b());
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0152-Configurable-packet-in-spam-threshold.patch b/Spigot-Server-Patches/0151-Configurable-packet-in-spam-threshold.patch
similarity index 94%
rename from Spigot-Server-Patches/0152-Configurable-packet-in-spam-threshold.patch
rename to Spigot-Server-Patches/0151-Configurable-packet-in-spam-threshold.patch
index 8526ded02..0e337d9b3 100644
--- a/Spigot-Server-Patches/0152-Configurable-packet-in-spam-threshold.patch
+++ b/Spigot-Server-Patches/0151-Configurable-packet-in-spam-threshold.patch
@@ -1,11 +1,11 @@
-From 4118bdbaaeb341e74ebe8c972f6d0d3bb783c745 Mon Sep 17 00:00:00 2001
+From 8a62de01c548f9ec4810c191ba1e238be4b0053c Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 11 Sep 2016 14:30:57 -0500
 Subject: [PATCH] Configurable packet in spam threshold
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index cf06f8ac..2001175b 100644
+index cf06f8ac3..2001175bf 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -235,4 +235,13 @@ public class PaperConfig {
@@ -23,7 +23,7 @@ index cf06f8ac..2001175b 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 5e0e5a3c..1cdb5bb9 100644
+index 5e0e5a3c1..1cdb5bb97 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -909,13 +909,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -44,5 +44,5 @@ index 5e0e5a3c..1cdb5bb9 100644
              limitedPackets = 0;
              return true;
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0153-Configurable-flying-kick-messages.patch b/Spigot-Server-Patches/0152-Configurable-flying-kick-messages.patch
similarity index 94%
rename from Spigot-Server-Patches/0153-Configurable-flying-kick-messages.patch
rename to Spigot-Server-Patches/0152-Configurable-flying-kick-messages.patch
index 408a0baaf..d597630d9 100644
--- a/Spigot-Server-Patches/0153-Configurable-flying-kick-messages.patch
+++ b/Spigot-Server-Patches/0152-Configurable-flying-kick-messages.patch
@@ -1,11 +1,11 @@
-From 2f6341c6ad8ff12ea10fd82203cc4b390887fd24 Mon Sep 17 00:00:00 2001
+From 7468ab306df0d51af8e8341607fca6d89a00a580 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Tue, 20 Sep 2016 00:58:01 +0000
 Subject: [PATCH] Configurable flying kick messages
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 2001175b..621c585e 100644
+index 2001175bf..621c585e7 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -244,4 +244,11 @@ public class PaperConfig {
@@ -21,7 +21,7 @@ index 2001175b..621c585e 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 1cdb5bb9..0191a9af 100644
+index 1cdb5bb97..0191a9af2 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -144,7 +144,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -43,5 +43,5 @@ index 1cdb5bb9..0191a9af 100644
                  }
              } else {
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0154-Auto-Save-Improvements.patch b/Spigot-Server-Patches/0153-Auto-Save-Improvements.patch
similarity index 99%
rename from Spigot-Server-Patches/0154-Auto-Save-Improvements.patch
rename to Spigot-Server-Patches/0153-Auto-Save-Improvements.patch
index 259f2f8e7..0711e3e0b 100644
--- a/Spigot-Server-Patches/0154-Auto-Save-Improvements.patch
+++ b/Spigot-Server-Patches/0153-Auto-Save-Improvements.patch
@@ -1,4 +1,4 @@
-From ed279a6dc705f1e1e3d1b5101d7fe9e130619a0a Mon Sep 17 00:00:00 2001
+From 17ca76593dd05a5c7ce88279f57a00b498bac4db 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
@@ -215,5 +215,5 @@ index f2ddc22dd..8493dccee 100644
              timings.worldSaveChunks.startTiming(); // Paper
              chunkproviderserver.a(flag);
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0155-Chunk-registration-fixes.patch b/Spigot-Server-Patches/0154-Chunk-registration-fixes.patch
similarity index 89%
rename from Spigot-Server-Patches/0155-Chunk-registration-fixes.patch
rename to Spigot-Server-Patches/0154-Chunk-registration-fixes.patch
index 819a430bb..9c8cda835 100644
--- a/Spigot-Server-Patches/0155-Chunk-registration-fixes.patch
+++ b/Spigot-Server-Patches/0154-Chunk-registration-fixes.patch
@@ -1,4 +1,4 @@
-From 8d70244eeb9149f698589ba03f8e0054bad5177f Mon Sep 17 00:00:00 2001
+From 25afea25eeeb4ee7fdbe857028fdb18c03729254 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 bafa37f6..d5e338eb 100644
+index bafa37f64..d5e338eb3 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1764,7 +1764,7 @@ public abstract class World implements IBlockAccess {
@@ -21,5 +21,5 @@ index bafa37f6..d5e338eb 100644
  
          if (!entity.aa || entity.ab != i || entity.ac != j || entity.ad != k) {
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0156-Remove-FishingHook-reference-on-Craft-Entity-removal.patch b/Spigot-Server-Patches/0155-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
similarity index 89%
rename from Spigot-Server-Patches/0156-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
rename to Spigot-Server-Patches/0155-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
index 20ec6a8cc..3f1a5fbc4 100644
--- a/Spigot-Server-Patches/0156-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
+++ b/Spigot-Server-Patches/0155-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
@@ -1,11 +1,11 @@
-From c473ab9ce441e759aeb2f0a3ff51471b397b800a Mon Sep 17 00:00:00 2001
+From c1b955d692b905a60aad32ba03b5a822f64b3b39 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/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java
-index d555597d..f5419dea 100644
+index d555597dc..f5419dea4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java
 @@ -62,4 +62,14 @@ public class CraftFish extends AbstractProjectile implements Fish {
@@ -24,5 +24,5 @@ index d555597d..f5419dea 100644
 +    // Paper end
  }
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0157-Auto-fix-bad-Y-levels-on-player-login.patch b/Spigot-Server-Patches/0156-Auto-fix-bad-Y-levels-on-player-login.patch
similarity index 89%
rename from Spigot-Server-Patches/0157-Auto-fix-bad-Y-levels-on-player-login.patch
rename to Spigot-Server-Patches/0156-Auto-fix-bad-Y-levels-on-player-login.patch
index 4981ceb78..264214701 100644
--- a/Spigot-Server-Patches/0157-Auto-fix-bad-Y-levels-on-player-login.patch
+++ b/Spigot-Server-Patches/0156-Auto-fix-bad-Y-levels-on-player-login.patch
@@ -1,4 +1,4 @@
-From 66b8a2dadd2f607d504a81db0487888174f25344 Mon Sep 17 00:00:00 2001
+From 61467bc3f9eb5227fef75f1a2699fa40e6e8457a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Sep 2016 23:48:39 -0400
 Subject: [PATCH] Auto fix bad Y levels on player login
@@ -6,7 +6,7 @@ Subject: [PATCH] Auto fix bad Y levels on player login
 Bring down to a saner Y level if super high, as this can cause the server to crash
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index ef081a57..45618017 100644
+index ef081a57f..456180178 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -131,6 +131,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -18,5 +18,5 @@ index ef081a57..45618017 100644
              if (this.C_().getForceGamemode()) {
                  this.playerInteractManager.setGameMode(this.C_().getGamemode());
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0158-Raise-string-limit-for-packet-serialization.patch b/Spigot-Server-Patches/0157-Raise-string-limit-for-packet-serialization.patch
similarity index 92%
rename from Spigot-Server-Patches/0158-Raise-string-limit-for-packet-serialization.patch
rename to Spigot-Server-Patches/0157-Raise-string-limit-for-packet-serialization.patch
index 51c9f6c10..4f8298577 100644
--- a/Spigot-Server-Patches/0158-Raise-string-limit-for-packet-serialization.patch
+++ b/Spigot-Server-Patches/0157-Raise-string-limit-for-packet-serialization.patch
@@ -1,4 +1,4 @@
-From 643e02228eb710e215fb00406b8bda665520218b Mon Sep 17 00:00:00 2001
+From 71992d13aa8e1c501cbef940dba3c689298668d0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Sep 2016 23:54:20 -0400
 Subject: [PATCH] Raise string limit for packet serialization
@@ -8,7 +8,7 @@ The default limit is possible to hit with 50 page books with color codes, causin
 Bump the limit up a hair to above currently seen sizes.
 
 diff --git a/src/main/java/net/minecraft/server/PacketDataSerializer.java b/src/main/java/net/minecraft/server/PacketDataSerializer.java
-index a8fc7e43..c1273e98 100644
+index a8fc7e431..c1273e988 100644
 --- a/src/main/java/net/minecraft/server/PacketDataSerializer.java
 +++ b/src/main/java/net/minecraft/server/PacketDataSerializer.java
 @@ -300,8 +300,8 @@ public class PacketDataSerializer extends ByteBuf {
@@ -23,5 +23,5 @@ index a8fc7e43..c1273e98 100644
              this.d(abyte.length);
              this.writeBytes(abyte);
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0159-Disable-Vanilla-Chunk-GC.patch b/Spigot-Server-Patches/0158-Disable-Vanilla-Chunk-GC.patch
similarity index 92%
rename from Spigot-Server-Patches/0159-Disable-Vanilla-Chunk-GC.patch
rename to Spigot-Server-Patches/0158-Disable-Vanilla-Chunk-GC.patch
index e10fc19f4..a8fbe0e0c 100644
--- a/Spigot-Server-Patches/0159-Disable-Vanilla-Chunk-GC.patch
+++ b/Spigot-Server-Patches/0158-Disable-Vanilla-Chunk-GC.patch
@@ -1,4 +1,4 @@
-From f2bc8ba70b4286933f8f56ebda7ae46fa4ce88ac Mon Sep 17 00:00:00 2001
+From 9f2c643fe85d5b7753e25a2ee29bef593c7073f7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 26 Sep 2016 01:51:30 -0400
 Subject: [PATCH] Disable Vanilla Chunk GC
@@ -6,7 +6,7 @@ Subject: [PATCH] Disable Vanilla Chunk GC
 Bukkit has its own system for this.
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 8493dcce..2ac5caaa 100644
+index 8493dccee..2ac5caaa4 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1067,7 +1067,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -29,5 +29,5 @@ index 8493dcce..2ac5caaa 100644
          }
      }
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0160-Option-to-remove-corrupt-tile-entities.patch b/Spigot-Server-Patches/0159-Option-to-remove-corrupt-tile-entities.patch
similarity index 96%
rename from Spigot-Server-Patches/0160-Option-to-remove-corrupt-tile-entities.patch
rename to Spigot-Server-Patches/0159-Option-to-remove-corrupt-tile-entities.patch
index a7ad9d036..0034c58d1 100644
--- a/Spigot-Server-Patches/0160-Option-to-remove-corrupt-tile-entities.patch
+++ b/Spigot-Server-Patches/0159-Option-to-remove-corrupt-tile-entities.patch
@@ -1,4 +1,4 @@
-From 0c57542e06e4318767fa618f78c9f7bccf623964 Mon Sep 17 00:00:00 2001
+From 8f7f997a86b876a3311ca579a33d17e307962df5 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
@@ -41,5 +41,5 @@ index 87730aec3..1d056031b 100644
          if (this.j) {
              TileEntity tileentity = (TileEntity) this.tileEntities.remove(blockposition);
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0161-Add-EntityZapEvent.patch b/Spigot-Server-Patches/0160-Add-EntityZapEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0161-Add-EntityZapEvent.patch
rename to Spigot-Server-Patches/0160-Add-EntityZapEvent.patch
index bc581eb26..abebd3792 100644
--- a/Spigot-Server-Patches/0161-Add-EntityZapEvent.patch
+++ b/Spigot-Server-Patches/0160-Add-EntityZapEvent.patch
@@ -1,11 +1,11 @@
-From 1cd159c4fdf6a238af6c9f14cfe07b68df2f9a37 Mon Sep 17 00:00:00 2001
+From 664ca0963760c29d828da4ac8f405e02f43c27b0 Mon Sep 17 00:00:00 2001
 From: AlphaBlend <whizkid3000@hotmail.com>
 Date: Sun, 16 Oct 2016 23:19:30 -0700
 Subject: [PATCH] Add EntityZapEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java
-index 94d01172..fcf99e66 100644
+index 94d011721..fcf99e668 100644
 --- a/src/main/java/net/minecraft/server/EntityPig.java
 +++ b/src/main/java/net/minecraft/server/EntityPig.java
 @@ -158,6 +158,12 @@ public class EntityPig extends EntityAnimal {
@@ -22,7 +22,7 @@ index 94d01172..fcf99e66 100644
              if (CraftEventFactory.callPigZapEvent(this, entitylightning, entitypigzombie).isCancelled()) {
                  return;
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index fe137ed0..09b466fc 100644
+index fe137ed06..09b466fcb 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -622,6 +622,12 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
@@ -48,7 +48,7 @@ index fe137ed0..09b466fc 100644
          }
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index bc84dd30..ba7e5d18 100644
+index bc84dd30f..ba7e5d181 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -684,6 +684,14 @@ public class CraftEventFactory {
@@ -67,5 +67,5 @@ index bc84dd30..ba7e5d18 100644
          HorseJumpEvent event = new HorseJumpEvent((AbstractHorse) horse.getBukkitEntity(), power);
          horse.getBukkitEntity().getServer().getPluginManager().callEvent(event);
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0162-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/Spigot-Server-Patches/0161-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
similarity index 94%
rename from Spigot-Server-Patches/0162-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
rename to Spigot-Server-Patches/0161-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
index c8765710c..4492c923a 100644
--- a/Spigot-Server-Patches/0162-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
+++ b/Spigot-Server-Patches/0161-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
@@ -1,4 +1,4 @@
-From acf2e4ec489ec38f2542c71cbe2d404a8ca35013 Mon Sep 17 00:00:00 2001
+From 7c2619b6f5b1de30a51cdf42f832501b4a685ce0 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
@@ -13,7 +13,7 @@ This of course is undesirable, so just return the loaded side as "primary"
 and treat it as a single chest if the other sides are unloaded
 
 diff --git a/src/main/java/net/minecraft/server/BlockChest.java b/src/main/java/net/minecraft/server/BlockChest.java
-index bc398ec5..90267a1f 100644
+index bc398ec52..90267a1fb 100644
 --- a/src/main/java/net/minecraft/server/BlockChest.java
 +++ b/src/main/java/net/minecraft/server/BlockChest.java
 @@ -339,7 +339,13 @@ public class BlockChest extends BlockTileEntity {
@@ -32,5 +32,5 @@ index bc398ec5..90267a1f 100644
                      if (block == this) {
                          if (this.e(world, blockposition1)) {
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0163-Prevent-Auto-Save-if-Save-Queue-is-full.patch b/Spigot-Server-Patches/0162-Prevent-Auto-Save-if-Save-Queue-is-full.patch
similarity index 97%
rename from Spigot-Server-Patches/0163-Prevent-Auto-Save-if-Save-Queue-is-full.patch
rename to Spigot-Server-Patches/0162-Prevent-Auto-Save-if-Save-Queue-is-full.patch
index fceaa1353..1a4747215 100644
--- a/Spigot-Server-Patches/0163-Prevent-Auto-Save-if-Save-Queue-is-full.patch
+++ b/Spigot-Server-Patches/0162-Prevent-Auto-Save-if-Save-Queue-is-full.patch
@@ -1,4 +1,4 @@
-From 8eceb79981e4d2c91162c0f554cbe68b2ef3cbaf Mon Sep 17 00:00:00 2001
+From cc91cfedfbbbd4410d42aac800deea920935c138 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
@@ -64,5 +64,5 @@ index 8747d9a45..77943821e 100644
      @Nullable
      public Chunk a(World world, int i, int j) throws IOException {
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0164-Chunk-Save-Stats-Debug-Option.patch b/Spigot-Server-Patches/0163-Chunk-Save-Stats-Debug-Option.patch
similarity index 96%
rename from Spigot-Server-Patches/0164-Chunk-Save-Stats-Debug-Option.patch
rename to Spigot-Server-Patches/0163-Chunk-Save-Stats-Debug-Option.patch
index 69f835951..b448b6262 100644
--- a/Spigot-Server-Patches/0164-Chunk-Save-Stats-Debug-Option.patch
+++ b/Spigot-Server-Patches/0163-Chunk-Save-Stats-Debug-Option.patch
@@ -1,4 +1,4 @@
-From 6b99030922c71c02dfb42ab65b1084131ff36811 Mon Sep 17 00:00:00 2001
+From deb93a88dc54ae8e37230bcdd14ba69d941ff82e 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
@@ -8,7 +8,7 @@ Adds a command line flag to enable stats on how chunk saves are processing.
 Stats on current queue, how many was processed and how many were queued.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 2b87329f..73554a51 100644
+index 2b87329f4..73554a518 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -28,6 +28,11 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -55,7 +55,7 @@ index 2b87329f..73554a51 100644
              return false;
          }
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 77943821..14f88e91 100644
+index 77943821e..14f88e91d 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -39,7 +39,13 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -90,5 +90,5 @@ index 77943821..14f88e91 100644
              boolean flag;
  
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0165-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch b/Spigot-Server-Patches/0164-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
similarity index 97%
rename from Spigot-Server-Patches/0165-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
rename to Spigot-Server-Patches/0164-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
index f54776ec5..49b850c9e 100644
--- a/Spigot-Server-Patches/0165-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
+++ b/Spigot-Server-Patches/0164-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
@@ -1,4 +1,4 @@
-From 2991704cddc67cd1ab388d5cba8f5f8da1b4128a Mon Sep 17 00:00:00 2001
+From 24bd8aa011e4db23f1dff3e17a4925e30bc4b08a 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
@@ -69,5 +69,5 @@ index b24f7d8b2..5a08f6b4e 100644
                  entity.f(nbttagcompound1);
              }
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0166-Cache-user-authenticator-threads.patch b/Spigot-Server-Patches/0165-Cache-user-authenticator-threads.patch
similarity index 96%
rename from Spigot-Server-Patches/0166-Cache-user-authenticator-threads.patch
rename to Spigot-Server-Patches/0165-Cache-user-authenticator-threads.patch
index 762f1ab83..00480a2a8 100644
--- a/Spigot-Server-Patches/0166-Cache-user-authenticator-threads.patch
+++ b/Spigot-Server-Patches/0165-Cache-user-authenticator-threads.patch
@@ -1,11 +1,11 @@
-From 63e0e40aaa8d0f6e8dcb38c59f0f131e6fce000f Mon Sep 17 00:00:00 2001
+From ce75a88cf3b22175b325c446a64511201a3e655e 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/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index 57f72856..2158fcd3 100644
+index 57f728567..2158fcd32 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -96,6 +96,12 @@ public class LoginListener implements PacketLoginInListener, ITickable {
@@ -63,5 +63,5 @@ index 57f72856..2158fcd3 100644
      }
  
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0167-Optimize-Network-Queue.patch b/Spigot-Server-Patches/0166-Optimize-Network-Queue.patch
similarity index 90%
rename from Spigot-Server-Patches/0167-Optimize-Network-Queue.patch
rename to Spigot-Server-Patches/0166-Optimize-Network-Queue.patch
index c31c5de09..51319514d 100644
--- a/Spigot-Server-Patches/0167-Optimize-Network-Queue.patch
+++ b/Spigot-Server-Patches/0166-Optimize-Network-Queue.patch
@@ -1,11 +1,11 @@
-From e8f3da1c987c8422e3d63a617c3a40f6c2e64cc7 Mon Sep 17 00:00:00 2001
+From fd37f4274286d7803935867537a4dd26f0859c25 Mon Sep 17 00:00:00 2001
 From: vemacs <d@nkmem.es>
 Date: Wed, 23 Nov 2016 12:54:56 -0500
 Subject: [PATCH] Optimize Network Queue
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5c09c6ff..13c6b5cc 100644
+index 5c09c6ff7..13c6b5ccd 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -104,7 +104,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -18,5 +18,5 @@ index 5c09c6ff..13c6b5cc 100644
      private long ab = aw();
  
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0168-Optimise-removeQueue.patch b/Spigot-Server-Patches/0167-Optimise-removeQueue.patch
similarity index 96%
rename from Spigot-Server-Patches/0168-Optimise-removeQueue.patch
rename to Spigot-Server-Patches/0167-Optimise-removeQueue.patch
index c6c961bcc..98dd16c5a 100644
--- a/Spigot-Server-Patches/0168-Optimise-removeQueue.patch
+++ b/Spigot-Server-Patches/0167-Optimise-removeQueue.patch
@@ -1,11 +1,11 @@
-From 80c96b91db8d9cc576f313b08dadb9286f8d6210 Mon Sep 17 00:00:00 2001
+From b2f598d188251fd4eb758669256903c8178f4235 Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Fri, 25 Nov 2016 13:22:40 +0000
 Subject: [PATCH] Optimise removeQueue
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 45618017..87967b68 100644
+index 456180178..87967b687 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -3,8 +3,10 @@ package net.minecraft.server;
@@ -61,5 +61,5 @@ index 45618017..87967b68 100644
          this.cv = entityplayer.cv;
          this.setShoulderEntityLeft(entityplayer.getShoulderEntityLeft());
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0169-Allow-Reloading-of-Command-Aliases.patch b/Spigot-Server-Patches/0168-Allow-Reloading-of-Command-Aliases.patch
similarity index 92%
rename from Spigot-Server-Patches/0169-Allow-Reloading-of-Command-Aliases.patch
rename to Spigot-Server-Patches/0168-Allow-Reloading-of-Command-Aliases.patch
index 53be9c0cf..6c8975dff 100644
--- a/Spigot-Server-Patches/0169-Allow-Reloading-of-Command-Aliases.patch
+++ b/Spigot-Server-Patches/0168-Allow-Reloading-of-Command-Aliases.patch
@@ -1,4 +1,4 @@
-From 0a192c02fbda74327438f6eeb90a8fd75a7768a1 Mon Sep 17 00:00:00 2001
+From 94f0fb32132cd32cac475ba9205a1079d7204385 Mon Sep 17 00:00:00 2001
 From: willies952002 <admin@domnian.com>
 Date: Mon, 28 Nov 2016 10:21:52 -0500
 Subject: [PATCH] Allow Reloading of Command Aliases
@@ -6,7 +6,7 @@ Subject: [PATCH] Allow Reloading of Command Aliases
 Reload the aliases stored in commands.yml
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c8cb4f22..701c9067 100644
+index c8cb4f226..701c90679 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1889,5 +1889,24 @@ public final class CraftServer implements Server {
@@ -35,5 +35,5 @@ index c8cb4f22..701c9067 100644
      // Paper end
  }
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0170-Add-source-to-PlayerExpChangeEvent.patch b/Spigot-Server-Patches/0169-Add-source-to-PlayerExpChangeEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0170-Add-source-to-PlayerExpChangeEvent.patch
rename to Spigot-Server-Patches/0169-Add-source-to-PlayerExpChangeEvent.patch
index e0f9fd696..3daa7598d 100644
--- a/Spigot-Server-Patches/0170-Add-source-to-PlayerExpChangeEvent.patch
+++ b/Spigot-Server-Patches/0169-Add-source-to-PlayerExpChangeEvent.patch
@@ -1,11 +1,11 @@
-From d98b0708ee4ce659c39c41e8280b1afe41be7a05 Mon Sep 17 00:00:00 2001
+From 1bbb6e7feeb81380b73a6604886e69208a07a830 Mon Sep 17 00:00:00 2001
 From: AlphaBlend <whizkid3000@hotmail.com>
 Date: Thu, 8 Sep 2016 08:48:33 -0700
 Subject: [PATCH] Add source to PlayerExpChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index eae70636..bf5f1f0e 100644
+index eae706368..bf5f1f0e8 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -178,7 +178,7 @@ public class EntityExperienceOrb extends Entity {
@@ -18,7 +18,7 @@ index eae70636..bf5f1f0e 100644
  
                  this.die();
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index ba7e5d18..87b4e918 100644
+index ba7e5d181..87b4e9189 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -46,6 +46,7 @@ import org.bukkit.entity.Player;
@@ -48,5 +48,5 @@ index ba7e5d18..87b4e918 100644
          Block block = world.getWorld().getBlockAt(x, y, z);
          CraftBlockState state = (CraftBlockState) block.getState();
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0171-Optimize-World.isLoaded-BlockPosition-Z.patch b/Spigot-Server-Patches/0170-Optimize-World.isLoaded-BlockPosition-Z.patch
similarity index 88%
rename from Spigot-Server-Patches/0171-Optimize-World.isLoaded-BlockPosition-Z.patch
rename to Spigot-Server-Patches/0170-Optimize-World.isLoaded-BlockPosition-Z.patch
index e625ee2db..41c66ff0d 100644
--- a/Spigot-Server-Patches/0171-Optimize-World.isLoaded-BlockPosition-Z.patch
+++ b/Spigot-Server-Patches/0170-Optimize-World.isLoaded-BlockPosition-Z.patch
@@ -1,4 +1,4 @@
-From fe57ba535053dc75510c673d9c9f4f92a28ac242 Mon Sep 17 00:00:00 2001
+From e1e4c2ad53114d29bce81ddbdc6d74647e97300d 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 d5e338eb..ea6f4652 100644
+index d5e338eb3..ea6f46522 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -290,7 +290,7 @@ public abstract class World implements IBlockAccess {
@@ -19,5 +19,5 @@ index d5e338eb..ea6f4652 100644
  
      public boolean a(BlockPosition blockposition, boolean flag) {
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0172-Speedup-BlockPos-by-fixing-inlining.patch b/Spigot-Server-Patches/0171-Speedup-BlockPos-by-fixing-inlining.patch
similarity index 98%
rename from Spigot-Server-Patches/0172-Speedup-BlockPos-by-fixing-inlining.patch
rename to Spigot-Server-Patches/0171-Speedup-BlockPos-by-fixing-inlining.patch
index ce7ca8b0c..b5f48344a 100644
--- a/Spigot-Server-Patches/0172-Speedup-BlockPos-by-fixing-inlining.patch
+++ b/Spigot-Server-Patches/0171-Speedup-BlockPos-by-fixing-inlining.patch
@@ -1,4 +1,4 @@
-From 54b614a4cfb7b37f74ddd27b7f06921b01a09331 Mon Sep 17 00:00:00 2001
+From 329e237f6cfee08bd844148fd37f97e3f18841de Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Wed, 30 Nov 2016 20:56:58 -0600
 Subject: [PATCH] Speedup BlockPos by fixing inlining
@@ -21,7 +21,7 @@ This is based upon conclusions drawn from inspecting the assenmbly generated byt
 They had 'callq' (invoke) instead of 'mov' (get from memory) instructions.
 
 diff --git a/src/main/java/net/minecraft/server/BaseBlockPosition.java b/src/main/java/net/minecraft/server/BaseBlockPosition.java
-index 679d5504..8e737718 100644
+index 679d5504e..8e737718e 100644
 --- a/src/main/java/net/minecraft/server/BaseBlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BaseBlockPosition.java
 @@ -7,11 +7,12 @@ import javax.annotation.concurrent.Immutable;
@@ -66,7 +66,7 @@ index 679d5504..8e737718 100644
      public BaseBlockPosition d(BaseBlockPosition baseblockposition) {
          return new BaseBlockPosition(this.getY() * baseblockposition.getZ() - this.getZ() * baseblockposition.getY(), this.getZ() * baseblockposition.getX() - this.getX() * baseblockposition.getZ(), this.getX() * baseblockposition.getY() - this.getY() * baseblockposition.getX());
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index b3c1f550..6a0b3a62 100644
+index b3c1f550c..6a0b3a62d 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -211,19 +211,21 @@ public class BlockPosition extends BaseBlockPosition {
@@ -177,5 +177,5 @@ index b3c1f550..6a0b3a62 100644
  
          public BlockPosition h() {
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0173-Don-t-let-fishinghooks-use-portals.patch b/Spigot-Server-Patches/0172-Don-t-let-fishinghooks-use-portals.patch
similarity index 90%
rename from Spigot-Server-Patches/0173-Don-t-let-fishinghooks-use-portals.patch
rename to Spigot-Server-Patches/0172-Don-t-let-fishinghooks-use-portals.patch
index 619c39b4d..caff8f970 100644
--- a/Spigot-Server-Patches/0173-Don-t-let-fishinghooks-use-portals.patch
+++ b/Spigot-Server-Patches/0172-Don-t-let-fishinghooks-use-portals.patch
@@ -1,11 +1,11 @@
-From 98bf219d91eea39921088353ed6588f970719c9c Mon Sep 17 00:00:00 2001
+From 1726ebda78e46c2ede197089ad6a10a487642f65 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 16 Dec 2016 16:03:19 -0600
 Subject: [PATCH] Don't let fishinghooks use portals
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 9ab89287..42da707a 100644
+index 9ab892876..42da707ae 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -144,7 +144,7 @@ public abstract class Entity implements ICommandListener {
@@ -18,7 +18,7 @@ index 9ab89287..42da707a 100644
      public int dimension;
      protected BlockPosition an;
 diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
-index 339d1f1b..7f011aef 100644
+index 339d1f1b1..7f011aef8 100644
 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
 @@ -185,6 +185,12 @@ public class EntityFishingHook extends Entity {
@@ -35,5 +35,5 @@ index 339d1f1b..7f011aef 100644
      }
  
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0174-Add-ProjectileCollideEvent.patch b/Spigot-Server-Patches/0173-Add-ProjectileCollideEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0174-Add-ProjectileCollideEvent.patch
rename to Spigot-Server-Patches/0173-Add-ProjectileCollideEvent.patch
index b8d211e70..8545d4a3d 100644
--- a/Spigot-Server-Patches/0174-Add-ProjectileCollideEvent.patch
+++ b/Spigot-Server-Patches/0173-Add-ProjectileCollideEvent.patch
@@ -1,11 +1,11 @@
-From 0d1121cecae2c4cabda856bc7ad134a9bc6ad6f9 Mon Sep 17 00:00:00 2001
+From afa5992d7e4b22cede2d0fea2fd2b3c85e46121a Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Fri, 16 Dec 2016 21:25:39 -0600
 Subject: [PATCH] Add ProjectileCollideEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
-index f55eb654..1338f37f 100644
+index f55eb654b..1338f37f3 100644
 --- a/src/main/java/net/minecraft/server/EntityArrow.java
 +++ b/src/main/java/net/minecraft/server/EntityArrow.java
 @@ -190,6 +190,15 @@ public abstract class EntityArrow extends Entity implements IProjectile {
@@ -25,7 +25,7 @@ index f55eb654..1338f37f 100644
                  this.a(movingobjectposition);
              }
 diff --git a/src/main/java/net/minecraft/server/EntityFireball.java b/src/main/java/net/minecraft/server/EntityFireball.java
-index 365e070f..657b3b5a 100644
+index 365e070f8..657b3b5ac 100644
 --- a/src/main/java/net/minecraft/server/EntityFireball.java
 +++ b/src/main/java/net/minecraft/server/EntityFireball.java
 @@ -70,6 +70,15 @@ public abstract class EntityFireball extends Entity {
@@ -45,7 +45,7 @@ index 365e070f..657b3b5a 100644
                  this.a(movingobjectposition);
  
 diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
-index 7f011aef..6ac89d1e 100644
+index 7f011aef8..6ac89d1e3 100644
 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
 @@ -240,6 +240,16 @@ public class EntityFishingHook extends Entity {
@@ -66,7 +66,7 @@ index 7f011aef..6ac89d1e 100644
              vec3d1 = new Vec3D(movingobjectposition.pos.x, movingobjectposition.pos.y, movingobjectposition.pos.z);
          }
 diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java
-index cfcaf383..01c7fcc8 100644
+index cfcaf3832..01c7fcc8b 100644
 --- a/src/main/java/net/minecraft/server/EntityProjectile.java
 +++ b/src/main/java/net/minecraft/server/EntityProjectile.java
 @@ -160,6 +160,15 @@ public abstract class EntityProjectile extends Entity implements IProjectile {
@@ -86,7 +86,7 @@ index cfcaf383..01c7fcc8 100644
              if (movingobjectposition.type == MovingObjectPosition.EnumMovingObjectType.BLOCK && this.world.getType(movingobjectposition.a()).getBlock() == Blocks.PORTAL) {
                  this.e(movingobjectposition.a());
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 87b4e918..06a277b3 100644
+index 87b4e9189..06a277b3b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -805,6 +805,16 @@ public class CraftEventFactory {
@@ -107,5 +107,5 @@ index 87b4e918..06a277b3 100644
          Projectile bukkitEntity = (Projectile) entity.getBukkitEntity();
          ProjectileLaunchEvent event = new ProjectileLaunchEvent(bukkitEntity);
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0175-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0174-Vanished-players-don-t-have-rights.patch
similarity index 96%
rename from Spigot-Server-Patches/0175-Vanished-players-don-t-have-rights.patch
rename to Spigot-Server-Patches/0174-Vanished-players-don-t-have-rights.patch
index 70f992fd1..f85921171 100644
--- a/Spigot-Server-Patches/0175-Vanished-players-don-t-have-rights.patch
+++ b/Spigot-Server-Patches/0174-Vanished-players-don-t-have-rights.patch
@@ -1,11 +1,11 @@
-From 22a87a95ab05fa67217c5022a4c83fc3ee11ba79 Mon Sep 17 00:00:00 2001
+From 6dbdcc68864a16883aeca56b83dabcad1c71a4e1 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 16 Dec 2016 22:10:35 -0600
 Subject: [PATCH] Vanished players don't have rights
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 42da707a..9080006e 100644
+index 42da707ae..9080006e5 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -68,7 +68,7 @@ public abstract class Entity implements ICommandListener {
@@ -18,7 +18,7 @@ index 42da707a..9080006e 100644
      protected int j;
      private Entity au;public void setVehicle(Entity entity) { this.au = entity; } // Paper // OBFHELPER
 diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java
-index 60149c1c..a5730d1c 100644
+index 60149c1ca..a5730d1c7 100644
 --- a/src/main/java/net/minecraft/server/ItemBlock.java
 +++ b/src/main/java/net/minecraft/server/ItemBlock.java
 @@ -20,7 +20,7 @@ public class ItemBlock extends Item {
@@ -31,7 +31,7 @@ index 60149c1c..a5730d1c 100644
              IBlockData iblockdata1 = this.a.getPlacedState(world, blockposition, enumdirection, f, f1, f2, i, entityhuman);
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index ea6f4652..01dba285 100644
+index ea6f46522..01dba285a 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1799,6 +1799,33 @@ public abstract class World implements IBlockAccess {
@@ -78,7 +78,7 @@ index ea6f4652..01dba285 100644
          this.getServer().getPluginManager().callEvent(event);
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 06a277b3..5f816e44 100644
+index 06a277b3b..5f816e44f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -810,6 +810,13 @@ public class CraftEventFactory {
@@ -96,5 +96,5 @@ index 06a277b3..5f816e44 100644
          return event;
      }
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0176-Prevent-Pathfinding-out-of-World-Border.patch b/Spigot-Server-Patches/0175-Prevent-Pathfinding-out-of-World-Border.patch
similarity index 93%
rename from Spigot-Server-Patches/0176-Prevent-Pathfinding-out-of-World-Border.patch
rename to Spigot-Server-Patches/0175-Prevent-Pathfinding-out-of-World-Border.patch
index 67e34b080..cf4cd6c64 100644
--- a/Spigot-Server-Patches/0176-Prevent-Pathfinding-out-of-World-Border.patch
+++ b/Spigot-Server-Patches/0175-Prevent-Pathfinding-out-of-World-Border.patch
@@ -1,4 +1,4 @@
-From 4b890966c02c8780d1b2a2d93dce4a2cd3479735 Mon Sep 17 00:00:00 2001
+From f97ce877b21aaf45ddfed74d21060dd6f4f336fe Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 19 Dec 2016 23:07:42 -0500
 Subject: [PATCH] Prevent Pathfinding out of World Border
@@ -6,7 +6,7 @@ Subject: [PATCH] Prevent Pathfinding out of World Border
 This prevents Entities from trying to run outside of the World Border
 
 diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
-index 3ac6f84d..935b2e81 100644
+index 3ac6f84d3..935b2e81e 100644
 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java
 +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
 @@ -69,6 +69,7 @@ public abstract class NavigationAbstract {
@@ -26,7 +26,7 @@ index 3ac6f84d..935b2e81 100644
              if (this.c != null && !this.c.b() && blockposition.equals(this.q)) {
                  return this.c;
 diff --git a/src/main/java/net/minecraft/server/WorldBorder.java b/src/main/java/net/minecraft/server/WorldBorder.java
-index 9038d52e..632eb1c9 100644
+index 9038d52eb..632eb1c9d 100644
 --- a/src/main/java/net/minecraft/server/WorldBorder.java
 +++ b/src/main/java/net/minecraft/server/WorldBorder.java
 @@ -29,7 +29,7 @@ public class WorldBorder {
@@ -39,5 +39,5 @@ index 9038d52e..632eb1c9 100644
      }
  
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0177-Bound-Treasure-Maps-to-World-Border.patch b/Spigot-Server-Patches/0176-Bound-Treasure-Maps-to-World-Border.patch
similarity index 94%
rename from Spigot-Server-Patches/0177-Bound-Treasure-Maps-to-World-Border.patch
rename to Spigot-Server-Patches/0176-Bound-Treasure-Maps-to-World-Border.patch
index aa252b9b4..c711f3d9c 100644
--- a/Spigot-Server-Patches/0177-Bound-Treasure-Maps-to-World-Border.patch
+++ b/Spigot-Server-Patches/0176-Bound-Treasure-Maps-to-World-Border.patch
@@ -1,4 +1,4 @@
-From 600763d8d29ff09f84ea917a7921e6f6f9a9e4f1 Mon Sep 17 00:00:00 2001
+From 2f440bf63710923c4cbacde09832ca021402616b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 20 Dec 2016 15:15:11 -0500
 Subject: [PATCH] Bound Treasure Maps to World Border
@@ -11,7 +11,7 @@ that is outside happens to be closer, but unreachable, yet another reachable
 one is in border that would of been missed.
 
 diff --git a/src/main/java/net/minecraft/server/StructureGenerator.java b/src/main/java/net/minecraft/server/StructureGenerator.java
-index 34fd7edf..e8263baa 100644
+index 34fd7edfe..e8263baa4 100644
 --- a/src/main/java/net/minecraft/server/StructureGenerator.java
 +++ b/src/main/java/net/minecraft/server/StructureGenerator.java
 @@ -236,6 +236,9 @@ public abstract class StructureGenerator extends WorldGenBase {
@@ -25,7 +25,7 @@ index 34fd7edf..e8263baa 100644
                              if (!flag1 || !world.b(l2, i3)) {
                                  return new BlockPosition((l2 << 4) + 8, 64, (i3 << 4) + 8);
 diff --git a/src/main/java/net/minecraft/server/WorldBorder.java b/src/main/java/net/minecraft/server/WorldBorder.java
-index 632eb1c9..1bb172bb 100644
+index 632eb1c9d..1bb172bbf 100644
 --- a/src/main/java/net/minecraft/server/WorldBorder.java
 +++ b/src/main/java/net/minecraft/server/WorldBorder.java
 @@ -33,6 +33,18 @@ public class WorldBorder {
@@ -48,5 +48,5 @@ index 632eb1c9..1bb172bb 100644
          return (double) chunkcoordintpair.e() > this.b() && (double) chunkcoordintpair.c() < this.d() && (double) chunkcoordintpair.f() > this.c() && (double) chunkcoordintpair.d() < this.e();
      }
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0178-Configurable-Cartographer-Treasure-Maps.patch b/Spigot-Server-Patches/0177-Configurable-Cartographer-Treasure-Maps.patch
similarity index 97%
rename from Spigot-Server-Patches/0178-Configurable-Cartographer-Treasure-Maps.patch
rename to Spigot-Server-Patches/0177-Configurable-Cartographer-Treasure-Maps.patch
index 1eceeddea..64b8f2dca 100644
--- a/Spigot-Server-Patches/0178-Configurable-Cartographer-Treasure-Maps.patch
+++ b/Spigot-Server-Patches/0177-Configurable-Cartographer-Treasure-Maps.patch
@@ -1,4 +1,4 @@
-From bfea6710128e78b4e93b7408115c55a4ca141f00 Mon Sep 17 00:00:00 2001
+From 960bf7841f506ecc2d545186199d23b6852ee8db 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
@@ -42,5 +42,5 @@ index 09b466fcb..df009e190 100644
              if (blockposition != null) {
                  ItemStack itemstack = ItemWorldMap.a(world, (double) blockposition.getX(), (double) blockposition.getZ(), (byte) 2, true, true);
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0179-Optimize-ItemStack.isEmpty.patch b/Spigot-Server-Patches/0178-Optimize-ItemStack.isEmpty.patch
similarity index 92%
rename from Spigot-Server-Patches/0179-Optimize-ItemStack.isEmpty.patch
rename to Spigot-Server-Patches/0178-Optimize-ItemStack.isEmpty.patch
index 793a80557..270f9b6f4 100644
--- a/Spigot-Server-Patches/0179-Optimize-ItemStack.isEmpty.patch
+++ b/Spigot-Server-Patches/0178-Optimize-ItemStack.isEmpty.patch
@@ -1,4 +1,4 @@
-From c949ff1e8360b6c7a27a4e31ed5e9c78a9b71b5d Mon Sep 17 00:00:00 2001
+From 6118660672d8a271d621a7d709bb04525aef2655 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Dec 2016 03:48:29 -0500
 Subject: [PATCH] Optimize ItemStack.isEmpty()
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize ItemStack.isEmpty()
 Remove hashMap lookup every check, simplify code to remove ternary
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index a8f7ff98..9465f4c1 100644
+index a8f7ff98f..9465f4c16 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -143,9 +143,15 @@ public final class ItemStack {
@@ -27,5 +27,5 @@ index a8f7ff98..9465f4c1 100644
      public static void a(DataConverterManager dataconvertermanager) {
          dataconvertermanager.a(DataConverterTypes.ITEM_INSTANCE, (DataInspector) (new DataInspectorBlockEntity()));
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0180-Add-API-methods-to-control-if-armour-stands-can-move.patch b/Spigot-Server-Patches/0179-Add-API-methods-to-control-if-armour-stands-can-move.patch
similarity index 92%
rename from Spigot-Server-Patches/0180-Add-API-methods-to-control-if-armour-stands-can-move.patch
rename to Spigot-Server-Patches/0179-Add-API-methods-to-control-if-armour-stands-can-move.patch
index 3c5fa9045..9ad36b8a0 100644
--- a/Spigot-Server-Patches/0180-Add-API-methods-to-control-if-armour-stands-can-move.patch
+++ b/Spigot-Server-Patches/0179-Add-API-methods-to-control-if-armour-stands-can-move.patch
@@ -1,11 +1,11 @@
-From a22a6f63c5aa6505bb32a18524b5d05c3c0806f9 Mon Sep 17 00:00:00 2001
+From ae7502f7d2f8e7218adbae9d3db0fc16e23e56f5 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 21 Dec 2016 11:47:25 -0600
 Subject: [PATCH] Add API methods to control if armour stands can move
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index c9054fc9..ee3d37a7 100644
+index c9054fc91..ee3d37a71 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -50,6 +50,7 @@ public class EntityArmorStand extends EntityLiving {
@@ -31,7 +31,7 @@ index c9054fc9..ee3d37a7 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
-index 2b66a08a..8a06cb16 100644
+index 2b66a08ad..8a06cb165 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 @@ -211,4 +211,14 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
@@ -50,5 +50,5 @@ index 2b66a08a..8a06cb16 100644
 +    }
  }
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0181-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/Spigot-Server-Patches/0180-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
similarity index 95%
rename from Spigot-Server-Patches/0181-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
rename to Spigot-Server-Patches/0180-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
index 3f1672955..91ff6089e 100644
--- a/Spigot-Server-Patches/0181-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
+++ b/Spigot-Server-Patches/0180-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
@@ -1,4 +1,4 @@
-From fb7eb6cf729f83d9fbbb3501d546dee43b34a985 Mon Sep 17 00:00:00 2001
+From 1228b89be7bd30aab11b8e96307e2a799ffe0565 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 21 Dec 2016 11:52:04 -0600
 Subject: [PATCH] Option to prevent armor stands from doing entity lookups
@@ -31,5 +31,5 @@ index 01dba285a..b0139fff6 100644
  
              for (int i = 0; i < list.size(); ++i) {
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0182-Add-option-to-remove-invalid-statistics.patch b/Spigot-Server-Patches/0181-Add-option-to-remove-invalid-statistics.patch
similarity index 94%
rename from Spigot-Server-Patches/0182-Add-option-to-remove-invalid-statistics.patch
rename to Spigot-Server-Patches/0181-Add-option-to-remove-invalid-statistics.patch
index cbe76c3fb..c60e03587 100644
--- a/Spigot-Server-Patches/0182-Add-option-to-remove-invalid-statistics.patch
+++ b/Spigot-Server-Patches/0181-Add-option-to-remove-invalid-statistics.patch
@@ -1,11 +1,11 @@
-From f73ecd606fdff1643f5b1c3f855bbf78e01de1bd Mon Sep 17 00:00:00 2001
+From 9645473bc0f79de0b3d578f53afb4c1bc42a8094 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 20 Dec 2016 23:09:21 -0600
 Subject: [PATCH] Add option to remove invalid statistics
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index da0984a3..28917f63 100644
+index da0984a35..28917f63d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -256,4 +256,13 @@ public class PaperConfig {
@@ -23,7 +23,7 @@ index da0984a3..28917f63 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/ServerStatisticManager.java b/src/main/java/net/minecraft/server/ServerStatisticManager.java
-index 14af226f..e3d2c0ff 100644
+index 14af226f3..e3d2c0ff7 100644
 --- a/src/main/java/net/minecraft/server/ServerStatisticManager.java
 +++ b/src/main/java/net/minecraft/server/ServerStatisticManager.java
 @@ -86,6 +86,7 @@ public class ServerStatisticManager extends StatisticManager {
@@ -53,5 +53,5 @@ index 14af226f..e3d2c0ff 100644
          }
      }
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0183-IllegalPacketEvent.patch b/Spigot-Server-Patches/0182-IllegalPacketEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0183-IllegalPacketEvent.patch
rename to Spigot-Server-Patches/0182-IllegalPacketEvent.patch
index 879325ffa..b8b0e6f1c 100644
--- a/Spigot-Server-Patches/0183-IllegalPacketEvent.patch
+++ b/Spigot-Server-Patches/0182-IllegalPacketEvent.patch
@@ -1,4 +1,4 @@
-From d9be020b4fa9f7b242d2fcadb0e0954231a3ef27 Mon Sep 17 00:00:00 2001
+From d515cb2947636628e6f0f272a72a73fc0d03b5c5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 23 Jun 2016 23:33:57 -0400
 Subject: [PATCH] IllegalPacketEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] IllegalPacketEvent
 Fired for invalid data from players that represents hacking attempts
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 0191a9af..45a50602 100644
+index 0191a9af2..45a50602b 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -56,6 +56,7 @@ import org.bukkit.inventory.CraftingInventory;
@@ -68,5 +68,5 @@ index 0191a9af..45a50602 100644
                      }
                      // CraftBukkit start
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0184-Properly-fix-item-duplication-bug.patch b/Spigot-Server-Patches/0183-Properly-fix-item-duplication-bug.patch
similarity index 91%
rename from Spigot-Server-Patches/0184-Properly-fix-item-duplication-bug.patch
rename to Spigot-Server-Patches/0183-Properly-fix-item-duplication-bug.patch
index 3e45ba1c8..878d9e8bf 100644
--- a/Spigot-Server-Patches/0184-Properly-fix-item-duplication-bug.patch
+++ b/Spigot-Server-Patches/0183-Properly-fix-item-duplication-bug.patch
@@ -1,4 +1,4 @@
-From f5f39b61dde31a496ce503231a0f8491a802d3e3 Mon Sep 17 00:00:00 2001
+From 7271052824771f13c3f2d1af7dbf9fd6feb49aeb Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Tue, 27 Dec 2016 01:57:57 +0000
 Subject: [PATCH] Properly fix item duplication bug
@@ -6,7 +6,7 @@ Subject: [PATCH] Properly fix item duplication bug
 Credit to prplz for figuring out the real issue
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 87967b68..0b71c4b9 100644
+index 87967b687..0b71c4b90 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1491,7 +1491,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -19,7 +19,7 @@ index 87967b68..0b71c4b9 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 45a50602..33ae7641 100644
+index 45a50602b..33ae76415 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2632,6 +2632,6 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -31,5 +31,5 @@ index 45a50602..33ae7641 100644
      }
  }
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0185-String-based-Action-Bar-API.patch b/Spigot-Server-Patches/0184-String-based-Action-Bar-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0185-String-based-Action-Bar-API.patch
rename to Spigot-Server-Patches/0184-String-based-Action-Bar-API.patch
index cff886249..b558d0133 100644
--- a/Spigot-Server-Patches/0185-String-based-Action-Bar-API.patch
+++ b/Spigot-Server-Patches/0184-String-based-Action-Bar-API.patch
@@ -1,4 +1,4 @@
-From d6be99ef58fb86a6d86ccbba15fb897a94fc92ea Mon Sep 17 00:00:00 2001
+From 5bfb5e8ee90a3f325ebed6c61703c283e8a9ab9b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 27 Dec 2016 15:02:42 -0500
 Subject: [PATCH] String based Action Bar API
diff --git a/Spigot-Server-Patches/0186-Activation-Range-Improvements.patch b/Spigot-Server-Patches/0185-Activation-Range-Improvements.patch
similarity index 95%
rename from Spigot-Server-Patches/0186-Activation-Range-Improvements.patch
rename to Spigot-Server-Patches/0185-Activation-Range-Improvements.patch
index 93a4bfa24..7b61c30a4 100644
--- a/Spigot-Server-Patches/0186-Activation-Range-Improvements.patch
+++ b/Spigot-Server-Patches/0185-Activation-Range-Improvements.patch
@@ -1,4 +1,4 @@
-From 9d4bd24aa567257e1d244b160eb2d22b58b941ee Mon Sep 17 00:00:00 2001
+From a55ca73274add9eb9693ca1952c8e563341902f9 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Activation Range Improvements
 Fixes and adds new Immunities to improve gameplay behavior
 
 diff --git a/src/main/java/net/minecraft/server/EntityCreature.java b/src/main/java/net/minecraft/server/EntityCreature.java
-index 0c82c6f5..9659a45e 100644
+index 0c82c6f5b..9659a45ef 100644
 --- a/src/main/java/net/minecraft/server/EntityCreature.java
 +++ b/src/main/java/net/minecraft/server/EntityCreature.java
 @@ -10,6 +10,7 @@ public abstract class EntityCreature extends EntityInsentient {
@@ -18,7 +18,7 @@ index 0c82c6f5..9659a45e 100644
      private float b;
      private final float c;
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 20aac1f3..650e549b 100644
+index f76be4da0..3cd37f28d 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -73,7 +73,7 @@ public abstract class EntityLiving extends Entity {
@@ -31,7 +31,7 @@ index 20aac1f3..650e549b 100644
      protected int ticksFarFromPlayer;
      protected float aW;
 diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java
-index dbda68dd..af49b727 100644
+index dbda68dd0..af49b7273 100644
 --- a/src/main/java/net/minecraft/server/EntityLlama.java
 +++ b/src/main/java/net/minecraft/server/EntityLlama.java
 @@ -363,6 +363,7 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
@@ -43,7 +43,7 @@ index dbda68dd..af49b727 100644
          return this.bL != null;
      }
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoal.java b/src/main/java/net/minecraft/server/PathfinderGoal.java
-index 83d9c43f..1cb6652c 100644
+index 83d9c43f3..1cb6652c2 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoal.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoal.java
 @@ -18,7 +18,10 @@ public abstract class PathfinderGoal {
@@ -59,7 +59,7 @@ index 83d9c43f..1cb6652c 100644
      public void e() {}
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java b/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java
-index e5b5e988..e3781f3a 100644
+index e5b5e9887..e3781f3a8 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java
 @@ -2,12 +2,21 @@ package net.minecraft.server;
@@ -96,7 +96,7 @@ index e5b5e988..e3781f3a 100644
                          }
                      }
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 47865c02..b0856461 100644
+index 47865c027..b08564618 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -20,6 +20,7 @@ import net.minecraft.server.EntityFireball;
@@ -141,5 +141,5 @@ index 47865c02..b0856461 100644
              {
                  EntityAnimal animal = (EntityAnimal) entity;
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0187-Firework-API-s.patch b/Spigot-Server-Patches/0186-Firework-API-s.patch
similarity index 96%
rename from Spigot-Server-Patches/0187-Firework-API-s.patch
rename to Spigot-Server-Patches/0186-Firework-API-s.patch
index bea281442..8c4fcfc79 100644
--- a/Spigot-Server-Patches/0187-Firework-API-s.patch
+++ b/Spigot-Server-Patches/0186-Firework-API-s.patch
@@ -1,11 +1,11 @@
-From bb8a4bf4041a14a6dbf40a17522d591badfd14f7 Mon Sep 17 00:00:00 2001
+From 9dacf738239c564182dad1fcd99b6bd43cf38c61 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 28 Dec 2016 01:18:33 -0500
 Subject: [PATCH] Firework API's
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityFireworks.java b/src/main/java/net/minecraft/server/EntityFireworks.java
-index 48cdef5d..bd0ec95f 100644
+index 48cdef5db..bd0ec95f2 100644
 --- a/src/main/java/net/minecraft/server/EntityFireworks.java
 +++ b/src/main/java/net/minecraft/server/EntityFireworks.java
 @@ -2,6 +2,8 @@ package net.minecraft.server;
@@ -53,7 +53,7 @@ index 48cdef5d..bd0ec95f 100644
  
      public boolean bd() {
 diff --git a/src/main/java/net/minecraft/server/ItemFireworks.java b/src/main/java/net/minecraft/server/ItemFireworks.java
-index b0bb4aa2..44a99721 100644
+index b0bb4aa23..44a997215 100644
 --- a/src/main/java/net/minecraft/server/ItemFireworks.java
 +++ b/src/main/java/net/minecraft/server/ItemFireworks.java
 @@ -9,6 +9,7 @@ public class ItemFireworks extends Item {
@@ -73,7 +73,7 @@ index b0bb4aa2..44a99721 100644
                  if (!entityhuman.abilities.canInstantlyBuild) {
                      itemstack.subtract(1);
 diff --git a/src/main/java/net/minecraft/server/NBTTagCompound.java b/src/main/java/net/minecraft/server/NBTTagCompound.java
-index e15c2336..82c2537b 100644
+index e15c23367..82c2537b3 100644
 --- a/src/main/java/net/minecraft/server/NBTTagCompound.java
 +++ b/src/main/java/net/minecraft/server/NBTTagCompound.java
 @@ -106,7 +106,7 @@ public class NBTTagCompound extends NBTBase {
@@ -86,7 +86,7 @@ index e15c2336..82c2537b 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
-index 99746b3c..d4fbe31d 100644
+index 99746b3c2..d4fbe31d6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
 @@ -1,6 +1,7 @@
@@ -129,5 +129,5 @@ index 99746b3c..d4fbe31d 100644
 +    // Paper end
  }
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0188-PlayerTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/0187-PlayerTeleportEndGatewayEvent.patch
similarity index 92%
rename from Spigot-Server-Patches/0188-PlayerTeleportEndGatewayEvent.patch
rename to Spigot-Server-Patches/0187-PlayerTeleportEndGatewayEvent.patch
index 959a150f4..1efe41aba 100644
--- a/Spigot-Server-Patches/0188-PlayerTeleportEndGatewayEvent.patch
+++ b/Spigot-Server-Patches/0187-PlayerTeleportEndGatewayEvent.patch
@@ -1,4 +1,4 @@
-From a9fa0eda22003f141a7901b9269c8ecff933506b Mon Sep 17 00:00:00 2001
+From 4c4ce708c08803922b2dcaa6b8ae9ce5e3b244eb Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 31 Dec 2016 21:44:50 -0500
 Subject: [PATCH] PlayerTeleportEndGatewayEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] PlayerTeleportEndGatewayEvent
 Allows you to access the Gateway being used in a teleport event
 
 diff --git a/src/main/java/net/minecraft/server/TileEntityEndGateway.java b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
-index cfce9274..ecbc48b0 100644
+index cfce9274a..ecbc48b0c 100644
 --- a/src/main/java/net/minecraft/server/TileEntityEndGateway.java
 +++ b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
 @@ -124,7 +124,7 @@ public class TileEntityEndGateway extends TileEntityEnderPortal implements ITick
@@ -19,5 +19,5 @@ index cfce9274..ecbc48b0 100644
                      if (teleEvent.isCancelled()) {
                          return;
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0189-ShulkerBox-Dupe-Prevention.patch b/Spigot-Server-Patches/0188-ShulkerBox-Dupe-Prevention.patch
similarity index 90%
rename from Spigot-Server-Patches/0189-ShulkerBox-Dupe-Prevention.patch
rename to Spigot-Server-Patches/0188-ShulkerBox-Dupe-Prevention.patch
index aed888b79..79447c9ae 100644
--- a/Spigot-Server-Patches/0189-ShulkerBox-Dupe-Prevention.patch
+++ b/Spigot-Server-Patches/0188-ShulkerBox-Dupe-Prevention.patch
@@ -1,4 +1,4 @@
-From dc2491bfd145f897f66dc549f2b0d231765d255a Mon Sep 17 00:00:00 2001
+From d82dfb8947dd6bb42282a778986d1cfe32c30216 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
@@ -7,7 +7,7 @@ This ensures that Shulker Boxes can never drop their contents twice, and
 that the inventory is cleared incase it some how also got saved to the world.
 
 diff --git a/src/main/java/net/minecraft/server/BlockShulkerBox.java b/src/main/java/net/minecraft/server/BlockShulkerBox.java
-index 8811eb3e..74e2e448 100644
+index 8811eb3e3..74e2e448f 100644
 --- a/src/main/java/net/minecraft/server/BlockShulkerBox.java
 +++ b/src/main/java/net/minecraft/server/BlockShulkerBox.java
 @@ -112,6 +112,7 @@ public class BlockShulkerBox extends BlockTileEntity {
@@ -19,5 +19,5 @@ index 8811eb3e..74e2e448 100644
  
              world.updateAdjacentComparators(blockposition, iblockdata.getBlock());
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0190-Provide-E-TE-Chunk-count-stat-methods.patch b/Spigot-Server-Patches/0189-Provide-E-TE-Chunk-count-stat-methods.patch
similarity index 93%
rename from Spigot-Server-Patches/0190-Provide-E-TE-Chunk-count-stat-methods.patch
rename to Spigot-Server-Patches/0189-Provide-E-TE-Chunk-count-stat-methods.patch
index 2c8a96978..5efd1e636 100644
--- a/Spigot-Server-Patches/0190-Provide-E-TE-Chunk-count-stat-methods.patch
+++ b/Spigot-Server-Patches/0189-Provide-E-TE-Chunk-count-stat-methods.patch
@@ -1,4 +1,4 @@
-From b48d1808b7f6a7d21e7aeac6c950d1c314248b5c Mon Sep 17 00:00:00 2001
+From 8ed6bbfdcdcdce2c39507c0a4d0e179c76a36f86 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 284dc639..2e78cd8c 100644
+index 284dc6391..2e78cd8cf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -78,6 +78,29 @@ public class CraftWorld implements World {
@@ -41,5 +41,5 @@ index 284dc639..2e78cd8c 100644
  
      public CraftWorld(WorldServer world, ChunkGenerator gen, Environment env) {
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0191-Enforce-Sync-Player-Saves.patch b/Spigot-Server-Patches/0190-Enforce-Sync-Player-Saves.patch
similarity index 94%
rename from Spigot-Server-Patches/0191-Enforce-Sync-Player-Saves.patch
rename to Spigot-Server-Patches/0190-Enforce-Sync-Player-Saves.patch
index 0f4d0608f..2217720c0 100644
--- a/Spigot-Server-Patches/0191-Enforce-Sync-Player-Saves.patch
+++ b/Spigot-Server-Patches/0190-Enforce-Sync-Player-Saves.patch
@@ -1,4 +1,4 @@
-From 22ea24f119b179ba0fd34826183d3d0fb1246e38 Mon Sep 17 00:00:00 2001
+From 343eb898d9c46caa258cda53eaf90c5c17495256 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 Jan 2017 15:41:58 -0500
 Subject: [PATCH] Enforce Sync Player Saves
diff --git a/Spigot-Server-Patches/0192-Enforce-Sync-Chunk-Unloads.patch b/Spigot-Server-Patches/0191-Enforce-Sync-Chunk-Unloads.patch
similarity index 92%
rename from Spigot-Server-Patches/0192-Enforce-Sync-Chunk-Unloads.patch
rename to Spigot-Server-Patches/0191-Enforce-Sync-Chunk-Unloads.patch
index 394c06e9e..551f13e93 100644
--- a/Spigot-Server-Patches/0192-Enforce-Sync-Chunk-Unloads.patch
+++ b/Spigot-Server-Patches/0191-Enforce-Sync-Chunk-Unloads.patch
@@ -1,4 +1,4 @@
-From 7fbafd99142430a403f45b0d6c71cda5b6925806 Mon Sep 17 00:00:00 2001
+From e1c5bbdef8f6afe22c6d095ee8cbfde7b895af45 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 Jan 2017 16:06:44 -0500
 Subject: [PATCH] Enforce Sync Chunk Unloads
@@ -7,7 +7,7 @@ Unloading Chunks async is extremely dangerous. This will force it to main
 the same way we handle async chunk loads.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 2e78cd8c..4ffe0d20 100644
+index 2e78cd8cf..4ffe0d208 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -245,6 +245,7 @@ public class CraftWorld implements World {
@@ -27,5 +27,5 @@ index 2e78cd8c..4ffe0d20 100644
  
      public boolean regenerateChunk(int x, int z) {
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0193-Don-t-allow-entities-to-ride-themselves-572.patch b/Spigot-Server-Patches/0192-Don-t-allow-entities-to-ride-themselves-572.patch
similarity index 88%
rename from Spigot-Server-Patches/0193-Don-t-allow-entities-to-ride-themselves-572.patch
rename to Spigot-Server-Patches/0192-Don-t-allow-entities-to-ride-themselves-572.patch
index 87d5353d9..b44d2c700 100644
--- a/Spigot-Server-Patches/0193-Don-t-allow-entities-to-ride-themselves-572.patch
+++ b/Spigot-Server-Patches/0192-Don-t-allow-entities-to-ride-themselves-572.patch
@@ -1,11 +1,11 @@
-From 124cae47c946fa9087ef435e5f3f81df34f91e83 Mon Sep 17 00:00:00 2001
+From 052a2f49a21bef5a25211cda939ea96f90e5d1c5 Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Sun, 8 Jan 2017 04:31:36 +0000
 Subject: [PATCH] Don't allow entities to ride themselves - #572
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 9080006e..a6ffe144 100644
+index 9080006e5..a6ffe144f 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1938,6 +1938,7 @@ public abstract class Entity implements ICommandListener {
@@ -17,5 +17,5 @@ index 9080006e..a6ffe144 100644
              throw new IllegalStateException("Use x.startRiding(y), not y.addPassenger(x)");
          } else {
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0194-Fix-block-break-desync.patch b/Spigot-Server-Patches/0193-Fix-block-break-desync.patch
similarity index 88%
rename from Spigot-Server-Patches/0194-Fix-block-break-desync.patch
rename to Spigot-Server-Patches/0193-Fix-block-break-desync.patch
index 3f4c53a72..d3e9e9967 100644
--- a/Spigot-Server-Patches/0194-Fix-block-break-desync.patch
+++ b/Spigot-Server-Patches/0193-Fix-block-break-desync.patch
@@ -1,11 +1,11 @@
-From 536dc88005cafea353beceacc93b5f75bff9006c Mon Sep 17 00:00:00 2001
+From ac16dd9c372c065d244a5354177b150ab6519191 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 33ae7641..2367ff1f 100644
+index 33ae76415..2367ff1f0 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -868,6 +868,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -17,5 +17,5 @@ index 33ae7641..2367ff1f 100644
              } else if (blockposition.getY() >= this.minecraftServer.getMaxBuildHeight()) {
                  return;
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0195-Assign-the-World-in-WorldGenStronghold.patch b/Spigot-Server-Patches/0194-Assign-the-World-in-WorldGenStronghold.patch
similarity index 87%
rename from Spigot-Server-Patches/0195-Assign-the-World-in-WorldGenStronghold.patch
rename to Spigot-Server-Patches/0194-Assign-the-World-in-WorldGenStronghold.patch
index d7a836582..6397d937f 100644
--- a/Spigot-Server-Patches/0195-Assign-the-World-in-WorldGenStronghold.patch
+++ b/Spigot-Server-Patches/0194-Assign-the-World-in-WorldGenStronghold.patch
@@ -1,11 +1,11 @@
-From a9eb218059ea10dd846b06145a95c1c787535320 Mon Sep 17 00:00:00 2001
+From 2f82d8aafd582feb742b94a70af97a109ee7ae34 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 c9375470..a3b958e0 100644
+index c93754704..a3b958e01 100644
 --- a/src/main/java/net/minecraft/server/WorldGenStronghold.java
 +++ b/src/main/java/net/minecraft/server/WorldGenStronghold.java
 @@ -56,6 +56,7 @@ public class WorldGenStronghold extends StructureGenerator {
@@ -17,5 +17,5 @@ index c9375470..a3b958e0 100644
              this.c();
              this.b = true;
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0196-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/Spigot-Server-Patches/0195-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
similarity index 96%
rename from Spigot-Server-Patches/0196-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
rename to Spigot-Server-Patches/0195-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
index cd29953cc..01ebcd037 100644
--- a/Spigot-Server-Patches/0196-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/Spigot-Server-Patches/0195-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
@@ -1,4 +1,4 @@
-From 1ad06605737c7f9b6df135d1117417f334335b30 Mon Sep 17 00:00:00 2001
+From fa7ee18f3ed2680a98723a562bc7c6bf8f8c6efc Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 16:31:46 -0500
 Subject: [PATCH] ExperienceOrbs API for Reason/Source/Triggering player
@@ -8,7 +8,7 @@ Adds lots of information about why this orb exists.
 Replaces isFromBottle() with logic that persists entity reloads too.
 
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index 35231096..3e2f5264 100644
+index 352310960..3e2f52647 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -388,13 +388,13 @@ public class Block {
@@ -28,7 +28,7 @@ index 35231096..3e2f5264 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index a8cc6b61..c925de97 100644
+index a8cc6b61a..c925de971 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
 @@ -618,7 +618,7 @@ public class EntityEnderDragon extends EntityInsentient implements IComplex, IMo
@@ -41,7 +41,7 @@ index a8cc6b61..c925de97 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index bf5f1f0e..d567ad4a 100644
+index bf5f1f0e8..d567ad4a5 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -15,9 +15,54 @@ public class EntityExperienceOrb extends Entity {
@@ -116,7 +116,7 @@ index bf5f1f0e..d567ad4a 100644
  
      public void d(EntityHuman entityhuman) {
 diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
-index 6ac89d1e..177d8582 100644
+index 6ac89d1e3..177d8582f 100644
 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
 @@ -458,7 +458,7 @@ public class EntityFishingHook extends Entity {
@@ -129,7 +129,7 @@ index 6ac89d1e..177d8582 100644
                      // CraftBukkit end
                      Item item = itemstack.getItem();
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 650e549b..73643bc7 100644
+index 3cd37f28d..ab3ab3889 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -347,7 +347,8 @@ public abstract class EntityLiving extends Entity {
@@ -143,7 +143,7 @@ index 650e549b..73643bc7 100644
              this.expToDrop = 0;
              // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/EntityThrownExpBottle.java b/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
-index 0255986f..e14f614f 100644
+index 0255986fd..e14f614f5 100644
 --- a/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
 +++ b/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
 @@ -40,7 +40,7 @@ public class EntityThrownExpBottle extends EntityProjectile {
@@ -156,7 +156,7 @@ index 0255986f..e14f614f 100644
  
              this.die();
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index df009e19..9944e0f9 100644
+index df009e190..9944e0f91 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -421,7 +421,7 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
@@ -169,7 +169,7 @@ index df009e19..9944e0f9 100644
  
          if (this.tradingPlayer instanceof EntityPlayer) {
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalBreed.java b/src/main/java/net/minecraft/server/PathfinderGoalBreed.java
-index 059671b5..444792ea 100644
+index 059671b54..444792ea0 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalBreed.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalBreed.java
 @@ -122,7 +122,7 @@ public class PathfinderGoalBreed extends PathfinderGoal {
@@ -182,7 +182,7 @@ index 059671b5..444792ea 100644
                  // CraftBukkit end
              }
 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index a1689c06..a49b5c81 100644
+index a1689c065..a49b5c81a 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
 @@ -383,7 +383,7 @@ public class PlayerInteractManager {
@@ -195,7 +195,7 @@ index a1689c06..a49b5c81 100644
                  // CraftBukkit end
  
 diff --git a/src/main/java/net/minecraft/server/SlotFurnaceResult.java b/src/main/java/net/minecraft/server/SlotFurnaceResult.java
-index 1dcf967a..ed394f7a 100644
+index 1dcf967a1..ed394f7a5 100644
 --- a/src/main/java/net/minecraft/server/SlotFurnaceResult.java
 +++ b/src/main/java/net/minecraft/server/SlotFurnaceResult.java
 @@ -7,7 +7,7 @@ import org.bukkit.event.inventory.FurnaceExtractEvent;
@@ -217,7 +217,7 @@ index 1dcf967a..ed394f7a 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 4ffe0d20..568a50ec 100644
+index 4ffe0d208..568a50ec4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1218,7 +1218,7 @@ public class CraftWorld implements World {
@@ -230,7 +230,7 @@ index 4ffe0d20..568a50ec 100644
              // not sure what this can do
              if (LightningStrike.class.isAssignableFrom(clazz)) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
-index 3a09cab3..3302af0e 100644
+index 3a09cab3d..3302af0e4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
 @@ -18,6 +18,18 @@ public class CraftExperienceOrb extends CraftEntity implements ExperienceOrb {
@@ -253,5 +253,5 @@ index 3a09cab3..3302af0e 100644
      public EntityExperienceOrb getHandle() {
          return (EntityExperienceOrb) entity;
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0197-Remove-the-Vanilla-Method-Profiler.patch b/Spigot-Server-Patches/0196-Remove-the-Vanilla-Method-Profiler.patch
similarity index 96%
rename from Spigot-Server-Patches/0197-Remove-the-Vanilla-Method-Profiler.patch
rename to Spigot-Server-Patches/0196-Remove-the-Vanilla-Method-Profiler.patch
index 674402a38..d61a8cbda 100644
--- a/Spigot-Server-Patches/0197-Remove-the-Vanilla-Method-Profiler.patch
+++ b/Spigot-Server-Patches/0196-Remove-the-Vanilla-Method-Profiler.patch
@@ -1,4 +1,4 @@
-From 207fc512f3df471ca49195bbf5b92bcb58620864 Mon Sep 17 00:00:00 2001
+From 1c34ffa74f4b1012824137f90a845d916eaf2530 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 21 Jan 2017 08:00:33 +0100
 Subject: [PATCH] Remove the Vanilla Method Profiler
@@ -11,7 +11,7 @@ added, so we do not want any risk of performance degredation.
 Paper has a proper Timings system that makes the Vanilla Method profiler obsolete and inferior.
 
 diff --git a/src/main/java/net/minecraft/server/CommandDebug.java b/src/main/java/net/minecraft/server/CommandDebug.java
-index 89708da9..7586168d 100644
+index 89708da96..7586168db 100644
 --- a/src/main/java/net/minecraft/server/CommandDebug.java
 +++ b/src/main/java/net/minecraft/server/CommandDebug.java
 @@ -35,12 +35,11 @@ public class CommandDebug extends CommandAbstract {
@@ -40,7 +40,7 @@ index 89708da9..7586168d 100644
  
      public List<String> tabComplete(MinecraftServer minecraftserver, ICommandListener icommandlistener, String[] astring, @Nullable BlockPosition blockposition) {
 diff --git a/src/main/java/net/minecraft/server/MethodProfiler.java b/src/main/java/net/minecraft/server/MethodProfiler.java
-index 480e2ca9..a76d5072 100644
+index 480e2ca97..a76d50723 100644
 --- a/src/main/java/net/minecraft/server/MethodProfiler.java
 +++ b/src/main/java/net/minecraft/server/MethodProfiler.java
 @@ -11,7 +11,31 @@ import java.util.function.Supplier;
@@ -84,5 +84,5 @@ index 480e2ca9..a76d5072 100644
      public static final class ProfilerInfo implements Comparable<MethodProfiler.ProfilerInfo> {
  
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0198-Cap-Entity-Collisions.patch b/Spigot-Server-Patches/0197-Cap-Entity-Collisions.patch
similarity index 97%
rename from Spigot-Server-Patches/0198-Cap-Entity-Collisions.patch
rename to Spigot-Server-Patches/0197-Cap-Entity-Collisions.patch
index d9bdffefb..8d7c5dcc0 100644
--- a/Spigot-Server-Patches/0198-Cap-Entity-Collisions.patch
+++ b/Spigot-Server-Patches/0197-Cap-Entity-Collisions.patch
@@ -1,4 +1,4 @@
-From 172f89f8b60e02690cbb9562af0f2ca7e996eb09 Mon Sep 17 00:00:00 2001
+From 9d475c9558f74b1a36807eb10a61656dca34897c 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
@@ -56,5 +56,5 @@ index ab3ab3889..6829f8f9c 100644
                  this.C(entity);
              }
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0199-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch b/Spigot-Server-Patches/0198-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch
similarity index 92%
rename from Spigot-Server-Patches/0199-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch
rename to Spigot-Server-Patches/0198-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch
index 223655558..210bba2e2 100644
--- a/Spigot-Server-Patches/0199-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch
+++ b/Spigot-Server-Patches/0198-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch
@@ -1,11 +1,11 @@
-From 0e04c6d432f05738934e33880354276003def83b Mon Sep 17 00:00:00 2001
+From fa1c8f839892e9c574684d25588f1455a0f6ec7f Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 23 Jan 2017 15:10:25 -0600
 Subject: [PATCH] Do not allow a zero max height in BiomeJungle
 
 
 diff --git a/src/main/java/net/minecraft/server/BiomeJungle.java b/src/main/java/net/minecraft/server/BiomeJungle.java
-index 8f67cb36..8dc0b623 100644
+index 8f67cb36c..8dc0b6238 100644
 --- a/src/main/java/net/minecraft/server/BiomeJungle.java
 +++ b/src/main/java/net/minecraft/server/BiomeJungle.java
 @@ -40,7 +40,11 @@ public class BiomeJungle extends BiomeBase {
@@ -22,7 +22,7 @@ index 8f67cb36..8dc0b623 100644
          (new WorldGenMelon()).generate(world, random, blockposition.a(i, k, j));
          WorldGenVines worldgenvines = new WorldGenVines();
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index 6a0b3a62..38a7af58 100644
+index 6a0b3a62d..38a7af58c 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -42,6 +42,7 @@ public class BlockPosition extends BaseBlockPosition {
@@ -34,5 +34,5 @@ index 6a0b3a62..38a7af58 100644
          return d0 == 0.0D && d1 == 0.0D && d2 == 0.0D ? this : new BlockPosition((double) this.getX() + d0, (double) this.getY() + d1, (double) this.getZ() + d2);
      }
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0200-Remove-CraftScheduler-Async-Task-Debugger.patch b/Spigot-Server-Patches/0199-Remove-CraftScheduler-Async-Task-Debugger.patch
similarity index 96%
rename from Spigot-Server-Patches/0200-Remove-CraftScheduler-Async-Task-Debugger.patch
rename to Spigot-Server-Patches/0199-Remove-CraftScheduler-Async-Task-Debugger.patch
index 88fca6d8c..9725de493 100644
--- a/Spigot-Server-Patches/0200-Remove-CraftScheduler-Async-Task-Debugger.patch
+++ b/Spigot-Server-Patches/0199-Remove-CraftScheduler-Async-Task-Debugger.patch
@@ -1,4 +1,4 @@
-From 3a79a923a1937cc284af48b1010251ce8c93e9fd Mon Sep 17 00:00:00 2001
+From 06e0c2047f0e86e7ca6f80a588f2698df7e75d22 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 5 Feb 2017 00:04:04 -0500
 Subject: [PATCH] Remove CraftScheduler Async Task Debugger
@@ -9,7 +9,7 @@ One report of a suspected memory leak with the system.
 This adds additional overhead to asynchronous task dispatching
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index bce41128..e47f4cca 100644
+index bce411288..e47f4cca2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 @@ -80,8 +80,8 @@ public class CraftScheduler implements BukkitScheduler {
@@ -58,5 +58,5 @@ index bce41128..e47f4cca 100644
  
      @Deprecated
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0201-Shame-on-you-Mojang.patch b/Spigot-Server-Patches/0200-Shame-on-you-Mojang.patch
similarity index 95%
rename from Spigot-Server-Patches/0201-Shame-on-you-Mojang.patch
rename to Spigot-Server-Patches/0200-Shame-on-you-Mojang.patch
index 0b91faf5f..cd23789bd 100644
--- a/Spigot-Server-Patches/0201-Shame-on-you-Mojang.patch
+++ b/Spigot-Server-Patches/0200-Shame-on-you-Mojang.patch
@@ -1,4 +1,4 @@
-From b4782f13b5bc888bbd9756eb3177e9c4dfc669a9 Mon Sep 17 00:00:00 2001
+From 4d09624b3f9bfda502cf181485092be9ba875a0d 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
@@ -12,7 +12,7 @@ This then triggers async chunk loads!
 What in the hell were you thinking?
 
 diff --git a/src/main/java/net/minecraft/server/BlockBeacon.java b/src/main/java/net/minecraft/server/BlockBeacon.java
-index f07ac018..21075974 100644
+index f07ac0186..21075974d 100644
 --- a/src/main/java/net/minecraft/server/BlockBeacon.java
 +++ b/src/main/java/net/minecraft/server/BlockBeacon.java
 @@ -62,8 +62,8 @@ public class BlockBeacon extends BlockTileEntity {
@@ -55,5 +55,5 @@ index f07ac018..21075974 100644
      }
  }
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0202-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch b/Spigot-Server-Patches/0201-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
similarity index 91%
rename from Spigot-Server-Patches/0202-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
rename to Spigot-Server-Patches/0201-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
index 7939f2c99..fa92c50e2 100644
--- a/Spigot-Server-Patches/0202-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
+++ b/Spigot-Server-Patches/0201-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
@@ -1,11 +1,11 @@
-From f8511475325fc02f96c23b4881178d92d46f3edf Mon Sep 17 00:00:00 2001
+From 8b31487b02eb4c83a7a448e570b95920ba0fce98 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Tue, 7 Feb 2017 16:55:35 -0600
 Subject: [PATCH] Make targetSize more aggressive in the chunk unload queue
 
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 73554a51..2558ba8c 100644
+index 73554a518..2558ba8c3 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -325,7 +325,7 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -18,5 +18,5 @@ index 73554a51..2558ba8c 100644
  
                  Iterator iterator = this.unloadQueue.iterator();
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0203-Do-not-let-armorstands-drown.patch b/Spigot-Server-Patches/0202-Do-not-let-armorstands-drown.patch
similarity index 92%
rename from Spigot-Server-Patches/0203-Do-not-let-armorstands-drown.patch
rename to Spigot-Server-Patches/0202-Do-not-let-armorstands-drown.patch
index f458b0a3c..91bb4dc71 100644
--- a/Spigot-Server-Patches/0203-Do-not-let-armorstands-drown.patch
+++ b/Spigot-Server-Patches/0202-Do-not-let-armorstands-drown.patch
@@ -1,11 +1,11 @@
-From b6ae0784d4a076ccf62b8acef83e06b9e26c5032 Mon Sep 17 00:00:00 2001
+From 32462fe122bceb27d35a68cfae1e43abf1f5b15f Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 18 Feb 2017 19:29:58 -0600
 Subject: [PATCH] Do not let armorstands drown
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index ee3d37a7..df0d66ad 100644
+index ee3d37a71..df0d66ad0 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -779,5 +779,10 @@ public class EntityArmorStand extends EntityLiving {
@@ -20,7 +20,7 @@ index ee3d37a7..df0d66ad 100644
      // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 28eb1330..839008ad 100644
+index 6829f8f9c..4e7cf5de6 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -195,6 +195,7 @@ public abstract class EntityLiving extends Entity {
@@ -41,5 +41,5 @@ index 28eb1330..839008ad 100644
                      if (this.getAirTicks() == -20) {
                          this.setAirTicks(0);
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0204-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch b/Spigot-Server-Patches/0203-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch
similarity index 90%
rename from Spigot-Server-Patches/0204-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch
rename to Spigot-Server-Patches/0203-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch
index d5e1c78ce..5eaa7e609 100644
--- a/Spigot-Server-Patches/0204-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch
+++ b/Spigot-Server-Patches/0203-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch
@@ -1,4 +1,4 @@
-From a7d08f6d229771a964acc992fe496836026f5ec8 Mon Sep 17 00:00:00 2001
+From ed42fa5362cb89e856e137f264bd18318ea3631e Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Sun, 9 Apr 2017 23:50:15 -0700
 Subject: [PATCH] Fix NFE when attempting to read EMPTY ItemStack
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix NFE when attempting to read EMPTY ItemStack
 Thanks @gabizou
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 9465f4c1..52cb34ab 100644
+index 9465f4c16..52cb34abd 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -119,7 +119,7 @@ public final class ItemStack {
@@ -19,5 +19,5 @@ index 9465f4c1..52cb34ab 100644
          // CraftBukkit start - Route through setData for filtering
          // this.damage = Math.max(0, nbttagcompound.getShort("Damage"));
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0205-Properly-handle-async-calls-to-restart-the-server.patch b/Spigot-Server-Patches/0204-Properly-handle-async-calls-to-restart-the-server.patch
similarity index 99%
rename from Spigot-Server-Patches/0205-Properly-handle-async-calls-to-restart-the-server.patch
rename to Spigot-Server-Patches/0204-Properly-handle-async-calls-to-restart-the-server.patch
index 7229e6aa4..174724032 100644
--- a/Spigot-Server-Patches/0205-Properly-handle-async-calls-to-restart-the-server.patch
+++ b/Spigot-Server-Patches/0204-Properly-handle-async-calls-to-restart-the-server.patch
@@ -1,4 +1,4 @@
-From 1536a04ca5d57cb2e1dcb5641d1843aa9930817b Mon Sep 17 00:00:00 2001
+From 1dfb9d1c54af2782c982eb047eb68c11c619beec 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
diff --git a/Spigot-Server-Patches/0206-Add-system-property-to-disable-book-size-limits.patch b/Spigot-Server-Patches/0205-Add-system-property-to-disable-book-size-limits.patch
similarity index 96%
rename from Spigot-Server-Patches/0206-Add-system-property-to-disable-book-size-limits.patch
rename to Spigot-Server-Patches/0205-Add-system-property-to-disable-book-size-limits.patch
index 701c1eefa..5a17aeec9 100644
--- a/Spigot-Server-Patches/0206-Add-system-property-to-disable-book-size-limits.patch
+++ b/Spigot-Server-Patches/0205-Add-system-property-to-disable-book-size-limits.patch
@@ -1,4 +1,4 @@
-From d995b454625c7ed52ca0468fc759431baf3a865c Mon Sep 17 00:00:00 2001
+From 44354be7cfc0c47083784dceeac767eaaeabd525 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 13 May 2017 20:11:21 -0500
 Subject: [PATCH] Add system property to disable book size limits
@@ -11,7 +11,7 @@ to make books with as much data as they want. Do not use this without
 limiting incoming data from packets in some other way.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
-index 6fab8cd1..d8684eed 100644
+index 6fab8cd17..d8684eed4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
 @@ -40,6 +40,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
@@ -57,5 +57,5 @@ index 6fab8cd1..d8684eed 100644
              }
  
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0207-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/Spigot-Server-Patches/0206-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
similarity index 97%
rename from Spigot-Server-Patches/0207-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
rename to Spigot-Server-Patches/0206-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
index 92f3ee935..e24015f04 100644
--- a/Spigot-Server-Patches/0207-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
+++ b/Spigot-Server-Patches/0206-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
@@ -1,4 +1,4 @@
-From 3bc18a629d942293ad8e4325218d8fbe82dd0c17 Mon Sep 17 00:00:00 2001
+From 11ca5b04707c3fdbb26a30fdd80c74db844da97d 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
@@ -57,5 +57,5 @@ index 2367ff1f0..9c8828ebd 100644
  
          case STOP_SNEAKING:
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0208-Add-configuration-option-to-prevent-player-names-fro.patch b/Spigot-Server-Patches/0207-Add-configuration-option-to-prevent-player-names-fro.patch
similarity index 91%
rename from Spigot-Server-Patches/0208-Add-configuration-option-to-prevent-player-names-fro.patch
rename to Spigot-Server-Patches/0207-Add-configuration-option-to-prevent-player-names-fro.patch
index c5a17c102..cc02f50ac 100644
--- a/Spigot-Server-Patches/0208-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/Spigot-Server-Patches/0207-Add-configuration-option-to-prevent-player-names-fro.patch
@@ -1,4 +1,4 @@
-From 35e35258ca58ff40ddbf60dad977f02fbc1c5836 Mon Sep 17 00:00:00 2001
+From a5c6c730527c0d813e4f3095153a41b1f114e4ef Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Fri, 9 Jun 2017 07:24:34 -0700
 Subject: [PATCH] Add configuration option to prevent player names from being
@@ -6,7 +6,7 @@ Subject: [PATCH] Add configuration option to prevent player names from being
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 28917f63..f4b23703 100644
+index 28917f63d..f4b237034 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -265,4 +265,9 @@ public class PaperConfig {
@@ -20,7 +20,7 @@ index 28917f63..f4b23703 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 701c9067..50341ae6 100644
+index 701c90679..50341ae6e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1908,5 +1908,10 @@ public final class CraftServer implements Server {
@@ -35,5 +35,5 @@ index 701c9067..50341ae6 100644
      // Paper end
  }
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0209-Use-TerminalConsoleAppender-for-console-improvements.patch b/Spigot-Server-Patches/0208-Use-TerminalConsoleAppender-for-console-improvements.patch
similarity index 98%
rename from Spigot-Server-Patches/0209-Use-TerminalConsoleAppender-for-console-improvements.patch
rename to Spigot-Server-Patches/0208-Use-TerminalConsoleAppender-for-console-improvements.patch
index 6ce58ec9d..c34b57b94 100644
--- a/Spigot-Server-Patches/0209-Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/Spigot-Server-Patches/0208-Use-TerminalConsoleAppender-for-console-improvements.patch
@@ -1,4 +1,4 @@
-From 44b99b76f79bf4ae023cad46b0a213577a77deca Mon Sep 17 00:00:00 2001
+From 6d092c14a6e1204d23a92dbc3747487fd9620aea Mon Sep 17 00:00:00 2001
 From: Minecrell <dev@minecrell.net>
 Date: Fri, 9 Jun 2017 19:03:43 +0200
 Subject: [PATCH] Use TerminalConsoleAppender for console improvements
@@ -20,7 +20,7 @@ Other changes:
     configuration
 
 diff --git a/pom.xml b/pom.xml
-index 3e1b412b..42f2a99a 100644
+index 5d9f71b1d..da69bb93f 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -53,12 +53,6 @@
@@ -90,7 +90,7 @@ index 3e1b412b..42f2a99a 100644
                  <groupId>org.apache.maven.plugins</groupId>
 diff --git a/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java
 new file mode 100644
-index 00000000..685deaa0
+index 000000000..685deaa0e
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java
 @@ -0,0 +1,17 @@
@@ -113,7 +113,7 @@ index 00000000..685deaa0
 +}
 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 00000000..d5bc6149
+index 000000000..d5bc61490
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/console/TerminalHandler.java
 @@ -0,0 +1,60 @@
@@ -178,7 +178,7 @@ index 00000000..d5bc6149
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 8f2afcc3..b3f1aa99 100644
+index 8f2afcc32..b3f1aa999 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -73,7 +73,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -231,7 +231,7 @@ index 8f2afcc3..b3f1aa99 100644
          System.setOut(new PrintStream(new LoggerOutputStream(logger, Level.INFO), true));
          System.setErr(new PrintStream(new LoggerOutputStream(logger, Level.WARN), true));
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 908a5d27..e8bddc17 100644
+index 908a5d273..e8bddc171 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -42,7 +42,6 @@ import org.apache.commons.lang3.Validate;
@@ -290,7 +290,7 @@ index 908a5d27..e8bddc17 100644
  
      public boolean a(int i, String s) {
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index c67e152d..21973468 100644
+index ff01bbff5..311c0b86f 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 {
@@ -304,7 +304,7 @@ index c67e152d..21973468 100644
  
          this.k = new GameProfileBanList(PlayerList.a);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 50341ae6..fa831dc8 100644
+index 50341ae6e..fa831dc8f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -128,7 +128,6 @@ import io.netty.buffer.ByteBuf;
@@ -330,7 +330,7 @@ index 50341ae6..fa831dc8 100644
      @Override
      public PluginCommand getPluginCommand(String name) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index ec9508e9..d3d848f8 100644
+index ec9508e90..d3d848f8c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -14,7 +14,7 @@ import java.util.logging.Logger;
@@ -372,7 +372,7 @@ index ec9508e9..d3d848f8 100644
                  if (Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java b/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java
 deleted file mode 100644
-index 26a2fb89..00000000
+index 26a2fb894..000000000
 --- a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java
 +++ /dev/null
 @@ -1,74 +0,0 @@
@@ -451,7 +451,7 @@ index 26a2fb89..00000000
 -    }
 -}
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
-index 33e8ea02..1e3aae3b 100644
+index 33e8ea02c..1e3aae3b8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
 +++ b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
 @@ -8,17 +8,27 @@ import java.util.logging.Level;
@@ -530,7 +530,7 @@ index 33e8ea02..1e3aae3b 100644
      }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
-index a0cdd231..0a181288 100644
+index a0cdd2317..0a1812883 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
 @@ -19,7 +19,7 @@ public class ServerShutdownThread extends Thread {
@@ -544,7 +544,7 @@ index a0cdd231..0a181288 100644
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java b/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java
 deleted file mode 100644
-index b6409711..00000000
+index b64097113..000000000
 --- a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java
 +++ /dev/null
 @@ -1,54 +0,0 @@
@@ -603,7 +603,7 @@ index b6409711..00000000
 -    }
 -}
 diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index 5cee8f00..08b6bb7f 100644
+index 5cee8f00e..08b6bb7f9 100644
 --- a/src/main/resources/log4j2.xml
 +++ b/src/main/resources/log4j2.xml
 @@ -1,12 +1,11 @@
@@ -633,5 +633,5 @@ index 5cee8f00..08b6bb7f 100644
              <AppenderRef ref="TerminalConsole" level="info"/>
          </Root>
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0210-provide-a-configurable-option-to-disable-creeper-lin.patch b/Spigot-Server-Patches/0209-provide-a-configurable-option-to-disable-creeper-lin.patch
similarity index 96%
rename from Spigot-Server-Patches/0210-provide-a-configurable-option-to-disable-creeper-lin.patch
rename to Spigot-Server-Patches/0209-provide-a-configurable-option-to-disable-creeper-lin.patch
index 8a98f37f1..561fa7e75 100644
--- a/Spigot-Server-Patches/0210-provide-a-configurable-option-to-disable-creeper-lin.patch
+++ b/Spigot-Server-Patches/0209-provide-a-configurable-option-to-disable-creeper-lin.patch
@@ -1,4 +1,4 @@
-From 4c1ef862ec16c3b2186795b172f94ac7eca8c2fb Mon Sep 17 00:00:00 2001
+From 163dadb9811b049e78caefbeeb5bdf57235d0e35 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
@@ -34,5 +34,5 @@ index c872607fc..8098d4d9f 100644
  
              entityareaeffectcloud.setSource(this); // CraftBukkit
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0211-Item-canEntityPickup.patch b/Spigot-Server-Patches/0210-Item-canEntityPickup.patch
similarity index 92%
rename from Spigot-Server-Patches/0211-Item-canEntityPickup.patch
rename to Spigot-Server-Patches/0210-Item-canEntityPickup.patch
index 7efe4db0e..a0a52604a 100644
--- a/Spigot-Server-Patches/0211-Item-canEntityPickup.patch
+++ b/Spigot-Server-Patches/0210-Item-canEntityPickup.patch
@@ -1,11 +1,11 @@
-From 77dad6b547631f9f9d517ef2ef5f32010dbaa4c6 Mon Sep 17 00:00:00 2001
+From 6e8a4f5f1b65d1146871827983d0cec19b615db9 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 5 May 2017 03:57:17 -0500
 Subject: [PATCH] Item#canEntityPickup
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 5ea9f309..89e87836 100644
+index 5ea9f3097..89e878365 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -514,6 +514,12 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -22,7 +22,7 @@ index 5ea9f309..89e87836 100644
                      this.a(entityitem);
                  }
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index 6593fc63..99dbb139 100644
+index 6593fc633..99dbb1393 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -22,6 +22,7 @@ public class EntityItem extends Entity implements HopperPusher {
@@ -34,7 +34,7 @@ index 6593fc63..99dbb139 100644
      private String g;
      private String h;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
-index a17a537d..1df17f09 100644
+index a17a537d6..1df17f09b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 @@ -37,6 +37,16 @@ public class CraftItem extends CraftEntity implements Item {
@@ -55,5 +55,5 @@ index a17a537d..1df17f09 100644
      public String toString() {
          return "CraftItem";
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0212-PlayerPickupItemEvent-setFlyAtPlayer.patch b/Spigot-Server-Patches/0211-PlayerPickupItemEvent-setFlyAtPlayer.patch
similarity index 95%
rename from Spigot-Server-Patches/0212-PlayerPickupItemEvent-setFlyAtPlayer.patch
rename to Spigot-Server-Patches/0211-PlayerPickupItemEvent-setFlyAtPlayer.patch
index 8bde28023..23c751574 100644
--- a/Spigot-Server-Patches/0212-PlayerPickupItemEvent-setFlyAtPlayer.patch
+++ b/Spigot-Server-Patches/0211-PlayerPickupItemEvent-setFlyAtPlayer.patch
@@ -1,11 +1,11 @@
-From 10af08536a0e2608485ac574bdb218e28afa388a Mon Sep 17 00:00:00 2001
+From 1e8be13e9b43dfc3a65c2ee2ba9e58b01b415083 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 May 2017 06:26:09 -0500
 Subject: [PATCH] PlayerPickupItemEvent#setFlyAtPlayer
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index 99dbb139..ae4910b4 100644
+index 99dbb1393..ae4910b4b 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -332,6 +332,7 @@ public class EntityItem extends Entity implements HopperPusher {
@@ -44,5 +44,5 @@ index 99dbb139..ae4910b4 100644
                      this.die();
                      itemstack.setCount(i);
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0213-PlayerAttemptPickupItemEvent.patch b/Spigot-Server-Patches/0212-PlayerAttemptPickupItemEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0213-PlayerAttemptPickupItemEvent.patch
rename to Spigot-Server-Patches/0212-PlayerAttemptPickupItemEvent.patch
index 78c4428b6..27b84eca9 100644
--- a/Spigot-Server-Patches/0213-PlayerAttemptPickupItemEvent.patch
+++ b/Spigot-Server-Patches/0212-PlayerAttemptPickupItemEvent.patch
@@ -1,11 +1,11 @@
-From 72f3e8ddfdc74bd4ad75e00bd849a540ec6e2041 Mon Sep 17 00:00:00 2001
+From 71201da7cbe09745d06d37bf47bb1d23a1686249 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 11 Jun 2017 16:30:30 -0500
 Subject: [PATCH] PlayerAttemptPickupItemEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index ae4910b4..0b7fc327 100644
+index ae4910b4b..0b7fc327f 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -8,6 +8,7 @@ import org.apache.logging.log4j.Logger;
@@ -40,5 +40,5 @@ index ae4910b4..0b7fc327 100644
                  itemstack.setCount(canHold);
                  // Call legacy event
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0214-Add-UnknownCommandEvent.patch b/Spigot-Server-Patches/0213-Add-UnknownCommandEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0214-Add-UnknownCommandEvent.patch
rename to Spigot-Server-Patches/0213-Add-UnknownCommandEvent.patch
index c636a806c..392b4130c 100644
--- a/Spigot-Server-Patches/0214-Add-UnknownCommandEvent.patch
+++ b/Spigot-Server-Patches/0213-Add-UnknownCommandEvent.patch
@@ -1,11 +1,11 @@
-From e6e958afb06dc28ebe7b314e5e3c7ff83aa76419 Mon Sep 17 00:00:00 2001
+From dcf6d346b92839c6bdbb430995cc6217878faa4f Mon Sep 17 00:00:00 2001
 From: Sweepyoface <github@sweepy.pw>
 Date: Sat, 17 Jun 2017 18:48:21 -0400
 Subject: [PATCH] Add UnknownCommandEvent
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index fa831dc8..8d0a9e8c 100644
+index fa831dc8f..8d0a9e8ca 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -78,6 +78,7 @@ import org.bukkit.craftbukkit.util.Versioning;
@@ -32,5 +32,5 @@ index fa831dc8..8d0a9e8c 100644
          // Spigot end
  
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0215-Basic-PlayerProfile-API.patch b/Spigot-Server-Patches/0214-Basic-PlayerProfile-API.patch
similarity index 99%
rename from Spigot-Server-Patches/0215-Basic-PlayerProfile-API.patch
rename to Spigot-Server-Patches/0214-Basic-PlayerProfile-API.patch
index 132e7a4c7..fc3eee8da 100644
--- a/Spigot-Server-Patches/0215-Basic-PlayerProfile-API.patch
+++ b/Spigot-Server-Patches/0214-Basic-PlayerProfile-API.patch
@@ -1,4 +1,4 @@
-From 076030ea02becd520a1f7cd2e6f5156ec46f05d9 Mon Sep 17 00:00:00 2001
+From f150a017e1d30c84b820b3ade01ee7653d86b31d 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
@@ -252,5 +252,5 @@ index 8d0a9e8ca..f0ae65f08 100644
      // Paper end
  }
 -- 
-2.15.1
+2.16.1
 
diff --git a/Spigot-Server-Patches/0216-Shoulder-Entities-Release-API.patch b/Spigot-Server-Patches/0215-Shoulder-Entities-Release-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0216-Shoulder-Entities-Release-API.patch
rename to Spigot-Server-Patches/0215-Shoulder-Entities-Release-API.patch
index 793baac68..d082889a7 100644
--- a/Spigot-Server-Patches/0216-Shoulder-Entities-Release-API.patch
+++ b/Spigot-Server-Patches/0215-Shoulder-Entities-Release-API.patch
@@ -1,4 +1,4 @@
-From 85a5ecfdfe44de1d6fb8e82118c4f53a2c37f274 Mon Sep 17 00:00:00 2001
+From 8a2456fdcb912d83beea339b4614c3be96526570 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
@@ -99,5 +99,5 @@ index a54548f02..a0128426f 100644
      public org.bukkit.entity.Entity getShoulderEntityLeft() {
          if (!getHandle().getShoulderEntityLeft().isEmpty()) {
 -- 
-2.15.1
+2.16.1
 
diff --git a/Spigot-Server-Patches/0217-Profile-Lookup-Events.patch b/Spigot-Server-Patches/0216-Profile-Lookup-Events.patch
similarity index 98%
rename from Spigot-Server-Patches/0217-Profile-Lookup-Events.patch
rename to Spigot-Server-Patches/0216-Profile-Lookup-Events.patch
index 6e2b48527..d98751c49 100644
--- a/Spigot-Server-Patches/0217-Profile-Lookup-Events.patch
+++ b/Spigot-Server-Patches/0216-Profile-Lookup-Events.patch
@@ -1,4 +1,4 @@
-From b034c0418594d6a49949633b857a6f310f364604 Mon Sep 17 00:00:00 2001
+From c1c4f93d153d0a7aa37b28b7d937bae85bd19bdd 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
@@ -95,5 +95,5 @@ index e8bddc171..6159cf4c0 100644
              final DedicatedServer dedicatedserver = new DedicatedServer(options, DataConverterRegistry.a(), yggdrasilauthenticationservice, minecraftsessionservice, gameprofilerepository, usercache);
  
 -- 
-2.15.1
+2.16.1
 
diff --git a/Spigot-Server-Patches/0218-Block-player-logins-during-server-shutdown.patch b/Spigot-Server-Patches/0217-Block-player-logins-during-server-shutdown.patch
similarity index 93%
rename from Spigot-Server-Patches/0218-Block-player-logins-during-server-shutdown.patch
rename to Spigot-Server-Patches/0217-Block-player-logins-during-server-shutdown.patch
index 4f56e241c..57df0d2fb 100644
--- a/Spigot-Server-Patches/0218-Block-player-logins-during-server-shutdown.patch
+++ b/Spigot-Server-Patches/0217-Block-player-logins-during-server-shutdown.patch
@@ -1,4 +1,4 @@
-From 524a5d32964ce51dcc7f2be7df620f12abd9bfba Mon Sep 17 00:00:00 2001
+From 612c97646db6fb6ae5f1e04d0608999378901668 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 2 Jul 2017 21:35:56 -0500
 Subject: [PATCH] Block player logins during server shutdown
@@ -22,5 +22,5 @@ index 2158fcd32..c5434e6ba 100644
              this.b();
          } else if (this.g == LoginListener.EnumProtocolState.DELAY_ACCEPT) {
 -- 
-2.15.1
+2.16.1
 
diff --git a/Spigot-Server-Patches/0219-Entity-fromMobSpawner.patch b/Spigot-Server-Patches/0218-Entity-fromMobSpawner.patch
similarity index 96%
rename from Spigot-Server-Patches/0219-Entity-fromMobSpawner.patch
rename to Spigot-Server-Patches/0218-Entity-fromMobSpawner.patch
index 4a55b4158..ef27b062e 100644
--- a/Spigot-Server-Patches/0219-Entity-fromMobSpawner.patch
+++ b/Spigot-Server-Patches/0218-Entity-fromMobSpawner.patch
@@ -1,4 +1,4 @@
-From 77aee58bb758526b4f20f846587dc64ff4ae388f Mon Sep 17 00:00:00 2001
+From 10d8c92db84bf780ee8477240e3698004cbce563 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()
@@ -37,7 +37,7 @@ index f08f4ae56..1f3aabd01 100644
  
          } catch (Throwable throwable) {
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index 0562c6e34..06b064a78 100644
+index a5261d70b..1ed0def1e 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -107,6 +107,7 @@ public abstract class MobSpawnerAbstract {
@@ -64,5 +64,5 @@ index 8628cd5a2..6f06584ff 100644
      // Paper end
  }
 -- 
-2.15.1
+2.16.1
 
diff --git a/Spigot-Server-Patches/0220-Fix-Anvil-Level-sync-to-client.patch b/Spigot-Server-Patches/0219-Fix-Anvil-Level-sync-to-client.patch
similarity index 97%
rename from Spigot-Server-Patches/0220-Fix-Anvil-Level-sync-to-client.patch
rename to Spigot-Server-Patches/0219-Fix-Anvil-Level-sync-to-client.patch
index 9bc9281da..f1f6bb6ea 100644
--- a/Spigot-Server-Patches/0220-Fix-Anvil-Level-sync-to-client.patch
+++ b/Spigot-Server-Patches/0219-Fix-Anvil-Level-sync-to-client.patch
@@ -1,4 +1,4 @@
-From 446060228e3bb43ea6455909af7464a97850bad4 Mon Sep 17 00:00:00 2001
+From a1b3f0d72d6a2bcd932ca516d96d1075f5ed1f6a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 11 Jul 2017 23:17:57 -0400
 Subject: [PATCH] Fix Anvil Level sync to client
diff --git a/Spigot-Server-Patches/0221-Add-missing-coverages-for-getTileEntity-in-order-to-.patch b/Spigot-Server-Patches/0220-Add-missing-coverages-for-getTileEntity-in-order-to-.patch
similarity index 93%
rename from Spigot-Server-Patches/0221-Add-missing-coverages-for-getTileEntity-in-order-to-.patch
rename to Spigot-Server-Patches/0220-Add-missing-coverages-for-getTileEntity-in-order-to-.patch
index 2a1622a06..cba9e3e6a 100644
--- a/Spigot-Server-Patches/0221-Add-missing-coverages-for-getTileEntity-in-order-to-.patch
+++ b/Spigot-Server-Patches/0220-Add-missing-coverages-for-getTileEntity-in-order-to-.patch
@@ -1,4 +1,4 @@
-From d1223562d51d9ff7482bc83692980f4a38ec9900 Mon Sep 17 00:00:00 2001
+From 72dee9e52b8ac496dcfcd504ed65d40ce6dcf273 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
@@ -24,5 +24,5 @@ index 2ac5caaa4..c03be509f 100644
          return result;
      }
 -- 
-2.15.1
+2.16.1
 
diff --git a/Spigot-Server-Patches/0222-Allow-Changing-of-Player-Sample-in-ServerListPingEve.patch b/Spigot-Server-Patches/0221-Allow-Changing-of-Player-Sample-in-ServerListPingEve.patch
similarity index 97%
rename from Spigot-Server-Patches/0222-Allow-Changing-of-Player-Sample-in-ServerListPingEve.patch
rename to Spigot-Server-Patches/0221-Allow-Changing-of-Player-Sample-in-ServerListPingEve.patch
index 051cf9a65..d0bec2343 100644
--- a/Spigot-Server-Patches/0222-Allow-Changing-of-Player-Sample-in-ServerListPingEve.patch
+++ b/Spigot-Server-Patches/0221-Allow-Changing-of-Player-Sample-in-ServerListPingEve.patch
@@ -1,4 +1,4 @@
-From 0b99c5bb088b5a88f180704eb53797a34bac74c3 Mon Sep 17 00:00:00 2001
+From 6fd4e6faec7bd63098f83384d6edec0341a85050 Mon Sep 17 00:00:00 2001
 From: willies952002 <admin@domnian.com>
 Date: Fri, 5 May 2017 18:59:22 -0400
 Subject: [PATCH] Allow Changing of Player Sample in ServerListPingEvent
@@ -64,5 +64,5 @@ index 313bb0007..45d6984f7 100644
              playerSample.a(profiles.toArray(new GameProfile[profiles.size()]));
  
 -- 
-2.15.1
+2.16.1
 
diff --git a/Spigot-Server-Patches/0223-Improve-the-Saddle-API-for-Horses.patch b/Spigot-Server-Patches/0222-Improve-the-Saddle-API-for-Horses.patch
similarity index 97%
rename from Spigot-Server-Patches/0223-Improve-the-Saddle-API-for-Horses.patch
rename to Spigot-Server-Patches/0222-Improve-the-Saddle-API-for-Horses.patch
index a222e1a31..519b05b6b 100644
--- a/Spigot-Server-Patches/0223-Improve-the-Saddle-API-for-Horses.patch
+++ b/Spigot-Server-Patches/0222-Improve-the-Saddle-API-for-Horses.patch
@@ -1,4 +1,4 @@
-From 3f12b606939ebb9cd6e9221474e59baa4795f1c2 Mon Sep 17 00:00:00 2001
+From 28c130aba2b5bb09b6f5fb05bd3fd8f433f97e4f 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/0224-Implement-ensureServerConversions-API.patch b/Spigot-Server-Patches/0223-Implement-ensureServerConversions-API.patch
similarity index 93%
rename from Spigot-Server-Patches/0224-Implement-ensureServerConversions-API.patch
rename to Spigot-Server-Patches/0223-Implement-ensureServerConversions-API.patch
index 3abc403f8..74ae12d99 100644
--- a/Spigot-Server-Patches/0224-Implement-ensureServerConversions-API.patch
+++ b/Spigot-Server-Patches/0223-Implement-ensureServerConversions-API.patch
@@ -1,4 +1,4 @@
-From aae8be84bd2b26b5a192bd5f1b6cdc2eb220d051 Mon Sep 17 00:00:00 2001
+From 1c57bc166a4c5abdc981ac6b43a6763494ce0524 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
@@ -23,5 +23,5 @@ index 49ebad22e..eb6987338 100644
 +    // Paper end
  }
 -- 
-2.15.1
+2.16.1
 
diff --git a/Spigot-Server-Patches/0225-Implement-getI18NDisplayName.patch b/Spigot-Server-Patches/0224-Implement-getI18NDisplayName.patch
similarity index 94%
rename from Spigot-Server-Patches/0225-Implement-getI18NDisplayName.patch
rename to Spigot-Server-Patches/0224-Implement-getI18NDisplayName.patch
index ff9d5bb71..89176e91e 100644
--- a/Spigot-Server-Patches/0225-Implement-getI18NDisplayName.patch
+++ b/Spigot-Server-Patches/0224-Implement-getI18NDisplayName.patch
@@ -1,4 +1,4 @@
-From 64d5c620752b7798dd9e34beabd74cd35a563536 Mon Sep 17 00:00:00 2001
+From 1148ed97aacf2627d0595c0b42b34c28dc80123f 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
@@ -31,5 +31,5 @@ index eb6987338..c2f26577c 100644
      // Paper end
  }
 -- 
-2.15.1
+2.16.1
 
diff --git a/Spigot-Server-Patches/0226-GH-806-Respect-saving-disabled-before-unloading-all-.patch b/Spigot-Server-Patches/0225-GH-806-Respect-saving-disabled-before-unloading-all-.patch
similarity index 93%
rename from Spigot-Server-Patches/0226-GH-806-Respect-saving-disabled-before-unloading-all-.patch
rename to Spigot-Server-Patches/0225-GH-806-Respect-saving-disabled-before-unloading-all-.patch
index a876971d6..357b606fd 100644
--- a/Spigot-Server-Patches/0226-GH-806-Respect-saving-disabled-before-unloading-all-.patch
+++ b/Spigot-Server-Patches/0225-GH-806-Respect-saving-disabled-before-unloading-all-.patch
@@ -1,4 +1,4 @@
-From 7583b605421861b80bd88300dca7ec8e6795143a Mon Sep 17 00:00:00 2001
+From 1e77f009173654cde9c436afbb9481b4c2e558a3 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
@@ -22,5 +22,5 @@ index 0b10f1684..4af557321 100644
              }
              } // Paper timing
 -- 
-2.15.1
+2.16.1
 
diff --git a/Spigot-Server-Patches/0227-ProfileWhitelistVerifyEvent.patch b/Spigot-Server-Patches/0226-ProfileWhitelistVerifyEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0227-ProfileWhitelistVerifyEvent.patch
rename to Spigot-Server-Patches/0226-ProfileWhitelistVerifyEvent.patch
index 2ea31b9c4..b73abefeb 100644
--- a/Spigot-Server-Patches/0227-ProfileWhitelistVerifyEvent.patch
+++ b/Spigot-Server-Patches/0226-ProfileWhitelistVerifyEvent.patch
@@ -1,4 +1,4 @@
-From 7fdb4afbccad8dbe17271f9620764fec0bbb06b0 Mon Sep 17 00:00:00 2001
+From 520cba43a16a37b21121f33a7dab1d515f249036 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 3 Jul 2017 18:11:10 -0500
 Subject: [PATCH] ProfileWhitelistVerifyEvent
diff --git a/Spigot-Server-Patches/0228-Fix-this-stupid-bullshit.patch b/Spigot-Server-Patches/0227-Fix-this-stupid-bullshit.patch
similarity index 95%
rename from Spigot-Server-Patches/0228-Fix-this-stupid-bullshit.patch
rename to Spigot-Server-Patches/0227-Fix-this-stupid-bullshit.patch
index 19c52c2ee..d8ab028b7 100644
--- a/Spigot-Server-Patches/0228-Fix-this-stupid-bullshit.patch
+++ b/Spigot-Server-Patches/0227-Fix-this-stupid-bullshit.patch
@@ -1,4 +1,4 @@
-From f8d03b8ecb61934d691a2f7f4a4da62e00df9671 Mon Sep 17 00:00:00 2001
+From 4f378a2e90a687b23096f2e62d281e77176b4298 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
@@ -29,5 +29,5 @@ index d3d848f8c..21628e196 100644
                  }
  
 -- 
-2.15.1
+2.16.1
 
diff --git a/Spigot-Server-Patches/0229-Ocelot-despawns-should-honor-nametags-and-leash.patch b/Spigot-Server-Patches/0228-Ocelot-despawns-should-honor-nametags-and-leash.patch
similarity index 92%
rename from Spigot-Server-Patches/0229-Ocelot-despawns-should-honor-nametags-and-leash.patch
rename to Spigot-Server-Patches/0228-Ocelot-despawns-should-honor-nametags-and-leash.patch
index a26c50960..0a7f99df9 100644
--- a/Spigot-Server-Patches/0229-Ocelot-despawns-should-honor-nametags-and-leash.patch
+++ b/Spigot-Server-Patches/0228-Ocelot-despawns-should-honor-nametags-and-leash.patch
@@ -1,4 +1,4 @@
-From 6e332112aa0268917c09e440ff581f07038d1763 Mon Sep 17 00:00:00 2001
+From 86801091a4d5d93d6598509fe1f11f9cb198d62e Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 31 Jul 2017 01:54:40 -0500
 Subject: [PATCH] Ocelot despawns should honor nametags and leash
@@ -18,5 +18,5 @@ index 5a76821ea..858bbef5b 100644
  
      protected void initAttributes() {
 -- 
-2.15.1
+2.16.1
 
diff --git a/Spigot-Server-Patches/0230-Reset-spawner-timer-when-spawner-event-is-cancelled.patch b/Spigot-Server-Patches/0229-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
similarity index 91%
rename from Spigot-Server-Patches/0230-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
rename to Spigot-Server-Patches/0229-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
index 9969dffb8..beb88b0f7 100644
--- a/Spigot-Server-Patches/0230-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
+++ b/Spigot-Server-Patches/0229-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
@@ -1,11 +1,11 @@
-From 8157ea3db7e48a39c5810f391a16f25d81f7e5eb Mon Sep 17 00:00:00 2001
+From f78d0fd199f662df9bf4295a04a473f0ac152b3e Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 31 Jul 2017 01:45:19 -0500
 Subject: [PATCH] Reset spawner timer when spawner event is cancelled
 
 
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index 06b064a78..c29df55fa 100644
+index 1ed0def1e..87fe4775f 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -113,6 +113,9 @@ public abstract class MobSpawnerAbstract {
@@ -28,5 +28,5 @@ index 06b064a78..c29df55fa 100644
                  }
  
 -- 
-2.15.1
+2.16.1
 
diff --git a/Spigot-Server-Patches/0231-MC-94186-Fix-dragon-egg-falling-in-lazy-chunks.patch b/Spigot-Server-Patches/0230-MC-94186-Fix-dragon-egg-falling-in-lazy-chunks.patch
similarity index 93%
rename from Spigot-Server-Patches/0231-MC-94186-Fix-dragon-egg-falling-in-lazy-chunks.patch
rename to Spigot-Server-Patches/0230-MC-94186-Fix-dragon-egg-falling-in-lazy-chunks.patch
index 8422382d0..cfad2db26 100644
--- a/Spigot-Server-Patches/0231-MC-94186-Fix-dragon-egg-falling-in-lazy-chunks.patch
+++ b/Spigot-Server-Patches/0230-MC-94186-Fix-dragon-egg-falling-in-lazy-chunks.patch
@@ -1,4 +1,4 @@
-From 49c70f3fff8b7fbb9c3525b210359b1323eed49f Mon Sep 17 00:00:00 2001
+From 5868a14449bc00fb1d1c5709425f34d6e06dc9ce Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Fri, 11 Aug 2017 03:29:26 +0200
 Subject: [PATCH] MC-94186 Fix dragon egg falling in lazy chunks
@@ -21,5 +21,5 @@ index ce186f825..291342c90 100644
              }
  
 -- 
-2.15.1
+2.16.1
 
diff --git a/Spigot-Server-Patches/0232-Fix-MC-117075-TE-Unload-Lag-Spike.patch b/Spigot-Server-Patches/0231-Fix-MC-117075-TE-Unload-Lag-Spike.patch
similarity index 94%
rename from Spigot-Server-Patches/0232-Fix-MC-117075-TE-Unload-Lag-Spike.patch
rename to Spigot-Server-Patches/0231-Fix-MC-117075-TE-Unload-Lag-Spike.patch
index 0808c4cb8..46a753554 100644
--- a/Spigot-Server-Patches/0232-Fix-MC-117075-TE-Unload-Lag-Spike.patch
+++ b/Spigot-Server-Patches/0231-Fix-MC-117075-TE-Unload-Lag-Spike.patch
@@ -1,4 +1,4 @@
-From ed3c41e1569e1bf2ccb034d9492a8e0675781bd1 Mon Sep 17 00:00:00 2001
+From 0c11302422d14d2cc64b9ed3a16ada9be0ba95a5 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
@@ -22,5 +22,5 @@ index b0139fff6..00513d02c 100644
              this.tileEntityListUnload.clear();
          }
 -- 
-2.15.1
+2.16.1
 
diff --git a/Spigot-Server-Patches/0233-Allow-specifying-a-custom-authentication-servers-dow.patch b/Spigot-Server-Patches/0232-Allow-specifying-a-custom-authentication-servers-dow.patch
similarity index 97%
rename from Spigot-Server-Patches/0233-Allow-specifying-a-custom-authentication-servers-dow.patch
rename to Spigot-Server-Patches/0232-Allow-specifying-a-custom-authentication-servers-dow.patch
index 6bcd46abd..16b569fa3 100644
--- a/Spigot-Server-Patches/0233-Allow-specifying-a-custom-authentication-servers-dow.patch
+++ b/Spigot-Server-Patches/0232-Allow-specifying-a-custom-authentication-servers-dow.patch
@@ -1,4 +1,4 @@
-From 4dde9263200c043ee84d1f97674bfccb42a3d38e Mon Sep 17 00:00:00 2001
+From bbb692b7756b3d884e75521c79edcda46e5ae5cc 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
@@ -42,5 +42,5 @@ index c5434e6ba..75df92836 100644
                              LoginListener.c.error("Couldn\'t verify username because servers are unavailable");
                          }
 -- 
-2.15.1
+2.16.1
 
diff --git a/Spigot-Server-Patches/0234-LivingEntity-setKiller.patch b/Spigot-Server-Patches/0233-LivingEntity-setKiller.patch
similarity index 91%
rename from Spigot-Server-Patches/0234-LivingEntity-setKiller.patch
rename to Spigot-Server-Patches/0233-LivingEntity-setKiller.patch
index a3f108895..fee1798c7 100644
--- a/Spigot-Server-Patches/0234-LivingEntity-setKiller.patch
+++ b/Spigot-Server-Patches/0233-LivingEntity-setKiller.patch
@@ -1,11 +1,11 @@
-From a73f221ae8da67088809289e20070d9abda308ac Mon Sep 17 00:00:00 2001
+From d05d7cc2a275ac2b40c6906f80350ceaf0e306f4 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 31 Jul 2017 01:49:48 -0500
 Subject: [PATCH] LivingEntity#setKiller
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index b9e106031..413bab0c9 100644
+index d4d51688c..a7b076377 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -252,6 +252,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -26,5 +26,5 @@ index b9e106031..413bab0c9 100644
          return addPotionEffect(effect, false);
      }
 -- 
-2.15.1
+2.16.1
 
diff --git a/Spigot-Server-Patches/0235-Avoid-NPE-during-CraftBlockEntityState-load.patch b/Spigot-Server-Patches/0234-Avoid-NPE-during-CraftBlockEntityState-load.patch
similarity index 95%
rename from Spigot-Server-Patches/0235-Avoid-NPE-during-CraftBlockEntityState-load.patch
rename to Spigot-Server-Patches/0234-Avoid-NPE-during-CraftBlockEntityState-load.patch
index e1033eb9b..9aba62ae7 100644
--- a/Spigot-Server-Patches/0235-Avoid-NPE-during-CraftBlockEntityState-load.patch
+++ b/Spigot-Server-Patches/0234-Avoid-NPE-during-CraftBlockEntityState-load.patch
@@ -1,4 +1,4 @@
-From 85d259828c414dd09689aa55984d663a59bc2423 Mon Sep 17 00:00:00 2001
+From 8d120f57374eefc72809cd7bdfaa6d1909e7723b Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Mon, 18 Sep 2017 13:38:40 -0700
 Subject: [PATCH] Avoid NPE during CraftBlockEntityState load
@@ -38,5 +38,5 @@ index 266f87d7f..22dcaea72 100644
      }
  
 -- 
-2.15.1
+2.16.1
 
diff --git a/Spigot-Server-Patches/0236-Anti-Xray.patch b/Spigot-Server-Patches/0235-Anti-Xray.patch
similarity index 99%
rename from Spigot-Server-Patches/0236-Anti-Xray.patch
rename to Spigot-Server-Patches/0235-Anti-Xray.patch
index a23ec81d9..95d08f4ac 100644
--- a/Spigot-Server-Patches/0236-Anti-Xray.patch
+++ b/Spigot-Server-Patches/0235-Anti-Xray.patch
@@ -1,4 +1,4 @@
-From d4de3b758fa744e0dd4fffbc99ef29ca9654a37f Mon Sep 17 00:00:00 2001
+From 553c8b95deacada0571d9e4c8a00c696bbdfc782 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
@@ -1579,5 +1579,5 @@ index 9942f0c75..2da6edc63 100644
                          }
                      }
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0237-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch b/Spigot-Server-Patches/0236-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
similarity index 94%
rename from Spigot-Server-Patches/0237-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
rename to Spigot-Server-Patches/0236-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
index d98a5fa9e..8c5f12867 100644
--- a/Spigot-Server-Patches/0237-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
+++ b/Spigot-Server-Patches/0236-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
@@ -1,4 +1,4 @@
-From 5780ce5c1c883e145098b9357bb43ecfcd836df2 Mon Sep 17 00:00:00 2001
+From 66c9cdfd056ed6789980d4cca7245efa0a8ad9ce Mon Sep 17 00:00:00 2001
 From: Minecrell <dev@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 42f2a99ab..9ce02242e 100644
+index da69bb93f..7734d84e8 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -97,6 +97,13 @@
@@ -47,5 +47,5 @@ index b3f1aa999..854455711 100644
  
          thread.setDaemon(true);
 -- 
-2.15.1
+2.16.1
 
diff --git a/Spigot-Server-Patches/0238-Handle-plugin-prefixes-using-Log4J-configuration.patch b/Spigot-Server-Patches/0237-Handle-plugin-prefixes-using-Log4J-configuration.patch
similarity index 97%
rename from Spigot-Server-Patches/0238-Handle-plugin-prefixes-using-Log4J-configuration.patch
rename to Spigot-Server-Patches/0237-Handle-plugin-prefixes-using-Log4J-configuration.patch
index e57ce8e66..b5258b4a8 100644
--- a/Spigot-Server-Patches/0238-Handle-plugin-prefixes-using-Log4J-configuration.patch
+++ b/Spigot-Server-Patches/0237-Handle-plugin-prefixes-using-Log4J-configuration.patch
@@ -1,4 +1,4 @@
-From ec9f527494698d241d2d3c0f1383cd5a6fed1c68 Mon Sep 17 00:00:00 2001
+From e5dc209cabc90dbdc9824472d8888176fb1f9234 Mon Sep 17 00:00:00 2001
 From: Minecrell <dev@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 9ce02242e..16baff46d 100644
+index 7734d84e8..28976dae8 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -94,7 +94,7 @@
@@ -70,5 +70,5 @@ index 08b6bb7f9..9f8334376 100644
                  <TimeBasedTriggeringPolicy />
                  <OnStartupTriggeringPolicy />
 -- 
-2.15.1
+2.16.1
 
diff --git a/Spigot-Server-Patches/0239-Include-Log4J2-SLF4J-implementation.patch b/Spigot-Server-Patches/0238-Include-Log4J2-SLF4J-implementation.patch
similarity index 86%
rename from Spigot-Server-Patches/0239-Include-Log4J2-SLF4J-implementation.patch
rename to Spigot-Server-Patches/0238-Include-Log4J2-SLF4J-implementation.patch
index 7e4ac48ba..52f5d0d87 100644
--- a/Spigot-Server-Patches/0239-Include-Log4J2-SLF4J-implementation.patch
+++ b/Spigot-Server-Patches/0238-Include-Log4J2-SLF4J-implementation.patch
@@ -1,11 +1,11 @@
-From 5c396d9b5ae99588482dc5c9991bfedc4974dbfd Mon Sep 17 00:00:00 2001
+From fa8a701f15d3ce39f3c7af65000fa2ca2b9a6475 Mon Sep 17 00:00:00 2001
 From: Minecrell <dev@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 16baff46d..0296c13d5 100644
+index 28976dae8..ffa9f5a97 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -98,6 +98,12 @@
@@ -22,5 +22,5 @@ index 16baff46d..0296c13d5 100644
              <groupId>org.apache.logging.log4j</groupId>
              <artifactId>log4j-iostreams</artifactId>
 -- 
-2.15.1
+2.16.1
 
diff --git a/Spigot-Server-Patches/0240-Disable-logger-prefix-for-various-plugins-bypassing-.patch b/Spigot-Server-Patches/0239-Disable-logger-prefix-for-various-plugins-bypassing-.patch
similarity index 96%
rename from Spigot-Server-Patches/0240-Disable-logger-prefix-for-various-plugins-bypassing-.patch
rename to Spigot-Server-Patches/0239-Disable-logger-prefix-for-various-plugins-bypassing-.patch
index 1a84da45d..676798fe1 100644
--- a/Spigot-Server-Patches/0240-Disable-logger-prefix-for-various-plugins-bypassing-.patch
+++ b/Spigot-Server-Patches/0239-Disable-logger-prefix-for-various-plugins-bypassing-.patch
@@ -1,4 +1,4 @@
-From 6b7045636e1f88e97515fa5d543f4a409320f3ed Mon Sep 17 00:00:00 2001
+From 0685c29429ea9669da418dc14d7d0ff9817f29ad Mon Sep 17 00:00:00 2001
 From: Minecrell <dev@minecrell.net>
 Date: Sat, 23 Sep 2017 21:07:20 +0200
 Subject: [PATCH] Disable logger prefix for various plugins bypassing the
@@ -35,5 +35,5 @@ index 9f8334376..6711e6dff 100644
                  </LoggerNamePatternSelector>
              </PatternLayout>
 -- 
-2.15.1
+2.16.1
 
diff --git a/Spigot-Server-Patches/0241-Add-PlayerJumpEvent.patch b/Spigot-Server-Patches/0240-Add-PlayerJumpEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0241-Add-PlayerJumpEvent.patch
rename to Spigot-Server-Patches/0240-Add-PlayerJumpEvent.patch
index f124dddc3..172ff8daa 100644
--- a/Spigot-Server-Patches/0241-Add-PlayerJumpEvent.patch
+++ b/Spigot-Server-Patches/0240-Add-PlayerJumpEvent.patch
@@ -1,4 +1,4 @@
-From 309f155e98051c570eac0d5115ed058577b6341d Mon Sep 17 00:00:00 2001
+From ec9b9999f5abe31e1c8661e419d1e9fd6b747311 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
@@ -65,5 +65,5 @@ index 9c8828ebd..cc58a4a93 100644
  
                              this.player.move(EnumMoveType.PLAYER, d7, d8, d9);
 -- 
-2.15.1
+2.16.1
 
diff --git a/Spigot-Server-Patches/0242-handle-PacketPlayInKeepAlive-async.patch b/Spigot-Server-Patches/0241-handle-PacketPlayInKeepAlive-async.patch
similarity index 96%
rename from Spigot-Server-Patches/0242-handle-PacketPlayInKeepAlive-async.patch
rename to Spigot-Server-Patches/0241-handle-PacketPlayInKeepAlive-async.patch
index ebf53bea1..c5236f6e9 100644
--- a/Spigot-Server-Patches/0242-handle-PacketPlayInKeepAlive-async.patch
+++ b/Spigot-Server-Patches/0241-handle-PacketPlayInKeepAlive-async.patch
@@ -1,4 +1,4 @@
-From 2fa4d2c6ca51041f47c8f2e2ce583aa67db30ae5 Mon Sep 17 00:00:00 2001
+From 8739276298bf59af5c9a36049733aec513ce659e 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
@@ -42,5 +42,5 @@ index cc58a4a93..a92bf8967 100644
  
      }
 -- 
-2.15.1
+2.16.1
 
diff --git a/Spigot-Server-Patches/0243-Expose-client-protocol-version-and-virtual-host.patch b/Spigot-Server-Patches/0242-Expose-client-protocol-version-and-virtual-host.patch
similarity index 98%
rename from Spigot-Server-Patches/0243-Expose-client-protocol-version-and-virtual-host.patch
rename to Spigot-Server-Patches/0242-Expose-client-protocol-version-and-virtual-host.patch
index bc2110046..4fcd90ef3 100644
--- a/Spigot-Server-Patches/0243-Expose-client-protocol-version-and-virtual-host.patch
+++ b/Spigot-Server-Patches/0242-Expose-client-protocol-version-and-virtual-host.patch
@@ -1,4 +1,4 @@
-From fefcfe0e575d6bd04ac9467445a027e783198e6c Mon Sep 17 00:00:00 2001
+From f8c2ab7e5d8fe885f51cf9f6311fcff36a125884 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Tue, 10 Oct 2017 18:45:20 +0200
 Subject: [PATCH] Expose client protocol version and virtual host
diff --git a/Spigot-Server-Patches/0244-revert-serverside-behavior-of-keepalives.patch b/Spigot-Server-Patches/0243-revert-serverside-behavior-of-keepalives.patch
similarity index 98%
rename from Spigot-Server-Patches/0244-revert-serverside-behavior-of-keepalives.patch
rename to Spigot-Server-Patches/0243-revert-serverside-behavior-of-keepalives.patch
index 9108a8995..4a1867822 100644
--- a/Spigot-Server-Patches/0244-revert-serverside-behavior-of-keepalives.patch
+++ b/Spigot-Server-Patches/0243-revert-serverside-behavior-of-keepalives.patch
@@ -1,4 +1,4 @@
-From 02abc033533f70ef3165a97bfda3f5c2fa58633a Mon Sep 17 00:00:00 2001
+From 17fb64da01acd903a06fc671490a5f378e9b2d99 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
@@ -65,5 +65,5 @@ index a92bf8967..d0ab87d0f 100644
          this.minecraftServer.methodProfiler.b();
          // CraftBukkit start
 -- 
-2.15.1
+2.16.1
 
diff --git a/Spigot-Server-Patches/0245-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch b/Spigot-Server-Patches/0244-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch
similarity index 94%
rename from Spigot-Server-Patches/0245-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch
rename to Spigot-Server-Patches/0244-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch
index 21340d311..bf9c4aab4 100644
--- a/Spigot-Server-Patches/0245-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch
+++ b/Spigot-Server-Patches/0244-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch
@@ -1,4 +1,4 @@
-From 198db96cdd97f7cc470172cb2a7ca1493e779a74 Mon Sep 17 00:00:00 2001
+From bddc88554209cb2f0a14e9539f07da19fa11ad18 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Fri, 20 Oct 2017 04:33:45 +0200
 Subject: [PATCH] Replace HashSet with fastutil's ObjectOpenHashSet in
@@ -26,5 +26,5 @@ index 80a5c29f3..cd864c404 100644
  
      public HashTreeSet() {
 -- 
-2.15.1
+2.16.1
 
diff --git a/Spigot-Server-Patches/0246-Send-attack-SoundEffects-only-to-players-who-can-see.patch b/Spigot-Server-Patches/0245-Send-attack-SoundEffects-only-to-players-who-can-see.patch
similarity index 98%
rename from Spigot-Server-Patches/0246-Send-attack-SoundEffects-only-to-players-who-can-see.patch
rename to Spigot-Server-Patches/0245-Send-attack-SoundEffects-only-to-players-who-can-see.patch
index 78bae99a2..56558d923 100644
--- a/Spigot-Server-Patches/0246-Send-attack-SoundEffects-only-to-players-who-can-see.patch
+++ b/Spigot-Server-Patches/0245-Send-attack-SoundEffects-only-to-players-who-can-see.patch
@@ -1,4 +1,4 @@
-From a66b464f8cf90c2a6fbffc33dc3392c66c3d6b9e Mon Sep 17 00:00:00 2001
+From d1969c3af9e747f85d2feb4a9b1ba58175c4980e 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
@@ -89,5 +89,5 @@ index 592e5b3ba..d45cbf2f6 100644
          for (int i = 0; i < this.u.size(); ++i) {
              ((IWorldAccess) this.u.get(i)).a(entityhuman, soundeffect, soundcategory, d0, d1, d2, f, f1);
 -- 
-2.15.1
+2.16.1
 
diff --git a/Spigot-Server-Patches/0247-Option-for-maximum-exp-value-when-merging-orbs.patch b/Spigot-Server-Patches/0246-Option-for-maximum-exp-value-when-merging-orbs.patch
similarity index 97%
rename from Spigot-Server-Patches/0247-Option-for-maximum-exp-value-when-merging-orbs.patch
rename to Spigot-Server-Patches/0246-Option-for-maximum-exp-value-when-merging-orbs.patch
index 4ce461b31..5b19e6d1d 100644
--- a/Spigot-Server-Patches/0247-Option-for-maximum-exp-value-when-merging-orbs.patch
+++ b/Spigot-Server-Patches/0246-Option-for-maximum-exp-value-when-merging-orbs.patch
@@ -1,4 +1,4 @@
-From 39f9e2d12137934d003591cb3701529096191e97 Mon Sep 17 00:00:00 2001
+From f92d7abd16d122577360574d18179ae2442a556c 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
@@ -56,5 +56,5 @@ index d45cbf2f6..0193364d2 100644
          } // Spigot end
  
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0248-Add-PlayerArmorChangeEvent.patch b/Spigot-Server-Patches/0247-Add-PlayerArmorChangeEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0248-Add-PlayerArmorChangeEvent.patch
rename to Spigot-Server-Patches/0247-Add-PlayerArmorChangeEvent.patch
index 9f98bc92e..cf681fecb 100644
--- a/Spigot-Server-Patches/0248-Add-PlayerArmorChangeEvent.patch
+++ b/Spigot-Server-Patches/0247-Add-PlayerArmorChangeEvent.patch
@@ -1,11 +1,11 @@
-From d55f00f8d2dce4264c41e41bbbeb8e4882527a1e Mon Sep 17 00:00:00 2001
+From 2ae8791e2ee4b302d1878c24e8cc369d1d0e6c74 Mon Sep 17 00:00:00 2001
 From: pkt77 <parkerkt77@gmail.com>
 Date: Fri, 10 Nov 2017 23:46:34 -0500
 Subject: [PATCH] Add PlayerArmorChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 839008ad7..c0abea96e 100644
+index 4e7cf5de6..b65b88586 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1,5 +1,6 @@
@@ -42,5 +42,5 @@ index cdf3a3ba4..be5d0bf89 100644
          return this.g;
      }
 -- 
-2.15.1
+2.16.1
 
diff --git a/Spigot-Server-Patches/0249-Improve-Structures-Checking.patch b/Spigot-Server-Patches/0248-Improve-Structures-Checking.patch
similarity index 99%
rename from Spigot-Server-Patches/0249-Improve-Structures-Checking.patch
rename to Spigot-Server-Patches/0248-Improve-Structures-Checking.patch
index af350623d..3b67cacdf 100644
--- a/Spigot-Server-Patches/0249-Improve-Structures-Checking.patch
+++ b/Spigot-Server-Patches/0248-Improve-Structures-Checking.patch
@@ -1,4 +1,4 @@
-From 8a37f43707be04249d2965202bb0cb4b5c3d860f Mon Sep 17 00:00:00 2001
+From b9120a4c1f05660508e9dd62ea9eb01f01be3c79 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 11 Nov 2017 17:57:39 -0500
 Subject: [PATCH] Improve Structures Checking
@@ -195,5 +195,5 @@ index b6abc74e0..f9bb953d0 100644
      }
  
 -- 
-2.15.1
+2.16.1
 
diff --git a/Spigot-Server-Patches/0250-Prevent-logins-from-being-processed-when-the-player-.patch b/Spigot-Server-Patches/0249-Prevent-logins-from-being-processed-when-the-player-.patch
similarity index 93%
rename from Spigot-Server-Patches/0250-Prevent-logins-from-being-processed-when-the-player-.patch
rename to Spigot-Server-Patches/0249-Prevent-logins-from-being-processed-when-the-player-.patch
index d63008ac5..bffbdee3a 100644
--- a/Spigot-Server-Patches/0250-Prevent-logins-from-being-processed-when-the-player-.patch
+++ b/Spigot-Server-Patches/0249-Prevent-logins-from-being-processed-when-the-player-.patch
@@ -1,4 +1,4 @@
-From 0d510a6bc971e920c01ed2277923d11bbfd3ab3f Mon Sep 17 00:00:00 2001
+From ad2a0a4d78e9fda00fe73c30f7a662ec98770c80 Mon Sep 17 00:00:00 2001
 From: killme <killme-git@ibts.me>
 Date: Sun, 12 Nov 2017 19:40:01 +0100
 Subject: [PATCH] Prevent logins from being processed when the player has
@@ -23,5 +23,5 @@ index 75df92836..eaac25dc3 100644
              EntityPlayer entityplayer = this.server.getPlayerList().a(this.i.getId());
  
 -- 
-2.15.1
+2.16.1
 
diff --git a/Spigot-Server-Patches/0251-use-CB-BlockState-implementations-for-captured-block.patch b/Spigot-Server-Patches/0250-use-CB-BlockState-implementations-for-captured-block.patch
similarity index 96%
rename from Spigot-Server-Patches/0251-use-CB-BlockState-implementations-for-captured-block.patch
rename to Spigot-Server-Patches/0250-use-CB-BlockState-implementations-for-captured-block.patch
index d59373e60..6857801ca 100644
--- a/Spigot-Server-Patches/0251-use-CB-BlockState-implementations-for-captured-block.patch
+++ b/Spigot-Server-Patches/0250-use-CB-BlockState-implementations-for-captured-block.patch
@@ -1,4 +1,4 @@
-From cb8299e55aeab7e3634c7d4f334e0e989f2a72bc Mon Sep 17 00:00:00 2001
+From 9ad5c79dafdeeaaa2a297f2f85e90d31c5fd4fd5 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
@@ -32,5 +32,5 @@ index 0193364d2..e4502551b 100644
              }
              // CraftBukkit end
 -- 
-2.15.1
+2.16.1
 
diff --git a/Spigot-Server-Patches/0252-API-to-get-a-BlockState-without-a-snapshot.patch b/Spigot-Server-Patches/0251-API-to-get-a-BlockState-without-a-snapshot.patch
similarity index 94%
rename from Spigot-Server-Patches/0252-API-to-get-a-BlockState-without-a-snapshot.patch
rename to Spigot-Server-Patches/0251-API-to-get-a-BlockState-without-a-snapshot.patch
index f3eb63b31..dfb1e2832 100644
--- a/Spigot-Server-Patches/0252-API-to-get-a-BlockState-without-a-snapshot.patch
+++ b/Spigot-Server-Patches/0251-API-to-get-a-BlockState-without-a-snapshot.patch
@@ -1,4 +1,4 @@
-From 64fcf554dbf7e71bf754a5ec9e9990f31033f5c2 Mon Sep 17 00:00:00 2001
+From 2cb703b80db3bf8c508bb4d02fc29575d1bfc3e2 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
@@ -9,10 +9,10 @@ on the real tile entity.
 This is useful for where performance is needed
 
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 237f7e6fe..fe2df18df 100644
+index 537e4b155..8e2d55a73 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
-@@ -266,7 +266,12 @@ public abstract class TileEntity {
+@@ -264,7 +264,12 @@ public abstract class TileEntity {
      }
  
      // CraftBukkit start - add method
@@ -25,7 +25,7 @@ index 237f7e6fe..fe2df18df 100644
          if (world == null) return null;
          // Spigot start
          org.bukkit.block.Block block = world.getWorld().getBlockAt(position.getX(), position.getY(), position.getZ());
-@@ -275,7 +280,7 @@ public abstract class TileEntity {
+@@ -273,7 +278,7 @@ public abstract class TileEntity {
              return null;
          }
          // Spigot end
@@ -101,5 +101,5 @@ index 22dcaea72..3b5a90c39 100644
          // copy tile entity data:
          this.snapshot = this.createSnapshot(tileEntity);
 -- 
-2.15.1
+2.16.1
 
diff --git a/Spigot-Server-Patches/0254-AsyncTabCompleteEvent.patch b/Spigot-Server-Patches/0252-AsyncTabCompleteEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0254-AsyncTabCompleteEvent.patch
rename to Spigot-Server-Patches/0252-AsyncTabCompleteEvent.patch
index 39c182193..ddd5eb6b8 100644
--- a/Spigot-Server-Patches/0254-AsyncTabCompleteEvent.patch
+++ b/Spigot-Server-Patches/0252-AsyncTabCompleteEvent.patch
@@ -1,4 +1,4 @@
-From 7677f1aafd2e836a61ba6a560c8fcbd7cc75dc3e Mon Sep 17 00:00:00 2001
+From 68df71e092d912014c7cde5c7504e016474fdb65 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 26 Nov 2017 13:19:58 -0500
 Subject: [PATCH] AsyncTabCompleteEvent
@@ -80,7 +80,7 @@ index d0ab87d0f..ca054afcf 100644
  
      public void a(PacketPlayInSettings packetplayinsettings) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 7d26531d8..a9cedb997 100644
+index f0ae65f08..f01408d55 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1643,8 +1643,8 @@ public final class CraftServer implements Server {
@@ -139,5 +139,5 @@ index 1e3aae3b8..95d13c146 100644
          Waitable<List<String>> waitable = new Waitable<List<String>>() {
              @Override
 -- 
-2.15.1
+2.16.1
 
diff --git a/Spigot-Server-Patches/0255-Avoid-NPE-in-PathfinderGoalTempt.patch b/Spigot-Server-Patches/0253-Avoid-NPE-in-PathfinderGoalTempt.patch
similarity index 92%
rename from Spigot-Server-Patches/0255-Avoid-NPE-in-PathfinderGoalTempt.patch
rename to Spigot-Server-Patches/0253-Avoid-NPE-in-PathfinderGoalTempt.patch
index 283541b31..ca008484e 100644
--- a/Spigot-Server-Patches/0255-Avoid-NPE-in-PathfinderGoalTempt.patch
+++ b/Spigot-Server-Patches/0253-Avoid-NPE-in-PathfinderGoalTempt.patch
@@ -1,4 +1,4 @@
-From a4b55d3c1a5a70f36a9a70c54c349e220ba6ad59 Mon Sep 17 00:00:00 2001
+From 080f3de513fd1534aa3a9e5eb63741a854d9d2db Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 29 Nov 2017 22:18:54 -0500
 Subject: [PATCH] Avoid NPE in PathfinderGoalTempt
@@ -18,5 +18,5 @@ index 188825d19..8004f3a3f 100644
          }
      }
 -- 
-2.15.1
+2.16.1
 
diff --git a/Spigot-Server-Patches/0253-Do-not-use-a-snapshot-for-hoppers.patch b/Spigot-Server-Patches/0253-Do-not-use-a-snapshot-for-hoppers.patch
deleted file mode 100644
index f4cb5a45a..000000000
--- a/Spigot-Server-Patches/0253-Do-not-use-a-snapshot-for-hoppers.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From ddc7428566ea2644e807eec0adc9f06829661059 Mon Sep 17 00:00:00 2001
-From: Shane Freeder <theboyetronic@gmail.com>
-Date: Sat, 25 Nov 2017 17:02:33 +0000
-Subject: [PATCH] Do not use a snapshot for hoppers
-
-In 1.12, Spigot improved their blockstate implementation to take a full
-copy of the TE, this allows for a much better snapshot in that it will
-actually retain all of the TE's state, it is a much more expensive
-implementation. This is also implicated with their backwards compat
-for inventories meaning that accessing of a snapshots inventory of a
-placed block will actually access the inventory of the live TE, making
-creation of a snapshot redundant if the only intent is to interact with
-the TEs inventory.
-
-Hoppers are a horrible hit, every attempt to transfer an ItemStack will
-result in two TileEntity state snapshots, with two hoppers and a double chest
-ontop, I managed to log 380 cases per second where a snapshot would have been
-taken in cases where the snapshot is redundant.
-
-diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java
-index 8ad081316..ebbe5d326 100644
---- a/src/main/java/net/minecraft/server/TileEntityHopper.java
-+++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
-@@ -219,11 +219,15 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
-                         // Have to special case large chests as they work oddly
-                         if (iinventory instanceof InventoryLargeChest) {
-                             destinationInventory = new org.bukkit.craftbukkit.inventory.CraftInventoryDoubleChest((InventoryLargeChest) iinventory);
-+                        // Paper start - avoid redundant snapshot creation of a TE
-+                        } else if (iinventory instanceof TileEntity) {
-+                            destinationInventory = ((TileEntity) iinventory).getOwner(false).getInventory();
-                         } else {
-                             destinationInventory = iinventory.getOwner().getInventory();
-                         }
- 
--                        InventoryMoveItemEvent event = new InventoryMoveItemEvent(this.getOwner().getInventory(), oitemstack.clone(), destinationInventory, true);
-+                        InventoryMoveItemEvent event = new InventoryMoveItemEvent(this.getOwner(false).getInventory(), oitemstack.clone(), destinationInventory, true);
-+                        // Paper end - avoid redundant snapshot creation of a TE
-                         this.getWorld().getServer().getPluginManager().callEvent(event);
-                         if (event.isCancelled()) {
-                             this.setItem(i, itemstack);
-@@ -379,12 +383,22 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
-             // Have to special case large chests as they work oddly
-             if (iinventory instanceof InventoryLargeChest) {
-                 sourceInventory = new org.bukkit.craftbukkit.inventory.CraftInventoryDoubleChest((InventoryLargeChest) iinventory);
-+            // Paper start - avoid redundant snapshot creation of a TE
-+            } else if (iinventory instanceof TileEntity){
-+                sourceInventory = ((TileEntity) iinventory).getOwner(false).getInventory();
-             } else {
-                 sourceInventory = iinventory.getOwner().getInventory();
-             }
- 
--            InventoryMoveItemEvent event = new InventoryMoveItemEvent(sourceInventory, oitemstack.clone(), ihopper.getOwner().getInventory(), false);
-+            Inventory destination;
-+            if (ihopper instanceof TileEntity) {
-+                destination = ((TileEntity) ihopper).getOwner(false).getInventory();
-+            } else {
-+                destination = ihopper.getOwner().getInventory();
-+            }
- 
-+            InventoryMoveItemEvent event = new InventoryMoveItemEvent(sourceInventory, oitemstack.clone(), destination, false);
-+            // Paper end - avoid redundant snapshot creation of a TE
-             ihopper.getWorld().getServer().getPluginManager().callEvent(event);
-             if (event.isCancelled()) {
-                 iinventory.setItem(i, itemstack1);
--- 
-2.15.1
-
diff --git a/Spigot-Server-Patches/0256-Don-t-blindly-send-unlit-chunks-when-lighting-update.patch b/Spigot-Server-Patches/0254-Don-t-blindly-send-unlit-chunks-when-lighting-update.patch
similarity index 96%
rename from Spigot-Server-Patches/0256-Don-t-blindly-send-unlit-chunks-when-lighting-update.patch
rename to Spigot-Server-Patches/0254-Don-t-blindly-send-unlit-chunks-when-lighting-update.patch
index 3fd19933c..b45ef1a87 100644
--- a/Spigot-Server-Patches/0256-Don-t-blindly-send-unlit-chunks-when-lighting-update.patch
+++ b/Spigot-Server-Patches/0254-Don-t-blindly-send-unlit-chunks-when-lighting-update.patch
@@ -1,4 +1,4 @@
-From 6dc94ffe03e8e9904cd9bc9e2f5b5e3707d2661b Mon Sep 17 00:00:00 2001
+From b3b7b8219d2c9dfc059263f8f4980be57dabe687 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Mon, 18 Dec 2017 07:26:56 +0000
 Subject: [PATCH] Don't blindly send unlit chunks when lighting updates are
@@ -44,5 +44,5 @@ index d1066d82e..001fca42a 100644
      }
  
 -- 
-2.15.1
+2.16.1
 
diff --git a/Spigot-Server-Patches/0257-PlayerPickupExperienceEvent.patch b/Spigot-Server-Patches/0255-PlayerPickupExperienceEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0257-PlayerPickupExperienceEvent.patch
rename to Spigot-Server-Patches/0255-PlayerPickupExperienceEvent.patch
index d34eb21d8..ae06b9780 100644
--- a/Spigot-Server-Patches/0257-PlayerPickupExperienceEvent.patch
+++ b/Spigot-Server-Patches/0255-PlayerPickupExperienceEvent.patch
@@ -1,4 +1,4 @@
-From 3d88ce77d6cc2afdaec24be87b4aca98571add64 Mon Sep 17 00:00:00 2001
+From e262ae75abac4df6a511aa83fdd67c13f4e27357 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 22:02:53 -0500
 Subject: [PATCH] PlayerPickupExperienceEvent
@@ -19,5 +19,5 @@ index d567ad4a5..ff5cc74ba 100644
                  entityhuman.receive(this, 1);
                  ItemStack itemstack = EnchantmentManager.b(Enchantments.C, (EntityLiving) entityhuman);
 -- 
-2.15.1
+2.16.1
 
diff --git a/Spigot-Server-Patches/0258-ExperienceOrbMergeEvent.patch b/Spigot-Server-Patches/0256-ExperienceOrbMergeEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0258-ExperienceOrbMergeEvent.patch
rename to Spigot-Server-Patches/0256-ExperienceOrbMergeEvent.patch
index 83c2ac887..09c6bcd36 100644
--- a/Spigot-Server-Patches/0258-ExperienceOrbMergeEvent.patch
+++ b/Spigot-Server-Patches/0256-ExperienceOrbMergeEvent.patch
@@ -1,4 +1,4 @@
-From 2754e335efcb78a7081b47e85b7f8a91745a3bc8 Mon Sep 17 00:00:00 2001
+From 74b2b4a7e674cff79b0521721ef07183b708aa4f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 22:57:26 -0500
 Subject: [PATCH] ExperienceOrbMergeEvent
@@ -21,5 +21,5 @@ index e4502551b..9f5388ed9 100644
                              // Paper start
                              if (!mergeUnconditionally && xp.value > maxValue) {
 -- 
-2.15.1
+2.16.1
 
diff --git a/Spigot-Server-Patches/0259-Ability-to-apply-mending-to-XP-API.patch b/Spigot-Server-Patches/0257-Ability-to-apply-mending-to-XP-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0259-Ability-to-apply-mending-to-XP-API.patch
rename to Spigot-Server-Patches/0257-Ability-to-apply-mending-to-XP-API.patch
index b8726c361..7b404bfea 100644
--- a/Spigot-Server-Patches/0259-Ability-to-apply-mending-to-XP-API.patch
+++ b/Spigot-Server-Patches/0257-Ability-to-apply-mending-to-XP-API.patch
@@ -1,4 +1,4 @@
-From cefeedf5877de310c73e5fae20025fabc90fd526 Mon Sep 17 00:00:00 2001
+From 4357408fd9a9e9858748a05a50c7bcdc653ed50a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 20 Dec 2017 17:36:49 -0500
 Subject: [PATCH] Ability to apply mending to XP API
diff --git a/Spigot-Server-Patches/0260-Configurable-Chunks-Sends-per-Tick-setting.patch b/Spigot-Server-Patches/0258-Configurable-Chunks-Sends-per-Tick-setting.patch
similarity index 96%
rename from Spigot-Server-Patches/0260-Configurable-Chunks-Sends-per-Tick-setting.patch
rename to Spigot-Server-Patches/0258-Configurable-Chunks-Sends-per-Tick-setting.patch
index 15c51aeef..cad59303f 100644
--- a/Spigot-Server-Patches/0260-Configurable-Chunks-Sends-per-Tick-setting.patch
+++ b/Spigot-Server-Patches/0258-Configurable-Chunks-Sends-per-Tick-setting.patch
@@ -1,4 +1,4 @@
-From eebcf6097af36a318d2c1bf682908952cecfc4fe Mon Sep 17 00:00:00 2001
+From 91700cb7ce8e0dd61fd844b85c1bd6984fbe2db4 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
@@ -39,5 +39,5 @@ index 4af557321..6ee9f6cfb 100644
              Iterator iterator2 = this.g.iterator();
  
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0261-Configurable-Max-Chunk-Gens-per-Tick.patch b/Spigot-Server-Patches/0259-Configurable-Max-Chunk-Gens-per-Tick.patch
similarity index 98%
rename from Spigot-Server-Patches/0261-Configurable-Max-Chunk-Gens-per-Tick.patch
rename to Spigot-Server-Patches/0259-Configurable-Max-Chunk-Gens-per-Tick.patch
index c701a789f..97a7e4eda 100644
--- a/Spigot-Server-Patches/0261-Configurable-Max-Chunk-Gens-per-Tick.patch
+++ b/Spigot-Server-Patches/0259-Configurable-Max-Chunk-Gens-per-Tick.patch
@@ -1,4 +1,4 @@
-From b1b3807d31307574eeb9f680a94f315e2af24494 Mon Sep 17 00:00:00 2001
+From f0e0f9c55243d1dd2478ed6cdc651a4fe2c2442d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 1 Jan 2018 16:10:24 -0500
 Subject: [PATCH] Configurable Max Chunk Gens per Tick
@@ -108,5 +108,5 @@ index 193c3621c..cf1258c55 100644
 +    // Paper end
  }
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0262-Make-max-squid-spawn-height-configurable.patch b/Spigot-Server-Patches/0260-Make-max-squid-spawn-height-configurable.patch
similarity index 95%
rename from Spigot-Server-Patches/0262-Make-max-squid-spawn-height-configurable.patch
rename to Spigot-Server-Patches/0260-Make-max-squid-spawn-height-configurable.patch
index b4dfa3029..08fcba6ab 100644
--- a/Spigot-Server-Patches/0262-Make-max-squid-spawn-height-configurable.patch
+++ b/Spigot-Server-Patches/0260-Make-max-squid-spawn-height-configurable.patch
@@ -1,4 +1,4 @@
-From 96f95bcd13cc2dbb7f781f7202acec4e40a4557b Mon Sep 17 00:00:00 2001
+From f7c13210387f0829c7f82425f45299fb13a37238 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
@@ -36,5 +36,5 @@ index 0ce16be65..58a902831 100644
  
      public void b(float f, float f1, float f2) {
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0263-PreCreatureSpawnEvent.patch b/Spigot-Server-Patches/0261-PreCreatureSpawnEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0263-PreCreatureSpawnEvent.patch
rename to Spigot-Server-Patches/0261-PreCreatureSpawnEvent.patch
index 11350d557..3818c4d5f 100644
--- a/Spigot-Server-Patches/0263-PreCreatureSpawnEvent.patch
+++ b/Spigot-Server-Patches/0261-PreCreatureSpawnEvent.patch
@@ -1,4 +1,4 @@
-From 3e08a65a29f3522738000548059c21f2fc6719cb Mon Sep 17 00:00:00 2001
+From 7d00eaca27f88fe73d52cb565085953013d89410 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 14 Jan 2018 17:01:31 -0500
 Subject: [PATCH] PreCreatureSpawnEvent
@@ -87,5 +87,5 @@ index 2cd063829..e217d3340 100644
  
                                                          try {
 -- 
-2.15.1
+2.16.1
 
diff --git a/Spigot-Server-Patches/0264-PlayerNaturallySpawnCreaturesEvent.patch b/Spigot-Server-Patches/0262-PlayerNaturallySpawnCreaturesEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0264-PlayerNaturallySpawnCreaturesEvent.patch
rename to Spigot-Server-Patches/0262-PlayerNaturallySpawnCreaturesEvent.patch
index 0c2e8b177..88de11cdb 100644
--- a/Spigot-Server-Patches/0264-PlayerNaturallySpawnCreaturesEvent.patch
+++ b/Spigot-Server-Patches/0262-PlayerNaturallySpawnCreaturesEvent.patch
@@ -1,4 +1,4 @@
-From ece277fc5badcf214e311535c3405c5bd937f754 Mon Sep 17 00:00:00 2001
+From ff7671025707830fb683200c9b85e26de979e6a7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 14 Jan 2018 17:36:02 -0500
 Subject: [PATCH] PlayerNaturallySpawnCreaturesEvent
@@ -9,7 +9,7 @@ from triggering monster spawns on a server.
 Also a highly more effecient way to blanket block spawns in a world
 
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index f64de94fa..2af22d15d 100644
+index e217d3340..46faa062d 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -72,6 +72,15 @@ public final class SpawnerCreature {
@@ -29,5 +29,5 @@ index f64de94fa..2af22d15d 100644
                      for (int i1 = -b0; i1 <= b0; ++i1) {
                          for (k = -b0; k <= b0; ++k) {
 -- 
-2.15.1
+2.16.1
 
diff --git a/Spigot-Server-Patches/0265-Add-SkullMeta.setPlayerProfile-API.patch b/Spigot-Server-Patches/0263-Add-SkullMeta.setPlayerProfile-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0265-Add-SkullMeta.setPlayerProfile-API.patch
rename to Spigot-Server-Patches/0263-Add-SkullMeta.setPlayerProfile-API.patch
index 8e5ae26e1..b7f60f330 100644
--- a/Spigot-Server-Patches/0265-Add-SkullMeta.setPlayerProfile-API.patch
+++ b/Spigot-Server-Patches/0263-Add-SkullMeta.setPlayerProfile-API.patch
@@ -1,4 +1,4 @@
-From 1da2d5ebec485e442b4faf5e78d1affcdb98d0d9 Mon Sep 17 00:00:00 2001
+From 948ec83dcbd7090a8573021948ec2bc96feeb8ed 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
@@ -49,5 +49,5 @@ index e2ea49cd9..4855307b9 100644
      public OfflinePlayer getOwningPlayer() {
          if (hasOwner()) {
 -- 
-2.15.1
+2.16.1
 
diff --git a/Spigot-Server-Patches/0266-Fill-Profile-Property-Events.patch b/Spigot-Server-Patches/0264-Fill-Profile-Property-Events.patch
similarity index 98%
rename from Spigot-Server-Patches/0266-Fill-Profile-Property-Events.patch
rename to Spigot-Server-Patches/0264-Fill-Profile-Property-Events.patch
index 27ef91a8e..d1b246da2 100644
--- a/Spigot-Server-Patches/0266-Fill-Profile-Property-Events.patch
+++ b/Spigot-Server-Patches/0264-Fill-Profile-Property-Events.patch
@@ -1,4 +1,4 @@
-From ab9a259b3a06cfb7d65b6a3e246eb3c732765814 Mon Sep 17 00:00:00 2001
+From 4f8def8cb7fbe369bb6a0dc77d9bc923484e7435 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
@@ -101,5 +101,5 @@ index 6159cf4c0..95d1ac442 100644
              gameprofilerepository = new com.destroystokyo.paper.profile.WrappedGameProfileRepository(gameprofilerepository); // Paper
              UserCache usercache = new UserCache(gameprofilerepository, new File(s1, MinecraftServer.a.getName()));
 -- 
-2.15.1
+2.16.1
 
diff --git a/Spigot-Server-Patches/0267-PlayerAdvancementCriterionGrantEvent.patch b/Spigot-Server-Patches/0265-PlayerAdvancementCriterionGrantEvent.patch
similarity index 90%
rename from Spigot-Server-Patches/0267-PlayerAdvancementCriterionGrantEvent.patch
rename to Spigot-Server-Patches/0265-PlayerAdvancementCriterionGrantEvent.patch
index 3a97d290b..bc6b194ef 100644
--- a/Spigot-Server-Patches/0267-PlayerAdvancementCriterionGrantEvent.patch
+++ b/Spigot-Server-Patches/0265-PlayerAdvancementCriterionGrantEvent.patch
@@ -1,11 +1,11 @@
-From 7dcca0ffd7f69ff6634cb8cdffc4180fda1975aa Mon Sep 17 00:00:00 2001
+From 37ac0c5c2fa91f8f922cb07489ce1cf11cfde4be Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 19 Jan 2018 08:15:29 -0600
 Subject: [PATCH] PlayerAdvancementCriterionGrantEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
-index 6896b709..8913e274 100644
+index 6896b7095..8913e2744 100644
 --- a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
 +++ b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
 @@ -196,6 +196,12 @@ public class AdvancementDataPlayer {
@@ -22,5 +22,5 @@ index 6896b709..8913e274 100644
              this.i.add(advancement);
              flag = true;
 -- 
-2.11.0
+2.16.1
 
diff --git a/Spigot-Server-Patches/0268-MC-99321-Dont-check-for-blocked-double-chest-for-hop.patch b/Spigot-Server-Patches/0266-MC-99321-Dont-check-for-blocked-double-chest-for-hop.patch
similarity index 93%
rename from Spigot-Server-Patches/0268-MC-99321-Dont-check-for-blocked-double-chest-for-hop.patch
rename to Spigot-Server-Patches/0266-MC-99321-Dont-check-for-blocked-double-chest-for-hop.patch
index 7d20f158c..c3c1b38d5 100644
--- a/Spigot-Server-Patches/0268-MC-99321-Dont-check-for-blocked-double-chest-for-hop.patch
+++ b/Spigot-Server-Patches/0266-MC-99321-Dont-check-for-blocked-double-chest-for-hop.patch
@@ -1,4 +1,4 @@
-From 5a74672ec236558bcc757636e0a9ed4da855db44 Mon Sep 17 00:00:00 2001
+From d4e195955eeef8c475479e8c5bb6e265395ea706 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 24 Jan 2018 20:06:39 -0500
 Subject: [PATCH] MC-99321 - Dont check for blocked double chest for hoppers
@@ -24,5 +24,5 @@ index 90267a1fb..91d3308c1 100644
                          }
  
 -- 
-2.15.1
+2.16.1
 
diff --git a/Spigot-Server-Patches/0269-Add-ArmorStand-Item-Meta.patch b/Spigot-Server-Patches/0267-Add-ArmorStand-Item-Meta.patch
similarity index 99%
rename from Spigot-Server-Patches/0269-Add-ArmorStand-Item-Meta.patch
rename to Spigot-Server-Patches/0267-Add-ArmorStand-Item-Meta.patch
index 4bcf4f7cd..d5716918e 100644
--- a/Spigot-Server-Patches/0269-Add-ArmorStand-Item-Meta.patch
+++ b/Spigot-Server-Patches/0267-Add-ArmorStand-Item-Meta.patch
@@ -1,4 +1,4 @@
-From 9cdf562f0b0ffc59c5855b61250ef35de620f0d3 Mon Sep 17 00:00:00 2001
+From 817f05030086ead4203fa67f74e027d4d5d90fd0 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
@@ -407,5 +407,5 @@ index 1f537d584..a29731f1d 100644
          );
  
 -- 
-2.14.3
+2.16.1
 
diff --git a/Spigot-Server-Patches/0270-Close-Structure-Window-when-PlayerInteractEvent-is-c.patch b/Spigot-Server-Patches/0268-Close-Structure-Window-when-PlayerInteractEvent-is-c.patch
similarity index 96%
rename from Spigot-Server-Patches/0270-Close-Structure-Window-when-PlayerInteractEvent-is-c.patch
rename to Spigot-Server-Patches/0268-Close-Structure-Window-when-PlayerInteractEvent-is-c.patch
index 057d12d0a..a22d7aea2 100644
--- a/Spigot-Server-Patches/0270-Close-Structure-Window-when-PlayerInteractEvent-is-c.patch
+++ b/Spigot-Server-Patches/0268-Close-Structure-Window-when-PlayerInteractEvent-is-c.patch
@@ -1,4 +1,4 @@
-From 1330ff87275e1668d5a00204e51ac07e86497190 Mon Sep 17 00:00:00 2001
+From 00c177bbfbcca2f9de95bbbcea6f679d18bc310d Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 11 Feb 2018 10:43:46 +0000
 Subject: [PATCH] Close Structure Window when PlayerInteractEvent is cancelled
diff --git a/Spigot-Server-Patches/0269-Optimize-Hoppers.patch b/Spigot-Server-Patches/0269-Optimize-Hoppers.patch
new file mode 100644
index 000000000..5e4dcd115
--- /dev/null
+++ b/Spigot-Server-Patches/0269-Optimize-Hoppers.patch
@@ -0,0 +1,283 @@
+From 699262240b7077607d2d221e980d4fd8e4c41f20 Mon Sep 17 00:00:00 2001
+From: Aikar <aikar@aikar.co>
+Date: Wed, 27 Apr 2016 22:09:52 -0400
+Subject: [PATCH] Optimize Hoppers
+
+* Removes unnecessary extra calls to .update() that are very expensive
+* Lots of itemstack cloning removed. Only clone if the item is actually moved
+* Return true when a plugin cancels inventory move item event instead of false, as false causes pulls to cycle through all items.
+  However, pushes do not exhibit the same behavior, so this is not something plugins could of been relying on.
+* Add option (Default on) to cooldown hoppers when they fail to move an item due to full inventory
+* Skip subsequent InventoryMoveItemEvents if a plugin does not use the item after first event fire for an iteration
+
+diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+index 1947f2466..61cc1d4e6 100644
+--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
++++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+@@ -482,4 +482,12 @@ public class PaperWorldConfig {
+         squidMaxSpawnHeight = getDouble("squid-spawn-height.maximum", 0.0D);
+     }
+ 
++    public boolean cooldownHopperWhenFull = true;
++    public boolean disableHopperMoveEvents = false;
++    private void hopperOptimizations() {
++        cooldownHopperWhenFull = getBoolean("hopper.cooldown-when-full", cooldownHopperWhenFull);
++        log("Cooldown Hoppers when Full: " + (cooldownHopperWhenFull ? "enabled" : "disabled"));
++        disableHopperMoveEvents = getBoolean("hopper.disable-move-event", disableHopperMoveEvents);
++        log("Hopper Move Item Events: " + (disableHopperMoveEvents ? "disabled" : "enabled"));
++    }
+ }
+diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
+index 95d1ac442..e8c72db96 100644
+--- a/src/main/java/net/minecraft/server/MinecraftServer.java
++++ b/src/main/java/net/minecraft/server/MinecraftServer.java
+@@ -876,6 +876,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
+ 
+             // if (i == 0 || this.getAllowNether()) {
+                 WorldServer worldserver = this.worlds.get(i);
++                TileEntityHopper.skipHopperEvents = worldserver.paperConfig.disableHopperMoveEvents || org.bukkit.event.inventory.InventoryMoveItemEvent.getHandlerList().getRegisteredListeners().length == 0;
+ 
+                 this.methodProfiler.a(() -> {
+                     return worldserver.getWorldData().getName();
+diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
+index 8e2d55a73..fe2df18df 100644
+--- a/src/main/java/net/minecraft/server/TileEntity.java
++++ b/src/main/java/net/minecraft/server/TileEntity.java
+@@ -34,6 +34,7 @@ public abstract class TileEntity {
+         return (MinecraftKey) TileEntity.f.b(oclass);
+     }
+ 
++    static boolean IGNORE_TILE_UPDATES = false; // Paper
+     public World getWorld() {
+         return this.world;
+     }
+@@ -112,6 +113,7 @@ public abstract class TileEntity {
+ 
+     public void update() {
+         if (this.world != null) {
++            if (IGNORE_TILE_UPDATES) return; // Paper
+             IBlockData iblockdata = this.world.getType(this.position);
+ 
+             this.g = iblockdata.getBlock().toLegacyData(iblockdata);
+diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java
+index e9315f2d5..6ec292714 100644
+--- a/src/main/java/net/minecraft/server/TileEntityHopper.java
++++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
+@@ -196,6 +196,153 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
+         return false;
+     }
+ 
++    // Paper start - Optimize Hoppers
++    private static boolean skipPullModeEventFire = false;
++    private static boolean skipPushModeEventFire = false;
++    static boolean skipHopperEvents = false;
++
++    private boolean hopperPush(IInventory iinventory, EnumDirection enumdirection) {
++        skipPushModeEventFire = skipHopperEvents;
++        boolean foundItem = false;
++        for (int i = 0; i < this.getSize(); ++i) {
++            if (!this.getItem(i).isEmpty()) {
++                foundItem = true;
++                ItemStack origItemStack = this.getItem(i);
++                ItemStack itemstack = origItemStack;
++
++                final int origCount = origItemStack.getCount();
++                final int moved = Math.min(world.spigotConfig.hopperAmount, origCount);
++                origItemStack.setCount(moved);
++
++                // We only need to fire the event once to give protection plugins a chance to cancel this event
++                // Because nothing uses getItem, every event call should end up the same result.
++                if (!skipPushModeEventFire) {
++                    itemstack = callPushMoveEvent(iinventory, itemstack);
++                    if (itemstack == null) { // cancelled
++                        origItemStack.setCount(origCount);
++                        return false;
++                    }
++                }
++                final ItemStack itemstack1 = addItem(this, iinventory, itemstack, enumdirection);
++
++                if (itemstack1.isEmpty()) {
++                    origItemStack = origItemStack.cloneItemStack();
++                    origItemStack.setCount(origCount - moved);
++                    this.setItem(i, origItemStack);
++                    iinventory.update();
++                    return true;
++                }
++                origItemStack.setCount(origCount);
++            }
++        }
++        if (foundItem && world.paperConfig.cooldownHopperWhenFull) { // Inventory was full - cooldown
++            this.setCooldown(world.spigotConfig.hopperTransfer);
++        }
++        return false;
++    }
++
++    private static boolean hopperPull(IHopper ihopper, IInventory iinventory, int i) {
++        ItemStack origItemStack = iinventory.getItem(i);
++        ItemStack itemstack = origItemStack;
++        final int origCount = origItemStack.getCount();
++        final World world = ihopper.getWorld();
++        final int moved = Math.min(world.spigotConfig.hopperAmount, origCount);
++        itemstack.setCount(moved);
++
++        if (!skipPullModeEventFire) {
++            itemstack = callPullMoveEvent(ihopper, iinventory, itemstack);
++            if (itemstack == null) { // cancelled
++                origItemStack.setCount(origCount);
++                // Drastically improve performance by returning true.
++                // No plugin could of relied on the behavior of false as the other call
++                // site for IMIE did not exhibit the same behavior
++                return true;
++            }
++        }
++
++        final ItemStack itemstack2 = addItem(iinventory, ihopper, itemstack, null);
++        if (itemstack2.isEmpty()) {
++            origItemStack = origItemStack.cloneItemStack();
++            origItemStack.setCount(origCount - moved);
++            IGNORE_TILE_UPDATES = true;
++            iinventory.setItem(i, origItemStack);
++            IGNORE_TILE_UPDATES = false;
++            iinventory.update();
++            return true;
++        }
++        origItemStack.setCount(origCount);
++
++        if (world.paperConfig.cooldownHopperWhenFull) {
++            cooldownHopper(ihopper);
++        }
++
++        return false;
++    }
++
++    private ItemStack callPushMoveEvent(IInventory iinventory, ItemStack itemstack) {
++        Inventory destinationInventory = getInventory(iinventory);
++        InventoryMoveItemEvent event = new InventoryMoveItemEvent(this.getOwner(false).getInventory(),
++                CraftItemStack.asCraftMirror(itemstack), destinationInventory, true);
++        boolean result = event.callEvent();
++        if (!event.calledGetItem && !event.calledSetItem) {
++            skipPushModeEventFire = true;
++        }
++        if (!result) {
++            cooldownHopper(this);
++            return null;
++        }
++
++        if (event.calledSetItem) {
++            return CraftItemStack.asNMSCopy(event.getItem());
++        } else {
++            return itemstack;
++        }
++    }
++
++    private static ItemStack callPullMoveEvent(IHopper hopper, IInventory iinventory, ItemStack itemstack) {
++        Inventory sourceInventory = getInventory(iinventory);
++        Inventory destination = getInventory(hopper);
++
++        InventoryMoveItemEvent event = new InventoryMoveItemEvent(sourceInventory,
++                // Mirror is safe as we no plugins ever use this item
++                CraftItemStack.asCraftMirror(itemstack), destination, false);
++        boolean result = event.callEvent();
++        if (!event.calledGetItem && !event.calledSetItem) {
++            skipPullModeEventFire = true;
++        }
++        if (!result) {
++            cooldownHopper(hopper);
++            return null;
++        }
++
++        if (event.calledSetItem) {
++            return CraftItemStack.asNMSCopy(event.getItem());
++        } else {
++            return itemstack;
++        }
++    }
++
++    private static Inventory getInventory(IInventory iinventory) {
++        Inventory sourceInventory;// Have to special case large chests as they work oddly
++        if (iinventory instanceof InventoryLargeChest) {
++            sourceInventory = new org.bukkit.craftbukkit.inventory.CraftInventoryDoubleChest((InventoryLargeChest) iinventory);
++        } else if (iinventory instanceof TileEntity) {
++            sourceInventory = ((TileEntity) iinventory).getOwner(false).getInventory();
++        } else {
++            sourceInventory = iinventory.getOwner().getInventory();
++        }
++        return sourceInventory;
++    }
++
++    private static void cooldownHopper(IHopper hopper) {
++        if (hopper instanceof TileEntityHopper) {
++            ((TileEntityHopper) hopper).setCooldown(hopper.getWorld().spigotConfig.hopperTransfer);
++        } else if (hopper instanceof EntityMinecartHopper) {
++            ((EntityMinecartHopper) hopper).setCooldown(hopper.getWorld().spigotConfig.hopperTransfer / 2);
++        }
++    }
++
++    // Paper end
+     private boolean s() {
+         IInventory iinventory = this.I();
+ 
+@@ -207,6 +354,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
+             if (this.a(iinventory, enumdirection)) {
+                 return false;
+             } else {
++                return hopperPush(iinventory, enumdirection); /* // Paper - disable rest
+                 for (int i = 0; i < this.getSize(); ++i) {
+                     if (!this.getItem(i).isEmpty()) {
+                         ItemStack itemstack = this.getItem(i).cloneItemStack();
+@@ -248,7 +396,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
+                     }
+                 }
+ 
+-                return false;
++                return false;*/ // Paper - end commenting out replaced block for Hopper Optimizations
+             }
+         }
+     }
+@@ -326,6 +474,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
+             if (b(iinventory, enumdirection)) {
+                 return false;
+             }
++            skipPullModeEventFire = skipHopperEvents; // Paper
+ 
+             if (iinventory instanceof IWorldInventory) {
+                 IWorldInventory iworldinventory = (IWorldInventory) iinventory;
+@@ -368,6 +517,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
+         ItemStack itemstack = iinventory.getItem(i);
+ 
+         if (!itemstack.isEmpty() && b(iinventory, itemstack, i, enumdirection)) {
++            return hopperPull(ihopper, iinventory, i); /* // Paper - disable rest
+             ItemStack itemstack1 = itemstack.cloneItemStack();
+             // ItemStack itemstack2 = addItem(iinventory, ihopper, iinventory.splitStack(i, 1), (EnumDirection) null);
+             // CraftBukkit start - Call event on collection of items from inventories into the hopper
+@@ -408,7 +558,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
+             }
+ 
+             itemstack1.subtract(origCount - itemstack2.getCount()); // Spigot
+-            iinventory.setItem(i, itemstack1);
++            iinventory.setItem(i, itemstack1);*/ // Paper - end commenting out replaced block for Hopper Optimizations
+         }
+ 
+         return false;
+@@ -422,7 +572,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
+             return false;
+         } else {
+             // CraftBukkit start
+-            InventoryPickupItemEvent event = new InventoryPickupItemEvent(iinventory1.getOwner().getInventory(), (org.bukkit.entity.Item) entityitem.getBukkitEntity());
++            InventoryPickupItemEvent event = new InventoryPickupItemEvent(getInventory(iinventory1), (org.bukkit.entity.Item) entityitem.getBukkitEntity()); // Paper - avoid snapshot creation
+             entityitem.world.getServer().getPluginManager().callEvent(event);
+             if (event.isCancelled()) {
+                 return false;
+@@ -477,7 +627,9 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
+             boolean flag1 = iinventory1.x_();
+ 
+             if (itemstack1.isEmpty()) {
++                IGNORE_TILE_UPDATES = true; // Paper
+                 iinventory1.setItem(i, itemstack);
++                IGNORE_TILE_UPDATES = false; // Paper
+                 itemstack = ItemStack.a;
+                 flag = true;
+             } else if (a(itemstack1, itemstack)) {
+-- 
+2.16.1
+