diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java index 9fc1334f42..c2ef742f8f 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -3553,12 +3553,6 @@ public class Player extends Playable } } - // Einhasad coin UI update. - if (destoyedItem.getId() == Inventory.EINHASAD_COIN_ID) - { - sendPacket(new ExBloodyCoinCount(this)); - } - return true; } @@ -3675,12 +3669,6 @@ public class Player extends Playable } } - // Einhasad coin UI update. - if (item.getId() == Inventory.EINHASAD_COIN_ID) - { - sendPacket(new ExBloodyCoinCount(this)); - } - return true; } diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index 405e7df43b..27afb9234a 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -50,6 +50,7 @@ import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.SkillConditionScope; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.ExAdenaInvenCount; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.limitshop.ExBloodyCoinCount; @@ -505,8 +506,13 @@ public class PlayerInventory extends Inventory actor.sendItemList(); } + // Adena UI update. + if (item.getId() == Inventory.ADENA_ID) + { + actor.sendPacket(new ExAdenaInvenCount(actor)); + } // Einhasad coin UI update. - if (item.getId() == Inventory.EINHASAD_COIN_ID) + else if (item.getId() == Inventory.EINHASAD_COIN_ID) { actor.sendPacket(new ExBloodyCoinCount(actor)); } @@ -598,9 +604,20 @@ public class PlayerInventory extends Inventory _ancientAdena = null; } - // Notify to scripts if (destroyedItem != null) { + // Adena UI update. + if (destroyedItem.getId() == Inventory.ADENA_ID) + { + actor.sendPacket(new ExAdenaInvenCount(actor)); + } + // Einhasad coin UI update. + else if (destroyedItem.getId() == Inventory.EINHASAD_COIN_ID) + { + actor.sendPacket(new ExBloodyCoinCount(actor)); + } + + // Notify to scripts EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDestroy(actor, destroyedItem), destroyedItem.getTemplate()); } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java index 77acb9a819..ee3101eda1 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -3581,12 +3581,6 @@ public class Player extends Playable } } - // Einhasad coin UI update. - if (destoyedItem.getId() == Inventory.EINHASAD_COIN_ID) - { - sendPacket(new ExBloodyCoinCount(this)); - } - return true; } @@ -3703,12 +3697,6 @@ public class Player extends Playable } } - // Einhasad coin UI update. - if (item.getId() == Inventory.EINHASAD_COIN_ID) - { - sendPacket(new ExBloodyCoinCount(this)); - } - return true; } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index 405e7df43b..27afb9234a 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -50,6 +50,7 @@ import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.SkillConditionScope; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.ExAdenaInvenCount; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.limitshop.ExBloodyCoinCount; @@ -505,8 +506,13 @@ public class PlayerInventory extends Inventory actor.sendItemList(); } + // Adena UI update. + if (item.getId() == Inventory.ADENA_ID) + { + actor.sendPacket(new ExAdenaInvenCount(actor)); + } // Einhasad coin UI update. - if (item.getId() == Inventory.EINHASAD_COIN_ID) + else if (item.getId() == Inventory.EINHASAD_COIN_ID) { actor.sendPacket(new ExBloodyCoinCount(actor)); } @@ -598,9 +604,20 @@ public class PlayerInventory extends Inventory _ancientAdena = null; } - // Notify to scripts if (destroyedItem != null) { + // Adena UI update. + if (destroyedItem.getId() == Inventory.ADENA_ID) + { + actor.sendPacket(new ExAdenaInvenCount(actor)); + } + // Einhasad coin UI update. + else if (destroyedItem.getId() == Inventory.EINHASAD_COIN_ID) + { + actor.sendPacket(new ExBloodyCoinCount(actor)); + } + + // Notify to scripts EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDestroy(actor, destroyedItem), destroyedItem.getTemplate()); } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java index 121e4497bc..bf2e0dd996 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -3515,12 +3515,6 @@ public class Player extends Playable } } - // LCoin UI update. - if (destoyedItem.getId() == Inventory.LCOIN_ID) - { - sendPacket(new ExBloodyCoinCount(this)); - } - return true; } @@ -3637,12 +3631,6 @@ public class Player extends Playable } } - // LCoin UI update. - if (item.getId() == Inventory.LCOIN_ID) - { - sendPacket(new ExBloodyCoinCount(this)); - } - return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index b83be41d1c..adcbf7a7aa 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -50,6 +50,7 @@ import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.SkillConditionScope; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.ExAdenaInvenCount; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.limitshop.ExBloodyCoinCount; @@ -505,8 +506,13 @@ public class PlayerInventory extends Inventory actor.sendItemList(); } + // Adena UI update. + if (item.getId() == Inventory.ADENA_ID) + { + actor.sendPacket(new ExAdenaInvenCount(actor)); + } // LCoin UI update. - if (item.getId() == Inventory.LCOIN_ID) + else if (item.getId() == Inventory.LCOIN_ID) { actor.sendPacket(new ExBloodyCoinCount(actor)); } @@ -598,9 +604,20 @@ public class PlayerInventory extends Inventory _ancientAdena = null; } - // Notify to scripts if (destroyedItem != null) { + // Adena UI update. + if (destroyedItem.getId() == Inventory.ADENA_ID) + { + actor.sendPacket(new ExAdenaInvenCount(actor)); + } + // LCoin UI update. + else if (destroyedItem.getId() == Inventory.LCOIN_ID) + { + actor.sendPacket(new ExBloodyCoinCount(actor)); + } + + // Notify to scripts EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDestroy(actor, destroyedItem), destroyedItem.getTemplate()); } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java index 8388eaca6b..b3356327fb 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -3557,12 +3557,6 @@ public class Player extends Playable } } - // LCoin UI update. - if (destoyedItem.getId() == Inventory.LCOIN_ID) - { - sendPacket(new ExBloodyCoinCount(this)); - } - return true; } @@ -3679,12 +3673,6 @@ public class Player extends Playable } } - // LCoin UI update. - if (item.getId() == Inventory.LCOIN_ID) - { - sendPacket(new ExBloodyCoinCount(this)); - } - return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index b83be41d1c..adcbf7a7aa 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -50,6 +50,7 @@ import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.SkillConditionScope; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.ExAdenaInvenCount; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.limitshop.ExBloodyCoinCount; @@ -505,8 +506,13 @@ public class PlayerInventory extends Inventory actor.sendItemList(); } + // Adena UI update. + if (item.getId() == Inventory.ADENA_ID) + { + actor.sendPacket(new ExAdenaInvenCount(actor)); + } // LCoin UI update. - if (item.getId() == Inventory.LCOIN_ID) + else if (item.getId() == Inventory.LCOIN_ID) { actor.sendPacket(new ExBloodyCoinCount(actor)); } @@ -598,9 +604,20 @@ public class PlayerInventory extends Inventory _ancientAdena = null; } - // Notify to scripts if (destroyedItem != null) { + // Adena UI update. + if (destroyedItem.getId() == Inventory.ADENA_ID) + { + actor.sendPacket(new ExAdenaInvenCount(actor)); + } + // LCoin UI update. + else if (destroyedItem.getId() == Inventory.LCOIN_ID) + { + actor.sendPacket(new ExBloodyCoinCount(actor)); + } + + // Notify to scripts EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDestroy(actor, destroyedItem), destroyedItem.getTemplate()); } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Player.java index b7c6c5b3c4..0921ea1ad9 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -3572,12 +3572,6 @@ public class Player extends Playable } } - // LCoin UI update. - if (destoyedItem.getId() == Inventory.LCOIN_ID) - { - sendPacket(new ExBloodyCoinCount(this)); - } - return true; } @@ -3694,12 +3688,6 @@ public class Player extends Playable } } - // LCoin UI update. - if (item.getId() == Inventory.LCOIN_ID) - { - sendPacket(new ExBloodyCoinCount(this)); - } - return true; } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index b83be41d1c..adcbf7a7aa 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -50,6 +50,7 @@ import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.SkillConditionScope; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.ExAdenaInvenCount; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.limitshop.ExBloodyCoinCount; @@ -505,8 +506,13 @@ public class PlayerInventory extends Inventory actor.sendItemList(); } + // Adena UI update. + if (item.getId() == Inventory.ADENA_ID) + { + actor.sendPacket(new ExAdenaInvenCount(actor)); + } // LCoin UI update. - if (item.getId() == Inventory.LCOIN_ID) + else if (item.getId() == Inventory.LCOIN_ID) { actor.sendPacket(new ExBloodyCoinCount(actor)); } @@ -598,9 +604,20 @@ public class PlayerInventory extends Inventory _ancientAdena = null; } - // Notify to scripts if (destroyedItem != null) { + // Adena UI update. + if (destroyedItem.getId() == Inventory.ADENA_ID) + { + actor.sendPacket(new ExAdenaInvenCount(actor)); + } + // LCoin UI update. + else if (destroyedItem.getId() == Inventory.LCOIN_ID) + { + actor.sendPacket(new ExBloodyCoinCount(actor)); + } + + // Notify to scripts EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDestroy(actor, destroyedItem), destroyedItem.getTemplate()); } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Player.java index ee34847b6c..b93403feaa 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -3605,12 +3605,6 @@ public class Player extends Playable } } - // LCoin UI update. - if (destoyedItem.getId() == Inventory.LCOIN_ID) - { - sendPacket(new ExBloodyCoinCount(this)); - } - return true; } @@ -3727,12 +3721,6 @@ public class Player extends Playable } } - // LCoin UI update. - if (item.getId() == Inventory.LCOIN_ID) - { - sendPacket(new ExBloodyCoinCount(this)); - } - return true; } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index b83be41d1c..adcbf7a7aa 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -50,6 +50,7 @@ import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.SkillConditionScope; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.ExAdenaInvenCount; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.limitshop.ExBloodyCoinCount; @@ -505,8 +506,13 @@ public class PlayerInventory extends Inventory actor.sendItemList(); } + // Adena UI update. + if (item.getId() == Inventory.ADENA_ID) + { + actor.sendPacket(new ExAdenaInvenCount(actor)); + } // LCoin UI update. - if (item.getId() == Inventory.LCOIN_ID) + else if (item.getId() == Inventory.LCOIN_ID) { actor.sendPacket(new ExBloodyCoinCount(actor)); } @@ -598,9 +604,20 @@ public class PlayerInventory extends Inventory _ancientAdena = null; } - // Notify to scripts if (destroyedItem != null) { + // Adena UI update. + if (destroyedItem.getId() == Inventory.ADENA_ID) + { + actor.sendPacket(new ExAdenaInvenCount(actor)); + } + // LCoin UI update. + else if (destroyedItem.getId() == Inventory.LCOIN_ID) + { + actor.sendPacket(new ExBloodyCoinCount(actor)); + } + + // Notify to scripts EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDestroy(actor, destroyedItem), destroyedItem.getTemplate()); }