From 61671f3bcdfa1dfda115516e8994818ce1e9882c Mon Sep 17 00:00:00 2001 From: Teetime Date: Sun, 7 Apr 2013 14:41:53 +0200 Subject: [PATCH] Fixed a missing check if killer is alive in tdm --- src/game/server/gamemodes/tdm.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/game/server/gamemodes/tdm.cpp b/src/game/server/gamemodes/tdm.cpp index 50ecd93ec..373bbd094 100644 --- a/src/game/server/gamemodes/tdm.cpp +++ b/src/game/server/gamemodes/tdm.cpp @@ -17,7 +17,7 @@ int CGameControllerTDM::OnCharacterDeath(class CCharacter *pVictim, class CPlaye IGameController::OnCharacterDeath(pVictim, pKiller, Weapon); - if(Weapon != WEAPON_GAME) + if(pKiller && Weapon != WEAPON_GAME) { // do team scoring if(pKiller == pVictim->GetPlayer() || pKiller->GetTeam() == pVictim->GetPlayer()->GetTeam())