Merge pull request #13259 from sonic3000/master

Core/Scripts: Fix for issue #882

src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp

@@ -165,6 +165,7 @@ class boss_prince_taldaram : public CreatureScript
                             {
                                 Talk(SAY_VANISH);
                                 DoCast(me, SPELL_VANISH);
+                                me->SetInCombatState(true); // Prevents the boss from resetting
                                 events.DelayEvents(500);
                                 events.ScheduleEvent(EVENT_JUST_VANISHED, 500);
                                 if (Unit* embraceTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true))