diff options
| author | Shauren <shauren.trinity@gmail.com> | 2017-09-09 23:31:33 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2017-09-09 23:31:33 +0200 |
| commit | c8fdda7f86f5dbe90525636a7291186fe603f61d (patch) | |
| tree | 4f222ee4555df625b2977158180cb1f6789d6e54 /src/server/game/Grids/Notifiers | |
| parent | 94cd4b6fad9a917c8629912916eb052a75b7c3f6 (diff) | |
Core/Creatures: Changed NearestAttackableUnitInObjectRangeCheck to only consider neutral units as targets if they are already in combat with target searching unit
Closes #13630
Closes #20205
Diffstat (limited to 'src/server/game/Grids/Notifiers')
| -rw-r--r-- | src/server/game/Grids/Notifiers/GridNotifiers.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Grids/Notifiers/GridNotifiers.h b/src/server/game/Grids/Notifiers/GridNotifiers.h index 218e856742e..16583516243 100644 --- a/src/server/game/Grids/Notifiers/GridNotifiers.h +++ b/src/server/game/Grids/Notifiers/GridNotifiers.h @@ -1027,7 +1027,7 @@ namespace Trinity bool operator()(Unit* u) { if (u->isTargetableForAttack() && i_obj->IsWithinDistInMap(u, i_range) && - !i_funit->IsFriendlyTo(u) && i_funit->CanSeeOrDetect(u)) + (i_funit->IsInCombatWith(u) || i_funit->IsHostileTo(u)) && i_obj->CanSeeOrDetect(u)) { i_range = i_obj->GetDistance(u); // use found unit range as new range limit for next check return true; |