Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/UnitAI: #17309 follow-up (#17608)

Browse Source 
* Core/UnitAI: SelectTarget correction

Set CurrentVictim as first element on targetList if necessary, which is then filled with the threatlist elements that satisfy the predicate.
This commit is contained in:
ccrs
2016-07-18 20:30:58 +02:00
committed by Shauren
parent f8f207d21c
commit b008b677ad
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/server/game/AI/CoreAI/UnitAI.h
View File

@@ -151,15 +151,23 @@ class TC_GAME_API UnitAI
return nullptr;
std::list<Unit*> targetList;
Unit* currentVictim = me->getThreatManager().getCurrentVictim()->getTarget();
Unit* currentVictim = nullptr;
if (auto currentVictimReference = me->getThreatManager().getCurrentVictim())
{
currentVictim = currentVictimReference->getTarget();
// Current victim always goes first
if (predicate(currentVictim))
targetList.push_back(currentVictim);
// Current victim always goes first
if (currentVictim && predicate(currentVictim))
targetList.push_back(currentVictim);
}
for (ThreatContainer::StorageType::const_iterator itr = threatlist.begin(); itr != threatlist.end(); ++itr)
if ((*itr)->getTarget() != currentVictim && predicate((*itr)->getTarget()))
{
if (currentVictim != nullptr && (*itr)->getTarget() != currentVictim && predicate((*itr)->getTarget()))
targetList.push_back((*itr)->getTarget());
else if (currentVictim == nullptr && predicate((*itr)->getTarget()))
targetList.push_back((*itr)->getTarget());
}
if (position >= targetList.size())
return nullptr;