[SD3] Fix ZG crash

mangosthree · May 16, 2023 · eca6267 · eca6267
1 parent 3d2c84e
commit eca6267
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 14 deletions.
diff --git a/src/modules/SD3/include/sc_grid_searchers.h b/src/modules/SD3/include/sc_grid_searchers.h
@@ -31,7 +31,7 @@
 class GameObject;
 class Creature;
 
-struct ObjectDistanceOrder : public std::binary_function<const WorldObject, const WorldObject, bool>
+struct ObjectDistanceOrder
 {
     const Unit* m_pSource;
 
@@ -43,7 +43,7 @@ struct ObjectDistanceOrder : public std::binary_function<const WorldObject, cons
     }
 };
 
-struct ObjectDistanceOrderReversed : public std::binary_function<const WorldObject, const WorldObject, bool>
+struct ObjectDistanceOrderReversed
 {
     const Unit* m_pSource;
 

diff --git a/src/modules/SD3/scripts/eastern_kingdoms/zulgurub/boss_hakkar.cpp b/src/modules/SD3/scripts/eastern_kingdoms/zulgurub/boss_hakkar.cpp
@@ -66,6 +66,7 @@ struct boss_hakkar : public CreatureScript
         boss_hakkarAI(Creature* pCreature) : ScriptedAI(pCreature)
         {
             m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData();
+            Reset();
         }
 
         ScriptedInstance* m_pInstance;
@@ -96,9 +97,16 @@ struct boss_hakkar : public CreatureScript
             m_uiAspectOfThekalTimer = 8000;
             m_uiAspectOfArlokkTimer = 18000;
 
-            DoCastSpellIfCan(nullptr, SPELL_DOUBLE_ATTACK, CAST_TRIGGERED | CAST_AURA_NOT_PRESENT);
+            //Needs more info. nullptr is unacceptable, see impl
+            //DoCastSpellIfCan(nullptr, SPELL_DOUBLE_ATTACK, CAST_TRIGGERED | CAST_AURA_NOT_PRESENT);
 
-            InitiateHakkarPowerStacks();
+            // Initiate Hakkar power stacks
+            m_creature->RemoveAurasDueToSpell(SPELL_HAKKAR_POWER);
+            for (uint8 i = 0; i < MAX_PRIESTS; i++)
+            {
+                if (m_pInstance->GetData(i) != DONE)
+                    m_creature->CastSpell(m_creature, SPELL_HAKKAR_POWER, false);
+            }
         }
 
         void Aggro(Unit* /*who*/) override
@@ -131,16 +139,6 @@ struct boss_hakkar : public CreatureScript
             }
         }
 
-        void InitiateHakkarPowerStacks()
-        {
-            m_creature->RemoveAurasDueToSpell(SPELL_HAKKAR_POWER);
-            for (uint8 i = 0; i < MAX_PRIESTS; i++)
-            {
-                if (m_pInstance->GetData(i) != DONE)
-                    m_creature->CastSpell(m_creature, SPELL_HAKKAR_POWER,false);
-            }
-        }
-
         void UpdateAI(const uint32 uiDiff) override
         {
             if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())