X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fbot%2Faim.qc;h=578306c4eb89c49c6e69707f07c6750273965601;hb=c1fc567698f48fbfa3866c7a93406edad4823a1f;hp=3bff21ecf00a4801bd083ba12315087312f28931;hpb=26ec33d6d19e627b43ac2cb51f83f890b5176293;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/bot/aim.qc b/qcsrc/server/bot/aim.qc index 3bff21ecf..578306c4e 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; }