From 8515ed3ba9365594aa091bad1ae85e35349ba41c Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 16 Jul 2021 20:56:11 +0000 Subject: [PATCH] Unified bow check with other ranged weapons. Contributed by manax182. --- .../gameserver/model/itemcontainer/Inventory.java | 13 ------------- .../gameserver/model/itemcontainer/Inventory.java | 13 ------------- .../gameserver/model/itemcontainer/Inventory.java | 13 ------------- .../gameserver/model/itemcontainer/Inventory.java | 13 ------------- .../gameserver/model/itemcontainer/Inventory.java | 13 ------------- .../gameserver/model/itemcontainer/Inventory.java | 13 ------------- 6 files changed, 78 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 11cbce62f1..c9ac10175f 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 @@ -237,19 +237,6 @@ public abstract class Inventory extends ItemContainer switch (item.getWeaponItem().getItemType()) { case BOW: - { - final ItemInstance leftHandItem = inventory.getPaperdollItem(PAPERDOLL_LHAND); - if (((leftHandItem != null) && ((leftHandItem.getItemType()) != ArmorType.SIGIL))) - { - inventory.setPaperdollItem(PAPERDOLL_LHAND, null); - } - final PlayerInstance owner = inventory.getOwner().getActingPlayer(); - if (owner != null) - { - owner.removeAmmunitionSkills(); - } - break; - } case CROSSBOW: case TWOHANDCROSSBOW: { 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 11cbce62f1..c9ac10175f 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 @@ -237,19 +237,6 @@ public abstract class Inventory extends ItemContainer switch (item.getWeaponItem().getItemType()) { case BOW: - { - final ItemInstance leftHandItem = inventory.getPaperdollItem(PAPERDOLL_LHAND); - if (((leftHandItem != null) && ((leftHandItem.getItemType()) != ArmorType.SIGIL))) - { - inventory.setPaperdollItem(PAPERDOLL_LHAND, null); - } - final PlayerInstance owner = inventory.getOwner().getActingPlayer(); - if (owner != null) - { - owner.removeAmmunitionSkills(); - } - break; - } case CROSSBOW: case TWOHANDCROSSBOW: { diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 11cbce62f1..c9ac10175f 100644 --- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -237,19 +237,6 @@ public abstract class Inventory extends ItemContainer switch (item.getWeaponItem().getItemType()) { case BOW: - { - final ItemInstance leftHandItem = inventory.getPaperdollItem(PAPERDOLL_LHAND); - if (((leftHandItem != null) && ((leftHandItem.getItemType()) != ArmorType.SIGIL))) - { - inventory.setPaperdollItem(PAPERDOLL_LHAND, null); - } - final PlayerInstance owner = inventory.getOwner().getActingPlayer(); - if (owner != null) - { - owner.removeAmmunitionSkills(); - } - break; - } case CROSSBOW: case TWOHANDCROSSBOW: { 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 da8232db46..1526b7a736 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 @@ -237,19 +237,6 @@ public abstract class Inventory extends ItemContainer switch (item.getWeaponItem().getItemType()) { case BOW: - { - final ItemInstance leftHandItem = inventory.getPaperdollItem(PAPERDOLL_LHAND); - if (((leftHandItem != null) && ((leftHandItem.getItemType()) != ArmorType.SIGIL))) - { - inventory.setPaperdollItem(PAPERDOLL_LHAND, null); - } - final PlayerInstance owner = inventory.getOwner().getActingPlayer(); - if (owner != null) - { - owner.removeAmmunitionSkills(); - } - break; - } case CROSSBOW: case TWOHANDCROSSBOW: { 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 1fbe0609f7..afe699389f 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 @@ -237,19 +237,6 @@ public abstract class Inventory extends ItemContainer switch (item.getWeaponItem().getItemType()) { case BOW: - { - final ItemInstance leftHandItem = inventory.getPaperdollItem(PAPERDOLL_LHAND); - if (((leftHandItem != null) && ((leftHandItem.getItemType()) != ArmorType.SIGIL))) - { - inventory.setPaperdollItem(PAPERDOLL_LHAND, null); - } - final PlayerInstance owner = inventory.getOwner().getActingPlayer(); - if (owner != null) - { - owner.removeAmmunitionSkills(); - } - break; - } case CROSSBOW: case TWOHANDCROSSBOW: { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 1fbe0609f7..afe699389f 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -237,19 +237,6 @@ public abstract class Inventory extends ItemContainer switch (item.getWeaponItem().getItemType()) { case BOW: - { - final ItemInstance leftHandItem = inventory.getPaperdollItem(PAPERDOLL_LHAND); - if (((leftHandItem != null) && ((leftHandItem.getItemType()) != ArmorType.SIGIL))) - { - inventory.setPaperdollItem(PAPERDOLL_LHAND, null); - } - final PlayerInstance owner = inventory.getOwner().getActingPlayer(); - if (owner != null) - { - owner.removeAmmunitionSkills(); - } - break; - } case CROSSBOW: case TWOHANDCROSSBOW: {