Scripts: Fix rbac permission for skipping default boss sequencing check

(cherry picked from commit e660c8bc19)
2026-01-15 23:20:36 +01:00 · 2020-01-14 23:53:08 +01:00
parent 45585b5305
commit 5d02739b98
213 changed files with 434 additions and 459 deletions
--- a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp
+++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp
@@ -529,12 +529,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;
--- a/src/server/game/AI/ScriptedAI/ScriptedCreature.h
+++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.h
@@ -329,7 +329,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(); }

@@ -337,7 +337,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);
--- a/src/server/scripts/Argus/AntorusTheBurningThrone/boss_garothi_worldbreaker.cpp
+++ b/src/server/scripts/Argus/AntorusTheBurningThrone/boss_garothi_worldbreaker.cpp
@@ -219,10 +219,10 @@ struct boss_garothi_worldbreaker : public BossAI
        me->SummonCreatureGroup(SUMMON_GROUP_ID_SURGING_FEL);
    }

-    void JustEngagedWith(Unit* /*who*/) override
+    void JustEngagedWith(Unit* who) override
    {
        me->SetReactState(REACT_AGGRESSIVE);
-        _JustEngagedWith();
+        BossAI::JustEngagedWith(who);
        Talk(SAY_AGGRO);
        DoCastSelf(SPELL_MELEE);
        instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me);
--- a/src/server/scripts/EasternKingdoms/BaradinHold/boss_alizabal.cpp
+++ b/src/server/scripts/EasternKingdoms/BaradinHold/boss_alizabal.cpp
@@ -92,9 +92,9 @@ class boss_alizabal : public CreatureScript
                _skewer = 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_RANDOM_CAST, 10000);
--- a/src/server/scripts/EasternKingdoms/BaradinHold/boss_occuthar.cpp
+++ b/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, 8s);
                events.ScheduleEvent(EVENT_FOCUSED_FIRE, 15s);
--- a/src/server/scripts/EasternKingdoms/BaradinHold/boss_pit_lord_argaloth.cpp
+++ b/src/server/scripts/EasternKingdoms/BaradinHold/boss_pit_lord_argaloth.cpp
@@ -51,9 +51,9 @@ class boss_pit_lord_argaloth : public CreatureScript
        {
            boss_pit_lord_argalothAI(Creature* creature) : BossAI(creature, DATA_ARGALOTH) { }

-            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, 20s);
                events.ScheduleEvent(EVENT_CONSUMING_DARKNESS, 20s, 25s);
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_ascendant_lord_obsidius.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_ascendant_lord_obsidius.cpp
@@ -56,9 +56,9 @@ class boss_ascendant_lord_obsidius : public CreatureScript
                _Reset();
            }

-            void JustEngagedWith(Unit* /*who*/) override
+            void JustEngagedWith(Unit* who) override
            {
-                _JustEngagedWith();
+                BossAI::JustEngagedWith(who);
                events.ScheduleEvent(EVENT_MANA_TAP, 30000);
                Talk(YELL_AGGRO);
            }
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_beauty.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_beauty.cpp
@@ -57,9 +57,9 @@ class boss_beauty : public CreatureScript
                _Reset();
            }

-            void JustEngagedWith(Unit* /*who*/) override
+            void JustEngagedWith(Unit* who) override
            {
-                _JustEngagedWith();
+                BossAI::JustEngagedWith(who);
                events.ScheduleEvent(SPELL_MAGMA_SPIT, urand(7000, 10000));
                events.ScheduleEvent(EVENT_BERSERKER_CHARGE, urand(16000, 19000));
                events.ScheduleEvent(EVENT_FLAMEBREAK, urand(18000, 22000));
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_corla.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_corla.cpp
@@ -61,9 +61,9 @@ class boss_corla : public CreatureScript
                events.ScheduleEvent(EVENT_DRAIN_ESSENSE, 2000);
            }

-            void JustEngagedWith(Unit* /*who*/) override
+            void JustEngagedWith(Unit* who) override
            {
-                _JustEngagedWith();
+                BossAI::JustEngagedWith(who);
                Talk(YELL_AGGRO);
                events.Reset();
                combatPhase = true;
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_karsh_steelbender.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_karsh_steelbender.cpp
@@ -56,9 +56,9 @@ class boss_karsh_steelbender : public CreatureScript
                _Reset();
            }

-            void JustEngagedWith(Unit* /*who*/) override
+            void JustEngagedWith(Unit* who) override
            {
-                _JustEngagedWith();
+                BossAI::JustEngagedWith(who);
                Talk(YELL_AGGRO);
                events.ScheduleEvent(EVENT_CLEAVE, 10000);
            }
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_romogg_bonecrusher.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_romogg_bonecrusher.cpp
@@ -75,9 +75,9 @@ class boss_romogg_bonecrusher : public CreatureScript
                    Talk(YELL_KILL);
            }

-            void JustEngagedWith(Unit* /*who*/) override
+            void JustEngagedWith(Unit* who) override
            {
-                _JustEngagedWith();
+                BossAI::JustEngagedWith(who);
                events.ScheduleEvent(EVENT_CHAINS_OF_WOE, urand(22000, 32000));
                events.ScheduleEvent(EVENT_WOUNDING_STRIKE, urand(26000, 32000));
                events.ScheduleEvent(EVENT_QUAKE, 45000);
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp
+++ b/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, 6s);
            events.ScheduleEvent(EVENT_CLEAVE,    8000);
            events.ScheduleEvent(EVENT_CONFLIGURATION, 15s);
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp
+++ b/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, 17s, 20s);
            events.ScheduleEvent(EVENT_INFECTED_BITE, 10s, 12s);
        }
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp
+++ b/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, 8s, 16s);
            events.ScheduleEvent(EVENT_FREEZE, 8s, 16s);
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp
+++ b/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, 17s, 20s);
            events.ScheduleEvent(EVENT_THRASH, 10s, 12s);
        }
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_highlord_omokk.cpp
+++ b/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);
        }
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp
+++ b/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, 6s, 8s);
            events.ScheduleEvent(EVENT_SHADOW_WRATH, 9s, 18s);
        }
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_mother_smolderweb.cpp
+++ b/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, 10s);
        }
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp
@@ -75,9 +75,9 @@ public:
            Initialize();
        }

-        void JustEngagedWith(Unit* /*who*/) override
+        void JustEngagedWith(Unit* who) override
        {
-            _JustEngagedWith();
+            BossAI::JustEngagedWith(who);
            events.ScheduleEvent(EVENT_BLAST_WAVE, 20s);
            events.ScheduleEvent(EVENT_SHOUT, 2s);
            events.ScheduleEvent(EVENT_CLEAVE, 6s);
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp
+++ b/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, 1s);
            events.ScheduleEvent(EVENT_STUN_BOMB, 16s);
        }
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp
+++ b/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, 13s, 15s);
            events.ScheduleEvent(EVENT_CLEAVE, 15s, 17s);
            events.ScheduleEvent(EVENT_MORTAL_STRIKE, 17s, 19s);
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp
+++ b/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, 2s);
            events.ScheduleEvent(EVENT_HEX,     8 * IN_MILLISECONDS);
            events.ScheduleEvent(EVENT_CLEAVE, 14s);
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp
+++ b/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);
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp
+++ b/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, 17s, 20s);
            events.ScheduleEvent(SPELL_STRIKE, 10s, 12s);
            Talk(SAY_AGGRO);
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp
+++ b/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, 8s);
            events.ScheduleEvent(EVENT_CLEAVE,   14 * IN_MILLISECONDS);
            events.ScheduleEvent(EVENT_UPPERCUT, 20s);
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp
+++ b/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, 8s);
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp
+++ b/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);
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp
+++ b/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, 10s, 20s);
            events.ScheduleEvent(EVENT_WINGBUFFET, 30s);
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp
+++ b/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, 10s, 20s);
            events.ScheduleEvent(EVENT_WINGBUFFET, 30s);
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp
+++ b/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, 10s, 20s);
            events.ScheduleEvent(EVENT_WINGBUFFET, 30s);
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
+++ b/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);

--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp
+++ b/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));
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp
+++ b/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, 12s);
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp
+++ b/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);
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp
+++ b/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();
        }
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
@@ -86,9 +86,9 @@ public:
            events.ScheduleEvent(EVENT_ENRAGE, 10min);
        }

-        void JustEngagedWith(Unit* /*who*/) override
+        void JustEngagedWith(Unit* who) override
        {
-            _JustEngagedWith();
+            BossAI::JustEngagedWith(who);
            Talk(SAY_AGGRO);
        }

--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
@@ -140,9 +140,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);
--- 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 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, 2100ms, 0, PHASE_NORMAL);
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
+++ b/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, 8s);
                events.ScheduleEvent(EVENT_ARCANE_SHOCK, 5s);
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp
@@ -55,9 +55,9 @@ struct boss_arcanist_doan : public BossAI
        _healthAbove50Pct = true;
    }

-    void JustEngagedWith(Unit* /*who*/) override
+    void JustEngagedWith(Unit* who) override
    {
-        _JustEngagedWith();
+        BossAI::JustEngagedWith(who);
        Talk(SAY_AGGRO);

        events.ScheduleEvent(EVENT_SILENCE, 15s);
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp
@@ -46,9 +46,9 @@ struct boss_azshir_the_sleepless : public BossAI
        _siphon = false;
    }

-    void JustEngagedWith(Unit* /*who*/) override
+    void JustEngagedWith(Unit* who) override
    {
-        _JustEngagedWith();
+        BossAI::JustEngagedWith(who);
        events.ScheduleEvent(EVENT_CALL_OF_GRAVE, 30s);
        events.ScheduleEvent(EVENT_TERRIFY, 20s);
    }
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp
@@ -55,10 +55,10 @@ struct boss_bloodmage_thalnos : public BossAI
        _Reset();
    }

-    void JustEngagedWith(Unit* /*who*/) override
+    void JustEngagedWith(Unit* who) override
    {
        Talk(SAY_AGGRO);
-        _JustEngagedWith();
+        BossAI::JustEngagedWith(who);
        events.ScheduleEvent(EVENT_FLAME_SHOCK, 10s);
        events.ScheduleEvent(EVENT_SHADOW_BOLT, 2s);
        events.ScheduleEvent(EVENT_FLAME_SPIKE, 8s);
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp
@@ -64,11 +64,11 @@ struct boss_herod : public BossAI
        _Reset();
    }

-    void JustEngagedWith(Unit* /*who*/) override
+    void JustEngagedWith(Unit* who) override
    {
        Talk(SAY_AGGRO);
        DoCast(me, SPELL_RUSHINGCHARGE);
-        _JustEngagedWith();
+        BossAI::JustEngagedWith(who);

        events.ScheduleEvent(EVENT_CLEAVE, 12s);
        events.ScheduleEvent(EVENT_WHIRLWIND, 1min);
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp
@@ -73,9 +73,9 @@ struct boss_high_inquisitor_fairbanks : public BossAI
        me->SetStandState(UNIT_STAND_STATE_DEAD);
    }

-    void JustEngagedWith(Unit* /*who*/) override
+    void JustEngagedWith(Unit* who) override
    {
-        _JustEngagedWith();
+        BossAI::JustEngagedWith(who);
        events.ScheduleEvent(EVENT_CURSE_BLOOD, 10s);
        events.ScheduleEvent(EVENT_DIPEL_MAGIC, 30s);
        events.ScheduleEvent(EVENT_FEAR, 40s);
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp
@@ -39,9 +39,9 @@ struct boss_houndmaster_loksey : public BossAI
 {
    boss_houndmaster_loksey(Creature* creature) : BossAI(creature, DATA_HOUNDMASTER_LOKSEY) { }

-    void JustEngagedWith(Unit* /*who*/) override
+    void JustEngagedWith(Unit* who) override
    {
-        _JustEngagedWith();
+        BossAI::JustEngagedWith(who);
        Talk(SAY_AGGRO);
        DoCast(SPELL_SUMMON_SCARLET_HOUND);
        events.ScheduleEvent(EVENT_BLOODLUST, 20s);
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp
@@ -57,10 +57,10 @@ struct boss_interrogator_vishas : public BossAI
        _Reset();
    }

-    void JustEngagedWith(Unit* /*who*/) override
+    void JustEngagedWith(Unit* who) override
    {
        Talk(SAY_AGGRO);
-        _JustEngagedWith();
+        BossAI::JustEngagedWith(who);
        events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 5s);
    }

--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp
@@ -103,9 +103,9 @@ public:
        instance->HandleGameObject(ObjectGuid::Empty, false, instance->GetGameObject(DATA_HIGH_INQUISITORS_DOOR));
    }

-    void JustEngagedWith(Unit* /*who*/) override
+    void JustEngagedWith(Unit* who) override
    {
-        _JustEngagedWith();
+        BossAI::JustEngagedWith(who);

        Talk(SAY_MO_AGGRO);

--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp
@@ -39,9 +39,9 @@ struct boss_scorn : public BossAI
 {
    boss_scorn(Creature* creature) : BossAI(creature, DATA_SCORN) { }

-    void JustEngagedWith(Unit* /*who*/) override
+    void JustEngagedWith(Unit* who) override
    {
-        _JustEngagedWith();
+        BossAI::JustEngagedWith(who);
        events.ScheduleEvent(EVENT_LICH_SLAP, 45s);
        events.ScheduleEvent(EVENT_FROSTBOLT_VOLLEY, 30s);
        events.ScheduleEvent(EVENT_MIND_FLAY, 30s);
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp
+++ b/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, 4500ms);
                events.ScheduleEvent(EVENT_SHADOWSHIELD, 12s);
                events.ScheduleEvent(EVENT_CURSE, 2s);
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp
+++ b/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, 8s);
                events.ScheduleEvent(EVENT_BACKHAND, 9s);
                events.ScheduleEvent(EVENT_FRENZY, 1s);
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp
+++ b/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, 18s);
                events.ScheduleEvent(EVENT_SHADOWSHOCK, 9s);
                events.ScheduleEvent(EVENT_SILENCE, 5s);
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp
+++ b/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, 4s);
                events.ScheduleEvent(EVENT_CORRUPTION, 8s);
                events.ScheduleEvent(EVENT_RENEW, 32s);
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp
@@ -87,7 +87,7 @@ class boss_kirtonos_the_herald : public CreatureScript
                _Reset();
            }

-            void JustEngagedWith(Unit* /*who*/) override
+            void JustEngagedWith(Unit* who) override
            {
                events.ScheduleEvent(EVENT_SWOOP, 8s, 8s);
                events.ScheduleEvent(EVENT_WING_FLAP, 15s, 15s);
@@ -97,7 +97,7 @@ class boss_kirtonos_the_herald : public CreatureScript
                events.ScheduleEvent(EVENT_CURSE_OF_TONGUES, 53s, 53s);
                events.ScheduleEvent(EVENT_DOMINATE_MIND, 34s, 48s);
                events.ScheduleEvent(EVENT_KIRTONOS_TRANSFORM, 20s, 20s);
-                _JustEngagedWith();
+                BossAI::JustEngagedWith(who);
            }

            void JustDied(Unit* /*killer*/) override
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp
+++ b/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, 7s);
                events.ScheduleEvent(EVENT_VEILOFSHADOW, 15s);
            }
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp
+++ b/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, 38s);
                events.ScheduleEvent(EVENT_DARKPLAGUE, 8s);
                events.ScheduleEvent(EVENT_CORROSIVEACID, 45s);
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp
+++ b/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, 24s);
                events.ScheduleEvent(EVENT_CLEAVE, 15s);
                events.ScheduleEvent(EVENT_SUNDERINCLEAVE, 40s);
--- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
+++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
@@ -255,9 +255,9 @@ class boss_archmage_arugal : public CreatureScript
                    Talk(SAY_TRANSFORM);
            }

-            void JustEngagedWith(Unit* /*who*/) override
+            void JustEngagedWith(Unit* who) override
            {
-                _JustEngagedWith();
+                BossAI::JustEngagedWith(who);
                Talk(SAY_AGGRO);
                events.ScheduleEvent(EVENT_CURSE, 7s);
                events.ScheduleEvent(EVENT_TELEPORT, 15s);
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
@@ -207,11 +207,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_KALECGOS_HUMAN, 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, 1s);
    }

-    void JustEngagedWith(Unit* /*who*/) override
+    void JustEngagedWith(Unit* who) override
    {
-        _JustEngagedWith();
+        BossAI::JustEngagedWith(who);
        Talk(SAY_SATH_AGGRO);
    }

--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp
+++ b/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);
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
@@ -44,10 +44,10 @@ class boss_akilzon : public CreatureScript
                _Reset();
            }

-            void JustEngagedWith(Unit* /*who*/) override
+            void JustEngagedWith(Unit* who) override
            {
                Talk(SAY_AGGRO);
-                _JustEngagedWith();
+                BossAI::JustEngagedWith(who);
            }

            void JustDied(Unit* /*killer*/) override
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_daakara.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_daakara.cpp
@@ -59,10 +59,10 @@ class boss_daakara : public CreatureScript
                _Reset();
            }

-            void JustEngagedWith(Unit* /*who*/) override
+            void JustEngagedWith(Unit* who) override
            {
                Talk(SAY_AGGRO);
-                _JustEngagedWith();
+                BossAI::JustEngagedWith(who);
            }

            void JustDied(Unit* /*killer*/) override
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
@@ -52,10 +52,10 @@ class boss_halazzi : public CreatureScript
                _Reset();
            }

-            void JustEngagedWith(Unit* /*who*/) override
+            void JustEngagedWith(Unit* who) override
            {
                Talk(SAY_AGGRO);
-                _JustEngagedWith();
+                BossAI::JustEngagedWith(who);
            }

            void JustDied(Unit* /*killer*/) override
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
@@ -56,10 +56,10 @@ class boss_hexlord_malacrass : public CreatureScript
                _Reset();
            }

-            void JustEngagedWith(Unit* /*who*/) override
+            void JustEngagedWith(Unit* who) override
            {
                Talk(SAY_AGGRO);
-                _JustEngagedWith();
+                BossAI::JustEngagedWith(who);
            }

            void JustDied(Unit* /*killer*/) override
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
@@ -53,10 +53,10 @@ class boss_janalai : public CreatureScript
                _Reset();
            }

-            void JustEngagedWith(Unit* /*who*/) override
+            void JustEngagedWith(Unit* who) override
            {
                Talk(SAY_AGGRO);
-                _JustEngagedWith();
+                BossAI::JustEngagedWith(who);
            }

            void JustDied(Unit* /*killer*/) override
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
@@ -58,10 +58,10 @@ class boss_nalorakk : public CreatureScript
                _Reset();
            }

-            void JustEngagedWith(Unit* /*who*/) override
+            void JustEngagedWith(Unit* who) override
            {
                Talk(SAY_AGGRO);
-                _JustEngagedWith();
+                BossAI::JustEngagedWith(who);
            }

            void JustDied(Unit* /*killer*/) override
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
@@ -46,12 +46,13 @@ class boss_grilek : public CreatureScript
            {
            }

-            void JustEngagedWith(Unit* /*who*/) override
+            void JustDied(Unit* /*killer*/) override
            {
            }

-            void JustDied(Unit* /*killer*/) override
+            void JustEngagedWith(Unit* who) override
            {
+                BossAI::JustEngagedWith(who);
            }

            void UpdateAI(uint32 diff) override
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
@@ -46,12 +46,13 @@ class boss_hazzarah : public CreatureScript
            {
            }

-            void JustEngagedWith(Unit* /*who*/) override
+            void JustDied(Unit* /*killer*/) override
            {
            }

-            void JustDied(Unit* /*killer*/) override
+            void JustEngagedWith(Unit* who) override
            {
+                BossAI::JustEngagedWith(who);
            }

            void UpdateAI(uint32 diff) override
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo_the_godbreaker.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo_the_godbreaker.cpp
@@ -62,9 +62,9 @@ class boss_jindo_the_godbreaker : public CreatureScript
                _Reset();
            }

-            void JustEngagedWith(Unit* /*who*/) override
+            void JustEngagedWith(Unit* who) override
            {
-                _JustEngagedWith();
+                BossAI::JustEngagedWith(who);
                Talk(SAY_AGGRO);
            }

--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_kilnara.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_kilnara.cpp
@@ -53,9 +53,9 @@ class boss_kilnara : public CreatureScript
                _Reset();
            }

-            void JustEngagedWith(Unit* /*who*/) override
+            void JustEngagedWith(Unit* who) override
            {
-                _JustEngagedWith();
+                BossAI::JustEngagedWith(who);
                Talk(SAY_AGGRO);
            }

--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
@@ -130,9 +130,9 @@ class boss_mandokir : public CreatureScript
                _reviveGUID.Clear();
            }

-            void JustEngagedWith(Unit* /*who*/) override
+            void JustEngagedWith(Unit* who) override
            {
-                _JustEngagedWith();
+                BossAI::JustEngagedWith(who);
                Talk(SAY_AGGRO);

                DoCastAOE(SPELL_BLOODLORD_AURA);
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
@@ -46,12 +46,13 @@ class boss_renataki : public CreatureScript
            {
            }

-            void JustEngagedWith(Unit* /*who*/) override
+            void JustDied(Unit* /*killer*/) override
            {
            }

-            void JustDied(Unit* /*killer*/) override
+            void JustEngagedWith(Unit* who) override
            {
+                BossAI::JustEngagedWith(who);
            }

            void UpdateAI(uint32 diff) override
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
@@ -55,18 +55,18 @@ class boss_venoxis : public CreatureScript
                _Reset();
            }

-            void JustEngagedWith(Unit* /*who*/) override
-            {
-                _JustEngagedWith();
-                Talk(SAY_AGGRO);
-            }
-
            void JustDied(Unit* /*killer*/) override
            {
                _JustDied();
                Talk(SAY_DEATH);
            }

+            void JustEngagedWith(Unit* who) override
+            {
+                BossAI::JustEngagedWith(who);
+                Talk(SAY_AGGRO);
+            }
+
            void KilledUnit(Unit* victim) override
            {
                if (victim->GetTypeId() == TYPEID_PLAYER)
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
@@ -42,16 +42,9 @@ class boss_wushoolay : public CreatureScript
            {
            }

-            void Reset() override
-            {
-            }
-
-            void JustEngagedWith(Unit* /*who*/) override
-            {
-            }
-
-            void JustDied(Unit* /*killer*/) override
+            void JustEngagedWith(Unit* who) override
            {
+                BossAI::JustEngagedWith(who);
            }

            void UpdateAI(uint32 diff) override
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_zanzil.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_zanzil.cpp
@@ -55,9 +55,9 @@ class boss_zanzil : public CreatureScript
                _Reset();
            }

-            void JustEngagedWith(Unit* /*who*/) override
+            void JustEngagedWith(Unit* who) override
            {
-                _JustEngagedWith();
+                BossAI::JustEngagedWith(who);
                Talk(SAY_AGGRO);
            }

--- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp
+++ b/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, 5s, 9s);
        }

--- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp
+++ b/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, 2s, 4s);
        }

--- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp
+++ b/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, 2s, 5s);
            events.ScheduleEvent(EVENT_SLEEP, 9s, 12s);
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
@@ -298,10 +298,10 @@ public:
            me->RemoveAllAuras();                              // Reset Soul Charge auras.
        }

-        void JustEngagedWith(Unit* /*who*/) override
+        void JustEngagedWith(Unit* who) override
        {
            Talk(SAY_AGGRO);
-            _JustEngagedWith();
+            BossAI::JustEngagedWith(who);
            events.ScheduleEvent(EVENT_FEAR, 42s);
            events.ScheduleEvent(EVENT_AIR_BURST, 30s);
            events.ScheduleEvent(EVENT_GRIP_OF_THE_LEGION, 5s, 25s);
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp
@@ -64,9 +64,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();
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite_corruptor.cpp
+++ b/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);
            }
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp
@@ -59,10 +59,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));
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp
@@ -71,10 +71,10 @@ class boss_salramm : 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_SUMMON_GHOULS, randtime(Seconds(19),Seconds(24)));
                events.ScheduleEvent(EVENT_SHADOW_BOLT, Seconds(2));
--- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp
+++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp
@@ -158,11 +158,11 @@ public:
            }
        }

-        void JustEngagedWith(Unit* /*who*/) override
+        void JustEngagedWith(Unit* who) override
        {
            instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me, 1);
            Talk(ANRAPHET_SAY_AGGRO);
-            _JustEngagedWith();
+            BossAI::JustEngagedWith(who);
        }

        void JustDied(Unit* /*killer*/) override
--- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp
+++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp
@@ -177,11 +177,11 @@ public:
            }
        }

-        void JustEngagedWith(Unit* /*who*/) override
+        void JustEngagedWith(Unit* who) override
        {
            instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me, 1);
            Talk(SAY_AGGRO);
-            _JustEngagedWith();
+            BossAI::JustEngagedWith(who);
        }

        void JustDied(Unit* /*killer*/) override
--- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp
+++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp
@@ -177,11 +177,11 @@ public:
            }
        }

-        void JustEngagedWith(Unit* /*who*/) override
+        void JustEngagedWith(Unit* who) override
        {
            instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me, 1);
            Talk(SAY_AGGRO);
-            _JustEngagedWith();
+            BossAI::JustEngagedWith(who);
        }

        void JustDied(Unit* /*killer*/) override
--- a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
+++ b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
@@ -160,9 +160,9 @@ public:
            instance->DoStopCriteriaTimer(CriteriaStartEvent::SendEvent, ACHIEV_TIMED_START_EVENT);
        }

-        void JustEngagedWith(Unit* /*who*/) override
+        void JustEngagedWith(Unit* who) override
        {
-            _JustEngagedWith();
+            BossAI::JustEngagedWith(who);
            Talk(SAY_AGGRO);
            events.ScheduleEvent(EVENT_FLAME_BREATH, 10s, 20s);
            events.ScheduleEvent(EVENT_TAIL_SWEEP, 15s, 20s);
--- a/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp
@@ -68,9 +68,9 @@ public:
            Initialize();
        }

-        void JustEngagedWith(Unit* /*who*/) override
+        void JustEngagedWith(Unit* who) override
        {
-            _JustEngagedWith();
+            BossAI::JustEngagedWith(who);
            events.ScheduleEvent(EVENT_AMNENNARSWRATH, 8s);
            events.ScheduleEvent(EVENT_FROSTBOLT, 1s);
            events.ScheduleEvent(EVENT_FROST_NOVA, 10s, 15s);
--- a/src/server/scripts/Kalimdor/RazorfenDowns/boss_glutton.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenDowns/boss_glutton.cpp
@@ -53,9 +53,9 @@ public:
            hp15 = false;
        }

-        void JustEngagedWith(Unit* /*who*/) override
+        void JustEngagedWith(Unit* who) override
        {
-            _JustEngagedWith();
+            BossAI::JustEngagedWith(who);
            Talk(SAY_AGGRO);
        }

--- a/src/server/scripts/Kalimdor/RazorfenDowns/boss_mordresh_fire_eye.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenDowns/boss_mordresh_fire_eye.cpp
@@ -58,9 +58,9 @@ public:
            events.ScheduleEvent(EVENT_OOC_1, 10000);
        }

-        void JustEngagedWith(Unit* /*who*/) override
+        void JustEngagedWith(Unit* who) override
        {
-            _JustEngagedWith();
+            BossAI::JustEngagedWith(who);
            events.Reset();
            Talk(SAY_AGGRO);
            events.ScheduleEvent(EVENT_FIREBALL, 100ms);
--- a/src/server/scripts/Kalimdor/RazorfenDowns/boss_tuten_kash.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenDowns/boss_tuten_kash.cpp
@@ -51,9 +51,9 @@ public:
                DoCast(me, SPELL_VIRULENT_POISON);
        }

-        void JustEngagedWith(Unit* /*who*/) override
+        void JustEngagedWith(Unit* who) override
        {
-            _JustEngagedWith();
+            BossAI::JustEngagedWith(who);
            events.ScheduleEvent(EVENT_WEB_SPRAY, 3s, 5s);
            events.ScheduleEvent(EVENT_CURSE_OF_TUTENKASH, 9s, 14s);
        }
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
@@ -86,7 +86,7 @@ class boss_buru : public CreatureScript

            void JustEngagedWith(Unit* who) override
            {
-                _JustEngagedWith();
+                BossAI::JustEngagedWith(who);
                Talk(EMOTE_TARGET, who);
                DoCast(me, SPELL_THORNS);

--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
@@ -138,9 +138,9 @@ class boss_ossirian : public CreatureScript
                            Trigger->CastSpell(Trigger, SpellWeakness[urand(0, 4)], false);
            }

-            void JustEngagedWith(Unit* /*who*/) override
+            void JustEngagedWith(Unit* who) override
            {
-                _JustEngagedWith();
+                BossAI::JustEngagedWith(who);
                events.Reset();
                events.ScheduleEvent(EVENT_SILENCE, 30s);
                events.ScheduleEvent(EVENT_CYCLONE, 20s);
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp
@@ -81,17 +81,6 @@ class boss_rajaxx : public CreatureScript
                events.ScheduleEvent(EVENT_THUNDERCRASH, 12s);
            }

-            void JustDied(Unit* /*killer*/) override
-            {
-                //SAY_DEATH
-                _JustDied();
-            }
-
-            void JustEngagedWith(Unit* /*victim*/) override
-            {
-                _JustEngagedWith();
-            }
-
            void UpdateAI(uint32 diff) override
            {
                if (!UpdateVictim())
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp
@@ -81,10 +81,10 @@ public:
            _Reset();
        }

-        void JustEngagedWith(Unit* /*who*/) override
+        void JustEngagedWith(Unit* who) override
        {
            DoCastVictim(SPELL_BIRTH);
-            _JustEngagedWith();
+            BossAI::JustEngagedWith(who);
        }

        void UpdateAI(uint32 diff) override
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp
@@ -93,10 +93,10 @@ public:
            _Reset();
        }

-        void JustEngagedWith(Unit* /*who*/) override
+        void JustEngagedWith(Unit* who) override
        {
            Talk(SAY_AGGRO);
-            _JustEngagedWith();
+            BossAI::JustEngagedWith(who);
        }

         void JustDied(Unit* /*killer*/) override
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp
@@ -135,9 +135,9 @@ class boss_skeram : public CreatureScript
                    me->DespawnOrUnsummon();
            }

-            void JustEngagedWith(Unit* /*who*/) override
+            void JustEngagedWith(Unit* who) override
            {
-                _JustEngagedWith();
+                BossAI::JustEngagedWith(who);
                events.Reset();

                events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, 6s, 12s);
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp
@@ -148,7 +148,7 @@ struct boss_twinemperorsAI : public BossAI

    void JustEngagedWith(Unit* who) override
    {
-        _JustEngagedWith();
+        BossAI::JustEngagedWith(who);
        Creature* pOtherBoss = GetOtherBoss();
        if (pOtherBoss)
        {
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp
@@ -180,9 +180,9 @@ class boss_viscidus : public CreatureScript
                }
            }

-            void JustEngagedWith(Unit* /*who*/) override
+            void JustEngagedWith(Unit* who) override
            {
-                _JustEngagedWith();
+                BossAI::JustEngagedWith(who);
                events.Reset();
                InitSpells();
            }
--- a/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp
+++ b/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp
@@ -150,9 +150,9 @@ class boss_high_priestess_azil : public CreatureScript
                events.ScheduleEvent(EVENT_SUMMON_WAVE_WEST, 40000);
            }

-            void JustEngagedWith(Unit* /*victim*/) override
+            void JustEngagedWith(Unit* who) override
            {
-                _JustEngagedWith();
+                BossAI::JustEngagedWith(who);

                DoCast(me, SPELL_ENERGY_SHIELD);
                Talk(SAY_AGGRO);
--- a/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp
+++ b/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp
@@ -92,9 +92,9 @@ class boss_ozruk : public CreatureScript
                events.ScheduleEvent(EVENT_ELEMENTIUM_SPIKE_SHIELD, 13000);
            }

-            void JustEngagedWith(Unit* /*victim*/) override
+            void JustEngagedWith(Unit* who) override
            {
-                _JustEngagedWith();
+                BossAI::JustEngagedWith(who);

                Talk(SAY_AGGRO);
            }
--- a/Show More
+++ b/Show More