Add /purpur command for reloading purpur.yml

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

@@ -1,24 +1,26 @@
-From a7a2dcc5ee627a8bc612f05449f5fc4f2ea36e1a Mon Sep 17 00:00:00 2001
+From 31d2f745b9a6252ba2da812d09aaea1391785bb2 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
 
 ---
- .../net/minecraft/server/DedicatedServer.java |   8 ++
+ .../net/minecraft/server/DedicatedServer.java |   9 ++
  src/main/java/net/minecraft/server/World.java |   3 +
- .../java/net/pl3x/purpur/PurpurConfig.java    | 113 ++++++++++++++++++
- .../net/pl3x/purpur/PurpurWorldConfig.java    |  63 ++++++++++
+ .../java/net/pl3x/purpur/PurpurCommand.java   |  59 ++++++++
+ .../java/net/pl3x/purpur/PurpurConfig.java    | 127 ++++++++++++++++++
+ .../net/pl3x/purpur/PurpurWorldConfig.java    |  63 +++++++++
  .../org/bukkit/craftbukkit/CraftServer.java   |   2 +
  .../java/org/bukkit/craftbukkit/Main.java     |   8 ++
- 6 files changed, 197 insertions(+)
+ 7 files changed, 271 insertions(+)
+ create mode 100644 src/main/java/net/pl3x/purpur/PurpurCommand.java
  create mode 100644 src/main/java/net/pl3x/purpur/PurpurConfig.java
  create mode 100644 src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index c1473330fa..3e32c211c7 100644
+index c1473330fa..f438323be1 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
-@@ -174,6 +174,14 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+@@ -174,6 +174,15 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
              return false;
          }
          com.destroystokyo.paper.PaperConfig.registerCommands();
@@ -29,6 +31,7 @@ index c1473330fa..3e32c211c7 100644
 +            DedicatedServer.LOGGER.error("Unable to load server configuration", e);
 +            return false;
 +        }
++        net.pl3x.purpur.PurpurConfig.registerCommands();
 +        // Purpur end
          com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // load version history now
          // Paper end
@@ -54,16 +57,83 @@ index a7a35d6a6f..c8f198fdf0 100644
          this.generator = gen;
          this.world = new CraftWorld((WorldServer) this, gen, env);
          this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
+diff --git a/src/main/java/net/pl3x/purpur/PurpurCommand.java b/src/main/java/net/pl3x/purpur/PurpurCommand.java
+new file mode 100644
+index 0000000000..293ed7da5f
+--- /dev/null
++++ b/src/main/java/net/pl3x/purpur/PurpurCommand.java
+@@ -0,0 +1,59 @@
++package net.pl3x.purpur;
++
++import net.minecraft.server.MinecraftServer;
++import net.minecraft.server.WorldServer;
++import org.bukkit.ChatColor;
++import org.bukkit.Location;
++import org.bukkit.command.Command;
++import org.bukkit.command.CommandSender;
++
++import java.io.File;
++import java.util.Arrays;
++import java.util.Collections;
++import java.util.List;
++import java.util.stream.Collectors;
++
++public class PurpurCommand extends Command {
++    public PurpurCommand(String name) {
++        super(name);
++        this.description = "Purpur related commands";
++        this.usageMessage = "/purpur [reload | version]";
++        this.setPermission("bukkit.command.purpur");
++    }
++
++    @Override
++    public List<String> tabComplete(CommandSender sender, String alias, String[] args, Location location) throws IllegalArgumentException {
++        if (args.length == 1) {
++            return Arrays.asList("reload", "version").stream()
++                    .filter(arg -> arg.startsWith(args[0].toLowerCase()))
++                    .collect(Collectors.toList());
++        }
++        return Collections.emptyList();
++    }
++
++    @Override
++    public boolean execute(CommandSender sender, String commandLabel, String[] args) {
++        if (!testPermission(sender)) return true;
++
++        if (args.length != 1) {
++            sender.sendMessage(ChatColor.RED + "Usage: " + usageMessage);
++            return false;
++        }
++
++        if (args[0].equals("reload")) {
++            Command.broadcastCommandMessage(sender, ChatColor.RED + "Please note that this command is not supported and may cause issues.");
++            Command.broadcastCommandMessage(sender, ChatColor.RED + "If you encounter any issues please use the /stop command to restart your server.");
++
++            MinecraftServer console = MinecraftServer.getServer();
++            net.pl3x.purpur.PurpurConfig.init((File) console.options.valueOf("purpur-settings"));
++            for (WorldServer world : console.getWorlds()) {
++                world.purpurConfig.init();
++            }
++            console.server.reloadCount++;
++
++            Command.broadcastCommandMessage(sender, ChatColor.GREEN + "Purpur config reload complete.");
++        }
++
++        return true;
++    }
++}
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 new file mode 100644
-index 0000000000..108450adcb
+index 0000000000..2f87a929c1
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -0,0 +1,113 @@
+@@ -0,0 +1,127 @@
 +package net.pl3x.purpur;
 +
 +import com.google.common.base.Throwables;
++import net.minecraft.server.MinecraftServer;
 +import org.bukkit.Bukkit;
++import org.bukkit.command.Command;
 +import org.bukkit.configuration.InvalidConfigurationException;
 +import org.bukkit.configuration.file.YamlConfiguration;
 +
@@ -72,7 +142,9 @@ index 0000000000..108450adcb
 +import java.lang.reflect.InvocationTargetException;
 +import java.lang.reflect.Method;
 +import java.lang.reflect.Modifier;
++import java.util.HashMap;
 +import java.util.List;
++import java.util.Map;
 +import java.util.logging.Level;
 +
 +public class PurpurConfig {
@@ -88,6 +160,7 @@ index 0000000000..108450adcb
 +            + "Docs: https://purpur.readthedocs.org/ \n";
 +    private static File CONFIG_FILE;
 +    static YamlConfiguration config;
++    static Map<String, Command> commands;
 +    private static int version;
 +    private static boolean verbose;
 +
@@ -96,7 +169,7 @@ index 0000000000..108450adcb
 +        config = new YamlConfiguration();
 +        try {
 +            config.load(CONFIG_FILE);
-+        } catch (IOException ex) {
++        } catch (IOException ignore) {
 +        } catch (InvalidConfigurationException ex) {
 +            Bukkit.getLogger().log(Level.SEVERE, "Could not load purpur.yml, please correct your syntax errors", ex);
 +            throw Throwables.propagate(ex);
@@ -105,6 +178,9 @@ index 0000000000..108450adcb
 +        config.options().copyDefaults(true);
 +        verbose = getBoolean("verbose", false);
 +
++        commands = new HashMap<>();
++        commands.put("purpur", new PurpurCommand("purpur"));
++
 +        version = getInt("config-version", CONFIG_VERSION);
 +        set("config-version", version);
 +
@@ -121,6 +197,12 @@ index 0000000000..108450adcb
 +        }
 +    }
 +
++    public static void registerCommands() {
++        for (Map.Entry<String, Command> entry : commands.entrySet()) {
++            MinecraftServer.getServer().server.getCommandMap().register(entry.getKey(), "Purpur", entry.getValue());
++        }
++    }
++
 +    static void readConfig(Class<?> clazz, Object instance) {
 +        for (Method method : clazz.getDeclaredMethods()) {
 +            if (Modifier.isPrivate(method.getModifiers())) {

patches/server/0003-cows-to-mooshroom-when-fed-mushrooms.patch

@@ -1,4 +1,4 @@
-From a0d76f3208f533582021f3a6333bff412464ecf4 Mon Sep 17 00:00:00 2001
+From cfbb0bb30d3e59592aeb8799880857a3a88f92c1 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 4 May 2019 01:10:30 -0500
 Subject: [PATCH] cows to mooshroom when fed mushrooms
@@ -131,10 +131,10 @@ index d2c2e3cc33..f053ff0e50 100644
      public EntityCow createChild(EntityAgeable entityageable) {
          return (EntityCow) EntityTypes.COW.a(this.world);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 108450adcb..dd73d846ab 100644
+index 2f87a929c1..3a1a6b9671 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -110,4 +110,9 @@ public class PurpurConfig {
+@@ -124,4 +124,9 @@ public class PurpurConfig {
          config.addDefault(path, def);
          return config.getString(path, config.getString(path));
      }

patches/server/0007-Snowman-set-pumpkin-on-off-by-player-interaction.patch

@@ -1,4 +1,4 @@
-From 896623d503e309ef34c1f9b38157852cec97645e Mon Sep 17 00:00:00 2001
+From 64c7e4e5d7c36b73a4a012fa258066a3913feba4 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 3 May 2019 23:58:44 -0500
 Subject: [PATCH] Snowman set pumpkin on/off by player interaction
@@ -9,7 +9,7 @@ Subject: [PATCH] Snowman set pumpkin on/off by player interaction
  2 files changed, 26 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntitySnowman.java b/src/main/java/net/minecraft/server/EntitySnowman.java
-index 8677f08184..fb36306b90 100644
+index fe1381cc17..e106b1dce4 100644
 --- a/src/main/java/net/minecraft/server/EntitySnowman.java
 +++ b/src/main/java/net/minecraft/server/EntitySnowman.java
 @@ -2,12 +2,14 @@ package net.minecraft.server;
@@ -60,10 +60,10 @@ index 8677f08184..fb36306b90 100644
  
          return super.a(entityhuman, enumhand);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index dd73d846ab..25112d6570 100644
+index 3a1a6b9671..1666412782 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -115,4 +115,11 @@ public class PurpurConfig {
+@@ -129,4 +129,11 @@ public class PurpurConfig {
      private static void cowsSettings() {
          feedMushroomsToCows = getInt("settings.mobs.cow.feed-mushrooms-for-mooshroom", feedMushroomsToCows);
      }

patches/server/0011-Integrate-ridables.patch

@@ -1,4 +1,4 @@
-From b515e212f65d06776d89622a0a1ae9a4d19ab25a Mon Sep 17 00:00:00 2001
+From a467968ed0cd18565c3c27a9a612dc6305722436 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Tue, 30 Apr 2019 19:17:21 -0500
 Subject: [PATCH] Integrate ridables
@@ -3095,7 +3095,7 @@ index 80354beb4d..f1561a927e 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 3396983adf..15a75c9404 100644
+index 2a3997149a..9dfddd980b 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -35,6 +35,7 @@ public class EntityZombie extends EntityMonster {
@@ -4086,10 +4086,10 @@ index a2fc2cd802..8f064526b2 100644
  
          return (d0 * d0 >= 0.029999999329447746D || this.b.pitch == 0.0F || Math.abs(this.b.pitch) >= 10.0F || !this.b.isInWater()) && !this.b.onGround;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 25112d6570..7239ad273a 100644
+index 1666412782..1fe54bb161 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -111,6 +111,11 @@ public class PurpurConfig {
+@@ -125,6 +125,11 @@ public class PurpurConfig {
          return config.getString(path, config.getString(path));
      }
  
@@ -4101,7 +4101,7 @@ index 25112d6570..7239ad273a 100644
      public static int feedMushroomsToCows = 5;
      private static void cowsSettings() {
          feedMushroomsToCows = getInt("settings.mobs.cow.feed-mushrooms-for-mooshroom", feedMushroomsToCows);
-@@ -122,4 +127,117 @@ public class PurpurConfig {
+@@ -136,4 +141,117 @@ public class PurpurConfig {
          snowmanDropsPumpkin = getBoolean("settings.mobs.snow_golem.drops-pumpkin-when-sheared", snowmanDropsPumpkin);
          snowmanPumpkinPutBack = getBoolean("settings.mobs.snow_golem.pumpkin-can-be-added-back", snowmanPumpkinPutBack);
      }

patches/server/0013-Make-giants-naturally-spawn-and-have-AI.patch

@@ -1,4 +1,4 @@
-From 677fc4c86d5a60ea81466d589965df52b7998c7c Mon Sep 17 00:00:00 2001
+From 19eee04e36e465587cc15e413a773221c07ec6dd Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 12 May 2019 00:43:12 -0500
 Subject: [PATCH] Make giants naturally spawn and have AI
@@ -106,10 +106,10 @@ index b7e2022b19..28b93ce736 100644
      }
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 7239ad273a..9e4adbb56c 100644
+index 1fe54bb161..162ab011ea 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -121,6 +121,13 @@ public class PurpurConfig {
+@@ -135,6 +135,13 @@ public class PurpurConfig {
          feedMushroomsToCows = getInt("settings.mobs.cow.feed-mushrooms-for-mooshroom", feedMushroomsToCows);
      }
  

patches/server/0017-Tick-loop-config-options.patch

@@ -1,4 +1,4 @@
-From 097fb95e55092078634a4fa36161cf604a76a801 Mon Sep 17 00:00:00 2001
+From 9e356f5a39c2f99c1ed2457c98d15aa535883f9e Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Wed, 22 May 2019 22:30:08 -0500
 Subject: [PATCH] Tick loop config options
@@ -59,10 +59,10 @@ index 5ec9a980c9..0324a90ca5 100644
                      this.methodProfiler.exit();
                      this.methodProfiler.b();
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 9e4adbb56c..d898522095 100644
+index 162ab011ea..442e37752f 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -111,6 +111,13 @@ public class PurpurConfig {
+@@ -125,6 +125,13 @@ public class PurpurConfig {
          return config.getString(path, config.getString(path));
      }
  

patches/server/0019-Packed-Barrels.patch

@@ -1,4 +1,4 @@
-From d20e4109ad982a6786df88e400ea100271d6ceb4 Mon Sep 17 00:00:00 2001
+From 020ef00e027d3e9df7d21966eb2bf34780961a69 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 23 May 2019 21:50:37 -0500
 Subject: [PATCH] Packed Barrels
@@ -9,7 +9,7 @@ Subject: [PATCH] Packed Barrels
  2 files changed, 8 insertions(+), 2 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/TileEntityBarrel.java b/src/main/java/net/minecraft/server/TileEntityBarrel.java
-index 4c71d8e1d1..045bf3b6b3 100644
+index 76f298336a..befb47d4dd 100644
 --- a/src/main/java/net/minecraft/server/TileEntityBarrel.java
 +++ b/src/main/java/net/minecraft/server/TileEntityBarrel.java
 @@ -56,7 +56,7 @@ public class TileEntityBarrel extends TileEntityLootable {
@@ -39,10 +39,10 @@ index 4c71d8e1d1..045bf3b6b3 100644
      }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index d898522095..3f89fb222a 100644
+index 442e37752f..5ebce40027 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -142,6 +142,11 @@ public class PurpurConfig {
+@@ -156,6 +156,11 @@ public class PurpurConfig {
          snowmanPumpkinPutBack = getBoolean("settings.mobs.snow_golem.pumpkin-can-be-added-back", snowmanPumpkinPutBack);
      }
  

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

@@ -1,4 +1,4 @@
-From b83ace346ad25db57b1c0db8024b2480bfd64ba6 Mon Sep 17 00:00:00 2001
+From 56241bb04ea8cb1494e462fc42f11515301913d4 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 6700c8c658..f0c77eb6c1 100644
              }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 3f89fb222a..e7ce46002a 100644
+index 5ebce40027..5e066f7253 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -147,6 +147,11 @@ public class PurpurConfig {
+@@ -161,6 +161,11 @@ public class PurpurConfig {
          packedBarrels = getBoolean("settings.packed-barrels", packedBarrels);
      }
  

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

@@ -1,4 +1,4 @@
-From 4aedd5650bafc65683e95343338459516781dc43 Mon Sep 17 00:00:00 2001
+From e364713b50306d38da22b851676b656a5057a8be 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
@@ -9,7 +9,7 @@ Subject: [PATCH] Make Iron Golems Swim
  2 files changed, 6 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/EntityIronGolem.java b/src/main/java/net/minecraft/server/EntityIronGolem.java
-index 41ad48c963..632d16cafd 100644
+index fd6a926cae..fd7972289c 100644
 --- a/src/main/java/net/minecraft/server/EntityIronGolem.java
 +++ b/src/main/java/net/minecraft/server/EntityIronGolem.java
 @@ -14,6 +14,7 @@ public class EntityIronGolem extends EntityGolem {
@@ -21,10 +21,10 @@ index 41ad48c963..632d16cafd 100644
          this.goalSelector.a(2, new PathfinderGoalMoveTowardsTarget(this, 0.9D, 32.0F));
          this.goalSelector.a(2, new PathfinderGoalStrollVillage(this, 0.6D));
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index e7ce46002a..c808ed50ef 100644
+index 5e066f7253..703fbab6e6 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -135,6 +135,11 @@ public class PurpurConfig {
+@@ -149,6 +149,11 @@ public class PurpurConfig {
          giantsHaveAI = getBoolean("settings.mobs.giant.have-ai", giantsHaveAI);
      }
  

patches/server/0032-Phantoms-spawn-naturally-in-the-end.patch

@@ -1,4 +1,4 @@
-From fd0bed9291b83e36b08ca54a76b99725bb9611fb Mon Sep 17 00:00:00 2001
+From a5647dc8df2a486be84ea8b22c12981f33c6d318 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 20 Jun 2019 18:48:58 -0500
 Subject: [PATCH] Phantoms spawn naturally in the end
@@ -80,10 +80,10 @@ index b442e09eb4..3e16cb2bc7 100644
                                                  EntityPositionTypes.Surface entitypositiontypes_surface = EntityPositionTypes.a(entitytypes);
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index c808ed50ef..afe16a7f55 100644
+index 703fbab6e6..542ac964a8 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -140,6 +140,11 @@ public class PurpurConfig {
+@@ -154,6 +154,11 @@ public class PurpurConfig {
          ironGolemSwims = getBoolean("settings.mobs.iron_golem.swims", ironGolemSwims);
      }
  

patches/server/0035-Add-large-sized-ender-chests.patch

@@ -1,4 +1,4 @@
-From 08f3258212f82ee1bebb73bb73c9eb2bc1c25206 Mon Sep 17 00:00:00 2001
+From bee972ac008843d0bb783f1f0a73c0112074dbe9 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 23 Jun 2019 17:01:26 -0500
 Subject: [PATCH] Add large sized ender chests
@@ -35,10 +35,10 @@ index fd31b9a6dc..49b369236d 100644
          // CraftBukkit end
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index afe16a7f55..9c7b8f3827 100644
+index 542ac964a8..448d21d9e1 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -152,6 +152,11 @@ public class PurpurConfig {
+@@ -166,6 +166,11 @@ public class PurpurConfig {
          snowmanPumpkinPutBack = getBoolean("settings.mobs.snow_golem.pumpkin-can-be-added-back", snowmanPumpkinPutBack);
      }
  

patches/server/0037-Controllable-Minecarts.patch

@@ -1,4 +1,4 @@
-From 9da2048d2a3c85e768563be742404530ab681d5a Mon Sep 17 00:00:00 2001
+From 85436bf8d0c03d671b7afc8abfcade610999485d 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
@@ -6,8 +6,8 @@ Subject: [PATCH] Controllable Minecarts
 ---
  .../java/net/minecraft/server/Entity.java     |  1 +
  .../server/EntityMinecartAbstract.java        | 35 +++++++++++++++++++
- .../java/net/pl3x/purpur/PurpurConfig.java    | 28 +++++++++++++++
- 3 files changed, 64 insertions(+)
+ .../java/net/pl3x/purpur/PurpurConfig.java    | 25 +++++++++++++
+ 3 files changed, 61 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
 index ca429be7db..ee099b6728 100644
@@ -81,33 +81,24 @@ index 6df2930e2d..d300c05333 100644
              this.setMot(new Vec3D(this.getMot().x * this.derailedX, this.getMot().y * this.derailedY, this.getMot().z * this.derailedZ));
              // CraftBukkit end
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 9c7b8f3827..c734ecaafe 100644
+index 448d21d9e1..b5aa94e802 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -1,7 +1,12 @@
+@@ -1,9 +1,13 @@
  package net.pl3x.purpur;
  
  import com.google.common.base.Throwables;
 +import net.minecraft.server.Block;
-+import net.minecraft.server.Blocks;
 +import net.minecraft.server.IRegistry;
 +import net.minecraft.server.MinecraftKey;
+ import net.minecraft.server.MinecraftServer;
  import org.bukkit.Bukkit;
+ import org.bukkit.command.Command;
 +import org.bukkit.configuration.ConfigurationSection;
  import org.bukkit.configuration.InvalidConfigurationException;
  import org.bukkit.configuration.file.YamlConfiguration;
  
-@@ -10,7 +15,9 @@ import java.io.IOException;
- import java.lang.reflect.InvocationTargetException;
- import java.lang.reflect.Method;
- import java.lang.reflect.Modifier;
-+import java.util.HashMap;
- import java.util.List;
-+import java.util.Map;
- import java.util.logging.Level;
- 
- public class PurpurConfig {
-@@ -279,4 +286,25 @@ public class PurpurConfig {
+@@ -293,4 +297,25 @@ public class PurpurConfig {
          ridableZombiePigman = getBoolean("settings.ridable.zombie_pigman", ridableZombiePigman);
          ridableZombieVillager = getBoolean("settings.ridable.zombie_villager", ridableZombieVillager);
      }