mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

move commands out of configuration

Browse source
This commit is contained in:
Jake Potrebic 2022-06-09 14:43:27 -07:00
parent ad51c406d5
commit 3f1c6a45da
No known key found for this signature in database
GPG key ID: ECE0B3C133C016C5
27 changed files with 167 additions and 188 deletions
Download patch file Download diff file Expand all files Collapse all files

19
patches/server/0004-Paper-config-files.patch
View file

@ -836,10 +836,10 @@ index 0000000000000000000000000000000000000000..69add4a7f1147015806bc9b63a8340d1
+}
diff --git a/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java b/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
new file mode 100644
index 0000000000000000000000000000000000000000..214bc66788d1736d40202b794ab5f820e0ebe611
index 0000000000000000000000000000000000000000..be64437ba7630fe069aaea502932b514c85162f8
--- /dev/null
+++ b/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
@@ -0,0 +1,394 @@
@@ -0,0 +1,384 @@
+package io.papermc.paper.configuration;
+
+import com.google.common.base.Suppliers;
@ -1192,16 +1192,6 @@ index 0000000000000000000000000000000000000000..214bc66788d1736d40202b794ab5f820
+ return Files.exists(legacyConfig) && Files.isRegularFile(legacyConfig);
+ }
+
+ private static final Map<String, Command> COMMANDS = new HashMap<>();
+ static {
+ }
+
+ public static void registerCommands(final MinecraftServer server) {
+ COMMANDS.forEach((s, command) -> {
+ server.server.getCommandMap().register(s, "Paper", command);
+ });
+ }
+
+ @Deprecated
+ public YamlConfiguration createLegacyObject(final MinecraftServer server) {
+ YamlConfiguration global = YamlConfiguration.loadConfiguration(this.globalFolder.resolve(this.globalConfigFileName).toFile());
@ -4006,17 +3996,16 @@ index 697ca7457115423a8c4d8a7d1f7a353237b56509..86c218e41fbe2a55b1319b37d26fd5da
}
}
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index 570db14d930e15a96621d0d24ce11a27dc38494b..297bb691759ed5be375f49441778892e1c816fc1 100644
index 570db14d930e15a96621d0d24ce11a27dc38494b..e476f93547f386ded0174693a6218d793ccc450b 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -188,6 +188,11 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -188,6 +188,10 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
org.spigotmc.SpigotConfig.init((java.io.File) options.valueOf("spigot-settings"));
org.spigotmc.SpigotConfig.registerCommands();
// Spigot end
+ // Paper start
+ paperConfigurations.initializeGlobalConfiguration();
+ paperConfigurations.initializeWorldDefaultsConfiguration();
+ io.papermc.paper.configuration.PaperConfigurations.registerCommands(this);
+ // Paper end
this.setPvpAllowed(dedicatedserverproperties.pvp);