From cc94fda2b11eaabae9f16a3723b714af256c09b5 Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Thu, 26 Mar 2009 09:01:23 -0600
Subject: *Fix a crash bug of pet.

--HG--
branch : trunk
---
 src/game/TemporarySummon.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/game')

diff --git a/src/game/TemporarySummon.h b/src/game/TemporarySummon.h
index c5f9fe906cd..cb5651d3194 100644
--- a/src/game/TemporarySummon.h
+++ b/src/game/TemporarySummon.h
@@ -55,6 +55,8 @@ class Guardian : public TempSummon
 
         int32 GetBonusDamage() { return m_bonusdamage; }
         void SetBonusDamage(int32 damage) { m_bonusdamage = damage; }
+
+        Unit *GetOwner() { return m_owner; }
     protected:
         Unit *m_owner;
         int32   m_bonusdamage;
-- 
cgit v1.2.3


From a6193d4893a277cb05d6ba59cb83c77e57fc93ef Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Thu, 26 Mar 2009 09:22:20 -0600
Subject: *Fix a crash.

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

(limited to 'src/game')

diff --git a/src/game/Pet.cpp b/src/game/Pet.cpp
index faf12118a10..71f45507d45 100644
--- a/src/game/Pet.cpp
+++ b/src/game/Pet.cpp
@@ -56,8 +56,8 @@ Pet::~Pet()
 {
     if(m_uint32Values)                                      // only for fully created Object
     {
-        if(Unit* owner = GetOwner())
-            owner->SetPet(this, false);
+        if(GetOwnerGUID())
+            sLog.outCrash("Pet %u is deconstructed but it still has owner guid", GetEntry());
 
         for (PetSpellMap::iterator i = m_spells.begin(); i != m_spells.end(); ++i)
             delete i->second;
-- 
cgit v1.2.3