From e3691a48d9678302baa13300e23a8f14b419c514 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Mon, 8 Nov 2021 23:16:25 +0000 Subject: [PATCH] Send modified item inventory update with checkAndEquipAmmunition method. --- .../gameserver/model/actor/instance/PlayerInstance.java | 7 +++++-- .../gameserver/model/actor/instance/PlayerInstance.java | 7 +++++-- .../gameserver/model/actor/instance/PlayerInstance.java | 7 +++++-- .../gameserver/model/actor/instance/PlayerInstance.java | 7 +++++-- .../gameserver/model/actor/instance/PlayerInstance.java | 7 +++++-- .../gameserver/model/actor/instance/PlayerInstance.java | 7 +++++-- .../gameserver/model/actor/instance/PlayerInstance.java | 7 +++++-- .../gameserver/model/actor/instance/PlayerInstance.java | 7 +++++-- .../gameserver/model/actor/instance/PlayerInstance.java | 4 +++- .../gameserver/model/actor/instance/PlayerInstance.java | 4 +++- .../gameserver/model/actor/instance/PlayerInstance.java | 4 +++- .../gameserver/model/actor/instance/PlayerInstance.java | 7 +++++-- .../gameserver/model/actor/instance/PlayerInstance.java | 7 +++++-- .../gameserver/model/actor/instance/PlayerInstance.java | 7 +++++-- .../gameserver/model/actor/instance/PlayerInstance.java | 7 +++++-- .../gameserver/model/actor/instance/PlayerInstance.java | 7 +++++-- .../gameserver/model/actor/instance/PlayerInstance.java | 7 +++++-- .../gameserver/model/actor/instance/PlayerInstance.java | 7 +++++-- .../gameserver/model/actor/instance/PlayerInstance.java | 4 +++- .../gameserver/model/actor/instance/PlayerInstance.java | 4 +++- .../gameserver/model/actor/instance/PlayerInstance.java | 4 +++- 21 files changed, 93 insertions(+), 36 deletions(-) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index cac2c2a0b8..846db04687 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -5827,11 +5827,14 @@ public class PlayerInstance extends Playable { arrows = _inventory.findBoltForCrossBow(weapon); } + + // Equip arrows needed in left hand. if (arrows != null) { - // Equip arrows needed in left hand _inventory.setPaperdollItem(Inventory.PAPERDOLL_LHAND, arrows); - sendItemList(false); + final InventoryUpdate iu = new InventoryUpdate(); + iu.addModifiedItem(arrows); + sendInventoryUpdate(iu); return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 17ba599b28..7d300ad0dc 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -5829,11 +5829,14 @@ public class PlayerInstance extends Playable { arrows = _inventory.findBoltForCrossBow(weapon); } + + // Equip arrows needed in left hand. if (arrows != null) { - // Equip arrows needed in left hand _inventory.setPaperdollItem(Inventory.PAPERDOLL_LHAND, arrows); - sendItemList(false); + final InventoryUpdate iu = new InventoryUpdate(); + iu.addModifiedItem(arrows); + sendInventoryUpdate(iu); return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index bb3812292d..58a1f37893 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -5831,11 +5831,14 @@ public class PlayerInstance extends Playable { arrows = _inventory.findBoltForCrossBow(weapon); } + + // Equip arrows needed in left hand. if (arrows != null) { - // Equip arrows needed in left hand _inventory.setPaperdollItem(Inventory.PAPERDOLL_LHAND, arrows); - sendItemList(false); + final InventoryUpdate iu = new InventoryUpdate(); + iu.addModifiedItem(arrows); + sendInventoryUpdate(iu); return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 96ab92477f..11aa0345f4 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -5826,11 +5826,14 @@ public class PlayerInstance extends Playable { arrows = _inventory.findBoltForCrossBow(weapon); } + + // Equip arrows needed in left hand. if (arrows != null) { - // Equip arrows needed in left hand _inventory.setPaperdollItem(Inventory.PAPERDOLL_LHAND, arrows); - sendItemList(false); + final InventoryUpdate iu = new InventoryUpdate(); + iu.addModifiedItem(arrows); + sendInventoryUpdate(iu); return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 0e04858a97..ee32ae272b 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -5809,11 +5809,14 @@ public class PlayerInstance extends Playable { arrows = _inventory.findBoltForCrossBow(weapon); } + + // Equip arrows needed in left hand. if (arrows != null) { - // Equip arrows needed in left hand _inventory.setPaperdollItem(Inventory.PAPERDOLL_LHAND, arrows); - sendItemList(); + final InventoryUpdate iu = new InventoryUpdate(); + iu.addModifiedItem(arrows); + sendInventoryUpdate(iu); return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 27c8eb1e49..c67280f59f 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -5809,11 +5809,14 @@ public class PlayerInstance extends Playable { arrows = _inventory.findBoltForCrossBow(weapon); } + + // Equip arrows needed in left hand. if (arrows != null) { - // Equip arrows needed in left hand _inventory.setPaperdollItem(Inventory.PAPERDOLL_LHAND, arrows); - sendItemList(); + final InventoryUpdate iu = new InventoryUpdate(); + iu.addModifiedItem(arrows); + sendInventoryUpdate(iu); return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 7d1fd3049e..436544b256 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -5810,11 +5810,14 @@ public class PlayerInstance extends Playable { arrows = _inventory.findBoltForCrossBow(weapon); } + + // Equip arrows needed in left hand. if (arrows != null) { - // Equip arrows needed in left hand _inventory.setPaperdollItem(Inventory.PAPERDOLL_LHAND, arrows); - sendItemList(); + final InventoryUpdate iu = new InventoryUpdate(); + iu.addModifiedItem(arrows); + sendInventoryUpdate(iu); return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 168c0c26a5..9cee0cdd0f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -5774,11 +5774,14 @@ public class PlayerInstance extends Playable { arrows = _inventory.findBoltForCrossBow(weapon); } + + // Equip arrows needed in left hand. if (arrows != null) { - // Equip arrows needed in left hand _inventory.setPaperdollItem(Inventory.PAPERDOLL_LHAND, arrows); - sendItemList(); + final InventoryUpdate iu = new InventoryUpdate(); + iu.addModifiedItem(arrows); + sendInventoryUpdate(iu); return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index aed2d6d69d..19c3934072 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -5819,7 +5819,9 @@ public class PlayerInstance extends Playable if (ammunition != null) { addAmmunitionSkills(ammunition); - sendItemList(); + final InventoryUpdate iu = new InventoryUpdate(); + iu.addModifiedItem(ammunition); + sendInventoryUpdate(iu); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index aceedc23c6..c6f51e8e59 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -5836,7 +5836,9 @@ public class PlayerInstance extends Playable if (ammunition != null) { addAmmunitionSkills(ammunition); - sendItemList(); + final InventoryUpdate iu = new InventoryUpdate(); + iu.addModifiedItem(ammunition); + sendInventoryUpdate(iu); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index cd0e8ee80f..35e2f21418 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -5869,7 +5869,9 @@ public class PlayerInstance extends Playable if (ammunition != null) { addAmmunitionSkills(ammunition); - sendItemList(); + final InventoryUpdate iu = new InventoryUpdate(); + iu.addModifiedItem(ammunition); + sendInventoryUpdate(iu); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index bc7f2f90c0..78cda326fb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -5802,11 +5802,14 @@ public class PlayerInstance extends Playable { arrows = _inventory.findBoltForCrossBow(weapon); } + + // Equip arrows needed in left hand. if (arrows != null) { - // Equip arrows needed in left hand _inventory.setPaperdollItem(Inventory.PAPERDOLL_LHAND, arrows); - sendItemList(false); + final InventoryUpdate iu = new InventoryUpdate(); + iu.addModifiedItem(arrows); + sendInventoryUpdate(iu); return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index ac0b0f4d73..c50e7d7a3b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -5802,11 +5802,14 @@ public class PlayerInstance extends Playable { arrows = _inventory.findBoltForCrossBow(weapon); } + + // Equip arrows needed in left hand. if (arrows != null) { - // Equip arrows needed in left hand _inventory.setPaperdollItem(Inventory.PAPERDOLL_LHAND, arrows); - sendItemList(false); + final InventoryUpdate iu = new InventoryUpdate(); + iu.addModifiedItem(arrows); + sendInventoryUpdate(iu); return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 405c7b9f96..6643aaad7a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -5788,11 +5788,14 @@ public class PlayerInstance extends Playable { arrows = _inventory.findBoltForCrossBow(weapon); } + + // Equip arrows needed in left hand. if (arrows != null) { - // Equip arrows needed in left hand _inventory.setPaperdollItem(Inventory.PAPERDOLL_LHAND, arrows); - sendItemList(); + final InventoryUpdate iu = new InventoryUpdate(); + iu.addModifiedItem(arrows); + sendInventoryUpdate(iu); return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 51bc1d9067..be8fb398d3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -5802,11 +5802,14 @@ public class PlayerInstance extends Playable { arrows = _inventory.findBoltForCrossBow(weapon); } + + // Equip arrows needed in left hand. if (arrows != null) { - // Equip arrows needed in left hand _inventory.setPaperdollItem(Inventory.PAPERDOLL_LHAND, arrows); - sendItemList(); + final InventoryUpdate iu = new InventoryUpdate(); + iu.addModifiedItem(arrows); + sendInventoryUpdate(iu); return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 893991a4bb..c056062e5a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -5802,11 +5802,14 @@ public class PlayerInstance extends Playable { arrows = _inventory.findBoltForCrossBow(weapon); } + + // Equip arrows needed in left hand. if (arrows != null) { - // Equip arrows needed in left hand _inventory.setPaperdollItem(Inventory.PAPERDOLL_LHAND, arrows); - sendItemList(); + final InventoryUpdate iu = new InventoryUpdate(); + iu.addModifiedItem(arrows); + sendInventoryUpdate(iu); return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 6d569cc5ba..3e6d55a2ba 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -5756,11 +5756,14 @@ public class PlayerInstance extends Playable { arrows = _inventory.findBoltForCrossBow(weapon); } + + // Equip arrows needed in left hand. if (arrows != null) { - // Equip arrows needed in left hand _inventory.setPaperdollItem(Inventory.PAPERDOLL_LHAND, arrows); - sendItemList(); + final InventoryUpdate iu = new InventoryUpdate(); + iu.addModifiedItem(arrows); + sendInventoryUpdate(iu); return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index dd3390a802..86817cd448 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -5783,11 +5783,14 @@ public class PlayerInstance extends Playable { arrows = _inventory.findBoltForCrossBow(weapon); } + + // Equip arrows needed in left hand. if (arrows != null) { - // Equip arrows needed in left hand _inventory.setPaperdollItem(Inventory.PAPERDOLL_LHAND, arrows); - sendItemList(false); + final InventoryUpdate iu = new InventoryUpdate(); + iu.addModifiedItem(arrows); + sendInventoryUpdate(iu); return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index dda2e61e74..66c59fca5d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -5835,7 +5835,9 @@ public class PlayerInstance extends Playable if (ammunition != null) { addAmmunitionSkills(ammunition); - sendItemList(); + final InventoryUpdate iu = new InventoryUpdate(); + iu.addModifiedItem(ammunition); + sendInventoryUpdate(iu); return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 6eb5cc3e52..5b20f1d74f 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -5880,7 +5880,9 @@ public class PlayerInstance extends Playable if (ammunition != null) { addAmmunitionSkills(ammunition); - sendItemList(); + final InventoryUpdate iu = new InventoryUpdate(); + iu.addModifiedItem(ammunition); + sendInventoryUpdate(iu); return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 6eb5cc3e52..5b20f1d74f 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -5880,7 +5880,9 @@ public class PlayerInstance extends Playable if (ammunition != null) { addAmmunitionSkills(ammunition); - sendItemList(); + final InventoryUpdate iu = new InventoryUpdate(); + iu.addModifiedItem(ammunition); + sendInventoryUpdate(iu); return true; }