Removed unnecessary check from equip items.
This commit is contained in:
parent
d85e592f55
commit
d43874492e
@ -1962,11 +1962,6 @@ public abstract class Inventory extends ItemContainer
|
|||||||
// formal dress
|
// formal dress
|
||||||
if (targetSlot == Item.SLOT_LR_HAND)
|
if (targetSlot == Item.SLOT_LR_HAND)
|
||||||
{
|
{
|
||||||
final ItemInstance rh = getPaperdollItem(PAPERDOLL_RHAND);
|
|
||||||
if ((rh != null) && (!rh.isArmor() || (rh.getArmorItem().getItemType() != ArmorType.SIGIL)))
|
|
||||||
{
|
|
||||||
setPaperdollItem(PAPERDOLL_RHAND, null);
|
|
||||||
}
|
|
||||||
final ItemInstance lh = getPaperdollItem(PAPERDOLL_LHAND);
|
final ItemInstance lh = getPaperdollItem(PAPERDOLL_LHAND);
|
||||||
if ((lh != null) && lh.isArmor() && (lh.getArmorItem().getItemType() == ArmorType.SHIELD))
|
if ((lh != null) && lh.isArmor() && (lh.getArmorItem().getItemType() == ArmorType.SHIELD))
|
||||||
{
|
{
|
||||||
|
@ -1962,11 +1962,6 @@ public abstract class Inventory extends ItemContainer
|
|||||||
// formal dress
|
// formal dress
|
||||||
if (targetSlot == Item.SLOT_LR_HAND)
|
if (targetSlot == Item.SLOT_LR_HAND)
|
||||||
{
|
{
|
||||||
final ItemInstance rh = getPaperdollItem(PAPERDOLL_RHAND);
|
|
||||||
if ((rh != null) && (!rh.isArmor() || (rh.getArmorItem().getItemType() != ArmorType.SIGIL)))
|
|
||||||
{
|
|
||||||
setPaperdollItem(PAPERDOLL_RHAND, null);
|
|
||||||
}
|
|
||||||
final ItemInstance lh = getPaperdollItem(PAPERDOLL_LHAND);
|
final ItemInstance lh = getPaperdollItem(PAPERDOLL_LHAND);
|
||||||
if ((lh != null) && lh.isArmor() && (lh.getArmorItem().getItemType() == ArmorType.SHIELD))
|
if ((lh != null) && lh.isArmor() && (lh.getArmorItem().getItemType() == ArmorType.SHIELD))
|
||||||
{
|
{
|
||||||
|
@ -2090,11 +2090,6 @@ public abstract class Inventory extends ItemContainer
|
|||||||
// formal dress
|
// formal dress
|
||||||
if (targetSlot == Item.SLOT_LR_HAND)
|
if (targetSlot == Item.SLOT_LR_HAND)
|
||||||
{
|
{
|
||||||
final ItemInstance rh = getPaperdollItem(PAPERDOLL_RHAND);
|
|
||||||
if ((rh != null) && (!rh.isArmor() || (rh.getArmorItem().getItemType() != ArmorType.SIGIL)))
|
|
||||||
{
|
|
||||||
setPaperdollItem(PAPERDOLL_RHAND, null);
|
|
||||||
}
|
|
||||||
final ItemInstance lh = getPaperdollItem(PAPERDOLL_LHAND);
|
final ItemInstance lh = getPaperdollItem(PAPERDOLL_LHAND);
|
||||||
if ((lh != null) && lh.isArmor() && (lh.getArmorItem().getItemType() == ArmorType.SHIELD))
|
if ((lh != null) && lh.isArmor() && (lh.getArmorItem().getItemType() == ArmorType.SHIELD))
|
||||||
{
|
{
|
||||||
|
@ -2099,11 +2099,6 @@ public abstract class Inventory extends ItemContainer
|
|||||||
// formal dress
|
// formal dress
|
||||||
if (targetSlot == Item.SLOT_LR_HAND)
|
if (targetSlot == Item.SLOT_LR_HAND)
|
||||||
{
|
{
|
||||||
final ItemInstance rh = getPaperdollItem(PAPERDOLL_RHAND);
|
|
||||||
if ((rh != null) && (!rh.isArmor() || (rh.getArmorItem().getItemType() != ArmorType.SIGIL)))
|
|
||||||
{
|
|
||||||
setPaperdollItem(PAPERDOLL_RHAND, null);
|
|
||||||
}
|
|
||||||
final ItemInstance lh = getPaperdollItem(PAPERDOLL_LHAND);
|
final ItemInstance lh = getPaperdollItem(PAPERDOLL_LHAND);
|
||||||
if ((lh != null) && lh.isArmor() && (lh.getArmorItem().getItemType() == ArmorType.SHIELD))
|
if ((lh != null) && lh.isArmor() && (lh.getArmorItem().getItemType() == ArmorType.SHIELD))
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user