Upstream/Multiverse-Core
1
0
Fork 0
mirror of https://github.com/Multiverse/Multiverse-Core.git synced 2024-11-07 11:20:32 +01:00
Code Issues Projects Releases Wiki Activity

Dots in world-names are now possible! :D

Browse Source
This commit is contained in:
main() 2012-03-04 19:36:14 +01:00
parent 91f7debb08
commit bbe134bd1a
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/java/com/onarandombox/MultiverseCore/utils/WorldManager.java
View File

@ -18,6 +18,7 @@ import org.bukkit.World;
import org.bukkit.World.Environment; import org.bukkit.World.Environment;
import org.bukkit.WorldCreator; import org.bukkit.WorldCreator;
import org.bukkit.WorldType; import org.bukkit.WorldType;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -35,6 +36,7 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.Stack;
import java.util.logging.Level; import java.util.logging.Level;
/** /**
@ -470,6 +472,7 @@ public class WorldManager implements MVWorldManager {
} }
private void ensureConfigIsPrepared() { private void ensureConfigIsPrepared() {
this.configWorlds.options().pathSeparator(SEPARATOR);
if (this.configWorlds.getConfigurationSection("worlds") == null) { if (this.configWorlds.getConfigurationSection("worlds") == null) {
this.configWorlds.createSection("worlds"); this.configWorlds.createSection("worlds");
} }
@ -550,6 +553,8 @@ public class WorldManager implements MVWorldManager {
return worldPurger; return worldPurger;
} }
private static final char SEPARATOR = '\uF8FF';
/** /**
* {@inheritDoc} * {@inheritDoc}
*/ */
@ -557,12 +562,26 @@ public class WorldManager implements MVWorldManager {
public FileConfiguration loadWorldConfig(File file) { public FileConfiguration loadWorldConfig(File file) {
this.configWorlds = YamlConfiguration.loadConfiguration(file); this.configWorlds = YamlConfiguration.loadConfiguration(file);
this.ensureConfigIsPrepared(); this.ensureConfigIsPrepared();
try {
this.configWorlds.save(new File(this.plugin.getDataFolder(), "worlds.yml"));
} catch (IOException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
// load world-objects // load world-objects
Set<String> worldKeys = this.configWorlds.getConfigurationSection("worlds").getKeys(false); Stack<String> worldKeys = new Stack<String>();
if (worldKeys != null) { worldKeys.addAll(this.configWorlds.getConfigurationSection("worlds").getKeys(false));
for (String key : worldKeys) { while (!worldKeys.isEmpty()) {
if (this.configWorlds.get("worlds." + key) instanceof MVWorld) { String key = worldKeys.pop();
this.worldsFromTheConfig.put(key, (MVWorld) this.configWorlds.get("worlds." + key)); String path = "worlds" + SEPARATOR + key;
Object obj = this.configWorlds.get(path);
if ((obj != null) && (obj instanceof MVWorld)) {
this.worldsFromTheConfig.put(key.replaceAll(String.valueOf(SEPARATOR), "."), (MVWorld) obj);
} else if (this.configWorlds.isConfigurationSection(path)) {
ConfigurationSection section = this.configWorlds.getConfigurationSection(path);
Set<String> subkeys = section.getKeys(false);
for (String subkey : subkeys) {
worldKeys.push(key + SEPARATOR + subkey);
} }
} }
} }
@ -575,8 +594,9 @@ public class WorldManager implements MVWorldManager {
@Override @Override
public boolean saveWorldsConfig() { public boolean saveWorldsConfig() {
try { try {
this.configWorlds.options().pathSeparator(SEPARATOR);
for (Map.Entry<String, MultiverseWorld> entry : worlds.entrySet()) { for (Map.Entry<String, MultiverseWorld> entry : worlds.entrySet()) {
this.configWorlds.set("worlds." + entry.getKey(), entry.getValue()); this.configWorlds.set("worlds" + SEPARATOR + entry.getKey(), entry.getValue());
} }
this.configWorlds.save(new File(this.plugin.getDataFolder(), "worlds.yml")); this.configWorlds.save(new File(this.plugin.getDataFolder(), "worlds.yml"));
return true; return true;