refactor: Fix command alias logic and ensure safe implementation

managed/src/SwiftlyS2.Core/AttributeParsers/CommandAttributeParser.cs

@@ -1,41 +1,42 @@
 using System.Reflection;
-using SwiftlyS2.Core.Commands;
 using SwiftlyS2.Shared.Commands;
 
 namespace SwiftlyS2.Core.AttributeParsers;
 
-internal static class CommandAttributeParser {
-  public static void ParseFromObject(this ICommandService self, object instance) {
-    var type = instance.GetType();
-    var methods = type.GetMethods(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
-    foreach (var method in methods)
+internal static class CommandAttributeParser
+{
+    public static void ParseFromObject( this ICommandService self, object instance )
     {
-      var commandAttribute = method.GetCustomAttribute<Command>();
-      var clientCommandHookHandlerAttribute = method.GetCustomAttribute<ClientCommandHookHandler>();
-      var clientChatHookHandlerAttribute = method.GetCustomAttribute<ClientChatHookHandler>();
-      if (commandAttribute != null)
-      {
-        var commandAliasAttributes = method.GetCustomAttributes<CommandAlias>();
-        var commandName = commandAttribute.Name;
-        var commandAlias = commandAliasAttributes.Select(a => a.Alias).ToArray();
-        var registerRaw = commandAttribute.RegisterRaw;
-        var permission = commandAttribute.Permission;
-        self.RegisterCommand(commandName, method.CreateDelegate<ICommandService.CommandListener>(instance), registerRaw, permission);
-        foreach (var alias in commandAlias)
+        var type = instance.GetType();
+        var methods = type.GetMethods(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
+        foreach (var method in methods)
         {
-          self.RegisterCommandAlias(commandName, alias, registerRaw);
-        }
-      }
+            var commandAttribute = method.GetCustomAttribute<Command>();
+            var clientCommandHookHandlerAttribute = method.GetCustomAttribute<ClientCommandHookHandler>();
+            var clientChatHookHandlerAttribute = method.GetCustomAttribute<ClientChatHookHandler>();
+            if (commandAttribute != null)
+            {
+                var commandAliasAttributes = method.GetCustomAttributes<CommandAlias>();
+                var commandName = commandAttribute.Name;
+                var registerRaw = commandAttribute.RegisterRaw;
+                var permission = commandAttribute.Permission;
+
+                var cmdGuid = self.RegisterCommand(commandName, method.CreateDelegate<ICommandService.CommandListener>(instance), registerRaw, permission);
+                foreach (var aliasAttr in commandAliasAttributes)
+                {
+                    self.RegisterCommandAlias(commandName, aliasAttr.Alias, aliasAttr.RegisterRaw);
+                }
+            }
 
-      if (clientCommandHookHandlerAttribute != null)
-      {
-        self.HookClientCommand(method.CreateDelegate<ICommandService.ClientCommandHandler>(instance));
-      }
+            if (clientCommandHookHandlerAttribute != null)
+            {
+                _ = self.HookClientCommand(method.CreateDelegate<ICommandService.ClientCommandHandler>(instance));
+            }
 
-      if (clientChatHookHandlerAttribute != null)
-      {
-        self.HookClientChat(method.CreateDelegate<ICommandService.ClientChatHandler>(instance));
-      }
+            if (clientChatHookHandlerAttribute != null)
+            {
+                _ = self.HookClientChat(method.CreateDelegate<ICommandService.ClientChatHandler>(instance));
+            }
+        }
     }
-  }
 }