From 319b0190807f342e1c004fbdad852afd750549e1 Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Tue, 16 Apr 2019 15:05:00 +0200 Subject: [PATCH] Core/Spells: Holy Power decay timer will now be reset when getting a charge of holy power --- src/server/game/Entities/Player/Player.h | 2 ++ src/server/game/Entities/Unit/Unit.cpp | 3 +++ 2 files changed, 5 insertions(+) diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index 353e7eccdd..0e0298d6e8 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -2380,6 +2380,8 @@ class TC_GAME_API Player : public Unit, public GridObject uint32 GetTransportSpawnID() const { return _transportSpawnID; } void SetTransportSpawnID(uint32 spawnId) { _transportSpawnID = spawnId; } + void ResetHolyPowerRegenerationTimer() { m_holyPowerRegenTimerCount = 0; } + protected: // Gamemaster whisper whitelist GuidList WhisperList; diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 8e37027d42..eafe699799 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -6576,6 +6576,9 @@ void Unit::EnergizeBySpell(Unit* victim, uint32 spellId, int32 damage, Powers po // needs to be called after sending spell log victim->ModifyPower(powerType, damage); + if (powerType == POWER_HOLY_POWER && GetTypeId() == TYPEID_PLAYER) + ToPlayer()->ResetHolyPowerRegenerationTimer(); + SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(spellId); victim->getHostileRefManager().threatAssist(this, float(damage) * 0.5f, spellInfo); }