Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-06 17:08:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Creatures: moved AIReaction to AtEngage to ensure that ai reactions wont be sent when entering combat with a creature that might not even engage us

Browse Source
This commit is contained in:
Ovahlord
2021-03-14 09:22:16 +01:00
parent 884caef150
commit a80faa391b
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/server/game/Entities/Creature/Creature.cpp
View File

@@ -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()

1
src/server/game/Entities/Creature/Creature.h
View File

@@ -363,7 +363,6 @@ class TC_GAME_API Creature : public Unit, public GridObject<Creature>, public Ma
void MakeInterruptable(bool apply);
bool IsEngaged() const override;
void AtEnterCombat() override;
void AtEngage(Unit* target) override;
void AtDisengage() override;