Fix core command handling (Fixes #3629)

Author: botder

Client/core/CCommands.cpp

@@ -125,6 +125,7 @@ bool CCommands::Execute(const char* szCommand, const char* szParametersIn, bool
 
     // Grab the command
     tagCOMMANDENTRY* pEntry = Get(szCommand);
+    bool             wasHandled = false;
     if (pEntry)
     {
         // If its a core command, or if its enabled
@@ -133,13 +134,16 @@ bool CCommands::Execute(const char* szCommand, const char* szParametersIn, bool
             // Execute it
             if (!bIsScriptedBind || pEntry->bAllowScriptedBind)
                 ExecuteHandler(pEntry->pfnCmdFunc, szParameters);
+
+            wasHandled = true;
         }
     }
 
     // Recompose the original command text
     std::string val = std::string(szCommand) + " " + std::string(szParameters ? szParameters : "");
 
     // Is it a cvar? (syntax: cvar[ = value])
+    if (!wasHandled)
     {
         // Check to see if '=' exists
         unsigned int nOpIndex = val.find('=');
@@ -187,7 +191,7 @@ bool CCommands::Execute(const char* szCommand, const char* szParametersIn, bool
 
     // HACK: if its a 'nick' command, save it here
     bool bIsNickCommand = !stricmp(szCommand, "nick");
-    if (bIsNickCommand && szParameters && !bIsScriptedBind)
+    if (!wasHandled && bIsNickCommand && szParameters && !bIsScriptedBind)
     {
         if (CCore::GetSingleton().IsValidNick(szParameters))
         {
@@ -208,10 +212,13 @@ bool CCommands::Execute(const char* szCommand, const char* szParametersIn, bool
     if (m_pfnExecuteHandler)
     {
         bool bAllowScriptedBind = (!pEntry || pEntry->bAllowScriptedBind);
-        if (m_pfnExecuteHandler(szCommand, szParameters, bHandleRemotely, (pEntry != NULL), bIsScriptedBind, bAllowScriptedBind))
+        if (m_pfnExecuteHandler(szCommand, szParameters, bHandleRemotely, wasHandled, bIsScriptedBind, bAllowScriptedBind))
             return true;
     }
 
+    if (wasHandled)
+        return true;
+
     // Unknown command
     val = _("Unknown command or cvar: ") + szCommand;
     if (!bIsScriptedBind && !bIsNickCommand && pEntry == nullptr)