From 1553d524307b5ced1c373ce1d220eced2fc200eb Mon Sep 17 00:00:00 2001 From: CraftBukkit/Spigot Date: Tue, 27 Dec 2011 16:48:09 +1100 Subject: [PATCH] Teach CraftServer.getOfflinePlayers to also give all online players. This method is most useful when it gives all the players who have ever logged on to the server. Previously, it was not distinguishing between players who had previously logged on, and were currently logged in, and those who had previously looged on and were not currently logged in. A distinction was made, however, between those currently logged in, but who had not logged in previously. This commit ensures that all players who have ever logged in (and are listed as either logged in, or they have a player .dat file) will be returned by the mentioned method. Fixes BUKKIT-404 By: Andrew Ardill --- .../main/java/org/bukkit/craftbukkit/CraftServer.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java index d07eb7c8f..ea85cb6e5 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2,7 +2,6 @@ package org.bukkit.craftbukkit; import java.io.FileNotFoundException; -import org.bukkit.craftbukkit.command.CraftConsoleCommandSender; import org.bukkit.generator.ChunkGenerator; import com.avaje.ebean.config.DataSourceConfig; import com.avaje.ebean.config.ServerConfig; @@ -25,6 +24,7 @@ import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashSet; import java.util.LinkedHashMap; import java.util.List; @@ -929,14 +929,15 @@ public final class CraftServer implements Server { } public OfflinePlayer[] getOfflinePlayers() { - WorldNBTStorage storage = (WorldNBTStorage)console.worlds.get(0).getDataManager(); + WorldNBTStorage storage = (WorldNBTStorage) console.worlds.get(0).getDataManager(); String[] files = storage.getPlayerDir().list(new DatFileFilter()); - OfflinePlayer[] players = new OfflinePlayer[files.length]; + Set players = new HashSet(); for (int i = 0; i < files.length; i++) { - players[i] = getOfflinePlayer(files[i].substring(0, files[i].length() - 4)); + players.add(getOfflinePlayer(files[i].substring(0, files[i].length() - 4))); } + players.addAll(Arrays.asList(getOnlinePlayers())); - return players; + return (OfflinePlayer[]) players.toArray(); } }