Skip to content

Commit

Permalink
Remove burning spirits from list on death.
Browse files Browse the repository at this point in the history
  • Loading branch information
ratkosrb committed Nov 29, 2023
1 parent 38f9f3b commit f450c08
Showing 1 changed file with 4 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -467,6 +467,9 @@ struct instance_blackrock_depths : ScriptedInstance
{
switch (pCreature->GetEntry())
{
case NPC_BURNING_SPIRIT:
m_burningSpirits.remove(pCreature->GetObjectGuid());
break;
case NPC_SHADOWFORGE_SENATOR:
// Emperor Dagran Thaurissan performs a random yell upon the death
// of Shadowforge Senators in the Throne Room
Expand Down Expand Up @@ -949,7 +952,7 @@ struct instance_blackrock_depths : ScriptedInstance
for (const auto& guid : m_burningSpirits)
{
if (Creature* pSummon = GetMap()->GetCreature(guid))
if (pSummon->IsAlive() && (!pSummon->IsInCombat() || uiData != DONE))
if (!pSummon->IsInCombat() || uiData != DONE)
pSummon->DespawnOrUnsummon();
}

Expand Down

0 comments on commit f450c08

Please sign in to comment.