From c5ff737ef8e9c1805505df8429d98a9fed839895 Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Wed, 26 Aug 2009 21:30:45 -0500
Subject: *Fix a crash caused by possess pet. Thanks to nanouniko

--HG--
branch : trunk
---
 src/game/Spell.cpp | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

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

diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index 132eb5fafb2..863530d953a 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -5129,9 +5129,21 @@ SpellCastResult Spell::CheckCast(bool strict)
                 }
                 break;
             }
+            case SPELL_AURA_MOD_POSSESS_PET:
+            {
+                if(m_caster->GetTypeId() != TYPEID_PLAYER)
+                    return SPELL_FAILED_NO_PET;
+
+                Pet *pet = ((Player*)m_caster)->GetPet();
+                if(!pet)
+                    return SPELL_FAILED_NO_PET;
+
+                if(pet->GetCharmerGUID())
+                    return SPELL_FAILED_CHARMED;
+                break;
+            }
             case SPELL_AURA_MOD_POSSESS:
             case SPELL_AURA_MOD_CHARM:
-            case SPELL_AURA_MOD_POSSESS_PET:
             case SPELL_AURA_AOE_CHARM:
             {
                 if(m_caster->GetCharmerGUID())
-- 
cgit v1.2.3