Scripts: Fix rbac permission for skipping default boss sequencing check

# Conflicts:
#	src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp
#	src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp
#	src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp
#	src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp
#	src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp
#	src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp
#	src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp
#	src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp
#	src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp
#	src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp
#	src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp
#	src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp
#	src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp
#	src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp
#	src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp
#	src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp
#	src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp
#	src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp
#	src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp
#	src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp
#	src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp
#	src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp
#	src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp
#	src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp
#	src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp
#	src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp
#	src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp
#	src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
#	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
#	src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
#	src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
#	src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
#	src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
#	src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
#	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
#	src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp
#	src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
#	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
#	src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
#	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
#	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
#	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
#	src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
#	src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
#	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
#	src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
#	src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
#	src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp
#	src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp
#	src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
#	src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp
#	src/server/scripts/Kalimdor/RazorfenDowns/boss_tuten_kash.cpp
#	src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp
#	src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp
#	src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp
#	src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp
#	src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp
#	src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp
#	src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
#	src/server/scripts/Northrend/Gundrak/boss_eck.cpp
#	src/server/scripts/Northrend/IcecrownCitadel/boss_sister_svalna.cpp
#	src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp
#	src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp
#	src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp
#	src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp
#	src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp
#	src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp
#	src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp
#	src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
#	src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp
#	src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp
#	src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_anzu.cpp
#	src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp
#	src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
#	src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp
#	src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp
#	src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
#	src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp
#	src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
#	src/server/scripts/Outland/BlackTemple/boss_supremus.cpp
#	src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
#	src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
#	src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp
#	src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_mennu_the_betrayer.cpp
#	src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_rokmar_the_crackler.cpp
#	src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
#	src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp
#	src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
#	src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
#	src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp
#	src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp

src/server/game/AI/ScriptedAI/ScriptedCreature.cpp

@@ -487,12 +487,12 @@ void BossAI::_JustReachedHome()
     me->setActive(false);
 }
 
-void BossAI::_JustEngagedWith()
+void BossAI::_JustEngagedWith(Unit* who)
 {
     if (instance)
     {
         // bosses do not respawn, check only on enter combat
-        if (!instance->CheckRequiredBosses(_bossId))
+        if (!instance->CheckRequiredBosses(_bossId, who->ToPlayer()))
         {
             EnterEvadeMode(EVADE_REASON_SEQUENCE_BREAK);
             return;

src/server/game/AI/ScriptedAI/ScriptedCreature.h

@@ -354,7 +354,7 @@ class TC_GAME_API BossAI : public ScriptedAI
         virtual void ScheduleTasks() { }
 
         void Reset() override { _Reset(); }
-        void JustEngagedWith(Unit* /*who*/) override { _JustEngagedWith(); }
+        void JustEngagedWith(Unit* who) override { _JustEngagedWith(who); }
         void JustDied(Unit* /*killer*/) override { _JustDied(); }
         void JustReachedHome() override { _JustReachedHome(); }
 
@@ -362,7 +362,7 @@ class TC_GAME_API BossAI : public ScriptedAI
 
     protected:
         void _Reset();
-        void _JustEngagedWith();
+        void _JustEngagedWith(Unit* who);
         void _JustDied();
         void _JustReachedHome();
         void _DespawnAtEvade(Seconds delayToRespawn, Creature* who = nullptr);

src/server/scripts/EasternKingdoms/BaradinHold/boss_alizabal.cpp

@@ -73,9 +73,9 @@ struct boss_alizabal : public BossAI
 {
     boss_alizabal(Creature* creature) : BossAI(creature, DATA_ALIZABAL), _bladeDanceChargeCount(0) { }
 
-    void JustEngagedWith(Unit* /*who*/) override
+    void JustEngagedWith(Unit* who) override
     {
-        _JustEngagedWith();
+        BossAI::JustEngagedWith(who);
         Talk(SAY_AGGRO);
         instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me);
         events.ScheduleEvent(EVENT_SEETHING_HATE, 9s + 500ms);

src/server/scripts/EasternKingdoms/BaradinHold/boss_occuthar.cpp

@@ -66,9 +66,9 @@ class boss_occuthar : public CreatureScript
                 ASSERT(_vehicle);
             }
 
-            void JustEngagedWith(Unit* /*who*/) override
+            void JustEngagedWith(Unit* who) override
             {
-                _JustEngagedWith();
+                BossAI::JustEngagedWith(who);
                 instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me);
                 events.ScheduleEvent(EVENT_SEARING_SHADOWS, 8 * IN_MILLISECONDS);
                 events.ScheduleEvent(EVENT_FOCUSED_FIRE, 15 * IN_MILLISECONDS);

src/server/scripts/EasternKingdoms/BaradinHold/boss_pit_lord_argaloth.cpp

@@ -63,9 +63,9 @@ struct boss_pit_lord_argaloth : public BossAI
 {
     boss_pit_lord_argaloth(Creature* creature) : BossAI(creature, DATA_ARGALOTH), _felFirestormCount(0) { }
 
-    void JustEngagedWith(Unit* /*who*/) override
+    void JustEngagedWith(Unit* who) override
     {
-        _JustEngagedWith();
+        BossAI::JustEngagedWith(who);
         instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me);
         events.ScheduleEvent(EVENT_METEOR_SLASH, 10s + 800ms);
         events.ScheduleEvent(EVENT_CONSUMING_DARKNESS, 6s);

src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_chogall.cpp

@@ -306,9 +306,9 @@ struct boss_chogall : public BossAI
         _achievementEnligibe = true;
     }
 
-    void JustEngagedWith(Unit* /*who*/) override
+    void JustEngagedWith(Unit* who) override
     {
-        _JustEngagedWith();
+        BossAI::JustEngagedWith(who);
         Talk(SAY_AGGRO);
         instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me);
         DoCastSelf(SPELL_CORRUPTED_BLOOD);

src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_halfus_wyrmbreaker.cpp

@@ -185,9 +185,9 @@ class boss_halfus_wyrmbreaker : public CreatureScript
                 DoSummon(NPC_PROTO_BEHEMOTH, ProtoBehemothPos);
             }
 
-            void JustEngagedWith(Unit* /*who*/) override
+            void JustEngagedWith(Unit* who) override
             {
-                _JustEngagedWith();
+                BossAI::JustEngagedWith(who);
                 Talk(SAY_AGGRO);
                 instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me);
                 events.ScheduleEvent(EVENT_BERSERK, 10min);

src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_theralion_and_valiona.cpp

@@ -249,7 +249,7 @@ class boss_theralion : public CreatureScript
 
             void JustEngagedWith(Unit* who) override
             {
-                _JustEngagedWith();
+                BossAI::JustEngagedWith(who);
                 instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me);
                 events.ScheduleEvent(EVENT_BERSERK, 10min);
 
@@ -500,7 +500,7 @@ class boss_valiona : public CreatureScript
 
             void JustEngagedWith(Unit* who) override
             {
-                _JustEngagedWith();
+                BossAI::JustEngagedWith(who);
                 instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me);
                 events.SetPhase(PHASE_GROUND);
                 events.ScheduleEvent(EVENT_BLACKOUT, Seconds(10) + Milliseconds(500));

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_ascendant_lord_obsidius.cpp

@@ -106,9 +106,9 @@ struct boss_ascendant_lord_obsidius : public BossAI
         }
     }
 
-    void JustEngagedWith(Unit* /*who*/) override
+    void JustEngagedWith(Unit* who) override
     {
-        _JustEngagedWith();
+        BossAI::JustEngagedWith(who);
         instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me);
         Talk(SAY_AGGRO);
         events.ScheduleEvent(EVENT_STONE_BLOW, 8s);

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_beauty.cpp

@@ -89,9 +89,9 @@ struct boss_beauty : public BossAI
         DoSummon(NPC_RUNTY, RuntyPos);
     }
 
-    void JustEngagedWith(Unit* /*who*/) override
+    void JustEngagedWith(Unit* who) override
     {
-        _JustEngagedWith();
+        BossAI::JustEngagedWith(who);
         instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me);
         events.ScheduleEvent(EVENT_BERSERKER_CHARGE, 15s);
         events.ScheduleEvent(EVENT_FLAMEBREAK, 21s);

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_corla_herald_of_twilight.cpp

@@ -126,9 +126,9 @@ struct boss_corla_herald_of_twilight : public BossAI
             DoCastSelf(SPELL_WEAR_CHRISTMAS_HAT_RED_SELF_DND);
     }
 
-    void JustEngagedWith(Unit* /*who*/) override
+    void JustEngagedWith(Unit* who) override
     {
-        _JustEngagedWith();
+        BossAI::JustEngagedWith(who);
         instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me);
         Talk(SAY_AGGRO);
         me->CastStop();

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_karsh_steelbender.cpp

@@ -93,9 +93,9 @@ struct boss_karsh_steelbender : public BossAI
         DoCastSelf(SPELL_SUPERHEATED_QUICKSILVER_ARMOR_PROC_AURA);
     }
 
-    void JustEngagedWith(Unit* /*who*/) override
+    void JustEngagedWith(Unit* who) override
     {
-        _JustEngagedWith();
+        BossAI::JustEngagedWith(who);
         instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me);
         Talk(SAY_AGGRO);
         events.ScheduleEvent(EVENT_CLEAVE, 10s, 12s);

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_romogg_bonecrusher.cpp

@@ -115,9 +115,9 @@ struct boss_romogg_bonecrusher : public BossAI
             _killedElementals++;
     }
 
-    void JustEngagedWith(Unit* /*who*/) override
+    void JustEngagedWith(Unit* who) override
     {
-        _JustEngagedWith();
+        BossAI::JustEngagedWith(who);
         instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me);
         Talk(SAY_AGGRO);
         Talk(SAY_EMOTE_CALL_FOR_HELP);

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp

@@ -49,9 +49,9 @@ public:
             _Reset();
         }
 
-        void JustEngagedWith(Unit* /*who*/) override
+        void JustEngagedWith(Unit* who) override
         {
-            _JustEngagedWith();
+            BossAI::JustEngagedWith(who);
             events.ScheduleEvent(EVENT_FIRE_NOVA, 6000);
             events.ScheduleEvent(EVENT_CLEAVE,    8000);
             events.ScheduleEvent(EVENT_CONFLIGURATION, 15000);

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp

@@ -59,9 +59,9 @@ public:
             me->GetMotionMaster()->MovePath(GIZRUL_PATH, false);
         }
 
-        void JustEngagedWith(Unit* /*who*/) override
+        void JustEngagedWith(Unit* who) override
         {
-            _JustEngagedWith();
+            BossAI::JustEngagedWith(who);
             events.ScheduleEvent(EVENT_FATAL_BITE, urand(17000,20000));
             events.ScheduleEvent(EVENT_INFECTED_BITE, urand(10000,12000));
         }

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp

@@ -78,9 +78,9 @@ public:
             }
         }
 
-        void JustEngagedWith(Unit* /*who*/) override
+        void JustEngagedWith(Unit* who) override
         {
-            _JustEngagedWith();
+            BossAI::JustEngagedWith(who);
 
             events.ScheduleEvent(EVENT_CORROSIVE_ACID, urand(8000, 16000));
             events.ScheduleEvent(EVENT_FREEZE, urand(8000, 16000));

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp

@@ -61,9 +61,9 @@ public:
             Initialize();
         }
 
-        void JustEngagedWith(Unit* /*who*/) override
+        void JustEngagedWith(Unit* who) override
         {
-            _JustEngagedWith();
+            BossAI::JustEngagedWith(who);
             events.ScheduleEvent(EVENT_REND, urand(17000,20000));
             events.ScheduleEvent(EVENT_THRASH, urand(10000,12000));
         }

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_highlord_omokk.cpp

@@ -50,9 +50,9 @@ public:
             _Reset();
         }
 
-        void JustEngagedWith(Unit* /*who*/) override
+        void JustEngagedWith(Unit* who) override
         {
-            _JustEngagedWith();
+            BossAI::JustEngagedWith(who);
             events.ScheduleEvent(EVENT_FRENZY,      20000);
             events.ScheduleEvent(EVENT_KNOCK_AWAY,  18000);
         }

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp

@@ -64,9 +64,9 @@ public:
             Initialize();
         }
 
-        void JustEngagedWith(Unit* /*who*/) override
+        void JustEngagedWith(Unit* who) override
         {
-            _JustEngagedWith();
+            BossAI::JustEngagedWith(who);
             events.ScheduleEvent(EVENT_SUMMON_SPECTRAL_ASSASSIN, urand(6000,8000));
             events.ScheduleEvent(EVENT_SHADOW_WRATH, urand(9000,18000));
         }

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_mother_smolderweb.cpp

@@ -51,9 +51,9 @@ public:
             _Reset();
         }
 
-        void JustEngagedWith(Unit* /*who*/) override
+        void JustEngagedWith(Unit* who) override
         {
-            _JustEngagedWith();
+            BossAI::JustEngagedWith(who);
             events.ScheduleEvent(EVENT_CRYSTALIZE,   20 * IN_MILLISECONDS);
             events.ScheduleEvent(EVENT_MOTHERS_MILK, 10 * IN_MILLISECONDS);
         }

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp

@@ -70,9 +70,9 @@ public:
             Initialize();
         }
 
-        void JustEngagedWith(Unit* /*who*/) override
+        void JustEngagedWith(Unit* who) override
         {
-            _JustEngagedWith();
+            BossAI::JustEngagedWith(who);
             events.ScheduleEvent(EVENT_BLAST_WAVE, 20 * IN_MILLISECONDS);
             events.ScheduleEvent(EVENT_SHOUT,       2 * IN_MILLISECONDS);
             events.ScheduleEvent(EVENT_CLEAVE,      6 * IN_MILLISECONDS);

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp

@@ -47,9 +47,9 @@ public:
             _Reset();
         }
 
-        void JustEngagedWith(Unit* /*who*/) override
+        void JustEngagedWith(Unit* who) override
         {
-            _JustEngagedWith();
+            BossAI::JustEngagedWith(who);
             events.ScheduleEvent(EVENT_SHOOT,      1000);
             events.ScheduleEvent(EVENT_STUN_BOMB, 16000);
         }

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp

@@ -181,9 +181,9 @@ public:
             portcullisGUID.Clear();
         }
 
-        void JustEngagedWith(Unit* /*who*/) override
+        void JustEngagedWith(Unit* who) override
         {
-            _JustEngagedWith();
+            BossAI::JustEngagedWith(who);
             events.ScheduleEvent(EVENT_WHIRLWIND,     urand(13000, 15000));
             events.ScheduleEvent(EVENT_CLEAVE,        urand(15000, 17000));
             events.ScheduleEvent(EVENT_MORTAL_STRIKE, urand(17000, 19000));

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp

@@ -53,9 +53,9 @@ public:
             //DoCast(me, SPELL_ICEARMOR, true);
         }
 
-        void JustEngagedWith(Unit* /*who*/) override
+        void JustEngagedWith(Unit* who) override
         {
-            _JustEngagedWith();
+            BossAI::JustEngagedWith(who);
             events.ScheduleEvent(EVENT_CURSE_OF_BLOOD, 2 * IN_MILLISECONDS);
             events.ScheduleEvent(EVENT_HEX,     8 * IN_MILLISECONDS);
             events.ScheduleEvent(EVENT_CLEAVE, 14 * IN_MILLISECONDS);

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp

@@ -52,9 +52,9 @@ public:
             _Reset();
         }
 
-        void JustEngagedWith(Unit* /*who*/) override
+        void JustEngagedWith(Unit* who) override
         {
-            _JustEngagedWith();
+            BossAI::JustEngagedWith(who);
             events.ScheduleEvent(EVENT_FLAME_BREAK,     12 * IN_MILLISECONDS);
             events.ScheduleEvent(EVENT_IMMOLATE,         3 * IN_MILLISECONDS);
             events.ScheduleEvent(EVENT_TERRIFYING_ROAR, 23 * IN_MILLISECONDS);

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp

@@ -53,9 +53,9 @@ public:
             _Reset();
         }
 
-        void JustEngagedWith(Unit* /*who*/) override
+        void JustEngagedWith(Unit* who) override
         {
-            _JustEngagedWith();
+            BossAI::JustEngagedWith(who);
             events.ScheduleEvent(SPELL_REND, urand(17000,20000));
             events.ScheduleEvent(SPELL_STRIKE, urand(10000,12000));
             Talk(SAY_AGGRO);

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp

@@ -53,9 +53,9 @@ public:
             _Reset();
         }
 
-        void JustEngagedWith(Unit* /*who*/) override
+        void JustEngagedWith(Unit* who) override
         {
-            _JustEngagedWith();
+            BossAI::JustEngagedWith(who);
             events.ScheduleEvent(EVENT_SNAP_KICK, 8 * IN_MILLISECONDS);
             events.ScheduleEvent(EVENT_CLEAVE,   14 * IN_MILLISECONDS);
             events.ScheduleEvent(EVENT_UPPERCUT, 20 * IN_MILLISECONDS);

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_atramedes.cpp

@@ -196,9 +196,9 @@ struct boss_atramedes : public BossAI
         events.SetPhase(PHASE_INTRO);
     }
 
-    void JustEngagedWith(Unit* /*who*/) override
+    void JustEngagedWith(Unit* who) override
     {
-        _JustEngagedWith();
+        BossAI::JustEngagedWith(who);
         instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me);
         Talk(SAY_AGGRO);
         DoCastSelf(SPELL_DEVASTATION_TRIGGER);

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_chimaeron.cpp

@@ -151,9 +151,9 @@ struct boss_chimaeron : public BossAI
         events.SetPhase(PHASE_ASLEEP);
     }
 
-    void JustEngagedWith(Unit* /*who*/) override
+    void JustEngagedWith(Unit* who) override
     {
-        _JustEngagedWith();
+        BossAI::JustEngagedWith(who);
         instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me);
         me->SetReactState(REACT_AGGRESSIVE);
         events.SetPhase(PHASE_1);

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_magmaw.cpp

@@ -215,9 +215,9 @@ struct boss_magmaw : public BossAI
         events.SetPhase(PHASE_OUT_OF_COMBAT);
     }
 
-    void JustEngagedWith(Unit* /*who*/) override
+    void JustEngagedWith(Unit* who) override
     {
-        _JustEngagedWith();
+        BossAI::JustEngagedWith(who);
         instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me, FRAME_PRIORITY_MAGMAW);
         me->SetReactState(REACT_AGGRESSIVE);
 

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_maloriak.cpp

@@ -262,9 +262,9 @@ struct boss_maloriak : public BossAI
         me->SummonCreatureGroup(SUMMON_GROUP_EXPERIMENTS);
     }
 
-    void JustEngagedWith(Unit* /*who*/) override
+    void JustEngagedWith(Unit* who) override
     {
-        _JustEngagedWith();
+        BossAI::JustEngagedWith(who);
         Talk(SAY_AGGRO);
         instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me);
         events.SetPhase(PHASE_ONE);

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_nefarians_end.cpp

@@ -380,7 +380,7 @@ struct boss_nefarians_end : public BossAI
         me->SetReactState(REACT_PASSIVE);
     }
 
-    void JustEngagedWith(Unit* /*who*/) override
+    void JustEngagedWith(Unit* who) override
     {
         // Attacking Nefarian while Onyxia is not engaged is not suposed to trigger anything
         if (instance->GetBossState(DATA_NEFARIANS_END) != IN_PROGRESS)
@@ -389,8 +389,7 @@ struct boss_nefarians_end : public BossAI
             me->CombatStop();
             return;
         }
-
-        _JustEngagedWith();
+        BossAI::JustEngagedWith(who);
     }
 
     void JustAppeared() override

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp

@@ -51,9 +51,9 @@ public:
     {
         boss_broodlordAI(Creature* creature) : BossAI(creature, DATA_BROODLORD_LASHLAYER) { }
 
-        void JustEngagedWith(Unit* /*who*/) override
+        void JustEngagedWith(Unit* who) override
         {
-            _JustEngagedWith();
+            BossAI::JustEngagedWith(who);
             Talk(SAY_AGGRO);
 
             events.ScheduleEvent(EVENT_CLEAVE, 8000);

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp

@@ -191,9 +191,9 @@ public:
             Initialize();
         }
 
-        void JustEngagedWith(Unit* /*who*/) override
+        void JustEngagedWith(Unit* who) override
         {
-            _JustEngagedWith();
+            BossAI::JustEngagedWith(who);
 
             events.ScheduleEvent(EVENT_SHIMMER, 0);
             events.ScheduleEvent(EVENT_BREATH_1, 30000);

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp

@@ -42,9 +42,9 @@ public:
     {
         boss_ebonrocAI(Creature* creature) : BossAI(creature, DATA_EBONROC) { }
 
-        void JustEngagedWith(Unit* /*who*/) override
+        void JustEngagedWith(Unit* who) override
         {
-            _JustEngagedWith();
+            BossAI::JustEngagedWith(who);
 
             events.ScheduleEvent(EVENT_SHADOWFLAME, urand(10000, 20000));
             events.ScheduleEvent(EVENT_WINGBUFFET, 30000);

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp

@@ -42,9 +42,9 @@ public:
     {
         boss_firemawAI(Creature* creature) : BossAI(creature, DATA_FIREMAW) { }
 
-        void JustEngagedWith(Unit* /*who*/) override
+        void JustEngagedWith(Unit* who) override
         {
-            _JustEngagedWith();
+            BossAI::JustEngagedWith(who);
 
             events.ScheduleEvent(EVENT_SHADOWFLAME, urand(10000, 20000));
             events.ScheduleEvent(EVENT_WINGBUFFET, 30000);

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp

@@ -47,9 +47,9 @@ public:
     {
         boss_flamegorAI(Creature* creature) : BossAI(creature, DATA_FLAMEGOR) { }
 
-        void JustEngagedWith(Unit* /*who*/) override
+        void JustEngagedWith(Unit* who) override
         {
-            _JustEngagedWith();
+            BossAI::JustEngagedWith(who);
 
             events.ScheduleEvent(EVENT_SHADOWFLAME, urand(10000, 20000));
             events.ScheduleEvent(EVENT_WINGBUFFET, 30000);

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp

@@ -203,7 +203,7 @@ public:
 
         void BeginEvent(Player* target)
         {
-            _JustEngagedWith();
+            _JustEngagedWith(target);
 
             Talk(SAY_GAMESBEGIN_2);
 

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp

@@ -93,9 +93,9 @@ public:
             Initialize();
         }
 
-        void JustEngagedWith(Unit* /*who*/) override
+        void JustEngagedWith(Unit* who) override
         {
-            _JustEngagedWith();
+            BossAI::JustEngagedWith(who);
 
             DoCast(me, SPELL_ESSENCEOFTHERED);
             me->SetHealth(me->CountPctFromMaxHealth(30));

src/server/scripts/EasternKingdoms/Deadmines/boss_admiral_ripsnarl.cpp

@@ -111,9 +111,9 @@ class boss_admiral_ripsnarl: public CreatureScript
                 DoCastSelf(SPELL_THIRST_FOR_BLOOD, true);
             }
 
-            void JustEngagedWith(Unit* /*who*/) override
+            void JustEngagedWith(Unit* who) override
             {
-                _JustEngagedWith();
+                BossAI::JustEngagedWith(who);
                 Talk(SAY_AGGRO);
                 DoCastAOE(SPELL_RIPSNARL_CANNON_KILL, true);
                 instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me);

src/server/scripts/EasternKingdoms/Deadmines/boss_captain_cookie.cpp

@@ -147,9 +147,9 @@ class boss_captain_cookie : public CreatureScript
                 DoCastSelf(SPELL_COOKIES_HAT, true);
             }
 
-            void JustEngagedWith(Unit* /*who*/) override
+            void JustEngagedWith(Unit* who) override
             {
-                _JustEngagedWith();
+                BossAI::JustEngagedWith(who);
                 instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me);
                 me->RemoveAurasDueToSpell(SPELL_WHOS_THAT);
                 me->AttackStop();

src/server/scripts/EasternKingdoms/Deadmines/boss_foe_reaper_5000.cpp

@@ -150,9 +150,9 @@ class boss_foe_reaper_5000 : public CreatureScript
                 }
             }
 
-            void JustEngagedWith(Unit* /*who*/) override
+            void JustEngagedWith(Unit* who) override
             {
-                _JustEngagedWith();
+                BossAI::JustEngagedWith(who);
                 events.SetPhase(PHASE_1);
                 instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me);
                 events.ScheduleEvent(EVENT_OVERDRIVE, Seconds(9));

src/server/scripts/EasternKingdoms/Deadmines/boss_glubtok.cpp

@@ -139,9 +139,9 @@ struct boss_glubtok : public BossAI
         }
     }
 
-    void JustEngagedWith(Unit* /*who*/) override
+    void JustEngagedWith(Unit* who) override
     {
-        _JustEngagedWith();
+        BossAI::JustEngagedWith(who);
         Talk(SAY_AGGRO);
         instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me);
         events.SetPhase(PHASE_1);

src/server/scripts/EasternKingdoms/Deadmines/boss_helix_gearbreaker.cpp

@@ -176,9 +176,9 @@ struct boss_helix_gearbreaker : public BossAI
         me->SetReactState(REACT_PASSIVE);
     }
 
-    void JustEngagedWith(Unit* /*who*/) override
+    void JustEngagedWith(Unit* who) override
     {
-        _JustEngagedWith();
+        BossAI::JustEngagedWith(who);
         Talk(SAY_AGGRO);
         instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me, 2);
 

src/server/scripts/EasternKingdoms/Deadmines/boss_vanessa_van_cleef.cpp

@@ -194,10 +194,10 @@ class boss_vanessa_van_cleef : public CreatureScript
                 _Reset();
             }
 
-            void JustEngagedWith(Unit* /*who*/) override
+            void JustEngagedWith(Unit* who) override
             {
+                BossAI::JustEngagedWith(who);
                 Talk(SAY_AGGRO);
-                _JustEngagedWith();
                 DoCastAOE(SPELL_VANESSA_ACHIEVEMENT_SPELL, true);
                 instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me);
                 events.ScheduleEvent(EVENT_DEFLECTION, Seconds(11));

src/server/scripts/EasternKingdoms/GrimBatol/boss_drahga_shadowburner.cpp

@@ -143,9 +143,9 @@ class boss_drahga_shadowburner : public CreatureScript
                     DoCastSelf(SPELL_WEAR_CHRISTMAS_HAT_GREEN_SELF_DND);
             }
 
-            void JustEngagedWith(Unit* /*who*/) override
+            void JustEngagedWith(Unit* who) override
             {
-                _JustEngagedWith();
+                BossAI::JustEngagedWith(who);
                 Talk(SAY_AGGRO);
                 instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me);
                 events.SetPhase(PHASE_1);

src/server/scripts/EasternKingdoms/GrimBatol/boss_erudax.cpp

@@ -130,9 +130,9 @@ class boss_erudax : public CreatureScript
         {
             boss_erudaxAI(Creature* creature) : BossAI(creature, DATA_ERUDAX), _achievementEnligible(true) { }
 
-            void JustEngagedWith(Unit* /*who*/) override
+            void JustEngagedWith(Unit* who) override
             {
-                _JustEngagedWith();
+                BossAI::JustEngagedWith(who);
                 Talk(SAY_AGGRO);
                 instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me);
                 events.ScheduleEvent(EVENT_BINDING_SHADOWS, Seconds(10) + Milliseconds(500));

src/server/scripts/EasternKingdoms/GrimBatol/boss_forgemaster_throngus.cpp

@@ -121,9 +121,9 @@ class boss_forgemaster_throngus : public CreatureScript
                 _Reset();
             }
 
-            void JustEngagedWith(Unit* /*who*/) override
+            void JustEngagedWith(Unit* who) override
             {
-                _JustEngagedWith();
+                BossAI::JustEngagedWith(who);
                 Talk(SAY_AGGRO);
                 instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me);
                 events.ScheduleEvent(EVENT_MIGHTY_STOMP, Seconds(6) + Milliseconds(500));

src/server/scripts/EasternKingdoms/GrimBatol/boss_general_umbriss.cpp

@@ -114,9 +114,9 @@ struct boss_general_umbriss : public BossAI
         _frenzyCasted = false;
     }
 
-    void JustEngagedWith(Unit* /*who*/) override
+    void JustEngagedWith(Unit* who) override
     {
-        _JustEngagedWith();
+        BossAI::JustEngagedWith(who);
         Talk(SAY_AGGRO);
         instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me);
         events.ScheduleEvent(EVENT_SUMMON_SKARDYN, Seconds(6));

src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp

@@ -77,9 +77,9 @@ public:
             Talk(SAY_DEATH);
         }
 
-        void JustEngagedWith(Unit* /*who*/) override
+        void JustEngagedWith(Unit* who) override
         {
-            _JustEngagedWith();
+            BossAI::JustEngagedWith(who);
             Talk(SAY_AGGRO);
 
             events.ScheduleEvent(EVENT_HATEFUL_BOLT, Seconds(12));

src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp

@@ -65,9 +65,9 @@ public:
             _JustDied();
         }
 
-        void JustEngagedWith(Unit* /*who*/) override
+        void JustEngagedWith(Unit* who) override
         {
-            _JustEngagedWith();
+            BossAI::JustEngagedWith(who);
             Talk(SAY_AGGRO);
 
             DoCastSelf(SPELL_HOLYGROUND, true);

src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp

@@ -181,9 +181,9 @@ public:
             instance->HandleGameObject(instance->GetGuidData(DATA_MASTERS_TERRACE_DOOR_2), open);
         }
 
-        void JustEngagedWith(Unit* /*who*/) override
+        void JustEngagedWith(Unit* who) override
         {
-            _JustEngagedWith();
+            BossAI::JustEngagedWith(who);
             Talk(YELL_AGGRO);
             SetupGroundPhase();
         }

src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp

@@ -86,9 +86,9 @@ public:
             events.ScheduleEvent(EVENT_ENRAGE, Minutes(10));
         }
 
-        void JustEngagedWith(Unit* /*who*/) override
+        void JustEngagedWith(Unit* who) override
         {
-            _JustEngagedWith();
+            BossAI::JustEngagedWith(who);
             Talk(SAY_AGGRO);
         }
 

src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp

@@ -141,9 +141,9 @@ struct boss_felblood_kaelthas : public BossAI
         _firstGravityLapse = true;
     }
 
-    void JustEngagedWith(Unit* /*who*/) override
+    void JustEngagedWith(Unit* who) override
     {
-        _JustEngagedWith();
+        BossAI::JustEngagedWith(who);
         events.SetPhase(PHASE_ONE);
         events.ScheduleEvent(EVENT_FIREBALL, 1ms, 0, PHASE_ONE);
         events.ScheduleEvent(EVENT_FLAME_STRIKE, 44s, 0, PHASE_ONE);

src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp

@@ -131,10 +131,10 @@ class boss_selin_fireheart : public CreatureScript
                     crystal->KillSelf();
             }
 
-            void JustEngagedWith(Unit* /*who*/) override
+            void JustEngagedWith(Unit* who) override
             {
                 Talk(SAY_AGGRO);
-                _JustEngagedWith();
+                BossAI::JustEngagedWith(who);
 
                 events.SetPhase(PHASE_NORMAL);
                 events.ScheduleEvent(EVENT_FEL_EXPLOSION, 2100, 0, PHASE_NORMAL);

src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp

@@ -83,10 +83,10 @@ class boss_vexallus : public CreatureScript
                 Talk(SAY_KILL);
             }
 
-            void JustEngagedWith(Unit* /*who*/) override
+            void JustEngagedWith(Unit* who) override
             {
                 Talk(SAY_AGGRO);
-                _JustEngagedWith();
+                BossAI::JustEngagedWith(who);
 
                 events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, 8000);
                 events.ScheduleEvent(EVENT_ARCANE_SHOCK, 5000);

src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp

@@ -53,9 +53,9 @@ struct boss_arcanist_doan : public BossAI
         _detonationTriggered = false;
     }
 
-    void JustEngagedWith(Unit* /*who*/) override
+    void JustEngagedWith(Unit* who) override
     {
-        _JustEngagedWith();
+        BossAI::JustEngagedWith(who);
         Talk(SAY_AGGRO);
         events.ScheduleEvent(EVENT_SILENCE, 6s);
         events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, 11s);

src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp

@@ -51,9 +51,9 @@ class boss_azshir_the_sleepless : public CreatureScript
                 _siphon = false;
             }
 
-            void JustEngagedWith(Unit* /*who*/) override
+            void JustEngagedWith(Unit* who) override
             {
-                _JustEngagedWith();
+                BossAI::JustEngagedWith(who);
                 events.ScheduleEvent(EVENT_CALL_OF_GRAVE, 30000);
                 events.ScheduleEvent(EVENT_TERRIFY, 20000);
             }

src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp

@@ -58,10 +58,10 @@ struct boss_bloodmage_thalnos : public BossAI
         _Reset();
     }
 
-    void JustEngagedWith(Unit* /*who*/) override
+    void JustEngagedWith(Unit* who) override
     {
+        BossAI::JustEngagedWith(who);
         Talk(SAY_AGGRO);
-        _JustEngagedWith();
         events.ScheduleEvent(EVENT_FLAME_SPIKE, 8s, 10s);
         events.ScheduleEvent(EVENT_SHADOW_BOLT, 1ms);
     }

src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp

@@ -76,11 +76,11 @@ class boss_herod : public CreatureScript
                 _Reset();
             }
 
-            void JustEngagedWith(Unit* /*who*/) override
+            void JustEngagedWith(Unit* who) override
             {
+                BossAI::JustEngagedWith(who);
                 Talk(SAY_AGGRO);
                 DoCast(me, SPELL_RUSHINGCHARGE);
-                _JustEngagedWith();
 
                 events.ScheduleEvent(EVENT_CLEAVE, 12000);
                 events.ScheduleEvent(EVENT_WHIRLWIND, 60000);

src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp

@@ -55,10 +55,10 @@ struct boss_houndmaster_loksey : public BossAI
        instance->instance->SpawnGroupSpawn(SPAWN_GROUP_ID_HOUNDS, true);
     }
 
-    void JustEngagedWith(Unit* /*who*/) override
+    void JustEngagedWith(Unit* who) override
     {
+        BossAI::JustEngagedWith(who);
         Talk(SAY_AGGRO);
-        _JustEngagedWith();
         events.ScheduleEvent(EVENT_BATTLE_SHOUT, 7s);
         events.ScheduleEvent(EVENT_BLOODLUST, 10s);
     }

src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp

@@ -49,10 +49,10 @@ struct boss_interrogator_vishas : public BossAI
         _Reset();
     }
 
-    void JustEngagedWith(Unit* /*who*/) override
+    void JustEngagedWith(Unit* who) override
     {
+        BossAI::JustEngagedWith(who);
         Talk(SAY_AGGRO);
-        _JustEngagedWith();
 
         events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 6s, 8s);
     }

src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp

@@ -49,9 +49,9 @@ class boss_scorn : public CreatureScript
                 _Reset();
             }
 
-            void JustEngagedWith(Unit* /*who*/) override
+            void JustEngagedWith(Unit* who) override
             {
-                _JustEngagedWith();
+                BossAI::JustEngagedWith(who);
                 events.ScheduleEvent(EVENT_LICH_SLAP, 45000);
                 events.ScheduleEvent(EVENT_FROSTBOLT_VOLLEY, 30000);
                 events.ScheduleEvent(EVENT_MIND_FLAY, 30000);

src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp

@@ -76,9 +76,9 @@ class boss_darkmaster_gandling : public CreatureScript
                     gate->SetGoState(GO_STATE_ACTIVE);
             }
 
-            void JustEngagedWith(Unit* /*who*/) override
+            void JustEngagedWith(Unit* who) override
             {
-                _JustEngagedWith();
+                BossAI::JustEngagedWith(who);
                 events.ScheduleEvent(EVENT_ARCANEMISSILES, 4500);
                 events.ScheduleEvent(EVENT_SHADOWSHIELD, 12000);
                 events.ScheduleEvent(EVENT_CURSE, 2000);

src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp

@@ -53,9 +53,9 @@ class boss_doctor_theolen_krastinov : public CreatureScript
         {
             boss_theolenkrastinovAI(Creature* creature) : BossAI(creature, DATA_DOCTORTHEOLENKRASTINOV) { }
 
-            void JustEngagedWith(Unit* /*who*/) override
+            void JustEngagedWith(Unit* who) override
             {
-                _JustEngagedWith();
+                BossAI::JustEngagedWith(who);
                 events.ScheduleEvent(EVENT_REND, 8000);
                 events.ScheduleEvent(EVENT_BACKHAND, 9000);
                 events.ScheduleEvent(EVENT_FRENZY, 1000);

src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp

@@ -51,9 +51,9 @@ class boss_illucia_barov : public CreatureScript
         {
             boss_illuciabarovAI(Creature* creature) : BossAI(creature, DATA_LADYILLUCIABAROV) { }
 
-            void JustEngagedWith(Unit* /*who*/) override
+            void JustEngagedWith(Unit* who) override
             {
-                _JustEngagedWith();
+                BossAI::JustEngagedWith(who);
                 events.ScheduleEvent(EVENT_CURSEOFAGONY, 18000);
                 events.ScheduleEvent(EVENT_SHADOWSHOCK, 9000);
                 events.ScheduleEvent(EVENT_SILENCE, 5000);

src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp

@@ -70,9 +70,9 @@ class boss_instructor_malicia : public CreatureScript
                 Initialize();
             }
 
-            void JustEngagedWith(Unit* /*who*/) override
+            void JustEngagedWith(Unit* who) override
             {
-                _JustEngagedWith();
+                BossAI::JustEngagedWith(who);
                 events.ScheduleEvent(EVENT_CALLOFGRAVES, 4000);
                 events.ScheduleEvent(EVENT_CORRUPTION, 8000);
                 events.ScheduleEvent(EVENT_RENEW, 32000);

src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp

@@ -87,8 +87,9 @@ class boss_kirtonos_the_herald : public CreatureScript
                 _Reset();
             }
 
-            void JustEngagedWith(Unit* /*who*/) override
+            void JustEngagedWith(Unit* who) override
             {
+                BossAI::JustEngagedWith(who);
                 events.ScheduleEvent(EVENT_SWOOP, urand(8000, 8000));
                 events.ScheduleEvent(EVENT_WING_FLAP, urand(15000, 15000));
                 events.ScheduleEvent(EVENT_PIERCE_ARMOR, urand(18000, 18000));
@@ -97,7 +98,6 @@ class boss_kirtonos_the_herald : public CreatureScript
                 events.ScheduleEvent(EVENT_CURSE_OF_TONGUES, urand(53000, 53000));
                 events.ScheduleEvent(EVENT_DOMINATE_MIND, urand(34000, 48000));
                 events.ScheduleEvent(EVENT_KIRTONOS_TRANSFORM, urand(20000, 20000));
-                _JustEngagedWith();
             }
 
             void JustDied(Unit* /*killer*/) override

src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp

@@ -55,9 +55,9 @@ class boss_lord_alexei_barov : public CreatureScript
                     DoCast(me, SPELL_UNHOLY_AURA);
             }
 
-            void JustEngagedWith(Unit* /*who*/) override
+            void JustEngagedWith(Unit* who) override
             {
-                _JustEngagedWith();
+                BossAI::JustEngagedWith(who);
                 events.ScheduleEvent(EVENT_IMMOLATE, 7000);
                 events.ScheduleEvent(EVENT_VEILOFSHADOW, 15000);
             }

src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp

@@ -50,9 +50,9 @@ class boss_lorekeeper_polkelt : public CreatureScript
         {
             boss_lorekeeperpolkeltAI(Creature* creature) : BossAI(creature, DATA_LOREKEEPERPOLKELT) { }
 
-            void JustEngagedWith(Unit* /*who*/) override
+            void JustEngagedWith(Unit* who) override
             {
-                _JustEngagedWith();
+                BossAI::JustEngagedWith(who);
                 events.ScheduleEvent(EVENT_VOLATILEINFECTION, 38000);
                 events.ScheduleEvent(EVENT_DARKPLAGUE, 8000);
                 events.ScheduleEvent(EVENT_CORROSIVEACID, 45000);

src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp

@@ -50,9 +50,9 @@ class boss_the_ravenian : public CreatureScript
         {
             boss_theravenianAI(Creature* creature) : BossAI(creature, DATA_THERAVENIAN) { }
 
-            void JustEngagedWith(Unit* /*who*/) override
+            void JustEngagedWith(Unit* who) override
             {
-                _JustEngagedWith();
+                BossAI::JustEngagedWith(who);
                 events.ScheduleEvent(EVENT_TRAMPLE, 24000);
                 events.ScheduleEvent(EVENT_CLEAVE, 15000);
                 events.ScheduleEvent(EVENT_SUNDERINCLEAVE, 40000);

src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_baron_ashbury.cpp

@@ -87,9 +87,9 @@ struct boss_baron_ashbury : public BossAI
         Initialize();
     }
 
-    void JustEngagedWith(Unit* /*who*/) override
+    void JustEngagedWith(Unit* who) override
     {
-        _JustEngagedWith();
+        BossAI::JustEngagedWith(who);
         Talk(SAY_AGGRO);
         instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me);
 

src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_baron_silverlaine.cpp

@@ -111,10 +111,10 @@ public:
             _worgenCounter = 0;
         }
 
-        void JustEngagedWith(Unit* /*who*/) override
+        void JustEngagedWith(Unit* who) override
         {
+            BossAI::JustEngagedWith(who);
             Talk(SAY_AGGRO);
-            _JustEngagedWith();
             instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me);
             if (IsHeroic())
                 events.ScheduleEvent(EVENT_CURSED_VEIL, Seconds(6));

src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_commander_springvale.cpp

@@ -130,10 +130,10 @@ public:
             */
         }
 
-        void JustEngagedWith(Unit* /*who*/) override
+        void JustEngagedWith(Unit* who) override
         {
+            BossAI::JustEngagedWith(who);
             Talk(SAY_AGGRO);
-            _JustEngagedWith();
             instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me);
             events.ScheduleEvent(EVENT_MALEFIC_STRIKE, Seconds(5));
             events.ScheduleEvent(EVENT_DESECRATION, Seconds(9) + Milliseconds(500));

src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_lord_godfrey.cpp

@@ -90,9 +90,9 @@ struct boss_lord_godfrey : public BossAI
         me->MakeInterruptable(false);
     }
 
-    void JustEngagedWith(Unit* /*who*/) override
+    void JustEngagedWith(Unit* who) override
     {
-        _JustEngagedWith();
+        BossAI::JustEngagedWith(who);
         Talk(instance->GetData(DATA_TEAM_IN_INSTANCE) == ALLIANCE ? SAY_AGGRO_ALLIANCE : SAY_AGGRO_HORDE);
         DoCastAOE(SPELL_BULLET_TIME_RESET_CREDIT);
         instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me);

src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_lord_walden.cpp

@@ -82,10 +82,10 @@ struct boss_lord_walden : public BossAI
         events.SetPhase(PHASE_INTRO);
     }
 
-    void JustEngagedWith(Unit* /*who*/) override
+    void JustEngagedWith(Unit* who) override
     {
+        BossAI::JustEngagedWith(who);
         Talk(SAY_AGGRO);
-        _JustEngagedWith();
         me->SetUInt32Value(UNIT_NPC_EMOTESTATE, 0);
 
         events.SetPhase(PHASE_COMBAT);

src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp

@@ -208,11 +208,11 @@ struct boss_kalecgos : public BossAI
             damage = 0;
     }
 
-    void JustEngagedWith(Unit* /*who*/) override
+    void JustEngagedWith(Unit* who) override
     {
         instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me);
         Talk(SAY_EVIL_AGGRO);
-        _JustEngagedWith();
+        BossAI::JustEngagedWith(who);
 
         if (Creature* kalecgosHuman = me->SummonCreature(NPC_KALEC, KalecgosSummonPos, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1000))
             if (Creature* sathrovar = instance->GetCreature(DATA_SATHROVARR))
@@ -461,9 +461,9 @@ struct boss_sathrovarr : public BossAI
         events.ScheduleEvent(EVENT_CHECK_TIMER, Seconds(1));
     }
 
-    void JustEngagedWith(Unit* /*who*/) override
+    void JustEngagedWith(Unit* who) override
     {
-        _JustEngagedWith();
+        BossAI::JustEngagedWith(who);
         Talk(SAY_SATH_AGGRO);
     }
 

src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp

@@ -276,9 +276,9 @@ public:
             });
         }
 
-        void JustEngagedWith(Unit* /*who*/) override
+        void JustEngagedWith(Unit* who) override
         {
-            _JustEngagedWith();
+            BossAI::JustEngagedWith(who);
             DoCast(me, SPELL_OPEN_PORTAL_PERIODIC, true);
             DoCast(me, SPELL_DARKNESS_PERIODIC, true);
             DoCast(me, SPELL_NEGATIVE_ENERGY_PERIODIC, true);

src/server/scripts/EasternKingdoms/TheStockade/boss_hogger.cpp

@@ -66,9 +66,9 @@ public:
     {
         boss_hoggerAI(Creature* creature) : BossAI(creature, DATA_HOGGER), _hasEnraged(false) { }
 
-        void JustEngagedWith(Unit* /*who*/) override
+        void JustEngagedWith(Unit* who) override
         {
-            _JustEngagedWith();
+            BossAI::JustEngagedWith(who);
             Talk(SAY_PULL);
             events.ScheduleEvent(EVENT_VICIOUS_SLICE, Seconds(3), Seconds(4));
             events.ScheduleEvent(EVENT_MADDENING_CALL, Seconds(1), Seconds(2));

src/server/scripts/EasternKingdoms/TheStockade/boss_lord_overheat.cpp

@@ -48,9 +48,9 @@ public:
     {
         boss_lord_overheatAI(Creature* creature) : BossAI(creature, DATA_LORD_OVERHEAT) { }
 
-        void JustEngagedWith(Unit* /*who*/) override
+        void JustEngagedWith(Unit* who) override
         {
-            _JustEngagedWith();
+            BossAI::JustEngagedWith(who);
             Talk(SAY_PULL);
             events.ScheduleEvent(EVENT_FIREBALL, Seconds(2));
             events.ScheduleEvent(EVENT_OVERHEAT, Seconds(9), Seconds(11));

src/server/scripts/EasternKingdoms/TheStockade/boss_randolph_moloch.cpp

@@ -70,9 +70,9 @@ public:
             secondVanish = false;
         }
 
-        void JustEngagedWith(Unit* /*who*/) override
+        void JustEngagedWith(Unit* who) override
         {
-            _JustEngagedWith();
+            BossAI::JustEngagedWith(who);
             Talk(SAY_PULL);
             events.ScheduleEvent(EVENT_WILDLY_STABBING, Seconds(4), Seconds(5));
             events.ScheduleEvent(EVENT_SWEEP, Seconds(2), Seconds(3));

src/server/scripts/EasternKingdoms/ThroneOfTheTides/boss_commander_ulthok.cpp

@@ -71,9 +71,9 @@ struct boss_commander_ulthok : public BossAI
 {
     boss_commander_ulthok(Creature* creature) : BossAI(creature, DATA_COMMANDER_ULTHOK) { }
 
-    void JustEngagedWith(Unit* /*who*/) override
+    void JustEngagedWith(Unit* who) override
     {
-        _JustEngagedWith();
+        BossAI::JustEngagedWith(who);
         instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me);
         Talk(SAY_AGGRO);
         DoCastAOE(SPELL_ULTHOK_VO_AGGRO, true);

src/server/scripts/EasternKingdoms/ThroneOfTheTides/boss_lady_nazjar.cpp

@@ -155,9 +155,9 @@ struct boss_lady_nazjar : public BossAI
 {
     boss_lady_nazjar(Creature* creature) : BossAI(creature, DATA_LADY_NAZJAR), _waterspoutPhaseCount(0), _killedAdds(0), _isInTransition(false) { }
 
-    void JustEngagedWith(Unit* /*who*/) override
+    void JustEngagedWith(Unit* who) override
     {
-        _JustEngagedWith();
+        BossAI::JustEngagedWith(who);
         Talk(SAY_AGGRO);
         HandleDoor(false);
         instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me);

src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp

@@ -293,9 +293,9 @@ struct boss_akilzon : public BossAI
 {
     boss_akilzon(Creature* creature) : BossAI(creature, DATA_ALKILZON) { }
 
-    void JustEngagedWith(Unit* /*who*/) override
+    void JustEngagedWith(Unit* who) override
     {
-        _JustEngagedWith();
+        BossAI::JustEngagedWith(who);
         instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me);
         Talk(SAY_AGGRO);
 

src/server/scripts/EasternKingdoms/ZulAman/boss_daakara.cpp

@@ -40,9 +40,9 @@ struct boss_daakara : public BossAI
         _Reset();
     }
 
-    void JustEngagedWith(Unit* /*who*/) override
+    void JustEngagedWith(Unit* who) override
     {
-        _JustEngagedWith();
+        BossAI::JustEngagedWith(who);
     }
 
     void JustDied(Unit* /*killer*/) override

src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp

@@ -51,9 +51,9 @@ struct boss_halazzi : public BossAI
         _Reset();
     }
 
-    void JustEngagedWith(Unit* /*who*/) override
+    void JustEngagedWith(Unit* who) override
     {
-        _JustEngagedWith();
+        BossAI::JustEngagedWith(who);
     }
 
     void JustDied(Unit* /*killer*/) override

src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp

@@ -53,9 +53,9 @@ struct boss_hexlord_malacrass : public BossAI
         _Reset();
     }
 
-    void JustEngagedWith(Unit* /*who*/) override
+    void JustEngagedWith(Unit* who) override
     {
-        _JustEngagedWith();
+        BossAI::JustEngagedWith(who);
     }
 
     void KilledUnit(Unit* /*victim*/) override

src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp

@@ -51,9 +51,9 @@ struct boss_nalorakk : public BossAI
         _Reset();
     }
 
-    void JustEngagedWith(Unit* /*who*/) override
+    void JustEngagedWith(Unit* who) override
     {
-        _JustEngagedWith();
+        BossAI::JustEngagedWith(who);
     }
 
     void JustDied(Unit* /*killer*/) override

src/server/scripts/EasternKingdoms/ZulGurub/boss_bloodlord_mandokir.cpp

@@ -117,9 +117,9 @@ struct boss_bloodlord_mandokir : public BossAI
         _reanimateOhganCooldown = false;
     }
 
-    void JustEngagedWith(Unit* /*who*/) override
+    void JustEngagedWith(Unit* who) override
     {
-        _JustEngagedWith();
+        BossAI::JustEngagedWith(who);
         Talk(SAY_AGGRO);
         instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me);
 

src/server/scripts/EasternKingdoms/ZulGurub/boss_high_priest_venoxis.cpp

@@ -210,9 +210,9 @@ struct boss_high_priest_venoxis : public BossAI
                 eyes->CastSpell(eyes, SPELL_SNAKE_EYES);
     }
 
-    void JustEngagedWith(Unit* /*who*/) override
+    void JustEngagedWith(Unit* who) override
     {
-        _JustEngagedWith();
+        BossAI::JustEngagedWith(who);
         instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me);
         Talk(SAY_AGGRO);
         me->RemoveAurasDueToSpell(SPELL_TOTEM_BEAM_LEFT);

src/server/scripts/EasternKingdoms/ZulGurub/boss_high_priestess_kilnara.cpp

@@ -112,9 +112,9 @@ struct boss_high_priestess_kilnara : public BossAI
         me->SummonCreatureGroup(SUMMON_GROUP_PRIDE_OF_BETHEK);
     }
 
-    void JustEngagedWith(Unit* /*who*/) override
+    void JustEngagedWith(Unit* who) override
     {
-        _JustEngagedWith();
+        BossAI::JustEngagedWith(who);
         Talk(SAY_AGGRO);
         DoCastAOE(SPELL_CLEAR_ACHIEVEMENT_CREDITS);
 

src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo_the_godbreaker.cpp

@@ -239,9 +239,9 @@ struct boss_jindo_the_godbreaker : public BossAI
         SetupEncounter();
     }
 
-    void JustEngagedWith(Unit* /*who*/) override
+    void JustEngagedWith(Unit* who) override
     {
-        _JustEngagedWith();
+        BossAI::JustEngagedWith(who);
         instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me);
         Talk(SAY_AGGRO);
         events.SetPhase(PHASE_ONE);

src/server/scripts/EasternKingdoms/ZulGurub/boss_zanzil.cpp

@@ -164,9 +164,9 @@ struct boss_zanzil : public BossAI
             DoSummon(NPC_ZANZILI_BERSERKER, ZanziliBerserkerPositions[i], 4000);
     }
 
-    void JustEngagedWith(Unit* /*who*/) override
+    void JustEngagedWith(Unit* who) override
     {
-        _JustEngagedWith();
+        BossAI::JustEngagedWith(who);
         Talk(SAY_AGGRO);
         events.ScheduleEvent(EVENT_ZANZILI_FIRE, 13s, 14s);
         events.ScheduleEvent(EVENT_TERRIBLE_TONIC, 10s, 11s);

src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp

@@ -54,9 +54,9 @@ public:
             _Reset();
         }
 
-        void JustEngagedWith(Unit* /*who*/) override
+        void JustEngagedWith(Unit* who) override
         {
-            _JustEngagedWith();
+            BossAI::JustEngagedWith(who);
             events.ScheduleEvent(EVENT_POISON_CLOUD, urand(5000, 9000));
         }
 

src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp

@@ -38,9 +38,9 @@ public:
     {
         boss_gelihastAI(Creature* creature) : BossAI(creature, DATA_GELIHAST) { }
 
-        void JustEngagedWith(Unit* /*who*/) override
+        void JustEngagedWith(Unit* who) override
         {
-            _JustEngagedWith();
+            BossAI::JustEngagedWith(who);
             events.ScheduleEvent(EVENT_THROW_NET, urand(2000, 4000));
         }
 

src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp

@@ -47,9 +47,9 @@ public:
     {
         boss_kelrisAI(Creature* creature) : BossAI(creature, DATA_KELRIS) { }
 
-        void JustEngagedWith(Unit* /*who*/) override
+        void JustEngagedWith(Unit* who) override
         {
-            _JustEngagedWith();
+            BossAI::JustEngagedWith(who);
             Talk(SAY_AGGRO);
             events.ScheduleEvent(EVENT_MIND_BLAST, urand(2000, 5000));
             events.ScheduleEvent(EVENT_SLEEP, urand(9000, 12000));

src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp

@@ -299,10 +299,10 @@ public:
             me->RemoveAllAuras();                              // Reset Soul Charge auras.
         }
 
-        void JustEngagedWith(Unit* /*who*/) override
+        void JustEngagedWith(Unit* who) override
         {
+            BossAI::JustEngagedWith(who);
             Talk(SAY_AGGRO);
-            _JustEngagedWith();
             events.ScheduleEvent(EVENT_FEAR, 42000);
             events.ScheduleEvent(EVENT_AIR_BURST, 30000);
             events.ScheduleEvent(EVENT_GRIP_OF_THE_LEGION, urand(5000, 25000));

src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp

@@ -63,9 +63,9 @@ class boss_epoch : public CreatureScript
                     me->RemoveLootMode(LOOT_MODE_DEFAULT);
             }
 
-            void JustEngagedWith(Unit* /*who*/) override
+            void JustEngagedWith(Unit* who) override
             {
-                _JustEngagedWith();
+                BossAI::JustEngagedWith(who);
 
                 _stepTargetIndex = 0;
                 _stepTargets.clear();

src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite_corruptor.cpp

@@ -75,10 +75,10 @@ class boss_infinite_corruptor : public CreatureScript
                     target->CastSpell(target, SPELL_CORRUPTION_OF_TIME_TARGET, true);
             }
 
-            void JustEngagedWith(Unit* /*who*/) override
+            void JustEngagedWith(Unit* who) override
             {
                 Talk(SAY_AGGRO);
-                _JustEngagedWith();
+                BossAI::JustEngagedWith(who);
                 events.ScheduleEvent(EVENT_CORRUPTING_BLIGHT, 7s);
                 events.ScheduleEvent(EVENT_VOID_STRIKE, 5s);
             }

src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp

@@ -58,10 +58,10 @@ class boss_meathook : public CreatureScript
                     me->RemoveLootMode(LOOT_MODE_DEFAULT);
             }
 
-            void JustEngagedWith(Unit* /*who*/) override
+            void JustEngagedWith(Unit* who) override
             {
                 Talk(SAY_AGGRO);
-                _JustEngagedWith();
+                BossAI::JustEngagedWith(who);
                 events.ScheduleEvent(EVENT_CHAIN, Seconds(7), Seconds(11));
                 events.ScheduleEvent(EVENT_DISEASE, Seconds(2));
                 events.ScheduleEvent(EVENT_FRENZY, Seconds(13), Seconds(17));