From 93d586592e4f01e1dab4f5644f32fbf30cf921cb Mon Sep 17 00:00:00 2001 From: GJ Date: Thu, 31 Oct 2013 08:15:19 -0400 Subject: [PATCH] Move these checks up. These checks need to happen sooner because they may impact config loading, specifically the MCPC+ check. Fixes #1549 --- src/main/java/com/gmail/nossr50/mcMMO.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/mcMMO.java b/src/main/java/com/gmail/nossr50/mcMMO.java index 1066b11b3..07cc8218e 100644 --- a/src/main/java/com/gmail/nossr50/mcMMO.java +++ b/src/main/java/com/gmail/nossr50/mcMMO.java @@ -117,6 +117,12 @@ public class mcMMO extends JavaPlugin { getLogger().setFilter(new LogFilter(this)); metadataValue = new FixedMetadataValue(this, true); + mcpcEnabled = getServer().getName().equals("MCPC+"); + combatTagEnabled = getServer().getPluginManager().getPlugin("CombatTag") != null; + healthBarPluginEnabled = getServer().getPluginManager().getPlugin("HealthBar") != null; + noCheatPlusPluginEnabled = getServer().getPluginManager().getPlugin("NoCheatPlus") != null; + compatNoCheatPlusPluginEnabled = getServer().getPluginManager().getPlugin("CompatNoCheatPlus") != null; + setupFilePaths(); loadConfigFiles(); @@ -125,12 +131,6 @@ public class mcMMO extends JavaPlugin { return; } - mcpcEnabled = getServer().getName().equals("MCPC+"); - combatTagEnabled = getServer().getPluginManager().getPlugin("CombatTag") != null; - healthBarPluginEnabled = getServer().getPluginManager().getPlugin("HealthBar") != null; - noCheatPlusPluginEnabled = getServer().getPluginManager().getPlugin("NoCheatPlus") != null; - compatNoCheatPlusPluginEnabled = getServer().getPluginManager().getPlugin("CompatNoCheatPlus") != null; - if (mcpcEnabled) { checkModConfigs(); }