diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index 86c76b509c5..03f751ed510 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -3311,14 +3311,6 @@ bool Creature::IsEngaged() const return false; } -void Creature::AtEnterCombat() -{ - Unit::AtEnterCombat(); - - if (GetAI() && !IsControlledByPlayer()) - SendAIReaction(AI_REACTION_HOSTILE); -} - void Creature::AtEngage(Unit* target) { Unit::AtEngage(target); @@ -3336,6 +3328,9 @@ void Creature::AtEngage(Unit* target) ai->JustEngagedWith(target); if (CreatureGroup* formation = GetFormation()) formation->MemberEngagingTarget(this, target); + + if (GetAI() && !IsControlledByPlayer()) + SendAIReaction(AI_REACTION_HOSTILE); } void Creature::AtDisengage() diff --git a/src/server/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h index 28dd75dbce6..874ecf3dbee 100644 --- a/src/server/game/Entities/Creature/Creature.h +++ b/src/server/game/Entities/Creature/Creature.h @@ -363,7 +363,6 @@ class TC_GAME_API Creature : public Unit, public GridObject, public Ma void MakeInterruptable(bool apply); bool IsEngaged() const override; - void AtEnterCombat() override; void AtEngage(Unit* target) override; void AtDisengage() override;