Help command shows only subcommands that player has access to

aleksilassila · Oct 21, 2020 · 62659a3 · 62659a3
1 parent 2b285dd
commit 62659a3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/me/aleksilassila/islands/commands/subcommands/HelpSubcommand.java b/src/me/aleksilassila/islands/commands/subcommands/HelpSubcommand.java
@@ -19,7 +19,8 @@ public void onCommand(Player player, String[] args, boolean confirmed) {
         player.sendMessage(Messages.help.AVAILABLE_COMMANDS);
 
         for (Subcommand subcommand : commands.subcommands) {
-            player.sendMessage(Messages.help.SUBCOMMAND(subcommand));
+            if (subcommand.getPermission() == null || player.hasPermission(subcommand.getPermission()))
+                player.sendMessage(Messages.help.SUBCOMMAND(subcommand));
         }
     }
 

diff --git a/src/me/aleksilassila/islands/utils/Messages.java b/src/me/aleksilassila/islands/utils/Messages.java
@@ -116,7 +116,7 @@ public static class help {
             public static final String GIVE = ChatColor.GRAY + "/island give <name> (You have to be on target island)";
             public static final String DELETE = ChatColor.GRAY + "/island delete (You have to be on target island)";
             public static final String HOME = error("Usage: /home <id>");
-            public static final String AVAILABLE_COMMANDS = ChatColor.WHITE + "Here's a list of available subcommands:";
+            public static final String AVAILABLE_COMMANDS = ChatColor.WHITE + "Here's a list of subcommands you have access to:";
 
             public static String SUBCOMMAND(Subcommand subcommand) {
                 return ChatColor.WHITE + "" + ChatColor.BOLD + subcommand.getName() + ChatColor.RESET + ChatColor.GRAY + ": " + subcommand.help();