OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-06 02:35:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

Preserve whitelist ordering. Addresses BUKKIT-1805

Browse source
This commit is contained in:
Jeff Wardian 2012-06-14 22:43:46 -05:00 committed by Wesley Wolfe
parent e35f6f2526
commit ae94a3308d
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/net/minecraft/server/ServerConfigurationManager.java
View file

@ -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;

3
src/main/java/org/bukkit/craftbukkit/CraftServer.java
View file

@ -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));