From: Mario <mario.mario@y7mail.com>
Date: Sun, 15 Sep 2013 07:40:47 +0000 (+1000)
Subject: Always gib monster if killed by mobkill command
X-Git-Tag: xonotic-v0.8.0~241^2^2~76
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b2295407f27d75eaa53bcf5dad11e0ac06b55c17;p=xonotic%2Fxonotic-data.pk3dir.git

Always gib monster if killed by mobkill command
---

diff --git a/qcsrc/common/monsters/sv_monsters.qc b/qcsrc/common/monsters/sv_monsters.qc
index 80d9bc92a..aff04c6df 100644
--- a/qcsrc/common/monsters/sv_monsters.qc
+++ b/qcsrc/common/monsters/sv_monsters.qc
@@ -936,7 +936,7 @@ void monsters_damage (entity inflictor, entity attacker, float damage, float dea
 	if(time < self.pain_finished && deathtype != DEATH_KILL)
 		return;
 
-	if(time < self.spawnshieldtime)
+	if(time < self.spawnshieldtime && deathtype != DEATH_KILL)
 		return;
 
 	vector v;
@@ -981,7 +981,7 @@ void monsters_damage (entity inflictor, entity attacker, float damage, float dea
 		frag_target = self;
 		MUTATOR_CALLHOOK(MonsterDies);
 
-		if(self.health <= -100) // check if we're already gibbed
+		if(self.health <= -100 || deathtype == DEATH_KILL) // check if we're already gibbed
 		{
 			Violence_GibSplash(self, 1, 0.5, attacker);