From 091e337574cf855af3b2e601916581d741c2e870 Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Sun, 23 Feb 2020 22:29:32 +0100 Subject: [PATCH] Core/Spells: SPELL_AURA_MOD_PACIFY will no longer block victim updates and return false in Attack method --- src/server/game/Entities/Unit/Unit.cpp | 3 --- src/server/game/Spells/Auras/SpellAuraEffects.cpp | 3 --- 2 files changed, 6 deletions(-) diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index f3de12b023..de78e18506 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -5664,9 +5664,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 b76632eff0..9577fe5f5b 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -2432,10 +2432,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