diff --git a/src/com/projectkorra/projectkorra/command/HelpCommand.java b/src/com/projectkorra/projectkorra/command/HelpCommand.java index f6f742ff..12be07cf 100644 --- a/src/com/projectkorra/projectkorra/command/HelpCommand.java +++ b/src/com/projectkorra/projectkorra/command/HelpCommand.java @@ -14,6 +14,7 @@ import org.bukkit.command.CommandSender; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.List; /** @@ -31,9 +32,15 @@ public class HelpCommand extends PKCommand { else if (args.size() == 0) { List strings = new ArrayList(); for (PKCommand command : instances.values()) { - strings.add(command.getProperUse()); + if (!command.getName().equalsIgnoreCase("help")) { + strings.add(command.getProperUse()); + } } - for (String s : getPage(strings, ChatColor.GOLD + "Commands: [optional]", 1)) { + Collections.sort(strings); + Collections.reverse(strings); + strings.add(instances.get("help").getProperUse()); + Collections.reverse(strings); + for (String s : getPage(strings, ChatColor.GOLD + "Commands: [optional]", 1, false)) { sender.sendMessage(ChatColor.YELLOW + s); } return; @@ -46,7 +53,7 @@ public class HelpCommand extends PKCommand { for (PKCommand command : instances.values()) { strings.add(command.getProperUse()); } - for (String s : getPage(strings, ChatColor.GOLD + "Commands: [optional]", Integer.valueOf(arg))) { + for (String s : getPage(strings, ChatColor.GOLD + "Commands: [optional]", Integer.valueOf(arg), true)) { sender.sendMessage(ChatColor.YELLOW + s); } } else if (instances.keySet().contains(arg.toLowerCase())) {//bending help command diff --git a/src/com/projectkorra/projectkorra/command/WhoCommand.java b/src/com/projectkorra/projectkorra/command/WhoCommand.java index 9db07a82..33631a19 100644 --- a/src/com/projectkorra/projectkorra/command/WhoCommand.java +++ b/src/com/projectkorra/projectkorra/command/WhoCommand.java @@ -135,7 +135,7 @@ public class WhoCommand extends PKCommand { //for (String st : players) { // sender.sendMessage(st); //} - for (String s : getPage(players, ChatColor.GOLD + "Players:", page)) { + for (String s : getPage(players, ChatColor.GOLD + "Players:", page, true)) { sender.sendMessage(s); } }