diff --git a/src/main/java/com/gmail/nossr50/mcMMO.java b/src/main/java/com/gmail/nossr50/mcMMO.java index ca71cb163..47586e5ea 100644 --- a/src/main/java/com/gmail/nossr50/mcMMO.java +++ b/src/main/java/com/gmail/nossr50/mcMMO.java @@ -128,8 +128,11 @@ public class mcMMO extends JavaPlugin { p = this; setupFilePaths(); - SpoutStuff.setSpoutEnabled(); - SpoutStuff.preCacheFiles(); + if (p.getServer().getPluginManager().getPlugin("Spout") != null) { + spoutEnabled = true; + + SpoutStuff.preCacheFiles(); + } // Force the loading of config files Config configInstance = Config.getInstance(); @@ -176,7 +179,6 @@ public class mcMMO extends JavaPlugin { pluginManager.registerEvents(inventoryListener, this); pluginManager.registerEvents(worldListener, this); - if (configInstance.getHardcoreEnabled()) { pluginManager.registerEvents(hardcoreListener, this); } diff --git a/src/main/java/com/gmail/nossr50/spout/SpoutStuff.java b/src/main/java/com/gmail/nossr50/spout/SpoutStuff.java index 385517884..4bfd931d2 100644 --- a/src/main/java/com/gmail/nossr50/spout/SpoutStuff.java +++ b/src/main/java/com/gmail/nossr50/spout/SpoutStuff.java @@ -594,15 +594,6 @@ public class SpoutStuff { } } - public static void setSpoutEnabled() { - if (plugin.getServer().getPluginManager().getPlugin("Spout") != null) { - mcMMO.spoutEnabled = true; - } - else { - mcMMO.spoutEnabled = false; - } - } - public static void preCacheFiles() { if (mcMMO.spoutEnabled) { extractFiles(); //Extract source materials