[nexuiz-commits] r7508 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: mand1nga
Date: 2009-08-23 16:23:48 -0400 (Sun, 23 Aug 2009)
New Revision: 7508

Modified:
   trunk/data/qcsrc/server/bots.qc
Log:
Don't attack neutral entities

Modified: trunk/data/qcsrc/server/bots.qc
===================================================================
--- trunk/data/qcsrc/server/bots.qc	2009-08-23 20:11:24 UTC (rev 7507)
+++ trunk/data/qcsrc/server/bots.qc	2009-08-23 20:23:48 UTC (rev 7508)
@@ -2312,10 +2312,16 @@
 		if (e.team != 0)
 			return FALSE;
 	}
-	if(!teams_matter)
-		if(bot_ignore_bots)
-			if(clienttype(e) == CLIENTTYPE_BOT)
-				return FALSE;
+
+	if(teams_matter)
+	{
+		if(e.team==0)
+			return FALSE;
+	}
+	else if(bot_ignore_bots)
+		if(clienttype(e) == CLIENTTYPE_BOT)
+			return FALSE;
+
 	if (!e.takedamage)
 		return FALSE;
 	if (e.deadflag)