diff options
| author | Giacomo Pozzoni <giacomopoz@gmail.com> | 2020-07-22 17:32:29 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-22 19:32:29 +0200 |
| commit | 6440c3bcac85a40de5c34aef1d8a8856966cc140 (patch) | |
| tree | d85fe329d181a25adb3aca5693d8107673af949f /src/server/game/Combat/CombatManager.cpp | |
| parent | 6ab9922171cf6e2877c39f503bcf987dd9faa898 (diff) | |
Core/Combat: Disable triggers entering combat (#25086)
* Core/Combat: Disable triggers entering combat
* Move check to database flags_extra flag in creature_template with value 0x00002000
* Fix Rotface puddle stalker too
* Rename 9999_99_99_99_world.sql to 2020_07_22_00_world.sql
Diffstat (limited to 'src/server/game/Combat/CombatManager.cpp')
| -rw-r--r-- | src/server/game/Combat/CombatManager.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/server/game/Combat/CombatManager.cpp b/src/server/game/Combat/CombatManager.cpp index 02dff689cda..c2774a23ec2 100644 --- a/src/server/game/Combat/CombatManager.cpp +++ b/src/server/game/Combat/CombatManager.cpp @@ -44,6 +44,12 @@ return false; if (a->HasUnitState(UNIT_STATE_IN_FLIGHT) || b->HasUnitState(UNIT_STATE_IN_FLIGHT)) return false; + if (Creature const* aCreature = a->ToCreature()) + if (aCreature->IsCombatDisallowed()) + return false; + if (Creature const* bCreature = b->ToCreature()) + if (bCreature->IsCombatDisallowed()) + return false; if (a->IsFriendlyTo(b) || b->IsFriendlyTo(a)) return false; Player const* playerA = a->GetCharmerOrOwnerPlayerOrPlayerItself(); |