From 888f9bb0bb3825ef8cfa1a8b33ed4dba032a9d73 Mon Sep 17 00:00:00 2001
From: UltraNix <80540499+UltraNix@users.noreply.github.com>
Date: Sun, 20 Nov 2022 23:39:01 +0100
Subject: [PATCH] =?UTF-8?q?fix(Scripts/Temple=20of=20AhnQiraj):=20Cthun's?=
 =?UTF-8?q?=20Eye=20should=20always=20focus=20on=20b=E2=80=A6=20(#13796)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix(Scripts/Temple of AhnQiraj): Cthun's Eye should always focus on beam target.

Fixes #13673
---
 .../Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp        | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
index 2382dad37..e8c8c8661 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
@@ -199,11 +199,15 @@ 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)
             {
-                AttackStart(who);
+                me->Attack(who, false);
             }
         }
     }
 
+    void AttackStart(Unit* /*victim*/) override
+    {
+    }
+
     void DoAction(int32 action) override
     {
         if (action == ACTION_SPAWN_EYE_TENTACLES)
@@ -238,6 +242,7 @@ 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();
@@ -246,7 +251,11 @@ struct boss_eye_of_cthun : public BossAI
                 {
                     _scheduler.Schedule(5s, [this](TaskContext task)
                     {
-                        DoCastRandomTarget(SPELL_GREEN_BEAM);
+                        if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.f, 0))
+                        {
+                            DoCast(target, SPELL_GREEN_BEAM);
+                            me->Attack(target, false);
+                        }
 
                         task.SetGroup(GROUP_BEAM_PHASE);
                         task.Repeat(3s);