*Fix a bug that melee weapon spells deal too much damage.

--HG--
branch : trunk

2 files changed, 5 insertions, 5 deletions

diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index e9e79cb1594..88b8b0e722e 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -5404,9 +5404,6 @@ int32 Spell::CalculateDamageDone(Unit *unit, const uint32 effectMask, float *mul
 
             if(m_damage > 0)
             {
-                if(m_originalCaster)
-                    m_damage = m_originalCaster->SpellDamageBonus(unit, m_spellInfo, m_damage, SPELL_DIRECT_DAMAGE);
-
                 if(IsAreaEffectTarget[m_spellInfo->EffectImplicitTargetA[i]] || IsAreaEffectTarget[m_spellInfo->EffectImplicitTargetB[i]])
                 {
                     if(int32 reducedPct = unit->GetMaxNegativeAuraModifier(SPELL_AURA_MOD_AOE_DAMAGE_AVOIDANCE))
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index 33cdd325545..187ecf5eb60 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -597,8 +597,11 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
             }
         }
 
-        if(damage >= 0)
-            m_damage+= damage;
+        if(m_originalCaster)
+            damage = m_originalCaster->SpellDamageBonus(unitTarget, m_spellInfo, damage, SPELL_DIRECT_DAMAGE);
+
+        if(damage > 0)
+            m_damage += damage;
     }
 }