*Move beast within bonus auras to sql.

--HG--
branch : trunk

3 files changed, 19 insertions, 20 deletions

diff --git a/sql/FULL/world_spell_full.sql b/sql/FULL/world_spell_full.sql
index 27c8b8e3d10..59ca0b0cbe1 100644
--- a/sql/FULL/world_spell_full.sql
+++ b/sql/FULL/world_spell_full.sql
@@ -72,6 +72,14 @@ INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comm
 ( 20594, 65116, 0, 'Stoneform'),
 ( 49039, 50397, 2, 'Lichborne - shapeshift'),
 ( 64382, 64380, 0, 'Shattering Throw'),
+( 19574, 24395, 2, 'Beast Within'),
+( 19574, 24396, 2, 'Beast Within'),
+( 19574, 24397, 2, 'Beast Within'),
+( 19574, 26592, 2, 'Beast Within'),
+( 34471, 24395, 2, 'Beast Within'),
+( 34471, 24396, 2, 'Beast Within'),
+( 34471, 24397, 2, 'Beast Within'),
+( 34471, 26592, 2, 'Beast Within'),
 
 -- Creature
 ( 36574, 36650, 0, 'Apply Phase Slip Vulnerability'),
diff --git a/sql/updates/4862_world_linked_spell.sql b/sql/updates/4862_world_linked_spell.sql
new file mode 100644
index 00000000000..a994a45bc22
--- /dev/null
+++ b/sql/updates/4862_world_linked_spell.sql
@@ -0,0 +1,11 @@
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN (19574,34471);
+INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) 
+VALUES
+( 19574, 24395, 2, 'Beast Within'),
+( 19574, 24396, 2, 'Beast Within'),
+( 19574, 24397, 2, 'Beast Within'),
+( 19574, 26592, 2, 'Beast Within'),
+( 34471, 24395, 2, 'Beast Within'),
+( 34471, 24396, 2, 'Beast Within'),
+( 34471, 24397, 2, 'Beast Within'),
+( 34471, 26592, 2, 'Beast Within');
\ No newline at end of file
diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index c303e5cdb11..6db5315ae5b 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -4215,26 +4215,6 @@ void AuraEffect::HandleModMechanicImmunity(bool apply, bool Real, bool /*changeA
             }
         }
     }
-
-    // The Beast Within and Bestial Wrath - immunity
-    if(GetId() == 19574 || GetId() == 34471)
-    {
-        if(apply)
-        {
-            m_target->CastSpell(m_target,24395,true, NULL, this);
-            m_target->CastSpell(m_target,24396,true, NULL, this);
-            m_target->CastSpell(m_target,24397,true, NULL, this);
-            m_target->CastSpell(m_target,26592,true, NULL, this);
-        }
-        else
-        {
-            m_target->RemoveAurasDueToSpell(24395);
-            m_target->RemoveAurasDueToSpell(24396);
-            m_target->RemoveAurasDueToSpell(24397);
-            m_target->RemoveAurasDueToSpell(26592);
-        }
-    }
-
     // Heroic Fury (remove Intercept cooldown)
     else if( apply && GetId() == 60970 && m_target->GetTypeId() == TYPEID_PLAYER )
     {