refactor(Core/AI): Some more refactoring prep for Comat Threat system… (#15026)

Co-authored-by: Treeston <14020072+Treeston@users.noreply.github.com>
2026-01-17 19:05:42 +00:00 · 2023-02-13 21:39:40 +01:00
parent fdfa88093e
commit bd6034e1a9
391 changed files with 873 additions and 846 deletions
--- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp
+++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp
@@ -125,7 +125,7 @@ public:
            summons.DespawnAll();
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            Talk(YELL_AGGRO);
        }
--- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp
+++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp
@@ -67,7 +67,7 @@ public:
            Attacked = false;
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            Talk(YELL_AGGRO);
        }
--- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp
+++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp
@@ -59,7 +59,7 @@ public:
            ResetTimer                      = 5 * IN_MILLISECONDS;
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            Talk(YELL_AGGRO);
        }
--- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp
+++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp
@@ -62,7 +62,7 @@ public:
            Attacked = false;
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            Talk(YELL_AGGRO);
        }
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp
@@ -104,7 +104,7 @@ public:
                    dwarfRune->SetGoState(state);
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            _events.ScheduleEvent(EVENT_SPELL_FIREBLAST, 2s);

--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_anubshiah.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_anubshiah.cpp
@@ -51,9 +51,9 @@ public:
    {
        boss_anubshiahAI(Creature* creature) :  BossAI(creature, DATA_ANUBSHIAH) { }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
-            _EnterCombat();
+            _JustEngagedWith();
            events.ScheduleEvent(SPELL_SHADOWBOLT, 0.2 * (int)TIMER_SHADOWBOLT);
            events.ScheduleEvent(SPELL_CURSE_TONGUES, 0.2 * (int)TIMER_CURSE_TONGUES);
            events.ScheduleEvent(SPELL_CURSE_WEAKNESS, 0.2 * (int)TIMER_CURSE_WEAKNESS);
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp
@@ -51,7 +51,7 @@ public:

        boss_draganthaurissanAI(Creature* creature) : BossAI(creature, DATA_EMPEROR){}

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            if (hasYelled != 5)
            {
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_eviscerator.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_eviscerator.cpp
@@ -49,9 +49,9 @@ public:

        bool SpellShieldReady = false;

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
-            _EnterCombat();
+            _JustEngagedWith();
            events.ScheduleEvent(SPELL_SHADOWBOLT_VOLLEY, 0.2 * (int)TIMER_SHADOWBOLT_VOLLEY);
            events.ScheduleEvent(SPELL_REND, 0.2 * (int) TIMER_REND);
            events.ScheduleEvent(SPELL_SHIELD, 0.2 * (int) TIMER_SHIELD);
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp
@@ -55,7 +55,7 @@ public:
            Medics = false;
        }

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

        void SummonAdds(Unit* victim)
        {
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_gorosh_the_dervish.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_gorosh_the_dervish.cpp
@@ -49,9 +49,9 @@ public:

        uint32 nextWhirlwindTime;

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
-            _EnterCombat();
+            _JustEngagedWith();
            events.ScheduleEvent(SPELL_WHIRLWIND, 0.2 * (int) TIMER_WHIRLWIND);
            events.ScheduleEvent(SPELL_MORTALSTRIKE, 0.2 * (int) TIMER_MORTAL);
            events.ScheduleEvent(SPELL_BLOODLUST, 0.2 * (int) TIMER_BLOODLUST);
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_grizzle.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_grizzle.cpp
@@ -48,9 +48,9 @@ public:

        uint32 nextTremorTime;

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
-            _EnterCombat();
+            _JustEngagedWith();
            events.ScheduleEvent(SPELL_GROUNDTREMOR, 0.2 * (int) TIMER_GROUNDTREMOR);
            events.ScheduleEvent(SPELL_FRENZY, 0.2 * (int) TIMER_FRENZY);
        }
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_hedrum.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_hedrum.cpp
@@ -47,9 +47,9 @@ public:
    {
        boss_hedrumAI(Creature* creature) : BossAI(creature, DATA_HEDRUM) {}

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
-            _EnterCombat();
+            _JustEngagedWith();
            events.ScheduleEvent(SPELL_PARALYZING, 0.2 * (int) TIMER_PARALYZING);
            events.ScheduleEvent(SPELL_BANEFUL, 0.2 * (int) TIMER_BANEFUL);
            events.ScheduleEvent(SPELL_WEB_EXPLOSION, 0.2 * (int) TIMER_WEB_EXPLOSION);
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp
@@ -54,7 +54,7 @@ public:
            ShadowShield_Timer = 8000;
        }

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

        void UpdateAI(uint32 diff) override
        {
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp
@@ -45,10 +45,10 @@ public:
            instance->SetData(TYPE_IRON_HALL, NOT_STARTED);
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            instance->SetData(TYPE_IRON_HALL, IN_PROGRESS);
-            _EnterCombat();
+            _JustEngagedWith();
            events.ScheduleEvent(SPELL_WARSTOMP, 8s, 12s);
            events.ScheduleEvent(SPELL_FIERYBURST, 4s, 8s);
        }
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp
@@ -41,9 +41,9 @@ struct boss_moira_bronzebeardAI : public BossAI
 {
    // use a default value so we can inherit for priestess
    boss_moira_bronzebeardAI(Creature* creature, uint32 data = DATA_MOIRA) : BossAI(creature, data) {}
-    void EnterCombat(Unit* /*who*/) override
+    void JustEngagedWith(Unit* /*who*/) override
    {
-        _EnterCombat();
+        _JustEngagedWith();
        events.ScheduleEvent(SPELL_MINDBLAST, 0.5 * (int) TIMER_MINDBLAST);
        events.ScheduleEvent(SPELL_HEAL, 0.5 * (int) TIMER_HEAL);
        events.ScheduleEvent(SPELL_RENEW, 0.5 * (int) TIMER_RENEW);
@@ -103,9 +103,9 @@ struct boss_high_priestess_thaurissanAI : public boss_moira_bronzebeardAI
 {
    boss_high_priestess_thaurissanAI(Creature* creature) : boss_moira_bronzebeardAI(creature, DATA_PRIESTESS) {}

-    void EnterCombat(Unit* /*who*/) override
+    void JustEngagedWith(Unit* /*who*/) override
    {
-        _EnterCombat();
+        _JustEngagedWith();
        Talk(0);
        events.ScheduleEvent(SPELL_WORDPAIN, 0.5 * (int)TIMER_WORDPAIN);
        events.ScheduleEvent(SPELL_HEAL, 0.5 * (int) TIMER_HEAL);
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_okthor.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_okthor.cpp
@@ -51,9 +51,9 @@ public:

        uint32 nextArcaneExplosionTime;

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
-            _EnterCombat();
+            _JustEngagedWith();
            events.ScheduleEvent(SPELL_ARCANE_BOLT, 0.2 * (int) TIMER_ARCANE_BOLT);
            events.ScheduleEvent(SPELL_ARCANE_EXPLOSION, 0.2 * (int) TIMER_ARCANE_EXPLOSION);
            events.ScheduleEvent(SPELL_POLYMORPH, 0.2 * (int) TIMER_POLYMORPH);
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp
@@ -191,7 +191,7 @@ public:
            }
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            _events.ScheduleEvent(EVENT_SPELL_SHADOWBOLTVOLLEY, 10s);
            _events.ScheduleEvent(EVENT_SPELL_IMMOLATE, 18s);
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp
@@ -52,9 +52,9 @@ public:
            _conflagrateThreat = 0.0f;
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
-            _EnterCombat();
+            _JustEngagedWith();
            events.ScheduleEvent(EVENT_FLAMESTRIKE, 6s);
            events.ScheduleEvent(EVENT_CLEAVE, 8s);
            events.ScheduleEvent(EVENT_CONFLAGRATION, 15s);
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp
@@ -70,9 +70,9 @@ public:
            }
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
-            _EnterCombat();
+            _JustEngagedWith();

            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
@@ -52,9 +52,9 @@ public:
            _Reset();
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
-            _EnterCombat();
+            _JustEngagedWith();
            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 EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
-            _EnterCombat();
+            _JustEngagedWith();
            events.ScheduleEvent(EVENT_FRENZY, 20s);
            events.ScheduleEvent(EVENT_KNOCK_AWAY, 18s);
        }
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp
@@ -74,9 +74,9 @@ public:
            StartTalking(TALK_SUMMON, 8 * IN_MILLISECONDS);
        }

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

            Talk(TALK_AGGRO);

--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_mor_grayhoof.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_mor_grayhoof.cpp
@@ -189,9 +189,9 @@ struct boss_mor_grayhoof : public BossAI
        }
    }

-    void EnterCombat(Unit* /*who*/) override
+    void JustEngagedWith(Unit* /*who*/) override
    {
-        _EnterCombat();
+        _JustEngagedWith();
        Talk(SAY_AGGRO);
        _scheduler.Schedule(5s, 10s, PHASE_HUMAN, [this](TaskContext context)
            {
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp
@@ -68,9 +68,9 @@ public:
            Summoned = false;
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
-            _EnterCombat();
+            _JustEngagedWith();
            events.ScheduleEvent(EVENT_BLAST_WAVE, 20s);
            events.ScheduleEvent(EVENT_SHOUT, 2s);
            events.ScheduleEvent(EVENT_CLEAVE, 6s);
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp
@@ -120,7 +120,7 @@ public:
            }
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            // ### TODO Check combat timing ###
            events.ScheduleEvent(EVENT_FIRENOVA,    6s);
@@ -376,7 +376,7 @@ public:
                _events.ScheduleEvent(EVENT_ENCAGED_EMBERSEER, 1s);
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            // Used to close doors
            if (Creature* Emberseer = me->FindNearestCreature(NPC_PYROGAURD_EMBERSEER, 30.0f, true))
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp
@@ -49,9 +49,9 @@ struct boss_quartermaster_zigris : public BossAI
        _hasDrunkPotion = false;
    }

-    void EnterCombat(Unit* who) override
+    void JustEngagedWith(Unit* who) override
    {
-        BossAI::EnterCombat(who);
+        BossAI::JustEngagedWith(who);
        events.ScheduleEvent(EVENT_STUN_BOMB, 16s);
        events.ScheduleEvent(EVENT_HOOKED_NET, 14s);
        events.ScheduleEvent(EVENT_SHOOT, 1s);
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp
@@ -158,9 +158,9 @@ public:
            summon->AI()->DoZoneInCombat(nullptr, 100.0f);
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
-            _EnterCombat();
+            _JustEngagedWith();
            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_solakar_flamewreath.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_solakar_flamewreath.cpp
@@ -65,7 +65,7 @@ public:
            targetEgg = nullptr;
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            events.ScheduleEvent(SPELL_HATCH_EGG, 1s);
        }
@@ -181,9 +181,9 @@ public:
            DoZoneInCombat(nullptr, 100.0f);
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
-            _EnterCombat();
+            _JustEngagedWith();
            events.ScheduleEvent(SPELL_WAR_STOMP, 17s, 20s);
            resetTimer = 0;
        }
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp
@@ -113,9 +113,9 @@ public:
            }
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
-            _EnterCombat();
+            _JustEngagedWith();
            events.ScheduleEvent(EVENT_FLAME_BREAK, 12s);
            events.ScheduleEvent(EVENT_IMMOLATE, 3s);
            events.ScheduleEvent(EVENT_TERRIFYING_ROAR, 23s);
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp
@@ -67,9 +67,9 @@ public:
            }
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
-            _EnterCombat();
+            _JustEngagedWith();
            events.ScheduleEvent(SPELL_REND, 17s, 20s);
            events.ScheduleEvent(SPELL_STRIKE, 10s, 12s);
            events.ScheduleEvent(SPELL_INTIMIDATING_ROAR, 25s, 30s);
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp
@@ -64,9 +64,9 @@ public:
    {
        boss_warmastervooneAI(Creature* creature) : BossAI(creature, DATA_WARMASTER_VOONE) { }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
-            _EnterCombat();
+            _JustEngagedWith();

            events.SetPhase(PHASE_BRAWLER);
            events.ScheduleEvent(EVENT_THRASH, 3s, GROUP_BRAWLER, PHASE_BRAWLER);
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp
@@ -65,9 +65,9 @@ public:
    {
        boss_broodlordAI(Creature* creature) : BossAI(creature, DATA_BROODLORD_LASHLAYER) { }

-        void EnterCombat(Unit* who) override
+        void JustEngagedWith(Unit* who) override
        {
-            BossAI::EnterCombat(who);
+            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
@@ -100,9 +100,9 @@ public:
            Initialize();
        }

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

            events.ScheduleEvent(EVENT_SHIMMER, 1s);
            events.ScheduleEvent(EVENT_BREATH, 30s);
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp
@@ -57,9 +57,9 @@ public:
            }, 15s);
        }

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

            events.ScheduleEvent(EVENT_SHADOWFLAME, 18s);
            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 EnterCombat(Unit* who) override
+        void JustEngagedWith(Unit* who) override
        {
-            BossAI::EnterCombat(who);
+            BossAI::JustEngagedWith(who);

            events.ScheduleEvent(EVENT_SHADOWFLAME, 18s);
            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 EnterCombat(Unit* victim) override
+        void JustEngagedWith(Unit* who) override
        {
-            BossAI::EnterCombat(victim);
+            BossAI::JustEngagedWith(who);

            events.ScheduleEvent(EVENT_SHADOWFLAME, 18s);
            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
@@ -352,7 +352,7 @@ public:

        void BeginEvent()
        {
-            _EnterCombat();
+            _JustEngagedWith();

            Talk(SAY_GAMESBEGIN_2);

@@ -552,7 +552,7 @@ struct boss_nefarian : public BossAI
        classesPresent.clear();
    }

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

    void JustDied(Unit* /*killer*/) override
    {
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp
@@ -129,9 +129,9 @@ public:
            return true;
        }

-        void EnterCombat(Unit* /*victim*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
-            _EnterCombat();
+            _JustEngagedWith();

            events.ScheduleEvent(EVENT_CLEAVE, 15s);
            events.ScheduleEvent(EVENT_STOMP, 35s);
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp
@@ -114,9 +114,9 @@ public:
            }
        }

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

            DoCastAOE(SPELL_ESSENCE_OF_THE_RED);
            // now drop damage requirement to be able to take loot
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp
@@ -60,9 +60,9 @@ public:
            armageddonCasted = false;
        }

-        void EnterCombat(Unit* /*attacker*/) override
+        void JustEngagedWith(Unit* /*attacker*/) override
        {
-            _EnterCombat();
+            _JustEngagedWith();
            events.ScheduleEvent(EVENT_INFERNO, 13s, 15s);
            events.ScheduleEvent(EVENT_IGNITE_MANA, 7s, 19s);
            events.ScheduleEvent(EVENT_LIVING_BOMB, 11s, 16s);
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp
@@ -69,9 +69,9 @@ public:
            massEruptionTimer = 600000;
        }

-        void EnterCombat(Unit* /*attacker*/) override
+        void JustEngagedWith(Unit* /*attacker*/) override
        {
-            _EnterCombat();
+            _JustEngagedWith();
            DoCastSelf(SPELL_SEPARATION_ANXIETY, true);
            events.ScheduleEvent(EVENT_ANTIMAGIC_PULSE, 15s);
            events.ScheduleEvent(EVENT_MAGMA_SHACKLES, 10s);
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp
@@ -43,9 +43,9 @@ public:
    {
        boss_gehennasAI(Creature* creature) : BossAI(creature, DATA_GEHENNAS) {}

-        void EnterCombat(Unit* /*attacker*/) override
+        void JustEngagedWith(Unit* /*attacker*/) override
        {
-            _EnterCombat();
+            _JustEngagedWith();
            events.ScheduleEvent(EVENT_GEHENNAS_CURSE, 6s, 9s);
            events.ScheduleEvent(EVENT_RAIN_OF_FIRE, 10s);
            events.ScheduleEvent(EVENT_SHADOW_BOLT, 3s, 5s);
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp
@@ -42,9 +42,9 @@ public:
    {
        boss_lucifronAI(Creature* creature) : BossAI(creature, DATA_LUCIFRON) {}

-        void EnterCombat(Unit* /*victim*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
-            _EnterCombat();
+            _JustEngagedWith();
            events.ScheduleEvent(EVENT_IMPENDING_DOOM, 6s, 11s);
            events.ScheduleEvent(EVENT_LUCIFRON_CURSE, 11s, 14s);
            events.ScheduleEvent(EVENT_SHADOW_SHOCK, 5s);
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp
@@ -55,9 +55,9 @@ public:
    {
        boss_magmadarAI(Creature* creature) : BossAI(creature, DATA_MAGMADAR) {}

-        void EnterCombat(Unit* /*victim*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
-            _EnterCombat();
+            _JustEngagedWith();
            events.ScheduleEvent(EVENT_FRENZY, 8500ms);
            events.ScheduleEvent(EVENT_PANIC, 9500ms);
            events.ScheduleEvent(EVENT_LAVA_BOMB, 12s);
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp
@@ -237,14 +237,14 @@ public:
            }
        }

-        void EnterCombat(Unit* /*attacker*/) override
+        void JustEngagedWith(Unit* /*attacker*/) override
        {
            if (!events.IsInPhase(PHASE_COMBAT))
            {
                return;
            }

-            _EnterCombat();
+            _JustEngagedWith();
            DoCastAOE(SPELL_SEPARATION_ANXIETY);
            Talk(SAY_AGGRO);
            DoCastSelf(SPELL_AEGIS_OF_RAGNAROS, true);
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp
@@ -204,9 +204,9 @@ public:
            }
        }

-        void EnterCombat(Unit* /*victim*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
-            _EnterCombat();
+            _JustEngagedWith();
            events.SetPhase(PHASE_EMERGED);
            ScheduleCombatEvents();
        }
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp
@@ -49,9 +49,9 @@ public:
    {
        boss_shazzrahAI(Creature* creature) : BossAI(creature, DATA_SHAZZRAH) {}

-        void EnterCombat(Unit* /*target*/) override
+        void JustEngagedWith(Unit* /*target*/) override
        {
-            _EnterCombat();
+            _JustEngagedWith();
            events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, 2s, 4s);
            events.ScheduleEvent(EVENT_SHAZZRAH_CURSE, 7s,11s);
            events.ScheduleEvent(EVENT_MAGIC_GROUNDING, 14s, 19s);
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp
@@ -56,9 +56,9 @@ public:
    {
        boss_sulfuronAI(Creature* creature) : BossAI(creature, DATA_SULFURON) {}

-        void EnterCombat(Unit* /*victim*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
-            _EnterCombat();
+            _JustEngagedWith();
            events.ScheduleEvent(EVENT_DEMORALIZING_SHOUT, 6s, 20s);
            events.ScheduleEvent(EVENT_INSPIRE, 7s, 10s);
            events.ScheduleEvent(EVENT_KNOCKDOWN, 6s);
@@ -128,7 +128,7 @@ public:
            events.Reset();
        }

-        void EnterCombat(Unit* /*victim*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            events.ScheduleEvent(EVENT_DARK_STRIKE, 4s, 7s);
            events.ScheduleEvent(EVENT_DARK_MENDING, 15s, 30s);
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.cpp
@@ -226,7 +226,7 @@ struct npc_lava_spawn : public ScriptedAI
        _scheduler.CancelAll();
    }

-    void EnterCombat(Unit* /*who*/) override
+    void JustEngagedWith(Unit* /*who*/) override
    {
        _scheduler.Schedule(15s, [this](TaskContext context)
        {
--- a/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp
+++ b/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp
@@ -71,7 +71,7 @@ public:
            me->SetReactState(REACT_AGGRESSIVE);
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            events.ScheduleEvent(EVENT_CHECK_HEALTH1, 500ms);
            events.ScheduleEvent(EVENT_CHECK_HEALTH2, 500ms);
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp
@@ -79,9 +79,9 @@ public:
            Talk(SAY_DEATH);
        }

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

            events.ScheduleEvent(EVENT_SPELL_HATEFUL_BOLT, 10000);
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp
@@ -43,9 +43,9 @@ struct boss_maiden_of_virtue : public BossAI
 {
    boss_maiden_of_virtue(Creature* creature) : BossAI(creature, DATA_MAIDEN) { }

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

        DoCastAOE(SPELL_HOLY_GROUND, true);
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp
@@ -366,9 +366,9 @@ public:
            }
        }

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

            scheduler.Schedule(Seconds(15), Seconds(25), [this](TaskContext task)
            {
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp
@@ -124,9 +124,9 @@ struct boss_moroes : public BossAI
        DoCastSelf(SPELL_DUAL_WIELD, true);
    }

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

        events.ScheduleEvent(EVENT_SPELL_VANISH, 30s);
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp
@@ -251,7 +251,7 @@ public:
                Door->SetGoState(open ? GO_STATE_ACTIVE : GO_STATE_READY);
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            HandleDoors(false);
            SwitchToPortalPhase();
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp
@@ -158,7 +158,7 @@ public:
            }
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            if (instance)
                instance->SetData(DATA_NIGHTBANE, IN_PROGRESS);
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp
@@ -105,7 +105,7 @@ public:
        InfernalPoint* point;

        void Reset() override { }
-        void EnterCombat(Unit* /*who*/) override { }
+        void JustEngagedWith(Unit* /*who*/) override { }
        void MoveInLineOfSight(Unit* /*who*/) override { }

        void UpdateAI(uint32 diff) override
@@ -233,7 +233,7 @@ public:
            }
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            Talk(SAY_AGGRO);
            DoZoneInCombat();
@@ -485,7 +485,7 @@ public:
        {
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            DoZoneInCombat();
        }
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_servant_quarters.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_servant_quarters.cpp
@@ -70,7 +70,7 @@ struct boss_servant_quarters : public BossAI
            me->DespawnOrUnsummon(1);
    }

-    void EnterCombat(Unit*  /*who*/) override
+    void JustEngagedWith(Unit*  /*who*/) override
    {
        me->setActive(true);
        if (me->GetEntry() == NPC_HYAKISS_THE_LURKER)
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
@@ -150,7 +150,7 @@ public:
            instance->HandleGameObject(instance->GetGuidData(DATA_GO_LIBRARY_DOOR), true);
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            Talk(SAY_AGGRO);

@@ -584,7 +584,7 @@ public:
            CastTimer = 2000 + (rand() % 3000);
        }

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

        void UpdateAI(uint32 diff) override
        {
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
@@ -91,7 +91,7 @@ public:
            AmplifyTimer = 2000;
        }

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

@@ -148,7 +148,7 @@ public:
            SacrificeGUID.Clear();
        }

-        void EnterCombat(Unit* /*who*/) override { }
+        void JustEngagedWith(Unit* /*who*/) override { }
        void AttackStart(Unit* /*who*/) override { }
        void MoveInLineOfSight(Unit* /*who*/) override { }

@@ -219,7 +219,7 @@ public:
            FireboltTimer = 2000;
        }

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

        void UpdateAI(uint32 diff) override
        {
@@ -313,7 +313,7 @@ public:
                DoCast(me, SPELL_SUMMON_IMP, true);
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            Talk(SAY_AGGRO);
            DoZoneInCombat();
--- a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
@@ -158,7 +158,7 @@ public:
            Initialize();
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            Talk(SAY_DOROTHEE_AGGRO);
            DoZoneInCombat();
@@ -263,7 +263,7 @@ public:
            YipTimer = 10000;
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            DoZoneInCombat();
        }
@@ -358,7 +358,7 @@ public:
            ScriptedAI::MoveInLineOfSight(who);
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            Talk(SAY_STRAWMAN_AGGRO);
            DoZoneInCombat();
@@ -467,7 +467,7 @@ public:
            RustCount   = 0;
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            Talk(SAY_TINHEAD_AGGRO);
            DoZoneInCombat();
@@ -599,7 +599,7 @@ public:
            ScriptedAI::AttackStart(who);
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            Talk(SAY_ROAR_AGGRO);
            DoZoneInCombat();
@@ -707,7 +707,7 @@ public:
            Talk(SAY_CRONE_SLAY);
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            Talk(SAY_CRONE_AGGRO);
            DoZoneInCombat();
@@ -775,7 +775,7 @@ public:
            MoveTimer = 1000;
        }

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

        void MoveInLineOfSight(Unit* /*who*/) override

@@ -886,7 +886,7 @@ public:
            IsChasing = false;
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            Talk(SAY_WOLF_AGGRO);
            DoZoneInCombat();
@@ -1118,7 +1118,7 @@ public:
            RomuloDead = false;
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            DoZoneInCombat();
        }
@@ -1288,7 +1288,7 @@ public:
            //LOG_ERROR("scripts", "boss_romuloAI: DamageTaken reach end of code, that should not happen.");
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            DoZoneInCombat();
            Talk(SAY_ROMULO_AGGRO);
--- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
@@ -168,7 +168,7 @@ public:
            Start(false, false);
        }

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

        void WaypointReached(uint32 waypointId) override
        {
@@ -480,7 +480,7 @@ public:
                me->DespawnOrUnsummon();
        }

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

        uint32 NextStep(uint32 nextStep)
        {
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
@@ -128,7 +128,7 @@ public:
            instance->SetData(DATA_KAELTHAS_EVENT, DONE);
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            instance->SetData(DATA_KAELTHAS_EVENT, IN_PROGRESS);
            me->SetInCombatWithZone();
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
@@ -147,7 +147,7 @@ public:
            ++HelpersKilled;
        }

-        void EnterCombat(Unit*  /*who*/) override
+        void JustEngagedWith(Unit*  /*who*/) override
        {
            Talk(SAY_AGGRO);
            summons.DoZoneInCombat();
@@ -336,7 +336,7 @@ struct boss_priestess_lackey_commonAI : public ScriptedAI
        ScriptedAI::EnterEvadeMode(why);
    }

-    void EnterCombat(Unit* who) override
+    void JustEngagedWith(Unit* who) override
    {
        if (Creature* delrissa = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_DELRISSA)))
            if (delrissa->IsAlive() && !delrissa->IsEngaged())
@@ -434,9 +434,9 @@ public:
    {
        boss_kagani_nightstrikeAI(Creature* creature) : boss_priestess_lackey_commonAI(creature, AI_TYPE_MELEE) { }

-        void EnterCombat(Unit* who) override
+        void JustEngagedWith(Unit* who) override
        {
-            boss_priestess_lackey_commonAI::EnterCombat(who);
+            boss_priestess_lackey_commonAI::JustEngagedWith(who);

            events.ScheduleEvent(EVENT_SPELL_GOUGE, 5500);
            events.ScheduleEvent(EVENT_SPELL_KICK, 9000);
@@ -534,10 +534,10 @@ public:
    {
        boss_ellris_duskhallowAI(Creature* creature) : boss_priestess_lackey_commonAI(creature, AI_TYPE_RANGED) { }

-        void EnterCombat(Unit* who) override
+        void JustEngagedWith(Unit* who) override
        {
            me->CastSpell(me, SPELL_SUMMON_IMP, false);
-            boss_priestess_lackey_commonAI::EnterCombat(who);
+            boss_priestess_lackey_commonAI::JustEngagedWith(who);

            events.ScheduleEvent(EVENT_SPELL_IMMOLATE, 3000);
            events.ScheduleEvent(EVENT_SPELL_SHADOW_BOLT, 1000);
@@ -612,9 +612,9 @@ public:
    {
        boss_eramas_brightblazeAI(Creature* creature) : boss_priestess_lackey_commonAI(creature, AI_TYPE_MELEE) { }

-        void EnterCombat(Unit* who) override
+        void JustEngagedWith(Unit* who) override
        {
-            boss_priestess_lackey_commonAI::EnterCombat(who);
+            boss_priestess_lackey_commonAI::JustEngagedWith(who);

            events.ScheduleEvent(EVENT_SPELL_KNOCKDOWN, 6000);
            events.ScheduleEvent(EVENT_SPELL_SNAP_KICK, 3000);
@@ -686,9 +686,9 @@ public:
    {
        boss_yazzaiAI(Creature* creature) : boss_priestess_lackey_commonAI(creature, AI_TYPE_RANGED) { }

-        void EnterCombat(Unit* who) override
+        void JustEngagedWith(Unit* who) override
        {
-            boss_priestess_lackey_commonAI::EnterCombat(who);
+            boss_priestess_lackey_commonAI::JustEngagedWith(who);

            events.ScheduleEvent(EVENT_SPELL_POLYMORPH, 1000);
            events.ScheduleEvent(EVENT_SPELL_ICE_BLOCK, 1000);
@@ -794,9 +794,9 @@ public:
    {
        boss_warlord_salarisAI(Creature* creature) : boss_priestess_lackey_commonAI(creature, AI_TYPE_MELEE) { }

-        void EnterCombat(Unit* who) override
+        void JustEngagedWith(Unit* who) override
        {
-            boss_priestess_lackey_commonAI::EnterCombat(who);
+            boss_priestess_lackey_commonAI::JustEngagedWith(who);
            me->CastSpell(me, SPELL_BATTLE_SHOUT, false);

            events.ScheduleEvent(EVENT_SPELL_DISARM, 6000);
@@ -886,9 +886,9 @@ public:
            me->SummonCreature(NPC_SLIVER, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 0);
        }

-        void EnterCombat(Unit* who) override
+        void JustEngagedWith(Unit* who) override
        {
-            boss_priestess_lackey_commonAI::EnterCombat(who);
+            boss_priestess_lackey_commonAI::JustEngagedWith(who);
            me->CastSpell(me, SPELL_FREEZING_TRAP, true);

            events.ScheduleEvent(EVENT_SPELL_AIMED_SHOT, 8000);
@@ -976,9 +976,9 @@ public:
        uint32 Healing_Wave_Timer;
 //        uint32 Frost_Shock_Timer;

-        void EnterCombat(Unit* who) override
+        void JustEngagedWith(Unit* who) override
        {
-            boss_priestess_lackey_commonAI::EnterCombat(who);
+            boss_priestess_lackey_commonAI::JustEngagedWith(who);

            events.ScheduleEvent(EVENT_SPELL_TOTEM1, 2000);
            events.ScheduleEvent(EVENT_SPELL_TOTEM2, 4000);
@@ -1067,9 +1067,9 @@ public:
    {
        boss_zelfanAI(Creature* creature) : boss_priestess_lackey_commonAI(creature, AI_TYPE_RANGED) { }

-        void EnterCombat(Unit* who) override
+        void JustEngagedWith(Unit* who) override
        {
-            boss_priestess_lackey_commonAI::EnterCombat(who);
+            boss_priestess_lackey_commonAI::JustEngagedWith(who);

            events.ScheduleEvent(EVENT_SPELL_DRAGON_GUN, 20000);
            events.ScheduleEvent(EVENT_SPELL_ROCKET_LAUNCH, 7000);
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
@@ -111,7 +111,7 @@ public:
            me->SetPower(POWER_MANA, 0);
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            Talk(SAY_AGGRO);
            instance->SetData(DATA_SELIN_EVENT, IN_PROGRESS);
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
@@ -104,7 +104,7 @@ public:
            instance->DoRemoveAurasDueToSpellOnPlayers(SPELL_ENERGY_FEEDBACK);
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            Talk(SAY_AGGRO);
            instance->SetData(DATA_VEXALLUS_EVENT, IN_PROGRESS);
--- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
@@ -748,7 +748,7 @@ public:
            me->LoadEquipment(0, true);
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            events.ScheduleEvent(EVENT_ICY_TOUCH, 1s, GCD_CAST);
            events.ScheduleEvent(EVENT_PLAGUE_STRIKE, 3s, GCD_CAST);
--- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
@@ -69,7 +69,7 @@ public:
            me->RestoreFaction();
        }

-        void EnterCombat(Unit*) override
+        void JustEngagedWith(Unit*) override
        {
            if (roll_chance_i(33))
                Talk(SAY_AGGRO);
@@ -432,7 +432,7 @@ public:
            uiStage_timer = 3000;
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            Talk(SAY_TREE2);
            me->Dismount();
@@ -525,7 +525,7 @@ public:
            uiValroth_Smite_timer = 1000;
        }

-        void EnterCombat(Unit* who) override
+        void JustEngagedWith(Unit* who) override
        {
            Talk(SAY_VALROTH_AGGRO);
            DoCast(who, SPELL_VALROTH_SMITE);
--- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp
@@ -520,7 +520,7 @@ public:
            }
        }

-        void EnterCombat(Unit*) override
+        void JustEngagedWith(Unit*) override
        {
            if (battleStarted != ENCOUNTER_STATE_FIGHT)
                return;
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp
@@ -411,7 +411,7 @@ public:
            ScriptedAI::MoveInLineOfSight(who);
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            Talk(SAY_MO_AGGRO);
            me->CastSpell(me, SPELL_RETRIBUTION_AURA, true);
@@ -568,7 +568,7 @@ public:
            instance->SetData(TYPE_MOGRAINE_AND_WHITE_EVENT, FAIL);
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            Talk(SAY_WH_INTRO);
            events.ScheduleEvent(EVENT_SPELL_HOLY_SMITE, 1s, 3s);
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp
@@ -183,7 +183,7 @@ public:
            }
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            DoZoneInCombat();
            instance->SetData(DATA_DARKMASTER_GANDLING, IN_PROGRESS);
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp
@@ -85,7 +85,7 @@ public:
        EventMap events2;
        InstanceScript* instance;

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            TransformsCount = 0;

--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp
@@ -83,7 +83,7 @@ struct boss_kormok : public ScriptedAI
        });
    }

-    void EnterCombat(Unit* /*who*/) override
+    void JustEngagedWith(Unit* /*who*/) override
    {
        Talk(TALK_AGGRO);

--- a/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp
@@ -380,7 +380,7 @@ public:
            }
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            originalDisplayId = me->GetDisplayId();

--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp
@@ -60,7 +60,7 @@ public:
            });
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            _scheduler.Schedule(1s, [this](TaskContext context){
                DoCastVictim(SPELL_BANSHEEWAIL);
--- a/src/server/scripts/EasternKingdoms/Stratholme/boss_jarien_and_sothos.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_jarien_and_sothos.cpp
@@ -181,9 +181,9 @@ struct boss_jarien : public BossAI
        }
    }

-    void EnterCombat(Unit* /*who*/) override
+    void JustEngagedWith(Unit* /*who*/) override
    {
-        _EnterCombat();
+        _JustEngagedWith();
        _scheduler.Schedule(5s, [this](TaskContext context)
            {
                DoCastVictim(SPELL_SHADOW_SHOCK);
@@ -307,9 +307,9 @@ struct boss_sothos : public BossAI
        }
    }

-    void EnterCombat(Unit* /*who*/) override
+    void JustEngagedWith(Unit* /*who*/) override
    {
-        _EnterCombat();
+        _JustEngagedWith();
        _scheduler.Schedule(10s, [this](TaskContext context)
            {
                DoCastAOE(SPELL_FEAR);
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp
@@ -82,13 +82,13 @@ public:
            }
        }

-        void EnterCombat(Unit* who) override
+        void JustEngagedWith(Unit* who) override
        {
            if (who->GetEntry() == NPC_MADRIGOSA)
                return;

            Talk(YELL_AGGRO);
-            BossAI::EnterCombat(who);
+            BossAI::JustEngagedWith(who);

            events.ScheduleEvent(EVENT_SPELL_SLASH, 11000);
            events.ScheduleEvent(EVENT_SPELL_STOMP, 30000);
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp
@@ -123,9 +123,9 @@ public:
            }
        }

-        void EnterCombat(Unit* who) override
+        void JustEngagedWith(Unit* who) override
        {
-            BossAI::EnterCombat(who);
+            BossAI::JustEngagedWith(who);
            if (Creature* alythess = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_GRAND_WARLOCK_ALYTHESS)))
                if (alythess->IsAlive() && !alythess->IsInCombat())
                    alythess->AI()->AttackStart(who);
@@ -271,9 +271,9 @@ public:
            }
        }

-        void EnterCombat(Unit* who) override
+        void JustEngagedWith(Unit* who) override
        {
-            BossAI::EnterCombat(who);
+            BossAI::JustEngagedWith(who);
            if (Creature* scorlash = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_LADY_SACROLASH)))
                if (scorlash->IsAlive() && !scorlash->IsInCombat())
                    scorlash->AI()->AttackStart(who);
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp
@@ -160,9 +160,9 @@ public:
            instance->DoRemoveAurasDueToSpellOnPlayers(SPELL_FOG_OF_CORRUPTION_CHARM);
        }

-        void EnterCombat(Unit* who) override
+        void JustEngagedWith(Unit* who) override
        {
-            BossAI::EnterCombat(who);
+            BossAI::JustEngagedWith(who);
            me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
            if (events.Empty() && events2.Empty())
                events2.ScheduleEvent(EVENT_INTRO_2, 3000);
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
@@ -201,9 +201,9 @@ public:
            BossAI::JustDied(killer);
        }

-        void EnterCombat(Unit* who) override
+        void JustEngagedWith(Unit* who) override
        {
-            BossAI::EnterCombat(who);
+            BossAI::JustEngagedWith(who);
            events.ScheduleEvent(EVENT_ARCANE_BUFFET, 6000);
            events.ScheduleEvent(EVENT_FROST_BREATH, 15000);
            events.ScheduleEvent(EVENT_WILD_MAGIC, 10000);
@@ -409,7 +409,7 @@ public:
                damage = 0;
        }

-        void EnterCombat(Unit*) override
+        void JustEngagedWith(Unit*) override
        {
            events.ScheduleEvent(EVENT_CHECK_HEALTH, 1000);
            events.ScheduleEvent(EVENT_CHECK_HEALTH2, 1000);
@@ -523,7 +523,7 @@ public:
            events.ScheduleEvent(EVENT_CHECK_HEALTH2, 1000);
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            Talk(SAY_SATH_AGGRO);
        }
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
@@ -364,7 +364,7 @@ public:
                Talk(SAY_KJ_SLAY);
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            events2.ScheduleEvent(EVENT_TEXT_SPEACH11, 26000, EVENT_GROUP_SPEACH);
            Talk(SAY_KJ_EMERGE);
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp
@@ -86,9 +86,9 @@ public:
            me->SetVisible(true);
        }

-        void EnterCombat(Unit* who) override
+        void JustEngagedWith(Unit* who) override
        {
-            BossAI::EnterCombat(who);
+            BossAI::JustEngagedWith(who);
            me->CastSpell(me, SPELL_NEGATIVE_ENERGY, true);
            me->CastSpell(me, SPELL_SUMMON_BLOOD_ELVES_PERIODIC, true);
            me->CastSpell(me, SPELL_OPEN_PORTAL_PERIODIC, true);
@@ -186,7 +186,7 @@ public:
            me->DespawnOrUnsummon();
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            events.ScheduleEvent(EVENT_SPAWN_BLACK_HOLE, 15000);
            events.ScheduleEvent(EVENT_SPAWN_DARKNESS, 10000);
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
@@ -110,7 +110,7 @@ public:
            SetWeather(WEATHER_STATE_FINE, 0.0f);
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            events.ScheduleEvent(EVENT_STATIC_DISRUPTION, urand(10000, 20000)); // 10 to 20 seconds (bosskillers)
            events.ScheduleEvent(EVENT_GUST_OF_WIND, urand(20000, 30000));      // 20 to 30 seconds(bosskillers)
@@ -391,7 +391,7 @@ public:
            me->SetDisableGravity(true);
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            DoZoneInCombat();
        }
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
@@ -105,7 +105,7 @@ public:
            EnterPhase(PHASE_LYNX);
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            instance->SetData(DATA_HALAZZIEVENT, IN_PROGRESS);
            Talk(SAY_AGGRO);
@@ -350,7 +350,7 @@ public:
                ScriptedAI::AttackStart(who);
        }

-        void EnterCombat(Unit* /*who*/) override {/*DoZoneInCombat();*/ }
+        void JustEngagedWith(Unit* /*who*/) override {/*DoZoneInCombat();*/ }

        void UpdateAI(uint32 diff) override
        {
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
@@ -228,7 +228,7 @@ struct boss_hexlord_addAI : public ScriptedAI

    void Reset() override { }

-    void EnterCombat(Unit* /*who*/) override
+    void JustEngagedWith(Unit* /*who*/) override
    {
        DoZoneInCombat();
    }
@@ -294,7 +294,7 @@ public:
            me->SetByteValue(UNIT_FIELD_BYTES_2, 0, SHEATH_STATE_MELEE);
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            instance->SetData(DATA_HEXLORDEVENT, IN_PROGRESS);

--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
@@ -175,7 +175,7 @@ public:
            Talk(SAY_SLAY);
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            instance->SetData(DATA_JANALAIEVENT, IN_PROGRESS);

@@ -451,7 +451,7 @@ public:
                DoCast(me, SPELL_FIRE_BOMB_DUMMY, true);
        }

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

        void AttackStart(Unit* /*who*/) override { }

@@ -524,7 +524,7 @@ public:
            return num == 0;   // if num == 0, no more templist
        }

-        void EnterCombat(Unit* /*who*/) override { }
+        void JustEngagedWith(Unit* /*who*/) override { }
        void AttackStart(Unit* /*who*/) override { }
        void MoveInLineOfSight(Unit* /*who*/) override { }

@@ -618,7 +618,7 @@ public:
            me->SetDisableGravity(true);
        }

-        void EnterCombat(Unit* /*who*/) override {/*DoZoneInCombat();*/ }
+        void JustEngagedWith(Unit* /*who*/) override {/*DoZoneInCombat();*/ }

        void UpdateAI(uint32 diff) override
        {
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
@@ -280,7 +280,7 @@ public:
            }
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            if (instance)
                instance->SetData(DATA_NALORAKKEVENT, IN_PROGRESS);
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
@@ -201,7 +201,7 @@ public:
            //me->SetByteValue(UNIT_FIELD_BYTES_2, 0, SHEATH_STATE_MELEE);
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            instance->SetData(DATA_ZULJINEVENT, IN_PROGRESS);

@@ -580,7 +580,7 @@ public:

        void Reset() override { }

-        void EnterCombat(Unit* /*target*/) override { }
+        void JustEngagedWith(Unit* /*target*/) override { }

        void SpellHit(Unit* caster, SpellInfo const* spell) override
        {
--- a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
@@ -144,7 +144,7 @@ public:

        void Reset() override { }

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

        void MovementInform(uint32 type, uint32 data) override
        {
@@ -469,7 +469,7 @@ public:

        void Reset() override { }

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

        void JustDied(Unit* /*killer*/) override
        {
@@ -618,7 +618,7 @@ public:
            uiTargetGUID.Clear();
        }

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

        void sGossipSelect(Player* player, uint32 sender, uint32 action) override
        {
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
@@ -115,9 +115,9 @@ public:
            Talk(SAY_DEATH);
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
-            _EnterCombat();
+            _JustEngagedWith();
            events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 7s, 9s, 0, PHASE_ONE);
            events.ScheduleEvent(EVENT_GOUGE, 12s, 15s, 0, PHASE_ONE);
            events.ScheduleEvent(EVENT_SUMMON_PROWLERS, 6s, 0, PHASE_ALL);
@@ -341,7 +341,7 @@ public:
            _events.ScheduleEvent(EVENT_ATTACK, 6000);
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            me->GetMotionMaster()->Clear(false);
            me->RemoveAura(SPELL_SNEAK_RANK_1_1);
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp
@@ -72,9 +72,9 @@ public:
            _JustDied();
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
-            _EnterCombat();
+            _JustEngagedWith();
            me->AddAura(SPELL_THRASH, me);
            events.ScheduleEvent(EVENT_FROSTBREATH, 8s);
            events.ScheduleEvent(EVENT_MASSIVEGEYSER, 25s);
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
@@ -61,9 +61,9 @@ public:
            BossAI::Reset();
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
-            _EnterCombat();
+            _JustEngagedWith();
            events.ScheduleEvent(EVENT_AVATAR, 20s, 30s);
            events.ScheduleEvent(EVENT_GROUND_TREMOR, 15s, 25s);
            events.ScheduleEvent(EVENT_ENTANGLING_ROOTS, 5s, 15s);
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
@@ -110,9 +110,9 @@ public:
            _JustDied();
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
-            _EnterCombat();
+            _JustEngagedWith();
            events.ScheduleEvent(EVENT_BLOOD_SIPHON, 90s);
            events.ScheduleEvent(EVENT_CORRUPTED_BLOOD, 25s);
            events.ScheduleEvent(EVENT_CAUSE_INSANITY, 17s);
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
@@ -69,9 +69,9 @@ struct boss_hazzarah : public BossAI
        summon->DespawnOrUnsummon();
    }

-    void EnterCombat(Unit* /*who*/) override
+    void JustEngagedWith(Unit* /*who*/) override
    {
-        _EnterCombat();
+        _JustEngagedWith();
        events.ScheduleEvent(EVENT_SLEEP, 12s, 15s);
        events.ScheduleEvent(EVENT_EARTH_SHOCK, 8s, 18s);
        events.ScheduleEvent(EVENT_CHAIN_BURN, 12s, 28s);
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
@@ -132,7 +132,7 @@ struct boss_jeklik : public BossAI
        BossAI::EnterEvadeMode(why);
    }

-    void EnterCombat(Unit* /*who*/) override
+    void JustEngagedWith(Unit* /*who*/) override
    {
        Talk(SAY_AGGRO);
        me->RemoveAurasDueToSpell(SPELL_GREEN_CHANNELING);
@@ -147,7 +147,7 @@ struct boss_jeklik : public BossAI
    {
        me->SetHover(false);
        me->SetDisableGravity(false);
-        _EnterCombat();
+        _JustEngagedWith();
        SetCombatMovement(true);
        me->SetReactState(REACT_AGGRESSIVE);
        events.SetPhase(PHASE_ONE);
@@ -285,7 +285,7 @@ struct npc_batrider : public ScriptedAI
        me->AddUnitState(UNIT_STATE_ROOT);
    }

-    void EnterCombat(Unit* /*who*/) override
+    void JustEngagedWith(Unit* /*who*/) override
    {
        _scheduler.Schedule(2s, [this](TaskContext context)
        {
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
@@ -58,9 +58,9 @@ struct boss_jindo : public BossAI
 {
    boss_jindo(Creature* creature) : BossAI(creature, DATA_JINDO) { }

-    void EnterCombat(Unit* who) override
+    void JustEngagedWith(Unit* who) override
    {
-        BossAI::EnterCombat(who);
+        BossAI::JustEngagedWith(who);
        events.ScheduleEvent(EVENT_BRAIN_WASH_TOTEM, 20s);
        events.ScheduleEvent(EVENT_POWERFULL_HEALING_WARD, 16s);
        events.ScheduleEvent(EVENT_HEX, 8s);
@@ -187,7 +187,7 @@ struct npc_healing_ward : public ScriptedAI
        _scheduler.CancelAll();
    }

-    void EnterCombat(Unit* /*who*/) override
+    void JustEngagedWith(Unit* /*who*/) override
    {
        _scheduler.
            Schedule(2s, [this](TaskContext context)
@@ -237,7 +237,7 @@ struct npc_shade_of_jindo : public ScriptedAI
            });
    }

-    void EnterCombat(Unit* /*who*/) override
+    void JustEngagedWith(Unit* /*who*/) override
    {
        _scheduler.
            Schedule(1s, [this](TaskContext context)
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
@@ -184,9 +184,9 @@ public:
            instance->SaveToDB();
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
-            _EnterCombat();
+            _JustEngagedWith();
            events.ScheduleEvent(EVENT_OVERPOWER, 1s);
            events.ScheduleEvent(EVENT_MORTAL_STRIKE, 14s, 28s);
            events.ScheduleEvent(EVENT_WHIRLWIND, 24s, 30s);
@@ -537,9 +537,9 @@ public:
            reviveGUID.Clear();
        }

-        void EnterCombat(Unit* victim) override
+        void JustEngagedWith(Unit* who) override
        {
-            if (victim->GetTypeId() != TYPEID_PLAYER)
+            if (who->GetTypeId() != TYPEID_PLAYER)
                return;

            _scheduler.Schedule(6s, 12s, [this](TaskContext context)
@@ -672,7 +672,7 @@ struct npc_vilebranch_speaker : public ScriptedAI
        _scheduler.CancelAll();
    }

-    void EnterCombat(Unit* /*who*/) override
+    void JustEngagedWith(Unit* /*who*/) override
    {
        _scheduler
            .Schedule(2s, 4s, [this](TaskContext context)
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
@@ -122,9 +122,9 @@ struct boss_marli : public BossAI
        Talk(SAY_DEATH);
    }

-    void EnterCombat(Unit* who) override
+    void JustEngagedWith(Unit* who) override
    {
-        BossAI::EnterCombat(who);
+        BossAI::JustEngagedWith(who);
        events.ScheduleEvent(EVENT_SPAWN_START_SPIDERS, 1s, 0, PHASE_ONE);
        Talk(SAY_AGGRO);
    }
@@ -253,7 +253,7 @@ struct npc_spawn_of_marli : public ScriptedAI
        _scheduler.CancelAll();
    }

-    void EnterCombat(Unit* /*who*/) override
+    void JustEngagedWith(Unit* /*who*/) override
    {
        _scheduler.Schedule(4s, [this](TaskContext context)
        {
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
@@ -63,9 +63,9 @@ public:
            _dynamicFlags = me->GetDynamicFlags();
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
-            _EnterCombat();
+            _JustEngagedWith();
            events.ScheduleEvent(EVENT_VANISH, 23s, 25s);
            events.ScheduleEvent(EVENT_GOUGE, 5s, 10s);
            events.ScheduleEvent(EVENT_THOUSAND_BLADES, 15s, 20s);
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
@@ -121,9 +121,9 @@ public:
            }
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
-            _EnterCombat();
+            _JustEngagedWith();

            _scheduler.CancelAll();
            _scheduler.Schedule(4s, [this](TaskContext context) {
@@ -306,7 +306,7 @@ public:
            });
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            _scheduler.Schedule(1s, [this](TaskContext context) {
                DoCastSelf(SPELL_SHIELD);
@@ -391,7 +391,7 @@ public:
            });
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            _scheduler.Schedule(13s, [this](TaskContext context) {
                DoCastSelf(SPELL_SWEEPINGSTRIKES);
--- a/Show More
+++ b/Show More