Apply

patches/server/0005-Paper-config-files.patch

@@ -487,10 +487,10 @@ index 0000000000000000000000000000000000000000..522156e1b7578663c426fcaf7e47acb9
 +}
 diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..c1fb2173ec35e754c6f85cb13f5ef4699cd2535e
+index 0000000000000000000000000000000000000000..ac5807723bd95e05265c7ce098909bab91544017
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-@@ -0,0 +1,310 @@
+@@ -0,0 +1,311 @@
 +package io.papermc.paper.configuration;
 +
 +import co.aikar.timings.MinecraftTimings;
@@ -512,6 +512,7 @@ index 0000000000000000000000000000000000000000..c1fb2173ec35e754c6f85cb13f5ef469
 +import java.util.List;
 +import java.util.Map;
 +import java.util.Objects;
++import java.util.Set;
 +
 +@SuppressWarnings({"CanBeFinal", "FieldCanBeLocal", "FieldMayBeFinal", "NotNullFieldNotInitialized", "InnerClassMayBeStatic"})
 +public class GlobalConfiguration extends ConfigurationPart {
@@ -791,7 +792,7 @@ index 0000000000000000000000000000000000000000..c1fb2173ec35e754c6f85cb13f5ef469
 +        public boolean useDimensionTypeForCustomSpawners = false;
 +        public boolean strictAdvancementDimensionCheck = false;
 +        public IntOr.Default compressionLevel = IntOr.Default.USE_DEFAULT;
-+        public List<String> requiredPlugins = List.of();
++        public Set<String> requiredPlugins = Set.of();
 +    }
 +
 +    public BlockUpdates blockUpdates;
@@ -4983,7 +4984,7 @@ index 277a66863f76d9a7bf59ca87553fc1d335fc73ca..1b5e2e07a7723f61d4c4d4e3141c60b2
          this.setPvpAllowed(dedicatedserverproperties.pvp);
          this.setFlightAllowed(dedicatedserverproperties.allowFlight);
 diff --git a/src/main/java/net/minecraft/server/dedicated/Settings.java b/src/main/java/net/minecraft/server/dedicated/Settings.java
-index 6d89a5414f46a0c30badb4fcd25bc6cb6d18db3a..0ec3b546db0cf3858dd9cd9ea067d1d6713a8491 100644
+index 397c978c71f36c8abe1c52e545699fc7928a6917..d9ad5087d152a2233d16743768d9ce885f32071d 100644
 --- a/src/main/java/net/minecraft/server/dedicated/Settings.java
 +++ b/src/main/java/net/minecraft/server/dedicated/Settings.java
 @@ -119,6 +119,7 @@ public abstract class Settings<T extends Settings<T>> {
@@ -5008,7 +5009,7 @@ index d7c5e872136d0452311b316c5703050c45960230..b84078f8105bccc40da0c14932ad3160
          this.convertable = convertable_conversionsession;
          this.uuid = WorldUUID.getUUID(convertable_conversionsession.levelDirectory.path().toFile());
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index ecbb926986bbc0ad6fe108b782cdc17ee8a9f035..b06ffa8d5953c8f0a47daf056495cd424d9ac843 100644
+index 8487fa452e4009c0f2a23a0d4eac4bf56f91447b..81fbc18b0cd9bc443555001947796342be4123b8 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -155,6 +155,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {

patches/server/0762-Configurable-chat-thread-limit.patch

@@ -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 4a34a49f12b106976ba19436f96f74ebb068249c..d12fd313730c44dcec3c73fcd8c99c0c84f46743 100644
+index 281eaeab7ede6addfd57a809f8752a7d988e2436..3c9f08da21bb50828868d5a0b6a393e36ebd6046 100644
 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-@@ -285,7 +285,18 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -308,7 +308,18 @@ public class GlobalConfiguration extends ConfigurationPart {
  
              @PostProcess
              private void postProcess() {

patches/server/0981-Rewrite-chunk-system.patch

@@ -14605,7 +14605,7 @@ index 0000000000000000000000000000000000000000..962d3cae6340fc11607b59355e291629
 +
 +}
 diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-index 5f59e733c00de9c0f5692b3b3c092a050a9f409f..b8a89bf8a7a0ef25f00ccc0e84ca64f4524fdc3e 100644
+index ac5807723bd95e05265c7ce098909bab91544017..281eaeab7ede6addfd57a809f8752a7d988e2436 100644
 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 @@ -29,6 +29,45 @@ public class GlobalConfiguration extends ConfigurationPart {

patches/server/1062-Add-RequiredPlugins.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add RequiredPlugins
 
 
 diff --git a/src/main/java/io/papermc/paper/plugin/manager/PaperPluginInstanceManager.java b/src/main/java/io/papermc/paper/plugin/manager/PaperPluginInstanceManager.java
-index 08b1aab5d37a56dc42542ce15ba1f7ccd1b08400..54d130f666a0a70894a0f4552305ab58f6120154 100644
+index 04efba1517e2bde8ecced31ab2eb669b2e84a28c..e88d534b13740a20cfed272c774200be6a12bb7c 100644
 --- a/src/main/java/io/papermc/paper/plugin/manager/PaperPluginInstanceManager.java
 +++ b/src/main/java/io/papermc/paper/plugin/manager/PaperPluginInstanceManager.java
 @@ -211,6 +211,11 @@ class PaperPluginInstanceManager {
@@ -21,10 +21,10 @@ index 08b1aab5d37a56dc42542ce15ba1f7ccd1b08400..54d130f666a0a70894a0f4552305ab58
              return;
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 782bb8ca67517dde5dba8f0a133eb8699353dd01..6fb5218e6e7e54c2d55071d6b0315fb66c80e20d 100644
+index 142d2c48239d4ebe3896218536656d116cd24d7c..add071514643b27084d7f1d5b29768edf094e5c3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -305,6 +305,7 @@ public final class CraftServer implements Server {
+@@ -300,6 +300,7 @@ public final class CraftServer implements Server {
      private boolean overrideAllCommandBlockCommands = false;
      public boolean ignoreVanillaPermissions = false;
      private final List<CraftPlayer> playerView;
@@ -32,7 +32,7 @@ index 782bb8ca67517dde5dba8f0a133eb8699353dd01..6fb5218e6e7e54c2d55071d6b0315fb6
      public int reloadCount;
      private final io.papermc.paper.datapack.PaperDatapackManager datapackManager; // Paper
      public static Exception excessiveVelEx; // Paper - Velocity warnings
-@@ -554,6 +555,14 @@ public final class CraftServer implements Server {
+@@ -550,6 +551,14 @@ public final class CraftServer implements Server {
          }
  
          if (type == PluginLoadOrder.POSTWORLD) {
@@ -47,7 +47,7 @@ index 782bb8ca67517dde5dba8f0a133eb8699353dd01..6fb5218e6e7e54c2d55071d6b0315fb6
              // Spigot start - Allow vanilla commands to be forced to be the main command
              this.setVanillaCommands(true);
              this.commandMap.setFallbackCommands();
-@@ -1053,6 +1062,7 @@ public final class CraftServer implements Server {
+@@ -1054,6 +1063,7 @@ public final class CraftServer implements Server {
              world.spigotConfig.init(); // Spigot
          }
  
@@ -55,7 +55,7 @@ index 782bb8ca67517dde5dba8f0a133eb8699353dd01..6fb5218e6e7e54c2d55071d6b0315fb6
          Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
          this.pluginManager.clearPlugins();
          this.commandMap.clearCommands();
-@@ -1094,6 +1104,7 @@ public final class CraftServer implements Server {
+@@ -1095,6 +1105,7 @@ public final class CraftServer implements Server {
          this.loadPlugins();
          this.enablePlugins(PluginLoadOrder.STARTUP);
          this.enablePlugins(PluginLoadOrder.POSTWORLD);