@ -312,7 +312,7 @@ public enum CombatManager {
//get Weapon
boolean isWeapon = true;
Item weapon = equipped.get(slot);
Item weapon = equipped.get(weaponSlot);
ItemBase wb = null;
if (weapon == null)