From 386d1794d01db17fc0bc630a188992c764bf561b Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sat, 24 Dec 2016 15:13:12 +0000 Subject: [PATCH] Moved crude brooch jewel checks in L2PcInstance. --- .../model/actor/instance/L2PcInstance.java | 49 +++++++++++++++ .../model/itemcontainer/Inventory.java | 59 ++++--------------- 2 files changed, 59 insertions(+), 49 deletions(-) diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index 939013ee2d..323f22ada8 100644 --- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -2154,6 +2154,11 @@ public final class L2PcInstance extends L2Playable final int oldInvLimit = getInventoryLimit(); SystemMessage sm = null; + if ((item.getItem().getBodyPart() == L2Item.SLOT_BROOCH_JEWEL) || (item.getItem().getBodyPart() == L2Item.SLOT_BROOCH)) + { + updateActiveBroochJewel(); + } + if (isEquiped) { if (item.getEnchantLevel() > 0) @@ -2212,6 +2217,7 @@ public final class L2PcInstance extends L2Playable sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); } } + refreshExpertisePenalty(); broadcastUserInfo(); @@ -2230,6 +2236,11 @@ public final class L2PcInstance extends L2Playable sendPacket(new ExStorageMaxCount(this)); } + if ((item.getItem().getBodyPart() == L2Item.SLOT_BROOCH_JEWEL) || (item.getItem().getBodyPart() == L2Item.SLOT_BROOCH)) + { + + } + // Notify to scripts EventDispatcher.getInstance().notifyEventAsync(new OnPlayerEquipItem(this, item), this); } @@ -8674,6 +8685,44 @@ public final class L2PcInstance extends L2Playable _activeShappireJewel = jewel; } + public void updateActiveBroochJewel() + { + // Update active Ruby jewel. + if ((getInventory().getItemByItemId(BroochJewel.RUBY_LV5.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.RUBY_LV5.getItemId()).isEquipped())) + { + setActiveRubyJewel(BroochJewel.RUBY_LV5); + } + else if ((getInventory().getItemByItemId(BroochJewel.RUBY_LV4.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.RUBY_LV4.getItemId()).isEquipped())) + { + setActiveRubyJewel(BroochJewel.RUBY_LV4); + } + else if ((getInventory().getItemByItemId(BroochJewel.RUBY_LV3.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.RUBY_LV5.getItemId()).isEquipped())) + { + setActiveRubyJewel(BroochJewel.RUBY_LV3); + } + else + { + setActiveRubyJewel(null); + } + // Update active Sapphire jewel. + if ((getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV5.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV5.getItemId()).isEquipped())) + { + setActiveShappireJewel(BroochJewel.SHAPPHIRE_LV5); + } + else if ((getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV4.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV4.getItemId()).isEquipped())) + { + setActiveShappireJewel(BroochJewel.SHAPPHIRE_LV4); + } + else if ((getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV3.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV3.getItemId()).isEquipped())) + { + setActiveShappireJewel(BroochJewel.SHAPPHIRE_LV3); + } + else + { + setActiveShappireJewel(null); + } + } + private ScheduledFuture _taskWarnUserTakeBreak; public EnumIntBitmask getClanPrivileges() diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 66d13518d3..300d62e998 100644 --- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -39,7 +39,6 @@ import com.l2jmobius.commons.database.DatabaseFactory; import com.l2jmobius.commons.util.CommonUtil; import com.l2jmobius.gameserver.data.xml.impl.ArmorSetsData; import com.l2jmobius.gameserver.datatables.ItemTable; -import com.l2jmobius.gameserver.enums.BroochJewel; import com.l2jmobius.gameserver.enums.ItemLocation; import com.l2jmobius.gameserver.enums.ItemSkillType; import com.l2jmobius.gameserver.enums.PrivateStoreType; @@ -389,11 +388,6 @@ public abstract class Inventory extends ItemContainer { player.sendPacket(new SkillCoolTime(player)); } - - if ((item.getItem().getBodyPart() == L2Item.SLOT_BROOCH_JEWEL) || (item.getItem().getBodyPart() == L2Item.SLOT_BROOCH)) - { - updateActiveBroochJewel(player); - } } @Override @@ -477,49 +471,6 @@ public abstract class Inventory extends ItemContainer { player.handleAutoShots(Config.ENABLE_AUTO_SHOTS); } - - if ((item.getItem().getBodyPart() == L2Item.SLOT_BROOCH_JEWEL) || (item.getItem().getBodyPart() == L2Item.SLOT_BROOCH)) - { - updateActiveBroochJewel(player); - } - } - - private void updateActiveBroochJewel(L2PcInstance player) - { - // Update active Ruby jewel. - if ((player.getInventory().getItemByItemId(BroochJewel.RUBY_LV5.getItemId()) != null) && (player.getInventory().getItemByItemId(BroochJewel.RUBY_LV5.getItemId()).isEquipped())) - { - player.setActiveRubyJewel(BroochJewel.RUBY_LV5); - } - else if ((player.getInventory().getItemByItemId(BroochJewel.RUBY_LV4.getItemId()) != null) && (player.getInventory().getItemByItemId(BroochJewel.RUBY_LV4.getItemId()).isEquipped())) - { - player.setActiveRubyJewel(BroochJewel.RUBY_LV4); - } - else if ((player.getInventory().getItemByItemId(BroochJewel.RUBY_LV3.getItemId()) != null) && (player.getInventory().getItemByItemId(BroochJewel.RUBY_LV5.getItemId()).isEquipped())) - { - player.setActiveRubyJewel(BroochJewel.RUBY_LV3); - } - else - { - player.setActiveRubyJewel(null); - } - // Update active Sapphire jewel. - if ((player.getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV5.getItemId()) != null) && (player.getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV5.getItemId()).isEquipped())) - { - player.setActiveShappireJewel(BroochJewel.SHAPPHIRE_LV5); - } - else if ((player.getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV4.getItemId()) != null) && (player.getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV4.getItemId()).isEquipped())) - { - player.setActiveShappireJewel(BroochJewel.SHAPPHIRE_LV4); - } - else if ((player.getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV3.getItemId()) != null) && (player.getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV3.getItemId()).isEquipped())) - { - player.setActiveShappireJewel(BroochJewel.SHAPPHIRE_LV3); - } - else - { - player.setActiveShappireJewel(null); - } } } @@ -553,6 +504,11 @@ public abstract class Inventory extends ItemContainer { player.sendSkillList(); } + + if ((item.getItem().getBodyPart() == L2Item.SLOT_BROOCH_JEWEL) || (item.getItem().getBodyPart() == L2Item.SLOT_BROOCH)) + { + player.updateActiveBroochJewel(); + } } private static boolean applySkills(L2PcInstance player, L2ItemInstance item, L2ArmorSet armorSet, Function idProvider) @@ -668,6 +624,11 @@ public abstract class Inventory extends ItemContainer player.checkItemRestriction(); player.sendSkillList(); } + + if ((item.getItem().getBodyPart() == L2Item.SLOT_BROOCH_JEWEL) || (item.getItem().getBodyPart() == L2Item.SLOT_BROOCH)) + { + player.updateActiveBroochJewel(); + } } }