From d9294d6cbb2887b626b7ab3d142861a7b5f7afd0 Mon Sep 17 00:00:00 2001
From: snowleo <snowleo@e251c2fe-e539-e718-e476-b85c1f46cddb>
Date: Mon, 2 May 2011 00:20:57 +0000
Subject: [PATCH] [trunk] Fix converting to new home format.

git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1304 e251c2fe-e539-e718-e476-b85c1f46cddb
---
 .../src/com/earth2me/essentials/EssentialsUpgrade.java    | 8 ++++++--
 1 file 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));
 				}