Skip to content

Commit 0f64899

Browse files
committed
gameserver: try to fix some more issues
1 parent 70068a2 commit 0f64899

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

source/modules/gameserver.cpp

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1477,7 +1477,7 @@ static void MoveCGameClientIntoCGameClient(CGameClient* origin, CGameClient* tar
14771477
//target->m_ConVars = origin->m_ConVars;
14781478
//target->m_bInitialConVarsSet = origin->m_bInitialConVarsSet;
14791479
//target->m_UserID = origin->m_UserID;
1480-
//target->SetName( origin->m_Name );
1480+
target->SetName( origin->m_Name ); // Required thingy
14811481
//target->m_bFakePlayer = origin->m_bFakePlayer;
14821482
//target->m_NetChannel = origin->m_NetChannel;
14831483
//target->m_clientChallenge = origin->m_clientChallenge;
@@ -1525,6 +1525,16 @@ static void MoveCGameClientIntoCGameClient(CGameClient* origin, CGameClient* tar
15251525
{
15261526
CExtentedNetMessage* msg = (CExtentedNetMessage*)chan->m_NetMessages[i];
15271527
msg->m_pMessageHandler = target;
1528+
1529+
if (msg->GetType() == clc_CmdKeyValues)
1530+
{
1531+
Base_CmdKeyValues* keyVal = (Base_CmdKeyValues*)msg;
1532+
if (keyVal->m_pKeyValues)
1533+
{
1534+
keyVal->GetKeyValues()->deleteThis();
1535+
keyVal->m_pKeyValues = NULL; // May leak memory.
1536+
}
1537+
}
15281538
}
15291539

15301540
/*

source/sourcesdk/netmessages.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ class Base_CmdKeyValues : public CNetMessage
334334
bool WriteToBuffer( bf_write &buffer );
335335
const char * ToString() const;
336336

337-
protected:
337+
public:
338338
KeyValues *m_pKeyValues;
339339
};
340340

0 commit comments

Comments
 (0)