Fix command permissions for default actions

Revxrsal · Feb 16, 2022 · 02f8d73 · 02f8d73
1 parent 9e43dab
commit 02f8d73
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/common/src/main/java/revxrsal/commands/core/BaseCommandCategory.java b/common/src/main/java/revxrsal/commands/core/BaseCommandCategory.java
@@ -93,7 +93,7 @@ private class CategoryPermission implements CommandPermission {
             for (CommandCategory category : categories.values())
                 if (category.getPermission().canExecute(actor))
                     return true;
-            return false;
+            return defaultAction != null && defaultAction.hasPermission(actor);
         }
     }
 

diff --git a/common/src/main/java/revxrsal/commands/core/BaseCommandHandler.java b/common/src/main/java/revxrsal/commands/core/BaseCommandHandler.java
@@ -129,21 +129,26 @@ public BaseCommandHandler() {
         for (BaseCommandCategory category : categories.values()) {
             CommandPath categoryPath = category.getPath().getCategoryPath();
             category.parent(categoryPath == null ? null : categories.get(categoryPath));
+            findPermission(category.defaultAction);
         }
-        command_loop:
         for (CommandExecutable executable : executables.values()) {
-            if (!executable.permissionSet) {
-                for (PermissionReader reader : permissionReaders) {
-                    CommandPermission p = reader.getPermission(executable);
-                    if (p != null) {
-                        executable.permissionSet = true;
-                        executable.setPermission(p);
-                        continue command_loop;
-                    }
+            findPermission(executable);
+        }
+        return this;
+    }
+
+    private void findPermission(@Nullable CommandExecutable executable) {
+        if (executable == null) return;
+        if (!executable.permissionSet) {
+            for (PermissionReader reader : permissionReaders) {
+                CommandPermission p = reader.getPermission(executable);
+                if (p != null) {
+                    executable.permissionSet = true;
+                    executable.setPermission(p);
+                    return;
                 }
             }
         }
-        return this;
     }
 
     public Set<PermissionReader> getPermissionReaders() {