nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-02-03 02:53:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Core/Formations): Implemented new creature formation flag: GROUP_… (#14537)

Browse Source 
fix(Core/Formations): Implemented new creature formation flag: GROUP_AI_FLAG_ACQUIRE_NEW_TARGET_ON_EVADE.

Fixes #14494
This commit is contained in:
UltraNix
2023-01-19 20:08:51 +01:00
committed by GitHub
parent 484cb1d01b
commit 1de52e5570
4 changed files with 85 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/server/game/Entities/Creature/CreatureGroups.cpp
View File

@@ -208,24 +208,75 @@ void CreatureGroup::MemberEngagingTarget(Creature* member, Unit* target)
for (auto const& itr : m_members)
{
Creature* pMember = itr.first;
if (m_leader) // avoid crash if leader was killed and reset.
LOG_DEBUG("entities.unit", "GROUP ATTACK: group instance id {} calls member instid {}", m_leader->GetInstanceId(), member->GetInstanceId());
//Skip one check
if (pMember == member)
if (!pMember)
{
continue;
}
if (!pMember->IsAlive())
if (pMember == member || !pMember->IsAlive() || pMember->GetVictim())
{
continue;
}
if (pMember->GetVictim())
if (pMember == m_leader && !(groupAI & std::underlying_type_t<GroupAIFlags>(GroupAIFlags::GROUP_AI_FLAG_LEADER_ASSIST_MEMBER)))
{
continue;
}
if (pMember->IsValidAttackTarget(target) && pMember->AI())
{
pMember->AI()->AttackStart(target);
}
}
}
Unit* CreatureGroup::GetNewTargetForMember(Creature* member)
{
uint8 const groupAI = sFormationMgr->CreatureGroupMap[member->GetSpawnId()].groupAI;
if (!(groupAI & std::underlying_type_t<GroupAIFlags>(GroupAIFlags::GROUP_AI_FLAG_ACQUIRE_NEW_TARGET_ON_EVADE)))
{
return nullptr;
}
if (member == m_leader)
{
if (!(groupAI & std::underlying_type_t<GroupAIFlags>(GroupAIFlags::GROUP_AI_FLAG_MEMBER_ASSIST_LEADER)))
{
return nullptr;
}
}
else if (!(groupAI & std::underlying_type_t<GroupAIFlags>(GroupAIFlags::GROUP_AI_FLAG_LEADER_ASSIST_MEMBER)))
{
return nullptr;
}
for (auto const& itr : m_members)
{
Creature* pMember = itr.first;
if (!pMember)
{
continue;
}
if (pMember == member || !pMember->IsAlive() || !pMember->GetVictim())
{
continue;
}
if (pMember == m_leader && !(groupAI & std::underlying_type_t<GroupAIFlags>(GroupAIFlags::GROUP_AI_FLAG_MEMBER_ASSIST_LEADER)))
{
continue;
}
if (member->IsValidAttackTarget(pMember->GetVictim()))
{
return pMember->GetVictim();
}
}
return nullptr;
}
void CreatureGroup::MemberEvaded(Creature* member)
{
uint8 const groupAI = sFormationMgr->CreatureGroupMap[member->GetSpawnId()].groupAI;