From 749b77d060e5186da2b554a1a843d3a9ac712e4c Mon Sep 17 00:00:00 2001 From: hondacrx Date: Thu, 23 Dec 2021 20:02:14 -0500 Subject: [PATCH] Core/Misc: Rename Unit::AttackedTarget to Unit::AtTargetAttacked to match naming scheme for these notifiers Port From (https://github.com/TrinityCore/TrinityCore/commit/dabdad3b47d7438327d3ee861eddd68e9bea68b1) --- Source/Game/Entities/Unit/Unit.Combat.cs | 4 ++-- Source/Game/Spells/Spell.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Game/Entities/Unit/Unit.Combat.cs b/Source/Game/Entities/Unit/Unit.Combat.cs index 31e915e5d..e637f8651 100644 --- a/Source/Game/Entities/Unit/Unit.Combat.cs +++ b/Source/Game/Entities/Unit/Unit.Combat.cs @@ -506,7 +506,7 @@ namespace Game.Entities if ((attType == WeaponAttackType.BaseAttack || attType == WeaponAttackType.OffAttack) && !IsWithinLOSInMap(victim)) return; - AttackedTarget(victim, true); + AtTargetAttacked(victim, true); RemoveAurasWithInterruptFlags(SpellAuraInterruptFlags.Attacking); // ignore ranged case @@ -643,7 +643,7 @@ namespace Game.Entities SendCombatLogMessage(packet); } - public void AttackedTarget(Unit target, bool canInitialAggro = true) + public void AtTargetAttacked(Unit target, bool canInitialAggro = true) { if (!target.IsEngaged() && !canInitialAggro) return; diff --git a/Source/Game/Spells/Spell.cs b/Source/Game/Spells/Spell.cs index 3d672c7fb..85a08e6a4 100644 --- a/Source/Game/Spells/Spell.cs +++ b/Source/Game/Spells/Spell.cs @@ -8039,7 +8039,7 @@ namespace Game.Spells { Unit unitCaster = spell.GetCaster().ToUnit(); if (unitCaster != null) - unitCaster.AttackedTarget(unit, spell.m_spellInfo.HasInitialAggro()); + unitCaster.AtTargetAttacked(unit, spell.m_spellInfo.HasInitialAggro()); if (!unit.IsStandState()) unit.SetStandState(UnitStandStateType.Stand);