From 5b034ee631822f71c6504944963aaa17c6a29b68 Mon Sep 17 00:00:00 2001
From: megamage <none@none.none>
Date: Mon, 28 Nov 2011 14:34:30 -0500
Subject: Revert 81fea2d7b51549c340866050f93e3780503112f7.

---
 src/server/game/Chat/Commands/Level2.cpp | 4 ----
 src/server/game/Spells/SpellEffects.cpp  | 6 ------
 src/server/scripts/Commands/cs_npc.cpp   | 3 +--
 3 files changed, 1 insertion(+), 12 deletions(-)

(limited to 'src/server')

diff --git a/src/server/game/Chat/Commands/Level2.cpp b/src/server/game/Chat/Commands/Level2.cpp
index 1dd603094f6..41bc564759c 100755
--- a/src/server/game/Chat/Commands/Level2.cpp
+++ b/src/server/game/Chat/Commands/Level2.cpp
@@ -861,10 +861,6 @@ bool ChatHandler::HandleCreatePetCommand(const char* /*args*/)
 
     // Everything looks OK, create new pet
     Pet* pet = new Pet(player, HUNTER_PET);
-
-    if (!pet)
-      return false;
-
     if (!pet->CreateBaseAtCreature(creatureTarget))
     {
         delete pet;
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());
diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp
index 46b6c1cb16b..b9ac21cc040 100644
--- a/src/server/scripts/Commands/cs_npc.cpp
+++ b/src/server/scripts/Commands/cs_npc.cpp
@@ -1126,12 +1126,11 @@ public:
         }
 
         // Everything looks OK, create new pet
-        Pet* pet = player->CreateTamedPetFrom (creatureTarget);
+        Pet* pet = player->CreateTamedPetFrom(creatureTarget);
         if (!pet)
         {
             handler->PSendSysMessage (LANG_CREATURE_NON_TAMEABLE, cInfo->Entry);
             handler->SetSentErrorMessage (true);
-            delete pet;
             return false;
         }
 
-- 
cgit v1.2.3