aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/game/SpellAuras.cpp13
1 files changed, 11 insertions, 2 deletions
diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index f2721efb485..89d5a5578d5 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -462,7 +462,7 @@ m_target(parentAura->GetTarget())
m_effIndex = effIndex;
m_auraName = AuraType(m_spellProto->EffectApplyAuraName[m_effIndex]);
- if(currentBasePoints)
+ /*if(currentBasePoints)
{
m_amount = *currentBasePoints;
m_currentBasePoints = m_amount - 1;
@@ -474,7 +474,16 @@ m_target(parentAura->GetTarget())
m_amount = caster->CalculateSpellDamage(m_spellProto, m_effIndex, m_currentBasePoints, m_target);
else
m_amount = m_currentBasePoints + 1;
- }
+ }*/
+ if(currentBasePoints)
+ m_currentBasePoints = *currentBasePoints;
+ else
+ m_currentBasePoints = m_spellProto->EffectBasePoints[m_effIndex];
+
+ if(caster)
+ m_amount = caster->CalculateSpellDamage(m_spellProto, m_effIndex, m_currentBasePoints, m_target);
+ else
+ m_amount = m_currentBasePoints + 1;
if (!m_amount && castItem && castItem->GetItemSuffixFactor())
{