feat: configurable multi-command handler support with warning levels

MohabCodeX · MohabCodeX · commit 2bd4d7e89d27 · 2025-07-29T01:10:48.000+03:00
diff --git a/Client/mods/deathmatch/logic/CClientGame.cpp b/Client/mods/deathmatch/logic/CClientGame.cpp
@@ -120,6 +120,7 @@ CClientGame::CClientGame(bool bLocalPlay) : m_ServerInfo(new CServerInfo())
 
     m_bCursorEventsEnabled = false;
     m_bInitiallyFadedOut = true;
+    m_eAllowMultiCommandHandlers = MULTI_COMMAND_ENABLED;
 
     m_bIsPlayingBack = false;
     m_bFirstPlaybackFrame = false;
@@ -6137,6 +6138,16 @@ bool CClientGame::GetBirdsEnabled()
     return m_bBirdsEnabled;
 }
 
+void CClientGame::SetAllowMultiCommandHandlers(CClientGame::eMultiCommandHandlerPolicy policy)
+{
+    m_eAllowMultiCommandHandlers = policy;
+}
+
+CClientGame::eMultiCommandHandlerPolicy CClientGame::GetAllowMultiCommandHandlers() const
+{
+    return m_eAllowMultiCommandHandlers;
+}
+
 void CClientGame::SetWeaponRenderEnabled(bool enabled)
 {
     g_pGame->SetWeaponRenderEnabled(enabled);
diff --git a/Client/mods/deathmatch/logic/CClientGame.h b/Client/mods/deathmatch/logic/CClientGame.h
@@ -192,6 +192,12 @@ class CClientGame
         QUIT_CONNECTION_DESYNC,
         QUIT_TIMEOUT,
     };
+    
+    enum eMultiCommandHandlerPolicy
+    {
+        MULTI_COMMAND_DISABLED = 0,
+        MULTI_COMMAND_ENABLED = 1
+    };
     enum
     {
         GLITCH_QUICKRELOAD,
@@ -469,6 +475,9 @@ class CClientGame
     void ReinitMarkers();
 
     void OnWindowFocusChange(bool state);
+    
+    void SetAllowMultiCommandHandlers(eMultiCommandHandlerPolicy policy);
+    eMultiCommandHandlerPolicy GetAllowMultiCommandHandlers() const;
 
 private:
     // CGUI Callbacks
@@ -872,6 +881,8 @@ class CClientGame
     // Key is the task and value is the CClientPed*
     RunNamedAnimTask_type m_mapOfRunNamedAnimTasks;
     
+    eMultiCommandHandlerPolicy m_eAllowMultiCommandHandlers;
+    
     long long m_timeLastDiscordStateUpdate;
 };
 
diff --git a/Client/mods/deathmatch/logic/CPacketHandler.cpp b/Client/mods/deathmatch/logic/CPacketHandler.cpp
@@ -10,6 +10,7 @@
  *****************************************************************************/
 
 #include "StdInc.h"
+#include "CClientGame.h"
 #include <game/CClock.h>
 #include <game/CFireManager.h>
 #include <game/CGarage.h>
@@ -23,6 +24,13 @@
 #include "net/SyncStructures.h"
 #include "CServerInfo.h"
 
+
+enum eMultiCommandHandlerPolicy
+{
+    BLOCK_DUPLICATE_HANDLERS,
+    ALLOW_MULTI_HANDLERS
+};
+
 using std::list;
 
 class CCore;
@@ -5567,6 +5575,10 @@ void CPacketHandler::Packet_SyncSettings(NetBitStreamInterface& bitStream)
     if (bitStream.Can(eBitStreamVersion::ShotgunDamageFix))
         bitStream.Read(ucAllowShotgunDamageFix);
 
+    uchar ucAllowMultiCommandHandlers = 1;
+    bitStream.Read(ucAllowMultiCommandHandlers);
+    g_pClientGame->SetAllowMultiCommandHandlers(static_cast<CClientGame::eMultiCommandHandlerPolicy>(ucAllowMultiCommandHandlers));
+
     SMiscGameSettings miscGameSettings;
     miscGameSettings.bUseAltPulseOrder = (ucUseAltPulseOrder != 0);
     miscGameSettings.bAllowFastSprintFix = (ucAllowFastSprintFix != 0);
diff --git a/Client/mods/deathmatch/logic/CRegisteredCommands.cpp b/Client/mods/deathmatch/logic/CRegisteredCommands.cpp
@@ -30,8 +30,19 @@ bool CRegisteredCommands::AddCommand(CLuaMain* pLuaMain, const char* szKey, cons
 
     if (CommandExists(szKey, NULL))
     {
-        g_pClientGame->GetScriptDebugging()->LogWarning(pLuaMain->GetVM(), "addCommandHandler: Attempt to register duplicate command '%s'", szKey);
-        return false;
+        CClientGame::eMultiCommandHandlerPolicy allowMultiHandlers = g_pClientGame->GetAllowMultiCommandHandlers();
+        
+        // If not allowing duplicate handlers, show warning and block
+        if (allowMultiHandlers == CClientGame::MULTI_COMMAND_DISABLED)
+        {
+            g_pClientGame->GetScriptDebugging()->LogWarning(pLuaMain->GetVM(), "addCommandHandler: Duplicate command registration blocked for '%s' (multiple handlers disabled)", szKey);
+            return false;
+        }
+        // If allowing with warning (default), log warning and proceed
+        else if (allowMultiHandlers == CClientGame::MULTI_COMMAND_ENABLED)
+        {
+            g_pClientGame->GetScriptDebugging()->LogWarning(pLuaMain->GetVM(), "addCommandHandler: Attempt to register duplicate command '%s'", szKey);
+        }
     }
 
     // Check if we already have this key and handler
diff --git a/Server/mods/deathmatch/logic/CGame.cpp b/Server/mods/deathmatch/logic/CGame.cpp
@@ -4831,9 +4831,10 @@ void CGame::SendSyncSettings(CPlayer* pPlayer)
     uchar ucAllowFastSprintFix = true;
     uchar ucAllowDrivebyAnimFix = true;
     uchar ucAllowShotgunDamageFix = true;
+    uchar ucAllowMultiCommandHandlers = m_pMainConfig->GetAllowMultiCommandHandlers();
 
     CSyncSettingsPacket packet(weaponTypesUsingBulletSync, ucVehExtrapolateEnabled, sVehExtrapolateBaseMs, sVehExtrapolatePercent, sVehExtrapolateMaxMs,
-                               ucUseAltPulseOrder, ucAllowFastSprintFix, ucAllowDrivebyAnimFix, ucAllowShotgunDamageFix);
+                               ucUseAltPulseOrder, ucAllowFastSprintFix, ucAllowDrivebyAnimFix, ucAllowShotgunDamageFix, ucAllowMultiCommandHandlers);
     if (pPlayer)
         pPlayer->Send(packet);
     else
diff --git a/Server/mods/deathmatch/logic/CMainConfig.cpp b/Server/mods/deathmatch/logic/CMainConfig.cpp
@@ -81,6 +81,7 @@ CMainConfig::CMainConfig(CConsole* pConsole) : CXMLConfig(NULL)
     m_bSyncMapElementData = true;
     m_elementDataWhitelisted = false;
     m_checkDuplicateSerials = true;
+    m_iAllowMultiCommandHandlers = 1;
 }
 
 bool CMainConfig::Load()
@@ -539,6 +540,8 @@ bool CMainConfig::Load()
 
     GetBoolean(m_pRootNode, "elementdata_whitelisted", m_elementDataWhitelisted);
     GetBoolean(m_pRootNode, "check_duplicate_serials", m_checkDuplicateSerials);
+    GetInteger(m_pRootNode, "allow_multi_command_handlers", m_iAllowMultiCommandHandlers);
+    m_iAllowMultiCommandHandlers = Clamp(0, m_iAllowMultiCommandHandlers, 2);
 
     ApplyNetOptions();
 
diff --git a/Server/mods/deathmatch/logic/CMainConfig.h b/Server/mods/deathmatch/logic/CMainConfig.h
@@ -150,6 +150,7 @@ class CMainConfig : public CXMLConfig
 
     int GetPlayerTriggeredEventInterval() const { return m_iPlayerTriggeredEventIntervalMs; }
     int GetMaxPlayerTriggeredEventsPerInterval() const { return m_iMaxPlayerTriggeredEventsPerInterval; }
+    int GetAllowMultiCommandHandlers() const { return m_iAllowMultiCommandHandlers; }
 
 private:
     void RegisterCommand(const char* szName, FCommandHandler* pFunction, bool bRestricted, const char* szConsoleHelpText);
@@ -235,4 +236,5 @@ class CMainConfig : public CXMLConfig
     bool                       m_elementDataWhitelisted;
     bool                       m_checkDuplicateSerials;
     int                        m_checkResourceClientFiles;
+    int                        m_iAllowMultiCommandHandlers;
 };
diff --git a/Server/mods/deathmatch/logic/CRegisteredCommands.cpp b/Server/mods/deathmatch/logic/CRegisteredCommands.cpp
@@ -20,6 +20,7 @@
 #include "CPlayer.h"
 #include "CGame.h"
 #include "CScriptDebugging.h"
+#include "CMainConfig.h"
 
 CRegisteredCommands::CRegisteredCommands(CAccessControlListManager* pACLManager)
 {
@@ -39,8 +40,19 @@ bool CRegisteredCommands::AddCommand(CLuaMain* pLuaMain, const char* szKey, cons
 
     if (CommandExists(szKey, NULL))
     {
-        g_pGame->GetScriptDebugging()->LogWarning(pLuaMain->GetVM(), "addCommandHandler: Attempt to register duplicate command '%s'", szKey);
-        return false;
+        int iAllowMultiCommandHandlers = g_pGame->GetConfig()->GetAllowMultiCommandHandlers();
+        
+        if (iAllowMultiCommandHandlers == 0)
+        {
+            // Block silently
+            return false;
+        }
+        else if (iAllowMultiCommandHandlers == 1)
+        {
+            // Allow with warning (default behavior)
+            g_pGame->GetScriptDebugging()->LogWarning(pLuaMain->GetVM(), "Attempt to register duplicate command '%s'", szKey);
+        }
+        // For iAllowMultiCommandHandlers == 2, allow silently (no action needed)
     }
 
     // Check if we already have this key and handler
diff --git a/Server/mods/deathmatch/logic/packets/CSyncSettingsPacket.cpp b/Server/mods/deathmatch/logic/packets/CSyncSettingsPacket.cpp
@@ -15,7 +15,7 @@
 
 CSyncSettingsPacket::CSyncSettingsPacket(const std::set<eWeaponType>& weaponTypesUsingBulletSync, uchar ucVehExtrapolateEnabled, short sVehExtrapolateBaseMs,
                                          short sVehExtrapolatePercent, short sVehExtrapolateMaxMs, uchar ucUseAltPulseOrder, uchar ucAllowFastSprintFix,
-                                         uchar ucAllowDrivebyAnimationFix, uchar ucAllowShotgunDamageFix)
+                                         uchar ucAllowDrivebyAnimationFix, uchar ucAllowShotgunDamageFix, uchar ucAllowMultiCommandHandlers)
 {
     m_weaponTypesUsingBulletSync = weaponTypesUsingBulletSync;
     m_ucVehExtrapolateEnabled = ucVehExtrapolateEnabled;
@@ -26,6 +26,7 @@ CSyncSettingsPacket::CSyncSettingsPacket(const std::set<eWeaponType>& weaponType
     m_ucAllowFastSprintFix = ucAllowFastSprintFix;
     m_ucAllowDrivebyAnimationFix = ucAllowDrivebyAnimationFix;
     m_ucAllowShotgunDamageFix = ucAllowShotgunDamageFix;
+    m_ucAllowMultiCommandHandlers = ucAllowMultiCommandHandlers;
 }
 
 bool CSyncSettingsPacket::Read(NetBitStreamInterface& BitStream)
@@ -71,5 +72,7 @@ bool CSyncSettingsPacket::Write(NetBitStreamInterface& BitStream) const
         BitStream.Write(m_ucAllowShotgunDamageFix);
     }
 
+    BitStream.Write(m_ucAllowMultiCommandHandlers);
+
     return true;
 }
diff --git a/Server/mods/deathmatch/logic/packets/CSyncSettingsPacket.h b/Server/mods/deathmatch/logic/packets/CSyncSettingsPacket.h
@@ -19,7 +19,7 @@ class CSyncSettingsPacket final : public CPacket
     CSyncSettingsPacket(){};
     CSyncSettingsPacket(const std::set<eWeaponType>& weaponTypesUsingBulletSync, uchar ucVehExtrapolateEnabled, short sVehExtrapolateBaseMs,
                         short sVehExtrapolatePercent, short sVehExtrapolateMaxMs, uchar ucUseAltPulseOrder, uchar ucAllowFastSprintFix,
-                        uchar ucAllowDrivebyAnimationFix, uchar ucAllowShotgunDamageFix);
+                        uchar ucAllowDrivebyAnimationFix, uchar ucAllowShotgunDamageFix, uchar ucAllowMultiCommandHandlers);
 
     ePacketID     GetPacketID() const { return PACKET_ID_SYNC_SETTINGS; };
     unsigned long GetFlags() const { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; };
@@ -36,4 +36,5 @@ class CSyncSettingsPacket final : public CPacket
     uchar                 m_ucAllowFastSprintFix;
     uchar                 m_ucAllowDrivebyAnimationFix;
     uchar                 m_ucAllowShotgunDamageFix;
+    uchar                 m_ucAllowMultiCommandHandlers;
 };
diff --git a/Server/mods/deathmatch/mtaserver.conf b/Server/mods/deathmatch/mtaserver.conf
@@ -94,6 +94,11 @@
          Available values: special detection (SD) codes ; (e.g. To enable special detection #15 use: 15) -->
     <enablesd></enablesd>
 
+    <!-- This parameter controls how duplicate command handlers are handled.
+         Some resources may need to register multiple handlers for the same command.
+         Values: 0 - disallow duplicate handlers, 1 - allow with warning, 2 - allow silently ; default value: 1 -->
+    <allow_multi_command_handlers>1</allow_multi_command_handlers>
+
     <!-- Minimum client version. Clients with a lower version will not be allowed to connect. After
          disconnection, clients will be given an opportunity to download an update.
          If left blank, this setting is disabled and there are no restrictions on who can connect.

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`
`16`	`16`	`CSyncSettingsPacket::CSyncSettingsPacket(const std::set<eWeaponType>& weaponTypesUsingBulletSync, uchar ucVehExtrapolateEnabled, short sVehExtrapolateBaseMs,`
`17`	`17`	`short sVehExtrapolatePercent, short sVehExtrapolateMaxMs, uchar ucUseAltPulseOrder, uchar ucAllowFastSprintFix,`
`18`		`- uchar ucAllowDrivebyAnimationFix, uchar ucAllowShotgunDamageFix)`
	`18`	`+ uchar ucAllowDrivebyAnimationFix, uchar ucAllowShotgunDamageFix, uchar ucAllowMultiCommandHandlers)`
`19`	`19`	`{`
`20`	`20`	`m_weaponTypesUsingBulletSync = weaponTypesUsingBulletSync;`
`21`	`21`	`m_ucVehExtrapolateEnabled = ucVehExtrapolateEnabled;`
`@@ -26,6 +26,7 @@ CSyncSettingsPacket::CSyncSettingsPacket(const std::set<eWeaponType>& weaponType`
`26`	`26`	`m_ucAllowFastSprintFix = ucAllowFastSprintFix;`
`27`	`27`	`m_ucAllowDrivebyAnimationFix = ucAllowDrivebyAnimationFix;`
`28`	`28`	`m_ucAllowShotgunDamageFix = ucAllowShotgunDamageFix;`
	`29`	`+ m_ucAllowMultiCommandHandlers = ucAllowMultiCommandHandlers;`
`29`	`30`	`}`
`30`	`31`
`31`	`32`	`bool CSyncSettingsPacket::Read(NetBitStreamInterface& BitStream)`
`@@ -71,5 +72,7 @@ bool CSyncSettingsPacket::Write(NetBitStreamInterface& BitStream) const`
`71`	`72`	`BitStream.Write(m_ucAllowShotgunDamageFix);`
`72`	`73`	`}`
`73`	`74`
	`75`	`+ BitStream.Write(m_ucAllowMultiCommandHandlers);`
	`76`	`+`
`74`	`77`	`return true;`
`75`	`78`	`}`