From f8155b4f95560188f4e6ea7a83d793e27ef41ba8 Mon Sep 17 00:00:00 2001
From: maximius <none@none>
Date: Sat, 26 Sep 2009 17:08:37 -0700
Subject: *Should fix a crash, thanks Drahy

--HG--
branch : trunk
---
 src/game/Creature.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp
index 6f24dbe1631..7d225ec4935 100644
--- a/src/game/Creature.cpp
+++ b/src/game/Creature.cpp
@@ -545,7 +545,8 @@ void Creature::Update(uint32 diff)
                 break;
 
             bool bNotInCombatOrIsPolymorphed = (!isInCombat() || IsPolymorphed() || !getVictim() ||
-                                                getVictim()->GetCharmerOrOwnerPlayerOrPlayerItself()->isGameMaster());
+                                               (getVictim()->GetCharmerOrOwnerPlayerOrPlayerItself() &&
+                                               getVictim()->GetCharmerOrOwnerPlayerOrPlayerItself()->isGameMaster()));
 
             if(m_regenTimer > diff && !bNotInCombatOrIsPolymorphed)
                 m_regenTimer -= diff;
-- 
cgit v1.2.3