From bf7e290f254b23ed5e181aa2cc2b822cf79bd53d Mon Sep 17 00:00:00 2001
From: BillyGalbreath <blake.galbreath@gmail.com>
Date: Fri, 8 Jan 2021 22:21:16 -0600
Subject: [PATCH] Hide server-ip from timings

---
 patches/server/0004-Timings-stuff.patch                     | 5 +++--
 patches/server/0006-Barrels-and-enderchests-6-rows.patch    | 6 +++---
 patches/server/0009-AFK-API.patch                           | 2 +-
 patches/server/0011-Configurable-server-mod-name.patch      | 2 +-
 patches/server/0013-Lagging-threshold.patch                 | 6 +++---
 patches/server/0021-Alternative-Keepalive-Handling.patch    | 4 ++--
 .../0025-Logger-settings-suppressing-pointless-logs.patch   | 4 ++--
 patches/server/0034-Dont-send-useless-entity-packets.patch  | 4 ++--
 patches/server/0059-Configurable-TPS-Catchup.patch          | 4 ++--
 patches/server/0080-Add-ping-command.patch                  | 2 +-
 .../server/0086-Add-allow-water-in-end-world-option.patch   | 4 ++--
 patches/server/0091-Configurable-end-spike-seed.patch       | 2 +-
 patches/server/0092-Configurable-dungeon-seed.patch         | 2 +-
 .../0102-Add-option-to-disable-mushroom-block-updates.patch | 4 ++--
 patches/server/0107-Short-enderman-height.patch             | 4 ++--
 patches/server/0109-Ridables.patch                          | 2 +-
 .../0111-Crying-obsidian-valid-for-portal-frames.patch      | 6 +++---
 ...perPR-Add-hex-color-code-support-for-console-loggi.patch | 4 ++--
 ...6-Allow-infinite-and-mending-enchantments-together.patch | 4 ++--
 patches/server/0129-Add-tablist-suffix-option-for-afk.patch | 2 +-
 patches/server/0141-Add-demo-command.patch                  | 2 +-
 ...nfig-migration-disable-saving-projectiles-to-disk-.patch | 2 +-
 .../0149-EMC-Configurable-disable-give-dropping.patch       | 4 ++--
 ...nfig-migration-climbing-should-not-bypass-cramming.patch | 2 +-
 24 files changed, 42 insertions(+), 41 deletions(-)

diff --git a/patches/server/0004-Timings-stuff.patch b/patches/server/0004-Timings-stuff.patch
index 547c75545..151e6d7d2 100644
--- a/patches/server/0004-Timings-stuff.patch
+++ b/patches/server/0004-Timings-stuff.patch
@@ -57,10 +57,10 @@ index 5dfa0658838c4801cdf260eae8b98163f729e5af..dae2e5d70756c5b61163d57099b65f7e
              String hostName = "BrokenHost";
              try {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index cd3272520eb78a9c663bac3bfdb2b63d611d48a1..2f9381e6384d86302378782a580978f7dd1bddc6 100644
+index cd3272520eb78a9c663bac3bfdb2b63d611d48a1..00eb196f8caa2e4f2478972c14f4596071adbd2a 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -127,4 +127,9 @@ public class PurpurConfig {
+@@ -127,4 +127,10 @@ public class PurpurConfig {
          config.addDefault(path, def);
          return config.getString(path, config.getString(path));
      }
@@ -68,5 +68,6 @@ index cd3272520eb78a9c663bac3bfdb2b63d611d48a1..2f9381e6384d86302378782a580978f7
 +    public static String timingsUrl = "https://timings.pl3x.net";
 +    private static void timingsSettings() {
 +        timingsUrl = getString("settings.timings.url", timingsUrl);
++        if (!TimingsManager.hiddenConfigs.contains("server-ip")) TimingsManager.hiddenConfigs.add("server-ip");
 +    }
  }
diff --git a/patches/server/0006-Barrels-and-enderchests-6-rows.patch b/patches/server/0006-Barrels-and-enderchests-6-rows.patch
index a67130183..c8bd7f2b8 100644
--- a/patches/server/0006-Barrels-and-enderchests-6-rows.patch
+++ b/patches/server/0006-Barrels-and-enderchests-6-rows.patch
@@ -107,7 +107,7 @@ index a1c3942cbf9a6c0adc4943b05a1c3859c5f0aed6..953741c1cfd9b5c1e0eac80d1e4c7890
      }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 2f9381e6384d86302378782a580978f7dd1bddc6..1705aefab4c16b3b766152fd81c5fc60bbd8d2e7 100644
+index 00eb196f8caa2e4f2478972c14f4596071adbd2a..cb7e34924cb5dbff25d1ffe05cfe5bc22e4a90ed 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -7,6 +7,7 @@ import org.bukkit.Bukkit;
@@ -118,9 +118,9 @@ index 2f9381e6384d86302378782a580978f7dd1bddc6..1705aefab4c16b3b766152fd81c5fc60
  
  import java.io.File;
  import java.io.IOException;
-@@ -132,4 +133,23 @@ public class PurpurConfig {
-     private static void timingsSettings() {
+@@ -133,4 +134,23 @@ public class PurpurConfig {
          timingsUrl = getString("settings.timings.url", timingsUrl);
+         if (!TimingsManager.hiddenConfigs.contains("server-ip")) TimingsManager.hiddenConfigs.add("server-ip");
      }
 +
 +    public static boolean barrelSixRows = false;
diff --git a/patches/server/0009-AFK-API.patch b/patches/server/0009-AFK-API.patch
index 152febe09..11e6ad77c 100644
--- a/patches/server/0009-AFK-API.patch
+++ b/patches/server/0009-AFK-API.patch
@@ -215,7 +215,7 @@ index ff1d80c7c3271a18fa355430417dd1992b8494a8..9d4181179760140c88cda25f8082d9b6
                  } else if (entityplayer.isSleeping()) {
                      ++j;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 1705aefab4c16b3b766152fd81c5fc60bbd8d2e7..5d22e643f254e9ea52de8725497ff7c54ceb4afd 100644
+index cb7e34924cb5dbff25d1ffe05cfe5bc22e4a90ed..406e840499e09638e8b325d0e52b764e80acc777 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -1,6 +1,7 @@
diff --git a/patches/server/0011-Configurable-server-mod-name.patch b/patches/server/0011-Configurable-server-mod-name.patch
index caf0f73b1..ed3665a9e 100644
--- a/patches/server/0011-Configurable-server-mod-name.patch
+++ b/patches/server/0011-Configurable-server-mod-name.patch
@@ -18,7 +18,7 @@ index 1f2bcafbe5444fe0900dea6a493bac2ccc6b8b50..0945e9cf8a37868beb9ea13e7b889aae
  
      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 5d22e643f254e9ea52de8725497ff7c54ceb4afd..36456402ab33c68f2538134a2d11d1d3253808b1 100644
+index 406e840499e09638e8b325d0e52b764e80acc777..4627261562a1482aecf4034b8717ecccc2dd9eb0 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -139,6 +139,11 @@ public class PurpurConfig {
diff --git a/patches/server/0013-Lagging-threshold.patch b/patches/server/0013-Lagging-threshold.patch
index b4a516aba..8d846be48 100644
--- a/patches/server/0013-Lagging-threshold.patch
+++ b/patches/server/0013-Lagging-threshold.patch
@@ -25,11 +25,11 @@ index 0945e9cf8a37868beb9ea13e7b889aae827b4662..3ac30bbf7ad327372b02ed365572fd32
                      }
                      // Tuinity - replace logic
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 36456402ab33c68f2538134a2d11d1d3253808b1..e6f8f3ae5810a23aca94cd878343edae345b5ae5 100644
+index 4627261562a1482aecf4034b8717ecccc2dd9eb0..a34ed978596f1a466b0b48e7db92ac4f1345a996 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -149,6 +149,11 @@ public class PurpurConfig {
-         timingsUrl = getString("settings.timings.url", timingsUrl);
+@@ -150,6 +150,11 @@ public class PurpurConfig {
+         if (!TimingsManager.hiddenConfigs.contains("server-ip")) TimingsManager.hiddenConfigs.add("server-ip");
      }
  
 +    public static double laggingThreshold = 19.0D;
diff --git a/patches/server/0021-Alternative-Keepalive-Handling.patch b/patches/server/0021-Alternative-Keepalive-Handling.patch
index 02ab0875a..c8a22adf1 100644
--- a/patches/server/0021-Alternative-Keepalive-Handling.patch
+++ b/patches/server/0021-Alternative-Keepalive-Handling.patch
@@ -68,10 +68,10 @@ index 07fcf1646a46b867ffb0e88746b4a781ef55729b..d74986818af4fbefdd60f865d2225d61
          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 e6f8f3ae5810a23aca94cd878343edae345b5ae5..e902d7bc3e2afe273184cc262ab5929cb14ebc88 100644
+index a34ed978596f1a466b0b48e7db92ac4f1345a996..9593ac057ef5b79fb54501d7cce1e69e49102918 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -154,6 +154,11 @@ public class PurpurConfig {
+@@ -155,6 +155,11 @@ public class PurpurConfig {
          laggingThreshold = getDouble("settings.lagging-threshold", laggingThreshold);
      }
  
diff --git a/patches/server/0025-Logger-settings-suppressing-pointless-logs.patch b/patches/server/0025-Logger-settings-suppressing-pointless-logs.patch
index 4072a4924..467241dbd 100644
--- a/patches/server/0025-Logger-settings-suppressing-pointless-logs.patch
+++ b/patches/server/0025-Logger-settings-suppressing-pointless-logs.patch
@@ -17,10 +17,10 @@ index c680319e4040be2b60795b22a5e65d6444cc67ed..eaa1063ff2bc5621e93043c4de41ca62
                              }
                              // CraftBukkit end
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index e902d7bc3e2afe273184cc262ab5929cb14ebc88..b37a4b7d27dbc2103b15d97e693675a50a4c1981 100644
+index 9593ac057ef5b79fb54501d7cce1e69e49102918..ec8efc913f8f0bf6ff559a3a5b439a3d24f3a9b6 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -177,4 +177,11 @@ public class PurpurConfig {
+@@ -178,4 +178,11 @@ public class PurpurConfig {
          InventoryType.ENDER_CHEST.setDefaultSize(enderChestSixRows ? 54 : 27);
          enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
      }
diff --git a/patches/server/0034-Dont-send-useless-entity-packets.patch b/patches/server/0034-Dont-send-useless-entity-packets.patch
index d722f3073..858e7ec03 100644
--- a/patches/server/0034-Dont-send-useless-entity-packets.patch
+++ b/patches/server/0034-Dont-send-useless-entity-packets.patch
@@ -61,10 +61,10 @@ index 8e48407fd405ac4c3eece7762b8155c5d0f00fa0..91c4e658230bb8bbce9d0f56db0768a7
      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 b37a4b7d27dbc2103b15d97e693675a50a4c1981..7e4136f62e409c03d4d10aaf11526fb685d0701d 100644
+index ec8efc913f8f0bf6ff559a3a5b439a3d24f3a9b6..a2f3c5c81d93814f89a778c8c58d36b416ea1efc 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -178,6 +178,11 @@ public class PurpurConfig {
+@@ -179,6 +179,11 @@ public class PurpurConfig {
          enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
      }
  
diff --git a/patches/server/0059-Configurable-TPS-Catchup.patch b/patches/server/0059-Configurable-TPS-Catchup.patch
index a30de7bef..3a88091f0 100644
--- a/patches/server/0059-Configurable-TPS-Catchup.patch
+++ b/patches/server/0059-Configurable-TPS-Catchup.patch
@@ -24,10 +24,10 @@ index de72f058b6de539ff75858120d6d023eaae22275..1c97728959709930d280d0522ef6331f
                      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 7e4136f62e409c03d4d10aaf11526fb685d0701d..403148774d880580412888a7c03c11da380149d7 100644
+index a2f3c5c81d93814f89a778c8c58d36b416ea1efc..10900ef825f88657f287c8c5b71a89338ba54c11 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -189,4 +189,9 @@ public class PurpurConfig {
+@@ -190,4 +190,9 @@ public class PurpurConfig {
          loggerSuppressInitLegacyMaterialError = getBoolean("settings.logger.suppress-init-legacy-material-errors", loggerSuppressInitLegacyMaterialError);
          loggerSuppressIgnoredAdvancementWarnings = getBoolean("settings.logger.suppress-ignored-advancement-warnings", loggerSuppressIgnoredAdvancementWarnings);
      }
diff --git a/patches/server/0080-Add-ping-command.patch b/patches/server/0080-Add-ping-command.patch
index a9827224a..fe0c9fc11 100644
--- a/patches/server/0080-Add-ping-command.patch
+++ b/patches/server/0080-Add-ping-command.patch
@@ -67,7 +67,7 @@ index 86f1cfe454ea0a989775b49a6b88375c766ef647..da53af61d1171db3c167c6e007adf953
          if (!(this.k instanceof EntityPlayer)) {
              throw CommandListenerWrapper.a.create();
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 403148774d880580412888a7c03c11da380149d7..98dd496be218ce254fc8d82f132c51ab8cdb918a 100644
+index 10900ef825f88657f287c8c5b71a89338ba54c11..ebf74ddb9786d3bcccb62c85352bb6c2278433f3 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -133,10 +133,12 @@ public class PurpurConfig {
diff --git a/patches/server/0086-Add-allow-water-in-end-world-option.patch b/patches/server/0086-Add-allow-water-in-end-world-option.patch
index 22a8458fa..cc6178712 100644
--- a/patches/server/0086-Add-allow-water-in-end-world-option.patch
+++ b/patches/server/0086-Add-allow-water-in-end-world-option.patch
@@ -68,7 +68,7 @@ index f91d9a19b3d9870c99a03c86eb835b8ec68cc133..70870b0af64ff9cac7a211cce7cc6ab2
 +    // Purpur end
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 98dd496be218ce254fc8d82f132c51ab8cdb918a..f0298277336aedd5943e62760753e3a1737c8fa3 100644
+index ebf74ddb9786d3bcccb62c85352bb6c2278433f3..c12146fe8ac1d89c6c1051a8f64ea29a9214e64b 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -1,7 +1,6 @@
@@ -79,7 +79,7 @@ index 98dd496be218ce254fc8d82f132c51ab8cdb918a..f0298277336aedd5943e62760753e3a1
  import net.minecraft.server.MinecraftServer;
  import net.pl3x.purpur.command.PurpurCommand;
  import org.bukkit.Bukkit;
-@@ -185,6 +184,11 @@ public class PurpurConfig {
+@@ -186,6 +185,11 @@ public class PurpurConfig {
          dontSendUselessEntityPackets = getBoolean("settings.dont-send-useless-entity-packets", dontSendUselessEntityPackets);
      }
  
diff --git a/patches/server/0091-Configurable-end-spike-seed.patch b/patches/server/0091-Configurable-end-spike-seed.patch
index ec4679433..fd9b5fce6 100644
--- a/patches/server/0091-Configurable-end-spike-seed.patch
+++ b/patches/server/0091-Configurable-end-spike-seed.patch
@@ -25,7 +25,7 @@ index 00a1707209b21fc0163960c957864f798da15554..5eb9b3d35e12c2d3dc5f158cbed0b0a0
          List<WorldGenEnder.Spike> list = worldgenfeatureendspikeconfiguration.c();
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index f0298277336aedd5943e62760753e3a1737c8fa3..8d418a2ebc719cf4568bea29e1993c5bf96e6b75 100644
+index c12146fe8ac1d89c6c1051a8f64ea29a9214e64b..c86f5178590f0b496f018858e21086a594de5dce 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -1,5 +1,6 @@
diff --git a/patches/server/0092-Configurable-dungeon-seed.patch b/patches/server/0092-Configurable-dungeon-seed.patch
index c9ba123b9..c63b1a9b0 100644
--- a/patches/server/0092-Configurable-dungeon-seed.patch
+++ b/patches/server/0092-Configurable-dungeon-seed.patch
@@ -31,7 +31,7 @@ index 07f7b69fefe66ec4f26ca7b4fb3b752e80aeed07..6aa1626f38df0cd8ae8a417dc4fca213
          int i = random.nextInt(2) + 2;
          int j = -i - 1;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 8d418a2ebc719cf4568bea29e1993c5bf96e6b75..698a04682924a374af3ad9668feb4b0f324939e9 100644
+index c86f5178590f0b496f018858e21086a594de5dce..d0b4a9a1a9dea069ea543aa63b950fc5d08c9d02 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -141,10 +141,13 @@ public class PurpurConfig {
diff --git a/patches/server/0102-Add-option-to-disable-mushroom-block-updates.patch b/patches/server/0102-Add-option-to-disable-mushroom-block-updates.patch
index 33e6ed242..34604e823 100644
--- a/patches/server/0102-Add-option-to-disable-mushroom-block-updates.patch
+++ b/patches/server/0102-Add-option-to-disable-mushroom-block-updates.patch
@@ -73,10 +73,10 @@ index e8f340b9f2a1e5de9cf7e8cf595de8a806cb528a..3490af6fe0cf2eccac9753778cf4085f
  
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 698a04682924a374af3ad9668feb4b0f324939e9..3f73dcc02d94d69f5deb6f734cf0a9ec6016bb4c 100644
+index d0b4a9a1a9dea069ea543aa63b950fc5d08c9d02..17a8b43892fdab87a80cbf076c7814bfab087142 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -200,6 +200,11 @@ public class PurpurConfig {
+@@ -201,6 +201,11 @@ public class PurpurConfig {
          allowWaterPlacementInTheEnd = getBoolean("settings.allow-water-placement-in-the-end", allowWaterPlacementInTheEnd);
      }
  
diff --git a/patches/server/0107-Short-enderman-height.patch b/patches/server/0107-Short-enderman-height.patch
index 858230526..c42af47a9 100644
--- a/patches/server/0107-Short-enderman-height.patch
+++ b/patches/server/0107-Short-enderman-height.patch
@@ -30,10 +30,10 @@ index 37b984a5b6c1c6e146e1c4b0947d1e39a051cfbb..7a35a367a5840fd5df72b0bd64e63019
      public static final EntityTypes<EntityEvoker> EVOKER = a("evoker", EntityTypes.Builder.a(EntityEvoker::new, EnumCreatureType.MONSTER).a(0.6F, 1.95F).trackingRange(8));
      public static final EntityTypes<EntityEvokerFangs> EVOKER_FANGS = a("evoker_fangs", EntityTypes.Builder.a(EntityEvokerFangs::new, EnumCreatureType.MISC).a(0.5F, 0.8F).trackingRange(6).updateInterval(2));
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 3f73dcc02d94d69f5deb6f734cf0a9ec6016bb4c..7854fa516fcb6c00838955c2aa20d73b9181aa90 100644
+index 17a8b43892fdab87a80cbf076c7814bfab087142..d2b5c0fb8004c3d9c7825a41f92bf54d07e9402b 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -190,6 +190,11 @@ public class PurpurConfig {
+@@ -191,6 +191,11 @@ public class PurpurConfig {
          enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
      }
  
diff --git a/patches/server/0109-Ridables.patch b/patches/server/0109-Ridables.patch
index bdf8ab63b..c99c39a6c 100644
--- a/patches/server/0109-Ridables.patch
+++ b/patches/server/0109-Ridables.patch
@@ -5053,7 +5053,7 @@ index 44942f73c98e28821ee9d899733f44f45762b02c..d5f1808b232869ed5db8161345a03bf7
          return new Throwable(entity + " Added to world at " + new java.util.Date());
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 7854fa516fcb6c00838955c2aa20d73b9181aa90..a0d1a45c4dac6e4519231aa3d02939eee3fbd0bc 100644
+index d2b5c0fb8004c3d9c7825a41f92bf54d07e9402b..74d24ee574f8153b02d8e70a7a1bc2b498afab53 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -134,11 +134,13 @@ public class PurpurConfig {
diff --git a/patches/server/0111-Crying-obsidian-valid-for-portal-frames.patch b/patches/server/0111-Crying-obsidian-valid-for-portal-frames.patch
index 06c73d115..94adde0fa 100644
--- a/patches/server/0111-Crying-obsidian-valid-for-portal-frames.patch
+++ b/patches/server/0111-Crying-obsidian-valid-for-portal-frames.patch
@@ -42,10 +42,10 @@ index 6ef81aeb4c63bc6c23163796dbd977602ca2f540..9ea3c30b679da4e77b86d96d0cc47673
      private final GeneratorAccess b;
      private final EnumDirection.EnumAxis c;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index a0d1a45c4dac6e4519231aa3d02939eee3fbd0bc..a00deb9347b22012b4bd27dfbd85846c49658dcf 100644
+index 74d24ee574f8153b02d8e70a7a1bc2b498afab53..a8a995792653f88bc7ef7bfc0dd0fcd88972266a 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -176,6 +176,7 @@ public class PurpurConfig {
+@@ -177,6 +177,7 @@ public class PurpurConfig {
      public static boolean barrelSixRows = false;
      public static boolean enderChestSixRows = false;
      public static boolean enderChestPermissionRows = false;
@@ -53,7 +53,7 @@ index a0d1a45c4dac6e4519231aa3d02939eee3fbd0bc..a00deb9347b22012b4bd27dfbd85846c
      private static void blockSettings() {
          if (version < 3) {
              boolean oldValue = getBoolean("settings.barrel.packed-barrels", true);
-@@ -190,6 +191,7 @@ public class PurpurConfig {
+@@ -191,6 +192,7 @@ public class PurpurConfig {
          enderChestSixRows = getBoolean("settings.blocks.ender_chest.six-rows", enderChestSixRows);
          InventoryType.ENDER_CHEST.setDefaultSize(enderChestSixRows ? 54 : 27);
          enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
diff --git a/patches/server/0118-PaperPR-Add-hex-color-code-support-for-console-loggi.patch b/patches/server/0118-PaperPR-Add-hex-color-code-support-for-console-loggi.patch
index 76e60206a..edda49040 100644
--- a/patches/server/0118-PaperPR-Add-hex-color-code-support-for-console-loggi.patch
+++ b/patches/server/0118-PaperPR-Add-hex-color-code-support-for-console-loggi.patch
@@ -63,10 +63,10 @@ index 685deaa0e5d1ddc13e3a7c0471b1cfcf1710c869..2a0ada490b15b0c4939dd4304f86e016
 +    }
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index a00deb9347b22012b4bd27dfbd85846c49658dcf..8fe0239311748fd234c05dd76832ebb6806f6a2f 100644
+index a8a995792653f88bc7ef7bfc0dd0fcd88972266a..eee8b6af02b9009050b64e7dfc0c6b55c9d4b62a 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -216,9 +216,11 @@ public class PurpurConfig {
+@@ -217,9 +217,11 @@ public class PurpurConfig {
  
      public static boolean loggerSuppressInitLegacyMaterialError = false;
      public static boolean loggerSuppressIgnoredAdvancementWarnings = false;
diff --git a/patches/server/0126-Allow-infinite-and-mending-enchantments-together.patch b/patches/server/0126-Allow-infinite-and-mending-enchantments-together.patch
index 0268ba019..9264f3d5a 100644
--- a/patches/server/0126-Allow-infinite-and-mending-enchantments-together.patch
+++ b/patches/server/0126-Allow-infinite-and-mending-enchantments-together.patch
@@ -17,10 +17,10 @@ index 408cfa460920f74e0394ab27101ecb12cceb9c43..3d4e34f7070a48c436284ba7744a94ae
      }
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 8fe0239311748fd234c05dd76832ebb6806f6a2f..847e8363c9d5083ea4b015456abfe3bb2552e257 100644
+index eee8b6af02b9009050b64e7dfc0c6b55c9d4b62a..19c0c16f448d368c1bf2137592272d50a11f592e 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -194,6 +194,16 @@ public class PurpurConfig {
+@@ -195,6 +195,16 @@ public class PurpurConfig {
          cryingObsidianValidForPortalFrame = getBoolean("settings.blocks.crying_obsidian.valid-for-portal-frame", cryingObsidianValidForPortalFrame);
      }
  
diff --git a/patches/server/0129-Add-tablist-suffix-option-for-afk.patch b/patches/server/0129-Add-tablist-suffix-option-for-afk.patch
index e55b051a2..155d9515b 100644
--- a/patches/server/0129-Add-tablist-suffix-option-for-afk.patch
+++ b/patches/server/0129-Add-tablist-suffix-option-for-afk.patch
@@ -22,7 +22,7 @@ index 3c748cca91e5f83701e6ae83f76e7548dad35420..d677b4477a871790377348a112fa2671
  
          ((WorldServer) world).everyoneSleeping();
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 847e8363c9d5083ea4b015456abfe3bb2552e257..208e192980faff20767a9bddcb458e301755310d 100644
+index 19c0c16f448d368c1bf2137592272d50a11f592e..c3e93904e4f431201207989d3afa66a196473cde 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -133,12 +133,14 @@ public class PurpurConfig {
diff --git a/patches/server/0141-Add-demo-command.patch b/patches/server/0141-Add-demo-command.patch
index 1cd206619..67ef6ab4e 100644
--- a/patches/server/0141-Add-demo-command.patch
+++ b/patches/server/0141-Add-demo-command.patch
@@ -30,7 +30,7 @@ index 08cbc787e2bf6587878bdeffa7248e5d23cdcf98..57d39ed441ec7be933f4fce48225f527
      public static final PacketPlayOutGameStateChange.a h = new PacketPlayOutGameStateChange.a(7);
      public static final PacketPlayOutGameStateChange.a i = new PacketPlayOutGameStateChange.a(8);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 208e192980faff20767a9bddcb458e301755310d..4709fe0db33d64406c3c52991626a377f0a8cf93 100644
+index c3e93904e4f431201207989d3afa66a196473cde..eb8714835984dc5a74f25db6b57df5cadb5a61a4 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -134,6 +134,7 @@ public class PurpurConfig {
diff --git a/patches/server/0146-Config-migration-disable-saving-projectiles-to-disk-.patch b/patches/server/0146-Config-migration-disable-saving-projectiles-to-disk-.patch
index 3b60fc43e..6bc774caf 100644
--- a/patches/server/0146-Config-migration-disable-saving-projectiles-to-disk-.patch
+++ b/patches/server/0146-Config-migration-disable-saving-projectiles-to-disk-.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Config migration: disable saving projectiles to disk ->
 
 
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 4709fe0db33d64406c3c52991626a377f0a8cf93..0c1f22249061f600fce2d4d627f0683f461977ba 100644
+index eb8714835984dc5a74f25db6b57df5cadb5a61a4..151cd80a2c76db18aaf35bf28bb61f698447445e 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -1,6 +1,7 @@
diff --git a/patches/server/0149-EMC-Configurable-disable-give-dropping.patch b/patches/server/0149-EMC-Configurable-disable-give-dropping.patch
index 0a1afaabe..9d9f699fa 100644
--- a/patches/server/0149-EMC-Configurable-disable-give-dropping.patch
+++ b/patches/server/0149-EMC-Configurable-disable-give-dropping.patch
@@ -20,10 +20,10 @@ index 1d22c45af884a917e77e02c272fcbae74794200c..7bf90f27fdc48440ef229cca0e100d2c
                      itemstack.setCount(1);
                      entityitem = entityplayer.drop(itemstack, false);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 0c1f22249061f600fce2d4d627f0683f461977ba..4ea4abc4f03123fa4be7e19b777d4afa0d2002ae 100644
+index 151cd80a2c76db18aaf35bf28bb61f698447445e..1a7c274d7a5dc03ff96f05e52941ecea3368c0d9 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-@@ -188,6 +188,11 @@ public class PurpurConfig {
+@@ -189,6 +189,11 @@ public class PurpurConfig {
      private static void useAlternateKeepAlive() {
          useAlternateKeepAlive = getBoolean("settings.use-alternate-keepalive", useAlternateKeepAlive);
      }
diff --git a/patches/server/0150-Config-migration-climbing-should-not-bypass-cramming.patch b/patches/server/0150-Config-migration-climbing-should-not-bypass-cramming.patch
index 768dca49e..9bb034841 100644
--- a/patches/server/0150-Config-migration-climbing-should-not-bypass-cramming.patch
+++ b/patches/server/0150-Config-migration-climbing-should-not-bypass-cramming.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Config migration: climbing should not bypass cramming
 
 
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 4ea4abc4f03123fa4be7e19b777d4afa0d2002ae..dbda80c9a57dc7a1882a00020b407dd69a187649 100644
+index 1a7c274d7a5dc03ff96f05e52941ecea3368c0d9..57571919e566ebc54204aa1b2ba8bd0e9be621a9 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -142,6 +142,17 @@ public class PurpurConfig {