Update Command.cs

ObsidianMC · Feb 24, 2024 · 9c3bb5b · 9c3bb5b
1 parent 2b0721a
commit 9c3bb5b
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/Obsidian/Commands/Framework/Entities/Command.cs b/Obsidian/Commands/Framework/Entities/Command.cs
@@ -88,7 +88,7 @@ public async Task ExecuteAsync(CommandContext context, string[] args)
     }
 
     private bool TryFindExecutor(IEnumerable<IExecutor<CommandContext>> executors, string[] args, CommandContext context,
-        [NotNullWhen(true)]out IExecutor<CommandContext>? executor)
+        [NotNullWhen(true)] out IExecutor<CommandContext>? executor)
     {
         executor = null;
 
@@ -102,20 +102,14 @@ private bool TryFindExecutor(IEnumerable<IExecutor<CommandContext>> executors, s
 
         foreach (var exec in executors)
         {
-            executor = exec;
-
             var methodParams = exec.GetParameters();
             for (int i = 0; i < args.Length; i++)
             {
                 var param = methodParams[i];
                 var arg = args[i];
 
                 if (!CommandHandler.IsValidArgumentType(param.ParameterType))
-                {
-                    success = false;
-                    executor = null;
                     return false;
-                }
 
                 var parser = CommandHandler.GetArgumentParser(param.ParameterType);
                 if (parser.TryParseArgument(arg, context, out _))
@@ -124,12 +118,14 @@ private bool TryFindExecutor(IEnumerable<IExecutor<CommandContext>> executors, s
                     continue;
                 }
 
-                success = false;
                 return false;
             }
 
             if (success)
+            {
+                executor = exec;
                 return true;
+            }
         }
 
         return false;