From ad19110ee827b7326364e04eaacb023cdf22a4e8 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Wed, 24 Jan 2018 13:42:25 -0500 Subject: [PATCH] Core/Player: fix regression with EquippedItemClass requiring spells --- Source/Game/Entities/Player/Player.Spells.cs | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Source/Game/Entities/Player/Player.Spells.cs b/Source/Game/Entities/Player/Player.Spells.cs index ce3052b25..a8f54d238 100644 --- a/Source/Game/Entities/Player/Player.Spells.cs +++ b/Source/Game/Entities/Player/Player.Spells.cs @@ -2193,6 +2193,15 @@ namespace Game.Entities if (spellInfo.HasAttribute(SpellAttr8.MasterySpecialization)) need_cast &= IsCurrentSpecMasterySpell(spellInfo); + // Check EquippedItemClass + // passive spells which apply aura and have an item requirement are to be added in Player::ApplyItemDependentAuras + if (spellInfo.IsPassive() && spellInfo.EquippedItemClass >= 0) + { + foreach (SpellEffectInfo effectInfo in spellInfo.GetEffectsForDifficulty(Difficulty.None)) + if (effectInfo != null && effectInfo.IsAura()) + return false; + } + //Check CasterAuraStates return need_cast && (spellInfo.CasterAuraState == 0 || HasAuraState(spellInfo.CasterAuraState)); }