From 1851a2e9e3a44d997488adaee43ac274476baef8 Mon Sep 17 00:00:00 2001
From: Shauren <shauren.trinity@gmail.com>
Date: Tue, 24 Apr 2012 16:53:37 +0200
Subject: Scripts: Replaced calls to ForcedDespawn with DespawnOrUnsummon
 (calls appropriate AI hooks in case of temporary summons) and made
 ForcedDespawn private

---
 src/server/scripts/Outland/blades_edge_mountains.cpp | 2 +-
 src/server/scripts/Outland/nagrand.cpp               | 4 ++--
 src/server/scripts/Outland/netherstorm.cpp           | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/server/scripts/Outland')

diff --git a/src/server/scripts/Outland/blades_edge_mountains.cpp b/src/server/scripts/Outland/blades_edge_mountains.cpp
index 7a371170d7d..cf0955ed89c 100644
--- a/src/server/scripts/Outland/blades_edge_mountains.cpp
+++ b/src/server/scripts/Outland/blades_edge_mountains.cpp
@@ -855,7 +855,7 @@ class npc_simon_bunny : public CreatureScript
                 if (GameObject* relic = me->FindNearestGameObject(large ? GO_APEXIS_MONUMENT : GO_APEXIS_RELIC, searchDistance))
                     relic->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE);
 
-                me->ForcedDespawn(1000);
+                me->DespawnOrUnsummon(1000);
             }
 
             /*
diff --git a/src/server/scripts/Outland/nagrand.cpp b/src/server/scripts/Outland/nagrand.cpp
index 8080a1402af..871a2f200bb 100644
--- a/src/server/scripts/Outland/nagrand.cpp
+++ b/src/server/scripts/Outland/nagrand.cpp
@@ -450,7 +450,7 @@ public:
           {
               if (Say_Timer <= diff)
               {
-                  me->ForcedDespawn();
+                  me->DespawnOrUnsummon();
                   ReleasedFromCage = false;
               }
               else
@@ -689,7 +689,7 @@ class go_warmaul_prison : public GameObjectScript
                 player->KilledMonsterCredit(NPC_MAGHAR_PRISONER, 0);
 
                 prisoner->AI()->Talk(SAY_FREE, player->GetGUID());
-                prisoner->ForcedDespawn(6000);
+                prisoner->DespawnOrUnsummon(6000);
             }
             return true;
         }
diff --git a/src/server/scripts/Outland/netherstorm.cpp b/src/server/scripts/Outland/netherstorm.cpp
index 388d18697b9..afc18c71b92 100644
--- a/src/server/scripts/Outland/netherstorm.cpp
+++ b/src/server/scripts/Outland/netherstorm.cpp
@@ -1057,7 +1057,7 @@ class go_captain_tyralius_prison : public GameObjectScript
                 player->KilledMonsterCredit(NPC_CAPTAIN_TYRALIUS, 0);
 
                 tyralius->AI()->Talk(SAY_FREE);
-                tyralius->ForcedDespawn(8000);
+                tyralius->DespawnOrUnsummon(8000);
             }
             return true;
         }
-- 
cgit v1.2.3