Merge remote-tracking branch 'origin/master' into Mario/classname_checks

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / bot / aim.qc

diff --git a/qcsrc/server/bot/aim.qc b/qcsrc/server/bot/aim.qc
index 5bb63654ea11d70498aa4df9dfca12c9b5faad81..578306c4eb89c49c6e69707f07c6750273965601 100644 (file)
--- a/qcsrc/server/bot/aim.qc
+++ b/qcsrc/server/bot/aim.qc
@@ -135,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;
 }