Update upstream B/CB/S

2018-01-10 23:31:19 -06:00 · 2018-01-10 23:31:19 -06:00 · d8c81d20d8
parent e32efa9a5a
commit d8c81d20d8
260 changed files with 1026 additions and 1070 deletions
--- a/Spigot-Server-Patches/0003-MC-Dev-fixes.patch
+++ b/Spigot-Server-Patches/0003-MC-Dev-fixes.patch
@ -1,4 +1,4 @@
-From b9b1f576225aa45f5638304a76b5764f5c4c85f5 Mon Sep 17 00:00:00 2001
+From de28e5dbfe736bdec1a553e02b88ee1e682de92a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 30 Mar 2016 19:36:20 -0400
 Subject: [PATCH] MC Dev fixes
@ -30,19 +30,6 @@ index 62a9c92f..1b759976 100644
     }
 
     @Nullable
-diff --git a/src/main/java/net/minecraft/server/BlockStateEnum.java b/src/main/java/net/minecraft/server/BlockStateEnum.java
-index 71524f2c..288c52c5 100644
--- a/src/main/java/net/minecraft/server/BlockStateEnum.java
-+++ b/src/main/java/net/minecraft/server/BlockStateEnum.java
-@@ -29,7 +29,7 @@ public class BlockStateEnum<T extends Enum<T> & INamable> extends BlockState<T>
-                 throw new IllegalArgumentException("Multiple values have the same name \'" + s1 + "\'");
-             }
- 
-            this.b.put(s1, oenum);
-+            this.b.put(s1, (T) oenum);
-         }
- 
-     }
 diff --git a/src/main/java/net/minecraft/server/CommandAbstract.java b/src/main/java/net/minecraft/server/CommandAbstract.java
 index 76bf04f5..a99d0f87 100644
 --- a/src/main/java/net/minecraft/server/CommandAbstract.java
@ -141,5 +128,5 @@ index f5bcbdbe..3190cadf 100644
         for (ZipEntry clazzEntry; (clazzEntry = nmsZipStream.getNextEntry()) != null; ) {
             final String entryName = clazzEntry.getName();
 -- 
-2.14.2.windows.2
+2.14.3

--- a/Spigot-Server-Patches/0006-Timings-v2.patch
+++ b/Spigot-Server-Patches/0006-Timings-v2.patch
@ -1,4 +1,4 @@
-From 8e28c20dbf59bb8d63c126f63d7ecd46298f9b0b Mon Sep 17 00:00:00 2001
+From 274261a0b59be13d67b3034b87f563f7e5751f58 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
@ -706,7 +706,7 @@ index ee2d1f9a..e8401bba 100644
     }
 
 diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java
-index 284d1204..3aab5420 100644
+index ce012402..a60f9460 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 {
@ -1062,7 +1062,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 c00aee88..b3356b40 100644
+index 588e9bd8..784d6b62 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -1,5 +1,6 @@
@ -1072,7 +1072,7 @@ index c00aee88..b3356b40 100644
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
-@@ -1203,10 +1204,11 @@ public abstract class PlayerList {
+@@ -1205,10 +1206,11 @@ public abstract class PlayerList {
     }
 
     public void savePlayers() {
@ -1388,7 +1388,7 @@ index d4f25cbf..e492913a 100644
 
     // CraftBukkit start
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b2bbccb5..7e1df932 100644
+index 14851a3a..9042deed 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1756,12 +1756,31 @@ public final class CraftServer implements Server {
@ -1648,7 +1648,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 328a81dc..f387b623 100644
+index e12e45e0..dfb5731c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -41,7 +41,7 @@ import org.bukkit.configuration.serialization.DelegateDeserialization;
@ -1906,5 +1906,5 @@ index 2bd690fd..38be7ed7 100644
     }
 }
 -- 
-2.15.1.windows.2
+2.14.3

--- a/Spigot-Server-Patches/0007-Configurable-cactus-and-reed-natural-growth-heights.patch
+++ b/Spigot-Server-Patches/0007-Configurable-cactus-and-reed-natural-growth-heights.patch
@ -1,21 +1,21 @@
-From 2df13908f2a9a16aedcfb2d7c56fa578181ffb97 Mon Sep 17 00:00:00 2001
+From 7861a759da2fec72229a685817cd2e0efdf916cb 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


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index f24839378..6228bc1f6 100644
+index 621bf705..4a692ac1 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -71,4 +71,13 @@ public class PaperWorldConfig {
-         squidMaxSpawnHeight = getDouble("squid-spawn-height.maximum", 63.0D);
-         log("Squids will spawn between Y: " + squidMinSpawnHeight + " and Y: " + squidMaxSpawnHeight);
+@@ -63,4 +63,13 @@ public class PaperWorldConfig {
+         config.addDefault("world-settings.default." + path, def);
+         return config.getString("world-settings." + worldName + "." + path, config.getString("world-settings.default." + path));
     }
 +
 +    public int cactusMaxHeight;
 +    public int reedMaxHeight;
-+    private void blowGrowthHeight() {
+    private void blockGrowthHeight() {
 +        cactusMaxHeight = getInt("max-growth-height.cactus", 3);
 +        reedMaxHeight = getInt("max-growth-height.reeds", 3);
 +        log("Max height for cactus growth " + cactusMaxHeight + ". Max height for reed growth " + reedMaxHeight);
@ -23,7 +23,7 @@ index f24839378..6228bc1f6 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/BlockCactus.java b/src/main/java/net/minecraft/server/BlockCactus.java
-index 3f579fbdb..a69a707aa 100644
+index 64b7d08f..d8fb87f7 100644
 --- a/src/main/java/net/minecraft/server/BlockCactus.java
 +++ b/src/main/java/net/minecraft/server/BlockCactus.java
@@ -28,7 +28,7 @@ public class BlockCactus extends Block {
@ -36,7 +36,7 @@ index 3f579fbdb..a69a707aa 100644
 
                 if (j >= (byte) range(3, ((100.0F / world.spigotConfig.cactusModifier) * 15) + 0.5F, 15)) { // Spigot
 diff --git a/src/main/java/net/minecraft/server/BlockReed.java b/src/main/java/net/minecraft/server/BlockReed.java
-index 84014b1c7..9d1af2adc 100644
+index 57f24f55..d19dce83 100644
 --- a/src/main/java/net/minecraft/server/BlockReed.java
 +++ b/src/main/java/net/minecraft/server/BlockReed.java
@@ -28,7 +28,7 @@ public class BlockReed extends Block {
@ -49,5 +49,5 @@ index 84014b1c7..9d1af2adc 100644
 
                     if (j >= (byte) range(3, ((100.0F / world.spigotConfig.caneModifier) * 15) + 0.5F, 15)) { // Spigot
 -- 
-2.12.0.windows.1
+2.14.3

--- a/Spigot-Server-Patches/0007-Configurable-squid-spawn-ranges.patch
+++ b/Spigot-Server-Patches/0007-Configurable-squid-spawn-ranges.patch
@ -1,39 +0,0 @@
-From fbea6e7aa23f4b7e63d3ad5671c1bc18a1e4189d 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
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 621bf7051..f24839378 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -63,4 +63,12 @@ public class PaperWorldConfig {
-         config.addDefault("world-settings.default." + path, def);
-         return config.getString("world-settings." + worldName + "." + path, config.getString("world-settings.default." + path));
-     }
-+
-+    public double squidMinSpawnHeight;
-+    public double squidMaxSpawnHeight;
-+    private void squidSpawnHeights() {
-+        squidMinSpawnHeight = getDouble("squid-spawn-height.minimum", 45.0D);
-+        squidMaxSpawnHeight = getDouble("squid-spawn-height.maximum", 63.0D);
-+        log("Squids will spawn between Y: " + squidMinSpawnHeight + " and Y: " + squidMaxSpawnHeight);
-+    }
- }
-diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java
-index 20b71b455..ee8e50706 100644
--- a/src/main/java/net/minecraft/server/EntitySquid.java
-+++ b/src/main/java/net/minecraft/server/EntitySquid.java
-@@ -141,7 +141,7 @@ public class EntitySquid extends EntityWaterAnimal {
-     }
- 
-     public boolean P() {
-        return this.locY > 45.0D && this.locY < (double) this.world.getSeaLevel() && super.P();
-+        return this.locY > world.paperConfig.squidMinSpawnHeight && this.locY < world.paperConfig.squidMaxSpawnHeight && super.P(); // Paper - Configurable squid spawn height range
-     }
- 
-     public void b(float f, float f1, float f2) {
-- 
-2.13.0
-
--- a/Spigot-Server-Patches/0008-Configurable-baby-zombie-movement-speed.patch
+++ b/Spigot-Server-Patches/0008-Configurable-baby-zombie-movement-speed.patch
@ -1,14 +1,14 @@
-From 729eb0ea88be715b9a00822f01f963c86361ecd0 Mon Sep 17 00:00:00 2001
+From 44b326120889fe804c445ea78a23b9e5dfa5b050 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


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 6228bc1f6..fe9e7b342 100644
+index 4a692ac1..d44cacc7 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -80,4 +80,10 @@ public class PaperWorldConfig {
+@@ -72,4 +72,10 @@ public class PaperWorldConfig {
         log("Max height for cactus growth " + cactusMaxHeight + ". Max height for reed growth " + reedMaxHeight);
 
     }
@ -20,7 +20,7 @@ index 6228bc1f6..fe9e7b342 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 36afc8f07..bf059a746 100644
+index 11c0f24f..277f1414 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
@@ -16,7 +16,7 @@ public class EntityZombie extends EntityMonster {
@ -45,5 +45,5 @@ index 36afc8f07..bf059a746 100644
         }
 
 -- 
-2.13.0
+2.14.3

--- a/Spigot-Server-Patches/0009-Configurable-fishing-time-ranges.patch
+++ b/Spigot-Server-Patches/0009-Configurable-fishing-time-ranges.patch
@ -1,14 +1,14 @@
-From 16212de7e01256c4ac01f0e1fab71bcee9e1c7e8 Mon Sep 17 00:00:00 2001
+From 9980c5d3448b67ab839e76f49a17c970d55c23ff 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


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index fe9e7b342..22999f0d2 100644
+index d44cacc7..45bddf3f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -86,4 +86,12 @@ public class PaperWorldConfig {
+@@ -78,4 +78,12 @@ public class PaperWorldConfig {
         babyZombieMovementSpeed = getDouble("baby-zombie-movement-speed", 0.5D); // Player moves at 0.1F, for reference
         log("Baby zombies will move at the speed of " + babyZombieMovementSpeed);
     }
@ -22,7 +22,7 @@ index fe9e7b342..22999f0d2 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
-index 472f36774..0c528c699 100644
+index b4d3bcb4..339d1f1b 100644
 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
@@ -381,7 +381,7 @@ public class EntityFishingHook extends Entity {
@ -35,5 +35,5 @@ index 472f36774..0c528c699 100644
             }
         }
 -- 
-2.12.0.windows.1
+2.14.3

--- a/Spigot-Server-Patches/0010-Allow-nerfed-mobs-to-jump.patch
+++ b/Spigot-Server-Patches/0010-Allow-nerfed-mobs-to-jump.patch
@ -1,14 +1,14 @@
-From 65725cb96944989051fc5bf381b31cff4967682b Mon Sep 17 00:00:00 2001
+From 9c02dc7968f42b1d0a021055f6d72c5d074eeb48 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


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 22999f0d2..5f13fbff3 100644
+index 45bddf3f..1d9dd0e0 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -94,4 +94,9 @@ public class PaperWorldConfig {
+@@ -86,4 +86,9 @@ public class PaperWorldConfig {
         fishingMaxTicks = getInt("fishing-time-range.MaximumTicks", 600);
         log("Fishing time ranges are between " + fishingMinTicks +" and " + fishingMaxTicks + " ticks");
     }
@ -19,7 +19,7 @@ index 22999f0d2..5f13fbff3 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/ControllerJump.java b/src/main/java/net/minecraft/server/ControllerJump.java
-index 4f2fa59ac..8af52a61f 100644
+index 4f2fa59a..8af52a61 100644
 --- a/src/main/java/net/minecraft/server/ControllerJump.java
 +++ b/src/main/java/net/minecraft/server/ControllerJump.java
@@ -13,6 +13,7 @@ public class ControllerJump {
@ -31,7 +31,7 @@ index 4f2fa59ac..8af52a61f 100644
         this.b.l(this.a);
         this.a = false;
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 3c48d9463..7b02b253c 100644
+index 3c48d946..7b02b253 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -46,6 +46,7 @@ public abstract class EntityInsentient extends EntityLiving {
@ -56,7 +56,7 @@ index 3c48d9463..7b02b253c 100644
         }
         // Spigot End
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalFloat.java b/src/main/java/net/minecraft/server/PathfinderGoalFloat.java
-index b3b303b3b..fc6c3bf71 100644
+index b3b303b3..fc6c3bf7 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalFloat.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalFloat.java
@@ -6,6 +6,7 @@ public class PathfinderGoalFloat extends PathfinderGoal {
--- a/Spigot-Server-Patches/0011-Add-configurable-despawn-distances-for-living-entiti.patch
+++ b/Spigot-Server-Patches/0011-Add-configurable-despawn-distances-for-living-entiti.patch
@ -1,14 +1,14 @@
-From dca2ae19f2d3a3f260e74471a5a53d7a9b019b67 Mon Sep 17 00:00:00 2001
+From 2f9986be69c453815c9f2a218ceec0adaca29119 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


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 5f13fbff3..4b64ccaa0 100644
+index 1d9dd0e0..22c1113a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -99,4 +99,20 @@ public class PaperWorldConfig {
+@@ -91,4 +91,20 @@ public class PaperWorldConfig {
     private void nerfedMobsShouldJump() {
         nerfedMobsShouldJump = getBoolean("spawner-nerfed-mobs-should-jump", false);
     }
@ -30,7 +30,7 @@ index 5f13fbff3..4b64ccaa0 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 7b02b253c..94967e6b6 100644
+index 7b02b253..94967e6b 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -630,13 +630,13 @@ public abstract class EntityInsentient extends EntityLiving {
@ -51,5 +51,5 @@ index 7b02b253c..94967e6b6 100644
                 }
             }
 -- 
-2.13.3
+2.14.3

--- a/Spigot-Server-Patches/0012-Allow-for-toggling-of-spawn-chunks.patch
+++ b/Spigot-Server-Patches/0012-Allow-for-toggling-of-spawn-chunks.patch
@ -1,14 +1,14 @@
-From 95f35af2f0cbcd086e82db7f001ed34265d28217 Mon Sep 17 00:00:00 2001
+From 6f59e21ac8b3574bd3fe990f51b95928994cbf23 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


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 4b64ccaa0..7ac6a5f1f 100644
+index 22c1113a..0094d1a8 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -115,4 +115,10 @@ public class PaperWorldConfig {
+@@ -107,4 +107,10 @@ public class PaperWorldConfig {
         softDespawnDistance = softDespawnDistance*softDespawnDistance;
         hardDespawnDistance = hardDespawnDistance*hardDespawnDistance;
     }
@ -20,7 +20,7 @@ index 4b64ccaa0..7ac6a5f1f 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index f06b82ec5..5c44e0ed4 100644
+index d902e263..759964b0 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -202,6 +202,7 @@ public abstract class World implements IBlockAccess {
@ -32,5 +32,5 @@ index f06b82ec5..5c44e0ed4 100644
         this.tileLimiter = new org.spigotmc.TickLimiter(spigotConfig.tileMaxTickTime);
     }
 -- 
-2.13.3.windows.1
+2.14.3

--- a/Spigot-Server-Patches/0013-Drop-falling-block-and-tnt-entities-at-the-specified.patch
+++ b/Spigot-Server-Patches/0013-Drop-falling-block-and-tnt-entities-at-the-specified.patch
@ -1,14 +1,14 @@
-From ff154bbf35dc82b964857cdc0ae1a2ab09a5c05a Mon Sep 17 00:00:00 2001
+From 5327fcad175af329bb3166193bd03cea317db5c2 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


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 7ac6a5f1f..8cdeb34d4 100644
+index 0094d1a8..4da84671 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -121,4 +121,14 @@ public class PaperWorldConfig {
+@@ -113,4 +113,14 @@ public class PaperWorldConfig {
         keepSpawnInMemory = getBoolean("keep-spawn-loaded", true);
         log("Keep spawn chunk loaded: " + keepSpawnInMemory);
     }
@ -24,7 +24,7 @@ index 7ac6a5f1f..8cdeb34d4 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 4c794a098..90be49189 100644
+index 4c794a09..90be4918 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1751,6 +1751,7 @@ public abstract class Entity implements ICommandListener {
@ -36,7 +36,7 @@ index 4c794a098..90be49189 100644
     public EntityItem a(ItemStack itemstack, float f) {
         if (itemstack.isEmpty()) {
 diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-index 579e51a0a..2ba5d51a5 100644
+index 579e51a0..2ba5d51a 100644
 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
 +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
@@ -84,6 +84,17 @@ public class EntityFallingBlock extends Entity {
@ -58,7 +58,7 @@ index 579e51a0a..2ba5d51a5 100644
                 blockposition = new BlockPosition(this);
                 boolean flag = this.block.getBlock() == Blocks.dS;
 diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
-index 44b2d4735..0d70dd1d2 100644
+index 44b2d473..0d70dd1d 100644
 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
@@ -57,6 +57,13 @@ public class EntityTNTPrimed extends Entity {
--- a/Spigot-Server-Patches/0014-Configurable-speed-for-water-flowing-over-lava.patch
+++ b/Spigot-Server-Patches/0014-Configurable-speed-for-water-flowing-over-lava.patch
@ -1,14 +1,14 @@
-From 16b591982a8417b9f551dd06a73d25cdf82842e1 Mon Sep 17 00:00:00 2001
+From cb2a71023bfe9b8c9de796ca43cce768d2b4aa6a 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


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 8cdeb34d4..62e6830aa 100644
+index 4da84671..d3484489 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -131,4 +131,10 @@ public class PaperWorldConfig {
+@@ -123,4 +123,10 @@ public class PaperWorldConfig {
         if (fallingBlockHeightNerf != 0) log("Falling Block Height Limit set to Y: " + fallingBlockHeightNerf);
         if (entityTNTHeightNerf != 0) log("TNT Entity Height Limit set to Y: " + entityTNTHeightNerf);
     }
@ -20,7 +20,7 @@ index 8cdeb34d4..62e6830aa 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/BlockFlowing.java b/src/main/java/net/minecraft/server/BlockFlowing.java
-index c9294a58d..f4ac7bafa 100644
+index 7b74df5b..62234a7c 100644
 --- a/src/main/java/net/minecraft/server/BlockFlowing.java
 +++ b/src/main/java/net/minecraft/server/BlockFlowing.java
@@ -30,7 +30,7 @@ public class BlockFlowing extends BlockFluids {
@ -57,5 +57,5 @@ index c9294a58d..f4ac7bafa 100644
 +    }
 }
 -- 
-2.12.0.windows.1
+2.14.3

--- a/Spigot-Server-Patches/0015-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
+++ b/Spigot-Server-Patches/0015-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
@ -1,4 +1,4 @@
-From 17fe4583cab6632ee9ec76e92101474233148721 Mon Sep 17 00:00:00 2001
+From f1d0beef43c007994fc2f16ad9e5d7ab9d85d02b 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
@ -33,7 +33,7 @@ index 8d08b536..92d48025 100644
 
     public CrashReport b(CrashReport crashreport) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 7e1df932..d6fdc535 100644
+index 9042deed..33b40ffc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -136,7 +136,7 @@ import org.bukkit.event.server.TabCompleteEvent;
@ -93,5 +93,5 @@ index 94a3d423..3ed983cc 100644
                 log.log( Level.SEVERE, "------------------------------" );
                 //
 -- 
-2.15.1.windows.2
+2.14.3

--- a/Spigot-Server-Patches/0016-Player-affects-spawning-API.patch
+++ b/Spigot-Server-Patches/0016-Player-affects-spawning-API.patch
@ -1,11 +1,11 @@
-From 431256683eff92a78786d888c39861a814291811 Mon Sep 17 00:00:00 2001
+From 5ca9db8b97b3c8ed1997ede12c32121bf26b5175 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


 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index c374efd79..467c5bf1a 100644
+index c374efd7..467c5bf1 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -64,6 +64,7 @@ public abstract class EntityHuman extends EntityLiving {
@ -17,7 +17,7 @@ index c374efd79..467c5bf1a 100644
     // CraftBukkit start
     public boolean fauxSleeping;
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 94967e6b6..5ea9f3097 100644
+index 94967e6b..5ea9f309 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -624,7 +624,7 @@ public abstract class EntityInsentient extends EntityLiving {
@ -30,7 +30,7 @@ index 94967e6b6..5ea9f3097 100644
                 double d1 = entityhuman.locY - this.locY;
                 double d2 = entityhuman.locZ - this.locZ;
 diff --git a/src/main/java/net/minecraft/server/EntitySilverfish.java b/src/main/java/net/minecraft/server/EntitySilverfish.java
-index 50bca48bf..57552c522 100644
+index 50bca48b..57552c52 100644
 --- a/src/main/java/net/minecraft/server/EntitySilverfish.java
 +++ b/src/main/java/net/minecraft/server/EntitySilverfish.java
@@ -99,8 +99,7 @@ public class EntitySilverfish extends EntityMonster {
@ -44,7 +44,7 @@ index 50bca48bf..57552c522 100644
             return false;
         }
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index a599a043d..1c7c187c7 100644
+index a599a043..1c7c187c 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
@@ -52,7 +52,7 @@ public final class SpawnerCreature {
@ -57,7 +57,7 @@ index a599a043d..1c7c187c7 100644
 
                     j = MathHelper.floor(entityhuman.locZ / 16.0D);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 759964b0f..26d4bd690 100644
+index 759964b0..26d4bd69 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -2727,7 +2727,7 @@ public abstract class World implements IBlockAccess {
@ -70,7 +70,7 @@ index 759964b0f..26d4bd690 100644
 
                 if (d3 < 0.0D || d4 < d3 * d3) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index f387b623d..fa91ecbef 100644
+index dfb5731c..aec4f8aa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1542,6 +1542,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -91,5 +91,5 @@ index f387b623d..fa91ecbef 100644
 
     // Spigot start
 -- 
-2.15.1
+2.14.3

--- a/Spigot-Server-Patches/0017-Remove-invalid-mob-spawner-tile-entities.patch
+++ b/Spigot-Server-Patches/0017-Remove-invalid-mob-spawner-tile-entities.patch
@ -1,11 +1,11 @@
-From ae8b5ae151c33ea2fb2dbdda86cc8eb3922ccf47 Mon Sep 17 00:00:00 2001
+From c24578957f9f544e023cf837aceadd650feec34e 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 bd3b16025..1c0108ef1 100644
+index 350e0991..66c78083 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 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.2
+2.14.3

--- a/Spigot-Server-Patches/0018-Optimize-TileEntity-Ticking.patch
+++ b/Spigot-Server-Patches/0018-Optimize-TileEntity-Ticking.patch
@ -1,11 +1,11 @@
-From ca3dd164ec111c629ea4e92778c786d2d9a61ba2 Mon Sep 17 00:00:00 2001
+From dcf282ac28b3cca835ce72abf3f69cea9bf4e8ff 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 af8c2cfa8..3cf80495e 100644
+index 3b5af473..63130412 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 af8c2cfa8..3cf80495e 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 31585757b..1c1741c56 100644
+index 31585757..1c1741c5 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 31585757b..1c1741c56 100644
     }
 
 -- 
-2.13.0
+2.14.3

--- a/Spigot-Server-Patches/0019-Further-improve-server-tick-loop.patch
+++ b/Spigot-Server-Patches/0019-Further-improve-server-tick-loop.patch
@ -1,4 +1,4 @@
-From 9106bda96d42fe08b005d0ed685fbf3cdd8e6cc7 Mon Sep 17 00:00:00 2001
+From 18e7bb3d26d123c1b7a26e2d0a2b3baa60e5dec2 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
@ -147,7 +147,7 @@ index 92d48025..47fe9262 100644
                     }
                     lastTick = curTime;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d6fdc535..58826d3d 100644
+index 33b40ffc..bfddd168 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1753,6 +1753,17 @@ public final class CraftServer implements Server {
@ -210,5 +210,5 @@ index be2e31de..6d21c326 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.15.1.windows.2
+2.14.3

--- a/Spigot-Server-Patches/0020-Only-refresh-abilities-if-needed.patch
+++ b/Spigot-Server-Patches/0020-Only-refresh-abilities-if-needed.patch
@ -1,11 +1,11 @@
-From df2f6f2f9147373fdf3905ae725faae4050e70aa Mon Sep 17 00:00:00 2001
+From bd2bf58607934dcb2249509a5c85337d570067b7 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


 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index fa91ecbef..d911a8a08 100644
+index aec4f8aa..cc0e7b0c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1245,12 +1245,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -24,5 +24,5 @@ index fa91ecbef..d911a8a08 100644
 
     @Override
 -- 
-2.15.0
+2.14.3

--- a/Spigot-Server-Patches/0021-Add-async-chunk-load-API.patch
+++ b/Spigot-Server-Patches/0021-Add-async-chunk-load-API.patch
@ -1,11 +1,11 @@
-From f647a0ac1262878131e46148d82bd16ec24a0d10 Mon Sep 17 00:00:00 2001
+From 60346178095179c691b4c2e164edd907116e3089 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 ef8165da4..01fc193db 100644
+index ef8165da..01fc193d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -134,6 +134,26 @@ public class CraftWorld implements World {
@ -36,5 +36,5 @@ index ef8165da4..01fc193db 100644
         return this.world.getChunkProviderServer().getChunkAt(x, z).bukkitChunk;
     }
 -- 
-2.15.0
+2.14.3

--- a/Spigot-Server-Patches/0022-Entity-Origin-API.patch
+++ b/Spigot-Server-Patches/0022-Entity-Origin-API.patch
@ -1,11 +1,11 @@
-From ee0d7d7e916d947a8fb486318b86b998649687ab Mon Sep 17 00:00:00 2001
+From fd41ee4d876889ccaa0a1e76c921b3f0ceec80af Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Tue, 1 Mar 2016 23:45:08 -0600
 Subject: [PATCH] Entity Origin API


 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 90be49189..00487dd5f 100644
+index 90be4918..00487dd5 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -149,6 +149,7 @@ public abstract class Entity implements ICommandListener {
@ -51,7 +51,7 @@ index 90be49189..00487dd5f 100644
         NBTTagList nbttaglist = new NBTTagList();
         double[] adouble1 = adouble;
 diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-index 2ba5d51a5..abdc2dea9 100644
+index 2ba5d51a..abdc2dea 100644
 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
 +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
@@ -267,6 +267,14 @@ public class EntityFallingBlock extends Entity {
@ -70,7 +70,7 @@ index 2ba5d51a5..abdc2dea9 100644
 
     public void a(boolean flag) {
 diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
-index 0d70dd1d2..bb0904f86 100644
+index 0d70dd1d..bb0904f8 100644
 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
@@ -109,6 +109,14 @@ public class EntityTNTPrimed extends Entity {
@ -89,7 +89,7 @@ index 0d70dd1d2..bb0904f86 100644
 
     @Nullable
 diff --git a/src/main/java/net/minecraft/server/NBTTagList.java b/src/main/java/net/minecraft/server/NBTTagList.java
-index bc6383669..ca9eb2f3b 100644
+index bc638366..ca9eb2f3 100644
 --- a/src/main/java/net/minecraft/server/NBTTagList.java
 +++ b/src/main/java/net/minecraft/server/NBTTagList.java
@@ -153,6 +153,7 @@ public class NBTTagList extends NBTBase {
@ -101,7 +101,7 @@ index bc6383669..ca9eb2f3b 100644
         if (i >= 0 && i < this.list.size()) {
             NBTBase nbtbase = (NBTBase) this.list.get(i);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 26d4bd690..31b765dea 100644
+index 26d4bd69..31b765de 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -1071,6 +1071,12 @@ public abstract class World implements IBlockAccess {
@ -118,7 +118,7 @@ index 26d4bd690..31b765dea 100644
             flag = true;
         }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 9958bf869..0f38abaf8 100644
+index 9958bf86..0f38abaf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -754,4 +754,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@ -135,5 +135,5 @@ index 9958bf869..0f38abaf8 100644
 +    // Paper end
 }
 -- 
-2.15.1
+2.14.3

--- a/Spigot-Server-Patches/0023-Prevent-tile-entity-and-entity-crashes.patch
+++ b/Spigot-Server-Patches/0023-Prevent-tile-entity-and-entity-crashes.patch
@ -1,11 +1,11 @@
-From 80f84d70004416226822704a2c67d06c21967b1d Mon Sep 17 00:00:00 2001
+From 5c582595ec7258d05855fe076e4fc24b1e62aeaf 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 d2d4ff6fb..65297a761 100644
+index d2d4ff6f..65297a76 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 d2d4ff6fb..65297a761 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 31b765dea..fd5f8102a 100644
+index 31b765de..fd5f8102 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -1449,10 +1449,12 @@ public abstract class World implements IBlockAccess {
@ -62,5 +62,5 @@ index 31b765dea..fd5f8102a 100644
                     // Spigot start
                     finally {
 -- 
-2.15.1
+2.14.3

--- a/Spigot-Server-Patches/0024-Configurable-top-of-nether-void-damage.patch
+++ b/Spigot-Server-Patches/0024-Configurable-top-of-nether-void-damage.patch
@ -1,14 +1,14 @@
-From 1cbc8e2e11753a3b5ca6dd8f1f66efcf629a4bba Mon Sep 17 00:00:00 2001
+From c65ba7f6ff965da2d8b2beff4fdaf0fbe65f4091 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


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 62e6830aa..e524a464f 100644
+index d3484489..bf7af475 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -137,4 +137,10 @@ public class PaperWorldConfig {
+@@ -129,4 +129,10 @@ public class PaperWorldConfig {
         waterOverLavaFlowSpeed = getInt("water-over-lava-flow-speed", 5);
         log("Water over lava flow speed: " + waterOverLavaFlowSpeed);
     }
@ -20,7 +20,7 @@ index 62e6830aa..e524a464f 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 00487dd5f..9ee8c40a5 100644
+index 00487dd5..9ee8c40a 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -450,9 +450,15 @@ public abstract class Entity implements ICommandListener {
@ -67,7 +67,7 @@ index 00487dd5f..9ee8c40a5 100644
         this.die();
     }
 diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
-index 82795ee87..f8da1887d 100644
+index 82795ee8..f8da1887 100644
 --- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
@@ -204,9 +204,15 @@ public abstract class EntityMinecartAbstract extends Entity implements INamableT
--- a/Spigot-Server-Patches/0025-Check-online-mode-before-converting-and-renaming-pla.patch
+++ b/Spigot-Server-Patches/0025-Check-online-mode-before-converting-and-renaming-pla.patch
@ -1,11 +1,11 @@
-From 46e9f8769e155aa2e047d3f373c816b6880243f3 Mon Sep 17 00:00:00 2001
+From b94394ffcc1baf20e676b78eecf2a1773581f0b2 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 b69c6cf97..eba1228fd 100644
+index b69c6cf9..eba1228f 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 b69c6cf97..eba1228fd 100644
                 file = new File( this.playerDir, UUID.nameUUIDFromBytes( ( "OfflinePlayer:" + entityhuman.getName() ).getBytes( "UTF-8" ) ).toString() + ".dat");
                 if ( file.exists() )
 -- 
-2.13.1
+2.14.3

--- a/Spigot-Server-Patches/0026-Always-tick-falling-blocks.patch
+++ b/Spigot-Server-Patches/0026-Always-tick-falling-blocks.patch
@ -1,11 +1,11 @@
-From b5310cf63d22fdf8714b2bfaea8ce9c66c3d5758 Mon Sep 17 00:00:00 2001
+From f2a09d0c6b52c8298494189dc30eebe1be91443e 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 5c2fb0058..c411ce886 100644
+index 38be7ed7..3265a6c2 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 5c2fb0058..c411ce886 100644
                 || entity instanceof EntityFireworks )
         {
 -- 
-2.12.2
+2.14.3

--- a/Spigot-Server-Patches/0027-Lighting-Queue.patch
+++ b/Spigot-Server-Patches/0027-Lighting-Queue.patch
@ -1,4 +1,4 @@
-From 1564084393d4718d099082ea434dd8f2b1a0b53a Mon Sep 17 00:00:00 2001
+From 40710ffc3a3e33ad680988e1bace785d72779f99 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
@ -27,10 +27,10 @@ index e0ad559b..4eebd9fa 100644
     }
 }
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index e524a464..fd606ee1 100644
+index bf7af475..94a17304 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -143,4 +143,10 @@ public class PaperWorldConfig {
+@@ -135,4 +135,10 @@ public class PaperWorldConfig {
         netherVoidTopDamage = getBoolean( "nether-ceiling-void-damage", false );
         log("Top of the nether void damage: " + netherVoidTopDamage);
     }
@ -245,5 +245,5 @@ index fd5f8102..77ed2d24 100644
                 }
 
 -- 
-2.15.1.windows.2
+2.14.3

--- a/Spigot-Server-Patches/0028-Configurable-end-credits.patch
+++ b/Spigot-Server-Patches/0028-Configurable-end-credits.patch
@ -1,14 +1,14 @@
-From e32cd6dae671845a2b59511787b802cadcb60222 Mon Sep 17 00:00:00 2001
+From 0d4cacaffc984e789135355f9b2f7eac2983f7af 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


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index fd606ee14..c00fa83d5 100644
+index 94a17304..db09711e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -149,4 +149,10 @@ public class PaperWorldConfig {
+@@ -141,4 +141,10 @@ public class PaperWorldConfig {
         queueLightUpdates = getBoolean("queue-light-updates", false);
         log("Lighting Queue enabled: " + queueLightUpdates);
     }
@ -20,7 +20,7 @@ index fd606ee14..c00fa83d5 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index e2369e7f2..efce9048b 100644
+index 4e71963b..9829cdd8 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -56,7 +56,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -41,5 +41,5 @@ index e2369e7f2..efce9048b 100644
                 this.cq = true;
             }
 -- 
-2.13.0
+2.14.3

--- a/Spigot-Server-Patches/0029-Fix-lag-from-explosions-processing-dead-entities.patch
+++ b/Spigot-Server-Patches/0029-Fix-lag-from-explosions-processing-dead-entities.patch
@ -1,11 +1,11 @@
-From 65e62f2e8061d17c5703124546f56bb1b1b7fb64 Mon Sep 17 00:00:00 2001
+From d0691988443de01bda2253f429d0d19fe988a125 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 904bee8b..4e05bcdf 100644
+index 98c2bdcf..a1ebcf85 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 904bee8b..4e05bcdf 100644
 
         for (int l1 = 0; l1 < list.size(); ++l1) {
 -- 
-2.12.2
+2.14.3

--- a/Spigot-Server-Patches/0030-Generator-Settings.patch
+++ b/Spigot-Server-Patches/0030-Generator-Settings.patch
@ -1,14 +1,14 @@
-From 73b4d3a44527decb181748068a02c35cf587593d Mon Sep 17 00:00:00 2001
+From d247ea32a5da80867333bba8c86e284be41fa4a1 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


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index c00fa83d5..3b19b53a8 100644
+index db09711e..80500108 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -155,4 +155,28 @@ public class PaperWorldConfig {
+@@ -147,4 +147,28 @@ public class PaperWorldConfig {
         disableEndCredits = getBoolean("game-mechanics.disable-end-credits", false);
         log("End credits disabled: " + disableEndCredits);
     }
@ -38,7 +38,7 @@ index c00fa83d5..3b19b53a8 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/BiomeBase.java b/src/main/java/net/minecraft/server/BiomeBase.java
-index 1b7599769..ab6db7468 100644
+index 1b759976..ab6db746 100644
 --- a/src/main/java/net/minecraft/server/BiomeBase.java
 +++ b/src/main/java/net/minecraft/server/BiomeBase.java
@@ -176,7 +176,7 @@ public abstract class BiomeBase {
@ -51,7 +51,7 @@ index 1b7599769..ab6db7468 100644
             } else {
                 IBlockData iblockdata2 = chunksnapshot.a(k1, l1, j1);
 diff --git a/src/main/java/net/minecraft/server/BiomeMesa.java b/src/main/java/net/minecraft/server/BiomeMesa.java
-index f2dd96a32..0541403f0 100644
+index f2dd96a3..0541403f 100644
 --- a/src/main/java/net/minecraft/server/BiomeMesa.java
 +++ b/src/main/java/net/minecraft/server/BiomeMesa.java
@@ -99,7 +99,7 @@ public class BiomeMesa extends BiomeBase {
@ -64,7 +64,7 @@ index f2dd96a32..0541403f0 100644
             } else if (l1 < 15 || this.I) {
                 IBlockData iblockdata2 = chunksnapshot.a(l, i2, k);
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderFlat.java b/src/main/java/net/minecraft/server/ChunkProviderFlat.java
-index 1452ff657..8b1b79380 100644
+index 1452ff65..8b1b7938 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderFlat.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderFlat.java
@@ -26,7 +26,7 @@ public class ChunkProviderFlat implements ChunkGenerator {
@ -110,7 +110,7 @@ index 1452ff657..8b1b79380 100644
         int k = 0;
         boolean flag1 = true;
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderGenerate.java b/src/main/java/net/minecraft/server/ChunkProviderGenerate.java
-index 22a24a39f..ee9e00e64 100644
+index 22a24a39..ee9e00e6 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderGenerate.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderGenerate.java
@@ -160,32 +160,32 @@ public class ChunkProviderGenerate implements ChunkGenerator {
@ -221,7 +221,7 @@ index 22a24a39f..ee9e00e64 100644
             }
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderHell.java b/src/main/java/net/minecraft/server/ChunkProviderHell.java
-index 9f738749f..12bc10ff0 100644
+index 9f738749..12bc10ff 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderHell.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderHell.java
@@ -151,7 +151,10 @@ public class ChunkProviderHell implements ChunkGenerator {
@ -245,7 +245,7 @@ index 9f738749f..12bc10ff0 100644
     }
 }
 diff --git a/src/main/java/net/minecraft/server/StructureGenerator.java b/src/main/java/net/minecraft/server/StructureGenerator.java
-index 2580a4cf6..078957aac 100644
+index 66a80a77..34fd7edf 100644
 --- a/src/main/java/net/minecraft/server/StructureGenerator.java
 +++ b/src/main/java/net/minecraft/server/StructureGenerator.java
@@ -128,6 +128,7 @@ public abstract class StructureGenerator extends WorldGenBase {
@ -257,5 +257,5 @@ index 2580a4cf6..078957aac 100644
         ObjectIterator objectiterator = this.c.values().iterator();
 
 -- 
-2.13.0
+2.14.3

--- a/Spigot-Server-Patches/0031-Optimize-explosions.patch
+++ b/Spigot-Server-Patches/0031-Optimize-explosions.patch
@ -1,4 +1,4 @@
-From 364b6430061c2056ad9cc389dd712a6b53cb56a0 Mon Sep 17 00:00:00 2001
+From a5de89e41e9dcf763cd0318fbab687fb11f534f7 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
@ -10,10 +10,10 @@ This patch adds a per-tick cache that is used for storing and retrieving
 an entity's exposure during an explosion.

 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 3b19b53a8..a7dfd2af7 100644
+index 80500108..20e1e0c2 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -179,4 +179,10 @@ public class PaperWorldConfig {
+@@ -171,4 +171,10 @@ public class PaperWorldConfig {
         generateVillage = getBoolean("generator-settings.village", true);
         generateFlatBedrock = getBoolean("generator-settings.flat-bedrock", false);
     }
@ -25,7 +25,7 @@ index 3b19b53a8..a7dfd2af7 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
-index a1ebcf858..e7f0e84d4 100644
+index a1ebcf85..e7f0e84d 100644
 --- a/src/main/java/net/minecraft/server/Explosion.java
 +++ b/src/main/java/net/minecraft/server/Explosion.java
@@ -130,7 +130,7 @@ public class Explosion {
@ -124,7 +124,7 @@ index a1ebcf858..e7f0e84d4 100644
 +    // Paper end
 }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5b0431c57..a5e3b13cc 100644
+index d63a243f..4e8ce79f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -889,6 +889,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@ -136,7 +136,7 @@ index 5b0431c57..a5e3b13cc 100644
 
             // this.i[i][this.ticks % 100] = System.nanoTime() - j; // CraftBukkit
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 763f21570..7aeb46d12 100644
+index 77ed2d24..fc7315f7 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -16,6 +16,7 @@ import javax.annotation.Nullable;
@ -156,5 +156,5 @@ index 763f21570..7aeb46d12 100644
     public CraftWorld getWorld() {
         return this.world;
 -- 
-2.13.3.windows.1
+2.14.3

--- a/Spigot-Server-Patches/0032-Stop-updating-flowing-block-if-material-has-changed.patch
+++ b/Spigot-Server-Patches/0032-Stop-updating-flowing-block-if-material-has-changed.patch
@ -1,11 +1,11 @@
-From 4286caaef0038d040cac7066e78873f7fe5c44d0 Mon Sep 17 00:00:00 2001
+From d03ae937e89c84d1069229eb94714aa1f2b2e009 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 f4ac7bafa..801b9cb7b 100644
+index 62234a7c..3b47253a 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 f4ac7bafa..801b9cb7b 100644
         IBlockData iblockdata2 = world.getType(blockposition.down());
 
 -- 
-2.12.2
+2.14.3

--- a/Spigot-Server-Patches/0033-Fast-draining.patch
+++ b/Spigot-Server-Patches/0033-Fast-draining.patch
@ -1,14 +1,14 @@
-From ccf86c26bd1bd5ec98c8410fd7140cf5830b16af Mon Sep 17 00:00:00 2001
+From 292af58c27a5bf3bd7e09cd1f03401a877d70716 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


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index a7dfd2af7..e093f7dc1 100644
+index 20e1e0c2..3b96b16f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -185,4 +185,11 @@ public class PaperWorldConfig {
+@@ -177,4 +177,11 @@ public class PaperWorldConfig {
         optimizeExplosions = getBoolean("optimize-explosions", false);
         log("Optimize explosions: " + optimizeExplosions);
     }
@ -21,7 +21,7 @@ index a7dfd2af7..e093f7dc1 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/BlockFlowing.java b/src/main/java/net/minecraft/server/BlockFlowing.java
-index 801b9cb7b..8e9de3bcb 100644
+index 3b47253a..3aaa19b2 100644
 --- a/src/main/java/net/minecraft/server/BlockFlowing.java
 +++ b/src/main/java/net/minecraft/server/BlockFlowing.java
@@ -69,7 +69,7 @@ public class BlockFlowing extends BlockFluids {
@ -109,5 +109,5 @@ index 801b9cb7b..8e9de3bcb 100644
 +    // Paper end
 }
 -- 
-2.12.2
+2.14.3

--- a/Spigot-Server-Patches/0034-Configurable-lava-flow-speed.patch
+++ b/Spigot-Server-Patches/0034-Configurable-lava-flow-speed.patch
@ -1,14 +1,14 @@
-From ec526d2a02bbc74f962bf21806940ad169baed8e Mon Sep 17 00:00:00 2001
+From ec63fe67dffe84268e752bf409cd3b1dfc9f1cb3 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


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index e093f7dc1..a197af84f 100644
+index 3b96b16f..e2d4f4bf 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -192,4 +192,11 @@ public class PaperWorldConfig {
+@@ -184,4 +184,11 @@ public class PaperWorldConfig {
         fastDrainLava = getBoolean("fast-drain.lava", false);
         fastDrainWater = getBoolean("fast-drain.water", false);
     }
@ -21,7 +21,7 @@ index e093f7dc1..a197af84f 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/BlockFlowing.java b/src/main/java/net/minecraft/server/BlockFlowing.java
-index 8e9de3bcb..0a2823686 100644
+index 3aaa19b2..739b9aac 100644
 --- a/src/main/java/net/minecraft/server/BlockFlowing.java
 +++ b/src/main/java/net/minecraft/server/BlockFlowing.java
@@ -272,6 +272,9 @@ public class BlockFlowing extends BlockFluids {
@ -35,7 +35,7 @@ index 8e9de3bcb..0a2823686 100644
                 world.getType(blockposition.north(1)).getBlock().material == Material.LAVA ||
                         world.getType(blockposition.south(1)).getBlock().material == Material.LAVA ||
 diff --git a/src/main/java/net/minecraft/server/WorldProvider.java b/src/main/java/net/minecraft/server/WorldProvider.java
-index 660f3bcce..a27512c0f 100644
+index f3eb2a79..d0265f96 100644
 --- a/src/main/java/net/minecraft/server/WorldProvider.java
 +++ b/src/main/java/net/minecraft/server/WorldProvider.java
@@ -114,6 +114,7 @@ public abstract class WorldProvider {
@ -47,5 +47,5 @@ index 660f3bcce..a27512c0f 100644
         return this.e;
     }
 -- 
-2.12.2
+2.14.3

--- a/Spigot-Server-Patches/0035-Add-player-view-distance-API.patch
+++ b/Spigot-Server-Patches/0035-Add-player-view-distance-API.patch
@ -1,11 +1,11 @@
-From 499e727e164124868aab6b4af116148f141cbcdf Mon Sep 17 00:00:00 2001
+From 7fc0df5e4ebc2e181f11411824fb7631ebef35a8 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


 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 9829cdd89..5b0675718 100644
+index 9829cdd8..5b067571 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -66,6 +66,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -25,7 +25,7 @@ index 9829cdd89..5b0675718 100644
     // CraftBukkit start
     public String displayName;
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index e4ed2e991..9627a9be0 100644
+index e4ed2e99..9627a9be 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
@@ -47,7 +47,7 @@ public class PlayerChunkMap {
@ -203,7 +203,7 @@ index e4ed2e991..9627a9be0 100644
 +    // Paper end
 }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d911a8a08..81f005177 100644
+index cc0e7b0c..7ee4965a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1555,6 +1555,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -224,5 +224,5 @@ index d911a8a08..81f005177 100644
     private final Player.Spigot spigot = new Player.Spigot()
     {
 -- 
-2.15.0
+2.14.3

--- a/Spigot-Server-Patches/0036-Disable-explosion-knockback.patch
+++ b/Spigot-Server-Patches/0036-Disable-explosion-knockback.patch
@ -1,14 +1,14 @@
-From 4222ad3d72e67eaf41b1e57ff7d0ba4c45bd6c80 Mon Sep 17 00:00:00 2001
+From 81aa797bd3b65e8a0b413fa9a273207bec071b5b 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


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index a197af84f..2217f680c 100644
+index e2d4f4bf..23a78adb 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -199,4 +199,9 @@ public class PaperWorldConfig {
+@@ -191,4 +191,9 @@ public class PaperWorldConfig {
         lavaFlowSpeedNormal = getInt("lava-flow-speed.normal", 30);
         lavaFlowSpeedNether = getInt("lava-flow-speed.nether", 10);
     }
@ -19,7 +19,7 @@ index a197af84f..2217f680c 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index e8401bba7..5a6b33981 100644
+index e8401bba..5a6b3398 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -906,6 +906,7 @@ public abstract class EntityLiving extends Entity {
@ -48,7 +48,7 @@ index e8401bba7..5a6b33981 100644
                     if (!this.e(damagesource)) {
                         SoundEffect soundeffect = this.cf();
 diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
-index e7f0e84d4..e148901e5 100644
+index e7f0e84d..e148901e 100644
 --- a/src/main/java/net/minecraft/server/Explosion.java
 +++ b/src/main/java/net/minecraft/server/Explosion.java
@@ -146,7 +146,7 @@ public class Explosion {
--- a/Spigot-Server-Patches/0037-Disable-thunder.patch
+++ b/Spigot-Server-Patches/0037-Disable-thunder.patch
@ -1,14 +1,14 @@
-From 2a74cffa0e22d482770a5e995adbe1ffe4945b9c Mon Sep 17 00:00:00 2001
+From 83f30f8074c950acb3da0d367b88805ee3302dea 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


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 2217f680c..a40d4887c 100644
+index 23a78adb..675c8c87 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -204,4 +204,9 @@ public class PaperWorldConfig {
+@@ -196,4 +196,9 @@ public class PaperWorldConfig {
     private void disableExplosionKnockback(){
         disableExplosionKnockback = getBoolean("disable-explosion-knockback", false);
     }
@ -19,7 +19,7 @@ index 2217f680c..a40d4887c 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index ce8fe791d..e52b14792 100644
+index e492913a..95ea3924 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -485,7 +485,8 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@ -33,5 +33,5 @@ index ce8fe791d..e52b14792 100644
                     l = this.l >> 2;
                     blockposition = this.a(new BlockPosition(j + (l & 15), 0, k + (l >> 8 & 15)));
 -- 
-2.13.1
+2.14.3

--- a/Spigot-Server-Patches/0038-Disable-ice-and-snow.patch
+++ b/Spigot-Server-Patches/0038-Disable-ice-and-snow.patch
@ -1,14 +1,14 @@
-From 4c057fc2149e1d6c3f6ef31d72acd13092d319f5 Mon Sep 17 00:00:00 2001
+From 74938698c481006668aab13a9b353407011eb511 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


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index a40d4887c..4fea4b359 100644
+index 675c8c87..49d14b8e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -209,4 +209,9 @@ public class PaperWorldConfig {
+@@ -201,4 +201,9 @@ public class PaperWorldConfig {
     private void disableThunder() {
         disableThunder = getBoolean("disable-thunder", false);
     }
@ -19,7 +19,7 @@ index a40d4887c..4fea4b359 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index e52b14792..bb07b1d66 100644
+index 95ea3924..9ef492f1 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -508,7 +508,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@ -32,5 +32,5 @@ index e52b14792..bb07b1d66 100644
                     l = this.l >> 2;
                     blockposition = this.p(new BlockPosition(j + (l & 15), 0, k + (l >> 8 & 15)));
 -- 
-2.13.1
+2.14.3

--- a/Spigot-Server-Patches/0039-Configurable-mob-spawner-tick-rate.patch
+++ b/Spigot-Server-Patches/0039-Configurable-mob-spawner-tick-rate.patch
@ -1,14 +1,14 @@
-From e57d4c1008d43b0b3e1aba3764a8336803b24a00 Mon Sep 17 00:00:00 2001
+From 7a2448f69b80dd8fce3f0e1516f1330ebb1a35a4 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


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 4fea4b359..1bb956515 100644
+index 49d14b8e..1fd29332 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -214,4 +214,9 @@ public class PaperWorldConfig {
+@@ -206,4 +206,9 @@ public class PaperWorldConfig {
     private void disableIceAndSnow(){
         disableIceAndSnow = getBoolean("disable-ice-and-snow", false);
     }
@ -19,7 +19,7 @@ index 4fea4b359..1bb956515 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index e87f90474..0562c6e34 100644
+index e87f9047..0562c6e3 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
@@ -19,6 +19,7 @@ public abstract class MobSpawnerAbstract {
@ -64,5 +64,5 @@ index e87f90474..0562c6e34 100644
                 }
 
 -- 
-2.13.4
+2.14.3

--- a/Spigot-Server-Patches/0040-Send-absolute-position-the-first-time-an-entity-is-s.patch
+++ b/Spigot-Server-Patches/0040-Send-absolute-position-the-first-time-an-entity-is-s.patch
@ -1,11 +1,11 @@
-From e2339144ecaec2b719659708e3567d04d491cdb3 Mon Sep 17 00:00:00 2001
+From 00b4d0840ad4aa83fd9f668f114997cbf00e3105 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 1493f9ab3..f542bf491 100644
+index d864c774..4c6eb6ed 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 1493f9ab3..f542bf491 100644
 
                     entityplayer.playerConnection.sendPacket(packet);
 -- 
-2.12.2
+2.14.3

--- a/Spigot-Server-Patches/0041-Add-BeaconEffectEvent.patch
+++ b/Spigot-Server-Patches/0041-Add-BeaconEffectEvent.patch
@ -1,11 +1,11 @@
-From 3308547d075d0d0e431b0273cfba7fcc8d38444b Mon Sep 17 00:00:00 2001
+From f4d8d65c9697b298b90b1eb269ff0e2ab86698ac 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 6f2fcd22e..71ecc5493 100644
+index b84a2ce5..a57b1717 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 6f2fcd22e..71ecc5493 100644
         }
 
 -- 
-2.12.2
+2.14.3

--- a/Spigot-Server-Patches/0042-Configurable-container-update-tick-rate.patch
+++ b/Spigot-Server-Patches/0042-Configurable-container-update-tick-rate.patch
@ -1,14 +1,14 @@
-From a2edd27f9aa96f68765c103e578597576c53c6cd Mon Sep 17 00:00:00 2001
+From c3a3ce641affd7a3f4247db2cf67ffcf17e2cca0 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


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 1bb956515..e6aae7317 100644
+index 1fd29332..83f9512f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -219,4 +219,9 @@ public class PaperWorldConfig {
+@@ -211,4 +211,9 @@ public class PaperWorldConfig {
     private void mobSpawnerTickRate() {
         mobSpawnerTickRate = getInt("mob-spawner-tick-rate", 1);
     }
@ -19,7 +19,7 @@ index 1bb956515..e6aae7317 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 00d2798c2..4dedab257 100644
+index 5b067571..e48121b4 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -75,6 +75,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -45,5 +45,5 @@ index 00d2798c2..4dedab257 100644
             this.closeInventory();
             this.activeContainer = this.defaultContainer;
 -- 
-2.14.1
+2.14.3

--- a/Spigot-Server-Patches/0043-Use-UserCache-for-player-heads.patch
+++ b/Spigot-Server-Patches/0043-Use-UserCache-for-player-heads.patch
@ -1,11 +1,11 @@
-From 84333515d4922a89743e89d319d7504fb6084905 Mon Sep 17 00:00:00 2001
+From 285a7bcc278a1fb6ac0fffd27d49b13a3927365d 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 8a58615f8..987cc9a80 100644
+index 8a58615f..987cc9a8 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;
@ -30,5 +30,5 @@ index 8a58615f8..987cc9a80 100644
 
         return true;
 -- 
-2.15.1
+2.14.3

--- a/Spigot-Server-Patches/0044-Disable-spigot-tick-limiters.patch
+++ b/Spigot-Server-Patches/0044-Disable-spigot-tick-limiters.patch
@ -1,11 +1,11 @@
-From b6b6996f477feb25fe5ccbd67064bc4ce83dae6c Mon Sep 17 00:00:00 2001
+From 22338f0f3207a00a9f48c20b9f394d118110981e 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 44801d898..6d200b809 100644
+index fc7315f7..e85ed2e3 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -1426,10 +1426,10 @@ public abstract class World implements IBlockAccess {
@ -35,5 +35,5 @@ index 44801d898..6d200b809 100644
             TileEntity tileentity = (TileEntity) this.tileEntityListTick.get(tileTickPosition);
             // Spigot start
 -- 
-2.15.1
+2.14.3

--- a/Spigot-Server-Patches/0045-Configurable-Chunk-IO-Thread-Base-Count.patch
+++ b/Spigot-Server-Patches/0045-Configurable-Chunk-IO-Thread-Base-Count.patch
@ -1,11 +1,11 @@
-From ba2c8def84e686a6ee2afa8a33a624ba1914800c Mon Sep 17 00:00:00 2001
+From b4c98eb4f723e9e65cb7e4dbc88325fd72813d34 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 b5795b6d3..36689db74 100644
+index b5795b6d..36689db7 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -199,4 +199,9 @@ public class PaperConfig {
@ -19,7 +19,7 @@ index b5795b6d3..36689db74 100644
 +    }
 }
 diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
-index e4fd9bc60..7b7a3d01b 100644
+index e4fd9bc6..7b7a3d01 100644
 --- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
@@ -1,5 +1,6 @@
@ -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.14.1
+2.14.3

--- a/Spigot-Server-Patches/0046-Add-PlayerInitialSpawnEvent.patch
+++ b/Spigot-Server-Patches/0046-Add-PlayerInitialSpawnEvent.patch
@ -1,4 +1,4 @@
-From c676f4ee1c9ca2e5f669de47d11e58e926229404 Mon Sep 17 00:00:00 2001
+From 40abd729cda512166ac068a2593b32a45205cbe8 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 b3356b40f..128f55287 100644
+index 784d6b62..b38ff689 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -110,6 +110,21 @@ public abstract class PlayerList {
@ -32,5 +32,5 @@ index b3356b40f..128f55287 100644
         entityplayer.playerInteractManager.a((WorldServer) entityplayer.world);
         String s1 = "local";
 -- 
-2.14.1
+2.14.3

--- a/Spigot-Server-Patches/0047-Disable-chest-cat-detection.patch
+++ b/Spigot-Server-Patches/0047-Disable-chest-cat-detection.patch
@ -1,14 +1,14 @@
-From d76321993eecd60cc0a0410ff8b45a0303134b81 Mon Sep 17 00:00:00 2001
+From 5a4192c1b33b2950000032a2f7e40a38e2b933e3 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


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index e6aae7317..6ce62827a 100644
+index 83f9512f..0355b711 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -224,4 +224,9 @@ public class PaperWorldConfig {
+@@ -216,4 +216,9 @@ public class PaperWorldConfig {
     private void containerUpdateTickRate() {
         containerUpdateTickRate = getInt("container-update-tick-rate", 1);
     }
@ -19,7 +19,7 @@ index e6aae7317..6ce62827a 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/BlockChest.java b/src/main/java/net/minecraft/server/BlockChest.java
-index c75ed8a36..9c4d1c938 100644
+index da2cfe20..bc398ec5 100644
 --- a/src/main/java/net/minecraft/server/BlockChest.java
 +++ b/src/main/java/net/minecraft/server/BlockChest.java
@@ -399,6 +399,11 @@ public class BlockChest extends BlockTileEntity {
@ -35,5 +35,5 @@ index c75ed8a36..9c4d1c938 100644
 
         EntityOcelot entityocelot;
 -- 
-2.12.2.windows.2
+2.14.3

--- a/Spigot-Server-Patches/0048-Ensure-commands-are-not-ran-async.patch
+++ b/Spigot-Server-Patches/0048-Ensure-commands-are-not-ran-async.patch
@ -1,4 +1,4 @@
-From c8577b4b0cdf04d387238b817a3d215a20b26ea6 Mon Sep 17 00:00:00 2001
+From 682aec6f3018c0732d241afabcda0b4fbc514d6f 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
@ -48,7 +48,7 @@ index da25a8be..5348c0cb 100644
         } else if (this.player.getChatFlags() == EntityHuman.EnumChatVisibility.SYSTEM) {
             // Do nothing, this is coming from a plugin
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 58826d3d..b6e7f7e9 100644
+index bfddd168..082957d3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -645,6 +645,29 @@ public final class CraftServer implements Server {
@ -82,5 +82,5 @@ index 58826d3d..b6e7f7e9 100644
             return true;
         }
 -- 
-2.15.1.windows.2
+2.14.3

--- a/Spigot-Server-Patches/0049-All-chunks-are-slime-spawn-chunks-toggle.patch
+++ b/Spigot-Server-Patches/0049-All-chunks-are-slime-spawn-chunks-toggle.patch
@ -1,14 +1,14 @@
-From 95af696519a3738b8dd148142fecc34108d3ef7b Mon Sep 17 00:00:00 2001
+From aa4e3394125e58d84fb818b4ee05949172582ccf 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


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 6ce62827a..ab7e81a0d 100644
+index 0355b711..3176379c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -229,4 +229,9 @@ public class PaperWorldConfig {
+@@ -221,4 +221,9 @@ public class PaperWorldConfig {
     private void disableChestCatDetection() {
         disableChestCatDetection = getBoolean("game-mechanics.disable-chest-cat-detection", false);
     }
@ -19,7 +19,7 @@ index 6ce62827a..ab7e81a0d 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/EntitySlime.java b/src/main/java/net/minecraft/server/EntitySlime.java
-index 24aac10da..31cf1df5d 100644
+index 272b2265..3d3a9ca0 100644
 --- a/src/main/java/net/minecraft/server/EntitySlime.java
 +++ b/src/main/java/net/minecraft/server/EntitySlime.java
@@ -251,8 +251,8 @@ public class EntitySlime extends EntityInsentient implements IMonster {
@ -34,5 +34,5 @@ index 24aac10da..31cf1df5d 100644
                 }
             }
 -- 
-2.13.0
+2.14.3

--- a/Spigot-Server-Patches/0050-Optimize-Pathfinding.patch
+++ b/Spigot-Server-Patches/0050-Optimize-Pathfinding.patch
@ -1,4 +1,4 @@
-From 185916cee82574977ec5fd0b7a038cdcfb3c5317 Mon Sep 17 00:00:00 2001
+From d07a9f35fa53a4f2cd7c20d38e15e74f90347e7b 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 26319d9b7..3e598afd4 100644
+index bfc5769f..cc44d30b 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 26319d9b7..3e598afd4 100644
     }
 
 -- 
-2.13.0
+2.14.3

--- a/Spigot-Server-Patches/0051-Avoid-hopper-searches-if-there-are-no-items.patch
+++ b/Spigot-Server-Patches/0051-Avoid-hopper-searches-if-there-are-no-items.patch
@ -1,4 +1,4 @@
-From 629064b222df6125fa3e161bdafa5746ba9b467e Mon Sep 17 00:00:00 2001
+From 87454f7aa992d28fb8dac2b75804360f77293510 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 c1f25e8d..2a1c11a0 100644
 
             while (iterator.hasNext()) {
 -- 
-2.15.1.windows.2
+2.14.3

--- a/Spigot-Server-Patches/0052-Expose-server-CommandMap.patch
+++ b/Spigot-Server-Patches/0052-Expose-server-CommandMap.patch
@ -1,11 +1,11 @@
-From 2a7fb1c3f5fbef8a3fe6818aa41ed5d964df233f Mon Sep 17 00:00:00 2001
+From d587d2dde23a2f8567a1cceecd11261c36060b27 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 b6e7f7e9..c2d945f1 100644
+index 082957d3..8bec4993 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1564,6 +1564,7 @@ public final class CraftServer implements Server {
@ -17,5 +17,5 @@ index b6e7f7e9..c2d945f1 100644
         return commandMap;
     }
 -- 
-2.15.1.windows.2
+2.14.3

--- a/Spigot-Server-Patches/0053-Be-a-bit-more-informative-in-maxHealth-exception.patch
+++ b/Spigot-Server-Patches/0053-Be-a-bit-more-informative-in-maxHealth-exception.patch
@ -1,11 +1,11 @@
-From 2ab6db5456790e25138316daebc61e8bb9a79067 Mon Sep 17 00:00:00 2001
+From e0cd0d92c3a5385e827cc313cef320ac0594bf41 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 425919cda..7bf45f7d0 100644
+index 425919cd..7bf45f7d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -94,7 +94,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@ -21,5 +21,5 @@ index 425919cda..7bf45f7d0 100644
 
         getHandle().setHealth((float) health);
 -- 
-2.15.1.windows.2
+2.14.3

--- a/Spigot-Server-Patches/0054-Player-Tab-List-and-Title-APIs.patch
+++ b/Spigot-Server-Patches/0054-Player-Tab-List-and-Title-APIs.patch
@ -1,11 +1,11 @@
-From b8ef081c643c1d3128c8fd5d1ad6a2fdd1923caa Mon Sep 17 00:00:00 2001
+From 43f8c8c8c507b42c37fb0619d2800d0c310cd5c7 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 0663b07ca..f5ef1ba31 100644
+index 0663b07c..f5ef1ba3 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 0663b07ca..f5ef1ba31 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 7bcafa8bb..4f6c1c2e7 100644
+index 7bcafa8b..4f6c1c2e 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 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 81f005177..3a30728e8 100644
+index 7ee4965a..58d53b32 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 81f005177..3a30728e8 100644
     public String getDisplayName() {
         return getHandle().displayName;
 -- 
-2.15.0
+2.14.3

--- a/Spigot-Server-Patches/0055-Ensure-inv-drag-is-in-bounds.patch
+++ b/Spigot-Server-Patches/0055-Ensure-inv-drag-is-in-bounds.patch
@ -1,11 +1,11 @@
-From bf866311f4f6ce12ea4e26e99b36f15ac43664ae Mon Sep 17 00:00:00 2001
+From 5394e873fbcf4dd43535cdaa0d98fcf3ce02114d 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 7d80b68b2..3a488ce20 100644
+index 7d80b68b..3a488ce2 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 7d80b68b2..3a488ce20 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.14.1
+2.14.3

--- a/Spigot-Server-Patches/0056-Change-implementation-of-tile-entity-removal-list.patch
+++ b/Spigot-Server-Patches/0056-Change-implementation-of-tile-entity-removal-list.patch
@ -1,11 +1,11 @@
-From 36a0759426050336602e3495938b275ab59ce6fd Mon Sep 17 00:00:00 2001
+From 91da56f560ed2baf64ec8fb3530b7329b5865325 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 9ee8c40a5..438624dd7 100644
+index 9ee8c40a..438624dd 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -122,7 +122,7 @@ public abstract class Entity implements ICommandListener {
@ -18,7 +18,7 @@ index 9ee8c40a5..438624dd7 100644
     public int ac; public int getChunkY() { return ac; } // Paper - OBFHELPER
     public int ad; public int getChunkZ() { return ad; } // Paper - OBFHELPER
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 6d200b809..b814d965e 100644
+index e85ed2e3..89197281 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -31,6 +31,11 @@ import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
@ -78,5 +78,5 @@ index 6d200b809..b814d965e 100644
         this.f.clear();
         this.l();
 -- 
-2.15.1
+2.14.3

--- a/Spigot-Server-Patches/0057-Add-configurable-portal-search-radius.patch
+++ b/Spigot-Server-Patches/0057-Add-configurable-portal-search-radius.patch
@ -1,14 +1,14 @@
-From c7880597e2dfa64fde32529848c07aff78bad349 Mon Sep 17 00:00:00 2001
+From ca0d6ed8d4b207343343badd7336c5040402f89a 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


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index ab7e81a0d..4cc74cd65 100644
+index 3176379c..27fac9ef 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -234,4 +234,9 @@ public class PaperWorldConfig {
+@@ -226,4 +226,9 @@ public class PaperWorldConfig {
     private void allChunksAreSlimeChunks() {
         allChunksAreSlimeChunks = getBoolean("all-chunks-are-slime-chunks", false);
     }
@ -19,7 +19,7 @@ index ab7e81a0d..4cc74cd65 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/PortalTravelAgent.java b/src/main/java/net/minecraft/server/PortalTravelAgent.java
-index 4455c2c43..fbf7cff24 100644
+index d1c67e39..f4972979 100644
 --- a/src/main/java/net/minecraft/server/PortalTravelAgent.java
 +++ b/src/main/java/net/minecraft/server/PortalTravelAgent.java
@@ -12,7 +12,7 @@ import org.bukkit.util.Vector;
@ -41,7 +41,7 @@ index 4455c2c43..fbf7cff24 100644
             return false;
         }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftTravelAgent.java b/src/main/java/org/bukkit/craftbukkit/CraftTravelAgent.java
-index 1d5dce10e..7ca2617a8 100644
+index 1d5dce10..7ca2617a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftTravelAgent.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftTravelAgent.java
@@ -11,7 +11,7 @@ public class CraftTravelAgent extends PortalTravelAgent implements TravelAgent {
@ -54,5 +54,5 @@ index 1d5dce10e..7ca2617a8 100644
     private boolean canCreatePortal = true;
 
 -- 
-2.12.2.windows.2
+2.14.3

--- a/Spigot-Server-Patches/0058-Add-velocity-warnings.patch
+++ b/Spigot-Server-Patches/0058-Add-velocity-warnings.patch
@ -1,11 +1,11 @@
-From 7f4faf67b72574d46629d226bff8b657c1a06439 Mon Sep 17 00:00:00 2001
+From 5d7034040c0b6785bd57f42da9d93af845990760 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 c2d945f1..137601d1 100644
+index 8bec4993..16b8d38a 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 {
@ -91,5 +91,5 @@ index 3ed983cc..6384d50e 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.15.1.windows.2
+2.14.3

--- a/Spigot-Server-Patches/0059-Fix-inter-world-teleportation-glitches.patch
+++ b/Spigot-Server-Patches/0059-Fix-inter-world-teleportation-glitches.patch
@ -1,4 +1,4 @@
-From 6a7fbc75f38face85e1305be4cc74c608971b302 Mon Sep 17 00:00:00 2001
+From 7195f547ff310de38bd29f53a4103864d43ec67b 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
@ -11,10 +11,10 @@ Example setup to perform the glitch: http://puu.sh/ng3PC/cf072dcbdb.png
 The wanted destination was on top of the emerald block however the player ended on top of the diamond block. This only is the case if the player is teleporting between worlds.

 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 4cc74cd65..fa49397ea 100644
+index 27fac9ef..1fb9cff9 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -239,4 +239,9 @@ public class PaperWorldConfig {
+@@ -231,4 +231,9 @@ public class PaperWorldConfig {
     private void portalSearchRadius() {
         portalSearchRadius = getInt("portal-search-radius", 128);
     }
@ -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 3a30728e8..aa5165f65 100644
+index 58d53b32..e9044f38 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -623,7 +623,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -39,5 +39,5 @@ index 3a30728e8..aa5165f65 100644
         return true;
     }
 -- 
-2.15.0
+2.14.3

--- a/Spigot-Server-Patches/0060-Add-exception-reporting-event.patch
+++ b/Spigot-Server-Patches/0060-Add-exception-reporting-event.patch
@ -1,4 +1,4 @@
-From a9e8dac195aef49744961d9c9edaab6cd1de17b3 Mon Sep 17 00:00:00 2001
+From 0674a65232371da02c375661f83d214aa59e4581 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
@ -373,5 +373,5 @@ index d50bbd2a..bce41128 100644
                 // (async tasks must live with race-conditions if they attempt to cancel between these few lines of code)
             }
 -- 
-2.15.1.windows.2
+2.14.3

--- a/Spigot-Server-Patches/0061-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
+++ b/Spigot-Server-Patches/0061-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
@ -1,4 +1,4 @@
-From 517b94fca16325f04702e129596f9d9f1fa4a50a Mon Sep 17 00:00:00 2001
+From acf1d6b999ead0cb9dfb022031296a0e803c6fc2 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 9fc83c4a3..b3b13ba11 100644
+index 67666d35..5d1a4962 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 9fc83c4a3..b3b13ba11 100644
             packetdataserializer.a(this.a);
         }
 -- 
-2.12.2.windows.2
+2.14.3

--- a/Spigot-Server-Patches/0062-Disable-Scoreboards-for-non-players-by-default.patch
+++ b/Spigot-Server-Patches/0062-Disable-Scoreboards-for-non-players-by-default.patch
@ -1,4 +1,4 @@
-From 31db3d39b5c57788978d813548990b7baeebc5a1 Mon Sep 17 00:00:00 2001
+From b7123bd1a147a200878cc069bc94f6a173b3ceba 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
@ -11,10 +11,10 @@ So avoid looking up scoreboards and short circuit to the "not on a team"
 logic which is most likely to be true.

 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index fa49397ea..9987a5c7a 100644
+index 1fb9cff9..f002ef27 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -244,4 +244,9 @@ public class PaperWorldConfig {
+@@ -236,4 +236,9 @@ public class PaperWorldConfig {
     private void disableTeleportationSuffocationCheck() {
         disableTeleportationSuffocationCheck = getBoolean("disable-teleportation-suffocation-check", false);
     }
@ -25,7 +25,7 @@ index fa49397ea..9987a5c7a 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/CommandScoreboard.java b/src/main/java/net/minecraft/server/CommandScoreboard.java
-index ec9a87239..b08274d93 100644
+index ec9a8723..b08274d9 100644
 --- a/src/main/java/net/minecraft/server/CommandScoreboard.java
 +++ b/src/main/java/net/minecraft/server/CommandScoreboard.java
@@ -492,6 +492,7 @@ public class CommandScoreboard extends CommandAbstract {
@ -37,7 +37,7 @@ index ec9a87239..b08274d93 100644
 
                         if (scoreboard.addPlayerToTeam(s2, s)) {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 438624dd7..9a1cac844 100644
+index 438624dd..9a1cac84 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2080,6 +2080,7 @@ public abstract class Entity implements ICommandListener {
--- a/Spigot-Server-Patches/0063-Add-methods-for-working-with-arrows-stuck-in-living-.patch
+++ b/Spigot-Server-Patches/0063-Add-methods-for-working-with-arrows-stuck-in-living-.patch
@ -1,11 +1,11 @@
-From 110010cf39dad71b885d93f3b3f056d0b58687a0 Mon Sep 17 00:00:00 2001
+From 1327edcaa7361519198876a7e6659f8109fe97ae 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/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 7bf45f7d0..b9e106031 100644
+index 7bf45f7d..b9e10603 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -494,4 +494,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@ -26,5 +26,5 @@ index 7bf45f7d0..b9e106031 100644
 +    // Paper end
 }
 -- 
-2.15.1.windows.2
+2.14.3

--- a/Spigot-Server-Patches/0064-Complete-resource-pack-API.patch
+++ b/Spigot-Server-Patches/0064-Complete-resource-pack-API.patch
@ -1,11 +1,11 @@
-From 38beacf452129cb95545832bc38121498c02b9ee Mon Sep 17 00:00:00 2001
+From ec57432cc4fd42a05473c74a587ae694dc6418f8 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 4 Apr 2015 23:17:52 -0400
 Subject: [PATCH] Complete resource pack API


 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 5348c0cbc..5cc5dbcd7 100644
+index 5348c0cb..5cc5dbcd 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1067,7 +1067,12 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@ -23,7 +23,7 @@ index 5348c0cbc..5cc5dbcd7 100644
     // CraftBukkit end
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index aa5165f65..219daa59b 100644
+index e9044f38..f62fa8c7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -88,6 +88,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -71,5 +71,5 @@ index aa5165f65..219daa59b 100644
     private final Player.Spigot spigot = new Player.Spigot()
     {
 -- 
-2.15.0
+2.14.3

--- a/Spigot-Server-Patches/0065-Chunk-save-queue-improvements.patch
+++ b/Spigot-Server-Patches/0065-Chunk-save-queue-improvements.patch
@ -1,4 +1,4 @@
-From 7b7f601ad0c78736c6699917a5e4627dea796289 Mon Sep 17 00:00:00 2001
+From 7f29042fa8a19c844fee61cfe0271a47e28e204c 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,7 +26,7 @@ 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 36689db74..3898ad8fa 100644
+index 36689db7..3898ad8f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -204,4 +204,10 @@ public class PaperConfig {
@ -41,7 +41,7 @@ index 36689db74..3898ad8fa 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 682b4230e..772da28aa 100644
+index a401dec6..4c3faa20 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -12,6 +12,7 @@ import java.util.List;
@ -138,7 +138,7 @@ index 682b4230e..772da28aa 100644
 +    // Paper end
 }
 diff --git a/src/main/java/net/minecraft/server/FileIOThread.java b/src/main/java/net/minecraft/server/FileIOThread.java
-index 1d6b1874c..9ee4115be 100644
+index 1d6b1874..9ee4115b 100644
 --- a/src/main/java/net/minecraft/server/FileIOThread.java
 +++ b/src/main/java/net/minecraft/server/FileIOThread.java
@@ -39,11 +39,15 @@ public class FileIOThread implements Runnable {
@ -162,5 +162,5 @@ index 1d6b1874c..9ee4115be 100644
 
         if (this.b.isEmpty()) {
 -- 
-2.13.4
+2.14.3

--- a/Spigot-Server-Patches/0066-Chunk-Save-Reattempt.patch
+++ b/Spigot-Server-Patches/0066-Chunk-Save-Reattempt.patch
@ -1,4 +1,4 @@
-From ed5ec72d4b67b763f70a69cd395a526a8c483b6a Mon Sep 17 00:00:00 2001
+From 8aa4fd3f27fff342a97065ddfbe6c143ccf91f55 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 772da28aa..6f2c192af 100644
+index 4c3faa20..12bd558a 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -194,11 +194,16 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@ -28,7 +28,7 @@ index 772da28aa..6f2c192af 100644
                 synchronized (lock) { if (this.b.get(chunkcoordintpair) == chunk.compoundSupplier) { 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 6a92b5af8..5bcbd718f 100644
+index 6a92b5af..5bcbd718 100644
 --- a/src/main/java/net/minecraft/server/RegionFile.java
 +++ b/src/main/java/net/minecraft/server/RegionFile.java
@@ -210,8 +210,7 @@ public class RegionFile {
@ -42,5 +42,5 @@ index 6a92b5af8..5bcbd718f 100644
 
     }
 -- 
-2.13.4
+2.14.3

--- a/Spigot-Server-Patches/0067-Default-loading-permissions.yml-before-plugins.patch
+++ b/Spigot-Server-Patches/0067-Default-loading-permissions.yml-before-plugins.patch
@ -1,4 +1,4 @@
-From 051d2c48ffa254b918d0e4ef4075acd11247c595 Mon Sep 17 00:00:00 2001
+From 59a7aa4ed75ec50385be412519acc32e79b5923b 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
@ -30,7 +30,7 @@ index 3898ad8f..2f6e169f 100644
 +    }
 }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 137601d1..776f165b 100644
+index 16b8d38a..9e50bc49 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -322,6 +322,7 @@ public final class CraftServer implements Server {
@ -51,5 +51,5 @@ index 137601d1..776f165b 100644
             CraftDefaultPermissions.registerCorePermissions();
             helpMap.initializeCommands();
 -- 
-2.15.1.windows.2
+2.14.3

--- a/Spigot-Server-Patches/0068-Allow-Reloading-of-Custom-Permissions.patch
+++ b/Spigot-Server-Patches/0068-Allow-Reloading-of-Custom-Permissions.patch
@ -1,4 +1,4 @@
-From e225af03264c4a4d03f205304964d22c755ce47d Mon Sep 17 00:00:00 2001
+From dd903cb350bb0f8ed52213d417523ca1de2527cb 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 776f165b..5df0fed2 100644
+index 9e50bc49..fd4e0279 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1863,5 +1863,20 @@ public final class CraftServer implements Server {
@ -31,5 +31,5 @@ index 776f165b..5df0fed2 100644
     // Paper end
 }
 -- 
-2.15.1.windows.2
+2.14.3

--- a/Spigot-Server-Patches/0069-Remove-Metadata-on-reload.patch
+++ b/Spigot-Server-Patches/0069-Remove-Metadata-on-reload.patch
@ -1,4 +1,4 @@
-From 062794319b62f22d10b7085e266d305551b6a82c Mon Sep 17 00:00:00 2001
+From 3c10de727781081009381cdd8eaebac04040ceff 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 5df0fed2..728d0ff8 100644
+index fd4e0279..5d15d584 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -743,8 +743,18 @@ public final class CraftServer implements Server {
@ -30,5 +30,5 @@ index 5df0fed2..728d0ff8 100644
         reloadData();
         org.spigotmc.SpigotConfig.registerCommands(); // Spigot
 -- 
-2.15.1.windows.2
+2.14.3

--- a/Spigot-Server-Patches/0070-Undead-horse-leashing.patch
+++ b/Spigot-Server-Patches/0070-Undead-horse-leashing.patch
@ -1,4 +1,4 @@
-From 13fc523d37a56bf1c6e29656573d3c647df3b68a Mon Sep 17 00:00:00 2001
+From 513c54e1769c36f21bdfccde4bfaf9100a935950 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
@ -6,10 +6,10 @@ Subject: [PATCH] Undead horse leashing
 default false to match vanilla, but option to allow undead horse types to be leashed.

 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 9987a5c7a..0873febb6 100644
+index f002ef27..47738624 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -249,4 +249,9 @@ public class PaperWorldConfig {
+@@ -241,4 +241,9 @@ public class PaperWorldConfig {
     private void nonPlayerEntitiesOnScoreboards() {
         nonPlayerEntitiesOnScoreboards = getBoolean("allow-non-player-entities-on-scoreboards", false);
     }
@ -20,7 +20,7 @@ index 9987a5c7a..0873febb6 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
-index 46d1ea217..dcc39236f 100644
+index 46d1ea21..dcc39236 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
@@ -115,7 +115,7 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven
@ -33,5 +33,5 @@ index 46d1ea217..dcc39236f 100644
 
     protected void q(float f) {
 -- 
-2.13.1
+2.14.3

--- a/Spigot-Server-Patches/0071-Fix-Furnace-cook-time-bug.patch
+++ b/Spigot-Server-Patches/0071-Fix-Furnace-cook-time-bug.patch
@ -1,4 +1,4 @@
-From 1f5e3b8cd3c4a90bd433b56172f9b84f11eb65ed Mon Sep 17 00:00:00 2001
+From c36013fd353a1f51ac3e51fae0054caf6d0bb405 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
@ -9,7 +9,7 @@ cook in the expected amount of time as the cook time was not decremented correct
 This patch ensures that furnaces cook to the correct wall time expectation.

 diff --git a/src/main/java/net/minecraft/server/TileEntityFurnace.java b/src/main/java/net/minecraft/server/TileEntityFurnace.java
-index 2f1f3edf5..e230d1608 100644
+index 886a73e9..7a142810 100644
 --- a/src/main/java/net/minecraft/server/TileEntityFurnace.java
 +++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java
@@ -165,7 +165,7 @@ public class TileEntityFurnace extends TileEntityContainer implements ITickable,
@ -22,5 +22,5 @@ index 2f1f3edf5..e230d1608 100644
                 this.burn();
                 flag1 = true;
 -- 
-2.12.2.windows.2
+2.14.3

--- a/Spigot-Server-Patches/0072-Handle-Item-Meta-Inconsistencies.patch
+++ b/Spigot-Server-Patches/0072-Handle-Item-Meta-Inconsistencies.patch
@ -1,4 +1,4 @@
-From 00260e9433c13cfcf1dee3927ee3a9e905c4a8dc Mon Sep 17 00:00:00 2001
+From 41148ad75dcb5ba9bfbff7a6bfa03d861f50cf03 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/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 0dcea61d2..a8f7ff98f 100644
+index 0dcea61d..a8f7ff98 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -56,6 +56,22 @@ public final class ItemStack {
@ -69,7 +69,7 @@ index 0dcea61d2..a8f7ff98f 100644
 
     public boolean hasEnchantments() {
 diff --git a/src/main/java/net/minecraft/server/NBTTagList.java b/src/main/java/net/minecraft/server/NBTTagList.java
-index ca9eb2f3b..576c3b714 100644
+index ca9eb2f3..576c3b71 100644
 --- a/src/main/java/net/minecraft/server/NBTTagList.java
 +++ b/src/main/java/net/minecraft/server/NBTTagList.java
@@ -14,6 +14,12 @@ public class NBTTagList extends NBTBase {
@ -86,7 +86,7 @@ index ca9eb2f3b..576c3b714 100644
 
     public NBTTagList() {}
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index fb1dc542d..cdf16e15a 100644
+index fb1dc542..cdf16e15 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;
@ -212,7 +212,7 @@ index fb1dc542d..cdf16e15a 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 c743ae066..0cdc8007a 100644
+index c743ae06..0cdc8007 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;
@ -358,5 +358,5 @@ index c743ae066..0cdc8007a 100644
     private final Spigot spigot = new Spigot()
     {
 -- 
-2.15.1
+2.14.3

--- a/Spigot-Server-Patches/0073-Configurable-Non-Player-Arrow-Despawn-Rate.patch
+++ b/Spigot-Server-Patches/0073-Configurable-Non-Player-Arrow-Despawn-Rate.patch
@ -1,4 +1,4 @@
-From f97a0149fe312629f4b29fce2ac49eacc0456754 Mon Sep 17 00:00:00 2001
+From 8bf1a9974147fc46939b2b86f09f7fe4f79ac427 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
@ -6,10 +6,10 @@ Subject: [PATCH] Configurable Non Player Arrow Despawn Rate
 Can set a much shorter despawn rate for arrows that players can not pick up.

 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 0873febb6..b37b5901b 100644
+index 47738624..db40db0d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -254,4 +254,13 @@ public class PaperWorldConfig {
+@@ -246,4 +246,13 @@ public class PaperWorldConfig {
     private void allowLeashingUndeadHorse() {
         allowLeashingUndeadHorse = getBoolean("allow-leashing-undead-horse", false);
     }
@ -24,7 +24,7 @@ index 0873febb6..b37b5901b 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
-index 65689f26d..8cda47518 100644
+index 3ff8b96f..f55eb654 100644
 --- a/src/main/java/net/minecraft/server/EntityArrow.java
 +++ b/src/main/java/net/minecraft/server/EntityArrow.java
@@ -157,7 +157,7 @@ public abstract class EntityArrow extends Entity implements IProjectile {
@ -37,5 +37,5 @@ index 65689f26d..8cda47518 100644
                 }
             }
 -- 
-2.12.2.windows.2
+2.14.3

--- a/Spigot-Server-Patches/0074-Add-World-Util-Methods.patch
+++ b/Spigot-Server-Patches/0074-Add-World-Util-Methods.patch
@ -1,4 +1,4 @@
-From 722ea2a8bface335c87958b7c9337c9e96000c81 Mon Sep 17 00:00:00 2001
+From 34d43d8cfc58035d0896f070e7aa8471bad4d0a1 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
@ -119,5 +119,5 @@ index 6be9c181..9339bf83 100644
         // CraftBukkit start - tree generation
         if (captureTreeGeneration) {
 -- 
-2.15.1.windows.2
+2.14.3

--- a/Spigot-Server-Patches/0075-Optimized-Light-Level-Comparisons.patch
+++ b/Spigot-Server-Patches/0075-Optimized-Light-Level-Comparisons.patch
@ -1,4 +1,4 @@
-From 11e7e276d572aa7ff71afe417b1dc245564d8801 Mon Sep 17 00:00:00 2001
+From c2a48e1b1cab73dacad11ef4a38c1907bae4c4a8 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 128096453..fea81de16 100644
+index c0b88580..55ed0c95 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 128096453..fea81de16 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 d0fa96651..62ec2ad31 100644
+index fe55848b..8fc736d6 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 d0fa96651..62ec2ad31 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 b22949368..cb1e5a2a3 100644
+index 6d0f4c15..3bbb123b 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 b22949368..cb1e5a2a3 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 7492110fa..8d1630ac0 100644
+index f12987c8..5ae7bd9d 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 7492110fa..8d1630ac0 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 21539ff9b..1585bf3bc 100644
+index 0f55cf51..8782bce5 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 21539ff9b..1585bf3bc 100644
     }
 
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 2b619ab93..372890b5d 100644
+index 277f1414..6111ca0b 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 2b619ab93..372890b5d 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.13.0.windows.1
+2.14.3

--- a/Spigot-Server-Patches/0076-Pass-world-to-Village-creation.patch
+++ b/Spigot-Server-Patches/0076-Pass-world-to-Village-creation.patch
@ -1,4 +1,4 @@
-From 7cb360d7aec57c15e7ce8b669d28fd9de086ffc3 Mon Sep 17 00:00:00 2001
+From 78ae8cc0f56bec8e4fa7d851fe63fb846d7b3ec7 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 a5b79ecad..01f7cee38 100644
+index a5b79eca..01f7cee3 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 a5b79ecad..01f7cee38 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 2ab381d50..817c836c3 100644
+index fb52785b..2eb33a98 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 2ab381d50..817c836c3 100644
         this.d = BlockPosition.ZERO;
         this.j = Maps.newHashMap();
 -- 
-2.12.2.windows.2
+2.14.3

--- a/Spigot-Server-Patches/0077-Custom-replacement-for-eaten-items.patch
+++ b/Spigot-Server-Patches/0077-Custom-replacement-for-eaten-items.patch
@ -1,11 +1,11 @@
-From 829f8ecf34a2f9572199f5378dcec701cc7bc844 Mon Sep 17 00:00:00 2001
+From 43a8e8c9b03128433633aa173352ee4529a83541 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 5a6b33981..4c632bb68 100644
+index 5a6b3398..4c632bb6 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2375,12 +2375,13 @@ public abstract class EntityLiving extends Entity {
--- a/Spigot-Server-Patches/0078-handle-NaN-health-absorb-values-and-repair-bad-data.patch
+++ b/Spigot-Server-Patches/0078-handle-NaN-health-absorb-values-and-repair-bad-data.patch
@ -1,11 +1,11 @@
-From 963710f477c9ccd12871c3fdc6e1da211c98bb36 Mon Sep 17 00:00:00 2001
+From 7fa0e0a09851cee926ea6ee93744b88bf157259f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 27 Sep 2015 01:18:02 -0400
 Subject: [PATCH] handle NaN health/absorb values and repair bad data


 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 4c632bb68..296c05480 100644
+index 4c632bb6..296c0548 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -488,7 +488,13 @@ public abstract class EntityLiving extends Entity {
@ -44,7 +44,7 @@ index 4c632bb68..296c05480 100644
         }
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 219daa59b..7a5866682 100644
+index f62fa8c7..9fe7a18a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1469,6 +1469,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -56,5 +56,5 @@ index 219daa59b..7a5866682 100644
     }
 
 -- 
-2.15.0
+2.14.3

--- a/Spigot-Server-Patches/0079-Catch-Async-PlayerChunkMap-operations.patch
+++ b/Spigot-Server-Patches/0079-Catch-Async-PlayerChunkMap-operations.patch
@ -1,11 +1,11 @@
-From d47e6d67d27ac3f30c4c14493a48e9d5f53651d4 Mon Sep 17 00:00:00 2001
+From 42feef1fd45b5b935b0bbb322e3d3e48abc66249 Mon Sep 17 00:00:00 2001
 From: Daniel Ennis <dennis@icontact.com>
 Date: Sun, 20 Mar 2016 15:22:42 -0400
 Subject: [PATCH] Catch Async PlayerChunkMap operations


 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index cfac05750..0a0b5261b 100644
+index 9627a9be..ad1d90b5 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
@@ -469,10 +469,12 @@ public class PlayerChunkMap {
@ -22,5 +22,5 @@ index cfac05750..0a0b5261b 100644
         long i = d(chunkcoordintpair.x, chunkcoordintpair.z);
 
 -- 
-2.12.2
+2.14.3

--- a/Spigot-Server-Patches/0080-Support-offline-mode-in-whitelist-command-as-well.patch
+++ b/Spigot-Server-Patches/0080-Support-offline-mode-in-whitelist-command-as-well.patch
@ -1,11 +1,11 @@
-From 7166a39b822d5bf6d55376dcc7956a693891b0aa Mon Sep 17 00:00:00 2001
+From 9915d4088a02b715b36eda4b090a09fbb55abca3 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 c74d1d2be..0f4237db1 100644
+index c74d1d2b..0f4237db 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 c74d1d2be..0f4237db1 100644
 +    // Paper end
 }
 -- 
-2.12.2
+2.14.3

--- a/Spigot-Server-Patches/0081-Waving-banner-workaround.patch
+++ b/Spigot-Server-Patches/0081-Waving-banner-workaround.patch
@ -1,4 +1,4 @@
-From 76a5db0ee94c7fb95adac70a4b0a1716cf7c87a9 Mon Sep 17 00:00:00 2001
+From 214262264e7899409a2cde18afb5480a9a130b91 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 c5c3f40c..6413f76e 100644
 
     public void a(PacketDataSerializer packetdataserializer) throws IOException {
 -- 
-2.15.1.windows.2
+2.14.3

--- a/Spigot-Server-Patches/0082-Use-a-Shared-Random-for-Entities.patch
+++ b/Spigot-Server-Patches/0082-Use-a-Shared-Random-for-Entities.patch
@ -1,4 +1,4 @@
-From c14cbce13cf440eff56cd38c718423c3fbd38cd5 Mon Sep 17 00:00:00 2001
+From 4e97c2e91c2a77de52a2dcdd5cfe5fd4185d835b 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 9a1cac844..05d764fa2 100644
+index 9a1cac84..05d764fa 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 {
--- a/Spigot-Server-Patches/0083-Don-t-teleport-dead-entities.patch
+++ b/Spigot-Server-Patches/0083-Don-t-teleport-dead-entities.patch
@ -1,4 +1,4 @@
-From d1970bfea52ebbad7919b325fee197544aed4e13 Mon Sep 17 00:00:00 2001
+From a37aa06bbc370c134338ad5ed72958e0d3c312bd Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 22 Mar 2016 00:55:23 -0400
 Subject: [PATCH] Don't teleport dead entities
@ -7,7 +7,7 @@ Had some issue with this in past, and this is the vanilla logic.
 Potentially an old CB change that's no longer needed.

 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 05d764fa2..a6d472139 100644
+index 05d764fa..a6d47213 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2356,7 +2356,7 @@ public abstract class Entity implements ICommandListener {
--- a/Spigot-Server-Patches/0084-Optimize-Chunk-Access.patch
+++ b/Spigot-Server-Patches/0084-Optimize-Chunk-Access.patch
@ -1,4 +1,4 @@
-From 970bfaa3a4f890a498b229a790fef7cb6780de63 Mon Sep 17 00:00:00 2001
+From 895c7044c86e42baa2d33241050f436c21315ec9 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 9449b645..c81b404b 100644
+index 4e51585a..15814f66 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 9449b645..c81b404b 100644
 
     public ChunkProviderServer(WorldServer worldserver, IChunkLoader ichunkloader, ChunkGenerator chunkgenerator) {
 -- 
-2.13.1.windows.2
+2.14.3

--- a/Spigot-Server-Patches/0085-Configurable-spawn-chances-for-skeleton-horses.patch
+++ b/Spigot-Server-Patches/0085-Configurable-spawn-chances-for-skeleton-horses.patch
@ -1,14 +1,14 @@
-From 6e18fbc081ded96ffa9b24ea6dfbcb1a49bfe924 Mon Sep 17 00:00:00 2001
+From 4a32500b8f95a5b791d8cf3b2f354b319544c5a9 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 22 Mar 2016 12:04:28 -0500
 Subject: [PATCH] Configurable spawn chances for skeleton horses


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index b37b5901..adc81072 100644
+index db40db0d..8027700d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -263,4 +263,9 @@ public class PaperWorldConfig {
+@@ -255,4 +255,9 @@ public class PaperWorldConfig {
         }
         log("Non Player Arrow Despawn Rate: " + nonPlayerArrowDespawnRate);
     }
@ -19,7 +19,7 @@ index b37b5901..adc81072 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index a00837f9..8e4697a0 100644
+index 9ef492f1..72dc2008 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -493,7 +493,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@ -32,5 +32,5 @@ index a00837f9..8e4697a0 100644
 
                             entityhorseskeleton.p(true);
 -- 
-2.13.1.windows.2
+2.14.3

--- a/Spigot-Server-Patches/0086-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
+++ b/Spigot-Server-Patches/0086-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
@ -1,4 +1,4 @@
-From 66124bd3037af7b231c57fd9b90226497c4495af Mon Sep 17 00:00:00 2001
+From 83aa50c2c80d1e27071ddc42948717897b3baff5 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
@ -12,7 +12,7 @@ Replace all calls to the new place to the unnecessary forward.
 Optimize getType and getBlockData to manually inline and optimize the calls

 diff --git a/src/main/java/net/minecraft/server/BaseBlockPosition.java b/src/main/java/net/minecraft/server/BaseBlockPosition.java
-index d55e180d7..679d5504e 100644
+index d55e180d..679d5504 100644
 --- a/src/main/java/net/minecraft/server/BaseBlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BaseBlockPosition.java
@@ -10,6 +10,14 @@ public class BaseBlockPosition implements Comparable<BaseBlockPosition> {
@ -31,7 +31,7 @@ index d55e180d7..679d5504e 100644
     public BaseBlockPosition(int i, int j, int k) {
         this.a = i;
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index 67b476b22..008ed206d 100644
+index 67b476b2..008ed206 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
@@ -339,6 +339,16 @@ public class BlockPosition extends BaseBlockPosition {
@ -52,7 +52,7 @@ index 67b476b22..008ed206d 100644
         public MutableBlockPosition() {
             this(0, 0, 0);
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index a15befd6a..6bf2f8d2d 100644
+index 84a88056..172d00bd 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -406,11 +406,27 @@ public class Chunk {
@ -86,7 +86,7 @@ index a15befd6a..6bf2f8d2d 100644
             IBlockData iblockdata = null;
 
 diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java
-index 3d784d0dc..afdc4a779 100644
+index 3d784d0d..afdc4a77 100644
 --- a/src/main/java/net/minecraft/server/ChunkSection.java
 +++ b/src/main/java/net/minecraft/server/ChunkSection.java
@@ -5,7 +5,7 @@ public class ChunkSection {
@ -99,7 +99,7 @@ index 3d784d0dc..afdc4a779 100644
     private NibbleArray skyLight;
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 5546f95b9..6b93dcca8 100644
+index 9339bf83..a20c9810 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -277,12 +277,12 @@ public abstract class World implements IBlockAccess {
@ -256,5 +256,5 @@ index 5546f95b9..6b93dcca8 100644
         } else {
             Chunk chunk = this.chunkProvider.getLoadedChunkAt(blockposition.getX() >> 4, blockposition.getZ() >> 4);
 -- 
-2.15.1
+2.14.3

--- a/Spigot-Server-Patches/0087-Fix-cooked-fish-legacy-import.patch
+++ b/Spigot-Server-Patches/0087-Fix-cooked-fish-legacy-import.patch
@ -1,4 +1,4 @@
-From 62ffa640940adcb317f89eea7f5a29462ab9c909 Mon Sep 17 00:00:00 2001
+From 95d1ad0c392010288eab3405f471248e8b91ca93 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 87b82eb3..a7c71f40 100644
         DataConverterMaterialId.a[352] = "minecraft:bone";
         DataConverterMaterialId.a[353] = "minecraft:sugar";
 -- 
-2.13.1.windows.2
+2.14.3

--- a/Spigot-Server-Patches/0088-Access-items-by-EquipmentSlot.patch
+++ b/Spigot-Server-Patches/0088-Access-items-by-EquipmentSlot.patch
@ -1,11 +1,11 @@
-From 1c3f66e29a58bdc85e459e793173d4febc431df3 Mon Sep 17 00:00:00 2001
+From bf706ec07b796e1b09610c8e0231e4631bf11bd5 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 67c54899d..3f58c34e0 100644
+index 67c54899..3f58c34e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
@@ -267,4 +267,54 @@ public class CraftInventoryPlayer extends CraftInventory implements org.bukkit.i
@ -64,5 +64,5 @@ index 67c54899d..3f58c34e0 100644
 +    // Paper end
 }
 -- 
-2.13.2
+2.14.3

--- a/Spigot-Server-Patches/0089-Check-async-remove-unused-vars-GH-159.patch
+++ b/Spigot-Server-Patches/0089-Check-async-remove-unused-vars-GH-159.patch
@ -1,4 +1,4 @@
-From 95c8f83b6d05e0a205c94a3f9c0509617ee71061 Mon Sep 17 00:00:00 2001
+From 8f7efee55b677903cf40c93b21b00163a9e8b1e1 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
@ -28,5 +28,5 @@ index 68a04532..45a83ae9 100644
                     if ((mobcnt = getEntityCount(worldserver, enumcreaturetype.a())) <= limit * i / 256) {
                         BlockPosition.MutableBlockPosition blockposition_mutableblockposition = new BlockPosition.MutableBlockPosition();
 -- 
-2.13.1.windows.2
+2.14.3

--- a/Spigot-Server-Patches/0090-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
+++ b/Spigot-Server-Patches/0090-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
@ -1,4 +1,4 @@
-From 64683f371daad0082a825007f7f531cc5c55d029 Mon Sep 17 00:00:00 2001
+From bbb8d54be68328cd031be2cd296ed83e5f3e939c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 19:55:45 -0400
 Subject: [PATCH] Option to disable BlockPhysicsEvent for Redstone
@ -11,10 +11,10 @@ Defaulting this to false will provide substantial performance improvement
 by saving millions of event calls on redstone heavy servers.

 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index adc810720..e706efff5 100644
+index 8027700d..923a7200 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -268,4 +268,9 @@ public class PaperWorldConfig {
+@@ -260,4 +260,9 @@ public class PaperWorldConfig {
     private void skeleHorseSpawnChance() {
         skeleHorseSpawnChance = getDouble("skeleton-horse-thunder-spawn-chance", 0.01D); // -1.0D represents a "vanilla" state
     }
@ -25,7 +25,7 @@ index adc810720..e706efff5 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index e93c45cfc..f079d62e7 100644
+index a20c9810..03f07677 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -582,7 +582,7 @@ public abstract class World implements IBlockAccess {
@ -38,7 +38,7 @@ index e93c45cfc..f079d62e7 100644
                     this.getServer().getPluginManager().callEvent(event);
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 72dc20087..f2ddc22dd 100644
+index 72dc2008..f2ddc22d 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -35,6 +35,7 @@ import org.bukkit.event.weather.LightningStrikeEvent;
@ -67,5 +67,5 @@ index 72dc20087..f2ddc22dd 100644
                         timing.stopTiming(); // Paper
                     } else {
 -- 
-2.14.1
+2.14.3

--- a/Spigot-Server-Patches/0091-Entity-AddTo-RemoveFrom-World-Events.patch
+++ b/Spigot-Server-Patches/0091-Entity-AddTo-RemoveFrom-World-Events.patch
@ -1,11 +1,11 @@
-From 0a2a8de008cd59aab6ac5aef1233fc37c3ab76c2 Mon Sep 17 00:00:00 2001
+From c656be4ffec7d9daac8f8278ecf04bb13b568744 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 d038a3da7..c6c85a5f1 100644
+index 03f07677..97499aeb 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -1185,6 +1185,7 @@ public abstract class World implements IBlockAccess {
@ -25,5 +25,5 @@ index d038a3da7..c6c85a5f1 100644
     }
 
 -- 
-2.15.1
+2.14.3

--- a/Spigot-Server-Patches/0092-Configurable-Chunk-Inhabited-Timer.patch
+++ b/Spigot-Server-Patches/0092-Configurable-Chunk-Inhabited-Timer.patch
@ -1,4 +1,4 @@
-From 85af59e5efe9dc63852fd38624fae257d95cdc56 Mon Sep 17 00:00:00 2001
+From d2894c5ff5eefbe0b68d0ccfefc49b5493d5e1ef 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
@ -9,10 +9,10 @@ aspects of vanilla gameplay to this factor.
 For people who want all chunks to be treated equally, you can disable the timer.

 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index e706efff..2c682ccf 100644
+index 923a7200..aa923406 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -273,4 +273,9 @@ public class PaperWorldConfig {
+@@ -265,4 +265,9 @@ public class PaperWorldConfig {
     private void firePhysicsEventForRedstone() {
         firePhysicsEventForRedstone = getBoolean("fire-physics-event-for-redstone", firePhysicsEventForRedstone);
     }
@ -36,5 +36,5 @@ index 172d00bd..300a5619 100644
 
     public void c(long i) {
 -- 
-2.15.1.windows.2
+2.14.3

--- a/Spigot-Server-Patches/0093-EntityPathfindEvent.patch
+++ b/Spigot-Server-Patches/0093-EntityPathfindEvent.patch
@ -1,4 +1,4 @@
-From ad43c73e95af0079283990272e0583063d7dd4ca Mon Sep 17 00:00:00 2001
+From c0bd0c65c216796321650a58bd0fd505ef23406b 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 cc44d30b..3ac6f84d 100644
                 float f = this.i();
 
 -- 
-2.13.1.windows.2
+2.14.3

--- a/Spigot-Server-Patches/0094-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
+++ b/Spigot-Server-Patches/0094-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
@ -1,4 +1,4 @@
-From fd37edca846d81afb65cd70f00f7b94d3b61bf39 Mon Sep 17 00:00:00 2001
+From 430494f70a3e392c7c90dc61bea75e6aea263c38 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 739b9aac..ff90e08e 100644
                 if (this.material == Material.LAVA) {
                     this.fizz(world, blockposition);
 -- 
-2.13.1.windows.2
+2.14.3

--- a/Spigot-Server-Patches/0095-Reduce-IO-ops-opening-a-new-region-file.patch
+++ b/Spigot-Server-Patches/0095-Reduce-IO-ops-opening-a-new-region-file.patch
@ -1,4 +1,4 @@
-From 3619fe0c11a4a4d44e4c69b4777030fa69aa52c5 Mon Sep 17 00:00:00 2001
+From 3f1afe5e7b801093fabae4b6a17daeecd27e258c 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 5bcbd718..2bd85e2d 100644
             }
         } catch (IOException ioexception) {
 -- 
-2.13.1.windows.2
+2.14.3

--- a/Spigot-Server-Patches/0096-Sanitise-RegionFileCache-and-make-configurable.patch
+++ b/Spigot-Server-Patches/0096-Sanitise-RegionFileCache-and-make-configurable.patch
@ -1,4 +1,4 @@
-From a774cbcdff02938f6689937656fd836f34fa848e Mon Sep 17 00:00:00 2001
+From 30fa5aba6e6c64938c45d420e8856c3fefdf3e58 Mon Sep 17 00:00:00 2001
 From: Antony Riley <antony@cyberiantiger.org>
 Date: Tue, 29 Mar 2016 08:22:55 +0300
 Subject: [PATCH] Sanitise RegionFileCache and make configurable.
@ -77,5 +77,5 @@ index 5f9e9dde..7e756580 100644
         Iterator iterator = RegionFileCache.a.values().iterator();
 
 -- 
-2.13.1.windows.2
+2.14.3

--- a/Spigot-Server-Patches/0097-Use-Optimized-Collections.patch
+++ b/Spigot-Server-Patches/0097-Use-Optimized-Collections.patch
@ -1,4 +1,4 @@
-From 92c11ac4d9226bc25c8f4b82fbf686c30b8c4660 Mon Sep 17 00:00:00 2001
+From f2a16d213b5259477eb5bdb9790116c5a627b13b 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/DataWatcher.java b/src/main/java/net/minecraft/server/DataWatcher.java
-index 1507f97fd..fe8484453 100644
+index 1507f97f..fe848445 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;
@ -34,5 +34,5 @@ index 1507f97fd..fe8484453 100644
     private boolean f = true;
     private boolean g;
 -- 
-2.13.0
+2.14.3

--- a/Spigot-Server-Patches/0098-Do-not-load-chunks-for-light-checks.patch
+++ b/Spigot-Server-Patches/0098-Do-not-load-chunks-for-light-checks.patch
@ -1,4 +1,4 @@
-From 4bc812256242f853920650f26f7626f2a4a4fc21 Mon Sep 17 00:00:00 2001
+From bbb44b54bb0a777d7b3907688af0cf057396d725 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 79216be29..7164f224f 100644
+index 97499aeb..279f0a26 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -764,6 +764,7 @@ public abstract class World implements IBlockAccess {
@ -19,5 +19,5 @@ index 79216be29..7164f224f 100644
                 Chunk chunk = this.getChunkAtWorldCoords(blockposition);
 
 -- 
-2.13.3.windows.1
+2.14.3

--- a/Spigot-Server-Patches/0099-Add-PlayerUseUnknownEntityEvent.patch
+++ b/Spigot-Server-Patches/0099-Add-PlayerUseUnknownEntityEvent.patch
@ -1,11 +1,11 @@
-From 79f3d91dc543274a2178db9afdc35eb51a49da4b Mon Sep 17 00:00:00 2001
+From 53c71782706b642bce798cd5af6b32cea8bd2ecd 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


 diff --git a/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java b/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java
-index c67cb54a3..521f46262 100644
+index c67cb54a..521f4626 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java
@@ -5,7 +5,7 @@ import javax.annotation.Nullable;
@ -18,7 +18,7 @@ index c67cb54a3..521f46262 100644
     private Vec3D c;
     private EnumHand d;
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 5cc5dbcd7..70fb4f6b0 100644
+index 5cc5dbcd..70fb4f6b 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1657,6 +1657,16 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
--- a/Spigot-Server-Patches/0100-Fix-reducedDebugInfo-not-initialized-on-client.patch
+++ b/Spigot-Server-Patches/0100-Fix-reducedDebugInfo-not-initialized-on-client.patch
@ -1,11 +1,11 @@
-From 421d357eb2ae97cda5e4f7a787df50d64161f834 Mon Sep 17 00:00:00 2001
+From e389317bbc486c5205df6f61bf88c76981a5d0f2 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 b90407d18..4b2865506 100644
+index b38ff689..7bdd5bcf 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -160,6 +160,7 @@ public abstract class PlayerList {
@ -17,5 +17,5 @@ index b90407d18..4b2865506 100644
         entityplayer.getStatisticManager().c();
         entityplayer.F().a(entityplayer);
 -- 
-2.13.0
+2.14.3

--- a/Spigot-Server-Patches/0101-Configurable-Grass-Spread-Tick-Rate.patch
+++ b/Spigot-Server-Patches/0101-Configurable-Grass-Spread-Tick-Rate.patch
@ -1,14 +1,14 @@
-From cbb44b27b60dca8248b7097389a2d1c6c2875dcd Mon Sep 17 00:00:00 2001
+From 7745c33d90b8c89977af2aa75adff679f16f222f 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


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 2c682ccf..74a49a5f 100644
+index aa923406..afbfbdf8 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -278,4 +278,10 @@ public class PaperWorldConfig {
+@@ -270,4 +270,10 @@ public class PaperWorldConfig {
     private void useInhabitedTime() {
         useInhabitedTime = getBoolean("use-chunk-inhabited-timer", true);
     }
@ -32,5 +32,5 @@ index 8fc736d6..b656994b 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.13.1.windows.2
+2.14.3

--- a/Spigot-Server-Patches/0102-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/Spigot-Server-Patches/0102-Configurable-Keep-Spawn-Loaded-range-per-world.patch
@ -1,4 +1,4 @@
-From 3ab35b757a837b4b28a3418167eae80c64cebd2a Mon Sep 17 00:00:00 2001
+From 7dd194bbef759969b45373918fcf12656d029fa2 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
@ -6,10 +6,10 @@ Subject: [PATCH] Configurable Keep Spawn Loaded range per world
 This lets you disable it for some worlds and lower it for others.

 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 74a49a5fb..3a942c763 100644
+index afbfbdf8..8136d223 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -284,4 +284,10 @@ public class PaperWorldConfig {
+@@ -276,4 +276,10 @@ public class PaperWorldConfig {
         grassUpdateRate = Math.max(0, getInt("grass-spread-tick-rate", grassUpdateRate));
         log("Grass Spread Tick Rate: " + grassUpdateRate);
     }
@ -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 4e8ce79ff..2300ee10b 100644
+index 4e8ce79f..2300ee10 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -357,8 +357,11 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@ -39,7 +39,7 @@ index 4e8ce79ff..2300ee10b 100644
 
                     if (i1 - j > 1000L) {
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 279f0a261..a0b36b6ba 100644
+index 279f0a26..a0b36b6b 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -3200,8 +3200,9 @@ public abstract class World implements IBlockAccess {
@ -54,7 +54,7 @@ index 279f0a261..a0b36b6ba 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 5d15d5846..bc048f292 100644
+index 5d15d584..bc048f29 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -961,7 +961,7 @@ public final class CraftServer implements Server {
@ -67,7 +67,7 @@ index 5d15d5846..bc048f292 100644
             for (int j = -short1; j <= short1; j += 16) {
                 for (int k = -short1; k <= short1; k += 16) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 01fc193db..69dc11e2b 100644
+index 01fc193d..69dc11e2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1283,8 +1283,9 @@ public class CraftWorld implements World {
@ -83,5 +83,5 @@ index 01fc193db..69dc11e2b 100644
                     loadChunk(chunkCoordX + x, chunkCoordZ + z);
                 } else {
 -- 
-2.15.1.windows.2
+2.14.3

--- a/Spigot-Server-Patches/0103-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
+++ b/Spigot-Server-Patches/0103-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
@ -1,11 +1,11 @@
-From 17d62977b12c1bd7bf5c0ac9bd7f460e7ecfbaa4 Mon Sep 17 00:00:00 2001
+From 904c8ee708739505f983b39cf809a39731b3d7fa Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 3 Apr 2016 17:48:50 -0400
 Subject: [PATCH] Fix Cancelling BlockPlaceEvent triggering physics


 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index f235f7483..0ee112756 100644
+index a0b36b6b..f78298a5 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -536,6 +536,7 @@ public abstract class World implements IBlockAccess {
@ -17,5 +17,5 @@ index f235f7483..0ee112756 100644
         this.a(blockposition.east(), block, blockposition);
         this.a(blockposition.down(), block, blockposition);
 -- 
-2.13.3.windows.1
+2.14.3

--- a/Show More
+++ b/Show More