mirror of
https://github.com/EssentialsX/Essentials.git
synced 2025-02-04 06:21:35 +01:00
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 79a44b919c
)
This commit is contained in:
parent
79671d08e4
commit
7f9a52c3f7
@ -15,7 +15,6 @@ import org.bukkit.Bukkit;
|
|||||||
import org.bukkit.Location;
|
import org.bukkit.Location;
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
import org.bukkit.World;
|
import org.bukkit.World;
|
||||||
import org.bukkit.configuration.ConfigurationSection;
|
|
||||||
import org.bukkit.inventory.ItemStack;
|
import org.bukkit.inventory.ItemStack;
|
||||||
|
|
||||||
|
|
||||||
@ -790,41 +789,6 @@ public class EssentialsUpgrade
|
|||||||
doneFile.save();
|
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()
|
public void beforeSettings()
|
||||||
{
|
{
|
||||||
if (!ess.getDataFolder().exists())
|
if (!ess.getDataFolder().exists())
|
||||||
@ -847,7 +811,6 @@ public class EssentialsUpgrade
|
|||||||
deleteOldItemsCsv();
|
deleteOldItemsCsv();
|
||||||
updateSpawnsToNewSpawnsConfig();
|
updateSpawnsToNewSpawnsConfig();
|
||||||
updateJailsToNewJailsConfig();
|
updateJailsToNewJailsConfig();
|
||||||
updateNumberedHomeNames();
|
|
||||||
warnMetrics();
|
warnMetrics();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user