From 2eb422885e476531296cc486399e13ffb5a3c155 Mon Sep 17 00:00:00 2001
From: Nefertumm <nefertum.dev@protonmail.com>
Date: Mon, 22 Nov 2021 18:44:08 -0300
Subject: [PATCH] fix(Core/MC): Golemagg (#9233)

---
 .../MoltenCore/boss_golemagg.cpp                  | 15 ++++++++-------
 .../MoltenCore/instance_molten_core.cpp           | 15 +--------------
 2 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp
index f34191403..3a1d8ac69 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp
@@ -31,8 +31,10 @@ enum Spells
     // Golemagg
     SPELL_PYROBLAST             = 20228,
     SPELL_EARTHQUAKE            = 19798,
-    SPELL_ENRAGE                = 19953,
     SPELL_ATTRACK_RAGER         = 20544,
+    SPELL_MAGMASPLASH           = 13879,
+    SPELL_GOLEMAGG_TRUST_AURA   = 20556,
+    SPELL_DOUBLE_ATTACK         = 18943,
 
     // Core Rager
     SPELL_MANGLE                = 19820,
@@ -58,13 +60,15 @@ public:
             earthquakeTimer = 0;
             pyroblastTimer = urand(3000, 7000);
             enraged = false;
+            DoCastSelf(SPELL_MAGMASPLASH);
+            DoCastSelf(SPELL_GOLEMAGG_TRUST_AURA);
+            DoCastSelf(SPELL_DOUBLE_ATTACK);
         }
 
         void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask) override
         {
             if (!enraged && me->HealthBelowPctDamaged(10, damage))
             {
-                DoCastSelf(SPELL_ENRAGE, true);
                 DoCastSelf(SPELL_ATTRACK_RAGER, true);
                 DoCastAOE(SPELL_EARTHQUAKE, true);
                 earthquakeTimer = 5000;
@@ -84,7 +88,7 @@ public:
             {
                 if (earthquakeTimer <= diff)
                 {
-                    DoCastAOE(SPELL_EARTHQUAKE, true);
+                    DoCastSelf(SPELL_EARTHQUAKE, true);
                     earthquakeTimer = 5000;
                 }
                 else
@@ -100,10 +104,7 @@ public:
 
             if (pyroblastTimer <= diff)
             {
-                if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true))
-                {
-                    DoCast(target, SPELL_PYROBLAST);
-                }
+                DoCastRandomTarget(SPELL_PYROBLAST);
 
                 pyroblastTimer = 7000;
             }
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp
index 8dd5aa75a..c1b29dfc8 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp
@@ -263,20 +263,6 @@ public:
                         }
                         break;
                     }
-                    case IN_PROGRESS:
-                    {
-                        if (!_golemaggMinionsGUIDS.empty())
-                        {
-                            for (ObjectGuid const& minionGuid : _golemaggMinionsGUIDS)
-                            {
-                                if (Creature* minion = instance->GetCreature(minionGuid))
-                                {
-                                    minion->AI()->DoZoneInCombat(nullptr, 150.0f);
-                                }
-                            }
-                        }
-                        break;
-                    }
                     case DONE:
                     {
                         if (!_golemaggMinionsGUIDS.empty())
@@ -292,6 +278,7 @@ public:
                         }
                         break;
                     }
+                    case IN_PROGRESS:
                     default:
                         break;
                 }