Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 18:36:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

*Force non-dead mobs that are either: out of combat, or polymorphed, to regenerate at each update, thanks Gyullo

Browse Source 
--HG--
branch : trunk
This commit is contained in:
maximius
2009-09-21 20:50:05 -07:00
parent ea2da8c758
commit c339f2df7b
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/game/Creature.cpp
View File

@@ -529,22 +529,23 @@ void Creature::Update(uint32 diff)
if(!isAlive())
break;
if(m_regenTimer > diff)
bool bNotInCombatOrIsPolymorphed = (!isInCombat() || IsPolymorphed());
if(m_regenTimer > diff || bNotInCombatOrIsPolymorphed)
m_regenTimer -= diff;
else
{
if (!isInCombat() || IsPolymorphed())
if(bNotInCombatOrIsPolymorphed)
RegenerateHealth();
if(getPowerType() == POWER_ENERGY)
{
if(!IsVehicle() || GetVehicleKit()->GetVehicleInfo()->m_powerType != POWER_PYRITE)
Regenerate(POWER_ENERGY);
}
else
RegenerateMana();
m_regenTimer += 2000 - diff;
if(!bNotInCombatOrIsPolymorphed)
m_regenTimer += 2000 - diff;
}
break;