Update home names to prepend "home" to numeric home names

1 files changed, 32 insertions, 0 deletions

diff --git a/Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java b/Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java
index 384e15603..d4f5c92b6 100644
--- a/Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java
+++ b/Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java
@@ -15,6 +15,7 @@ import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.World;
+import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.inventory.ItemStack;
 
 
@@ -789,6 +790,36 @@ public class EssentialsUpgrade
 		doneFile.save();
 	}
 
+	private void updateNumberedHomeNames()
+	{
+		if (doneFile.getBoolean("numberedHomeNames"))
+		{
+			return;
+		}
+		File[] files = new File(ess.getDataFolder(), "userdata").listFiles();
+		for(File file : files)
+		{
+			EssentialsConf config = new EssentialsConf(file);
+			config.load();
+			Set<String> homes = config.getConfigurationSection("homes").getKeys(true);
+			for(String s : homes)
+			{
+				if(!s.contains(".") && Util.isInt(s))
+				{
+					ConfigurationSection home = config.getConfigurationSection("homes." + s);
+					double x = home.getDouble("x"), y = home.getDouble("y"), z = home.getDouble("z"), yaw = home.getDouble("yaw"), pitch = home.getDouble("pitch");
+					config.setProperty("homes.home" + s, new Location(ess.getServer().getWorld(home.getString("world")), home.getDouble("x"), home.getDouble("y"), home.getDouble("z"), (float)home.getDouble("yaw"), (float)home.getDouble("pitch")));
+					config.removeProperty("homes." + s);
+				}
+			}
+			config.save();
+		}
+		
+
+		doneFile.setProperty("numberedHomeNames", true);
+		doneFile.save();
+	}
+
 	public void beforeSettings()
 	{
 		if (!ess.getDataFolder().exists())
@@ -811,6 +842,7 @@ public class EssentialsUpgrade
 		deleteOldItemsCsv();
 		updateSpawnsToNewSpawnsConfig();
 		updateJailsToNewJailsConfig();
+		updateNumberedHomeNames();
 		warnMetrics();
 	}
 }