aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Entities/Creature
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2016-04-26 18:56:35 +0200
committerShauren <shauren.trinity@gmail.com>2016-05-20 23:50:20 +0200
commitdf6d557a4d778093ec522d2c39c6c01acc41d978 (patch)
tree55ea1573d75628f8aa4516d4632607ad49c4a4f7 /src/server/game/Entities/Creature
parent70102f32fe38ae7d49acbd5ddee0239602d3cb94 (diff)
Core/Entities: Updated updatefields to 7.0.3.21414
Diffstat (limited to 'src/server/game/Entities/Creature')
-rw-r--r--src/server/game/Entities/Creature/Creature.cpp9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp
index 979390baaeb..553b4f0babc 100644
--- a/src/server/game/Entities/Creature/Creature.cpp
+++ b/src/server/game/Entities/Creature/Creature.cpp
@@ -702,9 +702,8 @@ void Creature::RegenerateMana()
if (IsInCombat() || !GetCharmerOrOwnerGUID().IsEmpty())
{
float ManaIncreaseRate = sWorld->getRate(RATE_POWER_MANA);
- float Spirit = GetStat(STAT_SPIRIT);
- addvalue = uint32((Spirit / 5.0f + 17.0f) * ManaIncreaseRate);
+ addvalue = uint32((27.0f / 5.0f + 17.0f) * ManaIncreaseRate);
}
else
addvalue = maxValue / 3;
@@ -737,12 +736,8 @@ void Creature::RegenerateHealth()
if (!GetCharmerOrOwnerGUID().IsEmpty())
{
float HealthIncreaseRate = sWorld->getRate(RATE_HEALTH);
- float Spirit = GetStat(STAT_SPIRIT);
- if (GetPower(POWER_MANA) > 0)
- addvalue = uint32(Spirit * 0.25 * HealthIncreaseRate);
- else
- addvalue = uint32(Spirit * 0.80 * HealthIncreaseRate);
+ addvalue = 0.015f * ((float)GetMaxHealth()) * HealthIncreaseRate;
}
else
addvalue = maxValue/3;