aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRushor <PBienati@web.de>2016-04-25 10:32:02 +0200
committerDDuarte <dnpd.dd@gmail.com>2016-04-28 17:22:57 +0100
commit926c1ac9a064780241f0a22fd6cab45d10e16f89 (patch)
tree74a7d5994cb6f4d94fd09ff67f2b7ffaf9d8a0cc /src
parent2265e33cc2213f4c7bcead00173b4cd18cb46e5f (diff)
Merge pull request #16494 from Rushor/calc
Core/Spell: Magic Absorption Calculation (cherry picked from commit ebafa2fdeaf4544b5e62c9fab7c281d54f7aa139) # Conflicts: # src/server/game/Spells/SpellInfo.cpp
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Spells/SpellInfo.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp
index 5e0c70e855e..977827e9d46 100644
--- a/src/server/game/Spells/SpellInfo.cpp
+++ b/src/server/game/Spells/SpellInfo.cpp
@@ -528,7 +528,8 @@ int32 SpellEffectInfo::CalcValue(Unit const* caster /*= nullptr*/, int32 const*
level = int32(_spellInfo->MaxLevel);
else if (level < int32(_spellInfo->BaseLevel))
level = int32(_spellInfo->BaseLevel);
- level -= int32(_spellInfo->SpellLevel);
+ if (!_spellInfo->IsPassive())
+ level -= int32(_spellInfo->SpellLevel);
basePoints += int32(level * basePointsPerLevel);
}