diff options
| author | Jeff Wardian <krinsdeath@hotmail.com> | 2012-06-14 22:43:46 -0500 |
|---|---|---|
| committer | Wesley Wolfe <weswolf@aol.com> | 2012-06-14 23:33:13 -0500 |
| commit | ae94a3308d189583b4e8efbffa4ad802d0ca4df9 (patch) | |
| tree | 917755f92ca0da41ce9c0360d1ae20008483bae8 | |
| parent | e35f6f25260019304631b55635ca49323ca0c7b9 (diff) | |
| download | craftbukkit-ae94a3308d189583b4e8efbffa4ad802d0ca4df9.tar craftbukkit-ae94a3308d189583b4e8efbffa4ad802d0ca4df9.tar.gz craftbukkit-ae94a3308d189583b4e8efbffa4ad802d0ca4df9.tar.lz craftbukkit-ae94a3308d189583b4e8efbffa4ad802d0ca4df9.tar.xz craftbukkit-ae94a3308d189583b4e8efbffa4ad802d0ca4df9.zip | |
Preserve whitelist ordering. Addresses BUKKIT-1805
| -rw-r--r-- | src/main/java/net/minecraft/server/ServerConfigurationManager.java | 4 | ||||
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/CraftServer.java | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/main/java/net/minecraft/server/ServerConfigurationManager.java b/src/main/java/net/minecraft/server/ServerConfigurationManager.java index b765faf7..e0099568 100644 --- a/src/main/java/net/minecraft/server/ServerConfigurationManager.java +++ b/src/main/java/net/minecraft/server/ServerConfigurationManager.java @@ -13,6 +13,8 @@ import java.util.Set; import java.util.logging.Logger; // CraftBukkit start +import java.util.LinkedHashSet; + import org.bukkit.Location; import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.CraftWorld; @@ -37,7 +39,7 @@ public class ServerConfigurationManager { public Set banByName = new HashSet(); // CraftBukkit - private -> public public Set banByIP = new HashSet(); // CraftBukkit - private -> public public Set operators = new HashSet(); // CraftBukkit - private -> public - private Set whitelist = new HashSet(); + private Set whitelist = new LinkedHashSet(); // CraftBukkit - HashSet() -> LinkedHashSet(); private File j; private File k; private File l; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java index 708daf73..cd85bdb1 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -9,6 +9,7 @@ import java.util.Arrays; import java.util.HashSet; import java.util.Iterator; import java.util.LinkedHashMap; +import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -1025,7 +1026,7 @@ public final class CraftServer implements Server { } public Set<OfflinePlayer> getWhitelistedPlayers() { - Set<OfflinePlayer> result = new HashSet<OfflinePlayer>(); + Set<OfflinePlayer> result = new LinkedHashSet<OfflinePlayer>(); for (Object name : server.getWhitelisted()) { result.add(getOfflinePlayer((String) name)); |