aboutsummaryrefslogtreecommitdiff
path: root/src/game/NPCHandler.cpp
diff options
context:
space:
mode:
authorQAston <none@none>2010-01-18 23:12:35 +0100
committerQAston <none@none>2010-01-18 23:12:35 +0100
commita1bbbd1421d29edd02feb2e19df8b07c9484f59d (patch)
tree7a64117ff17d3c44a0677ca05256366044c3ca3c /src/game/NPCHandler.cpp
parentc7c3b0edb06abbbbf5ffc54ed9e499a04e62c645 (diff)
*Cleanups before delete after not successfull load pet from db. Thanks to Drahy for debug traces.
--HG-- branch : trunk
Diffstat (limited to 'src/game/NPCHandler.cpp')
-rw-r--r--src/game/NPCHandler.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/game/NPCHandler.cpp b/src/game/NPCHandler.cpp
index a412f91b30c..31b539abd05 100644
--- a/src/game/NPCHandler.cpp
+++ b/src/game/NPCHandler.cpp
@@ -678,6 +678,7 @@ void WorldSession::HandleUnstablePet( WorldPacket & recv_data )
Pet *newpet = new Pet(_player, HUNTER_PET);
if(!newpet->LoadPetFromDB(_player,creature_id,petnumber))
{
+ newpet->CleanupsBeforeDelete();
delete newpet;
newpet = NULL;
WorldPacket data(SMSG_STABLE_RESULT, 1);
@@ -796,6 +797,7 @@ void WorldSession::HandleStableSwapPet( WorldPacket & recv_data )
Pet *newpet = new Pet(_player);
if(!newpet->LoadPetFromDB(_player,creature_id,pet_number))
{
+ newpet->CleanupsBeforeDelete();
delete newpet;
data << uint8(0x06);
}