From 26d2b9f138dd6ca283cfc6efbdb6405e3175d2f6 Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Tue, 11 Nov 2008 17:59:56 -0600
Subject: [svn] Fix a bug that tame beast may crash server.

--HG--
branch : trunk
---
 src/game/SpellEffects.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index d21f9ff7525..dfbe11803e5 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -3960,6 +3960,7 @@ void Spell::EffectTameCreature(uint32 /*i*/)
     finish();
 
     Pet* pet = m_caster->CreateTamedPetFrom(creatureTarget,m_spellInfo->Id);
+    if(!pet) return;
 
     // kill original creature
     creatureTarget->setDeathState(JUST_DIED);
-- 
cgit v1.2.3