*Merge.

--HG--
branch : trunk

1 files changed, 0 insertions, 19 deletions

diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index b5046a18491..aa04784fb97 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -2111,25 +2111,6 @@ void Spell::cancel()
 
     finish(false);
 
-    // Unsummon summon as possessed creatures on spell cancel
-    if(m_caster->GetTypeId() == TYPEID_PLAYER)
-    {
-        for(int i = 0; i < 3; ++i)
-        {
-            if(m_spellInfo->Effect[i] == SPELL_EFFECT_SUMMON &&
-                (m_spellInfo->EffectMiscValueB[i] == SUMMON_TYPE_POSESSED ||
-                 m_spellInfo->EffectMiscValueB[i] == SUMMON_TYPE_POSESSED2 ||
-                 m_spellInfo->EffectMiscValueB[i] == SUMMON_TYPE_POSESSED3))
-            {
-                ((Player*)m_caster)->StopCastingCharm();
-                break;
-                // Possession is removed in the UnSummon function
-                //if (m_caster->GetCharm())
-                //    ((TemporarySummon*)m_caster->GetCharm())->UnSummon();
-            }
-        }
-    }
-
     m_caster->RemoveDynObject(m_spellInfo->Id);
     m_caster->RemoveGameObject(m_spellInfo->Id,true);
 }