From 9501c0730185f997ff393cafa8e9975491276074 Mon Sep 17 00:00:00 2001 From: Steven Lawson Date: Sat, 1 Dec 2012 18:07:27 -0500 Subject: [PATCH] Make /list send clanforge the exact list that vanilla Bukkit prints out for compatibility. --- .../Commands/Command_list.java | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_list.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_list.java index e6088bbd..b2738865 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_list.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_list.java @@ -16,7 +16,11 @@ public class Command_list extends TFM_Command @Override public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { - final boolean is_clanforge = TFM_Util.isFromClanforge(sender.getName()); + if (TFM_Util.isFromClanforge(sender.getName())) + { + sender.sendMessage("There are " + server.getOnlinePlayers().length + "/" + server.getMaxPlayers() + " players online:\n" + StringUtils.join(server.getOnlinePlayers(), ", ").toString()); + return true; + } StringBuilder onlineStats = new StringBuilder(); StringBuilder onlineUsers = new StringBuilder(); @@ -30,25 +34,22 @@ public class Command_list extends TFM_Command { String prefix = ""; - if (!is_clanforge) + if (TFM_SuperadminList.isUserSuperadmin(p)) { - if (TFM_SuperadminList.isUserSuperadmin(p)) + if (TFM_SuperadminList.isSeniorAdmin(p)) { - if (TFM_SuperadminList.isSeniorAdmin(p)) - { - prefix = (ChatColor.LIGHT_PURPLE + "[SrA]"); - } - else - { - prefix = (ChatColor.GOLD + "[SA]"); - } + prefix = (ChatColor.LIGHT_PURPLE + "[SrA]"); } else { - if (p.isOp()) - { - prefix = (ChatColor.RED + "[OP]"); - } + prefix = (ChatColor.GOLD + "[SA]"); + } + } + else + { + if (p.isOp()) + { + prefix = (ChatColor.RED + "[OP]"); } }