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
@@ -110,7 +110,7 @@ public class HelpProvider {

    private static void printAlternatives(CommandDescription command, List<String> correctLabels, List<String> lines) {
        // TODO ljacqu 20151219: Need to show alternatives for base labels too? E.g. /r for /register
-        if (command.getLabels().size() <= 1) {
+        if (command.getLabels().size() <= 1 || correctLabels.size() <= 1) {
            return;
        }