Merge branch 'DefaultUser/gametype_votescreen' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / monsters / sv_monsters.qc

diff --git a/qcsrc/common/monsters/sv_monsters.qc b/qcsrc/common/monsters/sv_monsters.qc
index 3b2286935d6290c150da08c80c6b7fd285aedaa2..9ac1f4e14084f0adaa1ec8f40f2047ac14dd2ef9 100644 (file)
--- a/qcsrc/common/monsters/sv_monsters.qc
+++ b/qcsrc/common/monsters/sv_monsters.qc
@@ -99,14 +99,11 @@ bool Monster_ValidTarget(entity this, entity targ)
                return false;
        }
 
-       traceline(this.origin + this.view_ofs, targ.origin, MOVE_NORMAL, this);
+       traceline(this.origin + this.view_ofs, targ.origin, MOVE_NOMONSTERS, this);
 
        if(trace_fraction < 1)
                return false; // solid
 
-       if(trace_ent != targ && !autocvar_g_monsters_ignoretraces)
-               return false; // not our enemy
-
        if(autocvar_g_monsters_target_infront || (this.spawnflags & MONSTERFLAG_INFRONT))
        if(this.enemy != targ)
        {