*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
This commit is contained in:
maximius
2009-09-26 21:55:47 -07:00
parent de45e93689
commit 342b071d47
3 changed files with 10 additions and 3 deletions
+2 -2
View File
@@ -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)