Core/Spells: Fix damage and combat log for spell Hand of Reckoning

3 files changed, 5 insertions, 9 deletions

diff --git a/sql/base/world_database.sql b/sql/base/world_database.sql
index e2a337bc9a4..b2d7abe456a 100644
--- a/sql/base/world_database.sql
+++ b/sql/base/world_database.sql
@@ -16963,7 +16963,7 @@ INSERT INTO `spell_bonus_data` (`entry`,`direct_bonus`,`dot_bonus`,`ap_bonus`,`a
 (66922, 0, 0, 0, 0, 'Paladin - Flash of Light'),
 (53595, 0, 0, 0, 0, 'Paladin - Hammer of the Righteous'),
 (24275, 0.15, -1, 0.15, -1, 'Paladin - Hammer of Wrath'),
-(62124, 0.085, -1, -1, -1, 'Paladin - Hand of Reckoning'),
+(67485, 0, -1, 0.5, -1, 'Paladin - Hand of Reckoning triggered'),
 (635, 1.66, -1, -1, -1, 'Paladin - Holy Light'),
 (20925, 0.09, -1, 0.056, -1, 'Paladin - Holy Shield'),
 (25914, 0.81, -1, -1, -1, 'Paladin - Holy Shock Triggered Heal Rank 1'),
diff --git a/sql/updates/world/2011_05_10_02_world_spell_bonus_data.sql b/sql/updates/world/2011_05_10_02_world_spell_bonus_data.sql
new file mode 100644
index 00000000000..cde9c527400
--- /dev/null
+++ b/sql/updates/world/2011_05_10_02_world_spell_bonus_data.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_bonus_data` WHERE `entry` IN (62124, 67485);
+INSERT INTO `spell_bonus_data` VALUES
+(67485, 0, -1, 0.5, -1, 'Paladin - Hand of Reckoning Triggered');
diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp
index b8f5a28dbeb..eb0e5588db7 100755
--- a/src/server/game/Spells/SpellEffects.cpp
+++ b/src/server/game/Spells/SpellEffects.cpp
@@ -3883,14 +3883,7 @@ void Spell::EffectTaunt(SpellEffIndex /*effIndex*/)
     }
 
     if (m_spellInfo->Id == 62124)
-    {
-        int32 damageDone = int32(1 + m_caster->GetTotalAttackPowerValue(BASE_ATTACK) * 0.5f);
-        bool is_crit = m_caster->isSpellCrit(unitTarget, m_spellInfo, m_spellSchoolMask, m_attackType);
-        if (is_crit)
-            damageDone *= 2;
-        m_caster->DealDamage(unitTarget, damageDone, NULL, SPELL_DIRECT_DAMAGE, SPELL_SCHOOL_MASK_HOLY, m_spellInfo, false);
-        m_caster->SendSpellNonMeleeDamageLog(unitTarget, m_spellInfo->Id, damageDone, SPELL_SCHOOL_MASK_HOLY, 0, 0, false, false, is_crit);
-    }
+        m_caster->CastSpell(unitTarget, 67485, true);
 
     // Also use this effect to set the taunter's threat to the taunted creature's highest value
     if (unitTarget->getThreatManager().getCurrentVictim())