diff --git a/Spigot-Server-Patches/Configurable-mob-spawner-tick-rate.patch b/Spigot-Server-Patches/Configurable-mob-spawner-tick-rate.patch
index 4a442fcf7f..3e321b243a 100644
--- a/Spigot-Server-Patches/Configurable-mob-spawner-tick-rate.patch
+++ b/Spigot-Server-Patches/Configurable-mob-spawner-tick-rate.patch
@@ -50,7 +50,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                  }
  
 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 @@ -0,0 +0,0 @@ public class PaperSpigotWorldConfig
diff --git a/Spigot-Server-Patches/Configurable-speed-for-water-flowing-over-lava.patch b/Spigot-Server-Patches/Configurable-speed-for-water-flowing-over-lava.patch
index 66d97ed0ff..bec7710628 100644
--- a/Spigot-Server-Patches/Configurable-speed-for-water-flowing-over-lava.patch
+++ b/Spigot-Server-Patches/Configurable-speed-for-water-flowing-over-lava.patch
@@ -46,7 +46,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 @@ -0,0 +0,0 @@ public class PaperSpigotWorldConfig
-             log( "Falling Block Height Limit set to Y: " + fallingBlockHeightNerf );
+             log( "TNT Entity Height Limit set to Y: " + tntEntityHeightNerf );
          }
      }
 +
diff --git a/Spigot-Server-Patches/Disable-mood-sounds.patch b/Spigot-Server-Patches/Disable-mood-sounds.patch
index b6119630c3..22f2c7286d 100644
--- a/Spigot-Server-Patches/Disable-mood-sounds.patch
+++ b/Spigot-Server-Patches/Disable-mood-sounds.patch
@@ -18,7 +18,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              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 0000000000000000000000000000000000000000..00000000000000000000000000000000000000003 100644
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
 @@ -0,0 +0,0 @@ public class PaperSpigotWorldConfig
diff --git a/Spigot-Server-Patches/Drop-falling-block-and-tnt-entities-at-the-specified.patch b/Spigot-Server-Patches/Drop-falling-block-and-tnt-entities-at-the-specified.patch
new file mode 100644
index 0000000000..cb2b77e6f5
--- /dev/null
+++ b/Spigot-Server-Patches/Drop-falling-block-and-tnt-entities-at-the-specified.patch
@@ -0,0 +1,76 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Byteflux <byte@byteflux.net>
+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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
++++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
++++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
++++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
+@@ -0,0 +0,0 @@ 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 );
++        }
++    }
+ }
+--
\ No newline at end of file
diff --git a/Spigot-Server-Patches/Drop-falling-block-entities-that-are-above-the-speci.patch b/Spigot-Server-Patches/Drop-falling-block-entities-that-are-above-the-speci.patch
deleted file mode 100644
index 67bf87f927..0000000000
--- a/Spigot-Server-Patches/Drop-falling-block-entities-that-are-above-the-speci.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Byteflux <byte@byteflux.net>
-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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
-+++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-+++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-@@ -0,0 +0,0 @@ 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 );
-+        }
-+    }
- }
---
\ No newline at end of file
diff --git a/Spigot-Server-Patches/Remove-certain-entities-that-fly-through-unloaded-ch.patch b/Spigot-Server-Patches/Remove-certain-entities-that-fly-through-unloaded-ch.patch
index 1d9fc33e6e..a41d123b67 100644
--- a/Spigot-Server-Patches/Remove-certain-entities-that-fly-through-unloaded-ch.patch
+++ b/Spigot-Server-Patches/Remove-certain-entities-that-fly-through-unloaded-ch.patch
@@ -55,10 +55,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 @@ -0,0 +0,0 @@ public class EntityTNTPrimed extends Entity {
-         this.lastZ = this.locZ;
-         this.motY -= 0.03999999910593033D;
-         this.move(this.motX, this.motY, this.motZ);
-+
+         }
+         // PaperSpigot end
+ 
 +        // PaperSpigot start - Remove entities in unloaded chunks
 +        if (this.inUnloadedChunk && world.paperSpigotConfig.removeUnloadedTNTEntities) {
 +            this.die();