From 9c28c82a6662c6f7433457a0e9200afcb86cbc3c Mon Sep 17 00:00:00 2001 From: maximius Date: Fri, 11 Sep 2009 16:44:59 -0700 Subject: *Attempt to fix PetAI crash, thanks WarHead --HG-- branch : trunk --- src/game/PetAI.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') 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); -- cgit v1.2.3