geforkt von Mirrors/Paper
Preserve whitelist ordering. Addresses BUKKIT-1805
Dieser Commit ist enthalten in:
Ursprung
e35f6f2526
Commit
ae94a3308d
@ -13,6 +13,8 @@ import java.util.Set;
|
|||||||
import java.util.logging.Logger;
|
import java.util.logging.Logger;
|
||||||
|
|
||||||
// CraftBukkit start
|
// CraftBukkit start
|
||||||
|
import java.util.LinkedHashSet;
|
||||||
|
|
||||||
import org.bukkit.Location;
|
import org.bukkit.Location;
|
||||||
import org.bukkit.craftbukkit.CraftServer;
|
import org.bukkit.craftbukkit.CraftServer;
|
||||||
import org.bukkit.craftbukkit.CraftWorld;
|
import org.bukkit.craftbukkit.CraftWorld;
|
||||||
@ -37,7 +39,7 @@ public class ServerConfigurationManager {
|
|||||||
public Set banByName = new HashSet(); // CraftBukkit - private -> public
|
public Set banByName = new HashSet(); // CraftBukkit - private -> public
|
||||||
public Set banByIP = new HashSet(); // CraftBukkit - private -> public
|
public Set banByIP = new HashSet(); // CraftBukkit - private -> public
|
||||||
public Set operators = 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 j;
|
||||||
private File k;
|
private File k;
|
||||||
private File l;
|
private File l;
|
||||||
|
@ -9,6 +9,7 @@ import java.util.Arrays;
|
|||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
import java.util.LinkedHashMap;
|
import java.util.LinkedHashMap;
|
||||||
|
import java.util.LinkedHashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
@ -1025,7 +1026,7 @@ public final class CraftServer implements Server {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public Set<OfflinePlayer> getWhitelistedPlayers() {
|
public Set<OfflinePlayer> getWhitelistedPlayers() {
|
||||||
Set<OfflinePlayer> result = new HashSet<OfflinePlayer>();
|
Set<OfflinePlayer> result = new LinkedHashSet<OfflinePlayer>();
|
||||||
|
|
||||||
for (Object name : server.getWhitelisted()) {
|
for (Object name : server.getWhitelisted()) {
|
||||||
result.add(getOfflinePlayer((String) name));
|
result.add(getOfflinePlayer((String) name));
|
||||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren