diff --git a/Spigot-Server-Patches/0030-Generator-Settings.patch b/Spigot-Server-Patches/0030-Generator-Settings.patch
index 743cbdec33..aabef021d5 100644
--- a/Spigot-Server-Patches/0030-Generator-Settings.patch
+++ b/Spigot-Server-Patches/0030-Generator-Settings.patch
@@ -1,14 +1,14 @@
-From d247ea32a5da80867333bba8c86e284be41fa4a1 Mon Sep 17 00:00:00 2001
+From 1041665a9111bf437a33aef1bc08d7842c5ae211 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 db09711e..80500108 100644
+index db09711e4..7e5cd8042 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -147,4 +147,28 @@ public class PaperWorldConfig {
+@@ -147,4 +147,34 @@ public class PaperWorldConfig {
          disableEndCredits = getBoolean("game-mechanics.disable-end-credits", false);
          log("End credits disabled: " + disableEndCredits);
      }
@@ -23,6 +23,9 @@ index db09711e..80500108 100644
 +    public boolean generateTemple;
 +    public boolean generateVillage;
 +    public boolean generateFlatBedrock;
++    public boolean disableExtremeHillsEmeralds;
++    public boolean disableExtremeHillsMonsterEggs;
++    public boolean disableMesaAdditionalGold;
 +
 +    private void generatorSettings() {
 +        generateCanyon = getBoolean("generator-settings.canyon", true);
@@ -35,10 +38,13 @@ index db09711e..80500108 100644
 +        generateTemple = getBoolean("generator-settings.temple", true);
 +        generateVillage = getBoolean("generator-settings.village", true);
 +        generateFlatBedrock = getBoolean("generator-settings.flat-bedrock", false);
++        disableExtremeHillsEmeralds = getBoolean("generator-settings.disable-extreme-hills-emeralds", false);
++        disableExtremeHillsMonsterEggs = getBoolean("generator-settings.disable-extreme-hills-monster-eggs", false);
++        disableMesaAdditionalGold = getBoolean("generator-settings.disable-mesa-additional-gold", false);
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeBase.java b/src/main/java/net/minecraft/server/BiomeBase.java
-index 1b759976..ab6db746 100644
+index 1b7599769..ab6db7468 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 {
@@ -50,8 +56,45 @@ index 1b759976..ab6db746 100644
                  chunksnapshot.a(k1, l1, j1, BiomeBase.c);
              } else {
                  IBlockData iblockdata2 = chunksnapshot.a(k1, l1, j1);
+diff --git a/src/main/java/net/minecraft/server/BiomeBigHills.java b/src/main/java/net/minecraft/server/BiomeBigHills.java
+index 9c39bf7af..61680ab50 100644
+--- a/src/main/java/net/minecraft/server/BiomeBigHills.java
++++ b/src/main/java/net/minecraft/server/BiomeBigHills.java
+@@ -32,6 +32,9 @@ public class BiomeBigHills extends BiomeBase {
+         int k;
+         int l;
+ 
++        // Paper start - Disable extreme hills emeralds
++        if (!world.paperConfig.disableExtremeHillsEmeralds) {
++
+         for (j = 0; j < i; ++j) {
+             k = random.nextInt(16);
+             l = random.nextInt(28) + 4;
+@@ -43,6 +46,12 @@ public class BiomeBigHills extends BiomeBase {
+             }
+         }
+ 
++        }
++        // Paper end block
++
++        // Paper start - Disable extreme hills monster eggs
++        if (!world.paperConfig.disableExtremeHillsMonsterEggs) {
++
+         for (i = 0; i < 7; ++i) {
+             j = random.nextInt(16);
+             k = random.nextInt(64);
+@@ -50,6 +59,9 @@ public class BiomeBigHills extends BiomeBase {
+             this.x.generate(world, random, blockposition.a(j, k, l));
+         }
+ 
++        }
++        // Paper end block
++
+     }
+ 
+     public void a(World world, Random random, ChunkSnapshot chunksnapshot, int i, int j, double d0) {
 diff --git a/src/main/java/net/minecraft/server/BiomeMesa.java b/src/main/java/net/minecraft/server/BiomeMesa.java
-index f2dd96a3..0541403f 100644
+index f2dd96a32..67f8ad8ed 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 {
@@ -63,8 +106,16 @@ index f2dd96a3..0541403f 100644
                  chunksnapshot.a(l, i2, k, BiomeMesa.c);
              } else if (l1 < 15 || this.I) {
                  IBlockData iblockdata2 = chunksnapshot.a(l, i2, k);
+@@ -259,6 +259,7 @@ public class BiomeMesa extends BiomeBase {
+ 
+         protected void a(World world, Random random) {
+             super.a(world, random);
++            if (world.paperConfig.disableMesaAdditionalGold) return; // Paper
+             this.a(world, random, 20, this.n, 32, 80);
+         }
+ 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderFlat.java b/src/main/java/net/minecraft/server/ChunkProviderFlat.java
-index 1452ff65..8b1b7938 100644
+index 1452ff657..8b1b79380 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 +161,7 @@ index 1452ff65..8b1b7938 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 22a24a39..ee9e00e6 100644
+index 22a24a39f..ee9e00e64 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 +272,7 @@ index 22a24a39..ee9e00e6 100644
              }
  
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderHell.java b/src/main/java/net/minecraft/server/ChunkProviderHell.java
-index 9f738749..12bc10ff 100644
+index 9f738749f..12bc10ff0 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 +296,7 @@ index 9f738749..12bc10ff 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/StructureGenerator.java b/src/main/java/net/minecraft/server/StructureGenerator.java
-index 66a80a77..34fd7edf 100644
+index 66a80a776..34fd7edfe 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 {
diff --git a/Spigot-Server-Patches/0031-Optimize-explosions.patch b/Spigot-Server-Patches/0031-Optimize-explosions.patch
index e2d8dd8712..017a71d0cd 100644
--- a/Spigot-Server-Patches/0031-Optimize-explosions.patch
+++ b/Spigot-Server-Patches/0031-Optimize-explosions.patch
@@ -1,4 +1,4 @@
-From a5de89e41e9dcf763cd0318fbab687fb11f534f7 Mon Sep 17 00:00:00 2001
+From 345e60055a56d14763a2e9902b54079ca1ce7f72 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,12 +10,12 @@ 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 80500108..20e1e0c2 100644
+index 7e5cd8042..15675efbf 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -171,4 +171,10 @@ public class PaperWorldConfig {
-         generateVillage = getBoolean("generator-settings.village", true);
-         generateFlatBedrock = getBoolean("generator-settings.flat-bedrock", false);
+@@ -177,4 +177,10 @@ public class PaperWorldConfig {
+         disableExtremeHillsMonsterEggs = getBoolean("generator-settings.disable-extreme-hills-monster-eggs", false);
+         disableMesaAdditionalGold = getBoolean("generator-settings.disable-mesa-additional-gold", false);
      }
 +
 +    public boolean optimizeExplosions;
@@ -25,7 +25,7 @@ index 80500108..20e1e0c2 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
-index a1ebcf85..e7f0e84d 100644
+index a1ebcf858..e7f0e84d4 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 a1ebcf85..e7f0e84d 100644
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index d63a243f..4e8ce79f 100644
+index d63a243f3..4e8ce79ff 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 d63a243f..4e8ce79f 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 77ed2d24..fc7315f7 100644
+index 77ed2d249..fc7315f7d 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;
diff --git a/Spigot-Server-Patches/0033-Fast-draining.patch b/Spigot-Server-Patches/0033-Fast-draining.patch
index 2ce4bd4329..ac6945539b 100644
--- a/Spigot-Server-Patches/0033-Fast-draining.patch
+++ b/Spigot-Server-Patches/0033-Fast-draining.patch
@@ -1,14 +1,14 @@
-From 292af58c27a5bf3bd7e09cd1f03401a877d70716 Mon Sep 17 00:00:00 2001
+From dfbf1e7d43cafde4cfcd6a4c03e53d61bc454f06 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 20e1e0c2..3b96b16f 100644
+index 15675efbf..dbd82d5a9 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -177,4 +177,11 @@ public class PaperWorldConfig {
+@@ -183,4 +183,11 @@ public class PaperWorldConfig {
          optimizeExplosions = getBoolean("optimize-explosions", false);
          log("Optimize explosions: " + optimizeExplosions);
      }
@@ -21,7 +21,7 @@ index 20e1e0c2..3b96b16f 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/BlockFlowing.java b/src/main/java/net/minecraft/server/BlockFlowing.java
-index 3b47253a..3aaa19b2 100644
+index 3b47253a4..3aaa19b2f 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 {
diff --git a/Spigot-Server-Patches/0034-Configurable-lava-flow-speed.patch b/Spigot-Server-Patches/0034-Configurable-lava-flow-speed.patch
index 6cda9ca5c6..1a4bf9d717 100644
--- 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 ec63fe67dffe84268e752bf409cd3b1dfc9f1cb3 Mon Sep 17 00:00:00 2001
+From 39fb008250a9039f1547408fbd9769db26333787 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 3b96b16f..e2d4f4bf 100644
+index dbd82d5a9..b0b3033e7 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -184,4 +184,11 @@ public class PaperWorldConfig {
+@@ -190,4 +190,11 @@ public class PaperWorldConfig {
          fastDrainLava = getBoolean("fast-drain.lava", false);
          fastDrainWater = getBoolean("fast-drain.water", false);
      }
@@ -21,7 +21,7 @@ index 3b96b16f..e2d4f4bf 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/BlockFlowing.java b/src/main/java/net/minecraft/server/BlockFlowing.java
-index 3aaa19b2..739b9aac 100644
+index 3aaa19b2f..739b9aac3 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 3aaa19b2..739b9aac 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 f3eb2a79..d0265f96 100644
+index f3eb2a797..d0265f960 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 {
diff --git a/Spigot-Server-Patches/0036-Disable-explosion-knockback.patch b/Spigot-Server-Patches/0036-Disable-explosion-knockback.patch
index 824f4bd4d1..e4485085c8 100644
--- a/Spigot-Server-Patches/0036-Disable-explosion-knockback.patch
+++ b/Spigot-Server-Patches/0036-Disable-explosion-knockback.patch
@@ -1,14 +1,14 @@
-From 81aa797bd3b65e8a0b413fa9a273207bec071b5b Mon Sep 17 00:00:00 2001
+From f16a164dfccddfb47a36c363b71dd7788bcd2134 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 e2d4f4bf..23a78adb 100644
+index b0b3033e7..afc13e851 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -191,4 +191,9 @@ public class PaperWorldConfig {
+@@ -197,4 +197,9 @@ public class PaperWorldConfig {
          lavaFlowSpeedNormal = getInt("lava-flow-speed.normal", 30);
          lavaFlowSpeedNether = getInt("lava-flow-speed.nether", 10);
      }
@@ -19,7 +19,7 @@ index e2d4f4bf..23a78adb 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index e8401bba..5a6b3398 100644
+index 756590ac0..05d1fc10d 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 e8401bba..5a6b3398 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 e7f0e84d..e148901e 100644
+index e7f0e84d4..e148901e5 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 {
diff --git a/Spigot-Server-Patches/0037-Disable-thunder.patch b/Spigot-Server-Patches/0037-Disable-thunder.patch
index d0fa1b80bd..d718b78640 100644
--- a/Spigot-Server-Patches/0037-Disable-thunder.patch
+++ b/Spigot-Server-Patches/0037-Disable-thunder.patch
@@ -1,14 +1,14 @@
-From 83f30f8074c950acb3da0d367b88805ee3302dea Mon Sep 17 00:00:00 2001
+From 67f8358f906dddc95c4c24cc49351c282adc824c 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 23a78adb..675c8c87 100644
+index afc13e851..4ae2f9af1 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -196,4 +196,9 @@ public class PaperWorldConfig {
+@@ -202,4 +202,9 @@ public class PaperWorldConfig {
      private void disableExplosionKnockback(){
          disableExplosionKnockback = getBoolean("disable-explosion-knockback", false);
      }
@@ -19,7 +19,7 @@ index 23a78adb..675c8c87 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index e492913a..95ea3924 100644
+index e492913a2..95ea3924e 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 {
diff --git a/Spigot-Server-Patches/0038-Disable-ice-and-snow.patch b/Spigot-Server-Patches/0038-Disable-ice-and-snow.patch
index f9581a997b..038a19d676 100644
--- 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 74938698c481006668aab13a9b353407011eb511 Mon Sep 17 00:00:00 2001
+From ee5676d0639aa1732275560b2e20be53f6edb5bb 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 675c8c87..49d14b8e 100644
+index 4ae2f9af1..70b02f020 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -201,4 +201,9 @@ public class PaperWorldConfig {
+@@ -207,4 +207,9 @@ public class PaperWorldConfig {
      private void disableThunder() {
          disableThunder = getBoolean("disable-thunder", false);
      }
@@ -19,7 +19,7 @@ index 675c8c87..49d14b8e 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 95ea3924..9ef492f1 100644
+index 95ea3924e..9ef492f1b 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 {
diff --git a/Spigot-Server-Patches/0039-Configurable-mob-spawner-tick-rate.patch b/Spigot-Server-Patches/0039-Configurable-mob-spawner-tick-rate.patch
index b971206cd5..9254b49b22 100644
--- 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 47726f319a2cf8df91cec25ceaaa7f0f2c436f16 Mon Sep 17 00:00:00 2001
+From 65ef96c994b5143cb8fffada60fade2fa6ce842a 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 49d14b8e9..1fd29332f 100644
+index 70b02f020..f431000d1 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -206,4 +206,9 @@ public class PaperWorldConfig {
+@@ -212,4 +212,9 @@ public class PaperWorldConfig {
      private void disableIceAndSnow(){
          disableIceAndSnow = getBoolean("disable-ice-and-snow", false);
      }
@@ -64,5 +64,5 @@ index 0149726ea..a5261d70b 100644
                  }
  
 -- 
-2.16.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0042-Configurable-container-update-tick-rate.patch b/Spigot-Server-Patches/0042-Configurable-container-update-tick-rate.patch
index 5ada7216cd..83d5354826 100644
--- 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 c3a3ce641affd7a3f4247db2cf67ffcf17e2cca0 Mon Sep 17 00:00:00 2001
+From c8862c15d9b67e0ab06bf16bed2becb5bee083f3 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 1fd29332..83f9512f 100644
+index f431000d1..abcfb9216 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -211,4 +211,9 @@ public class PaperWorldConfig {
+@@ -217,4 +217,9 @@ public class PaperWorldConfig {
      private void mobSpawnerTickRate() {
          mobSpawnerTickRate = getInt("mob-spawner-tick-rate", 1);
      }
@@ -19,7 +19,7 @@ index 1fd29332..83f9512f 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 5b067571..e48121b4 100644
+index 5b0675718..e48121b4a 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 {
diff --git a/Spigot-Server-Patches/0047-Disable-chest-cat-detection.patch b/Spigot-Server-Patches/0047-Disable-chest-cat-detection.patch
index a09055775f..e1f29dc47b 100644
--- 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 5a4192c1b33b2950000032a2f7e40a38e2b933e3 Mon Sep 17 00:00:00 2001
+From 8a0d7626b94d1a66dca31152c8e73d5629babbbe 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 83f9512f..0355b711 100644
+index abcfb9216..4c57b9cbf 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -216,4 +216,9 @@ public class PaperWorldConfig {
+@@ -222,4 +222,9 @@ public class PaperWorldConfig {
      private void containerUpdateTickRate() {
          containerUpdateTickRate = getInt("container-update-tick-rate", 1);
      }
@@ -19,7 +19,7 @@ index 83f9512f..0355b711 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/BlockChest.java b/src/main/java/net/minecraft/server/BlockChest.java
-index da2cfe20..bc398ec5 100644
+index da2cfe206..bc398ec52 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 {
diff --git 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
index 2841a1996b..700829822c 100644
--- 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 aa4e3394125e58d84fb818b4ee05949172582ccf Mon Sep 17 00:00:00 2001
+From 79dbad715acc2a9afa9b55b2cfacdf7520d48080 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 0355b711..3176379c 100644
+index 4c57b9cbf..a289ba019 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -221,4 +221,9 @@ public class PaperWorldConfig {
+@@ -227,4 +227,9 @@ public class PaperWorldConfig {
      private void disableChestCatDetection() {
          disableChestCatDetection = getBoolean("game-mechanics.disable-chest-cat-detection", false);
      }
@@ -19,7 +19,7 @@ index 0355b711..3176379c 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntitySlime.java b/src/main/java/net/minecraft/server/EntitySlime.java
-index 272b2265..3d3a9ca0 100644
+index 272b22652..3d3a9ca04 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 {
diff --git a/Spigot-Server-Patches/0057-Add-configurable-portal-search-radius.patch b/Spigot-Server-Patches/0057-Add-configurable-portal-search-radius.patch
index b97fae8568..be24ac434f 100644
--- 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 ca0d6ed8d4b207343343badd7336c5040402f89a Mon Sep 17 00:00:00 2001
+From 3dc4aded0ca26267f9b737e34272a10cb89045de 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 3176379c..27fac9ef 100644
+index a289ba019..38ccabc0d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -226,4 +226,9 @@ public class PaperWorldConfig {
+@@ -232,4 +232,9 @@ public class PaperWorldConfig {
      private void allChunksAreSlimeChunks() {
          allChunksAreSlimeChunks = getBoolean("all-chunks-are-slime-chunks", false);
      }
@@ -19,7 +19,7 @@ index 3176379c..27fac9ef 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PortalTravelAgent.java b/src/main/java/net/minecraft/server/PortalTravelAgent.java
-index d1c67e39..f4972979 100644
+index d1c67e396..f49729796 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 d1c67e39..f4972979 100644
              return false;
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftTravelAgent.java b/src/main/java/org/bukkit/craftbukkit/CraftTravelAgent.java
-index 1d5dce10..7ca2617a 100644
+index 1d5dce10e..7ca2617a8 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 {
diff --git a/Spigot-Server-Patches/0059-Fix-inter-world-teleportation-glitches.patch b/Spigot-Server-Patches/0059-Fix-inter-world-teleportation-glitches.patch
index a51c75f491..a328bdc5a2 100644
--- 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 d8e52ce9b80cbf35b0c67abf63011597ac02227f Mon Sep 17 00:00:00 2001
+From 2256c77fd4bb1f31314fe41b9fd91504517b70d4 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 27fac9efb..1fb9cff93 100644
+index 38ccabc0d..b241c0380 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -231,4 +231,9 @@ public class PaperWorldConfig {
+@@ -237,4 +237,9 @@ public class PaperWorldConfig {
      private void portalSearchRadius() {
          portalSearchRadius = getInt("portal-search-radius", 128);
      }
@@ -39,5 +39,5 @@ index c14100ac6..6a43f5674 100644
          return true;
      }
 -- 
-2.16.1
+2.14.3
 
diff --git 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
index 627e357bb1..4e9c5f3351 100644
--- 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 b7123bd1a147a200878cc069bc94f6a173b3ceba Mon Sep 17 00:00:00 2001
+From f30a3addfcffdcb278c89d99217f9b3c6a9e9ab7 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 1fb9cff9..f002ef27 100644
+index b241c0380..a4c94845b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -236,4 +236,9 @@ public class PaperWorldConfig {
+@@ -242,4 +242,9 @@ public class PaperWorldConfig {
      private void disableTeleportationSuffocationCheck() {
          disableTeleportationSuffocationCheck = getBoolean("disable-teleportation-suffocation-check", false);
      }
@@ -25,7 +25,7 @@ index 1fb9cff9..f002ef27 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/CommandScoreboard.java b/src/main/java/net/minecraft/server/CommandScoreboard.java
-index ec9a8723..b08274d9 100644
+index ec9a87239..b08274d93 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 ec9a8723..b08274d9 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 438624dd..9a1cac84 100644
+index 438624dd7..9a1cac844 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 {
diff --git a/Spigot-Server-Patches/0070-Undead-horse-leashing.patch b/Spigot-Server-Patches/0070-Undead-horse-leashing.patch
index bac00c4fc9..ce2f6a0bf4 100644
--- a/Spigot-Server-Patches/0070-Undead-horse-leashing.patch
+++ b/Spigot-Server-Patches/0070-Undead-horse-leashing.patch
@@ -1,4 +1,4 @@
-From 513c54e1769c36f21bdfccde4bfaf9100a935950 Mon Sep 17 00:00:00 2001
+From 6da4750f26b7861285d45bfe2a164780f32dcab5 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 f002ef27..47738624 100644
+index a4c94845b..faacd86ba 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -241,4 +241,9 @@ public class PaperWorldConfig {
+@@ -247,4 +247,9 @@ public class PaperWorldConfig {
      private void nonPlayerEntitiesOnScoreboards() {
          nonPlayerEntitiesOnScoreboards = getBoolean("allow-non-player-entities-on-scoreboards", false);
      }
@@ -20,7 +20,7 @@ index f002ef27..47738624 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
-index 46d1ea21..dcc39236 100644
+index 46d1ea217..dcc39236f 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
diff --git a/Spigot-Server-Patches/0073-Configurable-Non-Player-Arrow-Despawn-Rate.patch b/Spigot-Server-Patches/0073-Configurable-Non-Player-Arrow-Despawn-Rate.patch
index c90f78c56b..19c4354a49 100644
--- 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 8bf1a9974147fc46939b2b86f09f7fe4f79ac427 Mon Sep 17 00:00:00 2001
+From 13b6f5ac556822bec0916f8ef59f0f4a5ad15713 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 47738624..db40db0d 100644
+index faacd86ba..f71580393 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -246,4 +246,13 @@ public class PaperWorldConfig {
+@@ -252,4 +252,13 @@ public class PaperWorldConfig {
      private void allowLeashingUndeadHorse() {
          allowLeashingUndeadHorse = getBoolean("allow-leashing-undead-horse", false);
      }
@@ -24,7 +24,7 @@ index 47738624..db40db0d 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
-index 3ff8b96f..f55eb654 100644
+index 3ff8b96f1..f55eb654b 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 {
diff --git a/Spigot-Server-Patches/0085-Configurable-spawn-chances-for-skeleton-horses.patch b/Spigot-Server-Patches/0085-Configurable-spawn-chances-for-skeleton-horses.patch
index a3c33f3303..12db301e55 100644
--- 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 4a32500b8f95a5b791d8cf3b2f354b319544c5a9 Mon Sep 17 00:00:00 2001
+From 32ea091c63092b3c8c17059ea2b44fbdf207a088 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 db40db0d..8027700d 100644
+index f71580393..38d664e00 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -255,4 +255,9 @@ public class PaperWorldConfig {
+@@ -261,4 +261,9 @@ public class PaperWorldConfig {
          }
          log("Non Player Arrow Despawn Rate: " + nonPlayerArrowDespawnRate);
      }
@@ -19,7 +19,7 @@ index db40db0d..8027700d 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 9ef492f1..72dc2008 100644
+index 9ef492f1b..72dc20087 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 {
diff --git a/Spigot-Server-Patches/0090-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch b/Spigot-Server-Patches/0090-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
index 14fa572714..2c063dc2ad 100644
--- 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 bbb8d54be68328cd031be2cd296ed83e5f3e939c Mon Sep 17 00:00:00 2001
+From 096a76ab0d00c7acb26f0a08688556ad017c1dd7 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 8027700d..923a7200 100644
+index 38d664e00..e634c3afd 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -260,4 +260,9 @@ public class PaperWorldConfig {
+@@ -266,4 +266,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 8027700d..923a7200 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index a20c9810..03f07677 100644
+index a20c9810f..03f076776 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 a20c9810..03f07677 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 72dc2008..f2ddc22d 100644
+index 72dc20087..f2ddc22dd 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;
diff --git a/Spigot-Server-Patches/0092-Configurable-Chunk-Inhabited-Timer.patch b/Spigot-Server-Patches/0092-Configurable-Chunk-Inhabited-Timer.patch
index fc10b607e3..948547f318 100644
--- 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 d2894c5ff5eefbe0b68d0ccfefc49b5493d5e1ef Mon Sep 17 00:00:00 2001
+From a85c4e1bb03849fd93ad1bbc0fafb823b8e086f3 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 923a7200..aa923406 100644
+index e634c3afd..54f23ea75 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -265,4 +265,9 @@ public class PaperWorldConfig {
+@@ -271,4 +271,9 @@ public class PaperWorldConfig {
      private void firePhysicsEventForRedstone() {
          firePhysicsEventForRedstone = getBoolean("fire-physics-event-for-redstone", firePhysicsEventForRedstone);
      }
@@ -23,7 +23,7 @@ index 923a7200..aa923406 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 172d00bd..300a5619 100644
+index 172d00bdc..300a56191 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -1408,7 +1408,7 @@ public class Chunk {
diff --git a/Spigot-Server-Patches/0101-Configurable-Grass-Spread-Tick-Rate.patch b/Spigot-Server-Patches/0101-Configurable-Grass-Spread-Tick-Rate.patch
index c9c25c440f..26822a24e0 100644
--- 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 7745c33d90b8c89977af2aa75adff679f16f222f Mon Sep 17 00:00:00 2001
+From 41feb93bbf2a80cf7b0cf54e790a7df29a05113d 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 aa923406..afbfbdf8 100644
+index 54f23ea75..6555f1373 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -270,4 +270,10 @@ public class PaperWorldConfig {
+@@ -276,4 +276,10 @@ public class PaperWorldConfig {
      private void useInhabitedTime() {
          useInhabitedTime = getBoolean("use-chunk-inhabited-timer", true);
      }
@@ -20,7 +20,7 @@ index aa923406..afbfbdf8 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/BlockGrass.java b/src/main/java/net/minecraft/server/BlockGrass.java
-index 8fc736d6..b656994b 100644
+index 8fc736d6a..b656994b2 100644
 --- a/src/main/java/net/minecraft/server/BlockGrass.java
 +++ b/src/main/java/net/minecraft/server/BlockGrass.java
 @@ -28,6 +28,7 @@ public class BlockGrass extends Block implements IBlockFragilePlantElement {
diff --git 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
index c2afedb66a..4bfcc01253 100644
--- 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 7dd194bbef759969b45373918fcf12656d029fa2 Mon Sep 17 00:00:00 2001
+From 9e236a550752495b42ff6d31317ba07d31f790a2 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 afbfbdf8..8136d223 100644
+index 6555f1373..abc1aabdd 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -276,4 +276,10 @@ public class PaperWorldConfig {
+@@ -282,4 +282,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 afbfbdf8..8136d223 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 4e8ce79f..2300ee10 100644
+index 4e8ce79ff..2300ee10b 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 4e8ce79f..2300ee10 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 279f0a26..a0b36b6b 100644
+index 279f0a261..a0b36b6ba 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 279f0a26..a0b36b6b 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 5d15d584..bc048f29 100644
+index 5d15d5846..bc048f292 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 5d15d584..bc048f29 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 01fc193d..69dc11e2 100644
+index 01fc193db..69dc11e2b 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 {
diff --git a/Spigot-Server-Patches/0106-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/Spigot-Server-Patches/0106-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
index 1131d23501..2216ba2c15 100644
--- a/Spigot-Server-Patches/0106-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
+++ b/Spigot-Server-Patches/0106-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
@@ -1,14 +1,14 @@
-From 48a023bccd8c393382d6b2985dae6a004ce8a6bf Mon Sep 17 00:00:00 2001
+From f792cc320c6dfc1bf48087e5379bc5b2255454cd Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 6 Apr 2016 01:04:23 -0500
 Subject: [PATCH] Option to use vanilla per-world scoreboard coloring on names
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 8136d223..c159871c 100644
+index abc1aabdd..6ea608ba9 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -282,4 +282,9 @@ public class PaperWorldConfig {
+@@ -288,4 +288,9 @@ public class PaperWorldConfig {
          keepLoadedRange = (short) (getInt("keep-spawn-loaded-range", Math.min(spigotConfig.viewDistance, 8)) * 16);
          log( "Keep Spawn Loaded Range: " + (keepLoadedRange/16));
      }
@@ -19,7 +19,7 @@ index 8136d223..c159871c 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index a6d47213..1d31bcde 100644
+index a6d472139..1d31bcde8 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2079,6 +2079,7 @@ public abstract class Entity implements ICommandListener {
@@ -31,7 +31,7 @@ index a6d47213..1d31bcde 100644
      public ScoreboardTeamBase aY() {
          if (!this.world.paperConfig.nonPlayerEntitiesOnScoreboards && !(this instanceof EntityHuman)) { return null; } // Paper
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 70fb4f6b..187e59a0 100644
+index 70fb4f6b0..187e59a08 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1390,7 +1390,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
diff --git a/Spigot-Server-Patches/0118-Add-ability-to-configure-frosted_ice-properties.patch b/Spigot-Server-Patches/0118-Add-ability-to-configure-frosted_ice-properties.patch
index 1d44843b6e..2504baa385 100644
--- a/Spigot-Server-Patches/0118-Add-ability-to-configure-frosted_ice-properties.patch
+++ b/Spigot-Server-Patches/0118-Add-ability-to-configure-frosted_ice-properties.patch
@@ -1,14 +1,14 @@
-From b4949242f77cb24711526907f00e0936a353036c Mon Sep 17 00:00:00 2001
+From 64fb6f3595eb66bc805be1ec9f07d815277a18cb Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 21 Apr 2016 23:51:55 -0700
 Subject: [PATCH] Add ability to configure frosted_ice properties
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index c159871c..609a068c 100644
+index 6ea608ba9..d96311f6b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -287,4 +287,14 @@ public class PaperWorldConfig {
+@@ -293,4 +293,14 @@ public class PaperWorldConfig {
      private void useVanillaScoreboardColoring() {
          useVanillaScoreboardColoring = getBoolean("use-vanilla-world-scoreboard-name-coloring", false);
      }
@@ -24,7 +24,7 @@ index c159871c..609a068c 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/BlockIceFrost.java b/src/main/java/net/minecraft/server/BlockIceFrost.java
-index 950863fb..a8dbbf20 100644
+index 950863fb9..a8dbbf20a 100644
 --- a/src/main/java/net/minecraft/server/BlockIceFrost.java
 +++ b/src/main/java/net/minecraft/server/BlockIceFrost.java
 @@ -19,10 +19,14 @@ public class BlockIceFrost extends BlockIce {
diff --git a/Spigot-Server-Patches/0124-LootTable-API-Replenishable-Lootables-Feature.patch b/Spigot-Server-Patches/0124-LootTable-API-Replenishable-Lootables-Feature.patch
index efa7972473..e8b81f5ff6 100644
--- a/Spigot-Server-Patches/0124-LootTable-API-Replenishable-Lootables-Feature.patch
+++ b/Spigot-Server-Patches/0124-LootTable-API-Replenishable-Lootables-Feature.patch
@@ -1,4 +1,4 @@
-From 91ffc1cc7f5b705776f785367c2f2e9db8e7742b Mon Sep 17 00:00:00 2001
+From b6087c2f60a85fa5845870bf99ce585aa9c34a42 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 1 May 2016 21:19:14 -0400
 Subject: [PATCH] LootTable API & Replenishable Lootables Feature
@@ -11,10 +11,10 @@ This feature is good for long term worlds so that newer players
 do not suffer with "Every chest has been looted"
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 609a068c..7ee8d4e7 100644
+index d96311f6b..067cb233e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -297,4 +297,26 @@ public class PaperWorldConfig {
+@@ -303,4 +303,26 @@ public class PaperWorldConfig {
          this.frostedIceDelayMax = this.getInt("frosted-ice.delay.max", this.frostedIceDelayMax);
          log("Frosted Ice: " + (this.frostedIceEnabled ? "enabled" : "disabled") + " / delay: min=" + this.frostedIceDelayMin + ", max=" + this.frostedIceDelayMax);
      }
@@ -43,7 +43,7 @@ index 609a068c..7ee8d4e7 100644
  }
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/CraftLootable.java b/src/main/java/com/destroystokyo/paper/loottable/CraftLootable.java
 new file mode 100644
-index 00000000..36c36d15
+index 000000000..36c36d158
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/CraftLootable.java
 @@ -0,0 +1,12 @@
@@ -61,7 +61,7 @@ index 00000000..36c36d15
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/CraftLootableBlockInventory.java b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableBlockInventory.java
 new file mode 100644
-index 00000000..20d236c4
+index 000000000..20d236c45
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableBlockInventory.java
 @@ -0,0 +1,33 @@
@@ -100,7 +100,7 @@ index 00000000..20d236c4
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/CraftLootableEntityInventory.java b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableEntityInventory.java
 new file mode 100644
-index 00000000..1150dee0
+index 000000000..1150dee01
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableEntityInventory.java
 @@ -0,0 +1,31 @@
@@ -137,7 +137,7 @@ index 00000000..1150dee0
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/CraftLootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableInventory.java
 new file mode 100644
-index 00000000..66809762
+index 000000000..668097620
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableInventory.java
 @@ -0,0 +1,88 @@
@@ -231,7 +231,7 @@ index 00000000..66809762
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/CraftLootableInventoryData.java b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableInventoryData.java
 new file mode 100644
-index 00000000..01c2713d
+index 000000000..01c2713d3
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableInventoryData.java
 @@ -0,0 +1,182 @@
@@ -418,7 +418,7 @@ index 00000000..01c2713d
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/EntityMinecartContainer.java b/src/main/java/net/minecraft/server/EntityMinecartContainer.java
-index d6afa4aa..50d7d34b 100644
+index d6afa4aa6..50d7d34b8 100644
 --- a/src/main/java/net/minecraft/server/EntityMinecartContainer.java
 +++ b/src/main/java/net/minecraft/server/EntityMinecartContainer.java
 @@ -6,17 +6,21 @@ import javax.annotation.Nullable;
@@ -541,7 +541,7 @@ index d6afa4aa..50d7d34b 100644
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/TileEntityLootable.java b/src/main/java/net/minecraft/server/TileEntityLootable.java
-index a97ad203..61852130 100644
+index a97ad2037..618521304 100644
 --- a/src/main/java/net/minecraft/server/TileEntityLootable.java
 +++ b/src/main/java/net/minecraft/server/TileEntityLootable.java
 @@ -1,44 +1,50 @@
@@ -658,7 +658,7 @@ index a97ad203..61852130 100644
 +
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
-index 8328ed00..266f87d7 100644
+index 8328ed005..266f87d7f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 @@ -60,7 +60,7 @@ public class CraftBlockEntityState<T extends TileEntity> extends CraftBlockState
@@ -671,7 +671,7 @@ index 8328ed00..266f87d7 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java b/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
-index 85f3bb27..733c04ef 100644
+index 85f3bb272..733c04ef7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
 @@ -1,5 +1,6 @@
@@ -691,7 +691,7 @@ index 85f3bb27..733c04ef 100644
      public CraftChest(final Block block) {
          super(block, TileEntityChest.class);
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftDispenser.java b/src/main/java/org/bukkit/craftbukkit/block/CraftDispenser.java
-index 1dc8bfec..bfcf9b6c 100644
+index 1dc8bfecd..bfcf9b6c4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftDispenser.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftDispenser.java
 @@ -1,5 +1,6 @@
@@ -711,7 +711,7 @@ index 1dc8bfec..bfcf9b6c 100644
      public CraftDispenser(final Block block) {
          super(block, TileEntityDispenser.class);
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java b/src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java
-index 6566554a..df156d0d 100644
+index 6566554ab..df156d0d9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java
 @@ -1,5 +1,6 @@
@@ -731,7 +731,7 @@ index 6566554a..df156d0d 100644
      public CraftHopper(final Block block) {
          super(block, TileEntityHopper.class);
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java b/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java
-index c029a124..c26f0b5a 100644
+index c029a1244..c26f0b5af 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java
 @@ -1,5 +1,6 @@
@@ -751,7 +751,7 @@ index c029a124..c26f0b5a 100644
      public CraftShulkerBox(final Block block) {
          super(block, TileEntityShulkerBox.class);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java
-index 69435c45..4291edf2 100644
+index 69435c457..4291edf25 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java
 @@ -1,5 +1,6 @@
@@ -771,7 +771,7 @@ index 69435c45..4291edf2 100644
  
      public CraftMinecartChest(CraftServer server, EntityMinecartChest entity) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java
-index e9963e21..acb4dee0 100644
+index e9963e21c..acb4dee04 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java
 @@ -1,5 +1,6 @@
diff --git a/Spigot-Server-Patches/0134-Optional-TNT-doesn-t-move-in-water.patch b/Spigot-Server-Patches/0134-Optional-TNT-doesn-t-move-in-water.patch
index d3274f3927..7e0b70008f 100644
--- a/Spigot-Server-Patches/0134-Optional-TNT-doesn-t-move-in-water.patch
+++ b/Spigot-Server-Patches/0134-Optional-TNT-doesn-t-move-in-water.patch
@@ -1,11 +1,11 @@
-From 8ac9f4faafc625ac84d32b2e2b097fbdc524b9bf Mon Sep 17 00:00:00 2001
+From e31db57ece1f54e5d574ed74be45120a704449ef Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 22 May 2016 20:20:55 -0500
 Subject: [PATCH] Optional TNT doesn't move in water
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 7ee8d4e7..c42fa157 100644
+index 067cb233e..06acdaaf0 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -2,7 +2,6 @@ package com.destroystokyo.paper;
@@ -16,7 +16,7 @@ index 7ee8d4e7..c42fa157 100644
  import org.bukkit.configuration.file.YamlConfiguration;
  import org.spigotmc.SpigotWorldConfig;
  
-@@ -319,4 +318,14 @@ public class PaperWorldConfig {
+@@ -325,4 +324,14 @@ public class PaperWorldConfig {
              );
          }
      }
@@ -32,7 +32,7 @@ index 7ee8d4e7..c42fa157 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index ef096ef6..d46fb1d7 100644
+index ef096ef65..d46fb1d76 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1114,6 +1114,11 @@ public abstract class Entity implements ICommandListener {
@@ -60,7 +60,7 @@ index ef096ef6..d46fb1d7 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
-index bb0904f8..50811852 100644
+index bb0904f86..50811852a 100644
 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 @@ -147,4 +147,49 @@ public class EntityTNTPrimed extends Entity {
diff --git a/Spigot-Server-Patches/0139-Fix-FallingBlocks-being-stuck-on-fences.patch b/Spigot-Server-Patches/0139-Fix-FallingBlocks-being-stuck-on-fences.patch
index f40ed58acc..66eed74777 100644
--- a/Spigot-Server-Patches/0139-Fix-FallingBlocks-being-stuck-on-fences.patch
+++ b/Spigot-Server-Patches/0139-Fix-FallingBlocks-being-stuck-on-fences.patch
@@ -1,4 +1,4 @@
-From 3ffe2b85f7cd6afd294437f630ab816db04eacde Mon Sep 17 00:00:00 2001
+From b399333aa55b91e79d5e43d11541302c178ca8ec Mon Sep 17 00:00:00 2001
 From: Martin Panzer <postremus1996@googlemail.com>
 Date: Fri, 3 Jun 2016 23:13:39 +0200
 Subject: [PATCH] Fix FallingBlocks being stuck on fences
@@ -11,10 +11,10 @@ We now first check, if if we are already on the ground.
 if not, we check if the falling block is inside of the hitbox of the block at y - 1.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index c42fa157..670d3d9a 100644
+index 06acdaaf0..600e603bd 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -328,4 +328,9 @@ public class PaperWorldConfig {
+@@ -334,4 +334,9 @@ public class PaperWorldConfig {
          preventTntFromMovingInWater = getBoolean("prevent-tnt-from-moving-in-water", false);
          log("Prevent TNT from moving in water: " + preventTntFromMovingInWater);
      }
@@ -25,7 +25,7 @@ index c42fa157..670d3d9a 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/BlockFalling.java b/src/main/java/net/minecraft/server/BlockFalling.java
-index 67439575..1086e311 100644
+index 674395756..1086e3117 100644
 --- a/src/main/java/net/minecraft/server/BlockFalling.java
 +++ b/src/main/java/net/minecraft/server/BlockFalling.java
 @@ -71,6 +71,12 @@ public class BlockFalling extends Block {
@@ -42,7 +42,7 @@ index 67439575..1086e311 100644
  
      public void a_(World world, BlockPosition blockposition) {}
 diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-index abdc2dea..59acc908 100644
+index abdc2dea9..59acc9088 100644
 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
 +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
 @@ -3,6 +3,7 @@ package net.minecraft.server;
diff --git a/Spigot-Server-Patches/0140-Make-entities-look-for-hoppers.patch b/Spigot-Server-Patches/0140-Make-entities-look-for-hoppers.patch
index 104263cf00..a425ef82f1 100644
--- a/Spigot-Server-Patches/0140-Make-entities-look-for-hoppers.patch
+++ b/Spigot-Server-Patches/0140-Make-entities-look-for-hoppers.patch
@@ -1,4 +1,4 @@
-From 4f6df6a265dcf623e4c26b538d1e043369e8714f Mon Sep 17 00:00:00 2001
+From cb53968694c97cfa498c287c913d102d39431d9c Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Sat, 18 Jun 2016 01:01:37 -0500
 Subject: [PATCH] Make entities look for hoppers
@@ -79,10 +79,10 @@ index 000000000..52457e3d8
 +    double getZ();
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 670d3d9a9..71cdb8118 100644
+index 600e603bd..ce43e7bb7 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -333,4 +333,9 @@ public class PaperWorldConfig {
+@@ -339,4 +339,9 @@ public class PaperWorldConfig {
      private void altFallingBlockOnGround() {
          altFallingBlockOnGround = getBoolean("use-alternate-fallingblock-onGround-detection", false);
      }
diff --git a/Spigot-Server-Patches/0141-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/Spigot-Server-Patches/0141-Delay-Chunk-Unloads-based-on-Player-Movement.patch
index a2d4776d13..3db34928b3 100644
--- a/Spigot-Server-Patches/0141-Delay-Chunk-Unloads-based-on-Player-Movement.patch
+++ b/Spigot-Server-Patches/0141-Delay-Chunk-Unloads-based-on-Player-Movement.patch
@@ -1,4 +1,4 @@
-From 9c680ac16d5b69f0b627984e5d65cf39effea1d3 Mon Sep 17 00:00:00 2001
+From a375ecc6d74a5d1788f0cc55f139a0c64ed1c4b0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 18 Jun 2016 23:22:12 -0400
 Subject: [PATCH] Delay Chunk Unloads based on Player Movement
@@ -17,10 +17,10 @@ This allows servers with smaller worlds who do less long distance exploring to s
 wasting cpu cycles on saving/unloading/reloading chunks repeatedly.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 71cdb811..70642451 100644
+index ce43e7bb7..112c447e2 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -338,4 +338,13 @@ public class PaperWorldConfig {
+@@ -344,4 +344,13 @@ public class PaperWorldConfig {
      private void isHopperPushBased() {
          isHopperPushBased = getBoolean("hopper.push-based", false);
      }
@@ -35,7 +35,7 @@ index 71cdb811..70642451 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index a847aa07..8ec26b97 100644
+index a847aa079..8ec26b97c 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -30,6 +30,7 @@ public class Chunk {
@@ -47,7 +47,7 @@ index a847aa07..8ec26b97 100644
      public final int locZ;
      private boolean m;
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index c7af8da6..0adfcaa8 100644
+index c7af8da61..0adfcaa8b 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -315,6 +315,19 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -71,7 +71,7 @@ index c7af8da6..0adfcaa8 100644
              this.chunkLoader.b();
          }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index 3d30e183..48a008e0 100644
+index 3d30e1831..48a008e0a 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
 @@ -32,8 +32,16 @@ public class PlayerChunk {
@@ -108,7 +108,7 @@ index 3d30e183..48a008e0 100644
              // CraftBukkit end
  
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index ad1d90b5..0b10f168 100644
+index ad1d90b56..0b10f1684 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -487,7 +487,13 @@ public class PlayerChunkMap {
@@ -127,7 +127,7 @@ index ad1d90b5..0b10f168 100644
  
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 69dc11e2..284dc639 100644
+index 69dc11e2b..284dc6391 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1576,7 +1576,7 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0142-Toggleable-Elytra-Wall-Damage.patch b/Spigot-Server-Patches/0142-Toggleable-Elytra-Wall-Damage.patch
index ccda7b1469..b1685ec13a 100644
--- a/Spigot-Server-Patches/0142-Toggleable-Elytra-Wall-Damage.patch
+++ b/Spigot-Server-Patches/0142-Toggleable-Elytra-Wall-Damage.patch
@@ -1,4 +1,4 @@
-From a527a33b86db5515a407228bf1424a81547dfd35 Mon Sep 17 00:00:00 2001
+From bf276b4e333709788d646c540756080a388d30c3 Mon Sep 17 00:00:00 2001
 From: Jadon Fowler <jadonflower@gmail.com>
 Date: Sat, 18 Jun 2016 23:13:59 -0700
 Subject: [PATCH] Toggleable Elytra Wall Damage
@@ -7,10 +7,10 @@ Instead of calculating the damage taken from hitting a wall, you can
 disable it in the config.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 70642451..64e31dd2 100644
+index 112c447e2..d182e716a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -347,4 +347,9 @@ public class PaperWorldConfig {
+@@ -353,4 +353,9 @@ public class PaperWorldConfig {
              delayChunkUnloadsBy *= 1000;
          }
      }
@@ -21,7 +21,7 @@ index 70642451..64e31dd2 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index a09d8964..20aac1f3 100644
+index edc9d94b7..f76be4da0 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1737,6 +1737,7 @@ public abstract class EntityLiving extends Entity {
diff --git a/Spigot-Server-Patches/0154-Auto-Save-Improvements.patch b/Spigot-Server-Patches/0154-Auto-Save-Improvements.patch
index a2d63294cf..259f2f8e7f 100644
--- a/Spigot-Server-Patches/0154-Auto-Save-Improvements.patch
+++ b/Spigot-Server-Patches/0154-Auto-Save-Improvements.patch
@@ -1,4 +1,4 @@
-From 21395ab1de11791b1dfb94aa74d1563c29276724 Mon Sep 17 00:00:00 2001
+From ed279a6dc705f1e1e3d1b5101d7fe9e130619a0a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 19 Sep 2016 23:16:39 -0400
 Subject: [PATCH] Auto Save Improvements
@@ -26,7 +26,7 @@ index 621c585e7..da0984a35 100644
 +    }
  }
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 64e31dd20..a59865930 100644
+index d182e716a..d1655de42 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -2,6 +2,7 @@ package com.destroystokyo.paper;
@@ -37,7 +37,7 @@ index 64e31dd20..a59865930 100644
  import org.bukkit.configuration.file.YamlConfiguration;
  import org.spigotmc.SpigotWorldConfig;
  
-@@ -352,4 +353,19 @@ public class PaperWorldConfig {
+@@ -358,4 +359,19 @@ public class PaperWorldConfig {
      private void elytraHitWallDamage() {
          elytraHitWallDamage = getBoolean("elytra-hit-wall-damage", true);
      }
@@ -215,5 +215,5 @@ index f2ddc22dd..8493dccee 100644
              timings.worldSaveChunks.startTiming(); // Paper
              chunkproviderserver.a(flag);
 -- 
-2.16.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0160-Option-to-remove-corrupt-tile-entities.patch b/Spigot-Server-Patches/0160-Option-to-remove-corrupt-tile-entities.patch
index d0873018f4..a7ad9d0369 100644
--- a/Spigot-Server-Patches/0160-Option-to-remove-corrupt-tile-entities.patch
+++ b/Spigot-Server-Patches/0160-Option-to-remove-corrupt-tile-entities.patch
@@ -1,14 +1,14 @@
-From e4b2b476129fc1d759efd425fe31524e9a95a9a7 Mon Sep 17 00:00:00 2001
+From 0c57542e06e4318767fa618f78c9f7bccf623964 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 5 Oct 2016 16:27:36 -0500
 Subject: [PATCH] Option to remove corrupt tile entities
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index a5986593..0ac2ad70 100644
+index d1655de42..21ae11e0a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -368,4 +368,9 @@ public class PaperWorldConfig {
+@@ -374,4 +374,9 @@ public class PaperWorldConfig {
      private void maxAutoSaveChunksPerTick() {
          maxAutoSaveChunksPerTick = getInt("max-auto-save-chunks-per-tick", 24);
      }
@@ -19,7 +19,7 @@ index a5986593..0ac2ad70 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 87730aec..1d056031 100644
+index 87730aec3..1d056031b 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -786,11 +786,17 @@ public class Chunk {
diff --git a/Spigot-Server-Patches/0163-Prevent-Auto-Save-if-Save-Queue-is-full.patch b/Spigot-Server-Patches/0163-Prevent-Auto-Save-if-Save-Queue-is-full.patch
index 430f99e759..fceaa13539 100644
--- a/Spigot-Server-Patches/0163-Prevent-Auto-Save-if-Save-Queue-is-full.patch
+++ b/Spigot-Server-Patches/0163-Prevent-Auto-Save-if-Save-Queue-is-full.patch
@@ -1,4 +1,4 @@
-From 89fa5284102d862b2f1a2a7310883f7ac2a6510f Mon Sep 17 00:00:00 2001
+From 8eceb79981e4d2c91162c0f554cbe68b2ef3cbaf Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Nov 2016 21:52:22 -0400
 Subject: [PATCH] Prevent Auto Save if Save Queue is full
@@ -7,10 +7,10 @@ If the save queue already has 50 (configurable) of chunks pending,
 then avoid processing auto save (which would add more)
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 0ac2ad70..e87c9863 100644
+index 21ae11e0a..f84fc54ec 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -369,6 +369,11 @@ public class PaperWorldConfig {
+@@ -375,6 +375,11 @@ public class PaperWorldConfig {
          maxAutoSaveChunksPerTick = getInt("max-auto-save-chunks-per-tick", 24);
      }
  
@@ -23,7 +23,7 @@ index 0ac2ad70..e87c9863 100644
      private void removeCorruptTEs() {
          removeCorruptTEs = getBoolean("remove-corrupt-tile-entities", false);
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 9e8f67ff..2b87329f 100644
+index 9e8f67ffd..2b87329f4 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -254,6 +254,14 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -51,7 +51,7 @@ index 9e8f67ff..2b87329f 100644
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 8747d9a4..77943821 100644
+index 8747d9a45..77943821e 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -39,6 +39,8 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
diff --git a/Spigot-Server-Patches/0165-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch b/Spigot-Server-Patches/0165-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
index 004ed39387..f54776ec56 100644
--- a/Spigot-Server-Patches/0165-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
+++ b/Spigot-Server-Patches/0165-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
@@ -1,11 +1,11 @@
-From 947bb9a35b9d0c4a1c117f41e87ce85d2079f42c Mon Sep 17 00:00:00 2001
+From 2991704cddc67cd1ab388d5cba8f5f8da1b4128a Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 12 Nov 2016 23:25:22 -0600
 Subject: [PATCH] Filter bad data from ArmorStand and SpawnEgg items
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index e87c9863..ed7ddbb2 100644
+index f84fc54ec..513c4b020 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -3,6 +3,7 @@ package com.destroystokyo.paper;
@@ -16,7 +16,7 @@ index e87c9863..ed7ddbb2 100644
  import org.bukkit.configuration.file.YamlConfiguration;
  import org.spigotmc.SpigotWorldConfig;
  
-@@ -378,4 +379,12 @@ public class PaperWorldConfig {
+@@ -384,4 +385,12 @@ public class PaperWorldConfig {
      private void removeCorruptTEs() {
          removeCorruptTEs = getBoolean("remove-corrupt-tile-entities", false);
      }
@@ -30,7 +30,7 @@ index e87c9863..ed7ddbb2 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-index 59acc908..d0b67d8f 100644
+index 59acc9088..d0b67d8fd 100644
 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
 +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
 @@ -271,6 +271,14 @@ public class EntityFallingBlock extends Entity {
@@ -49,7 +49,7 @@ index 59acc908..d0b67d8f 100644
          Block block = this.block.getBlock();
  
 diff --git a/src/main/java/net/minecraft/server/ItemMonsterEgg.java b/src/main/java/net/minecraft/server/ItemMonsterEgg.java
-index b24f7d8b..5a08f6b4 100644
+index b24f7d8b2..5a08f6b4e 100644
 --- a/src/main/java/net/minecraft/server/ItemMonsterEgg.java
 +++ b/src/main/java/net/minecraft/server/ItemMonsterEgg.java
 @@ -102,7 +102,14 @@ public class ItemMonsterEgg extends Item {
diff --git a/Spigot-Server-Patches/0178-Configurable-Cartographer-Treasure-Maps.patch b/Spigot-Server-Patches/0178-Configurable-Cartographer-Treasure-Maps.patch
index 435cecdba5..1eceeddea3 100644
--- a/Spigot-Server-Patches/0178-Configurable-Cartographer-Treasure-Maps.patch
+++ b/Spigot-Server-Patches/0178-Configurable-Cartographer-Treasure-Maps.patch
@@ -1,4 +1,4 @@
-From 50444acff6f8adf702cd9f2934d23333fa101b47 Mon Sep 17 00:00:00 2001
+From bfea6710128e78b4e93b7408115c55a4ca141f00 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 20 Dec 2016 15:26:27 -0500
 Subject: [PATCH] Configurable Cartographer Treasure Maps
@@ -9,10 +9,10 @@ Also allow turning off treasure maps all together as they can eat up Map ID's
 which are limited in quantity.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index ed7ddbb2..bbb5c942 100644
+index 513c4b020..631aa6eb9 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -387,4 +387,14 @@ public class PaperWorldConfig {
+@@ -393,4 +393,14 @@ public class PaperWorldConfig {
              Bukkit.getLogger().warning("Spawn Egg and Armor Stand NBT filtering disabled, this is a potential security risk");
          }
      }
@@ -28,7 +28,7 @@ index ed7ddbb2..bbb5c942 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 09b466fc..df009e19 100644
+index 09b466fcb..df009e190 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -767,7 +767,8 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
diff --git a/Spigot-Server-Patches/0181-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/Spigot-Server-Patches/0181-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
index 1769d17e7b..3f16729557 100644
--- a/Spigot-Server-Patches/0181-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
+++ b/Spigot-Server-Patches/0181-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
@@ -1,14 +1,14 @@
-From 9d1c16da817c5725432aa84a8986ffd3d9997ed0 Mon Sep 17 00:00:00 2001
+From fb7eb6cf729f83d9fbbb3501d546dee43b34a985 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 21 Dec 2016 11:52:04 -0600
 Subject: [PATCH] Option to prevent armor stands from doing entity lookups
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index bbb5c942..d3f612b6 100644
+index 631aa6eb9..7871406e4 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -397,4 +397,9 @@ public class PaperWorldConfig {
+@@ -403,4 +403,9 @@ public class PaperWorldConfig {
              log("Treasure Maps will return already discovered locations");
          }
      }
@@ -19,7 +19,7 @@ index bbb5c942..d3f612b6 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 01dba285..b0139fff 100644
+index 01dba285a..b0139fff6 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1335,6 +1335,7 @@ public abstract class World implements IBlockAccess {
diff --git a/Spigot-Server-Patches/0198-Cap-Entity-Collisions.patch b/Spigot-Server-Patches/0198-Cap-Entity-Collisions.patch
index 8e1f06024a..d9bdffefb9 100644
--- a/Spigot-Server-Patches/0198-Cap-Entity-Collisions.patch
+++ b/Spigot-Server-Patches/0198-Cap-Entity-Collisions.patch
@@ -1,4 +1,4 @@
-From 9cf7a8b264a7718e6d9d4f02a4328f795478bc49 Mon Sep 17 00:00:00 2001
+From 172f89f8b60e02690cbb9562af0f2ca7e996eb09 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 22 Jan 2017 18:07:56 -0500
 Subject: [PATCH] Cap Entity Collisions
@@ -12,10 +12,10 @@ just as it does in Vanilla, but entity pushing logic will be capped.
 You can set this to 0 to disable collisions.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index d3f612b6..3b0234ae 100644
+index 7871406e4..3ba465305 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -402,4 +402,10 @@ public class PaperWorldConfig {
+@@ -408,4 +408,10 @@ public class PaperWorldConfig {
      private void armorStandEntityLookups() {
          armorStandEntityLookups = getBoolean("armor-stands-do-collision-entity-lookups", true);
      }
@@ -27,7 +27,7 @@ index d3f612b6..3b0234ae 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index a6ffe144..f08f4ae5 100644
+index a6ffe144f..f08f4ae56 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -170,6 +170,7 @@ public abstract class Entity implements ICommandListener {
@@ -39,7 +39,7 @@ index a6ffe144..f08f4ae5 100644
      // Spigot end
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 73643bc7..28eb1330 100644
+index ab3ab3889..6829f8f9c 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2189,8 +2189,11 @@ public abstract class EntityLiving extends Entity {
diff --git a/Spigot-Server-Patches/0207-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/Spigot-Server-Patches/0207-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
index 0336ac770f..92f3ee935e 100644
--- a/Spigot-Server-Patches/0207-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
+++ b/Spigot-Server-Patches/0207-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
@@ -1,4 +1,4 @@
-From 11ce646a06ba992c2f1eaa013b8011d8b7ce94d4 Mon Sep 17 00:00:00 2001
+From 3bc18a629d942293ad8e4325218d8fbe82dd0c17 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 16 May 2017 21:29:08 -0500
 Subject: [PATCH] Add option to make parrots stay on shoulders despite movement
@@ -11,10 +11,10 @@ I suspect Mojang may switch to this behavior before full release.
 To be converted into a Paper-API event at some point in the future?
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 3b0234ae..9a4d3f85 100644
+index 3ba465305..79b12a6e9 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -408,4 +408,10 @@ public class PaperWorldConfig {
+@@ -414,4 +414,10 @@ public class PaperWorldConfig {
          maxCollisionsPerEntity = getInt( "max-entity-collisions", this.spigotConfig.getInt("max-entity-collisions", 8) );
          log( "Max Entity Collisions: " + maxCollisionsPerEntity );
      }
@@ -26,7 +26,7 @@ index 3b0234ae..9a4d3f85 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 0f1d9963..9cda8a17 100644
+index 0f1d99636..9cda8a177 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -399,7 +399,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -39,7 +39,7 @@ index 0f1d9963..9cda8a17 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 2367ff1f..9c8828eb 100644
+index 2367ff1f0..9c8828ebd 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1514,6 +1514,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
diff --git a/Spigot-Server-Patches/0210-provide-a-configurable-option-to-disable-creeper-lin.patch b/Spigot-Server-Patches/0210-provide-a-configurable-option-to-disable-creeper-lin.patch
index e4b6af989f..8a98f37f1b 100644
--- a/Spigot-Server-Patches/0210-provide-a-configurable-option-to-disable-creeper-lin.patch
+++ b/Spigot-Server-Patches/0210-provide-a-configurable-option-to-disable-creeper-lin.patch
@@ -1,4 +1,4 @@
-From 9ece1e7c063c766937e420d9b9bd48cb1228b68c Mon Sep 17 00:00:00 2001
+From 4c1ef862ec16c3b2186795b172f94ac7eca8c2fb Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 11 Jun 2017 21:01:18 +0100
 Subject: [PATCH] provide a configurable option to disable creeper lingering
@@ -6,10 +6,10 @@ Subject: [PATCH] provide a configurable option to disable creeper lingering
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 9a4d3f85..ca1dce68 100644
+index 79b12a6e9..7802cc1f4 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -414,4 +414,10 @@ public class PaperWorldConfig {
+@@ -420,4 +420,10 @@ public class PaperWorldConfig {
          parrotsHangOnBetter = getBoolean("parrots-are-unaffected-by-player-movement", false);
          log("Parrots are unaffected by player movement: " + parrotsHangOnBetter);
      }
@@ -21,7 +21,7 @@ index 9a4d3f85..ca1dce68 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
-index c872607f..8098d4d9 100644
+index c872607fc..8098d4d9f 100644
 --- a/src/main/java/net/minecraft/server/EntityCreeper.java
 +++ b/src/main/java/net/minecraft/server/EntityCreeper.java
 @@ -222,7 +222,7 @@ public class EntityCreeper extends EntityMonster {
diff --git a/Spigot-Server-Patches/0236-Anti-Xray.patch b/Spigot-Server-Patches/0236-Anti-Xray.patch
index 898246c79e..a23ec81d96 100644
--- a/Spigot-Server-Patches/0236-Anti-Xray.patch
+++ b/Spigot-Server-Patches/0236-Anti-Xray.patch
@@ -1,11 +1,11 @@
-From 398ab25e228ff38b78e33b3dfe4d85d028bcebfc Mon Sep 17 00:00:00 2001
+From d4de3b758fa744e0dd4fffbc99ef29ca9654a37f Mon Sep 17 00:00:00 2001
 From: stonar96 <minecraft.stonar96@gmail.com>
 Date: Thu, 21 Sep 2017 00:38:47 +0200
 Subject: [PATCH] Anti-Xray
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index ca1dce687..37b26827d 100644
+index 7802cc1f4..69fd81898 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -1,7 +1,10 @@
@@ -19,7 +19,7 @@ index ca1dce687..37b26827d 100644
  import net.minecraft.server.MinecraftServer;
  import org.bukkit.Bukkit;
  import org.bukkit.configuration.file.YamlConfiguration;
-@@ -420,4 +423,25 @@ public class PaperWorldConfig {
+@@ -426,4 +429,25 @@ public class PaperWorldConfig {
          disableCreeperLingeringEffect = getBoolean("disable-creeper-lingering-effect", false);
          log("Creeper lingering effect: " + disableCreeperLingeringEffect);
      }
@@ -1579,5 +1579,5 @@ index 9942f0c75..2da6edc63 100644
                          }
                      }
 -- 
-2.15.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0247-Option-for-maximum-exp-value-when-merging-orbs.patch b/Spigot-Server-Patches/0247-Option-for-maximum-exp-value-when-merging-orbs.patch
index 8333523537..4ce461b311 100644
--- a/Spigot-Server-Patches/0247-Option-for-maximum-exp-value-when-merging-orbs.patch
+++ b/Spigot-Server-Patches/0247-Option-for-maximum-exp-value-when-merging-orbs.patch
@@ -1,14 +1,14 @@
-From c3a4e34214b416d8987b146c4264a928195c7721 Mon Sep 17 00:00:00 2001
+From 39f9e2d12137934d003591cb3701529096191e97 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 10 Nov 2017 23:03:12 -0500
 Subject: [PATCH] Option for maximum exp value when merging orbs
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 37b26827d..fe6710f61 100644
+index 69fd81898..e6ee13ee5 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -444,4 +444,10 @@ public class PaperWorldConfig {
+@@ -450,4 +450,10 @@ public class PaperWorldConfig {
          replacementBlocks = getList("anti-xray.replacement-blocks", Arrays.asList((Object) "stone", "planks"));
          log("Anti-Xray: " + (antiXray ? "enabled" : "disabled") + " / Engine Mode: " + engineMode.getDescription() + " / Chunk Edge Mode: " + chunkEdgeMode.getDescription() + " / Up to " + ((maxChunkSectionIndex + 1) * 16) + " blocks");
      }
@@ -56,5 +56,5 @@ index d45cbf2f6..0193364d2 100644
          } // Spigot end
  
 -- 
-2.15.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0260-Configurable-Chunks-Sends-per-Tick-setting.patch b/Spigot-Server-Patches/0260-Configurable-Chunks-Sends-per-Tick-setting.patch
index 7bfbc1b7da..15c51aeef6 100644
--- a/Spigot-Server-Patches/0260-Configurable-Chunks-Sends-per-Tick-setting.patch
+++ b/Spigot-Server-Patches/0260-Configurable-Chunks-Sends-per-Tick-setting.patch
@@ -1,4 +1,4 @@
-From aad224df57ccfc99e1ba1f157dd97854f5bde6ec Mon Sep 17 00:00:00 2001
+From eebcf6097af36a318d2c1bf682908952cecfc4fe Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 1 Jan 2018 15:41:59 -0500
 Subject: [PATCH] Configurable Chunks Sends per Tick setting
@@ -8,10 +8,10 @@ Vanilla already had this limited, make it configurable.
 Limit how much exploration lags the server
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index fe6710f61..acf32d51d 100644
+index e6ee13ee5..8949b0290 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -450,4 +450,13 @@ public class PaperWorldConfig {
+@@ -456,4 +456,13 @@ public class PaperWorldConfig {
          expMergeMaxValue = getInt("experience-merge-max-value", -1);
          log("Experience Merge Max Value: " + expMergeMaxValue);
      }
@@ -39,5 +39,5 @@ index 4af557321..6ee9f6cfb 100644
              Iterator iterator2 = this.g.iterator();
  
 -- 
-2.15.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0261-Configurable-Max-Chunk-Gens-per-Tick.patch b/Spigot-Server-Patches/0261-Configurable-Max-Chunk-Gens-per-Tick.patch
index a3f6ce74b1..c701a789f2 100644
--- a/Spigot-Server-Patches/0261-Configurable-Max-Chunk-Gens-per-Tick.patch
+++ b/Spigot-Server-Patches/0261-Configurable-Max-Chunk-Gens-per-Tick.patch
@@ -1,4 +1,4 @@
-From 02583f41f823a2b75477de36eba276c499718fe8 Mon Sep 17 00:00:00 2001
+From b1b3807d31307574eeb9f680a94f315e2af24494 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 1 Jan 2018 16:10:24 -0500
 Subject: [PATCH] Configurable Max Chunk Gens per Tick
@@ -13,10 +13,10 @@ This should result in no noticeable speed reduction in generation for servers no
 lagging, and let larger servers reduce this value according to their own desires.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index acf32d51d..19c4148c6 100644
+index 8949b0290..cd036b440 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -459,4 +459,16 @@ public class PaperWorldConfig {
+@@ -465,4 +465,16 @@ public class PaperWorldConfig {
          }
          log("Max Chunk Sends Per Tick: " + maxChunkSendsPerTick);
      }
@@ -108,5 +108,5 @@ index 193c3621c..cf1258c55 100644
 +    // Paper end
  }
 -- 
-2.15.1
+2.14.3
 
diff --git a/Spigot-Server-Patches/0262-Make-max-squid-spawn-height-configurable.patch b/Spigot-Server-Patches/0262-Make-max-squid-spawn-height-configurable.patch
index 5e9aa9060b..b4dfa30291 100644
--- a/Spigot-Server-Patches/0262-Make-max-squid-spawn-height-configurable.patch
+++ b/Spigot-Server-Patches/0262-Make-max-squid-spawn-height-configurable.patch
@@ -1,4 +1,4 @@
-From a02014f865a05f49d52469459a509c46d8eb7544 Mon Sep 17 00:00:00 2001
+From 96f95bcd13cc2dbb7f781f7202acec4e40a4557b Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 11 Jan 2018 16:47:28 -0600
 Subject: [PATCH] Make max squid spawn height configurable
@@ -7,10 +7,10 @@ I don't know why upstream made only the minimum height configurable but
 whatever
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 19c4148c6..11e88663e 100644
+index cd036b440..1947f2466 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -471,4 +471,9 @@ public class PaperWorldConfig {
+@@ -477,4 +477,9 @@ public class PaperWorldConfig {
          }
      }
  
@@ -36,5 +36,5 @@ index 0ce16be65..58a902831 100644
  
      public void b(float f, float f1, float f2) {
 -- 
-2.15.1
+2.14.3
 
diff --git a/scripts/importmcdev.sh b/scripts/importmcdev.sh
index 639de5a9fd..c348742e7a 100755
--- a/scripts/importmcdev.sh
+++ b/scripts/importmcdev.sh
@@ -38,6 +38,7 @@ function import {
 import AxisAlignedBB
 import BaseBlockPosition
 import BiomeBase
+import BiomeBigHills
 import BiomeJungle
 import BiomeMesa
 import BlockBeacon