Merge pull request #1591 from noudess/aggro

[Bug Fix] always_aggro flag needed to be checked on assist
This commit is contained in:
Paul Coene 2021-10-07 16:25:51 -04:00 committed by GitHub
commit 7029c699a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -3379,7 +3379,7 @@ void NPC::AIYellForHelp(Mob *sender, Mob *attacker)
* if they are in range, make sure we are not green...
* then jump in if they are our friend
*/
if (mob->GetLevel() >= 50 || attacker->GetLevelCon(mob->GetLevel()) != CON_GRAY) {
if (mob->GetLevel() >= 50 || mob->AlwaysAggro() || attacker->GetLevelCon(mob->GetLevel()) != CON_GRAY) {
if (mob->GetPrimaryFaction() == sender->CastToNPC()->GetPrimaryFaction()) {
const NPCFactionList *cf = content_db.GetNPCFactionEntry(mob->CastToNPC()->GetNPCFactionID());
if (cf) {