aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormegamage <none@none>2009-03-22 11:44:07 -0600
committermegamage <none@none>2009-03-22 11:44:07 -0600
commitf703449242949e387432bbc1b54a094f589f84ea (patch)
tree3c69bc8d7a48e3805005266538a9b24c749fbd4f
parent763c81de3cb3e144276f850ffa12265bf92d0d03 (diff)
*Backport a crash fix of petai.
--HG-- branch : trunk
-rw-r--r--src/game/PetAI.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/game/PetAI.cpp b/src/game/PetAI.cpp
index 2ed3edb2df6..75c1aa06c20 100644
--- a/src/game/PetAI.cpp
+++ b/src/game/PetAI.cpp
@@ -123,6 +123,9 @@ void PetAI::UpdateAI(const uint32 diff)
}
}
+ if(!me->GetCharmInfo())
+ return;
+
if (i_pet.GetGlobalCooldown() == 0 && !i_pet.hasUnitState(UNIT_STAT_CASTING))
{
bool inCombat = me->getVictim();