diff options
| author | Shauren <shauren.trinity@gmail.com> | 2022-12-25 00:44:12 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-12-25 00:44:12 +0100 |
| commit | c3f385c48f5080e64b13b0f31864e20e04e531aa (patch) | |
| tree | 8c023148e0b62baafea101bcbb81514708c30b04 /src/server/scripts | |
| parent | d124cc68c8f43a55e4a4728fbcae563008521590 (diff) | |
Core/Phasing: Reduce differences between branches in GridNotifiers
Diffstat (limited to 'src/server/scripts')
| -rw-r--r-- | src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp | 2 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp index b2ed77e4a89..4ba062cdaec 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp @@ -309,7 +309,7 @@ struct boss_volazj : public BossAI if (Creature* visage = ObjectAccessor::GetCreature(*me, *iter)) { // Not all are dead - if (visage->IsInPhase(summon)) + if (visage->InSamePhase(summon)) return; else if (!visage->GetPhaseShift().GetPhases().empty()) { diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp index e0223f674be..1c076bb8d56 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp @@ -301,7 +301,7 @@ class boss_halion : public CreatureScript if (events.IsInPhase(PHASE_THREE)) { // Don't consider copied damage. - if (!attacker || !me->IsInPhase(attacker)) + if (!attacker || !me->InSamePhase(attacker)) return; if (Creature* controller = instance->GetCreature(DATA_HALION_CONTROLLER)) @@ -485,7 +485,7 @@ class boss_twilight_halion : public CreatureScript if (events.IsInPhase(PHASE_THREE)) { // Don't consider copied damage. - if (!attacker || !me->IsInPhase(attacker)) + if (!attacker || !me->InSamePhase(attacker)) return; if (Creature* controller = instance->GetCreature(DATA_HALION_CONTROLLER)) |