Skip to content

Commit 5bcf1c4

Browse files
committed
Added: Help subcommand in parent commands
This allows for parent commands to display something different when no parameters are displayed. Not currently used by any parent commands. It's recommended to call `super.showHelp()` when overriding.
1 parent db98b43 commit 5bcf1c4

File tree

1 file changed

+4
-3
lines changed
  • modules/RoyalCommands/src/main/java/org/royaldev/royalcommands/rcommands

1 file changed

+4
-3
lines changed

modules/RoyalCommands/src/main/java/org/royaldev/royalcommands/rcommands/ParentCommand.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ protected List<String> customList(final CommandSender cs, final Command cmd, fin
6060
if (completions.contains(name)) continue;
6161
completions.add(name);
6262
}
63+
completions.add("help");
6364
}
6465
return completions;
6566
}
@@ -76,8 +77,8 @@ protected SubCommand getSubCommand(final String name) {
7677

7778
@Override
7879
protected boolean runCommand(final CommandSender cs, final Command cmd, final String label, final String[] eargs, final CommandArguments ca) {
79-
if (eargs.length < 1) {
80-
this.showHelp(cs, label);
80+
if (eargs.length < 1 || eargs[0].equalsIgnoreCase("help")) {
81+
this.showHelp(cs, label, eargs.length < 1);
8182
return true;
8283
}
8384
final SubCommand sc = this.getSubCommand(eargs[0]);
@@ -93,7 +94,7 @@ protected boolean runCommand(final CommandSender cs, final Command cmd, final St
9394
return sc.runCommand(cs, cmd, label, (String[]) ArrayUtils.subarray(eargs, 1, eargs.length), ca);
9495
}
9596

96-
public void showHelp(final CommandSender cs, final String label) {
97+
public void showHelp(final CommandSender cs, final String label, boolean standalone) {
9798
cs.sendMessage(MessageColor.POSITIVE + "/" + label + " Help");
9899
final StringBuilder sb = new StringBuilder();
99100
sb.append(MessageColor.POSITIVE);

0 commit comments

Comments
 (0)