From e9aa9ce66b8aa904bb5a54e8c6ae99097ea4e385 Mon Sep 17 00:00:00 2001
From: Jason <11360596+jpenilla@users.noreply.github.com>
Date: Fri, 13 Aug 2021 13:24:25 -0700
Subject: [PATCH] Add config migration for named entity death logging option
 (#6390)

---
 ... => 0188-Upstream-config-migrations.patch} | 20 +++++++++++++------
 ...le-Alternative-LootPool-Luck-Formula.patch |  4 ++--
 ...nd-make-tab-spam-limits-configurable.patch |  4 ++--
 ...dd-Early-Warning-Feature-to-WatchDog.patch |  6 +++---
 ...60-Asynchronous-chunk-IO-and-loading.patch |  4 ++--
 ...0-Add-Velocity-IP-Forwarding-Support.patch |  4 ++--
 patches/server/0299-Book-Size-Limits.patch    |  4 ++--
 ...imise-TickListServer-by-rewriting-it.patch |  4 ++--
 ...asks-Speed-up-processing-of-chunk-lo.patch |  4 ++--
 ...and-End-Portal-Frames-from-being-des.patch |  4 ++--
 ...n-for-console-having-all-permissions.patch |  4 ++--
 ...ston-physics-inconsistency-MC-188840.patch |  4 ++--
 .../0501-Incremental-player-saving.patch      |  6 +++---
 ...-headless-pistons-from-being-created.patch |  4 ++--
 .../server/0515-Buffer-joins-to-world.patch   |  4 ++--
 ...-track-plugin-scoreboards-by-default.patch |  4 ++--
 .../server/0568-Limit-recipe-packets.patch    |  4 ++--
 .../0570-MC-4-Fix-item-position-desync.patch  |  4 ++--
 ...tab-completions-for-brigadier-comman.patch |  4 ++--
 ...7-Make-item-validations-configurable.patch |  4 ++--
 ...ktraces-in-log-messages-crash-report.patch |  6 +++---
 21 files changed, 57 insertions(+), 49 deletions(-)
 rename patches/server/{0188-Make-player-data-saving-configurable.patch => 0188-Upstream-config-migrations.patch} (61%)

diff --git a/patches/server/0188-Make-player-data-saving-configurable.patch b/patches/server/0188-Upstream-config-migrations.patch
similarity index 61%
rename from patches/server/0188-Make-player-data-saving-configurable.patch
rename to patches/server/0188-Upstream-config-migrations.patch
index 88b022391..da735f826 100644
--- a/patches/server/0188-Make-player-data-saving-configurable.patch
+++ b/patches/server/0188-Upstream-config-migrations.patch
@@ -1,17 +1,16 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Mon, 26 Mar 2018 18:30:53 +0300
-Subject: [PATCH] Make player data saving configurable
+Subject: [PATCH] Upstream config migrations
 
-Upstream has added a patch which negates the need for this patch,
-however, we should still migrate our configuration back upstream,
-to prevent unexpected situations
+This patch contains config migrations for when upstream adds options
+which Paper already had.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 8007220fa0646414c9cec66161aca2394e62dde3..3c29a0a39df1d6d4100a8a2fa403746ca4b95717 100644
+index 8007220fa0646414c9cec66161aca2394e62dde3..6b952280399833eec54a72e87d916e65ae4c7339 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -288,4 +288,13 @@ public class PaperConfig {
+@@ -288,4 +288,22 @@ public class PaperConfig {
      private static void authenticationServersDownKickMessage() {
          authenticationServersDownKickMessage = Strings.emptyToNull(getString("messages.kick.authentication-servers-down", authenticationServersDownKickMessage));
      }
@@ -23,5 +22,14 @@ index 8007220fa0646414c9cec66161aca2394e62dde3..3c29a0a39df1d6d4100a8a2fa403746c
 +            SpigotConfig.config.set("players.disable-saving", SpigotConfig.disableAdvancementSaving);
 +            SpigotConfig.save();
 +        }
++    }
++
++    private static void namedEntityDeaths() {
++        Object val = config.get("settings.log-named-entity-deaths");
++        if (val instanceof Boolean bool && !bool) {
++            SpigotConfig.logNamedDeaths = false;
++            SpigotConfig.config.set("settings.log-named-deaths", false);
++            SpigotConfig.save();
++        }
 +    }
  }
diff --git a/patches/server/0209-Configurable-Alternative-LootPool-Luck-Formula.patch b/patches/server/0209-Configurable-Alternative-LootPool-Luck-Formula.patch
index 0fcd6ad94..6f3738939 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 3c29a0a39df1d6d4100a8a2fa403746ca4b95717..92821927c887fd03b69e87219aab1c09401e3776 100644
+index 6b952280399833eec54a72e87d916e65ae4c7339..b42272b574e31d695ee31bd3fb76a4b906713442 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -297,4 +297,12 @@ public class PaperConfig {
+@@ -306,4 +306,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 d8dbc0050..5d8e303e2 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 92821927c887fd03b69e87219aab1c09401e3776..50b499886a7c375573efa3d4f06c81172582a52f 100644
+index b42272b574e31d695ee31bd3fb76a4b906713442..7e4ac2699eca8aebba675f3ffdac3a4dad422e4c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -305,4 +305,18 @@ public class PaperConfig {
+@@ -314,4 +314,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 4aeefd802..d21dceabc 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 50b499886a7c375573efa3d4f06c81172582a52f..e911bfa91e5f83d03f4fd7861f9b7e54aa815217 100644
+index 7e4ac2699eca8aebba675f3ffdac3a4dad422e4c..96366bfb03e1bc57a10154c13341a80ce6f0f4c4 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 50b499886a7c375573efa3d4f06c81172582a52f..e911bfa91e5f83d03f4fd7861f9b7e54
  
  public class PaperConfig {
  
-@@ -306,6 +307,14 @@ public class PaperConfig {
+@@ -315,6 +316,14 @@ public class PaperConfig {
          }
      }
  
@@ -68,7 +68,7 @@ index ac431c5b9a05a9aa65351092534298141f506fb8..f1e50f3f6d0e4876aa54b72dd474d238
  
      @Override
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 314fa148fe783a0558ba00b068e0bf69a91577e1..66a3395a7a0cc8eb1b3cd24761bed9d8c3349f4c 100644
+index 8e7630de11637a75a4a54a22283cbb2d0c7e6438..ba0e8902e7205bc6da88efd28be70ece04cc1974 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -229,7 +229,7 @@ public class SpigotConfig
diff --git a/patches/server/0260-Asynchronous-chunk-IO-and-loading.patch b/patches/server/0260-Asynchronous-chunk-IO-and-loading.patch
index b218fe3dc..b3d38fd6a 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 e911bfa91e5f83d03f4fd7861f9b7e54aa815217..8042efc858c6d134ce1071465479f8de11db64b4 100644
+index 96366bfb03e1bc57a10154c13341a80ce6f0f4c4..7cf2e8a0fb9906ef4576a143104556c1c70a240c 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 e911bfa91e5f83d03f4fd7861f9b7e54aa815217..8042efc858c6d134ce1071465479f8de
  import com.google.common.base.Strings;
  import com.google.common.base.Throwables;
  
-@@ -328,4 +329,54 @@ public class PaperConfig {
+@@ -337,4 +338,54 @@ public class PaperConfig {
          }
          tabSpamLimit = getInt("settings.spam-limiter.tab-spam-limit", tabSpamLimit);
      }
diff --git a/patches/server/0280-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0280-Add-Velocity-IP-Forwarding-Support.patch
index a4695f209..7f2e7d7ae 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 c0b6e398839136ef57fdf37d34c91a4db538b92d..94dc0fe5f5fe44d066847752ecd7e91f1bef35de 100644
+index 4d0ebcf6b870eb67e04cea4b1a652c946ef4a2ef..cdec195a7aab9195c07ebfbba4f25b27a319ca6e 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;
@@ -34,7 +34,7 @@ index c0b6e398839136ef57fdf37d34c91a4db538b92d..94dc0fe5f5fe44d066847752ecd7e91f
      }
  
      public static int packetInSpamThreshold = 300;
-@@ -335,6 +336,20 @@ public class PaperConfig {
+@@ -344,6 +345,20 @@ public class PaperConfig {
          tabSpamLimit = getInt("settings.spam-limiter.tab-spam-limit", tabSpamLimit);
      }
  
diff --git a/patches/server/0299-Book-Size-Limits.patch b/patches/server/0299-Book-Size-Limits.patch
index e3dfe7c20..055c0dfe0 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 670867c0a530b0b276abd0657921c125d009780f..9f92feb008fe83aea9f05f435a9aee2bc6908553 100644
+index 26de4e9daf0826b97a5f12304d7691dc815feee8..40818f1e90dd3aca77e164365370782828f765f4 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -356,6 +356,13 @@ public class PaperConfig {
+@@ -365,6 +365,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 6b8853f13..77c11cd79 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 9f92feb008fe83aea9f05f435a9aee2bc6908553..0c02058abebe52e98d079a4c6853570e7eba9a88 100644
+index 40818f1e90dd3aca77e164365370782828f765f4..2fcb923b8aa0e891de9f86c4c55a4af8969c04cd 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -363,6 +363,13 @@ public class PaperConfig {
+@@ -372,6 +372,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 20ac68b24..f522b46db 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 0c02058abebe52e98d079a4c6853570e7eba9a88..847c64005a47a947b9d3ccd66cb09ebfb975dd1f 100644
+index 2fcb923b8aa0e891de9f86c4c55a4af8969c04cd..04b402084d847ba75b8282b25054d7df8a705faa 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -419,4 +419,9 @@ public class PaperConfig {
+@@ -428,4 +428,9 @@ public class PaperConfig {
              log("Async Chunks: Enabled - Chunks will be loaded much faster, without lag.");
          }
      }
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 7585dbcf6..8c5fbe63c 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 eff4d8946f77e565b3818fdf82fab8e0b86e068e..ef9e4515260ec92a6a0d6ab77d6492574d70a3f9 100644
+index 586d78f9d194b9f82b446f456a3f5a1871981577..4361d0b450e789858801bbeae2748c7a410b70c3 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -425,4 +425,17 @@ public class PaperConfig {
+@@ -434,4 +434,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 dc64717f7..eb3242102 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 ef9e4515260ec92a6a0d6ab77d6492574d70a3f9..3b4b7dca3d109f72aa12f8ac79fb46bf94d25641 100644
+index 4361d0b450e789858801bbeae2748c7a410b70c3..99103cb1f86fdf1eee848037b71c3b73666c2e86 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -438,4 +438,9 @@ public class PaperConfig {
+@@ -447,4 +447,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 40211bb9f..6ab075674 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 3b4b7dca3d109f72aa12f8ac79fb46bf94d25641..879799a98ab4b4c95f0f8e72c525f1c44b023e3f 100644
+index 99103cb1f86fdf1eee848037b71c3b73666c2e86..de8b9be11b996f9d1eff30fa037cfa1823eff21b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -443,4 +443,10 @@ public class PaperConfig {
+@@ -452,4 +452,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 93f4c423c..490397f6d 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 879799a98ab4b4c95f0f8e72c525f1c44b023e3f..20c787301352b042e4e33c76b6171d83014c8c3d 100644
+index de8b9be11b996f9d1eff30fa037cfa1823eff21b..b0fe3f0ac4c706c4b64f2778fcb8d6c26e585d3c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -449,4 +449,15 @@ public class PaperConfig {
+@@ -458,4 +458,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);
      }
@@ -55,7 +55,7 @@ index 3ac5ab881913a90d5b59610e81d598e121320930..2c0b2bb254e9f4d39b526f170c11f481
          } // Paper start
          for (ServerLevel level : this.getAllLevels()) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index ab12bc6db7fdc865989804aa6366cdefefbc9a31..779408573c779f86f61667f8cde8fbd2f7d2956f 100644
+index 6cf83d9b1e43ade17cb67843dbdc11937eda1e08..f3e4b9f302fbc4b615a5e735d5aab0f403e16903 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -175,6 +175,7 @@ public class ServerPlayer extends Player {
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 684b66fb3..6942d5310 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 20c787301352b042e4e33c76b6171d83014c8c3d..378410de013202521e4caef8db53f4c519a76185 100644
+index b0fe3f0ac4c706c4b64f2778fcb8d6c26e585d3c..e7d54a510303653c5f3c7374e4e83101321840c6 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -450,6 +450,12 @@ public class PaperConfig {
+@@ -459,6 +459,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 e20b750da..969919eda 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 378410de013202521e4caef8db53f4c519a76185..1b1caa30d08fab858c43570d820ab820282f4eaf 100644
+index e7d54a510303653c5f3c7374e4e83101321840c6..a8585c1a7f7e92a7c91b9e4bba568df5888baf14 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -466,4 +466,9 @@ public class PaperConfig {
+@@ -475,4 +475,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 bfe6622bc..3d37c349f 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 1b1caa30d08fab858c43570d820ab820282f4eaf..c1842abd86751353a323a725e55db2d92a562dae 100644
+index a8585c1a7f7e92a7c91b9e4bba568df5888baf14..22027cdebcde2157b119f37cb1471f7a69c2a31a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -471,4 +471,9 @@ public class PaperConfig {
+@@ -480,4 +480,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 3f49f304d..5e1c72490 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 c1842abd86751353a323a725e55db2d92a562dae..ac79cdde35b0a332556a5db7017732eb98139b4f 100644
+index 22027cdebcde2157b119f37cb1471f7a69c2a31a..ec8afe1bb9881c87c4ee0f15dcfcb4b8f318febc 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -343,6 +343,13 @@ public class PaperConfig {
+@@ -352,6 +352,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 43c59b90e..71ac3227b 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 ac79cdde35b0a332556a5db7017732eb98139b4f..e8a0d8a6c8742e632e6866b078a3f2f05ec9fac7 100644
+index ec8afe1bb9881c87c4ee0f15dcfcb4b8f318febc..e6ce1f9f065a2e6293a651922273a6034df19d0f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -483,4 +483,9 @@ public class PaperConfig {
+@@ -492,4 +492,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 d0de48a0e..56ba585c9 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 e8a0d8a6c8742e632e6866b078a3f2f05ec9fac7..7249769c37ba5c4f8fbbab915a990ee91aaa91aa 100644
+index e6ce1f9f065a2e6293a651922273a6034df19d0f..062d8895f0de77c7391e99e8423d16dc4a1de765 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -488,4 +488,11 @@ public class PaperConfig {
+@@ -497,4 +497,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 ce6bc9596..b3d9a68a7 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 7249769c37ba5c4f8fbbab915a990ee91aaa91aa..e9abb3fde229e46870882c7075247c0baee99b49 100644
+index 062d8895f0de77c7391e99e8423d16dc4a1de765..3fedd75bea7197092823745deb7af8d4542efee5 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -495,4 +495,19 @@ public class PaperConfig {
+@@ -504,4 +504,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 21a50fda3..c0082f767 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Deobfuscate stacktraces in log messages, crash reports, and
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index f57faf4c4587f7a10c05038d6b358871a905039c..2add85992f6249c826f016826fa28d54b9e7ae89 100644
+index c95e5f2fee54be09b16c26daffdfcfda877ec203..0311fb1e70eb52da19685f7d9d815daf8f3a83ab 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -1,8 +1,12 @@
@@ -92,10 +92,10 @@ index f57faf4c4587f7a10c05038d6b358871a905039c..2add85992f6249c826f016826fa28d54
      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 e9abb3fde229e46870882c7075247c0baee99b49..6f51eb31a06922a9d0c3697755c1bfe8baf6cfe2 100644
+index 3fedd75bea7197092823745deb7af8d4542efee5..2e0191e5cfe8e29fb0a6c4fc6a2a570d4b8ae449 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -496,6 +496,11 @@ public class PaperConfig {
+@@ -505,6 +505,11 @@ public class PaperConfig {
          enableBrigadierConsoleCompletions = getBoolean("settings.console.enable-brigadier-completions", enableBrigadierConsoleCompletions);
      }