only initialize the config once, closes #1637

PurpurMC · Jan 30, 2025 · 79c1192 · 79c1192
1 parent 88ed744
commit 79c1192
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/...erver/minecraft-patches/sources/net/minecraft/server/dedicated/DedicatedServer.java.patch b/...erver/minecraft-patches/sources/net/minecraft/server/dedicated/DedicatedServer.java.patch
@@ -12,15 +12,15 @@
          io.papermc.paper.command.PaperCommands.registerCommands(this); // Paper - setup /paper command
          this.server.spark.registerCommandBeforePlugins(this.server); // Paper - spark
          com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics(); // Paper - start metrics
-+        // Purpur start - Purpur config files
++        /*// Purpur start - Purpur config files // Purpur - Configurable void damage height and damage
 +        try {
 +            org.purpurmc.purpur.PurpurConfig.init((java.io.File) options.valueOf("purpur-settings"));
 +        } catch (Exception e) {
 +            DedicatedServer.LOGGER.error("Unable to load server configuration", e);
 +            return false;
 +        }
 +        org.purpurmc.purpur.PurpurConfig.registerCommands();
-+        // Purpur end - Purpur config files
++        */// Purpur end - Purpur config files // Purpur - Configurable void damage height and damage
          com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - load version history now
 
          this.setPvpAllowed(properties.pvp);

diff --git a/purpur-server/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/purpur-server/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -74,8 +74,8 @@ public static void init(File configFile) {
         commands = new HashMap<>();
         commands.put("purpur", new PurpurCommand("purpur"));
 
-        version = getInt("config-version", 38);
-        set("config-version", 38);
+        version = getInt("config-version", 39);
+        set("config-version", 39);
 
         readConfig(PurpurConfig.class, null);
 

diff --git a/purpur-server/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/purpur-server/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -611,7 +611,7 @@ private void toolSettings() {
             PurpurConfig.config.set("world-settings.default.tools.axe.weatherables.minecraft:weathered_copper_bulb", Map.of("into", "minecraft:exposed_copper_bulb", "drops", new HashMap<String, Double>()));
             PurpurConfig.config.set("world-settings.default.tools.axe.weatherables.minecraft:oxidized_copper_bulb", Map.of("into", "minecraft:weathered_copper_bulb", "drops", new HashMap<String, Double>()));
         }
-        if (PurpurConfig.version < 38) {
+        if (PurpurConfig.version < 39) {
             PurpurConfig.config.set("world-settings.default.tools.axe.strippables.minecraft:pale_oak_wood", Map.of("into", "minecraft:stripped_pale_oak_wood", "drops", new HashMap<String, Double>()));
             PurpurConfig.config.set("world-settings.default.tools.axe.strippables.minecraft:pale_oak_log", Map.of("into", "minecraft:stripped_pale_oak_log", "drops", new HashMap<String, Double>()));
         }