aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatan Shukry <matanshukry@gmail.com>2021-03-28 16:50:23 +0300
committerGitHub <noreply@github.com>2021-03-28 15:50:23 +0200
commit7885bdf8afc37e5594128acf42e06d3f8bc3f669 (patch)
tree66a97a065443fa61f3f2288bf7c57d0d2cdf89e6
parenta8fb7109b78bdc951292c9de7eddcce59393afe9 (diff)
Core/Players: Fixed regenerating powers with CenterPower regen (#26308)
-rw-r--r--src/server/game/Entities/Player/Player.cpp32
1 files changed, 16 insertions, 16 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 917fb3f362d..8413516bf78 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -1782,22 +1782,6 @@ void Player::Regenerate(Powers power)
int32 minPower = powerType->MinPower;
int32 maxPower = GetMaxPower(power);
- if (addvalue < 0.0f)
- {
- if (curValue <= minPower)
- return;
- }
- else if (addvalue > 0.0f)
- {
- if (curValue >= maxPower)
- return;
- }
- else
- return;
-
- addvalue += m_powerFraction[powerIndex];
- int32 integerValue = int32(std::fabs(addvalue));
-
if (powerType->CenterPower)
{
if (curValue > powerType->CenterPower)
@@ -1814,6 +1798,22 @@ void Player::Regenerate(Powers power)
return;
}
+ addvalue += m_powerFraction[powerIndex];
+ int32 integerValue = int32(std::fabs(addvalue));
+
+ if (addvalue < 0.0f)
+ {
+ if (curValue <= minPower)
+ return;
+ }
+ else if (addvalue > 0.0f)
+ {
+ if (curValue >= maxPower)
+ return;
+ }
+ else
+ return;
+
if (addvalue < 0.0f)
{
if (curValue > minPower + integerValue)