[2336] Remove obsolete Add handling for Faerlina, thanks to Xfurry fo…

…r pointing
Schmoozerd · Nov 17, 2011 · c17ea91 · c17ea91
1 parent aa9ea8e
commit c17ea91
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 20 deletions.
diff --git a/scripts/northrend/naxxramas/instance_naxxramas.cpp b/scripts/northrend/naxxramas/instance_naxxramas.cpp
@@ -75,11 +75,6 @@ void instance_naxxramas::OnCreatureCreate(Creature* pCreature)
 
         case NPC_SUB_BOSS_TRIGGER:  m_lGothTriggerList.push_back(pCreature->GetObjectGuid()); break;
         case NPC_TESLA_COIL:        m_lThadTeslaCoilList.push_back(pCreature->GetObjectGuid()); break;
-
-        case NPC_NAXXRAMAS_FOLLOWER:
-        case NPC_NAXXRAMAS_WORSHIPPER:
-            m_lFaerlinaAddGUIDs.push_back(pCreature->GetObjectGuid());
-            break;
     }
 }
 
@@ -270,15 +265,6 @@ void instance_naxxramas::SetData(uint32 uiType, uint32 uiData)
                 DoUseDoorOrButton(GO_ARAC_FAER_DOOR);
                 DoUseDoorOrButton(GO_ARAC_MAEX_OUTER_DOOR);
             }
-            if (uiData == FAIL)
-            {
-                for (GUIDList::const_iterator itr = m_lFaerlinaAddGUIDs.begin(); itr != m_lFaerlinaAddGUIDs.end(); ++itr)
-                {
-                    Creature* pAdd = instance->GetCreature(*itr);
-                    if (pAdd && !pAdd->isAlive())
-                        pAdd->Respawn();
-                }
-            }
             m_auiEncounter[uiType] = uiData;
             break;
         case TYPE_MAEXXNA:

diff --git a/scripts/northrend/naxxramas/naxxramas.h b/scripts/northrend/naxxramas/naxxramas.h
@@ -76,10 +76,6 @@ enum
     NPC_THE_LICHKING            = 16980,
     NPC_MR_BIGGLESWORTH         = 16998,
 
-    // Faerlina
-    NPC_NAXXRAMAS_FOLLOWER      = 16505,
-    NPC_NAXXRAMAS_WORSHIPPER    = 16506,
-
     // Gothik
     NPC_GOTHIK                  = 16060,
     NPC_SUB_BOSS_TRIGGER        = 16137,                    //summon locations
@@ -238,7 +234,6 @@ class MANGOS_DLL_DECL instance_naxxramas : public ScriptedInstance
         std::string m_strInstData;
 
         GUIDList m_lThadTeslaCoilList;
-        GUIDList m_lFaerlinaAddGUIDs;
         GUIDList m_lGothTriggerList;
 
         UNORDERED_MAP<ObjectGuid, GothTrigger> m_mGothTriggerMap;

diff --git a/sd2_revision_nr.h b/sd2_revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __SD2_REVISION_NR_H__
 #define __SD2_REVISION_NR_H__
- #define SD2_REVISION_NR "2335"
+ #define SD2_REVISION_NR "2336"
 #endif // __SD2_REVISION_NR_H__