From d43874492eb81fac5bd02237bf1bf4b059abfa58 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Mon, 26 Apr 2021 11:13:41 +0000 Subject: [PATCH] Removed unnecessary check from equip items. --- .../l2jmobius/gameserver/model/itemcontainer/Inventory.java | 5 ----- .../l2jmobius/gameserver/model/itemcontainer/Inventory.java | 5 ----- .../l2jmobius/gameserver/model/itemcontainer/Inventory.java | 5 ----- .../l2jmobius/gameserver/model/itemcontainer/Inventory.java | 5 ----- 4 files changed, 20 deletions(-) diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index cc9348a8ec..528ec5cca2 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -1962,11 +1962,6 @@ public abstract class Inventory extends ItemContainer // formal dress 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); if ((lh != null) && lh.isArmor() && (lh.getArmorItem().getItemType() == ArmorType.SHIELD)) { diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index cc9348a8ec..528ec5cca2 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -1962,11 +1962,6 @@ public abstract class Inventory extends ItemContainer // formal dress 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); if ((lh != null) && lh.isArmor() && (lh.getArmorItem().getItemType() == ArmorType.SHIELD)) { diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 2e30f87de3..c721acf9af 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -2090,11 +2090,6 @@ public abstract class Inventory extends ItemContainer // formal dress 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); if ((lh != null) && lh.isArmor() && (lh.getArmorItem().getItemType() == ArmorType.SHIELD)) { diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index c434d53aa3..13cca69f90 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -2099,11 +2099,6 @@ public abstract class Inventory extends ItemContainer // formal dress 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); if ((lh != null) && lh.isArmor() && (lh.getArmorItem().getItemType() == ArmorType.SHIELD)) {