From fa59910ef295e567533cd31725474cf38785af69 Mon Sep 17 00:00:00 2001 From: Wohoo-GC Date: Thu, 9 Oct 2014 13:05:59 +0200 Subject: [PATCH] Update teams.cpp --- src/game/server/teams.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/game/server/teams.cpp b/src/game/server/teams.cpp index 52212d240..86da6f35f 100644 --- a/src/game/server/teams.cpp +++ b/src/game/server/teams.cpp @@ -628,10 +628,10 @@ void CGameTeams::OnCharacterDeath(int ClientID, int Weapon) str_format(aBuf, sizeof(aBuf), "'%s' joined team 0.", Server()->ClientName(ClientID)); for (int i = 0; i < MAX_CLIENTS; i++) { - if(m_Core.Team(i) == Team && i!= ClientID &&GameServer()->m_apPlayers[i]) - { - GameServer()->SendChatTarget(i, aBuf); - } + if(m_Core.Team(i) == Team && i!= ClientID &&GameServer()->m_apPlayers[i]) + { + GameServer()->SendChatTarget(i, aBuf); + } } } else @@ -658,9 +658,10 @@ void CGameTeams::OnCharacterDeath(int ClientID, int Weapon) if(m_Core.Team(i) == Team && GameServer()->m_apPlayers[i]) { if(i!= ClientID) + { GameServer()->m_apPlayers[i]->KillCharacter(-2); - - GameServer()->SendChatTarget(i, aBuf); + GameServer()->SendChatTarget(i, aBuf); + } } }