From 5561445de4809e1e671e52a77988e8be825fd07c Mon Sep 17 00:00:00 2001
From: Andrew <47818697+Nyeriah@users.noreply.github.com>
Date: Wed, 20 Nov 2024 18:26:45 -0300
Subject: [PATCH] fix(Scripts/ZulAman): Fix Janalai Enrage/Berserk behaviour
 (#20662)

* fix(Scripts/ZulAman): Fix Janalai Enrage/Berserk behaviour

* Update boss_janalai.cpp
---
 .../EasternKingdoms/ZulAman/boss_janalai.cpp     | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
index d6d82a1f2..33e5e1817 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
@@ -109,8 +109,8 @@ enum HatchActions
 enum Misc
 {
     MAX_BOMB_COUNT              = 40,
-
-    SCHEDULER_GROUP_HATCHING    = 1
+    SCHEDULER_GROUP_HATCHING    = 1,
+    GROUP_ENRAGE                = 1
 };
 
 struct boss_janalai : public BossAI
@@ -139,8 +139,10 @@ struct boss_janalai : public BossAI
             DoCastAOE(SPELL_HATCH_ALL);
         });
 
-        ScheduleHealthCheckEvent(25, [&] {
-            DoCastSelf(SPELL_ENRAGE, true);
+        ScheduleHealthCheckEvent(20, [&] {
+            if (!me->HasAura(SPELL_ENRAGE))
+                DoCastSelf(SPELL_ENRAGE, true);
+            me->m_Events.CancelEventGroup(GROUP_ENRAGE);
         });
 
         me->m_Events.KillAllEvents(false);
@@ -206,10 +208,14 @@ struct boss_janalai : public BossAI
             }
         }, 8s);
 
+        me->m_Events.AddEventAtOffset([&] {
+            DoCastSelf(SPELL_ENRAGE, true);
+        }, 5min, 5min, GROUP_ENRAGE);
+
         me->m_Events.AddEventAtOffset([&] {
             Talk(SAY_BERSERK);
             DoCastSelf(SPELL_BERSERK);
-        }, 5min);
+        }, 10min);
     }
 
     bool HatchAllEggs(uint32 hatchAction)