EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-26 07:06:45 +01:00
Code Issues Projects Releases Wiki Activity

Fixed double Config instantiation causing NPE on PlayerProfile.save()

Browse Source
This commit is contained in:
bm01 2012-05-09 15:58:11 +02:00
parent 68b9857409
commit 06791beabd
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,6 +15,7 @@ public class Config extends ConfigLoader {
public static Config getInstance() { public static Config getInstance() {
if (instance == null) { if (instance == null) {
instance = new Config(mcMMO.p); instance = new Config(mcMMO.p);
instance.load();
} }
return instance; return instance;
@ -440,14 +441,14 @@ public class Config extends ConfigLoader {
public HUDType defaulthud; public HUDType defaulthud;
public Config(mcMMO plugin) { private Config(mcMMO plugin) {
super(plugin, "config.yml"); super(plugin, "config.yml");
config = plugin.getConfig(); config = plugin.getConfig();
xpGainMultiplier = getExperienceGainsGlobalMultiplier(); xpGainMultiplier = getExperienceGainsGlobalMultiplier();
} }
@Override @Override
public void load() { protected void load() {
if (!configFile.exists()) { if (!configFile.exists()) {
dataFolder.mkdir(); dataFolder.mkdir();
plugin.saveDefaultConfig(); plugin.saveDefaultConfig();

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

@ -22,6 +22,7 @@ public class LoadTreasures extends ConfigLoader{
public static LoadTreasures getInstance() { public static LoadTreasures getInstance() {
if (instance == null) { if (instance == null) {
instance = new LoadTreasures(mcMMO.p); instance = new LoadTreasures(mcMMO.p);
instance.load();
} }
return instance; return instance;
@ -46,7 +47,7 @@ public class LoadTreasures extends ConfigLoader{
} }
@Override @Override
public void load() { protected void load() {
if (!configFile.exists()) { if (!configFile.exists()) {
dataFolder.mkdir(); dataFolder.mkdir();
plugin.saveTreasuresConfig(); plugin.saveTreasuresConfig();

15
src/main/java/com/gmail/nossr50/mcMMO.java
View File

@ -60,9 +60,7 @@ public class mcMMO extends JavaPlugin {
public File mcmmo; public File mcmmo;
//File Paths //File Paths
public String mainDirectory, flatFileDirectory, usersFile, leaderboardDirectory, modDirectory; public String mainDirectory, flatFileDirectory, usersFile, leaderboardDirectory, modDirectory;
private static Config configInstance = null;
/** /**
* Things to be run when the plugin is enabled. * Things to be run when the plugin is enabled.
@ -70,11 +68,10 @@ public class mcMMO extends JavaPlugin {
public void onEnable() { public void onEnable() {
p = this; p = this;
setupFilePaths(); setupFilePaths();
configInstance = new Config(this); //Force the loading of config files
configInstance.load(); Config configInstance = Config.getInstance();
LoadTreasures.getInstance();
LoadTreasures.getInstance().load();
if (configInstance.getToolModsEnabled()) { if (configInstance.getToolModsEnabled()) {
LoadCustomTools.getInstance().load(); LoadCustomTools.getInstance().load();
@ -244,6 +241,8 @@ public class mcMMO extends JavaPlugin {
getCommand("unarmed").setExecutor(new UnarmedCommand()); getCommand("unarmed").setExecutor(new UnarmedCommand());
getCommand("woodcutting").setExecutor(new WoodcuttingCommand()); getCommand("woodcutting").setExecutor(new WoodcuttingCommand());
Config configInstance = Config.getInstance();
//mc* commands //mc* commands
if (configInstance.getCommandMCRemoveEnabled()) { if (configInstance.getCommandMCRemoveEnabled()) {
getCommand("mcremove").setExecutor(new McremoveCommand(this)); getCommand("mcremove").setExecutor(new McremoveCommand(this));