diff options
| author | Ovah <dreadkiller@gmx.de> | 2020-02-28 19:22:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-28 19:22:25 +0100 |
| commit | 6cbfda2fcecdda980b60b359018e520f1daeaf3a (patch) | |
| tree | fc527920d7bf2840faeca6bb076a35d3b3726c37 | |
| parent | 0583445c05f92baf3ceb07aa842acb1d47804912 (diff) | |
Core/Units: UNIT_FLAG_PACIFIED will no longer block victim updates (#24190)
* Core/Units: UNIT_FLAG_PACIFIED will no longer block victim updates
* pacified units should only have their melee attacks blocked as counterpart to silence mechanics
* Core/Spells: removed unnecessary attack stop call from pacify aura effect handler
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 3 | ||||
| -rw-r--r-- | src/server/game/Spells/Auras/SpellAuraEffects.cpp | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 7e3fd717190..f00332d27c1 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -5493,9 +5493,6 @@ bool Unit::Attack(Unit* victim, bool meleeAttack) if (creature && creature->IsInEvadeMode()) return false; - if (HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PACIFIED)) - return false; - // nobody can attack GM in GM-mode if (victim->GetTypeId() == TYPEID_PLAYER) { diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index 2c4c381229d..1bf436b3a4f 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -2375,10 +2375,7 @@ void AuraEffect::HandleAuraModPacify(AuraApplication const* aurApp, uint8 mode, Unit* target = aurApp->GetTarget(); if (apply) - { target->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PACIFIED); - target->AttackStop(); - } else { // do not remove unit flag if there are more than this auraEffect of that kind on unit on unit |