aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorariel- <ariel-@users.noreply.github.com>2016-10-11 20:04:05 -0300
committerGitHub <noreply@github.com>2016-10-11 20:04:05 -0300
commit99c3f96f1a94ae526edf9b9595940af4e82cc85f (patch)
tree373d4c9d4af3f14e66891c9930afc8f3fa1a89e3 /src
parent85bb191816c5fa4d2d89bcc4e035e7ab5dee099b (diff)
Core/Player: Fix logic fail in ApplyEquipCooldown
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Entities/Player/Player.cpp5
1 files changed, 2 insertions, 3 deletions
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)
{