diff options
| author | Marius "Teelevision" Neugebauer <marius@teele.eu> | 2014-06-04 02:30:47 +0200 |
|---|---|---|
| committer | Marius "Teelevision" Neugebauer <marius@teele.eu> | 2014-06-04 02:30:47 +0200 |
| commit | 90a607d5c38c03183fe7c779bbe795755adccd8e (patch) | |
| tree | 8acc080659973ac61788abf7f10cfb4d2f6ccf70 /src | |
| parent | 7f8c2ccf148eea5fbff1a464747ea8a9c62107cd (diff) | |
| download | zcatch-90a607d5c38c03183fe7c779bbe795755adccd8e.tar.gz zcatch-90a607d5c38c03183fe7c779bbe795755adccd8e.zip | |
check release before checking whether someone can kill himself
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/server/gamecontext.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/game/server/gamecontext.cpp b/src/game/server/gamecontext.cpp index 3d8ab22f..a9397d1a 100644 --- a/src/game/server/gamecontext.cpp +++ b/src/game/server/gamecontext.cpp @@ -1358,17 +1358,7 @@ void CGameContext::OnMessage(int MsgID, CUnpacker *pUnpacker, int ClientID) (pPlayer->m_LastKillTry+Server()->TickSpeed()*3 > Server()->Tick())) return; - if(g_Config.m_SvSuicideTime == 0) - { - SendChatTarget(ClientID, "Suicide is not allowed."); - } - else if(pPlayer->m_LastKill && pPlayer->m_LastKill+Server()->TickSpeed()*g_Config.m_SvSuicideTime > Server()->Tick()) - { - char aBuf[128]; - str_format(aBuf, sizeof(aBuf), "Only one suicide every %d seconds is allowed.", g_Config.m_SvSuicideTime); - SendChatTarget(ClientID, aBuf); - } - else if(pPlayer->HasZCatchVictims()) + if(pPlayer->HasZCatchVictims()) { int lastVictim = pPlayer->LastZCatchVictim(); pPlayer->ReleaseZCatchVictim(CPlayer::ZCATCH_RELEASE_ALL, 1); @@ -1379,6 +1369,16 @@ void CGameContext::OnMessage(int MsgID, CUnpacker *pUnpacker, int ClientID) SendChatTarget(lastVictim, aBuf); return; } + else if(g_Config.m_SvSuicideTime == 0) + { + SendChatTarget(ClientID, "Suicide is not allowed."); + } + else if(pPlayer->m_LastKill && pPlayer->m_LastKill+Server()->TickSpeed()*g_Config.m_SvSuicideTime > Server()->Tick()) + { + char aBuf[128]; + str_format(aBuf, sizeof(aBuf), "Only one suicide every %d seconds is allowed.", g_Config.m_SvSuicideTime); + SendChatTarget(ClientID, aBuf); + } else if(pPlayer->GetCharacter() && pPlayer->GetCharacter()->m_FreezeTicks) { SendChatTarget(ClientID, "You can't kill yourself while you're frozen."); |