Revert (Controversial) "Fix #418: addCommandHandler returns true when…

… it should return false in certain scenarios (#3017)" Requires more input and conversation. This reverts commit 5947012.
multitheftauto · Jun 12, 2023 · ee9e71a · ee9e71a
1 parent 87e3dce
commit ee9e71a
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 14 deletions.
diff --git a/Client/mods/deathmatch/logic/CRegisteredCommands.cpp b/Client/mods/deathmatch/logic/CRegisteredCommands.cpp
@@ -27,9 +27,6 @@ bool CRegisteredCommands::AddCommand(CLuaMain* pLuaMain, const char* szKey, cons
     assert(pLuaMain);
     assert(szKey);
 
-    if (g_pCore->GetCommands()->Get(szKey))
-        return false;
-
     // Check if we already have this key and handler
     SCommand* pCommand = GetCommand(szKey, pLuaMain);
     if (pCommand)

diff --git a/Server/mods/deathmatch/logic/CMainConfig.cpp b/Server/mods/deathmatch/logic/CMainConfig.cpp
@@ -660,8 +660,6 @@ bool CMainConfig::LoadExtended()
         }
     } while (pNode);
 
-    RegisterCommands();
-
     // Handle the <resource> nodes
     pNode = NULL;
     uiCurrentIndex = 0;
@@ -751,11 +749,7 @@ bool CMainConfig::LoadExtended()
 
     CLogger::ProgressDotsEnd();
     CLogger::SetMinLogLevel(LOGLEVEL_LOW);
-    return true;
-}
 
-void CMainConfig::RegisterCommands()
-{
     // Register the commands
     RegisterCommand("start", CConsoleCommands::StartResource, false, "Usage: start <resource-name>\nStart a loaded resource eg: start admin");
     RegisterCommand("stop", CConsoleCommands::StopResource, false, "Usage: stop <resource-name>\nStop a resource eg: stop admin");
@@ -825,6 +819,7 @@ void CMainConfig::RegisterCommands()
     RegisterCommand("sfakelag", CConsoleCommands::FakeLag, false,
                     "Usage: sfakelag <packet loss> <extra ping> <ping variance> [<KBPS limit>]\nOnly available if enabled in the mtaserver.conf file.\nAdds "
                     "artificial packet loss, ping, jitter and bandwidth limits to the server-client connections.");
+    return true;
 }
 
 bool CMainConfig::Save()

diff --git a/Server/mods/deathmatch/logic/CMainConfig.h b/Server/mods/deathmatch/logic/CMainConfig.h
@@ -47,7 +47,6 @@ class CMainConfig : public CXMLConfig
 
     bool Load();
     bool LoadExtended();
-    void RegisterCommands();
     bool Save();
 
     const std::string& GetServerName() { return m_strServerName; };

diff --git a/Server/mods/deathmatch/logic/CRegisteredCommands.cpp b/Server/mods/deathmatch/logic/CRegisteredCommands.cpp
@@ -18,7 +18,6 @@
 #include "CClient.h"
 #include "CConsoleClient.h"
 #include "CPlayer.h"
-#include "CGame.h"
 
 CRegisteredCommands::CRegisteredCommands(CAccessControlListManager* pACLManager)
 {
@@ -36,9 +35,6 @@ bool CRegisteredCommands::AddCommand(CLuaMain* pLuaMain, const char* szKey, cons
     assert(pLuaMain);
     assert(szKey);
 
-    if (g_pGame->GetConsole()->GetCommand(szKey))
-        return false;
-
     // Check if we already have this key and handler
     SCommand* pCommand = GetCommand(szKey, pLuaMain);