From 8b7728f82e6e7c326b7945efd719218179e9767a Mon Sep 17 00:00:00 2001 From: Treeston Date: Sun, 7 Jan 2018 19:47:13 +0100 Subject: Core/Map: New Map::ForceRespawn to override objections and force a respawn (equivalent to force = true). Use this to fix various GM commands. Scripts/Valithria: Fix an issue that could get the encounter stuck in an unloaded state. (cherry picked from commit 3bb33e3108c65ba8a1c35b934526562aa542b63b) --- .../Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/server/scripts/Northrend') diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp index 02ac392f864..3030f3145a6 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp @@ -478,7 +478,7 @@ class npc_green_dragon_combat_trigger : public CreatureScript me->SetReactState(REACT_PASSIVE); } - void JustEngagedWith(Unit* target) override + void JustEnteredCombat(Unit* target) override { if (!instance->CheckRequiredBosses(DATA_VALITHRIA_DREAMWALKER, target->ToPlayer())) { @@ -505,9 +505,9 @@ class npc_green_dragon_combat_trigger : public CreatureScript return target->GetTypeId() == TYPEID_PLAYER; } - void JustReachedHome() override + void JustExitedCombat() override { - _JustReachedHome(); + me->setActive(false); DoAction(ACTION_DEATH); } @@ -516,7 +516,7 @@ class npc_green_dragon_combat_trigger : public CreatureScript if (action == ACTION_DEATH) { instance->SetBossState(DATA_VALITHRIA_DREAMWALKER, NOT_STARTED); - me->m_Events.AddEvent(new ValithriaDespawner(me), me->m_Events.CalculateTime(5000)); + me->m_Events.AddEventAtOffset(new ValithriaDespawner(me), 5s); } } -- cgit v1.2.3