*Merge

--HG--
branch : trunk

2 files changed, 14 insertions, 8 deletions

diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index 15cee611db0..378bd06aa95 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -2125,8 +2125,11 @@ void Spell::cancel()
     if(m_spellState == SPELL_STATE_FINISHED)
         return;
 
+    uint32 oldState = m_spellState;
+    m_spellState = SPELL_STATE_FINISHED;
+
     m_autoRepeat = false;
-    switch (m_spellState)
+    switch (oldState)
     {
         case SPELL_STATE_PREPARING:
         case SPELL_STATE_DELAYED:
@@ -2158,10 +2161,13 @@ void Spell::cancel()
         } break;
     }
 
-    finish(false);
-
     m_caster->RemoveDynObject(m_spellInfo->Id);
     m_caster->RemoveGameObject(m_spellInfo->Id,true);
+
+    //set state back so finish will be processed
+    m_spellState = oldState;
+
+    finish(false);
 }
 
 void Spell::cast(bool skipCheck)
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 7bdb3b28d27..6c75903072f 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -4706,13 +4706,10 @@ void Unit::RemoveAura(AuraMap::iterator &i, AuraRemoveMode mode)
         if(!caster)                                         // can be already located for IsSingleTargetSpell case
             caster = Aur->GetCaster();
 
-        if(caster)
+        if(caster && caster->isAlive())
         {
-            if(caster->GetTypeId()==TYPEID_UNIT && ((Creature*)caster)->isTotem() && ((Totem*)caster)->GetTotemType()==TOTEM_STATUE)
-                statue = ((Totem*)caster);
-
             // stop caster chanelling state
-            else if(caster->m_currentSpells[CURRENT_CHANNELED_SPELL]
+            if(caster->m_currentSpells[CURRENT_CHANNELED_SPELL]
                 //prevent recurential call
                 && caster->m_currentSpells[CURRENT_CHANNELED_SPELL]->getState() != SPELL_STATE_FINISHED)
             {
@@ -4727,6 +4724,9 @@ void Unit::RemoveAura(AuraMap::iterator &i, AuraRemoveMode mode)
                         caster->m_currentSpells[CURRENT_CHANNELED_SPELL]->cancel();
                     }
                 }
+
+                if(caster->GetTypeId()==TYPEID_UNIT && ((Creature*)caster)->isTotem() && ((Totem*)caster)->GetTotemType()==TOTEM_STATUE)
+                    statue = ((Totem*)caster);
             }
 
             // Unsummon summon as possessed creatures on spell cancel