Update upstream B/CB

Closes GH-569
2024-06-25 22:34:51 +02:00 · 2017-01-06 15:45:59 -06:00 · 2017-01-06 15:45:59 -06:00 · 63130fd2aa
commit 63130fd2aa
parent 849653ebac
140 changed files with 381 additions and 544 deletions
--- a/Spigot-API-Patches/0003-Timings-v2.patch
+++ b/Spigot-API-Patches/0003-Timings-v2.patch
@ -1,4 +1,4 @@
-From db5fdbf9e4aa5d4ae6de2c73e045656da6d057ed Mon Sep 17 00:00:00 2001
+From 814a2afee3c6dd679eda99f04850f658b9a947e3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 29 Feb 2016 18:48:17 -0600
 Subject: [PATCH] Timings v2
@ -2888,7 +2888,7 @@ index 0000000..3a288d2
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 07b44eb..07530ff 100644
+index 5b6413b..7fd544e 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
@@ -538,7 +538,6 @@ public final class Bukkit {
@ -2900,10 +2900,10 @@ index 07b44eb..07530ff 100644
 
     /**
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 2a9c860..36d0be2 100644
+index 120dba2..77cfe56 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -935,12 +935,27 @@ public interface Server extends PluginMessageRecipient {
+@@ -943,12 +943,27 @@ public interface Server extends PluginMessageRecipient {
 
     public class Spigot
     {
@ -3278,10 +3278,10 @@ index a8f61f2..0000000
 -    // Spigot end
 -}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 6299843..64c35df 100644
+index 5a2dc32..5fbad9f 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1455,6 +1455,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1443,6 +1443,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
         public void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
             throw new UnsupportedOperationException("Not supported yet.");
         }
--- a/Spigot-API-Patches/0004-Player-affects-spawning-API.patch
+++ b/Spigot-API-Patches/0004-Player-affects-spawning-API.patch
@ -1,14 +1,14 @@
-From 1bb24ae5896681760710bb23bb083d0efdcc9c71 Mon Sep 17 00:00:00 2001
+From 080e5d215fc7add653dfa942b37b83683798f474 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Mon, 29 Feb 2016 17:22:34 -0600
 Subject: [PATCH] Player affects spawning API


 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 64c35df..6443f65 100644
+index 5fbad9f..366d1ae 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1344,6 +1344,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1332,6 +1332,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
      */
     public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data);
 
--- a/Spigot-API-Patches/0005-Add-getTPS-method.patch
+++ b/Spigot-API-Patches/0005-Add-getTPS-method.patch
@ -1,46 +1,50 @@
-From 4af32b49e181ea1b8eff460f6d5906e3415d0a4b Mon Sep 17 00:00:00 2001
+From 89cb7c72eef5269f43decc17a24bc748f00c8616 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 29 Feb 2016 17:24:57 -0600
 Subject: [PATCH] Add getTPS method


 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 07530ff..ed646ca 100644
+index 7fd544e..3b16953 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1133,6 +1133,14 @@ public final class Bukkit {
+@@ -1142,6 +1142,16 @@ public final class Bukkit {
+         return server.getEntity(uuid);
     }
 
-     /**
+    // Paper start
+    /**
 +     * Gets the current server TPS
 +     * @return current server TPS (1m, 5m, 15m in Paper-Server)
 +     */
 +    public static double[] getTPS() {
 +        return server.getTPS();
 +    }
+    // Paper end
 +
-+    /**
+     /**
      * @see UnsafeValues
      * @return the unsafe values instance
-      */
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 36d0be2..09f921a 100644
+index 77cfe56..a4e6894 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -927,6 +927,13 @@ public interface Server extends PluginMessageRecipient {
-     BossBar createBossBar(String title, BarColor color, BarStyle style, BarFlag ...flags);
+@@ -934,6 +934,15 @@ public interface Server extends PluginMessageRecipient {
+      */
+     Entity getEntity(UUID uuid);
 
-     /**
+    // Paper start
+    /**
 +     * Gets the current server TPS
 +     *
 +     * @return current server TPS (1m, 5m, 15m in Paper-Server)
 +     */
 +    public double[] getTPS();
+    // Paper end
 +
-+    /**
+     /**
      * @see UnsafeValues
      * @return the unsafe values instance
-      */
 -- 
-2.10.2
+2.9.3

--- a/Spigot-API-Patches/0007-Entity-Origin-API.patch
+++ b/Spigot-API-Patches/0007-Entity-Origin-API.patch
@ -1,14 +1,14 @@
-From 27d1d26ddfd181c7d237e8914dcf372291982e99 Mon Sep 17 00:00:00 2001
+From 69e9d85562dfdfa22265b2a96b322207b3c20275 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Mon, 29 Feb 2016 17:50:31 -0600
 Subject: [PATCH] Entity Origin API


 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index cf4118e..15cf7c0 100644
+index c2ca83c..efeaf4c 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -440,4 +440,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
+@@ -472,4 +472,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
 
     Spigot spigot();
     // Spigot End
@ -61,5 +61,5 @@ index 3ce322d..69df487 100644
 +    public org.bukkit.Location getSourceLoc();
 }
 -- 
-2.10.2
+2.9.3

--- a/Spigot-API-Patches/0010-Add-player-view-distance-API.patch
+++ b/Spigot-API-Patches/0010-Add-player-view-distance-API.patch
@ -1,14 +1,14 @@
-From eb40756df6e39375611efba72fa447f576574c86 Mon Sep 17 00:00:00 2001
+From 22ab319e4192a07fd7b35c388d702ab194ff9d78 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Mon, 29 Feb 2016 18:05:37 -0600
 Subject: [PATCH] Add player view distance API


 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 6443f65..ebe727a 100644
+index 366d1ae..6f9836c 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1358,6 +1358,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1346,6 +1346,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
      */
     public void setAffectsSpawning(boolean affects);
 
--- a/Spigot-API-Patches/0015-Expose-server-CommandMap.patch
+++ b/Spigot-API-Patches/0015-Expose-server-CommandMap.patch
@ -1,11 +1,11 @@
-From 8a43d9544b79be8a253b9129e32735c12aaf6a44 Mon Sep 17 00:00:00 2001
+From 3cd44a0e52ef2aa66f77783cd077eb6923ce0acc Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Mon, 29 Feb 2016 19:48:59 -0600
 Subject: [PATCH] Expose server CommandMap


 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index ed646ca..9b310d8 100644
+index 3b16953..07077ec 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
@@ -17,10 +17,7 @@ import org.bukkit.boss.BarColor;
@ -20,7 +20,7 @@ index ed646ca..9b310d8 100644
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.InventoryType;
-@@ -1149,6 +1146,17 @@ public final class Bukkit {
+@@ -1161,6 +1158,17 @@ public final class Bukkit {
         return server.getUnsafe();
     }
 
@ -39,7 +39,7 @@ index ed646ca..9b310d8 100644
     {
         return server.spigot();
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 09f921a..eea7239 100644
+index a4e6894..4463ab3 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
@@ -17,10 +17,7 @@ import org.bukkit.boss.BarColor;
@ -54,9 +54,9 @@ index 09f921a..eea7239 100644
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.InventoryType;
-@@ -933,6 +930,14 @@ public interface Server extends PluginMessageRecipient {
-      */
+@@ -943,6 +940,14 @@ public interface Server extends PluginMessageRecipient {
     public double[] getTPS();
+     // Paper end
 
 +    // Paper start
 +    /**
@ -70,5 +70,5 @@ index 09f921a..eea7239 100644
      * @see UnsafeValues
      * @return the unsafe values instance
 -- 
-2.10.2
+2.9.3

--- a/Spigot-API-Patches/0022-Complete-resource-pack-API.patch
+++ b/Spigot-API-Patches/0022-Complete-resource-pack-API.patch
@ -1,14 +1,14 @@
-From 5865959ee46d30a03b7961c997a06ca7f0d022f8 Mon Sep 17 00:00:00 2001
+From 4f89f8b6c53cce94668af8f2b14a5378c72af8d4 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 4 Apr 2015 22:59:54 -0400
 Subject: [PATCH] Complete resource pack API


 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 0a11a51..083e60f 100644
+index 4b10b63..360da61 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1172,7 +1172,9 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1160,7 +1160,9 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
      * @throws IllegalArgumentException Thrown if the URL is null.
      * @throws IllegalArgumentException Thrown if the URL is too long. The
      *     length restriction is an implementation specific arbitrary value.
@ -18,7 +18,7 @@ index 0a11a51..083e60f 100644
     public void setResourcePack(String url);
 
     /**
-@@ -1515,6 +1517,57 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1503,6 +1505,57 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
      */
     public void setViewDistance(int viewDistance);
 
--- a/Spigot-API-Patches/0026-Add-command-to-reload-permissions.yml-and-require-co.patch
+++ b/Spigot-API-Patches/0026-Add-command-to-reload-permissions.yml-and-require-co.patch
@ -1,4 +1,4 @@
-From 51b97e731012cb0fefc1a80e3b8805f38e3751fe Mon Sep 17 00:00:00 2001
+From 40236482736f3757f53df9547b7f244622c38034 Mon Sep 17 00:00:00 2001
 From: William <admin@domnian.com>
 Date: Fri, 18 Mar 2016 03:28:07 -0400
 Subject: [PATCH] Add command to reload permissions.yml and require confirm to
@ -6,10 +6,10 @@ Subject: [PATCH] Add command to reload permissions.yml and require confirm to


 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 87648ae..1e98f39 100644
+index a2a8698..f5af400 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1175,6 +1175,13 @@ public final class Bukkit {
+@@ -1187,6 +1187,13 @@ public final class Bukkit {
     public static CommandMap getCommandMap() {
         return server.getCommandMap();
     }
@ -24,10 +24,10 @@ index 87648ae..1e98f39 100644
 
     public static Server.Spigot spigot()
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 915d8a5..1b682b5 100644
+index 0cc64b7..2df8324 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1015,4 +1015,6 @@ public interface Server extends PluginMessageRecipient {
+@@ -1025,4 +1025,6 @@ public interface Server extends PluginMessageRecipient {
     }
 
     Spigot spigot();
--- a/Spigot-API-Patches/0033-Add-PlayerUseUnknownEntityEvent.patch
+++ b/Spigot-API-Patches/0033-Add-PlayerUseUnknownEntityEvent.patch
@ -1,4 +1,4 @@
-From 971c532dd73e22735d0b227aa4b467f3e9555a0b Mon Sep 17 00:00:00 2001
+From b1f22f61664ce8f0ab822528909cce74b2e868db Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 2 Apr 2016 05:08:36 -0400
 Subject: [PATCH] Add PlayerUseUnknownEntityEvent
@ -53,5 +53,5 @@ index 0000000..70eeaf5
 +    }
 +}
 -- 
-2.9.2.windows.1
+2.9.3

--- a/Spigot-API-Patches/0033-Add-getEntity-by-UUID-API.patch
+++ b/Spigot-API-Patches/0033-Add-getEntity-by-UUID-API.patch
@ -1,47 +0,0 @@
-From d103b8d2293a1ceeb3ac328711f78cffe566098d Mon Sep 17 00:00:00 2001
-From: DemonWav <demonwav@gmail.com>
-Date: Wed, 30 Mar 2016 01:19:51 -0500
-Subject: [PATCH] Add getEntity by UUID API
-
-
-diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 1e98f39..eb6fb2c 100644
--- a/src/main/java/org/bukkit/Bukkit.java
-+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1182,6 +1182,16 @@ public final class Bukkit {
-     public static void reloadPermissions() {
-         server.reloadPermissions();
-     }
-+
-+    /**
-+     * Find an entity on the server by its UUID
-+     *
-+     * @param uuid The UUID of the entity
-+     * @return The entity that is identified by the given UUID, or null if one isn't found
-+     */
-+    public static Entity getEntity(UUID uuid) {
-+        return server.getEntity(uuid);
-+    }
-     // Paper end
- 
-     public static Server.Spigot spigot()
-diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 1b682b5..c2b61f1 100644
--- a/src/main/java/org/bukkit/Server.java
-+++ b/src/main/java/org/bukkit/Server.java
-@@ -1017,4 +1017,12 @@ public interface Server extends PluginMessageRecipient {
-     Spigot spigot();
- 
-     void reloadPermissions(); // Paper
-+
-+    /**
-+     * Find an entity on the server by its UUID
-+     *
-+     * @param uuid The UUID of the entity
-+     * @return The entity that is identified by the given UUID, or null if one isn't found
-+     */
-+    Entity getEntity(UUID uuid); // Paper
- }
-- 
-2.9.3
-
--- a/Spigot-API-Patches/0034-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
+++ b/Spigot-API-Patches/0034-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
@ -1,4 +1,4 @@
-From a887f5c891c64b820b93ab938dea9ba8b0f89755 Mon Sep 17 00:00:00 2001
+From d16e87afdfe9297199c8afd7e3929e734df8a1c4 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 13 Apr 2016 20:20:18 -0700
 Subject: [PATCH] Add handshake event to allow plugins to handle client
@ -223,5 +223,5 @@ index 0000000..e44d03a
 +    }
 +}
 -- 
-2.9.2.windows.1
+2.9.3

--- a/Spigot-API-Patches/0035-Arrow-pickup-rule-API.patch
+++ b/Spigot-API-Patches/0035-Arrow-pickup-rule-API.patch
@ -1,4 +1,4 @@
-From 5c695da3419985b0d9250e6b312b252daa19d89c Mon Sep 17 00:00:00 2001
+From e66a13a63d87c0064d5ae21c8c5215f2d2433212 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Fri, 4 Mar 2016 03:13:18 -0500
 Subject: [PATCH] Arrow pickup rule API
@ -41,5 +41,5 @@ index e7a32f7..08095b9 100644
     {
 
 -- 
-2.9.2.windows.1
+2.9.3

--- a/Spigot-API-Patches/0036-EntityRegainHealthEvent-isFastRegen-API.patch
+++ b/Spigot-API-Patches/0036-EntityRegainHealthEvent-isFastRegen-API.patch
@ -1,4 +1,4 @@
-From eb18a4b30a1eabbbac206684cb0fe901ce78a5c0 Mon Sep 17 00:00:00 2001
+From b8f719bf3e633e806374b39efb137bdadcf487aa Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 22 Apr 2016 01:43:11 -0500
 Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
@ -41,5 +41,5 @@ index c7e9ba6..3ffc727 100644
     /**
      * Gets the amount of regained health
 -- 
-2.10.2
+2.9.3

--- a/Spigot-API-Patches/0037-LootTable-API.patch
+++ b/Spigot-API-Patches/0037-LootTable-API.patch
@ -1,4 +1,4 @@
-From acf9054a24ff96c9fa7c238b7679cbe3316d8a42 Mon Sep 17 00:00:00 2001
+From c7f2d65d63f63175db11f06c1fac7c3c3bc5d246 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 1 May 2016 15:19:49 -0400
 Subject: [PATCH] LootTable API
@ -373,5 +373,5 @@ index 003cfb8..7b40df1 100644
     /**
      * Get the {@link DyeColor} corresponding to this ShulkerBox
 -- 
-2.10.2
+2.9.3

--- a/Spigot-API-Patches/0038-Add-EntityZapEvent.patch
+++ b/Spigot-API-Patches/0038-Add-EntityZapEvent.patch
@ -1,4 +1,4 @@
-From 37aa6e6fb396fb0b13a380e9bba7993f3c7629b7 Mon Sep 17 00:00:00 2001
+From c6760f719794bea15aefbc716b386ea7bc3a7af7 Mon Sep 17 00:00:00 2001
 From: AlphaBlend <whizkid3000@hotmail.com>
 Date: Sun, 16 Oct 2016 23:19:34 -0700
 Subject: [PATCH] Add EntityZapEvent
--- a/Spigot-API-Patches/0039-Misc-Utils.patch
+++ b/Spigot-API-Patches/0039-Misc-Utils.patch
@ -1,4 +1,4 @@
-From e8be384aca64a96173cf48b19340a6a92573bbb1 Mon Sep 17 00:00:00 2001
+From 80f595a006d469d8fe65d1324ee05d8b498a1ce5 Mon Sep 17 00:00:00 2001
 From: vemacs <d@nkmem.es>
 Date: Wed, 23 Nov 2016 12:53:43 -0500
 Subject: [PATCH] Misc Utils
--- a/Spigot-API-Patches/0040-Allow-Reloading-of-Command-Aliases.patch
+++ b/Spigot-API-Patches/0040-Allow-Reloading-of-Command-Aliases.patch
@ -1,4 +1,4 @@
-From b315acf6f03fd6fd14a9dfbcff844eae1fbf2d19 Mon Sep 17 00:00:00 2001
+From 9942e2dbb75147e6fe06aec8405f1f221fa802d8 Mon Sep 17 00:00:00 2001
 From: willies952002 <admin@domnian.com>
 Date: Mon, 28 Nov 2016 10:16:39 -0500
 Subject: [PATCH] Allow Reloading of Command Aliases
@ -6,12 +6,12 @@ Subject: [PATCH] Allow Reloading of Command Aliases
 Reload the aliases stored in commands.yml

 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index eb6fb2c..e16a02c 100644
+index f5af400..2255551 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1192,6 +1192,13 @@ public final class Bukkit {
-     public static Entity getEntity(UUID uuid) {
-         return server.getEntity(uuid);
+@@ -1194,6 +1194,13 @@ public final class Bukkit {
+     public static void reloadPermissions() {
+         server.reloadPermissions();
     }
 +
 +    /**
@ -24,13 +24,13 @@ index eb6fb2c..e16a02c 100644
 
     public static Server.Spigot spigot()
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index c2b61f1..09f3e20 100644
+index 2df8324..179e08d 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1025,4 +1025,6 @@ public interface Server extends PluginMessageRecipient {
-      * @return The entity that is identified by the given UUID, or null if one isn't found
-      */
-     Entity getEntity(UUID uuid); // Paper
+@@ -1027,4 +1027,6 @@ public interface Server extends PluginMessageRecipient {
+     Spigot spigot();
+ 
+     void reloadPermissions(); // Paper
 +
 +    void reloadCommandAliases(); // Paper
 }
--- a/Spigot-API-Patches/0041-Add-source-to-PlayerExpChangeEvent.patch
+++ b/Spigot-API-Patches/0041-Add-source-to-PlayerExpChangeEvent.patch
@ -1,4 +1,4 @@
-From ad3832340e806dd7772de4ec8ae594767d2ad294 Mon Sep 17 00:00:00 2001
+From 381bcc72af916fa0e30ba7c0701484e647c640dc Mon Sep 17 00:00:00 2001
 From: AlphaBlend <whizkid3000@hotmail.com>
 Date: Thu, 8 Sep 2016 08:47:08 -0700
 Subject: [PATCH] Add source to PlayerExpChangeEvent
--- a/Spigot-API-Patches/0042-Add-ProjectileCollideEvent.patch
+++ b/Spigot-API-Patches/0042-Add-ProjectileCollideEvent.patch
@ -1,4 +1,4 @@
-From 5d1ab8bdc2d9069a20154ef1be9eb8fe3080cc68 Mon Sep 17 00:00:00 2001
+From 5fba5a4e75e64bfb2b2b73ff39cbe55dd12ee1b9 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
--- a/Spigot-API-Patches/0043-Add-String-based-Action-Bar-API.patch
+++ b/Spigot-API-Patches/0043-Add-String-based-Action-Bar-API.patch
@ -1,11 +1,11 @@
-From f6d3809067cfa80c033843a9f594b15d044cce64 Mon Sep 17 00:00:00 2001
+From 35949ac22a7da304864f0d3cfdb3fbb3331dbe4d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 20 Dec 2016 15:55:55 -0500
 Subject: [PATCH] Add String based Action Bar API


 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 083e60fa..28a229e0 100644
+index 360da61..daab479 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -392,6 +392,26 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@ -47,7 +47,7 @@ index 083e60fa..28a229e0 100644
     public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
         spigot().sendMessage(position, components);
     }
-@@ -1663,9 +1685,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1651,9 +1673,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
         /**
          * Sends the component to the specified screen position of this player
          *
@ -59,7 +59,7 @@ index 083e60fa..28a229e0 100644
         public void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent component) {
             throw new UnsupportedOperationException("Not supported yet.");
         }
-@@ -1673,9 +1697,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1661,9 +1685,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
         /**
          * Sends an array of components as a single message to the specified screen position of this player
          *
@ -73,5 +73,5 @@ index 083e60fa..28a229e0 100644
             throw new UnsupportedOperationException("Not supported yet.");
         }
 -- 
-2.11.0
+2.9.3

--- a/Spigot-API-Patches/0044-Add-API-methods-to-control-if-armour-stands-can-move.patch
+++ b/Spigot-API-Patches/0044-Add-API-methods-to-control-if-armour-stands-can-move.patch
@ -1,4 +1,4 @@
-From 7226ac4a27ddff4001102f91265fbd8e0cb1e722 Mon Sep 17 00:00:00 2001
+From 78d6bbb91f72258376e3518b8f9f19eb3b91adee 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
--- a/Spigot-API-Patches/0045-IllegalPacketEvent.patch
+++ b/Spigot-API-Patches/0045-IllegalPacketEvent.patch
@ -1,4 +1,4 @@
-From d43e5b5b743c67c8b6f20af80421241adf160562 Mon Sep 17 00:00:00 2001
+From bad77ff8bbca1adeb51a99369b3aaaaf5046b7ee Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 4 Dec 2016 01:19:14 -0500
 Subject: [PATCH] IllegalPacketEvent
@ -9,7 +9,7 @@ Lets plugins change the kick message and if it should kick or not.

 diff --git a/src/main/java/com/destroystokyo/paper/event/player/IllegalPacketEvent.java b/src/main/java/com/destroystokyo/paper/event/player/IllegalPacketEvent.java
 new file mode 100644
-index 00000000..e11f74fc
+index 0000000..e11f74f
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/player/IllegalPacketEvent.java
@@ -0,0 +1,63 @@
@ -77,5 +77,5 @@ index 00000000..e11f74fc
 +    }
 +}
 -- 
-2.11.0
+2.9.3

--- a/Spigot-API-Patches/0046-Fireworks-API-s.patch
+++ b/Spigot-API-Patches/0046-Fireworks-API-s.patch
@ -1,4 +1,4 @@
-From ba197c354dadaeddf148c2dc6533e84b47bc30c4 Mon Sep 17 00:00:00 2001
+From f65a6ec0915047f1a5c30e467c5782bae67113d2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 28 Dec 2016 01:18:55 -0500
 Subject: [PATCH] Fireworks API's
@ -7,7 +7,7 @@ Get the Entity being boosted
 Get the firework launcher

 diff --git a/src/main/java/org/bukkit/entity/Firework.java b/src/main/java/org/bukkit/entity/Firework.java
-index b8a8c075..8c087bb7 100644
+index b8a8c07..8c087bb 100644
 --- a/src/main/java/org/bukkit/entity/Firework.java
 +++ b/src/main/java/org/bukkit/entity/Firework.java
@@ -2,6 +2,8 @@ package org.bukkit.entity;
@ -34,5 +34,5 @@ index b8a8c075..8c087bb7 100644
 +    // Paper end
 }
 -- 
-2.11.0
+2.9.3

--- a/Spigot-API-Patches/0047-PlayerTeleportEndGatewayEvent.patch
+++ b/Spigot-API-Patches/0047-PlayerTeleportEndGatewayEvent.patch
@ -1,4 +1,4 @@
-From 5d15ce969e0294506f6924f548bebbfbd30d3bdf Mon Sep 17 00:00:00 2001
+From 6f53556434c1c5c59e2642b0534ff0a5854e4d50 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 31 Dec 2016 20:29:33 -0500
 Subject: [PATCH] PlayerTeleportEndGatewayEvent
@ -7,7 +7,7 @@ Allows you to access the Gateway being used in a teleport event

 diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerTeleportEndGatewayEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerTeleportEndGatewayEvent.java
 new file mode 100644
-index 00000000..84eb0a54
+index 0000000..84eb0a5
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerTeleportEndGatewayEvent.java
@@ -0,0 +1,26 @@
@ -38,5 +38,5 @@ index 00000000..84eb0a54
 +    }
 +}
 -- 
-2.11.0
+2.9.3

--- a/Spigot-Server-Patches/0002-Paper-config-files.patch
+++ b/Spigot-Server-Patches/0002-Paper-config-files.patch
@ -1,4 +1,4 @@
-From 0ac855dbf62c840c8b3a875d44698b5dca3bba51 Mon Sep 17 00:00:00 2001
+From 1d7689f18f46242f411ada922d7c4feddf599ec1 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 29 Feb 2016 21:02:09 -0600
 Subject: [PATCH] Paper config files
@ -289,10 +289,10 @@ index 80a8c55..09ca809 100644
         this.world = new CraftWorld((WorldServer) this, gen, env);
         this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5079995..f4b0871 100644
+index 3122607..791383f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -696,6 +696,7 @@ public final class CraftServer implements Server {
+@@ -697,6 +697,7 @@ public final class CraftServer implements Server {
         }
 
         org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
@ -300,7 +300,7 @@ index 5079995..f4b0871 100644
         for (WorldServer world : console.worlds) {
             world.worldData.setDifficulty(difficulty);
             world.setSpawnFlags(monsters, animals);
-@@ -711,12 +712,14 @@ public final class CraftServer implements Server {
+@@ -712,12 +713,14 @@ public final class CraftServer implements Server {
                 world.ticksPerMonsterSpawns = this.getTicksPerMonsterSpawns();
             }
             world.spigotConfig.init(); // Spigot
--- a/Spigot-Server-Patches/0005-Timings-v2.patch
+++ b/Spigot-Server-Patches/0005-Timings-v2.patch
@ -1,11 +1,11 @@
-From 1fe272b953204b2245b13d9c628b424b2eec9168 Mon Sep 17 00:00:00 2001
+From f12d4e4b4091d002eeedd603a8f2ea637c5f734a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 04:00:11 -0600
 Subject: [PATCH] Timings v2


 diff --git a/pom.xml b/pom.xml
-index 0e88ae2a7..31b8401aa 100644
+index 0e88ae2..31b8401 100644
 --- a/pom.xml
 +++ b/pom.xml
@@ -66,6 +66,12 @@
@ -23,7 +23,7 @@ index 0e88ae2a7..31b8401aa 100644
             <version>3.0.3</version>
 diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java
 new file mode 100644
-index 000000000..29838de47
+index 0000000..29838de
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
@@ -0,0 +1,114 @@
@ -143,7 +143,7 @@ index 000000000..29838de47
 +}
 diff --git a/src/main/java/co/aikar/timings/TimedChunkGenerator.java b/src/main/java/co/aikar/timings/TimedChunkGenerator.java
 new file mode 100644
-index 000000000..b79f1be7a
+index 0000000..b79f1be
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimedChunkGenerator.java
@@ -0,0 +1,126 @@
@ -275,7 +275,7 @@ index 000000000..b79f1be7a
 +}
 diff --git a/src/main/java/co/aikar/timings/WorldTimingsHandler.java b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
 new file mode 100644
-index 000000000..e7789117b
+index 0000000..e778911
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
@@ -0,0 +1,101 @@
@ -381,7 +381,7 @@ index 000000000..e7789117b
 +    }
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index c009c5f12..e67989083 100644
+index c009c5f..e679890 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -14,11 +14,14 @@ import java.util.concurrent.TimeUnit;
@ -425,7 +425,7 @@ index c009c5f12..e67989083 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index e8511ac9a..d3f1a4ac0 100644
+index e8511ac..d3f1a4a 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
@@ -35,6 +35,15 @@ public class Block {
@ -445,7 +445,7 @@ index e8511ac9a..d3f1a4ac0 100644
     public static int getId(Block block) {
         return Block.REGISTRY.a(block); // CraftBukkit - decompile error
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 81fc04ed3..bd3b16025 100644
+index 81fc04e..bd3b160 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -900,7 +900,7 @@ public class Chunk {
@ -493,7 +493,7 @@ index 81fc04ed3..bd3b16025 100644
 
     private void z() {
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index b39937f3b..17d39bb0f 100644
+index b39937f..17d39bb 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -195,7 +195,7 @@ public class ChunkProviderServer implements IChunkProvider {
@ -515,7 +515,7 @@ index b39937f3b..17d39bb0f 100644
             this.chunkLoader.a(this.world, chunk);
         } catch (IOException ioexception) {
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index a97e7d3c2..4890023d7 100644
+index a97e7d3..4890023 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -402,7 +402,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@ -555,7 +555,7 @@ index a97e7d3c2..4890023d7 100644
         // return chunk; // CraftBukkit
     }
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index cb83e4f56..4dab9e962 100644
+index cb83e4f..4dab9e9 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -23,7 +23,7 @@ import java.io.PrintStream;
@ -586,7 +586,7 @@ index cb83e4f56..4dab9e962 100644
 
     public boolean aa() {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index dd946b948..4d289330e 100644
+index dd946b9..4d28933 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -25,7 +25,8 @@ import org.bukkit.block.BlockFace;
@ -625,7 +625,7 @@ index dd946b948..4d289330e 100644
 
     public void recalcPosition() {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index b231bfe7c..4fbe92a5a 100644
+index b231bfe..4fbe92a 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -31,7 +31,7 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@ -696,7 +696,7 @@ index b231bfe7c..4fbe92a5a 100644
     }
 
 diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java
-index 347a2b671..aceb08ce1 100644
+index 347a2b6..aceb08c 100644
 --- a/src/main/java/net/minecraft/server/EntityTracker.java
 +++ b/src/main/java/net/minecraft/server/EntityTracker.java
@@ -175,7 +175,7 @@ public class EntityTracker {
@ -727,7 +727,7 @@ index 347a2b671..aceb08ce1 100644
     }
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 90b667893..9e3a8d155 100644
+index 90b6678..9e3a8d1 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -47,7 +47,7 @@ import org.bukkit.Bukkit;
@ -869,7 +869,7 @@ index 90b667893..9e3a8d155 100644
         this.methodProfiler.b();
     }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index a5a096be5..c546139c8 100644
+index a5a096b..c546139 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
@@ -1,5 +1,6 @@
@ -969,7 +969,7 @@ index a5a096be5..c546139c8 100644
 
     }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 01f834304..a10d8a7b8 100644
+index 027baa6..04b4980 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;
@ -1017,7 +1017,7 @@ index 01f834304..a10d8a7b8 100644
         // CraftBukkit end
     }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 7be013599..9f5299570 100644
+index 7be0135..9f52995 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -1,5 +1,6 @@
@ -1041,7 +1041,7 @@ index 7be013599..9f5299570 100644
 
     public void addWhitelist(GameProfile gameprofile) {
 diff --git a/src/main/java/net/minecraft/server/StructureGenerator.java b/src/main/java/net/minecraft/server/StructureGenerator.java
-index f1f206501..fb350c408 100644
+index f1f2065..fb350c4 100644
 --- a/src/main/java/net/minecraft/server/StructureGenerator.java
 +++ b/src/main/java/net/minecraft/server/StructureGenerator.java
@@ -1,5 +1,7 @@
@ -1083,7 +1083,7 @@ index f1f206501..fb350c408 100644
         return flag;
     }
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 6958a2e0f..b3d3df4cf 100644
+index 6958a2e..b3d3df4 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
@@ -4,12 +4,13 @@ import javax.annotation.Nullable;
@ -1103,7 +1103,7 @@ index 6958a2e0f..b3d3df4cf 100644
     private static final RegistryMaterials<MinecraftKey, Class<? extends TileEntity>> f = new RegistryMaterials();
     protected World world;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 09ca809f0..47e3b4d98 100644
+index 09ca809..47e3b4d 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -18,11 +18,11 @@ import com.google.common.collect.Maps;
@ -1209,7 +1209,7 @@ index 09ca809f0..47e3b4d98 100644
     }
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 47131503d..26627ce82 100644
+index 4713150..26627ce 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -246,13 +246,13 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@ -1342,10 +1342,10 @@ index 47131503d..26627ce82 100644
 
     // CraftBukkit start
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f4b0871ed..761c8e462 100644
+index 791383f..38ce058 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1729,6 +1729,7 @@ public final class CraftServer implements Server {
+@@ -1737,6 +1737,7 @@ public final class CraftServer implements Server {
     private final Spigot spigot = new Spigot()
     {
 
@ -1353,7 +1353,7 @@ index f4b0871ed..761c8e462 100644
         @Override
         public YamlConfiguration getConfig()
         {
-@@ -1736,6 +1737,24 @@ public final class CraftServer implements Server {
+@@ -1744,6 +1745,24 @@ public final class CraftServer implements Server {
         }
 
         @Override
@ -1380,7 +1380,7 @@ index f4b0871ed..761c8e462 100644
         }
 diff --git a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java b/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
 deleted file mode 100644
-index 41d2d87ee..000000000
+index 41d2d87..0000000
 --- a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
 +++ /dev/null
@@ -1,173 +0,0 @@
@ -1558,7 +1558,7 @@ index 41d2d87ee..000000000
 -    }
 -}
 diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
-index 3a95b4465..b5efb9c3f 100644
+index 3a95b44..b5efb9c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
 +++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
@@ -1,6 +1,8 @@
@ -1602,7 +1602,7 @@ index 3a95b4465..b5efb9c3f 100644
 
     public void callStage3(QueuedChunk queuedChunk, Chunk chunk, Runnable runnable) throws RuntimeException {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d057cce36..877a0c88d 100644
+index d057cce..877a0c8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -37,15 +37,9 @@ import org.bukkit.configuration.serialization.DelegateDeserialization;
@ -1636,7 +1636,7 @@ index d057cce36..877a0c88d 100644
 
     public Player.Spigot spigot()
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index 92d217bce..198c37c3c 100644
+index 92d217b..198c37c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
@@ -189,7 +189,7 @@ public class CraftScheduler implements BukkitScheduler {
@ -1677,7 +1677,7 @@ index 92d217bce..198c37c3c 100644
                     task.getOwner().getLogger().log(
                             Level.WARNING,
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
-index 220e39abe..afc6c17e6 100644
+index 220e39a..afc6c17 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
@@ -1,8 +1,8 @@
@ -1759,7 +1759,7 @@ index 220e39abe..afc6c17e6 100644
 -    // Spigot end
 }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java b/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
-index e52ef47b7..3d90b3426 100644
+index e52ef47..3d90b34 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
@@ -5,6 +5,7 @@ import org.bukkit.util.CachedServerIcon;
@ -1771,7 +1771,7 @@ index e52ef47b7..3d90b3426 100644
         this.value = value;
     }
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index c32d44df0..5c2fb0058 100644
+index c32d44d..5c2fb00 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -29,7 +29,7 @@ import net.minecraft.server.EntityWither;
@ -1833,5 +1833,5 @@ index c32d44df0..5c2fb0058 100644
     }
 }
 -- 
-2.11.0
+2.9.3

--- a/Spigot-Server-Patches/0015-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
+++ b/Spigot-Server-Patches/0015-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
@ -1,4 +1,4 @@
-From cb75f26bfce777e1f28853aa91d6230531242425 Mon Sep 17 00:00:00 2001
+From fa342a9517f7e5c9ca34b6bc5b8c03f20524e4d6 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 14:32:43 -0600
 Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang
@ -20,7 +20,7 @@ index a8b5079..ebbc1fc 100644
             EULA.a.warn("Failed to save {}", new Object[] { this.b, exception});
         } finally {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 81a69e8..c8c6959 100644
+index 9e3a8d1..2638f03 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1035,7 +1035,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@ -33,10 +33,10 @@ index 81a69e8..c8c6959 100644
 
     public CrashReport b(CrashReport crashreport) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 761c8e4..3f13c86 100644
+index 38ce058..24fd62b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -134,7 +134,7 @@ import net.md_5.bungee.api.chat.BaseComponent;
+@@ -135,7 +135,7 @@ import net.md_5.bungee.api.chat.BaseComponent;
 
 public final class CraftServer implements Server {
     private static final Player[] EMPTY_PLAYER_ARRAY = new Player[0];
--- a/Spigot-Server-Patches/0020-Further-improve-server-tick-loop.patch
+++ b/Spigot-Server-Patches/0020-Further-improve-server-tick-loop.patch
@ -1,4 +1,4 @@
-From 1381fa6bedb54329d4d3206c466ce6dfe42c8c17 Mon Sep 17 00:00:00 2001
+From 4c820d01b5348a632a806b270fc93f2d5ae2b02b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 1 Mar 2016 23:09:29 -0600
 Subject: [PATCH] Further improve server tick loop
@ -12,7 +12,7 @@ Previous implementation did not calculate TPS correctly.
 Switch to a realistic rolling average and factor in std deviation as an extra reporting variable

 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c8c6959..127d11c 100644
+index 2638f03..6a1c7b7 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -112,17 +112,11 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@ -148,10 +148,10 @@ index c8c6959..127d11c 100644
                     }
                     lastTick = curTime;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 3f13c86..7e7be86 100644
+index 24fd62b..30ed3ad 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1726,6 +1726,17 @@ public final class CraftServer implements Server {
+@@ -1734,6 +1734,17 @@ public final class CraftServer implements Server {
         return CraftMagicNumbers.INSTANCE;
     }
 
--- a/Spigot-Server-Patches/0023-Entity-Origin-API.patch
+++ b/Spigot-Server-Patches/0023-Entity-Origin-API.patch
@ -1,4 +1,4 @@
-From 3bd1d97ca60e0d62df26c12863eb8d7b6138a903 Mon Sep 17 00:00:00 2001
+From 2406e88f815b2868a20d896fd3955ebe5df4b42f Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Tue, 1 Mar 2016 23:45:08 -0600
 Subject: [PATCH] Entity Origin API
@ -89,7 +89,7 @@ index fd07356..25e471d 100644
 
     @Nullable
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 2010fdd..a842ebd 100644
+index 688f405..ca641ab 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -1021,6 +1021,12 @@ public abstract class World implements IBlockAccess {
@ -106,10 +106,10 @@ index 2010fdd..a842ebd 100644
             flag = true;
         }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index e4fbcf2..5b01727 100644
+index 7d9b000..0167ed0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -675,4 +675,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -701,4 +701,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
         return spigot;
     }
     // Spigot end
--- a/Spigot-Server-Patches/0050-Ensure-commands-are-not-ran-async.patch
+++ b/Spigot-Server-Patches/0050-Ensure-commands-are-not-ran-async.patch
@ -1,4 +1,4 @@
-From 67e09fb94f4a77e6097e8b9c087b8d4954afe382 Mon Sep 17 00:00:00 2001
+From df13bd01b30384d625284d39cf4d3e53f1b4f3f8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 01:17:12 -0600
 Subject: [PATCH] Ensure commands are not ran async
@ -14,7 +14,7 @@ big slowdown in execution but throwing an exception at same time to raise awaren
 that it is happening so that plugin authors can fix their code to stop executing commands async.

 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 2e5e0b4a7..8147b5e3c 100644
+index 04b4980..6d92e6b 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1258,6 +1258,29 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@ -48,10 +48,10 @@ index 2e5e0b4a7..8147b5e3c 100644
         } else if (this.player.getChatFlags() == EntityHuman.EnumChatVisibility.SYSTEM) {
             // Do nothing, this is coming from a plugin
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 7e7be864b..63545ce40 100644
+index 30ed3ad..a795a16 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -646,6 +646,29 @@ public final class CraftServer implements Server {
+@@ -647,6 +647,29 @@ public final class CraftServer implements Server {
         Validate.notNull(sender, "Sender cannot be null");
         Validate.notNull(commandLine, "CommandLine cannot be null");
 
@ -82,5 +82,5 @@ index 7e7be864b..63545ce40 100644
             return true;
         }
 -- 
-2.11.0
+2.9.3

--- a/Spigot-Server-Patches/0054-Expose-server-CommandMap.patch
+++ b/Spigot-Server-Patches/0054-Expose-server-CommandMap.patch
@ -1,14 +1,14 @@
-From 0fb5e856063297b816b8a7ca739b31698f293a65 Mon Sep 17 00:00:00 2001
+From 93e2fc860b2110225b8015a067ed778281de507c Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 3 Mar 2016 02:15:57 -0600
 Subject: [PATCH] Expose server CommandMap


 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 32de676..b7a825a 100644
+index a795a16..03bc017 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1566,6 +1566,7 @@ public final class CraftServer implements Server {
+@@ -1567,6 +1567,7 @@ public final class CraftServer implements Server {
         return helpMap;
     }
 
--- a/Spigot-Server-Patches/0060-Add-velocity-warnings.patch
+++ b/Spigot-Server-Patches/0060-Add-velocity-warnings.patch
@ -1,14 +1,14 @@
-From 3ae58c1044d54f764d2b82a402281b50f74d5be4 Mon Sep 17 00:00:00 2001
+From 92f6a9bc233b3356b37dc4c1804387ecbf4d1da8 Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:48:12 -0600
 Subject: [PATCH] Add velocity warnings


 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 5b01727..ae95c76 100644
+index 0167ed0..2b1ca7e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -227,6 +227,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -229,6 +229,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
     }
 
     public void setVelocity(Vector vel) {
--- a/Spigot-Server-Patches/0069-Default-loading-permissions.yml-before-plugins.patch
+++ b/Spigot-Server-Patches/0069-Default-loading-permissions.yml-before-plugins.patch
@ -1,4 +1,4 @@
-From 00becfbfae18231f783587088d82d3f2d67a1965 Mon Sep 17 00:00:00 2001
+From cca72bb299e1dd0f6028b3cecaddbf0e1b5aa518 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 13:17:38 -0400
 Subject: [PATCH] Default loading permissions.yml before plugins
@ -16,7 +16,7 @@ modify that. Under the previous logic, plugins were unable (cleanly) override pe
 A config option has been added for those who depend on the previous behavior, but I don't expect that.

 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index c1a8243..88b6778 100644
+index 65fc0cb..7da844e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -195,4 +195,9 @@ public class PaperConfig {
@ -30,10 +30,10 @@ index c1a8243..88b6778 100644
 +    }
 }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b7a825a..9913421 100644
+index 03bc017..54cea6a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -316,6 +316,7 @@ public final class CraftServer implements Server {
+@@ -317,6 +317,7 @@ public final class CraftServer implements Server {
         if (type == PluginLoadOrder.STARTUP) {
             helpMap.clear();
             helpMap.initializeGeneralTopics();
@ -41,7 +41,7 @@ index b7a825a..9913421 100644
         }
 
         Plugin[] plugins = pluginManager.getPlugins();
-@@ -333,7 +334,7 @@ public final class CraftServer implements Server {
+@@ -334,7 +335,7 @@ public final class CraftServer implements Server {
             setVanillaCommands(false);
             // Spigot end
             commandMap.registerServerAliases();
--- a/Spigot-Server-Patches/0070-Allow-Reloading-of-Custom-Permissions.patch
+++ b/Spigot-Server-Patches/0070-Allow-Reloading-of-Custom-Permissions.patch
@ -1,4 +1,4 @@
-From 848e2dd10bcb00e9f5f874c93042fd96dfa693d7 Mon Sep 17 00:00:00 2001
+From 1e22976fc41743796f571137670c9480bfb64e4f Mon Sep 17 00:00:00 2001
 From: William <admin@domnian.com>
 Date: Fri, 18 Mar 2016 03:30:17 -0400
 Subject: [PATCH] Allow Reloading of Custom Permissions
@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Custom Permissions
 https://github.com/PaperMC/Paper/issues/49

 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 9913421..f246426 100644
+index 54cea6a..c3c4803 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1814,4 +1814,21 @@ public final class CraftServer implements Server {
+@@ -1822,4 +1822,21 @@ public final class CraftServer implements Server {
     {
         return spigot;
     }
--- a/Spigot-Server-Patches/0071-Remove-Metadata-on-reload.patch
+++ b/Spigot-Server-Patches/0071-Remove-Metadata-on-reload.patch
@ -1,4 +1,4 @@
-From 9ae1a095102acfba7a8241abd2d007d854d6cbe4 Mon Sep 17 00:00:00 2001
+From 18660b67f133ee9c2afc344d0344208bb10082b6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 13:50:14 -0400
 Subject: [PATCH] Remove Metadata on reload
@ -7,10 +7,10 @@ Metadata is not meant to persist reload as things break badly with non primitive
 This will remove metadata on reload so it does not crash everything if a plugin uses it.

 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f246426..4fdb3cc 100644
+index c3c4803..3661821 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -739,6 +739,14 @@ public final class CraftServer implements Server {
+@@ -740,6 +740,14 @@ public final class CraftServer implements Server {
             world.paperConfig.init(); // Paper
         }
 
--- a/Spigot-Server-Patches/0101-Add-getEntity-by-UUID-API.patch
+++ b/Spigot-Server-Patches/0101-Add-getEntity-by-UUID-API.patch
@ -1,57 +0,0 @@
-From 8ddafeefaeaf97373c2a76e463716b223bd730fa Mon Sep 17 00:00:00 2001
-From: DemonWav <demonwav@gmail.com>
-Date: Wed, 30 Mar 2016 01:20:11 -0500
-Subject: [PATCH] Add getEntity by UUID API
-
-
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 2456e33..fc433f9 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1521,6 +1521,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
-         this.Z = 0L;
-     }
- 
-+    public Entity getEntity(UUID uuid) { return this.a(uuid); } // Paper - OBFHELPER
-     @Nullable
-     public Entity a(UUID uuid) {
-         WorldServer[] aworldserver = this.worldServer;
-@@ -1534,7 +1535,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
-             if (worldserver != null) {
-                 Entity entity = worldserver.getEntity(uuid);
- 
-                if (entity != null) {
-+                if (entity != null && !entity.dead) {
-                     return entity;
-                 }
-             }
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 4fdb3cc..764b6d7 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -53,6 +53,7 @@ import org.bukkit.configuration.serialization.ConfigurationSerialization;
- import org.bukkit.conversations.Conversable;
- import org.bukkit.craftbukkit.boss.CraftBossBar;
- import org.bukkit.craftbukkit.command.VanillaCommandWrapper;
-+import org.bukkit.craftbukkit.entity.CraftEntity;
- import org.bukkit.craftbukkit.entity.CraftPlayer;
- import org.bukkit.craftbukkit.generator.CraftChunkData;
- import org.bukkit.craftbukkit.help.SimpleHelpMap;
-@@ -1838,5 +1839,14 @@ public final class CraftServer implements Server {
-             });
-         }
-     }
-+
-+    @Override
-+    public CraftEntity getEntity(UUID uuid) {
-+        Entity entity = getHandle().getServer().getEntity(uuid);
-+        if (entity == null) {
-+            return null;
-+        }
-+        return entity.getBukkitEntity();
-+    }
-     // Paper end
- }
-- 
-2.9.3
-
--- a/Spigot-Server-Patches/0101-Use-Optimized-Collections.patch
+++ b/Spigot-Server-Patches/0101-Use-Optimized-Collections.patch
@ -1,4 +1,4 @@
-From bcf0f8cce8edf3181863e5e35b2879c2d884de24 Mon Sep 17 00:00:00 2001
+From e0d27bb673eb6aad7eecf10e54b49c097b42e4e2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 30 Mar 2016 02:13:24 -0400
 Subject: [PATCH] Use Optimized Collections
--- a/Spigot-Server-Patches/0102-Do-not-load-chunks-for-light-checks.patch
+++ b/Spigot-Server-Patches/0102-Do-not-load-chunks-for-light-checks.patch
@ -1,4 +1,4 @@
-From ea74d4759a983c7da708fbf2e930381ab2b54228 Mon Sep 17 00:00:00 2001
+From 82823ca3b1570c84492d9d40efaec6e7c18487b1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 31 Mar 2016 19:17:58 -0400
 Subject: [PATCH] Do not load chunks for light checks
@ -7,7 +7,7 @@ Should only happen for blocks on the edge that uses neighbors light level
 (certain blocks). In that case, there will be 3-4 other neighbors to get a light level from.

 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index dd4634e..26166bd 100644
+index 654f2ae..2d5f3d2 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -759,6 +759,7 @@ public abstract class World implements IBlockAccess {
--- a/Spigot-Server-Patches/0103-Add-PlayerUseUnknownEntityEvent.patch
+++ b/Spigot-Server-Patches/0103-Add-PlayerUseUnknownEntityEvent.patch
@ -1,4 +1,4 @@
-From 6a3f20ec137e08c421a3351213338b0d35610016 Mon Sep 17 00:00:00 2001
+From 97a4cb72849a21f4add6fbe16a2c5647af13cd52 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 2 Apr 2016 05:09:16 -0400
 Subject: [PATCH] Add PlayerUseUnknownEntityEvent
@ -18,7 +18,7 @@ index c67cb54..521f462 100644
     private Vec3D c;
     private EnumHand d;
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index b42c0be..a376a0e 100644
+index 48d64b3..6fe870f 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1605,6 +1605,16 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
--- a/Spigot-Server-Patches/0104-Fix-reducedDebugInfo-not-initialized-on-client.patch
+++ b/Spigot-Server-Patches/0104-Fix-reducedDebugInfo-not-initialized-on-client.patch
@ -1,4 +1,4 @@
-From efdd99dd7957200659226404af74d6ac7199ce2c Mon Sep 17 00:00:00 2001
+From f9e31f50a0528a18a24340d167ffaf6d2a7fd90f Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 2 Apr 2016 20:37:03 -0400
 Subject: [PATCH] Fix reducedDebugInfo not initialized on client
--- a/Spigot-Server-Patches/0105-Configurable-Grass-Spread-Tick-Rate.patch
+++ b/Spigot-Server-Patches/0105-Configurable-Grass-Spread-Tick-Rate.patch
@ -1,4 +1,4 @@
-From 6f9b0a8a2bb769a5403e218228873df3833f2dc3 Mon Sep 17 00:00:00 2001
+From bd93ff035dfafc92136f585f5c873592e30ee886 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 3 Apr 2016 16:28:17 -0400
 Subject: [PATCH] Configurable Grass Spread Tick Rate
--- a/Spigot-Server-Patches/0106-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/Spigot-Server-Patches/0106-Configurable-Keep-Spawn-Loaded-range-per-world.patch
@ -1,4 +1,4 @@
-From 41cc62d3657a36b4cdb7316506531d78d6db17a5 Mon Sep 17 00:00:00 2001
+From 8a4f59fc1cf5f7bfc7e7e5f1fc16141cf971f7c1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 13 Sep 2014 23:14:43 -0400
 Subject: [PATCH] Configurable Keep Spawn Loaded range per world
@ -21,7 +21,7 @@ index 615a6af..6517c32 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index a87a9da..3809aaa 100644
+index 6011955..4dc8794 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -352,8 +352,11 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@ -54,7 +54,7 @@ index 2d5f3d2..9c36471 100644
 
     public void a(Packet<?> packet) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b39007f..d5b1adf 100644
+index 3661821..69d9e75 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -951,7 +951,7 @@ public final class CraftServer implements Server {
--- a/Spigot-Server-Patches/0107-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
+++ b/Spigot-Server-Patches/0107-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
@ -1,11 +1,11 @@
-From ae73bd2fe9bb25c99c9998c1894dd500fa831836 Mon Sep 17 00:00:00 2001
+From 811798ae6f012bbc184974770b5337d16857eb15 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 3 Apr 2016 17:48:50 -0400
 Subject: [PATCH] Fix Cancelling BlockPlaceEvent triggering physics


 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index fa92054..70cd195 100644
+index 9c36471..d348496 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -532,6 +532,7 @@ public abstract class World implements IBlockAccess {
--- a/Spigot-Server-Patches/0108-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
+++ b/Spigot-Server-Patches/0108-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
@ -1,4 +1,4 @@
-From 7a195418915f2b6f15e2828a2f73e0e6ef0d24d3 Mon Sep 17 00:00:00 2001
+From 0f2249076e9656417279e6382874f5160ede793d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Apr 2016 19:42:22 -0400
 Subject: [PATCH] Don't spam reload spawn chunks in nether/end
--- a/Spigot-Server-Patches/0109-Remove-Debug-checks-from-DataBits.patch
+++ b/Spigot-Server-Patches/0109-Remove-Debug-checks-from-DataBits.patch
@ -1,4 +1,4 @@
-From f5052f0ab3d6f3dca63bde76e1219434619430e6 Mon Sep 17 00:00:00 2001
+From f5252bd9356fc7cd5ae6f147731678d264b04da1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Apr 2016 21:38:58 -0400
 Subject: [PATCH] Remove Debug checks from DataBits
--- a/Spigot-Server-Patches/0110-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
+++ b/Spigot-Server-Patches/0110-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
@ -1,4 +1,4 @@
-From 50c227471b14fccfc5d99d73649dc34c34f01492 Mon Sep 17 00:00:00 2001
+From ede0ecaed35ed9d970a7962c63b315ff5b26a7c8 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 6 Apr 2016 01:04:23 -0500
 Subject: [PATCH] Option to use vanilla per-world scoreboard coloring on names
@ -31,7 +31,7 @@ index ac10fec..ae6638d 100644
     public ScoreboardTeamBase aQ() {
         if (!this.world.paperConfig.nonPlayerEntitiesOnScoreboards && !(this instanceof EntityHuman)) { return null; } // Paper
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index a376a0e..3a99311 100644
+index 6fe870f..845c2fb 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1338,7 +1338,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
--- a/Spigot-Server-Patches/0111-Workaround-for-setting-passengers-on-players.patch
+++ b/Spigot-Server-Patches/0111-Workaround-for-setting-passengers-on-players.patch
@ -1,4 +1,4 @@
-From cddf4caa7f3d36be3b5de9afd725b6b6cceb4b42 Mon Sep 17 00:00:00 2001
+From bfcdb392ed8a6a5002d63ec51086b250ae5bd5a9 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 10 Apr 2016 03:23:32 -0500
 Subject: [PATCH] Workaround for setting passengers on players
--- a/Spigot-Server-Patches/0112-Remove-unused-World-Tile-Entity-List.patch
+++ b/Spigot-Server-Patches/0112-Remove-unused-World-Tile-Entity-List.patch
@ -1,4 +1,4 @@
-From 0d0c3c94e75758a00e1082b833d20a928cc56f17 Mon Sep 17 00:00:00 2001
+From 700a03804e098b5366752d5cfde75ca1f9890743 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 13 Apr 2016 00:25:28 -0400
 Subject: [PATCH] Remove unused World Tile Entity List
--- a/Spigot-Server-Patches/0113-Don-t-tick-Skulls-unused-code.patch
+++ b/Spigot-Server-Patches/0113-Don-t-tick-Skulls-unused-code.patch
@ -1,4 +1,4 @@
-From 4f5fa0bf7fb883ea2d79b49add0e696be0adfeaf Mon Sep 17 00:00:00 2001
+From ae5a116e0a0dfa68b6bf02991c4b3fc5a1e9a6b7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 13 Apr 2016 00:30:10 -0400
 Subject: [PATCH] Don't tick Skulls - unused code
--- a/Spigot-Server-Patches/0114-Configurable-Player-Collision.patch
+++ b/Spigot-Server-Patches/0114-Configurable-Player-Collision.patch
@ -1,11 +1,11 @@
-From 024f56067df9c81b3dc1b69836311755d59d7680 Mon Sep 17 00:00:00 2001
+From 2fbcdc55c3f7c1f5de20f71ea62a51e90105ddde Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 13 Apr 2016 02:10:49 -0400
 Subject: [PATCH] Configurable Player Collision


 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 1b9c852..a3f4c1f 100644
+index 70f7c87..6d0ea19 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -210,4 +210,9 @@ public class PaperConfig {
@ -37,7 +37,7 @@ index ab9aa13..f9f59e5 100644
                     }
                 }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 2fc3e94..8b94120 100644
+index 4dc8794..8eef9c4 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -327,6 +327,20 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
--- a/Spigot-Server-Patches/0115-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
+++ b/Spigot-Server-Patches/0115-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
@ -1,4 +1,4 @@
-From f803c68f46d30c10dda07eacea30e5c60243b658 Mon Sep 17 00:00:00 2001
+From 484e0a0fa02ae5144f6a31ce2e53c0c3d986521a Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 13 Apr 2016 20:21:38 -0700
 Subject: [PATCH] Add handshake event to allow plugins to handle client
@ -6,7 +6,7 @@ Subject: [PATCH] Add handshake event to allow plugins to handle client


 diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
-index c1ed460..492a0c5 100644
+index a46df4b..f02263c 100644
 --- a/src/main/java/net/minecraft/server/HandshakeListener.java
 +++ b/src/main/java/net/minecraft/server/HandshakeListener.java
@@ -72,8 +72,33 @@ public class HandshakeListener implements PacketHandshakingInListener {
--- a/Spigot-Server-Patches/0116-Water-mobs-should-only-spawn-in-the-water.patch
+++ b/Spigot-Server-Patches/0116-Water-mobs-should-only-spawn-in-the-water.patch
@ -1,4 +1,4 @@
-From 5a9cea8d05b30aecdb586a5c81fd6eeb5c107fdf Mon Sep 17 00:00:00 2001
+From d153a3ef0f9c66361c449f0175123a8239fc9a32 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 14 Apr 2016 17:48:56 -0500
 Subject: [PATCH] Water mobs should only spawn in the water
--- a/Spigot-Server-Patches/0117-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch
+++ b/Spigot-Server-Patches/0117-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch
@ -1,4 +1,4 @@
-From a9fd44ef1436a725ebe60a5ca1230e01c231560b Mon Sep 17 00:00:00 2001
+From 82a710b86ac776efc85ae57246a489a52f439582 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 14 Apr 2016 21:01:39 -0400
 Subject: [PATCH] Fix Bugs with Spigot Mob Spawn Logic
--- a/Spigot-Server-Patches/0118-Configurable-RCON-IP-address.patch
+++ b/Spigot-Server-Patches/0118-Configurable-RCON-IP-address.patch
@ -1,4 +1,4 @@
-From 6853c3611af7ac1107959451fcf1d33684853f97 Mon Sep 17 00:00:00 2001
+From f2a1633a862df24f5b75b0246e23429ad8e1b652 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 16 Apr 2016 00:39:33 -0400
 Subject: [PATCH] Configurable RCON IP address
--- a/Spigot-Server-Patches/0119-Prevent-Fire-from-loading-chunks.patch
+++ b/Spigot-Server-Patches/0119-Prevent-Fire-from-loading-chunks.patch
@ -1,4 +1,4 @@
-From 1e7f0732a42a20adb87656e9223e1f5923d28912 Mon Sep 17 00:00:00 2001
+From 7c16eb68a4f367726dcc39715d2ff66b9e13d18f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 17 Apr 2016 17:27:09 -0400
 Subject: [PATCH] Prevent Fire from loading chunks
--- a/Spigot-Server-Patches/0120-Implement-PlayerLocaleChangeEvent.patch
+++ b/Spigot-Server-Patches/0120-Implement-PlayerLocaleChangeEvent.patch
@ -1,4 +1,4 @@
-From 952a91604c23b7d171c80d06e38235a38e9bfae4 Mon Sep 17 00:00:00 2001
+From 4cf4080ae649b04c6c320bc8dbcb95abcd93bfc5 Mon Sep 17 00:00:00 2001
 From: Isaac Moore <rmsy@me.com>
 Date: Tue, 19 Apr 2016 14:09:31 -0500
 Subject: [PATCH] Implement PlayerLocaleChangeEvent
--- a/Spigot-Server-Patches/0121-EntityRegainHealthEvent-isFastRegen-API.patch
+++ b/Spigot-Server-Patches/0121-EntityRegainHealthEvent-isFastRegen-API.patch
@ -1,4 +1,4 @@
-From 5f49b94077a298f1a7f1a67f670b2204d772a656 Mon Sep 17 00:00:00 2001
+From 27b1fa9b5c21ee589a9ea23c5ea91e6724dc59e2 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 22 Apr 2016 01:43:11 -0500
 Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
@ -6,7 +6,7 @@ Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
 Don't even get me started

 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index f57a1106a..88bc7d81e 100644
+index f57a110..88bc7d8 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -762,10 +762,16 @@ public abstract class EntityLiving extends Entity {
@ -28,7 +28,7 @@ index f57a1106a..88bc7d81e 100644
 
             if (!event.isCancelled()) {
 diff --git a/src/main/java/net/minecraft/server/FoodMetaData.java b/src/main/java/net/minecraft/server/FoodMetaData.java
-index b6e978668..8d95d148f 100644
+index b6e9786..8d95d14 100644
 --- a/src/main/java/net/minecraft/server/FoodMetaData.java
 +++ b/src/main/java/net/minecraft/server/FoodMetaData.java
@@ -65,7 +65,7 @@ public class FoodMetaData {
@ -41,5 +41,5 @@ index b6e978668..8d95d148f 100644
                 this.foodTickTimer = 0;
             }
 -- 
-2.11.0
+2.9.3

--- a/Spigot-Server-Patches/0122-Add-ability-to-configure-frosted_ice-properties.patch
+++ b/Spigot-Server-Patches/0122-Add-ability-to-configure-frosted_ice-properties.patch
@ -1,4 +1,4 @@
-From c12af4cb4b783527f0836975ede8f153756bfb9a Mon Sep 17 00:00:00 2001
+From c461161442b20dbd1470028cb7c1bcae878ada7b Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 21 Apr 2016 23:51:55 -0700
 Subject: [PATCH] Add ability to configure frosted_ice properties
--- a/Spigot-Server-Patches/0123-Vehicle-Event-Cancellation-Changes.patch
+++ b/Spigot-Server-Patches/0123-Vehicle-Event-Cancellation-Changes.patch
@ -1,11 +1,11 @@
-From bfeefa77f4a6e6a10d13927a766fd76a9c492764 Mon Sep 17 00:00:00 2001
+From 6019d4c635401d142da1f6a03287e936109deb9f Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 22 Apr 2016 18:20:05 -0500
 Subject: [PATCH] Vehicle Event Cancellation Changes


 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index ae6638d39..0818ff854 100644
+index ae6638d..0818ff8 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -70,7 +70,7 @@ public abstract class Entity implements ICommandListener {
@ -41,5 +41,5 @@ index ae6638d39..0818ff854 100644
             entity.j = 60;
         }
 -- 
-2.11.0
+2.9.3

--- a/Spigot-Server-Patches/0124-Arrow-pickup-rule-API.patch
+++ b/Spigot-Server-Patches/0124-Arrow-pickup-rule-API.patch
@ -1,4 +1,4 @@
-From f4417caf2ef943f482ec13ee77a622de815326e0 Mon Sep 17 00:00:00 2001
+From 1cc69c3985cea7741cb7d81473f906d4893cdabd Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Fri, 4 Mar 2016 03:16:11 -0500
 Subject: [PATCH] Arrow pickup rule API
--- a/Spigot-Server-Patches/0125-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch
+++ b/Spigot-Server-Patches/0125-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch
@ -1,4 +1,4 @@
-From 050a5a2a340eb01af624a481460399b67380736c Mon Sep 17 00:00:00 2001
+From 7f9704dfc3e3def3783e4822abc1127c909bacee Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 24 Apr 2016 19:49:33 -0500
 Subject: [PATCH] SPIGOT-1401: Fix dispenser, dropper, furnace placement
--- a/Spigot-Server-Patches/0126-Improve-Minecraft-Hopper-Performance.patch
+++ b/Spigot-Server-Patches/0126-Improve-Minecraft-Hopper-Performance.patch
@ -1,4 +1,4 @@
-From 8920ccc3b08ca7c3c6174681d49207bd5a685f17 Mon Sep 17 00:00:00 2001
+From 4dd03e3a236df339d97178a263a89bbdc28880f8 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
@ -86,5 +86,5 @@ index f12bc70..c21c63e 100644
         return this.f > 0;
     }
 -- 
-2.9.3 (Apple Git-75)
+2.9.3

--- a/Spigot-Server-Patches/0127-remove-null-possibility-for-getServer-singleton.patch
+++ b/Spigot-Server-Patches/0127-remove-null-possibility-for-getServer-singleton.patch
@ -1,4 +1,4 @@
-From 64924f639844d7e20e1d4f407aa36fd96d0f3deb Mon Sep 17 00:00:00 2001
+From 88c4726b6ae7c27b7abc04fd43f04540e9609cd1 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 8b94120..db77a88 100644
+index 8eef9c4..631a87f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -51,6 +51,7 @@ import co.aikar.timings.MinecraftTimings; // Paper
@ -25,7 +25,7 @@ index 8b94120..db77a88 100644
         io.netty.util.ResourceLeakDetector.setEnabled( false ); // Spigot - disable
         this.e = proxy;
         this.V = yggdrasilauthenticationservice;
-@@ -1626,7 +1628,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -1625,7 +1627,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
     // CraftBukkit start
     @Deprecated
     public static MinecraftServer getServer() {
--- a/Spigot-Server-Patches/0128-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
+++ b/Spigot-Server-Patches/0128-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
@ -1,4 +1,4 @@
-From 5f0e2802ad1a126163c565c9ab79abf9c087e4e9 Mon Sep 17 00:00:00 2001
+From 6ac78857e5e9c4a35ad096e2d1645444f2f2087a 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 f1823af..130da0e 100644
+index 43e28d6..af173a1 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -597,6 +597,12 @@ public abstract class EntityHuman extends EntityLiving {
@ -30,7 +30,7 @@ index f1823af..130da0e 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 370cb9c..91af48f 100644
+index f542bf4..fbda70a 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 370cb9c..91af48f 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 7ab4f45..8aaea1d 100644
+index 1acb963..ba0e0ef 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -1217,6 +1217,7 @@ public abstract class World implements IBlockAccess {
--- a/Spigot-Server-Patches/0129-LootTable-API-Replenishable-Lootables-Feature.patch
+++ b/Spigot-Server-Patches/0129-LootTable-API-Replenishable-Lootables-Feature.patch
@ -1,4 +1,4 @@
-From f33d6b1eda7baf6811cc5baeb03b4442668cb85c Mon Sep 17 00:00:00 2001
+From f15c9bc823d678e12c8135c4b792e071093e56de 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
--- a/Spigot-Server-Patches/0130-Do-not-load-chunks-for-pathfinding.patch
+++ b/Spigot-Server-Patches/0130-Do-not-load-chunks-for-pathfinding.patch
@ -1,4 +1,4 @@
-From 8190faebc8d1708af184119afe147214abb30d94 Mon Sep 17 00:00:00 2001
+From 6c7b98de5dda2d3970e51bedebf78f4d90d0ef01 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
--- a/Spigot-Server-Patches/0131-Entity-Tracking-Improvements.patch
+++ b/Spigot-Server-Patches/0131-Entity-Tracking-Improvements.patch
@ -1,4 +1,4 @@
-From 4910b3733b5f7cba9d48e801b1e3f6f2f64a84fe Mon Sep 17 00:00:00 2001
+From d397fc54e728d690037c3473cc6cedf0deca9602 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 78b3b3a..4907b24 100644
+index 0818ff8..44c5a25 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 78b3b3a..4907b24 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 91af48f..eec0870 100644
+index fbda70a..c28b4bd 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 {
--- a/Spigot-Server-Patches/0132-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
+++ b/Spigot-Server-Patches/0132-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
@ -1,11 +1,11 @@
-From 8999daf8a073c7e48f7a966c4d055c30a2773304 Mon Sep 17 00:00:00 2001
+From dc76d4eb236cf0021c1e8bffabf83bd8fef04278 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 a3f4c1f..ecf18eb 100644
+index 6d0ea19..5c9ea0f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -215,4 +215,9 @@ public class PaperConfig {
--- a/Spigot-Server-Patches/0133-Do-not-mark-chunks-as-active-for-neighbor-updates.patch
+++ b/Spigot-Server-Patches/0133-Do-not-mark-chunks-as-active-for-neighbor-updates.patch
@ -1,4 +1,4 @@
-From dffb73da6b48f17f82bbc3983a492e16a7097d6b Mon Sep 17 00:00:00 2001
+From 8a7aa0cf58365163b57b6a49683f75a4eed1ae1c 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
--- a/Spigot-Server-Patches/0134-Fix-Chunk-Unload-Queue-Issues.patch
+++ b/Spigot-Server-Patches/0134-Fix-Chunk-Unload-Queue-Issues.patch
@ -1,4 +1,4 @@
-From e2321d441dfdd9d390b0a045f4003bf316b565ff Mon Sep 17 00:00:00 2001
+From 790ff356da80906c321cf7a7058d29f5dfe65082 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
--- a/Spigot-Server-Patches/0135-System-property-for-disabling-watchdoge.patch
+++ b/Spigot-Server-Patches/0135-System-property-for-disabling-watchdoge.patch
@ -1,4 +1,4 @@
-From 5c26aa79b72482d6d92a7dd0bf0966d1930a591d Mon Sep 17 00:00:00 2001
+From f07d7d4911d659540e0174f02c98be3005f84f1e 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
--- a/Spigot-Server-Patches/0136-Optimize-EAR.patch
+++ b/Spigot-Server-Patches/0136-Optimize-EAR.patch
@ -1,4 +1,4 @@
-From 531225cb5aa8c1c3aa9fdcaf6da93e6d938b40a7 Mon Sep 17 00:00:00 2001
+From 8b846e4c369abaf8617f908ab09db22382f4fc9d 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
--- a/Spigot-Server-Patches/0137-Optimize-UserCache-Thread-Safe.patch
+++ b/Spigot-Server-Patches/0137-Optimize-UserCache-Thread-Safe.patch
@ -1,4 +1,4 @@
-From 63b38db571f308ba674ebf72599455094f837f4c Mon Sep 17 00:00:00 2001
+From a7a9c17fd6c4c91cb850a84a011ec9526033280a 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 db77a88..184cb72 100644
+index 631a87f..b3e0ef7 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -523,7 +523,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
--- a/Spigot-Server-Patches/0138-Avoid-blocking-on-Network-Manager-creation.patch
+++ b/Spigot-Server-Patches/0138-Avoid-blocking-on-Network-Manager-creation.patch
@ -1,4 +1,4 @@
-From e9ddf37579577e78b12a5e2d704ff1b898149cdd Mon Sep 17 00:00:00 2001
+From e24671031ec89855f269a9fabf0f6989e172a6aa 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
--- a/Spigot-Server-Patches/0139-Optional-old-TNT-cannon-behaviors.patch
+++ b/Spigot-Server-Patches/0139-Optional-old-TNT-cannon-behaviors.patch
@ -1,11 +1,11 @@
-From c01c75fa73fa69042e41cd421bb744654fb21843 Mon Sep 17 00:00:00 2001
+From 593b506b40495839f284fb7c939abb56d4e66ef7 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 old TNT cannon behaviors


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 4d6a30966..2a4d1dae7 100644
+index 4d6a309..2a4d1da 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -333,4 +333,12 @@ public class PaperWorldConfig {
@ -22,7 +22,7 @@ index 4d6a30966..2a4d1dae7 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/BlockDiodeAbstract.java b/src/main/java/net/minecraft/server/BlockDiodeAbstract.java
-index 59ee13de8..40c9f18bf 100644
+index 59ee13d..40c9f18 100644
 --- a/src/main/java/net/minecraft/server/BlockDiodeAbstract.java
 +++ b/src/main/java/net/minecraft/server/BlockDiodeAbstract.java
@@ -76,6 +76,17 @@ public abstract class BlockDiodeAbstract extends BlockFacingHorizontal {
@ -62,7 +62,7 @@ index 59ee13de8..40c9f18bf 100644
             int i = aenumdirection.length;
 
 diff --git a/src/main/java/net/minecraft/server/BlockRedstoneTorch.java b/src/main/java/net/minecraft/server/BlockRedstoneTorch.java
-index c7e095a11..741236289 100644
+index c7e095a..7412362 100644
 --- a/src/main/java/net/minecraft/server/BlockRedstoneTorch.java
 +++ b/src/main/java/net/minecraft/server/BlockRedstoneTorch.java
@@ -52,6 +52,12 @@ public class BlockRedstoneTorch extends BlockTorch {
@ -110,7 +110,7 @@ index c7e095a11..741236289 100644
         return this.isOn && iblockdata.get(BlockRedstoneTorch.FACING) != enumdirection ? 15 : 0;
     }
 diff --git a/src/main/java/net/minecraft/server/BlockRedstoneWire.java b/src/main/java/net/minecraft/server/BlockRedstoneWire.java
-index 5a0f026b1..20b9465e7 100644
+index 5a0f026..20b9465 100644
 --- a/src/main/java/net/minecraft/server/BlockRedstoneWire.java
 +++ b/src/main/java/net/minecraft/server/BlockRedstoneWire.java
@@ -20,7 +20,7 @@ public class BlockRedstoneWire extends Block {
@ -160,7 +160,7 @@ index 5a0f026b1..20b9465e7 100644
             int i = aenumdirection.length;
 
 diff --git a/src/main/java/net/minecraft/server/BlockTNT.java b/src/main/java/net/minecraft/server/BlockTNT.java
-index 6b6aa892a..5cec4160c 100644
+index 6b6aa89..5cec416 100644
 --- a/src/main/java/net/minecraft/server/BlockTNT.java
 +++ b/src/main/java/net/minecraft/server/BlockTNT.java
@@ -29,7 +29,11 @@ public class BlockTNT extends Block {
@ -190,7 +190,7 @@ index 6b6aa892a..5cec4160c 100644
                 world.addEntity(entitytntprimed);
                 world.a((EntityHuman) null, entitytntprimed.locX, entitytntprimed.locY, entitytntprimed.locZ, SoundEffects.gV, SoundCategory.BLOCKS, 1.0F, 1.0F);
 diff --git a/src/main/java/net/minecraft/server/DispenserRegistry.java b/src/main/java/net/minecraft/server/DispenserRegistry.java
-index dbfb8ab3e..537408a15 100644
+index dbfb8ab..537408a 100644
 --- a/src/main/java/net/minecraft/server/DispenserRegistry.java
 +++ b/src/main/java/net/minecraft/server/DispenserRegistry.java
@@ -481,7 +481,11 @@ public class DispenserRegistry {
@ -207,7 +207,7 @@ index dbfb8ab3e..537408a15 100644
                    world.getServer().getPluginManager().callEvent(event);
                 }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 44c5a253f..fc43007c6 100644
+index 44c5a25..fc43007 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1041,6 +1041,12 @@ public abstract class Entity implements ICommandListener {
@ -262,7 +262,7 @@ index 44c5a253f..fc43007c6 100644
     }
 
 diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-index 307a44c85..bb01929e8 100644
+index 307a44c..bb01929 100644
 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
 +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
@@ -280,4 +280,19 @@ public class EntityFallingBlock extends Entity {
@ -286,7 +286,7 @@ index 307a44c85..bb01929e8 100644
 +    // Paper end
 }
 diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
-index 25e471d37..e796ade87 100644
+index 25e471d..e796ade 100644
 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
@@ -32,6 +32,7 @@ public class EntityTNTPrimed extends Entity {
@ -366,7 +366,7 @@ index 25e471d37..e796ade87 100644
 +    // Paper end
 }
 diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
-index d7bc6a0ed..f2785d86c 100644
+index d7bc6a0..f2785d8 100644
 --- a/src/main/java/net/minecraft/server/Explosion.java
 +++ b/src/main/java/net/minecraft/server/Explosion.java
@@ -149,9 +149,15 @@ public class Explosion {
@ -389,5 +389,5 @@ index d7bc6a0ed..f2785d86c 100644
                             EntityHuman entityhuman = (EntityHuman) entity;
 
 -- 
-2.11.0
+2.9.3

--- a/Spigot-Server-Patches/0140-Faster-redstone-torch-rapid-clock-removal.patch
+++ b/Spigot-Server-Patches/0140-Faster-redstone-torch-rapid-clock-removal.patch
@ -1,4 +1,4 @@
-From e899fdb8ab3eee687e6d42cbbae4b1d59d20d448 Mon Sep 17 00:00:00 2001
+From 2da62ee6e370139908a266eee83f36fea8514d38 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
--- a/Spigot-Server-Patches/0141-Ensure-Chunks-never-ever-load-async.patch
+++ b/Spigot-Server-Patches/0141-Ensure-Chunks-never-ever-load-async.patch
@ -1,4 +1,4 @@
-From 787ac468018431afcfd3a955b13d668b162dd072 Mon Sep 17 00:00:00 2001
+From c066f205180636aecbdbd04e680309b520fdeb66 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
--- a/Spigot-Server-Patches/0142-Add-server-name-parameter.patch
+++ b/Spigot-Server-Patches/0142-Add-server-name-parameter.patch
@ -1,11 +1,11 @@
-From 7fc2f0caeb2545a79414f3a84128ae1499e227cc Mon Sep 17 00:00:00 2001
+From 6514a06e74bd0149b5eaa764b8d865bf7a5f524f 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 30b6f34..507390c 100644
+index 2cafdb8..5992196 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 {
--- a/Spigot-Server-Patches/0143-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
+++ b/Spigot-Server-Patches/0143-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
@ -1,4 +1,4 @@
-From 0d8fec691662cb2933243c2b4ca6841c4637a821 Mon Sep 17 00:00:00 2001
+From a9df4a6ded94b42daabf4caa275f1863ea6dd1f5 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
--- a/Spigot-Server-Patches/0144-Fix-FallingBlocks-being-stuck-on-fences.patch
+++ b/Spigot-Server-Patches/0144-Fix-FallingBlocks-being-stuck-on-fences.patch
@ -1,4 +1,4 @@
-From a8eee67a428457a0fad9e6b9f7033d2c1bd9086e Mon Sep 17 00:00:00 2001
+From da5dea9abb232acfaa7f6c5ced06548b48e28a6e 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
--- a/Spigot-Server-Patches/0145-Make-entities-look-for-hoppers.patch
+++ b/Spigot-Server-Patches/0145-Make-entities-look-for-hoppers.patch
@ -1,4 +1,4 @@
-From 0d4a74cbfb7372f1947cb1840342fbe514c1c732 Mon Sep 17 00:00:00 2001
+From 549a6b4f967073188eb89913933ab995717136b1 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
@ -144,7 +144,7 @@ index 008ed20..b3c1f55 100644
             this.b = i;
             this.c = j;
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 768d89d..b0d91ce 100644
+index fc43007..b2fd599 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -80,6 +80,19 @@ public abstract class Entity implements ICommandListener {
@ -390,5 +390,5 @@ index c21c63e..eaf06dd 100644
 
             if (!list.isEmpty()) {
 -- 
-2.9.3 (Apple Git-75)
+2.9.3

--- a/Spigot-Server-Patches/0146-Delay-Chunk-Unloads-based-on-Player-Movement.patch
+++ b/Spigot-Server-Patches/0146-Delay-Chunk-Unloads-based-on-Player-Movement.patch
@ -1,4 +1,4 @@
-From 1e9573a2fb6f8757a7f5ef540d162b19a40f0e4b Mon Sep 17 00:00:00 2001
+From 8f1616ef8eb8f326fb8b051afe4dee656464f926 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
@ -127,7 +127,7 @@ index d970e2f..d3c454c 100644
 
     }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 98da2ea..ade5ba0 100644
+index 73aee9b..5a44a9f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1557,7 +1557,7 @@ public class CraftWorld implements World {
--- a/Spigot-Server-Patches/0147-Toggleable-Elytra-Wall-Damage.patch
+++ b/Spigot-Server-Patches/0147-Toggleable-Elytra-Wall-Damage.patch
@ -1,4 +1,4 @@
-From 531975286ff007e40bcb53e97afb7a89f7e22c3b Mon Sep 17 00:00:00 2001
+From de55be17f455d2b265e3a81aa8217cc42293fe52 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
@ -7,7 +7,7 @@ Instead of calculating the damage taken from hitting a wall, you can
 disable it in the config.

 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index cda516f6a..965edc99c 100644
+index cda516f..965edc9 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -360,4 +360,9 @@ public class PaperWorldConfig {
@ -21,7 +21,7 @@ index cda516f6a..965edc99c 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 88bc7d81e..7ebdb30ce 100644
+index 88bc7d8..7ebdb30 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -1690,6 +1690,7 @@ public abstract class EntityLiving extends Entity {
@ -41,5 +41,5 @@ index 88bc7d81e..7ebdb30ce 100644
                 if (this.onGround && !this.world.isClientSide) {
                     if (getFlag(7) && !CraftEventFactory.callToggleGlideEvent(this, false).isCancelled()) // CraftBukkit
 -- 
-2.11.0
+2.9.3

--- a/Spigot-Server-Patches/0148-Fix-Double-World-Add-issues.patch
+++ b/Spigot-Server-Patches/0148-Fix-Double-World-Add-issues.patch
@ -1,4 +1,4 @@
-From 82ddaaf2cda9494934ab537cdb655401b7d5a29e Mon Sep 17 00:00:00 2001
+From d807efe6bf06f9b91e4571e155548a2341fa0be9 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 192705f..ef17262 100644
+index 310ab96..1941121 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -525,7 +525,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@ -21,7 +21,7 @@ index 192705f..ef17262 100644
             Iterator iterator = entity.bx().iterator();
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 8aaea1d..e833657 100644
+index ba0e0ef..49351c8 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -1098,6 +1098,7 @@ public abstract class World implements IBlockAccess {
--- a/Spigot-Server-Patches/0149-Fix-Old-Sign-Conversion.patch
+++ b/Spigot-Server-Patches/0149-Fix-Old-Sign-Conversion.patch
@ -1,4 +1,4 @@
-From 6000f8d9744b00e80973c25ab50a4fbfe52eda28 Mon Sep 17 00:00:00 2001
+From 4d9a35fbfa7429023a065e7c18fa8470532f09d0 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 ca63f0d..92d643a 100644
+index a3dc6fe..8364634 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 {
--- a/Spigot-Server-Patches/0150-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
+++ b/Spigot-Server-Patches/0150-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
@ -1,4 +1,4 @@
-From 0b54e3df6edce5b98f2ea62790d0eb1f34e055b8 Mon Sep 17 00:00:00 2001
+From a3db6537bf6a941533e53397ac7f50f8a488a65d 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
--- a/Spigot-Server-Patches/0151-More-informative-vehicle-moved-wrongly-message.patch
+++ b/Spigot-Server-Patches/0151-More-informative-vehicle-moved-wrongly-message.patch
@ -1,11 +1,11 @@
-From 425bfeb499e1f29e74c49fca27ee75fbe7584ce5 Mon Sep 17 00:00:00 2001
+From 243754b72dd8eee923da1e83577624b99b2ee39e 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 3a99311..216f9d0 100644
+index 845c2fb..6cecbe9 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -342,7 +342,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
--- a/Spigot-Server-Patches/0152-Re-track-players-that-dismount-from-other-players.patch
+++ b/Spigot-Server-Patches/0152-Re-track-players-that-dismount-from-other-players.patch
@ -1,4 +1,4 @@
-From 0c118bac13def5894ecd0de2da3c21e8e358728e Mon Sep 17 00:00:00 2001
+From b80ea9a6af52ea19e97e53aa766308d73b11c400 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
--- a/Spigot-Server-Patches/0153-Add-setting-for-proxy-online-mode-status.patch
+++ b/Spigot-Server-Patches/0153-Add-setting-for-proxy-online-mode-status.patch
@ -1,11 +1,11 @@
-From 70af4f6d5854528247d6fa68445f7c926e73379f Mon Sep 17 00:00:00 2001
+From 6fb8548de754057d2575e8247e105adde89ea39c 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 ecf18eb..91546b6 100644
+index 5c9ea0f..b1aa228 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -220,4 +220,9 @@ public class PaperConfig {
@ -33,7 +33,7 @@ index 2ff8a6d..52e7360 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 79ee561..326943d 100644
+index 69d9e75..50ac5bd 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 {
--- a/Spigot-Server-Patches/0154-Optimise-BlockStateEnum-hashCode-and-equals.patch
+++ b/Spigot-Server-Patches/0154-Optimise-BlockStateEnum-hashCode-and-equals.patch
@ -1,4 +1,4 @@
-From 607787d43c469d332ce9b605ab539ca4a0893cd0 Mon Sep 17 00:00:00 2001
+From cf7289da0dd5c5e7e02f8a0f0ef6eab4f0c3d037 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
--- a/Spigot-Server-Patches/0155-Disable-ticking-of-snow-blocks.patch
+++ b/Spigot-Server-Patches/0155-Disable-ticking-of-snow-blocks.patch
@ -1,4 +1,4 @@
-From f4904a19ccbf2be223e4570817b311016e551776 Mon Sep 17 00:00:00 2001
+From fc6639062e9afb2c604d2d60fa7e85051b3d100e 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
--- a/Spigot-Server-Patches/0156-Convert-new-health-to-a-float-during-set.patch
+++ b/Spigot-Server-Patches/0156-Convert-new-health-to-a-float-during-set.patch
@ -1,4 +1,4 @@
-From 0dc7ffdb7fb618484810f936215f90ddfee961c7 Mon Sep 17 00:00:00 2001
+From 0e4a24c077e44e5ef89ad18ff160824a0da98423 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 1 Sep 2016 09:51:31 +0000
 Subject: [PATCH] Convert new health to a float during set
--- a/Spigot-Server-Patches/0157-Fix-AIOOBE-in-inventory-handling.patch
+++ b/Spigot-Server-Patches/0157-Fix-AIOOBE-in-inventory-handling.patch
@ -1,11 +1,11 @@
-From 7bd73694bd50e01b3ac88d7b06a8c68006e128f8 Mon Sep 17 00:00:00 2001
+From 2d42826c205c5d09f44e5f61c803a819e417fbec 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 91364b5b5..4ca942927 100644
+index 6cecbe9..d6f73e5 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1800,7 +1800,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@ -18,5 +18,5 @@ index 91364b5b5..4ca942927 100644
                             } else {
                                 Slot slot = this.player.activeContainer.getSlot(packetplayinwindowclick.b());
 -- 
-2.11.0
+2.9.3

--- a/Spigot-Server-Patches/0158-Configurable-packet-in-spam-threshold.patch
+++ b/Spigot-Server-Patches/0158-Configurable-packet-in-spam-threshold.patch
@ -1,11 +1,11 @@
-From 3d294e4801614aecabf8cdd51824c2d3dde56e69 Mon Sep 17 00:00:00 2001
+From cef88375344db90e9925bba72c3b6ac74941422c 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 91546b6..211b88a 100644
+index b1aa228..3f5b482 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -225,4 +225,13 @@ public class PaperConfig {
@ -23,7 +23,7 @@ index 91546b6..211b88a 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index b8b7142..9da3bc7 100644
+index d6f73e5..abd94bc 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -862,13 +862,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
--- a/Spigot-Server-Patches/0159-Configurable-flying-kick-messages.patch
+++ b/Spigot-Server-Patches/0159-Configurable-flying-kick-messages.patch
@ -1,11 +1,11 @@
-From b2c3de274721f42c2d24cd152655e57232c62758 Mon Sep 17 00:00:00 2001
+From c36c838501c56fc6fa4701f255d7533c9acb703f 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 211b88a..3161dad 100644
+index 3f5b482..7018828 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -234,4 +234,11 @@ public class PaperConfig {
@ -21,7 +21,7 @@ index 211b88a..3161dad 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 9da3bc7..c57ab1a 100644
+index abd94bc..2a1b2cc 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -142,7 +142,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
--- a/Spigot-Server-Patches/0160-Auto-Save-Improvements.patch
+++ b/Spigot-Server-Patches/0160-Auto-Save-Improvements.patch
@ -1,4 +1,4 @@
-From a57aee2b24023bd4c1e0c17e153cc87832faf7b2 Mon Sep 17 00:00:00 2001
+From 50a06f81e5749b70315ab59c6e1995f3d64284d5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 19 Sep 2016 23:16:39 -0400
 Subject: [PATCH] Auto Save Improvements
@ -12,7 +12,7 @@ Re-introduce a cap per tick for auto save (Spigot disabled the vanilla cap) and
 Adds incremental player auto saving too

 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 3161dad45..668b375e1 100644
+index 7018828..dcb971a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -241,4 +241,9 @@ public class PaperConfig {
@ -26,7 +26,7 @@ index 3161dad45..668b375e1 100644
 +    }
 }
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 965edc99c..da530f9aa 100644
+index 965edc9..da530f9 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -2,6 +2,7 @@ package com.destroystokyo.paper;
@ -58,7 +58,7 @@ index 965edc99c..da530f9aa 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 88437d77a..9f7f32dc2 100644
+index 88437d7..9f7f32d 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -960,11 +960,9 @@ public class Chunk {
@ -76,7 +76,7 @@ index 88437d77a..9f7f32dc2 100644
 
     public Random a(long i) {
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 7a56a6416..5c5a56c51 100644
+index 7a56a64..5c5a56c 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -1,5 +1,6 @@
@ -96,7 +96,7 @@ index 7a56a6416..5c5a56c51 100644
                 }
             }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index de2d4394b..4ad336e38 100644
+index de2d439..4ad336e 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -29,6 +29,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -108,7 +108,7 @@ index de2d4394b..4ad336e38 100644
     public final MinecraftServer server;
     public final PlayerInteractManager playerInteractManager;
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 03185f789..85fd972bb 100644
+index b3e0ef7..9cdcdc4 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -117,6 +117,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@ -155,7 +155,7 @@ index 03185f789..85fd972bb 100644
         this.methodProfiler.a("tallying");
         this.h[this.ticks % 100] = System.nanoTime() - i;
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index b14d4cb7f..2f527f6ce 100644
+index b14d4cb..2f527f6 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -330,6 +330,7 @@ public abstract class PlayerList {
@ -192,7 +192,7 @@ index b14d4cb7f..2f527f6ce 100644
     public void addWhitelist(GameProfile gameprofile) {
         this.whitelist.add(new WhiteListEntry(gameprofile));
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 5bf7df7ee..bfa87d73d 100644
+index 5bf7df7..bfa87d7 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -1002,8 +1002,9 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@ -215,5 +215,5 @@ index 5bf7df7ee..bfa87d73d 100644
             timings.worldSaveChunks.startTiming(); // Paper
             chunkproviderserver.a(flag);
 -- 
-2.11.0
+2.9.3

--- a/Spigot-Server-Patches/0161-Chunk-registration-fixes.patch
+++ b/Spigot-Server-Patches/0161-Chunk-registration-fixes.patch
@ -1,4 +1,4 @@
-From 9ff8031d6484e0d3563ee7544fc702ba1fad4506 Mon Sep 17 00:00:00 2001
+From c641b6d0c9afd8a12ef3047d33ef9257335c6eaf 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
--- a/Spigot-Server-Patches/0162-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
+++ b/Spigot-Server-Patches/0162-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
@ -1,4 +1,4 @@
-From 8ebea26c362ecf59f556a57c5cc27c5ffbb36408 Mon Sep 17 00:00:00 2001
+From 8bf43afb65cb7a9a15616cdc1cd9ce1e97a8e08b 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
--- a/Spigot-Server-Patches/0163-Auto-fix-bad-Y-levels-on-player-login.patch
+++ b/Spigot-Server-Patches/0163-Auto-fix-bad-Y-levels-on-player-login.patch
@ -1,4 +1,4 @@
-From 2e713ba23758c2e03a64f0239356407df62e730a Mon Sep 17 00:00:00 2001
+From c9afe3d9ff87d23d46af6f8c7d7f6180bbeafc6d 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 4ad336e38..ab2b4c404 100644
+index 4ad336e..ab2b4c4 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -127,6 +127,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -18,5 +18,5 @@ index 4ad336e38..ab2b4c404 100644
     }
 
 -- 
-2.11.0
+2.9.3

--- a/Spigot-Server-Patches/0164-Raise-string-limit-for-packet-serialization.patch
+++ b/Spigot-Server-Patches/0164-Raise-string-limit-for-packet-serialization.patch
@ -1,4 +1,4 @@
-From ec45ece6dbc0adbc16b500c3ede7b8128383a782 Mon Sep 17 00:00:00 2001
+From 1694ca577a1e9873bca5a85bb5a4d60e061ffe80 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
--- a/Show More
+++ b/Show More