aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorccrs <ccrsdev1992@gmail.com>2016-11-30 14:41:38 +0100
committerccrs <ccrsdev1992@gmail.com>2016-11-30 14:41:38 +0100
commit62e97c45518a522fe938921449e8cebb750f0d58 (patch)
tree1f325cbddb513517a83b72e645c74e6e9dad060e /src
parent4bc60e650db62bd293575fddbc3dc99c146e6500 (diff)
Scripts/BlackTemple: 4bc60e650d followup
Diffstat (limited to 'src')
-rw-r--r--src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp11
1 files changed, 2 insertions, 9 deletions
diff --git a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
index f63c3b529a0..323cc346c03 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
@@ -118,13 +118,6 @@ public:
creature->SetReactState(REACT_PASSIVE);
}
- void Reset() override
- {
- _Reset();
- _intro = false;
- events.SetPhase(PHASE_INTRO);
- }
-
void EnterCombat(Unit* /*who*/) override
{
_EnterCombat();
@@ -150,6 +143,7 @@ public:
{
_intro = true;
Talk(SAY_INTRO);
+ events.SetPhase(PHASE_INTRO);
events.ScheduleEvent(EVENT_FINISH_INTRO, Seconds(20));
}
}
@@ -206,8 +200,7 @@ public:
events.Repeat(Seconds(18), Seconds(30));
break;
case EVENT_FINISH_INTRO:
- me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
- me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+ me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NON_ATTACKABLE);
me->SetReactState(REACT_AGGRESSIVE);
break;
default: