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
commit560ea0d3838a6424b1a591ecdd7e361cb4e918bf (patch)
tree69cff2b63a84aed962444cb971b414c1f6e01ba4
parent13056601b7ee5ad2b40e0b468c6910cc286e39ee (diff)
downloadEssentials-560ea0d3838a6424b1a591ecdd7e361cb4e918bf.tar
Essentials-560ea0d3838a6424b1a591ecdd7e361cb4e918bf.tar.gz
Essentials-560ea0d3838a6424b1a591ecdd7e361cb4e918bf.tar.lz
Essentials-560ea0d3838a6424b1a591ecdd7e361cb4e918bf.tar.xz
Essentials-560ea0d3838a6424b1a591ecdd7e361cb4e918bf.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;