diff --git a/CraftBukkit b/CraftBukkit
index f92e01ba5..f01861f80 160000
--- a/CraftBukkit
+++ b/CraftBukkit
@@ -1 +1 @@
-Subproject commit f92e01ba5cf46c123d0cd38b29321c78706257e0
+Subproject commit f01861f80bc8d903f72210e7d79c90c35473aa74
diff --git a/Spigot b/Spigot
index 1480adb82..a1b8bf353 160000
--- a/Spigot
+++ b/Spigot
@@ -1 +1 @@
-Subproject commit 1480adb82751e38cca5bcc75202ece68277b0113
+Subproject commit a1b8bf3530b3f83fbd94cc8624d05426b0d9de5f
diff --git a/Spigot-Server-Patches/0026-Entity-Origin-API.patch b/Spigot-Server-Patches/0026-Entity-Origin-API.patch
index 38629203a..c766d2f7d 100644
--- a/Spigot-Server-Patches/0026-Entity-Origin-API.patch
+++ b/Spigot-Server-Patches/0026-Entity-Origin-API.patch
@@ -1,11 +1,11 @@
-From 7c3d5f7af8f54b7c9862855660aa765dd93a28ca Mon Sep 17 00:00:00 2001
+From 2dfb9ed0eaf09ab4ca3ea4f5aa68596cdf8c6235 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
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 146223a..7152182 100644
+index 9e84616..2d22842 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -142,6 +142,7 @@ public abstract class Entity implements ICommandListener {
@@ -81,7 +81,7 @@ index 564ea37..1113b1c 100644
  
      public EntityLiving getSource() {
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 0460dc5..87236e8 100644
+index 72d0f5c..3f4bc0f 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -948,6 +948,12 @@ public abstract class World implements IBlockAccess {
@@ -98,10 +98,10 @@ index 0460dc5..87236e8 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 908dcee..f4168c4 100644
+index 8a1df54..f61f6cd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -603,4 +603,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -604,4 +604,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          return spigot;
      }
      // Spigot end
@@ -147,5 +147,5 @@ index c493c9c..93843aa 100644
 +    // Paper end
  }
 -- 
-2.7.4
+2.8.0
 
diff --git a/Spigot-Server-Patches/0056-Add-PlayerInitialSpawnEvent.patch b/Spigot-Server-Patches/0055-Add-PlayerInitialSpawnEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0056-Add-PlayerInitialSpawnEvent.patch
rename to Spigot-Server-Patches/0055-Add-PlayerInitialSpawnEvent.patch
index 2a2e43993..99832fcf7 100644
--- a/Spigot-Server-Patches/0056-Add-PlayerInitialSpawnEvent.patch
+++ b/Spigot-Server-Patches/0055-Add-PlayerInitialSpawnEvent.patch
@@ -1,4 +1,4 @@
-From 04ef494aa58524008dad1d2b8402234c5c109ac2 Mon Sep 17 00:00:00 2001
+From 4950c89748beaefcc27691878b089964e324068d Mon Sep 17 00:00:00 2001
 From: Steve Anton <anxuiz.nx@gmail.com>
 Date: Thu, 3 Mar 2016 00:09:38 -0600
 Subject: [PATCH] Add PlayerInitialSpawnEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerInitialSpawnEvent
 For modifying a player's initial spawn location as they join the server
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index ef76652..b636a71 100644
+index 52bece0..a6a4671 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -99,6 +99,21 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0055-EAR-Fix-bug-with-teleporting-entities.patch b/Spigot-Server-Patches/0055-EAR-Fix-bug-with-teleporting-entities.patch
deleted file mode 100644
index 65b7591f5..000000000
--- a/Spigot-Server-Patches/0055-EAR-Fix-bug-with-teleporting-entities.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 1d3116bd0f65f50f5b1fbfffa4d042cbc85cbb98 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Thu, 3 Mar 2016 00:07:23 -0600
-Subject: [PATCH] EAR: Fix bug with teleporting entities
-
-[17:53:15] <Aikar> had a reproduceable issue of losing entities on teleport, now resolved
-https://hub.spigotmc.org/stash/projects/SPIGOT/repos/spigot/pull-requests/52/overview
-
-diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 782abd6..359e18e 100644
---- a/src/main/java/net/minecraft/server/Entity.java
-+++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -119,9 +119,17 @@ public abstract class Entity implements ICommandListener {
-     private static final DataWatcherObject<Boolean> aA = DataWatcher.a(Entity.class, DataWatcherRegistry.h);
-     private static final DataWatcherObject<Boolean> aB = DataWatcher.a(Entity.class, DataWatcherRegistry.h);
-     public boolean aa;
--    public int ab;
--    public int ac;
--    public int ad;
-+    // Paper start - EAR: Fix bug with teleporting entities
-+    public boolean isAddedToChunk() {
-+        int chunkX = MathHelper.floor(locX / 16.0D);
-+        int chunkY = MathHelper.floor(locY / 16.0D);
-+        int chunkZ = MathHelper.floor(locZ / 16.0D);
-+        return aa && getChunkX() == chunkX && getChunkY() == chunkY || getChunkZ() == chunkZ;
-+    }
-+    public int ab; public int getChunkX() { return ab; }
-+    public int ac; public int getChunkY() { return ac; }
-+    public int ad; public int getChunkZ() { return ad; }
-+    // Paper end
-     public boolean ah;
-     public boolean impulse;
-     public int portalCooldown;
-diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index bffa3ac..1a1f082 100644
---- a/src/main/java/net/minecraft/server/World.java
-+++ b/src/main/java/net/minecraft/server/World.java
-@@ -1623,7 +1623,7 @@ public abstract class World implements IBlockAccess {
-         byte b0 = 32;
- 
-         // Spigot start
--        if (!org.spigotmc.ActivationRange.checkIfActive(entity)) {
-+        if (flag && !org.spigotmc.ActivationRange.checkIfActive(entity)) {
-             entity.ticksLived++;
-             entity.inactiveTick();
-         } else {
-diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index f0d3a19..a1bd1a6 100644
---- a/src/main/java/org/spigotmc/ActivationRange.java
-+++ b/src/main/java/org/spigotmc/ActivationRange.java
-@@ -249,7 +249,7 @@ public class ActivationRange
-     {
-         // Never safe to skip fireworks or entities not yet added to chunk
-         // PAIL: inChunk
--        if ( !entity.aa || entity instanceof EntityFireworks ) {
-+        if ( !entity.isAddedToChunk() || entity instanceof EntityFireworks ) { // Paper - EAR: Fix bug with teleporting entities
-             return true;
-         }
- 
--- 
-2.8.0
-
diff --git a/Spigot-Server-Patches/0058-Disable-chest-cat-detection.patch b/Spigot-Server-Patches/0056-Disable-chest-cat-detection.patch
similarity index 96%
rename from Spigot-Server-Patches/0058-Disable-chest-cat-detection.patch
rename to Spigot-Server-Patches/0056-Disable-chest-cat-detection.patch
index 4c838f7f3..1851786ab 100644
--- a/Spigot-Server-Patches/0058-Disable-chest-cat-detection.patch
+++ b/Spigot-Server-Patches/0056-Disable-chest-cat-detection.patch
@@ -1,4 +1,4 @@
-From f34313fe66f90655773a67b57c2975136ed7197e Mon Sep 17 00:00:00 2001
+From 1d96d8947dd9dcc848e7c9be4fb685d68cd04ddf Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 01:13:45 -0600
 Subject: [PATCH] Disable chest cat detection
@@ -35,5 +35,5 @@ index 2fb9c76..5143d9e 100644
  
          EntityOcelot entityocelot;
 -- 
-2.7.4
+2.8.0
 
diff --git a/Spigot-Server-Patches/0059-Ensure-commands-are-not-ran-async.patch b/Spigot-Server-Patches/0057-Ensure-commands-are-not-ran-async.patch
similarity index 97%
rename from Spigot-Server-Patches/0059-Ensure-commands-are-not-ran-async.patch
rename to Spigot-Server-Patches/0057-Ensure-commands-are-not-ran-async.patch
index d8779cc15..faf9d738b 100644
--- a/Spigot-Server-Patches/0059-Ensure-commands-are-not-ran-async.patch
+++ b/Spigot-Server-Patches/0057-Ensure-commands-are-not-ran-async.patch
@@ -1,4 +1,4 @@
-From a4eaef38bd59f6b140348788f2e2e5956dc958fc Mon Sep 17 00:00:00 2001
+From dc3f5c3a2b42709931b94412de62e201ea099943 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 19ef641..32ea702 100644
+index 3199c66..42456b6 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1265,6 +1265,29 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
diff --git a/Spigot-Server-Patches/0057-Process-Entity-Chunk-Registration-on-Teleport.patch b/Spigot-Server-Patches/0057-Process-Entity-Chunk-Registration-on-Teleport.patch
deleted file mode 100644
index 2da84b4cb..000000000
--- a/Spigot-Server-Patches/0057-Process-Entity-Chunk-Registration-on-Teleport.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 8cdfbcfe70be7d3748aa4b92e6a0a1bf48a03e51 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Thu, 3 Mar 2016 00:12:23 -0600
-Subject: [PATCH] Process Entity Chunk Registration on Teleport
-
-Fixes many issues with entities not being properly "switched" to their new chunk on teleport
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index f4168c4..b422b75 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -242,6 +242,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
-         // entity.world = ((CraftWorld) location.getWorld()).getHandle();
-         // Spigot end
-         entity.setLocation(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());
-+        entity.world.entityJoinedWorld(entity, false); // Paper - Fix issues with entities not being switched to their new chunk
-         // entity.setLocation() throws no event, and so cannot be cancelled
-         return true;
-     }
--- 
-2.8.0
-
diff --git a/Spigot-Server-Patches/0060-All-chunks-are-slime-spawn-chunks-toggle.patch b/Spigot-Server-Patches/0058-All-chunks-are-slime-spawn-chunks-toggle.patch
similarity index 95%
rename from Spigot-Server-Patches/0060-All-chunks-are-slime-spawn-chunks-toggle.patch
rename to Spigot-Server-Patches/0058-All-chunks-are-slime-spawn-chunks-toggle.patch
index b61284d7d..a3b221865 100644
--- a/Spigot-Server-Patches/0060-All-chunks-are-slime-spawn-chunks-toggle.patch
+++ b/Spigot-Server-Patches/0058-All-chunks-are-slime-spawn-chunks-toggle.patch
@@ -1,4 +1,4 @@
-From bbb75b5bf0779e9a2f7c2033582a58de026b30ac Mon Sep 17 00:00:00 2001
+From 727a1539c7a36c542d38491f6e6df38a63df04ae Mon Sep 17 00:00:00 2001
 From: vemacs <d@nkmem.es>
 Date: Thu, 3 Mar 2016 01:19:22 -0600
 Subject: [PATCH] All chunks are slime spawn chunks toggle
@@ -33,5 +33,5 @@ index fbefa3e..da73220 100644
                  }
              }
 -- 
-2.7.4
+2.8.0
 
diff --git a/Spigot-Server-Patches/0061-Add-Location-support-to-tab-completers-vanilla-featu.patch b/Spigot-Server-Patches/0059-Add-Location-support-to-tab-completers-vanilla-featu.patch
similarity index 99%
rename from Spigot-Server-Patches/0061-Add-Location-support-to-tab-completers-vanilla-featu.patch
rename to Spigot-Server-Patches/0059-Add-Location-support-to-tab-completers-vanilla-featu.patch
index a95503bfe..1f8d08274 100644
--- a/Spigot-Server-Patches/0061-Add-Location-support-to-tab-completers-vanilla-featu.patch
+++ b/Spigot-Server-Patches/0059-Add-Location-support-to-tab-completers-vanilla-featu.patch
@@ -1,4 +1,4 @@
-From db45502c0c844aea58ac4edf86dc3d1da394d429 Mon Sep 17 00:00:00 2001
+From 722700414bcbb589d78ddd5fd87e32faa8146760 Mon Sep 17 00:00:00 2001
 From: DemonWav <demonwav@gmail.com>
 Date: Thu, 3 Mar 2016 01:44:39 -0600
 Subject: [PATCH] Add Location support to tab completers (vanilla feature
@@ -151,5 +151,5 @@ index 100d84a..a40218c 100644
  
      public static CommandSender lastSender = null; // Nasty :(
 -- 
-2.7.4
+2.8.0
 
diff --git a/Spigot-Server-Patches/0062-Made-EntityDismountEvent-Cancellable.patch b/Spigot-Server-Patches/0060-Made-EntityDismountEvent-Cancellable.patch
similarity index 89%
rename from Spigot-Server-Patches/0062-Made-EntityDismountEvent-Cancellable.patch
rename to Spigot-Server-Patches/0060-Made-EntityDismountEvent-Cancellable.patch
index 3286dd654..f9572bd03 100644
--- a/Spigot-Server-Patches/0062-Made-EntityDismountEvent-Cancellable.patch
+++ b/Spigot-Server-Patches/0060-Made-EntityDismountEvent-Cancellable.patch
@@ -1,11 +1,11 @@
-From 43e30251a99b69cfd0da8a5fde044b124b344585 Mon Sep 17 00:00:00 2001
+From 3034ddd456b81eafd9a8ef34f9dfa72d8f6243af Mon Sep 17 00:00:00 2001
 From: Nik Gil <nikmanG@users.noreply.github.com>
 Date: Thu, 3 Mar 2016 04:04:19 -0600
 Subject: [PATCH] Made EntityDismountEvent Cancellable
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 359e18e..282a14f 100644
+index 782abd6..51b2a4f 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -38,6 +38,7 @@ import org.bukkit.craftbukkit.event.CraftEventFactory;
@@ -16,7 +16,7 @@ index 359e18e..282a14f 100644
  // CraftBukkit end
  
  public abstract class Entity implements ICommandListener {
-@@ -1750,6 +1751,11 @@ public abstract class Entity implements ICommandListener {
+@@ -1742,6 +1743,11 @@ public abstract class Entity implements ICommandListener {
              }
              // CraftBukkit end
              Bukkit.getPluginManager().callEvent( new org.spigotmc.event.entity.EntityDismountEvent(entity.getBukkitEntity(), this.getBukkitEntity())); // Spigot
diff --git a/Spigot-Server-Patches/0063-Optimize-Pathfinding.patch b/Spigot-Server-Patches/0061-Optimize-Pathfinding.patch
similarity index 96%
rename from Spigot-Server-Patches/0063-Optimize-Pathfinding.patch
rename to Spigot-Server-Patches/0061-Optimize-Pathfinding.patch
index ef273da80..5c043b0f3 100644
--- a/Spigot-Server-Patches/0063-Optimize-Pathfinding.patch
+++ b/Spigot-Server-Patches/0061-Optimize-Pathfinding.patch
@@ -1,4 +1,4 @@
-From 996f0b89d6d0fb777228a3de783c06a64a3d83cc Mon Sep 17 00:00:00 2001
+From b83dba2e70f1396521b6b36f57f2d63753ed73e7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 02:02:07 -0600
 Subject: [PATCH] Optimize Pathfinding
diff --git a/Spigot-Server-Patches/0064-Optimize-getBlockData.patch b/Spigot-Server-Patches/0062-Optimize-getBlockData.patch
similarity index 94%
rename from Spigot-Server-Patches/0064-Optimize-getBlockData.patch
rename to Spigot-Server-Patches/0062-Optimize-getBlockData.patch
index 898190532..ff82560e5 100644
--- a/Spigot-Server-Patches/0064-Optimize-getBlockData.patch
+++ b/Spigot-Server-Patches/0062-Optimize-getBlockData.patch
@@ -1,4 +1,4 @@
-From b306fe77bc8bd4a8236521c184d12201e221a73f Mon Sep 17 00:00:00 2001
+From 80bdfb8b3bf944ed05a1c28816568bde9e05709c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 02:07:55 -0600
 Subject: [PATCH] Optimize getBlockData
diff --git a/Spigot-Server-Patches/0065-Avoid-hopper-searches-if-there-are-no-items.patch b/Spigot-Server-Patches/0063-Avoid-hopper-searches-if-there-are-no-items.patch
similarity index 98%
rename from Spigot-Server-Patches/0065-Avoid-hopper-searches-if-there-are-no-items.patch
rename to Spigot-Server-Patches/0063-Avoid-hopper-searches-if-there-are-no-items.patch
index 614a169f1..1a3fd8a17 100644
--- a/Spigot-Server-Patches/0065-Avoid-hopper-searches-if-there-are-no-items.patch
+++ b/Spigot-Server-Patches/0063-Avoid-hopper-searches-if-there-are-no-items.patch
@@ -1,4 +1,4 @@
-From ae2b4a0ed69035e5b3ecab62b4e522cff5b196a0 Mon Sep 17 00:00:00 2001
+From 4b2dc270961fdd134dd221d6467e838fbdddf3a4 Mon Sep 17 00:00:00 2001
 From: CullanP <cullanpage@gmail.com>
 Date: Thu, 3 Mar 2016 02:13:38 -0600
 Subject: [PATCH] Avoid hopper searches if there are no items
diff --git a/Spigot-Server-Patches/0066-Expose-server-CommandMap.patch b/Spigot-Server-Patches/0064-Expose-server-CommandMap.patch
similarity index 90%
rename from Spigot-Server-Patches/0066-Expose-server-CommandMap.patch
rename to Spigot-Server-Patches/0064-Expose-server-CommandMap.patch
index c68f42384..856b760a9 100644
--- a/Spigot-Server-Patches/0066-Expose-server-CommandMap.patch
+++ b/Spigot-Server-Patches/0064-Expose-server-CommandMap.patch
@@ -1,4 +1,4 @@
-From e758d7754c164a0d94cc2351394f13e83cd5b34f Mon Sep 17 00:00:00 2001
+From 5bde9bfcd1cd72d14b7aafcf5f2591a93df7cf25 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 3 Mar 2016 02:15:57 -0600
 Subject: [PATCH] Expose server CommandMap
diff --git a/Spigot-Server-Patches/0067-Be-a-bit-more-informative-in-maxHealth-exception.patch b/Spigot-Server-Patches/0065-Be-a-bit-more-informative-in-maxHealth-exception.patch
similarity index 95%
rename from Spigot-Server-Patches/0067-Be-a-bit-more-informative-in-maxHealth-exception.patch
rename to Spigot-Server-Patches/0065-Be-a-bit-more-informative-in-maxHealth-exception.patch
index 4c2199797..887e97f2d 100644
--- a/Spigot-Server-Patches/0067-Be-a-bit-more-informative-in-maxHealth-exception.patch
+++ b/Spigot-Server-Patches/0065-Be-a-bit-more-informative-in-maxHealth-exception.patch
@@ -1,4 +1,4 @@
-From 306e73f4d5861978df54525515967bc218842bfc Mon Sep 17 00:00:00 2001
+From 61c9bda0f6b7c28ddf1b0d2fc158b8ade028ca57 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 3 Mar 2016 02:18:39 -0600
 Subject: [PATCH] Be a bit more informative in maxHealth exception
diff --git a/Spigot-Server-Patches/0068-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch b/Spigot-Server-Patches/0066-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
similarity index 96%
rename from Spigot-Server-Patches/0068-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
rename to Spigot-Server-Patches/0066-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
index 627908bab..964bab156 100644
--- a/Spigot-Server-Patches/0068-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
+++ b/Spigot-Server-Patches/0066-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
@@ -1,4 +1,4 @@
-From 72d50d65d74b4b9c801ff77f91e2c2c88527caa8 Mon Sep 17 00:00:00 2001
+From 90a8ebf1d6322be8e53bd6a8f517a57e23e29d2b Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 3 Mar 2016 02:21:58 -0600
 Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
diff --git a/Spigot-Server-Patches/0069-Player-Tab-List-and-Title-APIs.patch b/Spigot-Server-Patches/0067-Player-Tab-List-and-Title-APIs.patch
similarity index 99%
rename from Spigot-Server-Patches/0069-Player-Tab-List-and-Title-APIs.patch
rename to Spigot-Server-Patches/0067-Player-Tab-List-and-Title-APIs.patch
index 221f5bdb8..bf305df0a 100644
--- a/Spigot-Server-Patches/0069-Player-Tab-List-and-Title-APIs.patch
+++ b/Spigot-Server-Patches/0067-Player-Tab-List-and-Title-APIs.patch
@@ -1,4 +1,4 @@
-From e46e17e08a42764c03959f5667d23193d70a49b0 Mon Sep 17 00:00:00 2001
+From 5002ff27721abc44afe0cf1616fcc29dd48897b4 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Thu, 3 Mar 2016 02:32:10 -0600
 Subject: [PATCH] Player Tab List and Title APIs
diff --git a/Spigot-Server-Patches/0070-Ensure-inv-drag-is-in-bounds.patch b/Spigot-Server-Patches/0068-Ensure-inv-drag-is-in-bounds.patch
similarity index 91%
rename from Spigot-Server-Patches/0070-Ensure-inv-drag-is-in-bounds.patch
rename to Spigot-Server-Patches/0068-Ensure-inv-drag-is-in-bounds.patch
index d4c8089c5..3b52bce70 100644
--- a/Spigot-Server-Patches/0070-Ensure-inv-drag-is-in-bounds.patch
+++ b/Spigot-Server-Patches/0068-Ensure-inv-drag-is-in-bounds.patch
@@ -1,4 +1,4 @@
-From 1299d70ab8048f1fb255ff46acce134a8c1f75ee Mon Sep 17 00:00:00 2001
+From b2f9be4f53440860fd75b41484b8347f5e23d231 Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:33:53 -0600
 Subject: [PATCH] Ensure inv drag is in bounds
diff --git a/Spigot-Server-Patches/0071-Change-implementation-of-tile-entity-removal-list.patch b/Spigot-Server-Patches/0069-Change-implementation-of-tile-entity-removal-list.patch
similarity index 70%
rename from Spigot-Server-Patches/0071-Change-implementation-of-tile-entity-removal-list.patch
rename to Spigot-Server-Patches/0069-Change-implementation-of-tile-entity-removal-list.patch
index 48595a4d9..1413d0494 100644
--- a/Spigot-Server-Patches/0071-Change-implementation-of-tile-entity-removal-list.patch
+++ b/Spigot-Server-Patches/0069-Change-implementation-of-tile-entity-removal-list.patch
@@ -1,11 +1,28 @@
-From 3693b4666afcd63dcbcfad3b2973c329096fbe5b Mon Sep 17 00:00:00 2001
+From 41842af752e620167cec3eb7a00c4dbbf5af8e12 Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:39:54 -0600
 Subject: [PATCH] Change implementation of (tile)entity removal list
 
 
+diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
+index 51b2a4f..5c3f179 100644
+--- a/src/main/java/net/minecraft/server/Entity.java
++++ b/src/main/java/net/minecraft/server/Entity.java
+@@ -120,9 +120,9 @@ public abstract class Entity implements ICommandListener {
+     private static final DataWatcherObject<Boolean> aA = DataWatcher.a(Entity.class, DataWatcherRegistry.h);
+     private static final DataWatcherObject<Boolean> aB = DataWatcher.a(Entity.class, DataWatcherRegistry.h);
+     public boolean aa;
+-    public int ab;
+-    public int ac;
+-    public int ad;
++    public int ab;public int getChunkX() { return ab; } // Paper
++    public int ac;public int getChunkY() { return ac; } // Paper
++    public int ad;public int getChunkZ() { return ad; } // Paper
+     public boolean ah;
+     public boolean impulse;
+     public int portalCooldown;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index bffa3ac..ad5c96c 100644
+index 1a1f082..e676482 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -30,6 +30,11 @@ import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
diff --git a/Spigot-Server-Patches/0072-Add-configurable-portal-search-radius.patch b/Spigot-Server-Patches/0070-Add-configurable-portal-search-radius.patch
similarity index 97%
rename from Spigot-Server-Patches/0072-Add-configurable-portal-search-radius.patch
rename to Spigot-Server-Patches/0070-Add-configurable-portal-search-radius.patch
index d20fad28e..11039356f 100644
--- a/Spigot-Server-Patches/0072-Add-configurable-portal-search-radius.patch
+++ b/Spigot-Server-Patches/0070-Add-configurable-portal-search-radius.patch
@@ -1,4 +1,4 @@
-From 94d4c317f969d0991de45bf7862c4f3dff46eed0 Mon Sep 17 00:00:00 2001
+From e2ad3d929d3a20da24373bcb2a50363d8bd404e9 Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:46:17 -0600
 Subject: [PATCH] Add configurable portal search radius
@@ -54,5 +54,5 @@ index 1d5dce1..7ca2617 100644
      private boolean canCreatePortal = true;
  
 -- 
-2.7.4
+2.8.0
 
diff --git a/Spigot-Server-Patches/0073-Add-velocity-warnings.patch b/Spigot-Server-Patches/0071-Add-velocity-warnings.patch
similarity index 92%
rename from Spigot-Server-Patches/0073-Add-velocity-warnings.patch
rename to Spigot-Server-Patches/0071-Add-velocity-warnings.patch
index 65388647e..b885961ca 100644
--- a/Spigot-Server-Patches/0073-Add-velocity-warnings.patch
+++ b/Spigot-Server-Patches/0071-Add-velocity-warnings.patch
@@ -1,11 +1,11 @@
-From b9716afbe619e7b425cc2a9161b709555d39ac2f Mon Sep 17 00:00:00 2001
+From c7a94ca8f1a2da4eebdd69ccc8aa5112605e0d21 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 b422b75..d24b81b 100644
+index f61f6cd..e8a5fdf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -204,6 +204,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/Spigot-Server-Patches/0074-Fix-inter-world-teleportation-glitches.patch b/Spigot-Server-Patches/0072-Fix-inter-world-teleportation-glitches.patch
similarity index 97%
rename from Spigot-Server-Patches/0074-Fix-inter-world-teleportation-glitches.patch
rename to Spigot-Server-Patches/0072-Fix-inter-world-teleportation-glitches.patch
index 78086d206..60e6d393d 100644
--- a/Spigot-Server-Patches/0074-Fix-inter-world-teleportation-glitches.patch
+++ b/Spigot-Server-Patches/0072-Fix-inter-world-teleportation-glitches.patch
@@ -1,4 +1,4 @@
-From a92e9dc6bd64f98155825c6c51c3bce4c85de650 Mon Sep 17 00:00:00 2001
+From 1229f0d2029b9c393be5b101cd3ee8c3e5951899 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Thu, 3 Mar 2016 02:50:31 -0600
 Subject: [PATCH] Fix inter-world teleportation glitches
@@ -39,5 +39,5 @@ index 609f7ea..2f86dd3 100644
          return true;
      }
 -- 
-2.7.4
+2.8.0
 
diff --git a/Spigot-Server-Patches/0075-Add-exception-reporting-event.patch b/Spigot-Server-Patches/0073-Add-exception-reporting-event.patch
similarity index 99%
rename from Spigot-Server-Patches/0075-Add-exception-reporting-event.patch
rename to Spigot-Server-Patches/0073-Add-exception-reporting-event.patch
index d90e4273c..86a2f6232 100644
--- a/Spigot-Server-Patches/0075-Add-exception-reporting-event.patch
+++ b/Spigot-Server-Patches/0073-Add-exception-reporting-event.patch
@@ -1,4 +1,4 @@
-From 56f60ae2d3c9494957214772ea557b4e3d8dc608 Mon Sep 17 00:00:00 2001
+From 4751d36b42803328e4a375bf9c4959404b2febd5 Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 03:15:41 -0600
 Subject: [PATCH] Add exception reporting event
@@ -292,7 +292,7 @@ index 320e52e..d40257f 100644
              }
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index ad5c96c..ad7a81c 100644
+index e676482..2551f48 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1,5 +1,7 @@
diff --git a/Spigot-Server-Patches/0076-Speedup-BlockPos-by-fixing-inlining.patch b/Spigot-Server-Patches/0074-Speedup-BlockPos-by-fixing-inlining.patch
similarity index 99%
rename from Spigot-Server-Patches/0076-Speedup-BlockPos-by-fixing-inlining.patch
rename to Spigot-Server-Patches/0074-Speedup-BlockPos-by-fixing-inlining.patch
index 01c2e51ea..e1802fa14 100644
--- a/Spigot-Server-Patches/0076-Speedup-BlockPos-by-fixing-inlining.patch
+++ b/Spigot-Server-Patches/0074-Speedup-BlockPos-by-fixing-inlining.patch
@@ -1,4 +1,4 @@
-From b0b1a8be6b6d96d0077f999fbfea9f5ddb3665d6 Mon Sep 17 00:00:00 2001
+From 4cf0665023385a111f16d8f9d2407c739be84a63 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Mon, 7 Mar 2016 12:51:01 -0700
 Subject: [PATCH] Speedup BlockPos by fixing inlining
diff --git a/Spigot-Server-Patches/0077-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch b/Spigot-Server-Patches/0075-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
similarity index 95%
rename from Spigot-Server-Patches/0077-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
rename to Spigot-Server-Patches/0075-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
index 0bfd9fb78..4d1e28cbd 100644
--- a/Spigot-Server-Patches/0077-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
+++ b/Spigot-Server-Patches/0075-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
@@ -1,4 +1,4 @@
-From 67810a958994d256c3711da836fdb98d41e477eb Mon Sep 17 00:00:00 2001
+From a3a785b6ceb2e53bf5bbf386a676ee4dedee1647 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Tue, 8 Mar 2016 18:28:43 -0800
 Subject: [PATCH] Don't nest if we don't need to when cerealising text
diff --git a/Spigot-Server-Patches/0078-Disable-Scoreboards-for-non-players-by-default.patch b/Spigot-Server-Patches/0076-Disable-Scoreboards-for-non-players-by-default.patch
similarity index 93%
rename from Spigot-Server-Patches/0078-Disable-Scoreboards-for-non-players-by-default.patch
rename to Spigot-Server-Patches/0076-Disable-Scoreboards-for-non-players-by-default.patch
index 922be2217..b3938196d 100644
--- a/Spigot-Server-Patches/0078-Disable-Scoreboards-for-non-players-by-default.patch
+++ b/Spigot-Server-Patches/0076-Disable-Scoreboards-for-non-players-by-default.patch
@@ -1,4 +1,4 @@
-From 474aba78994def117b1c40b2565d8520173af652 Mon Sep 17 00:00:00 2001
+From b4e8b20eff4c996e4b10d937e0039a622f8d411e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 8 Mar 2016 23:25:45 -0500
 Subject: [PATCH] Disable Scoreboards for non players by default
@@ -37,10 +37,10 @@ index b044f33..1758a56 100644
  
                          if (scoreboard.addPlayerToTeam(s2, s)) {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 282a14f..3ded885 100644
+index 5c3f179..03944dd 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1859,6 +1859,7 @@ public abstract class Entity implements ICommandListener {
+@@ -1851,6 +1851,7 @@ public abstract class Entity implements ICommandListener {
      }
  
      public ScoreboardTeamBase aO() {
@@ -49,5 +49,5 @@ index 282a14f..3ded885 100644
      }
  
 -- 
-2.7.4
+2.8.0
 
diff --git a/Spigot-Server-Patches/0079-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/Spigot-Server-Patches/0077-Add-methods-for-working-with-arrows-stuck-in-living-.patch
similarity index 96%
rename from Spigot-Server-Patches/0079-Add-methods-for-working-with-arrows-stuck-in-living-.patch
rename to Spigot-Server-Patches/0077-Add-methods-for-working-with-arrows-stuck-in-living-.patch
index 770610863..f8f57ee50 100644
--- a/Spigot-Server-Patches/0079-Add-methods-for-working-with-arrows-stuck-in-living-.patch
+++ b/Spigot-Server-Patches/0077-Add-methods-for-working-with-arrows-stuck-in-living-.patch
@@ -1,4 +1,4 @@
-From 3d8ddadac2aa4be6d132d2242c814afda0930d5c Mon Sep 17 00:00:00 2001
+From b80588d1857fc4e9c086c1f7ba8b45639f9819e9 Mon Sep 17 00:00:00 2001
 From: mrapple <tony@oc.tc>
 Date: Sun, 25 Nov 2012 13:43:39 -0600
 Subject: [PATCH] Add methods for working with arrows stuck in living entities
diff --git a/Spigot-Server-Patches/0080-Complete-resource-pack-API.patch b/Spigot-Server-Patches/0078-Complete-resource-pack-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0080-Complete-resource-pack-API.patch
rename to Spigot-Server-Patches/0078-Complete-resource-pack-API.patch
index 5e0723c70..6a3f7cbdb 100644
--- a/Spigot-Server-Patches/0080-Complete-resource-pack-API.patch
+++ b/Spigot-Server-Patches/0078-Complete-resource-pack-API.patch
@@ -1,4 +1,4 @@
-From 16df8534ab49f0dfe02976ca774fc7b3e66b8550 Mon Sep 17 00:00:00 2001
+From 6787cb91302117d42751fccd63a7fa3a4195e0c4 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 4 Apr 2015 23:17:52 -0400
 Subject: [PATCH] Complete resource pack API
@@ -18,7 +18,7 @@ index 04e52d2..2a14e1a 100644
  
      public PacketPlayInResourcePackStatus() {}
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 32ea702..82ba20a 100644
+index 42456b6..ff64891 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1026,7 +1026,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
diff --git a/Spigot-Server-Patches/0081-Re-add-Spigot-s-hopper-check-feature.patch b/Spigot-Server-Patches/0079-Re-add-Spigot-s-hopper-check-feature.patch
similarity index 95%
rename from Spigot-Server-Patches/0081-Re-add-Spigot-s-hopper-check-feature.patch
rename to Spigot-Server-Patches/0079-Re-add-Spigot-s-hopper-check-feature.patch
index b08ccaad9..244bcc440 100644
--- a/Spigot-Server-Patches/0081-Re-add-Spigot-s-hopper-check-feature.patch
+++ b/Spigot-Server-Patches/0079-Re-add-Spigot-s-hopper-check-feature.patch
@@ -1,4 +1,4 @@
-From 01031212772eb916a2c3f5d05c30f93302c019d3 Mon Sep 17 00:00:00 2001
+From 35f4f999fb757889ec74b2ad15f51eb920c87395 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Sat, 12 Mar 2016 13:37:50 -0600
 Subject: [PATCH] Re-add Spigot's hopper-check feature
@@ -36,5 +36,5 @@ index b2f0c18..243da36 100644
              return false;
          } else {
 -- 
-2.7.4
+2.8.0
 
diff --git a/Spigot-Server-Patches/0082-Chunk-save-queue-improvements.patch b/Spigot-Server-Patches/0080-Chunk-save-queue-improvements.patch
similarity index 99%
rename from Spigot-Server-Patches/0082-Chunk-save-queue-improvements.patch
rename to Spigot-Server-Patches/0080-Chunk-save-queue-improvements.patch
index 61e4b4c9f..2a2560b8f 100644
--- a/Spigot-Server-Patches/0082-Chunk-save-queue-improvements.patch
+++ b/Spigot-Server-Patches/0080-Chunk-save-queue-improvements.patch
@@ -1,4 +1,4 @@
-From af642f58324bdab0a5c1b9d2706443b192b7e13e Mon Sep 17 00:00:00 2001
+From c5a2e980720023ddce60554a2280e1ea7a89f191 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 4 Mar 2016 18:18:37 -0600
 Subject: [PATCH] Chunk save queue improvements
diff --git a/Spigot-Server-Patches/0083-Chunk-Save-Reattempt.patch b/Spigot-Server-Patches/0081-Chunk-Save-Reattempt.patch
similarity index 97%
rename from Spigot-Server-Patches/0083-Chunk-Save-Reattempt.patch
rename to Spigot-Server-Patches/0081-Chunk-Save-Reattempt.patch
index 62c8ea8a1..1e6f19b70 100644
--- a/Spigot-Server-Patches/0083-Chunk-Save-Reattempt.patch
+++ b/Spigot-Server-Patches/0081-Chunk-Save-Reattempt.patch
@@ -1,4 +1,4 @@
-From 92e6b36b911d23f516db64a05b72e25b40dbc5c0 Mon Sep 17 00:00:00 2001
+From fe99af7b10b4fa0168b15e93249fdf4b3a8b2aff Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 4 Mar 2013 23:46:10 -0500
 Subject: [PATCH] Chunk Save Reattempt
diff --git a/Spigot-Server-Patches/0084-Default-loading-permissions.yml-before-plugins.patch b/Spigot-Server-Patches/0082-Default-loading-permissions.yml-before-plugins.patch
similarity index 97%
rename from Spigot-Server-Patches/0084-Default-loading-permissions.yml-before-plugins.patch
rename to Spigot-Server-Patches/0082-Default-loading-permissions.yml-before-plugins.patch
index b88a98bb1..242416f14 100644
--- a/Spigot-Server-Patches/0084-Default-loading-permissions.yml-before-plugins.patch
+++ b/Spigot-Server-Patches/0082-Default-loading-permissions.yml-before-plugins.patch
@@ -1,4 +1,4 @@
-From fb8fffbcccdbf0564e2c9c14e68f773212176618 Mon Sep 17 00:00:00 2001
+From ced795e7ce5a5d065cda466a5579403c1029e793 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
diff --git a/Spigot-Server-Patches/0085-Allow-Reloading-of-Custom-Permissions.patch b/Spigot-Server-Patches/0083-Allow-Reloading-of-Custom-Permissions.patch
similarity index 92%
rename from Spigot-Server-Patches/0085-Allow-Reloading-of-Custom-Permissions.patch
rename to Spigot-Server-Patches/0083-Allow-Reloading-of-Custom-Permissions.patch
index 162b30cea..96b570003 100644
--- a/Spigot-Server-Patches/0085-Allow-Reloading-of-Custom-Permissions.patch
+++ b/Spigot-Server-Patches/0083-Allow-Reloading-of-Custom-Permissions.patch
@@ -1,4 +1,4 @@
-From 569eaebd6555de10a0b88497b260c209c9b8d047 Mon Sep 17 00:00:00 2001
+From e0e3c0e65de60a9fcf351793df48a9b1fc8a5624 Mon Sep 17 00:00:00 2001
 From: William <admin@domnian.com>
 Date: Fri, 18 Mar 2016 03:30:17 -0400
 Subject: [PATCH] Allow Reloading of Custom Permissions
diff --git a/Spigot-Server-Patches/0086-Remove-Metadata-on-reload.patch b/Spigot-Server-Patches/0084-Remove-Metadata-on-reload.patch
similarity index 94%
rename from Spigot-Server-Patches/0086-Remove-Metadata-on-reload.patch
rename to Spigot-Server-Patches/0084-Remove-Metadata-on-reload.patch
index 840ec22dc..1b5fb9c00 100644
--- a/Spigot-Server-Patches/0086-Remove-Metadata-on-reload.patch
+++ b/Spigot-Server-Patches/0084-Remove-Metadata-on-reload.patch
@@ -1,4 +1,4 @@
-From 4ac4c0bbbf0d85a87df58b7b64b9bb6b285f46d6 Mon Sep 17 00:00:00 2001
+From 6a0d65b570ee34d0e746dbc30baf0aef76809944 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 13:50:14 -0400
 Subject: [PATCH] Remove Metadata on reload
diff --git a/Spigot-Server-Patches/0087-Undead-horse-leashing.patch b/Spigot-Server-Patches/0085-Undead-horse-leashing.patch
similarity index 95%
rename from Spigot-Server-Patches/0087-Undead-horse-leashing.patch
rename to Spigot-Server-Patches/0085-Undead-horse-leashing.patch
index ee6642201..c8b7b2f55 100644
--- a/Spigot-Server-Patches/0087-Undead-horse-leashing.patch
+++ b/Spigot-Server-Patches/0085-Undead-horse-leashing.patch
@@ -1,4 +1,4 @@
-From 7319c93dfc5a4556ead4fe14f8ae18a24d85382c Mon Sep 17 00:00:00 2001
+From 2de7f35a9929145e900262fcde536f0de84e34b0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 14:19:19 -0400
 Subject: [PATCH] Undead horse leashing
@@ -32,5 +32,5 @@ index a81bf3b..8367458 100644
      }
  
 -- 
-2.7.4
+2.8.0
 
diff --git a/Spigot-Server-Patches/0088-Fix-Furnace-cook-time-bug.patch b/Spigot-Server-Patches/0086-Fix-Furnace-cook-time-bug.patch
similarity index 94%
rename from Spigot-Server-Patches/0088-Fix-Furnace-cook-time-bug.patch
rename to Spigot-Server-Patches/0086-Fix-Furnace-cook-time-bug.patch
index 346982762..9106f48b8 100644
--- a/Spigot-Server-Patches/0088-Fix-Furnace-cook-time-bug.patch
+++ b/Spigot-Server-Patches/0086-Fix-Furnace-cook-time-bug.patch
@@ -1,4 +1,4 @@
-From e9f30600cca1ac5e4c62925729269cc5a1b09322 Mon Sep 17 00:00:00 2001
+From da9640438b63bf852b255d167081b5bf7d037a23 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 14:24:53 -0400
 Subject: [PATCH] Fix Furnace cook time bug
diff --git a/Spigot-Server-Patches/0089-Handle-Item-Meta-Inconsistencies.patch b/Spigot-Server-Patches/0087-Handle-Item-Meta-Inconsistencies.patch
similarity index 99%
rename from Spigot-Server-Patches/0089-Handle-Item-Meta-Inconsistencies.patch
rename to Spigot-Server-Patches/0087-Handle-Item-Meta-Inconsistencies.patch
index b33c58589..ba5edfdec 100644
--- a/Spigot-Server-Patches/0089-Handle-Item-Meta-Inconsistencies.patch
+++ b/Spigot-Server-Patches/0087-Handle-Item-Meta-Inconsistencies.patch
@@ -1,4 +1,4 @@
-From b472f6b03d8f312bacbb0e22730c30fbb42b3c60 Mon Sep 17 00:00:00 2001
+From 811beb27ad4f6c5df7d3d3f3beb2e29f861c254b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 28 May 2015 23:00:19 -0400
 Subject: [PATCH] Handle Item Meta Inconsistencies
diff --git a/Spigot-Server-Patches/0090-Configurable-Non-Player-Arrow-Despawn-Rate.patch b/Spigot-Server-Patches/0088-Configurable-Non-Player-Arrow-Despawn-Rate.patch
similarity index 96%
rename from Spigot-Server-Patches/0090-Configurable-Non-Player-Arrow-Despawn-Rate.patch
rename to Spigot-Server-Patches/0088-Configurable-Non-Player-Arrow-Despawn-Rate.patch
index 85df7bf8b..e0679bc50 100644
--- a/Spigot-Server-Patches/0090-Configurable-Non-Player-Arrow-Despawn-Rate.patch
+++ b/Spigot-Server-Patches/0088-Configurable-Non-Player-Arrow-Despawn-Rate.patch
@@ -1,4 +1,4 @@
-From 82efce5c51baa8cacf7b226959f61fe8feedd393 Mon Sep 17 00:00:00 2001
+From c5e8057ca0d583db8809136a623f5d71d605baf4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 15:12:22 -0400
 Subject: [PATCH] Configurable Non Player Arrow Despawn Rate
@@ -37,5 +37,5 @@ index 7a4f56d..a073e6c 100644
                  }
              } else {
 -- 
-2.7.4
+2.8.0
 
diff --git a/Spigot-Server-Patches/0091-Optimize-BlockStateList-BlockData.patch b/Spigot-Server-Patches/0089-Optimize-BlockStateList-BlockData.patch
similarity index 97%
rename from Spigot-Server-Patches/0091-Optimize-BlockStateList-BlockData.patch
rename to Spigot-Server-Patches/0089-Optimize-BlockStateList-BlockData.patch
index 170979d68..41b415c16 100644
--- a/Spigot-Server-Patches/0091-Optimize-BlockStateList-BlockData.patch
+++ b/Spigot-Server-Patches/0089-Optimize-BlockStateList-BlockData.patch
@@ -1,4 +1,4 @@
-From 02ef268d939372fee2ed6febdcab16b32556bb72 Mon Sep 17 00:00:00 2001
+From f7313e6dc75314c8ebe99a130f1cab8a31b48138 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 19:15:44 -0400
 Subject: [PATCH] Optimize BlockStateList/BlockData
diff --git a/Spigot-Server-Patches/0092-Add-World-Util-Methods.patch b/Spigot-Server-Patches/0090-Add-World-Util-Methods.patch
similarity index 97%
rename from Spigot-Server-Patches/0092-Add-World-Util-Methods.patch
rename to Spigot-Server-Patches/0090-Add-World-Util-Methods.patch
index 2d88556ab..625ec8d9e 100644
--- a/Spigot-Server-Patches/0092-Add-World-Util-Methods.patch
+++ b/Spigot-Server-Patches/0090-Add-World-Util-Methods.patch
@@ -1,4 +1,4 @@
-From 5dc04c9513360e761b5d95a02a5af027f5556a07 Mon Sep 17 00:00:00 2001
+From 18d902ae10f701f1f73d26d1ac79f59427e9264c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 20:16:03 -0400
 Subject: [PATCH] Add World Util Methods
@@ -6,7 +6,7 @@ Subject: [PATCH] Add World Util Methods
 Methods that can be used for other patches to help improve logic.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index ad7a81c..d658fa2 100644
+index 2551f48..f76ff72 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -152,6 +152,12 @@ public abstract class World implements IBlockAccess {
diff --git a/Spigot-Server-Patches/0093-Optimized-Light-Level-Comparisons.patch b/Spigot-Server-Patches/0091-Optimized-Light-Level-Comparisons.patch
similarity index 99%
rename from Spigot-Server-Patches/0093-Optimized-Light-Level-Comparisons.patch
rename to Spigot-Server-Patches/0091-Optimized-Light-Level-Comparisons.patch
index 047da9d27..84f9df372 100644
--- a/Spigot-Server-Patches/0093-Optimized-Light-Level-Comparisons.patch
+++ b/Spigot-Server-Patches/0091-Optimized-Light-Level-Comparisons.patch
@@ -1,4 +1,4 @@
-From 2b215afb5bc1e8af17912c2dcf1cfab0bbb122e4 Mon Sep 17 00:00:00 2001
+From 40da4eaa1b6515d51742dc8a7bb9960666a75299 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 21:22:56 -0400
 Subject: [PATCH] Optimized Light Level Comparisons
diff --git a/Spigot-Server-Patches/0094-Pass-world-to-Village-creation.patch b/Spigot-Server-Patches/0092-Pass-world-to-Village-creation.patch
similarity index 96%
rename from Spigot-Server-Patches/0094-Pass-world-to-Village-creation.patch
rename to Spigot-Server-Patches/0092-Pass-world-to-Village-creation.patch
index 44e8cf491..aeda32865 100644
--- a/Spigot-Server-Patches/0094-Pass-world-to-Village-creation.patch
+++ b/Spigot-Server-Patches/0092-Pass-world-to-Village-creation.patch
@@ -1,4 +1,4 @@
-From 5e0d629b3e6a5db8d5a0151baee6c66582d768ff Mon Sep 17 00:00:00 2001
+From 3ad8d8205d1a7ca14c8062a4544fe6072e1bfd61 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 19 Mar 2016 15:16:54 -0400
 Subject: [PATCH] Pass world to Village creation
diff --git a/Spigot-Server-Patches/0095-Custom-replacement-for-eaten-items.patch b/Spigot-Server-Patches/0093-Custom-replacement-for-eaten-items.patch
similarity index 96%
rename from Spigot-Server-Patches/0095-Custom-replacement-for-eaten-items.patch
rename to Spigot-Server-Patches/0093-Custom-replacement-for-eaten-items.patch
index 56a168e5b..cd748b694 100644
--- a/Spigot-Server-Patches/0095-Custom-replacement-for-eaten-items.patch
+++ b/Spigot-Server-Patches/0093-Custom-replacement-for-eaten-items.patch
@@ -1,4 +1,4 @@
-From 18897365f4f62800534d033dcf86f46dea38d55f Mon Sep 17 00:00:00 2001
+From f0f2dc3bddcddafe88517f3d615380b059c4f1c6 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 21 Jun 2015 15:07:20 -0400
 Subject: [PATCH] Custom replacement for eaten items
diff --git a/Spigot-Server-Patches/0096-Set-health-before-death-event.patch b/Spigot-Server-Patches/0094-Set-health-before-death-event.patch
similarity index 96%
rename from Spigot-Server-Patches/0096-Set-health-before-death-event.patch
rename to Spigot-Server-Patches/0094-Set-health-before-death-event.patch
index 928767e4b..617c55e1d 100644
--- a/Spigot-Server-Patches/0096-Set-health-before-death-event.patch
+++ b/Spigot-Server-Patches/0094-Set-health-before-death-event.patch
@@ -1,4 +1,4 @@
-From 52355afff2119157d7c0a1ef6f86ac5a44c669b2 Mon Sep 17 00:00:00 2001
+From 8c29971e2b222a7cbe7d0d9d48a99cc0fa129b58 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 19 Jul 2015 16:51:38 -0400
 Subject: [PATCH] Set health before death event
diff --git a/Spigot-Server-Patches/0097-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/Spigot-Server-Patches/0095-handle-NaN-health-absorb-values-and-repair-bad-data.patch
similarity index 97%
rename from Spigot-Server-Patches/0097-handle-NaN-health-absorb-values-and-repair-bad-data.patch
rename to Spigot-Server-Patches/0095-handle-NaN-health-absorb-values-and-repair-bad-data.patch
index 592ea2daf..98843e095 100644
--- a/Spigot-Server-Patches/0097-handle-NaN-health-absorb-values-and-repair-bad-data.patch
+++ b/Spigot-Server-Patches/0095-handle-NaN-health-absorb-values-and-repair-bad-data.patch
@@ -1,4 +1,4 @@
-From 50673c9e6a2f18b9997e5ef316a0ce67fb2f846e Mon Sep 17 00:00:00 2001
+From 3b613790bf18ce99fdf7dbd6d69930cb025b4e20 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 27 Sep 2015 01:18:02 -0400
 Subject: [PATCH] handle NaN health/absorb values and repair bad data
diff --git a/Spigot-Server-Patches/0098-Catch-Async-PlayerChunkMap-operations.patch b/Spigot-Server-Patches/0096-Catch-Async-PlayerChunkMap-operations.patch
similarity index 93%
rename from Spigot-Server-Patches/0098-Catch-Async-PlayerChunkMap-operations.patch
rename to Spigot-Server-Patches/0096-Catch-Async-PlayerChunkMap-operations.patch
index fbf545606..e6dedd59f 100644
--- a/Spigot-Server-Patches/0098-Catch-Async-PlayerChunkMap-operations.patch
+++ b/Spigot-Server-Patches/0096-Catch-Async-PlayerChunkMap-operations.patch
@@ -1,4 +1,4 @@
-From 1da217f367d2f1e81f73d6b7f8b1359f3410f648 Mon Sep 17 00:00:00 2001
+From 7eb979e9d6b597bf3c472b06ada7e24ceb7b587f Mon Sep 17 00:00:00 2001
 From: Daniel Ennis <dennis@icontact.com>
 Date: Sun, 20 Mar 2016 15:22:42 -0400
 Subject: [PATCH] Catch Async PlayerChunkMap operations
diff --git a/Spigot-Server-Patches/0099-Support-offline-mode-in-whitelist-command-as-well.patch b/Spigot-Server-Patches/0097-Support-offline-mode-in-whitelist-command-as-well.patch
similarity index 98%
rename from Spigot-Server-Patches/0099-Support-offline-mode-in-whitelist-command-as-well.patch
rename to Spigot-Server-Patches/0097-Support-offline-mode-in-whitelist-command-as-well.patch
index 7842031ee..81d459be0 100644
--- a/Spigot-Server-Patches/0099-Support-offline-mode-in-whitelist-command-as-well.patch
+++ b/Spigot-Server-Patches/0097-Support-offline-mode-in-whitelist-command-as-well.patch
@@ -1,4 +1,4 @@
-From f989b42f5b3ba73c09345df011db7c83eac75f06 Mon Sep 17 00:00:00 2001
+From ead9fa41adb7c620a593dac005223c01453252c4 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 21 Mar 2016 00:19:18 -0500
 Subject: [PATCH] Support offline mode in whitelist command as well
diff --git a/Spigot-Server-Patches/0100-Optimize-Chunk-Unload-Queue.patch b/Spigot-Server-Patches/0098-Optimize-Chunk-Unload-Queue.patch
similarity index 99%
rename from Spigot-Server-Patches/0100-Optimize-Chunk-Unload-Queue.patch
rename to Spigot-Server-Patches/0098-Optimize-Chunk-Unload-Queue.patch
index 5f39f7aac..a1007044b 100644
--- a/Spigot-Server-Patches/0100-Optimize-Chunk-Unload-Queue.patch
+++ b/Spigot-Server-Patches/0098-Optimize-Chunk-Unload-Queue.patch
@@ -1,4 +1,4 @@
-From 37286df2722a024569953f7d0627bc1c231a1826 Mon Sep 17 00:00:00 2001
+From 8fd1f5dfead2200e93116763999f776de862a848 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 17:57:25 -0400
 Subject: [PATCH] Optimize Chunk Unload Queue
@@ -240,7 +240,7 @@ index 63e118d..721bcae 100644
                  i += server.getChunkAt( x, z ).entityCount.get( oClass );
              }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index d658fa2..0a3cfbc 100644
+index f76ff72..c1cb133 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -159,9 +159,15 @@ public abstract class World implements IBlockAccess {
@@ -322,7 +322,7 @@ index 482af17..a1a6d5a 100644
                      neighbor.setNeighborLoaded(-x, -z);
                      chunk.setNeighborLoaded(x, z);
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index a1bd1a6..7fcd437 100644
+index f0d3a19..c32b805 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -126,9 +126,9 @@ public class ActivationRange
diff --git a/Spigot-Server-Patches/0101-Fix-SkullCache-case-bug.patch b/Spigot-Server-Patches/0099-Fix-SkullCache-case-bug.patch
similarity index 94%
rename from Spigot-Server-Patches/0101-Fix-SkullCache-case-bug.patch
rename to Spigot-Server-Patches/0099-Fix-SkullCache-case-bug.patch
index 19298364f..cc4f03f99 100644
--- a/Spigot-Server-Patches/0101-Fix-SkullCache-case-bug.patch
+++ b/Spigot-Server-Patches/0099-Fix-SkullCache-case-bug.patch
@@ -1,4 +1,4 @@
-From da3e50d1652f69d0f5fb9522ec10e881cb9fc384 Mon Sep 17 00:00:00 2001
+From 562833b7751f03dfd07a8ee84c4a689cf8a83add Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Jan 2016 21:48:24 -0500
 Subject: [PATCH] Fix SkullCache case bug
diff --git a/Spigot-Server-Patches/0102-Waving-banner-workaround.patch b/Spigot-Server-Patches/0100-Waving-banner-workaround.patch
similarity index 95%
rename from Spigot-Server-Patches/0102-Waving-banner-workaround.patch
rename to Spigot-Server-Patches/0100-Waving-banner-workaround.patch
index 4f0fa6054..4b3f1558c 100644
--- a/Spigot-Server-Patches/0102-Waving-banner-workaround.patch
+++ b/Spigot-Server-Patches/0100-Waving-banner-workaround.patch
@@ -1,4 +1,4 @@
-From 00a2f241b17ef929b9355f54fdf2b47cf24ef1ca Mon Sep 17 00:00:00 2001
+From 75ad0da281d8a214aec8932689fe42abf0eebb67 Mon Sep 17 00:00:00 2001
 From: Gabscap <sonstige.netzwerke@gabriel-paradzik.de>
 Date: Sat, 19 Mar 2016 22:25:11 +0100
 Subject: [PATCH] Waving banner workaround
diff --git a/Spigot-Server-Patches/0103-Use-a-Shared-Random-for-Entities.patch b/Spigot-Server-Patches/0101-Use-a-Shared-Random-for-Entities.patch
similarity index 87%
rename from Spigot-Server-Patches/0103-Use-a-Shared-Random-for-Entities.patch
rename to Spigot-Server-Patches/0101-Use-a-Shared-Random-for-Entities.patch
index e72a28cbe..f816f7b20 100644
--- a/Spigot-Server-Patches/0103-Use-a-Shared-Random-for-Entities.patch
+++ b/Spigot-Server-Patches/0101-Use-a-Shared-Random-for-Entities.patch
@@ -1,4 +1,4 @@
-From 2c65576061d5389c06554fc760fa93afd8322eb4 Mon Sep 17 00:00:00 2001
+From c4ee41fc06ca9056f3bf8e7eac25cd6b2083eb3e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 22 Mar 2016 00:33:47 -0400
 Subject: [PATCH] Use a Shared Random for Entities
@@ -6,7 +6,7 @@ Subject: [PATCH] Use a Shared Random for Entities
 Reduces memory usage and provides ensures more randomness, Especially since a lot of garbage entity objects get created.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 3ded885..6bdb76e 100644
+index 03944dd..2ebeaf9 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -45,6 +45,7 @@ public abstract class Entity implements ICommandListener {
@@ -17,7 +17,7 @@ index 3ded885..6bdb76e 100644
      static boolean isLevelAtLeast(NBTTagCompound tag, int level) {
          return tag.hasKey("Bukkit.updateLevel") && tag.getInt("Bukkit.updateLevel") >= level;
      }
-@@ -168,7 +169,7 @@ public abstract class Entity implements ICommandListener {
+@@ -160,7 +161,7 @@ public abstract class Entity implements ICommandListener {
          this.width = 0.6F;
          this.length = 1.8F;
          this.av = 1;
diff --git a/Spigot-Server-Patches/0104-Don-t-teleport-dead-entities.patch b/Spigot-Server-Patches/0102-Don-t-teleport-dead-entities.patch
similarity index 84%
rename from Spigot-Server-Patches/0104-Don-t-teleport-dead-entities.patch
rename to Spigot-Server-Patches/0102-Don-t-teleport-dead-entities.patch
index a947b99dd..50addff4a 100644
--- a/Spigot-Server-Patches/0104-Don-t-teleport-dead-entities.patch
+++ b/Spigot-Server-Patches/0102-Don-t-teleport-dead-entities.patch
@@ -1,4 +1,4 @@
-From 53747cbca7417b33a59fdc3288cb3301594259e4 Mon Sep 17 00:00:00 2001
+From fa99f34711fb6354b85ac93c3543dcc218db3e69 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 22 Mar 2016 00:55:23 -0400
 Subject: [PATCH] Don't teleport dead entities
@@ -7,10 +7,10 @@ Had some issue with this in past, and this is the vanilla logic.
 Potentially an old CB change that's no longer needed.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 6bdb76e..2637e60 100644
+index 2ebeaf9..e7af110 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2109,7 +2109,7 @@ public abstract class Entity implements ICommandListener {
+@@ -2101,7 +2101,7 @@ public abstract class Entity implements ICommandListener {
      }
  
      public Entity teleportTo(Location exit, boolean portal) {
diff --git a/Spigot-Server-Patches/0105-Optimize-Chunk-Access.patch b/Spigot-Server-Patches/0103-Optimize-Chunk-Access.patch
similarity index 97%
rename from Spigot-Server-Patches/0105-Optimize-Chunk-Access.patch
rename to Spigot-Server-Patches/0103-Optimize-Chunk-Access.patch
index fa70b9c45..c3290383d 100644
--- a/Spigot-Server-Patches/0105-Optimize-Chunk-Access.patch
+++ b/Spigot-Server-Patches/0103-Optimize-Chunk-Access.patch
@@ -1,4 +1,4 @@
-From 2abc0d00312f85e3dcef3520fc9cb106ae4bad3b Mon Sep 17 00:00:00 2001
+From 6664feff232eb242497638d4c014f9d3b3dfbba9 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 27 Aug 2015 01:15:02 -0400
 Subject: [PATCH] Optimize Chunk Access
diff --git a/Spigot-Server-Patches/0106-Configurable-spawn-chances-for-skeleton-horses.patch b/Spigot-Server-Patches/0104-Configurable-spawn-chances-for-skeleton-horses.patch
similarity index 96%
rename from Spigot-Server-Patches/0106-Configurable-spawn-chances-for-skeleton-horses.patch
rename to Spigot-Server-Patches/0104-Configurable-spawn-chances-for-skeleton-horses.patch
index 6bc48f6e7..3482baf7b 100644
--- a/Spigot-Server-Patches/0106-Configurable-spawn-chances-for-skeleton-horses.patch
+++ b/Spigot-Server-Patches/0104-Configurable-spawn-chances-for-skeleton-horses.patch
@@ -1,4 +1,4 @@
-From b42d5a8bb9526ec8f77411eea0076b7e30e2c8b7 Mon Sep 17 00:00:00 2001
+From 8b2dc36b364deaeb37048254d6c1a500deffb766 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 22 Mar 2016 12:04:28 -0500
 Subject: [PATCH] Configurable spawn chances for skeleton horses
diff --git a/Spigot-Server-Patches/0107-Optimize-isValidLocation-for-inlining.patch b/Spigot-Server-Patches/0105-Optimize-isValidLocation-for-inlining.patch
similarity index 98%
rename from Spigot-Server-Patches/0107-Optimize-isValidLocation-for-inlining.patch
rename to Spigot-Server-Patches/0105-Optimize-isValidLocation-for-inlining.patch
index d57a2e648..6832ca996 100644
--- a/Spigot-Server-Patches/0107-Optimize-isValidLocation-for-inlining.patch
+++ b/Spigot-Server-Patches/0105-Optimize-isValidLocation-for-inlining.patch
@@ -1,4 +1,4 @@
-From 3adef9813ff8d283b34b7c5ec9a2b47e8f72cc79 Mon Sep 17 00:00:00 2001
+From eaa70396911818f37f9a29242382e293a28e2828 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 22 Mar 2016 23:41:34 -0400
 Subject: [PATCH] Optimize isValidLocation for inlining
diff --git a/Spigot-Server-Patches/0108-Use-correct-item-in-arrow-pickup-event.patch b/Spigot-Server-Patches/0106-Use-correct-item-in-arrow-pickup-event.patch
similarity index 96%
rename from Spigot-Server-Patches/0108-Use-correct-item-in-arrow-pickup-event.patch
rename to Spigot-Server-Patches/0106-Use-correct-item-in-arrow-pickup-event.patch
index 69dd302ea..f844dcb53 100644
--- a/Spigot-Server-Patches/0108-Use-correct-item-in-arrow-pickup-event.patch
+++ b/Spigot-Server-Patches/0106-Use-correct-item-in-arrow-pickup-event.patch
@@ -1,4 +1,4 @@
-From 010b8cf40e7f0e7af73a26a32e20b247bb2374ef Mon Sep 17 00:00:00 2001
+From e793e612060ceb1d4265673b2c526697e86ed707 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Tue, 22 Mar 2016 16:00:16 -0400
 Subject: [PATCH] Use correct item in arrow pickup event
diff --git a/Spigot-Server-Patches/0109-Fix-cooked-fish-legacy-import.patch b/Spigot-Server-Patches/0107-Fix-cooked-fish-legacy-import.patch
similarity index 94%
rename from Spigot-Server-Patches/0109-Fix-cooked-fish-legacy-import.patch
rename to Spigot-Server-Patches/0107-Fix-cooked-fish-legacy-import.patch
index 4c5d2b931..db5f534d8 100644
--- a/Spigot-Server-Patches/0109-Fix-cooked-fish-legacy-import.patch
+++ b/Spigot-Server-Patches/0107-Fix-cooked-fish-legacy-import.patch
@@ -1,4 +1,4 @@
-From d0d8685cfd509adfb38b1b43e340915833202ede Mon Sep 17 00:00:00 2001
+From e2031b7f38af9ba162886a5d0aefcf1d9a58c8da Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Tue, 1 Mar 2016 04:32:08 -0500
 Subject: [PATCH] Fix cooked fish legacy import
diff --git a/Spigot-Server-Patches/0110-Load-chunk-before-player-teleport.patch b/Spigot-Server-Patches/0108-Load-chunk-before-player-teleport.patch
similarity index 93%
rename from Spigot-Server-Patches/0110-Load-chunk-before-player-teleport.patch
rename to Spigot-Server-Patches/0108-Load-chunk-before-player-teleport.patch
index 5b0c42dd6..d1a933cd1 100644
--- a/Spigot-Server-Patches/0110-Load-chunk-before-player-teleport.patch
+++ b/Spigot-Server-Patches/0108-Load-chunk-before-player-teleport.patch
@@ -1,4 +1,4 @@
-From fd475da2c48964e0ea04cbe945c0c11f71b94dfd Mon Sep 17 00:00:00 2001
+From d9b38b1ba8f921ac55766ecc47ff1cfe5a3b68c8 Mon Sep 17 00:00:00 2001
 From: Gabscap <sonstige.netzwerke@gabriel-paradzik.de>
 Date: Sat, 26 Mar 2016 18:41:22 +0100
 Subject: [PATCH] Load chunk before player teleport
diff --git a/Spigot-Server-Patches/0111-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch b/Spigot-Server-Patches/0109-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch
similarity index 98%
rename from Spigot-Server-Patches/0111-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch
rename to Spigot-Server-Patches/0109-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch
index 2352774a2..9db44bddf 100644
--- a/Spigot-Server-Patches/0111-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch
+++ b/Spigot-Server-Patches/0109-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch
@@ -1,4 +1,4 @@
-From 5cf2de3b1381af0c32b0cfd020b12ce6d05d47d6 Mon Sep 17 00:00:00 2001
+From 60476465177fdb77f6b8e66afed0caaf2a7946ba Mon Sep 17 00:00:00 2001
 From: DemonWav <demonwav@gmail.com>
 Date: Sat, 26 Mar 2016 21:36:05 -0500
 Subject: [PATCH] Prevent possible infinite loop in BlockPosition iterator
diff --git a/Spigot-Server-Patches/0112-Access-items-by-EquipmentSlot.patch b/Spigot-Server-Patches/0110-Access-items-by-EquipmentSlot.patch
similarity index 97%
rename from Spigot-Server-Patches/0112-Access-items-by-EquipmentSlot.patch
rename to Spigot-Server-Patches/0110-Access-items-by-EquipmentSlot.patch
index efc6b4238..854814b2c 100644
--- a/Spigot-Server-Patches/0112-Access-items-by-EquipmentSlot.patch
+++ b/Spigot-Server-Patches/0110-Access-items-by-EquipmentSlot.patch
@@ -1,4 +1,4 @@
-From c45edfb67ae5072a2a5dfdbe9c4012c888ed7c94 Mon Sep 17 00:00:00 2001
+From e7d974662e255f3f8dc6312901ac7f01cf2a1d1c Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 20 Mar 2016 06:45:01 -0400
 Subject: [PATCH] Access items by EquipmentSlot
diff --git a/Spigot-Server-Patches/0113-Check-async-remove-unused-vars-GH-159.patch b/Spigot-Server-Patches/0111-Check-async-remove-unused-vars-GH-159.patch
similarity index 96%
rename from Spigot-Server-Patches/0113-Check-async-remove-unused-vars-GH-159.patch
rename to Spigot-Server-Patches/0111-Check-async-remove-unused-vars-GH-159.patch
index 4e12598c5..60f28d129 100644
--- a/Spigot-Server-Patches/0113-Check-async-remove-unused-vars-GH-159.patch
+++ b/Spigot-Server-Patches/0111-Check-async-remove-unused-vars-GH-159.patch
@@ -1,4 +1,4 @@
-From 442c1cd9adabfa9d608bba2341e09588d22bd9af Mon Sep 17 00:00:00 2001
+From 55869f17856d6d11d00b4729ddda93feea603d2f Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 27 Mar 2016 20:24:05 -0500
 Subject: [PATCH] Check async, remove unused vars, GH-159
diff --git a/Spigot-Server-Patches/0114-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch b/Spigot-Server-Patches/0112-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
similarity index 98%
rename from Spigot-Server-Patches/0114-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
rename to Spigot-Server-Patches/0112-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
index 67af66bfd..5b00a3dc0 100644
--- a/Spigot-Server-Patches/0114-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
+++ b/Spigot-Server-Patches/0112-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
@@ -1,4 +1,4 @@
-From 89d4f6537a88b323c9072af629b4a54d6fe54db6 Mon Sep 17 00:00:00 2001
+From 2c031d019c95d2361b3a1cff4e12ace56697ff9a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 19:55:45 -0400
 Subject: [PATCH] Option to disable BlockPhysicsEvent for Redstone
diff --git a/Spigot-Server-Patches/0115-Entity-AddTo-RemoveFrom-World-Events.patch b/Spigot-Server-Patches/0113-Entity-AddTo-RemoveFrom-World-Events.patch
similarity index 94%
rename from Spigot-Server-Patches/0115-Entity-AddTo-RemoveFrom-World-Events.patch
rename to Spigot-Server-Patches/0113-Entity-AddTo-RemoveFrom-World-Events.patch
index 2e321bf4a..0e4e2393a 100644
--- a/Spigot-Server-Patches/0115-Entity-AddTo-RemoveFrom-World-Events.patch
+++ b/Spigot-Server-Patches/0113-Entity-AddTo-RemoveFrom-World-Events.patch
@@ -1,4 +1,4 @@
-From 86c09e0420200254be71440c724732e4af463d59 Mon Sep 17 00:00:00 2001
+From 343a5f46582da5a74c73c69c9c0c6e8f8bf7eea5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 20:32:58 -0400
 Subject: [PATCH] Entity AddTo/RemoveFrom World Events
diff --git a/Spigot-Server-Patches/0116-Configurable-Chunk-Inhabited-Timer.patch b/Spigot-Server-Patches/0114-Configurable-Chunk-Inhabited-Timer.patch
similarity index 95%
rename from Spigot-Server-Patches/0116-Configurable-Chunk-Inhabited-Timer.patch
rename to Spigot-Server-Patches/0114-Configurable-Chunk-Inhabited-Timer.patch
index cd88e0008..75fbb4f43 100644
--- a/Spigot-Server-Patches/0116-Configurable-Chunk-Inhabited-Timer.patch
+++ b/Spigot-Server-Patches/0114-Configurable-Chunk-Inhabited-Timer.patch
@@ -1,4 +1,4 @@
-From 3a99b17cfd36737d13c8a3b6efe419c94f2aaed2 Mon Sep 17 00:00:00 2001
+From d2962cd2970cd1aaf6ab931189512cd626f77581 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 20:46:14 -0400
 Subject: [PATCH] Configurable Chunk Inhabited Timer
@@ -36,5 +36,5 @@ index 6e3d17b..9334a0a 100644
  
      public void c(long i) {
 -- 
-2.7.4
+2.8.0
 
diff --git a/Spigot-Server-Patches/0117-EntityPathfindEvent.patch b/Spigot-Server-Patches/0115-EntityPathfindEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0117-EntityPathfindEvent.patch
rename to Spigot-Server-Patches/0115-EntityPathfindEvent.patch
index 2b6f78384..a7dbc12a9 100644
--- a/Spigot-Server-Patches/0117-EntityPathfindEvent.patch
+++ b/Spigot-Server-Patches/0115-EntityPathfindEvent.patch
@@ -1,4 +1,4 @@
-From 54ac4679bd5f98cde6a96547de0890155ae4c391 Mon Sep 17 00:00:00 2001
+From 06aaa486af57482d6a528208bbaabd477b11ddd3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 21:22:26 -0400
 Subject: [PATCH] EntityPathfindEvent
diff --git a/Spigot-Server-Patches/0118-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch b/Spigot-Server-Patches/0116-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
similarity index 97%
rename from Spigot-Server-Patches/0118-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
rename to Spigot-Server-Patches/0116-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
index 15db765b3..6aecb61ad 100644
--- a/Spigot-Server-Patches/0118-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
+++ b/Spigot-Server-Patches/0116-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
@@ -1,4 +1,4 @@
-From 770da115b23d30ad4a609da7661ea50d232c75fb Mon Sep 17 00:00:00 2001
+From 7f4484487e0a74dc63b2846472038f335132d687 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 22:03:09 -0400
 Subject: [PATCH] Prevent Waterflow BlockFromToEvent from loading chunks
diff --git a/Spigot-Server-Patches/0119-Minecart-drop-name-workaround.patch b/Spigot-Server-Patches/0117-Minecart-drop-name-workaround.patch
similarity index 94%
rename from Spigot-Server-Patches/0119-Minecart-drop-name-workaround.patch
rename to Spigot-Server-Patches/0117-Minecart-drop-name-workaround.patch
index ddf36d9ba..741f5f240 100644
--- a/Spigot-Server-Patches/0119-Minecart-drop-name-workaround.patch
+++ b/Spigot-Server-Patches/0117-Minecart-drop-name-workaround.patch
@@ -1,4 +1,4 @@
-From aa3ae67c4b3850173137954a092bba770fc7927f Mon Sep 17 00:00:00 2001
+From a6f76a4f31883fa1b948bd7a9bdb101a599b173d Mon Sep 17 00:00:00 2001
 From: Fabse <fabse@uwmc.info>
 Date: Mon, 28 Mar 2016 00:46:46 +0200
 Subject: [PATCH] Minecart drop name workaround
diff --git a/Spigot-Server-Patches/0120-Reduce-IO-ops-opening-a-new-region-file.patch b/Spigot-Server-Patches/0118-Reduce-IO-ops-opening-a-new-region-file.patch
similarity index 96%
rename from Spigot-Server-Patches/0120-Reduce-IO-ops-opening-a-new-region-file.patch
rename to Spigot-Server-Patches/0118-Reduce-IO-ops-opening-a-new-region-file.patch
index e6bc6ab15..c5bd17c81 100644
--- a/Spigot-Server-Patches/0120-Reduce-IO-ops-opening-a-new-region-file.patch
+++ b/Spigot-Server-Patches/0118-Reduce-IO-ops-opening-a-new-region-file.patch
@@ -1,4 +1,4 @@
-From 270bac107f50d5aa1a06d53c27446958fb031f80 Mon Sep 17 00:00:00 2001
+From 655d164991eca55b9c4ca8d0e3f070562f76b936 Mon Sep 17 00:00:00 2001
 From: Antony Riley <antony@cyberiantiger.org>
 Date: Tue, 29 Mar 2016 06:56:23 +0300
 Subject: [PATCH] Reduce IO ops opening a new region file.
diff --git a/Spigot-Server-Patches/0121-Sanitise-RegionFileCache-and-make-configurable.patch b/Spigot-Server-Patches/0119-Sanitise-RegionFileCache-and-make-configurable.patch
similarity index 98%
rename from Spigot-Server-Patches/0121-Sanitise-RegionFileCache-and-make-configurable.patch
rename to Spigot-Server-Patches/0119-Sanitise-RegionFileCache-and-make-configurable.patch
index 9e4e658dc..1b25ac1f1 100644
--- a/Spigot-Server-Patches/0121-Sanitise-RegionFileCache-and-make-configurable.patch
+++ b/Spigot-Server-Patches/0119-Sanitise-RegionFileCache-and-make-configurable.patch
@@ -1,4 +1,4 @@
-From b907ce7134a5744f6cf922ccdb72558ff26d5748 Mon Sep 17 00:00:00 2001
+From d0dba984a2e9a3fecae37744ba0a15c0d96aeb9f Mon Sep 17 00:00:00 2001
 From: Antony Riley <antony@cyberiantiger.org>
 Date: Tue, 29 Mar 2016 08:22:55 +0300
 Subject: [PATCH] Sanitise RegionFileCache and make configurable.
diff --git a/Spigot-Server-Patches/0122-Add-getEntity-by-UUID-API.patch b/Spigot-Server-Patches/0120-Add-getEntity-by-UUID-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0122-Add-getEntity-by-UUID-API.patch
rename to Spigot-Server-Patches/0120-Add-getEntity-by-UUID-API.patch
index 39d03f1b6..18ccf7f7c 100644
--- a/Spigot-Server-Patches/0122-Add-getEntity-by-UUID-API.patch
+++ b/Spigot-Server-Patches/0120-Add-getEntity-by-UUID-API.patch
@@ -1,4 +1,4 @@
-From d229df3e11a546bfc6fc7016a72633c4efbcec02 Mon Sep 17 00:00:00 2001
+From ab9e23811fe4a0adfc0453deeadd7b59b6dd9690 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/Spigot-Server-Patches/0123-Use-FastUtil-Int-HashMap-for-DataWatcher.patch b/Spigot-Server-Patches/0121-Use-FastUtil-Int-HashMap-for-DataWatcher.patch
similarity index 95%
rename from Spigot-Server-Patches/0123-Use-FastUtil-Int-HashMap-for-DataWatcher.patch
rename to Spigot-Server-Patches/0121-Use-FastUtil-Int-HashMap-for-DataWatcher.patch
index 821694feb..2087b1f26 100644
--- a/Spigot-Server-Patches/0123-Use-FastUtil-Int-HashMap-for-DataWatcher.patch
+++ b/Spigot-Server-Patches/0121-Use-FastUtil-Int-HashMap-for-DataWatcher.patch
@@ -1,4 +1,4 @@
-From 4450f745a28e5709f5df9bb18e8347a47370301f Mon Sep 17 00:00:00 2001
+From 005dac3ad5e821f19272ed003a8b4df9aac6e56f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 30 Mar 2016 02:13:24 -0400
 Subject: [PATCH] Use FastUtil Int HashMap for DataWatcher
diff --git a/Spigot-Server-Patches/0124-Do-not-load-chunks-for-light-checks.patch b/Spigot-Server-Patches/0122-Do-not-load-chunks-for-light-checks.patch
similarity index 93%
rename from Spigot-Server-Patches/0124-Do-not-load-chunks-for-light-checks.patch
rename to Spigot-Server-Patches/0122-Do-not-load-chunks-for-light-checks.patch
index 4e9e74093..15656804b 100644
--- a/Spigot-Server-Patches/0124-Do-not-load-chunks-for-light-checks.patch
+++ b/Spigot-Server-Patches/0122-Do-not-load-chunks-for-light-checks.patch
@@ -1,4 +1,4 @@
-From c56be574082969f54bed8a2553ebb2ff7d5ce052 Mon Sep 17 00:00:00 2001
+From a88cf69c865f77217e0565941cca9a260047ff3a 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
diff --git a/Spigot-Server-Patches/0125-gottagofast.patch b/Spigot-Server-Patches/0123-gottagofast.patch
similarity index 96%
rename from Spigot-Server-Patches/0125-gottagofast.patch
rename to Spigot-Server-Patches/0123-gottagofast.patch
index 0d0a4e4c9..9efbe35a2 100644
--- a/Spigot-Server-Patches/0125-gottagofast.patch
+++ b/Spigot-Server-Patches/0123-gottagofast.patch
@@ -1,4 +1,4 @@
-From 57c2f9101b897153d7afe526de98b4334ad925dd Mon Sep 17 00:00:00 2001
+From 74f09059d55bf7461526955623f7130d79706ef6 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 1 Apr 2016 01:29:29 -0500
 Subject: [PATCH] gottagofast
@@ -54,5 +54,5 @@ index 6d21c32..dc1d134 100644
      }
  }
 -- 
-2.7.4
+2.8.0