scriptdev2
diff --git a/‎scripts/eastern_kingdoms/molten_core/boss_garr.cpp‎
Lines changed: 16 additions & 4 deletions b/‎scripts/eastern_kingdoms/molten_core/boss_garr.cpp‎
Lines changed: 16 additions & 4 deletions
diff --git a/‎sd2_revision_nr.h‎
Lines changed: 1 addition & 1 deletion b/‎sd2_revision_nr.h‎
Lines changed: 1 addition & 1 deletion
@@ -16,8 +16,8 @@
 
 /* ScriptData
 SDName: Boss_Garr
-SD%Complete: 50
-SDComment: Garr's enrage is missing
+SD%Complete: 80
+SDComment: Firesworn erruption needs to be revisited
 SDCategory: Molten Core
 EndScriptData */
 
@@ -29,13 +29,13 @@ enum
     // Garr spells
     SPELL_ANTIMAGICPULSE        = 19492,
     SPELL_MAGMASHACKLES         = 19496,
-    SPELL_ENRAGE                = 19516,                    // TODO Stacking enrage (stacks to 10 times)
+    SPELL_ENRAGE                = 19516,
 
     // Add spells
     SPELL_ERUPTION              = 19497,
     SPELL_MASSIVE_ERUPTION      = 20483,                    // TODO possible on death
     SPELL_IMMOLATE              = 20294,
-    SPELL_SEPARATION_ANXIETY    = 23492,                    // Used if separated too far from Garr, 21095 use unknown.
+    SPELL_SEPARATION_ANXIETY    = 23492,                    // Used if separated too far from Garr
 };
 
 struct boss_garrAI : public ScriptedAI
@@ -121,6 +121,15 @@ struct mob_fireswornAI : public ScriptedAI
         m_uiSeparationCheckTimer = 5000;
     }
 
+    void JustDied(Unit* /*pKiller*/) override
+    {
+        if (m_pInstance)
+        {
+            if (Creature* pGarr = m_pInstance->GetSingleCreatureFromStorage(NPC_GARR))
+                pGarr->CastSpell(pGarr, SPELL_ENRAGE, true, NULL, NULL, m_creature->GetObjectGuid());
+        }
+    }
+
     void UpdateAI(const uint32 uiDiff) override
     {
         if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
@@ -139,6 +148,9 @@ struct mob_fireswornAI : public ScriptedAI
 
         if (m_uiSeparationCheckTimer < uiDiff)
         {
+            if (!m_pInstance)
+                return;
+
             // Distance guesswork, but should be ok
             Creature* pGarr = m_pInstance->GetSingleCreatureFromStorage(NPC_GARR);
             if (pGarr && pGarr->isAlive() && !m_creature->IsWithinDist2d(pGarr->GetPositionX(), pGarr->GetPositionY(), 50.0f))
 
@@ -1,4 +1,4 @@
 #ifndef __SD2_REVISION_NR_H__
 #define __SD2_REVISION_NR_H__
- #define SD2_REVISION_NR "z2712"
+ #define SD2_REVISION_NR "z2713"
 #endif // __SD2_REVISION_NR_H__