From 5d06fd77be8f16c36186b6795ac07b11aea28790 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Wed, 1 Jun 2022 16:09:27 -0400 Subject: [PATCH] Core/Spells: Implemented SPELL_ATTR6_AURA_IS_WEAPON_PROC Port From (https://github.com/TrinityCore/TrinityCore/commit/0710fd0ee09c6fd7cdd990d7a1d44cedb2a6034d) --- Source/Framework/Constants/Spells/SpellConst.cs | 2 +- Source/Game/Spells/Auras/Aura.cs | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Source/Framework/Constants/Spells/SpellConst.cs b/Source/Framework/Constants/Spells/SpellConst.cs index 610edc99b..5fe1578c2 100644 --- a/Source/Framework/Constants/Spells/SpellConst.cs +++ b/Source/Framework/Constants/Spells/SpellConst.cs @@ -1799,7 +1799,7 @@ namespace Framework.Constants IgnoreForModTimeRate = 0x10, /*Nyi, Time Rate Not Implemented*/ // Ignore For Mod Time Rate DoNotConsumeResources = 0x20, // Do Not Consume Resources FloatingCombatTextOnCast = 0x40, // Floating Combat Text On Cast (Client Only) - AuraIsWeaponProc = 0x80, /*Nyi*/ // Aura Is Weapon Proc + AuraIsWeaponProc = 0x80, // Aura Is Weapon Proc DoNotChainToCrowdControlledTargets = 0x100, // Do Not Chain To Crowd-Controlled Targets Description Implicit Targeting (Chaining And Area Targeting) Will Not Impact Crowd Controlled Targets AllowOnCharmedTargets = 0x200, /*Nyi*/ // Allow On Charmed Targets NoAuraLog = 0x400, // No Aura Log diff --git a/Source/Game/Spells/Auras/Aura.cs b/Source/Game/Spells/Auras/Aura.cs index 66f535277..b8615c024 100644 --- a/Source/Game/Spells/Auras/Aura.cs +++ b/Source/Game/Spells/Auras/Aura.cs @@ -1726,6 +1726,9 @@ namespace Game.Spells if (spell.m_CastItem != null && procEntry.AttributesMask.HasFlag(ProcAttributes.CantProcFromItemCast)) return 0; + + if (spell.GetSpellInfo().HasAttribute(SpellAttr4.SuppressWeaponProcs) && GetSpellInfo().HasAttribute(SpellAttr6.AuraIsWeaponProc)) + return 0; } // check don't break stealth attr present