* Merge.

--HG--
branch : trunk

2 files changed, 4 insertions, 2 deletions

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;
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;