gameserver: try to resolve the crash when moving the client

Author: RaphaelIT7

source/modules/gameserver.cpp

@@ -1456,6 +1456,16 @@ static void hook_CBaseServer_CheckTimeouts(CBaseServer* srv)
  */
 static void MoveCGameClientIntoCGameClient(CGameClient* origin, CGameClient* target)
 {
+	int slot = target->m_nClientSlot;
+	edict_t* edict = target->edict;
+
+	*target = *origin;
+	target->m_nClientSlot = slot;
+	target->edict = edict;
+
+	if (true)
+		return;
+
 	target->Inactivate();
 	target->Clear();
 
@@ -1505,6 +1515,13 @@ static void MoveCGameClientIntoCGameClient(CGameClient* origin, CGameClient* tar
 	target->m_bPlayerNameLocked = origin->m_bPlayerNameLocked;
 	memcpy(target->m_szPendingNameChange, origin->m_szPendingNameChange, sizeof(origin->m_szPendingNameChange));
 
+	/*
+	 * Update CNetChan properly.
+	 */
+
+	CNetChan* chan = (CNetChan*)target->m_NetChannel;
+	chan->m_MessageHandler = target;
+
 	/*
 	 * Nuke the origin client
 	 */
@@ -1513,8 +1530,6 @@ static void MoveCGameClientIntoCGameClient(CGameClient* origin, CGameClient* tar
 	//origin->m_ConVars = NULL; // Same here
 	origin->Inactivate();
 	origin->Clear();
-
-	target->FreeBaselines(); // Force a full update, as we don't copy the baseline.
 }
 
 void InitializeEntityDLLFields( edict_t *pEdict )