Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Core/Instances: Fix combat resurrection charge gain #21647

Merged
merged 1 commit into from Mar 21, 2018
Merged

Core/Instances: Fix combat resurrection charge gain #21647

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 4 additions & 7 deletions src/server/game/Instances/InstanceScript.cpp
View file
Open in desktop
Expand Up @@ -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*/)
Expand All @@ -814,7 +812,6 @@ void InstanceScript::AddCombatResurrectionCharge()
{
++_combatResurrectionCharges;
_combatResurrectionTimer = GetCombatResurrectionChargeInterval();
_combatResurrectionTimerStarted = true;

WorldPackets::Instance::InstanceEncounterGainCombatResurrectionCharge gainCombatResurrectionCharge;
gainCombatResurrectionCharge.InCombatResCount = _combatResurrectionCharges;
Expand All @@ -833,7 +830,7 @@ void InstanceScript::ResetCombatResurrections()
{
_combatResurrectionCharges = 0;
_combatResurrectionTimer = 0;
_combatResurrectionTimerStarted = 0;
_combatResurrectionTimerStarted = false;
}

uint32 InstanceScript::GetCombatResurrectionChargeInterval() const
Expand Down