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

Fix crash in kill protection

Browse source
This commit is contained in:
def 2014-08-25 11:35:55 +02:00
parent 4311df0c62
commit 05dd0b4af7
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1480,9 +1480,13 @@ void CGameContext::OnMessage(int MsgID, CUnpacker *pUnpacker, int ClientID)
if(pPlayer->m_Paused) if(pPlayer->m_Paused)
return; return;
CCharacter* pChr = pPlayer->GetCharacter();
if(!pChr)
return;
//Kill Protection //Kill Protection
int CurrTime = (Server()->Tick() - pPlayer->GetCharacter()->m_StartTime) / Server()->TickSpeed(); int CurrTime = (Server()->Tick() - pChr->m_StartTime) / Server()->TickSpeed();
if(g_Config.m_SvKillProtection != 0 && CurrTime >= (60 * g_Config.m_SvKillProtection) && pPlayer->GetCharacter()->m_DDRaceState == DDRACE_STARTED) if(g_Config.m_SvKillProtection != 0 && CurrTime >= (60 * g_Config.m_SvKillProtection) && pChr->m_DDRaceState == DDRACE_STARTED)
{ {
SendChatTarget(ClientID, "Kill Protection enabled. If you really want to kill, write /kill"); SendChatTarget(ClientID, "Kill Protection enabled. If you really want to kill, write /kill");
return; return;