From d1c3977e9b9b80a987001630d6abe2830f7ece51 Mon Sep 17 00:00:00 2001 From: "Marius \"Teelevision\" Neugebauer" Date: Sun, 6 Apr 2014 03:31:21 +0200 Subject: make it possible to release players if frozen --- src/game/server/gamecontext.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src') 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(); -- cgit 1.4.1