diff options
| author | maximius <none@none> | 2009-09-26 17:08:37 -0700 |
|---|---|---|
| committer | maximius <none@none> | 2009-09-26 17:08:37 -0700 |
| commit | f8155b4f95560188f4e6ea7a83d793e27ef41ba8 (patch) | |
| tree | 97e83ba8c8c7ee89993b0f787811dc2d307f292d /src | |
| parent | b528d14e73cb9c9e73b810ca73515c8f5eaecf42 (diff) | |
*Should fix a crash, thanks Drahy
--HG--
branch : trunk
Diffstat (limited to 'src')
| -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; |