From 86e7bfbf89f027fec63730fa5a5da1884ed8a098 Mon Sep 17 00:00:00 2001 From: nossr50 Date: Sun, 30 Jan 2022 14:24:21 -0800 Subject: [PATCH] Disabling mcMMO when the config breaks is dumb Fixes #4732 --- src/main/java/com/gmail/nossr50/config/BukkitConfig.java | 4 +--- src/main/java/com/gmail/nossr50/mcMMO.java | 7 ------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/config/BukkitConfig.java b/src/main/java/com/gmail/nossr50/config/BukkitConfig.java index a22990e00..f17b5c5f9 100644 --- a/src/main/java/com/gmail/nossr50/config/BukkitConfig.java +++ b/src/main/java/com/gmail/nossr50/config/BukkitConfig.java @@ -99,9 +99,7 @@ public abstract class BukkitConfig { if (validateKeys()) { mcMMO.p.debug("No errors found in " + fileName + "!"); } else { - mcMMO.p.getLogger().warning("Errors were found in " + fileName + "! mcMMO was disabled!"); - mcMMO.p.getServer().getPluginManager().disablePlugin(mcMMO.p); - mcMMO.p.noErrorsInConfigFiles = false; + mcMMO.p.getLogger().warning("Errors were found in " + fileName + ", overwriting invalid values!"); } } diff --git a/src/main/java/com/gmail/nossr50/mcMMO.java b/src/main/java/com/gmail/nossr50/mcMMO.java index 8a8d3192b..3d33807b3 100644 --- a/src/main/java/com/gmail/nossr50/mcMMO.java +++ b/src/main/java/com/gmail/nossr50/mcMMO.java @@ -125,9 +125,6 @@ public class mcMMO extends JavaPlugin { // API checks private static boolean serverAPIOutdated = false; - // Config Validation Check - public boolean noErrorsInConfigFiles = true; - // XP Event Check private boolean xpEventEnabled; @@ -199,10 +196,6 @@ public class mcMMO extends JavaPlugin { loadConfigFiles(); - if (!noErrorsInConfigFiles) { - return; - } - if (getServer().getName().equals("Cauldron") || getServer().getName().equals("MCPC+")) { checkModConfigs(); }