From 22169c64dbb6a8e433edb9b264cb6e0e6535bbe8 Mon Sep 17 00:00:00 2001
From: nossr50 <nossr50@gmail.com>
Date: Thu, 26 Apr 2012 12:18:43 -0700
Subject: [PATCH] NPE fix

---
 src/main/java/com/gmail/nossr50/config/Config.java             | 3 ++-
 src/main/java/com/gmail/nossr50/datatypes/popups/PopupMMO.java | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/gmail/nossr50/config/Config.java b/src/main/java/com/gmail/nossr50/config/Config.java
index 4636bb4cf..99552d587 100644
--- a/src/main/java/com/gmail/nossr50/config/Config.java
+++ b/src/main/java/com/gmail/nossr50/config/Config.java
@@ -5,7 +5,7 @@ import com.gmail.nossr50.datatypes.HUDType;
 
 public class Config extends ConfigLoader{
     
-    public static int xpGainMultiplier = getExperienceGainsGlobalMultiplier();
+    public static int xpGainMultiplier = 1;
 
     /*
      * GENERAL SETTINGS
@@ -319,6 +319,7 @@ public class Config extends ConfigLoader{
     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
index f1c46f498..1b876f758 100644
--- 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.bukkit.entity.Player;
 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;