lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Additional unequip check for shields.

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@ -1967,6 +1967,11 @@ public abstract class Inventory extends ItemContainer
{ {
setPaperdollItem(PAPERDOLL_RHAND, null); 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); setPaperdollItem(PAPERDOLL_RHAND, item);
} }
else if (targetSlot == Item.SLOT_L_HAND) else if (targetSlot == Item.SLOT_L_HAND)

5
L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@ -1967,6 +1967,11 @@ public abstract class Inventory extends ItemContainer
{ {
setPaperdollItem(PAPERDOLL_RHAND, null); 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); setPaperdollItem(PAPERDOLL_RHAND, item);
} }
else if (targetSlot == Item.SLOT_L_HAND) else if (targetSlot == Item.SLOT_L_HAND)

5
L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@ -2095,6 +2095,11 @@ public abstract class Inventory extends ItemContainer
{ {
setPaperdollItem(PAPERDOLL_RHAND, null); 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); setPaperdollItem(PAPERDOLL_RHAND, item);
} }
else if (targetSlot == Item.SLOT_L_HAND) else if (targetSlot == Item.SLOT_L_HAND)

5
L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@ -2104,6 +2104,11 @@ public abstract class Inventory extends ItemContainer
{ {
setPaperdollItem(PAPERDOLL_RHAND, null); 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); setPaperdollItem(PAPERDOLL_RHAND, item);
} }
else if (targetSlot == Item.SLOT_L_HAND) else if (targetSlot == Item.SLOT_L_HAND)