Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into 293-translate-help-messages

Conflicts: src/main/java/fr/xephi/authme/command/help/HelpProvider.java
2016-10-07 19:11:41 +02:00
parent f6a2b2b34b 71f3b86383
commit c30e7acdc5
208 changed files with 1444 additions and 1400 deletions
@@ -203,7 +203,7 @@ public class HelpProvider implements SettingsDependent {
        }

        lines.add(ChatColor.GOLD + helpMessagesService.getMessage(HelpMessageKey.COMMANDS) + ":");
-        String parentCommandPath = CommandUtils.labelsToString(parentLabels);
+        String parentCommandPath = String.join(" ", parentLabels);
        for (CommandDescription child : command.getChildren()) {
            lines.add(" /" + parentCommandPath + " " + child.getLabels().get(0)
                + ChatColor.GRAY + ChatColor.ITALIC + ": " + child.getDescription());