From: Jakob MG <jakob_mg@hotmail.com>
Date: Thu, 23 Aug 2012 18:17:15 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/mrbougo/killspree_bugfix'
X-Git-Tag: xonotic-v0.7.0~271
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=dbcdd58814a7281aef637c8c07a02242331c4c86;hp=19a4a52c42e00347a51b62ff1e5adcadecda31e0

Merge remote-tracking branch 'origin/mrbougo/killspree_bugfix'
---

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index d77d614759..7b02f4e5ec 100644
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -458,10 +458,7 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype)
 
 				attacker.killcount = attacker.killcount + 1;
 
-				if (attacker.killcount > 2) {
-					Send_KillNotification(a, ftos(attacker.killcount), "", KILL_SPREE, MSG_SPREE);
-				}
-				else if (attacker.killcount == 3)
+				if (attacker.killcount == 3)
 				{
 					Send_KillNotification(a, "", "", KILL_SPREE_3, MSG_SPREE);
 					AnnounceTo(attacker, "03kills");
@@ -503,6 +500,9 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype)
 					AnnounceTo(attacker, "30kills");
 					PlayerStats_Event(attacker, PLAYERSTATS_ACHIEVEMENT_KILL_SPREE_30, 1);
 				}
+				else if (attacker.killcount > 2) {
+					Send_KillNotification(a, ftos(attacker.killcount), "", KILL_SPREE, MSG_SPREE);
+				}
 				LogDeath("frag", deathtype, attacker, targ);
 			}
 		}