From 2a977557c2f3b2b06b23aebdcf678ee75d651a50 Mon Sep 17 00:00:00 2001 From: bm01 Date: Thu, 24 May 2012 06:18:43 +0200 Subject: [PATCH] Made sure that SpoutConfig.load is called when the instance is created, for safety --- src/main/java/com/gmail/nossr50/config/SpoutConfig.java | 1 + src/main/java/com/gmail/nossr50/runnables/SpoutStart.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gmail/nossr50/config/SpoutConfig.java b/src/main/java/com/gmail/nossr50/config/SpoutConfig.java index 68fb3b1b8..54209533f 100644 --- a/src/main/java/com/gmail/nossr50/config/SpoutConfig.java +++ b/src/main/java/com/gmail/nossr50/config/SpoutConfig.java @@ -9,6 +9,7 @@ public class SpoutConfig extends ConfigLoader { public static SpoutConfig getInstance() { if (instance == null) { instance = new SpoutConfig(mcMMO.p); + instance.load(); } return instance; diff --git a/src/main/java/com/gmail/nossr50/runnables/SpoutStart.java b/src/main/java/com/gmail/nossr50/runnables/SpoutStart.java index 1c7ec1b04..737ee66ec 100644 --- a/src/main/java/com/gmail/nossr50/runnables/SpoutStart.java +++ b/src/main/java/com/gmail/nossr50/runnables/SpoutStart.java @@ -25,7 +25,7 @@ public class SpoutStart implements Runnable{ //Spout Stuff if (plugin.spoutEnabled) { - SpoutConfig.getInstance().load(); + SpoutConfig.getInstance(); SpoutStuff.setupSpoutConfigs(); SpoutStuff.registerCustomEvent(); SpoutStuff.extractFiles(); //Extract source materials