Merge master into '306-command-service'

Conflict: - HelpCommand.java
2015-12-26 13:01:00 +01:00
parent 9e8f51c616 71a9f4140b
commit c73969256c
6 changed files with 55 additions and 16 deletions
@@ -36,7 +36,8 @@ public class HelpCommand implements ExecutableCommand {
            }
        }

-        if (arguments.size() == 1) {
+        int mappedCommandLevel = foundCommandResult.getCommandDescription().getLabelCount();
+        if (mappedCommandLevel == 1) {
            commandService.outputHelp(sender, result, HelpProvider.SHOW_CHILDREN);
        } else {
            commandService.outputHelp(sender, result, HelpProvider.ALL_OPTIONS);