From b409d695c13b3974c7611c4b3cdd6f424211b301 Mon Sep 17 00:00:00 2001 From: Vincent-Michael Date: Sun, 2 Aug 2015 18:26:04 +0200 Subject: Core: Added code back in f60a28978a78e983246e97332b8f6d2eff539144 --- src/server/game/Entities/Player/Player.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src') diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 7b45462ea82..c520e2924dd 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -22727,6 +22727,12 @@ void Player::ApplyEquipCooldown(Item* pItem) if (effectData->Trigger != ITEM_SPELLTRIGGER_ON_USE) continue; + // Don't replace longer cooldowns by equip cooldown if we have any. + if (GetSpellHistory()->GetRemainingCooldown(effectData->SpellID) > 30 * IN_MILLISECONDS) + continue; + + GetSpellHistory()->AddCooldown(effectData->SpellID, pItem->GetEntry(), std::chrono::seconds(30)); + WorldPackets::Item::ItemCooldown data; data.ItemGuid = pItem->GetGUID(); data.SpellID = effectData->SpellID; -- cgit v1.2.3