public/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/liyunfan1223/azerothcore-wotlk.git synced 2026-08-09 08:17:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Core/Spells): properly handle item cooldowns (#9176)

Browse Source 
- Closes #8918
This commit is contained in:
UltraNix
2021-11-23 13:25:29 +01:00
committed by GitHub
parent 05552d9d85
commit a0002afe07
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/server/game/Entities/Player/Player.cpp
View File

@@ -10139,6 +10139,7 @@ void Player::AddSpellAndCategoryCooldowns(SpellInfo const* spellInfo, uint32 ite
// cooldown information stored in item prototype // cooldown information stored in item prototype
// This used in same way in WorldSession::HandleItemQuerySingleOpcode data sending to client. // This used in same way in WorldSession::HandleItemQuerySingleOpcode data sending to client.
bool useSpellCooldown = false;
if (itemId) if (itemId)
{ {
if (ItemTemplate const* proto = sObjectMgr->GetItemTemplate(itemId)) if (ItemTemplate const* proto = sObjectMgr->GetItemTemplate(itemId))
@@ -10150,6 +10151,12 @@ void Player::AddSpellAndCategoryCooldowns(SpellInfo const* spellInfo, uint32 ite
cat = proto->Spells[idx].SpellCategory; cat = proto->Spells[idx].SpellCategory;
rec = proto->Spells[idx].SpellCooldown; rec = proto->Spells[idx].SpellCooldown;
catrec = proto->Spells[idx].SpellCategoryCooldown; catrec = proto->Spells[idx].SpellCategoryCooldown;
if (static_cast<int32>(cat) != catrec)
{
useSpellCooldown = true;
}
break; break;
} }
} }
@@ -10168,7 +10175,6 @@ void Player::AddSpellAndCategoryCooldowns(SpellInfo const* spellInfo, uint32 ite
time_t recTime; time_t recTime;
bool needsCooldownPacket = false; bool needsCooldownPacket = false;
bool useSpellCooldown = false;
// overwrite time for selected category // overwrite time for selected category
if (infinityCooldown) if (infinityCooldown)