aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiberate <none@none>2010-05-29 10:11:39 +0200
committerLiberate <none@none>2010-05-29 10:11:39 +0200
commit3b8be6d108fbca53277ec42ed56cc0768e52fce1 (patch)
tree1f1bddfba2ee1758608bcd483ffce63a783cdf78
parentd104f19469f9a63636f16e0d0765cd6798bccf4b (diff)
Fixes the cooldown of the heroic version of the Deathbringer's Will Trinket.
Thanks nightseas for testing and finding this bug. --HG-- branch : trunk
-rw-r--r--src/game/Unit.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index c8a00d1afe4..f259728a88f 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -5687,7 +5687,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
}
break;
}
- case 71562: // Deahtbringer's Will Heroic
+ case 71562: // Deathbringer's Will Heroic
{
if (GetTypeId() != TYPEID_PLAYER)
return false;
@@ -5728,7 +5728,8 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
CastSpell(target,RandomSpells[rand_spell],true,castItem,triggeredByAura, originalCaster);
for (std::vector<uint32>::iterator itr = RandomSpells.begin(); itr != RandomSpells.end(); ++itr)
{
- ToPlayer()->AddSpellCooldown(*itr,0,time(NULL) + cooldown);
+ if (!ToPlayer()->HasSpellCooldown(*itr))
+ ToPlayer()->AddSpellCooldown(*itr,0,time(NULL) + cooldown);
}
break;
}