*Spell_bonus_data for Shattering throw and Hand of Reckogning

*Do not check SPELL_ATTR_EX_CANT_TARGET_SELF for triggered spells

--HG--
branch : trunk

5 files changed, 67 insertions, 61 deletions

diff --git a/sql/FULL/world_spell_full.sql b/sql/FULL/world_spell_full.sql
index c2cbc55293a..09e4b7df270 100644
--- a/sql/FULL/world_spell_full.sql
+++ b/sql/FULL/world_spell_full.sql
@@ -1645,6 +1645,7 @@ INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`, `ap_bonus`
 (25742, 0.07, -1, 0.039, -1, 'Paladin - Seal of Righteousness Dummy Proc'),
 (53719, 0, 0, 0, 0, 'Paladin - Seal of the Martyr Proc Enemy'),
 (53718, 0, 0, 0, 0, 'Paladin - Seal of the Martyr Proc Self'),
+(62124, 0.085, -1, -1, -1, 'Paladin - Hand of Reckoning'),
 (50256, -1, -1, 0.08, -1, 'Pet Skills - Bear (Swipe)'),
 (32546, 0.8068, -1, -1, -1, 'Priest - Binding Heal'),
 (27813, 0, 0, 0, 0, 'Priest - Blessed Recovery Rank 1'),
@@ -1797,7 +1798,8 @@ INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`, `ap_bonus`
 (20253, -1, -1, 0.12, -1, 'Warrior - Intercept'),
 (61491, -1, -1, 0.12, -1, 'Warrior - Intercept'),
 (6572, -1, -1, 0.207, -1, 'Warrior - Revenge'),
-(6343, -1, -1, 0.12, -1, 'Warrior - Thunder Clap');
+(6343, -1, -1, 0.12, -1, 'Warrior - Thunder Clap'),
+(64382, -1, -1, 0.5, -1, 'Warrior - Shattering Throw');
 
 -- --------
 -- SPELL ELIXIR
diff --git a/sql/updates/4602_world_spell_bonus_data.txt b/sql/updates/4602_world_spell_bonus_data.txt
index 6e39d948f30..85975accd34 100644
--- a/sql/updates/4602_world_spell_bonus_data.txt
+++ b/sql/updates/4602_world_spell_bonus_data.txt
@@ -1,7 +1,7 @@
-DELETE FROM `spell_bonus_data` WHERE `entry`=779;

-INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`, `ap_bonus`, `ap_dot_bonus`, `comments`) VALUES 

-('779', '-1', '-1', '0.063', '-1', 'Druid - Swipe (Bear)');

-

-DELETE FROM `spell_bonus_data` WHERE `entry`=50256;

-INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`, `ap_bonus`, `ap_dot_bonus`, `comments`) VALUES 

+DELETE FROM `spell_bonus_data` WHERE `entry`=779;
+INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`, `ap_bonus`, `ap_dot_bonus`, `comments`) VALUES 
+('779', '-1', '-1', '0.063', '-1', 'Druid - Swipe (Bear)');
+
+DELETE FROM `spell_bonus_data` WHERE `entry`=50256;
+INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`, `ap_bonus`, `ap_dot_bonus`, `comments`) VALUES 
 (50256, -1, -1, 0.08, -1, 'Pet Skills - Bear (Swipe)');
\ No newline at end of file
diff --git a/sql/updates/4603_world_tmp.txt b/sql/updates/4603_world_tmp.txt
index 222a8efa783..4ce1593c9c7 100644
--- a/sql/updates/4603_world_tmp.txt
+++ b/sql/updates/4603_world_tmp.txt
@@ -1,54 +1,54 @@
-UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=11898;

-UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=11899;

-UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=149045;

-UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=149046;

-UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=164871;

-UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=175080;

-UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=176080;

-UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=176081;

-UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=176082;

-UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=176083;

-UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=176084;

-UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=176085;

-UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=176086;

-UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=176231;

-UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=176244;

-UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=176310;

-UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=176495;

-UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=177233;

-UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=181056;

-UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=181646;

-UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=183169;

-UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=183177;

-UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=183202;

-UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=183203;

-UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=183407;

-UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=183490;

-UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=183788;

-UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=184330;

-UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=20649;

-UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=20650;

-UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=20651;

-UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=20652;

-UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=20653;

-UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=20654;

-UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=20655;

-UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=20656;

-UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=20657;

-UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=20808;

-UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=210335;

-UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=210336;

-UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=210349;

-UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=211023;

-UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=211024;

-UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=211050;

-UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=211051;

-UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=211052;

-UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=211053;

-UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=4170;

-UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=4171;

-UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=47296;

-UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=47297;

-UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=80022;

-UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=80023;

+UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=11898;
+UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=11899;
+UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=149045;
+UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=149046;
+UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=164871;
+UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=175080;
+UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=176080;
+UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=176081;
+UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=176082;
+UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=176083;
+UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=176084;
+UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=176085;
+UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=176086;
+UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=176231;
+UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=176244;
+UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=176310;
+UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=176495;
+UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=177233;
+UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=181056;
+UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=181646;
+UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=183169;
+UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=183177;
+UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=183202;
+UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=183203;
+UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=183407;
+UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=183490;
+UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=183788;
+UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=184330;
+UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=20649;
+UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=20650;
+UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=20651;
+UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=20652;
+UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=20653;
+UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=20654;
+UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=20655;
+UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=20656;
+UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=20657;
+UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=20808;
+UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=210335;
+UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=210336;
+UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=210349;
+UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=211023;
+UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=211024;
+UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=211050;
+UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=211051;
+UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=211052;
+UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=211053;
+UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=4170;
+UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=4171;
+UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=47296;
+UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=47297;
+UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=80022;
+UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=80023;
 UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=85556;
\ No newline at end of file
diff --git a/sql/updates/4604_world.sql b/sql/updates/4604_world.sql
new file mode 100644
index 00000000000..ba05803139d
--- /dev/null
+++ b/sql/updates/4604_world.sql
@@ -0,0 +1,4 @@
+DELETE FROM `spell_bonus_data` where `entry` IN(62124, 64382);
+INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`, `ap_bonus`, `ap_dot_bonus`, `comments`) VALUES
+(62124, 0.085, -1, -1, -1, 'Paladin - Hand of Reckoning'),
+(64382, -1, -1, 0.5, -1, 'Warrior - Shattering Throw');
diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index 8f47a8252d4..dfa2687c72d 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -4341,7 +4341,7 @@ SpellCastResult Spell::CheckCast(bool strict)
         if(m_spellInfo->excludeTargetAuraSpell && target->HasAura(m_spellInfo->excludeTargetAuraSpell))
             return SPELL_FAILED_TARGET_AURASTATE;
 
-        if(target == m_caster && m_spellInfo->AttributesEx & SPELL_ATTR_EX_CANT_TARGET_SELF)
+        if(!m_IsTriggeredSpell && target == m_caster && m_spellInfo->AttributesEx & SPELL_ATTR_EX_CANT_TARGET_SELF)
             return SPELL_FAILED_BAD_TARGETS;
 
         if(target != m_caster)