diff --git a/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java b/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java index 1ad6d00b0..946e514e2 100644 --- a/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java +++ b/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java @@ -777,6 +777,7 @@ public class AdvancedConfig extends AutoUpdateConfigLoader { } else { mcMMO.p.getLogger().warning("Errors were found in " + fileName + "! mcMMO was disabled!"); mcMMO.p.getServer().getPluginManager().disablePlugin(mcMMO.p); + mcMMO.p.noErrorsInConfigFiles = false; } } diff --git a/src/main/java/com/gmail/nossr50/config/Config.java b/src/main/java/com/gmail/nossr50/config/Config.java index 47aa1543f..bd4fa7dc7 100644 --- a/src/main/java/com/gmail/nossr50/config/Config.java +++ b/src/main/java/com/gmail/nossr50/config/Config.java @@ -203,6 +203,7 @@ public class Config extends AutoUpdateConfigLoader { } else { mcMMO.p.getLogger().warning("Errors were found in " + fileName + "! mcMMO was disabled!"); mcMMO.p.getServer().getPluginManager().disablePlugin(mcMMO.p); + mcMMO.p.noErrorsInConfigFiles = false; } } diff --git a/src/main/java/com/gmail/nossr50/mcMMO.java b/src/main/java/com/gmail/nossr50/mcMMO.java index c197d1faa..53c8d67d7 100644 --- a/src/main/java/com/gmail/nossr50/mcMMO.java +++ b/src/main/java/com/gmail/nossr50/mcMMO.java @@ -78,6 +78,9 @@ public class mcMMO extends JavaPlugin { private static boolean spoutEnabled; private static boolean combatTagEnabled; + // Config Validation Check + public boolean noErrorsInConfigFiles = true; + // XP Event Check private boolean xpEventEnabled; @@ -109,6 +112,10 @@ public class mcMMO extends JavaPlugin { setupSpout(); loadConfigFiles(); + if (!noErrorsInConfigFiles) { + return; + } + combatTagEnabled = getServer().getPluginManager().getPlugin("CombatTag") != null; databaseManager = DatabaseManagerFactory.getDatabaseManager(); @@ -307,11 +314,6 @@ public class mcMMO extends JavaPlugin { repairables.addAll(rManager.getLoadedRepairables()); repairableManager = RepairableManagerFactory.getRepairManager(repairables.size()); repairableManager.registerRepairables(repairables); - - // Check if Repair Anvil and Salvage Anvil have different itemID's - if (Config.getInstance().getSalvageAnvilId() == Config.getInstance().getRepairAnvilId()) { - getLogger().warning("Can't use the same itemID for Repair/Salvage Anvils!"); - } } private void setupSpout() {