From 7f9a52c3f7d59e3f5f6b5063b8c2bce16c0d9e16 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@bigpond.com>
Date: Thu, 20 Dec 2012 17:24:14 +1100
Subject: Lets leave numeric homes as is for now, looping through all files on
 server startup is not the place to do this (reverse-merged from commit
 79a44b919cc05e1f03088d4345fc73363d9c490b)

---
 .../com/earth2me/essentials/EssentialsUpgrade.java | 37 ----------------------
 1 file changed, 37 deletions(-)

diff --git a/Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java b/Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java
index fb60d5b7c..384e15603 100644
--- a/Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java
+++ b/Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java
@@ -15,7 +15,6 @@ 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;
 
 
@@ -790,41 +789,6 @@ 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();
-			ConfigurationSection homesSection = config.getConfigurationSection("homes");
-			if(homesSection == null)
-			{
-				continue;
-			}
-			Set<String> homes = homesSection.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())
@@ -847,7 +811,6 @@ public class EssentialsUpgrade
 		deleteOldItemsCsv();
 		updateSpawnsToNewSpawnsConfig();
 		updateJailsToNewJailsConfig();
-		updateNumberedHomeNames();
 		warnMetrics();
 	}
 }
-- 
cgit v1.2.3