Switch to a bStats based Metrics system

Spigot-Server-Patches/0005-MC-Utils.patch

@@ -1,4 +1,4 @@
-From 11d2df695af8ab5f3f0d65c71cff3e0af8259cea Mon Sep 17 00:00:00 2001
+From a703dc3147918196659551ad173b9072f80e983c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 20:55:47 -0400
 Subject: [PATCH] MC Utils
@@ -252,5 +252,5 @@ index 370203b2d..ae7498c03 100644
  
      public NBTTagList() {}
 -- 
-2.11.0
+2.12.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From a8603339050a20775e8fe0d8b4ab72979ec40ca8 Mon Sep 17 00:00:00 2001
+From b2b5b98b2f544ee0afcceab0224a86eb75055b84 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
@@ -391,7 +391,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 328ff012b..0a6f9b256 100644
+index 75d4048a9..1ea799d59 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 328ff012b..0a6f9b256 100644
  
  public class PaperConfig {
  
-@@ -170,4 +173,24 @@ public class PaperConfig {
+@@ -175,4 +178,24 @@ public class PaperConfig {
          config.addDefault(path, def);
          return config.getString(path, config.getString(path));
      }

Spigot-Server-Patches/0007-Configurable-squid-spawn-ranges.patch

@@ -1,4 +1,4 @@
-From de528a5f3327325979e9c922f947a68d8f6a05f3 Mon Sep 17 00:00:00 2001
+From ffac25bb34932ef90c85baca9c77303e9ccf3702 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 12:45:11 -0600
 Subject: [PATCH] Configurable squid spawn ranges

Spigot-Server-Patches/0008-Configurable-cactus-and-reed-natural-growth-heights.patch

@@ -1,4 +1,4 @@
-From 9d3232a2cbd15f79ee0f7e152ef02dc867d1840f Mon Sep 17 00:00:00 2001
+From 2df13908f2a9a16aedcfb2d7c56fa578181ffb97 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 13:02:51 -0600
 Subject: [PATCH] Configurable cactus and reed natural growth heights

Spigot-Server-Patches/0009-Configurable-baby-zombie-movement-speed.patch

@@ -1,4 +1,4 @@
-From 790816c05478aaff9ca2e42497b728d335eac504 Mon Sep 17 00:00:00 2001
+From 4f7e02a3e570583d2510848d700901e72de644c8 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 13:09:16 -0600
 Subject: [PATCH] Configurable baby zombie movement speed

Spigot-Server-Patches/0010-Configurable-fishing-time-ranges.patch

@@ -1,4 +1,4 @@
-From 54a3c63aa8ce0d58f434036ef58d29e25d0ea9b8 Mon Sep 17 00:00:00 2001
+From 16212de7e01256c4ac01f0e1fab71bcee9e1c7e8 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 13:14:11 -0600
 Subject: [PATCH] Configurable fishing time ranges

Spigot-Server-Patches/0011-Allow-nerfed-mobs-to-jump.patch

@@ -1,4 +1,4 @@
-From 7fc4d230818cf9b8303ce829b2c45bc5bf8621c1 Mon Sep 17 00:00:00 2001
+From baef57831bfe28a7f0187a69bdb48b1f03ec8bde Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 13:24:16 -0600
 Subject: [PATCH] Allow nerfed mobs to jump

Spigot-Server-Patches/0012-Add-configurable-despawn-distances-for-living-entiti.patch

@@ -1,4 +1,4 @@
-From 8454fb258664baf7b6c6d257c4d36b328aa9c60f Mon Sep 17 00:00:00 2001
+From 8b4c81d464e94b495826f3cbc47d81d8da3f2c3b Mon Sep 17 00:00:00 2001
 From: Suddenly <suddenly@suddenly.coffee>
 Date: Tue, 1 Mar 2016 13:51:54 -0600
 Subject: [PATCH] Add configurable despawn distances for living entities

Spigot-Server-Patches/0013-Allow-for-toggling-of-spawn-chunks.patch

@@ -1,4 +1,4 @@
-From 97865c7e6e3ab14d911ee022f7538fba90a5f601 Mon Sep 17 00:00:00 2001
+From 93cedb6f2ccf3c12457a4f0662bfc01ba6aacdfb Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 3 Mar 2016 03:53:43 -0600
 Subject: [PATCH] Allow for toggling of spawn chunks

Spigot-Server-Patches/0014-Drop-falling-block-and-tnt-entities-at-the-specified.patch

@@ -1,4 +1,4 @@
-From 0eada54aa2eee86bf693c1ac9f60195a38eb41ff Mon Sep 17 00:00:00 2001
+From c626ab09022ba5bd9efab830624989ecffdcc36a Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Tue, 1 Mar 2016 14:14:15 -0600
 Subject: [PATCH] Drop falling block and tnt entities at the specified height

Spigot-Server-Patches/0015-Configurable-speed-for-water-flowing-over-lava.patch

@@ -1,4 +1,4 @@
-From 54abcccc1027dc80e9fd95a4fe70f473213b19b2 Mon Sep 17 00:00:00 2001
+From 16b591982a8417b9f551dd06a73d25cdf82842e1 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Tue, 1 Mar 2016 14:27:13 -0600
 Subject: [PATCH] Configurable speed for water flowing over lava

Spigot-Server-Patches/0016-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch

@@ -1,4 +1,4 @@
-From 097fe2c890f1fcff2a79ab78b18f7924db2edca9 Mon Sep 17 00:00:00 2001
+From 8936094d98b21ebe52e725f7c1ac99e196a8822a Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 14:32:43 -0600
 Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang
@@ -80,5 +80,5 @@ index 94a3d4237..3ed983cc0 100644
                  log.log( Level.SEVERE, "------------------------------" );
                  //
 -- 
-2.11.0.windows.3
+2.12.0.windows.1
 

Spigot-Server-Patches/0017-Player-affects-spawning-API.patch

@@ -1,4 +1,4 @@
-From 90a7f499e10cfa5104a1a22197a931454fef07c8 Mon Sep 17 00:00:00 2001
+From 18f6ba2999aa3d3d8175d9d660753847446cb5bf Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Tue, 1 Mar 2016 14:47:52 -0600
 Subject: [PATCH] Player affects spawning API

Spigot-Server-Patches/0018-Metrics.patch

@@ -1,11 +1,11 @@
-From ee38e5a5f229f8adad1383883452f365de3e1b6b Mon Sep 17 00:00:00 2001
+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 a5fd59d..680283c 100644
+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 {
@@ -18,5 +18,5 @@ index a5fd59d..680283c 100644
          String pluginVersion = (Metrics.class.getPackage().getImplementationVersion() != null) ? Metrics.class.getPackage().getImplementationVersion() : "unknown";
          String serverVersion = Bukkit.getVersion();
 -- 
-2.9.3
+2.12.0.windows.1
 

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

@@ -1,11 +1,11 @@
-From 6b1a51ebeb36d4d5f2b9e0a8816a4d7b3a7ddc02 Mon Sep 17 00:00:00 2001
+From 29afd8bc4380e527ae39018fde2d7842239bc4dc 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
 
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index bd3b160..1c0108e 100644
+index bd3b16025..1c0108ef1 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -722,6 +722,10 @@ public class Chunk {
@@ -20,5 +20,5 @@ index bd3b160..1c0108e 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.9.3
+2.12.0.windows.1
 

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

@@ -1,11 +1,11 @@
-From 801f5693fe5379447940a29868132cd8f973ece1 Mon Sep 17 00:00:00 2001
+From 6ee4894cd7619d860ec2d48dc29031bf2bd0384b 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
 
 
 diff --git a/src/main/java/net/minecraft/server/TileEntityChest.java b/src/main/java/net/minecraft/server/TileEntityChest.java
-index 28a514a..60452e8 100644
+index 28a514a64..60452e83b 100644
 --- a/src/main/java/net/minecraft/server/TileEntityChest.java
 +++ b/src/main/java/net/minecraft/server/TileEntityChest.java
 @@ -8,17 +8,17 @@ import org.bukkit.craftbukkit.entity.CraftHumanEntity;
@@ -117,7 +117,7 @@ index 28a514a..60452e8 100644
              this.world.applyPhysics(this.position, this.getBlock(), false);
  
 diff --git a/src/main/java/net/minecraft/server/TileEntityEnderChest.java b/src/main/java/net/minecraft/server/TileEntityEnderChest.java
-index 3d61c2d..586ceaa 100644
+index 3d61c2d68..586ceaa67 100644
 --- a/src/main/java/net/minecraft/server/TileEntityEnderChest.java
 +++ b/src/main/java/net/minecraft/server/TileEntityEnderChest.java
 @@ -1,15 +1,17 @@
@@ -186,5 +186,5 @@ index 3d61c2d..586ceaa 100644
      }
  
 -- 
-2.9.3
+2.12.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From f34109ceb110e7cc63f4d4d037245a64ff5a2449 Mon Sep 17 00:00:00 2001
+From 5a56db7a9f54088291795d52f2bde422119d5642 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
@@ -210,5 +210,5 @@ index be2e31dea..6d21c3269 100644
          return ( ( tps > 18.0 ) ? ChatColor.GREEN : ( tps > 16.0 ) ? ChatColor.YELLOW : ChatColor.RED ).toString()
                  + ( ( tps > 20.0 ) ? "*" : "" ) + Math.min( Math.round( tps * 100.0 ) / 100.0, 20.0 );
 -- 
-2.11.0
+2.12.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From 626b095ddadaefce16e25168f532b8152fe234e6 Mon Sep 17 00:00:00 2001
+From cf54a9e536799481ce0827ac26a2b10ef6f2b4f9 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

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

@@ -1,11 +1,11 @@
-From 38018a4a5db0023a7d170ac687428d5549785ae4 Mon Sep 17 00:00:00 2001
+From 066da232470e76f73ce6f5ac3bc9fba3f4e0d029 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
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index a15c129..110f655 100644
+index 822d73b9e..f65611a6a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -127,6 +127,26 @@ public class CraftWorld implements World {
@@ -36,5 +36,5 @@ index a15c129..110f655 100644
          return this.world.getChunkProviderServer().getChunkAt(x, z).bukkitChunk;
      }
 -- 
-2.9.3
+2.12.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From a4ea505f84809c0f4168a71e10a6714484a4cc75 Mon Sep 17 00:00:00 2001
+From 16134083d0eea50c8ec22f6a7421d056d58d3292 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

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

@@ -1,11 +1,11 @@
-From 7883878587bcd59f62d9a361ac68b1dc024a85c3 Mon Sep 17 00:00:00 2001
+From 555c9dbf56471528d900454f8556dcc19c7af2e3 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
 
 
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index b3d3df4c..d0c0371f 100644
+index b3d3df4cf..d0c0371fc 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -175,7 +175,12 @@ public abstract class TileEntity {
@@ -23,7 +23,7 @@ index b3d3df4c..d0c0371f 100644
                  public String a() throws Exception {
                      int i = Block.getId(TileEntity.this.world.getType(TileEntity.this.position).getBlock());
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index e39b966c..9cdc94be 100644
+index 39919ab1c..632d5c760 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1446,10 +1446,12 @@ public abstract class World implements IBlockAccess {

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

@@ -1,4 +1,4 @@
-From f39ff351a0d3263158ec312e3cb0a3e0e54283ff Mon Sep 17 00:00:00 2001
+From 4769d44f5b85ef49a3bbd628be4e7e2f86fa7521 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

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

@@ -1,11 +1,11 @@
-From 383074be770112c2b2dc2e9810fa50658b8c3e33 Mon Sep 17 00:00:00 2001
+From 5b5459ca71a1bc441e5c57a852d70ecbdb24bd5d 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
 
 
 diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java
-index caec568..30b54a5 100644
+index caec56824..30b54a50e 100644
 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
 +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java
 @@ -167,7 +167,7 @@ public class WorldNBTStorage implements IDataManager, IPlayerFileData {
@@ -18,5 +18,5 @@ index caec568..30b54a5 100644
                  file = new File( this.playerDir, UUID.nameUUIDFromBytes( ( "OfflinePlayer:" + entityhuman.getName() ).getBytes( "UTF-8" ) ).toString() + ".dat");
                  if ( file.exists() )
 -- 
-2.9.3
+2.12.0.windows.1
 

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

@@ -1,11 +1,11 @@
-From 84877410582d951108695a4d3d1d1951645022bb Mon Sep 17 00:00:00 2001
+From dfbba8355e51c337187a93a3db380b223f626892 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
 
 
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 5c2fb00..c411ce8 100644
+index 5c2fb0058..c411ce886 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -13,6 +13,7 @@ import net.minecraft.server.EntityCreature;
@@ -25,5 +25,5 @@ index 5c2fb00..c411ce8 100644
                  || entity instanceof EntityFireworks )
          {
 -- 
-2.9.3
+2.12.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From 72852de2a09e0ead6ff570f9c063bcf6b3d24854 Mon Sep 17 00:00:00 2001
+From d13d53ab6bafe9851cb3a816ca64e42ab83d6d29 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

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

@@ -1,4 +1,4 @@
-From 2d9ec51993b37973d282f321458d6faaf07bd49e Mon Sep 17 00:00:00 2001
+From b9ed456c56c03fd801daea418dc35ec4d8a0a2cb 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

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

@@ -1,11 +1,11 @@
-From 9878ca9652f24a660397d7e2291279a86ef7b54d Mon Sep 17 00:00:00 2001
+From cca16ca09a209720483d4fe88d1f2b8537ae7b75 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
 
 
 diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
-index 904bee8..4e05bcd 100644
+index 904bee8b5..4e05bcdfa 100644
 --- a/src/main/java/net/minecraft/server/Explosion.java
 +++ b/src/main/java/net/minecraft/server/Explosion.java
 @@ -104,7 +104,14 @@ public class Explosion {
@@ -25,5 +25,5 @@ index 904bee8..4e05bcd 100644
  
          for (int l1 = 0; l1 < list.size(); ++l1) {
 -- 
-2.9.3
+2.12.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From 273bc543e9cd4c645049ec8e33d9eae4025ec4a5 Mon Sep 17 00:00:00 2001
+From 8890e82c87bc665f7532115c8e0eb088f0c1b2de 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

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

@@ -1,4 +1,4 @@
-From 04028ca0d3b4b0eb358a3118acc84b30a49248bc Mon Sep 17 00:00:00 2001
+From 9d5e09ca837a92224b403ec20930f9ad1e300ed8 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

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

@@ -1,11 +1,11 @@
-From b0f886b09b2d945d228d9929ad9483d9804423f2 Mon Sep 17 00:00:00 2001
+From 3c56dc7c870aa521f719c5109fde8f44f3158c22 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
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockFlowing.java b/src/main/java/net/minecraft/server/BlockFlowing.java
-index f4ac7ba..801b9cb 100644
+index f4ac7bafa..801b9cb7b 100644
 --- a/src/main/java/net/minecraft/server/BlockFlowing.java
 +++ b/src/main/java/net/minecraft/server/BlockFlowing.java
 @@ -90,6 +90,7 @@ public class BlockFlowing extends BlockFluids {
@@ -17,5 +17,5 @@ index f4ac7ba..801b9cb 100644
          IBlockData iblockdata2 = world.getType(blockposition.down());
  
 -- 
-2.9.3
+2.12.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From ec1e69e287a2211ad9f14bd15e3c2cf371fa6082 Mon Sep 17 00:00:00 2001
+From d20531320914b578667604dc1a7d557b1c61b0f8 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

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

@@ -1,4 +1,4 @@
-From c9cd7554a7447afb16a65d55ebf96a2c6ee3fd9f Mon Sep 17 00:00:00 2001
+From 915fe90596915de1e459fcb7965d62f72b9f9d4f 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

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

@@ -1,4 +1,4 @@
-From 34d326401bb597b21f6712b873d8b0e92d8475b5 Mon Sep 17 00:00:00 2001
+From a60f675dfc193a297f79e43764d1980322bb4fd4 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

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

@@ -1,4 +1,4 @@
-From b2beab2af3a84a6cd80b833cec20d43c3d699899 Mon Sep 17 00:00:00 2001
+From fbb70839f7188d6096dff42ca1b3fdcf8c715f90 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

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

@@ -1,4 +1,4 @@
-From 4855da31c259635c9148c6eb7db94e696e810504 Mon Sep 17 00:00:00 2001
+From 4171809caf6057e84b0b1cf5ec03a259cde6c688 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

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

@@ -1,4 +1,4 @@
-From dd3197ca93e9529ee5559f5f4f1764a53865af9b Mon Sep 17 00:00:00 2001
+From 708e3b196dead7aa3871281f6922384c56c32257 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

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

@@ -1,4 +1,4 @@
-From a4a8ef41f089714d6077958ed2931b4a9eedb92b Mon Sep 17 00:00:00 2001
+From e483c2457d3eec68120dc6058950d391e6f54455 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

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

@@ -1,11 +1,11 @@
-From 6e4bf10e4048b6989928b12e4df3d237dbb44a4c Mon Sep 17 00:00:00 2001
+From a66312a6f87feb99a654ae23975f5130db7c5b26 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
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index b688e99..370cb9c 100644
+index 1493f9ab3..f542bf491 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 @@ -41,7 +41,12 @@ public class EntityTrackerEntry {
@@ -76,5 +76,5 @@ index b688e99..370cb9c 100644
  
                      entityplayer.playerConnection.sendPacket(packet);
 -- 
-2.9.3
+2.12.0.windows.1
 

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

@@ -1,11 +1,11 @@
-From f2e99545394c0006dcd8d1499aeaed4a7e8e9ce4 Mon Sep 17 00:00:00 2001
+From 1f602d61011394e08fb6e7511fac2ed306e188a2 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
 
 
 diff --git a/src/main/java/net/minecraft/server/TileEntityBeacon.java b/src/main/java/net/minecraft/server/TileEntityBeacon.java
-index 6f2fcd2..71ecc54 100644
+index 6f2fcd22e..71ecc5493 100644
 --- a/src/main/java/net/minecraft/server/TileEntityBeacon.java
 +++ b/src/main/java/net/minecraft/server/TileEntityBeacon.java
 @@ -16,6 +16,14 @@ import org.bukkit.entity.HumanEntity;
@@ -69,5 +69,5 @@ index 6f2fcd2..71ecc54 100644
          }
  
 -- 
-2.9.3
+2.12.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From 07032dd31eb190fc5371f1b47a699d67e18597b4 Mon Sep 17 00:00:00 2001
+From 2e01d589aa09d046929f8d3cd70b1938c0978a3c 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

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

@@ -1,11 +1,11 @@
-From 2087e0322bd2350d334b5292ab192c1be0814418 Mon Sep 17 00:00:00 2001
+From 9ebcc2f689753eb2c2ec33864e05450f9cee2fa3 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
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
-index f07eb2f..18cc746 100644
+index f07eb2f75..18cc74639 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
 @@ -6,6 +6,7 @@ import net.minecraft.server.GameProfileSerializer;
@@ -31,5 +31,5 @@ index f07eb2f..18cc746 100644
              // Spigot end
          }
 -- 
-2.9.3
+2.12.0.windows.1
 

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

@@ -1,11 +1,11 @@
-From 75cf51dbbbd0aa6c336f1a293dbc5a33daecb0f3 Mon Sep 17 00:00:00 2001
+From 85294ba8067c8ab43419b70379c53aaff9845630 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
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index d2b90fda..3c5a3532 100644
+index 5f7590e11..a1cdcd71b 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1423,10 +1423,10 @@ public abstract class World implements IBlockAccess {

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

@@ -1,14 +1,14 @@
-From 3a2a233551b5789414804e0694d2a665419d26b5 Mon Sep 17 00:00:00 2001
+From 4d33547c24567a2bedc35176c38b04c8f7320f38 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 0a6f9b256..18cabc4f3 100644
+index 1ea799d59..8c8bc4c86 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -193,4 +193,9 @@ public class PaperConfig {
+@@ -198,4 +198,9 @@ public class PaperConfig {
                  " - Interval: " + timeSummary(Timings.getHistoryInterval() / 20) +
                  " - Length: " + timeSummary(Timings.getHistoryLength() / 20));
      }

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

@@ -1,4 +1,4 @@
-From 06479b95dff55813423388c8af4a933ac5dda039 Mon Sep 17 00:00:00 2001
+From 8bd51ec6ce48f100cc32ac4268904c7bd54874ba 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
@@ -7,7 +7,7 @@ Plugins like Dynmap can end up creating tons of emtpy Region Files
 when using chunkExists.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index ca33899..8828275 100644
+index 4890023d7..79cb3953b 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -39,7 +39,10 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -23,7 +23,7 @@ index ca33899..8828275 100644
      // CraftBukkit end
  
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index f234298..933934f 100644
+index f23429898..933934fb6 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
 @@ -12,7 +12,13 @@ public class RegionFileCache {
@@ -49,5 +49,5 @@ index f234298..933934f 100644
                  file1.mkdirs();
              }
 -- 
-2.9.3
+2.12.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From bffea907537f9020197917bf12fd30854e784e30 Mon Sep 17 00:00:00 2001
+From cc53a532b798a31431e55027980618f421451d8b 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 04d6355..954d035 100644
+index 676cc3f3e..4e35e9102 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 04d6355..954d035 100644
          entityplayer.playerInteractManager.a((WorldServer) entityplayer.world);
          String s1 = "local";
 -- 
-2.9.3
+2.12.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From 122209091641313650c741bf1eb283ba4156a6cb Mon Sep 17 00:00:00 2001
+From 1410382d853ba361a079502d38568f4eb55113de 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

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

@@ -1,4 +1,4 @@
-From f53fc4b3d06bb6b236da8212307d9a9bc7c51eeb Mon Sep 17 00:00:00 2001
+From d94378d518cda98be6fc17c01200ed86b7ac3790 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

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

@@ -1,4 +1,4 @@
-From e1bfe5c5182260e5cef5c0e2b8fa851a516fe174 Mon Sep 17 00:00:00 2001
+From 6b32181201c024700da5cf0fd078deaa091230cd 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

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

@@ -1,4 +1,4 @@
-From fa3b82efa55cdcd8c7388ec868278b48be00961d Mon Sep 17 00:00:00 2001
+From c2e8208e724845d130dbf63019835d6ea9088f3a 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
@@ -7,7 +7,7 @@ Prevents pathfinding from spamming failures for things such as
 arrow attacks.
 
 diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
-index 4f28b88..43b2be5 100644
+index 4f28b8819..43b2be505 100644
 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java
 +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
 @@ -118,10 +118,26 @@ public abstract class NavigationAbstract {
@@ -47,5 +47,5 @@ index 4f28b88..43b2be5 100644
      }
  
 -- 
-2.9.3
+2.12.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From b17725413c3a4ad11af1df1d69c71dfd96350a29 Mon Sep 17 00:00:00 2001
+From b0c16e419f39727b2b51bc84b777dc9eb42a8131 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
@@ -14,7 +14,7 @@ And since minecart hoppers are used _very_ rarely near we can avoid alot of sear
 Combined, this adds up a lot.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index b80f951..e1fc4ea 100644
+index b80f95159..e1fc4ea6c 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -47,6 +47,13 @@ public class Chunk {
@@ -95,5 +95,5 @@ index b80f951..e1fc4ea 100644
  
              while (iterator.hasNext()) {
 -- 
-2.9.3
+2.12.0.windows.1
 

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

@@ -1,11 +1,11 @@
-From 93e2fc860b2110225b8015a067ed778281de507c Mon Sep 17 00:00:00 2001
+From 8eb9c58348a5373d07490079d2018313dfec3b64 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 a795a16..03bc017 100644
+index a795a165a..03bc0171b 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 a795a16..03bc017 100644
          return commandMap;
      }
 -- 
-2.9.3
+2.12.0.windows.1
 

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

@@ -1,11 +1,11 @@
-From 8df594dafa3d1db0eb68bdffcaa763b9e0c51072 Mon Sep 17 00:00:00 2001
+From e82e41369c3b18bf01ffa5a9ce73aceff5ea39a0 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 3 Mar 2016 02:18:39 -0600
 Subject: [PATCH] Be a bit more informative in maxHealth exception
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index c00260f67..5520c707e 100644
+index 27cd0d43d..61032eb2f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -96,7 +96,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -21,5 +21,5 @@ index c00260f67..5520c707e 100644
  
          if (health == 0) {
 -- 
-2.11.0
+2.12.0.windows.1
 

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

@@ -1,11 +1,11 @@
-From dd279236b6887fe946ef41564b45801b2ba9edb1 Mon Sep 17 00:00:00 2001
+From 1cde879dc1017264aa0d84569843d35006fa3f63 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Thu, 3 Mar 2016 02:32:10 -0600
 Subject: [PATCH] Player Tab List and Title APIs
 
 
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutPlayerListHeaderFooter.java b/src/main/java/net/minecraft/server/PacketPlayOutPlayerListHeaderFooter.java
-index 5f5b382..242efb0 100644
+index 5f5b3825d..242efb0b9 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutPlayerListHeaderFooter.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutPlayerListHeaderFooter.java
 @@ -4,6 +4,8 @@ import java.io.IOException;
@@ -40,7 +40,7 @@ index 5f5b382..242efb0 100644
  
      public void a(PacketListenerPlayOut packetlistenerplayout) {
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutTitle.java b/src/main/java/net/minecraft/server/PacketPlayOutTitle.java
-index 7bcafa8..4f6c1c2 100644
+index 7bcafa8bb..4f6c1c2e7 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutTitle.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutTitle.java
 @@ -12,6 +12,18 @@ public class PacketPlayOutTitle implements Packet<PacketListenerPlayOut> {
@@ -78,7 +78,7 @@ index 7bcafa8..4f6c1c2 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 0bf3429..0e6e416 100644
+index cc26aa748..2bcf3976f 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 0bf3429..0e6e416 100644
      public String getDisplayName() {
          return getHandle().displayName;
 -- 
-2.9.3
+2.12.0.windows.1
 

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

@@ -1,11 +1,11 @@
-From d49248d0e6675ce7fc2b0d5b5a042e5dbf009366 Mon Sep 17 00:00:00 2001
+From b73de79664f1d4e137d6c4764881817d39bbcb1d Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:33:53 -0600
 Subject: [PATCH] Ensure inv drag is in bounds
 
 
 diff --git a/src/main/java/net/minecraft/server/Container.java b/src/main/java/net/minecraft/server/Container.java
-index 686250e..b826089 100644
+index 686250ea8..b826089d1 100644
 --- a/src/main/java/net/minecraft/server/Container.java
 +++ b/src/main/java/net/minecraft/server/Container.java
 @@ -141,7 +141,7 @@ public abstract class Container {
@@ -18,5 +18,5 @@ index 686250e..b826089 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.9.3
+2.12.0.windows.1
 

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

@@ -1,11 +1,11 @@
-From aef0d783f0c288be9a2cbb3d4d80f2fe8a765dc0 Mon Sep 17 00:00:00 2001
+From 7c794303b52022aca46e88ccf0dd466abd2700ab Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:39:54 -0600
 Subject: [PATCH] Change implementation of (tile)entity removal list
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index e851e78a..223b0512 100644
+index 7feed2995..5b5e0e73c 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -121,10 +121,10 @@ public abstract class Entity implements ICommandListener {
@@ -24,7 +24,7 @@ index e851e78a..223b0512 100644
      public boolean impulse;
      public int portalCooldown;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 3c5a3532..412854b6 100644
+index a1cdcd71b..354a7309b 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -30,6 +30,11 @@ import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;

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

@@ -1,4 +1,4 @@
-From e508319d553bebb9f1c0ebcae8066ff53d1dd132 Mon Sep 17 00:00:00 2001
+From adea9822f254f16ea903bfcf4a929946a6879cd0 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

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

@@ -1,11 +1,11 @@
-From 870573220f675aa66477ab57fdaa78cc0b1dc993 Mon Sep 17 00:00:00 2001
+From 836675371c732b2c7d7977874436f4f5b20dece0 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 03bc017..c61752b 100644
+index 03bc0171b..c61752bc3 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 {
@@ -17,7 +17,7 @@ index 03bc017..c61752b 100644
      private final class BooleanWrapper {
          private boolean value = true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 0167ed0..c094465 100644
+index 6497905b9..463289199 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -229,6 +229,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -33,7 +33,7 @@ index 0167ed0..c094465 100644
          entity.motY = vel.getY();
          entity.motZ = vel.getZ();
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index 3ed983c..6384d50 100644
+index 3ed983cc0..6384d50e7 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
 @@ -66,7 +66,19 @@ public class WatchdogThread extends Thread
@@ -58,5 +58,5 @@ index 3ed983c..6384d50 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.9.3
+2.12.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From 6ebe6765d70174e67fbfbe3af0e445fadf03c301 Mon Sep 17 00:00:00 2001
+From 6f8838ab5bd00cfbc8e1fd70316230c562c16838 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

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

@@ -1,4 +1,4 @@
-From 63975534b050bf243aa688ce5210229565b23715 Mon Sep 17 00:00:00 2001
+From 1af338583cb34ab7e0569206f6b7e2eeec97135e 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Add exception reporting event
 
 diff --git a/src/main/java/com/destroystokyo/paper/ServerSchedulerReportingWrapper.java b/src/main/java/com/destroystokyo/paper/ServerSchedulerReportingWrapper.java
 new file mode 100644
-index 00000000..93397188
+index 000000000..93397188b
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/ServerSchedulerReportingWrapper.java
 @@ -0,0 +1,38 @@
@@ -50,7 +50,7 @@ index 00000000..93397188
 +}
 \ No newline at end of file
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index e1fc4ea6..8f1a68d6 100644
+index e1fc4ea6c..8f1a68d67 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -1,5 +1,6 @@
@@ -89,7 +89,7 @@ index e1fc4ea6..8f1a68d6 100644
          }
      }
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index f7f2d12c..b0a82e7e 100644
+index f7f2d12cf..b0a82e7ed 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -12,6 +12,7 @@ import java.util.Iterator;
@@ -144,7 +144,7 @@ index f7f2d12c..b0a82e7e 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
-index 016c64e8..2ff8a6da 100644
+index 016c64e82..2ff8a6da0 100644
 --- a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
 +++ b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
 @@ -1,5 +1,6 @@
@@ -171,7 +171,7 @@ index 016c64e8..2ff8a6da 100644
                         }
                          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/PersistentCollection.java b/src/main/java/net/minecraft/server/PersistentCollection.java
-index 936d6c64..50056f49 100644
+index 936d6c640..50056f49a 100644
 --- a/src/main/java/net/minecraft/server/PersistentCollection.java
 +++ b/src/main/java/net/minecraft/server/PersistentCollection.java
 @@ -1,5 +1,6 @@
@@ -198,7 +198,7 @@ index 936d6c64..50056f49 100644
  
          }
 diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
-index b0279ac3..be13c113 100644
+index b0279ac3e..be13c1131 100644
 --- a/src/main/java/net/minecraft/server/RegionFile.java
 +++ b/src/main/java/net/minecraft/server/RegionFile.java
 @@ -1,5 +1,6 @@
@@ -225,7 +225,7 @@ index b0279ac3..be13c113 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index 933934fb..19fbf9b4 100644
+index 933934fb6..19fbf9b4a 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
 @@ -1,5 +1,6 @@
@@ -244,7 +244,7 @@ index 933934fb..19fbf9b4 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index a05fad54..29219ec7 100644
+index a05fad54f..29219ec7b 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -7,6 +7,7 @@ import java.util.Random;
@@ -272,7 +272,7 @@ index a05fad54..29219ec7 100644
                              }
  
 diff --git a/src/main/java/net/minecraft/server/VillageSiege.java b/src/main/java/net/minecraft/server/VillageSiege.java
-index 7af5b7dd..2b498024 100644
+index 7af5b7dd7..2b498024c 100644
 --- a/src/main/java/net/minecraft/server/VillageSiege.java
 +++ b/src/main/java/net/minecraft/server/VillageSiege.java
 @@ -1,5 +1,7 @@
@@ -292,7 +292,7 @@ index 7af5b7dd..2b498024 100644
              }
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 412854b6..22e191ef 100644
+index 354a7309b..cc7369e52 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1,5 +1,7 @@
@@ -328,7 +328,7 @@ index 412854b6..22e191ef 100644
                          this.tileEntityListTick.remove(tileTickPosition--);
                          continue;
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index 9952b64b..e30cfb7b 100644
+index 9952b64be..e30cfb7b7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 @@ -15,6 +15,9 @@ import java.util.concurrent.atomic.AtomicReference;

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

@@ -1,4 +1,4 @@
-From 1cff86b001e1cbea670acc16a55ce94ef54334cf Mon Sep 17 00:00:00 2001
+From eb6be2b7c8be9fabd00b52ce3346948ada2bd67b 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Don't nest if we don't need to when cerealising text
 
 
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutChat.java b/src/main/java/net/minecraft/server/PacketPlayOutChat.java
-index 9fc83c4..b3b13ba 100644
+index 9fc83c4a3..b3b13ba11 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutChat.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutChat.java
 @@ -27,7 +27,14 @@ public class PacketPlayOutChat implements Packet<PacketListenerPlayOut> {
@@ -26,5 +26,5 @@ index 9fc83c4..b3b13ba 100644
              packetdataserializer.a(this.a);
          }
 -- 
-2.9.3
+2.12.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From b241d53cbf704b2ef0edd30052700c8a4c42db3c Mon Sep 17 00:00:00 2001
+From 9a82d2a8a75df88e30be7f1bc1c7515e277a5f42 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

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

@@ -1,11 +1,11 @@
-From 694e45177f8e7253cd0dd865cc31d8bc3ca6a841 Mon Sep 17 00:00:00 2001
+From 1612683999cfcbc22c50e0c505bfa4355b70b03b 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 a2d4768..193dadf 100644
+index e5fa1c3ba..247224117 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1380,10 +1380,12 @@ public abstract class EntityLiving extends Entity {
@@ -22,7 +22,7 @@ index a2d4768..193dadf 100644
          this.datawatcher.set(EntityLiving.bq, Integer.valueOf(i));
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 61032eb..348a8c7 100644
+index 61032eb2f..348a8c758 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -572,4 +572,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -43,5 +43,5 @@ index 61032eb..348a8c7 100644
 +    // Paper end
  }
 -- 
-2.9.3
+2.12.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From b30d84f0462ba70f3d1a46b71b7068be22a03127 Mon Sep 17 00:00:00 2001
+From 3ff9b059851515b6222203624c8aa44b1bd73826 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

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

@@ -1,4 +1,4 @@
-From bc747b229be5a26b7dbb271ab1059394265750bf Mon Sep 17 00:00:00 2001
+From 240543e6e7c364a4513e4cd4ca8d2711c5d0f97d 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 18cabc4f3..797f794de 100644
+index 8c8bc4c86..b2fa32e41 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -198,4 +198,10 @@ public class PaperConfig {
+@@ -203,4 +203,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
      }

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

@@ -1,4 +1,4 @@
-From 16847be93e8fcf69a05f8edf10ca923825a126ca Mon Sep 17 00:00:00 2001
+From 989492b0a14f1acbcb387e31b74ed58829a2b496 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Chunk Save Reattempt
 We commonly have "Stream Closed" errors on chunk saving, so this code should re-try to save the chunk in the event of failure and hopefully prevent rollbacks.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index b189ee4..192705f 100644
+index 7f3e874ba..310ab96ab 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -182,11 +182,16 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -28,7 +28,7 @@ index b189ee4..192705f 100644
                  synchronized (lock) { if (this.b.get(chunkcoordintpair) == nbttagcompound) { this.b.remove(chunkcoordintpair); } }// Paper - This will not equal if a newer version is still pending
  
 diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
-index be13c11..9cfc46b 100644
+index be13c1131..9cfc46bc2 100644
 --- a/src/main/java/net/minecraft/server/RegionFile.java
 +++ b/src/main/java/net/minecraft/server/RegionFile.java
 @@ -249,8 +249,7 @@ public class RegionFile {
@@ -42,5 +42,5 @@ index be13c11..9cfc46b 100644
  
      }
 -- 
-2.9.3
+2.12.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From c46e7e9b82220d05b4b3a3e8c33c1aaef69210fd Mon Sep 17 00:00:00 2001
+From d0e62de0df3e3803b64a74b42fdc74c54e608793 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 797f794de..7f02ac219 100644
+index b2fa32e41..078e0d989 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -204,4 +204,9 @@ public class PaperConfig {
+@@ -209,4 +209,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");
      }

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

@@ -1,4 +1,4 @@
-From 49c23225c5302e693fdcbd6b3d139d75b0cf4509 Mon Sep 17 00:00:00 2001
+From 1fc605c65c74fb9aff47a23174518c1492b73496 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 e2afd9d..4009123 100644
+index e2afd9d93..40091231e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1823,4 +1823,21 @@ public final class CraftServer implements Server {
@@ -32,5 +32,5 @@ index e2afd9d..4009123 100644
 +    // Paper end
  }
 -- 
-2.9.3
+2.12.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From b84844e83f6e3e64ff5e9120560d52e0d01e80bb Mon Sep 17 00:00:00 2001
+From 18e4daa1e2ed77af8da88506c84d13f813eeebd2 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 4009123..540d578 100644
+index 40091231e..540d57855 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 4009123..540d578 100644
          commandMap.clearCommands();
          resetRecipes();
 -- 
-2.9.3
+2.12.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From 95eb6bb990200c2bf1bdf929443034e3ab460f9c Mon Sep 17 00:00:00 2001
+From 8995c864c37aa0d3ea38ec7ea12313130b8f7dae 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

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

@@ -1,4 +1,4 @@
-From e49637befcf851f200423f0349d749abe8ffe950 Mon Sep 17 00:00:00 2001
+From 57b6cb61523faf718c89c3ae42d5d0d6050c9d74 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

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

@@ -1,4 +1,4 @@
-From 833390e11f3e2fe2e7d751e14e41fd1b335f0d69 Mon Sep 17 00:00:00 2001
+From e8614aaf18b456255a31f0baa78651f6ad2b61ac 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
@@ -18,7 +18,7 @@ For consistency, the old API methods now forward to use the
 ItemMeta API equivalents, and should deprecate the old API's.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 6adbbd4..bd3dc02 100644
+index a54bc7c42..81ec8f69e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -4,6 +4,7 @@ import static org.bukkit.craftbukkit.inventory.CraftMetaItem.ENCHANTMENTS;
@@ -144,7 +144,7 @@ index 6adbbd4..bd3dc02 100644
  
      static Map<Enchantment, Integer> getEnchantments(net.minecraft.server.ItemStack item) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index ec56806..9e7f9c6 100644
+index ec5680633..9e7f9c661 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -6,13 +6,8 @@ import java.lang.annotation.RetentionPolicy;
@@ -294,5 +294,5 @@ index ec56806..9e7f9c6 100644
      private final Spigot spigot = new Spigot()
      {
 -- 
-2.9.3
+2.12.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From 0f7207a38a3d9ac2b2c0a62696792a6c35256cc1 Mon Sep 17 00:00:00 2001
+From 9b1484edac9a42041e0eab60eb6f5e63ec64ccb7 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

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

@@ -1,4 +1,4 @@
-From cc7e1be187d727327679ca18327de968873e14cf Mon Sep 17 00:00:00 2001
+From b37013963c8a497b39c9ed4362ce585f8c9e6602 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 20:16:03 -0400
 Subject: [PATCH] Add World Util Methods
@@ -6,7 +6,7 @@ Subject: [PATCH] Add World Util Methods
 Methods that can be used for other patches to help improve logic.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index ceb0d71..e0e563c 100644
+index cc7369e52..1d2d174e8 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -152,6 +152,12 @@ public abstract class World implements IBlockAccess {
@@ -93,5 +93,5 @@ index ceb0d71..e0e563c 100644
          // CraftBukkit start - tree generation
          if (captureTreeGeneration) {
 -- 
-2.9.3
+2.12.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From 2c91ef56fe5b0b2247685411e0c557e7c9166f16 Mon Sep 17 00:00:00 2001
+From e34af1873ee3abd9f4754ab2eb52dee6dede22b2 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
@@ -8,7 +8,7 @@ Use an optimized method to test if a block position meets a desired light level.
 This method benefits from returning as soon as the desired light level matches.
 
 diff --git a/src/main/java/net/minecraft/server/BlockCrops.java b/src/main/java/net/minecraft/server/BlockCrops.java
-index e9c5d14..9015aff 100644
+index e9c5d1465..9015affc5 100644
 --- a/src/main/java/net/minecraft/server/BlockCrops.java
 +++ b/src/main/java/net/minecraft/server/BlockCrops.java
 @@ -48,7 +48,7 @@ public class BlockCrops extends BlockPlant implements IBlockFragilePlantElement
@@ -21,7 +21,7 @@ index e9c5d14..9015aff 100644
  
              if (i < this.g()) {
 diff --git a/src/main/java/net/minecraft/server/BlockGrass.java b/src/main/java/net/minecraft/server/BlockGrass.java
-index fb1bf80..8b43e60 100644
+index fb1bf80b8..8b43e6070 100644
 --- a/src/main/java/net/minecraft/server/BlockGrass.java
 +++ b/src/main/java/net/minecraft/server/BlockGrass.java
 @@ -29,7 +29,8 @@ public class BlockGrass extends Block implements IBlockFragilePlantElement {
@@ -65,7 +65,7 @@ index fb1bf80..8b43e60 100644
                              // world.setTypeUpdate(blockposition1, Blocks.GRASS.getBlockData());
                              org.bukkit.World bworld = world.getWorld();
 diff --git a/src/main/java/net/minecraft/server/BlockSapling.java b/src/main/java/net/minecraft/server/BlockSapling.java
-index f463b71..89458cd 100644
+index f463b7113..89458cd77 100644
 --- a/src/main/java/net/minecraft/server/BlockSapling.java
 +++ b/src/main/java/net/minecraft/server/BlockSapling.java
 @@ -34,7 +34,7 @@ public class BlockSapling extends BlockPlant implements IBlockFragilePlantElemen
@@ -78,7 +78,7 @@ index f463b71..89458cd 100644
                  world.captureTreeGeneration = true;
                  // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/BlockStem.java b/src/main/java/net/minecraft/server/BlockStem.java
-index c74b628..bb96e16 100644
+index c74b6284f..bb96e164e 100644
 --- a/src/main/java/net/minecraft/server/BlockStem.java
 +++ b/src/main/java/net/minecraft/server/BlockStem.java
 @@ -48,7 +48,7 @@ public class BlockStem extends BlockPlant implements IBlockFragilePlantElement {
@@ -91,7 +91,7 @@ index c74b628..bb96e16 100644
  
              if (random.nextInt((int) ((100.0F / (this == Blocks.PUMPKIN_STEM ? world.spigotConfig.pumpkinModifier : world.spigotConfig.melonModifier)) * (25.0F / f)) + 1) == 0) { // Spigot
 diff --git a/src/main/java/net/minecraft/server/EntityMonster.java b/src/main/java/net/minecraft/server/EntityMonster.java
-index 3ee5213..59d8bb6 100644
+index 3ee52139c..59d8bb6e7 100644
 --- a/src/main/java/net/minecraft/server/EntityMonster.java
 +++ b/src/main/java/net/minecraft/server/EntityMonster.java
 @@ -118,17 +118,17 @@ public abstract class EntityMonster extends EntityCreature implements IMonster {
@@ -118,7 +118,7 @@ index 3ee5213..59d8bb6 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 897882c..970fabf 100644
+index 897882c97..970fabf71 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -178,7 +178,7 @@ public class EntityZombie extends EntityMonster {
@@ -131,5 +131,5 @@ index 897882c..970fabf 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.9.3
+2.12.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From 6b5bbe53cb6015924619ad76fb68c59ac1d3a14d Mon Sep 17 00:00:00 2001
+From 6d7410d5cc715f3a78d2cae58868fdc4dc22c856 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Pass world to Village creation
 fixes NPE bug #95
 
 diff --git a/src/main/java/net/minecraft/server/PersistentVillage.java b/src/main/java/net/minecraft/server/PersistentVillage.java
-index a5b79ec..01f7cee 100644
+index a5b79ecad..01f7cee38 100644
 --- a/src/main/java/net/minecraft/server/PersistentVillage.java
 +++ b/src/main/java/net/minecraft/server/PersistentVillage.java
 @@ -238,7 +238,7 @@ public class PersistentVillage extends PersistentBase {
@@ -19,7 +19,7 @@ index a5b79ec..01f7cee 100644
              village.a(nbttagcompound1);
              this.villages.add(village);
 diff --git a/src/main/java/net/minecraft/server/Village.java b/src/main/java/net/minecraft/server/Village.java
-index 2ab381d..817c836 100644
+index 2ab381d50..817c836c3 100644
 --- a/src/main/java/net/minecraft/server/Village.java
 +++ b/src/main/java/net/minecraft/server/Village.java
 @@ -24,7 +24,7 @@ public class Village {
@@ -32,5 +32,5 @@ index 2ab381d..817c836 100644
          this.d = BlockPosition.ZERO;
          this.j = Maps.newHashMap();
 -- 
-2.9.3
+2.12.0.windows.1
 

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

@@ -1,11 +1,11 @@
-From 0cff8c26c45dac3c873b16c4b6aea730439d8c7a Mon Sep 17 00:00:00 2001
+From 7679dde826a395940efcd10cb8042a2d91dd0c5b 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 193dadf..ee177b2 100644
+index 247224117..9cb3b22fb 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2323,12 +2323,13 @@ public abstract class EntityLiving extends Entity {
@@ -46,5 +46,5 @@ index 193dadf..ee177b2 100644
  
      }
 -- 
-2.9.3
+2.12.0.windows.1
 

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

@@ -1,14 +1,14 @@
-From 22251c19e0a10fa2073fa1e2d3c9e7641c652396 Mon Sep 17 00:00:00 2001
+From 62f9ecf769955dd17317af05db2280aa386940e0 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 7f02ac219..0b4468726 100644
+index 078e0d989..a48f5cb51 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 {
+@@ -214,4 +214,9 @@ public class PaperConfig {
      private static void loadPermsBeforePlugins() {
          loadPermsBeforePlugins = getBoolean("settings.load-permissions-yml-before-plugins", true);
      }

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

@@ -1,4 +1,4 @@
-From e1edb49d9f186def10618afca0b8135bb2c4d326 Mon Sep 17 00:00:00 2001
+From 9eb7dd5d37830bc084265340fc125b0a8059e964 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

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

@@ -1,4 +1,4 @@
-From 62f5ab3a1a75ae8550464511ccc3ed520443c92b Mon Sep 17 00:00:00 2001
+From 32f6c5a12798ed212df901f65912a56b2ef70811 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.11.0.windows.3
+2.12.0.windows.1
 

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

@@ -1,11 +1,11 @@
-From d29f3b17dee0a6d823ebfc0debd4aaff105a339d Mon Sep 17 00:00:00 2001
+From f7c86c61f7ef38864a71ab0a671930550953dbc3 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 21 Mar 2016 00:19:18 -0500
 Subject: [PATCH] Support offline mode in whitelist command as well
 
 
 diff --git a/src/main/java/net/minecraft/server/CommandWhitelist.java b/src/main/java/net/minecraft/server/CommandWhitelist.java
-index c74d1d2..0f4237d 100644
+index c74d1d2be..0f4237db1 100644
 --- a/src/main/java/net/minecraft/server/CommandWhitelist.java
 +++ b/src/main/java/net/minecraft/server/CommandWhitelist.java
 @@ -44,24 +44,35 @@ public class CommandWhitelist extends CommandAbstract {
@@ -89,5 +89,5 @@ index c74d1d2..0f4237d 100644
 +    // Paper end
  }
 -- 
-2.9.3
+2.12.0.windows.1
 

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

@@ -1,11 +1,11 @@
-From d3bda3ae7d53809fd81ce89d15389679d8ecc6f4 Mon Sep 17 00:00:00 2001
+From 0b5537a8783083de5b42792af5f37352f2ef9d06 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Jan 2016 21:48:24 -0500
 Subject: [PATCH] Fix SkullCache case bug
 
 
 diff --git a/src/main/java/net/minecraft/server/TileEntitySkull.java b/src/main/java/net/minecraft/server/TileEntitySkull.java
-index 91ca4a2..edd6fb6 100644
+index 91ca4a279..edd6fb69e 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySkull.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySkull.java
 @@ -191,7 +191,7 @@ public class TileEntitySkull extends TileEntity implements ITickable {
@@ -18,5 +18,5 @@ index 91ca4a2..edd6fb6 100644
                      callback.apply(profile);
                  } else {
 -- 
-2.9.3
+2.12.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From c672f11a21481edf3e49ef4c09cf3b402350b29f Mon Sep 17 00:00:00 2001
+From a6d01124186c189889cb98a3f25cde842fe6eaeb 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Waving banner workaround
 This patch is a workaround for MC-63720
 
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java b/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java
-index c5c3f40..6413f76 100644
+index c5c3f40ce..6413f76e7 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java
 @@ -4,7 +4,13 @@ import java.io.IOException;
@@ -34,5 +34,5 @@ index c5c3f40..6413f76 100644
  
      public void a(PacketDataSerializer packetdataserializer) throws IOException {
 -- 
-2.9.3
+2.12.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From 519f8952226e95dde8e2083bb16103c81e35e4bc Mon Sep 17 00:00:00 2001
+From e2c35037b839ec84fb38debdbbc5437c66ec9f30 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 22 Mar 2016 00:33:47 -0400
 Subject: [PATCH] Use a Shared Random for Entities
@@ -6,7 +6,7 @@ Subject: [PATCH] Use a Shared Random for Entities
 Reduces memory usage and provides ensures more randomness, Especially since a lot of garbage entity objects get created.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 453efd4..64b682e 100644
+index be54c807b..42bd79b10 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -46,6 +46,7 @@ public abstract class Entity implements ICommandListener {
@@ -27,5 +27,5 @@ index 453efd4..64b682e 100644
          this.justCreated = true;
          this.uniqueID = MathHelper.a(this.random);
 -- 
-2.9.3
+2.12.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From a267b336205e376738ec0237266113100ab3a981 Mon Sep 17 00:00:00 2001
+From ab781f7781960c84d0caf220d208f3c514dc91f2 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

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

@@ -1,4 +1,4 @@
-From 840d96d545551835d72adbdf512de70cf5a22b00 Mon Sep 17 00:00:00 2001
+From 1def4d8dd01ad67f472db739eb8b2d917c54b5f6 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
@@ -9,7 +9,7 @@ getChunkAt is called for the same chunk multiple times in a row, often from getT
 Optimize this look up by using a Last Access cache.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 54ca738..902f9ac 100644
+index b0a82e7ed..a7e8a3f7d 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -27,7 +27,27 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -42,5 +42,5 @@ index 54ca738..902f9ac 100644
  
      public ChunkProviderServer(WorldServer worldserver, IChunkLoader ichunkloader, ChunkGenerator chunkgenerator) {
 -- 
-2.9.3
+2.12.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From ebd168135f9e0b79d5718dbacb5021290c813218 Mon Sep 17 00:00:00 2001
+From 03d2a8cac0d4d45cf78e5f81039fe2f56dac91d5 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

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

@@ -1,4 +1,4 @@
-From 4d9763586eab9522a87d6e37e6411695212ce774 Mon Sep 17 00:00:00 2001
+From 2e211c0f0a5dbcf8ac99fdf6eb4368dcae14c4f1 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

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

@@ -1,11 +1,11 @@
-From e78b091f4fbf7ba12b78cb0bde720c17554d5578 Mon Sep 17 00:00:00 2001
+From 808ddbb267bcde272fc8297a6bbc153e64836a95 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Tue, 1 Mar 2016 04:32:08 -0500
 Subject: [PATCH] Fix cooked fish legacy import
 
 
 diff --git a/src/main/java/net/minecraft/server/DataConverterMaterialId.java b/src/main/java/net/minecraft/server/DataConverterMaterialId.java
-index 87b82eb..a7c71f4 100644
+index 87b82eb35..a7c71f406 100644
 --- a/src/main/java/net/minecraft/server/DataConverterMaterialId.java
 +++ b/src/main/java/net/minecraft/server/DataConverterMaterialId.java
 @@ -261,7 +261,7 @@ public class DataConverterMaterialId implements IDataConverter {
@@ -18,5 +18,5 @@ index 87b82eb..a7c71f4 100644
          DataConverterMaterialId.a[352] = "minecraft:bone";
          DataConverterMaterialId.a[353] = "minecraft:sugar";
 -- 
-2.9.3
+2.12.0.windows.1
 

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

@@ -1,11 +1,11 @@
-From e2b0e859ad84a39b58e2b1299ffdd07896afde1e Mon Sep 17 00:00:00 2001
+From 5e5214b56e304a9e26c3d5ce2c106e1fe3f2ac5b Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 20 Mar 2016 06:45:01 -0400
 Subject: [PATCH] Access items by EquipmentSlot
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
-index d8c5364..120ec89 100644
+index d8c5364df..120ec897f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
 @@ -271,4 +271,54 @@ public class CraftInventoryPlayer extends CraftInventory implements org.bukkit.i
@@ -64,5 +64,5 @@ index d8c5364..120ec89 100644
 +    // Paper end
  }
 -- 
-2.9.3
+2.12.0.windows.1
 

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

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

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

@@ -1,4 +1,4 @@
-From 493bc62d5f87dc0fe5cbab3abe12a769733aaf4f Mon Sep 17 00:00:00 2001
+From 230889bd4f8eb5a76b29db21486a2d8bcf90ab86 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

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

@@ -1,11 +1,11 @@
-From eba67cd7c25447448c3fbeb37fc5a899108a23c4 Mon Sep 17 00:00:00 2001
+From 5ceed1d40f66d17831eafab8011bd93a78305a84 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 48cd4c39..ffa0d18b 100644
+index 8cbdbda92..f86c64cb2 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1182,6 +1182,7 @@ public abstract class World implements IBlockAccess {

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

@@ -1,4 +1,4 @@
-From 84cc380bde2c514ea83de852c8086d4da03a5c2d Mon Sep 17 00:00:00 2001
+From 0ea1c20ebdf134e47efb6aceb915590929ed4b9d 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

Spigot-Server-Patches/0098-EntityPathfindEvent.patch

@@ -1,4 +1,4 @@
-From 3dc7b052ab904452c72af7ec8494566f09c289dc Mon Sep 17 00:00:00 2001
+From ed3b89ad69c48ebe4ee51a704b10e3f5ac4b17f9 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 21:22:26 -0400
 Subject: [PATCH] EntityPathfindEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] EntityPathfindEvent
 Fires when an Entity decides to start moving to a location.
 
 diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
-index 43b2be5..c0ef240 100644
+index 43b2be505..c0ef2400b 100644
 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java
 +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
 @@ -4,7 +4,7 @@ import javax.annotation.Nullable;
@@ -35,5 +35,5 @@ index 43b2be5..c0ef240 100644
                  float f = this.h();
  
 -- 
-2.9.3
+2.12.0.windows.1
 

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

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

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

@@ -1,11 +1,11 @@
-From dc00f1adf650e8c591f1c67718fb12cabcf1d18b Mon Sep 17 00:00:00 2001
+From 37db8b5f7d7fc19b87d5bc444491d60d1197aa0c Mon Sep 17 00:00:00 2001
 From: Antony Riley <antony@cyberiantiger.org>
 Date: Tue, 29 Mar 2016 06:56:23 +0300
 Subject: [PATCH] Reduce IO ops opening a new region file.
 
 
 diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
-index 9cfc46b..637e5ba 100644
+index 9cfc46bc2..637e5baaf 100644
 --- a/src/main/java/net/minecraft/server/RegionFile.java
 +++ b/src/main/java/net/minecraft/server/RegionFile.java
 @@ -8,9 +8,12 @@ import java.io.ByteArrayInputStream;
@@ -49,5 +49,5 @@ index 9cfc46b..637e5ba 100644
              }
          } catch (IOException ioexception) {
 -- 
-2.9.3
+2.12.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From cf6994bcd2c15ead93ab8949c558846e981e0da1 Mon Sep 17 00:00:00 2001
+From 1c1d94fb02737c1c35d720dd430bfb0b04050f7c 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 0b4468726..ab796a959 100644
+index a48f5cb51..6b694705b 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 {
+@@ -219,4 +219,9 @@ public class PaperConfig {
      private static void healthDeath() {
          setHealthBeforeDeathEvent = getBoolean("settings.set-health-before-death-event", false);
      }

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

@@ -1,4 +1,4 @@
-From e0d27bb673eb6aad7eecf10e54b49c097b42e4e2 Mon Sep 17 00:00:00 2001
+From 5f32bddc3d9678ab8844312b8773a3e108110851 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
@@ -13,7 +13,7 @@ These collections are super fast as seen
 http://java-performance.info/hashmap-overview-jdk-fastutil-goldman-sachs-hppc-koloboke-trove-january-2015/
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 902f9ac..a57bcaf 100644
+index a7e8a3f7d..54b454fe3 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -24,7 +24,7 @@ import org.bukkit.event.world.ChunkUnloadEvent;
@@ -26,7 +26,7 @@ index 902f9ac..a57bcaf 100644
      private final IChunkLoader chunkLoader;
      // Paper start
 diff --git a/src/main/java/net/minecraft/server/DataWatcher.java b/src/main/java/net/minecraft/server/DataWatcher.java
-index 419add5..820c152 100644
+index 419add5db..820c15278 100644
 --- a/src/main/java/net/minecraft/server/DataWatcher.java
 +++ b/src/main/java/net/minecraft/server/DataWatcher.java
 @@ -12,6 +12,7 @@ import java.util.Map;
@@ -47,5 +47,5 @@ index 419add5..820c152 100644
      private boolean f = true;
      private boolean g;
 -- 
-2.9.3
+2.12.0.windows.1
 

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

@@ -1,4 +1,4 @@
-From 82823ca3b1570c84492d9d40efaec6e7c18487b1 Mon Sep 17 00:00:00 2001
+From 82762171170f5fa2efc679e390f59413dc496e7e 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 654f2ae..2d5f3d2 100644
+index f86c64cb2..7e6459654 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 654f2ae..2d5f3d2 100644
                  Chunk chunk = this.getChunkAtWorldCoords(blockposition);
  
 -- 
-2.9.3
+2.12.0.windows.1