From 1d015cac28ef785a4b4b4507e643437c74797515 Mon Sep 17 00:00:00 2001 From: n0n4m3 Date: Wed, 13 Jan 2010 14:52:56 +0300 Subject: [PATCH] Fixed crash in load Pet Aura, cause mtmaps. --HG-- branch : trunk --- src/game/Pet.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/game/Pet.cpp b/src/game/Pet.cpp index e9b1a2d0ea..261eca2170 100644 --- a/src/game/Pet.cpp +++ b/src/game/Pet.cpp @@ -498,7 +498,10 @@ void Pet::setDeathState(DeathState s) // overwrite virtual void Pet::Update(uint32 diff) { - if(m_removed) // pet already removed, just wait in remove queue, no updates + if (m_removed) // pet already removed, just wait in remove queue, no updates + return; + + if (m_loading) return; switch( m_deathState )