Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Instances: Fix combat resurrection charge gain (#21647)

Browse Source 
Old logic stopped the recharge timer after the first recharge
This commit is contained in:
Roc13x
2018-03-21 08:59:58 +00:00
committed by Shauren
parent 4471bac3a0
commit 1e62b53c66
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/server/game/Instances/InstanceScript.cpp
View File

@@ -792,12 +792,10 @@ void InstanceScript::UpdateCombatResurrection(uint32 diff)
if (!_combatResurrectionTimerStarted)
return;
_combatResurrectionTimer -= diff;
if (_combatResurrectionTimer <= 0)
{
if (_combatResurrectionTimer <= diff)
AddCombatResurrectionCharge();
_combatResurrectionTimerStarted = false;
}
else
_combatResurrectionTimer -= diff;
}
void InstanceScript::InitializeCombatResurrections(uint8 charges /*= 1*/, uint32 interval /*= 0*/)
@@ -814,7 +812,6 @@ void InstanceScript::AddCombatResurrectionCharge()
{
++_combatResurrectionCharges;
_combatResurrectionTimer = GetCombatResurrectionChargeInterval();
_combatResurrectionTimerStarted = true;
WorldPackets::Instance::InstanceEncounterGainCombatResurrectionCharge gainCombatResurrectionCharge;
gainCombatResurrectionCharge.InCombatResCount = _combatResurrectionCharges;
@@ -833,7 +830,7 @@ void InstanceScript::ResetCombatResurrections()
{
_combatResurrectionCharges = 0;
_combatResurrectionTimer = 0;
_combatResurrectionTimerStarted = 0;
_combatResurrectionTimerStarted = false;
}
uint32 InstanceScript::GetCombatResurrectionChargeInterval() const