summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft
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/net/minecraft
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/net/minecraft')
-rw-r--r--src/main/java/net/minecraft/server/ServerConfigurationManager.java4
1 files changed, 3 insertions, 1 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;