From 99c3f96f1a94ae526edf9b9595940af4e82cc85f Mon Sep 17 00:00:00 2001 From: ariel- Date: Tue, 11 Oct 2016 20:04:05 -0300 Subject: Core/Player: Fix logic fail in ApplyEquipCooldown --- src/server/game/Entities/Player/Player.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index c829c9998c3..08cf5471747 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -23175,10 +23175,9 @@ void Player::SendInstanceResetWarning(uint32 mapid, Difficulty difficulty, uint3 void Player::ApplyEquipCooldown(Item* pItem) { - if (pItem->HasFlag(ITEM_FIELD_FLAGS, ITEM_FLAG_NO_EQUIP_COOLDOWN)) - return; - ItemTemplate const* proto = pItem->GetTemplate(); + if (proto->GetFlags() & ITEM_FLAG_NO_EQUIP_COOLDOWN) + return; for (uint8 i = 0; i < proto->Effects.size(); ++i) { -- cgit v1.2.3