summaryrefslogtreecommitdiffstats
path: root/src/main/java/org
diff options
context:
space:
mode:
authorJeff Wardian <krinsdeath@hotmail.com>2012-06-14 22:43:46 -0500
committerWesley Wolfe <weswolf@aol.com>2012-06-14 23:33:13 -0500
commitae94a3308d189583b4e8efbffa4ad802d0ca4df9 (patch)
tree917755f92ca0da41ce9c0360d1ae20008483bae8 /src/main/java/org
parente35f6f25260019304631b55635ca49323ca0c7b9 (diff)
downloadcraftbukkit-ae94a3308d189583b4e8efbffa4ad802d0ca4df9.tar
craftbukkit-ae94a3308d189583b4e8efbffa4ad802d0ca4df9.tar.gz
craftbukkit-ae94a3308d189583b4e8efbffa4ad802d0ca4df9.tar.lz
craftbukkit-ae94a3308d189583b4e8efbffa4ad802d0ca4df9.tar.xz
craftbukkit-ae94a3308d189583b4e8efbffa4ad802d0ca4df9.zip
Preserve whitelist ordering. Addresses BUKKIT-1805
Diffstat (limited to 'src/main/java/org')
-rw-r--r--src/main/java/org/bukkit/craftbukkit/CraftServer.java3
1 files changed, 2 insertions, 1 deletions
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));