From ebaee135c94cce270acc0581f9a3347ed2135358 Mon Sep 17 00:00:00 2001 From: Nay Date: Tue, 6 Aug 2013 18:19:18 +0100 Subject: Server/Player: Fix a logical mistake in ApplyEquipCooldown Thanks Joschiwald --- src/server/game/Entities/Player/Player.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/server') diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 6544d9350a8..b6d93f75dd9 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -22684,10 +22684,10 @@ void Player::ApplyEquipCooldown(Item* pItem) if (spellData.SpellTrigger != ITEM_SPELLTRIGGER_ON_USE) continue; - //! Don't replace longer cooldowns by equip cooldown if we have any. + // Don't replace longer cooldowns by equip cooldown if we have any. SpellCooldowns::iterator itr = m_spellCooldowns.find(spellData.SpellId); if (itr != m_spellCooldowns.end() && itr->second.itemid == pItem->GetEntry() && itr->second.end > time(NULL) + 30) - break; + continue; AddSpellCooldown(spellData.SpellId, pItem->GetEntry(), time(NULL) + 30); -- cgit v1.2.3