aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorn0n4m3 <none@none>2010-01-13 14:52:56 +0300
committern0n4m3 <none@none>2010-01-13 14:52:56 +0300
commit1d015cac28ef785a4b4b4507e643437c74797515 (patch)
tree1c28c3b1b11f70060ebc4279d51f23f8092221c4 /src
parentf2dcf0270f7bce6d026680e91783e4a0c6eeacb6 (diff)
Fixed crash in load Pet Aura, cause mtmaps.
--HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/game/Pet.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/game/Pet.cpp b/src/game/Pet.cpp
index e9b1a2d0eac..261eca21701 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 )