From 4e1a263e7c8730d4bbda49cebbbec381f971164a Mon Sep 17 00:00:00 2001 From: Shauren Date: Sat, 3 Dec 2016 16:15:21 +0100 Subject: Core/Spells: Fixed spell value calculation for consumables Closes #18385 --- src/server/game/Spells/SpellInfo.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'src') diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp index 16b05fc6329..70cdcd3ed1f 100644 --- a/src/server/game/Spells/SpellInfo.cpp +++ b/src/server/game/Spells/SpellInfo.cpp @@ -483,13 +483,7 @@ int32 SpellEffectInfo::CalcValue(Unit const* caster /*= nullptr*/, int32 const* if (!_spellInfo->Scaling.ScalesFromItemLevel) { if (!_spellInfo->HasAttribute(SPELL_ATTR11_SCALES_WITH_ITEM_LEVEL)) - { - GtSpellScalingEntry const* gtScaling = sSpellScalingGameTable.GetRow(level); - if (_spellInfo->Scaling.Class > 0) - value = GetSpellScalingColumnForClass(gtScaling, _spellInfo->Scaling.Class); - else - value = gtScaling->Item; - } + value = GetSpellScalingColumnForClass(sSpellScalingGameTable.GetRow(level), _spellInfo->Scaling.Class); else { uint32 effectiveItemLevel = itemLevel != -1 ? uint32(itemLevel) : 1u; -- cgit v1.2.3