Upstream
/
Multiverse-Core
mirror of https://github.com/Multiverse/Multiverse-Core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix NPCs Showing up in mv who 

This fixes #501. FINALLY!

If anyone wants NPCs back, open a ticket, and I'll add a flag, but this is now the default behavior.
This commit is contained in:
Eric Stokes 2012-10-21 14:22:12 -06:00
parent 009ceeeede
commit b45a4cf20a
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/com/onarandombox/MultiverseCore/commands/WhoCommand.java
View File

@ -24,6 +24,7 @@ import java.util.List;
public class WhoCommand extends MultiverseCommand {
private MVWorldManager worldManager;
private List<Player> visiblePlayers;
public WhoCommand(MultiverseCore plugin) {
super(plugin);
@ -51,6 +52,14 @@ public class WhoCommand extends MultiverseCommand {
showAll = false;
}
final Player[] onlinePlayers = plugin.getServer().getOnlinePlayers();
this.visiblePlayers = new ArrayList<Player>();
for (final Player player : onlinePlayers) {
if (p == null || p.canSee(player)) {
visiblePlayers.add(player);
}
}
if (args.size() == 1) {
if (args.get(0).equalsIgnoreCase("--all") || args.get(0).equalsIgnoreCase("-a")) {
showAll = true;
@ -69,19 +78,11 @@ public class WhoCommand extends MultiverseCommand {
sender.sendMessage(String.format("%s--- Players in %s%s ---", ChatColor.AQUA,
world.getColoredWorldString(), ChatColor.AQUA));
sender.sendMessage(buildPlayerString(world, p));
sender.sendMessage(this.buildPlayerString(world, p));
return;
}
}
final Player[] onlinePlayers = plugin.getServer().getOnlinePlayers();
final List<Player> visiblePlayers = new ArrayList<Player>();
for (final Player player : onlinePlayers) {
if (p == null || p.canSee(player)) {
visiblePlayers.add(player);
}
}
// multiworld mode
sender.sendMessage(ChatColor.AQUA + "--- Worlds and their players --- "
+ visiblePlayers.size() + "/" + plugin.getServer().getMaxPlayers());
@ -100,11 +101,14 @@ public class WhoCommand extends MultiverseCommand {
return;
}
private static String buildPlayerString(MultiverseWorld world, Player viewer) {
private String buildPlayerString(MultiverseWorld world, Player viewer) {
// Retrieve the players in this world
List<Player> players = world.getCBWorld().getPlayers();
StringBuilder playerBuilder = new StringBuilder();
for (Player player : players) {
if ((viewer == null) || viewer.canSee(player))
// If the viewer is the console or the viewier is allowed to see the player, show them.
// Make sure we're also ONLY showing online players.
if (((viewer == null) || viewer.canSee(player)) && this.visiblePlayers.contains(player) )
playerBuilder.append(player.getDisplayName()).append(", ");
}
String bString = playerBuilder.toString();