Re-introduce an option to limit the height of a flying tnt entity

30 files changed, 206 insertions, 222 deletions

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
new file mode 100644
index 0000000000..8a62448e58
--- /dev/null
+++ b/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch
@@ -0,0 +1,78 @@
+From 19a21a3299d8e33e9d2e74f2ec7216689a03c8e5 Mon Sep 17 00:00:00 2001
+From: Byteflux <[email protected]>
+Date: Sat, 7 Mar 2015 22:03:47 -0600
+Subject: [PATCH] Drop falling block and tnt entities at the specified height
+
+
+diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
+index 7a42040..95c188b 100644
+--- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
++++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
+@@ -69,6 +69,17 @@ public class EntityFallingBlock extends Entity {
+ 
+             this.motY -= 0.03999999910593033D;
+             this.move(this.motX, this.motY, this.motZ);
++
++            // PaperSpigot start - Drop falling blocks above the specified height
++            if (this.world.paperSpigotConfig.fallingBlockHeightNerf != 0 && this.locY > this.world.paperSpigotConfig.fallingBlockHeightNerf) {
++                if (this.dropItem) {
++                    this.a(new ItemStack(block, 1, block.getDropData(this.block)), 0.0F);
++                }
++
++                this.die();
++            }
++            // PaperSpigot end
++
+             this.motX *= 0.9800000190734863D;
+             this.motY *= 0.9800000190734863D;
+             this.motZ *= 0.9800000190734863D;
+diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
+index 2d22327..d2d94d7 100644
+--- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
++++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
+@@ -47,6 +47,13 @@ public class EntityTNTPrimed extends Entity {
+         this.lastZ = this.locZ;
+         this.motY -= 0.03999999910593033D;
+         this.move(this.motX, this.motY, this.motZ);
++
++        // PaperSpigot start - Drop TNT entities above the specified height
++        if (this.world.paperSpigotConfig.tntEntityHeightNerf != 0 && this.locY > this.world.paperSpigotConfig.tntEntityHeightNerf) {
++            this.die();
++        }
++        // PaperSpigot end
++
+         this.motX *= 0.9800000190734863D;
+         this.motY *= 0.9800000190734863D;
+         this.motZ *= 0.9800000190734863D;
+diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
+index b7703a0..52c05a8 100644
+--- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
++++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
+@@ -146,4 +146,24 @@ public class PaperSpigotWorldConfig
+         keepSpawnInMemory = getBoolean( "keep-spawn-loaded", true );
+         log( "Keep spawn chunk loaded: " + keepSpawnInMemory );
+     }
++
++    public int fallingBlockHeightNerf;
++    private void fallingBlockheightNerf()
++    {
++        fallingBlockHeightNerf = getInt( "falling-block-height-nerf", 0 );
++        if ( fallingBlockHeightNerf != 0 )
++        {
++            log( "Falling Block Height Limit set to Y: " + fallingBlockHeightNerf );
++        }
++    }
++
++    public int tntEntityHeightNerf;
++    private void tntEntityHeightNerf()
++    {
++        tntEntityHeightNerf = getInt( "tnt-entity-height-nerf", 0 );
++        if ( tntEntityHeightNerf != 0 )
++        {
++            log( "TNT Entity Height Limit set to Y: " + tntEntityHeightNerf );
++        }
++    }
+ }
+-- 
+2.7.0
+
diff --git a/Spigot-Server-Patches/0016-Drop-falling-block-entities-that-are-above-the-speci.patch b/Spigot-Server-Patches/0016-Drop-falling-block-entities-that-are-above-the-speci.patch
deleted file mode 100644
index 5cb1d956dc..0000000000
--- a/Spigot-Server-Patches/0016-Drop-falling-block-entities-that-are-above-the-speci.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From ba42a80cc0bcbcbf2a8d3ecf0782b9acdc8c499e Mon Sep 17 00:00:00 2001
-From: Byteflux <[email protected]>
-Date: Sat, 7 Mar 2015 22:03:47 -0600
-Subject: [PATCH] Drop falling block entities that are above the specified
- height
-
-
-diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-index ce91553..ef93776 100644
---- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
-+++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-@@ -69,6 +69,17 @@ public class EntityFallingBlock extends Entity {
- 
-             this.motY -= 0.03999999910593033D;
-             this.move(this.motX, this.motY, this.motZ);
-+
-+            // PaperSpigot start - Drop falling blocks above the specified height
-+            if (this.world.paperSpigotConfig.fallingBlockHeightNerf != 0 && this.locY > this.world.paperSpigotConfig.fallingBlockHeightNerf) {
-+                if (this.dropItem) {
-+                    this.a(new ItemStack(block, 1, block.getDropData(this.block)), 0.0F);
-+                }
-+
-+                this.die();
-+            }
-+            // PaperSpigot end
-+
-             this.motX *= 0.9800000190734863D;
-             this.motY *= 0.9800000190734863D;
-             this.motZ *= 0.9800000190734863D;
-diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-index b7703a0..dcc02b7 100644
---- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-+++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-@@ -146,4 +146,56 @@ public class PaperSpigotWorldConfig
-         keepSpawnInMemory = getBoolean( "keep-spawn-loaded", true );
-         log( "Keep spawn chunk loaded: " + keepSpawnInMemory );
-     }
-+
-+    public int fallingBlockHeightNerf;
-+    private void fallingBlockheightNerf()
-+    {
-+        // TODO: Remove migrations after most users have upgraded.
-+        if ( PaperSpigotConfig.version < 8 )
-+        {
-+            // Migrate default value
-+
-+            int heightNerf = config.getInt( "world-settings.default.falling-block-height-nerf", 0 );
-+            if ( heightNerf == 0 ) heightNerf = config.getInt( "world-settings.default.tnt-entity-height-nerf", 0 );
-+            if ( heightNerf == 0 ) heightNerf = config.getInt( "world-settings.default.tnt-gameplay.tnt-entity-height-limit", 0 );
-+            if ( heightNerf != 0 ) config.set( "world-settings.default.falling-block-height-nerf", heightNerf );
-+
-+            if ( config.contains( "world-settings.default.tnt-entity-height-nerf" ) )
-+            {
-+                config.getDefaults().set( "world-settings.default.tnt-entity-height-nerf", null );
-+                config.set( "world-settings.default.tnt-entity-height-nerf", null );
-+            }
-+
-+            if ( config.contains( "world-settings.default.tnt-gameplay.tnt-entity-height-limit" ) )
-+            {
-+                config.getDefaults().set( "world-settings.default.tnt-gameplay.tnt-entity-height-limit", null );
-+                config.set( "world-settings.default.tnt-gameplay.tnt-entity-height-limit", null );
-+            }
-+
-+            // Migrate world setting
-+
-+            heightNerf = config.getInt( "world-settings." + worldName + ".falling-block-height-nerf" );
-+            if ( heightNerf == 0 ) heightNerf = config.getInt( "world-settings." + worldName + ".tnt-entity-height-nerf", 0 );
-+            if ( heightNerf == 0 ) heightNerf = config.getInt( "world-settings." + worldName + ".tnt-gameplay.tnt-entity-height-limit", 0 );
-+            if ( heightNerf != 0 ) config.set( "world-settings." + worldName + ".falling-block-height-nerf", heightNerf );
-+
-+            if ( config.contains( "world-settings." + worldName + ".tnt-entity-height-nerf" ) )
-+            {
-+                config.getDefaults().set( "world-settings." + worldName + ".tnt-entity-height-nerf", null );
-+                config.set( "world-settings." + worldName + ".tnt-entity-height-nerf", null);
-+            }
-+
-+            if ( config.contains( "world-settings." + worldName + ".tnt-gameplay.tnt-entity-height-limit" ) )
-+            {
-+                config.getDefaults().set( "world-settings." + worldName + ".tnt-gameplay.tnt-entity-height-limit", null );
-+                config.set( "world-settings." + worldName + ".tnt-gameplay.tnt-entity-height-limit", null );
-+            }
-+        }
-+
-+        fallingBlockHeightNerf = getInt( "falling-block-height-nerf", 0 );
-+        if ( fallingBlockHeightNerf != 0 )
-+        {
-+            log( "Falling Block Height Limit set to Y: " + fallingBlockHeightNerf );
-+        }
-+    }
- }
--- 
-2.5.1
-
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 f94e5e991c..695f7d052d 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,4 +1,4 @@
-From db282abf06283e8f054810398f6f9a96450b9ed9 Mon Sep 17 00:00:00 2001
+From 89acd9868cbace41415af5c22266009e9e7b8764 Mon Sep 17 00:00:00 2001
 From: Byteflux <[email protected]>
 Date: Sat, 7 Mar 2015 22:17:03 -0600
 Subject: [PATCH] Configurable speed for water flowing over lava
@@ -42,11 +42,11 @@ index 5d36af3..de1dddb 100644
 +    }
  }
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-index dcc02b7..d0a97b6 100644
+index 52c05a8..781cf75 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-@@ -198,4 +198,11 @@ public class PaperSpigotWorldConfig
-             log( "Falling Block Height Limit set to Y: " + fallingBlockHeightNerf );
+@@ -166,4 +166,11 @@ public class PaperSpigotWorldConfig
+             log( "TNT Entity Height Limit set to Y: " + tntEntityHeightNerf );
          }
      }
 +
@@ -58,5 +58,5 @@ index dcc02b7..d0a97b6 100644
 +    }
  }
 -- 
-2.5.1
+2.7.0
 
diff --git a/Spigot-Server-Patches/0021-Remove-invalid-mob-spawner-tile-entities.patch b/Spigot-Server-Patches/0021-Remove-invalid-mob-spawner-tile-entities.patch
index 0853b511f5..f2a68ad13f 100644
--- a/Spigot-Server-Patches/0021-Remove-invalid-mob-spawner-tile-entities.patch
+++ b/Spigot-Server-Patches/0021-Remove-invalid-mob-spawner-tile-entities.patch
@@ -1,4 +1,4 @@
-From 82203f5b964a9ebb9a3cf4d62381a7d4512b4753 Mon Sep 17 00:00:00 2001
+From 1f32bbad70c29f4636c376fa8dac5e579e3e4865 Mon Sep 17 00:00:00 2001
 From: Byteflux <[email protected]>
 Date: Sun, 8 Mar 2015 22:55:25 -0600
 Subject: [PATCH] Remove invalid mob spawner tile entities
@@ -21,10 +21,10 @@ index 022ba31..7242d45 100644
              System.out.println("Attempted to place a tile entity (" + tileentity + ") at " + tileentity.position.getX() + "," + tileentity.position.getY() + "," + tileentity.position.getZ()
                  + " (" + org.bukkit.craftbukkit.util.CraftMagicNumbers.getMaterial(getType(blockposition)) + ") where there was no entity tile!");
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-index d0a97b6..5aa368f 100644
+index 781cf75..af53220 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-@@ -205,4 +205,11 @@ public class PaperSpigotWorldConfig
+@@ -173,4 +173,11 @@ public class PaperSpigotWorldConfig
          waterOverLavaFlowSpeed = getInt( "water-over-lava-flow-speed", 5 );
          log( "Water over lava flow speed: " + waterOverLavaFlowSpeed );
      }
@@ -37,5 +37,5 @@ index d0a97b6..5aa368f 100644
 +    }
  }
 -- 
-2.6.0
+2.7.0
 
diff --git a/Spigot-Server-Patches/0023-Remove-certain-entities-that-fly-through-unloaded-ch.patch b/Spigot-Server-Patches/0023-Remove-certain-entities-that-fly-through-unloaded-ch.patch
index c460b83d56..75cadd3d32 100644
--- a/Spigot-Server-Patches/0023-Remove-certain-entities-that-fly-through-unloaded-ch.patch
+++ b/Spigot-Server-Patches/0023-Remove-certain-entities-that-fly-through-unloaded-ch.patch
@@ -1,4 +1,4 @@
-From 7e20c9665dde62e307535c68d0a636c5f18898d9 Mon Sep 17 00:00:00 2001
+From ac3f20717a8488391789eefd180e54977a436842 Mon Sep 17 00:00:00 2001
 From: Iceee <[email protected]>
 Date: Sun, 8 Mar 2015 03:34:15 -0500
 Subject: [PATCH] Remove certain entities that fly through unloaded chunks
@@ -51,14 +51,13 @@ index 95c188b..86556cd 100644
              if (this.world.paperSpigotConfig.fallingBlockHeightNerf != 0 && this.locY > this.world.paperSpigotConfig.fallingBlockHeightNerf) {
                  if (this.dropItem) {
 diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
-index 2d22327..50423eb 100644
+index d2d94d7..ebc4b85 100644
 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
-@@ -47,6 +47,14 @@ public class EntityTNTPrimed extends Entity {
-         this.lastZ = this.locZ;
-         this.motY -= 0.03999999910593033D;
-         this.move(this.motX, this.motY, this.motZ);
-+
+@@ -54,6 +54,13 @@ public class EntityTNTPrimed extends Entity {
+         }
+         // PaperSpigot end
+ 
 +        // PaperSpigot start - Remove entities in unloaded chunks
 +        if (this.inUnloadedChunk && world.paperSpigotConfig.removeUnloadedTNTEntities) {
 +            this.die();
@@ -97,10 +96,10 @@ index 4b642ba..46e39f2 100644
              entity.tickTimer.startTiming(); // Spigot
              // CraftBukkit end
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-index 5aa368f..729cbf1 100644
+index af53220..4596616 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-@@ -212,4 +212,14 @@ public class PaperSpigotWorldConfig
+@@ -180,4 +180,14 @@ public class PaperSpigotWorldConfig
          removeInvalidMobSpawnerTEs = getBoolean( "remove-invalid-mob-spawner-tile-entities", true );
          log( "Remove invalid mob spawner tile entities: " + removeInvalidMobSpawnerTEs );
      }
@@ -116,5 +115,5 @@ index 5aa368f..729cbf1 100644
 +    }
  }
 -- 
-2.6.1.windows.1
+2.7.0
 
diff --git a/Spigot-Server-Patches/0027-Configurable-game-mechanics-changes.patch b/Spigot-Server-Patches/0027-Configurable-game-mechanics-changes.patch
index 2b43ded351..1d5a8b1e53 100644
--- a/Spigot-Server-Patches/0027-Configurable-game-mechanics-changes.patch
+++ b/Spigot-Server-Patches/0027-Configurable-game-mechanics-changes.patch
@@ -1,4 +1,4 @@
-From 9d77de8e9fe61e0032c6534d3bd8fb127493db36 Mon Sep 17 00:00:00 2001
+From b550c3d13b8fec67ae07928e772475624ccf31be Mon Sep 17 00:00:00 2001
 From: gsand <[email protected]>
 Date: Sun, 8 Mar 2015 04:10:02 -0500
 Subject: [PATCH] Configurable game mechanics changes
@@ -63,10 +63,10 @@ index f6a43c0..0e6f8c0 100644
 +    }
  }
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-index 729cbf1..88ee38a 100644
+index 4596616..a6d444b 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-@@ -222,4 +222,10 @@ public class PaperSpigotWorldConfig
+@@ -190,4 +190,10 @@ public class PaperSpigotWorldConfig
          removeUnloadedTNTEntities = getBoolean( "remove-unloaded.tnt-entities", true );
          removeUnloadedFallingBlocks = getBoolean( "remove-unloaded.falling-blocks", true );
      }
@@ -78,5 +78,5 @@ index 729cbf1..88ee38a 100644
 +    }
  }
 -- 
-2.5.2
+2.7.0
 
diff --git a/Spigot-Server-Patches/0030-Add-TNT-source-location-API.patch b/Spigot-Server-Patches/0030-Add-TNT-source-location-API.patch
index 2666b33232..d02b3a099b 100644
--- a/Spigot-Server-Patches/0030-Add-TNT-source-location-API.patch
+++ b/Spigot-Server-Patches/0030-Add-TNT-source-location-API.patch
@@ -1,4 +1,4 @@
-From ec281d8d7494f7338e01f25c7b256b74862383ca Mon Sep 17 00:00:00 2001
+From caf326d2691e94f197820555136aac73ef7cee29 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sun, 8 Mar 2015 04:23:41 -0500
 Subject: [PATCH] Add TNT source location API
@@ -42,7 +42,7 @@ index f2c78f3..bc07d3d 100644
  
                  world.addEntity(entitytntprimed);
 diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
-index 50423eb..1daba4e 100644
+index 2eeea05..7f82c4a 100644
 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 @@ -8,15 +8,23 @@ public class EntityTNTPrimed extends Entity {
@@ -71,7 +71,7 @@ index 50423eb..1daba4e 100644
          this.setPosition(d0, d1, d2);
          float f = (float) (Math.random() * 3.1415927410125732D * 2.0D);
  
-@@ -96,10 +104,25 @@ public class EntityTNTPrimed extends Entity {
+@@ -102,10 +110,25 @@ public class EntityTNTPrimed extends Entity {
  
      protected void b(NBTTagCompound nbttagcompound) {
          nbttagcompound.setByte("Fuse", (byte) this.fuseTicks);
@@ -98,7 +98,7 @@ index 50423eb..1daba4e 100644
  
      public EntityLiving getSource() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 552f5c3..05b88fd 100644
+index 89e78ab..d8417c9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1110,7 +1110,8 @@ public class CraftWorld implements World {
@@ -128,5 +128,5 @@ index e08ad47..b7e8b4d 100644
 +    // PaperSpigot end
  }
 -- 
-2.5.2
+2.7.0
 
diff --git a/Spigot-Server-Patches/0032-Configurable-top-of-nether-void-damage.patch b/Spigot-Server-Patches/0032-Configurable-top-of-nether-void-damage.patch
index 99daac2fb7..9eafb350ed 100644
--- a/Spigot-Server-Patches/0032-Configurable-top-of-nether-void-damage.patch
+++ b/Spigot-Server-Patches/0032-Configurable-top-of-nether-void-damage.patch
@@ -1,4 +1,4 @@
-From 66f764d702640b3cf873889ecc41ff921481bbfa Mon Sep 17 00:00:00 2001
+From 61dc85a7666c14d6599771c6fe971920efd40fb9 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Mon, 23 Feb 2015 14:57:28 -0600
 Subject: [PATCH] Configurable top of nether void damage
@@ -32,10 +32,10 @@ index 3e89aa9..a3b4cdb 100644
          }
  
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-index 88ee38a..c1f21ae 100644
+index a6d444b..b2f9a8e 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-@@ -228,4 +228,10 @@ public class PaperSpigotWorldConfig
+@@ -196,4 +196,10 @@ public class PaperSpigotWorldConfig
      {
          boatsDropBoats = getBoolean( "game-mechanics.boats-drop-boats", false );
      }
@@ -47,5 +47,5 @@ index 88ee38a..c1f21ae 100644
 +    }
  }
 -- 
-2.5.2
+2.7.0
 
diff --git a/Spigot-Server-Patches/0035-Fix-redstone-lag-issues.patch b/Spigot-Server-Patches/0035-Fix-redstone-lag-issues.patch
index 2c13ddb2b2..246f68a4c2 100644
--- a/Spigot-Server-Patches/0035-Fix-redstone-lag-issues.patch
+++ b/Spigot-Server-Patches/0035-Fix-redstone-lag-issues.patch
@@ -1,11 +1,11 @@
-From 81b8f96f7f26a7f0d2805bc3f9681544f6c1432b Mon Sep 17 00:00:00 2001
+From d3fbc65d48a954e502579dccb29442db086fa363 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Mon, 13 Apr 2015 15:47:15 -0500
 Subject: [PATCH] Fix redstone lag issues
 
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index effac28..a94c6dc 100644
+index bf7c876..9829ff0 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -611,6 +611,8 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -54,10 +54,10 @@ index effac28..a94c6dc 100644
                  this.methodProfiler.a("ticking");
                  Iterator iterator = this.V.iterator();
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-index c1f21ae..8421e3b 100644
+index b2f9a8e..c8971d1 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-@@ -234,4 +234,14 @@ public class PaperSpigotWorldConfig
+@@ -202,4 +202,14 @@ public class PaperSpigotWorldConfig
      {
          netherVoidTopDamage = getBoolean( "nether-ceiling-void-damage", false );
      }
@@ -73,5 +73,5 @@ index c1f21ae..8421e3b 100644
 +    }
  }
 -- 
-2.5.2
+2.7.0
 
diff --git a/Spigot-Server-Patches/0038-Configurable-async-light-updates.patch b/Spigot-Server-Patches/0038-Configurable-async-light-updates.patch
index 1a30c5d6ef..0f55babef5 100644
--- a/Spigot-Server-Patches/0038-Configurable-async-light-updates.patch
+++ b/Spigot-Server-Patches/0038-Configurable-async-light-updates.patch
@@ -1,4 +1,4 @@
-From bd3df799507c4cf52bfa005a06acec8010a5dfea Mon Sep 17 00:00:00 2001
+From 887a1070709897069646cb85cb7c86813926d695 Mon Sep 17 00:00:00 2001
 From: Byteflux <[email protected]>
 Date: Wed, 1 Jul 2015 00:18:10 -0700
 Subject: [PATCH] Configurable async light updates
@@ -216,10 +216,10 @@ index c50536e..82c43e3 100644
          return false;
      }
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-index 8421e3b..fa5066b 100644
+index c8971d1..9ad53fa 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-@@ -244,4 +244,11 @@ public class PaperSpigotWorldConfig
+@@ -212,4 +212,11 @@ public class PaperSpigotWorldConfig
          log( "WorldServer TickNextTick cap set at " + tickNextTickCap );
          log( "WorldServer TickNextTickList cap always processes redstone: " + tickNextTickListCapIgnoresRedstone );
      }
@@ -232,5 +232,5 @@ index 8421e3b..fa5066b 100644
 +    }
  }
 -- 
-2.6.1.windows.1
+2.7.0
 
diff --git a/Spigot-Server-Patches/0040-Toggleable-player-crits-helps-mitigate-hacked-client.patch b/Spigot-Server-Patches/0040-Toggleable-player-crits-helps-mitigate-hacked-client.patch
index efa4238a48..d7a6864dd5 100644
--- a/Spigot-Server-Patches/0040-Toggleable-player-crits-helps-mitigate-hacked-client.patch
+++ b/Spigot-Server-Patches/0040-Toggleable-player-crits-helps-mitigate-hacked-client.patch
@@ -1,4 +1,4 @@
-From cc596c88c9f0dfe7eb582439bbacacc878959871 Mon Sep 17 00:00:00 2001
+From 75816e95b1a72dabba47e22901bff5c9ce7d89cc Mon Sep 17 00:00:00 2001
 From: Roman Alexander <[email protected]>
 Date: Fri, 27 Mar 2015 00:52:24 -0400
 Subject: [PATCH] Toggleable player crits, helps mitigate hacked clients.
@@ -18,10 +18,10 @@ index b901c69..cc1e33c 100644
                      if (flag && f > 0.0F) {
                          f *= 1.5F;
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-index fa5066b..0b1a96e 100644
+index 9ad53fa..1a4a9af 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-@@ -224,9 +224,11 @@ public class PaperSpigotWorldConfig
+@@ -192,9 +192,11 @@ public class PaperSpigotWorldConfig
      }
  
      public boolean boatsDropBoats;
@@ -34,5 +34,5 @@ index fa5066b..0b1a96e 100644
  
      public boolean netherVoidTopDamage;
 -- 
-2.5.2
+2.7.0
 
diff --git a/Spigot-Server-Patches/0043-Configurable-end-credits-when-leaving-the-end.patch b/Spigot-Server-Patches/0043-Configurable-end-credits-when-leaving-the-end.patch
index 54d0afa057..d17772d409 100644
--- a/Spigot-Server-Patches/0043-Configurable-end-credits-when-leaving-the-end.patch
+++ b/Spigot-Server-Patches/0043-Configurable-end-credits-when-leaving-the-end.patch
@@ -1,4 +1,4 @@
-From 6d3998003267900af6bfed5014920c15eabbf502 Mon Sep 17 00:00:00 2001
+From 49ec7288782b79ced596646469a118e5885a6aaa Mon Sep 17 00:00:00 2001
 From: DoctorDark <[email protected]>
 Date: Thu, 28 May 2015 20:12:38 -0500
 Subject: [PATCH] Configurable end credits when leaving the end
@@ -74,10 +74,10 @@ index d3d19dd..deb0b82 100644
              return;
          }
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-index 0b1a96e..36e0948 100644
+index 1a4a9af..00ca118 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-@@ -253,4 +253,10 @@ public class PaperSpigotWorldConfig
+@@ -221,4 +221,10 @@ public class PaperSpigotWorldConfig
          useAsyncLighting = getBoolean( "use-async-lighting", false );
          log( "World async lighting: " + useAsyncLighting );
      }
@@ -89,5 +89,5 @@ index 0b1a96e..36e0948 100644
 +    }
  }
 -- 
-2.5.2
+2.7.0
 
diff --git a/Spigot-Server-Patches/0044-Force-load-chunks-for-specific-entities-that-fly-thr.patch b/Spigot-Server-Patches/0044-Force-load-chunks-for-specific-entities-that-fly-thr.patch
index 81e54a5243..8d1beb7783 100644
--- a/Spigot-Server-Patches/0044-Force-load-chunks-for-specific-entities-that-fly-thr.patch
+++ b/Spigot-Server-Patches/0044-Force-load-chunks-for-specific-entities-that-fly-thr.patch
@@ -1,4 +1,4 @@
-From 3dce862b73862649830c363a11c30e0e2b27ea78 Mon Sep 17 00:00:00 2001
+From a4fdf33885e7cc6ab538e1bc98e867fa74c33956 Mon Sep 17 00:00:00 2001
 From: Byteflux <[email protected]>
 Date: Tue, 30 Jun 2015 20:45:24 -0700
 Subject: [PATCH] Force load chunks for specific entities that fly through
@@ -99,7 +99,7 @@ index b34e93c..f2d0eee 100644
  
      protected boolean s_() {
 diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
-index 1daba4e..3a7c4fa 100644
+index f415248..7a5fb2a 100644
 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 @@ -21,6 +21,7 @@ public class EntityTNTPrimed extends Entity {
@@ -110,7 +110,7 @@ index 1daba4e..3a7c4fa 100644
      }
  
      public EntityTNTPrimed(org.bukkit.Location loc, World world, double d0, double d1, double d2, EntityLiving entityliving) {
-@@ -90,7 +91,15 @@ public class EntityTNTPrimed extends Entity {
+@@ -96,7 +97,15 @@ public class EntityTNTPrimed extends Entity {
      private void explode() {
          // CraftBukkit start
          // float f = 4.0F;
@@ -127,7 +127,7 @@ index 1daba4e..3a7c4fa 100644
          org.bukkit.craftbukkit.CraftServer server = this.world.getServer();
  
          ExplosionPrimeEvent event = new ExplosionPrimeEvent((org.bukkit.entity.Explosive) org.bukkit.craftbukkit.entity.CraftEntity.getEntity(server, this));
-@@ -100,6 +109,12 @@ public class EntityTNTPrimed extends Entity {
+@@ -106,6 +115,12 @@ public class EntityTNTPrimed extends Entity {
              this.world.createExplosion(this, this.locX, this.locY + (double) (this.length / 2.0F), this.locZ, event.getRadius(), event.getFire(), true);
          }
          // CraftBukkit end
@@ -170,10 +170,10 @@ index 82c43e3..d2cb1f1 100644
                      this.getChunkAt(entity.ae, entity.ag).a(entity, entity.af);
                  }
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-index 36e0948..a78d748 100644
+index 00ca118..65e0f12 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-@@ -259,4 +259,14 @@ public class PaperSpigotWorldConfig
+@@ -227,4 +227,14 @@ public class PaperSpigotWorldConfig
      {
          disableEndCredits = getBoolean( "game-mechanics.disable-end-credits", false );
      }
@@ -202,5 +202,5 @@ index d6311bd..5b0c64d 100644
              return true;
          }
 -- 
-2.6.3
+2.7.0
 
diff --git a/Spigot-Server-Patches/0047-Generator-Settings.patch b/Spigot-Server-Patches/0047-Generator-Settings.patch
index a99b9305fb..70c19a11ba 100644
--- a/Spigot-Server-Patches/0047-Generator-Settings.patch
+++ b/Spigot-Server-Patches/0047-Generator-Settings.patch
@@ -1,4 +1,4 @@
-From bcfba603222a07cf5b77763853394956f01727ea Mon Sep 17 00:00:00 2001
+From d4c583643d602b2740c1c919eceeb624997b69a2 Mon Sep 17 00:00:00 2001
 From: Byteflux <[email protected]>
 Date: Tue, 2 Jun 2015 00:41:23 -0700
 Subject: [PATCH] Generator Settings
@@ -243,10 +243,10 @@ index 0f8211a..e76acfc 100644
          Iterator iterator = this.e.values().iterator();
  
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-index a78d748..d2fe995 100644
+index 65e0f12..cffb5f0 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-@@ -269,4 +269,28 @@ public class PaperSpigotWorldConfig
+@@ -237,4 +237,28 @@ public class PaperSpigotWorldConfig
          loadUnloadedTNTEntities = getBoolean( "load-chunks.tnt-entities", false );
          loadUnloadedFallingBlocks = getBoolean( "load-chunks.falling-blocks", false );
      }
@@ -276,5 +276,5 @@ index a78d748..d2fe995 100644
 +    }
  }
 -- 
-2.5.2
+2.7.0
 
diff --git a/Spigot-Server-Patches/0048-Configurable-TNT-cannon-fix.patch b/Spigot-Server-Patches/0048-Configurable-TNT-cannon-fix.patch
index d6be89dee8..fb7a17df36 100644
--- a/Spigot-Server-Patches/0048-Configurable-TNT-cannon-fix.patch
+++ b/Spigot-Server-Patches/0048-Configurable-TNT-cannon-fix.patch
@@ -1,4 +1,4 @@
-From bc36db0be50fef7b6769cb38af1ad11897f822c4 Mon Sep 17 00:00:00 2001
+From 5585f2e02d7ba71ddff799e36040d6e154263525 Mon Sep 17 00:00:00 2001
 From: Iceee <[email protected]>
 Date: Thu, 4 Jun 2015 13:55:02 -0700
 Subject: [PATCH] Configurable TNT cannon fix
@@ -199,7 +199,7 @@ index f2d0eee..36c384e 100644
 +    // PaperSpigot end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
-index 3a7c4fa..b5fdbe6 100644
+index 7a5fb2a..872d965 100644
 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 @@ -37,6 +37,7 @@ public class EntityTNTPrimed extends Entity {
@@ -210,7 +210,7 @@ index 3a7c4fa..b5fdbe6 100644
      }
  
      protected void h() {}
-@@ -144,7 +145,64 @@ public class EntityTNTPrimed extends Entity {
+@@ -150,7 +151,64 @@ public class EntityTNTPrimed extends Entity {
          return this.source;
      }
  
@@ -298,10 +298,10 @@ index 78e3a7d..0e8af2e 100644
                              this.k.put((EntityHuman) entity, new Vec3D(d8 * d13, d9 * d13, d10 * d13));
                          }
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-index d2fe995..beeaa0b 100644
+index cffb5f0..180158b 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-@@ -293,4 +293,43 @@ public class PaperSpigotWorldConfig
+@@ -261,4 +261,43 @@ public class PaperSpigotWorldConfig
          generateVillage = getBoolean( "generator-settings.village", true );
          generateFlatBedrock = getBoolean( "generator-settings.flat-bedrock", false );
      }
@@ -346,5 +346,5 @@ index d2fe995..beeaa0b 100644
 +    }
  }
 -- 
-2.6.3
+2.7.0
 
diff --git a/Spigot-Server-Patches/0049-FallingBlock-and-TNT-entities-collide-with-specific-.patch b/Spigot-Server-Patches/0049-FallingBlock-and-TNT-entities-collide-with-specific-.patch
index 7f34093dd0..96ba0e783d 100644
--- a/Spigot-Server-Patches/0049-FallingBlock-and-TNT-entities-collide-with-specific-.patch
+++ b/Spigot-Server-Patches/0049-FallingBlock-and-TNT-entities-collide-with-specific-.patch
@@ -1,4 +1,4 @@
-From 1b1ce3c1d7f3c2ede70f18412bbe050b80c844c9 Mon Sep 17 00:00:00 2001
+From b492b9f378575d22dba8aa0c1766c5c1b06133b4 Mon Sep 17 00:00:00 2001
 From: Byteflux <[email protected]>
 Date: Fri, 5 Jun 2015 00:43:17 -0700
 Subject: [PATCH] FallingBlock and TNT entities collide with specific blocks
@@ -26,10 +26,10 @@ index d2cb1f1..7660356 100644
                          }
                      }
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-index beeaa0b..88e0644 100644
+index 180158b..ef59074 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-@@ -332,4 +332,10 @@ public class PaperSpigotWorldConfig
+@@ -300,4 +300,10 @@ public class PaperSpigotWorldConfig
          fixCannons = getBoolean( "fix-cannons", false );
          log( "Fix TNT cannons: " + fixCannons );
      }
@@ -41,5 +41,5 @@ index beeaa0b..88e0644 100644
 +    }
  }
 -- 
-2.6.1.windows.1
+2.7.0
 
diff --git a/Spigot-Server-Patches/0050-Optimize-explosions.patch b/Spigot-Server-Patches/0050-Optimize-explosions.patch
index 688409bb82..ccef0328b0 100644
--- a/Spigot-Server-Patches/0050-Optimize-explosions.patch
+++ b/Spigot-Server-Patches/0050-Optimize-explosions.patch
@@ -1,4 +1,4 @@
-From 08d9141e892efb8b00b405903f3be94307236c8f Mon Sep 17 00:00:00 2001
+From d5ef4de366d7f65280dd0466a92f71a09b1120fd Mon Sep 17 00:00:00 2001
 From: Byteflux <[email protected]>
 Date: Tue, 16 Jun 2015 00:43:17 -0700
 Subject: [PATCH] Optimize explosions
@@ -134,10 +134,10 @@ index 7660356..68cb798 100644
      public static long chunkToKey(int x, int z)
      {
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-index 88e0644..f3228d9 100644
+index ef59074..e42b574 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-@@ -338,4 +338,10 @@ public class PaperSpigotWorldConfig
+@@ -306,4 +306,10 @@ public class PaperSpigotWorldConfig
      {
          fallingBlocksCollideWithSigns = getBoolean( "falling-blocks-collide-with-signs", false );
      }
@@ -149,5 +149,5 @@ index 88e0644..f3228d9 100644
 +    }
  }
 -- 
-2.6.1.windows.1
+2.7.0
 
diff --git a/Spigot-Server-Patches/0052-Fast-draining.patch b/Spigot-Server-Patches/0052-Fast-draining.patch
index 5d5715a547..888868aff8 100644
--- a/Spigot-Server-Patches/0052-Fast-draining.patch
+++ b/Spigot-Server-Patches/0052-Fast-draining.patch
@@ -1,4 +1,4 @@
-From f52fd3b116d6cfbbe30bf9d80fd890c7938be025 Mon Sep 17 00:00:00 2001
+From 0400a17ebc786a5b92448a24fb891814519d2fd3 Mon Sep 17 00:00:00 2001
 From: Byteflux <[email protected]>
 Date: Tue, 30 Jun 2015 19:31:02 -0700
 Subject: [PATCH] Fast draining
@@ -80,10 +80,10 @@ index ab2e43f..fc3fc48 100644
 +    }
  }
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-index f3228d9..2ecacd5 100644
+index e42b574..56c8433 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-@@ -344,4 +344,12 @@ public class PaperSpigotWorldConfig
+@@ -312,4 +312,12 @@ public class PaperSpigotWorldConfig
      {
          optimizeExplosions = getBoolean( "optimize-explosions", false );
      }
@@ -97,5 +97,5 @@ index f3228d9..2ecacd5 100644
 +    }
  }
 -- 
-2.6.0
+2.7.0
 
diff --git a/Spigot-Server-Patches/0053-Configurable-lava-flow-speed.patch b/Spigot-Server-Patches/0053-Configurable-lava-flow-speed.patch
index dcf20239fd..5a3acc5732 100644
--- a/Spigot-Server-Patches/0053-Configurable-lava-flow-speed.patch
+++ b/Spigot-Server-Patches/0053-Configurable-lava-flow-speed.patch
@@ -1,4 +1,4 @@
-From 4983f09972f340718b3dce467b9ae791be927718 Mon Sep 17 00:00:00 2001
+From 70a6bd60d4c817a5d2420fdefcc6ad1d4afe869a Mon Sep 17 00:00:00 2001
 From: Byteflux <[email protected]>
 Date: Wed, 1 Jul 2015 00:38:10 -0700
 Subject: [PATCH] Configurable lava flow speed
@@ -19,10 +19,10 @@ index fc3fc48..23130ba 100644
                  world.getType(blockposition.north(1)).getBlock().getMaterial() == Material.LAVA ||
                          world.getType(blockposition.south(1)).getBlock().getMaterial() == Material.LAVA ||
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-index 2ecacd5..9ae1b18 100644
+index 56c8433..349f77a 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-@@ -352,4 +352,12 @@ public class PaperSpigotWorldConfig
+@@ -320,4 +320,12 @@ public class PaperSpigotWorldConfig
          fastDrainLava = getBoolean( "fast-drain.lava", false );
          fastDrainWater = getBoolean( "fast-drain.water", false );
      }
@@ -36,5 +36,5 @@ index 2ecacd5..9ae1b18 100644
 +    }
  }
 -- 
-2.5.2
+2.7.0
 
diff --git a/Spigot-Server-Patches/0055-Disable-explosion-knockback.patch b/Spigot-Server-Patches/0055-Disable-explosion-knockback.patch
index eb665d21b1..94c08b561a 100644
--- a/Spigot-Server-Patches/0055-Disable-explosion-knockback.patch
+++ b/Spigot-Server-Patches/0055-Disable-explosion-knockback.patch
@@ -1,11 +1,11 @@
-From a2e155ea58f56fac11c16a6ea54faa60a35557c1 Mon Sep 17 00:00:00 2001
+From b3a5cb356f485d1408532c223268045d25a76112 Mon Sep 17 00:00:00 2001
 From: Sudzzy <[email protected]>
 Date: Tue, 14 Jul 2015 09:20:44 -0700
 Subject: [PATCH] Disable explosion knockback
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 3c852fd..b0618e4 100644
+index f643b29..0de13bb 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -779,7 +779,10 @@ public abstract class EntityLiving extends Entity {
@@ -52,10 +52,10 @@ index f6067ce..a60d3dd 100644
                          }
                      }
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-index 9ae1b18..b5bc358 100644
+index 349f77a..eaf1eda 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-@@ -360,4 +360,10 @@ public class PaperSpigotWorldConfig
+@@ -328,4 +328,10 @@ public class PaperSpigotWorldConfig
          lavaFlowSpeedNormal = getInt( "lava-flow-speed.normal", 30 );
          lavaFlowSpeedNether = getInt( "lava-flow-speed.nether", 10 );
      }
@@ -67,5 +67,5 @@ index 9ae1b18..b5bc358 100644
 +    }
  }
 -- 
-2.5.2
+2.7.0
 
diff --git a/Spigot-Server-Patches/0056-Disable-thunder.patch b/Spigot-Server-Patches/0056-Disable-thunder.patch
index a86e34f8fe..c47d58fb23 100644
--- a/Spigot-Server-Patches/0056-Disable-thunder.patch
+++ b/Spigot-Server-Patches/0056-Disable-thunder.patch
@@ -1,11 +1,11 @@
-From bc5228ac287ff7d3d28af35781958c3695991670 Mon Sep 17 00:00:00 2001
+From 1fac37952e90156a79e01dc1ae40d02b31c7fd6c Mon Sep 17 00:00:00 2001
 From: Sudzzy <[email protected]>
 Date: Tue, 14 Jul 2015 09:26:41 -0700
 Subject: [PATCH] Disable thunder
 
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index a94c6dc..2a3b944 100644
+index 9829ff0..6cf3157 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -422,7 +422,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -18,10 +18,10 @@ index a94c6dc..2a3b944 100644
                      i1 = this.m >> 2;
                      blockposition = this.a(new BlockPosition(k + (i1 & 15), 0, l + (i1 >> 8 & 15)));
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-index b5bc358..c5425ab 100644
+index eaf1eda..a29f042 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-@@ -366,4 +366,10 @@ public class PaperSpigotWorldConfig
+@@ -334,4 +334,10 @@ public class PaperSpigotWorldConfig
      {
          disableExplosionKnockback = getBoolean( "disable-explosion-knockback", false );
      }
@@ -33,5 +33,5 @@ index b5bc358..c5425ab 100644
 +    }
  }
 -- 
-2.5.2
+2.7.0
 
diff --git a/Spigot-Server-Patches/0057-Disable-ice-and-snow.patch b/Spigot-Server-Patches/0057-Disable-ice-and-snow.patch
index bc895cd97b..94048a422f 100644
--- a/Spigot-Server-Patches/0057-Disable-ice-and-snow.patch
+++ b/Spigot-Server-Patches/0057-Disable-ice-and-snow.patch
@@ -1,11 +1,11 @@
-From 250fcdbcd4a67cb389bee872357ffa0906746790 Mon Sep 17 00:00:00 2001
+From 3825558644345b19345fde32b2c8de71a19ef36e Mon Sep 17 00:00:00 2001
 From: Sudzzy <[email protected]>
 Date: Tue, 14 Jul 2015 09:28:31 -0700
 Subject: [PATCH] Disable ice and snow
 
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 2a3b944..06c7057 100644
+index 6cf3157..392896b 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -432,7 +432,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -18,10 +18,10 @@ index 2a3b944..06c7057 100644
                      i1 = this.m >> 2;
                      blockposition = this.q(new BlockPosition(k + (i1 & 15), 0, l + (i1 >> 8 & 15)));
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-index c5425ab..25e92f8 100644
+index a29f042..da5030a 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-@@ -372,4 +372,10 @@ public class PaperSpigotWorldConfig
+@@ -340,4 +340,10 @@ public class PaperSpigotWorldConfig
      {
          disableThunder = getBoolean( "disable-thunder", false );
      }
@@ -33,5 +33,5 @@ index c5425ab..25e92f8 100644
 +    }
  }
 -- 
-2.5.2
+2.7.0
 
diff --git a/Spigot-Server-Patches/0058-Disable-mood-sounds.patch b/Spigot-Server-Patches/0058-Disable-mood-sounds.patch
index 8192a454cb..db4856a906 100644
--- a/Spigot-Server-Patches/0058-Disable-mood-sounds.patch
+++ b/Spigot-Server-Patches/0058-Disable-mood-sounds.patch
@@ -1,4 +1,4 @@
-From ba096e647abc5ff61aea708c97dba3ba08d9a0df Mon Sep 17 00:00:00 2001
+From d7b725f84544da3633918ede5a0d708504bb80c8 Mon Sep 17 00:00:00 2001
 From: Sudzzy <[email protected]>
 Date: Tue, 14 Jul 2015 09:30:28 -0700
 Subject: [PATCH] Disable mood sounds
@@ -18,10 +18,10 @@ index 68cb798..64713bd 100644
              int k = this.m >> 2;
              int l = k & 15;
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-index 25e92f8..8e5de323 100644
+index da5030a..469b620 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-@@ -378,4 +378,10 @@ public class PaperSpigotWorldConfig
+@@ -346,4 +346,10 @@ public class PaperSpigotWorldConfig
      {
          disableIceAndSnow = getBoolean( "disable-ice-and-snow", false );
      }
@@ -33,5 +33,5 @@ index 25e92f8..8e5de323 100644
 +    }
  }
 -- 
-2.6.1.windows.1
+2.7.0
 
diff --git a/Spigot-Server-Patches/0059-Configurable-mob-spawner-tick-rate.patch b/Spigot-Server-Patches/0059-Configurable-mob-spawner-tick-rate.patch
index b75625a355..942bdc1a77 100644
--- a/Spigot-Server-Patches/0059-Configurable-mob-spawner-tick-rate.patch
+++ b/Spigot-Server-Patches/0059-Configurable-mob-spawner-tick-rate.patch
@@ -1,4 +1,4 @@
-From ef6d2eb2901e52146ebbb4c0c8d7ac6aa0ec94b4 Mon Sep 17 00:00:00 2001
+From faf83e8f660a77386fd15533e3031bf6734ad1b3 Mon Sep 17 00:00:00 2001
 From: Sudzzy <[email protected]>
 Date: Tue, 14 Jul 2015 09:58:15 -0700
 Subject: [PATCH] Configurable mob spawner tick rate
@@ -50,10 +50,10 @@ index ebd1e36..d4674dc 100644
                  }
  
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-index 8e5de323..12697ff 100644
+index 469b620..8247aef 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-@@ -384,4 +384,10 @@ public class PaperSpigotWorldConfig
+@@ -352,4 +352,10 @@ public class PaperSpigotWorldConfig
      {
          disableMoodSounds = getBoolean( "disable-mood-sounds", false );
      }
@@ -65,5 +65,5 @@ index 8e5de323..12697ff 100644
 +    }
  }
 -- 
-2.5.2
+2.7.0
 
diff --git a/Spigot-Server-Patches/0061-ChunkMap-caching.patch b/Spigot-Server-Patches/0061-ChunkMap-caching.patch
index 9c6d3b5cc3..1f93ece43b 100644
--- a/Spigot-Server-Patches/0061-ChunkMap-caching.patch
+++ b/Spigot-Server-Patches/0061-ChunkMap-caching.patch
@@ -1,4 +1,4 @@
-From 001bb0997eb6555d5bfb56ec280061c590f8d2a2 Mon Sep 17 00:00:00 2001
+From 915587ce38bd3ddc6843111678206ccc2bce8e25 Mon Sep 17 00:00:00 2001
 From: Iceee <[email protected]>
 Date: Wed, 15 Jul 2015 02:41:12 -0700
 Subject: [PATCH] ChunkMap caching
@@ -121,10 +121,10 @@ index 10c0e34..00c0538 100644
              this.a[j] = chunk.locX;
              this.b[j] = chunk.locZ;
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-index 12697ff..49104ff 100644
+index 8247aef..54f432d 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-@@ -390,4 +390,10 @@ public class PaperSpigotWorldConfig
+@@ -358,4 +358,10 @@ public class PaperSpigotWorldConfig
      {
          mobSpawnerTickRate = getInt( "mob-spawner-tick-rate", 1 );
      }
@@ -136,5 +136,5 @@ index 12697ff..49104ff 100644
 +    }
  }
 -- 
-2.5.2
+2.7.0
 
diff --git a/Spigot-Server-Patches/0065-Configurable-container-update-tick-rate.patch b/Spigot-Server-Patches/0065-Configurable-container-update-tick-rate.patch
index 3725a7d58f..ffb264671d 100644
--- a/Spigot-Server-Patches/0065-Configurable-container-update-tick-rate.patch
+++ b/Spigot-Server-Patches/0065-Configurable-container-update-tick-rate.patch
@@ -1,4 +1,4 @@
-From b3648456c35595d816fc03a27dee08070d9414ef Mon Sep 17 00:00:00 2001
+From 54a6f2217b848ae8f4a01a8315e5266feac87dc8 Mon Sep 17 00:00:00 2001
 From: Sudzzy <[email protected]>
 Date: Thu, 23 Jul 2015 22:05:22 -0700
 Subject: [PATCH] Configurable container update tick rate
@@ -33,10 +33,10 @@ index 3e4869b..0c49a25 100644
              this.closeInventory();
              this.activeContainer = this.defaultContainer;
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-index 49104ff..84cdb12 100644
+index 54f432d..f1409cf 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-@@ -396,4 +396,10 @@ public class PaperSpigotWorldConfig
+@@ -364,4 +364,10 @@ public class PaperSpigotWorldConfig
      {
          cacheChunkMaps = getBoolean( "cache-chunk-maps", false );
      }
@@ -48,5 +48,5 @@ index 49104ff..84cdb12 100644
 +    }
  }
 -- 
-2.5.2
+2.7.0
 
diff --git a/Spigot-Server-Patches/0066-Configurable-TNT-explosion-volume.patch b/Spigot-Server-Patches/0066-Configurable-TNT-explosion-volume.patch
index 485085c7f5..24fb571d4d 100644
--- a/Spigot-Server-Patches/0066-Configurable-TNT-explosion-volume.patch
+++ b/Spigot-Server-Patches/0066-Configurable-TNT-explosion-volume.patch
@@ -1,4 +1,4 @@
-From 828d3214e608e5d47b09df72d7cdb285dd01ad97 Mon Sep 17 00:00:00 2001
+From 1fb1f1763f84d9861eed6b1f1b0d9a4b77c01e4a Mon Sep 17 00:00:00 2001
 From: Byteflux <[email protected]>
 Date: Tue, 4 Aug 2015 17:45:00 -0700
 Subject: [PATCH] Configurable TNT explosion volume
@@ -21,10 +21,10 @@ index a60d3dd..b7d410e 100644
              this.world.addParticle(EnumParticle.EXPLOSION_HUGE, this.posX, this.posY, this.posZ, 1.0D, 0.0D, 0.0D, new int[0]);
          } else {
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-index 84cdb12..3f8bffc 100644
+index f1409cf..346e3f9 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-@@ -402,4 +402,10 @@ public class PaperSpigotWorldConfig
+@@ -370,4 +370,10 @@ public class PaperSpigotWorldConfig
      {
          containerUpdateTickRate = getInt( "container-update-tick-rate", 1 );
      }
@@ -36,5 +36,5 @@ index 84cdb12..3f8bffc 100644
 +    }
  }
 -- 
-2.5.2
+2.7.0
 
diff --git a/Spigot-Server-Patches/0069-Re-add-Spigot-s-hopper-check-feature.patch b/Spigot-Server-Patches/0069-Re-add-Spigot-s-hopper-check-feature.patch
index be6ad3fcf4..e2072e73d6 100644
--- a/Spigot-Server-Patches/0069-Re-add-Spigot-s-hopper-check-feature.patch
+++ b/Spigot-Server-Patches/0069-Re-add-Spigot-s-hopper-check-feature.patch
@@ -1,4 +1,4 @@
-From 0cf9e5edd72d42954cfe131d1aa6bc15b17f35fe Mon Sep 17 00:00:00 2001
+From 246f9b49c79068ca061b938ab2824c8bffa6eb7c Mon Sep 17 00:00:00 2001
 From: Byteflux <[email protected]>
 Date: Thu, 13 Aug 2015 10:33:34 -0700
 Subject: [PATCH] Re-add Spigot's hopper-check feature
@@ -21,10 +21,10 @@ index cab636a..760a076 100644
          } else {
              return false;
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-index 3f8bffc..7d46f2c 100644
+index 346e3f9..7eb3463 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-@@ -408,4 +408,10 @@ public class PaperSpigotWorldConfig
+@@ -376,4 +376,10 @@ public class PaperSpigotWorldConfig
      {
          tntExplosionVolume = getFloat( "tnt-explosion-volume", 4.0F );
      }
@@ -36,5 +36,5 @@ index 3f8bffc..7d46f2c 100644
 +    }
  }
 -- 
-2.5.2
+2.7.0
 
diff --git a/Spigot-Server-Patches/0077-Make-duplicate-entity-UUID-logging-toggleable.patch b/Spigot-Server-Patches/0077-Make-duplicate-entity-UUID-logging-toggleable.patch
index df809ff474..d0402c5189 100644
--- a/Spigot-Server-Patches/0077-Make-duplicate-entity-UUID-logging-toggleable.patch
+++ b/Spigot-Server-Patches/0077-Make-duplicate-entity-UUID-logging-toggleable.patch
@@ -1,4 +1,4 @@
-From 3a58d39da336a69bd6f3318aedaf60b1719b23a1 Mon Sep 17 00:00:00 2001
+From e66fdc98485e5aaf93ea9d9e5d223e35d137c48d Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Mon, 28 Dec 2015 20:06:25 -0600
 Subject: [PATCH] Make duplicate entity UUID logging toggleable
@@ -18,10 +18,10 @@ index 6186f6c..3ec58dc 100644
  
              if (this.g.contains(entity1)) {
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-index 7d46f2c..fbb83a1 100644
+index 7eb3463..add9680 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-@@ -414,4 +414,10 @@ public class PaperSpigotWorldConfig
+@@ -382,4 +382,10 @@ public class PaperSpigotWorldConfig
      {
          useHopperCheck = getBoolean( "use-hopper-check", false );
      }
@@ -33,5 +33,5 @@ index 7d46f2c..fbb83a1 100644
 +    }
  }
 -- 
-2.6.4
+2.7.0
 
diff --git a/Spigot-Server-Patches/0082-Disable-chest-cat-detection.patch b/Spigot-Server-Patches/0082-Disable-chest-cat-detection.patch
index cc2952fdd8..505db5b576 100644
--- a/Spigot-Server-Patches/0082-Disable-chest-cat-detection.patch
+++ b/Spigot-Server-Patches/0082-Disable-chest-cat-detection.patch
@@ -1,4 +1,4 @@
-From e4574617d97d2150d08ddd74aaf2ec0e72c3b5b1 Mon Sep 17 00:00:00 2001
+From 4e920f946fea67010570e36e28268358e174ab80 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sun, 10 Jan 2016 20:40:33 -0600
 Subject: [PATCH] Disable chest cat detection
@@ -21,10 +21,10 @@ index f725aea..eed516e 100644
  
          EntityOcelot entityocelot;
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-index 93ac338..5c2b47d 100644
+index add9680..f5a8d49 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-@@ -225,10 +225,12 @@ public class PaperSpigotWorldConfig
+@@ -193,10 +193,12 @@ public class PaperSpigotWorldConfig
  
      public boolean boatsDropBoats;
      public boolean disablePlayerCrits;
@@ -38,5 +38,5 @@ index 93ac338..5c2b47d 100644
  
      public boolean netherVoidTopDamage;
 -- 
-2.7.0.windows.1
+2.7.0