From: Samual Lenks <samual@xonotic.org>
Date: Sat, 2 Mar 2013 03:21:30 +0000 (-0500)
Subject: Fix suicides
X-Git-Tag: xonotic-v0.7.0~62^2~23^2~48
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0c6fbb446a832e41cbf325919741e952ca86a8e3;p=xonotic%2Fxonotic-data.pk3dir.git

Fix suicides
---

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index f357f5123..3f768ffdc 100644
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -390,14 +390,15 @@ void Obituary(entity attacker, entity inflictor, entity targ, float deathtype)
 						break;
 					}
 				}
-				LogDeath("suicide", deathtype, targ, targ);
-				GiveFrags(attacker, targ, -1, deathtype);
 			}
 		}
 		else if not(Obituary_WeaponDeath(targ, FALSE, deathtype, targ.netname, deathlocation, "", targ.killcount, 0))
 		{
 			backtrace("SUICIDE: what the hell happened here?\n");
+			return;
 		}
+		LogDeath("suicide", deathtype, targ, targ);
+		GiveFrags(attacker, targ, -1, deathtype);
 	}
 
 	// ======