Skip to content

Commit

Permalink
Fix cooldown check talent Rapture (Priest)
Browse files Browse the repository at this point in the history
(cherry picked from commit 7093c0c)
  • Loading branch information
Keader authored and Shauren committed Apr 2, 2016
1 parent 02c9a66 commit 0a8bab8
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/server/game/Spells/Auras/SpellAuras.cpp
Expand Up @@ -1488,7 +1488,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b
{
// This additional check is needed to add a minimal delay before cooldown in in effect
// to allow all bubbles broken by a single damage source proc mana return
if (caster->GetSpellHistory()->GetRemainingCooldown(aura->GetSpellInfo()) <= 11)
if (caster->GetSpellHistory()->GetRemainingCooldown(aura->GetSpellInfo()) <= 11 * IN_MILLISECONDS)
break;
}
else // and add if needed
Expand Down

2 comments on commit 0a8bab8

@Zedron
Copy link
Contributor

@Zedron Zedron commented on 0a8bab8 Apr 2, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

47535 doesnt exist in 6x :
some day someone should clean up all these. probably quite a few dont exist any more

@Shauren
Copy link
Member

@Shauren Shauren commented on 0a8bab8 Apr 2, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sure, but before its removed, keeping it in sync with 3.3.5 makes merging easier

Please sign in to comment.