More paper config cleanup (#9938)

Also adds a warning and error message if a newer config version
was found signaling a downgrade.
This commit is contained in:
Jake Potrebic
2023-11-18 16:29:14 -08:00
parent 72f5e76f9b
commit 7693140ca0
8 changed files with 175 additions and 116 deletions

View File

@@ -552,8 +552,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
// Spigot end
// Paper start
+ io.papermc.paper.util.ObfHelper.INSTANCE.getClass(); // Paper - load mappings for stacktrace deobf and etc.
paperConfigurations.initializeGlobalConfiguration();
paperConfigurations.initializeWorldDefaultsConfiguration();
paperConfigurations.initializeGlobalConfiguration(this.registryAccess());
paperConfigurations.initializeWorldDefaultsConfiguration(this.registryAccess());
org.spigotmc.WatchdogThread.doStart(org.spigotmc.SpigotConfig.timeoutTime, org.spigotmc.SpigotConfig.restartOnCrash);
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644