Make spawner nerfed mobs float AI toggleable

closes GH-57

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

@@ -1,11 +1,25 @@
-From 990076963be48fb550e05ccfa3faf24c35d1565b Mon Sep 17 00:00:00 2001
+From 5de6bbdc6f0c91c7585f52c748c9b981f2e39d17 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 13:24:16 -0600
 Subject: [PATCH] Allow nerfed mobs to jump
 
 
+diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+index 03a4fb4..6d6793c 100644
+--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
++++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+@@ -97,4 +97,9 @@ public class PaperWorldConfig {
+         fishingMaxTicks = getInt("fishing-time-range.MaximumTicks", 900);
+         log("Fishing time ranges are between " + fishingMinTicks +" and " + fishingMaxTicks + " ticks");
+     }
++
++    public boolean nerfedMobsShouldJump;
++    private void nerfedMobsShouldJump() {
++        nerfedMobsShouldJump = getBoolean("spawner-nerfed-mobs-should-jump", false);
++    }
+ }
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 16444b6..9b1204c 100644
+index 1a6b406..cee3b4a 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -43,6 +43,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -30,17 +44,17 @@ index 16444b6..9b1204c 100644
          }
          // Spigot End
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalFloat.java b/src/main/java/net/minecraft/server/PathfinderGoalFloat.java
-index 1a20dbf..e385148 100644
+index 1a20dbf..c56a0d0 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalFloat.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalFloat.java
 @@ -6,6 +6,7 @@ public class PathfinderGoalFloat extends PathfinderGoal {
  
      public PathfinderGoalFloat(EntityInsentient entityinsentient) {
          this.a = entityinsentient;
-+        entityinsentient.goalFloat = this; // Paper
++        if (entityinsentient.getWorld().paperConfig.nerfedMobsShouldJump) entityinsentient.goalFloat = this; // Paper
          this.a(4);
          ((Navigation) entityinsentient.getNavigation()).c(true);
      }
 -- 
-2.7.2
+2.7.3
 

Spigot-Server-Patches/0011-Player-Exhaustion-Multipliers.patch

@@ -1,16 +1,16 @@
-From b8e78ccacc247ac547456ead079b6c1d44a26830 Mon Sep 17 00:00:00 2001
+From 714b27a7819a114922fedd7a31a2bb58644643f3 Mon Sep 17 00:00:00 2001
 From: gsand <gsandowns@gmail.com>
 Date: Tue, 1 Mar 2016 13:43:16 -0600
 Subject: [PATCH] Player Exhaustion Multipliers
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 03a4fb4..6e82c3a 100644
+index 6d6793c..8a63435 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -97,4 +97,13 @@ public class PaperWorldConfig {
-         fishingMaxTicks = getInt("fishing-time-range.MaximumTicks", 900);
-         log("Fishing time ranges are between " + fishingMinTicks +" and " + fishingMaxTicks + " ticks");
+@@ -102,4 +102,13 @@ public class PaperWorldConfig {
+     private void nerfedMobsShouldJump() {
+         nerfedMobsShouldJump = getBoolean("spawner-nerfed-mobs-should-jump", false);
      }
 +
 +    public float blockBreakExhaustion;

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

@@ -1,14 +1,14 @@
-From 558de1f1cbd82e65ad5f0bcb5a1a08d3682edcb1 Mon Sep 17 00:00:00 2001
+From ec837e710d8f8d434c530be6b134c00c955f5415 Mon Sep 17 00:00:00 2001
 From: Suddenly <suddenly@suddenly.coffee>
 Date: Tue, 1 Mar 2016 13:51:54 -0600
 Subject: [PATCH] Add configurable despawn distances for living entities
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 6e82c3a..35a596f 100644
+index 8a63435..f9da7f8 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -106,4 +106,20 @@ public class PaperWorldConfig {
+@@ -111,4 +111,20 @@ public class PaperWorldConfig {
          log("Player exhaustion penalty for breaking blocks is " + blockBreakExhaustion);
          log("Player exhaustion penalty for swimming is " + playerSwimmingExhaustion);
      }

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

@@ -1,14 +1,14 @@
-From 7d0a8e445a94605d8511782d0268585bc6a7ff6b Mon Sep 17 00:00:00 2001
+From f6e5969f986f2901cc038cfa040cd26caa583bc9 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 3 Mar 2016 03:53:43 -0600
 Subject: [PATCH] Allow for toggling of spawn chunks
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 35a596f..fb27c66 100644
+index f9da7f8..f9a58f9 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -122,4 +122,10 @@ public class PaperWorldConfig {
+@@ -127,4 +127,10 @@ public class PaperWorldConfig {
          softDespawnDistance = softDespawnDistance*softDespawnDistance;
          hardDespawnDistance = hardDespawnDistance*hardDespawnDistance;
      }

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

@@ -1,14 +1,14 @@
-From 2e4e0b6ade2d6981baeda14c27df73fa3872935f Mon Sep 17 00:00:00 2001
+From cfc8fd001aac08c3626ecba2837d019897781381 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Tue, 1 Mar 2016 14:14:15 -0600
 Subject: [PATCH] Drop falling block and tnt entities at the specified height
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index fb27c66..b974c1a 100644
+index f9a58f9..df3e6fb 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -128,4 +128,14 @@ public class PaperWorldConfig {
+@@ -133,4 +133,14 @@ public class PaperWorldConfig {
          keepSpawnInMemory = getBoolean("keep-spawn-loaded", true);
          log("Keep spawn chunk loaded: " + keepSpawnInMemory);
      }

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

@@ -1,14 +1,14 @@
-From e329dec769d13616825e5ff08c36abcffad7a4a5 Mon Sep 17 00:00:00 2001
+From 2f00755a3e59a728c3ec0fa9e677862f2eca4929 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Tue, 1 Mar 2016 14:27:13 -0600
 Subject: [PATCH] Configurable speed for water flowing over lava
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index b974c1a..991a972 100644
+index df3e6fb..f81ece3 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -138,4 +138,10 @@ public class PaperWorldConfig {
+@@ -143,4 +143,10 @@ public class PaperWorldConfig {
          if (fallingBlockHeightNerf != 0) log("Falling Block Height Limit set to Y: " + fallingBlockHeightNerf);
          if (entityTNTHeightNerf != 0) log("TNT Entity Height Limit set to Y: " + entityTNTHeightNerf);
      }

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

@@ -1,14 +1,14 @@
-From b7109efd8179d03cd5d21a03c4f1ce01ddbdccad Mon Sep 17 00:00:00 2001
+From ee1afb11244134f8ecd99fd411fc50c6832775d9 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 23:58:50 -0600
 Subject: [PATCH] Configurable top of nether void damage
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 991a972..1a194e7 100644
+index f81ece3..7c0e61f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -144,4 +144,10 @@ public class PaperWorldConfig {
+@@ -149,4 +149,10 @@ public class PaperWorldConfig {
          waterOverLavaFlowSpeed = getInt("water-over-lava-flow-speed", 5);
          log("Water over lava flow speed: " + waterOverLavaFlowSpeed);
      }

Spigot-Server-Patches/0028-Fix-redstone-lag-issues.patch

@@ -1,14 +1,14 @@
-From e53a4f873aa7abb6ede0e5a04c0b73743384b923 Mon Sep 17 00:00:00 2001
+From 22c29fc6b22cb45bc388af5368121efb5cc89d2b Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 2 Mar 2016 00:21:24 -0600
 Subject: [PATCH] Fix redstone lag issues
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 1a194e7..17619b6 100644
+index 7c0e61f..facb98c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -150,4 +150,15 @@ public class PaperWorldConfig {
+@@ -155,4 +155,15 @@ public class PaperWorldConfig {
          netherVoidTopDamage = getBoolean( "nether-ceiling-void-damage", false );
          log("Top of the nether void damage: " + netherVoidTopDamage);
      }

Spigot-Server-Patches/0030-Configurable-async-light-updates.patch

@@ -1,14 +1,14 @@
-From 3737e9c22597fdd788f00c58af11937a76d8d613 Mon Sep 17 00:00:00 2001
+From 9ba3497e7a95320ae772e24c1407d1894b2b3b33 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 00:52:31 -0600
 Subject: [PATCH] Configurable async light updates
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 17619b6..ef5c960 100644
+index facb98c..9991a4a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -161,4 +161,9 @@ public class PaperWorldConfig {
+@@ -166,4 +166,9 @@ public class PaperWorldConfig {
  
      }
  

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

@@ -1,14 +1,14 @@
-From cc85a64d57ff70fd663cd2f90bb5889fa0564efe Mon Sep 17 00:00:00 2001
+From 72c2f2efed002ce3792cfb50fb51c67d5da91a17 Mon Sep 17 00:00:00 2001
 From: DoctorDark <doctordark11@gmail.com>
 Date: Wed, 16 Mar 2016 02:21:39 -0500
 Subject: [PATCH] Configurable end credits
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index ef5c960..43e73e1 100644
+index 9991a4a..1b88731 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -166,4 +166,10 @@ public class PaperWorldConfig {
+@@ -171,4 +171,10 @@ public class PaperWorldConfig {
          useAsyncLighting = false; //getBoolean( "use-async-lighting", false );
          log("World async lighting: " + useAsyncLighting);
      }

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

@@ -1,14 +1,14 @@
-From 9d7afb2ff89ef9000241a6e4a2ac450acd695bcc Mon Sep 17 00:00:00 2001
+From 5ea4fba695f5844e3f0b69dc14fb186a1c53f8c6 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 43e73e1..1e7eed0 100644
+index 1b88731..7154d31 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -172,4 +172,28 @@ public class PaperWorldConfig {
+@@ -177,4 +177,28 @@ public class PaperWorldConfig {
          disableEndCredits = getBoolean("game-mechanics.disable-end-credits", false);
          log("End credits disabled: " + disableEndCredits);
      }

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

@@ -1,4 +1,4 @@
-From 094312075d640754ee3ce29482b5f02c39dd107d Mon Sep 17 00:00:00 2001
+From a17c879830b3beb5c4c246390355c0b2b1c14f9e Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 11:59:48 -0600
 Subject: [PATCH] Optimize explosions
@@ -10,10 +10,10 @@ This patch adds a per-tick cache that is used for storing and retrieving
 an entity's exposure during an explosion.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 1e7eed0..9d48620 100644
+index 7154d31..2be15d2 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -196,4 +196,10 @@ public class PaperWorldConfig {
+@@ -201,4 +201,10 @@ public class PaperWorldConfig {
          generateVillage = getBoolean("generator-settings.village", true);
          generateFlatBedrock = getBoolean("generator-settings.flat-bedrock", false);
      }

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

@@ -1,14 +1,14 @@
-From a6d6f3dda04dce7d7ca8be12b32e66ee4287479f Mon Sep 17 00:00:00 2001
+From aeb9cc94434dccf95b48ee6944f59e6927fa9ee5 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 9d48620..43f2672 100644
+index 2be15d2..dcf3d74 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -202,4 +202,11 @@ public class PaperWorldConfig {
+@@ -207,4 +207,11 @@ public class PaperWorldConfig {
          optimizeExplosions = getBoolean("optimize-explosions", false);
          log("Optimize explosions: " + optimizeExplosions);
      }

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

@@ -1,14 +1,14 @@
-From 6b8c28394f75afccd698e24332449b441f0f8b30 Mon Sep 17 00:00:00 2001
+From 6ed55ff9a184a7c22c065788ad99d4f55f833c8a 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 43f2672..3d1f0ff 100644
+index dcf3d74..78a1e59 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -209,4 +209,11 @@ public class PaperWorldConfig {
+@@ -214,4 +214,11 @@ public class PaperWorldConfig {
          fastDrainLava = getBoolean("fast-drain.lava", false);
          fastDrainWater = getBoolean("fast-drain.water", false);
      }

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

@@ -1,14 +1,14 @@
-From 7111ea7de2000970d20588754f7267242f3d86fc Mon Sep 17 00:00:00 2001
+From af80def89b8b7064581e872b121842e79a182369 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 3d1f0ff..c67cf3b 100644
+index 78a1e59..6fce2b3 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 {
+@@ -221,4 +221,9 @@ public class PaperWorldConfig {
          lavaFlowSpeedNormal = getInt("lava-flow-speed.normal", 30);
          lavaFlowSpeedNether = getInt("lava-flow-speed.nether", 10);
      }

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

@@ -1,14 +1,14 @@
-From 6e5e85cb4c46e79231dd2da3a8830172f81e7a58 Mon Sep 17 00:00:00 2001
+From 8e70e29c1591a664c587bacc5b0d86c50afc2652 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 c67cf3b..c70ead7 100644
+index 6fce2b3..ea9043a 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 {
+@@ -226,4 +226,9 @@ public class PaperWorldConfig {
      private void disableExplosionKnockback(){
          disableExplosionKnockback = getBoolean("disable-explosion-knockback", false);
      }

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

@@ -1,14 +1,14 @@
-From 59395a4297a844d3474ba593635dd70770aec9a7 Mon Sep 17 00:00:00 2001
+From 73e99e657d8d2da102db1d65aaa1742b2f28a4bc 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 c70ead7..7c42e99 100644
+index ea9043a..8b7028a 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 {
+@@ -231,4 +231,9 @@ public class PaperWorldConfig {
      private void disableThunder() {
          disableThunder = getBoolean("disable-thunder", false);
      }

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

@@ -1,14 +1,14 @@
-From 87b088fd9d782584af22e32aa2edb46e913191cd Mon Sep 17 00:00:00 2001
+From 8d47eefa32b1239d781e2a7dbdb1f57f2f5d8a49 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 7c42e99..a5acb1a 100644
+index 8b7028a..5efba80 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 {
+@@ -236,4 +236,9 @@ public class PaperWorldConfig {
      private void disableIceAndSnow(){
          disableIceAndSnow = getBoolean("disable-ice-and-snow", false);
      }

Spigot-Server-Patches/0044-Configurable-TNT-cannon-fix.patch

@@ -1,14 +1,14 @@
-From 60140188171da9c29a6b5c795016a858343b84a2 Mon Sep 17 00:00:00 2001
+From 34ec1688d03f4da1d9148437e382ddcbab8bd2fe Mon Sep 17 00:00:00 2001
 From: Iceee <andrew@opticgaming.tv>
 Date: Wed, 2 Mar 2016 23:00:53 -0600
 Subject: [PATCH] Configurable TNT cannon fix
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index a5acb1a..85c9cd1 100644
+index 5efba80..2cfeb9c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -236,4 +236,10 @@ public class PaperWorldConfig {
+@@ -241,4 +241,10 @@ public class PaperWorldConfig {
      private void mobSpawnerTickRate() {
          mobSpawnerTickRate = getInt("mob-spawner-tick-rate", 1);
      }

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

@@ -1,14 +1,14 @@
-From 4bc7f8fcd75e55fcfb67cd622dc54b159cbaf3e8 Mon Sep 17 00:00:00 2001
+From 8e721ad60337c0c5a614eea11664af50fda00c19 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 85c9cd1..8622874 100644
+index 2cfeb9c..a4d9b16 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -242,4 +242,9 @@ public class PaperWorldConfig {
+@@ -247,4 +247,9 @@ public class PaperWorldConfig {
          fixCannons = getBoolean("fix-cannons", false);
          log("Fix TNT cannons: " + fixCannons);
      }

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

@@ -1,14 +1,14 @@
-From 47814077eed10ca56e3ccc7b9410a098aaa152cb Mon Sep 17 00:00:00 2001
+From d823b6d2a8148198d203cc315f2b2cba153e9f4b 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 8622874..a3fa8a0 100644
+index a4d9b16..4911060 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -247,4 +247,9 @@ public class PaperWorldConfig {
+@@ -252,4 +252,9 @@ public class PaperWorldConfig {
      private void containerUpdateTickRate() {
          containerUpdateTickRate = getInt("container-update-tick-rate", 1);
      }

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

@@ -1,14 +1,14 @@
-From 877e7c6ce16d87576c96e52011e39ac2faae10c6 Mon Sep 17 00:00:00 2001
+From 7bb145b09d9c6ba49a92b4c39d6d9bc422ee167d 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 a3fa8a0..e0ed821 100644
+index 4911060..8ec65af 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -252,4 +252,9 @@ public class PaperWorldConfig {
+@@ -257,4 +257,9 @@ public class PaperWorldConfig {
      private void disableChestCatDetection() {
          disableChestCatDetection = getBoolean("game-mechanics.disable-chest-cat-detection", false);
      }

Spigot-Server-Patches/0061-Add-Location-support-to-tab-completers-vanilla-featu.patch

@@ -1,4 +1,4 @@
-From 125eea581760ee79f5a3cb767d40cb0b3fe3fa22 Mon Sep 17 00:00:00 2001
+From 94e78ae772b6c0b96a39f28b088331772b5157d3 Mon Sep 17 00:00:00 2001
 From: DemonWav <demonwav@gmail.com>
 Date: Thu, 3 Mar 2016 01:44:39 -0600
 Subject: [PATCH] Add Location support to tab completers (vanilla feature
@@ -6,10 +6,10 @@ Subject: [PATCH] Add Location support to tab completers (vanilla feature
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index e0ed821..7dc63dc 100644
+index 8ec65af..fd9aa5c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -257,4 +257,9 @@ public class PaperWorldConfig {
+@@ -262,4 +262,9 @@ public class PaperWorldConfig {
      private void allChunksAreSlimeChunks() {
          allChunksAreSlimeChunks = getBoolean("all-chunks-are-slime-chunks", false);
      }

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

@@ -1,14 +1,14 @@
-From f3ff0967d4016da4aa66a8214bccc2c54c1d45ab Mon Sep 17 00:00:00 2001
+From c6fb8f63240d3ee1457c3c31a041b50df8cab965 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 7dc63dc..69b29f2 100644
+index fd9aa5c..904d9a8 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -262,4 +262,9 @@ public class PaperWorldConfig {
+@@ -267,4 +267,9 @@ public class PaperWorldConfig {
      private void allowBlockLocationTabCompletion() {
          allowBlockLocationTabCompletion = getBoolean("allow-block-location-tab-completion", true);
      }

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

@@ -1,4 +1,4 @@
-From c13405662594117edbb8b8749f489b249ffff62f Mon Sep 17 00:00:00 2001
+From 1aee9c338934ea6f0187ff0e4141929f27fd9d91 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 69b29f2..4655ded 100644
+index 904d9a8..7b5b2d3 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -267,4 +267,9 @@ public class PaperWorldConfig {
+@@ -272,4 +272,9 @@ public class PaperWorldConfig {
      private void portalSearchRadius() {
          portalSearchRadius = getInt("portal-search-radius", 128);
      }

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

@@ -1,4 +1,4 @@
-From e1b447268152ca7148ae0ec948cb7865f81b055a Mon Sep 17 00:00:00 2001
+From 11111d3ecaacfd66ca1678680b23a8aa9d6b8cde 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 4655ded..e884208 100644
+index 7b5b2d3..7cd36da 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -272,4 +272,9 @@ public class PaperWorldConfig {
+@@ -277,4 +277,9 @@ public class PaperWorldConfig {
      private void disableTeleportationSuffocationCheck() {
          disableTeleportationSuffocationCheck = getBoolean("disable-teleportation-suffocation-check", false);
      }

Spigot-Server-Patches/0082-Re-add-Spigot-s-hopper-check-feature.patch

@@ -1,14 +1,14 @@
-From 3a4f23e7d9df30c673288c37fe6c6912d586f05b Mon Sep 17 00:00:00 2001
+From 43a8b5d2e760a663bf8674cdb794e510f3c3d62d Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Sat, 12 Mar 2016 13:37:50 -0600
 Subject: [PATCH] Re-add Spigot's hopper-check feature
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index e884208..9c0022f 100644
+index 7cd36da..854607a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -277,4 +277,9 @@ public class PaperWorldConfig {
+@@ -282,4 +282,9 @@ public class PaperWorldConfig {
      private void nonPlayerEntitiesOnScoreboards() {
          nonPlayerEntitiesOnScoreboards = getBoolean("allow-non-player-entities-on-scoreboards", false);
      }

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

@@ -1,4 +1,4 @@
-From bb9f6df828da47c7dbcab06ef3679cfd141c3040 Mon Sep 17 00:00:00 2001
+From 061b3ef97d23ed3950196836e50da0c62bf08d38 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 9c0022f..e315960 100644
+index 854607a..b5ed53f 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 {
+@@ -287,4 +287,9 @@ public class PaperWorldConfig {
      private void useHopperCheck() {
          useHopperCheck = getBoolean("use-hopper-check", false);
      }

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

@@ -1,4 +1,4 @@
-From 218242d58329b3113b113a734d1491d162fd783d Mon Sep 17 00:00:00 2001
+From 62ffb05812c537072f184c2b561f62d77f4750b5 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 e315960..cf56561 100644
+index b5ed53f..38272c4 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -287,4 +287,13 @@ public class PaperWorldConfig {
+@@ -292,4 +292,13 @@ public class PaperWorldConfig {
      private void allowLeashingUndeadHorse() {
          allowLeashingUndeadHorse = getBoolean("allow-leashing-undead-horse", false);
      }