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

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
+

Spigot-Server-Patches/0121-Improve-Minecraft-Hopper-Performance.patch

@@ -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
-

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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

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
 

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
 

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
 

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
 

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
 

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

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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