Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Auras: Removed triggering aura effect from SPELL_AURA_OVERRIDE_AUTOATTACK_WITH_MELEE_SPELL handling (paladin Crusading Strikes combines this with a proc aura on another effect on the same spell)

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/36ecc2d8cb8d913a6ac0936031de47b18c69a90d)
This commit is contained in:
hondacrx
2023-07-18 07:37:11 -04:00
parent d20f904f1d
commit 7de6a839fa
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Unit/Unit.Combat.cs
+4 -11
View File
@@ -534,15 +534,11 @@ namespace Game.Entities
victim = GetMeleeHitRedirectTarget(victim); victim = GetMeleeHitRedirectTarget(victim);
var meleeAttackOverrides = GetAuraEffectsByType(AuraType.OverrideAutoattackWithMeleeSpell); var meleeAttackOverrides = GetAuraEffectsByType(AuraType.OverrideAutoattackWithMeleeSpell);
AuraEffect meleeAttackAuraEffect = null;
uint meleeAttackSpellId = 0; uint meleeAttackSpellId = 0;
if (attType == WeaponAttackType.BaseAttack) if (attType == WeaponAttackType.BaseAttack)
{ {
if (!meleeAttackOverrides.Empty()) if (!meleeAttackOverrides.Empty())
{ meleeAttackSpellId = meleeAttackOverrides.First().GetSpellEffectInfo().TriggerSpell;
meleeAttackAuraEffect = meleeAttackOverrides.First();
meleeAttackSpellId = meleeAttackAuraEffect.GetSpellEffectInfo().TriggerSpell;
}
} }
else else
{ {
@@ -552,13 +548,10 @@ namespace Game.Entities
}); });
if (auraEffect != null) if (auraEffect != null)
{ meleeAttackSpellId = (uint)auraEffect.GetSpellEffectInfo().MiscValue;
meleeAttackAuraEffect = auraEffect;
meleeAttackSpellId = (uint)meleeAttackAuraEffect.GetSpellEffectInfo().MiscValue;
}
} }
if (meleeAttackAuraEffect == null) if (meleeAttackSpellId == 0)
{ {
CalcDamageInfo damageInfo; CalcDamageInfo damageInfo;
CalculateMeleeDamage(victim, out damageInfo, attType); CalculateMeleeDamage(victim, out damageInfo, attType);
@@ -586,7 +579,7 @@ namespace Game.Entities
} }
else else
{ {
CastSpell(victim, meleeAttackSpellId, new CastSpellExtraArgs(meleeAttackAuraEffect)); CastSpell(victim, meleeAttackSpellId, true);
HitInfo hitInfo = HitInfo.AffectsVictim | HitInfo.NoAnimation; HitInfo hitInfo = HitInfo.AffectsVictim | HitInfo.NoAnimation;
if (attType == WeaponAttackType.OffAttack) if (attType == WeaponAttackType.OffAttack)