*Merge.

--HG--
branch : trunk

1 files changed, 7 insertions, 1 deletions

diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index 661eef708ea..dd85148022b 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -5669,7 +5669,13 @@ void Spell::EffectSummonObject(uint32 i)
         if( m_caster )
             obj = m_caster->GetMap()->GetGameObject(guid);
 
-        if(obj) obj->Delete();
+        if(obj)
+        {
+            // Recast case - null spell id to make auras not be removed on object remove from world
+            if (m_spellInfo->Id == obj->GetSpellId())
+                obj->SetSpellId(0);
+            obj->Delete();
+        }
         m_caster->m_ObjectSlot[slot] = 0;
     }