diff options
Diffstat (limited to 'Essentials/src/net/ess3/commands/Commandlist.java')
| -rw-r--r-- | Essentials/src/net/ess3/commands/Commandlist.java | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/Essentials/src/net/ess3/commands/Commandlist.java b/Essentials/src/net/ess3/commands/Commandlist.java index ea4deeefc..64e352731 100644 --- a/Essentials/src/net/ess3/commands/Commandlist.java +++ b/Essentials/src/net/ess3/commands/Commandlist.java @@ -1,19 +1,17 @@ package net.ess3.commands; -import java.util.*; import static net.ess3.I18n._; +import net.ess3.utils.Util; import net.ess3.api.ISettings; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; -import net.ess3.utils.Util; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; +import java.util.*; public class Commandlist extends EssentialsCommand { @Override - public void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception + protected void run(final CommandSender sender, final String commandLabel, final String[] args) throws Exception { boolean showhidden = false; if (Permissions.LIST_HIDDEN.isAuthorized(sender)) @@ -23,7 +21,7 @@ public class Commandlist extends EssentialsCommand int playerHidden = 0; for (Player onlinePlayer : server.getOnlinePlayers()) { - if (ess.getUser(onlinePlayer).isHidden()) + if (onlinePlayer.getUser().isHidden()) { playerHidden++; } @@ -32,11 +30,11 @@ public class Commandlist extends EssentialsCommand String online; if (showhidden && playerHidden > 0) { - online = _("listAmountHidden", server.getOnlinePlayers().length - playerHidden, playerHidden, server.getMaxPlayers()); + online = _("listAmountHidden", server.getOnlinePlayers().size() - playerHidden, playerHidden, server.getMaxPlayers()); } else { - online = _("listAmount", server.getOnlinePlayers().length - playerHidden, server.getMaxPlayers()); + online = _("listAmount", server.getOnlinePlayers().size() - playerHidden, server.getMaxPlayers()); } sender.sendMessage(online); @@ -55,9 +53,9 @@ public class Commandlist extends EssentialsCommand if (sortListByGroups) { Map<String, List<IUser>> sort = new HashMap<String, List<IUser>>(); - for (Player OnlinePlayer : server.getOnlinePlayers()) + for (Player onlinePlayer : server.getOnlinePlayers()) { - final IUser player = ess.getUser(OnlinePlayer); + final IUser player = onlinePlayer.getUser(); if (player.isHidden() && !showhidden) { continue; @@ -116,9 +114,9 @@ public class Commandlist extends EssentialsCommand else { final List<IUser> users = new ArrayList<IUser>(); - for (Player OnlinePlayer : server.getOnlinePlayers()) + for (Player onlinePlayer : server.getOnlinePlayers()) { - final IUser player = ess.getUser(OnlinePlayer); + final IUser player =onlinePlayer.getUser(); if (player.isHidden() && !showhidden) { continue; |