diff options
| author | Shauren <shauren.dev@gmail.com> | 2011-01-02 21:33:37 +0100 |
|---|---|---|
| committer | Shauren <shauren.dev@gmail.com> | 2011-01-02 21:33:37 +0100 |
| commit | 9c0cd63e933ece1a9b878b90103b305358202d25 (patch) | |
| tree | 03f63fa2a44ea6af7c1989c0b7979ba28b3feb06 /src/server/scripts/Outland | |
| parent | c2f98606b2d0c33f13b55c07c4c0e55d3d959676 (diff) | |
Core/Scripts: Added wrapper method for despawning creatures DespawnOrUnsummon
Diffstat (limited to 'src/server/scripts/Outland')
5 files changed, 7 insertions, 7 deletions
diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp index 2d43628841a..e67cec43b0e 100644 --- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp +++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp @@ -300,7 +300,7 @@ public: me->InterruptNonMeleeSpells(true); DoCast(me, SPELL_ETHEREAL_APPRENTICE, true); - me->ForcedDespawn(); + me->DespawnOrUnsummon(); return; } else Apprentice_Timer -= diff; } diff --git a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp index e1bb175be62..30889ff69ad 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp @@ -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; diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp index 0ed1e6718d4..bb2f006c366 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp @@ -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); diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp index 9f5c80eaf9a..b89fa7af86b 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp @@ -337,7 +337,7 @@ public: DoCast(me->getVictim(), SPELL_GLOBULE_EXPLOSION); //despawn - me->ForcedDespawn(); + me->DespawnOrUnsummon(); return; } Check_Timer = 500; diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp index 03376be7056..fb2ef71c576 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp @@ -180,7 +180,7 @@ class mob_abyssal : public CreatureScript if (Despawn_Timer <= diff) { - me->ForcedDespawn(); + me->DespawnOrUnsummon(); } else Despawn_Timer -= diff; |