Partial revert of 15a207f, which was causing issues (ref #4943 and #19768). Instead, fix the underlying issue from 15a207f one level further down - Unit::getAttackerForHelper() shouldn't return units that we aren't in combat with (victim can be such a unit for players/player pets, which can startattack from a distance without entering combat). (#19814)
Fixes the following issues: - Player pets would aggro neutral mobs as soon as they start autocasting (Imp's Firebolt) if they're in react range (due to victim != null, autocast counts as autoattack and sets victim) - Neutral mobs would randomly evade when aggro switched between targets. Closes #19768, #19485 and #10921. (from PR #19814)
This commit is contained in:
1 parent
9522f968c2
commit
16e60ba408
2 files changed
+13
-9
No files matched your search
@@ -5443,13 +5443,22 @@ void Unit::_removeAttacker(Unit* pAttacker)
|
||||
|
||||
Unit* Unit::getAttackerForHelper() const // If someone wants to help, who to give them
|
||||
{
|
||||
if (GetVictim() != NULL)
|
||||
return GetVictim();
|
||||
if (Unit* victim = GetVictim())
|
||||
if (!IsControlledByPlayer() || IsInCombatWith(victim) || victim->IsInCombatWith(this))
|
||||
return victim;
|
||||
|
||||
if (!m_attackers.empty())
|
||||
return *(m_attackers.begin());
|
||||
|
||||
return NULL;
|
||||
if (Player* owner = GetCharmerOrOwnerPlayerOrPlayerItself())
|
||||
{
|
||||
HostileRefManager& refs = owner->getHostileRefManager();
|
||||
for (Reference<Unit, ThreatManager> const& ref : refs)
|
||||
if (Unit* hostile = ref.GetSource()->GetOwner())
|
||||
return hostile;
|
||||
}
|
||||
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
bool Unit::Attack(Unit* victim, bool meleeAttack)
|
||||
|
||||
Reference in new issue
Block a user