From efd7e5182c6885c2aa4e1c267ed3da61eb6185b8 Mon Sep 17 00:00:00 2001
From: MeFisto94 <MeFisto94@users.noreply.github.com>
Date: Mon, 26 Jul 2021 01:11:44 +0200
Subject: [PATCH] Move "use-display-name-in-quit-message" to settings namespace
 (#6257)

---
 patches/server/0004-Paper-config-files.patch           |  6 +++---
 patches/server/0010-Adventure.patch                    | 10 +++++++---
 ...efault-loading-permissions.yml-before-plugins.patch |  8 ++++----
 ...anitise-RegionFileCache-and-make-configurable.patch |  4 ++--
 .../server/0083-Configurable-Player-Collision.patch    |  4 ++--
 ...save-empty-scoreboard-teams-to-scoreboard.dat.patch |  4 ++--
 ...0102-Add-setting-for-proxy-online-mode-status.patch |  4 ++--
 .../0104-Configurable-packet-in-spam-threshold.patch   |  4 ++--
 .../0105-Configurable-flying-kick-messages.patch       |  4 ++--
 ...figuration-option-to-prevent-player-names-fro.patch |  4 ++--
 ...pecifying-a-custom-authentication-servers-dow.patch |  4 ++--
 .../0188-Make-player-data-saving-configurable.patch    |  4 ++--
 ...onfigurable-Alternative-LootPool-Luck-Formula.patch |  4 ++--
 ...reak-up-and-make-tab-spam-limits-configurable.patch |  4 ++--
 .../0245-Add-Early-Warning-Feature-to-WatchDog.patch   |  4 ++--
 .../0260-Asynchronous-chunk-IO-and-loading.patch       |  4 ++--
 ...Configurable-connection-throttle-kick-message.patch |  4 ++--
 .../0280-Add-Velocity-IP-Forwarding-Support.patch      |  6 +++---
 ...e-the-default-permission-message-configurable.patch |  4 ++--
 patches/server/0299-Book-Size-Limits.patch             |  4 ++--
 .../0388-Optimise-TickListServer-by-rewriting-it.patch |  4 ++--
 ...k-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch |  4 ++--
 .../0399-Add-tick-times-API-and-mspt-command.patch     |  6 +++---
 ...-Bedrock-and-End-Portal-Frames-from-being-des.patch |  4 ++--
 ...Add-option-for-console-having-all-permissions.patch |  4 ++--
 ...59-Fix-piston-physics-inconsistency-MC-188840.patch |  4 ++--
 patches/server/0501-Incremental-player-saving.patch    |  4 ++--
 ...2-Prevent-headless-pistons-from-being-created.patch |  4 ++--
 patches/server/0515-Buffer-joins-to-world.patch        |  4 ++--
 ...30-Lazily-track-plugin-scoreboards-by-default.patch |  4 ++--
 patches/server/0568-Limit-recipe-packets.patch         |  4 ++--
 .../server/0570-MC-4-Fix-item-position-desync.patch    |  4 ++--
 ...-console-tab-completions-for-brigadier-comman.patch |  4 ++--
 .../0707-Make-item-validations-configurable.patch      |  4 ++--
 ...cate-stacktraces-in-log-messages-crash-report.patch |  4 ++--
 ...-Config-option-for-named-entity-death-logging.patch |  4 ++--
 36 files changed, 82 insertions(+), 78 deletions(-)

diff --git a/patches/server/0004-Paper-config-files.patch b/patches/server/0004-Paper-config-files.patch
index 38a21ad2cc..47cc354a6f 100644
--- a/patches/server/0004-Paper-config-files.patch
+++ b/patches/server/0004-Paper-config-files.patch
@@ -298,7 +298,7 @@ index 0000000000000000000000000000000000000000..bee2fa2bfbb61209381f24ed6508d3d1
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..2c0514892d3993bef57ecf677cf8bb0fbe0216e4
+index 0000000000000000000000000000000000000000..da4e7ee0914cd23679645ced0060541de69c64ee
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -0,0 +1,185 @@
@@ -364,8 +364,8 @@ index 0000000000000000000000000000000000000000..2c0514892d3993bef57ecf677cf8bb0f
 +        commands = new HashMap<String, Command>();
 +        commands.put("paper", new PaperCommand("paper"));
 +
-+        version = getInt("config-version", 20);
-+        set("config-version", 20);
++        version = getInt("config-version", 21);
++        set("config-version", 21);
 +        readConfig(PaperConfig.class, null);
 +    }
 +
diff --git a/patches/server/0010-Adventure.patch b/patches/server/0010-Adventure.patch
index 1d51ce9e46..95f680827d 100644
--- a/patches/server/0010-Adventure.patch
+++ b/patches/server/0010-Adventure.patch
@@ -7,17 +7,21 @@ Co-authored-by: zml <zml@stellardrift.ca>
 Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index f973828da3ab56dba768fb029a271b2e55cfc24e..4030ac49ad2e4e42a7fbd2e1979876488735a9d8 100644
+index 997041d4bc1cd6be97a2d403723eded7eda60351..8330f57d57181002dab4599e2c1f477cf9e51784 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -222,4 +222,9 @@ public class PaperConfig {
+@@ -222,4 +222,13 @@ public class PaperConfig {
                  " - Length: " + timeSummary(Timings.getHistoryLength() / 20) +
                  " - Server Name: " + timingsServerName);
      }
 +
 +    public static boolean useDisplayNameInQuit = false;
 +    private static void useDisplayNameInQuit() {
-+        useDisplayNameInQuit = getBoolean("use-display-name-in-quit-message", useDisplayNameInQuit);
++        if (version < 21) {
++            boolean oldValue = getBoolean("use-display-name-in-quit-message", useDisplayNameInQuit);
++            set("settings.use-display-name-in-quit-message", oldValue);
++        }
++        useDisplayNameInQuit = getBoolean("settings.use-display-name-in-quit-message", useDisplayNameInQuit);
 +    }
  }
 diff --git a/src/main/java/io/papermc/paper/adventure/AdventureComponent.java b/src/main/java/io/papermc/paper/adventure/AdventureComponent.java
diff --git a/patches/server/0059-Default-loading-permissions.yml-before-plugins.patch b/patches/server/0059-Default-loading-permissions.yml-before-plugins.patch
index 47a80ee995..c90b3983df 100644
--- a/patches/server/0059-Default-loading-permissions.yml-before-plugins.patch
+++ b/patches/server/0059-Default-loading-permissions.yml-before-plugins.patch
@@ -16,12 +16,12 @@ modify that. Under the previous logic, plugins were unable (cleanly) override pe
 A config option has been added for those who depend on the previous behavior, but I don't expect that.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 4030ac49ad2e4e42a7fbd2e1979876488735a9d8..de5d6b692e3e05fcf704c01dc602197992991386 100644
+index 8330f57d57181002dab4599e2c1f477cf9e51784..e3ca633a99d30ebf9dc35fd9236836b577a2b598 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -227,4 +227,9 @@ public class PaperConfig {
-     private static void useDisplayNameInQuit() {
-         useDisplayNameInQuit = getBoolean("use-display-name-in-quit-message", useDisplayNameInQuit);
+@@ -231,4 +231,9 @@ public class PaperConfig {
+         }
+         useDisplayNameInQuit = getBoolean("settings.use-display-name-in-quit-message", useDisplayNameInQuit);
      }
 +
 +    public static boolean loadPermsBeforePlugins = true;
diff --git a/patches/server/0074-Sanitise-RegionFileCache-and-make-configurable.patch b/patches/server/0074-Sanitise-RegionFileCache-and-make-configurable.patch
index d2023e94bf..44370fd0cb 100644
--- a/patches/server/0074-Sanitise-RegionFileCache-and-make-configurable.patch
+++ b/patches/server/0074-Sanitise-RegionFileCache-and-make-configurable.patch
@@ -11,10 +11,10 @@ The implementation uses a LinkedHashMap as an LRU cache (modified from HashMap).
 The maximum size of the RegionFileCache is also made configurable.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index de5d6b692e3e05fcf704c01dc602197992991386..1096b7462480c6c130545c03df8d8bed9c09ab79 100644
+index e3ca633a99d30ebf9dc35fd9236836b577a2b598..78f3e00715a5d3a60c341461a7cd4fa52e2492f0 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -232,4 +232,9 @@ public class PaperConfig {
+@@ -236,4 +236,9 @@ public class PaperConfig {
      private static void loadPermsBeforePlugins() {
          loadPermsBeforePlugins = getBoolean("settings.load-permissions-yml-before-plugins", true);
      }
diff --git a/patches/server/0083-Configurable-Player-Collision.patch b/patches/server/0083-Configurable-Player-Collision.patch
index 647eb3bf13..238edbec43 100644
--- a/patches/server/0083-Configurable-Player-Collision.patch
+++ b/patches/server/0083-Configurable-Player-Collision.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable Player Collision
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 1096b7462480c6c130545c03df8d8bed9c09ab79..47f77ad8ef4e9a26c6a4bbc8a73b9943f7604a6a 100644
+index 78f3e00715a5d3a60c341461a7cd4fa52e2492f0..2413ed16de148ea63667dca7ab3ee89fb714cf84 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -237,4 +237,9 @@ public class PaperConfig {
+@@ -241,4 +241,9 @@ public class PaperConfig {
      private static void regionFileCacheSize() {
          regionFileCacheSize = Math.max(getInt("settings.region-file-cache-size", 256), 4);
      }
diff --git a/patches/server/0092-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/patches/server/0092-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
index c797f89e9e..4e9b56a20f 100644
--- a/patches/server/0092-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
+++ b/patches/server/0092-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Don't save empty scoreboard teams to scoreboard.dat
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 47f77ad8ef4e9a26c6a4bbc8a73b9943f7604a6a..8cece23c90e1fc78415f2f743fc9a91b15670d75 100644
+index 2413ed16de148ea63667dca7ab3ee89fb714cf84..b4746ddf18a492e8993bbc534f41d13d4da65eeb 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -242,4 +242,9 @@ public class PaperConfig {
+@@ -246,4 +246,9 @@ public class PaperConfig {
      private static void enablePlayerCollisions() {
          enablePlayerCollisions = getBoolean("settings.enable-player-collisions", true);
      }
diff --git a/patches/server/0102-Add-setting-for-proxy-online-mode-status.patch b/patches/server/0102-Add-setting-for-proxy-online-mode-status.patch
index c97de55426..e8aff1936b 100644
--- a/patches/server/0102-Add-setting-for-proxy-online-mode-status.patch
+++ b/patches/server/0102-Add-setting-for-proxy-online-mode-status.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add setting for proxy online mode status
 TODO: Add isProxyOnlineMode check to Metrics
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 8cece23c90e1fc78415f2f743fc9a91b15670d75..d7a14bf8d2f8d91e3ed1eca3dce2f6b4c1a20403 100644
+index b4746ddf18a492e8993bbc534f41d13d4da65eeb..092f9f9588d3a3621d6221c397c0e64aff9067e2 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -23,6 +23,7 @@ import org.bukkit.configuration.InvalidConfigurationException;
@@ -17,7 +17,7 @@ index 8cece23c90e1fc78415f2f743fc9a91b15670d75..d7a14bf8d2f8d91e3ed1eca3dce2f6b4
  
  public class PaperConfig {
  
-@@ -247,4 +248,13 @@ public class PaperConfig {
+@@ -251,4 +252,13 @@ public class PaperConfig {
      private static void saveEmptyScoreboardTeams() {
          saveEmptyScoreboardTeams = getBoolean("settings.save-empty-scoreboard-teams", false);
      }
diff --git a/patches/server/0104-Configurable-packet-in-spam-threshold.patch b/patches/server/0104-Configurable-packet-in-spam-threshold.patch
index 6e3e9e28a7..b0fbe6214d 100644
--- a/patches/server/0104-Configurable-packet-in-spam-threshold.patch
+++ b/patches/server/0104-Configurable-packet-in-spam-threshold.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable packet in spam threshold
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index d7a14bf8d2f8d91e3ed1eca3dce2f6b4c1a20403..f1b1648a5ff2724c13a82468c3bad0040d8495cd 100644
+index 092f9f9588d3a3621d6221c397c0e64aff9067e2..a9965c54e18d714acb8fe5d40cb90efeb8f9eff0 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -257,4 +257,13 @@ public class PaperConfig {
+@@ -261,4 +261,13 @@ public class PaperConfig {
      public static boolean isProxyOnlineMode() {
          return Bukkit.getOnlineMode() || (SpigotConfig.bungee && bungeeOnlineMode);
      }
diff --git a/patches/server/0105-Configurable-flying-kick-messages.patch b/patches/server/0105-Configurable-flying-kick-messages.patch
index d47a82e174..85a61f3c63 100644
--- a/patches/server/0105-Configurable-flying-kick-messages.patch
+++ b/patches/server/0105-Configurable-flying-kick-messages.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable flying kick messages
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index f1b1648a5ff2724c13a82468c3bad0040d8495cd..c053850594e05a92a8d4a6cf2052f698bfdc3a03 100644
+index a9965c54e18d714acb8fe5d40cb90efeb8f9eff0..8af8e5f28b5205e3e4ef68ba870f610facc389bd 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -266,4 +266,11 @@ public class PaperConfig {
+@@ -270,4 +270,11 @@ public class PaperConfig {
          }
          packetInSpamThreshold = getInt("settings.incoming-packet-spam-threshold", 300);
      }
diff --git a/patches/server/0136-Add-configuration-option-to-prevent-player-names-fro.patch b/patches/server/0136-Add-configuration-option-to-prevent-player-names-fro.patch
index cf2c31a491..3928650156 100644
--- a/patches/server/0136-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/patches/server/0136-Add-configuration-option-to-prevent-player-names-fro.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Add configuration option to prevent player names from being
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index c053850594e05a92a8d4a6cf2052f698bfdc3a03..395468cdf1e2ce834f7de351efaa6a2b0915a5ea 100644
+index 8af8e5f28b5205e3e4ef68ba870f610facc389bd..546daac72e4829a22ed3c3eb4093b0d8c69cb53a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -273,4 +273,9 @@ public class PaperConfig {
+@@ -277,4 +277,9 @@ public class PaperConfig {
          flyingKickPlayerMessage = getString("messages.kick.flying-player", flyingKickPlayerMessage);
          flyingKickVehicleMessage = getString("messages.kick.flying-vehicle", flyingKickVehicleMessage);
      }
diff --git a/patches/server/0156-Allow-specifying-a-custom-authentication-servers-dow.patch b/patches/server/0156-Allow-specifying-a-custom-authentication-servers-dow.patch
index d69165106b..e5f31cc406 100644
--- a/patches/server/0156-Allow-specifying-a-custom-authentication-servers-dow.patch
+++ b/patches/server/0156-Allow-specifying-a-custom-authentication-servers-dow.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Allow specifying a custom "authentication servers down" kick
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 395468cdf1e2ce834f7de351efaa6a2b0915a5ea..ceeb011f2ae496f39a391316cb3773fdef52ee11 100644
+index 546daac72e4829a22ed3c3eb4093b0d8c69cb53a..8007220fa0646414c9cec66161aca2394e62dde3 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -1,5 +1,6 @@
@@ -16,7 +16,7 @@ index 395468cdf1e2ce834f7de351efaa6a2b0915a5ea..ceeb011f2ae496f39a391316cb3773fd
  import com.google.common.base.Throwables;
  
  import java.io.File;
-@@ -278,4 +279,9 @@ public class PaperConfig {
+@@ -282,4 +283,9 @@ public class PaperConfig {
      private static void suggestPlayersWhenNull() {
          suggestPlayersWhenNullTabCompletions = getBoolean("settings.suggest-player-names-when-null-tab-completions", suggestPlayersWhenNullTabCompletions);
      }
diff --git a/patches/server/0188-Make-player-data-saving-configurable.patch b/patches/server/0188-Make-player-data-saving-configurable.patch
index e11134f9fa..88b0223911 100644
--- a/patches/server/0188-Make-player-data-saving-configurable.patch
+++ b/patches/server/0188-Make-player-data-saving-configurable.patch
@@ -8,10 +8,10 @@ however, we should still migrate our configuration back upstream,
 to prevent unexpected situations
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index ceeb011f2ae496f39a391316cb3773fdef52ee11..49eff2eeb06ca104c379cfa0fdb393fe9c9ff956 100644
+index 8007220fa0646414c9cec66161aca2394e62dde3..3c29a0a39df1d6d4100a8a2fa403746ca4b95717 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -284,4 +284,13 @@ public class PaperConfig {
+@@ -288,4 +288,13 @@ public class PaperConfig {
      private static void authenticationServersDownKickMessage() {
          authenticationServersDownKickMessage = Strings.emptyToNull(getString("messages.kick.authentication-servers-down", authenticationServersDownKickMessage));
      }
diff --git a/patches/server/0209-Configurable-Alternative-LootPool-Luck-Formula.patch b/patches/server/0209-Configurable-Alternative-LootPool-Luck-Formula.patch
index 9335d78ec4..0fcd6ad940 100644
--- a/patches/server/0209-Configurable-Alternative-LootPool-Luck-Formula.patch
+++ b/patches/server/0209-Configurable-Alternative-LootPool-Luck-Formula.patch
@@ -36,10 +36,10 @@ This change will result in some major changes to fishing formulas.
 I would love to see this change in Vanilla, so Mojang please pull :)
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 49eff2eeb06ca104c379cfa0fdb393fe9c9ff956..3c783d49166f6fd1cfd327b83da122763ba7d9d4 100644
+index 3c29a0a39df1d6d4100a8a2fa403746ca4b95717..92821927c887fd03b69e87219aab1c09401e3776 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -293,4 +293,12 @@ public class PaperConfig {
+@@ -297,4 +297,12 @@ public class PaperConfig {
              SpigotConfig.save();
          }
      }
diff --git a/patches/server/0241-Break-up-and-make-tab-spam-limits-configurable.patch b/patches/server/0241-Break-up-and-make-tab-spam-limits-configurable.patch
index 72f5e87221..d8dbc00500 100644
--- a/patches/server/0241-Break-up-and-make-tab-spam-limits-configurable.patch
+++ b/patches/server/0241-Break-up-and-make-tab-spam-limits-configurable.patch
@@ -22,10 +22,10 @@ to take the burden of this into their own hand without having to rely on
 plugins doing unsafe things.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 3c783d49166f6fd1cfd327b83da122763ba7d9d4..706e4bb5c352be78ebbcd2879b23f220900db02c 100644
+index 92821927c887fd03b69e87219aab1c09401e3776..50b499886a7c375573efa3d4f06c81172582a52f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -301,4 +301,18 @@ public class PaperConfig {
+@@ -305,4 +305,18 @@ public class PaperConfig {
              Bukkit.getLogger().log(Level.INFO, "Using Aikar's Alternative Luck Formula to apply Luck attribute to all loot pool calculations. See https://luckformula.emc.gs");
          }
      }
diff --git a/patches/server/0245-Add-Early-Warning-Feature-to-WatchDog.patch b/patches/server/0245-Add-Early-Warning-Feature-to-WatchDog.patch
index b54cbb7a09..4aeefd8025 100644
--- a/patches/server/0245-Add-Early-Warning-Feature-to-WatchDog.patch
+++ b/patches/server/0245-Add-Early-Warning-Feature-to-WatchDog.patch
@@ -9,7 +9,7 @@ thread dumps at an interval until the point of crash.
 This will help diagnose what was going on in that time before the crash.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 706e4bb5c352be78ebbcd2879b23f220900db02c..f529b625d34395ed84570a241ab74f10985bddc9 100644
+index 50b499886a7c375573efa3d4f06c81172582a52f..e911bfa91e5f83d03f4fd7861f9b7e54aa815217 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -25,6 +25,7 @@ import org.bukkit.configuration.file.YamlConfiguration;
@@ -20,7 +20,7 @@ index 706e4bb5c352be78ebbcd2879b23f220900db02c..f529b625d34395ed84570a241ab74f10
  
  public class PaperConfig {
  
-@@ -302,6 +303,14 @@ public class PaperConfig {
+@@ -306,6 +307,14 @@ public class PaperConfig {
          }
      }
  
diff --git a/patches/server/0260-Asynchronous-chunk-IO-and-loading.patch b/patches/server/0260-Asynchronous-chunk-IO-and-loading.patch
index 0f2ebb4c2e..93103dfa0e 100644
--- a/patches/server/0260-Asynchronous-chunk-IO-and-loading.patch
+++ b/patches/server/0260-Asynchronous-chunk-IO-and-loading.patch
@@ -159,7 +159,7 @@ index 0fda52841b5e1643efeda92106124998abc4e0aa..fe79c0add4f7cb18d487c5bb9415c40c
  
      public static Timing getTickList(ServerLevel worldserver, String timingsType) {
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index f529b625d34395ed84570a241ab74f10985bddc9..e19988ea5822026f5a81465f6a72744b8b552cc0 100644
+index e911bfa91e5f83d03f4fd7861f9b7e54aa815217..8042efc858c6d134ce1071465479f8de11db64b4 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -1,5 +1,6 @@
@@ -169,7 +169,7 @@ index f529b625d34395ed84570a241ab74f10985bddc9..e19988ea5822026f5a81465f6a72744b
  import com.google.common.base.Strings;
  import com.google.common.base.Throwables;
  
-@@ -324,4 +325,54 @@ public class PaperConfig {
+@@ -328,4 +329,54 @@ public class PaperConfig {
          }
          tabSpamLimit = getInt("settings.spam-limiter.tab-spam-limit", tabSpamLimit);
      }
diff --git a/patches/server/0273-Configurable-connection-throttle-kick-message.patch b/patches/server/0273-Configurable-connection-throttle-kick-message.patch
index 3f4dd9260f..91ba48f48a 100644
--- a/patches/server/0273-Configurable-connection-throttle-kick-message.patch
+++ b/patches/server/0273-Configurable-connection-throttle-kick-message.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable connection throttle kick message
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index e19988ea5822026f5a81465f6a72744b8b552cc0..50d099d4c9d61bf4679d0efce8617f662e2ba971 100644
+index 8042efc858c6d134ce1071465479f8de11db64b4..c0b6e398839136ef57fdf37d34c91a4db538b92d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -287,6 +287,11 @@ public class PaperConfig {
+@@ -291,6 +291,11 @@ public class PaperConfig {
          authenticationServersDownKickMessage = Strings.emptyToNull(getString("messages.kick.authentication-servers-down", authenticationServersDownKickMessage));
      }
  
diff --git a/patches/server/0280-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0280-Add-Velocity-IP-Forwarding-Support.patch
index 634cb261de..a4695f209e 100644
--- a/patches/server/0280-Add-Velocity-IP-Forwarding-Support.patch
+++ b/patches/server/0280-Add-Velocity-IP-Forwarding-Support.patch
@@ -14,7 +14,7 @@ forwarding, and is integrated into the Minecraft login process by using the 1.13
 login plugin message packet.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 50d099d4c9d61bf4679d0efce8617f662e2ba971..0e0afdea5b9d6bdd706414cf615fa826d5efb8c7 100644
+index c0b6e398839136ef57fdf37d34c91a4db538b92d..94dc0fe5f5fe44d066847752ecd7e91f1bef35de 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -9,6 +9,7 @@ import java.io.IOException;
@@ -25,7 +25,7 @@ index 50d099d4c9d61bf4679d0efce8617f662e2ba971..0e0afdea5b9d6bdd706414cf615fa826
  import java.util.HashMap;
  import java.util.List;
  import java.util.Map;
-@@ -258,7 +259,7 @@ public class PaperConfig {
+@@ -262,7 +263,7 @@ public class PaperConfig {
      }
  
      public static boolean isProxyOnlineMode() {
@@ -34,7 +34,7 @@ index 50d099d4c9d61bf4679d0efce8617f662e2ba971..0e0afdea5b9d6bdd706414cf615fa826
      }
  
      public static int packetInSpamThreshold = 300;
-@@ -331,6 +332,20 @@ public class PaperConfig {
+@@ -335,6 +336,20 @@ public class PaperConfig {
          tabSpamLimit = getInt("settings.spam-limiter.tab-spam-limit", tabSpamLimit);
      }
  
diff --git a/patches/server/0294-Make-the-default-permission-message-configurable.patch b/patches/server/0294-Make-the-default-permission-message-configurable.patch
index 46abc24fd5..ce866a95fd 100644
--- a/patches/server/0294-Make-the-default-permission-message-configurable.patch
+++ b/patches/server/0294-Make-the-default-permission-message-configurable.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Make the default permission message configurable
 TODO: Change the message in PaperCommand
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 0e0afdea5b9d6bdd706414cf615fa826d5efb8c7..95c82bdd658ed55b2e86087441d1552eb3bd38ea 100644
+index 94dc0fe5f5fe44d066847752ecd7e91f1bef35de..670867c0a530b0b276abd0657921c125d009780f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -20,6 +20,7 @@ import java.util.regex.Pattern;
@@ -17,7 +17,7 @@ index 0e0afdea5b9d6bdd706414cf615fa826d5efb8c7..95c82bdd658ed55b2e86087441d1552e
  import org.bukkit.command.Command;
  import org.bukkit.configuration.ConfigurationSection;
  import org.bukkit.configuration.InvalidConfigurationException;
-@@ -293,6 +294,11 @@ public class PaperConfig {
+@@ -297,6 +298,11 @@ public class PaperConfig {
          connectionThrottleKickMessage = getString("messages.kick.connection-throttle", connectionThrottleKickMessage);
      }
  
diff --git a/patches/server/0299-Book-Size-Limits.patch b/patches/server/0299-Book-Size-Limits.patch
index 5fa62915f6..e3dfe7c206 100644
--- a/patches/server/0299-Book-Size-Limits.patch
+++ b/patches/server/0299-Book-Size-Limits.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Book Size Limits
 Puts some limits on the size of books.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 95c82bdd658ed55b2e86087441d1552eb3bd38ea..f52f1497da37d523d2d7282127aa3b3beb76cc3b 100644
+index 670867c0a530b0b276abd0657921c125d009780f..9f92feb008fe83aea9f05f435a9aee2bc6908553 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -352,6 +352,13 @@ public class PaperConfig {
+@@ -356,6 +356,13 @@ public class PaperConfig {
          }
      }
  
diff --git a/patches/server/0388-Optimise-TickListServer-by-rewriting-it.patch b/patches/server/0388-Optimise-TickListServer-by-rewriting-it.patch
index ce4da1d062..ae6c0db7b0 100644
--- a/patches/server/0388-Optimise-TickListServer-by-rewriting-it.patch
+++ b/patches/server/0388-Optimise-TickListServer-by-rewriting-it.patch
@@ -42,10 +42,10 @@ sets the excessive tick delay to the specified ticks (defaults to
 60 * 20 ticks, aka 60 seconds)
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index f52f1497da37d523d2d7282127aa3b3beb76cc3b..b6bb9f50f44927d5212ec3a8804f7fd793d61c48 100644
+index 9f92feb008fe83aea9f05f435a9aee2bc6908553..0c02058abebe52e98d079a4c6853570e7eba9a88 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -359,6 +359,13 @@ public class PaperConfig {
+@@ -363,6 +363,13 @@ public class PaperConfig {
          maxBookTotalSizeMultiplier = getDouble("settings.book-size.total-multiplier", maxBookTotalSizeMultiplier);
      }
  
diff --git a/patches/server/0397-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch b/patches/server/0397-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch
index 9676f463a4..17fbed0b55 100644
--- a/patches/server/0397-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch
+++ b/patches/server/0397-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch
@@ -42,10 +42,10 @@ index b47b7dce26805badd422c1867733ff4bfd00e9f4..b9cdbf8acccfd6b207a0116f068168f3
      public static final Timing commandFunctionsTimer = Timings.ofSafe("Command Functions");
      public static final Timing connectionTimer = Timings.ofSafe("Connection Handler");
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index b6bb9f50f44927d5212ec3a8804f7fd793d61c48..e9d0dd2a8b4d55c3009132343388706e89cb90db 100644
+index 0c02058abebe52e98d079a4c6853570e7eba9a88..847c64005a47a947b9d3ccd66cb09ebfb975dd1f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -415,4 +415,9 @@ public class PaperConfig {
+@@ -419,4 +419,9 @@ public class PaperConfig {
              log("Async Chunks: Enabled - Chunks will be loaded much faster, without lag.");
          }
      }
diff --git a/patches/server/0399-Add-tick-times-API-and-mspt-command.patch b/patches/server/0399-Add-tick-times-API-and-mspt-command.patch
index 34dab52914..bde579896d 100644
--- a/patches/server/0399-Add-tick-times-API-and-mspt-command.patch
+++ b/patches/server/0399-Add-tick-times-API-and-mspt-command.patch
@@ -75,7 +75,7 @@ index 0000000000000000000000000000000000000000..d0211d4f39f9d6af1d751ac66342b42c
 +    }
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 5c67c51dd0a19357086d4ceb3ca724401e4d26b8..89a475429ede42f3a8aae16760e56bfba57bb1b5 100644
+index 40818b03f2f285124e2cf6982936e66ff047b6e7..6259677b6d06cea5c66b3e3f508eef648dab0de1 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -69,6 +69,7 @@ public class PaperConfig {
@@ -84,8 +84,8 @@ index 5c67c51dd0a19357086d4ceb3ca724401e4d26b8..89a475429ede42f3a8aae16760e56bfb
          commands.put("paper", new PaperCommand("paper"));
 +        commands.put("mspt", new MSPTCommand("mspt"));
  
-         version = getInt("config-version", 20);
-         set("config-version", 20);
+         version = getInt("config-version", 21);
+         set("config-version", 21);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
 index 0115ffe84356468ddc254d8d5bdd719bc5e7e3f8..def1edb961ba41819ce30c427b1616578a513433 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
diff --git a/patches/server/0442-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/0442-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
index 1618d49971..7585dbcf6e 100644
--- a/patches/server/0442-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
+++ b/patches/server/0442-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
@@ -13,10 +13,10 @@ A config is provided if you rather let players use these exploits, and let
 them destroy the worlds End Portals and get on top of the nether easy.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index f52c7e7800ff86abd513777fa2ce2e8b9bd9dfd5..846c4b456e4f644b5da7fc4e2cc8df7bba7fd707 100644
+index eff4d8946f77e565b3818fdf82fab8e0b86e068e..ef9e4515260ec92a6a0d6ab77d6492574d70a3f9 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -421,4 +421,17 @@ public class PaperConfig {
+@@ -425,4 +425,17 @@ public class PaperConfig {
      private static void midTickChunkTasks() {
          midTickChunkTasks = getInt("settings.chunk-tasks-per-tick", midTickChunkTasks);
      }
diff --git a/patches/server/0446-Add-option-for-console-having-all-permissions.patch b/patches/server/0446-Add-option-for-console-having-all-permissions.patch
index 3a777339f1..53eaa8658d 100644
--- a/patches/server/0446-Add-option-for-console-having-all-permissions.patch
+++ b/patches/server/0446-Add-option-for-console-having-all-permissions.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add option for console having all permissions
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 846c4b456e4f644b5da7fc4e2cc8df7bba7fd707..4cb66752f3377cc419ef944cc86f4ac734c8d9e6 100644
+index ef9e4515260ec92a6a0d6ab77d6492574d70a3f9..3b4b7dca3d109f72aa12f8ac79fb46bf94d25641 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -434,4 +434,9 @@ public class PaperConfig {
+@@ -438,4 +438,9 @@ public class PaperConfig {
  
      }
  
diff --git a/patches/server/0459-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0459-Fix-piston-physics-inconsistency-MC-188840.patch
index 8ff4e32e25..40211bb9f8 100644
--- a/patches/server/0459-Fix-piston-physics-inconsistency-MC-188840.patch
+++ b/patches/server/0459-Fix-piston-physics-inconsistency-MC-188840.patch
@@ -32,10 +32,10 @@ This patch fixes https://bugs.mojang.com/browse/MC-188840
 This patch also fixes rail duping and carpet duping.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 4cb66752f3377cc419ef944cc86f4ac734c8d9e6..88e8360bc2eb8cfe896fe69f969b286e59154984 100644
+index 3b4b7dca3d109f72aa12f8ac79fb46bf94d25641..879799a98ab4b4c95f0f8e72c525f1c44b023e3f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -439,4 +439,10 @@ public class PaperConfig {
+@@ -443,4 +443,10 @@ public class PaperConfig {
          consoleHasAllPermissions = getBoolean("settings.console-has-all-permissions", consoleHasAllPermissions);
      }
  
diff --git a/patches/server/0501-Incremental-player-saving.patch b/patches/server/0501-Incremental-player-saving.patch
index 5efa479538..5ae8fc6240 100644
--- a/patches/server/0501-Incremental-player-saving.patch
+++ b/patches/server/0501-Incremental-player-saving.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Incremental player saving
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 88e8360bc2eb8cfe896fe69f969b286e59154984..fa06d9a9c353815ade73fa019ac9f55b4597cc28 100644
+index 879799a98ab4b4c95f0f8e72c525f1c44b023e3f..20c787301352b042e4e33c76b6171d83014c8c3d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -445,4 +445,15 @@ public class PaperConfig {
+@@ -449,4 +449,15 @@ public class PaperConfig {
          allowPistonDuplication = getBoolean("settings.unsupported-settings.allow-piston-duplication", config.getBoolean("settings.unsupported-settings.allow-tnt-duplication", false));
          set("settings.unsupported-settings.allow-tnt-duplication", null);
      }
diff --git a/patches/server/0512-Prevent-headless-pistons-from-being-created.patch b/patches/server/0512-Prevent-headless-pistons-from-being-created.patch
index a336f97f24..684b66fb3a 100644
--- a/patches/server/0512-Prevent-headless-pistons-from-being-created.patch
+++ b/patches/server/0512-Prevent-headless-pistons-from-being-created.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Prevent headless pistons from being created
 Prevent headless pistons from being created by explosions or tree/mushroom growth.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index fa06d9a9c353815ade73fa019ac9f55b4597cc28..085ef48d8490e2d80406656a43dc751f4428a96f 100644
+index 20c787301352b042e4e33c76b6171d83014c8c3d..378410de013202521e4caef8db53f4c519a76185 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -446,6 +446,12 @@ public class PaperConfig {
+@@ -450,6 +450,12 @@ public class PaperConfig {
          set("settings.unsupported-settings.allow-tnt-duplication", null);
      }
  
diff --git a/patches/server/0515-Buffer-joins-to-world.patch b/patches/server/0515-Buffer-joins-to-world.patch
index 451e2866dd..e20b750da8 100644
--- a/patches/server/0515-Buffer-joins-to-world.patch
+++ b/patches/server/0515-Buffer-joins-to-world.patch
@@ -8,10 +8,10 @@ the world per tick, this attempts to reduce the impact that join floods
 has on the server
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 085ef48d8490e2d80406656a43dc751f4428a96f..989d83ec31160ebfcd27281fee03da6f34ad88da 100644
+index 378410de013202521e4caef8db53f4c519a76185..1b1caa30d08fab858c43570d820ab820282f4eaf 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -462,4 +462,9 @@ public class PaperConfig {
+@@ -466,4 +466,9 @@ public class PaperConfig {
              maxPlayerAutoSavePerTick = (playerAutoSaveRate == -1 || playerAutoSaveRate > 100) ? 10 : 20;
          }
      }
diff --git a/patches/server/0530-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0530-Lazily-track-plugin-scoreboards-by-default.patch
index 24d7cebf3b..bfe6622bc8 100644
--- a/patches/server/0530-Lazily-track-plugin-scoreboards-by-default.patch
+++ b/patches/server/0530-Lazily-track-plugin-scoreboards-by-default.patch
@@ -14,10 +14,10 @@ this breaks your workflow you can always force all scoreboards to be tracked wit
 settings.track-plugin-scoreboards in paper.yml.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 989d83ec31160ebfcd27281fee03da6f34ad88da..b9a31b8c2d9e3d3f47ed27738a59b409aec8caf7 100644
+index 1b1caa30d08fab858c43570d820ab820282f4eaf..c1842abd86751353a323a725e55db2d92a562dae 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -467,4 +467,9 @@ public class PaperConfig {
+@@ -471,4 +471,9 @@ public class PaperConfig {
      private static void maxJoinsPerTick() {
          maxJoinsPerTick = getInt("settings.max-joins-per-tick", 3);
      }
diff --git a/patches/server/0568-Limit-recipe-packets.patch b/patches/server/0568-Limit-recipe-packets.patch
index 6bfafed4e1..2f4cda0bf6 100644
--- a/patches/server/0568-Limit-recipe-packets.patch
+++ b/patches/server/0568-Limit-recipe-packets.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Limit recipe packets
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index b9a31b8c2d9e3d3f47ed27738a59b409aec8caf7..cd8ef155d1aa4f103fb821ebf718d00efad51aba 100644
+index c1842abd86751353a323a725e55db2d92a562dae..ac79cdde35b0a332556a5db7017732eb98139b4f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -339,6 +339,13 @@ public class PaperConfig {
+@@ -343,6 +343,13 @@ public class PaperConfig {
          tabSpamLimit = getInt("settings.spam-limiter.tab-spam-limit", tabSpamLimit);
      }
  
diff --git a/patches/server/0570-MC-4-Fix-item-position-desync.patch b/patches/server/0570-MC-4-Fix-item-position-desync.patch
index a7d6a6aa70..43c59b90e3 100644
--- a/patches/server/0570-MC-4-Fix-item-position-desync.patch
+++ b/patches/server/0570-MC-4-Fix-item-position-desync.patch
@@ -9,10 +9,10 @@ loss, which forces the server to lose the same precision as the client
 keeping them in sync.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index cd8ef155d1aa4f103fb821ebf718d00efad51aba..50c47c512dfc90536b28274d5715a46fd13f4e77 100644
+index ac79cdde35b0a332556a5db7017732eb98139b4f..e8a0d8a6c8742e632e6866b078a3f2f05ec9fac7 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -479,4 +479,9 @@ public class PaperConfig {
+@@ -483,4 +483,9 @@ public class PaperConfig {
      private static void trackPluginScoreboards() {
          trackPluginScoreboards = getBoolean("settings.track-plugin-scoreboards", false);
      }
diff --git a/patches/server/0653-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0653-Enhance-console-tab-completions-for-brigadier-comman.patch
index 133035d576..d0de48a0ef 100644
--- a/patches/server/0653-Enhance-console-tab-completions-for-brigadier-comman.patch
+++ b/patches/server/0653-Enhance-console-tab-completions-for-brigadier-comman.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Enhance console tab completions for brigadier commands
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 50c47c512dfc90536b28274d5715a46fd13f4e77..71fa9e572873f5d76643d1b9f5555c3ede7016fa 100644
+index e8a0d8a6c8742e632e6866b078a3f2f05ec9fac7..7249769c37ba5c4f8fbbab915a990ee91aaa91aa 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -484,4 +484,11 @@ public class PaperConfig {
+@@ -488,4 +488,11 @@ public class PaperConfig {
      private static void fixEntityPositionDesync() {
          fixEntityPositionDesync = getBoolean("settings.fix-entity-position-desync", fixEntityPositionDesync);
      }
diff --git a/patches/server/0707-Make-item-validations-configurable.patch b/patches/server/0707-Make-item-validations-configurable.patch
index 8577ca23a2..d67b4be505 100644
--- a/patches/server/0707-Make-item-validations-configurable.patch
+++ b/patches/server/0707-Make-item-validations-configurable.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Make item validations configurable
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 71fa9e572873f5d76643d1b9f5555c3ede7016fa..9f94c4ff06962b7b947c58db93426742574431e3 100644
+index 7249769c37ba5c4f8fbbab915a990ee91aaa91aa..e9abb3fde229e46870882c7075247c0baee99b49 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -491,4 +491,19 @@ public class PaperConfig {
+@@ -495,4 +495,19 @@ public class PaperConfig {
          enableBrigadierConsoleHighlighting = getBoolean("settings.console.enable-brigadier-highlighting", enableBrigadierConsoleHighlighting);
          enableBrigadierConsoleCompletions = getBoolean("settings.console.enable-brigadier-completions", enableBrigadierConsoleCompletions);
      }
diff --git a/patches/server/0714-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/0714-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
index 8c18f2188a..392c50a95b 100644
--- a/patches/server/0714-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
+++ b/patches/server/0714-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
@@ -92,10 +92,10 @@ index 9c1698df7e31c467ddb43c3989a0aeabebb88e94..864f67f57b92bc66208ff63225086348
      exclude("org/bukkit/craftbukkit/inventory/ItemStack*Test.class")
  }
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 9f94c4ff06962b7b947c58db93426742574431e3..4f073bff5fa8350e719da648a0c15792dadeef6f 100644
+index e9abb3fde229e46870882c7075247c0baee99b49..6f51eb31a06922a9d0c3697755c1bfe8baf6cfe2 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -492,6 +492,11 @@ public class PaperConfig {
+@@ -496,6 +496,11 @@ public class PaperConfig {
          enableBrigadierConsoleCompletions = getBoolean("settings.console.enable-brigadier-completions", enableBrigadierConsoleCompletions);
      }
  
diff --git a/patches/server/0721-Config-option-for-named-entity-death-logging.patch b/patches/server/0721-Config-option-for-named-entity-death-logging.patch
index 4be5e1fcc7..fb46c4dac1 100644
--- a/patches/server/0721-Config-option-for-named-entity-death-logging.patch
+++ b/patches/server/0721-Config-option-for-named-entity-death-logging.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Config option for named entity death logging
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 4f073bff5fa8350e719da648a0c15792dadeef6f..f4642259a82dbc19934772eb6ddfae682c84375e 100644
+index 6f51eb31a06922a9d0c3697755c1bfe8baf6cfe2..95d8cf449bf0439fddaf319246fef51e1570b68e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -497,6 +497,11 @@ public class PaperConfig {
+@@ -501,6 +501,11 @@ public class PaperConfig {
          deobfuscateStacktraces = getBoolean("settings.loggers.deobfuscate-stacktraces", deobfuscateStacktraces);
      }