From 52571d6d48c14ebfffec68b4f47ad499b431fa45 Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Mon, 13 Apr 2009 12:11:36 -0500
Subject: *Fix a 100% crash that pet is killed by DOT.

--HG--
branch : trunk
---
 src/game/Player.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/game/Player.cpp')

diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 1779ea84d7c..2d7d98579a8 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -16454,18 +16454,19 @@ void Player::RemovePet(Pet* pet, PetSaveMode mode, bool returnreagent)
         }
     }
 
-    pet->SavePetToDB(mode);
-
     // only if current pet in slot
     switch(pet->getPetType())
     {
         case POSSESSED_PET:
             pet->RemoveCharmedOrPossessedBy(NULL);
+            break;
         default:
-            SetGuardian(pet, false);
+            pet->SavePetToDB(mode);
             break;
     }
 
+    SetGuardian(pet, false);
+
     pet->CleanupsBeforeDelete();
     pet->AddObjectToRemoveList();
     pet->m_removed = true;
-- 
cgit v1.2.3