*Should fix a crash, thanks Drahy

--HG-- branch : trunk
2026-01-23 02:25:38 +01:00 · 2009-09-26 17:08:37 -07:00
parent b528d14e73
commit f8155b4f95
1 changed files with 2 additions and 1 deletions
--- 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;