From: Mario <zacjardine@y7mail.com>
Date: Sat, 3 Oct 2015 07:47:04 +0000 (+1000)
Subject: Even invincible monsters should be weak against hurt triggers and lava
X-Git-Tag: xonotic-v0.8.2~1888
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2cb3d125600d4582f942a7551585a502638095ed;p=xonotic%2Fxonotic-data.pk3dir.git

Even invincible monsters should be weak against hurt triggers and lava
---

diff --git a/qcsrc/common/monsters/sv_monsters.qc b/qcsrc/common/monsters/sv_monsters.qc
index 0734d54d5..64c264474 100644
--- a/qcsrc/common/monsters/sv_monsters.qc
+++ b/qcsrc/common/monsters/sv_monsters.qc
@@ -1045,7 +1045,7 @@ void Monster_Dead(entity attacker, float gibbed)
 
 void Monster_Damage(entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force)
 {SELFPARAM();
-	if((self.spawnflags & MONSTERFLAG_INVINCIBLE) && deathtype != DEATH_KILL)
+	if((self.spawnflags & MONSTERFLAG_INVINCIBLE) && deathtype != DEATH_KILL && !ITEM_DAMAGE_NEEDKILL(deathtype))
 		return;
 
 	if(self.frozen && deathtype != DEATH_KILL && deathtype != DEATH_NADE_ICE_FREEZE)