diff --git a/src/org/apollo/game/message/handler/impl/EquipItemHandler.java b/src/org/apollo/game/message/handler/impl/EquipItemHandler.java index a3628e6b..6102dc48 100644 --- a/src/org/apollo/game/message/handler/impl/EquipItemHandler.java +++ b/src/org/apollo/game/message/handler/impl/EquipItemHandler.java @@ -58,6 +58,8 @@ public final class EquipItemHandler extends MessageHandler { Item weapon = equipment.get(EquipmentConstants.WEAPON); Item shield = equipment.get(EquipmentConstants.SHIELD); + // XXX: This is still pretty ugly in some parts, improve. + if (definition.isTwoHanded()) { int slotsRequired = weapon != null && shield != null ? 1 : 0; if (inventory.freeSlots() < slotsRequired) {