Rebase fixups

This commit is contained in:
Spottedleaf 2024-10-25 12:24:15 -07:00
parent 62e3bcdc3b
commit b711764991
90 changed files with 3448 additions and 10434 deletions

View file

@ -22,10 +22,10 @@ is actually processed, this is honestly really just exposed for the misnomers or
who just wanna ensure that this won't grow over a specific size if chat gets stupidly active
diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
index b92bfd89e32becde2e7630c6116c16f8a4f6614a..73e8a524925ed6f2580d3bd01616646fabafda78 100644
index 904d2f96a60e72aa089fdfe6be08044b04f995c1..36b96e0ed5c0d25068ec4678eddd8a19a020d345 100644
--- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
+++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
@@ -303,7 +303,18 @@ public class GlobalConfiguration extends ConfigurationPart {
@@ -327,7 +327,18 @@ public class GlobalConfiguration extends ConfigurationPart {
@PostProcess
private void postProcess() {