Update upstream CB

Spigot-Server-Patches/0005-Timings-v2.patch

@@ -1,11 +1,11 @@
-From c6b316a39c0fb4143c7b793cd80beb0c9d87abb5 Mon Sep 17 00:00:00 2001
+From 8f95cad119243c2ee4e76eb203befbf1dbae752f 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 2fa192515..911c0a9c5 100644
+index 2fa1925..911c0a9 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -66,6 +66,12 @@
@@ -23,7 +23,7 @@ index 2fa192515..911c0a9c5 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 3d0a00512..f509bed8a 100644
+index 3d0a005..f509bed 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 3d0a00512..f509bed8a 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index 9d144039c..da868740f 100644
+index 9d14403..da86874 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 9d144039c..da868740f 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 15969b14d..ca33899bb 100644
+index 15969b1..ca33899 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 15969b14d..ca33899bb 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 f01bd35bc..51d6b3efd 100644
+index f01bd35..51d6b3e 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 f01bd35bc..51d6b3efd 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 e148e3761..e0276a62c 100644
+index e148e37..e0276a6 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -24,7 +24,8 @@ import org.bukkit.block.BlockFace;
@@ -625,7 +625,7 @@ index e148e3761..e0276a62c 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 4617473aa..3756f2558 100644
+index 95b59ba..b328b25 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;
@@ -637,7 +637,7 @@ index 4617473aa..3756f2558 100644
  
  public abstract class EntityLiving extends Entity {
  
-@@ -1812,7 +1812,6 @@ public abstract class EntityLiving extends Entity {
+@@ -1815,7 +1815,6 @@ public abstract class EntityLiving extends Entity {
      }
  
      public void A_() {
@@ -645,7 +645,7 @@ index 4617473aa..3756f2558 100644
          super.A_();
          this.cA();
          if (!this.world.isClientSide) {
-@@ -1885,9 +1884,7 @@ public abstract class EntityLiving extends Entity {
+@@ -1888,9 +1887,7 @@ public abstract class EntityLiving extends Entity {
              }
          }
  
@@ -655,7 +655,7 @@ index 4617473aa..3756f2558 100644
          double d0 = this.locX - this.lastX;
          double d1 = this.locZ - this.lastZ;
          float f = (float) (d0 * d0 + d1 * d1);
-@@ -1956,8 +1953,6 @@ public abstract class EntityLiving extends Entity {
+@@ -1959,8 +1956,6 @@ public abstract class EntityLiving extends Entity {
          } else {
              this.bp = 0;
          }
@@ -664,7 +664,7 @@ index 4617473aa..3756f2558 100644
      }
  
      protected float h(float f, float f1) {
-@@ -2022,7 +2017,6 @@ public abstract class EntityLiving extends Entity {
+@@ -2025,7 +2020,6 @@ public abstract class EntityLiving extends Entity {
          }
  
          this.world.methodProfiler.a("ai");
@@ -672,7 +672,7 @@ index 4617473aa..3756f2558 100644
          if (this.isFrozen()) {
              this.bd = false;
              this.be = 0.0F;
-@@ -2033,7 +2027,6 @@ public abstract class EntityLiving extends Entity {
+@@ -2036,7 +2030,6 @@ public abstract class EntityLiving extends Entity {
              this.doTick();
              this.world.methodProfiler.b();
          }
@@ -680,7 +680,7 @@ index 4617473aa..3756f2558 100644
  
          this.world.methodProfiler.b();
          this.world.methodProfiler.a("jump");
-@@ -2056,14 +2049,10 @@ public abstract class EntityLiving extends Entity {
+@@ -2059,14 +2052,10 @@ public abstract class EntityLiving extends Entity {
          this.bf *= 0.98F;
          this.bg *= 0.9F;
          this.r();
@@ -696,7 +696,7 @@ index 4617473aa..3756f2558 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 0b790ab68..81a69e82f 100644
+index 0b790ab..81a69e8 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 0b790ab68..81a69e82f 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 2a195ca32..3c4cc27a5 100644
+index b583e9a..bc3af9b 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;
@@ -980,7 +980,7 @@ index 2a195ca32..3c4cc27a5 100644
  // CraftBukkit end
  
  public class PlayerConnection implements PacketListenerPlayIn, ITickable {
-@@ -1316,7 +1317,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1318,7 +1319,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
      // CraftBukkit end
  
     private void handleCommand(String s) {
@@ -989,7 +989,7 @@ index 2a195ca32..3c4cc27a5 100644
         // CraftBukkit start - whole method
          if ( org.spigotmc.SpigotConfig.logCommands ) // Spigot
          this.LOGGER.info(this.player.getName() + " issued server command: " + s);
-@@ -1327,22 +1328,22 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1329,22 +1330,22 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
          this.server.getPluginManager().callEvent(event);
  
          if (event.isCancelled()) {
@@ -1017,7 +1017,7 @@ index 2a195ca32..3c4cc27a5 100644
          // CraftBukkit end
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 5359e8c07..04d6355f0 100644
+index 5359e8c..04d6355 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 5359e8c07..04d6355f0 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 8d54eb367..0f505ed5b 100644
+index 8d54eb3..0f505ed 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 8d54eb367..0f505ed5b 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 8bd0250ee..78b5a3c6e 100644
+index 8bd0250..78b5a3c 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 8bd0250ee..78b5a3c6e 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index f369b4977..2817191e6 100644
+index f369b49..2817191 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,7 +1342,7 @@ index f369b4977..2817191e6 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 f4b0871..761c8e4 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 {
@@ -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 feeaa9a58..fbd7df94b 100644
+index feeaa9a..fbd7df9 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 feeaa9a58..fbd7df94b 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.windows.1
+2.9.3
 

Spigot-Server-Patches/0051-Ensure-commands-are-not-ran-async.patch

@@ -1,4 +1,4 @@
-From e3d4bd0368b3f900252d3a0d6ea7a5a60662a563 Mon Sep 17 00:00:00 2001
+From f5fbbeec055ca9162db7b1d993ef4fdcd54aabbf 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,10 +14,10 @@ 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 6cacac5..d833b61 100644
+index bc3af9b..878a79e 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1249,6 +1249,29 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1251,6 +1251,29 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
          }
  
          if (!async && s.startsWith("/")) {
@@ -48,7 +48,7 @@ index 6cacac5..d833b61 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 c1149a6..ff0a441 100644
+index 7e7be86..32de676 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 {
@@ -82,5 +82,5 @@ index c1149a6..ff0a441 100644
              return true;
          }
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0067-Add-methods-for-working-with-arrows-stuck-in-living-.patch

@@ -1,14 +1,14 @@
-From 1f97c9460dc9da319a81d4abae1ed9e7b5773949 Mon Sep 17 00:00:00 2001
+From 8c3db58f89aa782429d2f32e0da3c3cf9f3d39a9 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/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 87a8a3e..97eac7a 100644
+index fe6fe3f..fbc20ba 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -1376,10 +1376,12 @@ public abstract class EntityLiving extends Entity {
+@@ -1379,10 +1379,12 @@ public abstract class EntityLiving extends Entity {
          return (float) this.getAttributeInstance(GenericAttributes.maxHealth).getValue();
      }
  
@@ -43,5 +43,5 @@ index aaea4e8..2a77cd4 100644
 +    // Paper end
  }
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0068-Complete-resource-pack-API.patch

@@ -1,14 +1,14 @@
-From d76ebc3e672482779cc7f5d3210cc8178b31ab74 Mon Sep 17 00:00:00 2001
+From bbb98127842e91bf2359e4abe639c2e87dc079e7 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 4 Apr 2015 23:17:52 -0400
 Subject: [PATCH] Complete resource pack API
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index d1c0e70..7105c42 100644
+index 878a79e..687a8e6 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1010,7 +1010,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1012,7 +1012,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
  
      // CraftBukkit start
      public void a(PacketPlayInResourcePackStatus packetplayinresourcepackstatus) {
@@ -72,5 +72,5 @@ index b3084b7..5be1a6f 100644
      private final Player.Spigot spigot = new Player.Spigot()
      {
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0081-Custom-replacement-for-eaten-items.patch

@@ -1,14 +1,14 @@
-From 7ef822ff5f73057b05d269b49105de4dfa773c86 Mon Sep 17 00:00:00 2001
+From 6de1e740885e08b20f142d25e047d1a949ce0cbc 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/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 97eac7a..4cc89ec 100644
+index fbc20ba..539d016 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2337,7 +2337,20 @@ public abstract class EntityLiving extends Entity {
+@@ -2340,7 +2340,20 @@ public abstract class EntityLiving extends Entity {
              ItemStack itemstack = (craftItem.equals(event.getItem())) ? this.activeItem.a(this.world, this) : CraftItemStack.asNMSCopy(event.getItem()).a(world, this);
              this.a(this.cz(), itemstack);
              // CraftBukkit end
@@ -30,5 +30,5 @@ index 97eac7a..4cc89ec 100644
  
      }
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0083-handle-NaN-health-absorb-values-and-repair-bad-data.patch

@@ -1,11 +1,11 @@
-From b2392134aa1d23f36e9f81352ce09da45ac8023a Mon Sep 17 00:00:00 2001
+From 5fc1a30d419fe9aebcaff5cb6bfb2e559b83b40e 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/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index cc00fde..39609f7 100644
+index 539d016..1eee8a3 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -481,7 +481,13 @@ public abstract class EntityLiving extends Entity {
@@ -34,7 +34,7 @@ index cc00fde..39609f7 100644
          // CraftBukkit start - Handle scaled health
          if (this instanceof EntityPlayer) {
              org.bukkit.craftbukkit.entity.CraftPlayer player = ((EntityPlayer) this).getBukkitEntity();
-@@ -2207,7 +2217,7 @@ public abstract class EntityLiving extends Entity {
+@@ -2210,7 +2220,7 @@ public abstract class EntityLiving extends Entity {
      }
  
      public void setAbsorptionHearts(float f) {
@@ -56,5 +56,5 @@ index 5be1a6f..06e401a 100644
      }
  
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0093-Fix-cooked-fish-legacy-import.patch

@@ -1,4 +1,4 @@
-From 68d66a89483def18f9e82a01fab7faed0270615a Mon Sep 17 00:00:00 2001
+From 1224bc8a7663374d3169a7b37fd82fa15a070459 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
@@ -18,5 +18,5 @@ index 87b82eb..a7c71f4 100644
          DataConverterMaterialId.a[352] = "minecraft:bone";
          DataConverterMaterialId.a[353] = "minecraft:sugar";
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0093-Use-correct-item-in-arrow-pickup-event.patch

@@ -1,31 +0,0 @@
-From c584e7ace10c7aaf8dd332a93ea20b8cf075af8b 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/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
-index bb332b3..b71ebea 100644
---- a/src/main/java/net/minecraft/server/EntityArrow.java
-+++ b/src/main/java/net/minecraft/server/EntityArrow.java
-@@ -457,7 +457,7 @@ public abstract class EntityArrow extends Entity implements IProjectile {
-     public void d(EntityHuman entityhuman) {
-         if (!this.world.isClientSide && this.inGround && this.shake <= 0) {
-             // CraftBukkit start
--            ItemStack itemstack = new ItemStack(Items.ARROW);
-+            ItemStack itemstack = this.j(); // Paper - Use the correct item
-             if (this.fromPlayer == PickupStatus.ALLOWED && entityhuman.inventory.canHold(itemstack) > 0) {
-                 EntityItem item = new EntityItem(this.world, this.locX, this.locY, this.locZ, itemstack);
- 
-@@ -472,7 +472,7 @@ public abstract class EntityArrow extends Entity implements IProjectile {
-             // CraftBukkit end
-             boolean flag = this.fromPlayer == EntityArrow.PickupStatus.ALLOWED || this.fromPlayer == EntityArrow.PickupStatus.CREATIVE_ONLY && entityhuman.abilities.canInstantlyBuild;
- 
--            if (this.fromPlayer == EntityArrow.PickupStatus.ALLOWED && !entityhuman.inventory.pickup(this.j())) {
-+            if (this.fromPlayer == EntityArrow.PickupStatus.ALLOWED && !entityhuman.inventory.pickup(itemstack)) { // Paper - Use event itemstack
-                 flag = false;
-             }
- 
--- 
-2.10.2
-

Spigot-Server-Patches/0094-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch

@@ -1,4 +1,4 @@
-From 5869c04c3569ddc7ef8dd83d347f6064e8ea0db5 Mon Sep 17 00:00:00 2001
+From dd87a92db737c55ac67cb8bdd74ad21ddfe8e7c5 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
@@ -87,5 +87,5 @@ index 1852972..93b65cd 100644
                              this.b.b = i;
                              this.b.c = j;
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0095-Access-items-by-EquipmentSlot.patch

@@ -1,4 +1,4 @@
-From b49a516f20a12e9a8e00b701b1d10de3930d918c Mon Sep 17 00:00:00 2001
+From f0d56cc21c423373e46a085939b4192f57a1013f 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
@@ -64,5 +64,5 @@ index d8c5364..120ec89 100644
 +    // Paper end
  }
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0096-Check-async-remove-unused-vars-GH-159.patch

@@ -1,11 +1,11 @@
-From 939c6f4fc40f89a3645b2dd258aef8d64781a95a Mon Sep 17 00:00:00 2001
+From ecd85fe47a95c6799d3137101dc4e4644095b8a6 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/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index 8c35cab..bb8191a 100644
+index 31bafc6..f6e330c 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -40,6 +40,7 @@ public final class SpawnerCreature {
@@ -28,5 +28,5 @@ index 8c35cab..bb8191a 100644
                      if ((mobcnt = getEntityCount(worldserver, enumcreaturetype.a())) <= limit * i / 256) {
                          BlockPosition.MutableBlockPosition blockposition_mutableblockposition = new BlockPosition.MutableBlockPosition();
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0097-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch

@@ -1,4 +1,4 @@
-From e482dc823e0e0935a379abb0cce95b9525dc22c3 Mon Sep 17 00:00:00 2001
+From 6eacb52095e6eac9c9f2d94b3b50c721448a9278 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
@@ -11,7 +11,7 @@ Defaulting this to false will provide substantial performance improvement
 by saving millions of event calls on redstone heavy servers.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index d92ccc735..298c48fc5 100644
+index d92ccc7..298c48f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -274,4 +274,9 @@ public class PaperWorldConfig {
@@ -25,7 +25,7 @@ index d92ccc735..298c48fc5 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 224e4c941..0ac8a5736 100644
+index 224e4c9..0ac8a57 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -578,7 +578,7 @@ public abstract class World implements IBlockAccess {
@@ -38,7 +38,7 @@ index 224e4c941..0ac8a5736 100644
                      this.getServer().getPluginManager().callEvent(event);
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 2c75c15cb..f04486e86 100644
+index 2c75c15..f04486e 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -34,6 +34,7 @@ import org.bukkit.event.weather.LightningStrikeEvent;
@@ -67,5 +67,5 @@ index 2c75c15cb..f04486e86 100644
                          timing.stopTiming(); // Paper
                      } else {
 -- 
-2.11.0.windows.1
+2.9.3
 

Spigot-Server-Patches/0098-Entity-AddTo-RemoveFrom-World-Events.patch

@@ -1,11 +1,11 @@
-From 78bdb62f1d9d62e09dd043e50eb7bedc83e42e44 Mon Sep 17 00:00:00 2001
+From 26c49b0604fc10ccbe754dd33791c68c57d8ae84 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 20:32:58 -0400
 Subject: [PATCH] Entity AddTo/RemoveFrom World Events
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 2573b8e..345351e 100644
+index 0ac8a57..fbe33a8 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1179,6 +1179,7 @@ public abstract class World implements IBlockAccess {
@@ -25,5 +25,5 @@ index 2573b8e..345351e 100644
      }
  
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0099-Configurable-Chunk-Inhabited-Timer.patch

@@ -1,4 +1,4 @@
-From 53d2df55456f0fa55923f7f232506f25978885b6 Mon Sep 17 00:00:00 2001
+From 85e6989fdc7fd57d46442adca43233022c0f11be 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 736fa1f..61d34fc 100644
  
      public void c(long i) {
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0100-EntityPathfindEvent.patch

@@ -1,4 +1,4 @@
-From b43ccdb82d26397d2cc633a96a7e3cd037c41d2d Mon Sep 17 00:00:00 2001
+From b0e2f5308c90ca48dc24af1e86b20520e963eba9 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 21:22:26 -0400
 Subject: [PATCH] EntityPathfindEvent
@@ -35,5 +35,5 @@ index 43b2be5..c0ef240 100644
                  float f = this.h();
  
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0101-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch

@@ -1,4 +1,4 @@
-From 6164cfed01bee6e1ec4ae381b1e20451d45ae423 Mon Sep 17 00:00:00 2001
+From 8044718f3a6e4aedccd7d51573c752e2e3ff2492 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
@@ -12,7 +12,7 @@ of unloaded chunks anyways.
 This keeps behavior consistent, vs inconsistent flowing based on plugin triggered loads.
 
 diff --git a/src/main/java/net/minecraft/server/BlockFlowing.java b/src/main/java/net/minecraft/server/BlockFlowing.java
-index 765a37160..6939ac2cc 100644
+index 765a371..6939ac2 100644
 --- a/src/main/java/net/minecraft/server/BlockFlowing.java
 +++ b/src/main/java/net/minecraft/server/BlockFlowing.java
 @@ -96,6 +96,7 @@ public class BlockFlowing extends BlockFluids {
@@ -48,5 +48,5 @@ index 765a37160..6939ac2cc 100644
                  if (this.material == Material.LAVA) {
                      this.fizz(world, blockposition);
 -- 
-2.11.0.windows.1
+2.9.3
 

Spigot-Server-Patches/0102-Reduce-IO-ops-opening-a-new-region-file.patch

@@ -1,4 +1,4 @@
-From bf6b9a133ea2b2d0f540eab577914809e73206d1 Mon Sep 17 00:00:00 2001
+From 471591d79ffceac151b5a06c667ccaf32a356c4e 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.
@@ -49,5 +49,5 @@ index 9cfc46b..637e5ba 100644
              }
          } catch (IOException ioexception) {
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0103-Sanitise-RegionFileCache-and-make-configurable.patch

@@ -1,4 +1,4 @@
-From b33c16e4099083ce2d1913b8ffde98021ff18ec0 Mon Sep 17 00:00:00 2001
+From 325d3bb7b69bb86e217ca758a8e12a1a946c4972 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.
@@ -77,5 +77,5 @@ index 19fbf9b..ad00c39 100644
          Iterator iterator = RegionFileCache.a.values().iterator();
  
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0104-Add-getEntity-by-UUID-API.patch

@@ -1,4 +1,4 @@
-From de9e7e0db359950df5f0f8213285b8845c8c38bf Mon Sep 17 00:00:00 2001
+From 9612faedc986c334b3f3b434b1b41e6b27f6d440 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
@@ -26,7 +26,7 @@ index a872e76..3339985 100644
                  }
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 7364705..119001c 100644
+index f154248..5614147 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;
@@ -53,5 +53,5 @@ index 7364705..119001c 100644
      // Paper end
  }
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0105-Use-Optimized-Collections.patch

@@ -1,4 +1,4 @@
-From 9f18ec97a8e587faf904677dffb029e4faf1a9fb Mon Sep 17 00:00:00 2001
+From 6024663bf49d367680f557bc9e63c89a4eafceb7 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
@@ -47,5 +47,5 @@ index 419add5..820c152 100644
      private boolean f = true;
      private boolean g;
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0106-Do-not-load-chunks-for-light-checks.patch

@@ -1,4 +1,4 @@
-From 3786f7789bb15a32800a8cb9331b3538510735bf Mon Sep 17 00:00:00 2001
+From a22e78030bbed897eddbf5a6557bbe0cc2d78468 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 345351e..b175b28 100644
+index fbe33a8..6c72e7e 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 {
@@ -19,5 +19,5 @@ index 345351e..b175b28 100644
                  Chunk chunk = this.getChunkAtWorldCoords(blockposition);
  
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0107-Add-PlayerUseUnknownEntityEvent.patch

@@ -1,4 +1,4 @@
-From 073cf1e4b1797af8772ea2146f63542e4ee2bf4c Mon Sep 17 00:00:00 2001
+From f0bf2a707a75e985bf9c47d612ef69e191481032 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 2 Apr 2016 05:09:16 -0400
 Subject: [PATCH] Add PlayerUseUnknownEntityEvent
@@ -18,10 +18,10 @@ index 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 724b9ad..6264494 100644
+index 687a8e6..1f0047b 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1596,6 +1596,16 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1598,6 +1598,16 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                  }
              }
          }
@@ -39,5 +39,5 @@ index 724b9ad..6264494 100644
      }
  
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0108-Fix-reducedDebugInfo-not-initialized-on-client.patch

@@ -1,4 +1,4 @@
-From 541545f30a6d54e0ee4893e5800a35589ddd3797 Mon Sep 17 00:00:00 2001
+From c28acd09d82ab7410f79a4d2b34545acc52b0438 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
@@ -17,5 +17,5 @@ index 954d035..87740c2 100644
          entityplayer.getStatisticManager().d();
          entityplayer.getStatisticManager().updateStatistics(entityplayer);
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0109-Configurable-Grass-Spread-Tick-Rate.patch

@@ -1,4 +1,4 @@
-From 3f0c460538337858040cb082e5c463d06ff32f7c Mon Sep 17 00:00:00 2001
+From de0c198ba4a6f03d184acf8b6d003e00f7f765c3 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
@@ -32,5 +32,5 @@ index 8b43e60..5cbc95f 100644
              int lightLevel = -1; // Paper
              if (world.getType(blockposition.up()).c() > 2 && (lightLevel = world.getLightLevel(blockposition.up())) < 4) { // Paper - move light check to end to avoid unneeded light lookups
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0110-Configurable-Keep-Spawn-Loaded-range-per-world.patch

@@ -1,4 +1,4 @@
-From d994474633853169f0956a20ca5d02d50e7839b0 Mon Sep 17 00:00:00 2001
+From b2b8342d1fcbb7475bbf3e566ec8fd666f5ea38f 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
@@ -67,7 +67,7 @@ index 5614147..f107221 100644
              for (int j = -short1; j <= short1; j += 16) {
                  for (int k = -short1; k <= short1; k += 16) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index cc15a0b..5bfdcfd 100644
+index 110f655..98da2ea 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1264,8 +1264,9 @@ public class CraftWorld implements World {

Spigot-Server-Patches/0111-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch

@@ -1,11 +1,11 @@
-From 951354f7bd62febe717bcbe47708e6a8322b0b2a Mon Sep 17 00:00:00 2001
+From 94112ba932ea43628bc61dc09236b7ffd88323de 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 bd81a19..f0f18b2 100644
+index c82ea39..5164082 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 {
@@ -17,5 +17,5 @@ index bd81a19..f0f18b2 100644
          this.a(blockposition.east(), block, blockposition);
          this.a(blockposition.down(), block, blockposition);
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0112-Don-t-spam-reload-spawn-chunks-in-nether-end.patch

@@ -1,11 +1,11 @@
-From 2f5acd3d033a39924b042ddfc9aecbfd5a5fb91d Mon Sep 17 00:00:00 2001
+From 8393a8e37b3918941a5886a97b6e64e94297e8b3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Apr 2016 19:42:22 -0400
 Subject: [PATCH] Don't spam reload spawn chunks in nether/end
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index f0f18b2..124c24a 100644
+index 5164082..acc0272 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -3218,6 +3218,7 @@ public abstract class World implements IBlockAccess {
@@ -29,5 +29,5 @@ index 660f3bc..9adadaf 100644
      }
  }
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0113-Remove-Debug-checks-from-DataBits.patch

@@ -1,4 +1,4 @@
-From fd1c35b9d21856fe5eaecb673f4b1ce372a3fe2f Mon Sep 17 00:00:00 2001
+From efe0d10cf4b3ae44d99d0bc243315430db1d0e81 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
@@ -42,5 +42,5 @@ index f3a6799..fa0fd8a 100644
          int k = j / 64;
          int l = ((i + 1) * this.b - 1) / 64;
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0114-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch

@@ -1,4 +1,4 @@
-From a8b640a52d70d9d23336ec4294ebb4b893533e41 Mon Sep 17 00:00:00 2001
+From dadfa1ee4ca5b33de2bcd13a7bf691cd1d2d234f 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,10 +31,10 @@ index d8ebe11..2d0e132 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 6264494..9fa9ad6 100644
+index 1f0047b..00135cc 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1329,7 +1329,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1331,7 +1331,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                      return;
                  }
  
@@ -51,5 +51,5 @@ index 6264494..9fa9ad6 100644
                  if (((LazyPlayerSet) event.getRecipients()).isLazy()) {
                      for (Object recipient : minecraftServer.getPlayerList().players) {
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0115-Workaround-for-setting-passengers-on-players.patch

@@ -1,4 +1,4 @@
-From 1c728d40587a71f8a41b47845ff144fdd5e242e6 Mon Sep 17 00:00:00 2001
+From ad01e2c491ed045ba0d29e61916d7f7fe692d096 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Workaround for setting passengers on players
 SPIGOT-1915 & GH-114
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 88a19a8..2eaf502 100644
+index 06e401a..1a4603d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -602,6 +602,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -28,5 +28,5 @@ index 88a19a8..2eaf502 100644
      public void setSneaking(boolean sneak) {
          getHandle().setSneaking(sneak);
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0116-Remove-unused-World-Tile-Entity-List.patch

@@ -1,4 +1,4 @@
-From de1f0ef246faa7fb26a52bac94bcacc6748219df Mon Sep 17 00:00:00 2001
+From 927b8519e21bbe8d01523a1408314fe3762a9ee8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 13 Apr 2016 00:25:28 -0400
 Subject: [PATCH] Remove unused World Tile Entity List
@@ -6,7 +6,7 @@ Subject: [PATCH] Remove unused World Tile Entity List
 Massive hit to performance and it is completely unnecessary.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 124c24a..da255bb 100644
+index acc0272..b8fefb8 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -68,7 +68,7 @@ public abstract class World implements IBlockAccess {
@@ -67,5 +67,5 @@ index 124c24a..da255bb 100644
              }
  
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0117-Don-t-tick-Skulls-unused-code.patch

@@ -1,4 +1,4 @@
-From fb9c00889babf3171e41e25c9431eda1d41e133f Mon Sep 17 00:00:00 2001
+From d94d2932a04f0f9a94ceac00af829123758ba063 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
@@ -18,5 +18,5 @@ index edd6fb6..380373c 100644
      private int a;
      public int rotation;
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0118-Configurable-Player-Collision.patch

@@ -1,4 +1,4 @@
-From 8f7b249a6de92ce692b7056afcaca278a887184b Mon Sep 17 00:00:00 2001
+From a4bf0117bb3933d3d85c8dc3712a9efd9f88a36d 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
@@ -132,5 +132,5 @@ index 87740c2..981c31f 100644
  
      // CraftBukkit start
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0119-Add-handshake-event-to-allow-plugins-to-handle-clien.patch

@@ -1,4 +1,4 @@
-From 8717ae9f6fa348f9d037fc1b41f38ba4ce59f575 Mon Sep 17 00:00:00 2001
+From 042754e2e1e1efe8c4fe1c48423ff2d7528a778a 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
@@ -45,5 +45,5 @@ index d29796a..d84ac87 100644
                      if ( split.length == 3 || split.length == 4 ) {
                          packethandshakinginsetprotocol.hostname = split[0];
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0120-Water-mobs-should-only-spawn-in-the-water.patch

@@ -1,4 +1,4 @@
-From 4f5c683362ad3163bcbe0679da71c81c19d6ff60 Mon Sep 17 00:00:00 2001
+From 182eced389007c2a1bf636b77983bee4a9a5e687 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
@@ -26,5 +26,5 @@ index 90d33af..2515557 100644
  
      public boolean canSpawn() {
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0121-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch

@@ -1,4 +1,4 @@
-From 93ccf6d56b720ecfa06e1de2f1bb78f52633aa98 Mon Sep 17 00:00:00 2001
+From 0bf6e6d9533372e999b08ca7b4c714496c9c4ed4 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
@@ -27,7 +27,7 @@ index 61d34fc..a6cf1d8 100644
          if (entity instanceof EntityItem) {
              itemCounts[i]--;
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index bb8191a..6bb0cf5 100644
+index f6e330c..c1f6e63 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -23,6 +23,15 @@ public final class SpawnerCreature {
@@ -56,5 +56,5 @@ index bb8191a..6bb0cf5 100644
                          Iterator iterator1 = this.b.iterator();
  
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0122-Configurable-RCON-IP-address.patch

@@ -1,4 +1,4 @@
-From 86cd299d88867e1634be4e3515681708fdd15d8c Mon Sep 17 00:00:00 2001
+From 6316e4cb845a5045a881450db207d68dc2f3550c 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
@@ -19,5 +19,5 @@ index a6a0d5a..efcafe7 100644
          if (0 == this.h) {
              this.h = this.i + 10;
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0123-Prevent-Fire-from-loading-chunks.patch

@@ -1,4 +1,4 @@
-From 074e297af2d1ef1b3389c4b6872e1940ff89c3d7 Mon Sep 17 00:00:00 2001
+From e3a566ee10a6d293e886d673f03a3652d854d7ef 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
@@ -45,5 +45,5 @@ index 20eb42d..1f2bc1e 100644
  
              return i;
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0124-Implement-PlayerLocaleChangeEvent.patch

@@ -1,11 +1,11 @@
-From 2d1c453d99db8e60221d8d31ee8da6b370268c12 Mon Sep 17 00:00:00 2001
+From 8a7da10a7e66a93a4f182344c9ff8993ad0ec429 Mon Sep 17 00:00:00 2001
 From: Isaac Moore <rmsy@me.com>
 Date: Tue, 19 Apr 2016 14:09:31 -0500
 Subject: [PATCH] Implement PlayerLocaleChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index feb07a3..83f3317 100644
+index 9662ea0..518283f 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -28,7 +28,7 @@ import org.bukkit.inventory.MainHand;
@@ -50,5 +50,5 @@ index 1a4603d..ffb7341 100644
  
          @Override
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0125-EntityRegainHealthEvent-isFastRegen-API.patch

@@ -1,4 +1,4 @@
-From 8f880722e118276157060204f50b4be80fe33955 Mon Sep 17 00:00:00 2001
+From 52dd965b56ebb4753e78717444b08d25e29fa6a9 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 7a96447..1eedcb0 100644
+index 1eee8a3..9a86d84 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -761,10 +761,16 @@ public abstract class EntityLiving extends Entity {
@@ -41,5 +41,5 @@ index b6e9786..8d95d14 100644
                  this.foodTickTimer = 0;
              }
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0126-Add-ability-to-configure-frosted_ice-properties.patch

@@ -1,4 +1,4 @@
-From 954d12a14c1dff636a87a76694a64029dc2dcd75 Mon Sep 17 00:00:00 2001
+From 357350798adfbe53370efcf429e73b341a02f069 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
@@ -44,5 +44,5 @@ index 7385582..f079c33 100644
  
      }
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0127-Vehicle-Event-Cancellation-Changes.patch

@@ -1,4 +1,4 @@
-From 8d59288c7eb6f9863e8068be2f788ebc63e67489 Mon Sep 17 00:00:00 2001
+From b9113e6ba632a3c3bbe17f6b487ffb56132b80e7 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
@@ -90,5 +90,5 @@ index 2d0e132..b0cdce1 100644
          return this.bx().size() < 1;
      }
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0128-Arrow-pickup-rule-API.patch

@@ -1,4 +1,4 @@
-From 20fc9ddcd798168124bbb0efb50264d45a0b86af Mon Sep 17 00:00:00 2001
+From ce322eaf0e78ed212d80c7dfe0e33c5fa105f6d4 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
@@ -54,5 +54,5 @@ index 2a3482c..fbf289f 100644
      private final Arrow.Spigot spigot = new Arrow.Spigot()
      {
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0129-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch

@@ -1,4 +1,4 @@
-From dacfbf50ad5db3be1c4e25f38e1958a0352a19ee Mon Sep 17 00:00:00 2001
+From 072bddba8079cc680ff95f629c926103a8af486a 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
@@ -51,5 +51,5 @@ index cb70d2c..b8750fb 100644
      public boolean interact(World world, BlockPosition blockposition, IBlockData iblockdata, EntityHuman entityhuman, EnumHand enumhand, EnumDirection enumdirection, float f, float f1, float f2) {
          if (world.isClientSide) {
 -- 
-2.10.2
+2.9.3
 

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

@@ -1,4 +1,4 @@
-From 0eaf3ca3298bb5c9a52c60b66f6d250e6797fa95 Mon Sep 17 00:00:00 2001
+From 07e66bf9e7556e4982a2029b012475b4f6c5fbc7 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
@@ -49,5 +49,5 @@ index f12bc70..7154776 100644
          return this.f > 0;
      }
 -- 
-2.10.0
+2.9.3
 

Spigot-Server-Patches/0131-remove-null-possibility-for-getServer-singleton.patch

@@ -1,4 +1,4 @@
-From c72e9c55511cad4b6ea72ace54e6cb392f0fd5ba Mon Sep 17 00:00:00 2001
+From c7fc2d45d3bf02828cba7ebc49fde738d05268bc Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 28 Apr 2016 00:57:27 -0400
 Subject: [PATCH] remove null possibility for getServer singleton
@@ -35,5 +35,5 @@ index 6f2cf4b..7446a3d 100644
      // CraftBukkit end
  }
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0132-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch

@@ -1,4 +1,4 @@
-From 5f6b95f9b97741dc1e2a6170966c8cc30774f9ca Mon Sep 17 00:00:00 2001
+From 0f6fb20f482b0f6bae8e1d4a4c70ff30592836b3 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 ae86ebc..c54f3f7 100644
+index f0a673f..fd08195 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 {
@@ -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 da255bb..ab0656e 100644
+index b8fefb8..a18a3f6 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1216,6 +1216,7 @@ public abstract class World implements IBlockAccess {
@@ -145,5 +145,5 @@ index 256a131..5768cd5 100644
  
      public RenderData() {
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0133-LootTable-API-Replenishable-Lootables-Feature.patch

@@ -1,4 +1,4 @@
-From 8712e9ac088ad974d4eea2c12880912523da7af5 Mon Sep 17 00:00:00 2001
+From 0960bacbacd9d02edd2c479ef2677e27c51b5822 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
@@ -782,5 +782,5 @@ index e9963e2..acb4dee 100644
  
      CraftMinecartHopper(CraftServer server, EntityMinecartHopper entity) {
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0134-Do-not-load-chunks-for-pathfinding.patch

@@ -1,4 +1,4 @@
-From 9747f0c9aa6bc79dd0e3f0c142f778bae82110db Mon Sep 17 00:00:00 2001
+From 84977c4a270a63d85372e4d71f30ac1ff981a040 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Jan 2016 00:13:19 -0500
 Subject: [PATCH] Do not load chunks for pathfinding
@@ -18,5 +18,5 @@ index 08b986f..786d1dd 100644
          }
  
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0135-Entity-Tracking-Improvements.patch

@@ -1,4 +1,4 @@
-From 16eb78807927b06bcc3b855a29ec3a93cbb5f58d Mon Sep 17 00:00:00 2001
+From 5db4f83d1537975e541f83fcc400b5c81323b28f 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
@@ -99,5 +99,5 @@ index 91af48f..eec0870 100644
  
      }
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0136-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch

@@ -1,4 +1,4 @@
-From 981399b650a75a66fefb2eb27fd14d79719722d2 Mon Sep 17 00:00:00 2001
+From 6092a6929b443e1ceca2337e038d2e05a6e9cdf1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 May 2016 23:33:08 -0400
 Subject: [PATCH] Don't save empty scoreboard teams to scoreboard.dat
@@ -31,5 +31,5 @@ index 230004b..62752f8 100644
  
              nbttagcompound.setString("Name", scoreboardteam.getName());
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0137-Do-not-mark-chunks-as-active-for-neighbor-updates.patch

@@ -1,4 +1,4 @@
-From df81c219e14fe868c7fa04064774545d91c51ff5 Mon Sep 17 00:00:00 2001
+From d926ee6cde591188f202d3ff4738eaeb221d4e02 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
@@ -44,5 +44,5 @@ index a6cf1d8..3db2916 100644
              if (chunk4 != null) {
                  chunk4.a(chunkgenerator);
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0138-Fix-Chunk-Unload-Queue-Issues.patch

@@ -1,4 +1,4 @@
-From 633c1df19c75e203b8f37dc85a17453195f284ac Mon Sep 17 00:00:00 2001
+From d2a0928f85b5cda286ca017993c0ac4bd72edbfd 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
@@ -34,5 +34,5 @@ index a57bcaf..bd44764 100644
                              continue;
                          }
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0139-System-property-for-disabling-watchdoge.patch

@@ -1,4 +1,4 @@
-From 084c9f8e37017e84a8cb3a9acac8c457db46965b Mon Sep 17 00:00:00 2001
+From ccd0b6b2684527b411ad2ee81d04f54649950653 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 12 May 2016 23:02:58 -0500
 Subject: [PATCH] System property for disabling watchdoge
@@ -18,5 +18,5 @@ index 3ed983c..fb57e0d 100644
                  Logger log = Bukkit.getServer().getLogger();
                  log.log( Level.SEVERE, "The server has stopped responding!" );
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0140-Optimize-EAR.patch

@@ -1,4 +1,4 @@
-From 31326e2e77e0f08fce209c6541d0f523eed2cd44 Mon Sep 17 00:00:00 2001
+From baae6bcffe1507b731eb9665ecf00263e7b66cdb 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
@@ -65,5 +65,5 @@ index c411ce8..c8a6ff3 100644
                  }
              }
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0141-Optimize-UserCache-Thread-Safe.patch

@@ -1,4 +1,4 @@
-From c441252e14019b1cb4a583ab7bad128f7fd7260a Mon Sep 17 00:00:00 2001
+From 9cc035507e52602c06dd0cbda7935091d5b74316 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
@@ -96,5 +96,5 @@ index ccfc755..989758c 100644
      }
  
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0142-Avoid-blocking-on-Network-Manager-creation.patch

@@ -1,4 +1,4 @@
-From b08b9267a815bb5ed31fc5f94479dd3b54c529a2 Mon Sep 17 00:00:00 2001
+From c588b430bfab3474b02c488ec2642b0e6b7a46d2 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
@@ -43,5 +43,5 @@ index 6a71ebb..faf7b60 100644
              if ( org.spigotmc.SpigotConfig.playerShuffle > 0 && MinecraftServer.currentTick % org.spigotmc.SpigotConfig.playerShuffle == 0 )
              {
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0143-Optional-old-TNT-cannon-behaviors.patch

@@ -1,4 +1,4 @@
-From caa2532ecdeb24407bbd2d4e2af544fc888fb1ac Mon Sep 17 00:00:00 2001
+From 00d7398a73ad247f545629e5cf38f6bed90cb4e4 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
@@ -389,5 +389,5 @@ index d7bc6a0..f2785d8 100644
                              EntityHuman entityhuman = (EntityHuman) entity;
  
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0144-Faster-redstone-torch-rapid-clock-removal.patch

@@ -1,4 +1,4 @@
-From 48ac4280ce35d77584c2aaefc8067f72c0fd613f Mon Sep 17 00:00:00 2001
+From 7873041b5366f21e28f223cb43dc235c29a83609 Mon Sep 17 00:00:00 2001
 From: Martin Panzer <postremus1996@googlemail.com>
 Date: Mon, 23 May 2016 12:12:37 +0200
 Subject: [PATCH] Faster redstone torch rapid clock removal
@@ -6,7 +6,7 @@ Subject: [PATCH] Faster redstone torch rapid clock removal
 Only resize the the redstone torch list once, since resizing arrays / lists is costly
 
 diff --git a/src/main/java/net/minecraft/server/BlockRedstoneTorch.java b/src/main/java/net/minecraft/server/BlockRedstoneTorch.java
-index 22bd94d..28fe59a 100644
+index 7412362..25a2a5d 100644
 --- a/src/main/java/net/minecraft/server/BlockRedstoneTorch.java
 +++ b/src/main/java/net/minecraft/server/BlockRedstoneTorch.java
 @@ -117,9 +117,17 @@ public class BlockRedstoneTorch extends BlockTorch {
@@ -39,5 +39,5 @@ index 22bd94d..28fe59a 100644
          public RedstoneUpdateInfo(BlockPosition blockposition, long i) {
              this.a = blockposition;
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0145-Ensure-Chunks-never-ever-load-async.patch

@@ -1,4 +1,4 @@
-From bcf573326269816e6803bf52318fe3db9a68a484 Mon Sep 17 00:00:00 2001
+From be7f6fcbd5a50af9cbe9495f50192ab6f878b0c2 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
@@ -42,5 +42,5 @@ index b5efb9c..ef9529a 100644
              return;
          }
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0146-Add-server-name-parameter.patch

@@ -1,11 +1,11 @@
-From 3e15342133e1166fbbeac7862c485d1ead54849c Mon Sep 17 00:00:00 2001
+From e0ddf29d3ebe2772a89b2dd583e94c98cbbfe68e 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 11bc824..b171b0f 100644
+index 788bf66..4ac4e6f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -134,6 +134,14 @@ public class Main {
@@ -24,5 +24,5 @@ index 11bc824..b171b0f 100644
          };
  
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0147-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch

@@ -1,4 +1,4 @@
-From f7f973dee1cbc0106ca291436f986925ba58f6e7 Mon Sep 17 00:00:00 2001
+From a65a78f663f0651a98aa19cbdd968f2a9ca5e87c 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
@@ -25,7 +25,7 @@ index 7eea3bb..6d3a212 100644
                      double deltaZ = this.locZ - player.locZ;
                      double distanceSquared = deltaX * deltaX + deltaZ * deltaZ;
 diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java
-index 47c5362..21856be 100644
+index f56dabb..73c7d01 100644
 --- a/src/main/java/net/minecraft/server/EntityWither.java
 +++ b/src/main/java/net/minecraft/server/EntityWither.java
 @@ -206,8 +206,12 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
@@ -44,5 +44,5 @@ index 47c5362..21856be 100644
                      double deltaZ = this.locZ - player.locZ;
                      double distanceSquared = deltaX * deltaX + deltaZ * deltaZ;
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0148-Fix-FallingBlocks-being-stuck-on-fences.patch

@@ -1,4 +1,4 @@
-From 2b86c572200449a630e63977abf6733c518e4be5 Mon Sep 17 00:00:00 2001
+From c26e577f4889a970d2cbd8f9f10ddd4bbb301fa3 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
@@ -102,5 +102,5 @@ index 613af99..edc817a 100644
          Block block = this.block.getBlock();
  
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0149-Make-entities-look-for-hoppers.patch

@@ -1,4 +1,4 @@
-From 56aca6078929415387fb88359401d9259e3180de Mon Sep 17 00:00:00 2001
+From a7eb52dbae3e2378a094cdd70304b7e2c3c3dffa 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
@@ -390,5 +390,5 @@ index 7154776..f8339ad 100644
  
              if (!list.isEmpty()) {
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0150-Delay-Chunk-Unloads-based-on-Player-Movement.patch

@@ -1,4 +1,4 @@
-From 795af98bafa1b29558646aa61187796616c97a82 Mon Sep 17 00:00:00 2001
+From 84601041d42d274955a08deea4f7b069ccb07dda 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 5bfdcfd..c3f0f47 100644
+index 98da2ea..ade5ba0 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 {

Spigot-Server-Patches/0151-Toggleable-Elytra-Wall-Damage.patch

@@ -1,4 +1,4 @@
-From acbec2ce9a40d727cd574ede9b85e08ec2d58e31 Mon Sep 17 00:00:00 2001
+From 2a76c1435b1a5a3f30fdbc8277df3aae5703330b 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
@@ -21,10 +21,10 @@ index cda516f..965edc9 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 1eedcb0..a875e7d 100644
+index 9a86d84..1f2f08c 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -1686,6 +1686,7 @@ public abstract class EntityLiving extends Entity {
+@@ -1689,6 +1689,7 @@ public abstract class EntityLiving extends Entity {
                      this.motY = 0.30000001192092896D;
                  }
              } else if (this.cH()) {
@@ -32,7 +32,7 @@ index 1eedcb0..a875e7d 100644
                  if (this.motY > -0.5D) {
                      this.fallDistance = 1.0F;
                  }
-@@ -1735,6 +1736,7 @@ public abstract class EntityLiving extends Entity {
+@@ -1738,6 +1739,7 @@ public abstract class EntityLiving extends Entity {
                          this.damageEntity(DamageSource.FLY_INTO_WALL, f7);
                      }
                  }
@@ -41,5 +41,5 @@ index 1eedcb0..a875e7d 100644
                  if (this.onGround && !this.world.isClientSide) {
                      if (getFlag(7) && !CraftEventFactory.callToggleGlideEvent(this, false).isCancelled()) // CraftBukkit
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0152-Fix-Double-World-Add-issues.patch

@@ -1,4 +1,4 @@
-From 53fd3c714c6ff5f5d720290623f6713383d2c606 Mon Sep 17 00:00:00 2001
+From 80cc890650fe88d381a659ed551d6fdf47978d54 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
@@ -21,7 +21,7 @@ index e2dd95b..ff7b406 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 ab0656e..424ee48 100644
+index a18a3f6..b7c4e07 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 {
@@ -33,5 +33,5 @@ index ab0656e..424ee48 100644
          int i = MathHelper.floor(entity.locX / 16.0D);
          int j = MathHelper.floor(entity.locZ / 16.0D);
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0153-Fix-Old-Sign-Conversion.patch

@@ -1,4 +1,4 @@
-From dfe457a610b086620e5d1e2dfdde0f80bc14511d Mon Sep 17 00:00:00 2001
+From d215ca6808f38cb7dfa31591393e1afb0d8c6a35 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
@@ -67,5 +67,5 @@ index 34ade14..242552c 100644
                  try {
                      this.lines[i] = ChatComponentUtils.filterForDisplay(icommandlistener, ichatbasecomponent, (Entity) null);
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0154-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch

@@ -1,4 +1,4 @@
-From db3d1547cdd512ebbb747ae3e3302d5e1ff19fb9 Mon Sep 17 00:00:00 2001
+From 49bdee5275cd8950f35be0796a3469c8282919ae 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
@@ -18,5 +18,5 @@ index 989758c..1c619c5 100644
              GameProfile gameprofile = new GameProfile(uuid, s);
  
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0155-More-informative-vehicle-moved-wrongly-message.patch

@@ -1,11 +1,11 @@
-From 0280ebfd1743284fc42a5b8a22921a9293fade03 Mon Sep 17 00:00:00 2001
+From e8cc90238708d5eeeb9e2885e4c2e12138a8d354 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 9fa9ad6..052847d 100644
+index 00135cc..a78de71 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 {
@@ -18,5 +18,5 @@ index 9fa9ad6..052847d 100644
  
                  entity.setLocation(d3, d4, d5, f, f1);
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0156-Re-track-players-that-dismount-from-other-players.patch

@@ -1,11 +1,11 @@
-From 4ff19b3208d669d5dce08b3108f02c4a1ddebdb7 Mon Sep 17 00:00:00 2001
+From f0ce8613766ec872134d1a67b3bb0dd08d3f1555 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 31 Jul 2016 16:33:03 -0500
 Subject: [PATCH] Re-track players that dismount from other players
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 83f3317..ee3bdcf 100644
+index 518283f..722367b 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -632,6 +632,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -23,5 +23,5 @@ index 83f3317..ee3bdcf 100644
      }
  
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0157-Add-setting-for-proxy-online-mode-status.patch

@@ -1,4 +1,4 @@
-From eaae681fc8287926596f6418c360884e23a20888 Mon Sep 17 00:00:00 2001
+From 19700e1fb94bf0116f33ca99906c7996bcf03989 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
@@ -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 67e802a..d5e602f 100644
+index f107221..b24ed68 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1347,7 +1347,8 @@ public final class CraftServer implements Server {
@@ -47,5 +47,5 @@ index 67e802a..d5e602f 100644
                  profile = console.getUserCache().getProfile( name );
              }
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0158-Optimise-BlockStateEnum-hashCode-and-equals.patch

@@ -1,4 +1,4 @@
-From 64b37b622f4e10a52558313fba5a96d2d4f5c715 Mon Sep 17 00:00:00 2001
+From b6dbc63e8c4a6ef4bb026c56768b50ba1d0bebbd 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
@@ -58,5 +58,5 @@ index 288c52c..66c459d 100644
  
      public static <T extends Enum<T> & INamable> BlockStateEnum<T> of(String s, Class<T> oclass) {
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0159-Disable-ticking-of-snow-blocks.patch

@@ -1,4 +1,4 @@
-From 7d402227d07286eddce588c63b10c8f69618aae4 Mon Sep 17 00:00:00 2001
+From ba26de0a9ca21cdbfacf6dea0884cb88e8144020 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
@@ -34,5 +34,5 @@ index f69dc17..51924fe 100644
 +    //Paper end
  }
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0160-Convert-new-health-to-a-float-during-set.patch

@@ -1,4 +1,4 @@
-From cf1eccf846f6d3b1e74979e9b2912a7b0d2cfc3c Mon Sep 17 00:00:00 2001
+From fabb9366afe8e8558bb54cfc1076846a4332c612 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
@@ -18,5 +18,5 @@ index 0493c1b..13d480f 100644
              // Paper - Be more informative
              throw new IllegalArgumentException("Health must be between 0 and " + getMaxHealth() + ", but was " + health
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0161-Fix-AIOOBE-in-inventory-handling.patch

@@ -1,14 +1,14 @@
-From 2dd71889546b21e8776df2cc1b451989acb828b2 Mon Sep 17 00:00:00 2001
+From ed4a6c8cfc33ea7aaed798d5399f579d3c4bf66b 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 052847d..5f86e0a 100644
+index a78de71..93e427b 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1796,7 +1796,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1798,7 +1798,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                      case CLONE:
                          if (packetplayinwindowclick.c() == 2) {
                              click = ClickType.MIDDLE;
@@ -18,5 +18,5 @@ index 052847d..5f86e0a 100644
                              } else {
                                  Slot slot = this.player.activeContainer.getSlot(packetplayinwindowclick.b());
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0162-Configurable-packet-in-spam-threshold.patch

@@ -1,4 +1,4 @@
-From 285e4d9d114e3bb87f3850b36d67d9d0e30be0d5 Mon Sep 17 00:00:00 2001
+From 4aa83413120d7846fd492c18c3b6d006dcd69d40 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 11 Sep 2016 14:30:57 -0500
 Subject: [PATCH] Configurable packet in spam threshold
@@ -23,7 +23,7 @@ index 91546b6..211b88a 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 5f86e0a..6ed53dd 100644
+index 93e427b..b0de8c1 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -855,13 +855,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -44,5 +44,5 @@ index 5f86e0a..6ed53dd 100644
              limitedPackets = 0;
              return true;
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0163-Configurable-flying-kick-messages.patch

@@ -1,4 +1,4 @@
-From 7ae8fc9dea13bbb435641999e91017797a427321 Mon Sep 17 00:00:00 2001
+From a297d9ece693ba2bb45f011e1432531a6c03b627 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Tue, 20 Sep 2016 00:58:01 +0000
 Subject: [PATCH] Configurable flying kick messages
@@ -21,7 +21,7 @@ index 211b88a..3161dad 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 6ed53dd..6c1efc6 100644
+index b0de8c1..ae05dd8 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 {
@@ -43,5 +43,5 @@ index 6ed53dd..6c1efc6 100644
                  }
              } else {
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0164-Auto-Save-Improvements.patch

@@ -1,4 +1,4 @@
-From 4a3555714b95d6e286bee597c340598df3b235ef Mon Sep 17 00:00:00 2001
+From 850c07bad704068a851f429350b6242bb2e7db32 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
@@ -10,7 +10,7 @@ Process auto save every tick instead of once per auto tick interval, so that chu
 Re-introduce a cap per tick for auto save (Spigot disabled the vanilla cap) and make it configurable.
 
 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;
@@ -42,7 +42,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 {
@@ -60,7 +60,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 @@
@@ -80,7 +80,7 @@ index 7a56a6416..5c5a56c51 100644
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 968b0ecd0..683ace3af 100644
+index 968b0ec..683ace3 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
@@ -122,7 +122,7 @@ index 968b0ecd0..683ace3af 100644
          this.methodProfiler.a("tallying");
          this.h[this.ticks % 100] = System.nanoTime() - i;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index f04486e86..2ac1d7498 100644
+index f04486e..2ac1d74 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 {
@@ -145,5 +145,5 @@ index f04486e86..2ac1d7498 100644
              timings.worldSaveChunks.startTiming(); // Paper
              chunkproviderserver.a(flag);
 -- 
-2.11.0.windows.1
+2.9.3
 

Spigot-Server-Patches/0165-Chunk-registration-fixes.patch

@@ -1,4 +1,4 @@
-From 2a3e39c4d8dad45834527f5bb3300a622266ae8d Mon Sep 17 00:00:00 2001
+From 0a20481608c409a59af7eef5b70d127edab08a4f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Sep 2016 22:54:28 -0400
 Subject: [PATCH] Chunk registration fixes
@@ -8,7 +8,7 @@ World checks and the Chunk Add logic are inconsistent on how Y > 256, < 0, is tr
 Keep them consistent
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 424ee48..addde05 100644
+index b7c4e07..e7ae4c7 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1783,7 +1783,7 @@ public abstract class World implements IBlockAccess {
@@ -21,5 +21,5 @@ index 424ee48..addde05 100644
  
              if (!entity.aa || entity.ab != k || entity.ac != l || entity.ad != i1) {
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0166-Remove-FishingHook-reference-on-Craft-Entity-removal.patch

@@ -1,4 +1,4 @@
-From 7342a055c028ef8bc6511d931e50eb5c5176ee9b Mon Sep 17 00:00:00 2001
+From 0542654c0122702d9a18649a3c3d79c2b9d24a65 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
@@ -26,5 +26,5 @@ index ecfc316..3f909c1 100644
      public LivingEntity _INVALID_getShooter() {
          return (LivingEntity) getShooter();
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0167-Auto-fix-bad-Y-levels-on-player-login.patch

@@ -1,4 +1,4 @@
-From ff13b1139f11a5c3e9f4645d524d8aece960e3ca Mon Sep 17 00:00:00 2001
+From a96b37507762942b172e68b0e33c2fd4edcada4e 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
@@ -18,5 +18,5 @@ index 722367b..e72d6bb 100644
      }
  
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0168-Raise-string-limit-for-packet-serialization.patch

@@ -1,4 +1,4 @@
-From 51bf651bfa762b1b94e2998f414718e8dbfbe551 Mon Sep 17 00:00:00 2001
+From d69d28d4abefe283853847af7e2707eb10139084 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
@@ -23,5 +23,5 @@ index 7a66195..68e8c46 100644
              this.d(abyte.length);
              this.writeBytes(abyte);
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0169-Disable-Vanilla-Chunk-GC.patch

@@ -1,4 +1,4 @@
-From 59f5468075f4fc98a3aeae6d107d3d5482e3e9bf Mon Sep 17 00:00:00 2001
+From 4af5d5b07b603fd1bb03d7d3c5b06846948d9e30 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 26 Sep 2016 01:51:30 -0400
 Subject: [PATCH] Disable Vanilla Chunk GC
@@ -6,7 +6,7 @@ Subject: [PATCH] Disable Vanilla Chunk GC
 Bukkit has its own system for this.
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 2ac1d7498..4d4828a44 100644
+index 2ac1d74..4d4828a 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1019,7 +1019,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -29,5 +29,5 @@ index 2ac1d7498..4d4828a44 100644
          }
      }
 -- 
-2.11.0.windows.1
+2.9.3
 

Spigot-Server-Patches/0170-Option-to-remove-corrupt-tile-entities.patch

@@ -1,4 +1,4 @@
-From 3f23c1b94aee59ba0147e16c5de5956a4c5bb637 Mon Sep 17 00:00:00 2001
+From d52728bb4d71f2069314213896b745c729848c2b Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 5 Oct 2016 16:27:36 -0500
 Subject: [PATCH] Option to remove corrupt tile entities
@@ -41,5 +41,5 @@ index 9f7f32d..d850dbf 100644
          if (this.j) {
              TileEntity tileentity = (TileEntity) this.tileEntities.remove(blockposition);
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0171-Add-EntityZapEvent.patch

@@ -1,11 +1,11 @@
-From 51633679da869034a68ca0c5c2f2fac459132268 Mon Sep 17 00:00:00 2001
+From 032b7db5cf8f34d301a90bac95c812edcfbea26a Mon Sep 17 00:00:00 2001
 From: AlphaBlend <whizkid3000@hotmail.com>
 Date: Sun, 16 Oct 2016 23:19:30 -0700
 Subject: [PATCH] Add EntityZapEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java
-index 5279a60c7..c5f5b57a3 100644
+index 5279a60..c5f5b57 100644
 --- a/src/main/java/net/minecraft/server/EntityPig.java
 +++ b/src/main/java/net/minecraft/server/EntityPig.java
 @@ -146,6 +146,12 @@ public class EntityPig extends EntityAnimal {
@@ -22,7 +22,7 @@ index 5279a60c7..c5f5b57a3 100644
              if (CraftEventFactory.callPigZapEvent(this, entitylightning, entitypigzombie).isCancelled()) {
                  return;
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index a2e68c59e..4a6b3da1b 100644
+index a2e68c5..4a6b3da 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -616,6 +616,12 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
@@ -48,7 +48,7 @@ index a2e68c59e..4a6b3da1b 100644
          }
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 1e7fdb576..9b36fb1af 100644
+index 1e7fdb5..9b36fb1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -671,6 +671,14 @@ public class CraftEventFactory {
@@ -67,5 +67,5 @@ index 1e7fdb576..9b36fb1af 100644
          HorseJumpEvent event = new HorseJumpEvent((AbstractHorse) horse.getBukkitEntity(), power);
          horse.getBukkitEntity().getServer().getPluginManager().callEvent(event);
 -- 
-2.11.0.windows.1
+2.9.3
 

Spigot-Server-Patches/0172-Don-t-load-Chunks-from-Hoppers-and-other-things.patch

@@ -1,4 +1,4 @@
-From a4322ea60fbb664e3dc2fb4c35f3efce09a4a794 Mon Sep 17 00:00:00 2001
+From 6de9374b33d41a9335bd667efdcd3dd4dec39516 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Nov 2016 20:28:12 -0400
 Subject: [PATCH] Don't load Chunks from Hoppers and other things
@@ -32,5 +32,5 @@ index 9d4c15f..9470dd6 100644
                      if (block == this) {
                          if (this.e(world, blockposition1)) {
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0173-Prevent-Auto-Save-if-Save-Queue-is-full.patch

@@ -1,4 +1,4 @@
-From 9f09ca2a4183dce2ce00f47ed4c17d42699a0158 Mon Sep 17 00:00:00 2001
+From 591dfc50062fc73514857eba53676054a11cd56c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Nov 2016 21:52:22 -0400
 Subject: [PATCH] Prevent Auto Save if Save Queue is full
@@ -63,5 +63,5 @@ index ff7b406..2fbcf8d 100644
          ChunkCoordIntPair chunkcoordintpair = new ChunkCoordIntPair(i, j);
  
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0174-Chunk-Save-Stats-Debug-Option.patch

@@ -1,4 +1,4 @@
-From 120160b9b4a6ca345a7246104380ef7b07e8e3ff Mon Sep 17 00:00:00 2001
+From e3488f09522735e340e2a58b0a46183405970823 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 4 Nov 2016 02:12:10 -0400
 Subject: [PATCH] Chunk Save Stats Debug Option
@@ -90,5 +90,5 @@ index 2fbcf8d..519c527 100644
              boolean flag;
  
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0175-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch

@@ -1,4 +1,4 @@
-From 1a47c05d6dfd88710e000e82b165b231b7cded01 Mon Sep 17 00:00:00 2001
+From 756ed4959a2b41d42001b3083e1296532eff6b67 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 12 Nov 2016 23:25:22 -0600
 Subject: [PATCH] Filter bad data from ArmorStand and SpawnEgg items
@@ -61,5 +61,5 @@ index 69caabb..143b94f 100644
                  entity.f(nbttagcompound1);
              }
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0176-Cache-user-authenticator-threads.patch

@@ -1,4 +1,4 @@
-From 2c1a61f0eac80134adb181157e9e32ea3d99d612 Mon Sep 17 00:00:00 2001
+From 672eb08f8b066ea26d9bebd60159d95ae77bfd62 Mon Sep 17 00:00:00 2001
 From: vemacs <d@nkmem.es>
 Date: Wed, 23 Nov 2016 08:31:45 -0500
 Subject: [PATCH] Cache user authenticator threads
@@ -63,5 +63,5 @@ index fe390fe..350ec03 100644
      }
  
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0177-Optimize-Network-Queue.patch

@@ -1,4 +1,4 @@
-From 08cf7bcd0a6eb494ee8b05d579381539dc72348a Mon Sep 17 00:00:00 2001
+From cdfc40dc5ede1164bc57a15488eea8db5b1f4ba3 Mon Sep 17 00:00:00 2001
 From: vemacs <d@nkmem.es>
 Date: Wed, 23 Nov 2016 12:54:56 -0500
 Subject: [PATCH] Optimize Network Queue
@@ -18,5 +18,5 @@ index 683ace3..b4adf7e 100644
      private long ab = aw();
  
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0178-Optimise-NetworkManager.patch

@@ -1,4 +1,4 @@
-From 7002b0c4ea6fec54a9a40d23d91dfb03eb3e1016 Mon Sep 17 00:00:00 2001
+From e25bf1475aa5d939a70fc68b7822b6d39c20bec6 Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Fri, 25 Nov 2016 20:35:05 +0000
 Subject: [PATCH] Optimise NetworkManager
@@ -121,5 +121,5 @@ index 184ef32..be14c0b 100644
  
          }
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0179-Optimise-removeQueue.patch

@@ -1,4 +1,4 @@
-From 1d7ec33233736bb1d6a954199624e923e6c1c841 Mon Sep 17 00:00:00 2001
+From 3adb456f88d312da4a666630a0aa28698d200905 Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Fri, 25 Nov 2016 13:22:40 +0000
 Subject: [PATCH] Optimise removeQueue
@@ -61,5 +61,5 @@ index e72d6bb..3e81336 100644
  
      protected void a(MobEffect mobeffect) {
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0180-Allow-Reloading-of-Command-Aliases.patch

@@ -1,4 +1,4 @@
-From ebdaabf2be182bea341c4fcfeec3a8330790bc3a Mon Sep 17 00:00:00 2001
+From 120d8ec03fdcb9cfc95827a280f85bc37ccfd375 Mon Sep 17 00:00:00 2001
 From: willies952002 <admin@domnian.com>
 Date: Mon, 28 Nov 2016 10:21:52 -0500
 Subject: [PATCH] Allow Reloading of Command Aliases
@@ -26,5 +26,5 @@ index b24ed68..5559532 100644
      // Paper end
  }
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0181-Add-source-to-PlayerExpChangeEvent.patch

@@ -1,11 +1,11 @@
-From 17e625b39d6946da74619b776f3337cbb8afbbe2 Mon Sep 17 00:00:00 2001
+From 6b5f9a58181a07e62b972e797c3f23c78a4cb662 Mon Sep 17 00:00:00 2001
 From: AlphaBlend <whizkid3000@hotmail.com>
 Date: Thu, 8 Sep 2016 08:48:33 -0700
 Subject: [PATCH] Add source to PlayerExpChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index 9da8ae451..11f3b3189 100644
+index 9da8ae4..11f3b31 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -172,7 +172,7 @@ public class EntityExperienceOrb extends Entity {
@@ -18,7 +18,7 @@ index 9da8ae451..11f3b3189 100644
  
                  this.die();
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 9b36fb1af..75b014952 100644
+index 9b36fb1..75b0149 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -45,6 +45,7 @@ import org.bukkit.entity.Player;
@@ -48,5 +48,5 @@ index 9b36fb1af..75b014952 100644
          Block block = world.getWorld().getBlockAt(x, y, z);
          CraftBlockState state = (CraftBlockState) block.getState();
 -- 
-2.11.0.windows.1
+2.9.3
 

Spigot-Server-Patches/0182-Speedup-BlockPos-by-fixing-inlining.patch

@@ -1,4 +1,4 @@
-From 8f70d3bfbc06dc2d3b6ffeb06b2ca85c5797efe5 Mon Sep 17 00:00:00 2001
+From becc6261143f3bf64f526ae038f9b6d54bf9ed83 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Wed, 30 Nov 2016 20:56:58 -0600
 Subject: [PATCH] Speedup BlockPos by fixing inlining
@@ -158,5 +158,5 @@ index 6c14061..c258331 100644
  
          public BlockPosition h() {
 -- 
-2.10.2
+2.9.3
 

Spigot-Server-Patches/0183-Optimize-World.isLoaded-BlockPosition-Z.patch

@@ -1,4 +1,4 @@
-From dfd4b6b5d6fb892d5456f3fa1782c0d286ff577a Mon Sep 17 00:00:00 2001
+From e0b5a13ae87be78291e42f80d3520108c7c3e8e4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 2 Dec 2016 00:11:43 -0500
 Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z
@@ -19,5 +19,5 @@ index e7ae4c7..51e05f4 100644
  
      public boolean a(BlockPosition blockposition, boolean flag) {
 -- 
-2.10.2
+2.9.3
 

work/CraftBukkit

@@ -1 +1 @@
-Subproject commit 622630c823bfd8b39113dd0279dcb45ca5b09118
+Subproject commit 7e02867f09c3957574d1e421532bdbbd9f4fffc6