* Move Paladin Judgement bonuses to spell_bonus_data, thanks deltapower.inc

* Avoid code duplication by moving spell interrupt code for jump effects to a common function for both EffectJump and EffectJumpDest, thanks devthenecro

--HG--
branch : trunk

2 files changed, 4 insertions, 24 deletions

diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp
index 5094589f921..618849d0ff7 100644
--- a/src/server/game/Movement/MotionMaster.cpp
+++ b/src/server/game/Movement/MotionMaster.cpp
@@ -327,6 +327,10 @@ void MotionMaster::MoveJump(float x, float y, float z, float speedXY, float spee
     uint32 moveFlag = SPLINEFLAG_TRAJECTORY | SPLINEFLAG_WALKING;
     uint32 time = uint32(speedZ * 100);
 
+    // Instantly interrupt non melee spells being casted
+    if (i_owner->IsNonMeleeSpellCasted(true))
+        i_owner->InterruptNonMeleeSpells(true);
+
     i_owner->addUnitState(UNIT_STAT_CHARGING | UNIT_STAT_JUMPING);
     i_owner->m_TempSpeed = speedXY;
     if (i_owner->GetTypeId() == TYPEID_PLAYER)
diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp
index ad908cc26ec..3e870182e63 100644
--- a/src/server/game/Spells/SpellEffects.cpp
+++ b/src/server/game/Spells/SpellEffects.cpp
@@ -733,22 +733,6 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
                 {
                     damage += int32(m_caster->GetShieldBlockValue() * 1.3f);
                 }
-                // Judgements
-                else switch (m_spellInfo->Id)
-                {
-                    case 20187:
-                    case 54158:
-                    case 31804:
-                        float attackPower = m_caster->GetTotalAttackPowerValue(BASE_ATTACK);
-                        float spellPower = (float)(m_caster->SpellBaseDamageBonus(GetSpellSchoolMask(m_spellInfo)));
-                        if (m_spellInfo->Id == 20187) // Judgement of Righteousness
-                            damage += int32(0.2f * attackPower + 0.32f * spellPower);
-                        if (m_spellInfo->Id == 54158) // Judgement of Wisdom, Light, Justice
-                            damage += int32(0.16f * attackPower + 0.25f * spellPower);
-                        if (m_spellInfo->Id == 31804) // Judgement of Vengeance
-                            damage += int32(0.14f * attackPower + 0.22f * spellPower);
-                        break;
-                }
                 break;
             }
             case SPELLFAMILY_DEATHKNIGHT:
@@ -2100,10 +2084,6 @@ void Spell::EffectJump(uint32 i)
     if (m_caster->isInFlight())
         return;
 
-    // Instantly interrupt non melee spells being casted
-    if (m_caster->IsNonMeleeSpellCasted(true))
-        m_caster->InterruptNonMeleeSpells(true);
-
     float x,y,z,o;
     if (m_targets.getUnitTarget())
     {
@@ -2131,10 +2111,6 @@ void Spell::EffectJumpDest(uint32 i)
     if (m_caster->isInFlight())
         return;
 
-    // Instantly interrupt non melee spells being casted
-    if (m_caster->IsNonMeleeSpellCasted(true))
-        m_caster->InterruptNonMeleeSpells(true);
-
     // Init dest coordinates
     float x,y,z,o;
     if (m_targets.HasDst())