Skip help output of choice command

PikaMug · Nov 23, 2022 · a5429d3 · a5429d3
1 parent ee45d26
commit a5429d3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/core/src/main/java/me/blackvein/quests/commands/quests/QuestsCommandHandler.java b/core/src/main/java/me/blackvein/quests/commands/quests/QuestsCommandHandler.java
@@ -103,6 +103,9 @@ private void printHelp(final CommandSender cs) {
         cs.sendMessage(ChatColor.GOLD + Lang.get("questHelpTitle"));
         cs.sendMessage(ChatColor.YELLOW + "/quests " + Lang.get("questDisplayHelp"));
         for (final QuestsSubCommand cmd : subCommands.values()) {
+            if (cmd.getName().equals("choice")) {
+                continue;
+            }
             cs.sendMessage(ChatColor.YELLOW + "/quests " + cmd.getDescription().replace("<command>", ChatColor.GOLD
                     + (plugin.getSettings().canTranslateSubCommands() ? cmd.getNameI18N() : cmd.getName())
                     + ChatColor.YELLOW));

diff --git a/core/src/main/java/me/blackvein/quests/commands/quests/subcommands/QuestsChoiceCommand.java b/core/src/main/java/me/blackvein/quests/commands/quests/subcommands/QuestsChoiceCommand.java
@@ -44,7 +44,7 @@ public void execute(CommandSender cs, String[] args) {
         if (assertNonPlayer(cs)) {
             return;
         }
-        Player player = (Player) cs;
+        final Player player = (Player) cs;
         if (!cs.hasPermission(getPermission())) {
             Lang.send(player, ChatColor.RED + Lang.get(player, "noPermission"));
             return;
@@ -56,7 +56,9 @@ public void execute(CommandSender cs, String[] args) {
         if (args.length == 1) {
             return;
         }
-        player.acceptConversationInput(concatArgArray(args, 1, args.length - 1, ' '));
+        final String input = concatArgArray(args, 1, args.length - 1, ' ');
+        if (input != null) {
+            player.acceptConversationInput(input);
+        }
     }
-
 }