Core/Units: UNIT_FLAG_PACIFIED will no longer block victim updates
Port From (https://github.com/TrinityCore/TrinityCore/commit/8f4c6ebb49832fa2564e5bdb573d350d39b33117)
This commit is contained in:
@@ -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;
|
||||
|
||||
|
||||
@@ -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)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user