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:
hondacrx
2022-01-07 10:46:06 -05:00
parent d47f9f0171
commit dee852d202
2 changed files with 3 additions and 16 deletions
+3 -6
View File
@@ -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;
-10
View File
@@ -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)
{