From b57f4a179bdb0fab39c43a86222922a4b927fa8f Mon Sep 17 00:00:00 2001
From: MrLama <MrLama@getmangos.com>
Date: Fri, 26 Feb 2010 22:34:57 +0300
Subject: [PATCH] [9459] Make spell 47540 and ranks channeling interruptible

In fact make triggered spell replace main spell for channeling.
This also let drop hack for target death case interrupt channeling for spell.

Signed-off-by: VladimirMangos <vladimir@getmangos.com>
---
 src/game/SpellAuras.cpp   | 8 --------
 src/game/SpellEffects.cpp | 8 ++++++--
 src/shared/revision_nr.h  | 2 +-
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index 630124542..e46706d24 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -2511,14 +2511,6 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
                     caster->InterruptSpell(CURRENT_CHANNELED_SPELL);
                 return;
             }
-            // Stop caster Penance chanelling on death
-            if (m_spellProto->SpellFamilyName == SPELLFAMILY_PRIEST &&
-                (m_spellProto->SpellFamilyFlags2 & UI64LIT(0x00000080)))
-            {
-                if (Unit* caster = GetCaster())
-                    caster->InterruptSpell(CURRENT_CHANNELED_SPELL);
-                return;
-            }
         }
     }
 
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index b1c8fa298..b49f874fa 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -1756,10 +1756,14 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
                         return;
                 }
 
+                // prevent interrupted message for main spell
+                finish(true);
+
+                // replace cast by selected spell, this also make it interruptible including target death case
                 if (m_caster->IsFriendlyTo(unitTarget))
-                    m_caster->CastSpell(unitTarget, heal, true);
+                    m_caster->CastSpell(unitTarget, heal, false);
                 else
-                    m_caster->CastSpell(unitTarget, hurt, true);
+                    m_caster->CastSpell(unitTarget, hurt, false);
 
                 return;
             }
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index bd81b3171..67eb1e34d 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "9458"
+ #define REVISION_NR "9459"
 #endif // __REVISION_NR_H__