Core/Creature: Remove non-std::chrono overload of DespawnOrUnsummon

(cherry picked from commit 480dee3125929181b7004810516ea673c61f5811)

12 files changed, 18 insertions, 19 deletions

diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp
index 96d00318f52..122708f62c6 100644
--- a/src/server/game/Entities/Creature/Creature.cpp
+++ b/src/server/game/Entities/Creature/Creature.cpp
@@ -2302,12 +2302,12 @@ void Creature::ForcedDespawn(uint32 timeMSToDespawn, Seconds forceRespawnTimer)
     }
 }
 
-void Creature::DespawnOrUnsummon(uint32 msTimeToDespawn /*= 0*/, Seconds forceRespawnTimer /*= 0*/)
+void Creature::DespawnOrUnsummon(Milliseconds timeToDespawn /*= 0s*/, Seconds forceRespawnTimer /*= 0s*/)
 {
     if (TempSummon* summon = ToTempSummon())
-        summon->UnSummon(msTimeToDespawn);
+        summon->UnSummon(timeToDespawn.count());
     else
-        ForcedDespawn(msTimeToDespawn, forceRespawnTimer);
+        ForcedDespawn(timeToDespawn.count(), forceRespawnTimer);
 }
 
 void Creature::LoadTemplateImmunities()
diff --git a/src/server/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h
index d75965446c0..8b0dc29f542 100644
--- a/src/server/game/Entities/Creature/Creature.h
+++ b/src/server/game/Entities/Creature/Creature.h
@@ -260,8 +260,7 @@ class TC_GAME_API Creature : public Unit, public GridObject<Creature>, public Ma
 
         void RemoveCorpse(bool setSpawnTime = true, bool destroyForNearbyPlayers = true);
 
-        void DespawnOrUnsummon(uint32 msTimeToDespawn = 0, Seconds forceRespawnTime = 0s);
-        void DespawnOrUnsummon(Milliseconds time, Seconds forceRespawnTime = 0s) { DespawnOrUnsummon(uint32(time.count()), forceRespawnTime); }
+        void DespawnOrUnsummon(Milliseconds timeToDespawn = 0s, Seconds forceRespawnTime = 0s);
 
         time_t const& GetRespawnTime() const { return m_respawnTime; }
         time_t GetRespawnTimeEx() const;
diff --git a/src/server/scripts/EasternKingdoms/BaradinHold/boss_occuthar.cpp b/src/server/scripts/EasternKingdoms/BaradinHold/boss_occuthar.cpp
index 6331f561027..28934fec38a 100644
--- a/src/server/scripts/EasternKingdoms/BaradinHold/boss_occuthar.cpp
+++ b/src/server/scripts/EasternKingdoms/BaradinHold/boss_occuthar.cpp
@@ -347,7 +347,7 @@ class spell_occuthar_occuthars_destruction : public SpellScriptLoader
                     if (IsExpired())
                         caster->CastSpell(nullptr, SPELL_OCCUTHARS_DESTUCTION, aurEff);
 
-                    caster->ToCreature()->DespawnOrUnsummon(500);
+                    caster->ToCreature()->DespawnOrUnsummon(500ms);
                 }
             }
 
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
index 54ddedbc236..ad6007160f8 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
@@ -408,7 +408,7 @@ class npc_chained_spirit : public CreatureScript
                     if (Player* target = ObjectAccessor::GetPlayer(*me, _revivePlayerGUID))
                         DoCast(target, SPELL_REVIVE);
 
-                    me->DespawnOrUnsummon(2000);
+                    me->DespawnOrUnsummon(2s);
                 }
             }
 
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp
index aa1e2169f12..834190258fd 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp
@@ -1149,7 +1149,7 @@ public:
                         break;
                     case RP2_EVENT_MALGANIS_LEAVE2:
                         if (Creature* malganis = me->FindNearestCreature(NPC_MALGANIS, 80.0f, true))
-                            malganis->DespawnOrUnsummon(0);
+                            malganis->DespawnOrUnsummon();
                         if (Creature* bunny = me->FindNearestCreature(NPC_MALGANIS_BUNNY, 80.0f, true))
                             bunny->CastSpell(bunny, SPELL_SHADOWSTEP_VISUAL);
                         break;
diff --git a/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp b/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp
index f8b76beec94..96b22fed443 100644
--- a/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp
+++ b/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp
@@ -517,7 +517,7 @@ class spell_alysrazor_cosmetic_egg_xplosion : public SpellScriptLoader
                 PreventHitDefaultEffect(effIndex);
                 GetHitUnit()->SetDisplayId(MODEL_INVISIBLE_STALKER);
                 if (Creature* creature = GetHitCreature())
-                    creature->DespawnOrUnsummon(4000);
+                    creature->DespawnOrUnsummon(4s);
             }
 
             void Register() override
diff --git a/src/server/scripts/Maelstrom/Stonecore/boss_corborus.cpp b/src/server/scripts/Maelstrom/Stonecore/boss_corborus.cpp
index 422e526ff98..f3992ddb4a6 100644
--- a/src/server/scripts/Maelstrom/Stonecore/boss_corborus.cpp
+++ b/src/server/scripts/Maelstrom/Stonecore/boss_corborus.cpp
@@ -238,7 +238,7 @@ class boss_corborus : public CreatureScript
                 {
                     summon->SetReactState(REACT_PASSIVE);
                     summon->CastSpell(summon, SPELL_TRASHING_CHARGE_EFFECT);
-                    summon->DespawnOrUnsummon(6000);
+                    summon->DespawnOrUnsummon(6s);
                 }
 
                 BossAI::JustSummoned(summon);
diff --git a/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp b/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp
index 0fdd8114fa4..0d37c6fd8bf 100644
--- a/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp
+++ b/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp
@@ -354,7 +354,7 @@ public:
             events.ScheduleEvent(EVENT_GRAVITY_WELL_AURA_DAMAGE, 3200ms);
             events.ScheduleEvent(EVENT_GRAVITY_WELL_AURA_PULL, 4500ms);
             if (!IsHeroic())
-                me->DespawnOrUnsummon(23200);
+                me->DespawnOrUnsummon(23200ms);
         }
 
         void KilledUnit(Unit* victim) override
@@ -364,7 +364,7 @@ public:
 
             me->SetObjectScale(me->GetObjectScale() - 0.25f);
             if (me->GetObjectScale() <= 0.0f)
-                me->DespawnOrUnsummon(1000);
+                me->DespawnOrUnsummon(1s);
         }
 
         void UpdateAI(uint32 diff) override
diff --git a/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp b/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp
index 81aff022649..0176eb7941d 100644
--- a/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp
+++ b/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp
@@ -104,7 +104,7 @@ class boss_ozruk : public CreatureScript
                 if (summon->GetEntry() == NPC_RUPTURE_CONTROLLER)
                 {
                     summon->CastSpell(summon, SPELL_RUPTURE, true);
-                    summon->DespawnOrUnsummon(10000);
+                    summon->DespawnOrUnsummon(10s);
                 }
 
                 BossAI::JustSummoned(summon);
diff --git a/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp b/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp
index 0bf68975566..a4b6b251195 100644
--- a/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp
+++ b/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp
@@ -346,7 +346,7 @@ public:
                     case EVENT_LAVA_FISSURE_ERUPTION:
                         me->RemoveAurasDueToSpell(SPELL_LAVA_FISSURE_CRACK);
                         DoCast(me, SPELL_LAVA_FISSURE_ERUPTION, true);
-                        me->DespawnOrUnsummon(14000);
+                        me->DespawnOrUnsummon(14s);
                         break;
                     default:
                         break;
@@ -392,7 +392,7 @@ public:
                 {
                     case EVENT_STALACTITE_MISSLE:
                         DoCast(me, SPELL_STALACTITE_MISSLE);
-                        me->DespawnOrUnsummon(11000);
+                        me->DespawnOrUnsummon(11s);
                         break;
                     default:
                         break;
diff --git a/src/server/scripts/Maelstrom/Stonecore/instance_stonecore.cpp b/src/server/scripts/Maelstrom/Stonecore/instance_stonecore.cpp
index 77e8eabe75c..a0f902410bf 100644
--- a/src/server/scripts/Maelstrom/Stonecore/instance_stonecore.cpp
+++ b/src/server/scripts/Maelstrom/Stonecore/instance_stonecore.cpp
@@ -198,13 +198,13 @@ class instance_stonecore : public InstanceMapScript
             void MillhouseEvent_Despawn()
             {
                 if (Creature* Millhouse = GetCreature(DATA_MILLHOUSE_MANASTORM))
-                    Millhouse->DespawnOrUnsummon(3000);
+                    Millhouse->DespawnOrUnsummon(3s);
                 for (GuidVector::const_iterator itr = millhouseTrashGUIDs.begin(); itr != millhouseTrashGUIDs.end(); ++itr)
                     if (Creature* creature = instance->GetCreature(*itr))
-                        creature->DespawnOrUnsummon(3000);
+                        creature->DespawnOrUnsummon(3s);
                 for (GuidVector::const_iterator itr = millhouseLastGroupGUIDs.begin(); itr != millhouseLastGroupGUIDs.end(); ++itr)
                     if (Creature* creature = instance->GetCreature(*itr))
-                        creature->DespawnOrUnsummon(3000);
+                        creature->DespawnOrUnsummon(3s);
             }
 
             void ActivateTeleporter(Creature* teleporter)
diff --git a/src/server/scripts/Outland/zone_netherstorm.cpp b/src/server/scripts/Outland/zone_netherstorm.cpp
index 7d03245f321..7e2e4905614 100644
--- a/src/server/scripts/Outland/zone_netherstorm.cpp
+++ b/src/server/scripts/Outland/zone_netherstorm.cpp
@@ -503,7 +503,7 @@ class go_captain_tyralius_prison : public GameObjectScript
                 }
 
                 if (Creature* prisoner = me->FindNearestCreature(NPC_ETHEREUM_PRISONER, 1.0f))
-                    prisoner->DespawnOrUnsummon(0);
+                    prisoner->DespawnOrUnsummon();
 
                 return true;
             }