X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fbot%2Faim.qc;h=3467e2b395d61c7c1f28357fe0460b0a97011394;hp=3bff21ecf00a4801bd083ba12315087312f28931;hb=ef3193f7a8b94d570b83a09e5f75ba2c87fe2bb9;hpb=74a82a7354648fcc2698c19afc0581f7bdc3b1ca

diff --git a/qcsrc/server/bot/aim.qc b/qcsrc/server/bot/aim.qc
index 3bff21ecf..3467e2b39 100644
--- a/qcsrc/server/bot/aim.qc
+++ b/qcsrc/server/bot/aim.qc
@@ -111,9 +111,8 @@ float bot_shouldattack(entity e)
 			return FALSE;
 	}
 
-	if(g_freezetag)
-		if(e.freezetag_frozen)
-			return FALSE;
+	if(e.freezetag_frozen)
+		return FALSE;
 
 	// If neither player has ball then don't attack unless the ball is on the
 	// ground.
@@ -127,7 +126,7 @@ float bot_shouldattack(entity e)
 			return FALSE;
 	}
 	else if(bot_ignore_bots)
-		if(clienttype(e) == CLIENTTYPE_BOT)
+		if(IS_BOT_CLIENT(e))
 			return FALSE;
 
 	if (!e.takedamage)
@@ -136,11 +135,13 @@ float bot_shouldattack(entity e)
 		return FALSE;
 	if (e.BUTTON_CHAT)
 		return FALSE;
-	if(g_minstagib)
-	if(e.items & IT_STRENGTH)
-		return FALSE;
 	if(e.flags & FL_NOTARGET)
 		return FALSE;
+
+	checkentity = e;
+	if(MUTATOR_CALLHOOK(BotShouldAttack))
+		return FALSE;
+
 	return TRUE;
 }