aboutsummaryrefslogtreecommitdiff
path: root/src/game/Pet.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/game/Pet.cpp')
-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 )