Additional unequip check for shields.

This commit is contained in:
MobiusDevelopment 2021-04-24 23:48:46 +00:00
parent db0b0ebc7d
commit c6b043a3f2
4 changed files with 20 additions and 0 deletions

View File

@ -1967,6 +1967,11 @@ public abstract class Inventory extends ItemContainer
{
setPaperdollItem(PAPERDOLL_RHAND, null);
}
final ItemInstance lh = getPaperdollItem(PAPERDOLL_LHAND);
if ((lh != null) && lh.isArmor() && (lh.getArmorItem().getItemType() == ArmorType.SHIELD))
{
setPaperdollItem(PAPERDOLL_LHAND, null);
}
setPaperdollItem(PAPERDOLL_RHAND, item);
}
else if (targetSlot == Item.SLOT_L_HAND)

View File

@ -1967,6 +1967,11 @@ public abstract class Inventory extends ItemContainer
{
setPaperdollItem(PAPERDOLL_RHAND, null);
}
final ItemInstance lh = getPaperdollItem(PAPERDOLL_LHAND);
if ((lh != null) && lh.isArmor() && (lh.getArmorItem().getItemType() == ArmorType.SHIELD))
{
setPaperdollItem(PAPERDOLL_LHAND, null);
}
setPaperdollItem(PAPERDOLL_RHAND, item);
}
else if (targetSlot == Item.SLOT_L_HAND)

View File

@ -2095,6 +2095,11 @@ public abstract class Inventory extends ItemContainer
{
setPaperdollItem(PAPERDOLL_RHAND, null);
}
final ItemInstance lh = getPaperdollItem(PAPERDOLL_LHAND);
if ((lh != null) && lh.isArmor() && (lh.getArmorItem().getItemType() == ArmorType.SHIELD))
{
setPaperdollItem(PAPERDOLL_LHAND, null);
}
setPaperdollItem(PAPERDOLL_RHAND, item);
}
else if (targetSlot == Item.SLOT_L_HAND)

View File

@ -2104,6 +2104,11 @@ public abstract class Inventory extends ItemContainer
{
setPaperdollItem(PAPERDOLL_RHAND, null);
}
final ItemInstance lh = getPaperdollItem(PAPERDOLL_LHAND);
if ((lh != null) && lh.isArmor() && (lh.getArmorItem().getItemType() == ArmorType.SHIELD))
{
setPaperdollItem(PAPERDOLL_LHAND, null);
}
setPaperdollItem(PAPERDOLL_RHAND, item);
}
else if (targetSlot == Item.SLOT_L_HAND)