NPE fix

mcMMO-Dev · Apr 26, 2012 · 22169c6 · 22169c6
1 parent b8e128e
commit 22169c6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/java/com/gmail/nossr50/config/Config.java b/src/main/java/com/gmail/nossr50/config/Config.java
@@ -5,7 +5,7 @@
 
 public class Config extends ConfigLoader{
 
-    public static int xpGainMultiplier = getExperienceGainsGlobalMultiplier();
+    public static int xpGainMultiplier = 1;
 
     /*
      * GENERAL SETTINGS
@@ -319,6 +319,7 @@ public static String getMySQLUserPassword() {
     public Config(mcMMO plugin) {
         super(plugin, "config.yml");
         config = plugin.getConfig();
+        xpGainMultiplier = getExperienceGainsGlobalMultiplier();
     }
 
     @Override

diff --git a/src/main/java/com/gmail/nossr50/datatypes/popups/PopupMMO.java b/src/main/java/com/gmail/nossr50/datatypes/popups/PopupMMO.java
@@ -5,7 +5,6 @@
 import org.getspout.spoutapi.gui.GenericLabel;
 import org.getspout.spoutapi.gui.GenericPopup;
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.buttons.ButtonEscape;
 import com.gmail.nossr50.datatypes.buttons.ButtonHUDStyle;