From 14e6f187b815f9533d55307e8b841614f0094463 Mon Sep 17 00:00:00 2001
From: DrakiaXYZ <565558+TheDgtl@users.noreply.github.com>
Date: Mon, 13 Oct 2025 14:44:38 -0700
Subject: [PATCH 1/2] Fix commando inheriting all chat commands - Add new
 ICommandoCommand interface for Commando-specific commands

---
 .../Helpers/Dialogue/Commando/ICommandoCommand.cs          | 7 +++++++
 .../Helpers/Dialogue/Commando/SptCommandoCommands.cs       | 3 ++-
 .../Helpers/Dialogue/CommandoDialogChatBot.cs              | 3 ++-
 3 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/ICommandoCommand.cs

diff --git a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/ICommandoCommand.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/ICommandoCommand.cs
new file mode 100644
index 00000000..736a6632
--- /dev/null
+++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/ICommandoCommand.cs
@@ -0,0 +1,7 @@
+using SPTarkov.Server.Core.Helpers.Dialog.Commando;
+
+namespace SPTarkov.Server.Core.Helpers.Dialogue.Commando;
+
+public interface ICommandoCommand : IChatCommand
+{
+}
diff --git a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommandoCommands.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommandoCommands.cs
index 0e69643b..4527d81d 100644
--- a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommandoCommands.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommandoCommands.cs
@@ -1,5 +1,6 @@
 using SPTarkov.DI.Annotations;
 using SPTarkov.Server.Core.Helpers.Dialog.Commando.SptCommands;
+using SPTarkov.Server.Core.Helpers.Dialogue.Commando;
 using SPTarkov.Server.Core.Models.Common;
 using SPTarkov.Server.Core.Models.Eft.Dialog;
 using SPTarkov.Server.Core.Models.Eft.Profile;
@@ -10,7 +11,7 @@ using SPTarkov.Server.Core.Services;
 namespace SPTarkov.Server.Core.Helpers.Dialog.Commando;
 
 [Injectable]
-public class SptCommandoCommands : IChatCommand
+public class SptCommandoCommands : ICommandoCommand
 {
     protected readonly ServerLocalisationService _serverLocalisationService;
     protected readonly IDictionary<string, ISptCommand> _sptCommands;
diff --git a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/CommandoDialogChatBot.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/CommandoDialogChatBot.cs
index 95f20310..e57fa993 100644
--- a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/CommandoDialogChatBot.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/CommandoDialogChatBot.cs
@@ -1,5 +1,6 @@
 using SPTarkov.DI.Annotations;
 using SPTarkov.Server.Core.Helpers.Dialog.Commando;
+using SPTarkov.Server.Core.Helpers.Dialogue.Commando;
 using SPTarkov.Server.Core.Models.Eft.Profile;
 using SPTarkov.Server.Core.Models.Enums;
 using SPTarkov.Server.Core.Models.Spt.Config;
@@ -15,7 +16,7 @@ public class CommandoDialogChatBot(
     MailSendService mailSendService,
     ServerLocalisationService localisationService,
     ConfigServer configServer,
-    IEnumerable<IChatCommand> chatCommands
+    IEnumerable<ICommandoCommand> chatCommands
 ) : AbstractDialogChatBot(logger, mailSendService, localisationService, chatCommands)
 {
     protected readonly CoreConfig CoreConfig = configServer.GetConfig<CoreConfig>();

From eedc4e543e5a2944a2fa63362bb1801d910df8dc Mon Sep 17 00:00:00 2001
From: DrakiaXYZ <565558+TheDgtl@users.noreply.github.com>
Date: Mon, 13 Oct 2025 14:45:57 -0700
Subject: [PATCH 2/2] Formatting

---
 .../Helpers/Dialogue/Commando/ICommandoCommand.cs             | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/ICommandoCommand.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/ICommandoCommand.cs
index 736a6632..8e25bfbe 100644
--- a/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/ICommandoCommand.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/ICommandoCommand.cs
@@ -2,6 +2,4 @@
 
 namespace SPTarkov.Server.Core.Helpers.Dialogue.Commando;
 
-public interface ICommandoCommand : IChatCommand
-{
-}
+public interface ICommandoCommand : IChatCommand { }