2 files changed, 34 insertions, 46 deletions

diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp
index b46b8cfd978..8efbd353ed0 100644
--- a/src/server/scripts/Commands/cs_debug.cpp
+++ b/src/server/scripts/Commands/cs_debug.cpp
@@ -856,8 +856,6 @@ public:
             handler->PSendSysMessage("%s (%s) is not alive.", target->GetName().c_str(), target->GetGUID().ToString().c_str());
             return true;
         }
-        if (!target->CanHaveThreatList())
-            handler->PSendSysMessage("%s (%s) cannot have a threat list.", target->GetName().c_str(), target->GetGUID().ToString().c_str());
 
         uint32 count = 0;
         auto const& threatenedByMe = target->GetThreatManager().GetThreatenedByMeList();
@@ -875,8 +873,8 @@ public:
         }
 
         if (!mgr.CanHaveThreatList())
-            return true;
-        if (mgr.IsEngaged())
+            handler->PSendSysMessage("%s (%s) cannot have a threat list.", target->GetName().c_str(), target->GetGUID().ToString().c_str());
+        else if (mgr.IsEngaged())
         {
             count = 0;
             handler->PSendSysMessage("Threat list of %s (%s, SpawnID %u)", target->GetName().c_str(), target->GetGUID().ToString().c_str(), target->GetTypeId() == TYPEID_UNIT ? target->ToCreature()->GetSpawnId() : 0);
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp
index 01213a9009d..1ebd8a54307 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp
@@ -230,44 +230,10 @@ class ValithriaDespawner : public BasicEvent
 
         void operator()(Creature* creature) const
         {
-            switch (creature->GetEntry())
-            {
-                case NPC_VALITHRIA_DREAMWALKER:
-                    if (InstanceScript* instance = creature->GetInstanceScript())
-                        instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, creature);
-                    break;
-                case NPC_BLAZING_SKELETON:
-                case NPC_SUPPRESSER:
-                case NPC_BLISTERING_ZOMBIE:
-                case NPC_GLUTTONOUS_ABOMINATION:
-                case NPC_MANA_VOID:
-                case NPC_COLUMN_OF_FROST:
-                case NPC_ROT_WORM:
-                    creature->DespawnOrUnsummon();
-                    return;
-                case NPC_RISEN_ARCHMAGE:
-                    if (!creature->GetSpawnId())
-                    {
-                        creature->DespawnOrUnsummon();
-                        return;
-                    }
-                    creature->Respawn(true);
-                    break;
-                default:
-                    return;
-            }
-
-            uint32 corpseDelay = creature->GetCorpseDelay();
-            uint32 respawnDelay = creature->GetRespawnDelay();
-            creature->SetCorpseDelay(1);
-            creature->SetRespawnDelay(10);
-
-            if (CreatureData const* data = creature->GetCreatureData())
-                creature->UpdatePosition(data->spawnPoint);
-            creature->DespawnOrUnsummon();
-
-            creature->SetCorpseDelay(corpseDelay);
-            creature->SetRespawnDelay(respawnDelay);
+            if (creature->GetEntry() == NPC_VALITHRIA_DREAMWALKER)
+                if (InstanceScript* instance = creature->GetInstanceScript())
+                    instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, creature);
+            creature->DespawnOrUnsummon(0, 10s);
         }
 
     private:
@@ -365,7 +331,7 @@ class boss_valithria_dreamwalker : public CreatureScript
                 }
                 else if (_instance->GetBossState(DATA_VALITHRIA_DREAMWALKER) == NOT_STARTED)
                     if (Creature* archmage = me->FindNearestCreature(NPC_RISEN_ARCHMAGE, 30.0f))
-                        archmage->AI()->DoZoneInCombat();   // call JustEngagedWith on one of them, that will make it all start
+                        archmage->EngageWithTarget(healer);   // call JustEngagedWith on one of them, that will make it all start
             }
 
             void DamageTaken(Unit* /*attacker*/, uint32& damage) override
@@ -628,8 +594,9 @@ class npc_the_lich_king_controller : public CreatureScript
             {
                 // must not be in dream phase
                 PhasingHandler::RemovePhase(summon, 173, true);
+                summon->AI()->DoZoneInCombat();
                 if (summon->GetEntry() != NPC_SUPPRESSER)
-                    if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true))
+                    if (Unit* target = me->GetCombatManager().GetAnyTarget())
                         summon->AI()->AttackStart(target);
             }
 
@@ -711,7 +678,7 @@ class npc_risen_archmage : public CreatureScript
                 Initialize();
             }
 
-            void JustEngagedWith(Unit* /*target*/) override
+            void JustEngagedWith(Unit* target) override
             {
                 me->FinishSpell(CURRENT_CHANNELED_SPELL, false);
                 if (me->GetSpawnId() && _canCallJustEngagedWith)
@@ -724,10 +691,16 @@ class npc_risen_archmage : public CreatureScript
                         (*itr)->AI()->DoAction(ACTION_ENTER_COMBAT);
 
                     if (Creature* lichKing = ObjectAccessor::GetCreature(*me, _instance->GetGuidData(DATA_VALITHRIA_LICH_KING)))
+                    {
+                        lichKing->EngageWithTarget(target);
                         lichKing->AI()->DoZoneInCombat();
+                    }
 
                     if (Creature* trigger = ObjectAccessor::GetCreature(*me, _instance->GetGuidData(DATA_VALITHRIA_TRIGGER)))
+                    {
+                        trigger->EngageWithTarget(target);
                         trigger->AI()->DoZoneInCombat();
+                    }
                 }
             }
 
@@ -883,7 +856,24 @@ class npc_suppresser : public CreatureScript
             void IsSummonedBy(Unit* /*summoner*/) override
             {
                 if (Creature* valithria = ObjectAccessor::GetCreature(*me, _instance->GetGuidData(DATA_VALITHRIA_DREAMWALKER)))
-                    AttackStart(valithria);
+                {
+                    float x, y, z;
+                    valithria->GetContactPoint(me, x,y,z);
+                    me->GetMotionMaster()->MovePoint(42, x, y, z);
+                }
+            }
+
+            void MovementInform(uint32 /*type*/, uint32 id)
+            {
+                if (id == 42)
+                {
+                    me->SetReactState(REACT_AGGRESSIVE);
+                    if (Creature* valithria = ObjectAccessor::GetCreature(*me, _instance->GetGuidData(DATA_VALITHRIA_DREAMWALKER)))
+                    {
+                        AttackStart(valithria);
+                        DoCastAOE(SPELL_SUPPRESSION);
+                    }
+                }
             }
 
             void UpdateAI(uint32 diff) override