aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Spells/SpellEffects.cpp
diff options
context:
space:
mode:
authormegamage <none@none.none>2011-11-28 14:34:30 -0500
committermegamage <none@none.none>2011-11-28 14:34:30 -0500
commit5b034ee631822f71c6504944963aaa17c6a29b68 (patch)
tree6247dbc18bbdd964cc38b82d9acb8b22792fb9f4 /src/server/game/Spells/SpellEffects.cpp
parent1f70fd2851c52d7bbfeb58af8180cf3ad39af290 (diff)
Revert 81fea2d7b51549c340866050f93e3780503112f7.
Diffstat (limited to 'src/server/game/Spells/SpellEffects.cpp')
-rwxr-xr-xsrc/server/game/Spells/SpellEffects.cpp6
1 files changed, 0 insertions, 6 deletions
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());