Update to be compatible with latest AC

src/naxx40Scripts/boss_anubrekhan_40.cpp

@@ -161,9 +161,9 @@ public:
             }
         }
 
-        void EnterCombat(Unit* who) override
+        void JustEngagedWith(Unit* who) override
         {
-            BossAI::EnterCombat(who);
+            BossAI::JustEngagedWith(who);
             me->CallForHelp(30.0f);
             Talk(SAY_AGGRO);
             if (pInstance)

src/naxx40Scripts/boss_faerlina_40.cpp

@@ -118,9 +118,9 @@ public:
             }
         }
 
-        void EnterCombat(Unit* who) override
+        void JustEngagedWith(Unit* who) override
         {
-            BossAI::EnterCombat(who);
+            BossAI::JustEngagedWith(who);
             me->CallForHelp(VISIBLE_RANGE);
             summons.DoZoneInCombat();
             Talk(SAY_AGGRO);

src/naxx40Scripts/boss_four_horsemen_40.cpp

@@ -295,9 +295,9 @@ public:
             Talk(SAY_DEATH);
         }
 
-        void EnterCombat(Unit* who) override
+        void JustEngagedWith(Unit* who) override
         {
-            BossAI::EnterCombat(who);
+            BossAI::JustEngagedWith(who);
             if (movementPhase == MOVE_PHASE_NONE)
             {
                 Talk(SAY_AGGRO);

src/naxx40Scripts/boss_gluth_40.cpp

@@ -108,9 +108,9 @@ public:
             }
         }
 
-        void EnterCombat(Unit* who) override
+        void JustEngagedWith(Unit* who) override
         {
-            BossAI::EnterCombat(who);
+            BossAI::JustEngagedWith(who);
             me->SetInCombatWithZone();
             events.ScheduleEvent(EVENT_MORTAL_WOUND, 10000);
             events.ScheduleEvent(EVENT_ENRAGE, 22000);

src/naxx40Scripts/boss_gothik_40.cpp

@@ -248,9 +248,9 @@ public:
             }
         }
 
-        void EnterCombat(Unit* who) override
+        void JustEngagedWith(Unit* who) override
         {
-            BossAI::EnterCombat(who);
+            BossAI::JustEngagedWith(who);
             me->SetInCombatWithZone();
             Talk(SAY_INTRO_1);
             events.ScheduleEvent(EVENT_INTRO_2, 4000);
@@ -541,7 +541,7 @@ public:
             events.Reset();
         }
 
-        void EnterCombat(Unit*  /*who*/) override
+        void JustEngagedWith(Unit*  /*who*/) override
         {
             switch (me->GetEntry())
             {

src/naxx40Scripts/boss_grobbulus_40.cpp

@@ -94,9 +94,9 @@ public:
             }
         }
 
-        void EnterCombat(Unit* who) override
+        void JustEngagedWith(Unit* who) override
         {
-            BossAI::EnterCombat(who);
+            BossAI::JustEngagedWith(who);
             PullChamberAdds();
             me->SetInCombatWithZone();
             events.ScheduleEvent(EVENT_POISON_CLOUD, 15000);

src/naxx40Scripts/boss_heigan_40.cpp

@@ -112,9 +112,9 @@ public:
             Talk(EMOTE_DEATH);
         }
 
-        void EnterCombat(Unit* who) override
+        void JustEngagedWith(Unit* who) override
         {
-            BossAI::EnterCombat(who);
+            BossAI::JustEngagedWith(who);
             me->SetInCombatWithZone();
             Talk(SAY_AGGRO);
             if (pInstance)

src/naxx40Scripts/boss_kelthuzad_40.cpp

@@ -294,9 +294,9 @@ public:
                 AttackStart(who);
         }
 
-        void EnterCombat(Unit* who) override
+        void JustEngagedWith(Unit* who) override
         {
-            BossAI::EnterCombat(who);
+            BossAI::JustEngagedWith(who);
             Talk(SAY_SUMMON_MINIONS);
             me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_DISABLE_MOVE);
             me->RemoveAllAttackers();
@@ -599,7 +599,7 @@ public:
             }
         }
 
-        void EnterCombat(Unit*  /*who*/) override
+        void JustEngagedWith(Unit*  /*who*/) override
         {
             me->SetInCombatWithZone();
             if (me->GetEntry() == NPC_UNSTOPPABLE_ABOMINATION)

src/naxx40Scripts/boss_loatheb_40.cpp

@@ -107,9 +107,9 @@ public:
             }
         }
 
-        void EnterCombat(Unit* who) override
+        void JustEngagedWith(Unit* who) override
         {
-            BossAI::EnterCombat(who);
+            BossAI::JustEngagedWith(who);
             me->SetInCombatWithZone();
             events.ScheduleEvent(EVENT_NECROTIC_AURA, 10000);
             events.ScheduleEvent(EVENT_DEATHBLOOM, 5000);

src/naxx40Scripts/boss_maexxna_40.cpp

@@ -104,9 +104,9 @@ public:
             }
         }
 
-        void EnterCombat(Unit* who) override
+        void JustEngagedWith(Unit* who) override
         {
-            BossAI::EnterCombat(who);
+            BossAI::JustEngagedWith(who);
             me->SetInCombatWithZone();
             events.ScheduleEvent(EVENT_WEB_WRAP, 20000);
             events.ScheduleEvent(EVENT_WEB_SPRAY, 40000);

src/naxx40Scripts/boss_noth_40.cpp

@@ -164,9 +164,9 @@ public:
             ScriptedAI::EnterEvadeMode(why);
         }
 
-        void EnterCombat(Unit* who) override
+        void JustEngagedWith(Unit* who) override
         {
-            BossAI::EnterCombat(who);
+            BossAI::JustEngagedWith(who);
             Talk(SAY_AGGRO);
             StartGroundPhase();
             if (pInstance)

src/naxx40Scripts/boss_patchwerk_40.cpp

@@ -91,9 +91,9 @@ public:
             Talk(SAY_DEATH);
         }
 
-        void EnterCombat(Unit* who) override
+        void JustEngagedWith(Unit* who) override
         {
-            BossAI::EnterCombat(who);
+            BossAI::JustEngagedWith(who);
             Talk(SAY_AGGRO);
             me->SetInCombatWithZone();
             events.ScheduleEvent(EVENT_HATEFUL_STRIKE, 1200);

src/naxx40Scripts/boss_razuvious_40.cpp

@@ -131,9 +131,9 @@ public:
             }
         }
 
-        void EnterCombat(Unit* who) override
+        void JustEngagedWith(Unit* who) override
         {
-            BossAI::EnterCombat(who);
+            BossAI::JustEngagedWith(who);
             Talk(SAY_AGGRO);
             events.ScheduleEvent(EVENT_UNBALANCING_STRIKE, 20000);
             events.ScheduleEvent(EVENT_DISRUPTING_SHOUT, 15000);
@@ -202,7 +202,7 @@ public:
             }
         }
 
-        void EnterCombat(Unit* who) override
+        void JustEngagedWith(Unit* who) override
         {
             if (Creature* cr = me->FindNearestCreature(NPC_RAZUVIOUS, 100.0f))
             {

src/naxx40Scripts/boss_sapphiron_40.cpp

@@ -171,9 +171,9 @@ public:
             }
         }
 
-        void EnterCombat(Unit* who) override
+        void JustEngagedWith(Unit* who) override
         {
-            BossAI::EnterCombat(who);
+            BossAI::JustEngagedWith(who);
             EnterCombatSelfFunction();
             if (isNaxx40Sapp(me->GetEntry()))
             {

src/naxx40Scripts/boss_thaddius_40.cpp

@@ -237,9 +237,9 @@ public:
             summons.Summon(cr);
         }
 
-        void EnterCombat(Unit* who) override
+        void JustEngagedWith(Unit* who) override
         {
-            BossAI::EnterCombat(who);
+            BossAI::JustEngagedWith(who);
             me->SetInCombatWithZone();
             summons.DoZoneInCombat(NPC_FEUGEN_40);
             summons.DoZoneInCombat(NPC_STALAGG_40);
@@ -411,7 +411,7 @@ public:
             ScriptedAI::EnterEvadeMode(why);
         }
 
-        void EnterCombat(Unit* pWho) override
+        void JustEngagedWith(Unit* pWho) override
         {
             me->SetInCombatWithZone();
             if (Creature* cr = me->FindNearestCreature(NPC_TESLA_COIL, 150.f, true))
@@ -735,7 +735,7 @@ public:
         npc_teslaAI(Creature* creature) : ScriptedAI(creature) { }
         void EnterEvadeMode(EvadeReason /*why*/) override { } // never stop casting due to evade
         void UpdateAI(uint32 /*diff*/) override { } // never do anything unless told
-        void EnterCombat(Unit* /*who*/) override { }
+        void JustEngagedWith(Unit* /*who*/) override { }
         void DamageTaken(Unit* /*who*/, uint32& damage, DamageEffectType, SpellSchoolMask) override { damage = 0; } // no, you can't kill it
     };
 };

src/vanillaScripts/boss_drakkisath.cpp

@@ -49,9 +49,9 @@ public:
     {
         boss_drakkisathAI_50_59_B(Creature* creature) : BossAI(creature, DATA_GENERAL_DRAKKISATH) {}
 
-        void EnterCombat(Unit* /*who*/) override
+        void JustEngagedWith(Unit* /*who*/) override
         {
-            _EnterCombat();
+            _JustEngagedWith();
             events.ScheduleEvent(EVENT_FLAMESTRIKE, 6000);
             events.ScheduleEvent(EVENT_CLEAVE,    8000);
             events.ScheduleEvent(EVENT_CONFLAGRATION, 15000);

src/vanillaScripts/boss_lord_kazzak.cpp

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

src/vanillaScripts/boss_onyxia.cpp

@@ -187,12 +187,12 @@ public:
             }
         }
 
-        void EnterCombat(Unit* who) override
+        void JustEngagedWith(Unit* who) override
         {
             Talk(SAY_AGGRO);
             SetPhase(PHASE_GROUNDED);
 
-            BossAI::EnterCombat(who);
+            BossAI::JustEngagedWith(who);
         }
 
         void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask) override

src/vanillaScripts/quest_jail_break.cpp

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

src/vanillaScripts/quest_the_masquerade.cpp

@@ -1096,7 +1096,7 @@ public:
             }
         }
 
-        void EnterCombat(Unit* /*victim*/) override
+        void JustEngagedWith(Unit* /*victim*/) override
         {
             if (me->GetEntry() == NPC_ONYXIA_GUARD)
             {