Fix monsters not targeting players in normal gamemodes

diff --git a/qcsrc/server/monsters/lib/monsters.qc b/qcsrc/server/monsters/lib/monsters.qc
index c010c2ecc4af8792de0b8969403bd6a2390ae40b..5ca1ae56883838a2efe46a05ac19f20c3536108e 100644 (file)
--- a/qcsrc/server/monsters/lib/monsters.qc
+++ b/qcsrc/server/monsters/lib/monsters.qc
@@ -78,9 +78,6 @@ float monster_isvalidtarget (entity targ, entity ent, float neutral)
        if(neutral == TRUE)
                return TRUE; // we come in peace!
                
-       if(targ.owner == ent.owner)
-               return FALSE;
-               
        if(targ.takedamage == DAMAGE_NO)
                return FALSE; // enemy can't be damaged
                
@@ -103,8 +100,7 @@ float monster_isvalidtarget (entity targ, entity ent, float neutral)
        if(targ.BUTTON_CHAT)
                return FALSE; // no typefragging!
        
-       if(teamplay)
-       if(targ.team == ent.team)
+       if not(IsDifferentTeam(targ, ent))
                return FALSE; // enemy is on our team
        
        return TRUE;