aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjoschiwald <joschiwald.trinity@gmail.com>2017-12-26 19:52:09 +0100
committerjoschiwald <joschiwald.trinity@gmail.com>2017-12-26 19:52:09 +0100
commit5465b4f46ea37680106d3c7a618d362ee1ec7ade (patch)
tree5bef4e056fb9b7fabeaabbe9358323eb3ab2357c /src
parent447b78f57b8cecb3a68b0c8f8715a00dda093e82 (diff)
Core/Spells: Fixed proc cooldown
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Spells/SpellMgr.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp
index 492220b85f7..be4064e7a2d 100644
--- a/src/server/game/Spells/SpellMgr.cpp
+++ b/src/server/game/Spells/SpellMgr.cpp
@@ -1352,6 +1352,8 @@ void SpellMgr::LoadSpellProcs()
procEntry.Charges = spellInfo->ProcCharges;
if (!procEntry.Chance && !procEntry.ProcsPerMinute)
procEntry.Chance = float(spellInfo->ProcChance);
+ if (procEntry.Cooldown == Milliseconds::zero())
+ procEntry.Cooldown = Milliseconds(spellInfo->ProcCooldown);
// validate data
if (procEntry.SchoolMask & ~SPELL_SCHOOL_MASK_ALL)
@@ -1566,7 +1568,7 @@ void SpellMgr::LoadSpellProcs()
procEntry.ProcsPerMinute = 0;
procEntry.Chance = spellInfo->ProcChance;
- procEntry.Cooldown = Milliseconds::zero();
+ procEntry.Cooldown = Milliseconds(spellInfo->ProcCooldown);
procEntry.Charges = spellInfo->ProcCharges;
mSpellProcMap[spellInfo->Id] = procEntry;