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

Co-authored-by: Treeston <14020072+Treeston@users.noreply.github.com>
2026-01-28 08:06:23 +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/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp
@@ -76,7 +76,7 @@ public:
                instance->SetData(DATA_ANETHERONEVENT, NOT_STARTED);
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            if (IsEvent)
                instance->SetData(DATA_ANETHERONEVENT, IN_PROGRESS);
@@ -208,7 +208,7 @@ public:
            CheckTimer = 5000;
        }

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

--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
@@ -127,7 +127,7 @@ public:
            me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
        }

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

        void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask) override
        {
@@ -172,7 +172,7 @@ public:

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

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

        void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask) override
        {
@@ -215,7 +215,7 @@ public:
                TargetGUID = who->GetGUID();
        }

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

        void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask) override
        {
@@ -347,7 +347,7 @@ public:
                }
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            me->InterruptSpell(CURRENT_CHANNELED_SPELL);
            Talk(SAY_AGGRO);
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp
@@ -82,7 +82,7 @@ public:
                instance->SetData(DATA_AZGALOREVENT, NOT_STARTED);
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            if (IsEvent)
                instance->SetData(DATA_AZGALOREVENT, IN_PROGRESS);
@@ -213,7 +213,7 @@ public:
            CheckTimer = 5000;
        }

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

--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp
@@ -78,7 +78,7 @@ public:
                instance->SetData(DATA_KAZROGALEVENT, NOT_STARTED);
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            if (IsEvent)
                instance->SetData(DATA_KAZROGALEVENT, IN_PROGRESS);
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp
@@ -73,7 +73,7 @@ public:
                instance->SetData(DATA_RAGEWINTERCHILLEVENT, NOT_STARTED);
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            if (IsEvent)
                instance->SetData(DATA_RAGEWINTERCHILLEVENT, IN_PROGRESS);
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
@@ -420,7 +420,7 @@ void hyjalAI::EnterEvadeMode(EvadeReason /*why*/)
    me->SetLootRecipient(nullptr);
 }

-void hyjalAI::EnterCombat(Unit* /*who*/)
+void hyjalAI::JustEngagedWith(Unit* /*who*/)
 {
    if (IsDummy)return;
    for (uint8 i = 0; i < HYJAL_AI_MAX_SPELLS; ++i)
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h
@@ -124,7 +124,7 @@ struct hyjalAI : public npc_escortAI

    void EnterEvadeMode(EvadeReason /*why*/ = EVADE_REASON_OTHER) override;                                  // Send creature back to spawn location and evade.

-    void EnterCombat(Unit* /*who*/) override;                                  // Used to reset cooldowns for our spells and to inform the raid that we're under attack
+    void JustEngagedWith(Unit* /*who*/) override;                                  // Used to reset cooldowns for our spells and to inform the raid that we're under attack

    void UpdateAI(uint32 diff) override;                       // Called to summon waves, check for boss deaths and to cast our spells.

--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp
@@ -437,7 +437,7 @@ public:
            imol = false;
        }

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

        void WaypointReached(uint32 waypointId) override
        {
@@ -590,7 +590,7 @@ public:
            }
        }

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

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

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

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

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

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

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

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

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

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

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

        void UpdateAI(uint32 diff) override
        {
@@ -1190,7 +1190,7 @@ public:
            me->SetPosition(x, y, z, 0);
        }

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

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

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

--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp
@@ -73,7 +73,7 @@ public:
            warps = 0;
        }

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

--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp
@@ -75,7 +75,7 @@ public:

        void JustSummoned(Creature* cr) override { summons.Summon(cr); }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            me->InterruptNonMeleeSpells(false);
            events.ScheduleEvent(EVENT_SPELL_VOID_STRIKE, 8000);
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp
@@ -84,7 +84,7 @@ public:
            }
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            Talk(SAY_AGGRO);
            events.ScheduleEvent(EVENT_SPELL_CARRION_SWARM, 6000);
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp
@@ -63,7 +63,7 @@ public:
        EventMap events;
        void Reset() override { events.Reset(); }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            Talk(SAY_AGGRO);
            events.RescheduleEvent(EVENT_SPELL_CONSTRICTING_CHAINS, 15000);
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp
@@ -80,7 +80,7 @@ public:

        void JustSummoned(Creature* cr) override { summons.Summon(cr); }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            Talk(SAY_AGGRO);
            events.ScheduleEvent(EVENT_SPELL_SHADOW_BOLT, 7000);
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
@@ -385,7 +385,7 @@ public:
        void ScheduleNextEvent(uint32 currentEvent, uint32 time);
        void SummonNextWave();
        void ReorderInstance(uint32 data);
-        void EnterCombat(Unit* /*who*/) override ;
+        void JustEngagedWith(Unit* /*who*/) override ;
        void SendNextWave(uint32 entry);
        void SpawnTimeRift();

@@ -1232,7 +1232,7 @@ void npc_arthas::npc_arthasAI::SummonNextWave()
        me->SummonCreature(/*entry*/(uint32)WavesLocations[tableId][i][0], WavesLocations[tableId][i][1], WavesLocations[tableId][i][2], WavesLocations[tableId][i][3], WavesLocations[tableId][i][4]);
 }

-void npc_arthas::npc_arthasAI::EnterCombat(Unit* /*who*/)
+void npc_arthas::npc_arthasAI::JustEngagedWith(Unit* /*who*/)
 {
    DoCast(me, SPELL_ARTHAS_AURA);

--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp
@@ -149,7 +149,7 @@ public:
            }
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            me->CastSpell(me, SPELL_DEVOTION_AURA, true);

--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp
@@ -57,7 +57,7 @@ public:
        {
        }

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

--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_lieutenant_drake.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_lieutenant_drake.cpp
@@ -94,7 +94,7 @@ public:
            events.Reset();
        }

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

--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
@@ -444,7 +444,7 @@ public:
            }
        }

-        void EnterCombat(Unit*) override
+        void JustEngagedWith(Unit*) override
        {
            combatEvents.Reset();
            combatEvents.ScheduleEvent(EVENT_CHECK_HEALTH, 500);
--- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp
@@ -83,7 +83,7 @@ public:
            }
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            events.ScheduleEvent(EVENT_CLEAVE, 5000);
            events.ScheduleEvent(EVENT_SANDBREATH, 20000);
--- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp
@@ -71,7 +71,7 @@ public:
            ScriptedAI::InitializeAI();
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            events.ScheduleEvent(EVENT_ARCANE_BLAST, 10000);
            events.ScheduleEvent(EVENT_TIME_LAPSE, 15000);
--- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp
@@ -70,7 +70,7 @@ public:
            ScriptedAI::InitializeAI();
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            events.ScheduleEvent(EVENT_HASTEN, 12000);
            events.ScheduleEvent(EVENT_MORTAL_WOUND, 5000);
--- a/src/server/scripts/Kalimdor/DireMaul/boss_isalien.cpp
+++ b/src/server/scripts/Kalimdor/DireMaul/boss_isalien.cpp
@@ -87,9 +87,9 @@ struct boss_isalien : public BossAI
        summons.Summon(summon);
    }

-    void EnterCombat(Unit* /*who*/) override
+    void JustEngagedWith(Unit* /*who*/) override
    {
-        _EnterCombat();
+        _JustEngagedWith();
        _scheduler.Schedule(4s, 5s, [this](TaskContext context)
            {
                DoCastRandomTarget(SPELL_NET);
--- a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
+++ b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
@@ -177,14 +177,14 @@ public:
        }
    }

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

        instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); // just in case at reset some players already left the instance
        instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT);
-        BossAI::EnterCombat(who);
+        BossAI::JustEngagedWith(who);

        me->SummonCreature(NPC_ONYXIAN_LAIR_GUARD, -167.837936f, -200.549332f, -66.343231f, 5.598287f, TEMPSUMMON_MANUAL_DESPAWN);
    }
@@ -552,7 +552,7 @@ public:

    EventMap events;

-    void EnterCombat(Unit* /*who*/) override
+    void JustEngagedWith(Unit* /*who*/) override
    {
        events.Reset();
        events.ScheduleEvent(EVENT_OLG_SPELL_BLASTNOVA, 15000);
--- a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp
@@ -95,7 +95,7 @@ public:
            }
        }

-        void EnterCombat(Unit* who) override
+        void JustEngagedWith(Unit* who) override
        {
            if (channeling)
                Talk(SAY_WATCH_OUT, who);
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp
@@ -201,9 +201,9 @@ struct boss_ayamiss : public BossAI
        BossAI::EnterEvadeMode(why);
    }

-    void EnterCombat(Unit* attacker) override
+    void JustEngagedWith(Unit* attacker) override
    {
-        BossAI::EnterCombat(attacker);
+        BossAI::JustEngagedWith(attacker);
        me->SetCanFly(true);
        me->SetDisableGravity(true);
        me->GetMotionMaster()->MovePoint(POINT_AIR, AyamissAirPos);
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
@@ -78,9 +78,9 @@ struct boss_buru : public BossAI
            respawn ? egg->Respawn() : Unit::Kill(me, egg);
    }

-    void EnterCombat(Unit* who) override
+    void JustEngagedWith(Unit* who) override
    {
-        BossAI::EnterCombat(who);
+        BossAI::JustEngagedWith(who);
        me->AddThreat(who, 1000000.f);
        Talk(EMOTE_TARGET, who);
        DoCastSelf(SPELL_THORNS);
@@ -193,7 +193,7 @@ struct npc_buru_egg : public ScriptedAI
        me->SetControlled(true, UNIT_STATE_STUNNED);
    }

-    void EnterCombat(Unit* attacker) override
+    void JustEngagedWith(Unit* attacker) override
    {
        if (Creature* buru = _instance->GetCreature(DATA_BURU))
        {
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp
@@ -68,9 +68,9 @@ struct boss_moam : public BossAI
        me->SetRegeneratingPower(false);
    }

-    void EnterCombat(Unit* who) override
+    void JustEngagedWith(Unit* who) override
    {
-        BossAI::EnterCombat(who);
+        BossAI::JustEngagedWith(who);
        Talk(EMOTE_AGGRO);
        events.ScheduleEvent(EVENT_STONE_PHASE, 90s);
        events.ScheduleEvent(EVENT_SPELL_TRAMPLE, 9s);
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
@@ -161,9 +161,9 @@ struct boss_ossirian : public BossAI
        }
    }

-    void EnterCombat(Unit* who) override
+    void JustEngagedWith(Unit* who) override
    {
-        BossAI::EnterCombat(who);
+        BossAI::JustEngagedWith(who);
        events.Reset();
        events.ScheduleEvent(EVENT_SPEEDUP, 10s);
        events.ScheduleEvent(EVENT_SILENCE, 30s);
@@ -403,7 +403,7 @@ struct npc_anubisath_guardian : public ScriptedAI
        });
    }

-    void EnterCombat(Unit* /*who*/) override
+    void JustEngagedWith(Unit* /*who*/) override
    {
        DoCastSelf(_spells[0]);
        DoCastSelf(_spells[1]);
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp
@@ -86,9 +86,9 @@ struct boss_rajaxx : public BossAI
        });
    }

-    void EnterCombat(Unit* /*victim*/) override
+    void JustEngagedWith(Unit* /*who*/) override
    {
-        _EnterCombat();
+        _JustEngagedWith();
        events.ScheduleEvent(EVENT_DISARM, 10s);
        events.ScheduleEvent(EVENT_THUNDERCRASH, 12s);
    }
@@ -219,7 +219,7 @@ struct npc_general_andorov : public npc_escortAI
        _summons.Summon(summon);
    }

-    void EnterCombat(Unit* /*who*/) override
+    void JustEngagedWith(Unit* /*who*/) override
    {
        events.ScheduleEvent(EVENT_BASH, 8s, 11s);
        events.ScheduleEvent(EVENT_COMMAND_AURA, 1s, 3s);
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.cpp
@@ -46,7 +46,7 @@ struct npc_hivezara_stinger : public ScriptedAI
        _scheduler.CancelAll();
    }

-    void EnterCombat(Unit* who) override
+    void JustEngagedWith(Unit* who) override
    {
        DoCast(who ,who->HasAura(SPELL_HIVEZARA_CATALYST) ? SPELL_STINGER_CHARGE_BUFFED : SPELL_STINGER_CHARGE_NORMAL, true);

@@ -100,7 +100,7 @@ struct npc_obsidian_destroyer : public ScriptedAI
        me->SetPower(POWER_MANA, 0);
    }

-    void EnterCombat(Unit* /*who*/) override
+    void JustEngagedWith(Unit* /*who*/) override
    {
        _scheduler.Schedule(6s, [this](TaskContext context)
        {
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp
@@ -79,7 +79,7 @@ public:

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

        if (Creature* vem = instance->GetCreature(DATA_VEM))
        {
@@ -331,7 +331,7 @@ struct boss_kri : public boss_bug_trio
    {
    }

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

@@ -359,7 +359,7 @@ struct boss_vem : public boss_bug_trio
    {
    }

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

@@ -400,7 +400,7 @@ struct boss_yauj : public boss_bug_trio
    {
    }

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

--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
@@ -181,10 +181,10 @@ struct boss_eye_of_cthun : public BossAI
        }
    }

-    void EnterCombat(Unit* who) override
+    void JustEngagedWith(Unit* who) override
    {
        ScheduleTask(true);
-        BossAI::EnterCombat(who);
+        BossAI::JustEngagedWith(who);
        _beamTarget = who->GetGUID();
    }

@@ -404,7 +404,7 @@ struct boss_cthun : public BossAI
        scheduler.CancelAll();
    }

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

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

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

@@ -770,7 +770,7 @@ struct npc_giant_claw_tentacle : public ScriptedAI
            });
    }

-    void EnterCombat(Unit* /*who*/) override
+    void JustEngagedWith(Unit* /*who*/) override
    {
        DoZoneInCombat();
        ScheduleTasks();
@@ -927,7 +927,7 @@ struct npc_giant_eye_tentacle : public ScriptedAI
            });
    }

-    void EnterCombat(Unit* /*who*/) override
+    void JustEngagedWith(Unit* /*who*/) override
    {
        DoZoneInCombat();
    }
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp
@@ -85,10 +85,10 @@ struct boss_fankriss : public BossAI
        }
    }

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

        _scheduler
            .Schedule(7s, 14s, [this](TaskContext context)
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp
@@ -61,9 +61,9 @@ struct boss_huhuran : public BossAI
        _hardEnrage = false;
    }

-    void EnterCombat(Unit* who) override
+    void JustEngagedWith(Unit* who) override
    {
-        BossAI::EnterCombat(who);
+        BossAI::JustEngagedWith(who);
        events.ScheduleEvent(EVENT_FRENZY, 12s, 21s);
        events.ScheduleEvent(EVENT_WYVERN_STING, 25s, 43s);
        events.ScheduleEvent(EVENT_ACID_SPIT, 1s, 20s);
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp
@@ -283,11 +283,11 @@ struct boss_ouro : public BossAI
        }
    }

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

-        BossAI::EnterCombat(who);
+        BossAI::JustEngagedWith(who);
    }

    void UpdateAI(uint32 diff) override
@@ -335,7 +335,7 @@ struct npc_dirt_mound : ScriptedAI
            _ouroHealth = data;
    }

-    void EnterCombat(Unit* /*who*/) override
+    void JustEngagedWith(Unit* /*who*/) override
    {
        DoZoneInCombat();
        _scheduler.Schedule(30s, [this](TaskContext /*context*/)
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp
@@ -74,9 +74,9 @@ struct boss_sartura : public BossAI
        me->SetReactState(REACT_AGGRESSIVE);
    }

-    void EnterCombat(Unit* who) override
+    void JustEngagedWith(Unit* who) override
    {
-        BossAI::EnterCombat(who);
+        BossAI::JustEngagedWith(who);
        Talk(SAY_AGGRO);
        events.ScheduleEvent(EVENT_SARTURA_WHIRLWIND, 12s, 22s);
        events.ScheduleEvent(EVENT_SPELL_BERSERK, 10min);
@@ -181,7 +181,7 @@ struct npc_sartura_royal_guard : public ScriptedAI
        me->SetReactState(REACT_AGGRESSIVE);
    }

-    void EnterCombat(Unit* /*who*/) override
+    void JustEngagedWith(Unit* /*who*/) override
    {
        events.ScheduleEvent(EVENT_GUARD_WHIRLWIND, 6s, 10s);
        events.ScheduleEvent(EVENT_GUARD_KNOCKBACK, 12s, 16s);
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp
@@ -141,9 +141,9 @@ struct boss_skeram : public BossAI
            me->RemoveCorpse();
    }

-    void EnterCombat(Unit* /*who*/) override
+    void JustEngagedWith(Unit* /*who*/) override
    {
-        _EnterCombat();
+        _JustEngagedWith();
        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
@@ -237,9 +237,9 @@ struct boss_twinemperorsAI : public BossAI
        }
    }

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

        if (!_introDone)
        {
@@ -300,9 +300,9 @@ struct boss_veknilash : public boss_twinemperorsAI

    bool IAmVeklor() override { return false; }

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

        DoPlaySoundToSet(me, SOUND_VN_AGGRO);

@@ -331,9 +331,9 @@ struct boss_veklor : public boss_twinemperorsAI

    bool IAmVeklor() override { return true; }

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

        DoPlaySoundToSet(me, SOUND_VK_AGGRO);

--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp
@@ -276,9 +276,9 @@ struct boss_viscidus : public BossAI
        }
    }

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

--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp
@@ -251,7 +251,7 @@ public:
            me->AddAura(id, me);
        }

-        void EnterCombat(Unit* who) override
+        void JustEngagedWith(Unit* who) override
        {
            if (gatherOthersWhenAggro)
                GetOtherSentinels(who);
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.cpp
@@ -82,7 +82,7 @@ struct npc_anubisath_defender : public ScriptedAI
        _enraged = false;
    }

-    void EnterCombat(Unit* /*who*/) override
+    void JustEngagedWith(Unit* /*who*/) override
    {
        DoCastSelf(urand(0, 1) ? SPELL_SHADOW_FROST_REFLECT : SPELL_FIRE_ARCANE_REFLECT, true);

@@ -191,7 +191,7 @@ struct npc_vekniss_stinger : public ScriptedAI
        _scheduler.CancelAll();
    }

-    void EnterCombat(Unit* who) override
+    void JustEngagedWith(Unit* who) override
    {
        DoCast(who ,who->HasAura(SPELL_VEKNISS_CATALYST) ? SPELL_STINGER_CHARGE_BUFFED : SPELL_STINGER_CHARGE_NORMAL, true);

@@ -246,7 +246,7 @@ struct npc_obsidian_eradicator : public ScriptedAI
        _targetGUIDs.clear();
    }

-    void EnterCombat(Unit* /*who*/) override
+    void JustEngagedWith(Unit* /*who*/) override
    {
        _scheduler.Schedule(3500ms, [this](TaskContext context)
        {
@@ -311,7 +311,7 @@ struct npc_anubisath_warder : public ScriptedAI
        _scheduler.CancelAll();
    }

-    void EnterCombat(Unit* /*who*/) override
+    void JustEngagedWith(Unit* /*who*/) override
    {
        if (urand(0, 1))
        {
@@ -382,7 +382,7 @@ struct npc_obsidian_nullifier : public ScriptedAI
        _targetGUIDs.clear();
    }

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

-    void EnterCombat(Unit* /*who*/) override
+    void JustEngagedWith(Unit* /*who*/) override
    {
        _scheduler.CancelAll();

--- a/src/server/scripts/Kalimdor/boss_azuregos.cpp
+++ b/src/server/scripts/Kalimdor/boss_azuregos.cpp
@@ -84,7 +84,7 @@ public:
            }
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            DoCastSelf(SPELL_MARK_OF_FROST_AURA);
            Talk(SAY_AGGRO);
--- a/src/server/scripts/Kalimdor/zone_ashenvale.cpp
+++ b/src/server/scripts/Kalimdor/zone_ashenvale.cpp
@@ -88,7 +88,7 @@ public:
            _isBrazierExtinguished = false;
        }

-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
        {
            if (Player* player = GetPlayerForEscort())
                if (HasEscortState(STATE_ESCORT_PAUSED))
--- a/src/server/scripts/Kalimdor/zone_azshara.cpp
+++ b/src/server/scripts/Kalimdor/zone_azshara.cpp
@@ -67,7 +67,7 @@ public:
            spellhit = false;
        }

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

        void SpellHit(Unit* unit, SpellInfo const* spell) override
        {
@@ -237,7 +237,7 @@ public:
            Reached = false;
        }

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

        void AttackStart(Unit* who) override
        {
@@ -422,7 +422,7 @@ public:
            WeMustDieTimer = 1000;
        }

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

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

--- a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp
+++ b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp
@@ -87,7 +87,7 @@ public:
            me->SetStandState(UNIT_STAND_STATE_SLEEP);
        }

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

        void MoveInLineOfSight(Unit* who) override
        {
@@ -196,7 +196,7 @@ public:
            }
        }

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

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

@@ -245,7 +245,7 @@ public:
            _events.Reset();
        }

-        void EnterCombat(Unit* who) override
+        void JustEngagedWith(Unit* who) override
        {
            Talk(SAY_AGGRO, who);
        }
--- a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp
+++ b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp
@@ -53,7 +53,7 @@ public:

        void Reset() override { }

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

        void JustDied(Unit* killer) override
        {
--- a/src/server/scripts/Kalimdor/zone_darkshore.cpp
+++ b/src/server/scripts/Kalimdor/zone_darkshore.cpp
@@ -75,7 +75,7 @@ public:
            me->SetReactState(REACT_PASSIVE);
        }

-        void EnterCombat(Unit*) override
+        void JustEngagedWith(Unit*) override
        {
            events.Reset();
            events.ScheduleEvent(EVENT_SPELL_SUNDER_ARMOR, 5s);
@@ -329,7 +329,7 @@ public:

        void Reset() override {}

-        void EnterCombat(Unit* who) override
+        void JustEngagedWith(Unit* who) override
        {
            if (urand(0, 1))
                Talk(SAY_REM_AGGRO, who);
--- a/src/server/scripts/Kalimdor/zone_durotar.cpp
+++ b/src/server/scripts/Kalimdor/zone_durotar.cpp
@@ -154,7 +154,7 @@ public:
        {
        }

-        void EnterCombat(Unit* /*target*/) override
+        void JustEngagedWith(Unit* /*target*/) override
        {
            _events.Reset();
            _events.ScheduleEvent(EVENT_POUNCE, 100ms);
--- a/src/server/scripts/Kalimdor/zone_moonglade.cpp
+++ b/src/server/scripts/Kalimdor/zone_moonglade.cpp
@@ -276,7 +276,7 @@ enum ClintarSpirit
 {
    ASPECT_RAVEN                        = 22915,

-    // Texts for EnterCombat, the event and the end of the event are missing
+    // Texts for JustEngagedWith, the event and the end of the event are missing
    CLINTAR_SPIRIT_SAY_START            = 0,
 };

@@ -604,7 +604,7 @@ public:
            }
        }

-        void EnterCombat(Unit* /*attacker*/) override
+        void JustEngagedWith(Unit* /*attacker*/) override
        {
            events.Reset();
            events.ScheduleEvent(EVENT_CAST_CLEAVE, 3s,  5s);
--- a/src/server/scripts/Kalimdor/zone_orgrimmar.cpp
+++ b/src/server/scripts/Kalimdor/zone_orgrimmar.cpp
@@ -81,7 +81,7 @@ public:
            PlayerGUID.Clear();
        }

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

        void UpdateAI(uint32 diff) override
        {
@@ -252,7 +252,7 @@ public:
            ShockTimer = 8000;
        }

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

        void DoAction(int32 action) override
        {
--- a/src/server/scripts/Kalimdor/zone_silithus.cpp
+++ b/src/server/scripts/Kalimdor/zone_silithus.cpp
@@ -656,7 +656,7 @@ public:
            hasTarget = false;
        }

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

        void UpdateAI(uint32 diff) override
--- a/src/server/scripts/Kalimdor/zone_tanaris.cpp
+++ b/src/server/scripts/Kalimdor/zone_tanaris.cpp
@@ -98,7 +98,7 @@ public:
            }
        }

-        void EnterCombat(Unit* who) override
+        void JustEngagedWith(Unit* who) override
        {
            Talk(AGGRO_YELL_AQUE, who);
        }
@@ -270,7 +270,7 @@ public:
            }
        }

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

        void UpdateAI(uint32 diff) override
--- a/src/server/scripts/Kalimdor/zone_the_barrens.cpp
+++ b/src/server/scripts/Kalimdor/zone_the_barrens.cpp
@@ -118,7 +118,7 @@ public:
            }
        }

-        void EnterCombat(Unit* who) override
+        void JustEngagedWith(Unit* who) override
        {
            //not always use
            if (rand() % 4)
@@ -199,7 +199,7 @@ public:
            }
        }

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

        void UpdateAI(uint32 diff) override
        {
@@ -304,7 +304,7 @@ public:
            BigWill.Clear();
        }

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

        void EnterEvadeMode(EvadeReason why) override
        {