diff options
| author | Sorikoff <46191832+Sorikoff@users.noreply.github.com> | 2020-02-16 17:00:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-16 16:00:54 +0100 |
| commit | 5f20715e2f38a6eb721f443df9e13c84ecb11fbb (patch) | |
| tree | 3e579145e64c9ab6bab717651a6d13ec73c3e199 /src/server/game/Entities/Creature | |
| parent | 6176ce92ea01fd33b11c2e7f8e9ebb509e80c944 (diff) | |
[WIP] Core/AI: Pets musn't attack civilian NPC in aggressive mode (#24121)
* Core/AI: Pets musn't attack civilian NPC in aggressive mode
* Move decision to ignore civilians to PetAI, keeping the check in GridNotifiers
Co-authored-by: Giacomo Pozzoni <giacomopoz@gmail.com>
Diffstat (limited to 'src/server/game/Entities/Creature')
| -rw-r--r-- | src/server/game/Entities/Creature/Creature.cpp | 4 | ||||
| -rw-r--r-- | src/server/game/Entities/Creature/Creature.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index c2aee8683c6..f45bb607890 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -2990,14 +2990,14 @@ float Creature::GetAggroRange(Unit const* target) const return 0.0f; } -Unit* Creature::SelectNearestHostileUnitInAggroRange(bool useLOS) const +Unit* Creature::SelectNearestHostileUnitInAggroRange(bool useLOS, bool ignoreCivilians) const { // Selects nearest hostile target within creature's aggro range. Used primarily by // pets set to aggressive. Will not return neutral or friendly targets. Unit* target = nullptr; - Trinity::NearestHostileUnitInAggroRangeCheck u_check(this, useLOS); + Trinity::NearestHostileUnitInAggroRangeCheck u_check(this, useLOS, ignoreCivilians); Trinity::UnitSearcher<Trinity::NearestHostileUnitInAggroRangeCheck> searcher(this, target, u_check); Cell::VisitGridObjects(this, searcher, MAX_AGGRO_RADIUS); diff --git a/src/server/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h index 87de314fb70..47f8d0d602a 100644 --- a/src/server/game/Entities/Creature/Creature.h +++ b/src/server/game/Entities/Creature/Creature.h @@ -232,7 +232,7 @@ class TC_GAME_API Creature : public Unit, public GridObject<Creature>, public Ma Unit* SelectNearestTarget(float dist = 0, bool playerOnly = false) const; Unit* SelectNearestTargetInAttackDistance(float dist = 0) const; - Unit* SelectNearestHostileUnitInAggroRange(bool useLOS = false) const; + Unit* SelectNearestHostileUnitInAggroRange(bool useLOS = false, bool ignoreCivilians = false) const; void DoFleeToGetAssistance(); void CallForHelp(float fRadius); |