Core/Scripts: Added wrapper method for despawning creatures DespawnOrUnsummon

This commit is contained in:
Shauren
2011-01-02 21:33:37 +01:00
parent c2f98606b2
commit 9c0cd63e93
66 changed files with 153 additions and 194 deletions
@@ -300,7 +300,7 @@ public:
me->InterruptNonMeleeSpells(true);
DoCast(me, SPELL_ETHEREAL_APPRENTICE, true);
me->ForcedDespawn();
me->DespawnOrUnsummon();
return;
} else Apprentice_Timer -= diff;
}
@@ -168,7 +168,7 @@ public:
{
if (Creature* Essence = Unit::GetCreature(*me, EssenceGUID))
{
Essence->ForcedDespawn();
Essence->DespawnOrUnsummon();
}
EssenceGUID = 0;
}
@@ -324,7 +324,7 @@ public:
{
DoScriptText(DESI_SAY_AFTER, Essence);
}
Essence->ForcedDespawn();
Essence->DespawnOrUnsummon();
me->SetUInt32Value(UNIT_NPC_EMOTESTATE,0);
EssenceGUID = 0;
SoulCount = 0;
@@ -338,7 +338,7 @@ public:
Creature* pCreature = Unit::GetCreature((*me), InnderDemon[i]);
if (pCreature && pCreature->isAlive())
{
pCreature->ForcedDespawn();
pCreature->DespawnOrUnsummon();
}
InnderDemon[i] = 0;
}
@@ -390,7 +390,7 @@ public:
if (Demon)
{
if (Creature* pDemon = Unit::GetCreature(*me, Demon))
pDemon->ForcedDespawn();
pDemon->DespawnOrUnsummon();
}
if (pInstance)
pInstance->SetData(DATA_LEOTHERASTHEBLINDEVENT, DONE);
@@ -337,7 +337,7 @@ public:
DoCast(me->getVictim(), SPELL_GLOBULE_EXPLOSION);
//despawn
me->ForcedDespawn();
me->DespawnOrUnsummon();
return;
}
Check_Timer = 500;
@@ -180,7 +180,7 @@ class mob_abyssal : public CreatureScript
if (Despawn_Timer <= diff)
{
me->ForcedDespawn();
me->DespawnOrUnsummon();
}
else Despawn_Timer -= diff;