diff options
| -rw-r--r-- | sql/updates/world/3.3.5/2016_11_30_01_world.sql | 1 | ||||
| -rw-r--r-- | src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp | 11 |
2 files changed, 3 insertions, 9 deletions
diff --git a/sql/updates/world/3.3.5/2016_11_30_01_world.sql b/sql/updates/world/3.3.5/2016_11_30_01_world.sql new file mode 100644 index 00000000000..9dcf3c9f333 --- /dev/null +++ b/sql/updates/world/3.3.5/2016_11_30_01_world.sql @@ -0,0 +1 @@ +UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry`=23123; 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: |