Core/Entities: Fixed an issue where creatures would not properly assist formation members in certain scenarios. Tagging #21967.

# Conflicts:
#	src/server/game/Combat/ThreatManager.cpp
This commit is contained in:
Treeston authored and Ovahlord committed 2020-07-22 17:45:10 +02:00
1 parent fd599605da
commit b634358967
2 files changed
+3 -5

No files matched your search

-5
View File
@@ -31,7 +31,6 @@
#include "ConditionMgr.h"
#include "CreatureAI.h"
#include "CreatureAIImpl.h"
#include "CreatureGroups.h"
#include "Formulas.h"
#include "GameTime.h"
#include "GridNotifiersImpl.h"
@@ -8404,10 +8403,6 @@ void Unit::EngageWithTarget(Unit* enemy)
m_threatManager.AddThreat(enemy, 0.0f, nullptr, true, true);
else
SetInCombatWith(enemy);
if (Creature* creature = ToCreature())
if (CreatureGroup* formation = creature->GetFormation())
formation->MemberEngagingTarget(creature, enemy);
}
void Unit::AttackedTarget(Unit* target, bool canInitialAggro)