diff --git a/src/com/massivecraft/mcore5/usys/Multiverse.java b/src/com/massivecraft/mcore5/usys/Multiverse.java index 8d9f7e19..302a4f9d 100644 --- a/src/com/massivecraft/mcore5/usys/Multiverse.java +++ b/src/com/massivecraft/mcore5/usys/Multiverse.java @@ -2,11 +2,11 @@ package com.massivecraft.mcore5.usys; import java.util.HashMap; import java.util.HashSet; -import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.Set; +import java.util.TreeSet; import com.massivecraft.mcore5.MCore; import com.massivecraft.mcore5.cmd.arg.ARUniverse; @@ -88,7 +88,7 @@ public class Multiverse extends Entity public Set getUniverses() { - Set ret = new LinkedHashSet(); + Set ret = new TreeSet(); ret.addAll(this.uw.keySet()); ret.add(MCore.DEFAULT); return ret; @@ -145,7 +145,7 @@ public class Multiverse extends Entity public Set getWorlds() { - Setret = new HashSet(); + Set ret = new TreeSet(); for (Set uworlds : this.uw.values()) { ret.addAll(uworlds); @@ -155,7 +155,13 @@ public class Multiverse extends Entity public Set getWorlds(String universe) { - return this.uw.get(universe); + Set orig = this.uw.get(universe); + if (orig == null) return null; + + Set ret = new TreeSet(); + ret.addAll(orig); + + return ret; } public boolean removeWorld(String worldName)