Scripts/Naxxramas: Fixed reseting of Just Can't Get Enough achievement. Thanks to Shauren for notice

2 files changed, 25 insertions, 0 deletions

diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
index deaa48af1b1..3b8e369a769 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
@@ -269,8 +269,10 @@ public:
         boss_kelthuzadAI(Creature* c) : BossAI(c, BOSS_KELTHUZAD), spawns(c)
         {
             uiFaction = me->getFaction();
+            instance = me->GetInstanceScript();
         }
 
+        InstanceScript* instance;
         uint32 Phase;
         uint32 uiGuardiansOfIcecrownTimer;
         uint32 uiFaction;
@@ -307,6 +309,9 @@ public:
 
             FindGameObjects();
 
+            if (instance)
+                instance->SetData(DATA_ABOMINATION_KILLED, 0);
+
             if (GameObject* pKTTrigger = me->GetMap()->GetGameObject(KTTriggerGUID))
             {
                 pKTTrigger->ResetDoorOrButton();
diff --git a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
index 722eb3ef37d..f08e0ccb5cf 100644
--- a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
@@ -147,6 +147,26 @@ public:
         time_t minHorsemenDiedTime;
         time_t maxHorsemenDiedTime;
 
+        void Initialize()
+        {
+            GothikGateGUID      = 0;
+            HorsemenChestGUID   = 0;
+            SapphironGUID       = 0;
+            uiFaerlina          = 0;
+            uiThane             = 0;
+            uiLady              = 0;
+            uiBaron             = 0;
+            uiSir               = 0;
+            uiThaddius          = 0;
+            uiHeigan            = 0;
+            uiFeugen            = 0;
+            uiStalagg           = 0;
+            uiKelthuzad         = 0;
+            uiKelthuzadTrigger  = 0;
+
+            memset(uiPortals, 0, sizeof(uiPortals));
+        }
+
         void OnCreatureCreate(Creature* creature)
         {
             switch(creature->GetEntry())