[s2835] Fix trash mobs cleaning for M'uru on encounter fail or complete

Signed-off-by: Xfurry <xfurry@scriptdev2.com>

(based on commit SD2[3110] - 9593341)

Signed-off-by: Xfurry <xfurry@scriptdev2.com>

Author: Ulduar

scripts/eastern_kingdoms/sunwell_plateau/boss_muru.cpp

@@ -63,8 +63,6 @@ enum
 
     // Muru npcs
     NPC_VOID_SENTINEL_SUMMONER      = 25782,
-    NPC_VOID_SENTINEL               = 25772,    // scripted in Acid
-    NPC_DARK_FIEND                  = 25744,
 
     // darkness spells
     SPELL_VOID_ZONE_VISUAL          = 46265,

scripts/eastern_kingdoms/sunwell_plateau/instance_sunwell_plateau.cpp

@@ -125,6 +125,12 @@ void instance_sunwell_plateau::OnCreatureCreate(Creature* pCreature)
             if (pCreature->GetPositionY() < 523.0f)
                 m_lBackdoorTriggersList.push_back(pCreature->GetObjectGuid());
             break;
+        case NPC_BERSERKER:
+        case NPC_FURY_MAGE:
+        case NPC_DARK_FIEND:
+        case NPC_VOID_SENTINEL:
+            m_lMuruTrashGuidList.push_back(pCreature->GetObjectGuid());
+            return;
     }
 }
 
@@ -233,6 +239,17 @@ void instance_sunwell_plateau::SetData(uint32 uiType, uint32 uiData)
                 DoUseDoorOrButton(GO_MURU_EXIT_GATE);
             else if (uiData == IN_PROGRESS)
                 m_uiMuruBerserkTimer = 10 * MINUTE * IN_MILLISECONDS;
+            if (uiData == FAIL || uiData == DONE)
+            {
+                // clear all the trash mobs
+                for (GuidList::const_iterator itr = m_lMuruTrashGuidList.begin(); itr != m_lMuruTrashGuidList.end(); ++itr)
+                {
+                    if (Creature* pTrash = instance->GetCreature(*itr))
+                        pTrash->ForcedDespawn();
+                }
+
+                m_lMuruTrashGuidList.clear();
+            }
             break;
         case TYPE_KILJAEDEN:
             m_auiEncounter[uiType] = uiData;

scripts/eastern_kingdoms/sunwell_plateau/sunwell_plateau.h

@@ -31,6 +31,10 @@ enum
     NPC_SACROLASH               = 25165,
     NPC_MURU                    = 25741,
     NPC_ENTROPIUS               = 25840,
+    NPC_BERSERKER               = 25798,            // muru trash mobs - scripted in Acid
+    NPC_FURY_MAGE               = 25799,
+    NPC_DARK_FIEND              = 25744,
+    NPC_VOID_SENTINEL           = 25772,
     NPC_DECEIVER                = 25588,
     NPC_KILJAEDEN               = 25315,
     NPC_KILJAEDEN_CONTROLLER    = 25608,            // kiljaeden event controller
@@ -151,5 +155,6 @@ class instance_sunwell_plateau : public ScriptedInstance, private DialogueHelper
         GuidList m_lAllFlightTriggersList;
         GuidList m_lBackdoorTriggersList;
         GuidList m_lDeceiversGuidList;
+        GuidList m_lMuruTrashGuidList;
 };
 #endif

sd2_revision_nr.h

@@ -1,4 +1,4 @@
 #ifndef __SD2_REVISION_NR_H__
 #define __SD2_REVISION_NR_H__
- #define SD2_REVISION_NR "s2834"
+ #define SD2_REVISION_NR "s2835"
 #endif // __SD2_REVISION_NR_H__