scaling.diff

@@ -432,11 +432,12 @@ int32 SpellEffectInfo::CalcValue(Unit const* caster, int32 const* bp, Unit const
     float basePointsPerLevel = RealPointsPerLevel;
     int32 basePoints = bp ? *bp : BasePoints;
     float comboDamage = PointsPerComboPoint;
 
     // base amount modification based on spell lvl vs caster lvl
-    if (ScalingMultiplier != 0.0f)
+    // Do not perform any scaling calculation if custom values were passed to us
+    if (ScalingMultiplier != 0.0f && !bp)
     {
         if (caster)
         {
             int32 level = caster->getLevel();
             if (target && _spellInfo->IsPositiveEffect(_effIndex) && Effect == SPELL_EFFECT_APPLY_AURA)