From f95ca514e6787131b0673906c2b0ec0f10b63dff Mon Sep 17 00:00:00 2001 From: treeston Date: Thu, 4 Aug 2016 15:32:24 +0200 Subject: [PATCH] ScriptedAI/Creature: Fix a bug where a std::chrono overload was counting milliseconds instead of seconds. --- src/server/game/AI/ScriptedAI/ScriptedCreature.h | 2 +- src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.h b/src/server/game/AI/ScriptedAI/ScriptedCreature.h index 3863eddac8a..54146e71fca 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedCreature.h +++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.h @@ -369,7 +369,7 @@ class BossAI : public ScriptedAI void _JustDied(); void _JustReachedHome() { me->setActive(false); } void _DespawnAtEvade(uint32 delayToRespawn = 30, Creature* who = nullptr); - void _DespawnAtEvade(Milliseconds const& time, Creature* who = nullptr) { _DespawnAtEvade(uint32(time.count()), who); } + void _DespawnAtEvade(Seconds const& time, Creature* who = nullptr) { _DespawnAtEvade(uint32(time.count()), who); } void TeleportCheaters(); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp index 7e7edfb7832..ce3e68d9c48 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp @@ -93,7 +93,7 @@ public: void EnterEvadeMode(EvadeReason /*why*/) override { if (Creature* midnight = ObjectAccessor::GetCreature(*me, _midnightGUID)) - BossAI::_DespawnAtEvade(10, midnight); + BossAI::_DespawnAtEvade(Seconds(10), midnight); me->DespawnOrUnsummon(); } @@ -349,7 +349,7 @@ public: void EnterEvadeMode(EvadeReason /*why*/) override { - BossAI::_DespawnAtEvade(10); + BossAI::_DespawnAtEvade(Seconds(10)); } void KilledUnit(Unit* /*victim*/) override