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

Core/Creature: Adjust SelectVictim behavior: (PR #21324)

Browse Source 
- No more automatic combat -> threat promotion. This matches anecdotal retail behavior - spells already in transit will not cause mob to chase you if its primary target vanishes before the spell hits.
- Prevent mobbing by stopping creatures from auto-acquiring a nearby target just because the primary target vanished.
This commit is contained in:
Treeston
2018-01-29 23:14:46 +01:00
committed by Ovahlord
parent c8b05e927f
commit 528953ab8f
1 changed files with 2 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1030,32 +1030,8 @@ Unit* Creature::SelectVictim()
{
Unit* target = nullptr;
ThreatManager& mgr = GetThreatManager();
if (mgr.CanHaveThreatList())
{
target = mgr.SelectVictim();
while (!target)
{
Unit* newTarget = nullptr;
// nothing found to attack - try to find something we're in combat with (but don't have a threat entry for yet) and start attacking it
for (auto const& pair : GetCombatManager().GetPvECombatRefs())
{
newTarget = pair.second->GetOther(this);
if (!mgr.IsThreatenedBy(newTarget, true))
{
mgr.AddThreat(newTarget, 0.0f, nullptr, true, true);
ASSERT(mgr.IsThreatenedBy(newTarget, true), "%s tried to add combatant %s to threat list, but this failed - potential infinite loop", GetName().c_str(), newTarget->GetName().c_str()); // prevent potential infinite loop
break;
}
else
newTarget = nullptr;
}
if (!newTarget)
break;
target = mgr.SelectVictim();
}
}
if (CanHaveThreatList())
target = GetThreatManager().SelectVictim();
else if (!HasReactState(REACT_PASSIVE))
{
// We're a player pet, probably
@@ -1095,15 +1071,6 @@ Unit* Creature::SelectVictim()
if (GetVehicle())
return nullptr;
// search nearby enemy before enter evade mode
if (HasReactState(REACT_AGGRESSIVE))
{
target = SelectNearestTargetInAttackDistance(m_CombatDistance ? m_CombatDistance : ATTACK_DISTANCE);
if (target && _IsTargetAcceptable(target) && CanCreatureAttack(target))
return target;
}
Unit::AuraEffectList const& iAuras = GetAuraEffectsByType(SPELL_AURA_MOD_INVISIBILITY);
if (!iAuras.empty())
{