Fix /purpur reload not reloading world options

patches/server/0002-Purpur-config-files.patch

@@ -1,4 +1,4 @@
-From 95ff0e54f1d111aecc87857dddd5ae493e811d01 Mon Sep 17 00:00:00 2001
+From 8fee7d3acc09c544c5849a04bf99dcc4bec3a089 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 9 May 2019 18:09:43 -0500
 Subject: [PATCH] Purpur config files
@@ -10,10 +10,10 @@ Subject: [PATCH] Purpur config files
  src/main/java/net/pl3x/purpur/Metrics.java    | 598 ++++++++++++++++++
  .../java/net/pl3x/purpur/PurpurCommand.java   |  66 ++
  .../java/net/pl3x/purpur/PurpurConfig.java    | 133 ++++
- .../net/pl3x/purpur/PurpurWorldConfig.java    |  63 ++
+ .../net/pl3x/purpur/PurpurWorldConfig.java    |  60 ++
  .../org/bukkit/craftbukkit/CraftServer.java   |   3 +
  .../java/org/bukkit/craftbukkit/Main.java     |   8 +
- 9 files changed, 885 insertions(+)
+ 9 files changed, 882 insertions(+)
  create mode 100644 src/main/java/net/pl3x/purpur/Metrics.java
  create mode 100644 src/main/java/net/pl3x/purpur/PurpurCommand.java
  create mode 100644 src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -57,7 +57,7 @@ index 3ed74ae0ec..8139108470 100644
          // Paper end
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 2c92d3390a..97c4a6773a 100644
+index 5460ace8f8..c5cd19afa0 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -96,6 +96,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -894,14 +894,13 @@ index 0000000000..6f378b5f69
 +}
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 new file mode 100644
-index 0000000000..30f11fe261
+index 0000000000..4985f21733
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -0,0 +1,63 @@
+@@ -0,0 +1,60 @@
 +package net.pl3x.purpur;
 +
 +import com.destroystokyo.paper.PaperWorldConfig;
-+import org.bukkit.configuration.file.YamlConfiguration;
 +import org.spigotmc.SpigotWorldConfig;
 +
 +import java.util.List;
@@ -913,14 +912,12 @@ index 0000000000..30f11fe261
 +    private final String worldName;
 +    private final PaperWorldConfig paperConfig;
 +    private final SpigotWorldConfig spigotConfig;
-+    private final YamlConfiguration config;
 +    private boolean verbose;
 +
 +    public PurpurWorldConfig(String worldName, PaperWorldConfig paperConfig, SpigotWorldConfig spigotConfig) {
 +        this.worldName = worldName;
 +        this.paperConfig = paperConfig;
 +        this.spigotConfig = spigotConfig;
-+        this.config = PurpurConfig.config;
 +        init();
 +    }
 +
@@ -930,39 +927,39 @@ index 0000000000..30f11fe261
 +    }
 +
 +    private void set(String path, Object val) {
-+        config.set("world-settings.default." + path, val);
-+        if (config.get("world-settings." + worldName + "." + path) != null) {
-+            config.set("world-settings." + worldName + "." + path, val);
++        PurpurConfig.config.set("world-settings.default." + path, val);
++        if (PurpurConfig.config.get("world-settings." + worldName + "." + path) != null) {
++            PurpurConfig.config.set("world-settings." + worldName + "." + path, val);
 +        }
 +    }
 +
 +    private boolean getBoolean(String path, boolean def) {
-+        config.addDefault("world-settings.default." + path, def);
-+        return config.getBoolean("world-settings." + worldName + "." + path, config.getBoolean("world-settings.default." + path));
++        PurpurConfig.config.addDefault("world-settings.default." + path, def);
++        return PurpurConfig.config.getBoolean("world-settings." + worldName + "." + path, PurpurConfig.config.getBoolean("world-settings.default." + path));
 +    }
 +
 +    private double getDouble(String path, double def) {
-+        config.addDefault("world-settings.default." + path, def);
-+        return config.getDouble("world-settings." + worldName + "." + path, config.getDouble("world-settings.default." + path));
++        PurpurConfig.config.addDefault("world-settings.default." + path, def);
++        return PurpurConfig.config.getDouble("world-settings." + worldName + "." + path, PurpurConfig.config.getDouble("world-settings.default." + path));
 +    }
 +
 +    private int getInt(String path, int def) {
-+        config.addDefault("world-settings.default." + path, def);
-+        return config.getInt("world-settings." + worldName + "." + path, config.getInt("world-settings.default." + path));
++        PurpurConfig.config.addDefault("world-settings.default." + path, def);
++        return PurpurConfig.config.getInt("world-settings." + worldName + "." + path, PurpurConfig.config.getInt("world-settings.default." + path));
 +    }
 +
 +    private <T> List getList(String path, T def) {
-+        config.addDefault("world-settings.default." + path, def);
-+        return config.getList("world-settings." + worldName + "." + path, config.getList("world-settings.default." + path));
++        PurpurConfig.config.addDefault("world-settings.default." + path, def);
++        return PurpurConfig.config.getList("world-settings." + worldName + "." + path, PurpurConfig.config.getList("world-settings.default." + path));
 +    }
 +
 +    private String getString(String path, String def) {
-+        config.addDefault("world-settings.default." + path, def);
-+        return config.getString("world-settings." + worldName + "." + path, config.getString("world-settings.default." + path));
++        PurpurConfig.config.addDefault("world-settings.default." + path, def);
++        return PurpurConfig.config.getString("world-settings." + worldName + "." + path, PurpurConfig.config.getString("world-settings.default." + path));
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8f4ca4c285..6d453b6711 100644
+index 55b8492373..4c15bd403d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -794,6 +794,7 @@ public final class CraftServer implements Server {
@@ -990,7 +987,7 @@ index 8f4ca4c285..6d453b6711 100644
          ignoreVanillaPermissions = commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 140b82275c..3a4881fb18 100644
+index 75d3cbc441..c9937fb0d6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -137,6 +137,14 @@ public class Main {
@@ -1009,5 +1006,5 @@ index 140b82275c..3a4881fb18 100644
                  acceptsAll(asList("server-name"), "Name of the server")
                          .withRequiredArg()
 -- 
-2.24.0.rc1
+2.24.0
 

patches/server/0014-Add-regen-effect-to-campfires.patch

@@ -1,4 +1,4 @@
-From 2a405bf3462278e4dfaf7f34e5bc79de1afbf9d3 Mon Sep 17 00:00:00 2001
+From 437b82c05e30e30bf70561ae8f235336055af24d Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 19 May 2019 18:11:53 -0500
 Subject: [PATCH] Add regen effect to campfires
@@ -151,12 +151,12 @@ index a1580b8c6d..3a44454ed7 100644
      }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 30f11fe261..314fd584b8 100644
+index 4985f21733..f4811a1d7b 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -60,4 +60,27 @@ public class PurpurWorldConfig {
-         config.addDefault("world-settings.default." + path, def);
-         return config.getString("world-settings." + worldName + "." + path, config.getString("world-settings.default." + path));
+@@ -57,4 +57,27 @@ public class PurpurWorldConfig {
+         PurpurConfig.config.addDefault("world-settings.default." + path, def);
+         return PurpurConfig.config.getString("world-settings." + worldName + "." + path, PurpurConfig.config.getString("world-settings.default." + path));
      }
 +
 +    public int campfireRegenInterval = 40;
@@ -183,5 +183,5 @@ index 30f11fe261..314fd584b8 100644
 +    }
  }
 -- 
-2.24.0.rc1
+2.24.0
 

patches/server/0015-Campfires-should-fall-with-gravity.patch

@@ -1,4 +1,4 @@
-From 1e761b4f982976c32121123d6d7256dcae9a2914 Mon Sep 17 00:00:00 2001
+From 04c9f3e094bdb7afd444279a484a89df8c11fb04 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 23 May 2019 16:20:21 -0500
 Subject: [PATCH] Campfires should fall with gravity
@@ -10,7 +10,7 @@ Subject: [PATCH] Campfires should fall with gravity
  3 files changed, 31 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index 4d29faccaa..bad1098406 100644
+index 0afcbef2f3..2c464299a1 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -387,6 +387,7 @@ public class Block implements IMaterial {
@@ -68,11 +68,11 @@ index 6303be944c..5d1312d2f1 100644
  
              if (flag) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 314fd584b8..871c0e2349 100644
+index f4811a1d7b..33840d0036 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -61,6 +61,11 @@ public class PurpurWorldConfig {
-         return config.getString("world-settings." + worldName + "." + path, config.getString("world-settings.default." + path));
+@@ -58,6 +58,11 @@ public class PurpurWorldConfig {
+         return PurpurConfig.config.getString("world-settings." + worldName + "." + path, PurpurConfig.config.getString("world-settings.default." + path));
      }
  
 +    public boolean campfireObeysGravity = true;
@@ -84,5 +84,5 @@ index 314fd584b8..871c0e2349 100644
      public int campfireRegenDuration = 80;
      public int campfireRegenRange = 5;
 -- 
-2.24.0.rc1
+2.24.0
 

patches/server/0016-Campfires-burn-out-in-rain.patch

@@ -1,4 +1,4 @@
-From 4a6b57cb93aa44291057d493345d384db72c209f Mon Sep 17 00:00:00 2001
+From 003c0a4b0f11853467a5bf473748caa966b12206 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 6 Jun 2019 21:30:49 -0500
 Subject: [PATCH] Campfires burn out in rain
@@ -23,10 +23,10 @@ index 5d1312d2f1..7cb4ce95e7 100644
      }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 871c0e2349..8d1f3feb82 100644
+index 33840d0036..6a9647367f 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -88,4 +88,9 @@ public class PurpurWorldConfig {
+@@ -85,4 +85,9 @@ public class PurpurWorldConfig {
          campfireRegenBoostRequireLineOfSight = getBoolean("campfire-regen.boost-require-line-of-sight", campfireRegenBoostRequireLineOfSight);
          campfireRequireRegenPotion = getBoolean("campfire-regen.requires-regen-potion-to-activate", campfireRequireRegenPotion);
      }
@@ -37,5 +37,5 @@ index 871c0e2349..8d1f3feb82 100644
 +    }
  }
 -- 
-2.24.0.rc1
+2.24.0
 

patches/server/0019-Right-click-to-open-sign-editor.patch

@@ -1,4 +1,4 @@
-From 37e9a772a5e76b43000d8cec3b48ee937364f5a3 Mon Sep 17 00:00:00 2001
+From 781d16718818af366e999bbc01453d18ee3d820f Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 24 May 2019 02:39:25 -0500
 Subject: [PATCH] Right click to open sign editor
@@ -31,11 +31,11 @@ index 8a31054a1d..503090e38a 100644
              } else {
                  return EnumInteractionResult.PASS;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 8d1f3feb82..8bd887b1c2 100644
+index 6a9647367f..6cb887ca8b 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -61,6 +61,11 @@ public class PurpurWorldConfig {
-         return config.getString("world-settings." + worldName + "." + path, config.getString("world-settings.default." + path));
+@@ -58,6 +58,11 @@ public class PurpurWorldConfig {
+         return PurpurConfig.config.getString("world-settings." + worldName + "." + path, PurpurConfig.config.getString("world-settings.default." + path));
      }
  
 +    public boolean editableSigns = false;
@@ -47,5 +47,5 @@ index 8d1f3feb82..8bd887b1c2 100644
      private void campfireObeysGravity() {
          campfireObeysGravity = getBoolean("campfire-obeys-gravity", campfireObeysGravity);
 -- 
-2.24.0.rc1
+2.24.0
 

patches/server/0020-Allow-color-codes-on-signs.patch

@@ -1,4 +1,4 @@
-From 8efdf76807baceb82e429ef9ac91dff672bed469 Mon Sep 17 00:00:00 2001
+From f36f4a5ca0b2017ab6da339d7a97d5f25e4ab1ec Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 6 Jun 2019 17:40:30 -0500
 Subject: [PATCH] Allow color codes on signs
@@ -67,10 +67,10 @@ index 5eb86c4341..8810a1120b 100644
      @Override
      public PacketPlayOutTileEntityData getUpdatePacket() {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 8bd887b1c2..abd10a500a 100644
+index 6cb887ca8b..061b02e45a 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -98,4 +98,9 @@ public class PurpurWorldConfig {
+@@ -95,4 +95,9 @@ public class PurpurWorldConfig {
      private void campfiresGoOutInRain() {
          campfiresGoOutInRain = getBoolean("campfires-go-out-in-rain", campfiresGoOutInRain);
      }

patches/server/0022-Always-place-dragon-egg-when-dragon-is-killed.patch

@@ -1,4 +1,4 @@
-From 4a49933497d7955879f09d161ca3b9ed2af58cde Mon Sep 17 00:00:00 2001
+From 306aa7d682962a0ec6bf1b304d839f07481420f2 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 1 Jun 2019 01:16:35 -0500
 Subject: [PATCH] Always place dragon egg when dragon is killed
@@ -31,10 +31,10 @@ index 218c04245b..a2dfdc23f1 100644
              }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index abd10a500a..f91019986c 100644
+index 061b02e45a..ea5c898966 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -103,4 +103,9 @@ public class PurpurWorldConfig {
+@@ -100,4 +100,9 @@ public class PurpurWorldConfig {
      private void allowSignColors() {
          allowSignColors = getBoolean("allow-sign-colors", allowSignColors);
      }

patches/server/0024-Add-config-for-items-breaking-turtle-eggs.patch

@@ -1,4 +1,4 @@
-From 5daded8219c8a600f6ad744e0efdab29ff5958a1 Mon Sep 17 00:00:00 2001
+From 8c3f3ab3cbe85b4c194aae321aa9123e31f034f3 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 6 Jun 2019 22:15:46 -0500
 Subject: [PATCH] Add config for items breaking turtle eggs
@@ -32,10 +32,10 @@ index cb36334e41..238d260b5f 100644
      }
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index f91019986c..37bd83271b 100644
+index ea5c898966..7544b6a2af 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -104,6 +104,11 @@ public class PurpurWorldConfig {
+@@ -101,6 +101,11 @@ public class PurpurWorldConfig {
          allowSignColors = getBoolean("allow-sign-colors", allowSignColors);
      }
  

patches/server/0026-Allow-soil-to-moisten-from-water-directly-under-it.patch

@@ -1,4 +1,4 @@
-From 15d7908520fa62896ec47d761fe64269ed9256c6 Mon Sep 17 00:00:00 2001
+From 9e94791f4f71f4927a305d6337ab0f81689fffbd Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 21 Jun 2019 14:37:10 -0500
 Subject: [PATCH] Allow soil to moisten from water directly under it
@@ -9,7 +9,7 @@ Subject: [PATCH] Allow soil to moisten from water directly under it
  2 files changed, 12 insertions(+), 12 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/BlockSoil.java b/src/main/java/net/minecraft/server/BlockSoil.java
-index 2fc6e210d..54f913901 100644
+index b6561f2c79..e3814b6270 100644
 --- a/src/main/java/net/minecraft/server/BlockSoil.java
 +++ b/src/main/java/net/minecraft/server/BlockSoil.java
 @@ -112,19 +112,14 @@ public class BlockSoil extends Block {
@@ -40,10 +40,10 @@ index 2fc6e210d..54f913901 100644
  
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 5c5a729e9..038c2ac07 100644
+index 7544b6a2af..968d32900a 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -99,6 +99,11 @@ public class PurpurWorldConfig {
+@@ -96,6 +96,11 @@ public class PurpurWorldConfig {
          campfiresGoOutInRain = getBoolean("campfires-go-out-in-rain", campfiresGoOutInRain);
      }
  
@@ -56,5 +56,5 @@ index 5c5a729e9..038c2ac07 100644
      private void allowSignColors() {
          allowSignColors = getBoolean("allow-sign-colors", allowSignColors);
 -- 
-2.23.0.rc1
+2.24.0
 

patches/server/0034-Add-chance-for-zombie-horse-natural-spawns.patch

@@ -1,4 +1,4 @@
-From 2a316cadda007eae32884eef898e21ec252771e3 Mon Sep 17 00:00:00 2001
+From dadd35b34b2359649a188b21e7eebb9361a7c724 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 7 Jul 2019 19:52:16 -0500
 Subject: [PATCH] Add chance for zombie horse natural spawns
@@ -38,10 +38,10 @@ index 8526a3fda1..fbfe37ea0a 100644
  
                  this.strikeLightning(new EntityLightning(this, (double) blockposition.getX() + 0.5D, (double) blockposition.getY(), (double) blockposition.getZ() + 0.5D, flag1), org.bukkit.event.weather.LightningStrikeEvent.Cause.WEATHER); // CraftBukkit
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index c053aec937..993906ba42 100644
+index 968d32900a..64128359c1 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -118,4 +118,9 @@ public class PurpurWorldConfig {
+@@ -115,4 +115,9 @@ public class PurpurWorldConfig {
      private void enderDragonSettings() {
          enderDragonAlwaysDropsEggBlock = getBoolean("mobs.ender-dragon.always-drop-egg-block", enderDragonAlwaysDropsEggBlock);
      }

patches/server/0035-Fix-pig-zombies-MC-56653.patch

@@ -1,4 +1,4 @@
-From acedbc60518eb695950bf5d604b8c1744a2890d2 Mon Sep 17 00:00:00 2001
+From 251d5327835fdede67ecee55e56f02395deabe36 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Tue, 9 Jul 2019 20:56:47 -0500
 Subject: [PATCH] Fix pig zombies (MC-56653)
@@ -43,10 +43,10 @@ index 8d57c5f1b5..0a0ecaf197 100644
  
          public PathfinderGoalAnger(EntityPigZombie entitypigzombie) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 993906ba42..704c0cd47f 100644
+index 64128359c1..f8755060f1 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -119,6 +119,11 @@ public class PurpurWorldConfig {
+@@ -116,6 +116,11 @@ public class PurpurWorldConfig {
          enderDragonAlwaysDropsEggBlock = getBoolean("mobs.ender-dragon.always-drop-egg-block", enderDragonAlwaysDropsEggBlock);
      }
  

patches/server/0036-Option-to-toggle-milk-curing-bad-omen.patch

@@ -1,4 +1,4 @@
-From d78331ff5b753953f661acd3461591d5bf32c310 Mon Sep 17 00:00:00 2001
+From 7f41b1ff626fe428ddef47f024791aa18cef65dd Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Wed, 10 Jul 2019 20:43:05 -0500
 Subject: [PATCH] Option to toggle milk curing bad omen
@@ -23,10 +23,10 @@ index b7dd5e3c07..93131de75c 100644
  
          return itemstack.isEmpty() ? new ItemStack(Items.BUCKET) : itemstack;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 704c0cd47f..24adf973c1 100644
+index f8755060f1..81ece70d38 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -114,6 +114,11 @@ public class PurpurWorldConfig {
+@@ -111,6 +111,11 @@ public class PurpurWorldConfig {
          itemsCanBreakTurtleEggs = getBoolean("items-can-break-turtle-eggs", itemsCanBreakTurtleEggs);
      }
  

patches/server/0037-Tulips-change-fox-type.patch

@@ -1,4 +1,4 @@
-From 56a5007877edd368d86f64159e68b4c36f03e01b Mon Sep 17 00:00:00 2001
+From c7e7dc47f23638477d520df6e45bf73d684cb3be Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 13 Jul 2019 15:56:22 -0500
 Subject: [PATCH] Tulips change fox type
@@ -77,10 +77,10 @@ index 282fbca4fc..b261da87b7 100644
      public static final Item bd = a(Blocks.OXEYE_DAISY, CreativeModeTab.c);
      public static final Item be = a(Blocks.CORNFLOWER, CreativeModeTab.c);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 24adf973c1..de3511aa6b 100644
+index 81ece70d38..e5ea54a206 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -124,6 +124,11 @@ public class PurpurWorldConfig {
+@@ -121,6 +121,11 @@ public class PurpurWorldConfig {
          enderDragonAlwaysDropsEggBlock = getBoolean("mobs.ender-dragon.always-drop-egg-block", enderDragonAlwaysDropsEggBlock);
      }
  

patches/server/0041-Implement-a-hard-limit-for-pillager-outpost-spawns.patch

@@ -1,4 +1,4 @@
-From 80a6a769ebd4823a3231f0015c2bc1e1acb198d0 Mon Sep 17 00:00:00 2001
+From 8c9db74b61fed29c35db8183f770e892eeac8eeb Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Mon, 22 Jul 2019 14:24:26 -0500
 Subject: [PATCH] Implement a hard limit for pillager outpost spawns
@@ -21,10 +21,10 @@ index 70f43c5159..baca8f7054 100644
              }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index de3511aa6b..5539c33996 100644
+index e5ea54a206..66dd66f062 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -134,6 +134,11 @@ public class PurpurWorldConfig {
+@@ -131,6 +131,11 @@ public class PurpurWorldConfig {
          pigmenDontTargetUnlessHit = getBoolean("mobs.pigmen.dont-target-unless-hit", pigmenDontTargetUnlessHit);
      }
  

patches/server/0042-Implement-configurable-search-radius-for-villagers-t.patch

@@ -1,4 +1,4 @@
-From 050790025bea61c40983bb5eb93eb11f6e36d74a Mon Sep 17 00:00:00 2001
+From b7be946d6da6ef9731a126cb8d881540d3b729d7 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Mon, 22 Jul 2019 17:32:17 -0500
 Subject: [PATCH] Implement configurable search radius for villagers to spawn
@@ -41,10 +41,10 @@ index 5727230058..daa9544453 100644
          int i = 0;
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 5539c33996..e31727c7e9 100644
+index 66dd66f062..6cc6d8015f 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -139,6 +139,13 @@ public class PurpurWorldConfig {
+@@ -136,6 +136,13 @@ public class PurpurWorldConfig {
          pillagerLimitOutpostSpawns = getInt("mobs.pillager.limit-outpost-spawns", pillagerLimitOutpostSpawns);
      }
  

patches/server/0045-Implement-elytra-settings.patch

@@ -1,4 +1,4 @@
-From d31953fe6ca7247b4cadc3f15b9d4a17b97378b3 Mon Sep 17 00:00:00 2001
+From 5dd421530fad8511fcac6377a518a79ed3ab7de9 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 25 Jul 2019 18:07:37 -0500
 Subject: [PATCH] Implement elytra settings
@@ -123,10 +123,10 @@ index 212af252be..fbc30e6ece 100644
          return this.x * this.x + this.y * this.y + this.z * this.z;
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index e31727c7e9..d2879d3833 100644
+index 6cc6d8015f..6d875b78b9 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -119,6 +119,19 @@ public class PurpurWorldConfig {
+@@ -116,6 +116,19 @@ public class PurpurWorldConfig {
          milkCuresBadOmen = getBoolean("milk-cures-bad-omen", milkCuresBadOmen);
      }
  

patches/server/0050-Implement-AFK-API.patch

@@ -1,4 +1,4 @@
-From 8a2bf04d29d12fb3d670201238c371031227ec52 Mon Sep 17 00:00:00 2001
+From d06261552766977bb5db6c507bc22df984eceea6 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 8 Aug 2019 15:29:15 -0500
 Subject: [PATCH] Implement AFK API
@@ -11,10 +11,10 @@ Subject: [PATCH] Implement AFK API
  .../net/minecraft/server/IEntitySelector.java |  2 +
  .../minecraft/server/PlayerConnection.java    | 10 +++++
  .../net/minecraft/server/WorldServer.java     |  4 +-
- .../net/pl3x/purpur/PurpurWorldConfig.java    | 16 +++++++
+ .../net/pl3x/purpur/PurpurWorldConfig.java    | 15 +++++++
  .../craftbukkit/entity/CraftPlayer.java       | 17 ++++++++
  .../java/org/spigotmc/ActivationRange.java    |  1 +
- 10 files changed, 113 insertions(+), 24 deletions(-)
+ 10 files changed, 112 insertions(+), 24 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
 index b9f678f26b..b502e589d4 100644
@@ -227,18 +227,10 @@ index fbfe37ea0a..4dfcce82de 100644
                  } else if (entityplayer.isSleeping()) {
                      ++j;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index d2879d3833..17950a8245 100644
+index 6d875b78b9..7422f361e4 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1,6 +1,7 @@
- package net.pl3x.purpur;
- 
- import com.destroystokyo.paper.PaperWorldConfig;
-+import org.bukkit.ChatColor;
- import org.bukkit.configuration.file.YamlConfiguration;
- import org.spigotmc.SpigotWorldConfig;
- 
-@@ -109,6 +110,21 @@ public class PurpurWorldConfig {
+@@ -106,6 +106,21 @@ public class PurpurWorldConfig {
          allowSignColors = getBoolean("allow-sign-colors", allowSignColors);
      }
  
@@ -253,8 +245,8 @@ index d2879d3833..17950a8245 100644
 +        idleTimeoutTickNearbyEntities = getBoolean("idle-timeout.tick-nearby-entities", idleTimeoutTickNearbyEntities);
 +        idleTimeoutCountAsSleeping = getBoolean("idle-timeout.count-as-sleeping", idleTimeoutCountAsSleeping);
 +        idleTimeoutUpdateTabList = getBoolean("idle-timeout.update-tab-list", idleTimeoutUpdateTabList);
-+        idleTimeoutBroadcastAway = ChatColor.translateAlternateColorCodes('&', getString("idle-timeout.broadcast.away", idleTimeoutBroadcastAway));
-+        idleTimeoutBroadcastBack = ChatColor.translateAlternateColorCodes('&', getString("idle-timeout.broadcast.back", idleTimeoutBroadcastBack));
++        idleTimeoutBroadcastAway = org.bukkit.ChatColor.translateAlternateColorCodes('&', getString("idle-timeout.broadcast.away", idleTimeoutBroadcastAway));
++        idleTimeoutBroadcastBack = org.bukkit.ChatColor.translateAlternateColorCodes('&', getString("idle-timeout.broadcast.back", idleTimeoutBroadcastBack));
 +    }
 +
      public boolean itemsCanBreakTurtleEggs = false;

patches/server/0052-Add-option-for-zombies-targetting-turtle-eggs.patch

@@ -1,4 +1,4 @@
-From 298180158709cdd2f19ed901f2944fb36bd8c1f3 Mon Sep 17 00:00:00 2001
+From 870cab93964729a680ca7ae59e8c9661f332ee71 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 17 Aug 2019 15:27:09 -0500
 Subject: [PATCH] Add option for zombies targetting turtle eggs
@@ -22,10 +22,10 @@ index 8f9d252c1e..e9da244d98 100644
          this.goalSelector.a(8, new PathfinderGoalRandomLookaround(this));
          this.l();
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 17950a8245..603ae7d8be 100644
+index 7422f361e4..4072aac8e4 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -175,6 +175,11 @@ public class PurpurWorldConfig {
+@@ -171,6 +171,11 @@ public class PurpurWorldConfig {
          villagerSpawnIronGolemLimit = getInt("mobs.villager.spawn-iron-golem.limit", villagerSpawnIronGolemLimit);
      }
  

patches/server/0053-Implement-bamboo-growth-settings.patch

@@ -1,4 +1,4 @@
-From 32bf5f46921685a320bdae7baebf60ab446c963d Mon Sep 17 00:00:00 2001
+From 93184f0c69419be53e1cf8107e683b3f0196b361 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 23 Aug 2019 20:57:29 -0500
 Subject: [PATCH] Implement bamboo growth settings
@@ -67,10 +67,10 @@ index 02c548dd9c..e4693fb27d 100644
          }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 0764be9d1a..8915bc9ea8 100644
+index 4072aac8e4..c6ff074b14 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -67,6 +67,13 @@ public class PurpurWorldConfig {
+@@ -63,6 +63,13 @@ public class PurpurWorldConfig {
          editableSigns = getBoolean("editable-signs", editableSigns);
      }
  
@@ -85,5 +85,5 @@ index 0764be9d1a..8915bc9ea8 100644
      private void campfireObeysGravity() {
          campfireObeysGravity = getBoolean("campfire-obeys-gravity", campfireObeysGravity);
 -- 
-2.24.0.rc1
+2.24.0
 

patches/server/0055-Ender-Dragon-always-drops-full-exp.patch

@@ -1,4 +1,4 @@
-From 000015edf660a1af0c6c7bd66e0b6de9b9870672 Mon Sep 17 00:00:00 2001
+From e0633c984825e440db28131ccbb54dbbe0509b56 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 24 Aug 2019 14:42:54 -0500
 Subject: [PATCH] Ender Dragon always drops full exp
@@ -22,10 +22,10 @@ index 5935ecb529..19395a9349 100644
          }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index e4de91a658..e8f1db88f1 100644
+index c6ff074b14..0eb8f8bfa5 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -156,8 +156,10 @@ public class PurpurWorldConfig {
+@@ -152,8 +152,10 @@ public class PurpurWorldConfig {
      }
  
      public boolean enderDragonAlwaysDropsEggBlock = false;

patches/server/0056-Dispenser-curse-of-binding-protection.patch

@@ -1,4 +1,4 @@
-From 5f11f209c5b6ad99a7f699e542b31d7e21b7339a Mon Sep 17 00:00:00 2001
+From 24865276d300025fb4c18ae0154652cfc7fa9c13 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 25 Aug 2019 00:09:52 -0500
 Subject: [PATCH] Dispenser curse of binding protection
@@ -10,7 +10,7 @@ Subject: [PATCH] Dispenser curse of binding protection
  3 files changed, 14 insertions(+), 2 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 53fffb3dc3..53b45215bc 100644
+index 79aa996f1d..116820dd81 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -902,9 +902,15 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -52,10 +52,10 @@ index cef073c81e..4014c7d116 100644
          return this.b;
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 8915bc9ea8..3ff5dc4a3b 100644
+index 0eb8f8bfa5..38d85c6389 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -107,6 +107,11 @@ public class PurpurWorldConfig {
+@@ -103,6 +103,11 @@ public class PurpurWorldConfig {
          campfiresGoOutInRain = getBoolean("campfires-go-out-in-rain", campfiresGoOutInRain);
      }
  
@@ -68,5 +68,5 @@ index 8915bc9ea8..3ff5dc4a3b 100644
      private void allowMoistSoilFromWaterBelow() {
          allowMoistSoilFromWaterBelow = getBoolean("allow-moist-soil-from-water-below", allowMoistSoilFromWaterBelow);
 -- 
-2.24.0.rc1
+2.24.0
 

patches/server/0059-Add-option-for-boats-to-eject-players-on-land.patch

@@ -1,4 +1,4 @@
-From c9997e5b02ff432c5b64261ae3612edd7ac538c3 Mon Sep 17 00:00:00 2001
+From 877f9dfcb737f543b84fb49c12f7ddcb390d6f08 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 7 Sep 2019 22:47:59 -0500
 Subject: [PATCH] Add option for boats to eject players on land
@@ -21,10 +21,10 @@ index 03624bbd6a..36969eeb2b 100644
              } else {
                  return EntityBoat.EnumStatus.IN_AIR;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 3ff5dc4a3b..f687444604 100644
+index 38d85c6389..b2c62de053 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -74,6 +74,11 @@ public class PurpurWorldConfig {
+@@ -70,6 +70,11 @@ public class PurpurWorldConfig {
          bambooSmallHeight = getInt("bamboo.small-height", bambooSmallHeight);
      }
  
@@ -37,5 +37,5 @@ index 3ff5dc4a3b..f687444604 100644
      private void campfireObeysGravity() {
          campfireObeysGravity = getBoolean("campfire-obeys-gravity", campfireObeysGravity);
 -- 
-2.24.0.rc1
+2.24.0
 

patches/server/0067-Add-block-and-fluid-tick-events.patch

@@ -1,4 +1,4 @@
-From 87e96f6f24a83d3296935af1d348dc4237296d67 Mon Sep 17 00:00:00 2001
+From 0ebf3580ed75a053cf80047aea6c28045d39bfb1 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 18 Oct 2019 23:58:56 -0500
 Subject: [PATCH] Add block and fluid tick events
@@ -10,7 +10,7 @@ Subject: [PATCH] Add block and fluid tick events
  3 files changed, 29 insertions(+), 2 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index bc02c54526..58d67168e8 100644
+index 4dfcce82de..53763216f0 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -604,7 +604,7 @@ public class WorldServer extends World {
@@ -48,11 +48,11 @@ index bc02c54526..58d67168e8 100644
          }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index f4d45baf27..10c659da7a 100644
+index b2c62de053..b82fc8d19f 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -62,6 +62,13 @@ public class PurpurWorldConfig {
-         return config.getString("world-settings." + worldName + "." + path, config.getString("world-settings.default." + path));
+@@ -58,6 +58,13 @@ public class PurpurWorldConfig {
+         return PurpurConfig.config.getString("world-settings." + worldName + "." + path, PurpurConfig.config.getString("world-settings.default." + path));
      }
  
 +    public boolean blockTickEvent = false;

patches/server/0080-Implement-infinite-lava.patch

@@ -1,4 +1,4 @@
-From b838cc63bdc601ca165c0ddf060b7e0262963acf Mon Sep 17 00:00:00 2001
+From e333cb0d9b353fcd4828e679634afa442a06e992 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 23 Nov 2019 17:55:42 -0600
 Subject: [PATCH] Implement infinite lava
@@ -69,10 +69,10 @@ index 9eba9a12c0..39252e6873 100644
      protected boolean c;
      protected boolean d;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 2df15feb81..49472a0531 100644
+index b82fc8d19f..059ecf375c 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -159,6 +159,11 @@ public class PurpurWorldConfig {
+@@ -155,6 +155,11 @@ public class PurpurWorldConfig {
          milkCuresBadOmen = getBoolean("milk-cures-bad-omen", milkCuresBadOmen);
      }
  

patches/server/0084-Despawn-egg-hatches-chicken.patch

@@ -1,4 +1,4 @@
-From 7ae71c19d4b9877650e8a0e5d0a7141799758174 Mon Sep 17 00:00:00 2001
+From 70da9dd4f68ee591b2fb3fe9013382676cd66e0d Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 29 Nov 2019 23:47:42 -0600
 Subject: [PATCH] Despawn egg hatches chicken
@@ -41,10 +41,10 @@ index e61af3f5eb..184b2a015a 100644
          Vec3D vec3d = this.getMot();
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 49472a0531..ed147a9865 100644
+index 059ecf375c..a773d5dc76 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -177,6 +177,13 @@ public class PurpurWorldConfig {
+@@ -173,6 +173,13 @@ public class PurpurWorldConfig {
          elytraDamagePerTridentBoost = getInt("elytra.damage-per-boost.trident", elytraDamagePerTridentBoost);
      }
  

patches/server/0085-Option-for-hay-block-fall-damage.patch

@@ -1,4 +1,4 @@
-From 9cdc0cd0fc7a589620fe67e0227de5888adba0bf Mon Sep 17 00:00:00 2001
+From e2b99918b8f7f859a285957c6292e3ddd21de737 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 30 Nov 2019 01:31:09 -0600
 Subject: [PATCH] Option for hay block fall damage
@@ -21,10 +21,10 @@ index ca81c49f0a..ca8f957989 100644
      }
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index ed147a9865..04b6723322 100644
+index a773d5dc76..de793add46 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -159,6 +159,11 @@ public class PurpurWorldConfig {
+@@ -155,6 +155,11 @@ public class PurpurWorldConfig {
          milkCuresBadOmen = getBoolean("milk-cures-bad-omen", milkCuresBadOmen);
      }
  

patches/server/0086-Add-sleep-options.patch

@@ -1,4 +1,4 @@
-From a390a1f62e35af6c5f9a78ec938aa7e609cc196e Mon Sep 17 00:00:00 2001
+From f9e503e9a1b4aa1513cb1e4dfc0200a16933651d Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 30 Nov 2019 03:30:17 -0600
 Subject: [PATCH] Add sleep options
@@ -73,10 +73,10 @@ index 3c9f180960..e1301d3170 100644
                  return Either.left(EntityHuman.EnumBedResult.NOT_POSSIBLE_NOW);
              }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 04b6723322..bb95f4322c 100644
+index de793add46..f81c0cde39 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -182,6 +182,13 @@ public class PurpurWorldConfig {
+@@ -178,6 +178,13 @@ public class PurpurWorldConfig {
          elytraDamagePerTridentBoost = getInt("elytra.damage-per-boost.trident", elytraDamagePerTridentBoost);
      }
  

patches/server/0089-Add-option-for-zombie-villager-transformation-chance.patch

@@ -1,4 +1,4 @@
-From d7e80122731f8bc54201f1b770c9bb5ddd4b79b9 Mon Sep 17 00:00:00 2001
+From 68a4b563397296fe762231c5cd9733b69fa83a0d Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 19 Dec 2019 16:59:46 -0600
 Subject: [PATCH] Add option for zombie villager transformation chance
@@ -35,10 +35,10 @@ index e9da244d98..0f0df08fff 100644
              }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index bb95f4322c..656349339c 100644
+index f81c0cde39..69b3bef766 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -234,4 +234,13 @@ public class PurpurWorldConfig {
+@@ -230,4 +230,13 @@ public class PurpurWorldConfig {
      private void zombieHorseSettings() {
          zombieHorseSpawnChance = (float) getDouble("mobs.zombie_horse.spawn-chance", zombieHorseSpawnChance);
      }

patches/server/0090-Add-natural-cat-spawning-options.patch

@@ -1,4 +1,4 @@
-From 8963738c69994006d9a94c00d5e2c56a19cb997d Mon Sep 17 00:00:00 2001
+From cbeb79089f1039cc7fd2d627c129912a17e1370f Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 26 Dec 2019 18:52:55 -0600
 Subject: [PATCH] Add natural cat spawning options
@@ -54,10 +54,10 @@ index 6024478dc0..034b973365 100644
          return list.size() < 1 ? this.a(blockposition, world) : 0;
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 656349339c..58dfc60ca7 100644
+index 69b3bef766..3bb968cfa1 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -189,6 +189,15 @@ public class PurpurWorldConfig {
+@@ -185,6 +185,15 @@ public class PurpurWorldConfig {
          playerSleepCondition = getString("player.sleep.condition", playerSleepCondition);
      }
  

patches/server/0091-Add-player-death-exp-control-options.patch

@@ -1,4 +1,4 @@
-From 69b14455429313df707039cdabc19c10488d4c49 Mon Sep 17 00:00:00 2001
+From fbb7a7da6ba3e70c8c4f28b8174140d4de743f7a Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 26 Dec 2019 22:08:37 -0600
 Subject: [PATCH] Add player death exp control options
@@ -35,10 +35,10 @@ index e1301d3170..36ee2cdcce 100644
              return 0;
          }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 58dfc60ca7..bc8b17ab25 100644
+index 3bb968cfa1..915b3beb2b 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -182,9 +182,13 @@ public class PurpurWorldConfig {
+@@ -178,9 +178,13 @@ public class PurpurWorldConfig {
          elytraDamagePerTridentBoost = getInt("elytra.damage-per-boost.trident", elytraDamagePerTridentBoost);
      }
  

patches/server/0095-Make-lava-flow-speed-configurable.patch

@@ -1,4 +1,4 @@
-From 66648a810a82cd772e71553dc60eeef514770c50 Mon Sep 17 00:00:00 2001
+From 5174d846270dbb9edca5f00a66f4b089d9d161f7 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 2 Jan 2020 11:31:36 -0600
 Subject: [PATCH] Make lava flow speed configurable
@@ -38,10 +38,10 @@ index 39252e6873..75f8441ab6 100644
          return this.d;
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index bc8b17ab25..118ed99007 100644
+index 915b3beb2b..a49ccf2898 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -165,8 +165,12 @@ public class PurpurWorldConfig {
+@@ -161,8 +161,12 @@ public class PurpurWorldConfig {
      }
  
      public boolean lavaInfinite = false;

patches/server/0096-Allow-beehives-to-generate-with-saplings.patch

@@ -1,4 +1,4 @@
-From 1050e92dd278f108e6c5cfeddf64c5c9961e0750 Mon Sep 17 00:00:00 2001
+From c9f6ecb656be006f75656866d86fbb2a509b8272 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 4 Jan 2020 11:41:38 -0600
 Subject: [PATCH] Allow beehives to generate with saplings
@@ -212,10 +212,10 @@ index 1998d19776..b9264c84c9 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 118ed99007..d2918411c0 100644
+index a49ccf2898..da3adb3fae 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -159,6 +159,11 @@ public class PurpurWorldConfig {
+@@ -155,6 +155,11 @@ public class PurpurWorldConfig {
          milkCuresBadOmen = getBoolean("milk-cures-bad-omen", milkCuresBadOmen);
      }
  

patches/server/0097-Add-configurable-beehive-generation-chance.patch

@@ -1,4 +1,4 @@
-From 710368d4c617cb81fcb8e0cb0a29dd3318671f5a Mon Sep 17 00:00:00 2001
+From f4bc1de0cdd05c3ea3a26bfa1afcd7f2b0238c3d Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 5 Jan 2020 12:07:28 -0600
 Subject: [PATCH] Add configurable beehive generation chance
@@ -53,10 +53,10 @@ index e85e096cd6..ca4b5b77fb 100644
          // Purpur end
              EnumDirection enumdirection = BlockBeehive.a[random.nextInt(BlockBeehive.a.length)];
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index d2918411c0..763132a918 100644
+index da3adb3fae..8fe470150e 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -160,8 +160,20 @@ public class PurpurWorldConfig {
+@@ -156,8 +156,20 @@ public class PurpurWorldConfig {
      }
  
      public boolean beeHivesGenerateFromSaplings = false;

patches/server/0099-Add-wither-skeleton-takes-wither-damage-option.patch

@@ -1,4 +1,4 @@
-From e604b031868c58c4254af9945e76a8bae968fd14 Mon Sep 17 00:00:00 2001
+From 03487b653cd66c255cc7b08f16f80df334bddd6e Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 14 Jan 2020 19:43:40 -0600
 Subject: [PATCH] Add wither skeleton takes wither damage option
@@ -21,10 +21,10 @@ index c2b93010a3..a00133f13d 100644
      }
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 763132a918..81379ac897 100644
+index 8fe470150e..3ac7f468cf 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -259,6 +259,11 @@ public class PurpurWorldConfig {
+@@ -255,6 +255,11 @@ public class PurpurWorldConfig {
          villagerSpawnIronGolemLimit = getInt("mobs.villager.spawn-iron-golem.limit", villagerSpawnIronGolemLimit);
      }