Merge pull request #7491 from NorthStrider/pull-1

[4.3.4] Core/Players: updated health regeneration to cataclysm.
This commit is contained in:
Nay committed 2012-09-03 08:24:36 -07:00
commit f76b961562
1 file changed
+5 -4
+5 -4
View File
@@ -2692,10 +2692,6 @@ void Player::RegenerateHealth()
return;
float HealthIncreaseRate = sWorld->getRate(RATE_HEALTH);
if (getLevel() < 15)
HealthIncreaseRate = sWorld->getRate(RATE_HEALTH) * (2.066f - (getLevel() * 0.066f));
float addvalue = 0.0f;
// polymorphed case
@@ -2707,6 +2703,11 @@ void Player::RegenerateHealth()
addvalue = HealthIncreaseRate;
if (!isInCombat())
{
if (getLevel() < 15)
addvalue = (0.20f*((float)GetMaxHealth())/getLevel()*HealthIncreaseRate);
else
addvalue = 0.015f*((float)GetMaxHealth())*HealthIncreaseRate;
AuraEffectList const& mModHealthRegenPct = GetAuraEffectsByType(SPELL_AURA_MOD_HEALTH_REGEN_PERCENT);
for (AuraEffectList::const_iterator i = mModHealthRegenPct.begin(); i != mModHealthRegenPct.end(); ++i)
AddPctN(addvalue, (*i)->GetAmount());