TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-06-29 02:30:01 +00:00
Code Issues Projects Releases Wiki Activity

Little more command cleanup.

Browse source
This commit is contained in:
KHobbits 2011-11-18 13:48:31 +00:00
parent 5655509c62
commit a05f730e76
8 changed files with 54 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

36
Essentials/src/com/earth2me/essentials/commands/Commandlist.java
View file

@ -22,7 +22,7 @@ public class Commandlist extends EssentialsCommand
}
@Override
public void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
{
boolean showhidden = false;
if (sender instanceof Player)
@ -37,15 +37,15 @@ public class Commandlist extends EssentialsCommand
showhidden = true;
}
int playerHidden = 0;
for (Player p : server.getOnlinePlayers())
for (Player onlinePlayer : server.getOnlinePlayers())
{
if (ess.getUser(p).isHidden())
if (ess.getUser(onlinePlayer).isHidden())
{
playerHidden++;
}
}
//TODO: move these to messages file
StringBuilder online = new StringBuilder();
final StringBuilder online = new StringBuilder();
online.append(ChatColor.BLUE).append("There are ").append(ChatColor.RED).append(server.getOnlinePlayers().length - playerHidden);
if (showhidden && playerHidden > 0)
{
@ -58,29 +58,29 @@ public class Commandlist extends EssentialsCommand
if (ess.getSettings().getSortListByGroups())
{
Map<String, List<User>> sort = new HashMap<String, List<User>>();
for (Player p : server.getOnlinePlayers())
for (Player OnlinePlayer : server.getOnlinePlayers())
{
User u = ess.getUser(p);
if (u.isHidden() && !showhidden)
final User player = ess.getUser(OnlinePlayer);
if (player.isHidden() && !showhidden)
{
continue;
}
String group = u.getGroup();
final String group = player.getGroup();
List<User> list = sort.get(group);
if (list == null)
{
list = new ArrayList<User>();
sort.put(group, list);
}
list.add(u);
list.add(player);
}
String[] groups = sort.keySet().toArray(new String[0]);
final String[] groups = sort.keySet().toArray(new String[0]);
Arrays.sort(groups, String.CASE_INSENSITIVE_ORDER);
for (String group : groups)
{
StringBuilder groupString = new StringBuilder();
final StringBuilder groupString = new StringBuilder();
groupString.append(group).append(": ");
List<User> users = sort.get(group);
final List<User> users = sort.get(group);
Collections.sort(users);
boolean first = true;
for (User user : users)
@ -109,19 +109,19 @@ public class Commandlist extends EssentialsCommand
}
else
{
List<User> users = new ArrayList<User>();
for (Player p : server.getOnlinePlayers())
final List<User> users = new ArrayList<User>();
for (Player OnlinePlayer : server.getOnlinePlayers())
{
final User u = ess.getUser(p);
if (u.isHidden() && !showhidden)
final User player = ess.getUser(OnlinePlayer);
if (player.isHidden() && !showhidden)
{
continue;
}
users.add(u);
users.add(player);
}
Collections.sort(users);
StringBuilder onlineUsers = new StringBuilder();
final StringBuilder onlineUsers = new StringBuilder();
onlineUsers.append(Util.i18n("connectedPlayers"));
boolean first = true;
for (User user : users)