Fix melee attack not damaging correct entity

diff --git a/qcsrc/common/monsters/sv_monsters.qc b/qcsrc/common/monsters/sv_monsters.qc
index 0f79997023fdfb0e11eb351444e4694cdfcd50e8..5760dad4fa29182fd78ef771cfcf2d6287fe125d 100644 (file)
--- a/qcsrc/common/monsters/sv_monsters.qc
+++ b/qcsrc/common/monsters/sv_monsters.qc
@@ -211,9 +211,7 @@ float monster_melee(entity targ, float damg, float anim, float er, float anim_fi
        float rdmg = damg * random();
 
        if (self.health <= 0)
-               return FALSE;
-       if (targ == world)
-               return FALSE;
+               return FALSE; // attacking while dead?!
                
        if(dostop)
        {
@@ -233,7 +231,7 @@ float monster_melee(entity targ, float damg, float anim, float er, float anim_fi
        traceline(self.origin + self.view_ofs, self.origin + v_forward * er, 0, self);
        
        if(trace_ent.takedamage)
-               Damage(targ, self, self, rdmg * monster_skill, deathtype, targ.origin, normalize(targ.origin - self.origin));
+               Damage(trace_ent, self, self, rdmg * monster_skill, deathtype, trace_ent.origin, normalize(trace_ent.origin - self.origin));
                
        return TRUE;
 }