diff options
Diffstat (limited to 'src/server/scripts/EasternKingdoms/MagistersTerrace')
4 files changed, 13 insertions, 13 deletions
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp index 4f7e025c984..0338a3ad73f 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp @@ -176,7 +176,7 @@ public: RemoveGravityLapse(); // Remove Gravity Lapse so that players fall to ground if they kill him when in air. } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { instance->SetBossState(DATA_KAELTHAS, IN_PROGRESS); } @@ -464,7 +464,7 @@ public: DoCast(me, SPELL_FLAMESTRIKE2, true); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void MoveInLineOfSight(Unit* /*who*/) override { } void UpdateAI(uint32 diff) override @@ -518,7 +518,7 @@ public: Initialize(); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void DamageTaken(Unit* /*killer*/, uint32 &damage) override { @@ -624,7 +624,7 @@ public: Initialize(); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void MoveInLineOfSight(Unit* /*who*/) override { } @@ -667,7 +667,7 @@ public: DoCast(me, SPELL_ARCANE_SPHERE_PASSIVE, true); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void UpdateAI(uint32 diff) override { diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp index e6cac2e0132..e50740d8dac 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp @@ -163,7 +163,7 @@ public: instance->SetBossState(DATA_DELRISSA, FAIL); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { Talk(SAY_AGGRO); @@ -385,7 +385,7 @@ struct boss_priestess_lackey_commonAI : public ScriptedAI } } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { if (!who) return; @@ -621,7 +621,7 @@ public: boss_priestess_lackey_commonAI::Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoCast(me, SPELL_SUMMON_IMP); } @@ -929,7 +929,7 @@ public: boss_priestess_lackey_commonAI::Reset(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { DoCast(me, SPELL_BATTLE_SHOUT); } diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp index 2ec9cc5c7d5..bf1be4eee1f 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp @@ -131,10 +131,10 @@ class boss_selin_fireheart : public CreatureScript crystal->KillSelf(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); - _EnterCombat(); + _JustEngagedWith(); events.SetPhase(PHASE_NORMAL); events.ScheduleEvent(EVENT_FEL_EXPLOSION, 2100, 0, PHASE_NORMAL); diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp index b9bdcced9e6..4e776b83208 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp @@ -88,10 +88,10 @@ class boss_vexallus : public CreatureScript _JustDied(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_AGGRO); - _EnterCombat(); + _JustEngagedWith(); events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, 8000); events.ScheduleEvent(EVENT_ARCANE_SHOCK, 5000); |