From 5b034ee631822f71c6504944963aaa17c6a29b68 Mon Sep 17 00:00:00 2001 From: megamage Date: Mon, 28 Nov 2011 14:34:30 -0500 Subject: Revert 81fea2d7b51549c340866050f93e3780503112f7. --- src/server/game/Spells/SpellEffects.cpp | 6 ------ 1 file changed, 6 deletions(-) (limited to 'src/server/game/Spells/SpellEffects.cpp') diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index faac7acece5..e42294f59ae 100755 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -3823,10 +3823,7 @@ void Spell::EffectTameCreature(SpellEffIndex /*effIndex*/) Pet* pet = m_caster->CreateTamedPetFrom(creatureTarget, m_spellInfo->Id); if (!pet) // in very specific state like near world end/etc. - { - delete pet; return; - } // "kill" original creature creatureTarget->DespawnOrUnsummon(); @@ -7012,10 +7009,7 @@ void Spell::EffectCreateTamedPet(SpellEffIndex effIndex) uint32 creatureEntry = m_spellInfo->Effects[effIndex].MiscValue; Pet* pet = unitTarget->CreateTamedPetFrom(creatureEntry, m_spellInfo->Id); if (!pet) - { - delete pet; return; - } // add to world pet->GetMap()->AddToMap(pet->ToCreature()); -- cgit v1.2.3