diff options
| author | Marius "Teelevision" Neugebauer <marius@teele.eu> | 2014-04-06 03:31:21 +0200 |
|---|---|---|
| committer | Marius "Teelevision" Neugebauer <marius@teele.eu> | 2014-04-06 03:31:21 +0200 |
| commit | d1c3977e9b9b80a987001630d6abe2830f7ece51 (patch) | |
| tree | cfff169ef4be1e23e15c1fd5232512dd77b1ff25 /src/game/server | |
| parent | e0d9aeefcf1e884f6f612c054f29b331961a821e (diff) | |
| download | zcatch-d1c3977e9b9b80a987001630d6abe2830f7ece51.tar.gz zcatch-d1c3977e9b9b80a987001630d6abe2830f7ece51.zip | |
make it possible to release players if frozen
Diffstat (limited to 'src/game/server')
| -rw-r--r-- | src/game/server/gamecontext.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/game/server/gamecontext.cpp b/src/game/server/gamecontext.cpp index 3a9e7543..9bcfaa62 100644 --- a/src/game/server/gamecontext.cpp +++ b/src/game/server/gamecontext.cpp @@ -1231,10 +1231,6 @@ void CGameContext::OnMessage(int MsgID, CUnpacker *pUnpacker, int ClientID) 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."); - } else if(pPlayer->HasZCatchVictims()) { int lastVictim = pPlayer->LastZCatchVictim(); @@ -1246,6 +1242,10 @@ void CGameContext::OnMessage(int MsgID, CUnpacker *pUnpacker, int ClientID) SendChatTarget(lastVictim, aBuf); return; } + else if(pPlayer->GetCharacter() && pPlayer->GetCharacter()->m_FreezeTicks) + { + SendChatTarget(ClientID, "You can't kill yourself while you're frozen."); + } else { pPlayer->m_LastKill = Server()->Tick(); |