Make purpur.lang reloadable with

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

@@ -1,4 +1,4 @@
-From 6d54e386f9aee77d38d503e587507142d959e77e Mon Sep 17 00:00:00 2001
+From cc20b9003b0b7dbc01173445f4a2a8ad6a326795 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
@@ -8,16 +8,16 @@ Subject: [PATCH] Purpur config files
  .../net/minecraft/server/DedicatedServer.java |   9 +
  src/main/java/net/minecraft/server/World.java |   4 +-
  src/main/java/net/pl3x/purpur/Metrics.java    | 598 ++++++++++++++++++
- .../java/net/pl3x/purpur/PurpurCommand.java   |  66 ++
+ .../java/net/pl3x/purpur/PurpurConfig.java    | 136 ++++
- .../java/net/pl3x/purpur/PurpurConfig.java    | 135 ++++
  .../net/pl3x/purpur/PurpurWorldConfig.java    |  67 ++
+ .../pl3x/purpur/command/PurpurCommand.java    |  67 ++
  .../org/bukkit/craftbukkit/CraftServer.java   |  15 +
  .../java/org/bukkit/craftbukkit/Main.java     |   8 +
- 9 files changed, 902 insertions(+), 2 deletions(-)
+ 9 files changed, 904 insertions(+), 2 deletions(-)
  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
  create mode 100644 src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+ create mode 100644 src/main/java/net/pl3x/purpur/command/PurpurCommand.java
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 index 1c4cd36351..cb8bac539d 100644
@@ -684,88 +684,17 @@ index 0000000000..9210afab6d
 +        }
 +    }
 +}
-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..f8cf4ad234
---- /dev/null
-+++ b/src/main/java/net/pl3x/purpur/PurpurCommand.java
-@@ -0,0 +1,66 @@
-+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].equalsIgnoreCase("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.");
-+        }
-+
-+        else if (args[0].equalsIgnoreCase("version")) {
-+            Command verCmd = org.bukkit.Bukkit.getServer().getCommandMap().getCommand("version");
-+            if (verCmd != null) {
-+                return verCmd.execute(sender, commandLabel, new String[0]);
-+            }
-+        }
-+
-+        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..706d787579
+index 0000000000..83466b5837
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -0,0 +1,135 @@
+@@ -0,0 +1,136 @@
 +package net.pl3x.purpur;
 +
 +import com.google.common.base.Throwables;
 +import net.minecraft.server.MinecraftServer;
++import net.pl3x.purpur.command.PurpurCommand;
 +import org.bukkit.Bukkit;
 +import org.bukkit.command.Command;
 +import org.bukkit.configuration.InvalidConfigurationException;
@@ -970,6 +899,79 @@ index 0000000000..eda37fa43f
 +        return PurpurConfig.config.getString("world-settings." + worldName + "." + path, PurpurConfig.config.getString("world-settings.default." + path));
 +    }
 +}
+diff --git a/src/main/java/net/pl3x/purpur/command/PurpurCommand.java b/src/main/java/net/pl3x/purpur/command/PurpurCommand.java
+new file mode 100644
+index 0000000000..7d983d9a54
+--- /dev/null
++++ b/src/main/java/net/pl3x/purpur/command/PurpurCommand.java
+@@ -0,0 +1,67 @@
++package net.pl3x.purpur.command;
++
++import net.minecraft.server.MinecraftServer;
++import net.minecraft.server.WorldServer;
++import net.pl3x.purpur.PurpurConfig;
++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.Collections;
++import java.util.List;
++import java.util.stream.Collectors;
++import java.util.stream.Stream;
++
++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 Stream.of("reload", "version")
++                    .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].equalsIgnoreCase("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();
++            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.");
++        }
++
++        else if (args[0].equalsIgnoreCase("version")) {
++            Command verCmd = org.bukkit.Bukkit.getServer().getCommandMap().getCommand("version");
++            if (verCmd != null) {
++                return verCmd.execute(sender, commandLabel, new String[0]);
++            }
++        }
++
++        return true;
++    }
++}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 index 76fbbb620c..aa084a56b2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java

patches/server/0004-Add-language-asset-purpur.lang.patch

@@ -1,13 +1,14 @@
-From ac7403d39a928740071cf70a4af0293d41041326 Mon Sep 17 00:00:00 2001
+From e4bd0958cd47d0622cb38e650bb52fe529f9b067 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 26 Mar 2020 13:17:09 -0500
 Subject: [PATCH] Add language asset purpur.lang
 
 ---
  .../net/minecraft/server/EntityPlayer.java    |  1 +
- .../net/minecraft/server/LocaleLanguage.java  | 38 ++++++++++++++++++-
+ .../net/minecraft/server/LocaleLanguage.java  | 48 +++++++++++++++++--
+ .../pl3x/purpur/command/PurpurCommand.java    |  3 ++
  src/main/resources/purpur.lang                |  1 +
- 3 files changed, 38 insertions(+), 2 deletions(-)
+ 4 files changed, 49 insertions(+), 4 deletions(-)
  create mode 100644 src/main/resources/purpur.lang
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -23,10 +24,10 @@ index fb38975830..74085c0511 100644
              if (!future.isSuccess() && (chatmessagetype == ChatMessageType.GAME_INFO || chatmessagetype == ChatMessageType.SYSTEM)) {
                  boolean flag = true;
 diff --git a/src/main/java/net/minecraft/server/LocaleLanguage.java b/src/main/java/net/minecraft/server/LocaleLanguage.java
-index 6012739331..17527965c7 100644
+index 6012739331..75707adcd7 100644
 --- a/src/main/java/net/minecraft/server/LocaleLanguage.java
 +++ b/src/main/java/net/minecraft/server/LocaleLanguage.java
-@@ -15,6 +15,7 @@ import java.util.Map.Entry;
+@@ -15,18 +15,41 @@ import java.util.Map.Entry;
  import java.util.regex.Pattern;
  import org.apache.logging.log4j.LogManager;
  import org.apache.logging.log4j.Logger;
@@ -34,13 +35,17 @@ index 6012739331..17527965c7 100644
  
  public class LocaleLanguage {
  
-@@ -25,8 +26,31 @@ public class LocaleLanguage {
+     private static final Logger LOGGER = LogManager.getLogger();
-     private long e;
+     private static final Pattern b = Pattern.compile("%(\\d+\\$)?[\\d\\.]*[df]");
+     private static final LocaleLanguage c = new LocaleLanguage();
+-    private final Map<String, String> d = Maps.newHashMap();
+-    private long e;
++    private final Map<String, String> d = Maps.newHashMap(); public Map<String, String> getStorage() { return this.d; } // Purpur - OBFHELPER
++    private long e; public long getLastUpdateTime() { return this.e; } public void setLastUpdateTime(int time) { this.e = time; } // Purpur - OBFHELPER
  
      public LocaleLanguage() {
 +        // Purpur start
-+        loadFromJar("/assets/minecraft/lang/en_us.json");
++        reload(this);
-+        loadFromFile("purpur.lang");
 +    }
 +
 +    private void loadFromFile(String resource) {
@@ -67,7 +72,7 @@ index 6012739331..17527965c7 100644
              Throwable throwable = null;
  
              try {
-@@ -60,7 +84,7 @@ public class LocaleLanguage {
+@@ -60,7 +83,7 @@ public class LocaleLanguage {
  
              }
          } catch (JsonParseException | IOException ioexception) {
@@ -76,12 +81,19 @@ index 6012739331..17527965c7 100644
          }
  
      }
-@@ -88,4 +112,14 @@ public class LocaleLanguage {
+@@ -88,4 +111,21 @@ public class LocaleLanguage {
      public long b() {
          return this.e;
      }
 +
 +    // Purpur start
++    public static void reload(LocaleLanguage instance) {
++        instance.setLastUpdateTime(0);
++        instance.getStorage().clear();
++        instance.loadFromJar("/assets/minecraft/lang/en_us.json");
++        instance.loadFromFile("purpur.lang");
++    }
++
 +    public static ChatMessage translate(String key, Object... args) {
 +        String str = getInstance().translateKey(key);
 +        if (str == null) return null;
@@ -91,6 +103,26 @@ index 6012739331..17527965c7 100644
 +    }
 +    // Purpur end
  }
+diff --git a/src/main/java/net/pl3x/purpur/command/PurpurCommand.java b/src/main/java/net/pl3x/purpur/command/PurpurCommand.java
+index 7d983d9a54..36260e0ec8 100644
+--- a/src/main/java/net/pl3x/purpur/command/PurpurCommand.java
++++ b/src/main/java/net/pl3x/purpur/command/PurpurCommand.java
+@@ -1,5 +1,6 @@
+ package net.pl3x.purpur.command;
+ 
++import net.minecraft.server.LocaleLanguage;
+ import net.minecraft.server.MinecraftServer;
+ import net.minecraft.server.WorldServer;
+ import net.pl3x.purpur.PurpurConfig;
+@@ -45,6 +46,8 @@ public class PurpurCommand extends Command {
+             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.");
+ 
++            LocaleLanguage.reload(LocaleLanguage.getInstance());
++
+             MinecraftServer console = MinecraftServer.getServer();
+             PurpurConfig.init((File) console.options.valueOf("purpur-settings"));
+             for (WorldServer world : console.getWorlds()) {
 diff --git a/src/main/resources/purpur.lang b/src/main/resources/purpur.lang
 new file mode 100644
 index 0000000000..0967ef424b

patches/server/0006-Host-our-own-timings.patch

@@ -1,4 +1,4 @@
-From 528c7a2c9941aafc4c1ade433028e5946a445572 Mon Sep 17 00:00:00 2001
+From c86a00013a0ea39096208b3be3d88f744018dc4c Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 18 Feb 2020 20:38:34 -0600
 Subject: [PATCH] Host our own timings
@@ -8,10 +8,10 @@ Subject: [PATCH] Host our own timings
  1 file changed, 4 insertions(+)
 
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 706d787579..f234832e6f 100644
+index 83466b5837..ccc80a00d0 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -132,4 +132,8 @@ public class PurpurConfig {
+@@ -133,4 +133,8 @@ public class PurpurConfig {
          config.addDefault(path, def);
          return config.getString(path, config.getString(path));
      }

patches/server/0008-Logger-settings-suppressing-pointless-logs.patch

@@ -1,4 +1,4 @@
-From 1f81122ea3f898adc0068b8723bb2136ab5cce2c Mon Sep 17 00:00:00 2001
+From deaf74d47f71b21d051c46207f2c6ca6877e93a4 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 00:52:12 -0500
 Subject: [PATCH] Logger settings (suppressing pointless logs)
@@ -35,10 +35,10 @@ index 73402f2b5a..1c2320cc54 100644
              return new WorldGenFeatureConfigured<>(WorldGenerator.NO_OP, WorldGenFeatureEmptyConfiguration.e);
          }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index f234832e6f..345404c3a1 100644
+index ccc80a00d0..3ddd11219d 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -133,6 +133,15 @@ public class PurpurConfig {
+@@ -134,6 +134,15 @@ public class PurpurConfig {
          return config.getString(path, config.getString(path));
      }
  

patches/server/0038-Dont-send-useless-entity-packets.patch

@@ -1,4 +1,4 @@
-From 0615cce725fded5d85634ddd864dab33a6b3a9b9 Mon Sep 17 00:00:00 2001
+From d3b9c34a0236d4c693f4917b495674f77d66700a Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 6 Jul 2019 17:00:04 -0500
 Subject: [PATCH] Dont send useless entity packets
@@ -66,10 +66,10 @@ index e5da2b19c1..5b1d959354 100644
      protected boolean h;
      protected boolean i;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 345404c3a1..e219312168 100644
+index 3ddd11219d..c8940f52b4 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 {
+@@ -143,6 +143,11 @@ public class PurpurConfig {
          loggerSuppressWorldGenFeatureDeserializationError = getBoolean("settings.logger.suppress-world-gen-feature-deserialization-errors", loggerSuppressWorldGenFeatureDeserializationError);
      }
  

patches/server/0049-Implement-lagging-threshold.patch

@@ -1,4 +1,4 @@
-From bc78a0fa91cf5f14809754da9f5f28cd6413bce7 Mon Sep 17 00:00:00 2001
+From 2db5c40be842351587214c5de7058509df7c456f Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Tue, 23 Jul 2019 10:07:16 -0500
 Subject: [PATCH] Implement lagging threshold
@@ -30,10 +30,10 @@ index 11ba4a8c06..6887c2ffd2 100644
                      }
                      chunksTasksRan = 0; // Paper
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index e219312168..b608b1deb3 100644
+index c8940f52b4..d3729c0896 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 {
+@@ -143,6 +143,11 @@ public class PurpurConfig {
          loggerSuppressWorldGenFeatureDeserializationError = getBoolean("settings.logger.suppress-world-gen-feature-deserialization-errors", loggerSuppressWorldGenFeatureDeserializationError);
      }
  

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

@@ -1,4 +1,4 @@
-From 64b784befcca6b4662238e5a7ef93fcf35ae04f9 Mon Sep 17 00:00:00 2001
+From a4dc0303af430efc90020a1f4251a55f3969e7e8 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
@@ -47,10 +47,10 @@ index 01f32659d9..52ab86f0b1 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index b608b1deb3..0f69284a72 100644
+index d3729c0896..391fe7a512 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 {
+@@ -153,6 +153,11 @@ public class PurpurConfig {
          dontSendUselessEntityPackets = getBoolean("settings.dont-send-useless-entity-packets", dontSendUselessEntityPackets);
      }
  

patches/server/0062-Alternative-Keepalive-Handling.patch

@@ -1,4 +1,4 @@
-From 453cb1e7cf0a3c89572dc257de590ed4b74f3053 Mon Sep 17 00:00:00 2001
+From 7c1f60cee753f6b992262cde23a649037fd80235 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 11 Oct 2019 00:17:39 -0500
 Subject: [PATCH] Alternative Keepalive Handling
@@ -74,10 +74,10 @@ index f92516069a..b60b71a15d 100644
          if (this.awaitingKeepAlive && packetplayinkeepalive.b() == this.h) {
              int i = (int) (SystemUtils.getMonotonicMillis() - this.lastKeepAlive);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 0f69284a72..777f167293 100644
+index 391fe7a512..bcd6837d46 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 {
+@@ -148,6 +148,11 @@ public class PurpurConfig {
          laggingThreshold = getDouble("settings.lagging-threshold", laggingThreshold);
      }
  

patches/server/0066-Barrels-have-6-rows.patch

@@ -1,4 +1,4 @@
-From d5c2ca13c73fb5250a39e89858e7dc0c9d0dc8c6 Mon Sep 17 00:00:00 2001
+From 14a292ed71211ddc7ce139d495d826ac05a02885 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] Barrels have 6 rows
@@ -40,10 +40,10 @@ index 1e27abbea0..ca3b6c9aae 100644
      }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 777f167293..392f4f8771 100644
+index bcd6837d46..7ce48323ae 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -6,6 +6,7 @@ import org.bukkit.Bukkit;
+@@ -7,6 +7,7 @@ import org.bukkit.Bukkit;
  import org.bukkit.command.Command;
  import org.bukkit.configuration.InvalidConfigurationException;
  import org.bukkit.configuration.file.YamlConfiguration;
@@ -51,7 +51,7 @@ index 777f167293..392f4f8771 100644
  
  import java.io.File;
  import java.io.IOException;
-@@ -157,8 +158,16 @@ public class PurpurConfig {
+@@ -158,8 +159,16 @@ public class PurpurConfig {
          dontSendUselessEntityPackets = getBoolean("settings.dont-send-useless-entity-packets", dontSendUselessEntityPackets);
      }
  

patches/server/0067-Enderchest-6-rows-plus-permissions.patch

@@ -1,4 +1,4 @@
-From 375a8337c5992e617ebcddeba44ced534b932ad5 Mon Sep 17 00:00:00 2001
+From a846ead72d1914e2ab5c8bf0d8d428631070cfc4 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] Enderchest 6 rows (plus permissions)
@@ -58,10 +58,10 @@ index fd31b9a6dc..903c02e9ef 100644
          // CraftBukkit end
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 392f4f8771..3f8648cd71 100644
+index 7ce48323ae..16f5c9d372 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -160,14 +160,22 @@ public class PurpurConfig {
+@@ -161,14 +161,22 @@ public class PurpurConfig {
  
      public static boolean barrelSixRows = false;
      public static boolean slimeBlocksNotPushable = false;

patches/server/0089-UPnP-Port-Forwarding-Service.patch

@@ -1,4 +1,4 @@
-From ac1ceac801068a5e93a7f75cc102ddeb62d04f9c Mon Sep 17 00:00:00 2001
+From 3f95f3fb3a8ab2517225ece2f5ec447c58128be3 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Wed, 22 Jan 2020 20:13:40 -0600
 Subject: [PATCH] UPnP Port Forwarding Service
@@ -107,10 +107,10 @@ index 1577308be6..2a3b4f309c 100644
  
      public String getServerIp() {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 3f8648cd71..acf5ea62a0 100644
+index 16f5c9d372..c4ec515557 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -153,6 +153,11 @@ public class PurpurConfig {
+@@ -154,6 +154,11 @@ public class PurpurConfig {
          useAlternateKeepAlive = getBoolean("settings.use-alternate-keepalive", useAlternateKeepAlive);
      }
  

patches/server/0100-Configurable-server-mod-name.patch

@@ -1,4 +1,4 @@
-From b0bc21755a5e38baabe4784ff0c3ea29e981c651 Mon Sep 17 00:00:00 2001
+From 09e58e194d78c13e0a8749307549b16afca28dda Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 21 Mar 2020 11:47:39 -0500
 Subject: [PATCH] Configurable server mod name
@@ -22,10 +22,10 @@ index 2a3b4f309c..b7e0e0a977 100644
  
      public CrashReport b(CrashReport crashreport) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index acf5ea62a0..42eedc9955 100644
+index c4ec515557..dd3afd4a57 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -184,6 +184,11 @@ public class PurpurConfig {
+@@ -185,6 +185,11 @@ public class PurpurConfig {
          slimeBlocksNotPushable = getBoolean("settings.blocks.slime.not-movable-by-piston", slimeBlocksNotPushable);
      }
  

patches/server/0102-Configurable-TPS-Catchup.patch

@@ -1,4 +1,4 @@
-From 4245196c677145462c0bf13ce6eb3c30f084c60c Mon Sep 17 00:00:00 2001
+From 54f229f3b96bb8359a993ec786682476fe86ae23 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 26 Mar 2020 19:06:22 -0500
 Subject: [PATCH] Configurable TPS Catchup
@@ -27,10 +27,10 @@ index b7e0e0a977..b6da0884cd 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 42eedc9955..3cc03c9e85 100644
+index dd3afd4a57..c55e5c1f27 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -158,6 +158,11 @@ public class PurpurConfig {
+@@ -159,6 +159,11 @@ public class PurpurConfig {
          useUPnP = getBoolean("settings.upnp-port-forwarding", useUPnP);
      }
  

patches/server/0105-Configurable-enchantment-max-level.patch

@@ -1,4 +1,4 @@
-From 1eccc9c002bd9a1aae3dd8b3ebd19c49a43fa455 Mon Sep 17 00:00:00 2001
+From 61e33c354ed40f8da623cee42e41e9ff1d7de334 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Wed, 1 Apr 2020 17:21:42 -0500
 Subject: [PATCH] Configurable enchantment max level
@@ -740,7 +740,7 @@ index 4571cdf021..aa3cbd523a 100644
      public float a(int i, EnumMonsterType enummonstertype) {
          return this.a == 0 ? 1.0F + (float) Math.max(0, i - 1) * 0.5F : (this.a == 1 && enummonstertype == EnumMonsterType.UNDEAD ? (float) i * 2.5F : (this.a == 2 && enummonstertype == EnumMonsterType.ARTHROPOD ? (float) i * 2.5F : 0.0F));
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 3cc03c9e85..b42b3dfa72 100644
+index c55e5c1f27..e09cc77785 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -1,6 +1,8 @@
@@ -750,9 +750,9 @@ index 3cc03c9e85..b42b3dfa72 100644
 +import net.minecraft.server.Enchantment;
 +import net.minecraft.server.IRegistry;
  import net.minecraft.server.MinecraftServer;
+ import net.pl3x.purpur.command.PurpurCommand;
  import org.bukkit.Bukkit;
- import org.bukkit.command.Command;
+@@ -198,4 +200,12 @@ public class PurpurConfig {
-@@ -197,4 +199,12 @@ public class PurpurConfig {
      private static void timingsSettings() {
          getString("settings.timings.url", "https://timings.pl3x.net");
      }

patches/server/0111-Async-recalc-perms-and-command-map.patch

@@ -1,4 +1,4 @@
-From 5b23f784db460c764a221b7a8851720d0483753a Mon Sep 17 00:00:00 2001
+From 89cadb880367ca553254aaee8372031eaa1eef5b Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Wed, 8 Apr 2020 23:01:20 -0500
 Subject: [PATCH] Async recalc perms and command map
@@ -37,10 +37,10 @@ index 0d985b83d8..e0004fb644 100644
          if (entityplayer.playerConnection != null) {
              byte b0;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index b42b3dfa72..0c4c4ee9d2 100644
+index e09cc77785..9ef407f346 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -207,4 +207,9 @@ public class PurpurConfig {
+@@ -208,4 +208,9 @@ public class PurpurConfig {
              enchantment.setMaxLevel(maxLevel);
          }
      }

patches/server/0114-MC-4-Fix-Item-position-desync.patch

@@ -1,4 +1,4 @@
-From d5fba49f71128ec363e9fb12ce82118208b87f0d Mon Sep 17 00:00:00 2001
+From ec96758f556e1a9ffb87bdad591fa22df602e952 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 6 Jul 2019 21:12:58 -0500
 Subject: [PATCH] MC-4 Fix - Item position desync
@@ -44,10 +44,10 @@ index 5b1d959354..0010448e3a 100644
          return (new Vec3D((double) i, (double) j, (double) k)).a(2.44140625E-4D);
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 0c4c4ee9d2..6a3723202c 100644
+index 9ef407f346..31c5eec50c 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -166,8 +166,10 @@ public class PurpurConfig {
+@@ -167,8 +167,10 @@ public class PurpurConfig {
      }
  
      public static boolean dontSendUselessEntityPackets = false;

patches/server/0120-Tuinity-Delay-chunk-unloads.patch

@@ -1,4 +1,4 @@
-From 422d878acd677f420368f77dd5ffda99770d3d12 Mon Sep 17 00:00:00 2001
+From 268092bc3630f2ac33f396e0f0d4ddc8f3cf4ede Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Fri, 25 Oct 2019 02:11:30 -0700
 Subject: [PATCH] Tuinity - Delay chunk unloads
@@ -185,7 +185,7 @@ index 4b87ca2ecb..346e2ebc79 100644
      public static <T> TicketType<T> a(String s, Comparator<T> comparator) {
          return new TicketType<>(s, comparator, 0L);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 6a3723202c..eda4be515c 100644
+index 31c5eec50c..66258ea47b 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -4,6 +4,7 @@ import com.google.common.base.Throwables;
@@ -193,10 +193,10 @@ index 6a3723202c..eda4be515c 100644
  import net.minecraft.server.IRegistry;
  import net.minecraft.server.MinecraftServer;
 +import net.minecraft.server.TicketType;
+ import net.pl3x.purpur.command.PurpurCommand;
  import org.bukkit.Bukkit;
  import org.bukkit.command.Command;
- import org.bukkit.configuration.InvalidConfigurationException;
+@@ -215,4 +216,12 @@ public class PurpurConfig {
-@@ -214,4 +215,12 @@ public class PurpurConfig {
      private static void updatePermsAndCommandsAsync() {
          updatePermsAndCommandsAsync = getBoolean("settings.update-permissions-and-commands-async", updatePermsAndCommandsAsync);
      }