Core/Spells: SPELL_AURA_MOD_PACIFY will no longer block victim updates and return false in Attack method
This commit is contained in:
1 parent
64d990ba4f
commit
091e337574
2 files changed
-6
No files matched your search
@@ -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)
|
||||
{
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in new issue
Block a user