summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2011-08-24 03:49:35 +0100
committerKHobbits <rob@khobbits.co.uk>2011-08-24 03:49:35 +0100
commit6c738294d1a37ad10e351838b6b8923a41b37628 (patch)
tree2b557398514a5b1e255537f5001aebdfcbe3c7a3
parent30f0f78efcc0f4584fb33ffa61f15d96effb3c1d (diff)
downloadEssentials-6c738294d1a37ad10e351838b6b8923a41b37628.tar
Essentials-6c738294d1a37ad10e351838b6b8923a41b37628.tar.gz
Essentials-6c738294d1a37ad10e351838b6b8923a41b37628.tar.lz
Essentials-6c738294d1a37ad10e351838b6b8923a41b37628.tar.xz
Essentials-6c738294d1a37ad10e351838b6b8923a41b37628.zip
Skip default home if it's invalid.
-rw-r--r--Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java b/Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java
index aeb90c806..8a771778d 100644
--- a/Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java
+++ b/Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java
@@ -281,9 +281,10 @@ public class EssentialsUpgrade
@SuppressWarnings("unchecked")
final String defworld = (String)config.getProperty("home.default");
final Location defloc = config.getLocation("home.worlds." + defworld, ess.getServer());
-
- ;
- config.setProperty("homes.home", defloc);
+ if (defloc != null)
+ {
+ config.setProperty("homes.home", defloc);
+ }
List<String> worlds = config.getKeys("home.worlds");
Location loc;