From 58e1c091a2879f8f8930018d2e68027cfefe423b Mon Sep 17 00:00:00 2001 From: Carbenium Date: Sun, 26 Jul 2020 00:52:19 +0200 Subject: Scripts/EasternKingdoms: Use std::chrono overload of Creature::DespawnOrUnsummon (cherry picked from commit d1a39a2ebf3bb55998696c424cd58f3fcdedd66a) --- .../BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp | 2 +- .../BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp | 6 +++--- .../BlackrockMountain/BlackwingLair/boss_nefarian.cpp | 2 +- .../EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp | 2 +- src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp | 2 +- src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp index 86d10cbb625..e8bbd7139f1 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp @@ -234,7 +234,7 @@ public: case 11: if (Creature* gyth = me->FindNearestCreature(NPC_GYTH, 10.0f, true)) gyth->AI()->SetData(1, 1); - me->DespawnOrUnsummon(1000, 24h * 7); + me->DespawnOrUnsummon(1s, 7_days); break; } } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp index 3f53a64f74f..96d71073c7b 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp @@ -97,12 +97,12 @@ public: case NPC_PYROGAURD_EMBERSEER: PyroguardEmberseer = creature->GetGUID(); if (GetBossState(DATA_PYROGAURD_EMBERSEER) == DONE) - creature->DespawnOrUnsummon(0, 24h * 7); + creature->DespawnOrUnsummon(0s, 7_days); break; case NPC_WARCHIEF_REND_BLACKHAND: WarchiefRendBlackhand = creature->GetGUID(); if (GetBossState(DATA_GYTH) == DONE) - creature->DespawnOrUnsummon(0, 24h * 7); + creature->DespawnOrUnsummon(0s, 7_days); break; case NPC_GYTH: Gyth = creature->GetGUID(); @@ -116,7 +116,7 @@ public: case NPC_LORD_VICTOR_NEFARIUS: LordVictorNefarius = creature->GetGUID(); if (GetBossState(DATA_GYTH) == DONE) - creature->DespawnOrUnsummon(0, 24h * 7); + creature->DespawnOrUnsummon(0s, 7_days); break; case NPC_SCARSHIELD_INFILTRATOR: ScarshieldInfiltrator = creature->GetGUID(); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp index 650430a7635..89cfa1de524 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp @@ -284,7 +284,7 @@ public: break; case EVENT_SUCCESS_2: DoCast(me, SPELL_VAELASTRASZZ_SPAWN); - me->DespawnOrUnsummon(1000); + me->DespawnOrUnsummon(1s); break; case EVENT_PATH_3: me->GetMotionMaster()->MovePath(NEFARIUS_PATH_3, false); diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp index 813eb2d6898..545d3549ee4 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp @@ -121,7 +121,7 @@ class boss_kirtonos_the_herald : public CreatureScript brazier->ResetDoorOrButton(); brazier->SetGoState(GO_STATE_READY); } - me->DespawnOrUnsummon(5000); + me->DespawnOrUnsummon(5s); } void IsSummonedBy(WorldObject* /*summoner*/) override diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp index 302ed471876..a7517baeca1 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp @@ -656,7 +656,7 @@ class spell_dark_fiend_skin : public SpellScriptLoader target->AttackStop(); target->StopMoving(); target->CastSpell(target, SPELL_DARKFIEND_VISUAL, true); - target->DespawnOrUnsummon(3000); + target->DespawnOrUnsummon(3s); } } diff --git a/src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp b/src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp index f0783a3c2d4..4ba69674c22 100644 --- a/src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp +++ b/src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp @@ -373,7 +373,7 @@ struct npc_thalorien_dawnseeker : public ScriptedAI if (Creature* thalorien = ObjectAccessor::GetCreature(*me, _thalorienGUID)) { thalorien->SetStandState(UNIT_STAND_STATE_KNEEL); - thalorien->DespawnOrUnsummon(5 * IN_MILLISECONDS); + thalorien->DespawnOrUnsummon(5s); } me->AddNpcFlag(UNIT_NPC_FLAG_GOSSIP); -- cgit v1.2.3