aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMachiavelli <machiavelli.trinity@gmail.com>2012-09-10 01:14:05 -0700
committerMachiavelli <machiavelli.trinity@gmail.com>2012-09-10 01:14:05 -0700
commit1efd2f9e333120b35ae910e19e03ddd1202e2775 (patch)
treeec3112c5c5e0b1ffb25a0c3f12a5936d38fdbd6a /src
parent7790a2d6317139e60aaf589e24a73a25917342a7 (diff)
parentcb59ba9653e985352bdf8559b4e504610f068816 (diff)
Merge pull request #7715 from e000/master
Core/Player: Fix wrong check in 7a8652c
Diffstat (limited to 'src')
-rwxr-xr-xsrc/server/game/Entities/Player/Player.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 3ad3eb0ddd6..bc29f6795c9 100755
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -11532,7 +11532,7 @@ InventoryResult Player::CanEquipItem(uint8 slot, uint16 &dest, Item* pItem, bool
if (eslot == EQUIPMENT_SLOT_OFFHAND)
{
// Do not allow polearm to be equipped in the offhand (rare case for the only 1h polearm 41750)
- if (pProto->SubClass == ITEM_SUBCLASS_WEAPON_POLEARM)
+ if (type == INVTYPE_WEAPON && pProto->SubClass == ITEM_SUBCLASS_WEAPON_POLEARM)
return EQUIP_ERR_ITEM_DOESNT_GO_TO_SLOT;
else if (type == INVTYPE_WEAPON || type == INVTYPE_WEAPONOFFHAND)