Update bStats implementation

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

@@ -1,11 +1,11 @@
-From 7d15c7cd26f998e90cb1854d92547f803d07a40b Mon Sep 17 00:00:00 2001
+From be6fc8fd90adbee10abc3c19b9baffa4e9b55618 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 8b96966d..8d1e8680 100644
+index 8b96966d8..8d1e8680b 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -66,6 +66,12 @@
@@ -23,7 +23,7 @@ index 8b96966d..8d1e8680 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 00000000..4b4b77a5
+index 000000000..4b4b77a5c
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
 @@ -0,0 +1,124 @@
@@ -153,7 +153,7 @@ index 00000000..4b4b77a5
 +}
 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 00000000..b79f1be7
+index 000000000..b79f1be7a
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimedChunkGenerator.java
 @@ -0,0 +1,126 @@
@@ -285,7 +285,7 @@ index 00000000..b79f1be7
 +}
 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 00000000..e7789117
+index 000000000..e7789117b
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
 @@ -0,0 +1,101 @@
@@ -391,7 +391,7 @@ index 00000000..e7789117
 +    }
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 75d4048a..1ea799d5 100644
+index 1594d7ca4..007589314 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;
@@ -409,7 +409,7 @@ index 75d4048a..1ea799d5 100644
  
  public class PaperConfig {
  
-@@ -175,4 +178,24 @@ public class PaperConfig {
+@@ -176,4 +179,24 @@ public class PaperConfig {
          config.addDefault(path, def);
          return config.getString(path, config.getString(path));
      }
@@ -435,7 +435,7 @@ index 75d4048a..1ea799d5 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index e8511ac9..d3f1a4ac 100644
+index e8511ac9a..d3f1a4ac0 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 {
@@ -455,7 +455,7 @@ index e8511ac9..d3f1a4ac 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 81fc04ed..bd3b1602 100644
+index 81fc04ed3..bd3b16025 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 {
@@ -503,7 +503,7 @@ index 81fc04ed..bd3b1602 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 daf2c0a6..3ba489d4 100644
+index daf2c0a67..3ba489d4f 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 {
@@ -525,7 +525,7 @@ index daf2c0a6..3ba489d4 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 a97e7d3c..4890023d 100644
+index a97e7d3c2..4890023d7 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 {
@@ -565,7 +565,7 @@ index a97e7d3c..4890023d 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 cb83e4f5..e6819139 100644
+index cb83e4f56..e6819139f 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;
@@ -618,7 +618,7 @@ index cb83e4f5..e6819139 100644
              return waitable.get();
          } catch (java.util.concurrent.ExecutionException e) {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 9bd9dc28..14d23556 100644
+index 9bd9dc28b..14d23556f 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -25,7 +25,8 @@ import org.bukkit.block.BlockFace;
@@ -657,7 +657,7 @@ index 9bd9dc28..14d23556 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 e9002c95..b22f81b1 100644
+index e9002c953..b22f81b12 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;
@@ -728,7 +728,7 @@ index e9002c95..b22f81b1 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java
-index 347a2b67..aceb08ce 100644
+index 347a2b671..aceb08ce1 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 {
@@ -759,7 +759,7 @@ index 347a2b67..aceb08ce 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index cc0efa2e..1b432f0d 100644
+index cc0efa2e0..1b432f0d7 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -47,8 +47,8 @@ import org.bukkit.Bukkit;
@@ -900,7 +900,7 @@ index cc0efa2e..1b432f0d 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 703d5813..021dfba1 100644
+index 703d5813d..021dfba14 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -1,5 +1,6 @@
@@ -1000,7 +1000,7 @@ index 703d5813..021dfba1 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 9897bade..27283efa 100644
+index 9897bade8..27283efad 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;
@@ -1048,7 +1048,7 @@ index 9897bade..27283efa 100644
          // CraftBukkit end
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
-index f74b0679..1fc632e0 100644
+index f74b06794..1fc632e0c 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
 @@ -1,15 +1,21 @@
@@ -1078,7 +1078,7 @@ index f74b0679..1fc632e0 100644
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index be52f3ad..d778eafb 100644
+index be52f3ad1..d778eafb3 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1,5 +1,6 @@
@@ -1102,7 +1102,7 @@ index be52f3ad..d778eafb 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 f1f20650..fb350c40 100644
+index f1f206501..fb350c408 100644
 --- a/src/main/java/net/minecraft/server/StructureGenerator.java
 +++ b/src/main/java/net/minecraft/server/StructureGenerator.java
 @@ -1,5 +1,7 @@
@@ -1144,7 +1144,7 @@ index f1f20650..fb350c40 100644
          return flag;
      }
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 6958a2e0..b3d3df4c 100644
+index 6958a2e0f..b3d3df4cf 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;
@@ -1164,7 +1164,7 @@ index 6958a2e0..b3d3df4c 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 758962e6..a87b3727 100644
+index 758962e67..a87b37277 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;
@@ -1270,7 +1270,7 @@ index 758962e6..a87b3727 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 391a09c5..96693899 100644
+index 391a09c52..966938997 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -247,13 +247,13 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -1403,7 +1403,7 @@ index 391a09c5..96693899 100644
  
      // CraftBukkit start
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 587d23df..d27e2ce9 100644
+index 587d23dfd..d27e2ce98 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1741,6 +1741,7 @@ public final class CraftServer implements Server {
@@ -1441,7 +1441,7 @@ index 587d23df..d27e2ce9 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 41d2d87e..00000000
+index 41d2d87ee..000000000
 --- a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
 +++ /dev/null
 @@ -1,173 +0,0 @@
@@ -1619,7 +1619,7 @@ index 41d2d87e..00000000
 -    }
 -}
 diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
-index 3a95b446..b5efb9c3 100644
+index 3a95b4465..b5efb9c3f 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 @@
@@ -1663,7 +1663,7 @@ index 3a95b446..b5efb9c3 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 5ceb086e..b56ae7a3 100644
+index 5ceb086e5..b56ae7a36 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -39,15 +39,9 @@ import org.bukkit.configuration.serialization.DelegateDeserialization;
@@ -1697,7 +1697,7 @@ index 5ceb086e..b56ae7a3 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 92d217bc..9952b64b 100644
+index 92d217bce..9952b64be 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 @@ -14,6 +14,7 @@ import java.util.concurrent.atomic.AtomicInteger;
@@ -1773,7 +1773,7 @@ index 92d217bc..9952b64b 100644
  
      private boolean isReady(final int currentTick) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
-index 220e39ab..afc6c17e 100644
+index 220e39abe..afc6c17e6 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 @@
@@ -1855,7 +1855,7 @@ index 220e39ab..afc6c17e 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 e52ef47b..3d90b342 100644
+index e52ef47b7..3d90b3426 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;
@@ -1867,7 +1867,7 @@ index e52ef47b..3d90b342 100644
          this.value = value;
      }
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index c32d44df..5c2fb005 100644
+index c32d44df0..5c2fb0058 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;

Spigot-Server-Patches/0018-Metrics.patch

@@ -1,22 +0,0 @@
-From 7ebf3a58079064072c7e0aa534b092ba412ed5c8 Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Tue, 1 Mar 2016 14:54:32 -0600
-Subject: [PATCH] Metrics
-
-
-diff --git a/src/main/java/org/spigotmc/Metrics.java b/src/main/java/org/spigotmc/Metrics.java
-index a5fd59d5e..680283ce0 100644
---- a/src/main/java/org/spigotmc/Metrics.java
-+++ b/src/main/java/org/spigotmc/Metrics.java
-@@ -344,7 +344,7 @@ public class Metrics {
-      */
-     private void postPlugin(final boolean isPing) throws IOException {
-         // Server software specific section
--        String pluginName = "Spigot";
-+        String pluginName = "PaperSpigot"; // Paper - Keep old name for legacy data
-         boolean onlineMode = Bukkit.getServer().getOnlineMode(); // TRUE if online mode is enabled
-         String pluginVersion = (Metrics.class.getPackage().getImplementationVersion() != null) ? Metrics.class.getPackage().getImplementationVersion() : "unknown";
-         String serverVersion = Bukkit.getVersion();
--- 
-2.12.0.windows.1
-

Spigot-Server-Patches/0018-Remove-invalid-mob-spawner-tile-entities.patch

@@ -1,4 +1,4 @@
-From 29afd8bc4380e527ae39018fde2d7842239bc4dc Mon Sep 17 00:00:00 2001
+From ae8b5ae151c33ea2fb2dbdda86cc8eb3922ccf47 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Tue, 1 Mar 2016 15:08:03 -0600
 Subject: [PATCH] Remove invalid mob spawner tile entities
@@ -20,5 +20,5 @@ index bd3b16025..1c0108ef1 100644
              System.out.println("Attempted to place a tile entity (" + tileentity + ") at " + tileentity.position.getX() + "," + tileentity.position.getY() + "," + tileentity.position.getZ()
                  + " (" + org.bukkit.craftbukkit.util.CraftMagicNumbers.getMaterial(getBlockData(blockposition).getBlock()) + ") where there was no entity tile!");
 -- 
-2.12.0.windows.1
+2.12.2
 

Spigot-Server-Patches/0019-Optimize-TileEntity-Ticking.patch

@@ -1,4 +1,4 @@
-From 6ee4894cd7619d860ec2d48dc29031bf2bd0384b Mon Sep 17 00:00:00 2001
+From 25724130e87f1b906d5143058d200b6d04b59e18 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 22:01:19 -0600
 Subject: [PATCH] Optimize TileEntity Ticking
@@ -186,5 +186,5 @@ index 3d61c2d68..586ceaa67 100644
      }
  
 -- 
-2.12.0.windows.1
+2.12.2
 

Spigot-Server-Patches/0020-Further-improve-server-tick-loop.patch

@@ -1,4 +1,4 @@
-From b57fe9f86395e7db8e78eca60a656aa263d39d2c Mon Sep 17 00:00:00 2001
+From dff249a4a075a2bab36f65251537d6b8882e0768 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 1 Mar 2016 23:09:29 -0600
 Subject: [PATCH] Further improve server tick loop
@@ -12,7 +12,7 @@ Previous implementation did not calculate TPS correctly.
 Switch to a realistic rolling average and factor in std deviation as an extra reporting variable
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index d9e4f1a9..c4497aaa 100644
+index d9e4f1a9f..c4497aaa6 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -113,16 +113,12 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -147,7 +147,7 @@ index d9e4f1a9..c4497aaa 100644
                      }
                      lastTick = curTime;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index db4ac484..0f77d067 100644
+index db4ac484f..0f77d0674 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1738,6 +1738,17 @@ public final class CraftServer implements Server {
@@ -169,7 +169,7 @@ index db4ac484..0f77d067 100644
      {
  
 diff --git a/src/main/java/org/spigotmc/TicksPerSecondCommand.java b/src/main/java/org/spigotmc/TicksPerSecondCommand.java
-index be2e31de..6d21c326 100644
+index be2e31dea..6d21c3269 100644
 --- a/src/main/java/org/spigotmc/TicksPerSecondCommand.java
 +++ b/src/main/java/org/spigotmc/TicksPerSecondCommand.java
 @@ -1,8 +1,5 @@

Spigot-Server-Patches/0021-Only-refresh-abilities-if-needed.patch

@@ -1,4 +1,4 @@
-From b3d1c2d9a1d5bf7b73627520a8887224643a0feb Mon Sep 17 00:00:00 2001
+From a876defc63064db6b4c54a0af7cc133dd2479aec Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 23:12:03 -0600
 Subject: [PATCH] Only refresh abilities if needed
@@ -24,5 +24,5 @@ index 6509df573..87ac74420 100644
  
      @Override
 -- 
-2.12.1.windows.1
+2.12.2
 

Spigot-Server-Patches/0022-Add-async-chunk-load-API.patch

@@ -1,4 +1,4 @@
-From 066da232470e76f73ce6f5ac3bc9fba3f4e0d029 Mon Sep 17 00:00:00 2001
+From a35538236be21ec093715779bf57044a413516f3 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 23:19:01 -0600
 Subject: [PATCH] Add async chunk load API
@@ -36,5 +36,5 @@ index 822d73b9e..f65611a6a 100644
          return this.world.getChunkProviderServer().getChunkAt(x, z).bukkitChunk;
      }
 -- 
-2.12.0.windows.1
+2.12.2
 

Spigot-Server-Patches/0023-Entity-Origin-API.patch

@@ -1,4 +1,4 @@
-From 16134083d0eea50c8ec22f6a7421d056d58d3292 Mon Sep 17 00:00:00 2001
+From 1f83e96b7750ff012aa3510df4eba6f2f25efde8 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Tue, 1 Mar 2016 23:45:08 -0600
 Subject: [PATCH] Entity Origin API
@@ -155,5 +155,5 @@ index c493c9c0c..93843aa50 100644
 +    // Paper end
  }
 -- 
-2.12.0.windows.1
+2.12.2
 

Spigot-Server-Patches/0024-Prevent-tile-entity-and-entity-crashes.patch

@@ -1,4 +1,4 @@
-From 555c9dbf56471528d900454f8556dcc19c7af2e3 Mon Sep 17 00:00:00 2001
+From d19627bd77a6f4f3b3360d3ba224224b206344ce Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 1 Mar 2016 23:52:34 -0600
 Subject: [PATCH] Prevent tile entity and entity crashes
@@ -62,5 +62,5 @@ index 39919ab1c..632d5c760 100644
                      // Spigot start
                      finally {
 -- 
-2.12.0.windows.1
+2.12.2
 

Spigot-Server-Patches/0025-Configurable-top-of-nether-void-damage.patch

@@ -1,4 +1,4 @@
-From 4769d44f5b85ef49a3bbd628be4e7e2f86fa7521 Mon Sep 17 00:00:00 2001
+From 52e6992f765e671f1ed612870e81947d646aca17 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 23:58:50 -0600
 Subject: [PATCH] Configurable top of nether void damage
@@ -87,5 +87,5 @@ index fd3337d3f..ca1faa41d 100644
          int i;
  
 -- 
-2.12.0.windows.1
+2.12.2
 

Spigot-Server-Patches/0026-Check-online-mode-before-converting-and-renaming-pla.patch

@@ -1,4 +1,4 @@
-From 5b5459ca71a1bc441e5c57a852d70ecbdb24bd5d Mon Sep 17 00:00:00 2001
+From 3119d5d5e0f90c64083736d6665a65950b605149 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 2 Mar 2016 00:03:55 -0600
 Subject: [PATCH] Check online mode before converting and renaming player data
@@ -18,5 +18,5 @@ index caec56824..30b54a50e 100644
                  file = new File( this.playerDir, UUID.nameUUIDFromBytes( ( "OfflinePlayer:" + entityhuman.getName() ).getBytes( "UTF-8" ) ).toString() + ".dat");
                  if ( file.exists() )
 -- 
-2.12.0.windows.1
+2.12.2
 

Spigot-Server-Patches/0027-Always-tick-falling-blocks.patch

@@ -1,4 +1,4 @@
-From dfbba8355e51c337187a93a3db380b223f626892 Mon Sep 17 00:00:00 2001
+From b5310cf63d22fdf8714b2bfaea8ce9c66c3d5758 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 2 Mar 2016 00:32:25 -0600
 Subject: [PATCH] Always tick falling blocks
@@ -25,5 +25,5 @@ index 5c2fb0058..c411ce886 100644
                  || entity instanceof EntityFireworks )
          {
 -- 
-2.12.0.windows.1
+2.12.2
 

Spigot-Server-Patches/0028-Lighting-Queue.patch

@@ -1,4 +1,4 @@
-From d13d53ab6bafe9851cb3a816ca64e42ab83d6d29 Mon Sep 17 00:00:00 2001
+From ddc58c0259cad56358f0e79c327658a407436af5 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 00:52:31 -0600
 Subject: [PATCH] Lighting Queue
@@ -97,7 +97,7 @@ index 3ba489d4f..f7f2d12cf 100644
          // Update neighbor counts
          for (int x = -2; x < 3; x++) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 4476799d8..f953ef8e0 100644
+index c4497aaa6..ca0ff4d30 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -721,7 +721,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -238,5 +238,5 @@ index 632d5c760..e6e85e7a8 100644
                  }
  
 -- 
-2.12.0.windows.1
+2.12.2
 

Spigot-Server-Patches/0029-Configurable-end-credits.patch

@@ -1,4 +1,4 @@
-From 6e48bc7be8c37a8e58e0a2731860aa4c48ce9190 Mon Sep 17 00:00:00 2001
+From d5161bb68e53e6d14389c17582a73a10fce3aeee Mon Sep 17 00:00:00 2001
 From: DoctorDark <doctordark11@gmail.com>
 Date: Wed, 16 Mar 2016 02:21:39 -0500
 Subject: [PATCH] Configurable end credits
@@ -52,5 +52,5 @@ index 030a3e51c..79c9601fa 100644
                  } else {
                      this.b((Statistic) AchievementList.D);
 -- 
-2.12.1.windows.1
+2.12.2
 

Spigot-Server-Patches/0030-Fix-lag-from-explosions-processing-dead-entities.patch

@@ -1,4 +1,4 @@
-From cca16ca09a209720483d4fe88d1f2b8537ae7b75 Mon Sep 17 00:00:00 2001
+From 6da14448ed853c7b336d8ff6ce0952ebf5b9af2a Mon Sep 17 00:00:00 2001
 From: Iceee <andrew@opticgaming.tv>
 Date: Wed, 2 Mar 2016 01:39:52 -0600
 Subject: [PATCH] Fix lag from explosions processing dead entities
@@ -25,5 +25,5 @@ index 904bee8b5..4e05bcdfa 100644
  
          for (int l1 = 0; l1 < list.size(); ++l1) {
 -- 
-2.12.0.windows.1
+2.12.2
 

Spigot-Server-Patches/0031-Generator-Settings.patch

@@ -1,4 +1,4 @@
-From 8890e82c87bc665f7532115c8e0eb088f0c1b2de Mon Sep 17 00:00:00 2001
+From 886b8af6b9e07e9214c61bf0ba100e8d4c5a0ac3 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 02:17:54 -0600
 Subject: [PATCH] Generator Settings
@@ -265,5 +265,5 @@ index fb350c408..9c1605b14 100644
          ObjectIterator objectiterator = this.c.values().iterator();
  
 -- 
-2.12.0.windows.1
+2.12.2
 

Spigot-Server-Patches/0032-Optimize-explosions.patch

@@ -1,4 +1,4 @@
-From 9d5e09ca837a92224b403ec20930f9ad1e300ed8 Mon Sep 17 00:00:00 2001
+From 000f618c3793428ef5abd2cb979e9241f44fcc5a Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 11:59:48 -0600
 Subject: [PATCH] Optimize explosions
@@ -124,7 +124,7 @@ index 4e05bcdfa..49fc95e35 100644
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index f953ef8e0..3b67ff52e 100644
+index ca0ff4d30..e7c63a953 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -886,6 +886,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -156,5 +156,5 @@ index e6e85e7a8..5f7590e11 100644
      public CraftWorld getWorld() {
          return this.world;
 -- 
-2.12.0.windows.1
+2.12.2
 

Spigot-Server-Patches/0033-Stop-updating-flowing-block-if-material-has-changed.patch

@@ -1,4 +1,4 @@
-From 3c56dc7c870aa521f719c5109fde8f44f3158c22 Mon Sep 17 00:00:00 2001
+From 4286caaef0038d040cac7066e78873f7fe5c44d0 Mon Sep 17 00:00:00 2001
 From: Iceee <andrew@opticgaming.tv>
 Date: Wed, 2 Mar 2016 12:03:23 -0600
 Subject: [PATCH] Stop updating flowing block if material has changed
@@ -17,5 +17,5 @@ index f4ac7bafa..801b9cb7b 100644
          IBlockData iblockdata2 = world.getType(blockposition.down());
  
 -- 
-2.12.0.windows.1
+2.12.2
 

Spigot-Server-Patches/0034-Fast-draining.patch

@@ -1,4 +1,4 @@
-From d20531320914b578667604dc1a7d557b1c61b0f8 Mon Sep 17 00:00:00 2001
+From ccf86c26bd1bd5ec98c8410fd7140cf5830b16af Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 12:20:52 -0600
 Subject: [PATCH] Fast draining
@@ -109,5 +109,5 @@ index 801b9cb7b..8e9de3bcb 100644
 +    // Paper end
  }
 -- 
-2.12.0.windows.1
+2.12.2
 

Spigot-Server-Patches/0035-Configurable-lava-flow-speed.patch

@@ -1,4 +1,4 @@
-From 915fe90596915de1e459fcb7965d62f72b9f9d4f Mon Sep 17 00:00:00 2001
+From ec526d2a02bbc74f962bf21806940ad169baed8e Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 12:27:07 -0600
 Subject: [PATCH] Configurable lava flow speed
@@ -47,5 +47,5 @@ index 660f3bcce..a27512c0f 100644
          return this.e;
      }
 -- 
-2.12.0.windows.1
+2.12.2
 

Spigot-Server-Patches/0036-Add-player-view-distance-API.patch

@@ -1,4 +1,4 @@
-From aba5e7d678803a80c6c72216a765652e920f1ea7 Mon Sep 17 00:00:00 2001
+From 5ef6465bc8b487a3f06e10963e579fde91f5251d Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 14:35:27 -0600
 Subject: [PATCH] Add player view distance API
@@ -215,5 +215,5 @@ index 87ac74420..16dcaba3f 100644
      private final Player.Spigot spigot = new Player.Spigot()
      {
 -- 
-2.12.1.windows.1
+2.12.2
 

Spigot-Server-Patches/0037-Disable-explosion-knockback.patch

@@ -1,4 +1,4 @@
-From fbb70839f7188d6096dff42ca1b3fdcf8c715f90 Mon Sep 17 00:00:00 2001
+From 91cdc4554cebe5d6b7ae636e7768ce5fe8365855 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 14:48:03 -0600
 Subject: [PATCH] Disable explosion knockback
@@ -69,5 +69,5 @@ index 49fc95e35..d7bc6a0ed 100644
                              }
                          }
 -- 
-2.12.0.windows.1
+2.12.2
 

Spigot-Server-Patches/0038-Disable-thunder.patch

@@ -1,4 +1,4 @@
-From 4171809caf6057e84b0b1cf5ec03a259cde6c688 Mon Sep 17 00:00:00 2001
+From 05106693177445d76ea1325231181bd3404e6da1 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 14:52:43 -0600
 Subject: [PATCH] Disable thunder
@@ -33,5 +33,5 @@ index 966938997..ce087eb7d 100644
                      l = this.l >> 2;
                      blockposition = this.a(new BlockPosition(j + (l & 15), 0, k + (l >> 8 & 15)));
 -- 
-2.12.0.windows.1
+2.12.2
 

Spigot-Server-Patches/0039-Disable-ice-and-snow.patch

@@ -1,4 +1,4 @@
-From 708e3b196dead7aa3871281f6922384c56c32257 Mon Sep 17 00:00:00 2001
+From 84e563f38e936dd47f7390190f080b89f445b76f Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 14:57:24 -0600
 Subject: [PATCH] Disable ice and snow
@@ -32,5 +32,5 @@ index ce087eb7d..ac8dc5f2f 100644
                      l = this.l >> 2;
                      blockposition = this.p(new BlockPosition(j + (l & 15), 0, k + (l >> 8 & 15)));
 -- 
-2.12.0.windows.1
+2.12.2
 

Spigot-Server-Patches/0040-Configurable-mob-spawner-tick-rate.patch

@@ -1,4 +1,4 @@
-From e483c2457d3eec68120dc6058950d391e6f54455 Mon Sep 17 00:00:00 2001
+From dbcc226d6239952ce5b5db079ef633eada51a50d Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 15:03:53 -0600
 Subject: [PATCH] Configurable mob spawner tick rate
@@ -64,5 +64,5 @@ index 796b3e53f..ce1db632d 100644
                  }
  
 -- 
-2.12.0.windows.1
+2.12.2
 

Spigot-Server-Patches/0041-Send-absolute-position-the-first-time-an-entity-is-s.patch

@@ -1,4 +1,4 @@
-From a66312a6f87feb99a654ae23975f5130db7c5b26 Mon Sep 17 00:00:00 2001
+From e2339144ecaec2b719659708e3567d04d491cdb3 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Wed, 2 Mar 2016 23:13:07 -0600
 Subject: [PATCH] Send absolute position the first time an entity is seen
@@ -76,5 +76,5 @@ index 1493f9ab3..f542bf491 100644
  
                      entityplayer.playerConnection.sendPacket(packet);
 -- 
-2.12.0.windows.1
+2.12.2
 

Spigot-Server-Patches/0042-Add-BeaconEffectEvent.patch

@@ -1,4 +1,4 @@
-From 1f602d61011394e08fb6e7511fac2ed306e188a2 Mon Sep 17 00:00:00 2001
+From 3308547d075d0d0e431b0273cfba7fcc8d38444b Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 23:30:53 -0600
 Subject: [PATCH] Add BeaconEffectEvent
@@ -69,5 +69,5 @@ index 6f2fcd22e..71ecc5493 100644
          }
  
 -- 
-2.12.0.windows.1
+2.12.2
 

Spigot-Server-Patches/0043-Configurable-container-update-tick-rate.patch

@@ -1,4 +1,4 @@
-From ff439bb924729825a7d8c535b306a61a4bbecb0e Mon Sep 17 00:00:00 2001
+From ad16101c81f51dd63f5aff74cc1f10414650e8ce Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 23:34:44 -0600
 Subject: [PATCH] Configurable container update tick rate
@@ -45,5 +45,5 @@ index 1ed1859b8..4866f9f34 100644
              this.closeInventory();
              this.activeContainer = this.defaultContainer;
 -- 
-2.12.1.windows.1
+2.12.2
 

Spigot-Server-Patches/0044-Use-UserCache-for-player-heads.patch

@@ -1,4 +1,4 @@
-From 9ebcc2f689753eb2c2ec33864e05450f9cee2fa3 Mon Sep 17 00:00:00 2001
+From 526ed5df91f1b0ca392b4707f6aa7a8384c27acd Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Wed, 2 Mar 2016 23:42:37 -0600
 Subject: [PATCH] Use UserCache for player heads
@@ -31,5 +31,5 @@ index f07eb2f75..18cc74639 100644
              // Spigot end
          }
 -- 
-2.12.0.windows.1
+2.12.2
 

Spigot-Server-Patches/0045-Disable-spigot-tick-limiters.patch

@@ -1,4 +1,4 @@
-From 85294ba8067c8ab43419b70379c53aaff9845630 Mon Sep 17 00:00:00 2001
+From bf5743f31df9d1cd46c219f13808a0063a09e6b0 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 2 Mar 2016 23:45:17 -0600
 Subject: [PATCH] Disable spigot tick limiters
@@ -35,5 +35,5 @@ index 5f7590e11..a1cdcd71b 100644
              TileEntity tileentity = (TileEntity) this.tileEntityListTick.get(tileTickPosition);
              // Spigot start
 -- 
-2.12.0.windows.1
+2.12.2
 

Spigot-Server-Patches/0046-Configurable-Chunk-IO-Thread-Base-Count.patch

@@ -1,14 +1,14 @@
-From 4d33547c24567a2bedc35176c38b04c8f7320f38 Mon Sep 17 00:00:00 2001
+From e576a2e6f75c9065ff77b0d808d9deb8828c2a2a Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 2 Mar 2016 23:46:57 -0600
 Subject: [PATCH] Configurable Chunk IO Thread Base Count
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 1ea799d59..8c8bc4c86 100644
+index 007589314..9a6f87e59 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -198,4 +198,9 @@ public class PaperConfig {
+@@ -199,4 +199,9 @@ public class PaperConfig {
                  " - Interval: " + timeSummary(Timings.getHistoryInterval() / 20) +
                  " - Length: " + timeSummary(Timings.getHistoryLength() / 20));
      }
@@ -39,5 +39,5 @@ index e4fd9bc60..7b7a3d01b 100644
  
      private static final AsynchronousExecutor<QueuedChunk, Chunk, Runnable, RuntimeException> instance = new AsynchronousExecutor<QueuedChunk, Chunk, Runnable, RuntimeException>(new ChunkIOProvider(), BASE_THREADS);
 -- 
-2.12.0.windows.1
+2.12.2
 

Spigot-Server-Patches/0047-Don-t-create-Region-File-s-when-checking-if-chunk-ex.patch

@@ -1,4 +1,4 @@
-From 8bd51ec6ce48f100cc32ac4268904c7bd54874ba Mon Sep 17 00:00:00 2001
+From ce608a503abf342c96c23e68f479c099be811aa7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 2 Mar 2016 23:51:51 -0600
 Subject: [PATCH] Don't create Region File's when checking if chunk exists
@@ -49,5 +49,5 @@ index f23429898..933934fb6 100644
                  file1.mkdirs();
              }
 -- 
-2.12.0.windows.1
+2.12.2
 

Spigot-Server-Patches/0048-Add-PlayerInitialSpawnEvent.patch

@@ -1,4 +1,4 @@
-From cc53a532b798a31431e55027980618f421451d8b Mon Sep 17 00:00:00 2001
+From 2e3b2f159778b82cd48210b44e1ce8dffeb91c78 Mon Sep 17 00:00:00 2001
 From: Steve Anton <anxuiz.nx@gmail.com>
 Date: Thu, 3 Mar 2016 00:09:38 -0600
 Subject: [PATCH] Add PlayerInitialSpawnEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerInitialSpawnEvent
 For modifying a player's initial spawn location as they join the server
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 676cc3f3e..4e35e9102 100644
+index d778eafb3..d6a2bbc08 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -104,6 +104,21 @@ public abstract class PlayerList {
@@ -32,5 +32,5 @@ index 676cc3f3e..4e35e9102 100644
          entityplayer.playerInteractManager.a((WorldServer) entityplayer.world);
          String s1 = "local";
 -- 
-2.12.0.windows.1
+2.12.2
 

Spigot-Server-Patches/0049-Disable-chest-cat-detection.patch

@@ -1,4 +1,4 @@
-From 1410382d853ba361a079502d38568f4eb55113de Mon Sep 17 00:00:00 2001
+From 1c4b779cc2accfe5eae2d1435bdf0e1e2a74f319 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 01:13:45 -0600
 Subject: [PATCH] Disable chest cat detection
@@ -35,5 +35,5 @@ index c75ed8a36..9c4d1c938 100644
  
          EntityOcelot entityocelot;
 -- 
-2.12.0.windows.1
+2.12.2
 

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

@@ -1,4 +1,4 @@
-From e66b45a8fc4d658d70b3faff1ab27165f4c7e879 Mon Sep 17 00:00:00 2001
+From acaa4a559a33fe2e2dae4fb4f59aaea68ff00490 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
@@ -82,5 +82,5 @@ index 0f77d0674..5302bb283 100644
              return true;
          }
 -- 
-2.12.2.windows.2
+2.12.2
 

Spigot-Server-Patches/0051-All-chunks-are-slime-spawn-chunks-toggle.patch

@@ -1,4 +1,4 @@
-From 6b32181201c024700da5cf0fd078deaa091230cd Mon Sep 17 00:00:00 2001
+From 71575ec7e7c01c6ffae6465bb584e0bbb5d4e109 Mon Sep 17 00:00:00 2001
 From: vemacs <d@nkmem.es>
 Date: Thu, 3 Mar 2016 01:19:22 -0600
 Subject: [PATCH] All chunks are slime spawn chunks toggle
@@ -33,5 +33,5 @@ index 8fb14d6b5..c68429fb1 100644
                  }
              }
 -- 
-2.12.0.windows.1
+2.12.2
 

Spigot-Server-Patches/0052-Optimize-Pathfinding.patch

@@ -1,4 +1,4 @@
-From c2e8208e724845d130dbf63019835d6ea9088f3a Mon Sep 17 00:00:00 2001
+From 0a119adb2127be5db1c6efba9c6cfeeecc3926d4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 02:02:07 -0600
 Subject: [PATCH] Optimize Pathfinding
@@ -47,5 +47,5 @@ index 4f28b8819..43b2be505 100644
      }
  
 -- 
-2.12.0.windows.1
+2.12.2
 

Spigot-Server-Patches/0053-Avoid-hopper-searches-if-there-are-no-items.patch

@@ -1,4 +1,4 @@
-From b0c16e419f39727b2b51bc84b777dc9eb42a8131 Mon Sep 17 00:00:00 2001
+From 082fa781df2dfffd7b1774cfe10089544daa70a9 Mon Sep 17 00:00:00 2001
 From: CullanP <cullanpage@gmail.com>
 Date: Thu, 3 Mar 2016 02:13:38 -0600
 Subject: [PATCH] Avoid hopper searches if there are no items
@@ -95,5 +95,5 @@ index b80f95159..e1fc4ea6c 100644
  
              while (iterator.hasNext()) {
 -- 
-2.12.0.windows.1
+2.12.2
 

Spigot-Server-Patches/0054-Expose-server-CommandMap.patch

@@ -1,11 +1,11 @@
-From 8eb9c58348a5373d07490079d2018313dfec3b64 Mon Sep 17 00:00:00 2001
+From ccbbc6329f8ab2240eabdc1e2eb4bdc5e3e29834 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 3 Mar 2016 02:15:57 -0600
 Subject: [PATCH] Expose server CommandMap
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a795a165a..03bc0171b 100644
+index 5302bb283..cab671d68 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1567,6 +1567,7 @@ public final class CraftServer implements Server {
@@ -17,5 +17,5 @@ index a795a165a..03bc0171b 100644
          return commandMap;
      }
 -- 
-2.12.0.windows.1
+2.12.2
 

Spigot-Server-Patches/0055-Be-a-bit-more-informative-in-maxHealth-exception.patch

@@ -1,4 +1,4 @@
-From e82e41369c3b18bf01ffa5a9ce73aceff5ea39a0 Mon Sep 17 00:00:00 2001
+From ae0cf0afb053eb18ce36346f330d8940c9f8aeea Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 3 Mar 2016 02:18:39 -0600
 Subject: [PATCH] Be a bit more informative in maxHealth exception
@@ -21,5 +21,5 @@ index 27cd0d43d..61032eb2f 100644
  
          if (health == 0) {
 -- 
-2.12.0.windows.1
+2.12.2
 

Spigot-Server-Patches/0056-Player-Tab-List-and-Title-APIs.patch

@@ -1,4 +1,4 @@
-From 1cde879dc1017264aa0d84569843d35006fa3f63 Mon Sep 17 00:00:00 2001
+From ca1b52f9e3a17711934151e7ff7a2af41d700320 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Thu, 3 Mar 2016 02:32:10 -0600
 Subject: [PATCH] Player Tab List and Title APIs
@@ -78,7 +78,7 @@ index 7bcafa8bb..4f6c1c2e7 100644
  
          if (this.a == PacketPlayOutTitle.EnumTitleAction.TIMES) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index cc26aa748..2bcf3976f 100644
+index 16dcaba3f..0e7086da3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1,5 +1,6 @@
@@ -175,5 +175,5 @@ index cc26aa748..2bcf3976f 100644
      public String getDisplayName() {
          return getHandle().displayName;
 -- 
-2.12.0.windows.1
+2.12.2
 

Spigot-Server-Patches/0057-Ensure-inv-drag-is-in-bounds.patch

@@ -1,4 +1,4 @@
-From b73de79664f1d4e137d6c4764881817d39bbcb1d Mon Sep 17 00:00:00 2001
+From 20d8fcc6f23ec8125341558bdf29c7dc015258b1 Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:33:53 -0600
 Subject: [PATCH] Ensure inv drag is in bounds
@@ -18,5 +18,5 @@ index 686250ea8..b826089d1 100644
                  itemstack1 = playerinventory.getCarried();
                  if (slot != null && a(slot, itemstack1, true) && slot.isAllowed(itemstack1) && (this.dragType == 2 || itemstack1.getCount() > this.h.size()) && this.b(slot)) {
 -- 
-2.12.0.windows.1
+2.12.2
 

Spigot-Server-Patches/0058-Change-implementation-of-tile-entity-removal-list.patch

@@ -1,4 +1,4 @@
-From 7c794303b52022aca46e88ccf0dd466abd2700ab Mon Sep 17 00:00:00 2001
+From 87607d3f2bf2e768f4e192bd97576dd95fe3efd5 Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:39:54 -0600
 Subject: [PATCH] Change implementation of (tile)entity removal list
@@ -84,5 +84,5 @@ index a1cdcd71b..354a7309b 100644
          this.f.clear();
          this.l();
 -- 
-2.12.0.windows.1
+2.12.2
 

Spigot-Server-Patches/0059-Add-configurable-portal-search-radius.patch

@@ -1,4 +1,4 @@
-From adea9822f254f16ea903bfcf4a929946a6879cd0 Mon Sep 17 00:00:00 2001
+From d04bed0a2739870f17f68f432a430319d515e2d9 Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:46:17 -0600
 Subject: [PATCH] Add configurable portal search radius
@@ -54,5 +54,5 @@ index 1d5dce10e..7ca2617a8 100644
      private boolean canCreatePortal = true;
  
 -- 
-2.12.0.windows.1
+2.12.2
 

Spigot-Server-Patches/0060-Add-velocity-warnings.patch

@@ -1,11 +1,11 @@
-From 836675371c732b2c7d7977874436f4f5b20dece0 Mon Sep 17 00:00:00 2001
+From e5d75fd43f1e772df59e499fced596ef2eefdb25 Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:48:12 -0600
 Subject: [PATCH] Add velocity warnings
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 03bc0171b..c61752bc3 100644
+index cab671d68..28da39cbd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -173,6 +173,7 @@ public final class CraftServer implements Server {
@@ -58,5 +58,5 @@ index 3ed983cc0..6384d50e7 100644
                  log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Paper!):" );
                  dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().primaryThread.getId(), Integer.MAX_VALUE ), log );
 -- 
-2.12.0.windows.1
+2.12.2
 

Spigot-Server-Patches/0061-Fix-inter-world-teleportation-glitches.patch

@@ -1,4 +1,4 @@
-From 6f8838ab5bd00cfbc8e1fd70316230c562c16838 Mon Sep 17 00:00:00 2001
+From fa4d2110a0ca3cc431097ca324b6e370212f8ac4 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Thu, 3 Mar 2016 02:50:31 -0600
 Subject: [PATCH] Fix inter-world teleportation glitches
@@ -25,7 +25,7 @@ index 4cc74cd65..fa49397ea 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 2bcf3976f..68ce11be8 100644
+index 0e7086da3..d72ff0af2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -579,7 +579,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -39,5 +39,5 @@ index 2bcf3976f..68ce11be8 100644
          return true;
      }
 -- 
-2.12.0.windows.1
+2.12.2
 

Spigot-Server-Patches/0062-Add-exception-reporting-event.patch

@@ -1,4 +1,4 @@
-From e809913b483eee57889389a0edc97d2d111d4232 Mon Sep 17 00:00:00 2001
+From 33f879767f8b9a6146f578e89282b711f5d1543d Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 03:15:41 -0600
 Subject: [PATCH] Add exception reporting event
@@ -372,5 +372,5 @@ index 9952b64be..e30cfb7b7 100644
                  // (async tasks must live with race-conditions if they attempt to cancel between these few lines of code)
              }
 -- 
-2.12.1.windows.1
+2.12.2
 

Spigot-Server-Patches/0063-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch

@@ -1,4 +1,4 @@
-From eb6be2b7c8be9fabd00b52ce3346948ada2bd67b Mon Sep 17 00:00:00 2001
+From 7c5e2edf7bd7a935b905f4ddd48137c861634f8d Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Tue, 8 Mar 2016 18:28:43 -0800
 Subject: [PATCH] Don't nest if we don't need to when cerealising text
@@ -26,5 +26,5 @@ index 9fc83c4a3..b3b13ba11 100644
              packetdataserializer.a(this.a);
          }
 -- 
-2.12.0.windows.1
+2.12.2
 

Spigot-Server-Patches/0064-Disable-Scoreboards-for-non-players-by-default.patch

@@ -1,4 +1,4 @@
-From 9a82d2a8a75df88e30be7f1bc1c7515e277a5f42 Mon Sep 17 00:00:00 2001
+From 94c3548d2ce0fa0ab60e04d21caf2c842eca3df3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 8 Mar 2016 23:25:45 -0500
 Subject: [PATCH] Disable Scoreboards for non players by default
@@ -49,5 +49,5 @@ index 5b5e0e73c..be54c807b 100644
      }
  
 -- 
-2.12.0.windows.1
+2.12.2
 

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

@@ -1,4 +1,4 @@
-From 1612683999cfcbc22c50e0c505bfa4355b70b03b Mon Sep 17 00:00:00 2001
+From 6d83a42776d8dcc58a966d6f8da8b5056c273026 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
@@ -43,5 +43,5 @@ index 61032eb2f..348a8c758 100644
 +    // Paper end
  }
 -- 
-2.12.0.windows.1
+2.12.2
 

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

@@ -1,4 +1,4 @@
-From 44dab017dbfb0913ce29eb02f54337766b9c38d6 Mon Sep 17 00:00:00 2001
+From db92fcc38686e0be97b3244eb5eae2e6da8966e1 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
@@ -71,5 +71,5 @@ index d72ff0af2..5fd5e39fa 100644
      private final Player.Spigot spigot = new Player.Spigot()
      {
 -- 
-2.12.2.windows.2
+2.12.2
 

Spigot-Server-Patches/0067-Chunk-save-queue-improvements.patch

@@ -1,4 +1,4 @@
-From 240543e6e7c364a4513e4cd4ca8d2711c5d0f97d Mon Sep 17 00:00:00 2001
+From 30f567605c740413aa96168ce4eb60ab22ee1180 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 4 Mar 2016 18:18:37 -0600
 Subject: [PATCH] Chunk save queue improvements
@@ -26,10 +26,10 @@ Then finally, Sleeping will by default be removed, but due to known issues with
 But if sleeps are to remain enabled, we at least lower the sleep interval so it doesn't have as much negative impact.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 8c8bc4c86..b2fa32e41 100644
+index 9a6f87e59..873ffa77d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -203,4 +203,10 @@ public class PaperConfig {
+@@ -204,4 +204,10 @@ public class PaperConfig {
      private static void chunkLoadThreads() {
          minChunkLoadThreads = Math.min(6, getInt("settings.min-chunk-load-threads", 2)); // Keep people from doing stupid things with max of 6
      }
@@ -177,5 +177,5 @@ index acfdd52dc..fdbaf5fbd 100644
  
          if (this.b.isEmpty()) {
 -- 
-2.12.0.windows.1
+2.12.2
 

Spigot-Server-Patches/0068-Chunk-Save-Reattempt.patch

@@ -1,4 +1,4 @@
-From 989492b0a14f1acbcb387e31b74ed58829a2b496 Mon Sep 17 00:00:00 2001
+From 82e7c9b1c02794288a3242d11d2b62ee3c46369b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 4 Mar 2013 23:46:10 -0500
 Subject: [PATCH] Chunk Save Reattempt
@@ -42,5 +42,5 @@ index be13c1131..9cfc46bc2 100644
  
      }
 -- 
-2.12.0.windows.1
+2.12.2
 

Spigot-Server-Patches/0069-Default-loading-permissions.yml-before-plugins.patch

@@ -1,4 +1,4 @@
-From d0e62de0df3e3803b64a74b42fdc74c54e608793 Mon Sep 17 00:00:00 2001
+From 2cbb25a2774f83799823fe7362f067609bdffc0c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 13:17:38 -0400
 Subject: [PATCH] Default loading permissions.yml before plugins
@@ -16,10 +16,10 @@ modify that. Under the previous logic, plugins were unable (cleanly) override pe
 A config option has been added for those who depend on the previous behavior, but I don't expect that.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index b2fa32e41..078e0d989 100644
+index 873ffa77d..b5ff26c71 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -209,4 +209,9 @@ public class PaperConfig {
+@@ -210,4 +210,9 @@ public class PaperConfig {
          enableFileIOThreadSleep = getBoolean("settings.sleep-between-chunk-saves", false);
          if (enableFileIOThreadSleep) Bukkit.getLogger().info("Enabled sleeping between chunk saves, beware of memory issues");
      }
@@ -30,7 +30,7 @@ index b2fa32e41..078e0d989 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c61752bc3..e2afd9d93 100644
+index 28da39cbd..9df6c0ebb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -318,6 +318,7 @@ public final class CraftServer implements Server {
@@ -51,5 +51,5 @@ index c61752bc3..e2afd9d93 100644
              CraftDefaultPermissions.registerCorePermissions();
              helpMap.initializeCommands();
 -- 
-2.12.0.windows.1
+2.12.2
 

Spigot-Server-Patches/0070-Allow-Reloading-of-Custom-Permissions.patch

@@ -1,4 +1,4 @@
-From 851ddaf3a91b416502beeb19aabbe3f495e1f580 Mon Sep 17 00:00:00 2001
+From c17904b073dbf431afdc19c4dc09f444ad6ecb6c Mon Sep 17 00:00:00 2001
 From: William <admin@domnian.com>
 Date: Fri, 18 Mar 2016 03:30:17 -0400
 Subject: [PATCH] Allow Reloading of Custom Permissions
@@ -6,7 +6,7 @@ Subject: [PATCH] Allow Reloading of Custom Permissions
 https://github.com/PaperMC/Paper/issues/49
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 9df6c0eb..e77307c3 100644
+index 9df6c0ebb..e77307c35 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1827,4 +1827,21 @@ public final class CraftServer implements Server {

Spigot-Server-Patches/0071-Remove-Metadata-on-reload.patch

@@ -1,4 +1,4 @@
-From 18e4daa1e2ed77af8da88506c84d13f813eeebd2 Mon Sep 17 00:00:00 2001
+From ef440adcb9e263901028407fe1ad0d2e02f2435c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 13:50:14 -0400
 Subject: [PATCH] Remove Metadata on reload
@@ -7,7 +7,7 @@ Metadata is not meant to persist reload as things break badly with non primitive
 This will remove metadata on reload so it does not crash everything if a plugin uses it.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 40091231e..540d57855 100644
+index e77307c35..4d761d32a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -741,6 +741,14 @@ public final class CraftServer implements Server {
@@ -26,5 +26,5 @@ index 40091231e..540d57855 100644
          commandMap.clearCommands();
          resetRecipes();
 -- 
-2.12.0.windows.1
+2.12.2
 

Spigot-Server-Patches/0072-Undead-horse-leashing.patch

@@ -1,4 +1,4 @@
-From 8995c864c37aa0d3ea38ec7ea12313130b8f7dae Mon Sep 17 00:00:00 2001
+From 2c430290f17c86c477c2c7a7d267fd23ddfbba3f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 14:19:19 -0400
 Subject: [PATCH] Undead horse leashing
@@ -33,5 +33,5 @@ index d74ccd68d..3416c7a7d 100644
  
      protected void q(float f) {
 -- 
-2.12.0.windows.1
+2.12.2
 

Spigot-Server-Patches/0073-Fix-Furnace-cook-time-bug.patch

@@ -1,4 +1,4 @@
-From 57b6cb61523faf718c89c3ae42d5d0d6050c9d74 Mon Sep 17 00:00:00 2001
+From f9d6774c585cdc37c69b774d8afee693a95dda02 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 14:24:53 -0400
 Subject: [PATCH] Fix Furnace cook time bug
@@ -22,5 +22,5 @@ index 2f1f3edf5..e230d1608 100644
                  this.burn();
                  flag1 = true;
 -- 
-2.12.0.windows.1
+2.12.2
 

Spigot-Server-Patches/0074-Handle-Item-Meta-Inconsistencies.patch

@@ -1,4 +1,4 @@
-From e8614aaf18b456255a31f0baa78651f6ad2b61ac Mon Sep 17 00:00:00 2001
+From 89011dc877a65af7754e98c4764d44c93e5772f2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 28 May 2015 23:00:19 -0400
 Subject: [PATCH] Handle Item Meta Inconsistencies
@@ -294,5 +294,5 @@ index ec5680633..9e7f9c661 100644
      private final Spigot spigot = new Spigot()
      {
 -- 
-2.12.0.windows.1
+2.12.2
 

Spigot-Server-Patches/0075-Configurable-Non-Player-Arrow-Despawn-Rate.patch

@@ -1,4 +1,4 @@
-From 9b1484edac9a42041e0eab60eb6f5e63ec64ccb7 Mon Sep 17 00:00:00 2001
+From ccd2974a83c4fae5d48a01486ab8b8dffe414363 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 15:12:22 -0400
 Subject: [PATCH] Configurable Non Player Arrow Despawn Rate
@@ -37,5 +37,5 @@ index 65689f26d..8cda47518 100644
                  }
              }
 -- 
-2.12.0.windows.1
+2.12.2
 

Spigot-Server-Patches/0076-Add-World-Util-Methods.patch

@@ -1,4 +1,4 @@
-From b37013963c8a497b39c9ed4362ce585f8c9e6602 Mon Sep 17 00:00:00 2001
+From cc98ddd19cc2afe5d8afcd704383ead8d44c36fd Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 20:16:03 -0400
 Subject: [PATCH] Add World Util Methods
@@ -93,5 +93,5 @@ index cc7369e52..1d2d174e8 100644
          // CraftBukkit start - tree generation
          if (captureTreeGeneration) {
 -- 
-2.12.0.windows.1
+2.12.2
 

Spigot-Server-Patches/0077-Optimized-Light-Level-Comparisons.patch

@@ -1,4 +1,4 @@
-From e34af1873ee3abd9f4754ab2eb52dee6dede22b2 Mon Sep 17 00:00:00 2001
+From f9f7cf2e61b9417615c1eec1229bb54569db0d0d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 21:22:56 -0400
 Subject: [PATCH] Optimized Light Level Comparisons
@@ -131,5 +131,5 @@ index 897882c97..970fabf71 100644
                          if (!this.world.isPlayerNearby((double) i1, (double) j1, (double) k1, 7.0D) && this.world.a(entityzombie.getBoundingBox(), (Entity) entityzombie) && this.world.getCubes(entityzombie, entityzombie.getBoundingBox()).isEmpty() && !this.world.containsLiquid(entityzombie.getBoundingBox())) {
                              this.world.addEntity(entityzombie, CreatureSpawnEvent.SpawnReason.REINFORCEMENTS); // CraftBukkit
 -- 
-2.12.0.windows.1
+2.12.2
 

Spigot-Server-Patches/0078-Pass-world-to-Village-creation.patch

@@ -1,4 +1,4 @@
-From 6d7410d5cc715f3a78d2cae58868fdc4dc22c856 Mon Sep 17 00:00:00 2001
+From 2914df909b71dac220c18c9b220de90f2fce300c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 19 Mar 2016 15:16:54 -0400
 Subject: [PATCH] Pass world to Village creation
@@ -32,5 +32,5 @@ index 2ab381d50..817c836c3 100644
          this.d = BlockPosition.ZERO;
          this.j = Maps.newHashMap();
 -- 
-2.12.0.windows.1
+2.12.2
 

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

@@ -1,4 +1,4 @@
-From 7679dde826a395940efcd10cb8042a2d91dd0c5b Mon Sep 17 00:00:00 2001
+From 37773c2d575050daa8addd625bf40b28ee74a5a0 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
@@ -46,5 +46,5 @@ index 247224117..9cb3b22fb 100644
  
      }
 -- 
-2.12.0.windows.1
+2.12.2
 

Spigot-Server-Patches/0080-Set-health-before-death-event.patch

@@ -1,14 +1,14 @@
-From 62f9ecf769955dd17317af05db2280aa386940e0 Mon Sep 17 00:00:00 2001
+From 376c4082cf93f2688de0d051a121f20b5c8ba326 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 19 Jul 2015 16:51:38 -0400
 Subject: [PATCH] Set health before death event
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 078e0d989..a48f5cb51 100644
+index b5ff26c71..6907d4680 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -214,4 +214,9 @@ public class PaperConfig {
+@@ -215,4 +215,9 @@ public class PaperConfig {
      private static void loadPermsBeforePlugins() {
          loadPermsBeforePlugins = getBoolean("settings.load-permissions-yml-before-plugins", true);
      }
@@ -45,5 +45,5 @@ index 348a8c758..c0103cb39 100644
  
      public double getMaxHealth() {
 -- 
-2.12.0.windows.1
+2.12.2
 

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

@@ -1,4 +1,4 @@
-From e3b383aa29dc343314f3fd834b7b8d3ecdfe41d9 Mon Sep 17 00:00:00 2001
+From 04de121f6f8d6af28cb652b11cd17feec668ce9e 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
@@ -56,5 +56,5 @@ index 5fd5e39fa..80a6a0b41 100644
      }
  
 -- 
-2.12.1.windows.1
+2.12.2
 

Spigot-Server-Patches/0082-Catch-Async-PlayerChunkMap-operations.patch

@@ -1,4 +1,4 @@
-From 32f6c5a12798ed212df901f65912a56b2ef70811 Mon Sep 17 00:00:00 2001
+From a5080daa55ef68c39c367086483795eb455cf451 Mon Sep 17 00:00:00 2001
 From: Daniel Ennis <dennis@icontact.com>
 Date: Sun, 20 Mar 2016 15:22:42 -0400
 Subject: [PATCH] Catch Async PlayerChunkMap operations
@@ -22,5 +22,5 @@ index 9012a63a0..5b27bd1c5 100644
          long i = d(chunkcoordintpair.x, chunkcoordintpair.z);
  
 -- 
-2.12.0.windows.1
+2.12.2
 

Spigot-Server-Patches/0083-Support-offline-mode-in-whitelist-command-as-well.patch

@@ -1,4 +1,4 @@
-From f7c86c61f7ef38864a71ab0a671930550953dbc3 Mon Sep 17 00:00:00 2001
+From 139e93117fa8452adb2be851e7dd957dd824d702 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 21 Mar 2016 00:19:18 -0500
 Subject: [PATCH] Support offline mode in whitelist command as well
@@ -89,5 +89,5 @@ index c74d1d2be..0f4237db1 100644
 +    // Paper end
  }
 -- 
-2.12.0.windows.1
+2.12.2
 

Spigot-Server-Patches/0084-Fix-SkullCache-case-bug.patch

@@ -1,4 +1,4 @@
-From 0b5537a8783083de5b42792af5f37352f2ef9d06 Mon Sep 17 00:00:00 2001
+From 41e002267b87e75db128ca73dec84b7636afde2b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Jan 2016 21:48:24 -0500
 Subject: [PATCH] Fix SkullCache case bug
@@ -18,5 +18,5 @@ index 91ca4a279..edd6fb69e 100644
                      callback.apply(profile);
                  } else {
 -- 
-2.12.0.windows.1
+2.12.2
 

Spigot-Server-Patches/0085-Waving-banner-workaround.patch

@@ -1,4 +1,4 @@
-From a6d01124186c189889cb98a3f25cde842fe6eaeb Mon Sep 17 00:00:00 2001
+From ba98d3629b53c82bc96d097c0ee3086345af2300 Mon Sep 17 00:00:00 2001
 From: Gabscap <sonstige.netzwerke@gabriel-paradzik.de>
 Date: Sat, 19 Mar 2016 22:25:11 +0100
 Subject: [PATCH] Waving banner workaround
@@ -34,5 +34,5 @@ index c5c3f40ce..6413f76e7 100644
  
      public void a(PacketDataSerializer packetdataserializer) throws IOException {
 -- 
-2.12.0.windows.1
+2.12.2
 

Spigot-Server-Patches/0086-Use-a-Shared-Random-for-Entities.patch

@@ -1,4 +1,4 @@
-From e2c35037b839ec84fb38debdbbc5437c66ec9f30 Mon Sep 17 00:00:00 2001
+From 7db79cee3f3587bced0e3d249bb50aa4ee3b1fef Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 22 Mar 2016 00:33:47 -0400
 Subject: [PATCH] Use a Shared Random for Entities
@@ -27,5 +27,5 @@ index be54c807b..42bd79b10 100644
          this.justCreated = true;
          this.uniqueID = MathHelper.a(this.random);
 -- 
-2.12.0.windows.1
+2.12.2
 

Spigot-Server-Patches/0087-Don-t-teleport-dead-entities.patch

@@ -1,4 +1,4 @@
-From ab781f7781960c84d0caf220d208f3c514dc91f2 Mon Sep 17 00:00:00 2001
+From 978d5af9bceeb871be2b1cbfffb45f9de62b5636 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 22 Mar 2016 00:55:23 -0400
 Subject: [PATCH] Don't teleport dead entities
@@ -20,5 +20,5 @@ index 42bd79b10..70a431a63 100644
              WorldServer worldserver1 = ((CraftWorld) exit.getWorld()).getHandle();
              int i = worldserver1.dimension;
 -- 
-2.12.0.windows.1
+2.12.2
 

Spigot-Server-Patches/0088-Optimize-Chunk-Access.patch

@@ -1,4 +1,4 @@
-From 1def4d8dd01ad67f472db739eb8b2d917c54b5f6 Mon Sep 17 00:00:00 2001
+From 15890a007fe5797522d8b42f028835b2b2ff6d05 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 27 Aug 2015 01:15:02 -0400
 Subject: [PATCH] Optimize Chunk Access
@@ -42,5 +42,5 @@ index b0a82e7ed..a7e8a3f7d 100644
  
      public ChunkProviderServer(WorldServer worldserver, IChunkLoader ichunkloader, ChunkGenerator chunkgenerator) {
 -- 
-2.12.0.windows.1
+2.12.2
 

Spigot-Server-Patches/0089-Configurable-spawn-chances-for-skeleton-horses.patch

@@ -1,4 +1,4 @@
-From 03d2a8cac0d4d45cf78e5f81039fe2f56dac91d5 Mon Sep 17 00:00:00 2001
+From 4bc32176e261712428bd91475ec9a4da500a582d Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 22 Mar 2016 12:04:28 -0500
 Subject: [PATCH] Configurable spawn chances for skeleton horses
@@ -32,5 +32,5 @@ index ac8dc5f2f..39ed0d533 100644
  
                              entityhorseskeleton.p(true);
 -- 
-2.12.0.windows.1
+2.12.2
 

Spigot-Server-Patches/0090-Optimize-isValidLocation-getType-and-getBlockData-fo.patch

@@ -1,4 +1,4 @@
-From 2e211c0f0a5dbcf8ac99fdf6eb4368dcae14c4f1 Mon Sep 17 00:00:00 2001
+From 22e1661666d7e149b0fddf9a6f45cad52af4b917 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 02:07:55 -0600
 Subject: [PATCH] Optimize isValidLocation, getType and getBlockData for inling
@@ -255,5 +255,5 @@ index 1d2d174e8..9427fc080 100644
          } else {
              Chunk chunk = this.chunkProvider.getLoadedChunkAt(blockposition.getX() >> 4, blockposition.getZ() >> 4);
 -- 
-2.12.0.windows.1
+2.12.2
 

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

@@ -1,4 +1,4 @@
-From 808ddbb267bcde272fc8297a6bbc153e64836a95 Mon Sep 17 00:00:00 2001
+From c4390170763cc895adafa3fd63614c0423b6a761 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 87b82eb35..a7c71f406 100644
          DataConverterMaterialId.a[352] = "minecraft:bone";
          DataConverterMaterialId.a[353] = "minecraft:sugar";
 -- 
-2.12.0.windows.1
+2.12.2
 

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

@@ -1,4 +1,4 @@
-From 8e14d9745e779264b36de11905925262ea2c1cb4 Mon Sep 17 00:00:00 2001
+From 52393541b308a635b69f891b01eb41c1776e8f07 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 67c54899d..3f58c34e0 100644
 +    // Paper end
  }
 -- 
-2.12.2.windows.2
+2.12.2
 

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

@@ -1,11 +1,11 @@
-From b62a735c3225762f282e00951b5351a786bcb853 Mon Sep 17 00:00:00 2001
+From 931dd1b6fbddd6576e436007a749078ceae64f1a 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 29219ec7b..c95fb7f30 100644
+index c79fb7d57..8749a1879 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 29219ec7b..c95fb7f30 100644
                      if ((mobcnt = getEntityCount(worldserver, enumcreaturetype.a())) <= limit * i / 256) {
                          BlockPosition.MutableBlockPosition blockposition_mutableblockposition = new BlockPosition.MutableBlockPosition();
 -- 
-2.12.0.windows.1
+2.12.2
 

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

@@ -1,4 +1,4 @@
-From 230889bd4f8eb5a76b29db21486a2d8bcf90ab86 Mon Sep 17 00:00:00 2001
+From c80433172ca35367589f748c6ac3a0270f33b8f3 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
@@ -67,5 +67,5 @@ index 39ed0d533..f969d2a72 100644
                          timing.stopTiming(); // Paper
                      } else {
 -- 
-2.12.0.windows.1
+2.12.2
 

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

@@ -1,4 +1,4 @@
-From 5ceed1d40f66d17831eafab8011bd93a78305a84 Mon Sep 17 00:00:00 2001
+From e87ca8c0409093b76e27c0077e2b3a86c26e045b 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
@@ -25,5 +25,5 @@ index 8cbdbda92..f86c64cb2 100644
      }
  
 -- 
-2.12.0.windows.1
+2.12.2
 

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

@@ -1,4 +1,4 @@
-From 0ea1c20ebdf134e47efb6aceb915590929ed4b9d Mon Sep 17 00:00:00 2001
+From 2f4d4c62f46ec42fef570d76224b5e12257eb95b 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 736fa1f62..61d34fc37 100644
  
      public void c(long i) {
 -- 
-2.12.0.windows.1
+2.12.2
 

Spigot-Server-Patches/0097-EntityPathfindEvent.patch

@@ -1,4 +1,4 @@
-From ed3b89ad69c48ebe4ee51a704b10e3f5ac4b17f9 Mon Sep 17 00:00:00 2001
+From 45f66cc197d1dcd2090286f05210c9acef78ca40 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 43b2be505..c0ef2400b 100644
                  float f = this.h();
  
 -- 
-2.12.0.windows.1
+2.12.2
 

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

@@ -1,4 +1,4 @@
-From 68a9bbc962a93f0689d95be191fae73489a5c2f7 Mon Sep 17 00:00:00 2001
+From 063a6b2a26bfabac382e663575b0a98e517346d9 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
@@ -48,5 +48,5 @@ index 0a2823686..8eba70b01 100644
                  if (this.material == Material.LAVA) {
                      this.fizz(world, blockposition);
 -- 
-2.12.0.windows.1
+2.12.2
 

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

@@ -1,4 +1,4 @@
-From 37db8b5f7d7fc19b87d5bc444491d60d1197aa0c Mon Sep 17 00:00:00 2001
+From 5fd361c508284348b1fe96835571b9d871da0ddc 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 9cfc46bc2..637e5baaf 100644
              }
          } catch (IOException ioexception) {
 -- 
-2.12.0.windows.1
+2.12.2
 

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

@@ -1,4 +1,4 @@
-From 1c1d94fb02737c1c35d720dd430bfb0b04050f7c Mon Sep 17 00:00:00 2001
+From 61c14766f4cf6eb0ac45cfcd60aae9fdcba217e8 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.
@@ -11,10 +11,10 @@ The implementation uses a LinkedHashMap as an LRU cache (modified from HashMap).
 The maximum size of the RegionFileCache is also made configurable.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index a48f5cb51..6b694705b 100644
+index 6907d4680..c3ff47e00 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -219,4 +219,9 @@ public class PaperConfig {
+@@ -220,4 +220,9 @@ public class PaperConfig {
      private static void healthDeath() {
          setHealthBeforeDeathEvent = getBoolean("settings.set-health-before-death-event", false);
      }
@@ -77,5 +77,5 @@ index 19fbf9b4a..ad00c39ce 100644
          Iterator iterator = RegionFileCache.a.values().iterator();
  
 -- 
-2.12.0.windows.1
+2.12.2
 

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

@@ -1,4 +1,4 @@
-From 5f32bddc3d9678ab8844312b8773a3e108110851 Mon Sep 17 00:00:00 2001
+From 0d5d2097b72aa92d7199dd4b84adc080cb9df775 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 419add5db..820c15278 100644
      private boolean f = true;
      private boolean g;
 -- 
-2.12.0.windows.1
+2.12.2
 

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

@@ -1,4 +1,4 @@
-From 82762171170f5fa2efc679e390f59413dc496e7e Mon Sep 17 00:00:00 2001
+From 22757113dc8d4014c7fe8ef4fb3d8a734fddf9fe 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
@@ -19,5 +19,5 @@ index f86c64cb2..7e6459654 100644
                  Chunk chunk = this.getChunkAtWorldCoords(blockposition);
  
 -- 
-2.12.0.windows.1
+2.12.2
 

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

@@ -1,4 +1,4 @@
-From ae218e1dc8c65c8e474da62a4799a0b42a7ec276 Mon Sep 17 00:00:00 2001
+From a143c953207c29ed4c31626f8a19e2aaa5ef72c0 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
@@ -39,5 +39,5 @@ index b67837dd2..840448995 100644
      }
  
 -- 
-2.12.2.windows.2
+2.12.2
 

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

@@ -1,11 +1,11 @@
-From d64ae353b75ee5abab8c33346297cedbd806d0f0 Mon Sep 17 00:00:00 2001
+From a93413a68948fca1c6565e2998d21c76031a7f04 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
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 4e35e9102..a55a6fca0 100644
+index d6a2bbc08..b8d48b45c 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -154,6 +154,7 @@ public abstract class PlayerList {
@@ -17,5 +17,5 @@ index 4e35e9102..a55a6fca0 100644
          entityplayer.getStatisticManager().d();
          entityplayer.getStatisticManager().updateStatistics(entityplayer);
 -- 
-2.12.0.windows.1
+2.12.2
 

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

@@ -1,4 +1,4 @@
-From ce7d0b024535acff9b1f9613aafee35d0560b7a5 Mon Sep 17 00:00:00 2001
+From 2239e93f9ca22ddb356ed4ee329aae51355d6a5d 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 8b43e6070..5cbc95f7c 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.12.0.windows.1
+2.12.2
 

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

@@ -1,4 +1,4 @@
-From 3c25ca03245aa817b01fc414d55019887bde034e Mon Sep 17 00:00:00 2001
+From 02aceb5c58c3c99427fbc68765cf7ce5340d477d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 13 Sep 2014 23:14:43 -0400
 Subject: [PATCH] Configurable Keep Spawn Loaded range per world
@@ -21,7 +21,7 @@ index 74a49a5fb..3a942c763 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 3b67ff52e..33d23f4b2 100644
+index e7c63a953..3aea41f76 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -356,8 +356,11 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -54,7 +54,7 @@ index 7e6459654..dba3fb167 100644
  
      public void a(Packet<?> packet) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 540d57855..8cb8cbe2d 100644
+index 4d761d32a..a958ce998 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -952,7 +952,7 @@ public final class CraftServer implements Server {
@@ -83,5 +83,5 @@ index f65611a6a..9965235ab 100644
                      loadChunk(chunkCoordX + x, chunkCoordZ + z);
                  } else {
 -- 
-2.12.0.windows.1
+2.12.2
 

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

@@ -1,4 +1,4 @@
-From 742f1c783e22b45da804858ae209f1098f5b287c Mon Sep 17 00:00:00 2001
+From a22863594140aa2beb47672cc81f2eeca3a4424c 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
@@ -17,5 +17,5 @@ index dba3fb167..44108ab9a 100644
          this.a(blockposition.east(), block, blockposition);
          this.a(blockposition.down(), block, blockposition);
 -- 
-2.12.0.windows.1
+2.12.2
 

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

@@ -1,4 +1,4 @@
-From a36884f63ccd005005d2ca4000ef1b31cf79cd03 Mon Sep 17 00:00:00 2001
+From b45bff5ab25d652697981a8e08b69d4d52edf888 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
@@ -29,5 +29,5 @@ index a27512c0f..4691b3d8f 100644
      }
  }
 -- 
-2.12.0.windows.1
+2.12.2
 

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

@@ -1,4 +1,4 @@
-From 64d38625dcef9c927f62fcda7a6de7e97f078c84 Mon Sep 17 00:00:00 2001
+From 09e2228c9837b20fdc95318fbe4e2a2d8a396f57 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 f3a6799a8..fa0fd8a9c 100644
          int k = j / 64;
          int l = ((i + 1) * this.b - 1) / 64;
 -- 
-2.12.0.windows.1
+2.12.2
 

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

@@ -1,4 +1,4 @@
-From e5561846f3f37b66f1140ab87113b267f45f7c5b Mon Sep 17 00:00:00 2001
+From 961fafdaceab970599d69a51dd78cb93a0d93a25 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
@@ -51,5 +51,5 @@ index 840448995..dfbae01f4 100644
                  if (((LazyPlayerSet) event.getRecipients()).isLazy()) {
                      for (Object recipient : minecraftServer.getPlayerList().players) {
 -- 
-2.12.2.windows.2
+2.12.2
 

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

@@ -1,4 +1,4 @@
-From b17837a6de60969078250788da9e1aaed2c2cf99 Mon Sep 17 00:00:00 2001
+From 5fa0344f756b199b838d8addb7e3f50efe5a4f91 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 b2fe1afc0..a74d6c768 100644
+index 80a6a0b41..5f6b182d6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -589,6 +589,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -28,5 +28,5 @@ index b2fe1afc0..a74d6c768 100644
      public void setSneaking(boolean sneak) {
          getHandle().setSneaking(sneak);
 -- 
-2.12.0.windows.1
+2.12.2
 

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

@@ -1,4 +1,4 @@
-From 46779d2f2ca037a8800c901a4bb48d59d7d1cf24 Mon Sep 17 00:00:00 2001
+From dcfc848c896f88a21c47d10b8e5914bdeeda4321 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
@@ -67,5 +67,5 @@ index 9bc8ce64c..2f4728b0d 100644
              }
  
 -- 
-2.12.0.windows.1
+2.12.2
 

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

@@ -1,4 +1,4 @@
-From 46a6949ea4c98de6bc09f7bd6db7205afa027dcf Mon Sep 17 00:00:00 2001
+From 421db0871b70be8fbcee14ef32188a132e5e12d2 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 edd6fb69e..380373c0e 100644
      private int a;
      public int rotation;
 -- 
-2.12.0.windows.1
+2.12.2
 

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

@@ -1,14 +1,14 @@
-From f6310cc6c324b8888a8ada2c71896f32c796fa36 Mon Sep 17 00:00:00 2001
+From 8947fc06b9c49517b322470cd569d158c05b4118 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 13 Apr 2016 02:10:49 -0400
 Subject: [PATCH] Configurable Player Collision
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 6b694705..ee884ba5 100644
+index c3ff47e00..710c432d8 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -224,4 +224,9 @@ public class PaperConfig {
+@@ -225,4 +225,9 @@ public class PaperConfig {
      private static void regionFileCacheSize() {
          regionFileCacheSize = getInt("settings.region-file-cache-size", 256);
      }
@@ -19,7 +19,7 @@ index 6b694705..ee884ba5 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/CommandScoreboard.java b/src/main/java/net/minecraft/server/CommandScoreboard.java
-index ab9aa132..f9f59e55 100644
+index ab9aa132a..f9f59e559 100644
 --- a/src/main/java/net/minecraft/server/CommandScoreboard.java
 +++ b/src/main/java/net/minecraft/server/CommandScoreboard.java
 @@ -183,6 +183,13 @@ public class CommandScoreboard extends CommandAbstract {
@@ -37,7 +37,7 @@ index ab9aa132..f9f59e55 100644
                      }
                  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 3aea41f7..430168d2 100644
+index 3aea41f76..430168d21 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -331,6 +331,20 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -62,7 +62,7 @@ index 3aea41f7..430168d2 100644
  
      protected void l() {
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java b/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java
-index d8ec5045..eb45d3cf 100644
+index d8ec50455..eb45d3cf2 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java
 @@ -96,7 +96,7 @@ public class PacketPlayOutScoreboardTeam implements Packet<PacketListenerPlayOut
@@ -75,7 +75,7 @@ index d8ec5045..eb45d3cf 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index b8d48b45..50a3dfe4 100644
+index b8d48b45c..50a3dfe44 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -71,6 +71,7 @@ public abstract class PlayerList {