From f6df334bb63a301cd94fb078bb80cddcca7624b5 Mon Sep 17 00:00:00 2001 From: Wyrserth Date: Sun, 21 Jul 2019 19:05:12 +0200 Subject: Script/ScarletEnclave: remove Eye of Acherus control and speed auras from player when the Eye of Acherus is dismissed. (cherry picked from commit bf8741c53d299a1d167354a174f5e40ae1981551) --- src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp index 44c13ff1aea..37572cdc7a3 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp @@ -406,6 +406,7 @@ class spell_death_knight_initiate_visual : public SpellScript enum EyeOfAcherusMisc { + SPELL_THE_EYE_OF_ACHERUS = 51852, SPELL_EYE_VISUAL = 51892, SPELL_EYE_FLIGHT_BOOST = 51923, SPELL_EYE_FLIGHT = 51890, @@ -461,7 +462,14 @@ class npc_eye_of_acherus : public CreatureScript me->GetMotionMaster()->LaunchMoveSpline(std::move(init), POINT_EYE_FALL, MOTION_PRIORITY_NORMAL, POINT_MOTION_TYPE); } - void OnCharmed(bool /*isNew*/) override { } + void OnCharmed(bool /*isNew*/) override + { + if (!me->IsCharmed()) + { + me->GetCharmerOrOwner()->RemoveAurasDueToSpell(SPELL_THE_EYE_OF_ACHERUS); + me->GetCharmerOrOwner()->RemoveAurasDueToSpell(SPELL_EYE_FLIGHT_BOOST); + } + } void UpdateAI(uint32 diff) override { -- cgit v1.2.3