From 9676c5eddf8aee8665e3faa3918492aeaf816a8d Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Wed, 17 Jun 2009 15:44:18 -0500
Subject: *Fix a crash caused by boss_fathomguard script.

--HG--
branch : trunk
---
 .../coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp   | 2 --
 src/game/SpellEffects.cpp                                             | 4 ++++
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp
index fb15b427bfa..1d0083d9d0d 100644
--- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp
+++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp
@@ -642,8 +642,6 @@ struct TRINITY_DLL_DECL boss_fathomguard_caribdisAI : public ScriptedAI
         if (TidalSurge_Timer < diff)
         {
             DoCast(m_creature->getVictim(), SPELL_TIDAL_SURGE);
-            // Hacky way to do it - won't trigger elseways
-            m_creature->getVictim()->CastSpell( m_creature->getVictim(), SPELL_TIDAL_SURGE_FREEZE, true );
             TidalSurge_Timer = 15000+rand()%5000;
         }else TidalSurge_Timer -= diff;
 
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index 610ebba2b71..3efd29c6e69 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -4758,6 +4758,10 @@ void Spell::EffectScriptEffect(uint32 effIndex)
                     }
                     break;
                 }
+                case 38358:
+                    if(unitTarget)
+                        m_caster->CastSpell(unitTarget, 38353, true);
+                    return;
                 /*// Flame Crash
                 case 41126:
                 {
-- 
cgit v1.2.3