edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a possible crash

Browse source
This commit is contained in:
GreYFoX 2011-04-19 21:44:02 +02:00
parent 65e7e9effe
commit dca0057bc1
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/game/server/gamecontext.cpp
View file

@ -709,7 +709,7 @@ void CGameContext::OnMessage(int MsgID, CUnpacker *pUnpacker, int ClientID)
{
void *pRawMsg = m_NetObjHandler.SecureUnpackMsg(MsgID, pUnpacker);
CPlayer *pPlayer = m_apPlayers[ClientID];
CGameControllerDDRace* pController = (CGameControllerDDRace*)m_pController;
if(!pRawMsg)
{
char aBuf[256];
@ -913,7 +913,7 @@ void CGameContext::OnMessage(int MsgID, CUnpacker *pUnpacker, int ClientID)
return;
}
if(GetPlayerChar(ClientID) && GetPlayerChar(KickID) && GetPlayerChar(ClientID)->Team() != GetPlayerChar(KickID)->Team())
if(GetPlayerChar(ClientID) && GetPlayerChar(KickID) && GetDDRaceTeam(ClientID) != GetDDRaceTeam(KickID))
{
SendChatTarget(ClientID, "You can kick only your team member");
m_apPlayers[ClientID]->m_Last_KickVote = time_get();
@ -1243,7 +1243,7 @@ void CGameContext::OnMessage(int MsgID, CUnpacker *pUnpacker, int ClientID)
}
else if (MsgID == NETMSGTYPE_CL_KILL && !m_World.m_Paused)
{
if(m_VoteCloseTime && m_VoteCreator == ClientID && pPlayer->GetCharacter()->Team())
if(m_VoteCloseTime && m_VoteCreator == ClientID && GetDDRaceTeam(ClientID))
{
SendChatTarget(ClientID, "You are running a vote please try again after the vote is done!");
return;
@ -1950,3 +1950,9 @@ int CGameContext::ProcessSpamProtection(int ClientID)
return 0;
}
int CGameContext::GetDDRaceTeam(int ClientID)
{
CGameControllerDDRace* pController = (CGameControllerDDRace*)m_pController;
return pController->m_Teams.m_Core.Team(ClientID);
}

1
src/game/server/gamecontext.h
View file

@ -170,6 +170,7 @@ public:
// DDRace
int ProcessSpamProtection(int ClientID);
int GetDDRaceTeam(int ClientID);
private: