diff --git a/Spigot-Server-Patches/0002-Paper-config-files.patch b/Spigot-Server-Patches/0002-Paper-config-files.patch
index 4023cca9e8..4d2861b006 100644
--- a/Spigot-Server-Patches/0002-Paper-config-files.patch
+++ b/Spigot-Server-Patches/0002-Paper-config-files.patch
@@ -1,4 +1,4 @@
-From 377f09f50cc994ec746ef79a44d51bae391884b2 Mon Sep 17 00:00:00 2001
+From dd08779d7de95a6ad71760c8dae7a47b756e69aa 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
@@ -134,25 +134,28 @@ index 0000000..dca7763
 +}
 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..ca6d1a2
+index 0000000..2d50237
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -0,0 +1,66 @@
+@@ -0,0 +1,69 @@
 +package com.destroystokyo.paper;
 +
 +import java.util.List;
 +
 +import org.bukkit.Bukkit;
 +import org.bukkit.configuration.file.YamlConfiguration;
++import org.spigotmc.SpigotWorldConfig;
 +
 +public class PaperWorldConfig {
 +
 +    private final String worldName;
++    private final SpigotWorldConfig spigotConfig;
 +    private final YamlConfiguration config;
 +    private boolean verbose;
 +
-+    public PaperWorldConfig(String worldName) {
++    public PaperWorldConfig(String worldName, SpigotWorldConfig spigotConfig) {
 +        this.worldName = worldName;
++        this.spigotConfig = spigotConfig;
 +        this.config = PaperConfig.config;
 +        init();
 +    }
@@ -205,7 +208,7 @@ index 0000000..ca6d1a2
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 0f8c10a..45680ed 100644
+index 8110780..dd3abb8 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -180,6 +180,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -220,7 +223,7 @@ index 0f8c10a..45680ed 100644
              DedicatedServer.LOGGER.info("Generating keypair");
              this.a(MinecraftEncryption.b());
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 833d5a4..227fd95 100644
+index 0590c06..8c163ee 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -125,6 +125,8 @@ public abstract class World implements IBlockAccess {
@@ -236,7 +239,7 @@ index 833d5a4..227fd95 100644
  
      protected World(IDataManager idatamanager, WorldData worlddata, WorldProvider worldprovider, MethodProfiler methodprofiler, boolean flag, ChunkGenerator gen, org.bukkit.World.Environment env) {
          this.spigotConfig = new org.spigotmc.SpigotWorldConfig( worlddata.getName() ); // Spigot
-+        this.paperConfig = new com.destroystokyo.paper.PaperWorldConfig( worlddata.getName() ); // Paper
++        this.paperConfig = new com.destroystokyo.paper.PaperWorldConfig(worlddata.getName(), this.spigotConfig); // Paper
          this.generator = gen;
          this.world = new CraftWorld((WorldServer) this, gen, env);
          this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
@@ -287,5 +290,5 @@ index 337aa29..979adad 100644
          };
  
 -- 
-2.7.2
+2.7.3
 
diff --git a/Spigot-Server-Patches/0005-Configurable-squid-spawn-ranges.patch b/Spigot-Server-Patches/0005-Configurable-squid-spawn-ranges.patch
index fbcbc65b9d..d712a05188 100644
--- a/Spigot-Server-Patches/0005-Configurable-squid-spawn-ranges.patch
+++ b/Spigot-Server-Patches/0005-Configurable-squid-spawn-ranges.patch
@@ -1,14 +1,14 @@
-From f07fd6b18c525b635c99a3390a5f83361cb640fa Mon Sep 17 00:00:00 2001
+From 1e4670aa8a0ac665cc6d7c59d8f293cd59d5ec49 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 ca6d1a2..ac7a176 100644
+index 2d50237..fe9502c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -63,4 +63,12 @@ public class PaperWorldConfig {
+@@ -66,4 +66,12 @@ public class PaperWorldConfig {
          config.addDefault("world-settings.default." + path, def);
          return config.getString("world-settings." + worldName + "." + path, config.getString("world-settings.default." + path));
      }
@@ -36,5 +36,5 @@ index b94444d..9f1a50e 100644
  
      public void b(float f, float f1, float f2) {
 -- 
-2.7.2
+2.7.3
 
diff --git a/Spigot-Server-Patches/0006-Configurable-cactus-and-reed-natural-growth-heights.patch b/Spigot-Server-Patches/0006-Configurable-cactus-and-reed-natural-growth-heights.patch
index 8a89de26e9..4dfd1c3025 100644
--- a/Spigot-Server-Patches/0006-Configurable-cactus-and-reed-natural-growth-heights.patch
+++ b/Spigot-Server-Patches/0006-Configurable-cactus-and-reed-natural-growth-heights.patch
@@ -1,14 +1,14 @@
-From dda17d3cf1838666320af0b6fe3820766fc17fd2 Mon Sep 17 00:00:00 2001
+From 027000643b436829fb988e3d2806f49571eae326 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 c214c35..66db130 100644
+index fe9502c..22b643e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -71,4 +71,13 @@ public class PaperWorldConfig {
+@@ -74,4 +74,13 @@ public class PaperWorldConfig {
          squidMaxSpawnHeight = getDouble("squid-spawn-height.maximum", 63.0D);
          log("Squids will spawn between Y: " + squidMinSpawnHeight + " and Y: " + squidMaxSpawnHeight);
      }
@@ -49,5 +49,5 @@ index fb19f19..6e0fa5f 100644
  
                      if (j >= (byte) range(3, ((100 / world.spigotConfig.caneModifier) * 15) + 0.5F, 15)) { // Spigot
 -- 
-2.7.2
+2.7.3
 
diff --git a/Spigot-Server-Patches/0007-Configurable-baby-zombie-movement-speed.patch b/Spigot-Server-Patches/0007-Configurable-baby-zombie-movement-speed.patch
index d7244f08c3..1e1d8a3c29 100644
--- a/Spigot-Server-Patches/0007-Configurable-baby-zombie-movement-speed.patch
+++ b/Spigot-Server-Patches/0007-Configurable-baby-zombie-movement-speed.patch
@@ -1,14 +1,14 @@
-From de2a0128b959a312b8568680540decf3bf9af46e Mon Sep 17 00:00:00 2001
+From e46a6bc9aa3e19ef36d848513d5346f69b853820 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 ca0c9f0..852a5bd 100644
+index 22b643e..2cb4ac6 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -80,4 +80,10 @@ public class PaperWorldConfig {
+@@ -83,4 +83,10 @@ public class PaperWorldConfig {
          log("Max height for cactus growth " + cactusMaxHeight + ". Max height for reed growth " + reedMaxHeight);
  
      }
@@ -20,7 +20,7 @@ index ca0c9f0..852a5bd 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index ba2f12f..24e5863 100644
+index e7be27a..949452c 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -15,7 +15,7 @@ public class EntityZombie extends EntityMonster {
@@ -45,5 +45,5 @@ index ba2f12f..24e5863 100644
          }
  
 -- 
-2.7.2
+2.7.3
 
diff --git a/Spigot-Server-Patches/0008-Configurable-fishing-time-ranges.patch b/Spigot-Server-Patches/0008-Configurable-fishing-time-ranges.patch
index 54c7560894..6fa71ac2fd 100644
--- a/Spigot-Server-Patches/0008-Configurable-fishing-time-ranges.patch
+++ b/Spigot-Server-Patches/0008-Configurable-fishing-time-ranges.patch
@@ -1,14 +1,14 @@
-From b88a07a3dffa0b0742869f430b392b3696251239 Mon Sep 17 00:00:00 2001
+From 5577bc3583786f0578b30283171830bfd272e56e 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 852a5bd..2f30b66 100644
+index 2cb4ac6..03a4fb4 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -86,4 +86,12 @@ public class PaperWorldConfig {
+@@ -89,4 +89,12 @@ public class PaperWorldConfig {
          babyZombieMovementSpeed = getDouble("baby-zombie-movement-speed", 0.5D); // Player moves at 0.1F, for reference
          log("Baby zombies will move at the speed of " + babyZombieMovementSpeed);
      }
@@ -22,7 +22,7 @@ index 852a5bd..2f30b66 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
-index 2751b92..a38898c 100644
+index 140df3a..b99d9c4 100644
 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
 @@ -359,7 +359,7 @@ public class EntityFishingHook extends Entity {
@@ -35,5 +35,5 @@ index 2751b92..a38898c 100644
                          }
                      }
 -- 
-2.7.2
+2.7.3
 
diff --git a/Spigot-Server-Patches/0011-Player-Exhaustion-Multipliers.patch b/Spigot-Server-Patches/0011-Player-Exhaustion-Multipliers.patch
index 555dbff9ce..b922e4e04f 100644
--- a/Spigot-Server-Patches/0011-Player-Exhaustion-Multipliers.patch
+++ b/Spigot-Server-Patches/0011-Player-Exhaustion-Multipliers.patch
@@ -1,14 +1,14 @@
-From 62db989dcad63f99430f472ddcbc0384da81bd9b Mon Sep 17 00:00:00 2001
+From b8e78ccacc247ac547456ead079b6c1d44a26830 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 f042253..7a7547f 100644
+index 03a4fb4..6e82c3a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -94,4 +94,13 @@ public class PaperWorldConfig {
+@@ -97,4 +97,13 @@ public class PaperWorldConfig {
          fishingMaxTicks = getInt("fishing-time-range.MaximumTicks", 900);
          log("Fishing time ranges are between " + fishingMinTicks +" and " + fishingMaxTicks + " ticks");
      }
@@ -36,7 +36,7 @@ index 1d2f580..bed5577 100644
              ItemStack itemstack1 = this.u(iblockdata);
  
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 6e40e60..b602c5d 100644
+index ba32125..17fbc17 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -1449,13 +1449,13 @@ public abstract class EntityHuman extends EntityLiving {
@@ -56,5 +56,5 @@ index 6e40e60..b602c5d 100644
              } else if (this.n_()) {
                  if (d1 > 0.0D) {
 -- 
-2.7.2
+2.7.3
 
diff --git a/Spigot-Server-Patches/0012-Add-configurable-despawn-distances-for-living-entiti.patch b/Spigot-Server-Patches/0012-Add-configurable-despawn-distances-for-living-entiti.patch
index 6aa0a3f7d5..d6e2563bef 100644
--- a/Spigot-Server-Patches/0012-Add-configurable-despawn-distances-for-living-entiti.patch
+++ b/Spigot-Server-Patches/0012-Add-configurable-despawn-distances-for-living-entiti.patch
@@ -1,14 +1,14 @@
-From b61da73d5aac97d17a6decdf32a00beace3db99f Mon Sep 17 00:00:00 2001
+From 558de1f1cbd82e65ad5f0bcb5a1a08d3682edcb1 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 7a7547f..375ac89 100644
+index 6e82c3a..35a596f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -103,4 +103,20 @@ public class PaperWorldConfig {
+@@ -106,4 +106,20 @@ public class PaperWorldConfig {
          log("Player exhaustion penalty for breaking blocks is " + blockBreakExhaustion);
          log("Player exhaustion penalty for swimming is " + playerSwimmingExhaustion);
      }
@@ -30,7 +30,7 @@ index 7a7547f..375ac89 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 9b1204c..c0215e2 100644
+index cee3b4a..fdda1ae 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -601,13 +601,13 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -51,5 +51,5 @@ index 9b1204c..c0215e2 100644
                  }
              }
 -- 
-2.7.2
+2.7.3
 
diff --git a/Spigot-Server-Patches/0013-Allow-for-toggling-of-spawn-chunks.patch b/Spigot-Server-Patches/0013-Allow-for-toggling-of-spawn-chunks.patch
index 69fdb8e04e..8517427145 100644
--- a/Spigot-Server-Patches/0013-Allow-for-toggling-of-spawn-chunks.patch
+++ b/Spigot-Server-Patches/0013-Allow-for-toggling-of-spawn-chunks.patch
@@ -1,14 +1,14 @@
-From 5f57470879bc673989301bd8e3f055627f51feb5 Mon Sep 17 00:00:00 2001
+From 7d0a8e445a94605d8511782d0268585bc6a7ff6b 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 375ac89..22d68af 100644
+index 35a596f..fb27c66 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -119,4 +119,10 @@ public class PaperWorldConfig {
+@@ -122,4 +122,10 @@ public class PaperWorldConfig {
          softDespawnDistance = softDespawnDistance*softDespawnDistance;
          hardDespawnDistance = hardDespawnDistance*hardDespawnDistance;
      }
@@ -20,7 +20,7 @@ index 375ac89..22d68af 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index a482db9..39afaae 100644
+index 1c2db29..c31cc0c 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -197,6 +197,7 @@ public abstract class World implements IBlockAccess {
@@ -32,5 +32,5 @@ index a482db9..39afaae 100644
                  this.entityLimiter = new org.spigotmc.TickLimiter(spigotConfig.entityMaxTickTime);
          this.tileLimiter = new org.spigotmc.TickLimiter(spigotConfig.tileMaxTickTime);
 -- 
-2.7.2
+2.7.3
 
diff --git a/Spigot-Server-Patches/0014-Drop-falling-block-and-tnt-entities-at-the-specified.patch b/Spigot-Server-Patches/0014-Drop-falling-block-and-tnt-entities-at-the-specified.patch
index 01c083e620..3242673ccf 100644
--- a/Spigot-Server-Patches/0014-Drop-falling-block-and-tnt-entities-at-the-specified.patch
+++ b/Spigot-Server-Patches/0014-Drop-falling-block-and-tnt-entities-at-the-specified.patch
@@ -1,14 +1,14 @@
-From e29729e0e0500cc46e355b654b01114a03605c96 Mon Sep 17 00:00:00 2001
+From 2e4e0b6ade2d6981baeda14c27df73fa3872935f 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 41747bd..0d0cca5 100644
+index fb27c66..b974c1a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -125,4 +125,14 @@ public class PaperWorldConfig {
+@@ -128,4 +128,14 @@ public class PaperWorldConfig {
          keepSpawnInMemory = getBoolean("keep-spawn-loaded", true);
          log("Keep spawn chunk loaded: " + keepSpawnInMemory);
      }
@@ -24,7 +24,7 @@ index 41747bd..0d0cca5 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-index 86cb592..9c506ed 100644
+index a78d705..4c8e336 100644
 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
 +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
 @@ -76,6 +76,17 @@ public class EntityFallingBlock extends Entity {
@@ -64,5 +64,5 @@ index 35ed2a6..564ea37 100644
          this.motY *= 0.9800000190734863D;
          this.motZ *= 0.9800000190734863D;
 -- 
-2.7.2
+2.7.3
 
diff --git a/Spigot-Server-Patches/0015-Configurable-speed-for-water-flowing-over-lava.patch b/Spigot-Server-Patches/0015-Configurable-speed-for-water-flowing-over-lava.patch
index 01ece2b5d2..e96b36de8b 100644
--- a/Spigot-Server-Patches/0015-Configurable-speed-for-water-flowing-over-lava.patch
+++ b/Spigot-Server-Patches/0015-Configurable-speed-for-water-flowing-over-lava.patch
@@ -1,14 +1,14 @@
-From dffc7e903b5996c39b84fca2262852fa7f13f24b Mon Sep 17 00:00:00 2001
+From e329dec769d13616825e5ff08c36abcffad7a4a5 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 0d0cca5..6ccd700 100644
+index b974c1a..991a972 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -135,4 +135,10 @@ public class PaperWorldConfig {
+@@ -138,4 +138,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);
      }
@@ -57,5 +57,5 @@ index 800ffdc..036e861 100644
 +    }
  }
 -- 
-2.7.2
+2.7.3
 
diff --git a/Spigot-Server-Patches/0026-Configurable-top-of-nether-void-damage.patch b/Spigot-Server-Patches/0026-Configurable-top-of-nether-void-damage.patch
index 6d49cd98b5..3686a26dfd 100644
--- a/Spigot-Server-Patches/0026-Configurable-top-of-nether-void-damage.patch
+++ b/Spigot-Server-Patches/0026-Configurable-top-of-nether-void-damage.patch
@@ -1,14 +1,14 @@
-From b957945130e1dcd74a709f8335efee886512b17c Mon Sep 17 00:00:00 2001
+From b7109efd8179d03cd5d21a03c4f1ce01ddbdccad 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 6ccd700..a45bb02 100644
+index 991a972..1a194e7 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -141,4 +141,10 @@ public class PaperWorldConfig {
+@@ -144,4 +144,10 @@ public class PaperWorldConfig {
          waterOverLavaFlowSpeed = getInt("water-over-lava-flow-speed", 5);
          log("Water over lava flow speed: " + waterOverLavaFlowSpeed);
      }
@@ -20,7 +20,7 @@ index 6ccd700..a45bb02 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index a4a6352..b0834dc 100644
+index fd3983f..b3c29ca 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -299,6 +299,13 @@ public abstract class Entity implements ICommandListener {
@@ -47,5 +47,5 @@ index a4a6352..b0834dc 100644
          }
  
 -- 
-2.7.2
+2.7.3
 
diff --git a/Spigot-Server-Patches/0028-Fix-redstone-lag-issues.patch b/Spigot-Server-Patches/0028-Fix-redstone-lag-issues.patch
index 60f83a0f2c..fb168ee75e 100644
--- a/Spigot-Server-Patches/0028-Fix-redstone-lag-issues.patch
+++ b/Spigot-Server-Patches/0028-Fix-redstone-lag-issues.patch
@@ -1,14 +1,14 @@
-From 7cc8852fb82b77ed0c37f262cabbdd01c40c18de Mon Sep 17 00:00:00 2001
+From e53a4f873aa7abb6ede0e5a04c0b73743384b923 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 a9489de..28e3e3c 100644
+index 1a194e7..17619b6 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -147,4 +147,15 @@ public class PaperWorldConfig {
+@@ -150,4 +150,15 @@ public class PaperWorldConfig {
          netherVoidTopDamage = getBoolean( "nether-ceiling-void-damage", false );
          log("Top of the nether void damage: " + netherVoidTopDamage);
      }
@@ -25,7 +25,7 @@ index a9489de..28e3e3c 100644
 +
  }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 46004f0..14d92bb 100644
+index 4f9136d..8f37b97 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -690,6 +690,8 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -75,5 +75,5 @@ index 46004f0..14d92bb 100644
                  this.methodProfiler.a("ticking");
                  Iterator iterator = this.U.iterator();
 -- 
-2.7.2
+2.7.3
 
diff --git a/Spigot-Server-Patches/0030-Configurable-async-light-updates.patch b/Spigot-Server-Patches/0030-Configurable-async-light-updates.patch
index 7d3083ecc0..9ab3f4614b 100644
--- a/Spigot-Server-Patches/0030-Configurable-async-light-updates.patch
+++ b/Spigot-Server-Patches/0030-Configurable-async-light-updates.patch
@@ -1,14 +1,14 @@
-From 712fee2a1cf2121a90ca3aeb86ca6a9213527da9 Mon Sep 17 00:00:00 2001
+From 3737e9c22597fdd788f00c58af11937a76d8d613 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 28e3e3c..5504cfe 100644
+index 17619b6..ef5c960 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -158,4 +158,9 @@ public class PaperWorldConfig {
+@@ -161,4 +161,9 @@ public class PaperWorldConfig {
  
      }
  
@@ -102,7 +102,7 @@ index 83857a6..49288c9 100644
              // CraftBukkit start
              this.unloadQueue.add(i, j);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 0b5c9fe..aa2c65e 100644
+index b1cf8cc..a062013 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -29,6 +29,12 @@ import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
@@ -238,5 +238,5 @@ index 0b5c9fe..aa2c65e 100644
          return false;
      }
 -- 
-2.7.2
+2.7.3
 
diff --git a/Spigot-Server-Patches/0032-Configurable-end-credits.patch b/Spigot-Server-Patches/0032-Configurable-end-credits.patch
index ff13b7ce92..68398d7375 100644
--- a/Spigot-Server-Patches/0032-Configurable-end-credits.patch
+++ b/Spigot-Server-Patches/0032-Configurable-end-credits.patch
@@ -1,14 +1,14 @@
-From f710e478cc89844a8a0f4718ba8bdf1189055143 Mon Sep 17 00:00:00 2001
+From cc85a64d57ff70fd663cd2f90bb5889fa0564efe 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 5504cfe..6dc7e4c 100644
+index ef5c960..43e73e1 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -163,4 +163,10 @@ public class PaperWorldConfig {
+@@ -166,4 +166,10 @@ public class PaperWorldConfig {
          useAsyncLighting = false; //getBoolean( "use-async-lighting", false );
          log("World async lighting: " + useAsyncLighting);
      }
@@ -51,5 +51,5 @@ index ff0939b..987164e 100644
                  } else {
                      this.b((Statistic) AchievementList.D);
 -- 
-2.7.2
+2.7.3
 
diff --git a/Spigot-Server-Patches/0034-Generator-Settings.patch b/Spigot-Server-Patches/0034-Generator-Settings.patch
index 7d5753b75c..94f5b5b616 100644
--- a/Spigot-Server-Patches/0034-Generator-Settings.patch
+++ b/Spigot-Server-Patches/0034-Generator-Settings.patch
@@ -1,14 +1,14 @@
-From 4386e26de2f222ee1a34c1e93d01ec832d516e39 Mon Sep 17 00:00:00 2001
+From 9d7afb2ff89ef9000241a6e4a2ac450acd695bcc 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 6dc7e4c..a3fbe69 100644
+index 43e73e1..1e7eed0 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -169,4 +169,28 @@ public class PaperWorldConfig {
+@@ -172,4 +172,28 @@ public class PaperWorldConfig {
          disableEndCredits = getBoolean("game-mechanics.disable-end-credits", false);
          log("End credits disabled: " + disableEndCredits);
      }
@@ -274,5 +274,5 @@ index 22d96e9..83d9509 100644
          Iterator iterator = this.c.values().iterator();
  
 -- 
-2.7.2
+2.7.3
 
diff --git a/Spigot-Server-Patches/0035-Optimize-explosions.patch b/Spigot-Server-Patches/0035-Optimize-explosions.patch
index e464005a7c..d70decaa6e 100644
--- a/Spigot-Server-Patches/0035-Optimize-explosions.patch
+++ b/Spigot-Server-Patches/0035-Optimize-explosions.patch
@@ -1,4 +1,4 @@
-From eb19e5187fe8700b9c232ad829938129c1f5d4c8 Mon Sep 17 00:00:00 2001
+From 094312075d640754ee3ce29482b5f02c39dd107d 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 a3fbe69..138fc9c 100644
+index 1e7eed0..9d48620 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -193,4 +193,10 @@ public class PaperWorldConfig {
+@@ -196,4 +196,10 @@ public class PaperWorldConfig {
          generateVillage = getBoolean("generator-settings.village", true);
          generateFlatBedrock = getBoolean("generator-settings.flat-bedrock", false);
      }
@@ -136,7 +136,7 @@ index db425fb..733f8e7 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 641d71f..de0a751 100644
+index a062013..6ea06c5 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -32,6 +32,7 @@ import org.bukkit.generator.ChunkGenerator;
@@ -156,5 +156,5 @@ index 641d71f..de0a751 100644
      public CraftWorld getWorld() {
          return this.world;
 -- 
-2.7.2
+2.7.3
 
diff --git a/Spigot-Server-Patches/0037-Fast-draining.patch b/Spigot-Server-Patches/0037-Fast-draining.patch
index 477dd58277..f4aa7a438f 100644
--- a/Spigot-Server-Patches/0037-Fast-draining.patch
+++ b/Spigot-Server-Patches/0037-Fast-draining.patch
@@ -1,14 +1,14 @@
-From 3287d25c2f738f9d2d1ca3c00508852732d3cf55 Mon Sep 17 00:00:00 2001
+From a6d6f3dda04dce7d7ca8be12b32e66ee4287479f 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 138fc9c..d2ffd55 100644
+index 9d48620..43f2672 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -199,4 +199,11 @@ public class PaperWorldConfig {
+@@ -202,4 +202,11 @@ public class PaperWorldConfig {
          optimizeExplosions = getBoolean("optimize-explosions", false);
          log("Optimize explosions: " + optimizeExplosions);
      }
@@ -96,5 +96,5 @@ index 1f07f82..517c1e8 100644
 +    }
  }
 -- 
-2.7.2
+2.7.3
 
diff --git a/Spigot-Server-Patches/0038-Configurable-lava-flow-speed.patch b/Spigot-Server-Patches/0038-Configurable-lava-flow-speed.patch
index 097e737341..4d1a3623a4 100644
--- a/Spigot-Server-Patches/0038-Configurable-lava-flow-speed.patch
+++ b/Spigot-Server-Patches/0038-Configurable-lava-flow-speed.patch
@@ -1,14 +1,14 @@
-From 925bdb7907d19b956e9c7cf3bcf4663f8a2fc2da Mon Sep 17 00:00:00 2001
+From 6b8c28394f75afccd698e24332449b441f0f8b30 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 d2ffd55..1c8e310 100644
+index 43f2672..3d1f0ff 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -206,4 +206,11 @@ public class PaperWorldConfig {
+@@ -209,4 +209,11 @@ public class PaperWorldConfig {
          fastDrainLava = getBoolean("fast-drain.lava", false);
          fastDrainWater = getBoolean("fast-drain.water", false);
      }
@@ -35,5 +35,5 @@ index 517c1e8..51b80cb 100644
                  world.getType(blockposition.north(1)).getBlock().material == Material.LAVA ||
                          world.getType(blockposition.south(1)).getBlock().material == Material.LAVA ||
 -- 
-2.7.2
+2.7.3
 
diff --git a/Spigot-Server-Patches/0040-Disable-explosion-knockback.patch b/Spigot-Server-Patches/0040-Disable-explosion-knockback.patch
index b25fb87102..26ba5a8a71 100644
--- a/Spigot-Server-Patches/0040-Disable-explosion-knockback.patch
+++ b/Spigot-Server-Patches/0040-Disable-explosion-knockback.patch
@@ -1,14 +1,14 @@
-From 42387eb4bbc045d276ba084d578cb3f5b41b8e84 Mon Sep 17 00:00:00 2001
+From 7111ea7de2000970d20588754f7267242f3d86fc 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 1c8e310..694b448 100644
+index 3d1f0ff..c67cf3b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -213,4 +213,9 @@ public class PaperWorldConfig {
+@@ -216,4 +216,9 @@ public class PaperWorldConfig {
          lavaFlowSpeedNormal = getInt("lava-flow-speed.normal", 30);
          lavaFlowSpeedNether = getInt("lava-flow-speed.nether", 10);
      }
@@ -69,5 +69,5 @@ index afe402e..cd2fb14 100644
                              }
                          }
 -- 
-2.7.2
+2.7.3
 
diff --git a/Spigot-Server-Patches/0041-Disable-thunder.patch b/Spigot-Server-Patches/0041-Disable-thunder.patch
index cce7db8275..3ebb466085 100644
--- a/Spigot-Server-Patches/0041-Disable-thunder.patch
+++ b/Spigot-Server-Patches/0041-Disable-thunder.patch
@@ -1,14 +1,14 @@
-From b65215c6f3d7008143b5af416f3e9d4b22975c01 Mon Sep 17 00:00:00 2001
+From 6e5e85cb4c46e79231dd2da3a8830172f81e7a58 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 694b448..889aaad 100644
+index c67cf3b..c70ead7 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -218,4 +218,9 @@ public class PaperWorldConfig {
+@@ -221,4 +221,9 @@ public class PaperWorldConfig {
      private void disableExplosionKnockback(){
          disableExplosionKnockback = getBoolean("disable-explosion-knockback", false);
      }
@@ -33,5 +33,5 @@ index 8f37b97..2ef774c 100644
                      l = this.l >> 2;
                      blockposition = this.a(new BlockPosition(j + (l & 15), 0, k + (l >> 8 & 15)));
 -- 
-2.7.2
+2.7.3
 
diff --git a/Spigot-Server-Patches/0042-Disable-ice-and-snow.patch b/Spigot-Server-Patches/0042-Disable-ice-and-snow.patch
index bee5c051ae..6007a0fc0b 100644
--- a/Spigot-Server-Patches/0042-Disable-ice-and-snow.patch
+++ b/Spigot-Server-Patches/0042-Disable-ice-and-snow.patch
@@ -1,14 +1,14 @@
-From 4e200a7aae77a2396d684a3060fdc3a8822e32a0 Mon Sep 17 00:00:00 2001
+From 59395a4297a844d3474ba593635dd70770aec9a7 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 889aaad..30117f7 100644
+index c70ead7..7c42e99 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -223,4 +223,9 @@ public class PaperWorldConfig {
+@@ -226,4 +226,9 @@ public class PaperWorldConfig {
      private void disableThunder() {
          disableThunder = getBoolean("disable-thunder", false);
      }
@@ -32,5 +32,5 @@ index 2ef774c..c411f01 100644
                      l = this.l >> 2;
                      blockposition = this.p(new BlockPosition(j + (l & 15), 0, k + (l >> 8 & 15)));
 -- 
-2.7.2
+2.7.3
 
diff --git a/Spigot-Server-Patches/0043-Configurable-mob-spawner-tick-rate.patch b/Spigot-Server-Patches/0043-Configurable-mob-spawner-tick-rate.patch
index c04b53b1e3..715af3f5ca 100644
--- a/Spigot-Server-Patches/0043-Configurable-mob-spawner-tick-rate.patch
+++ b/Spigot-Server-Patches/0043-Configurable-mob-spawner-tick-rate.patch
@@ -1,14 +1,14 @@
-From 10427ff3394de15b2ce46a01e09be9ccc0e6986c Mon Sep 17 00:00:00 2001
+From 87b088fd9d782584af22e32aa2edb46e913191cd 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 30117f7..668bd78 100644
+index 7c42e99..a5acb1a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -228,4 +228,9 @@ public class PaperWorldConfig {
+@@ -231,4 +231,9 @@ public class PaperWorldConfig {
      private void disableIceAndSnow(){
          disableIceAndSnow = getBoolean("disable-ice-and-snow", false);
      }
@@ -64,5 +64,5 @@ index 2eee845..f4f77d7 100644
                  }
  
 -- 
-2.7.2
+2.7.3
 
diff --git a/Spigot-Server-Patches/0044-Configurable-TNT-cannon-fix.patch b/Spigot-Server-Patches/0044-Configurable-TNT-cannon-fix.patch
index 6522300bde..0ea941e834 100644
--- a/Spigot-Server-Patches/0044-Configurable-TNT-cannon-fix.patch
+++ b/Spigot-Server-Patches/0044-Configurable-TNT-cannon-fix.patch
@@ -1,14 +1,14 @@
-From b8725fa29dc886377b3042ff03cd3ff590cd997c Mon Sep 17 00:00:00 2001
+From 60140188171da9c29a6b5c795016a858343b84a2 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 668bd78..7102d7b 100644
+index a5acb1a..85c9cd1 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -233,4 +233,10 @@ public class PaperWorldConfig {
+@@ -236,4 +236,10 @@ public class PaperWorldConfig {
      private void mobSpawnerTickRate() {
          mobSpawnerTickRate = getInt("mob-spawner-tick-rate", 1);
      }
@@ -315,5 +315,5 @@ index cd2fb14..678ce44 100644
                              EntityHuman entityhuman = (EntityHuman) entity;
  
 -- 
-2.7.2
+2.7.3
 
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 9674940b1b..b77417467a 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 601b345a7b4df9658baef232c406b3b0b7c1926c Mon Sep 17 00:00:00 2001
+From 4bc7f8fcd75e55fcfb67cd622dc54b159cbaf3e8 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 7102d7b..427e3b3 100644
+index 85c9cd1..8622874 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -239,4 +239,9 @@ public class PaperWorldConfig {
+@@ -242,4 +242,9 @@ public class PaperWorldConfig {
          fixCannons = getBoolean("fix-cannons", false);
          log("Fix TNT cannons: " + fixCannons);
      }
@@ -45,5 +45,5 @@ index 5b5d1ef..3902d4f 100644
              this.closeInventory();
              this.activeContainer = this.defaultContainer;
 -- 
-2.7.2
+2.7.3
 
diff --git a/Spigot-Server-Patches/0058-Disable-chest-cat-detection.patch b/Spigot-Server-Patches/0058-Disable-chest-cat-detection.patch
index d214c34f7c..9c22642ca6 100644
--- a/Spigot-Server-Patches/0058-Disable-chest-cat-detection.patch
+++ b/Spigot-Server-Patches/0058-Disable-chest-cat-detection.patch
@@ -1,14 +1,14 @@
-From 40227e21c0661deeb3326ec2a40a72c8a6908ca0 Mon Sep 17 00:00:00 2001
+From 47814077eed10ca56e3ccc7b9410a098aaa152cb 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 427e3b3..6122760 100644
+index 8622874..a3fa8a0 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -244,4 +244,9 @@ public class PaperWorldConfig {
+@@ -247,4 +247,9 @@ public class PaperWorldConfig {
      private void containerUpdateTickRate() {
          containerUpdateTickRate = getInt("container-update-tick-rate", 1);
      }
@@ -35,5 +35,5 @@ index 7d27317..ed8d1df 100644
  
          EntityOcelot entityocelot;
 -- 
-2.7.2
+2.7.3
 
diff --git a/Spigot-Server-Patches/0060-All-chunks-are-slime-spawn-chunks-toggle.patch b/Spigot-Server-Patches/0060-All-chunks-are-slime-spawn-chunks-toggle.patch
index 26d0b6790f..c1e11d6c74 100644
--- a/Spigot-Server-Patches/0060-All-chunks-are-slime-spawn-chunks-toggle.patch
+++ b/Spigot-Server-Patches/0060-All-chunks-are-slime-spawn-chunks-toggle.patch
@@ -1,14 +1,14 @@
-From 4a1f121939b07b19c79e15686da38a75a1e33182 Mon Sep 17 00:00:00 2001
+From 877e7c6ce16d87576c96e52011e39ac2faae10c6 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 6122760..30c4a0f 100644
+index a3fa8a0..e0ed821 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -249,4 +249,9 @@ public class PaperWorldConfig {
+@@ -252,4 +252,9 @@ public class PaperWorldConfig {
      private void disableChestCatDetection() {
          disableChestCatDetection = getBoolean("game-mechanics.disable-chest-cat-detection", false);
      }
@@ -33,5 +33,5 @@ index cb92686..645082d 100644
                  }
              }
 -- 
-2.7.2
+2.7.3
 
diff --git a/Spigot-Server-Patches/0061-Add-Location-support-to-tab-completers-vanilla-featu.patch b/Spigot-Server-Patches/0061-Add-Location-support-to-tab-completers-vanilla-featu.patch
index ea6984dc4f..6cf0524d1f 100644
--- a/Spigot-Server-Patches/0061-Add-Location-support-to-tab-completers-vanilla-featu.patch
+++ b/Spigot-Server-Patches/0061-Add-Location-support-to-tab-completers-vanilla-featu.patch
@@ -1,4 +1,4 @@
-From c3b0fc1874833d20cc33095420a4349f202b88a0 Mon Sep 17 00:00:00 2001
+From 125eea581760ee79f5a3cb767d40cb0b3fe3fa22 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 30c4a0f..99f072e 100644
+index e0ed821..7dc63dc 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -254,4 +254,9 @@ public class PaperWorldConfig {
+@@ -257,4 +257,9 @@ public class PaperWorldConfig {
      private void allChunksAreSlimeChunks() {
          allChunksAreSlimeChunks = getBoolean("all-chunks-are-slime-chunks", false);
      }
@@ -151,5 +151,5 @@ index 100d84a..a40218c 100644
  
      public static CommandSender lastSender = null; // Nasty :(
 -- 
-2.7.2
+2.7.3
 
diff --git a/Spigot-Server-Patches/0072-Add-configurable-portal-search-radius.patch b/Spigot-Server-Patches/0072-Add-configurable-portal-search-radius.patch
index 03ad407776..71908e6a6e 100644
--- a/Spigot-Server-Patches/0072-Add-configurable-portal-search-radius.patch
+++ b/Spigot-Server-Patches/0072-Add-configurable-portal-search-radius.patch
@@ -1,14 +1,14 @@
-From 3508955e76e6d945f59e1c07eab3363916ee2359 Mon Sep 17 00:00:00 2001
+From f3ff0967d4016da4aa66a8214bccc2c54c1d45ab 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 99f072e..0f74015 100644
+index 7dc63dc..69b29f2 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -259,4 +259,9 @@ public class PaperWorldConfig {
+@@ -262,4 +262,9 @@ public class PaperWorldConfig {
      private void allowBlockLocationTabCompletion() {
          allowBlockLocationTabCompletion = getBoolean("allow-block-location-tab-completion", true);
      }
@@ -54,5 +54,5 @@ index 1d5dce1..7ca2617 100644
      private boolean canCreatePortal = true;
  
 -- 
-2.7.2
+2.7.3
 
diff --git a/Spigot-Server-Patches/0074-Fix-inter-world-teleportation-glitches.patch b/Spigot-Server-Patches/0074-Fix-inter-world-teleportation-glitches.patch
index cd258d86c4..dfd5d67329 100644
--- a/Spigot-Server-Patches/0074-Fix-inter-world-teleportation-glitches.patch
+++ b/Spigot-Server-Patches/0074-Fix-inter-world-teleportation-glitches.patch
@@ -1,4 +1,4 @@
-From 951f6ae30c2192bd5a95efe4c386a3cda7e2ef03 Mon Sep 17 00:00:00 2001
+From c13405662594117edbb8b8749f489b249ffff62f 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 0f74015..f3b4288 100644
+index 69b29f2..4655ded 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -264,4 +264,9 @@ public class PaperWorldConfig {
+@@ -267,4 +267,9 @@ public class PaperWorldConfig {
      private void portalSearchRadius() {
          portalSearchRadius = getInt("portal-search-radius", 128);
      }
@@ -25,7 +25,7 @@ index 0f74015..f3b4288 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d9fab10..51c971f 100644
+index 0c2d2c6..4be2653 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -553,7 +553,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -39,5 +39,5 @@ index d9fab10..51c971f 100644
          return true;
      }
 -- 
-2.7.2
+2.7.3
 
diff --git a/Spigot-Server-Patches/0079-Disable-Scoreboards-for-non-players-by-default.patch b/Spigot-Server-Patches/0079-Disable-Scoreboards-for-non-players-by-default.patch
index db21f42428..def23ac00d 100644
--- a/Spigot-Server-Patches/0079-Disable-Scoreboards-for-non-players-by-default.patch
+++ b/Spigot-Server-Patches/0079-Disable-Scoreboards-for-non-players-by-default.patch
@@ -1,4 +1,4 @@
-From 61f697e3c5f65691e9a451bb1245c0b8d03883f6 Mon Sep 17 00:00:00 2001
+From e1b447268152ca7148ae0ec948cb7865f81b055a 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 f3b4288..c47de89 100644
+index 4655ded..e884208 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -269,4 +269,9 @@ public class PaperWorldConfig {
+@@ -272,4 +272,9 @@ public class PaperWorldConfig {
      private void disableTeleportationSuffocationCheck() {
          disableTeleportationSuffocationCheck = getBoolean("disable-teleportation-suffocation-check", false);
      }
@@ -49,5 +49,5 @@ index ab718ce..c28cf58 100644
      }
  
 -- 
-2.7.2
+2.7.3
 
diff --git a/Spigot-Server-Patches/0082-Re-add-Spigot-s-hopper-check-feature.patch b/Spigot-Server-Patches/0082-Re-add-Spigot-s-hopper-check-feature.patch
index 47f2b95510..17a1b651d4 100644
--- a/Spigot-Server-Patches/0082-Re-add-Spigot-s-hopper-check-feature.patch
+++ b/Spigot-Server-Patches/0082-Re-add-Spigot-s-hopper-check-feature.patch
@@ -1,14 +1,14 @@
-From 60830bb985ae3fb37b5918b52bbccea28eb80958 Mon Sep 17 00:00:00 2001
+From 3a4f23e7d9df30c673288c37fe6c6912d586f05b 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 c47de89..56e513e 100644
+index e884208..9c0022f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -274,4 +274,9 @@ public class PaperWorldConfig {
+@@ -277,4 +277,9 @@ public class PaperWorldConfig {
      private void nonPlayerEntitiesOnScoreboards() {
          nonPlayerEntitiesOnScoreboards = getBoolean("allow-non-player-entities-on-scoreboards", false);
      }
@@ -36,5 +36,5 @@ index 4cd2caa..6406bed 100644
              return false;
          } else {
 -- 
-2.7.2
+2.7.3
 
diff --git a/Spigot-Server-Patches/0087-Undead-horse-leashing.patch b/Spigot-Server-Patches/0087-Undead-horse-leashing.patch
index 3889627ab4..e9171324e0 100644
--- a/Spigot-Server-Patches/0087-Undead-horse-leashing.patch
+++ b/Spigot-Server-Patches/0087-Undead-horse-leashing.patch
@@ -1,4 +1,4 @@
-From 995fdcf36842e733b9e019c1e4e394522fcc7468 Mon Sep 17 00:00:00 2001
+From bb9f6df828da47c7dbcab06ef3679cfd141c3040 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 56e513e..4474104 100644
+index 9c0022f..e315960 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -279,4 +279,9 @@ public class PaperWorldConfig {
+@@ -282,4 +282,9 @@ public class PaperWorldConfig {
      private void useHopperCheck() {
          useHopperCheck = getBoolean("use-hopper-check", false);
      }
diff --git a/Spigot-Server-Patches/0090-Configurable-Non-Player-Arrow-Despawn-Rate.patch b/Spigot-Server-Patches/0090-Configurable-Non-Player-Arrow-Despawn-Rate.patch
index 52031eb397..e31b3e88f7 100644
--- a/Spigot-Server-Patches/0090-Configurable-Non-Player-Arrow-Despawn-Rate.patch
+++ b/Spigot-Server-Patches/0090-Configurable-Non-Player-Arrow-Despawn-Rate.patch
@@ -1,4 +1,4 @@
-From b04843c61db61e9940626f7cdb1978546ff8e601 Mon Sep 17 00:00:00 2001
+From 218242d58329b3113b113a734d1491d162fd783d 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,33 +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 4474104..351f0e8 100644
+index e315960..cf56561 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -2,17 +2,21 @@ package com.destroystokyo.paper;
- 
- import java.util.List;
- 
-+import net.minecraft.server.World;
- import org.bukkit.Bukkit;
- import org.bukkit.configuration.file.YamlConfiguration;
-+import org.spigotmc.SpigotWorldConfig;
- 
- public class PaperWorldConfig {
- 
-     private final String worldName;
-+    private final SpigotWorldConfig spigotConfig;
-     private final YamlConfiguration config;
-     private boolean verbose;
- 
--    public PaperWorldConfig(String worldName) {
-+    public PaperWorldConfig(String worldName, SpigotWorldConfig spigotConfig) {
-         this.worldName = worldName;
-+        this.spigotConfig = spigotConfig;
-         this.config = PaperConfig.config;
-         init();
-     }
-@@ -284,4 +288,13 @@ public class PaperWorldConfig {
+@@ -287,4 +287,13 @@ public class PaperWorldConfig {
      private void allowLeashingUndeadHorse() {
          allowLeashingUndeadHorse = getBoolean("allow-leashing-undead-horse", false);
      }
@@ -59,19 +36,6 @@ index 5ccdb88..e5f1b71 100644
                      this.die();
                  }
              } else {
-diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index d569f3b..6ed328a 100644
---- a/src/main/java/net/minecraft/server/World.java
-+++ b/src/main/java/net/minecraft/server/World.java
-@@ -162,7 +162,7 @@ public abstract class World implements IBlockAccess {
- 
-     protected World(IDataManager idatamanager, WorldData worlddata, WorldProvider worldprovider, MethodProfiler methodprofiler, boolean flag, ChunkGenerator gen, org.bukkit.World.Environment env) {
-         this.spigotConfig = new org.spigotmc.SpigotWorldConfig( worlddata.getName() ); // Spigot
--        this.paperConfig = new com.destroystokyo.paper.PaperWorldConfig( worlddata.getName() ); // Paper
-+        this.paperConfig = new com.destroystokyo.paper.PaperWorldConfig( worlddata.getName(), this.spigotConfig); // Paper
-         this.generator = gen;
-         this.world = new CraftWorld((WorldServer) this, gen, env);
-         this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
 -- 
-2.7.4
+2.7.3