From bce43de7f3fba618c370f2aba327d23dd30d1cdd Mon Sep 17 00:00:00 2001 From: Treeston Date: Sun, 31 Dec 2017 03:23:42 +0100 Subject: Core/AI: Some more refactoring prep for #19930. CreatureAI::EnterCombat is now called CreatureAI::JustEngagedWith. There's also two new methods on UnitAI, though they're never invoked right now. (cherry picked from commit 6113b9dec2e0081c36c36c2974a28ed0693bc601) --- src/server/scripts/Pet/pet_generic.cpp | 2 +- src/server/scripts/Pet/pet_hunter.cpp | 2 +- src/server/scripts/Pet/pet_mage.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/server/scripts/Pet') diff --git a/src/server/scripts/Pet/pet_generic.cpp b/src/server/scripts/Pet/pet_generic.cpp index 56a35e1ac0c..45efd2dcf96 100644 --- a/src/server/scripts/Pet/pet_generic.cpp +++ b/src/server/scripts/Pet/pet_generic.cpp @@ -285,7 +285,7 @@ class npc_pet_gen_mojo : public CreatureScript me->GetMotionMaster()->MoveFollow(owner, 0.0f, 0.0f); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void UpdateAI(uint32 /*diff*/) override { } void ReceiveEmote(Player* player, uint32 emote) override diff --git a/src/server/scripts/Pet/pet_hunter.cpp b/src/server/scripts/Pet/pet_hunter.cpp index 263bcf2038f..2523dd63896 100644 --- a/src/server/scripts/Pet/pet_hunter.cpp +++ b/src/server/scripts/Pet/pet_hunter.cpp @@ -55,7 +55,7 @@ class npc_pet_hunter_snake_trap : public CreatureScript _isViper = false; } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void Reset() override { diff --git a/src/server/scripts/Pet/pet_mage.cpp b/src/server/scripts/Pet/pet_mage.cpp index 42716b22dfa..06d9ce4cb49 100644 --- a/src/server/scripts/Pet/pet_mage.cpp +++ b/src/server/scripts/Pet/pet_mage.cpp @@ -126,7 +126,7 @@ class npc_pet_mage_mirror_image : public CreatureScript owner->CastSpell(me, SPELL_MAGE_CLONE_ME, false); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { if (me->GetVictim() && !me->GetVictim()->HasBreakableByDamageCrowdControlAura(me)) { -- cgit v1.2.3