aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormaximius <none@none>2009-09-11 16:44:59 -0700
committermaximius <none@none>2009-09-11 16:44:59 -0700
commit9c28c82a6662c6f7433457a0e9200afcb86cbc3c (patch)
tree9d440abd6a8f8b3f5eb004ffda2d3499bfb4cdc4
parent2bb0c319789c893255d94556bd8a819f96be0c0d (diff)
*Attempt to fix PetAI crash, thanks WarHead
--HG-- branch : trunk
-rw-r--r--src/game/PetAI.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/PetAI.cpp b/src/game/PetAI.cpp
index f28cf2ecc93..bf368001cc1 100644
--- a/src/game/PetAI.cpp
+++ b/src/game/PetAI.cpp
@@ -415,7 +415,7 @@ void PetAI::MovementInform(uint32 moveType, uint32 data)
{
// If data is owner's GUIDLow then we've reached follow point,
// otherwise we're probably chasing a creature
- if (data == me->GetCharmerOrOwner()->GetGUIDLow() && me->GetCharmInfo()->IsReturning())
+ if (me->GetCharmerOrOwner() && me->GetCharmInfo() && data == me->GetCharmerOrOwner()->GetGUIDLow() && me->GetCharmInfo()->IsReturning())
{
me->GetCharmInfo()->SetIsAtStay(false);
me->GetCharmInfo()->SetIsReturning(false);