*Merge required after backout.

--HG-- branch : trunk
2009-07-30 11:52:49 +02:00
parent 2a402ff6c7 33efe96f94
commit 8c6b85ccb1
1 changed files with 13 additions and 3 deletions
@@ -5874,10 +5874,20 @@ void Spell::EffectSummonObject(uint32 i)
        default: return;
    }

-    if(uint64 guid = m_caster->m_ObjectSlot[slot])
+    uint64 guid = m_caster->m_ObjectSlot[slot];
+    if(guid != 0)
    {
-        if(GameObject* obj = m_caster ? m_caster->GetMap()->GetGameObject(guid) : NULL)
-            obj->SetLootState(GO_JUST_DEACTIVATED);
+        GameObject* obj = NULL;
+        if( m_caster )
+            obj = m_caster->GetMap()->GetGameObject(guid);
+
+        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);
+            m_caster->RemoveGameObject(obj, true);
+        }
        m_caster->m_ObjectSlot[slot] = 0;
    }