4 files changed, 28 insertions, 16 deletions

diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index ddfb9c01be5..989aa37bc5c 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -2114,7 +2114,7 @@ void Spell::prepare(SpellCastTargets * targets, Aura* triggeredByAura)
     }
 }
 
-void Spell::cancel()
+void Spell::cancel(bool report)
 {
     if(m_spellState == SPELL_STATE_FINISHED)
         return;
@@ -2144,7 +2144,7 @@ void Spell::cancel()
             m_caster->RemoveAurasDueToCasterSpell(m_spellInfo->Id, m_caster->GetGUID());
             SendChannelUpdate(0);
             SendInterrupted(0);
-            SendCastResult(SPELL_FAILED_INTERRUPTED);
+            SendCastResult(report ? SPELL_FAILED_INTERRUPTED : SPELL_FAILED_DONT_REPORT);
         } break;
 
         default:
diff --git a/src/game/Spell.h b/src/game/Spell.h
index 474336edab8..9debbf7efd9 100644
--- a/src/game/Spell.h
+++ b/src/game/Spell.h
@@ -323,7 +323,7 @@ class Spell
         ~Spell();
 
         void prepare(SpellCastTargets * targets, Aura* triggeredByAura = NULL);
-        void cancel();
+        void cancel(bool report = true);
         void update(uint32 difftime);
         void cast(bool skipCheck = false);
         void finish(bool ok = true);
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 607e33d6219..813d7783243 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -4644,7 +4644,7 @@ void Unit::RemoveAura(AuraMap::iterator &i, AuraRemoveMode mode)
 
     // Statue unsummoned at aura remove
     Totem* statue = NULL;
-    bool caster_channeled = false;
+    bool channeled = false;
     if(IsChanneledSpell(AurSpellInfo))
     {
         if(!caster)                                         // can be already located for IsSingleTargetSpell case
@@ -4654,8 +4654,15 @@ void Unit::RemoveAura(AuraMap::iterator &i, AuraRemoveMode mode)
         {
             if(caster->GetTypeId()==TYPEID_UNIT && ((Creature*)caster)->isTotem() && ((Totem*)caster)->GetTotemType()==TOTEM_STATUE)
                 statue = ((Totem*)caster);
-            else
-                caster_channeled = caster==this;
+
+            // stop caster chanelling state
+            else if(caster->m_currentSpells[CURRENT_CHANNELED_SPELL] 
+                //prevent recurential call
+                && caster->m_currentSpells[CURRENT_CHANNELED_SPELL]->getState() != SPELL_STATE_FINISHED)
+            {
+                caster->m_currentSpells[CURRENT_CHANNELED_SPELL]->cancel(false);
+                channeled = true;
+            }
         }
     }
 
@@ -4683,8 +4690,13 @@ void Unit::RemoveAura(AuraMap::iterator &i, AuraRemoveMode mode)
 
     delete Aur;
 
-    if(caster_channeled)
-        RemoveAurasAtChanneledTarget (AurSpellInfo);
+    if(channeled)
+    {
+        //if target is not caster remove auras also on caster
+        if (caster!=this)
+            caster->RemoveAurasAtChanneledTarget (AurSpellInfo, caster);
+        RemoveAurasAtChanneledTarget (AurSpellInfo, caster);
+    }
 
     if(statue)
         statue->UnSummon();
@@ -12553,23 +12565,23 @@ bool Unit::HandleMeandingAuraProc( Aura* triggeredByAura )
     return true;
 }
 
-void Unit::RemoveAurasAtChanneledTarget(SpellEntry const* spellInfo)
+void Unit::RemoveAurasAtChanneledTarget(SpellEntry const* spellInfo, Unit * caster)
 {
-    uint64 target_guid = GetUInt64Value(UNIT_FIELD_CHANNEL_OBJECT);
+/*    uint64 target_guid = GetUInt64Value(UNIT_FIELD_CHANNEL_OBJECT);
     if(target_guid == GetGUID())
         return;
 
     if(!IS_UNIT_GUID(target_guid))
         return;
 
-    Unit* target = ObjectAccessor::GetUnit(*this, target_guid);
-    if(!target)
+    Unit* target = ObjectAccessor::GetUnit(*this, target_guid);*/
+    if(!caster)
         return;
 
-    for (AuraMap::iterator iter = target->GetAuras().begin(); iter != target->GetAuras().end(); )
+    for (AuraMap::iterator iter = GetAuras().begin(); iter != GetAuras().end(); )
     {
-        if (iter->second->GetId() == spellInfo->Id && iter->second->GetCasterGUID()==GetGUID())
-            target->RemoveAura(iter);
+        if (iter->second->GetId() == spellInfo->Id && iter->second->GetCasterGUID() == caster->GetGUID())
+            RemoveAura(iter);
         else
             ++iter;
     }
diff --git a/src/game/Unit.h b/src/game/Unit.h
index 07899aff090..077e82a2143 100644
--- a/src/game/Unit.h
+++ b/src/game/Unit.h
@@ -1110,7 +1110,7 @@ class TRINITY_DLL_SPEC Unit : public WorldObject
         void RemoveAurasDueToSpellByDispel(uint32 spellId, uint64 casterGUID, Unit *dispeler);
         void RemoveAurasDueToSpellBySteal(uint32 spellId, uint64 casterGUID, Unit *stealer);
         void RemoveAurasDueToSpellByCancel(uint32 spellId);
-        void RemoveAurasAtChanneledTarget(SpellEntry const* spellInfo);
+        void RemoveAurasAtChanneledTarget(SpellEntry const* spellInfo, Unit * caster);
         void RemoveNotOwnSingleTargetAuras();
 
         void RemoveSpellsCausingAura(AuraType auraType);