twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-06 07:02:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix getting white list, ban list, and op list. Fixes BUKKIT-5538

Browse Source 
The getEntries methods on these return player names instead of UUIDs.
As we need the UUIDs for our API we add a getValues method to get at
the data we need. To further ensure we get the most data possible we
also add a way to get at the stored GameProfile to ensure we always
have both the UUID and the name from the list.
This commit is contained in:
Travis Watkins
2014-04-17 03:31:49 -05:00
parent 5cbbcae9a9
commit 6ad36f09e5
9 changed files with 78 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/main/java/org/bukkit/craftbukkit/CraftServer.java
View File

@@ -76,7 +76,10 @@ import net.minecraft.server.EntityTracker;
import net.minecraft.server.EnumDifficulty;
import net.minecraft.server.EnumGamemode;
import net.minecraft.server.ExceptionWorldConflict;
import net.minecraft.server.GameProfileBanEntry;
import net.minecraft.server.GameProfileBanList;
import net.minecraft.server.Items;
import net.minecraft.server.JsonListEntry;
import net.minecraft.server.PlayerList;
import net.minecraft.server.RecipesFurnace;
import net.minecraft.server.MinecraftServer;
@@ -737,8 +740,16 @@ public final class CraftServer implements Server {
chunkGCLoadThresh = configuration.getInt("chunk-gc.load-threshold");
loadIcon();
playerList.getIPBans().load();
playerList.getProfileBans().load();
try {
playerList.getIPBans().load();
} catch (IOException ex) {
logger.log(Level.WARNING, "Failed to load banned-ips.json, " + ex.getMessage());
}
try {
playerList.getProfileBans().load();
} catch (IOException ex) {
logger.log(Level.WARNING, "Failed to load banned-players.json, " + ex.getMessage());
}
for (WorldServer world : console.worlds) {
world.difficulty = difficulty;
@@ -1330,12 +1341,8 @@ public final class CraftServer implements Server {
public Set<OfflinePlayer> getBannedPlayers() {
Set<OfflinePlayer> result = new HashSet<OfflinePlayer>();
for (String id : playerList.getProfileBans().getEntries()) {
try {
result.add(getOfflinePlayer(UUID.fromString(id)));
} catch (IllegalArgumentException ex) {
// This shouldn't happen
}
for (JsonListEntry entry : playerList.getProfileBans().getValues()) {
result.add(getOfflinePlayer((GameProfile) entry.f())); // Should be getKey
}
return result;
@@ -1364,11 +1371,8 @@ public final class CraftServer implements Server {
public Set<OfflinePlayer> getWhitelistedPlayers() {
Set<OfflinePlayer> result = new LinkedHashSet<OfflinePlayer>();
for (Object name : playerList.getWhitelisted()) {
if (((String)name).length() == 0 || ((String)name).startsWith("#")) {
continue;
}
result.add(getOfflinePlayer((String) name));
for (JsonListEntry entry : playerList.getWhitelist().getValues()) {
result.add(getOfflinePlayer((GameProfile) entry.f())); // Should be getKey
}
return result;
@@ -1377,12 +1381,8 @@ public final class CraftServer implements Server {
public Set<OfflinePlayer> getOperators() {
Set<OfflinePlayer> result = new HashSet<OfflinePlayer>();
for (String id : playerList.getOPs().getEntries()) {
try {
result.add(getOfflinePlayer(UUID.fromString(id)));
} catch (IllegalArgumentException ex) {
// This shouldn't ever happen
}
for (JsonListEntry entry : playerList.getOPs().getValues()) {
result.add(getOfflinePlayer((GameProfile) entry.f())); // Should be getKey
}
return result;