diff options
| -rw-r--r-- | src/game/Creature.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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; |