From e1927fa4f804e9ba70448ae7bf886bfc4e3fedae Mon Sep 17 00:00:00 2001 From: megamage Date: Mon, 1 Jun 2009 11:16:17 +0400 Subject: [PATCH] [7936] Fixed low chance but possible crash at creature tame. Thanks to marry521 for patch preparing to mangos. Signed-off-by: VladimirMangos --- src/game/SpellEffects.cpp | 2 ++ src/shared/revision_nr.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index 4a60e7620..c72564862 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -4039,6 +4039,8 @@ void Spell::EffectTameCreature(uint32 /*i*/) finish(); Pet* pet = m_caster->CreateTamedPetFrom(creatureTarget,m_spellInfo->Id); + if(!pet) // in versy specific state like near world end/etc. + return; // kill original creature creatureTarget->setDeathState(JUST_DIED); diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index bdf63fc02..e07c9fa24 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "7935" + #define REVISION_NR "7936" #endif // __REVISION_NR_H__