merge

--HG--
branch : trunk

1 files changed, 1 insertions, 9 deletions

diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index c826c70900a..154357c76f8 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -1909,20 +1909,12 @@ void Spell::EffectDummy(uint32 i)
             {
                 // No power, dismiss Gargoyle
                 if (m_caster->GetPower(POWER_RUNIC_POWER)<30)
-                    m_caster->CastSpell((Unit*)NULL,50515,true);
+                    m_caster->RemoveAurasDueToSpell(50514, m_caster->GetGUID());
                 else
                     m_caster->ModifyPower(POWER_RUNIC_POWER,-30);
 
                 return;
             }
-            // Dismiss Gargoyle
-            else if (m_spellInfo->Id == 50515)
-            {
-                // FIXME: gargoyle should fly away
-                unitTarget->setDeathState(JUST_DIED);
-                m_caster->RemoveAurasDueToSpell(50514);
-                return;
-            }
             break;
     }