diff options
| author | treeston <treeston.mmoc@gmail.com> | 2016-08-04 15:32:24 +0200 |
|---|---|---|
| committer | joschiwald <joschiwald.trinity@gmail.com> | 2017-02-11 22:03:16 +0100 |
| commit | d176be59b8063eaf47ace47f638b9c68934445e6 (patch) | |
| tree | 3ce9ed2c608ac23207ae0f46af436405248369fb | |
| parent | a3384bdc70d239d79dac40b52fcbe076c0474591 (diff) | |
ScriptedAI/Creature: Fix a bug where a std::chrono overload was counting milliseconds instead of seconds.
(cherry picked from commit 4030e4d780ed60d281c2b0eaff58ed2b40ad7f47)
| -rw-r--r-- | src/server/game/AI/ScriptedAI/ScriptedCreature.h | 2 | ||||
| -rw-r--r-- | 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 59c4f61ae97..8eee577b097 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedCreature.h +++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.h @@ -366,7 +366,7 @@ class TC_GAME_API 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 78063b43170..45282eb2919 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 |