Fix commands

ObsidianMC · Jan 24, 2024 · c01ded3 · c01ded3
1 parent b265481
commit c01ded3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Obsidian/Commands/Builders/CommandBuilder.cs b/Obsidian/Commands/Builders/CommandBuilder.cs
@@ -51,14 +51,14 @@ public CommandBuilder AddOverload(IExecutor<CommandContext> commandExecutor)
         return this;
     }
 
-    public CommandBuilder AddOverloads(params CommandExecutor[] executors)
+    public CommandBuilder AddOverloads(params IExecutor<CommandContext>[] executors)
     {
         this.overloads.AddRange(executors);
 
         return this;
     }
 
-    public CommandBuilder AddOverloads(IEnumerable<CommandExecutor> executors)
+    public CommandBuilder AddOverloads(IEnumerable<IExecutor<CommandContext>> executors)
     {
         this.overloads.AddRange(executors);
 

diff --git a/...ands/Framework/CommandDelegateExecutor.cs → ...nds/Framework/CommandExecutor.Delegate.cs b/...ands/Framework/CommandDelegateExecutor.cs → ...nds/Framework/CommandExecutor.Delegate.cs
@@ -12,7 +12,7 @@ internal sealed class CommandDelegateExecutor : IExecutor<CommandContext>
 
     public required Delegate MethodDelegate { get; init; }
 
-    public ParameterInfo[] GetParameters() => this.MethodDelegate.Method.GetParameters();
+    public ParameterInfo[] GetParameters() => this.MethodDelegate.Method.GetParameters()[..1];
 
     public IEnumerable<TAttribute> GetCustomAttributes<TAttribute>() where TAttribute : Attribute =>
          this.MethodDelegate.Method.GetCustomAttributes<TAttribute>();

diff --git a/Obsidian/Registries/CommandsRegistry.cs b/Obsidian/Registries/CommandsRegistry.cs
@@ -29,7 +29,7 @@ public static void Register(Server server)
 
             foreach (var overload in cmd.Overloads)
             {
-                var args = overload.HasModule ? overload.GetParameters() : overload.GetParameters().Skip(1); // skipping obsidian context
+                var args = overload.GetParameters();
                 if (!args.Any())
                     cmdNode.Type |= CommandNodeType.IsExecutable;