Allow configurable nether void height damage

Fixes GH-1804

Spigot-Server-Patches/0002-Paper-config-files.patch

@@ -318,8 +318,8 @@ index 000000000..5586575ce
 +        commands = new HashMap<String, Command>();
 +        commands.put("paper", new PaperCommand("paper"));
 +
-+        version = getInt("config-version", 17);
-+        set("config-version", 17);
++        version = getInt("config-version", 18);
++        set("config-version", 18);
 +        readConfig(PaperConfig.class, null);
 +    }
 +

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

@@ -1,26 +1,34 @@
-From 6df42e32054107780e490a3e22433d369da2de84 Mon Sep 17 00:00:00 2001
+From 49b42c949cd1c28bcf4fb9ff73e86810e4ed5d90 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 1ed58f4bba..39d565db1f 100644
+index 1ed58f4bb..6eddceb06 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -124,4 +124,10 @@ public class PaperWorldConfig {
+@@ -124,4 +124,18 @@ 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);
      }
 +
-+    public boolean netherVoidTopDamage;
-+    private void netherVoidTopDamage() {
-+        netherVoidTopDamage = getBoolean( "nether-ceiling-void-damage", false );
-+        log("Top of the nether void damage: " + netherVoidTopDamage);
++    public int netherVoidTopDamageHeight;
++    private void netherVoidTopDamageHeight() {
++        netherVoidTopDamageHeight = getInt("nether-ceiling-void-damage-height", 128);
++        log("Top of the nether void damage height: " + netherVoidTopDamageHeight);
++
++        if (PaperConfig.version < 18) {
++            boolean legacy = getBoolean("nether-ceiling-void-damage", false);
++            if (legacy) {
++                netherVoidTopDamageHeight = 128;
++                set("nether-ceiling-void-damage-height", netherVoidTopDamageHeight);
++            }
++        }
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 22f757756c..d3551ca681 100644
+index bff44d535..040ecb2c1 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -461,9 +461,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -34,7 +42,7 @@ index 22f757756c..d3551ca681 100644
              this.aa();
          }
 +        */
-+        this.checkAndDoHeightDamage();
++        this.performVoidDamage();
 +        // Paper end
  
          if (!this.world.isClientSide) {
@@ -44,9 +52,9 @@ index 22f757756c..d3551ca681 100644
      }
  
 +    // Paper start
-+    protected void checkAndDoHeightDamage() {
-+        if (this.locY < -64.0D || (this.world.paperConfig.netherVoidTopDamage && this.world.getWorld().getEnvironment() == org.bukkit.World.Environment.NETHER && this.locY >= 128.0D)) {
-+            this.kill();
++    protected void performVoidDamage() {
++        if (this.locY < -64.0D || (this.world.getWorld().getEnvironment() == org.bukkit.World.Environment.NETHER && this.locY >= world.paperConfig.netherVoidTopDamageHeight)) {
++            this.doVoidDamage();
 +        }
 +    }
 +    // Paper end
@@ -58,12 +66,12 @@ index 22f757756c..d3551ca681 100644
          this.fireTicks = 0;
      }
  
-+    protected final void kill() { this.aa(); } // Paper - OBFHELPER
++    protected final void doVoidDamage() { this.aa(); } // Paper - OBFHELPER
      protected void aa() {
          this.die();
      }
 diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
-index 9000d2d7b2..a8a64d054c 100644
+index 205251bcd..0f531e7d4 100644
 --- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 @@ -193,9 +193,15 @@ public abstract class EntityMinecartAbstract extends Entity implements INamableT
@@ -77,11 +85,11 @@ index 9000d2d7b2..a8a64d054c 100644
              this.aa();
          }
 +        */
-+        this.checkAndDoHeightDamage();
++        this.performVoidDamage();
 +        // Paper end
  
          int i;
  
 -- 
-2.20.1
+2.21.0
 

Spigot-Server-Patches/0028-Lighting-Queue.patch

@@ -1,4 +1,4 @@
-From 018b4f700c5e3dbd66fd8c0891a778a2152d481c Mon Sep 17 00:00:00 2001
+From 9176d0600774732f414a30b9b30dac85e40eb83e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 2 Mar 2016 00:52:31 -0600
 Subject: [PATCH] Lighting Queue
@@ -46,12 +46,12 @@ index 1256a0d58..2c97c6533 100644
          boolean timings = getBoolean("timings.enabled", true);
          boolean verboseTimings = getBoolean("timings.verbose", true);
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 39d565db1..8f6f0288b 100644
+index 6eddceb06..28b852b46 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -130,4 +130,12 @@ public class PaperWorldConfig {
-         netherVoidTopDamage = getBoolean( "nether-ceiling-void-damage", false );
-         log("Top of the nether void damage: " + netherVoidTopDamage);
+@@ -138,4 +138,12 @@ public class PaperWorldConfig {
+             }
+         }
      }
 +
 +    public boolean queueLightUpdates;
@@ -263,7 +263,7 @@ index 000000000..9783f3a0d
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 891f0bb35..c9ba98d89 100644
+index b10e4c409..f3755fcfb 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -329,7 +329,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -276,5 +276,5 @@ index 891f0bb35..c9ba98d89 100644
                  }
  
 -- 
-2.20.1
+2.21.0
 

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

@@ -1,14 +1,14 @@
-From 8389f574485f07e27a681ea473b5028947250219 Mon Sep 17 00:00:00 2001
+From e6867b527d0832f9eb00c8ce1ebee5af5061d9e8 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 8f6f0288b..5aee23dce 100644
+index 28b852b46..36e49616c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -138,4 +138,10 @@ public class PaperWorldConfig {
+@@ -146,4 +146,10 @@ public class PaperWorldConfig {
          log("Warning: This feature may help reduce TPS loss from light, but comes at the cost of buggy light data");
          log("We are working to improve this feature.");
      }
@@ -20,7 +20,7 @@ index 8f6f0288b..5aee23dce 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 5e60bdb40..301119d3e 100644
+index 0902c69f3..c4a55c6a1 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -58,7 +58,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -41,5 +41,5 @@ index 5e60bdb40..301119d3e 100644
                  this.cx = true;
              }
 -- 
-2.20.1
+2.21.0
 

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

@@ -1,4 +1,4 @@
-From d51c2d868e810811a350508026017fd96949c0b7 Mon Sep 17 00:00:00 2001
+From 07e0df3b6a6c5fdfa93103063d46cdbd75e332fb 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 5aee23dce..2ec3d9355 100644
+index 36e49616c..a65db0b06 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -144,4 +144,10 @@ public class PaperWorldConfig {
+@@ -152,4 +152,10 @@ public class PaperWorldConfig {
          disableEndCredits = getBoolean("game-mechanics.disable-end-credits", false);
          log("End credits disabled: " + disableEndCredits);
      }
@@ -136,7 +136,7 @@ index 00f1c36e9..f488c37f7 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index c9ba98d89..5788ec6f6 100644
+index f3755fcfb..20990cbfd 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -22,6 +22,7 @@ import org.apache.logging.log4j.Logger;
@@ -156,5 +156,5 @@ index c9ba98d89..5788ec6f6 100644
      public CraftWorld getWorld() {
          return this.world;
 -- 
-2.20.1
+2.21.0
 

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

@@ -1,14 +1,14 @@
-From 0d8064d1842895f71ea36b249c8723b1ca743209 Mon Sep 17 00:00:00 2001
+From b3bc616303f9056349c6fde2750423e31269408a 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 2ec3d93551..4679246662 100644
+index a65db0b06..75d8c35be 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -150,4 +150,9 @@ public class PaperWorldConfig {
+@@ -158,4 +158,9 @@ public class PaperWorldConfig {
          optimizeExplosions = getBoolean("optimize-explosions", false);
          log("Optimize explosions: " + optimizeExplosions);
      }
@@ -19,7 +19,7 @@ index 2ec3d93551..4679246662 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index ce79887cf4..961da5bf97 100644
+index b092b0fa2..c5cc0b471 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1006,6 +1006,7 @@ public abstract class EntityLiving extends Entity {
@@ -48,7 +48,7 @@ index ce79887cf4..961da5bf97 100644
                  if (!this.e(damagesource)) {
                      SoundEffect soundeffect = this.cs();
 diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
-index d0ba510023..8180b3ef38 100644
+index 3e44b2d54..5591ccb3b 100644
 --- a/src/main/java/net/minecraft/server/Explosion.java
 +++ b/src/main/java/net/minecraft/server/Explosion.java
 @@ -153,7 +153,7 @@ public class Explosion {
@@ -70,5 +70,5 @@ index d0ba510023..8180b3ef38 100644
                              }
                          }
 -- 
-2.19.0
+2.21.0
 

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

@@ -1,14 +1,14 @@
-From 252e5a6798a4f1635081f343bb1d95bf4fb4d2fb Mon Sep 17 00:00:00 2001
+From 65f4b512b23c376d4cea51508f5d096041028ddb 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 467924666..13253f6e9 100644
+index 75d8c35be..7010102eb 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -155,4 +155,9 @@ public class PaperWorldConfig {
+@@ -163,4 +163,9 @@ public class PaperWorldConfig {
      private void disableExplosionKnockback(){
          disableExplosionKnockback = getBoolean("disable-explosion-knockback", false);
      }
@@ -19,7 +19,7 @@ index 467924666..13253f6e9 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 60939cc33..54c1b484a 100644
+index 5a7087c75..716c3ddb8 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -474,7 +474,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -32,5 +32,5 @@ index 60939cc33..54c1b484a 100644
                      l = this.m >> 2;
                      blockposition = this.a(new BlockPosition(j + (l & 15), 0, k + (l >> 8 & 15)));
 -- 
-2.20.1
+2.21.0
 

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

@@ -1,14 +1,14 @@
-From 3e950e16bbbff96b09fb37f9fbffbed216f61a68 Mon Sep 17 00:00:00 2001
+From bd37e8da13d6647b94ad07f9b585f0c63e8c01aa 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 13253f6e9..cde9c11f4 100644
+index 7010102eb..65c5cfd3a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -160,4 +160,9 @@ public class PaperWorldConfig {
+@@ -168,4 +168,9 @@ public class PaperWorldConfig {
      private void disableThunder() {
          disableThunder = getBoolean("disable-thunder", false);
      }
@@ -19,7 +19,7 @@ index 13253f6e9..cde9c11f4 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 54c1b484a..7bece8558 100644
+index 716c3ddb8..ed6f3afcf 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -496,7 +496,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -32,5 +32,5 @@ index 54c1b484a..7bece8558 100644
                      l = this.m >> 2;
                      blockposition = this.getHighestBlockYAt(HeightMap.Type.MOTION_BLOCKING, new BlockPosition(j + (l & 15), 0, k + (l >> 8 & 15)));
 -- 
-2.20.1
+2.21.0
 

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

@@ -1,14 +1,14 @@
-From 5084976937dafe4c17533cb903f03ebd209b510e Mon Sep 17 00:00:00 2001
+From d74aa86834e98f074ccff5dbeb29fcbd1b2871b7 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 cde9c11f4d..40766d81c7 100644
+index 65c5cfd3a..92abe7f7e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -165,4 +165,9 @@ public class PaperWorldConfig {
+@@ -173,4 +173,9 @@ public class PaperWorldConfig {
      private void disableIceAndSnow(){
          disableIceAndSnow = getBoolean("disable-ice-and-snow", false);
      }
@@ -19,7 +19,7 @@ index cde9c11f4d..40766d81c7 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index b091c89fb1..02ec6b10f5 100644
+index cc0371b4a..ce43b4bc5 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -22,6 +22,7 @@ public abstract class MobSpawnerAbstract {
@@ -64,5 +64,5 @@ index b091c89fb1..02ec6b10f5 100644
                  }
  
 -- 
-2.19.0
+2.21.0
 

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

@@ -1,14 +1,14 @@
-From 2a9f268a740cdb30e6fd16398f90305080411e21 Mon Sep 17 00:00:00 2001
+From f1f33913c393a123fdb82cf71b44d56408c43bb1 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 40766d81c..71af3fcfe 100644
+index 92abe7f7e..ae2f73aa2 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -170,4 +170,9 @@ public class PaperWorldConfig {
+@@ -178,4 +178,9 @@ public class PaperWorldConfig {
      private void mobSpawnerTickRate() {
          mobSpawnerTickRate = getInt("mob-spawner-tick-rate", 1);
      }
@@ -19,7 +19,7 @@ index 40766d81c..71af3fcfe 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 301119d3e..98a8ce962 100644
+index c4a55c6a1..2665faa6c 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -68,6 +68,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -45,5 +45,5 @@ index 301119d3e..98a8ce962 100644
              this.closeInventory();
              this.activeContainer = this.defaultContainer;
 -- 
-2.20.1
+2.21.0
 

Spigot-Server-Patches/0043-Configurable-Disabling-Cat-Chest-Detection.patch

@@ -1,4 +1,4 @@
-From 6397a37ddacf30f6245a460f231d38e336d8773d Mon Sep 17 00:00:00 2001
+From ab040271bb86e9e0038f4d57874a6312f859ad1f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 01:13:45 -0600
 Subject: [PATCH] Configurable Disabling Cat Chest Detection
@@ -6,10 +6,10 @@ Subject: [PATCH] Configurable Disabling Cat Chest Detection
 Offers a gameplay feature to stop cats from blocking chests
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 71af3fcfe..e28d5b19a 100644
+index ae2f73aa2..e5ee61378 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -175,4 +175,9 @@ public class PaperWorldConfig {
+@@ -183,4 +183,9 @@ public class PaperWorldConfig {
      private void containerUpdateTickRate() {
          containerUpdateTickRate = getInt("container-update-tick-rate", 1);
      }
@@ -36,5 +36,5 @@ index 5e1a3df2b..e94786138 100644
  
          if (!list.isEmpty()) {
 -- 
-2.20.1
+2.21.0
 

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

@@ -1,14 +1,14 @@
-From 0736eba49760e3435f6dd1b7c0add91d5324a0e6 Mon Sep 17 00:00:00 2001
+From 3d2a3723f7c468c1892681d8de31b54d7e3a08e0 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 e28d5b19a..3528b674f 100644
+index e5ee61378..f5cb4b420 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -180,4 +180,9 @@ public class PaperWorldConfig {
+@@ -188,4 +188,9 @@ public class PaperWorldConfig {
      private void disableChestCatDetection() {
          disableChestCatDetection = getBoolean("game-mechanics.disable-chest-cat-detection", false);
      }
@@ -32,5 +32,5 @@ index aa23cdff1..f92bf02b8 100644
                  if (this.random.nextInt(10) == 0 && flag1 && this.locY < 40.0D) {
                      return super.a(generatoraccess, flag);
 -- 
-2.19.2
+2.21.0
 

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

@@ -1,14 +1,14 @@
-From ee19b52c8f80ea7fb920ff6736e719a610659b9d Mon Sep 17 00:00:00 2001
+From ebaf3a76307fdfa3cd578975fea4c4ceea824cde 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 3528b674fc..9db394d4ff 100644
+index f5cb4b420..59a58dc79 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -185,4 +185,9 @@ public class PaperWorldConfig {
+@@ -193,4 +193,9 @@ public class PaperWorldConfig {
      private void allChunksAreSlimeChunks() {
          allChunksAreSlimeChunks = getBoolean("all-chunks-are-slime-chunks", false);
      }
@@ -19,7 +19,7 @@ index 3528b674fc..9db394d4ff 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PortalTravelAgent.java b/src/main/java/net/minecraft/server/PortalTravelAgent.java
-index 73d5b4d625..5e899e05cf 100644
+index b911d830a..aca407142 100644
 --- a/src/main/java/net/minecraft/server/PortalTravelAgent.java
 +++ b/src/main/java/net/minecraft/server/PortalTravelAgent.java
 @@ -13,7 +13,7 @@ import org.bukkit.util.Vector;
@@ -41,7 +41,7 @@ index 73d5b4d625..5e899e05cf 100644
              return false;
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftTravelAgent.java b/src/main/java/org/bukkit/craftbukkit/CraftTravelAgent.java
-index d4639c8221..e1eb3aa0f3 100644
+index d4639c822..e1eb3aa0f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftTravelAgent.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftTravelAgent.java
 @@ -12,7 +12,7 @@ public class CraftTravelAgent extends PortalTravelAgent implements TravelAgent {
@@ -54,5 +54,5 @@ index d4639c8221..e1eb3aa0f3 100644
      private boolean canCreatePortal = true;
  
 -- 
-2.19.0
+2.21.0
 

Spigot-Server-Patches/0055-Configurable-inter-world-teleportation-safety.patch

@@ -1,4 +1,4 @@
-From 787f106b9e19dbff7d5063e7b864b9915d6f4c30 Mon Sep 17 00:00:00 2001
+From ac9279f204c594830e8f85715fcb866d5dcca814 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Thu, 3 Mar 2016 02:50:31 -0600
 Subject: [PATCH] Configurable inter-world teleportation safety
@@ -16,10 +16,10 @@ The wanted destination was on top of the emerald block however the player ended
 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 9db394d4f..50837d767 100644
+index 59a58dc79..3966d2c9c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -190,4 +190,9 @@ public class PaperWorldConfig {
+@@ -198,4 +198,9 @@ public class PaperWorldConfig {
      private void portalSearchRadius() {
          portalSearchRadius = getInt("portal-search-radius", 128);
      }

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

@@ -1,4 +1,4 @@
-From 78be8d9e61b91006a198ff15b2269c69ef2348cb Mon Sep 17 00:00:00 2001
+From 848925762955d0e0a15e644ef5d4d4e58596acd7 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 50837d767f..898068a817 100644
+index 3966d2c9c..932cae2f9 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -195,4 +195,9 @@ public class PaperWorldConfig {
+@@ -203,4 +203,9 @@ public class PaperWorldConfig {
      private void disableTeleportationSuffocationCheck() {
          disableTeleportationSuffocationCheck = getBoolean("disable-teleportation-suffocation-check", false);
      }
@@ -25,7 +25,7 @@ index 50837d767f..898068a817 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index d3551ca681..8676debb50 100644
+index 040ecb2c1..24e0fc3c5 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2261,6 +2261,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -37,7 +37,7 @@ index d3551ca681..8676debb50 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 25982848ae..8b88050172 100644
+index c5cc0b471..0ba15fce6 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -538,6 +538,7 @@ public abstract class EntityLiving extends Entity {
@@ -49,5 +49,5 @@ index 25982848ae..8b88050172 100644
  
              if (!flag) {
 -- 
-2.20.1
+2.21.0
 

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

@@ -1,4 +1,4 @@
-From dffcbee647e4d7391d244401c9df2ff96d1a2e1c Mon Sep 17 00:00:00 2001
+From 3b5748f2fb9a7a1562bb861705fb5636b010e783 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 898068a817..c2845266e2 100644
+index 932cae2f9..a9739bcb4 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -200,4 +200,9 @@ public class PaperWorldConfig {
+@@ -208,4 +208,9 @@ public class PaperWorldConfig {
      private void nonPlayerEntitiesOnScoreboards() {
          nonPlayerEntitiesOnScoreboards = getBoolean("allow-non-player-entities-on-scoreboards", false);
      }
@@ -20,7 +20,7 @@ index 898068a817..c2845266e2 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
-index 4d4880aa2a..1699ccee50 100644
+index fc89cc89a..953277631 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
 @@ -113,7 +113,7 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven
@@ -33,5 +33,5 @@ index 4d4880aa2a..1699ccee50 100644
  
      protected void u(float f) {
 -- 
-2.19.0
+2.21.0
 

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

@@ -1,4 +1,4 @@
-From 03c8edd8f0cb69915eb88fa5ec7485b90ea01d5e Mon Sep 17 00:00:00 2001
+From c3270fd2c5b1010fe2857dea35a4030c4f414baf Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 15:12:22 -0400
 Subject: [PATCH] Configurable Non Player Arrow Despawn Rate
@@ -6,10 +6,10 @@ Subject: [PATCH] Configurable Non Player Arrow Despawn Rate
 Can set a much shorter despawn rate for arrows that players can not pick up.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index c2845266e2..795545245a 100644
+index a9739bcb4..f248983a9 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -205,4 +205,19 @@ public class PaperWorldConfig {
+@@ -213,4 +213,19 @@ public class PaperWorldConfig {
      private void allowLeashingUndeadHorse() {
          allowLeashingUndeadHorse = getBoolean("allow-leashing-undead-horse", false);
      }
@@ -30,7 +30,7 @@ index c2845266e2..795545245a 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
-index e8ce99eb96..feafb82dd3 100644
+index e8ce99eb9..feafb82dd 100644
 --- a/src/main/java/net/minecraft/server/EntityArrow.java
 +++ b/src/main/java/net/minecraft/server/EntityArrow.java
 @@ -261,7 +261,7 @@ public abstract class EntityArrow extends Entity implements IProjectile {
@@ -43,5 +43,5 @@ index e8ce99eb96..feafb82dd3 100644
          }
  
 -- 
-2.20.1
+2.21.0
 

Spigot-Server-Patches/0079-Configurable-spawn-chances-for-skeleton-horses.patch

@@ -1,14 +1,14 @@
-From 3ab0f8039f163674f602340e00fdef8f34bfdbab Mon Sep 17 00:00:00 2001
+From d242e85eac2dc3db23322ecbcf0986880268570f Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 22 Mar 2016 12:04:28 -0500
 Subject: [PATCH] Configurable spawn chances for skeleton horses
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 795545245..0faef7cf2 100644
+index f248983a9..e41502da2 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -220,4 +220,12 @@ public class PaperWorldConfig {
+@@ -228,4 +228,12 @@ public class PaperWorldConfig {
          log("Non Player Arrow Despawn Rate: " + nonPlayerArrowDespawnRate);
          log("Creative Arrow Despawn Rate: " + creativeArrowDespawnRate);
      }
@@ -22,7 +22,7 @@ index 795545245..0faef7cf2 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 7bece8558..4a8cc0ff1 100644
+index ed6f3afcf..aaeb888a8 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -480,7 +480,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -35,5 +35,5 @@ index 7bece8558..4a8cc0ff1 100644
                          if (flag2) {
                              EntityHorseSkeleton entityhorseskeleton = new EntityHorseSkeleton(this);
 -- 
-2.20.1
+2.21.0
 

Spigot-Server-Patches/0084-Configurable-Chunk-Inhabited-Time.patch

@@ -1,4 +1,4 @@
-From 1d5190a00dcb30b662df5214303fc3ed91ef1600 Mon Sep 17 00:00:00 2001
+From b27903c8e28cfe0ddfad2374bb47fa43d2fe30c4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 20:46:14 -0400
 Subject: [PATCH] Configurable Chunk Inhabited Time
@@ -11,10 +11,10 @@ For people who want all chunks to be treated equally, you can chose a fixed valu
 This allows to fine-tune vanilla gameplay.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 0faef7cf28..d2559f7c48 100644
+index e41502da2..ec76f7b80 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -228,4 +228,19 @@ public class PaperWorldConfig {
+@@ -236,4 +236,19 @@ public class PaperWorldConfig {
              skeleHorseSpawnChance = 0.01D; // Vanilla value
          }
      }
@@ -35,7 +35,7 @@ index 0faef7cf28..d2559f7c48 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 182a637add..0421f8f959 100644
+index 182a637ad..0421f8f95 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -1289,7 +1289,7 @@ public class Chunk implements IChunkAccess {
@@ -48,5 +48,5 @@ index 182a637add..0421f8f959 100644
  
      public void b(long i) {
 -- 
-2.20.1
+2.21.0
 

Spigot-Server-Patches/0093-Configurable-Grass-Spread-Tick-Rate.patch

@@ -1,14 +1,14 @@
-From 272d84b1e4ba0f99f9573a7ab3c8123f8d3ab2bb Mon Sep 17 00:00:00 2001
+From 2a1104785a4c3ccb13bb94cfe0c0985ce40c9b87 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 3 Apr 2016 16:28:17 -0400
 Subject: [PATCH] Configurable Grass Spread Tick Rate
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index d2559f7c4..058cd8cc8 100644
+index ec76f7b80..d190e5228 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -243,4 +243,10 @@ public class PaperWorldConfig {
+@@ -251,4 +251,10 @@ public class PaperWorldConfig {
          }
          fixedInhabitedTime = getInt("fixed-chunk-inhabited-time", -1);
      }
@@ -32,5 +32,5 @@ index da6182deb..f1174825c 100644
              if (!a((IWorldReader) world, blockposition)) {
                  // CraftBukkit start
 -- 
-2.20.0
+2.21.0
 

Spigot-Server-Patches/0094-Configurable-Keep-Spawn-Loaded-range-per-world.patch

@@ -1,4 +1,4 @@
-From 102ffd1fa2fb10d7aaeb220c7c71bd3b0c3b4c10 Mon Sep 17 00:00:00 2001
+From cd9e9e53a805dc38a57d7f7dfcb939e2edc2f8b9 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 13 Sep 2014 23:14:43 -0400
 Subject: [PATCH] Configurable Keep Spawn Loaded range per world
@@ -6,10 +6,10 @@ Subject: [PATCH] Configurable Keep Spawn Loaded range per world
 This lets you disable it for some worlds and lower it for others.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 058cd8cc8..276dd98fd 100644
+index d190e5228..cd8ee8df8 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -249,4 +249,10 @@ public class PaperWorldConfig {
+@@ -257,4 +257,10 @@ public class PaperWorldConfig {
          grassUpdateRate = Math.max(0, getInt("grass-spread-tick-rate", grassUpdateRate));
          log("Grass Spread Tick Rate: " + grassUpdateRate);
      }
@@ -21,7 +21,7 @@ index 058cd8cc8..276dd98fd 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index f488c37f7..e53e25626 100644
+index ee45d3705..01c5d3c57 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -486,13 +486,21 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -63,7 +63,7 @@ index f488c37f7..e53e25626 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index f4b5e3ba4..2ed87dd9c 100644
+index 2e8485859..d77992640 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -2852,8 +2852,9 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -78,7 +78,7 @@ index f4b5e3ba4..2ed87dd9c 100644
  
      public LongSet ag() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8f31492cb..b64f3594a 100644
+index 533dcd60d..e107ddcf7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1006,7 +1006,7 @@ public final class CraftServer implements Server {
@@ -91,7 +91,7 @@ index 8f31492cb..b64f3594a 100644
              for (int j = -short1; j <= short1; j += 16) {
                  for (int k = -short1; k <= short1; k += 16) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index f118d382c..274e8626d 100644
+index 262c3f910..a8c7e7931 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1419,8 +1419,9 @@ public class CraftWorld implements World {
@@ -107,5 +107,5 @@ index f118d382c..274e8626d 100644
                      loadChunk(chunkCoordX + x, chunkCoordZ + z);
                  } else {
 -- 
-2.20.1
+2.21.0
 

Spigot-Server-Patches/0098-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch

@@ -1,4 +1,4 @@
-From fc795917307bbed324521bca9996db6dcbfc7976 Mon Sep 17 00:00:00 2001
+From 9563128427dbd5b90e4e42fe14d63228bfc5736d Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 6 Apr 2016 01:04:23 -0500
 Subject: [PATCH] Option to use vanilla per-world scoreboard coloring on names
@@ -12,10 +12,10 @@ for this on CB at one point but I can't find it. We may need to do this
 ourselves at some point in the future.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 276dd98fd..973ea8bca 100644
+index cd8ee8df8..071c7d062 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -255,4 +255,9 @@ public class PaperWorldConfig {
+@@ -263,4 +263,9 @@ public class PaperWorldConfig {
          keepLoadedRange = (short) (getInt("keep-spawn-loaded-range", Math.min(spigotConfig.viewDistance, 8)) * 16);
          log( "Keep Spawn Loaded Range: " + (keepLoadedRange/16));
      }

Spigot-Server-Patches/0108-Add-ability-to-configure-frosted_ice-properties.patch

@@ -1,14 +1,14 @@
-From 8555700222db1b2ae1797468e723cecf28b80d3a Mon Sep 17 00:00:00 2001
+From 3a8c3fdcb86526df441d14e78ba2889b194f64e5 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 21 Apr 2016 23:51:55 -0700
 Subject: [PATCH] Add ability to configure frosted_ice properties
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 973ea8bca..7c7d5595a 100644
+index 071c7d062..f1c8f1ead 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -260,4 +260,14 @@ public class PaperWorldConfig {
+@@ -268,4 +268,14 @@ public class PaperWorldConfig {
      private void useVanillaScoreboardColoring() {
          useVanillaScoreboardColoring = getBoolean("use-vanilla-world-scoreboard-name-coloring", false);
      }

Spigot-Server-Patches/0111-LootTable-API-Replenishable-Lootables-Feature.patch

@@ -1,4 +1,4 @@
-From 2a9433a35edc1cc2055964bccbdc0614cc44713d Mon Sep 17 00:00:00 2001
+From 8b08f2e1799a2e91fdb2b4028353d1ed8bd3eb69 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 1 May 2016 21:19:14 -0400
 Subject: [PATCH] LootTable API & Replenishable Lootables Feature
@@ -11,10 +11,10 @@ This feature is good for long term worlds so that newer players
 do not suffer with "Every chest has been looted"
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 7c7d5595af..00f0451ef8 100644
+index f1c8f1ead..fa9c733a3 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -270,4 +270,26 @@ public class PaperWorldConfig {
+@@ -278,4 +278,26 @@ public class PaperWorldConfig {
          this.frostedIceDelayMax = this.getInt("frosted-ice.delay.max", this.frostedIceDelayMax);
          log("Frosted Ice: " + (this.frostedIceEnabled ? "enabled" : "disabled") + " / delay: min=" + this.frostedIceDelayMin + ", max=" + this.frostedIceDelayMax);
      }
@@ -43,7 +43,7 @@ index 7c7d5595af..00f0451ef8 100644
  }
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperLootableBlockInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableBlockInventory.java
 new file mode 100644
-index 0000000000..d6fce3112e
+index 000000000..d6fce3112
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableBlockInventory.java
 @@ -0,0 +1,33 @@
@@ -82,7 +82,7 @@ index 0000000000..d6fce3112e
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperLootableEntityInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableEntityInventory.java
 new file mode 100644
-index 0000000000..5e637782d5
+index 000000000..5e637782d
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableEntityInventory.java
 @@ -0,0 +1,28 @@
@@ -116,7 +116,7 @@ index 0000000000..5e637782d5
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventory.java
 new file mode 100644
-index 0000000000..856843fc91
+index 000000000..856843fc9
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventory.java
 @@ -0,0 +1,71 @@
@@ -193,7 +193,7 @@ index 0000000000..856843fc91
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java
 new file mode 100644
-index 0000000000..b5401eaf97
+index 000000000..b5401eaf9
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java
 @@ -0,0 +1,179 @@
@@ -378,7 +378,7 @@ index 0000000000..b5401eaf97
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperMinecartLootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperMinecartLootableInventory.java
 new file mode 100644
-index 0000000000..f9fbc221bd
+index 000000000..f9fbc221b
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperMinecartLootableInventory.java
 @@ -0,0 +1,64 @@
@@ -448,7 +448,7 @@ index 0000000000..f9fbc221bd
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java
 new file mode 100644
-index 0000000000..d50410532c
+index 000000000..d50410532
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java
 @@ -0,0 +1,67 @@
@@ -520,7 +520,7 @@ index 0000000000..d50410532c
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index e87b6b8c1a..8f86209925 100644
+index 00f2b2a63..b771644d5 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -67,6 +67,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -532,7 +532,7 @@ index e87b6b8c1a..8f86209925 100644
  
      public CraftEntity getBukkitEntity() {
 diff --git a/src/main/java/net/minecraft/server/EntityMinecartContainer.java b/src/main/java/net/minecraft/server/EntityMinecartContainer.java
-index 520cca48cc..e228fc8538 100644
+index 520cca48c..e228fc853 100644
 --- a/src/main/java/net/minecraft/server/EntityMinecartContainer.java
 +++ b/src/main/java/net/minecraft/server/EntityMinecartContainer.java
 @@ -15,10 +15,11 @@ public abstract class EntityMinecartContainer extends EntityMinecartAbstract imp
@@ -591,7 +591,7 @@ index 520cca48cc..e228fc8538 100644
  
              if (this.lootTableSeed == 0L) {
 diff --git a/src/main/java/net/minecraft/server/TileEntityLootable.java b/src/main/java/net/minecraft/server/TileEntityLootable.java
-index 961d9a5f99..60f0b5046a 100644
+index 961d9a5f9..60f0b5046 100644
 --- a/src/main/java/net/minecraft/server/TileEntityLootable.java
 +++ b/src/main/java/net/minecraft/server/TileEntityLootable.java
 @@ -5,9 +5,10 @@ import javax.annotation.Nullable;
@@ -647,7 +647,7 @@ index 961d9a5f99..60f0b5046a 100644
  
              if (this.h == 0L) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
-index 8617fac6b0..4f4121adca 100644
+index 8617fac6b..4f4121adc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 @@ -61,7 +61,7 @@ public class CraftBlockEntityState<T extends TileEntity> extends CraftBlockState
@@ -660,7 +660,7 @@ index 8617fac6b0..4f4121adca 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java b/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
-index fa03d17a4c..14b5be75f3 100644
+index fa03d17a4..14b5be75f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
 @@ -13,8 +13,9 @@ import org.bukkit.craftbukkit.CraftWorld;
@@ -675,7 +675,7 @@ index fa03d17a4c..14b5be75f3 100644
      public CraftChest(final Block block) {
          super(block, TileEntityChest.class);
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java b/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java
-index 7ef68bb626..daf183fb10 100644
+index 7ef68bb62..daf183fb1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java
 @@ -1,5 +1,6 @@
@@ -704,7 +704,7 @@ index 7ef68bb626..daf183fb10 100644
          getSnapshot().setLootTable(key, seed);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java
-index 1b5b266c05..e0b99207b2 100644
+index 1b5b266c0..e0b99207b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java
 @@ -1,5 +1,6 @@
@@ -724,7 +724,7 @@ index 1b5b266c05..e0b99207b2 100644
  
      public CraftMinecartChest(CraftServer server, EntityMinecartChest entity) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartContainer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartContainer.java
-index 87303ecd13..6790fa2fee 100644
+index 87303ecd1..6790fa2fe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartContainer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartContainer.java
 @@ -47,7 +47,7 @@ public abstract class CraftMinecartContainer extends CraftMinecart implements Lo
@@ -737,7 +737,7 @@ index 87303ecd13..6790fa2fee 100644
          getHandle().a(newKey, seed);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java
-index f29365c948..1937f7b9a2 100644
+index f29365c94..1937f7b9a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java
 @@ -1,5 +1,6 @@
@@ -757,5 +757,5 @@ index f29365c948..1937f7b9a2 100644
  
      public CraftMinecartHopper(CraftServer server, EntityMinecartHopper entity) {
 -- 
-2.20.1
+2.21.0
 

Spigot-Server-Patches/0118-Optional-TNT-doesn-t-move-in-water.patch

@@ -1,11 +1,11 @@
-From c8e70c5455757ea8fbfa886cf6e184e02b461517 Mon Sep 17 00:00:00 2001
+From dd6bf1ec82b0224859c167344b62dc986e209251 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 22 May 2016 20:20:55 -0500
 Subject: [PATCH] Optional TNT doesn't move in water
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 00f0451ef..42d951554 100644
+index fa9c733a3..ff69f3927 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -2,7 +2,6 @@ package com.destroystokyo.paper;
@@ -16,7 +16,7 @@ index 00f0451ef..42d951554 100644
  import org.bukkit.configuration.file.YamlConfiguration;
  import org.spigotmc.SpigotWorldConfig;
  
-@@ -292,4 +291,14 @@ public class PaperWorldConfig {
+@@ -300,4 +299,14 @@ public class PaperWorldConfig {
              );
          }
      }
@@ -32,7 +32,7 @@ index 00f0451ef..42d951554 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index d004f7e62..a2e795bc2 100644
+index 182f6903d..828d61e6e 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1187,6 +1187,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

Spigot-Server-Patches/0123-Delay-Chunk-Unloads-based-on-Player-Movement.patch

@@ -1,4 +1,4 @@
-From 09fc8909e5eff839302c3e21bd901bbb4f5d4641 Mon Sep 17 00:00:00 2001
+From d42ea19198de063d55931d90612c1c322922a5b2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 18 Jun 2016 23:22:12 -0400
 Subject: [PATCH] Delay Chunk Unloads based on Player Movement
@@ -20,10 +20,10 @@ This also makes the Chunk GC System useless, by auto scheduling unload as soon a
 a spare chunk is added to the server thats outside of view distance.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 42d951554..d8f258105 100644
+index ff69f3927..914b9410c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -301,4 +301,18 @@ public class PaperWorldConfig {
+@@ -309,4 +309,18 @@ public class PaperWorldConfig {
          preventTntFromMovingInWater = getBoolean("prevent-tnt-from-moving-in-water", false);
          log("Prevent TNT from moving in water: " + preventTntFromMovingInWater);
      }
@@ -172,7 +172,7 @@ index 206457650..ab4f3b722 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 744cb9b0b..06991baca 100644
+index b287dbd91..3d3ea5152 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1292,7 +1292,13 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -191,7 +191,7 @@ index 744cb9b0b..06991baca 100644
                          this.methodProfiler.a(() -> {
                              return String.valueOf(TileEntityTypes.a(tileentity.C()));
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 274e8626d..cecdc5388 100644
+index a8c7e7931..f7883e708 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1772,7 +1772,7 @@ public class CraftWorld implements World {
@@ -220,5 +220,5 @@ index d08ef3fe1..081789a8f 100644
      }
  }
 -- 
-2.20.1
+2.21.0
 

Spigot-Server-Patches/0135-Auto-Save-Improvements.patch

@@ -1,4 +1,4 @@
-From 245ce5906974836db86776d813d9f2828e31a085 Mon Sep 17 00:00:00 2001
+From e34aa064d327e08c4e2f4eacc0ec281f3f3d0da3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 19 Sep 2016 23:16:39 -0400
 Subject: [PATCH] Auto Save Improvements
@@ -12,7 +12,7 @@ Re-introduce a cap per tick for auto save (Spigot disabled the vanilla cap) and
 Adds incremental player auto saving too
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 4e07ab0fef..a4853e04be 100644
+index 4e07ab0fe..a4853e04b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -269,4 +269,15 @@ public class PaperConfig {
@@ -32,7 +32,7 @@ index 4e07ab0fef..a4853e04be 100644
 +    }
  }
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index d8f2581058..47bfb5b626 100644
+index 914b9410c..cf3f6cb65 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -2,6 +2,7 @@ package com.destroystokyo.paper;
@@ -43,7 +43,7 @@ index d8f2581058..47bfb5b626 100644
  import org.bukkit.configuration.file.YamlConfiguration;
  import org.spigotmc.SpigotWorldConfig;
  
-@@ -315,4 +316,19 @@ public class PaperWorldConfig {
+@@ -323,4 +324,19 @@ public class PaperWorldConfig {
      private void skipEntityTickingInChunksScheduledForUnload() {
          skipEntityTickingInChunksScheduledForUnload = getBoolean("skip-entity-ticking-in-chunks-scheduled-for-unload", skipEntityTickingInChunksScheduledForUnload);
      }
@@ -64,7 +64,7 @@ index d8f2581058..47bfb5b626 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index ddccdc9390..0d70ce797f 100644
+index ddccdc939..0d70ce797 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -53,9 +53,9 @@ public class Chunk implements IChunkAccess {
@@ -96,7 +96,7 @@ index ddccdc9390..0d70ce797f 100644
  
      public boolean isEmpty() {
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index d0bf0f72da..fbc69b5ba5 100644
+index d0bf0f72d..fbc69b5ba 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -243,7 +243,7 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -109,7 +109,7 @@ index d0bf0f72da..fbc69b5ba5 100644
                      }
                  }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 3ea9dd740d..77b90f62c3 100644
+index 621e79bc5..260fa3e67 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -34,6 +34,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -121,7 +121,7 @@ index 3ea9dd740d..77b90f62c3 100644
      public final MinecraftServer server;
      public final PlayerInteractManager playerInteractManager;
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 7ffb061414..6283c774d6 100644
+index 7ffb06141..6283c774d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -143,6 +143,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -168,7 +168,7 @@ index 7ffb061414..6283c774d6 100644
          this.methodProfiler.enter("snooper");
          if (getSnooperEnabled() && !this.snooper.d() && this.ticks > 100) { // Spigot
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 79641a73a8..fe6649224a 100644
+index 79641a73a..fe6649224 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -341,6 +341,7 @@ public abstract class PlayerList {
@@ -207,7 +207,7 @@ index 79641a73a8..fe6649224a 100644
      public WhiteList getWhitelist() {
          return this.whitelist;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 639068d2dc..49c5b0b5cc 100644
+index 639068d2d..49c5b0b5c 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -855,8 +855,9 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -230,5 +230,5 @@ index 639068d2dc..49c5b0b5cc 100644
              timings.worldSaveChunks.startTiming(); // Paper
              chunkproviderserver.a(flag);
 -- 
-2.20.1
+2.21.0
 

Spigot-Server-Patches/0140-Option-to-remove-corrupt-tile-entities.patch

@@ -1,14 +1,14 @@
-From 984982d70b5d3b3fdb0b5c930d8d4a24b09628e9 Mon Sep 17 00:00:00 2001
+From 6a9a7fe58a449fbd511ebdfa7cf1dfaba32440ee Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 5 Oct 2016 16:27:36 -0500
 Subject: [PATCH] Option to remove corrupt tile entities
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 47bfb5b62..e8417cb2e 100644
+index cf3f6cb65..7711431db 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -331,4 +331,9 @@ public class PaperWorldConfig {
+@@ -339,4 +339,9 @@ public class PaperWorldConfig {
      private void maxAutoSaveChunksPerTick() {
          maxAutoSaveChunksPerTick = getInt("max-auto-save-chunks-per-tick", 24);
      }
@@ -44,5 +44,5 @@ index 0d70ce797..6150b56e0 100644
          if (this.i) {
              TileEntity tileentity = (TileEntity) this.tileEntities.remove(blockposition);
 -- 
-2.20.1
+2.21.0
 

Spigot-Server-Patches/0143-Prevent-Auto-Save-if-Save-Queue-is-full.patch

@@ -1,4 +1,4 @@
-From 0bf2e8f130c7966e8d6ebf91cebee3a747aed8cd Mon Sep 17 00:00:00 2001
+From 099d0cd62bcfc918434472e15bcc545dd8d35e0c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Nov 2016 21:52:22 -0400
 Subject: [PATCH] Prevent Auto Save if Save Queue is full
@@ -7,10 +7,10 @@ If the save queue already has 50 (configurable) of chunks pending,
 then avoid processing auto save (which would add more)
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index e8417cb2e..de59f4ce0 100644
+index 7711431db..83a284505 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -332,6 +332,11 @@ public class PaperWorldConfig {
+@@ -340,6 +340,11 @@ public class PaperWorldConfig {
          maxAutoSaveChunksPerTick = getInt("max-auto-save-chunks-per-tick", 24);
      }
  
@@ -54,5 +54,5 @@ index a144118f6..adfb5d056 100644
      @Nullable
      public Chunk a(GeneratorAccess generatoraccess, int i, int j, Consumer<Chunk> consumer) throws IOException {
 -- 
-2.20.1
+2.21.0
 

Spigot-Server-Patches/0145-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch

@@ -1,11 +1,11 @@
-From 5fec8498aa012572f774ed58f9c7f97f488bb23e Mon Sep 17 00:00:00 2001
+From 5006c24c2036139dc05c789ba184dc83722cbd2e Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 12 Nov 2016 23:25:22 -0600
 Subject: [PATCH] Filter bad data from ArmorStand and SpawnEgg items
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index de59f4ce0..03b7410f5 100644
+index 83a284505..1593f2e2f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -3,6 +3,7 @@ package com.destroystokyo.paper;
@@ -16,7 +16,7 @@ index de59f4ce0..03b7410f5 100644
  import org.bukkit.configuration.file.YamlConfiguration;
  import org.spigotmc.SpigotWorldConfig;
  
-@@ -341,4 +342,12 @@ public class PaperWorldConfig {
+@@ -349,4 +350,12 @@ public class PaperWorldConfig {
      private void removeCorruptTEs() {
          removeCorruptTEs = getBoolean("remove-corrupt-tile-entities", false);
      }
@@ -30,7 +30,7 @@ index de59f4ce0..03b7410f5 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-index bf1556a90..a8500176a 100644
+index 489dd861d..3eaee8d89 100644
 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
 +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
 @@ -228,6 +228,15 @@ public class EntityFallingBlock extends Entity {
@@ -50,5 +50,5 @@ index bf1556a90..a8500176a 100644
          if (nbttagcompound.hasKeyOfType("HurtEntities", 99)) {
              this.hurtEntities = nbttagcompound.getBoolean("HurtEntities");
 -- 
-2.20.0
+2.21.0
 

Spigot-Server-Patches/0155-Configurable-Cartographer-Treasure-Maps.patch

@@ -1,4 +1,4 @@
-From 0a247fdee9a25543901d17cb25571925233f8984 Mon Sep 17 00:00:00 2001
+From 7306db580bb63b51c6e135d5071f169ecde0ab1b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 20 Dec 2016 15:26:27 -0500
 Subject: [PATCH] Configurable Cartographer Treasure Maps
@@ -9,10 +9,10 @@ Also allow turning off treasure maps all together as they can eat up Map ID's
 which are limited in quantity.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 03b7410f5..5c50c62e5 100644
+index 1593f2e2f..a47f6a339 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -350,4 +350,14 @@ public class PaperWorldConfig {
+@@ -358,4 +358,14 @@ public class PaperWorldConfig {
              Bukkit.getLogger().warning("Spawn Egg and Armor Stand NBT filtering disabled, this is a potential security risk");
          }
      }
@@ -40,5 +40,5 @@ index 213d0b18c..ebe397b15 100644
  
              if (blockposition != null) {
 -- 
-2.20.1
+2.21.0
 

Spigot-Server-Patches/0169-Cap-Entity-Collisions.patch

@@ -1,4 +1,4 @@
-From 7eba79d80f71e892b6910c910812675add63ede1 Mon Sep 17 00:00:00 2001
+From 1e39a1de5495058977d44734200fb42ac2843390 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 22 Jan 2017 18:07:56 -0500
 Subject: [PATCH] Cap Entity Collisions
@@ -12,10 +12,10 @@ just as it does in Vanilla, but entity pushing logic will be capped.
 You can set this to 0 to disable collisions.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 5c50c62e5..e49eb0caf 100644
+index a47f6a339..8af7bd277 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -360,4 +360,10 @@ public class PaperWorldConfig {
+@@ -368,4 +368,10 @@ public class PaperWorldConfig {
              log("Treasure Maps will return already discovered locations");
          }
      }
@@ -27,7 +27,7 @@ index 5c50c62e5..e49eb0caf 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index f9973a363..4be9226c8 100644
+index fd30936c6..68fc58716 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -182,6 +182,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -39,7 +39,7 @@ index f9973a363..4be9226c8 100644
      // Spigot end
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index eb7ed070b..4efd62f0b 100644
+index 3bc1f8f9b..34fbf8362 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2355,8 +2355,11 @@ public abstract class EntityLiving extends Entity {
@@ -56,5 +56,5 @@ index eb7ed070b..4efd62f0b 100644
                  this.C(entity);
              }
 -- 
-2.20.1
+2.21.0
 

Spigot-Server-Patches/0175-Add-option-to-make-parrots-stay-on-shoulders-despite.patch

@@ -1,4 +1,4 @@
-From 7e0c048688797357331b9b96630f12e0325a264e Mon Sep 17 00:00:00 2001
+From c2d216af32d0d000bc0afa1c3a01edec5e62c7a5 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 16 May 2017 21:29:08 -0500
 Subject: [PATCH] Add option to make parrots stay on shoulders despite movement
@@ -11,10 +11,10 @@ I suspect Mojang may switch to this behavior before full release.
 To be converted into a Paper-API event at some point in the future?
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index e49eb0caf..aefb0ce97 100644
+index 8af7bd277..7765e72f1 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -366,4 +366,10 @@ public class PaperWorldConfig {
+@@ -374,4 +374,10 @@ public class PaperWorldConfig {
          maxCollisionsPerEntity = getInt( "max-entity-collisions", this.spigotConfig.getInt("max-entity-collisions", 8) );
          log( "Max Entity Collisions: " + maxCollisionsPerEntity );
      }

Spigot-Server-Patches/0178-provide-a-configurable-option-to-disable-creeper-lin.patch

@@ -1,4 +1,4 @@
-From 21f905a2536d1e3dbf5fe9f96a7f9bfebc4ef139 Mon Sep 17 00:00:00 2001
+From e7ec90a2f370af760914960228952385170912c4 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 11 Jun 2017 21:01:18 +0100
 Subject: [PATCH] provide a configurable option to disable creeper lingering
@@ -6,10 +6,10 @@ Subject: [PATCH] provide a configurable option to disable creeper lingering
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index aefb0ce97..af31030dc 100644
+index 7765e72f1..235e2ffec 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -372,4 +372,10 @@ public class PaperWorldConfig {
+@@ -380,4 +380,10 @@ public class PaperWorldConfig {
          parrotsHangOnBetter = getBoolean("parrots-are-unaffected-by-player-movement", false);
          log("Parrots are unaffected by player movement: " + parrotsHangOnBetter);
      }

Spigot-Server-Patches/0211-Option-for-maximum-exp-value-when-merging-orbs.patch

@@ -1,14 +1,14 @@
-From 23f26bd993530d5476459997d337aafa494f5ac3 Mon Sep 17 00:00:00 2001
+From 0174153107fce0839887e809226f02da6bda3a79 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 10 Nov 2017 23:03:12 -0500
 Subject: [PATCH] Option for maximum exp value when merging orbs
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index af31030dc7..b6764c7ec1 100644
+index 235e2ffec..c0569963b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -378,4 +378,10 @@ public class PaperWorldConfig {
+@@ -386,4 +386,10 @@ public class PaperWorldConfig {
          disableCreeperLingeringEffect = getBoolean("disable-creeper-lingering-effect", false);
          log("Creeper lingering effect: " + disableCreeperLingeringEffect);
      }
@@ -20,7 +20,7 @@ index af31030dc7..b6764c7ec1 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 9cbbfed4fe..2985c76f37 100644
+index 9cbbfed4f..2985c76f3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -394,16 +394,32 @@ public class CraftEventFactory {

Spigot-Server-Patches/0221-Configurable-Chunks-Sends-per-Tick-setting.patch

@@ -1,4 +1,4 @@
-From 193187888801fbb2b7f54be6f15c78127f824bbe Mon Sep 17 00:00:00 2001
+From 443d8a46f316c49e41109f43fb4e4a0c51619793 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 1 Jan 2018 15:41:59 -0500
 Subject: [PATCH] Configurable Chunks Sends per Tick setting
@@ -8,10 +8,10 @@ Vanilla already had this limited, make it configurable.
 Limit how much exploration lags the server
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index b6764c7ec..29cb718fb 100644
+index c0569963b..100b8a97c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -384,4 +384,13 @@ public class PaperWorldConfig {
+@@ -392,4 +392,13 @@ public class PaperWorldConfig {
          expMergeMaxValue = getInt("experience-merge-max-value", -1);
          log("Experience Merge Max Value: " + expMergeMaxValue);
      }

Spigot-Server-Patches/0222-Configurable-Max-Chunk-Gens-per-Tick.patch

@@ -1,4 +1,4 @@
-From 6a576fd91e6c21dca0af32180d32e465909b6440 Mon Sep 17 00:00:00 2001
+From eca822dc7103d4e7f66f41105eb707f180d36170 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 1 Jan 2018 16:10:24 -0500
 Subject: [PATCH] Configurable Max Chunk Gens per Tick
@@ -13,10 +13,10 @@ This should result in no noticeable speed reduction in generation for servers no
 lagging, and let larger servers reduce this value according to their own desires.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 29cb718fb..695bdf2e6 100644
+index 100b8a97c..c7108e9c3 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -393,4 +393,15 @@ public class PaperWorldConfig {
+@@ -401,4 +401,15 @@ public class PaperWorldConfig {
          }
          log("Max Chunk Sends Per Tick: " + maxChunkSendsPerTick);
      }

Spigot-Server-Patches/0223-Make-max-squid-spawn-height-configurable.patch

@@ -1,4 +1,4 @@
-From 62cbd17d1f0da41dc1c67a97e1dd82cbde999430 Mon Sep 17 00:00:00 2001
+From d08cc0efdc7a0ca77aff3772431825e6093e8eea Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 11 Jan 2018 16:47:28 -0600
 Subject: [PATCH] Make max squid spawn height configurable
@@ -7,10 +7,10 @@ I don't know why upstream made only the minimum height configurable but
 whatever
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 695bdf2e6..313dd9891 100644
+index c7108e9c3..3d47b991a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -404,4 +404,9 @@ public class PaperWorldConfig {
+@@ -412,4 +412,9 @@ public class PaperWorldConfig {
              log("Max Chunk Gens Per Tick: " + maxChunkGensPerTick);
          }
      }

Spigot-Server-Patches/0232-Toggleable-player-crits-helps-mitigate-hacked-client.patch

@@ -1,14 +1,14 @@
-From 828d13db6aa9aa148e8cc13fd6442237ce390dda Mon Sep 17 00:00:00 2001
+From 6f74c219c8913850933c61eb1ea2a237d2e4cca7 Mon Sep 17 00:00:00 2001
 From: MiniDigger <admin@minidigger.me>
 Date: Sat, 10 Mar 2018 00:50:24 +0100
 Subject: [PATCH] Toggleable player crits, helps mitigate hacked clients.
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 313dd9891..56226bc86 100644
+index 3d47b991a..cf3fba4af 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -182,6 +182,11 @@ public class PaperWorldConfig {
+@@ -190,6 +190,11 @@ public class PaperWorldConfig {
          disableChestCatDetection = getBoolean("game-mechanics.disable-chest-cat-detection", false);
      }
  

Spigot-Server-Patches/0249-Configurable-sprint-interruption-on-attack.patch

@@ -1,4 +1,4 @@
-From 623810aef4870a0628e85110d07d591dd78eaed9 Mon Sep 17 00:00:00 2001
+From 0f4a20d55921ecc3e2107c58b540fdcd8c71da17 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Sat, 14 Apr 2018 20:20:46 +0200
 Subject: [PATCH] Configurable sprint interruption on attack
@@ -6,10 +6,10 @@ Subject: [PATCH] Configurable sprint interruption on attack
 If the sprint interruption is disabled players continue sprinting when they attack entities.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 56226bc86..6bb54fcbd 100644
+index cf3fba4af..33270a169 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -414,4 +414,9 @@ public class PaperWorldConfig {
+@@ -422,4 +422,9 @@ public class PaperWorldConfig {
      private void squidMaxSpawnHeight() {
          squidMaxSpawnHeight = getDouble("squid-spawn-height.maximum", 0.0D);
      }

Spigot-Server-Patches/0253-Block-Enderpearl-Travel-Exploit.patch

@@ -1,4 +1,4 @@
-From bab81459f33357301c77cb9d0577cb8dd7c46fb7 Mon Sep 17 00:00:00 2001
+From 2d2ff76e9090cf63d6d2930f4ff233c03f3fd38c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 17:15:26 -0400
 Subject: [PATCH] Block Enderpearl Travel Exploit
@@ -12,10 +12,10 @@ This disables that by not saving the thrower when the chunk is unloaded.
 This is mainly useful for survival servers that do not allow freeform teleporting.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 6bb54fcbd..9aba755a4 100644
+index 33270a169..ba82ca9f1 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -419,4 +419,10 @@ public class PaperWorldConfig {
+@@ -427,4 +427,10 @@ public class PaperWorldConfig {
      private void disableSprintInterruptionOnAttack() {
          disableSprintInterruptionOnAttack = getBoolean("game-mechanics.disable-sprint-interruption-on-attack", false);
      }

Spigot-Server-Patches/0259-Configurable-Villages-loading-chunks-for-door-checks.patch

@@ -1,4 +1,4 @@
-From 9467d4c80d0a12a9699615796ddfff76e80a0985 Mon Sep 17 00:00:00 2001
+From bffa724c8c9c385f1fa6b56586d8bc62a4289623 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Jun 2018 00:32:22 -0400
 Subject: [PATCH] Configurable Villages loading chunks for door checks
@@ -6,10 +6,10 @@ Subject: [PATCH] Configurable Villages loading chunks for door checks
 This avoids villages spam loading chunks sync.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 9aba755a4..2033ace4f 100644
+index ba82ca9f1..994e925dd 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -425,4 +425,12 @@ public class PaperWorldConfig {
+@@ -433,4 +433,12 @@ public class PaperWorldConfig {
          disableEnderpearlExploit = getBoolean("game-mechanics.disable-unloaded-chunk-enderpearl-exploit", disableEnderpearlExploit);
          log("Disable Unloaded Chunk Enderpearl Exploit: " + (disableEnderpearlExploit ? "enabled" : "disabled"));
      }

Spigot-Server-Patches/0268-Make-shield-blocking-delay-configurable.patch

@@ -1,14 +1,14 @@
-From 2d496d8c12f0e17ce2f0a22c563ca216ac0a4373 Mon Sep 17 00:00:00 2001
+From a0331bf8dd08e986a5076f2862f5e9a2ac852c29 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 16 Jun 2018 01:18:16 -0500
 Subject: [PATCH] Make shield blocking delay configurable
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 2033ace4f..875650b8d 100644
+index 994e925dd..49d6b1a7c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -433,4 +433,9 @@ public class PaperWorldConfig {
+@@ -441,4 +441,9 @@ public class PaperWorldConfig {
              log("Villages can load chunks - Warning this can cause intense TPS loss. Strongly consider disabling this.");
          }
      }

Spigot-Server-Patches/0277-Add-config-to-disable-ender-dragon-legacy-check.patch

@@ -1,14 +1,14 @@
-From 726761caf70e3e00e5ffb2c57512b7f1eaf2a301 Mon Sep 17 00:00:00 2001
+From b3bb68564a597a2e603263d976d8702a6e89ea2e Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 22 Jun 2018 10:38:31 -0500
 Subject: [PATCH] Add config to disable ender dragon legacy check
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 875650b8d..74185b31f 100644
+index 49d6b1a7c..45d8b52b7 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -438,4 +438,9 @@ public class PaperWorldConfig {
+@@ -446,4 +446,9 @@ public class PaperWorldConfig {
      private void shieldBlockingDelay() {
          shieldBlockingDelay = getInt("game-mechanics.shield-blocking-delay", 5);
      }

Spigot-Server-Patches/0281-Configurable-Bed-Search-Radius.patch

@@ -1,4 +1,4 @@
-From 36acae6d7bd94abfd53508a8a7e9af5729c8c990 Mon Sep 17 00:00:00 2001
+From c52d374c494f11ada14981a77b34467c89e924dc Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 Jul 2018 15:22:06 -0400
 Subject: [PATCH] Configurable Bed Search Radius
@@ -10,10 +10,10 @@ player at their bed should it of became obstructed.
 Defaults to vanilla 1.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 74185b31f..92acfa6fb 100644
+index 45d8b52b7..471a8d6f0 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -443,4 +443,15 @@ public class PaperWorldConfig {
+@@ -451,4 +451,15 @@ public class PaperWorldConfig {
      private void scanForLegacyEnderDragon() {
          scanForLegacyEnderDragon = getBoolean("game-mechanics.scan-for-legacy-ender-dragon", true);
      }

Spigot-Server-Patches/0294-Duplicate-UUID-Resolve-Option.patch

@@ -1,4 +1,4 @@
-From 33a0b942620f80702dcbea1008f0c043250a26d3 Mon Sep 17 00:00:00 2001
+From 839b6ba6410971ca20b19a8b881aa451b3ba97b3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 21 Jul 2018 14:27:34 -0400
 Subject: [PATCH] Duplicate UUID Resolve Option
@@ -33,10 +33,10 @@ But for those who are ok with leaving this inconsistent behavior, you may use WA
 It is recommended you regenerate the entities, as these were legit entities, and deserve your love.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 92acfa6fb..05509e4fd 100644
+index 471a8d6f0..9cdc63a03 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -454,4 +454,43 @@ public class PaperWorldConfig {
+@@ -462,4 +462,43 @@ public class PaperWorldConfig {
              log("Bed Search Radius: " + bedSearchRadius);
          }
      }
@@ -163,7 +163,7 @@ index 1c1f39524..edae53b82 100644
              // CraftBukkit start
              List<Entity> toRemove = new LinkedList<>();
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 58122bfcc..a64a02fd4 100644
+index 0b23b5af9..f4cdf7548 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2736,6 +2736,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

Spigot-Server-Patches/0298-Option-to-prevent-armor-stands-from-doing-entity-loo.patch

@@ -1,14 +1,14 @@
-From 19b4e3b7404f122071f38eb325a2190b6aee10a1 Mon Sep 17 00:00:00 2001
+From 2f802d8c02eb54fb1f7b690525b587af03e63485 Mon Sep 17 00:00:00 2001
 From: Hugo Manrique <hugmanrique@gmail.com>
 Date: Mon, 23 Jul 2018 12:57:39 +0200
 Subject: [PATCH] Option to prevent armor stands from doing entity lookups
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 05509e4fd..4059c7a72 100644
+index 9cdc63a03..773099166 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -366,6 +366,11 @@ public class PaperWorldConfig {
+@@ -374,6 +374,11 @@ public class PaperWorldConfig {
          }
      }
  

Spigot-Server-Patches/0327-Allow-disabling-armour-stand-ticking.patch

@@ -1,14 +1,14 @@
-From c3e0bed1cacc07c470717a3a75769ce86673f31a Mon Sep 17 00:00:00 2001
+From 2f96701f58556985184d42578abf7acb8aeb7817 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 15 Aug 2018 01:26:09 -0700
 Subject: [PATCH] Allow disabling armour stand ticking
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 4059c7a72..10efe6b3d 100644
+index 773099166..bc96f0796 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -498,4 +498,10 @@ public class PaperWorldConfig {
+@@ -506,4 +506,10 @@ public class PaperWorldConfig {
                  break;
          }
      }

Spigot-Server-Patches/0332-Optimize-Hoppers.patch

@@ -1,4 +1,4 @@
-From 8bc8f28b66ce5f9a6f903c800d2a3f18bc753ae4 Mon Sep 17 00:00:00 2001
+From e05f725ac3e6fd1db94b82977db7700dca19e023 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 27 Apr 2016 22:09:52 -0400
 Subject: [PATCH] Optimize Hoppers
@@ -11,10 +11,10 @@ Subject: [PATCH] Optimize Hoppers
 * Skip subsequent InventoryMoveItemEvents if a plugin does not use the item after first event fire for an iteration
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 10efe6b3d..6feea98b6 100644
+index bc96f0796..2b8ad6d58 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -420,6 +420,15 @@ public class PaperWorldConfig {
+@@ -428,6 +428,15 @@ public class PaperWorldConfig {
          squidMaxSpawnHeight = getDouble("squid-spawn-height.maximum", 0.0D);
      }
  

Spigot-Server-Patches/0336-Anti-Xray.patch

@@ -1,11 +1,11 @@
-From dd0691766e290b04122d57c0b4717665f1d3d3a7 Mon Sep 17 00:00:00 2001
+From 52d96728e9d538d1d61d181d4757e95a4ea9af4f Mon Sep 17 00:00:00 2001
 From: stonar96 <minecraft.stonar96@gmail.com>
 Date: Mon, 20 Aug 2018 03:03:58 +0200
 Subject: [PATCH] Anti-Xray
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 6feea98b6..7b1e0d6f2 100644
+index 2b8ad6d58..89e4dcd73 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -1,7 +1,10 @@
@@ -19,7 +19,7 @@ index 6feea98b6..7b1e0d6f2 100644
  import net.minecraft.server.MinecraftServer;
  import org.bukkit.Bukkit;
  import org.bukkit.configuration.file.YamlConfiguration;
-@@ -513,4 +516,34 @@ public class PaperWorldConfig {
+@@ -521,4 +524,34 @@ public class PaperWorldConfig {
          this.armorStandTick = this.getBoolean("armor-stands-tick", this.armorStandTick);
          log("ArmorStand ticking is " + (this.armorStandTick ? "enabled" : "disabled") + " by default");
      }

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

@@ -1,14 +1,14 @@
-From 1d4af8c0e9e1b39d7b55d27a56bed234be220222 Mon Sep 17 00:00:00 2001
+From b2ecad4a75de1a8b47605c6a521bc0a28f613660 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 8 Aug 2018 16:33:21 -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 7b1e0d6f2..e04204055 100644
+index 89e4dcd73..a9df93b56 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -472,6 +472,12 @@ public class PaperWorldConfig {
+@@ -480,6 +480,12 @@ public class PaperWorldConfig {
          }
      }
  

Spigot-Server-Patches/0377-Limit-lightning-strike-effect-distance.patch

@@ -1,14 +1,14 @@
-From 9e37b3bf99fe441cef80a2aae6e2367eec74487e Mon Sep 17 00:00:00 2001
+From 764ac0fbaeca1e56ba4fd66b52a86dd49725fcda Mon Sep 17 00:00:00 2001
 From: Trigary <trigary0@gmail.com>
 Date: Fri, 14 Sep 2018 17:42:08 +0200
 Subject: [PATCH] Limit lightning strike effect distance
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index e04204055..30985cdfc 100644
+index a9df93b56..a3022846c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -237,6 +237,28 @@ public class PaperWorldConfig {
+@@ -245,6 +245,28 @@ public class PaperWorldConfig {
              skeleHorseSpawnChance = 0.01D; // Vanilla value
          }
      }

Spigot-Server-Patches/0384-Add-option-to-prevent-players-from-moving-into-unloa.patch

@@ -1,4 +1,4 @@
-From 03c3c45382dd0a1fc06143cb5bd31f0e0722d6a1 Mon Sep 17 00:00:00 2001
+From ff7bfbfdb5d328d544475c02745c9e820aea67c4 Mon Sep 17 00:00:00 2001
 From: Gabriele C <sgdc3.mail@gmail.com>
 Date: Mon, 22 Oct 2018 17:34:10 +0200
 Subject: [PATCH] Add option to prevent players from moving into unloaded
@@ -6,10 +6,10 @@ Subject: [PATCH] Add option to prevent players from moving into unloaded
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 30985cdfc..2add466ac 100644
+index a3022846c..aa74c159a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -574,4 +574,9 @@ public class PaperWorldConfig {
+@@ -582,4 +582,9 @@ public class PaperWorldConfig {
          replacementBlocks = getList("anti-xray.replacement-blocks", Arrays.asList("stone", "planks"));
          log("Anti-Xray: " + (antiXray ? "enabled" : "disabled") + " / Engine Mode: " + engineMode.getDescription() + " / Chunk Edge Mode: " + chunkEdgeMode.getDescription() + " / Up to " + ((maxChunkSectionIndex + 1) * 16) + " blocks / Update Radius: " + updateRadius);
      }

Spigot-Server-Patches/0396-Optimize-redstone-algorithm.patch

@@ -1,4 +1,4 @@
-From 18012a69f5b8fb4eac4d7fb7e868eddba581a77b Mon Sep 17 00:00:00 2001
+From 4e2f2eff29218a6eb117f162299eb901a020f222 Mon Sep 17 00:00:00 2001
 From: theosib <millerti@172.16.221.1>
 Date: Thu, 27 Sep 2018 01:43:35 -0600
 Subject: [PATCH] Optimize redstone algorithm
@@ -19,10 +19,10 @@ Aside from making the obvious class/function renames and obfhelpers I didn't nee
 Just added Bukkit's event system and took a few liberties with dead code and comment misspellings.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 2add466ac..b499c58b7 100644
+index aa74c159a..a5231169c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -579,4 +579,14 @@ public class PaperWorldConfig {
+@@ -587,4 +587,14 @@ public class PaperWorldConfig {
      private void preventMovingIntoUnloadedChunks() {
          preventMovingIntoUnloadedChunks = getBoolean("prevent-moving-into-unloaded-chunks", false);
      }

Spigot-Server-Patches/0424-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch

@@ -1,4 +1,4 @@
-From 9e85ab2027dac98fc5f8252b955be863a7cb64f3 Mon Sep 17 00:00:00 2001
+From 2c29c1376a6d21e9459fb15b2c99f6d34f0bb3ed Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 24 Mar 2019 01:01:32 -0400
 Subject: [PATCH] Only count Natural Spawned mobs towards natural spawn mob
@@ -17,10 +17,10 @@ This should fully solve all of the issues around it so that only natural
 influences natural spawns.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index b499c58b7..fc7ac2bc0 100644
+index a5231169c..1d21277b7 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -589,4 +589,14 @@ public class PaperWorldConfig {
+@@ -597,4 +597,14 @@ public class PaperWorldConfig {
              log("Using vanilla redstone algorithm.");
          }
      }