diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp index 849576a155..de0677dd43 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp @@ -65,7 +65,6 @@ enum VezaxNpcs { // NPC_VEZAX = 33271, // NPC_VEZAX_BUNNY = 33500, - NPC_SARONITE_ANIMUS = 33524, }; enum VezaxGOs @@ -368,11 +367,7 @@ struct npc_ulduar_saronite_animus : public ScriptedAI npc_ulduar_saronite_animus(Creature* creature) : ScriptedAI(creature) { _instance = creature->GetInstanceScript(); - if (_instance) - if (Creature* vezax = _instance->GetCreature(BOSS_VEZAX)) - vezax->AI()->JustSummoned(me); timer = 0; - me->SetInCombatWithZone(); } InstanceScript* _instance; @@ -389,7 +384,8 @@ struct npc_ulduar_saronite_animus : public ScriptedAI void UpdateAI(uint32 diff) override { - UpdateVictim(); + if (!UpdateVictim()) + return; timer += diff; if (timer >= 2000) diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp index b54ff8b975..9daa556ff2 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp @@ -165,6 +165,12 @@ ObjectData const gameobjectData[] = { 0, 0 } }; +ObjectData const summonData[] = +{ + { NPC_SARONITE_ANIMUS, BOSS_VEZAX }, // summoned by a Saronite Vapor, not Vezax + { 0, 0 } +}; + BossBoundaryData const boundaries = { { BOSS_LEVIATHAN, new RectangleBoundary(130.0f, 450.0f, -170.0f, 110.0f) }, @@ -189,6 +195,7 @@ public: SetPersistentDataCount(MAX_PERSISTENT_DATA); LoadDoorData(doorData); LoadObjectData(creatureData, gameobjectData); + LoadSummonData(summonData); LoadBossBoundaries(boundaries); Initialize(); }; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h b/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h index 314c174e6f..faaf83d215 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h @@ -172,6 +172,7 @@ enum UlduarNPCs NPC_THORIM = 32865, NPC_FREYA = 32906, NPC_VEZAX = 33271, + NPC_SARONITE_ANIMUS = 33524, NPC_SARA = 33134, NPC_YOGGSARON = 33288, NPC_BRAIN_OF_YOGG_SARON = 33890,