aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2016-09-24 01:19:18 +0200
committerShauren <shauren.trinity@gmail.com>2016-09-24 01:19:18 +0200
commit8abf6da2ead261d3dffc4d443190e7e7fb9dfd5e (patch)
tree5b2fd91b965f3e5ca7a3290e509bc191ff1a269e /src
parent55d2c19f079e9486c1c1f939c61501f53ac42159 (diff)
Warning fix
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Entities/Player/Player.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index b082d2672f6..82f8fef2934 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -1843,7 +1843,7 @@ void Player::Regenerate(Powers power)
if (HasAuraTypeWithValue(SPELL_AURA_PREVENT_REGENERATE_POWER, power))
return;
- uint32 curValue = GetPower(power);
+ int32 curValue = GetPower(power);
// TODO: updating haste should update UNIT_FIELD_POWER_REGEN_FLAT_MODIFIER for certain power types
PowerTypeEntry const* powerType = sDB2Manager.GetPowerTypeEntry(power);
@@ -1909,7 +1909,7 @@ void Player::Regenerate(Powers power)
if (addvalue < 0.0f)
{
- if (curValue > integerValue + minPower)
+ if (curValue > minPower + integerValue)
{
curValue -= integerValue;
m_powerFraction[powerIndex] = addvalue + integerValue;