minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-17 20:11:21 +02:00
Code Issues Releases Wiki Activity

Fix _setMoney failing on upgrade.

Browse Source 
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1500 e251c2fe-e539-e718-e476-b85c1f46cddb
This commit is contained in:
snowleo
2011-05-16 08:55:20 +00:00
parent 6c2b47c206
commit 6f0a139ab6
2 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Essentials/src/com/earth2me/essentials/Essentials.java
View File

@@ -99,9 +99,11 @@ public class Essentials extends JavaPlugin
{ {
setStatic(); setStatic();
EssentialsUpgrade upgrade = new EssentialsUpgrade(this.getDescription().getVersion(), this); EssentialsUpgrade upgrade = new EssentialsUpgrade(this.getDescription().getVersion(), this);
upgrade.beforeSettings();
confList = new ArrayList<IConf>(); confList = new ArrayList<IConf>();
settings = new Settings(this.getDataFolder()); settings = new Settings(this.getDataFolder());
confList.add(settings); confList.add(settings);
upgrade.afterSettings();
Util.updateLocale(settings.getLocale(), this.getDataFolder()); Util.updateLocale(settings.getLocale(), this.getDataFolder());
spawn = new Spawn(getServer(), this.getDataFolder()); spawn = new Spawn(getServer(), this.getDataFolder());
confList.add(spawn); confList.add(spawn);

26
Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java
View File

@@ -28,15 +28,6 @@ public class EssentialsUpgrade
} }
alreadyRun = true; alreadyRun = true;
ess = essentials; ess = essentials;
if (!ess.getDataFolder().exists())
{
ess.getDataFolder().mkdirs();
}
moveWorthValuesToWorthYml();
sanitizeAllUserFilenames();
updateUsersToNewDefaultHome();
moveUsersDataToUserdataFolder();
convertWarps();
} }
private void moveWorthValuesToWorthYml() private void moveWorthValuesToWorthYml()
@@ -376,4 +367,21 @@ public class EssentialsUpgrade
} }
return null; return null;
} }
void beforeSettings()
{
if (!ess.getDataFolder().exists())
{
ess.getDataFolder().mkdirs();
}
moveWorthValuesToWorthYml();
}
void afterSettings()
{
sanitizeAllUserFilenames();
updateUsersToNewDefaultHome();
moveUsersDataToUserdataFolder();
convertWarps();
}
} }