diff options
author | jackpoz <giacomopoz@gmail.com> | 2020-09-23 20:17:35 +0200 |
---|---|---|
committer | jackpoz <giacomopoz@gmail.com> | 2020-09-23 20:17:35 +0200 |
commit | 24018b7a74ec8e68e43895e0e57f6397f59ea890 (patch) | |
tree | 330f4b926edc4bebb3e131391fcceb7e6b3e73bd /src | |
parent | a6d8a7ad1e5e507aacc90546982a7590b62d2d78 (diff) |
Core/Creature: Ignore combat reach when looking for assisting creatures
Fixes #25487
Diffstat (limited to 'src')
-rw-r--r-- | src/server/game/Grids/Notifiers/GridNotifiers.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/server/game/Grids/Notifiers/GridNotifiers.h b/src/server/game/Grids/Notifiers/GridNotifiers.h index b116760c411..035c93acc52 100644 --- a/src/server/game/Grids/Notifiers/GridNotifiers.h +++ b/src/server/game/Grids/Notifiers/GridNotifiers.h @@ -1141,7 +1141,8 @@ namespace Trinity return; // too far - if (!u->IsWithinDistInMap(i_funit, i_range)) + // Don't use combat reach distance, range must be an absolute value, otherwise the chain aggro range will be too big + if (!u->IsWithinDistInMap(i_funit, i_range, true, false, false)) return; // only if see assisted creature's enemy @@ -1274,7 +1275,8 @@ namespace Trinity return false; // too far - if (!i_funit->IsWithinDistInMap(u, i_range)) + // Don't use combat reach distance, range must be an absolute value, otherwise the chain aggro range will be too big + if (!i_funit->IsWithinDistInMap(u, i_range, true, false, false)) return false; // only if see assisted creature @@ -1303,7 +1305,8 @@ namespace Trinity if (!u->CanAssistTo(i_obj, i_enemy)) return false; - if (!i_obj->IsWithinDistInMap(u, i_range)) + // Don't use combat reach distance, range must be an absolute value, otherwise the chain aggro range will be too big + if (!i_obj->IsWithinDistInMap(u, i_range, true, false, false)) return false; if (!i_obj->IsWithinLOSInMap(u)) |