From f71237ea9538bb4348c369b2a0a6b5338f0b91ae Mon Sep 17 00:00:00 2001 From: Luck Date: Sun, 17 Dec 2017 13:31:45 +0000 Subject: [PATCH] Send more helpful message when /lp is executed without any arguments --- .../lucko/luckperms/common/commands/CommandManager.java | 9 +++++++-- .../java/me/lucko/luckperms/common/locale/Message.java | 3 +++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/CommandManager.java b/common/src/main/java/me/lucko/luckperms/common/commands/CommandManager.java index e23c612b2..342dddf53 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/CommandManager.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/CommandManager.java @@ -143,8 +143,13 @@ public class CommandManager { handleRewrites(arguments, true); // Handle no arguments - if (arguments.size() == 0) { - sendCommandUsage(sender, label); + if (arguments.size() == 0 || (arguments.size() == 1 && arguments.get(0).trim().isEmpty())) { + CommandUtils.sendPluginMessage(sender, "&2Running &bLuckPerms v" + plugin.getVersion() + "&2."); + if (mainCommands.stream().anyMatch(c -> c.shouldDisplay() && c.isAuthorized(sender))) { + Message.VIEW_AVAILABLE_COMMANDS_PROMPT.send(sender, label); + } else { + Message.NO_PERMISSION_FOR_SUBCOMMANDS.send(sender); + } return CommandResult.INVALID_ARGS; } diff --git a/common/src/main/java/me/lucko/luckperms/common/locale/Message.java b/common/src/main/java/me/lucko/luckperms/common/locale/Message.java index 759bf347e..7930313bb 100644 --- a/common/src/main/java/me/lucko/luckperms/common/locale/Message.java +++ b/common/src/main/java/me/lucko/luckperms/common/locale/Message.java @@ -45,6 +45,9 @@ public enum Message { */ PREFIX("&7&l[&b&lL&3&lP&7&l] ", false), + VIEW_AVAILABLE_COMMANDS_PROMPT("&3Use &a/{} help &3to view available commands.", true), + NO_PERMISSION_FOR_SUBCOMMANDS("&3You do not have permission to use any sub commands.", true), + EMPTY("&c{}", true), PLAYER_ONLINE("&aOnline", false), PLAYER_OFFLINE("&cOffline", false),