From dabd75f9a15eefc785baef0f65868b67ce6de81c Mon Sep 17 00:00:00 2001 From: UltraNix <80540499+UltraNix@users.noreply.github.com> Date: Tue, 23 Aug 2022 13:07:11 +0200 Subject: [PATCH] fix(Scripts/TempleOfAhnQiraj): Fixed Skeram's Earth Shock. (#12740) * fix(Scripts/Temple of AhnQiraj): Fixed Skeram's Earth Shock. Fixes #12714 * fix codestyle Co-authored-by: Angelo Venturini --- .../Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp index 36c4e56a8..b48830de2 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp @@ -125,7 +125,7 @@ struct boss_skeram : public BossAI events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, 6s, 12s); events.ScheduleEvent(EVENT_FULLFILMENT, 15s); events.ScheduleEvent(EVENT_BLINK, 30s, 45s); - events.ScheduleEvent(EVENT_EARTH_SHOCK, 2s); + events.ScheduleEvent(EVENT_EARTH_SHOCK, 1200ms); Talk(SAY_AGGRO); } @@ -159,7 +159,7 @@ struct boss_skeram : public BossAI break; case EVENT_EARTH_SHOCK: DoCastVictim(SPELL_EARTH_SHOCK); - events.ScheduleEvent(EVENT_EARTH_SHOCK, 2s); + events.ScheduleEvent(EVENT_EARTH_SHOCK, 1200ms); break; } } @@ -173,10 +173,20 @@ struct boss_skeram : public BossAI events.RescheduleEvent(EVENT_BLINK, 2s); } - if (me->IsWithinMeleeRange(me->GetVictim())) + if (Unit* myVictim = me->GetVictim()) { - events.RescheduleEvent(EVENT_EARTH_SHOCK, 2s); - DoMeleeAttackIfReady(); + if (me->IsWithinMeleeRange(myVictim)) + { + DoMeleeAttackIfReady(); + + if (Unit* victimTarget = myVictim->GetVictim()) + { + if (victimTarget->GetGUID() == me->GetGUID()) + { + events.RescheduleEvent(EVENT_EARTH_SHOCK, 1200ms); + } + } + } } }