diff options
| author | maximius <none@none> | 2009-09-26 21:55:47 -0700 |
|---|---|---|
| committer | maximius <none@none> | 2009-09-26 21:55:47 -0700 |
| commit | 342b071d476f71f9467c56c46ac046eb906f7205 (patch) | |
| tree | 75082bb060482948a32e49dd1340ece5437f25a6 /src | |
| parent | de45e9368997509f64f6eb4f3dfdc5e9eaf8ed7b (diff) | |
*Instead of checking getVictim() to determine whether or not to regen health, check if the threat list is empty
*Fix some incorrect/missing scriptname assignments, thanks Drahy
--HG--
branch : trunk
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) |