From: Freddy <schro.sb@gmail.com>
Date: Tue, 24 Oct 2017 13:47:12 +0000 (+0200)
Subject: Don't check for firstblood if in warmup
X-Git-Tag: xonotic-v0.8.5~2431^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=94b370ceff7950995104c8cad86f1e2db2280eec;p=xonotic%2Fxonotic-data.pk3dir.git

Don't check for firstblood if in warmup
---

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index 108297d4a..afe018c08 100644
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -379,15 +379,12 @@ void Obituary(entity attacker, entity inflictor, entity targ, int deathtype)
 			}
 			#undef SPREE_ITEM
 
-			if(!checkrules_firstblood)
+			if(!warmup_stage && !checkrules_firstblood)
 			{
 				checkrules_firstblood = true;
 				notif_firstblood = true; // modify the current messages so that they too show firstblood information
-				if (!warmup_stage)
-				{
-					PlayerStats_GameReport_Event_Player(attacker, PLAYERSTATS_ACHIEVEMENT_FIRSTBLOOD, 1);
-					PlayerStats_GameReport_Event_Player(targ, PLAYERSTATS_ACHIEVEMENT_FIRSTVICTIM, 1);
-				}
+				PlayerStats_GameReport_Event_Player(attacker, PLAYERSTATS_ACHIEVEMENT_FIRSTBLOOD, 1);
+				PlayerStats_GameReport_Event_Player(targ, PLAYERSTATS_ACHIEVEMENT_FIRSTVICTIM, 1);
 
 				// tell spree_inf and spree_cen that this is a first-blood and first-victim event
 				kill_count_to_attacker = -1;