fix: remove command to use command manager (#579)

Co-authored-by: Michael Wilson <[email protected]>

managed/CounterStrikeSharp.API/Core/BasePlugin.cs

@@ -116,9 +116,6 @@ public void Dispose()
 
         public readonly Dictionary<Delegate, CallbackSubscriber> Handlers =
             new Dictionary<Delegate, CallbackSubscriber>();
-
-        public readonly Dictionary<Delegate, CallbackSubscriber> CommandHandlers =
-            new Dictionary<Delegate, CallbackSubscriber>();
 
         public readonly Dictionary<Delegate, CallbackSubscriber> CommandListeners =
             new Dictionary<Delegate, CallbackSubscriber>();
@@ -132,6 +129,8 @@ public void Dispose()
         internal readonly Dictionary<Delegate, EntityIO.EntityOutputCallback> EntitySingleOutputHooks =
             new Dictionary<Delegate, EntityIO.EntityOutputCallback>();
 
+        public readonly List<CommandDefinition> CommandDefinitions = new List<CommandDefinition>();
+
         public readonly List<Timer> Timers = new List<Timer>();
 
         public delegate HookResult GameEventHandler<T>(T @event, GameEventInfo info) where T : GameEvent;
@@ -193,11 +192,13 @@ public void DeregisterEventHandler(string name, Delegate handler, bool post)
         public void AddCommand(string name, string description, CommandInfo.CommandCallback handler)
         {
             var definition = new CommandDefinition(name, description, handler);
+            CommandDefinitions.Add(definition);
             CommandManager.RegisterCommand(definition);
         }
 
         private void AddCommand(CommandDefinition definition)
         {
+            CommandDefinitions.Add(definition);
             CommandManager.RegisterCommand(definition);
         }
 
@@ -229,14 +230,13 @@ public void AddCommandListener(string? name, CommandInfo.CommandListenerCallback
         /// <param name="handler">The callback function to be invoked when the command is executed.</param>
         public void RemoveCommand(string name, CommandInfo.CommandCallback handler)
         {
-            if (CommandHandlers.ContainsKey(handler))
-            {
-                var subscriber = CommandHandlers[handler];
+            var definition = CommandDefinitions.FirstOrDefault(
+                definition => definition.Name == name && definition.Callback == handler);
 
-                NativeAPI.RemoveCommand(name, subscriber.GetInputArgument());
-
-                FunctionReference.Remove(subscriber.GetReferenceIdentifier());
-                CommandHandlers.Remove(handler);
+            if (definition != null)
+            {
+                CommandDefinitions.Remove(definition);
+                CommandManager.RemoveCommand(definition);
             }
         }
 
@@ -621,11 +621,6 @@ protected virtual void Dispose(bool disposing)
             {
                 subscriber.Dispose();
             }
-
-            foreach (var subscriber in CommandHandlers.Values)
-            {
-                subscriber.Dispose();
-            }
 
             foreach (var subscriber in CommandListeners.Values)
             {
@@ -642,6 +637,11 @@ protected virtual void Dispose(bool disposing)
                 subscriber.Dispose();
             }
 
+            foreach (var definition in CommandDefinitions)
+            {
+                CommandManager.RemoveCommand(definition);
+            }
+
             foreach (var timer in Timers)
             {
                 timer.Kill();
@@ -650,4 +650,4 @@ protected virtual void Dispose(bool disposing)
             _disposed = true;
         }
     }
-}
+}