aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts
diff options
context:
space:
mode:
authorVincent-Michael <Vincent_Michael@gmx.de>2014-10-04 03:29:04 +0200
committerVincent-Michael <Vincent_Michael@gmx.de>2014-10-04 03:29:04 +0200
commit339ddf5e83d6d1839dde87033b29e82a677c37b4 (patch)
tree42f3f185919592c0f935c0af0ee7d50068e8538f /src/server/scripts
parent10e8a110e6f92d4b938eab5004a78a344e9183dc (diff)
parentb33695a2efe9401548faec150c677209858549e8 (diff)
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Diffstat (limited to 'src/server/scripts')
-rw-r--r--src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp
index cf80f21d290..645588c0bc5 100644
--- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp
+++ b/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))