*Remove incorrect object deletion from EffectSummonObject call and use RemoveGameObject() instead.

--HG--
branch : trunk

3 files changed, 6 insertions, 10 deletions

diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index 3b98301cb2e..8f679517c9b 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -1266,7 +1266,7 @@ void Aura::_RemoveAura()
         if (procEx)
         {
             uint32 ProcCaster, ProcVictim;
-            if (IsPositiveSpell(GetId()))
+            if (IsPositive())
             {
                 ProcCaster = PROC_FLAG_SUCCESSFUL_POSITIVE_MAGIC_SPELL | PROC_FLAG_SUCCESSFUL_POSITIVE_SPELL_HIT;
                 ProcVictim = PROC_FLAG_TAKEN_POSITIVE_MAGIC_SPELL | PROC_FLAG_TAKEN_POSITIVE_SPELL;
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index 8dc2e696da1..5e2dd395101 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -5874,7 +5874,7 @@ void Spell::EffectSummonObject(uint32 i)
             // 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->RemoveGameObject(obj, true);
         }
         m_caster->m_ObjectSlot[slot] = 0;
     }
diff --git a/src/game/SpellMgr.h b/src/game/SpellMgr.h
index 0f2e352fdcd..e087ec66502 100644
--- a/src/game/SpellMgr.h
+++ b/src/game/SpellMgr.h
@@ -567,14 +567,10 @@ class PetAura
             std::map<uint32, uint32>::const_iterator itr = auras.find(petEntry);
             if(itr != auras.end())
                 return itr->second;
-            else
-            {
-                std::map<uint32, uint32>::const_iterator itr2 = auras.find(0);
-                if(itr2 != auras.end())
-                    return itr2->second;
-                else
-                    return 0;
-            }
+            std::map<uint32, uint32>::const_iterator itr2 = auras.find(0);
+            if(itr2 != auras.end())
+                return itr2->second;
+            return 0;
         }
 
         void AddAura(uint32 petEntry, uint32 aura)