diff --git a/purpur-server/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/purpur-server/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index e140497bf..d4a6cf2fe 100644 --- a/purpur-server/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/purpur-server/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -49,8 +49,10 @@ public class PurpurWorldConfig { } private void set(String path, Object val) { - PurpurConfig.config.addDefault("world-settings.default." + path, val); - PurpurConfig.config.set("world-settings.default." + path, val); + if (PurpurConfig.config.get("world-settings.default." + path) == null || val == null) { + PurpurConfig.config.addDefault("world-settings.default." + path, val); + PurpurConfig.config.set("world-settings.default." + path, val); + } if (PurpurConfig.config.get("world-settings." + worldName + "." + path) != null) { PurpurConfig.config.addDefault("world-settings." + worldName + "." + path, val); PurpurConfig.config.set("world-settings." + worldName + "." + path, val); @@ -63,12 +65,16 @@ public class PurpurWorldConfig { } private String getString(String path, String def) { - PurpurConfig.config.addDefault("world-settings.default." + path, def); + if (PurpurConfig.config.get("world-settings.default." + path) == null) { + PurpurConfig.config.addDefault("world-settings.default." + path, def); + } return PurpurConfig.config.getString("world-settings." + worldName + "." + path, PurpurConfig.config.getString("world-settings.default." + path)); } private boolean getBoolean(String path, boolean def) { - PurpurConfig.config.addDefault("world-settings.default." + path, def); + if (PurpurConfig.config.get("world-settings.default." + path) == null) { + PurpurConfig.config.addDefault("world-settings.default." + path, def); + } return PurpurConfig.config.getBoolean("world-settings." + worldName + "." + path, PurpurConfig.config.getBoolean("world-settings.default." + path)); } @@ -79,17 +85,23 @@ public class PurpurWorldConfig { } private double getDouble(String path, double def) { - PurpurConfig.config.addDefault("world-settings.default." + path, def); + if (PurpurConfig.config.get("world-settings.default." + path) == null) { + PurpurConfig.config.addDefault("world-settings.default." + path, def); + } return PurpurConfig.config.getDouble("world-settings." + worldName + "." + path, PurpurConfig.config.getDouble("world-settings.default." + path)); } private int getInt(String path, int def) { - PurpurConfig.config.addDefault("world-settings.default." + path, def); + if (PurpurConfig.config.get("world-settings.default." + path) == null) { + PurpurConfig.config.addDefault("world-settings.default." + path, def); + } return PurpurConfig.config.getInt("world-settings." + worldName + "." + path, PurpurConfig.config.getInt("world-settings.default." + path)); } private List getList(String path, T def) { - PurpurConfig.config.addDefault("world-settings.default." + path, def); + if (PurpurConfig.config.get("world-settings.default." + path) == null) { + PurpurConfig.config.addDefault("world-settings.default." + path, def); + } return PurpurConfig.config.getList("world-settings." + worldName + "." + path, PurpurConfig.config.getList("world-settings.default." + path)); }