diff options
author | snowleo <snowleo@e251c2fe-e539-e718-e476-b85c1f46cddb> | 2011-05-01 21:58:38 +0000 |
---|---|---|
committer | snowleo <snowleo@e251c2fe-e539-e718-e476-b85c1f46cddb> | 2011-05-01 21:58:38 +0000 |
commit | 088508bd374b630e75b4ea9364bfbdaae1a30586 (patch) | |
tree | 2d73fbc7ac0007f4e66b6b0fac49a97657b73b2d | |
parent | 224c18348ae18ddd6c3e3de0f98a9d3f039e67d8 (diff) | |
download | Essentials-088508bd374b630e75b4ea9364bfbdaae1a30586.tar Essentials-088508bd374b630e75b4ea9364bfbdaae1a30586.tar.gz Essentials-088508bd374b630e75b4ea9364bfbdaae1a30586.tar.lz Essentials-088508bd374b630e75b4ea9364bfbdaae1a30586.tar.xz Essentials-088508bd374b630e75b4ea9364bfbdaae1a30586.zip |
[trunk] Fix bug on upgrade the home locations
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1301 e251c2fe-e539-e718-e476-b85c1f46cddb
-rw-r--r-- | Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java | 2 | ||||
-rw-r--r-- | Essentials/src/com/earth2me/essentials/UserData.java | 31 |
2 files changed, 21 insertions, 12 deletions
diff --git a/Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java b/Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java index cba23d301..8f582769e 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java +++ b/Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java @@ -193,7 +193,7 @@ public class EssentialsUpgrade { user.setMails(mails); } - if (user.getHome() == null) + if (!user.hasHome()) { @SuppressWarnings("unchecked") List<Object> vals = (List<Object>)usersConfig.getProperty(username + ".home"); diff --git a/Essentials/src/com/earth2me/essentials/UserData.java b/Essentials/src/com/earth2me/essentials/UserData.java index 941950c4e..170394014 100644 --- a/Essentials/src/com/earth2me/essentials/UserData.java +++ b/Essentials/src/com/earth2me/essentials/UserData.java @@ -87,21 +87,30 @@ public abstract class UserData extends PlayerExtension implements IConf } } - public Location getHome() + public boolean hasHome() { if (config.hasProperty("home")) { - World world = getLocation().getWorld(); - String worldHome = "home.worlds." + world.getName().toLowerCase(); - if (!config.hasProperty(worldHome)) - { - String defaultWorld = config.getString("home.default"); - worldHome = "home.worlds." + defaultWorld; - } - Location loc = config.getLocation(worldHome, getServer()); - return loc; + return true; + } + return false; + } + + public Location getHome() + { + if (!hasHome()) + { + return null; + } + World world = getLocation().getWorld(); + String worldHome = "home.worlds." + world.getName().toLowerCase(); + if (!config.hasProperty(worldHome)) + { + String defaultWorld = config.getString("home.default"); + worldHome = "home.worlds." + defaultWorld; } - return null; + Location loc = config.getLocation(worldHome, getServer()); + return loc; } public void setHome(Location loc, boolean b) |