From 293e682af4bbc3fbd786aa703784f5e639687f3b Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@Gmail.com>
Date: Tue, 1 Feb 2022 17:02:54 -0600
Subject: [PATCH] Fix PaperMC/Paper#5869

---
 ...r-settings-suppressing-pointless-logs.patch | 18 ++++++++++++++++--
 .../server/0052-Configurable-TPS-Catchup.patch |  8 ++++----
 patches/server/0237-UPnP-Port-Forwarding.patch |  6 +++---
 ...urable-valid-characters-for-usernames.patch |  4 ++--
 .../0261-Configurable-food-attributes.patch    |  4 ++--
 patches/server/0262-Max-joins-per-second.patch |  4 ++--
 6 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/patches/server/0025-Logger-settings-suppressing-pointless-logs.patch b/patches/server/0025-Logger-settings-suppressing-pointless-logs.patch
index 832d8e342..1b1c1d1c0 100644
--- a/patches/server/0025-Logger-settings-suppressing-pointless-logs.patch
+++ b/patches/server/0025-Logger-settings-suppressing-pointless-logs.patch
@@ -16,6 +16,18 @@ index f7959fe8d5247504dd79a18010470d98781c7cfe..6f5b7650d45958284f7b5c675c1e32d4
                                  PlayerAdvancements.LOGGER.warn("Ignored advancement '{}' in progress file {} - it doesn't exist anymore?", entry.getKey(), this.file);
                              }
                              // CraftBukkit end
+diff --git a/src/main/java/net/minecraft/server/level/WorldGenRegion.java b/src/main/java/net/minecraft/server/level/WorldGenRegion.java
+index 9b25d36fe5230e287d81b99be31b9eddd8e76002..298a19f7b2bd5733823afe1d0ac0b1effe37dcc6 100644
+--- a/src/main/java/net/minecraft/server/level/WorldGenRegion.java
++++ b/src/main/java/net/minecraft/server/level/WorldGenRegion.java
+@@ -286,6 +286,7 @@ public class WorldGenRegion implements WorldGenLevel {
+ 
+             return true;
+         } else {
++            if (!org.purpurmc.purpur.PurpurConfig.loggerSuppressSetBlockFarChunk)
+             Util.logAndPauseIfInIde("Detected setBlock in a far chunk [" + i + ", " + j + "], pos: " + pos + ", status: " + this.generatingStatus + (this.currentlyGenerating == null ? "" : ", currently generating: " + (String) this.currentlyGenerating.get()));
+             return false;
+         }
 diff --git a/src/main/java/net/minecraft/stats/ServerRecipeBook.java b/src/main/java/net/minecraft/stats/ServerRecipeBook.java
 index ecdac349efbea9e05ac66200c5d0f0385ad1349b..17c18d90f23477e31f98edf889b8b64b4b066fbf 100644
 --- a/src/main/java/net/minecraft/stats/ServerRecipeBook.java
@@ -41,10 +53,10 @@ index b2a15c986c7500a0ce227a54cb61ec3f5378f6f3..14600a7bc01bf61e8ffb736816d23df6
          if (MinecraftServer.getServer() != null && MinecraftServer.getServer().isDebugging()) {
              new Exception().printStackTrace();
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 7abbdaa54ce3b9471792e4f71842e363b903c2fa..d2e19fdaae731253b38311fbc1c7146ae4a2c026 100644
+index 8124b27f043beb763d70881593a883e06ea59f6e..dab104575c5a12857faffb8efc5620a123580a9e 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -230,4 +230,13 @@ public class PurpurConfig {
+@@ -230,4 +230,15 @@ public class PurpurConfig {
          org.bukkit.event.inventory.InventoryType.ENDER_CHEST.setDefaultSize(enderChestSixRows ? 54 : 27);
          enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
      }
@@ -52,9 +64,11 @@ index 7abbdaa54ce3b9471792e4f71842e363b903c2fa..d2e19fdaae731253b38311fbc1c7146a
 +    public static boolean loggerSuppressInitLegacyMaterialError = false;
 +    public static boolean loggerSuppressIgnoredAdvancementWarnings = false;
 +    public static boolean loggerSuppressUnrecognizedRecipeErrors = false;
++    public static boolean loggerSuppressSetBlockFarChunk = false;
 +    private static void loggerSettings() {
 +        loggerSuppressInitLegacyMaterialError = getBoolean("settings.logger.suppress-init-legacy-material-errors", loggerSuppressInitLegacyMaterialError);
 +        loggerSuppressIgnoredAdvancementWarnings = getBoolean("settings.logger.suppress-ignored-advancement-warnings", loggerSuppressIgnoredAdvancementWarnings);
 +        loggerSuppressUnrecognizedRecipeErrors = getBoolean("settings.logger.suppress-unrecognized-recipe-errors", loggerSuppressUnrecognizedRecipeErrors);
++        loggerSuppressSetBlockFarChunk = getBoolean("settings.logger.suppress-setblock-in-far-chunk-errors", loggerSuppressSetBlockFarChunk);
 +    }
  }
diff --git a/patches/server/0052-Configurable-TPS-Catchup.patch b/patches/server/0052-Configurable-TPS-Catchup.patch
index 0b2088040..cc708c773 100644
--- a/patches/server/0052-Configurable-TPS-Catchup.patch
+++ b/patches/server/0052-Configurable-TPS-Catchup.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable TPS Catchup
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 17f0167cd38a7f2e0dbef42738f03f2f92944f1a..2d24ddd09730ce0807d89d081b439c1a77cb14d8 100644
+index 0c7355902448b444c360259a84a7e8a10ad96f46..5e2d1e31722791f879f09705ebd491dedc6ac1da 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1268,7 +1268,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -24,12 +24,12 @@ index 17f0167cd38a7f2e0dbef42738f03f2f92944f1a..2d24ddd09730ce0807d89d081b439c1a
                      this.profiler.pop();
                      this.endMetricsRecordingTick();
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index d2e19fdaae731253b38311fbc1c7146ae4a2c026..25747c6f1aa2415217bf65ba49a6090319c740c1 100644
+index dab104575c5a12857faffb8efc5620a123580a9e..b41d73318d6795c0fa7b9c60431ef141026fa9d6 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -239,4 +239,9 @@ public class PurpurConfig {
-         loggerSuppressIgnoredAdvancementWarnings = getBoolean("settings.logger.suppress-ignored-advancement-warnings", loggerSuppressIgnoredAdvancementWarnings);
+@@ -241,4 +241,9 @@ public class PurpurConfig {
          loggerSuppressUnrecognizedRecipeErrors = getBoolean("settings.logger.suppress-unrecognized-recipe-errors", loggerSuppressUnrecognizedRecipeErrors);
+         loggerSuppressSetBlockFarChunk = getBoolean("settings.logger.suppress-setblock-in-far-chunk-errors", loggerSuppressSetBlockFarChunk);
      }
 +
 +    public static boolean tpsCatchup = true;
diff --git a/patches/server/0237-UPnP-Port-Forwarding.patch b/patches/server/0237-UPnP-Port-Forwarding.patch
index f1712d8ca..ddc451222 100644
--- a/patches/server/0237-UPnP-Port-Forwarding.patch
+++ b/patches/server/0237-UPnP-Port-Forwarding.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] UPnP Port Forwarding
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index d9e94136d8f5a3f41d2d205808105e24e2790a50..76c7430b7d167908911dc8ebb267532260374ea6 100644
+index 793f72254220ab79bec4ba3c36f79309bf99cb3d..ac06db0034a3a5522bebaad021aca14c62ab8834 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -309,6 +309,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -67,10 +67,10 @@ index 9e83f2dea73461f698185f5ffdb6060e422b9494..6b503d7bdd0eb202ff3466dc1f691102
          // CraftBukkit start
          // this.setPlayerList(new DedicatedPlayerList(this, this.registryHolder, this.playerDataStorage)); // Spigot - moved up
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 50b946518a1cc4ba2483cf2753037dc07429229c..c1328d9de75b8394848ad4a0a31e080173e494c2 100644
+index c09107111bc09e2359c6d661ff50bdbe46ca8cc5..3b0f8883ac1aa84de0d6db46d689cd7362692c1c 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -416,4 +416,9 @@ public class PurpurConfig {
+@@ -418,4 +418,9 @@ public class PurpurConfig {
      private static void tpsCatchup() {
          tpsCatchup = getBoolean("settings.tps-catchup", tpsCatchup);
      }
diff --git a/patches/server/0252-Configurable-valid-characters-for-usernames.patch b/patches/server/0252-Configurable-valid-characters-for-usernames.patch
index 2737ab2cf..63c29eb37 100644
--- a/patches/server/0252-Configurable-valid-characters-for-usernames.patch
+++ b/patches/server/0252-Configurable-valid-characters-for-usernames.patch
@@ -18,10 +18,10 @@ index 5f154db373026ca78b812f9247dc9288d6826cb0..547158e80c501aec66f4ffc96c0a496a
              char c = in.charAt(i);
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index c1328d9de75b8394848ad4a0a31e080173e494c2..f20565c61c56bd0a866cd1dd99dc088614f2c74c 100644
+index 3b0f8883ac1aa84de0d6db46d689cd7362692c1c..b917c669e4033d9c799ce18d1aac56bcbb9daae4 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -421,4 +421,11 @@ public class PurpurConfig {
+@@ -423,4 +423,11 @@ public class PurpurConfig {
      private static void networkSettings() {
          useUPnP = getBoolean("settings.network.upnp-port-forwarding", useUPnP);
      }
diff --git a/patches/server/0261-Configurable-food-attributes.patch b/patches/server/0261-Configurable-food-attributes.patch
index 89663a357..75e850405 100644
--- a/patches/server/0261-Configurable-food-attributes.patch
+++ b/patches/server/0261-Configurable-food-attributes.patch
@@ -69,10 +69,10 @@ index 513343d225a71e242b0f237eefcd25147709d9d1..1f65bba67cd4fab1dee115f24b213075
      }
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 0075a0f744c860c68cbfe7efa5b8aa2b4a30c5b6..df7a687114789836e5248a88a43cfbc4d3c8a5ac 100644
+index 89f6b49af6c851e28742bf99244c4bb9331b240a..0de19eca066dc7cd0ebdbf6bd4d9d846a672e81e 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -430,4 +430,57 @@ public class PurpurConfig {
+@@ -432,4 +432,57 @@ public class PurpurConfig {
          String setPattern = getString("settings.username-valid-characters", defaultPattern);
          usernameValidCharactersPattern = java.util.regex.Pattern.compile(setPattern == null || setPattern.isBlank() ? defaultPattern : setPattern);
      }
diff --git a/patches/server/0262-Max-joins-per-second.patch b/patches/server/0262-Max-joins-per-second.patch
index 9cf581ee1..a4a6d7d39 100644
--- a/patches/server/0262-Max-joins-per-second.patch
+++ b/patches/server/0262-Max-joins-per-second.patch
@@ -31,10 +31,10 @@ index 7b8f9cf06833860d0fc02399822e6aea214883ed..03701c154e7bfad5314f3ed0e51866a2
          }
          // Paper end
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index df7a687114789836e5248a88a43cfbc4d3c8a5ac..ea2b2a2c7aa311826cd78d80dd139b9aa0b83849 100644
+index 0de19eca066dc7cd0ebdbf6bd4d9d846a672e81e..47463d2964b4db693b9054459bdf8f78afbb3d6d 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -420,8 +420,10 @@ public class PurpurConfig {
+@@ -422,8 +422,10 @@ public class PurpurConfig {
      }
  
      public static boolean useUPnP = false;