diff options
| author | snowleo <snowleo@e251c2fe-e539-e718-e476-b85c1f46cddb> | 2011-05-02 00:20:57 +0000 |
|---|---|---|
| committer | snowleo <snowleo@e251c2fe-e539-e718-e476-b85c1f46cddb> | 2011-05-02 00:20:57 +0000 |
| commit | d9294d6cbb2887b626b7ab3d142861a7b5f7afd0 (patch) | |
| tree | 02eb84d2fe3d97c714cfc1396933cb7225f777b0 | |
| parent | 0e4de9e17e3b9c7f70c799c9a522b9c8c4303c90 (diff) | |
| download | Essentials-d9294d6cbb2887b626b7ab3d142861a7b5f7afd0.tar Essentials-d9294d6cbb2887b626b7ab3d142861a7b5f7afd0.tar.gz Essentials-d9294d6cbb2887b626b7ab3d142861a7b5f7afd0.tar.lz Essentials-d9294d6cbb2887b626b7ab3d142861a7b5f7afd0.tar.xz Essentials-d9294d6cbb2887b626b7ab3d142861a7b5f7afd0.zip | |
[trunk] Fix converting to new home format.
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1304 e251c2fe-e539-e718-e476-b85c1f46cddb
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java b/Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java index 3c40db8a8..452caeec3 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java +++ b/Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java @@ -139,12 +139,16 @@ public class EssentialsUpgrade continue; } EssentialsConf config = new EssentialsConf(file); + config.load(); if (config.hasProperty("home") && !config.hasProperty("home.default")) { @SuppressWarnings("unchecked") List<Object> vals = (List<Object>)config.getProperty("home"); - World world = ess.getServer() == null ? null : ess.getServer().getWorlds().get(0); - if (vals.size() > 5 && ess.getServer() != null) + if (vals == null) { + continue; + } + World world = ess.getServer().getWorlds().get(0); + if (vals.size() > 5) { world = ess.getServer().getWorld((String)vals.get(5)); } |