Core/Spell: added some helpers to SpellInfo to reduce code duplication

(cherry picked from commit 14c2b2d6cd2303609f1a1859e727ace7b8ea649c)

1 files changed, 2 insertions, 9 deletions

diff --git a/src/server/game/Entities/Unit/StatSystem.cpp b/src/server/game/Entities/Unit/StatSystem.cpp
index 14037920628..3c93d8404a0 100644
--- a/src/server/game/Entities/Unit/StatSystem.cpp
+++ b/src/server/game/Entities/Unit/StatSystem.cpp
@@ -706,17 +706,10 @@ void Player::UpdateExpertise(WeaponAttackType attack)
 
     int32 expertise = int32(GetRatingBonusValue(CR_EXPERTISE));
 
-    Item* weapon = GetWeaponForAttack(attack, true);
+    Item const* weapon = GetWeaponForAttack(attack, true);
     expertise += GetTotalAuraModifier(SPELL_AURA_MOD_EXPERTISE, [weapon](AuraEffect const* aurEff) -> bool
     {
-        // item neutral spell
-        if (aurEff->GetSpellInfo()->EquippedItemClass == -1)
-            return true;
-        // item dependent spell
-        else if (weapon && weapon->IsFitToSpellRequirements(aurEff->GetSpellInfo()))
-            return true;
-
-        return false;
+        return aurEff->GetSpellInfo()->IsItemFitToSpellRequirements(weapon);
     });
 
     if (expertise < 0)