Rename spell_snakes_spray for spell_jormungars_snakes_spray and cleanup

3 files changed, 18 insertions, 28 deletions

diff --git a/sql/updates/world/3.3.5/9999_99_99_99_world.sql b/sql/updates/world/3.3.5/9999_99_99_99_world.sql
index 6e708e4a6c4..04ff155e12c 100644
--- a/sql/updates/world/3.3.5/9999_99_99_99_world.sql
+++ b/sql/updates/world/3.3.5/9999_99_99_99_world.sql
@@ -1,13 +1,13 @@
-DELETE FROM `spell_script_names` where `ScriptName` IN ('spell_burning_spray','spell_paralytic_spray','spell_jormungars_paralytic_toxin');
+DELETE FROM `spell_script_names` where `ScriptName` IN ('spell_jormungars_burning_spray','spell_jormungars_paralytic_spray','spell_jormungars_paralytic_toxin');
 INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
-(66902,'spell_burning_spray'), -- Burning Spray 10m normal
-(67627,'spell_burning_spray'), -- Burning Spray 25m normal
-(67628,'spell_burning_spray'), -- Burning Spray 10m heroic
-(67629,'spell_burning_spray'), -- Burning Spray 25m heroic
-(66901,'spell_paralytic_spray'), -- Paralytic Spray 10m normal
-(67615,'spell_paralytic_spray'), -- Paralytic Spray 25m normal
-(67616,'spell_paralytic_spray'), -- Paralytic Spray 10m heroic
-(67617,'spell_paralytic_spray'), -- Paralytic Spray 25m heroic
+(66902,'spell_jormungars_burning_spray'), -- Burning Spray 10m normal
+(67627,'spell_jormungars_burning_spray'), -- Burning Spray 25m normal
+(67628,'spell_jormungars_burning_spray'), -- Burning Spray 10m heroic
+(67629,'spell_jormungars_burning_spray'), -- Burning Spray 25m heroic
+(66901,'spell_jormungars_paralytic_spray'), -- Paralytic Spray 10m normal
+(67615,'spell_jormungars_paralytic_spray'), -- Paralytic Spray 25m normal
+(67616,'spell_jormungars_paralytic_spray'), -- Paralytic Spray 10m heroic
+(67617,'spell_jormungars_paralytic_spray'), -- Paralytic Spray 25m heroic
 (66823,'spell_jormungars_paralytic_toxin'), -- Paralytic Toxin 10m normal
 (67618,'spell_jormungars_paralytic_toxin'), -- Paralytic Toxin 25m normal
 (67619,'spell_jormungars_paralytic_toxin'), -- Paralytic Toxin 10m heroic
diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
index a8adda3ad58..459f273b790 100644
--- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
@@ -846,16 +846,6 @@ void AuraEffect::UpdatePeriodic(Unit* caster)
                         case 59911: // Tenacity (vehicle)
                            GetBase()->RefreshDuration();
                            break;
-                        case 66823: case 67618: case 67619: case 67620: // Paralytic Toxin
-                            // Get 0 effect aura
-                            if (AuraEffect* slow = GetBase()->GetEffect(0))
-                            {
-                                int32 newAmount = slow->GetAmount() - 10;
-                                if (newAmount < -100)
-                                    newAmount = -100;
-                                slow->ChangeAmount(newAmount);
-                            }
-                            break;
                         default:
                             break;
                     }
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
index 9bef1e9c794..463f9e942c0 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
@@ -1205,17 +1205,17 @@ public:
     }
 };
 
-class spell_snakes_spray : public SpellScriptLoader
+class spell_jormungars_snakes_spray : public SpellScriptLoader
 {
 public:
-    spell_snakes_spray(const char* name, uint32 spellId) : SpellScriptLoader(name), _spellId(spellId) { }
+    spell_jormungars_snakes_spray(const char* name, uint32 spellId) : SpellScriptLoader(name), _spellId(spellId) { }
 
-    class spell_snakes_spray_SpellScript : public SpellScript
+    class spell_jormungars_snakes_spray_SpellScript : public SpellScript
     {
-        PrepareSpellScript(spell_snakes_spray_SpellScript);
+        PrepareSpellScript(spell_jormungars_snakes_spray_SpellScript);
 
     public:
-        spell_snakes_spray_SpellScript(uint32 spellId) : SpellScript(), _spellId(spellId) { }
+        spell_jormungars_snakes_spray_SpellScript(uint32 spellId) : SpellScript(), _spellId(spellId) { }
 
         bool Validate(SpellInfo const* /*spell*/)
         {
@@ -1232,7 +1232,7 @@ public:
 
         void Register()
         {
-            OnEffectHitTarget += SpellEffectFn(spell_snakes_spray_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
+            OnEffectHitTarget += SpellEffectFn(spell_jormungars_snakes_spray_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
         }
 
     private:
@@ -1241,7 +1241,7 @@ public:
 
     SpellScript* GetSpellScript() const
     {
-        return new spell_snakes_spray_SpellScript(_spellId);
+        return new spell_jormungars_snakes_spray_SpellScript(_spellId);
     }
 
 private:
@@ -1259,8 +1259,8 @@ void AddSC_boss_northrend_beasts()
     new boss_dreadscale();
     new npc_slime_pool();
     new spell_jormungars_paralytic_toxin();
-    new spell_snakes_spray("spell_burning_spray", SPELL_BURNING_BILE);
-    new spell_snakes_spray("spell_paralytic_spray", SPELL_PARALYTIC_TOXIN);
+    new spell_jormungars_snakes_spray("spell_jormungars_burning_spray", SPELL_BURNING_BILE);
+    new spell_jormungars_snakes_spray("spell_jormungars_paralytic_spray", SPELL_PARALYTIC_TOXIN);
 
     new boss_icehowl();
 }