Upstream/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-12-28 11:37:39 +01:00
Code Issues Projects Releases Wiki Activity

NPE fix

Browse Source
This commit is contained in:
nossr50 2012-04-26 12:18:43 -07:00
parent b8e128e0a9
commit 22169c64db
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/gmail/nossr50/config/Config.java
View File

@ -5,7 +5,7 @@ import com.gmail.nossr50.datatypes.HUDType;
public class Config extends ConfigLoader{ public class Config extends ConfigLoader{
public static int xpGainMultiplier = getExperienceGainsGlobalMultiplier(); public static int xpGainMultiplier = 1;
/* /*
* GENERAL SETTINGS * GENERAL SETTINGS
@ -319,6 +319,7 @@ public class Config extends ConfigLoader{
public Config(mcMMO plugin) { public Config(mcMMO plugin) {
super(plugin, "config.yml"); super(plugin, "config.yml");
config = plugin.getConfig(); config = plugin.getConfig();
xpGainMultiplier = getExperienceGainsGlobalMultiplier();
} }
@Override @Override

1
src/main/java/com/gmail/nossr50/datatypes/popups/PopupMMO.java
View File

@ -5,7 +5,6 @@ import org.bukkit.entity.Player;
import org.getspout.spoutapi.gui.GenericLabel; import org.getspout.spoutapi.gui.GenericLabel;
import org.getspout.spoutapi.gui.GenericPopup; import org.getspout.spoutapi.gui.GenericPopup;
import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.datatypes.buttons.ButtonEscape; import com.gmail.nossr50.datatypes.buttons.ButtonEscape;
import com.gmail.nossr50.datatypes.buttons.ButtonHUDStyle; import com.gmail.nossr50.datatypes.buttons.ButtonHUDStyle;