diff options
| author | Meji <alvaro.megias@outlook.com> | 2025-09-22 21:56:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-09-22 21:56:04 +0200 |
| commit | 1085b3f43321e58f151c1543a70b3558c26ed8e5 (patch) | |
| tree | 621f525f17904bd95a0018eca9310c0c63aaf897 /src/server/scripts/KulTiras | |
| parent | df02bec2a1871267548494bc473711a0f9de9b43 (diff) | |
Core/AreaTriggers: Implement AreaTriggerActionSetFlag::DontRunOnLeaveWhenExpiring (#31276)
Diffstat (limited to 'src/server/scripts/KulTiras')
3 files changed, 5 insertions, 53 deletions
diff --git a/src/server/scripts/KulTiras/ShrineOfTheStorm/boss_aqusirr.cpp b/src/server/scripts/KulTiras/ShrineOfTheStorm/boss_aqusirr.cpp index 49d63ede3a8..3c25f72d16f 100644 --- a/src/server/scripts/KulTiras/ShrineOfTheStorm/boss_aqusirr.cpp +++ b/src/server/scripts/KulTiras/ShrineOfTheStorm/boss_aqusirr.cpp @@ -682,7 +682,7 @@ struct at_aqusirr_undertow : AreaTriggerAI unit->ApplyMovementForce(at->GetGUID(), at->GetPosition(), -5.0f, MovementForceType::Gravity); } - void OnUnitExit(Unit* unit) override + void OnUnitExit(Unit* unit, AreaTriggerExitReason /*reason*/) override { if (!unit->IsPlayer()) return; diff --git a/src/server/scripts/KulTiras/WaycrestManor/boss_heartsbane_triad.cpp b/src/server/scripts/KulTiras/WaycrestManor/boss_heartsbane_triad.cpp index 480c122bade..4ee73330aca 100644 --- a/src/server/scripts/KulTiras/WaycrestManor/boss_heartsbane_triad.cpp +++ b/src/server/scripts/KulTiras/WaycrestManor/boss_heartsbane_triad.cpp @@ -824,22 +824,10 @@ struct at_heartsbane_triad_aura_of_apathy : AreaTriggerAI unit->CastSpell(unit, SPELL_AURA_OF_APATHY_DEBUFF, true); } - void OnUnitExit(Unit* unit) override + void OnUnitExit(Unit* unit, AreaTriggerExitReason /*reason*/) override { unit->RemoveAurasDueToSpell(SPELL_AURA_OF_APATHY_DEBUFF); } - - void OnRemove() override - { - for (ObjectGuid const& guid : at->GetInsideUnits()) - { - Unit* unit = ObjectAccessor::GetUnit(*at, guid); - if (!unit) - continue; - - OnUnitExit(unit); - } - } }; // 17791 - Aura of Dread @@ -855,23 +843,11 @@ struct at_heartsbane_triad_aura_of_dread : AreaTriggerAI unit->CastSpell(unit, SPELL_AURA_OF_DREAD_MOVE_CHECK, true); } - void OnUnitExit(Unit* unit) override + void OnUnitExit(Unit* unit, AreaTriggerExitReason /*reason*/) override { unit->RemoveAurasDueToSpell(SPELL_AURA_OF_DREAD_MOVE_CHECK); unit->RemoveAurasDueToSpell(SPELL_AURA_OF_DREAD_DAMAGE); } - - void OnRemove() override - { - for (ObjectGuid const& guid : at->GetInsideUnits()) - { - Unit* unit = ObjectAccessor::GetUnit(*at, guid); - if (!unit) - continue; - - OnUnitExit(unit); - } - } }; // 268088 - Aura of Dread @@ -949,22 +925,10 @@ struct at_heartsbane_triad_aura_of_thorns : AreaTriggerAI unit->CastSpell(unit, SPELL_AURA_OF_THORNS_CHECK_PROC, true); } - void OnUnitExit(Unit* unit) override + void OnUnitExit(Unit* unit, AreaTriggerExitReason /*reason*/) override { unit->RemoveAurasDueToSpell(SPELL_AURA_OF_THORNS_CHECK_PROC); } - - void OnRemove() override - { - for (ObjectGuid const& guid : at->GetInsideUnits()) - { - Unit* unit = ObjectAccessor::GetUnit(*at, guid); - if (!unit) - continue; - - OnUnitExit(unit); - } - } }; // 268122 - Aura of Thorns diff --git a/src/server/scripts/KulTiras/WaycrestManor/waycrest_manor.cpp b/src/server/scripts/KulTiras/WaycrestManor/waycrest_manor.cpp index 21fb2e722fc..a40eaca0158 100644 --- a/src/server/scripts/KulTiras/WaycrestManor/waycrest_manor.cpp +++ b/src/server/scripts/KulTiras/WaycrestManor/waycrest_manor.cpp @@ -272,23 +272,11 @@ struct at_waycrest_manor_wildfire : AreaTriggerAI } } - void OnUnitExit(Unit* unit) override + void OnUnitExit(Unit* unit, AreaTriggerExitReason /*reason*/) override { unit->RemoveAurasDueToSpell(SPELL_WILDFIRE_DAMAGE); unit->RemoveAurasDueToSpell(SPELL_WILDFIRE_DAMAGE_NPC); } - - void OnRemove() override - { - for (ObjectGuid const& guid : at->GetInsideUnits()) - { - Unit* unit = ObjectAccessor::GetUnit(*at, guid); - if (!unit) - continue; - - OnUnitExit(unit); - } - } }; // 267643 - Organ Missiles |