Merge pull request #16491 from Treeston/3.3.5-boundarycheck
[3.3.5] Add target boundary check to BossAI CanCreatureAttack call
This commit is contained in:
commit
2c437ff8ec
6 files changed
+8
-6
No files matched your search
+2
-2
@@ -135,9 +135,9 @@ class boss_general_zarithrian : public CreatureScript
|
||||
Talk(SAY_KILL);
|
||||
}
|
||||
|
||||
bool CanAIAttack(Unit const* /*target*/) const override
|
||||
bool CanAIAttack(Unit const* target) const override
|
||||
{
|
||||
return (instance->GetBossState(DATA_SAVIANA_RAGEFIRE) == DONE && instance->GetBossState(DATA_BALTHARUS_THE_WARBORN) == DONE);
|
||||
return (instance->GetBossState(DATA_SAVIANA_RAGEFIRE) == DONE && instance->GetBossState(DATA_BALTHARUS_THE_WARBORN) == DONE && BossAI::CanAIAttack(target));
|
||||
}
|
||||
|
||||
void UpdateAI(uint32 diff) override
|
||||
|
||||
@@ -598,7 +598,7 @@ class boss_deathbringer_saurfang : public CreatureScript
|
||||
if (target->GetTransport())
|
||||
return false;
|
||||
|
||||
return true;
|
||||
return BossAI::CanAIAttack(target);
|
||||
}
|
||||
|
||||
static uint32 const FightWonValue;
|
||||
|
||||
@@ -578,7 +578,7 @@ class boss_the_lich_king : public CreatureScript
|
||||
bool CanAIAttack(Unit const* target) const override
|
||||
{
|
||||
// The Lich King must not select targets in frostmourne room if he killed everyone outside
|
||||
return !target->HasAura(SPELL_IN_FROSTMOURNE_ROOM);
|
||||
return !target->HasAura(SPELL_IN_FROSTMOURNE_ROOM) && BossAI::CanAIAttack(target);
|
||||
}
|
||||
|
||||
void EnterEvadeMode(EvadeReason why) override
|
||||
|
||||
Reference in new issue
Block a user