diff options
| author | Mik43l <u.mercogliano@gmail.com> | 2012-09-04 00:51:26 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2012-09-04 00:51:26 +0200 |
| commit | a47ad2f5e174588587d621ab2216197a7993054f (patch) | |
| tree | 91c19ec5eb069375097116718b4de4d36bfa6d5b /src | |
| parent | 76be70a4dc225bbcbce3c5d427585aededef37b6 (diff) | |
Core/Auras: Added minimal delay before Rapture cooldown takes effect to allow all bubbles broken by a single damage source proc mana return
Closes #7443
Signed-off-by: Shauren <shauren.trinity@gmail.com>
Diffstat (limited to 'src')
| -rwxr-xr-x | src/server/game/Spells/Auras/SpellAuras.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp index 9ee05b9a2a4..1eb771dc500 100755 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -1414,10 +1414,16 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b if (caster->GetTypeId() == TYPEID_PLAYER) { if (caster->ToPlayer()->HasSpellCooldown(aura->GetId())) - break; - // and add if needed - caster->ToPlayer()->AddSpellCooldown(aura->GetId(), 0, uint32(time(NULL) + 12)); + { + // 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->ToPlayer()->GetSpellCooldownDelay(aura->GetId()) <= 11) + break; + } + else // and add if needed + caster->ToPlayer()->AddSpellCooldown(aura->GetId(), 0, uint32(time(NULL) + 12)); } + // effect on caster if (AuraEffect const* aurEff = aura->GetEffect(0)) { |