diff --git a/Spigot-Server-Patches/0002-Paper-config-files.patch b/Spigot-Server-Patches/0002-Paper-config-files.patch
index 4042d5608d..7e123dd0f2 100644
--- a/Spigot-Server-Patches/0002-Paper-config-files.patch
+++ b/Spigot-Server-Patches/0002-Paper-config-files.patch
@@ -1,4 +1,4 @@
-From 41aae67ada140ebfe2b2c0fcbd5eb9172943b696 Mon Sep 17 00:00:00 2001
+From e7da3c333a344c248d825b4b2df0d0ff6c8ac238 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 29 Feb 2016 21:02:09 -0600
 Subject: [PATCH] Paper config files
@@ -6,7 +6,7 @@ Subject: [PATCH] Paper config files
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 new file mode 100644
-index 0000000..4f4377e
+index 0000000..0468372
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -0,0 +1,164 @@
@@ -66,8 +66,8 @@ index 0000000..4f4377e
 +
 +        commands = new HashMap<String, Command>();
 +
-+        version = getInt("config-version", 9);
-+        set("config-version", 9);
++        version = getInt("config-version", 10);
++        set("config-version", 10);
 +        readConfig(PaperConfig.class, null);
 +    }
 +
@@ -176,10 +176,10 @@ index 0000000..4f4377e
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 new file mode 100644
-index 0000000..2d50237
+index 0000000..dae60dc
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -0,0 +1,69 @@
+@@ -0,0 +1,72 @@
 +package com.destroystokyo.paper;
 +
 +import java.util.List;
@@ -217,6 +217,9 @@ index 0000000..2d50237
 +
 +    private void set(String path, Object val) {
 +        config.set("world-settings.default." + path, val);
++        if (config.get("world-settings." + worldName + "." + path) != null) {
++            config.set("world-settings." + worldName + "." + path, val);
++        }
 +    }
 +
 +    private boolean getBoolean(String path, boolean def) {
diff --git a/Spigot-Server-Patches/0007-Configurable-squid-spawn-ranges.patch b/Spigot-Server-Patches/0007-Configurable-squid-spawn-ranges.patch
index fba35cec3c..a0a16ea29c 100644
--- a/Spigot-Server-Patches/0007-Configurable-squid-spawn-ranges.patch
+++ b/Spigot-Server-Patches/0007-Configurable-squid-spawn-ranges.patch
@@ -1,14 +1,14 @@
-From ba437ee826f25bccd4ff0b36e33a206e4e625c66 Mon Sep 17 00:00:00 2001
+From 4e2dd233744cdd1ead4930a0e390656b3270c8f5 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 12:45:11 -0600
 Subject: [PATCH] Configurable squid spawn ranges
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 2d50237..fe9502c 100644
+index dae60dc..c74c8a7 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -66,4 +66,12 @@ public class PaperWorldConfig {
+@@ -69,4 +69,12 @@ public class PaperWorldConfig {
          config.addDefault("world-settings.default." + path, def);
          return config.getString("world-settings." + worldName + "." + path, config.getString("world-settings.default." + path));
      }
diff --git a/Spigot-Server-Patches/0008-Configurable-cactus-and-reed-natural-growth-heights.patch b/Spigot-Server-Patches/0008-Configurable-cactus-and-reed-natural-growth-heights.patch
index 461f92f7f6..2569992f01 100644
--- a/Spigot-Server-Patches/0008-Configurable-cactus-and-reed-natural-growth-heights.patch
+++ b/Spigot-Server-Patches/0008-Configurable-cactus-and-reed-natural-growth-heights.patch
@@ -1,14 +1,14 @@
-From 37379ea38aeae3de6345be81d535c6304db9286a Mon Sep 17 00:00:00 2001
+From aa74736eea28148bcbbda202c2c130aeb3636927 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 13:02:51 -0600
 Subject: [PATCH] Configurable cactus and reed natural growth heights
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index fe9502c..22b643e 100644
+index c74c8a7..8d9c322 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -74,4 +74,13 @@ public class PaperWorldConfig {
+@@ -77,4 +77,13 @@ public class PaperWorldConfig {
          squidMaxSpawnHeight = getDouble("squid-spawn-height.maximum", 63.0D);
          log("Squids will spawn between Y: " + squidMinSpawnHeight + " and Y: " + squidMaxSpawnHeight);
      }
diff --git a/Spigot-Server-Patches/0009-Configurable-baby-zombie-movement-speed.patch b/Spigot-Server-Patches/0009-Configurable-baby-zombie-movement-speed.patch
index 287f099c27..a30ce9191d 100644
--- a/Spigot-Server-Patches/0009-Configurable-baby-zombie-movement-speed.patch
+++ b/Spigot-Server-Patches/0009-Configurable-baby-zombie-movement-speed.patch
@@ -1,14 +1,14 @@
-From bb6eb027005395cbddc8fc0acae01a60dda0858e Mon Sep 17 00:00:00 2001
+From 14d9f4590ae91be7b3dd0e32fcf5faab128164b1 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 13:09:16 -0600
 Subject: [PATCH] Configurable baby zombie movement speed
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 22b643e..2cb4ac6 100644
+index 8d9c322..ae3d0e4 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -83,4 +83,10 @@ public class PaperWorldConfig {
+@@ -86,4 +86,10 @@ public class PaperWorldConfig {
          log("Max height for cactus growth " + cactusMaxHeight + ". Max height for reed growth " + reedMaxHeight);
  
      }
diff --git a/Spigot-Server-Patches/0010-Configurable-fishing-time-ranges.patch b/Spigot-Server-Patches/0010-Configurable-fishing-time-ranges.patch
index 49365dfd11..81e26fdc36 100644
--- a/Spigot-Server-Patches/0010-Configurable-fishing-time-ranges.patch
+++ b/Spigot-Server-Patches/0010-Configurable-fishing-time-ranges.patch
@@ -1,14 +1,14 @@
-From 7f1e7b45866ef1b0f6d4236c5e255ae3e1d8698b Mon Sep 17 00:00:00 2001
+From 7360bcabef9effea0d23611bde5a3ed0c3ce699b Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 13:14:11 -0600
 Subject: [PATCH] Configurable fishing time ranges
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 2cb4ac6..03a4fb4 100644
+index ae3d0e4..9a72ef7 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -89,4 +89,12 @@ public class PaperWorldConfig {
+@@ -92,4 +92,12 @@ public class PaperWorldConfig {
          babyZombieMovementSpeed = getDouble("baby-zombie-movement-speed", 0.5D); // Player moves at 0.1F, for reference
          log("Baby zombies will move at the speed of " + babyZombieMovementSpeed);
      }
diff --git a/Spigot-Server-Patches/0011-Allow-nerfed-mobs-to-jump.patch b/Spigot-Server-Patches/0011-Allow-nerfed-mobs-to-jump.patch
index e4c75172e5..484ede123a 100644
--- a/Spigot-Server-Patches/0011-Allow-nerfed-mobs-to-jump.patch
+++ b/Spigot-Server-Patches/0011-Allow-nerfed-mobs-to-jump.patch
@@ -1,14 +1,14 @@
-From ebe3ea7e457df136088d8e88252db21880d3bff2 Mon Sep 17 00:00:00 2001
+From 105ff62df1fc75c06aaa91e9d6c8f61527dd8566 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
+index 9a72ef7..a44bbed 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 {
+@@ -100,4 +100,9 @@ public class PaperWorldConfig {
          fishingMaxTicks = getInt("fishing-time-range.MaximumTicks", 900);
          log("Fishing time ranges are between " + fishingMinTicks +" and " + fishingMaxTicks + " ticks");
      }
diff --git a/Spigot-Server-Patches/0013-Player-Exhaustion-Multipliers.patch b/Spigot-Server-Patches/0013-Player-Exhaustion-Multipliers.patch
index cfc9e2fc4b..3d18dfab42 100644
--- a/Spigot-Server-Patches/0013-Player-Exhaustion-Multipliers.patch
+++ b/Spigot-Server-Patches/0013-Player-Exhaustion-Multipliers.patch
@@ -1,14 +1,14 @@
-From 539d8278cd23299ba4310d2f5b3f2862be81e9fb Mon Sep 17 00:00:00 2001
+From c5ca014520533f97fea98525454b2ef371d0e83a 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 6d6793c..8a63435 100644
+index a44bbed..b1d712f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -102,4 +102,13 @@ public class PaperWorldConfig {
+@@ -105,4 +105,13 @@ public class PaperWorldConfig {
      private void nerfedMobsShouldJump() {
          nerfedMobsShouldJump = getBoolean("spawner-nerfed-mobs-should-jump", false);
      }
diff --git a/Spigot-Server-Patches/0014-Add-configurable-despawn-distances-for-living-entiti.patch b/Spigot-Server-Patches/0014-Add-configurable-despawn-distances-for-living-entiti.patch
index 8c6f51f51c..b0e44af6a4 100644
--- a/Spigot-Server-Patches/0014-Add-configurable-despawn-distances-for-living-entiti.patch
+++ b/Spigot-Server-Patches/0014-Add-configurable-despawn-distances-for-living-entiti.patch
@@ -1,14 +1,14 @@
-From 498b31972ea2738871d13c59515cabcc9e231b76 Mon Sep 17 00:00:00 2001
+From 2540f8f92c0ba3791668eaab910567ee1c0234bd 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 8a63435..f9da7f8 100644
+index b1d712f..402dbe7 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -111,4 +111,20 @@ public class PaperWorldConfig {
+@@ -114,4 +114,20 @@ public class PaperWorldConfig {
          log("Player exhaustion penalty for breaking blocks is " + blockBreakExhaustion);
          log("Player exhaustion penalty for swimming is " + playerSwimmingExhaustion);
      }
diff --git a/Spigot-Server-Patches/0015-Allow-for-toggling-of-spawn-chunks.patch b/Spigot-Server-Patches/0015-Allow-for-toggling-of-spawn-chunks.patch
index 087843021d..955d93aff6 100644
--- a/Spigot-Server-Patches/0015-Allow-for-toggling-of-spawn-chunks.patch
+++ b/Spigot-Server-Patches/0015-Allow-for-toggling-of-spawn-chunks.patch
@@ -1,14 +1,14 @@
-From 3928ed004ee94d72443934868f5a055241c01f27 Mon Sep 17 00:00:00 2001
+From 45ab98c4fc1e70b8214aa368871d6621d04815c1 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 f9da7f8..f9a58f9 100644
+index 402dbe7..78dcf26 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -127,4 +127,10 @@ public class PaperWorldConfig {
+@@ -130,4 +130,10 @@ public class PaperWorldConfig {
          softDespawnDistance = softDespawnDistance*softDespawnDistance;
          hardDespawnDistance = hardDespawnDistance*hardDespawnDistance;
      }
@@ -20,7 +20,7 @@ index f9da7f8..f9a58f9 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index b26516a..5524e43 100644
+index e2a06f1..9599849 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -198,6 +198,7 @@ public abstract class World implements IBlockAccess {
@@ -32,5 +32,5 @@ index b26516a..5524e43 100644
          this.tileLimiter = new org.spigotmc.TickLimiter(spigotConfig.tileMaxTickTime);
      }
 -- 
-2.7.4
+2.8.2
 
diff --git a/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch b/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch
index 15a329823e..e6db47365e 100644
--- a/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch
+++ b/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch
@@ -1,14 +1,14 @@
-From c2b98da52b36fcfa251ddc1951645eadf6b25bbd Mon Sep 17 00:00:00 2001
+From a0937231e2595d3b2ce3795d3fca5e36bbee8980 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 f9a58f9..df3e6fb 100644
+index 78dcf26..f19ae97 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -133,4 +133,14 @@ public class PaperWorldConfig {
+@@ -136,4 +136,14 @@ public class PaperWorldConfig {
          keepSpawnInMemory = getBoolean("keep-spawn-loaded", true);
          log("Keep spawn chunk loaded: " + keepSpawnInMemory);
      }
diff --git a/Spigot-Server-Patches/0017-Configurable-speed-for-water-flowing-over-lava.patch b/Spigot-Server-Patches/0017-Configurable-speed-for-water-flowing-over-lava.patch
index 1098e106b2..943d8e222d 100644
--- a/Spigot-Server-Patches/0017-Configurable-speed-for-water-flowing-over-lava.patch
+++ b/Spigot-Server-Patches/0017-Configurable-speed-for-water-flowing-over-lava.patch
@@ -1,14 +1,14 @@
-From 37850ea6d29505f59ae31c0e27b286baa36a5afe Mon Sep 17 00:00:00 2001
+From ad6832d5982a4f8af5dfcac70d5a17c97c73a780 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 df3e6fb..f81ece3 100644
+index f19ae97..8fc2f6c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -143,4 +143,10 @@ public class PaperWorldConfig {
+@@ -146,4 +146,10 @@ public class PaperWorldConfig {
          if (fallingBlockHeightNerf != 0) log("Falling Block Height Limit set to Y: " + fallingBlockHeightNerf);
          if (entityTNTHeightNerf != 0) log("TNT Entity Height Limit set to Y: " + entityTNTHeightNerf);
      }
@@ -20,7 +20,7 @@ index df3e6fb..f81ece3 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/BlockFlowing.java b/src/main/java/net/minecraft/server/BlockFlowing.java
-index 800ffdc..036e861 100644
+index ab1efab..be8020a 100644
 --- a/src/main/java/net/minecraft/server/BlockFlowing.java
 +++ b/src/main/java/net/minecraft/server/BlockFlowing.java
 @@ -35,7 +35,7 @@ public class BlockFlowing extends BlockFluids {
@@ -57,5 +57,5 @@ index 800ffdc..036e861 100644
 +    }
  }
 -- 
-2.7.4
+2.8.2
 
diff --git a/Spigot-Server-Patches/0028-Configurable-top-of-nether-void-damage.patch b/Spigot-Server-Patches/0028-Configurable-top-of-nether-void-damage.patch
index a055334e71..972306e8a4 100644
--- a/Spigot-Server-Patches/0028-Configurable-top-of-nether-void-damage.patch
+++ b/Spigot-Server-Patches/0028-Configurable-top-of-nether-void-damage.patch
@@ -1,14 +1,14 @@
-From 660b12196ce83db18407308413758b721fe5c643 Mon Sep 17 00:00:00 2001
+From 5897b5a231713af5b38a3da0e2eb7a400da94d6f 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 f81ece3..7c0e61f 100644
+index 8fc2f6c..d78b688 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -149,4 +149,10 @@ public class PaperWorldConfig {
+@@ -152,4 +152,10 @@ public class PaperWorldConfig {
          waterOverLavaFlowSpeed = getInt("water-over-lava-flow-speed", 5);
          log("Water over lava flow speed: " + waterOverLavaFlowSpeed);
      }
diff --git a/Spigot-Server-Patches/0031-Lighting-Queue.patch b/Spigot-Server-Patches/0031-Lighting-Queue.patch
index da3dd898a1..cde7f1da80 100644
--- a/Spigot-Server-Patches/0031-Lighting-Queue.patch
+++ b/Spigot-Server-Patches/0031-Lighting-Queue.patch
@@ -1,4 +1,4 @@
-From dda988688e1cc0e88e958f3d2efb47a23df5cc01 Mon Sep 17 00:00:00 2001
+From 85c55d56c0aecf3428c971fc1c3830465ea2059e Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 00:52:31 -0600
 Subject: [PATCH] Lighting Queue
@@ -27,10 +27,10 @@ index 11dd692..da3787d 100644
      }
  }
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 7c0e61f..8e3a0f3 100644
+index d78b688..158db3a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -155,4 +155,10 @@ public class PaperWorldConfig {
+@@ -158,4 +158,10 @@ public class PaperWorldConfig {
          netherVoidTopDamage = getBoolean( "nether-ceiling-void-damage", false );
          log("Top of the nether void damage: " + netherVoidTopDamage);
      }
@@ -85,7 +85,7 @@ index 5690e81..d55beb9 100644
  
                  TileEntity tileentity;
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index de85bd5..50f0345 100644
+index 6c94565..b26de26 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -275,6 +275,7 @@ public class ChunkProviderServer implements IChunkProvider {
diff --git a/Spigot-Server-Patches/0033-Configurable-end-credits.patch b/Spigot-Server-Patches/0033-Configurable-end-credits.patch
index b928a21737..d2beeec5b3 100644
--- a/Spigot-Server-Patches/0033-Configurable-end-credits.patch
+++ b/Spigot-Server-Patches/0033-Configurable-end-credits.patch
@@ -1,14 +1,14 @@
-From e5bd40dc6bc3827203da24f8214cfb76b7caf653 Mon Sep 17 00:00:00 2001
+From bbd9db10725d0e0bfb9ed3bd9252636585728e72 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 8e3a0f3..2e88385 100644
+index 158db3a..e4e5487 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -161,4 +161,10 @@ public class PaperWorldConfig {
+@@ -164,4 +164,10 @@ public class PaperWorldConfig {
          queueLightUpdates = getBoolean("queue-light-updates", false);
          log("Lighting Queue enabled: " + queueLightUpdates);
      }
diff --git a/Spigot-Server-Patches/0035-Generator-Settings.patch b/Spigot-Server-Patches/0035-Generator-Settings.patch
index 022b62ea3c..d0d7a54cc4 100644
--- a/Spigot-Server-Patches/0035-Generator-Settings.patch
+++ b/Spigot-Server-Patches/0035-Generator-Settings.patch
@@ -1,14 +1,14 @@
-From c4c7414c6f7f2475be2d17d0389f13d082a8f9a5 Mon Sep 17 00:00:00 2001
+From 4aa8d64815d16a16a1688273eba27172adf4fe14 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 2e88385..af2491e 100644
+index e4e5487..7525bcb 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -167,4 +167,28 @@ public class PaperWorldConfig {
+@@ -170,4 +170,28 @@ public class PaperWorldConfig {
          disableEndCredits = getBoolean("game-mechanics.disable-end-credits", false);
          log("End credits disabled: " + disableEndCredits);
      }
diff --git a/Spigot-Server-Patches/0036-Optimize-explosions.patch b/Spigot-Server-Patches/0036-Optimize-explosions.patch
index 26ff8cd64e..669d63efd4 100644
--- a/Spigot-Server-Patches/0036-Optimize-explosions.patch
+++ b/Spigot-Server-Patches/0036-Optimize-explosions.patch
@@ -1,4 +1,4 @@
-From 67a035d6646e7d542e0a6c0156ec202e542e01aa Mon Sep 17 00:00:00 2001
+From 36914be12a1db4d0d548285b1bccf8b4563723ba 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 af2491e..54e31ca 100644
+index 7525bcb..ca0ac9b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -191,4 +191,10 @@ public class PaperWorldConfig {
+@@ -194,4 +194,10 @@ public class PaperWorldConfig {
          generateVillage = getBoolean("generator-settings.village", true);
          generateFlatBedrock = getBoolean("generator-settings.flat-bedrock", false);
      }
diff --git a/Spigot-Server-Patches/0038-Fast-draining.patch b/Spigot-Server-Patches/0038-Fast-draining.patch
index 6575a85d81..ddbdbee94f 100644
--- a/Spigot-Server-Patches/0038-Fast-draining.patch
+++ b/Spigot-Server-Patches/0038-Fast-draining.patch
@@ -1,14 +1,14 @@
-From 772d424160249d441b16bf2be8fb59d5f607c182 Mon Sep 17 00:00:00 2001
+From 30d62432d64c2e0ff69634d8708c9e28bf74e0c5 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 54e31ca..f2babb1 100644
+index ca0ac9b..f8b90e3 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -197,4 +197,11 @@ public class PaperWorldConfig {
+@@ -200,4 +200,11 @@ public class PaperWorldConfig {
          optimizeExplosions = getBoolean("optimize-explosions", false);
          log("Optimize explosions: " + optimizeExplosions);
      }
diff --git a/Spigot-Server-Patches/0039-Configurable-lava-flow-speed.patch b/Spigot-Server-Patches/0039-Configurable-lava-flow-speed.patch
index d499a41041..5c51e4ea28 100644
--- a/Spigot-Server-Patches/0039-Configurable-lava-flow-speed.patch
+++ b/Spigot-Server-Patches/0039-Configurable-lava-flow-speed.patch
@@ -1,14 +1,14 @@
-From 068efa1fbc02bc6da886f9d426d21109166ee9cd Mon Sep 17 00:00:00 2001
+From 4e9c8a5c496584442c77125e51fda1f54f8bfa8f 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 f2babb1..ba7184f 100644
+index f8b90e3..004d4c0 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -204,4 +204,11 @@ public class PaperWorldConfig {
+@@ -207,4 +207,11 @@ public class PaperWorldConfig {
          fastDrainLava = getBoolean("fast-drain.lava", false);
          fastDrainWater = getBoolean("fast-drain.water", false);
      }
diff --git a/Spigot-Server-Patches/0041-Disable-explosion-knockback.patch b/Spigot-Server-Patches/0041-Disable-explosion-knockback.patch
index 736f7288f9..96d5c379f8 100644
--- a/Spigot-Server-Patches/0041-Disable-explosion-knockback.patch
+++ b/Spigot-Server-Patches/0041-Disable-explosion-knockback.patch
@@ -1,14 +1,14 @@
-From 9fa5a8960f44a4e590ecc89bb30ee7e27559d2e3 Mon Sep 17 00:00:00 2001
+From 83fbaeb18c12386e53df07927bc67ffcf0ed06ae 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 ba7184f..2626f81 100644
+index 004d4c0..87979dd 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 {
+@@ -214,4 +214,9 @@ public class PaperWorldConfig {
          lavaFlowSpeedNormal = getInt("lava-flow-speed.normal", 30);
          lavaFlowSpeedNether = getInt("lava-flow-speed.nether", 10);
      }
diff --git a/Spigot-Server-Patches/0042-Disable-thunder.patch b/Spigot-Server-Patches/0042-Disable-thunder.patch
index 552507cb60..9c1fae45c1 100644
--- a/Spigot-Server-Patches/0042-Disable-thunder.patch
+++ b/Spigot-Server-Patches/0042-Disable-thunder.patch
@@ -1,14 +1,14 @@
-From ea9b69cddde0863bd7aedf3d4166380c99708377 Mon Sep 17 00:00:00 2001
+From 0da947e01ad657951ae7118c3873af4781376334 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 2626f81..1a341d8 100644
+index 87979dd..076fcbb 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 {
+@@ -219,4 +219,9 @@ public class PaperWorldConfig {
      private void disableExplosionKnockback(){
          disableExplosionKnockback = getBoolean("disable-explosion-knockback", false);
      }
diff --git a/Spigot-Server-Patches/0043-Disable-ice-and-snow.patch b/Spigot-Server-Patches/0043-Disable-ice-and-snow.patch
index 9f2e05f3a4..8aba099e5e 100644
--- a/Spigot-Server-Patches/0043-Disable-ice-and-snow.patch
+++ b/Spigot-Server-Patches/0043-Disable-ice-and-snow.patch
@@ -1,14 +1,14 @@
-From 36e96a6be9ba5842cc48f7693975aa1f9463fea6 Mon Sep 17 00:00:00 2001
+From 1f43df2ac1437616a2e6101979fcb06f07eb2f43 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 1a341d8..d8bc932 100644
+index 076fcbb..9018df5 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 {
+@@ -224,4 +224,9 @@ public class PaperWorldConfig {
      private void disableThunder() {
          disableThunder = getBoolean("disable-thunder", false);
      }
diff --git a/Spigot-Server-Patches/0044-Configurable-mob-spawner-tick-rate.patch b/Spigot-Server-Patches/0044-Configurable-mob-spawner-tick-rate.patch
index 61ebb1ebf0..ffa661cfc0 100644
--- a/Spigot-Server-Patches/0044-Configurable-mob-spawner-tick-rate.patch
+++ b/Spigot-Server-Patches/0044-Configurable-mob-spawner-tick-rate.patch
@@ -1,14 +1,14 @@
-From bf6c80f0836eb5a5a4f7443a6fd00022c4dd18ad Mon Sep 17 00:00:00 2001
+From d49a422051ab99ef08a0d45cd381757e64e10982 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 d8bc932..7028730 100644
+index 9018df5..5a139e2 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 {
+@@ -229,4 +229,9 @@ public class PaperWorldConfig {
      private void disableIceAndSnow(){
          disableIceAndSnow = getBoolean("disable-ice-and-snow", false);
      }
@@ -19,7 +19,7 @@ index d8bc932..7028730 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index 2eee845..f4f77d7 100644
+index 6c3e365..de6055a 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -18,6 +18,7 @@ public abstract class MobSpawnerAbstract {
@@ -64,5 +64,5 @@ index 2eee845..f4f77d7 100644
                  }
  
 -- 
-2.7.4
+2.8.2
 
diff --git a/Spigot-Server-Patches/0047-Configurable-container-update-tick-rate.patch b/Spigot-Server-Patches/0047-Configurable-container-update-tick-rate.patch
index baffb186fa..5839efd22f 100644
--- a/Spigot-Server-Patches/0047-Configurable-container-update-tick-rate.patch
+++ b/Spigot-Server-Patches/0047-Configurable-container-update-tick-rate.patch
@@ -1,14 +1,14 @@
-From cf030fd51a742b785df6b038a2a66591fdb5b5b8 Mon Sep 17 00:00:00 2001
+From 43f512a084a306bc3fd86a259ad91b180f84c294 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 7028730..12440dc 100644
+index 5a139e2..e182e48 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 {
+@@ -234,4 +234,9 @@ public class PaperWorldConfig {
      private void mobSpawnerTickRate() {
          mobSpawnerTickRate = getInt("mob-spawner-tick-rate", 1);
      }
diff --git a/Spigot-Server-Patches/0055-Disable-chest-cat-detection.patch b/Spigot-Server-Patches/0055-Disable-chest-cat-detection.patch
index b6fedfee80..662f4b78d2 100644
--- a/Spigot-Server-Patches/0055-Disable-chest-cat-detection.patch
+++ b/Spigot-Server-Patches/0055-Disable-chest-cat-detection.patch
@@ -1,14 +1,14 @@
-From 89bf06e23661104544cf99f5fc23fe97abb1024e Mon Sep 17 00:00:00 2001
+From f68afec9bf832efe71d3eb418eb72aa13eb7a7d4 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 12440dc..84dac97 100644
+index e182e48..c89ab0c 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 {
+@@ -239,4 +239,9 @@ public class PaperWorldConfig {
      private void containerUpdateTickRate() {
          containerUpdateTickRate = getInt("container-update-tick-rate", 1);
      }
diff --git a/Spigot-Server-Patches/0057-All-chunks-are-slime-spawn-chunks-toggle.patch b/Spigot-Server-Patches/0057-All-chunks-are-slime-spawn-chunks-toggle.patch
index 71ce5e8382..af85918576 100644
--- a/Spigot-Server-Patches/0057-All-chunks-are-slime-spawn-chunks-toggle.patch
+++ b/Spigot-Server-Patches/0057-All-chunks-are-slime-spawn-chunks-toggle.patch
@@ -1,14 +1,14 @@
-From 968d090e257dda79487473e2b8a264f676efa117 Mon Sep 17 00:00:00 2001
+From 65ac541fa8ed62de2d0829d816d0762d723e9ea7 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 84dac97..2b7a4dd 100644
+index c89ab0c..b302cb7 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 {
+@@ -244,4 +244,9 @@ public class PaperWorldConfig {
      private void disableChestCatDetection() {
          disableChestCatDetection = getBoolean("game-mechanics.disable-chest-cat-detection", false);
      }
diff --git a/Spigot-Server-Patches/0058-Add-Location-support-to-tab-completers-vanilla-featu.patch b/Spigot-Server-Patches/0058-Add-Location-support-to-tab-completers-vanilla-featu.patch
index 09102fc047..17d6cc497e 100644
--- a/Spigot-Server-Patches/0058-Add-Location-support-to-tab-completers-vanilla-featu.patch
+++ b/Spigot-Server-Patches/0058-Add-Location-support-to-tab-completers-vanilla-featu.patch
@@ -1,4 +1,4 @@
-From d867255d8c2e1b34c741e287d89375ba801c1098 Mon Sep 17 00:00:00 2001
+From 9a35dcacf6c7419e788d81e7704b177ab3c3c5ff 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 2b7a4dd..246f3d9 100644
+index b302cb7..75e7b78 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -246,4 +246,9 @@ public class PaperWorldConfig {
+@@ -249,4 +249,9 @@ public class PaperWorldConfig {
      private void allChunksAreSlimeChunks() {
          allChunksAreSlimeChunks = getBoolean("all-chunks-are-slime-chunks", false);
      }
diff --git a/Spigot-Server-Patches/0068-Add-configurable-portal-search-radius.patch b/Spigot-Server-Patches/0068-Add-configurable-portal-search-radius.patch
index ca132630ca..2efff9ca83 100644
--- a/Spigot-Server-Patches/0068-Add-configurable-portal-search-radius.patch
+++ b/Spigot-Server-Patches/0068-Add-configurable-portal-search-radius.patch
@@ -1,14 +1,14 @@
-From cef04d9da593e1217f0a9c12402bd5deb054c047 Mon Sep 17 00:00:00 2001
+From 094f39cebbabf098b5f817d0dd9434ac3af6185b 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 246f3d9..0aef69d 100644
+index 75e7b78..5807609 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -251,4 +251,9 @@ public class PaperWorldConfig {
+@@ -254,4 +254,9 @@ public class PaperWorldConfig {
      private void allowBlockLocationTabCompletion() {
          allowBlockLocationTabCompletion = getBoolean("allow-block-location-tab-completion", true);
      }
diff --git a/Spigot-Server-Patches/0070-Fix-inter-world-teleportation-glitches.patch b/Spigot-Server-Patches/0070-Fix-inter-world-teleportation-glitches.patch
index e50e47790e..5479ff2225 100644
--- a/Spigot-Server-Patches/0070-Fix-inter-world-teleportation-glitches.patch
+++ b/Spigot-Server-Patches/0070-Fix-inter-world-teleportation-glitches.patch
@@ -1,4 +1,4 @@
-From 4089dcc3abddf4073495eb7db420aea17bbe59a0 Mon Sep 17 00:00:00 2001
+From add5b3b793be2bd95e906affa8f8119ef2fdf6cd 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 0aef69d..37d58ee 100644
+index 5807609..034369a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -256,4 +256,9 @@ public class PaperWorldConfig {
+@@ -259,4 +259,9 @@ public class PaperWorldConfig {
      private void portalSearchRadius() {
          portalSearchRadius = getInt("portal-search-radius", 128);
      }
diff --git a/Spigot-Server-Patches/0073-Disable-Scoreboards-for-non-players-by-default.patch b/Spigot-Server-Patches/0073-Disable-Scoreboards-for-non-players-by-default.patch
index 3afef42f1f..4e87057d8e 100644
--- a/Spigot-Server-Patches/0073-Disable-Scoreboards-for-non-players-by-default.patch
+++ b/Spigot-Server-Patches/0073-Disable-Scoreboards-for-non-players-by-default.patch
@@ -1,4 +1,4 @@
-From 4e264597fc3622e07e76a1cb118288cb2549c867 Mon Sep 17 00:00:00 2001
+From 4d5552cf47f156086b9619a29197cdbb4cff6f7f 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 37d58ee..b0bcea0 100644
+index 034369a..308dfdd 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -261,4 +261,9 @@ public class PaperWorldConfig {
+@@ -264,4 +264,9 @@ public class PaperWorldConfig {
      private void disableTeleportationSuffocationCheck() {
          disableTeleportationSuffocationCheck = getBoolean("disable-teleportation-suffocation-check", false);
      }
diff --git a/Spigot-Server-Patches/0076-Re-add-Spigot-s-hopper-check-feature.patch b/Spigot-Server-Patches/0076-Re-add-Spigot-s-hopper-check-feature.patch
index 9c10a9a3fa..0d6d49f930 100644
--- a/Spigot-Server-Patches/0076-Re-add-Spigot-s-hopper-check-feature.patch
+++ b/Spigot-Server-Patches/0076-Re-add-Spigot-s-hopper-check-feature.patch
@@ -1,14 +1,14 @@
-From 40ac20134bcce4386091db2a60b3a493979ac879 Mon Sep 17 00:00:00 2001
+From a94f9554cfbe7e4388e50aca733edd805ebcb52b 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 b0bcea0..593256c 100644
+index 308dfdd..48ea25c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -266,4 +266,9 @@ public class PaperWorldConfig {
+@@ -269,4 +269,9 @@ public class PaperWorldConfig {
      private void nonPlayerEntitiesOnScoreboards() {
          nonPlayerEntitiesOnScoreboards = getBoolean("allow-non-player-entities-on-scoreboards", false);
      }
diff --git a/Spigot-Server-Patches/0082-Undead-horse-leashing.patch b/Spigot-Server-Patches/0082-Undead-horse-leashing.patch
index 44baa27437..4e543e91fb 100644
--- a/Spigot-Server-Patches/0082-Undead-horse-leashing.patch
+++ b/Spigot-Server-Patches/0082-Undead-horse-leashing.patch
@@ -1,4 +1,4 @@
-From f9bc08b80ea7df56b143ea9bc8857cc4b3343b22 Mon Sep 17 00:00:00 2001
+From ffb0e934efe4e2025f43f2d1eb921462b4760838 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 593256c..8875559 100644
+index 48ea25c..57e1fcf 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -271,4 +271,9 @@ public class PaperWorldConfig {
+@@ -274,4 +274,9 @@ public class PaperWorldConfig {
      private void useHopperCheck() {
          useHopperCheck = getBoolean("use-hopper-check", false);
      }
diff --git a/Spigot-Server-Patches/0085-Configurable-Non-Player-Arrow-Despawn-Rate.patch b/Spigot-Server-Patches/0085-Configurable-Non-Player-Arrow-Despawn-Rate.patch
index 1272fda670..6e07c7b14e 100644
--- a/Spigot-Server-Patches/0085-Configurable-Non-Player-Arrow-Despawn-Rate.patch
+++ b/Spigot-Server-Patches/0085-Configurable-Non-Player-Arrow-Despawn-Rate.patch
@@ -1,4 +1,4 @@
-From 16c55fb0b6c3638b99225963274e14d316f6e411 Mon Sep 17 00:00:00 2001
+From 7330300f4ce381a1f67de5cc44b9f0a6a94e67ca 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 8875559..50e891f 100644
+index 57e1fcf..3f8a47b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -276,4 +276,13 @@ public class PaperWorldConfig {
+@@ -279,4 +279,13 @@ public class PaperWorldConfig {
      private void allowLeashingUndeadHorse() {
          allowLeashingUndeadHorse = getBoolean("allow-leashing-undead-horse", false);
      }
diff --git a/Spigot-Server-Patches/0099-Configurable-spawn-chances-for-skeleton-horses.patch b/Spigot-Server-Patches/0099-Configurable-spawn-chances-for-skeleton-horses.patch
index 40a0ccf6a7..f829ccd20e 100644
--- a/Spigot-Server-Patches/0099-Configurable-spawn-chances-for-skeleton-horses.patch
+++ b/Spigot-Server-Patches/0099-Configurable-spawn-chances-for-skeleton-horses.patch
@@ -1,14 +1,14 @@
-From da7add4567d101a8d875e6a43a74263680b77fbd Mon Sep 17 00:00:00 2001
+From 3bb349b42d4ab8cfd618900eb2bfd6eeaf8cf288 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 50e891f..cdb1766 100644
+index 3f8a47b..098eedd 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -285,4 +285,9 @@ public class PaperWorldConfig {
+@@ -288,4 +288,9 @@ public class PaperWorldConfig {
          }
          log("Non Player Arrow Despawn Rate: " + nonPlayerArrowDespawnRate);
      }
diff --git a/Spigot-Server-Patches/0106-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch b/Spigot-Server-Patches/0106-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
index d37a5f0dd6..7ef2f04320 100644
--- a/Spigot-Server-Patches/0106-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
+++ b/Spigot-Server-Patches/0106-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
@@ -1,4 +1,4 @@
-From 2f625e1e83f3c8ea5a221e29dcf5b8321b9ee533 Mon Sep 17 00:00:00 2001
+From cfa3609238c2749fc65d6877feb8518054fecdc3 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 cdb1766..f689d69 100644
+index 098eedd..5bea199 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -290,4 +290,9 @@ public class PaperWorldConfig {
+@@ -293,4 +293,9 @@ public class PaperWorldConfig {
      private void skeleHorseSpawnChance() {
          skeleHorseSpawnChance = getDouble("skeleton-horse-thunder-spawn-chance", -1.0D); // -1.0D represents a "vanilla" state
      }
diff --git a/Spigot-Server-Patches/0108-Configurable-Chunk-Inhabited-Timer.patch b/Spigot-Server-Patches/0108-Configurable-Chunk-Inhabited-Timer.patch
index 2825c78fbc..6cf294b4c6 100644
--- a/Spigot-Server-Patches/0108-Configurable-Chunk-Inhabited-Timer.patch
+++ b/Spigot-Server-Patches/0108-Configurable-Chunk-Inhabited-Timer.patch
@@ -1,4 +1,4 @@
-From 6141cadba25a695101752faca997db05813c436b Mon Sep 17 00:00:00 2001
+From 5cb8ee3731491cdb9d7ab81ff6d77fd022658640 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 f689d69..6f77cfd 100644
+index 5bea199..ae5bcfc 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -295,4 +295,9 @@ public class PaperWorldConfig {
+@@ -298,4 +298,9 @@ public class PaperWorldConfig {
      private void firePhysicsEventForRedstone() {
          firePhysicsEventForRedstone = getBoolean("fire-physics-event-for-redstone", firePhysicsEventForRedstone);
      }
diff --git a/Spigot-Server-Patches/0119-Configurable-Grass-Spread-Tick-Rate.patch b/Spigot-Server-Patches/0119-Configurable-Grass-Spread-Tick-Rate.patch
index cd29c859ab..c1318cbcc0 100644
--- a/Spigot-Server-Patches/0119-Configurable-Grass-Spread-Tick-Rate.patch
+++ b/Spigot-Server-Patches/0119-Configurable-Grass-Spread-Tick-Rate.patch
@@ -1,14 +1,14 @@
-From 2088da9097d3467af015f5278b7eb4ee3e3d5051 Mon Sep 17 00:00:00 2001
+From 1b0541c134ec647d39470178f69215b80c6f3651 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 6f77cfd..b2d74df 100644
+index ae5bcfc..ee67628 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -300,4 +300,10 @@ public class PaperWorldConfig {
+@@ -303,4 +303,10 @@ public class PaperWorldConfig {
      private void useInhabitedTime() {
          useInhabitedTime = getBoolean("use-chunk-inhabited-timer", true);
      }
diff --git a/Spigot-Server-Patches/0120-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0120-Configurable-Keep-Spawn-Loaded-range-per-world.patch
index 67b88890ea..dd94a445a2 100644
--- a/Spigot-Server-Patches/0120-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/Spigot-Server-Patches/0120-Configurable-Keep-Spawn-Loaded-range-per-world.patch
@@ -1,4 +1,4 @@
-From e2c01a96c6d7748d416bc8b270f513d9bd96afef Mon Sep 17 00:00:00 2001
+From 01d78e7d212614b991a1e4b2ae57b8b85c439610 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 b2d74df..36f0087 100644
+index ee67628..4f94b04 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -306,4 +306,10 @@ public class PaperWorldConfig {
+@@ -309,4 +309,10 @@ public class PaperWorldConfig {
          grassUpdateRate = Math.max(0, getInt("grass-spread-tick-rate", grassUpdateRate));
          log("Grass Spread Tick Rate: " + grassUpdateRate);
      }
diff --git a/Spigot-Server-Patches/0124-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/Spigot-Server-Patches/0124-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
index c0a36a109e..76e9317f21 100644
--- a/Spigot-Server-Patches/0124-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
+++ b/Spigot-Server-Patches/0124-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
@@ -1,14 +1,14 @@
-From e58584a83f045a829e6f346fc7a3e5a157008aef Mon Sep 17 00:00:00 2001
+From 697e05516b86feec6e9431909006d8900248bab9 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 36f0087..4398814 100644
+index 4f94b04..6a235d1 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -312,4 +312,9 @@ public class PaperWorldConfig {
+@@ -315,4 +315,9 @@ public class PaperWorldConfig {
          keepLoadedRange = (short) (getInt("keep-spawn-loaded-range", Math.min(spigotConfig.viewDistance, 8)) * 16);
          log( "Keep Spawn Loaded Range: " + (keepLoadedRange/16));
      }
diff --git a/Spigot-Server-Patches/0134-Allow-capping-number-of-attempts-at-spawning-mobs.patch b/Spigot-Server-Patches/0134-Allow-capping-number-of-attempts-at-spawning-mobs.patch
index 9f5b34af01..a9e56310a4 100644
--- a/Spigot-Server-Patches/0134-Allow-capping-number-of-attempts-at-spawning-mobs.patch
+++ b/Spigot-Server-Patches/0134-Allow-capping-number-of-attempts-at-spawning-mobs.patch
@@ -1,4 +1,4 @@
-From bba590ef48a38b044e9e7ceb69af8f19015abd39 Mon Sep 17 00:00:00 2001
+From 665309dc76ad50bb5c79f50fcbf48cdcf5bc92f4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 15 Apr 2016 21:27:14 -0400
 Subject: [PATCH] Allow capping number of attempts at spawning mobs
@@ -10,18 +10,26 @@ This patch will cap the # of attempts to so that the tick does not spend
 extra long time on mob spawning
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 4398814..4f3fc82 100644
+index 6a235d1..d470e75 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -317,4 +317,10 @@ public class PaperWorldConfig {
+@@ -320,4 +320,18 @@ public class PaperWorldConfig {
      private void useVanillaScoreboardColoring() {
          useVanillaScoreboardColoring = getBoolean("use-vanilla-world-scoreboard-name-coloring", false);
      }
 +
 +    public int maxMobSpawnAttempts;
 +    private void maxMobSpawnAttempts() {
-+        maxMobSpawnAttempts = getInt("max-mob-spawn-attempts", 50);
++        maxMobSpawnAttempts = getInt("max-mob-spawn-attempts", 250);
 +        log( "Max Mob Spawn Attempts: " + maxMobSpawnAttempts);
++        if (maxMobSpawnAttempts < 0) {
++            maxMobSpawnAttempts = Integer.MAX_VALUE;
++        } else {
++            if (maxMobSpawnAttempts < 250 && PaperConfig.version < 10) {
++                set("max-mob-spawn-attempts", 250);
++                maxMobSpawnAttempts = 250;
++            }
++        }
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
diff --git a/Spigot-Server-Patches/0139-Add-ability-to-configure-frosted_ice-properties.patch b/Spigot-Server-Patches/0139-Add-ability-to-configure-frosted_ice-properties.patch
index 45c3c4347f..919debbcd2 100644
--- a/Spigot-Server-Patches/0139-Add-ability-to-configure-frosted_ice-properties.patch
+++ b/Spigot-Server-Patches/0139-Add-ability-to-configure-frosted_ice-properties.patch
@@ -1,16 +1,16 @@
-From 35e06d3fc58b053ed9ed82a14fb91cfca3fa8ff0 Mon Sep 17 00:00:00 2001
+From 40dda2d897571e1d1bbc27d767096ba0ac6c0ffd 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 4f3fc82..b39acc4 100644
+index d470e75..ccc11a8 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -323,4 +323,14 @@ public class PaperWorldConfig {
-         maxMobSpawnAttempts = getInt("max-mob-spawn-attempts", 50);
-         log( "Max Mob Spawn Attempts: " + maxMobSpawnAttempts);
+@@ -334,4 +334,14 @@ public class PaperWorldConfig {
+             }
+         }
      }
 +
 +    public boolean frostedIceEnabled = true;
diff --git a/Spigot-Server-Patches/0148-LootTable-API-Replenishable-Lootables-Feature.patch b/Spigot-Server-Patches/0148-LootTable-API-Replenishable-Lootables-Feature.patch
index ad950a2586..4a67eba775 100644
--- a/Spigot-Server-Patches/0148-LootTable-API-Replenishable-Lootables-Feature.patch
+++ b/Spigot-Server-Patches/0148-LootTable-API-Replenishable-Lootables-Feature.patch
@@ -1,4 +1,4 @@
-From 3cae4941492db646e4a46f31da7b72aa878fcf01 Mon Sep 17 00:00:00 2001
+From ba491f530be8703553a9b5f2f5b24a330519ba4c 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 b39acc4..095ef47 100644
+index ccc11a8..9c79f2e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -333,4 +333,26 @@ public class PaperWorldConfig {
+@@ -344,4 +344,26 @@ public class PaperWorldConfig {
          this.frostedIceDelayMax = this.getInt("frosted-ice.delay.max", this.frostedIceDelayMax);
          this.log("Frosted Ice: " + (this.frostedIceEnabled ? "enabled" : "disabled") + " / delay: min=" + this.frostedIceDelayMin + ", max=" + this.frostedIceDelayMax);
      }
@@ -729,5 +729,5 @@ index e9963e2..acb4dee 100644
  
      CraftMinecartHopper(CraftServer server, EntityMinecartHopper entity) {
 -- 
-2.8.2.windows.1
+2.8.2