Core/Spells: Improved spell category cooldown handling
* Category cooldown is stored with the spell that started the cooldown (and only resetting cooldown on that spell will clear cooldowns on entire category - this fully mirrors client behavior) * This significantly reduces the amount of data saved to database for cooldowns * Spell casts from items that have a different category specified than on spell will now check for cooldown during the cast (cherry picked from commit 1efb3f08e278530f59d681f676b031a7fc6db3ac) Closes #15766 Closes #15137 Closes #14837
This commit is contained in:
1 parent
3f32307d37
commit
7dcddd90be
12 files changed
+155
-139
No files matched your search
@@ -15912,7 +15912,7 @@ bool Player::GetQuestRewardStatus(uint32 quest_id) const
|
||||
uint16 eventId = sGameEventMgr->GetEventIdForQuest(qInfo);
|
||||
if (m_seasonalquests.find(eventId) != m_seasonalquests.end())
|
||||
return m_seasonalquests.find(eventId)->second.find(quest_id) != m_seasonalquests.find(eventId)->second.end();
|
||||
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -22723,7 +22723,7 @@ void Player::ApplyEquipCooldown(Item* pItem)
|
||||
continue;
|
||||
|
||||
// Don't replace longer cooldowns by equip cooldown if we have any.
|
||||
if (GetSpellHistory()->GetRemainingCooldown(spellData.SpellId) > 30 * IN_MILLISECONDS)
|
||||
if (GetSpellHistory()->GetRemainingCooldown(sSpellMgr->EnsureSpellInfo(spellData.SpellId)) > 30 * IN_MILLISECONDS)
|
||||
continue;
|
||||
|
||||
GetSpellHistory()->AddCooldown(spellData.SpellId, pItem->GetEntry(), std::chrono::seconds(30));
|
||||
|
||||
Reference in new issue
Block a user