From dee852d202d0ec0a3001accc88392f59ac53bc15 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Fri, 7 Jan 2022 10:46:06 -0500 Subject: [PATCH] Core/Units: UNIT_FLAG_PACIFIED will no longer block victim updates Port From (https://github.com/TrinityCore/TrinityCore/commit/8f4c6ebb49832fa2564e5bdb573d350d39b33117) --- Source/Game/Entities/Unit/Unit.Combat.cs | 9 +++------ Source/Game/Spells/Auras/AuraEffect.cs | 10 ---------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/Source/Game/Entities/Unit/Unit.Combat.cs b/Source/Game/Entities/Unit/Unit.Combat.cs index 831222f83..5b2940b7e 100644 --- a/Source/Game/Entities/Unit/Unit.Combat.cs +++ b/Source/Game/Entities/Unit/Unit.Combat.cs @@ -255,12 +255,6 @@ namespace Game.Entities if (creature != null && creature.IsInEvadeMode()) return false; - if (HasUnitFlag(UnitFlags.Pacified)) - return false; - - if (HasAuraType(AuraType.DisableAttackingExceptAbilities)) - return false; - // nobody can attack GM in GM-mode if (victim.IsTypeId(TypeId.Player)) { @@ -489,6 +483,9 @@ namespace Game.Entities if (HasUnitState(UnitState.CannotAutoattack) || HasUnitFlag(UnitFlags.Pacified)) return; + if (HasAuraType(AuraType.DisableAttackingExceptAbilities)) + return; + if (!victim.IsAlive()) return; diff --git a/Source/Game/Spells/Auras/AuraEffect.cs b/Source/Game/Spells/Auras/AuraEffect.cs index 14b6bb6c9..f247dfd44 100644 --- a/Source/Game/Spells/Auras/AuraEffect.cs +++ b/Source/Game/Spells/Auras/AuraEffect.cs @@ -1885,16 +1885,6 @@ namespace Game.Spells HandleAuraModSilence(aurApp, mode, apply); } - [AuraEffectHandler(AuraType.DisableAttackingExceptAbilities)] - void HandleAuraDisableAttackingExceptAbilities(AuraApplication aurApp, AuraEffectHandleModes mode, bool apply) - { - if (!mode.HasAnyFlag(AuraEffectHandleModes.SendForClientMask)) - return; - - if (apply) - aurApp.GetTarget().AttackStop(); - } - [AuraEffectHandler(AuraType.ModNoActions)] void HandleAuraModNoActions(AuraApplication aurApp, AuraEffectHandleModes mode, bool apply) {