Fix some options showing multiple times

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

@@ -1,61 +1,44 @@
-From cf4910c1723f54cdd5f195294ef83f7950eb16f2 Mon Sep 17 00:00:00 2001
+From a0e09aac9b0c78e4791feb0d6daad4f83f6cc348 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
 
 ---
- .../minecraft/server/EnderDragonBattle.java   |  4 +++-
- .../java/net/pl3x/purpur/PurpurConfig.java    | 19 +++++++++++++++++++
- 2 files changed, 22 insertions(+), 1 deletion(-)
+ .../java/net/minecraft/server/EnderDragonBattle.java  |  2 +-
+ src/main/java/net/pl3x/purpur/PurpurConfig.java       | 11 +++++++++++
+ 2 files changed, 12 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/EnderDragonBattle.java b/src/main/java/net/minecraft/server/EnderDragonBattle.java
-index 6700c8c65..8dab537e9 100644
+index 6700c8c65..c7470d285 100644
 --- a/src/main/java/net/minecraft/server/EnderDragonBattle.java
 +++ b/src/main/java/net/minecraft/server/EnderDragonBattle.java
-@@ -13,6 +13,8 @@ import java.util.Set;
- import java.util.UUID;
- import java.util.function.Predicate;
- import javax.annotation.Nullable;
-+
-+import net.pl3x.purpur.PurpurConfig;
- import org.apache.logging.log4j.LogManager;
- import org.apache.logging.log4j.Logger;
- 
-@@ -356,7 +358,7 @@ public class EnderDragonBattle {
+@@ -356,7 +356,7 @@ public class EnderDragonBattle {
              this.bossBattle.setVisible(false);
              this.a(true);
              this.n();
 -            if (!this.l) {
-+            if (PurpurConfig.enderDragonAlwaysDropsEggBlock || !this.l) { // Purpur - always place dragon egg
++            if (net.pl3x.purpur.PurpurConfig.enderDragonAlwaysDropsEggBlock || !this.l) { // Purpur - always place dragon egg
                  this.d.setTypeUpdate(this.d.getHighestBlockYAt(HeightMap.Type.MOTION_BLOCKING, WorldGenEndTrophy.a), Blocks.DRAGON_EGG.getBlockData());
              }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 4c25d358f..16fb9478a 100644
+index 4c25d358f..b450ffc53 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -142,6 +142,25 @@ public class PurpurConfig {
+@@ -142,6 +142,17 @@ public class PurpurConfig {
          feedMushroomsToCows = getInt("settings.mobs.cow.feed-mushrooms-for-mooshroom", feedMushroomsToCows);
      }
  
 +    public static boolean enderDragonAlwaysDropsEggBlock = false;
 +    private static void enderDragonSettings() {
 +        if (version < 2) {
-+            boolean oldValue = getBoolean("ender-dragon-death-always-places-egg-block", enderDragonAlwaysDropsEggBlock);
-+            oldValue = getBoolean("settings.ender-dragon-death-always-places-egg-block", oldValue);
-+
-+            set("ender-dragon-death-always-places-egg-block", null);
-+            set("settings.ender-dragon-death-always-places-egg-block", null);
++            boolean oldValue = config.getBoolean("ender-dragon-death-always-places-egg-block", enderDragonAlwaysDropsEggBlock);
++            oldValue = config.getBoolean("settings.ender-dragon-death-always-places-egg-block", oldValue);
 +
 +            set("settings.mobs.ender-dragon.always-drop-egg-block", oldValue);
 +        }
 +        enderDragonAlwaysDropsEggBlock = getBoolean("settings.mobs.ender-dragon.always-drop-egg-block", enderDragonAlwaysDropsEggBlock);
 +    }
-+
-+    public static boolean tulipsChangeFoxType = true;
-+    private static void foxSettings() {
-+        tulipsChangeFoxType = getBoolean("settings.mobs.fox.tulips-change-type", tulipsChangeFoxType);
-+    }
 +
      public static boolean giantsNaturallySpawn = true;
      public static boolean giantsHaveAI = true;

patches/server/0026-Make-Iron-Golems-Swim.patch

@@ -1,4 +1,4 @@
-From 9d56f2f8acd6a601abd773cd803cb8227a5ea2e8 Mon Sep 17 00:00:00 2001
+From fc1090d07ca3bceb0e087d718eb2ee727843c14f Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 15 Jun 2019 03:12:15 -0500
 Subject: [PATCH] Make Iron Golems Swim
@@ -21,10 +21,10 @@ index 2c34ab337..9bb033336 100644
          this.goalSelector.a(1, new PathfinderGoalMeleeAttack(this, 1.0D, true));
          this.goalSelector.a(2, new PathfinderGoalMoveTowardsTarget(this, 0.9D, 32.0F));
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 16fb9478a..1c63724c4 100644
+index b450ffc53..777f1a5fc 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -168,6 +168,11 @@ public class PurpurConfig {
+@@ -160,6 +160,11 @@ public class PurpurConfig {
          giantsHaveAI = getBoolean("settings.mobs.giant.have-ai", giantsHaveAI);
      }
  

patches/server/0028-Controllable-Minecarts.patch

@@ -1,4 +1,4 @@
-From f48a623d39ee69754756d20656d4a954011d50ac Mon Sep 17 00:00:00 2001
+From 6bed4b809a302f4792a8ebcff626741efea0eb00 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 29 Jun 2019 02:32:40 -0500
 Subject: [PATCH] Controllable Minecarts
@@ -111,7 +111,7 @@ index ec96fa0a4..9ad3cc298 100644
      }
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 1c63724c4..f5dcdda6c 100644
+index 777f1a5fc..0e20e0b13 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -1,9 +1,13 @@
@@ -128,7 +128,7 @@ index 1c63724c4..f5dcdda6c 100644
  import org.bukkit.configuration.InvalidConfigurationException;
  import org.bukkit.configuration.file.YamlConfiguration;
  import org.bukkit.event.inventory.InventoryType;
-@@ -317,4 +321,30 @@ public class PurpurConfig {
+@@ -309,4 +313,30 @@ public class PurpurConfig {
          ridableZombiePigman = getBoolean("settings.ridable.zombie_pigman", ridableZombiePigman);
          ridableZombieVillager = getBoolean("settings.ridable.zombie_villager", ridableZombieVillager);
      }

patches/server/0030-Make-illusioners-naturally-spawn.patch

@@ -1,4 +1,4 @@
-From bc945b320b5dd3c71df603969f0ed00c8e81e581 Mon Sep 17 00:00:00 2001
+From 8c0bd778fe20cdb8f7d7e8113400c9d96eeffe89 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 5 Jul 2019 11:09:25 -0500
 Subject: [PATCH] Make illusioners naturally spawn
@@ -54,10 +54,10 @@ index 694075cb1..966ef81c6 100644
                                                  // Purpur end
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 24c0e86eb..9b96ee52c 100644
+index 749dce0b4..d44b7b173 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -177,6 +177,11 @@ public class PurpurConfig {
+@@ -169,6 +169,11 @@ public class PurpurConfig {
          giantsHaveAI = getBoolean("settings.mobs.giant.have-ai", giantsHaveAI);
      }
  

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

@@ -1,4 +1,4 @@
-From cd4dc13e8fffc6724060aa215d56649459f0e72a Mon Sep 17 00:00:00 2001
+From 2922bb6e1c02352f23e17784f7cfefb4eaefb05b 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
@@ -9,7 +9,7 @@ Subject: [PATCH] Add chance for zombie horse natural spawns
  2 files changed, 17 insertions(+), 6 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 163d4fa85..f996c2c24 100644
+index 75492a655..7ffcc1f1a 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -477,12 +477,18 @@ public class WorldServer extends World {
@@ -38,10 +38,10 @@ index 163d4fa85..f996c2c24 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/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 75104cee6..d09aadb01 100644
+index 0e3a64e85..538ebb7fd 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -213,6 +213,11 @@ public class PurpurConfig {
+@@ -205,6 +205,11 @@ public class PurpurConfig {
          snowmanPumpkinPutBack = getBoolean("settings.mobs.snow_golem.pumpkin-can-be-added-back", snowmanPumpkinPutBack);
      }
  

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

@@ -1,4 +1,4 @@
-From eb22727e3d1c2598a5c8a5ae405a033c9937b2d9 Mon Sep 17 00:00:00 2001
+From 1c2af02b95c6fc297b6c6e1dd13d5dfffc813405 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 5760a1836..54ccc93f1 100644
  
          public PathfinderGoalAnger(EntityPigZombie entitypigzombie) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index d09aadb01..b0f5c3db3 100644
+index 538ebb7fd..4ce905aba 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -206,6 +206,11 @@ public class PurpurConfig {
+@@ -198,6 +198,11 @@ public class PurpurConfig {
          phantomsOrbitCrystalsRadius = getDouble("settings.mobs.phantom.orbit-crystal-radius", phantomsOrbitCrystalsRadius);
      }
  

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

@@ -1,4 +1,4 @@
-From 714752c1c6b7745937c85881108589ba4b72a161 Mon Sep 17 00:00:00 2001
+From 6fdcebd77a151ef668b74d43b3823a8be700d73d 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
@@ -6,7 +6,8 @@ Subject: [PATCH] Tulips change fox type
 ---
  .../java/net/minecraft/server/EntityFox.java  | 27 +++++++++++++++++++
  src/main/java/net/minecraft/server/Items.java |  4 +--
- 2 files changed, 29 insertions(+), 2 deletions(-)
+ .../java/net/pl3x/purpur/PurpurConfig.java    |  5 ++++
+ 3 files changed, 34 insertions(+), 2 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java
 index e9f6b3931..07891a055 100644
@@ -75,6 +76,22 @@ index 987297634..eed256349 100644
      public static final Item bc = a(Blocks.PINK_TULIP, CreativeModeTab.c);
      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/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
+index 4ce905aba..c4f1ab8f2 100644
+--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
++++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
+@@ -172,6 +172,11 @@ public class PurpurConfig {
+         enderDragonAlwaysDropsEggBlock = getBoolean("settings.mobs.ender-dragon.always-drop-egg-block", enderDragonAlwaysDropsEggBlock);
+     }
+ 
++    public static boolean tulipsChangeFoxType = true;
++    private static void foxSettings() {
++        tulipsChangeFoxType = getBoolean("settings.mobs.fox.tulips-change-type", tulipsChangeFoxType);
++    }
++
+     public static boolean giantsNaturallySpawn = true;
+     public static boolean giantsHaveAI = true;
+     private static void giantsSettings() {
 -- 
 2.23.0.rc1
 

patches/server/0047-Implement-configurable-villager-brain-ticks.patch

@@ -1,4 +1,4 @@
-From 043cff4c73d4c0da58cbaaacbd87264dc245b086 Mon Sep 17 00:00:00 2001
+From 9e5e09ccddfe2aea09de7693fca3e0af87969fe0 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Tue, 23 Jul 2019 08:28:21 -0500
 Subject: [PATCH] Implement configurable villager brain ticks
@@ -40,10 +40,10 @@ index 70e8a422a..da3fb4b57 100644
          this.world.getMethodProfiler().exit();
          if (!this.dY() && this.bE > 0) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 1c4e6ec06..24db73807 100644
+index cdfd39374..ed2cdf509 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -233,6 +233,13 @@ public class PurpurConfig {
+@@ -230,6 +230,13 @@ public class PurpurConfig {
          snowmanPumpkinPutBack = getBoolean("settings.mobs.snow_golem.pumpkin-can-be-added-back", snowmanPumpkinPutBack);
      }
  

patches/server/0049-Add-option-to-disable-pillager-patrols.patch

@@ -1,4 +1,4 @@
-From 3477e1051bc8669ed64f25f102f604cf0fa33c75 Mon Sep 17 00:00:00 2001
+From c5510ce78aa5573cb977a87a40dcb94d9ba227fa Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 27 Jul 2019 17:20:35 -0500
 Subject: [PATCH] Add option to disable pillager patrols
@@ -21,10 +21,10 @@ index bb612b386..99bb38f03 100644
              return 0;
          } else {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 24db73807..16e7c1aed 100644
+index ed2cdf509..4243cd4d7 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -226,6 +226,11 @@ public class PurpurConfig {
+@@ -223,6 +223,11 @@ public class PurpurConfig {
          pigmenDontTargetUnlessHit = getBoolean("settings.mobs.pigmen.dont-target-unless-hit", pigmenDontTargetUnlessHit);
      }
  

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

@@ -1,4 +1,4 @@
-From ba75df9df7be44b80bb5c590c9e3e3e12c8c44cb Mon Sep 17 00:00:00 2001
+From 0328d210600672ab34ff98907333c8f0e39ada6f 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 96676a786..b426941f5 100644
          this.goalSelector.a(8, new PathfinderGoalRandomLookaround(this));
          this.l();
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 9dca0fce2..9532bf349 100644
+index 973cf6586..4f6df3ba6 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -262,6 +262,11 @@ public class PurpurConfig {
+@@ -259,6 +259,11 @@ public class PurpurConfig {
          villagerBrainTicks = getInt("settings.mobs.villager.brain-ticks", villagerBrainTicks);
      }
  

patches/server/0058-Option-for-slimes-not-pushable.patch

@@ -1,12 +1,12 @@
-From 95a99311f4b9e531e4308604b51b1a7c0e47578f Mon Sep 17 00:00:00 2001
+From 51c6e0b1fa1ac7f9eac376a30d2ad37f88e45569 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 23 Aug 2019 21:56:31 -0500
 Subject: [PATCH] Option for slimes not pushable
 
 ---
  src/main/java/net/minecraft/server/BlockSlime.java |  5 +++++
- src/main/java/net/pl3x/purpur/PurpurConfig.java    | 14 ++++++++++++++
- 2 files changed, 19 insertions(+)
+ src/main/java/net/pl3x/purpur/PurpurConfig.java    | 11 +++++++++++
+ 2 files changed, 16 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/BlockSlime.java b/src/main/java/net/minecraft/server/BlockSlime.java
 index fd54958f6..0f4cdd5ed 100644
@@ -23,21 +23,18 @@ index fd54958f6..0f4cdd5ed 100644
 +    }
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 9532bf349..808a5bb8a 100644
+index 4f6df3ba6..14930aea7 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -284,6 +284,20 @@ public class PurpurConfig {
+@@ -281,6 +281,17 @@ public class PurpurConfig {
          InventoryType.BARREL.setDefaultSize(packedBarrels ? 54 : 27);
      }
  
 +    public static boolean slimeBlocksNotPushable = false;
 +    private static void slimeBlocksNotPushable() {
 +        if (version < 2) {
-+            boolean oldValue = getBoolean("slimes-not-pushable", slimeBlocksNotPushable);
-+            oldValue = getBoolean("settings.slimes-not-pushable", oldValue);
-+
-+            set("slimes-not-pushable", null);
-+            set("settings.slimes-not-pushable", null);
++            boolean oldValue = config.getBoolean("slimes-not-pushable", slimeBlocksNotPushable);
++            oldValue = config.getBoolean("settings.slimes-not-pushable", oldValue);
 +
 +            set("settings.slime-blocks-not-pushable", oldValue);
 +        }

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

@@ -1,4 +1,4 @@
-From 059b482a5264839ee16e36b76c1ef067a263b722 Mon Sep 17 00:00:00 2001
+From 58354b185e7f9cc352e79508fd3f2cff1d75af9a 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,7 +22,7 @@ index 6a6367a2e..578676fec 100644
          }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 0d1ee157b..d85f3daa7 100644
+index 14930aea7..46c31ad1c 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -194,6 +194,7 @@ public class PurpurConfig {
@@ -32,8 +32,8 @@ index 0d1ee157b..d85f3daa7 100644
 +    public static boolean enderDragonAlwaysDropsFullExp = false;
      private static void enderDragonSettings() {
          if (version < 2) {
-             boolean oldValue = getBoolean("ender-dragon-death-always-places-egg-block", enderDragonAlwaysDropsEggBlock);
-@@ -205,6 +206,7 @@ public class PurpurConfig {
+             boolean oldValue = config.getBoolean("ender-dragon-death-always-places-egg-block", enderDragonAlwaysDropsEggBlock);
+@@ -202,6 +203,7 @@ public class PurpurConfig {
              set("settings.mobs.ender-dragon.always-drop-egg-block", oldValue);
          }
          enderDragonAlwaysDropsEggBlock = getBoolean("settings.mobs.ender-dragon.always-drop-egg-block", enderDragonAlwaysDropsEggBlock);