From 55957fbb6e24f2fb6df57c92b829ad42498afee0 Mon Sep 17 00:00:00 2001 From: Skjalf <47818697+Nyeriah@users.noreply.github.com> Date: Thu, 24 Nov 2022 18:23:27 -0300 Subject: [PATCH] =?UTF-8?q?Revert=20"fix(Scripts/Temple=20of=20AhnQiraj):?= =?UTF-8?q?=20Cthun's=20Eye=20should=20always=20focus=20on=20b=E2=80=A6"?= =?UTF-8?q?=20(#13938)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Revert "fix(Scripts/Temple of AhnQiraj): Cthun's Eye should always focus on b… (#13796)" This reverts commit 888f9bb0bb3825ef8cfa1a8b33ed4dba032a9d73. --- .../Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp index e8c8c8661..2382dad37 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp @@ -199,15 +199,11 @@ struct boss_eye_of_cthun : public BossAI // Z checks are necessary here because AQ maps do funky stuff. if (me->IsWithinLOSInMap(who) && me->IsWithinDist2d(who, 90.0f) && who->GetPositionZ() > 100.0f) { - me->Attack(who, false); + AttackStart(who); } } } - void AttackStart(Unit* /*victim*/) override - { - } - void DoAction(int32 action) override { if (action == ACTION_SPAWN_EYE_TENTACLES) @@ -242,7 +238,6 @@ struct boss_eye_of_cthun : public BossAI if (Unit* target = ObjectAccessor::GetUnit(*me, _beamTarget)) { DoCast(target, SPELL_GREEN_BEAM); - me->Attack(target, false); } task.Repeat(); @@ -251,11 +246,7 @@ struct boss_eye_of_cthun : public BossAI { _scheduler.Schedule(5s, [this](TaskContext task) { - if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.f, 0)) - { - DoCast(target, SPELL_GREEN_BEAM); - me->Attack(target, false); - } + DoCastRandomTarget(SPELL_GREEN_BEAM); task.SetGroup(GROUP_BEAM_PHASE); task.Repeat(3s);