Merge pull request #1427 from multitheftauto/hotfix/kickplayer-console

Author: qaisjp

Server/mods/deathmatch/logic/lua/CLuaFunctionParseHelpers.h

@@ -9,6 +9,7 @@
  *****************************************************************************/
 #pragma once
 #include "CElementIDs.h"
+#include "CConsoleClient.h"
 
 // Forward declare enum reflection stuff
 enum eLuaType
@@ -119,6 +120,10 @@ inline SString GetClassTypeName(CElement*)
 {
     return "element";
 }
+inline SString GetClassTypeName(CClient*)
+{
+    return "client";
+}
 inline SString GetClassTypeName(CPlayer*)
 {
     return "player";
@@ -437,6 +442,24 @@ CPlayer* UserDataCast(CPlayer*, void* ptr, lua_State*)
     return (CPlayer*)pElement;
 }
 
+// CClient from CConsoleClient or a CPlayer
+template <class T>
+CClient* UserDataCast(CClient*, void* ptr, lua_State*)
+{
+    ElementID ID = TO_ELEMENTID(ptr);
+    CElement* pElement = CElementIDs::GetElement(ID);
+    if (!pElement || pElement->IsBeingDeleted())
+        return nullptr;
+
+    CClient* pClient = nullptr;
+    if (pElement->GetType() == CElement::PLAYER)
+        pClient = reinterpret_cast<CPlayer*>(pElement);
+    else if (pElement->GetType() == CElement::CONSOLE)
+        pClient = reinterpret_cast<CConsoleClient*>(pElement);
+
+    return pClient;
+}
+
 //
 // CElement ( something )
 //

Server/mods/deathmatch/logic/luadefs/CLuaPlayerDefs.cpp

@@ -2012,7 +2012,7 @@ int CLuaPlayerDefs::KickPlayer(lua_State* luaVM)
 
     if (argStream.NextIsUserData())
     {
-        CPlayer* pResponsible;
+        CClient* pResponsible;
         argStream.ReadUserData(pResponsible);
         if (!argStream.HasErrors())
         {