diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/Creature.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp index b361f949237..4aa4c48ffe8 100644 --- a/src/game/Creature.cpp +++ b/src/game/Creature.cpp @@ -544,8 +544,8 @@ void Creature::Update(uint32 diff) if(!isAlive()) break; - bool bNotInCombatOrIsPolymorphed = (!isInCombat() || IsPolymorphed() || getVictim() == NULL || - (getVictim()->GetCharmerOrOwnerPlayerOrPlayerItself() != NULL && + bool bNotInCombatOrIsPolymorphed = (!isInCombat() || IsPolymorphed() || getThreatManager().isThreatListEmpty() || + (getVictim() && getVictim()->GetCharmerOrOwnerPlayerOrPlayerItself() && getVictim()->GetCharmerOrOwnerPlayerOrPlayerItself()->isGameMaster())); if(m_regenTimer > diff && !bNotInCombatOrIsPolymorphed) |