Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-05 00:19:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Players: corrected MP5 rule implementation for players

Browse Source
This commit is contained in:
Ovahlord
2023-11-18 21:14:33 +01:00
parent cf0ba9f435
commit 3fbdbe7b95
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/server/game/Entities/Player/Player.cpp
View File

@@ -1763,15 +1763,14 @@ void Player::Regenerate(Powers power)
return;
float addvalue = 0.0f;
if (!IsInCombat())
{
if (powerType->GetFlags().HasFlag(PowerTypeFlags::UseRegenInterrupt) && m_regenInterruptTimestamp + Milliseconds(powerType->RegenInterruptTimeMS) < GameTime::Now())
return;
addvalue = (powerType->RegenPeace + m_unitData->PowerRegenFlatModifier[powerIndex]) * 0.001f * m_regenTimer;
}
else if (power != POWER_MANA || !IsPowerRegenInterruptedByMP5Rule())
if (power == POWER_MANA && IsPowerRegenInterruptedByMP5Rule())
addvalue = (powerType->RegenCombat + m_unitData->PowerRegenInterruptedFlatModifier[powerIndex]) * 0.001f * m_regenTimer;
else
addvalue = (powerType->RegenPeace + m_unitData->PowerRegenFlatModifier[powerIndex]) * 0.001f * m_regenTimer;
if (powerType->GetFlags().HasFlag(PowerTypeFlags::UseRegenInterrupt) && m_regenInterruptTimestamp + Milliseconds(powerType->RegenInterruptTimeMS) < GameTime::Now())
return;
static Rates const RatesForPower[MAX_POWERS] =
{