From b6c4ad2b6c346cae9544f8040345c56357ac530f Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 7 Feb 2013 17:27:51 +1100 Subject: [PATCH] Fix monsters not targeting players in normal gamemodes --- qcsrc/server/monsters/lib/monsters.qc | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/qcsrc/server/monsters/lib/monsters.qc b/qcsrc/server/monsters/lib/monsters.qc index c010c2ecc..5ca1ae568 100644 --- 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; -- 2.39.2