Fix root commands in Brigadier, handle MalformedEntitySelectorException

Revxrsal · Oct 13, 2021 · 7876c63 · 7876c63
1 parent e150660
commit 7876c63
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/bukkit/src/main/java/revxrsal/commands/bukkit/core/Brigadier.java b/bukkit/src/main/java/revxrsal/commands/bukkit/core/Brigadier.java
@@ -120,9 +120,13 @@ public EntitySelectorImpl(List<Entity> entities) {
     public void parse(@NotNull CommandHandler handler) {
         List<LiteralArgumentBuilder<?>> nodes = new ArrayList<>();
         List<CommandCategory> roots = handler.getCategories().values().stream().filter(c -> c.getPath().size() == 1).collect(Collectors.toList());
+        List<ExecutableCommand> rootCommands = handler.getCommands().values().stream().filter(c -> c.getPath().size() == 1).collect(Collectors.toList());
         for (CommandCategory root : roots) {
             nodes.add(parse(literal(root.getName()), root));
         }
+        for (ExecutableCommand root : rootCommands) {
+            nodes.add(parse(literal(root.getName()), root));
+        }
         nodes.forEach(commodore::register);
     }
 
@@ -153,7 +157,6 @@ private LiteralArgumentBuilder<?> parse(LiteralArgumentBuilder<?> parent, Comman
     private LiteralArgumentBuilder<?> parse(LiteralArgumentBuilder<?> parent, ExecutableCommand command) {
         CommandNode<?> lastParameter = null;
         for (CommandParameter parameter : command.getValueParameters().values()) {
-
             CommandNode node = getBuilder(command, parameter, true).build();
             if (lastParameter == null) {
                 parent.then(node);

diff --git a/bukkit/src/main/java/revxrsal/commands/bukkit/exception/BukkitExceptionAdapter.java b/bukkit/src/main/java/revxrsal/commands/bukkit/exception/BukkitExceptionAdapter.java
@@ -37,6 +37,10 @@ protected void invalidWorld(@NotNull CommandActor actor, @NotNull InvalidWorldEx
         actor.error("Invalid world: &e" + exception.getInput());
     }
 
+    protected void malformedEntitySelector(@NotNull CommandActor actor, @NotNull MalformedEntitySelectorException exception) {
+        actor.error("Invalid selector argument: &e'" + exception.getInput() + "'");
+    }
+
     protected void handleUnknownThrowable(@NotNull CommandActor actor, @NotNull Throwable throwable) {
         throwable.printStackTrace();
     }