Core/Scripts: Added wrapper method for despawning creatures DespawnOrUnsummon

9 files changed, 18 insertions, 18 deletions

diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp
index 443766f949b..b57417f323a 100644
--- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp
@@ -123,7 +123,7 @@ public:
             if (DespawnTimer <= diff)
             {
                 if (!UpdateVictim())
-                    me->ForcedDespawn();
+                    me->DespawnOrUnsummon();
                 DespawnTimer = 5000;
             } else DespawnTimer -= diff;
 
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp
index 4fdb9f0ad03..1c3b68afb43 100644
--- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp
@@ -370,7 +370,7 @@ public:
                     if (!Nefarian || !Nefarian->isAlive())
                     {
                         NefarianGUID = 0;
-                        me->ForcedDespawn();
+                        me->DespawnOrUnsummon();
                     }
 
                     NefCheckTime = 2000;
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
index 46acdacf72f..97b6bdbb5f9 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
@@ -287,7 +287,7 @@ public:
                     if (Creature* pPortal = Unit::GetCreature(*me, PortalGUID[i]))
                     {
                         CAST_AI(mob_fiendish_portal::mob_fiendish_portalAI, pPortal->AI())->DespawnAllImp();
-                        pPortal->ForcedDespawn();
+                        pPortal->DespawnOrUnsummon();
                     }
 
                     PortalGUID[i] = 0;
@@ -351,7 +351,7 @@ public:
                 if (PortalGUID[i])
                 {
                     if (Creature* pPortal = Unit::GetCreature((*me), PortalGUID[i]))
-                        pPortal->ForcedDespawn();
+                        pPortal->DespawnOrUnsummon();
 
                     PortalGUID[i] = 0;
                 }
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
index 47eb09eb5ee..cde236b8ca7 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
@@ -149,7 +149,7 @@ public:
 
         void JustReachedHome()
         {
-            me->ForcedDespawn();
+            me->DespawnOrUnsummon();
         }
 
         void SummonTito();
@@ -337,7 +337,7 @@ public:
 
         void JustReachedHome()
         {
-            me->ForcedDespawn();
+            me->DespawnOrUnsummon();
         }
 
         void SpellHit(Unit* /*caster*/, const SpellEntry *Spell)
@@ -440,7 +440,7 @@ public:
 
         void JustReachedHome()
         {
-            me->ForcedDespawn();
+            me->DespawnOrUnsummon();
         }
 
         void AttackStart(Unit* who)
@@ -564,7 +564,7 @@ public:
 
         void JustReachedHome()
         {
-            me->ForcedDespawn();
+            me->DespawnOrUnsummon();
         }
 
         void JustDied(Unit* /*killer*/)
@@ -648,7 +648,7 @@ public:
 
         void JustReachedHome()
         {
-            me->ForcedDespawn();
+            me->DespawnOrUnsummon();
         }
 
         void EnterCombat(Unit* /*who*/)
@@ -784,7 +784,7 @@ public:
             if (Creature* pBigBadWolf = pCreature->SummonCreature(CREATURE_BIG_BAD_WOLF, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, HOUR*2*IN_MILLISECONDS))
                 pBigBadWolf->AI()->AttackStart(pPlayer);
 
-            pCreature->ForcedDespawn();
+            pCreature->DespawnOrUnsummon();
         }
 
         return true;
@@ -848,7 +848,7 @@ public:
 
         void JustReachedHome()
         {
-            me->ForcedDespawn();
+            me->DespawnOrUnsummon();
         }
 
         void JustDied(Unit* /*killer*/)
@@ -1086,7 +1086,7 @@ public:
 
         void JustReachedHome()
         {
-            me->ForcedDespawn();
+            me->DespawnOrUnsummon();
         }
 
         void SpellHit(Unit* /*caster*/, const SpellEntry *Spell)
@@ -1176,7 +1176,7 @@ public:
 
         void JustReachedHome()
         {
-            me->ForcedDespawn();
+            me->DespawnOrUnsummon();
         }
 
         void DamageTaken(Unit* /*done_by*/, uint32 &damage)
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
index c42ef75cf95..9ae5cca4cc0 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
@@ -274,7 +274,7 @@ public:
                     if (TalkCount > 3)
                     {
                         if (Creature* pSpotlight = Unit::GetCreature(*me, m_uiSpotlightGUID))
-                            pSpotlight->ForcedDespawn();
+                            pSpotlight->DespawnOrUnsummon();
 
                         SetEscortPaused(false);
                         return;
diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
index df4ebfe1639..eeef3d373a5 100644
--- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
@@ -579,7 +579,7 @@ public:
                         Phase = 3;
                         break;
                     case 3:
-                        me->ForcedDespawn();
+                        me->DespawnOrUnsummon();
                         break;
                     default:
                         break;
diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp
index 2cf1dd9e736..f0efca78876 100644
--- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp
@@ -1331,7 +1331,7 @@ public:
                             break;
 
                         case 73:
-                            me->ForcedDespawn();
+                            me->DespawnOrUnsummon();
                             break;
                     }
 
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
index 236d7a944f0..c4c6f53e444 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
@@ -114,7 +114,7 @@ class boss_arlokk : public CreatureScript
                     m_pInstance->SetData(TYPE_ARLOKK, NOT_STARTED);
 
                 //we should be summoned, so despawn
-                me->ForcedDespawn();
+                me->DespawnOrUnsummon();
             }
 
             void JustDied(Unit* /*pKiller*/)
diff --git a/src/server/scripts/EasternKingdoms/hinterlands.cpp b/src/server/scripts/EasternKingdoms/hinterlands.cpp
index 62cd5990182..363e7f68e87 100644
--- a/src/server/scripts/EasternKingdoms/hinterlands.cpp
+++ b/src/server/scripts/EasternKingdoms/hinterlands.cpp
@@ -333,7 +333,7 @@ public:
                         }
                         else
                         {
-                            me->ForcedDespawn();
+                            me->DespawnOrUnsummon();
                             return;
                         }
                     }