diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 168ab141b25..f09e8e136df 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -13311,14 +13311,15 @@ bool Player::IsTwoHandUsed() const bool Player::IsUsingTwoHandedWeaponInOneHand() const { - Item* mainItem = GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_MAINHAND); Item* offItem = GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_OFFHAND); + if (offItem && offItem->GetTemplate()->GetInventoryType() == INVTYPE_2HWEAPON) + return true; - if (!mainItem || !offItem) + Item* mainItem = GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_MAINHAND); + if (!mainItem || mainItem->GetTemplate()->GetInventoryType() != INVTYPE_2HWEAPON) return false; - if (mainItem->GetTemplate()->GetInventoryType() != INVTYPE_2HWEAPON && - offItem->GetTemplate()->GetInventoryType() != INVTYPE_2HWEAPON) + if (!offItem) return false; return true; |