From ced2bd05e6a7275efab66d0d38087760ab83e7b4 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Thu, 8 Jul 2021 23:16:15 +0000 Subject: [PATCH] Talisman equip message adjustments. Contributed by manax182. --- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/itemcontainer/Inventory.java | 9 --------- .../gameserver/network/clientpackets/UseItem.java | 4 ++-- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/itemcontainer/Inventory.java | 9 --------- .../gameserver/network/clientpackets/UseItem.java | 4 ++-- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/itemcontainer/Inventory.java | 9 --------- .../gameserver/network/clientpackets/UseItem.java | 4 ++-- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/itemcontainer/Inventory.java | 9 --------- .../gameserver/network/clientpackets/UseItem.java | 4 ++-- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/itemcontainer/Inventory.java | 9 --------- .../gameserver/network/clientpackets/UseItem.java | 4 ++-- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/itemcontainer/Inventory.java | 9 --------- .../gameserver/network/clientpackets/UseItem.java | 4 ++-- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/itemcontainer/Inventory.java | 9 --------- .../gameserver/network/clientpackets/UseItem.java | 4 ++-- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/itemcontainer/Inventory.java | 9 --------- .../gameserver/network/clientpackets/UseItem.java | 4 ++-- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/itemcontainer/Inventory.java | 9 --------- .../gameserver/network/clientpackets/UseItem.java | 4 ++-- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/itemcontainer/Inventory.java | 9 --------- .../gameserver/network/clientpackets/UseItem.java | 4 ++-- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/itemcontainer/Inventory.java | 9 --------- .../gameserver/network/clientpackets/UseItem.java | 4 ++-- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/itemcontainer/Inventory.java | 9 --------- .../gameserver/network/clientpackets/UseItem.java | 4 ++-- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/itemcontainer/Inventory.java | 9 --------- .../gameserver/network/clientpackets/UseItem.java | 4 ++-- .../gameserver/model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/itemcontainer/Inventory.java | 9 --------- .../gameserver/network/clientpackets/UseItem.java | 4 ++-- 49 files changed, 49 insertions(+), 175 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 8ab3f90fce..d4bbeaf528 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -2277,7 +2277,7 @@ public class PlayerInstance extends Playable } else { - sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); + sendPacket(SystemMessageId.NO_EQUIPMENT_SLOT_AVAILABLE); } } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index a723dbdce8..6ec2971ab3 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -2283,7 +2283,7 @@ public class PlayerInstance extends Playable } else { - sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); + sendPacket(SystemMessageId.NO_EQUIPMENT_SLOT_AVAILABLE); } } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index cf3216db8b..2836e5021a 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -2285,7 +2285,7 @@ public class PlayerInstance extends Playable } else { - sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); + sendPacket(SystemMessageId.NO_EQUIPMENT_SLOT_AVAILABLE); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 1fed7f35ea..cb6f607ad8 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -2292,7 +2292,7 @@ public class PlayerInstance extends Playable } else { - sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); + sendPacket(SystemMessageId.NO_EQUIPMENT_SLOT_AVAILABLE); } } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index df4ff5ce25..448be544c7 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -2288,7 +2288,7 @@ public class PlayerInstance extends Playable } else { - sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); + sendPacket(SystemMessageId.NO_EQUIPMENT_SLOT_AVAILABLE); } } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 9239beb336..a45adbdf28 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -2209,9 +2209,6 @@ public abstract class Inventory extends ItemContainer return; } } - - // no free slots - put on first - setPaperdollItem(PAPERDOLL_DECO1, item); } public int getBroochJewelSlots() @@ -2246,9 +2243,6 @@ public abstract class Inventory extends ItemContainer return; } } - - // no free slots - put on first - setPaperdollItem(PAPERDOLL_BROOCH_JEWEL1, item); } public int getAgathionSlots() @@ -2283,9 +2277,6 @@ public abstract class Inventory extends ItemContainer return; } } - - // no free slots - put on first - setPaperdollItem(PAPERDOLL_AGATHION1, item); } public boolean canEquipCloak() diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index e8c4a648d3..01d731c514 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -225,7 +225,7 @@ public class UseItem implements IClientIncomingPacket { if (!item.isEquipped() && (player.getInventory().getTalismanSlots() == 0)) { - player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); + player.sendPacket(SystemMessageId.NO_EQUIPMENT_SLOT_AVAILABLE); return; } } @@ -243,7 +243,7 @@ public class UseItem implements IClientIncomingPacket { if (!item.isEquipped() && (player.getInventory().getAgathionSlots() == 0)) { - player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); + player.sendPacket(SystemMessageId.NO_EQUIPMENT_SLOT_AVAILABLE); return; } } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 9a68cd6cd3..5e132b0e19 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -2288,7 +2288,7 @@ public class PlayerInstance extends Playable } else { - sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); + sendPacket(SystemMessageId.NO_EQUIPMENT_SLOT_AVAILABLE); } } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 3725aeb656..338f50fb00 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -2330,9 +2330,6 @@ public abstract class Inventory extends ItemContainer return; } } - - // no free slots - put on first - setPaperdollItem(PAPERDOLL_DECO1, item); } public int getArtifactSlots() @@ -2433,9 +2430,6 @@ public abstract class Inventory extends ItemContainer return; } } - - // no free slots - put on first - setPaperdollItem(PAPERDOLL_BROOCH_JEWEL1, item); } public int getAgathionSlots() @@ -2470,9 +2464,6 @@ public abstract class Inventory extends ItemContainer return; } } - - // no free slots - put on first - setPaperdollItem(PAPERDOLL_AGATHION1, item); } public boolean canEquipCloak() diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 949dba2b59..d175d8cfaf 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -225,7 +225,7 @@ public class UseItem implements IClientIncomingPacket { if (!item.isEquipped() && (player.getInventory().getTalismanSlots() == 0)) { - player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); + player.sendPacket(SystemMessageId.NO_EQUIPMENT_SLOT_AVAILABLE); return; } } @@ -243,7 +243,7 @@ public class UseItem implements IClientIncomingPacket { if (!item.isEquipped() && (player.getInventory().getAgathionSlots() == 0)) { - player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); + player.sendPacket(SystemMessageId.NO_EQUIPMENT_SLOT_AVAILABLE); return; } } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index f4f8fa7dc1..c9132e76be 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -2288,7 +2288,7 @@ public class PlayerInstance extends Playable } else { - sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); + sendPacket(SystemMessageId.NO_EQUIPMENT_SLOT_AVAILABLE); } } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 3725aeb656..338f50fb00 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -2330,9 +2330,6 @@ public abstract class Inventory extends ItemContainer return; } } - - // no free slots - put on first - setPaperdollItem(PAPERDOLL_DECO1, item); } public int getArtifactSlots() @@ -2433,9 +2430,6 @@ public abstract class Inventory extends ItemContainer return; } } - - // no free slots - put on first - setPaperdollItem(PAPERDOLL_BROOCH_JEWEL1, item); } public int getAgathionSlots() @@ -2470,9 +2464,6 @@ public abstract class Inventory extends ItemContainer return; } } - - // no free slots - put on first - setPaperdollItem(PAPERDOLL_AGATHION1, item); } public boolean canEquipCloak() diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 949dba2b59..d175d8cfaf 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -225,7 +225,7 @@ public class UseItem implements IClientIncomingPacket { if (!item.isEquipped() && (player.getInventory().getTalismanSlots() == 0)) { - player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); + player.sendPacket(SystemMessageId.NO_EQUIPMENT_SLOT_AVAILABLE); return; } } @@ -243,7 +243,7 @@ public class UseItem implements IClientIncomingPacket { if (!item.isEquipped() && (player.getInventory().getAgathionSlots() == 0)) { - player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); + player.sendPacket(SystemMessageId.NO_EQUIPMENT_SLOT_AVAILABLE); return; } } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index dda6df6a0f..e6a3b74ffb 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -2224,7 +2224,7 @@ public class PlayerInstance extends Playable } else { - sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); + sendPacket(SystemMessageId.NO_EQUIPMENT_SLOT_AVAILABLE); } } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 19bc1c5300..0fa78ca91c 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -2315,9 +2315,6 @@ public abstract class Inventory extends ItemContainer return; } } - - // no free slots - put on first - setPaperdollItem(PAPERDOLL_DECO1, item); } public int getArtifactSlots() @@ -2418,9 +2415,6 @@ public abstract class Inventory extends ItemContainer return; } } - - // no free slots - put on first - setPaperdollItem(PAPERDOLL_BROOCH_JEWEL1, item); } public int getAgathionSlots() @@ -2455,9 +2449,6 @@ public abstract class Inventory extends ItemContainer return; } } - - // no free slots - put on first - setPaperdollItem(PAPERDOLL_AGATHION1, item); } public boolean canEquipCloak() diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 949dba2b59..d175d8cfaf 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -225,7 +225,7 @@ public class UseItem implements IClientIncomingPacket { if (!item.isEquipped() && (player.getInventory().getTalismanSlots() == 0)) { - player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); + player.sendPacket(SystemMessageId.NO_EQUIPMENT_SLOT_AVAILABLE); return; } } @@ -243,7 +243,7 @@ public class UseItem implements IClientIncomingPacket { if (!item.isEquipped() && (player.getInventory().getAgathionSlots() == 0)) { - player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); + player.sendPacket(SystemMessageId.NO_EQUIPMENT_SLOT_AVAILABLE); return; } } diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 825ae2458a..4421b84daf 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -2255,7 +2255,7 @@ public class PlayerInstance extends Playable } else { - sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); + sendPacket(SystemMessageId.NO_EQUIPMENT_SLOT_AVAILABLE); } } 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 528ec5cca2..11cbce62f1 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 @@ -2310,9 +2310,6 @@ public abstract class Inventory extends ItemContainer return; } } - - // no free slots - put on first - setPaperdollItem(PAPERDOLL_DECO1, item); } public int getArtifactSlots() @@ -2413,9 +2410,6 @@ public abstract class Inventory extends ItemContainer return; } } - - // no free slots - put on first - setPaperdollItem(PAPERDOLL_BROOCH_JEWEL1, item); } public int getAgathionSlots() @@ -2450,9 +2444,6 @@ public abstract class Inventory extends ItemContainer return; } } - - // no free slots - put on first - setPaperdollItem(PAPERDOLL_AGATHION1, item); } public boolean canEquipCloak() diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 00dfcf1da1..c2afc19e91 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -227,7 +227,7 @@ public class UseItem implements IClientIncomingPacket { if (!item.isEquipped() && (player.getInventory().getTalismanSlots() == 0)) { - player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); + player.sendPacket(SystemMessageId.NO_EQUIPMENT_SLOT_AVAILABLE); return; } } @@ -245,7 +245,7 @@ public class UseItem implements IClientIncomingPacket { if (!item.isEquipped() && (player.getInventory().getAgathionSlots() == 0)) { - player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); + player.sendPacket(SystemMessageId.NO_EQUIPMENT_SLOT_AVAILABLE); return; } } diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index bf241ef95a..bd163185fd 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -2273,7 +2273,7 @@ public class PlayerInstance extends Playable } else { - sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); + sendPacket(SystemMessageId.NO_EQUIPMENT_SLOT_AVAILABLE); } } 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 528ec5cca2..11cbce62f1 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 @@ -2310,9 +2310,6 @@ public abstract class Inventory extends ItemContainer return; } } - - // no free slots - put on first - setPaperdollItem(PAPERDOLL_DECO1, item); } public int getArtifactSlots() @@ -2413,9 +2410,6 @@ public abstract class Inventory extends ItemContainer return; } } - - // no free slots - put on first - setPaperdollItem(PAPERDOLL_BROOCH_JEWEL1, item); } public int getAgathionSlots() @@ -2450,9 +2444,6 @@ public abstract class Inventory extends ItemContainer return; } } - - // no free slots - put on first - setPaperdollItem(PAPERDOLL_AGATHION1, item); } public boolean canEquipCloak() diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 00dfcf1da1..c2afc19e91 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -227,7 +227,7 @@ public class UseItem implements IClientIncomingPacket { if (!item.isEquipped() && (player.getInventory().getTalismanSlots() == 0)) { - player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); + player.sendPacket(SystemMessageId.NO_EQUIPMENT_SLOT_AVAILABLE); return; } } @@ -245,7 +245,7 @@ public class UseItem implements IClientIncomingPacket { if (!item.isEquipped() && (player.getInventory().getAgathionSlots() == 0)) { - player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); + player.sendPacket(SystemMessageId.NO_EQUIPMENT_SLOT_AVAILABLE); return; } } diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index bf241ef95a..bd163185fd 100644 --- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -2273,7 +2273,7 @@ public class PlayerInstance extends Playable } else { - sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); + sendPacket(SystemMessageId.NO_EQUIPMENT_SLOT_AVAILABLE); } } 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 528ec5cca2..11cbce62f1 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 @@ -2310,9 +2310,6 @@ public abstract class Inventory extends ItemContainer return; } } - - // no free slots - put on first - setPaperdollItem(PAPERDOLL_DECO1, item); } public int getArtifactSlots() @@ -2413,9 +2410,6 @@ public abstract class Inventory extends ItemContainer return; } } - - // no free slots - put on first - setPaperdollItem(PAPERDOLL_BROOCH_JEWEL1, item); } public int getAgathionSlots() @@ -2450,9 +2444,6 @@ public abstract class Inventory extends ItemContainer return; } } - - // no free slots - put on first - setPaperdollItem(PAPERDOLL_AGATHION1, item); } public boolean canEquipCloak() diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 00dfcf1da1..c2afc19e91 100644 --- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -227,7 +227,7 @@ public class UseItem implements IClientIncomingPacket { if (!item.isEquipped() && (player.getInventory().getTalismanSlots() == 0)) { - player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); + player.sendPacket(SystemMessageId.NO_EQUIPMENT_SLOT_AVAILABLE); return; } } @@ -245,7 +245,7 @@ public class UseItem implements IClientIncomingPacket { if (!item.isEquipped() && (player.getInventory().getAgathionSlots() == 0)) { - player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); + player.sendPacket(SystemMessageId.NO_EQUIPMENT_SLOT_AVAILABLE); return; } } 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 7da0966053..44a2f6b29f 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 @@ -2249,7 +2249,7 @@ public class PlayerInstance extends Playable } else { - sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); + sendPacket(SystemMessageId.NO_EQUIPMENT_SLOT_AVAILABLE); } } 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 a7fb30fd9a..22ae2a9113 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 @@ -2249,7 +2249,7 @@ public class PlayerInstance extends Playable } else { - sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); + sendPacket(SystemMessageId.NO_EQUIPMENT_SLOT_AVAILABLE); } } 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 6de55347f4..6b35d79d0a 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 @@ -2247,7 +2247,7 @@ public class PlayerInstance extends Playable } else { - sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); + sendPacket(SystemMessageId.NO_EQUIPMENT_SLOT_AVAILABLE); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index f10b1c7634..2e97af389c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -2217,9 +2217,6 @@ public abstract class Inventory extends ItemContainer return; } } - - // no free slots - put on first - setPaperdollItem(PAPERDOLL_DECO1, item); } public int getBroochJewelSlots() @@ -2254,9 +2251,6 @@ public abstract class Inventory extends ItemContainer return; } } - - // no free slots - put on first - setPaperdollItem(PAPERDOLL_BROOCH_JEWEL1, item); } public int getAgathionSlots() @@ -2291,9 +2285,6 @@ public abstract class Inventory extends ItemContainer return; } } - - // no free slots - put on first - setPaperdollItem(PAPERDOLL_AGATHION1, item); } public boolean canEquipCloak() diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index da6164a46c..bf2810f4d3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -225,7 +225,7 @@ public class UseItem implements IClientIncomingPacket { if (!item.isEquipped() && (player.getInventory().getTalismanSlots() == 0)) { - player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); + player.sendPacket(SystemMessageId.NO_EQUIPMENT_SLOT_AVAILABLE); return; } } @@ -243,7 +243,7 @@ public class UseItem implements IClientIncomingPacket { if (!item.isEquipped() && (player.getInventory().getAgathionSlots() == 0)) { - player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); + player.sendPacket(SystemMessageId.NO_EQUIPMENT_SLOT_AVAILABLE); return; } } 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 1f12488197..6b60458452 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 @@ -2258,7 +2258,7 @@ public class PlayerInstance extends Playable } else { - sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); + sendPacket(SystemMessageId.NO_EQUIPMENT_SLOT_AVAILABLE); } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 29ba4c70fc..e535781eaa 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -2332,9 +2332,6 @@ public abstract class Inventory extends ItemContainer return; } } - - // no free slots - put on first - setPaperdollItem(PAPERDOLL_DECO1, item); } public int getArtifactSlots() @@ -2435,9 +2432,6 @@ public abstract class Inventory extends ItemContainer return; } } - - // no free slots - put on first - setPaperdollItem(PAPERDOLL_BROOCH_JEWEL1, item); } public int getAgathionSlots() @@ -2472,9 +2466,6 @@ public abstract class Inventory extends ItemContainer return; } } - - // no free slots - put on first - setPaperdollItem(PAPERDOLL_AGATHION1, item); } public boolean canEquipCloak() diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 9337052aa2..fe67b2a71b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -225,7 +225,7 @@ public class UseItem implements IClientIncomingPacket { if (!item.isEquipped() && (player.getInventory().getTalismanSlots() == 0)) { - player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); + player.sendPacket(SystemMessageId.NO_EQUIPMENT_SLOT_AVAILABLE); return; } } @@ -243,7 +243,7 @@ public class UseItem implements IClientIncomingPacket { if (!item.isEquipped() && (player.getInventory().getAgathionSlots() == 0)) { - player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); + player.sendPacket(SystemMessageId.NO_EQUIPMENT_SLOT_AVAILABLE); return; } } 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 83995918d5..fa72a8f472 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 @@ -2258,7 +2258,7 @@ public class PlayerInstance extends Playable } else { - sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); + sendPacket(SystemMessageId.NO_EQUIPMENT_SLOT_AVAILABLE); } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 29ba4c70fc..e535781eaa 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -2332,9 +2332,6 @@ public abstract class Inventory extends ItemContainer return; } } - - // no free slots - put on first - setPaperdollItem(PAPERDOLL_DECO1, item); } public int getArtifactSlots() @@ -2435,9 +2432,6 @@ public abstract class Inventory extends ItemContainer return; } } - - // no free slots - put on first - setPaperdollItem(PAPERDOLL_BROOCH_JEWEL1, item); } public int getAgathionSlots() @@ -2472,9 +2466,6 @@ public abstract class Inventory extends ItemContainer return; } } - - // no free slots - put on first - setPaperdollItem(PAPERDOLL_AGATHION1, item); } public boolean canEquipCloak() diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 9337052aa2..fe67b2a71b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -225,7 +225,7 @@ public class UseItem implements IClientIncomingPacket { if (!item.isEquipped() && (player.getInventory().getTalismanSlots() == 0)) { - player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); + player.sendPacket(SystemMessageId.NO_EQUIPMENT_SLOT_AVAILABLE); return; } } @@ -243,7 +243,7 @@ public class UseItem implements IClientIncomingPacket { if (!item.isEquipped() && (player.getInventory().getAgathionSlots() == 0)) { - player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); + player.sendPacket(SystemMessageId.NO_EQUIPMENT_SLOT_AVAILABLE); return; } } 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 f161aac86d..55ceaf6aba 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 @@ -2183,7 +2183,7 @@ public class PlayerInstance extends Playable } else { - sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); + sendPacket(SystemMessageId.NO_EQUIPMENT_SLOT_AVAILABLE); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 0502e5bf64..86506a32e3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -2317,9 +2317,6 @@ public abstract class Inventory extends ItemContainer return; } } - - // no free slots - put on first - setPaperdollItem(PAPERDOLL_DECO1, item); } public int getArtifactSlots() @@ -2420,9 +2417,6 @@ public abstract class Inventory extends ItemContainer return; } } - - // no free slots - put on first - setPaperdollItem(PAPERDOLL_BROOCH_JEWEL1, item); } public int getAgathionSlots() @@ -2457,9 +2451,6 @@ public abstract class Inventory extends ItemContainer return; } } - - // no free slots - put on first - setPaperdollItem(PAPERDOLL_AGATHION1, item); } public boolean canEquipCloak() diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 9337052aa2..fe67b2a71b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -225,7 +225,7 @@ public class UseItem implements IClientIncomingPacket { if (!item.isEquipped() && (player.getInventory().getTalismanSlots() == 0)) { - player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); + player.sendPacket(SystemMessageId.NO_EQUIPMENT_SLOT_AVAILABLE); return; } } @@ -243,7 +243,7 @@ public class UseItem implements IClientIncomingPacket { if (!item.isEquipped() && (player.getInventory().getAgathionSlots() == 0)) { - player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); + player.sendPacket(SystemMessageId.NO_EQUIPMENT_SLOT_AVAILABLE); return; } } 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 2c8f69c8e9..29ef4fa6f5 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 @@ -2246,7 +2246,7 @@ public class PlayerInstance extends Playable } else { - sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); + sendPacket(SystemMessageId.NO_EQUIPMENT_SLOT_AVAILABLE); } } diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index af3d132cd4..cf96cd8309 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -2253,7 +2253,7 @@ public class PlayerInstance extends Playable } else { - sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); + sendPacket(SystemMessageId.NO_EQUIPMENT_SLOT_AVAILABLE); } } 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 c721acf9af..da8232db46 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 @@ -2438,9 +2438,6 @@ public abstract class Inventory extends ItemContainer return; } } - - // no free slots - put on first - setPaperdollItem(PAPERDOLL_DECO1, item); } public int getArtifactSlots() @@ -2541,9 +2538,6 @@ public abstract class Inventory extends ItemContainer return; } } - - // no free slots - put on first - setPaperdollItem(PAPERDOLL_BROOCH_JEWEL1, item); } public int getAgathionSlots() @@ -2578,9 +2572,6 @@ public abstract class Inventory extends ItemContainer return; } } - - // no free slots - put on first - setPaperdollItem(PAPERDOLL_AGATHION1, item); } public boolean canEquipCloak() diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 6c937231aa..8c4bca54b7 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -227,7 +227,7 @@ public class UseItem implements IClientIncomingPacket { if (!item.isEquipped() && (player.getInventory().getTalismanSlots() == 0)) { - player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); + player.sendPacket(SystemMessageId.NO_EQUIPMENT_SLOT_AVAILABLE); return; } } @@ -245,7 +245,7 @@ public class UseItem implements IClientIncomingPacket { if (!item.isEquipped() && (player.getInventory().getAgathionSlots() == 0)) { - player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); + player.sendPacket(SystemMessageId.NO_EQUIPMENT_SLOT_AVAILABLE); return; } } diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 5bc7dd3624..4f05489d00 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -2285,7 +2285,7 @@ public class PlayerInstance extends Playable } else { - sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); + sendPacket(SystemMessageId.NO_EQUIPMENT_SLOT_AVAILABLE); } } 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 13cca69f90..1fbe0609f7 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 @@ -2468,9 +2468,6 @@ public abstract class Inventory extends ItemContainer return; } } - - // no free slots - put on first - setPaperdollItem(PAPERDOLL_DECO1, item); } public int getArtifactSlots() @@ -2571,9 +2568,6 @@ public abstract class Inventory extends ItemContainer return; } } - - // no free slots - put on first - setPaperdollItem(PAPERDOLL_BROOCH_JEWEL1, item); } public int getAgathionSlots() @@ -2608,9 +2602,6 @@ public abstract class Inventory extends ItemContainer return; } } - - // no free slots - put on first - setPaperdollItem(PAPERDOLL_AGATHION1, item); } public boolean canEquipCloak() diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 6c937231aa..8c4bca54b7 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -227,7 +227,7 @@ public class UseItem implements IClientIncomingPacket { if (!item.isEquipped() && (player.getInventory().getTalismanSlots() == 0)) { - player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); + player.sendPacket(SystemMessageId.NO_EQUIPMENT_SLOT_AVAILABLE); return; } } @@ -245,7 +245,7 @@ public class UseItem implements IClientIncomingPacket { if (!item.isEquipped() && (player.getInventory().getAgathionSlots() == 0)) { - player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); + player.sendPacket(SystemMessageId.NO_EQUIPMENT_SLOT_AVAILABLE); return; } } 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 5bc7dd3624..4f05489d00 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 @@ -2285,7 +2285,7 @@ public class PlayerInstance extends Playable } else { - sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); + sendPacket(SystemMessageId.NO_EQUIPMENT_SLOT_AVAILABLE); } } 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 13cca69f90..1fbe0609f7 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 @@ -2468,9 +2468,6 @@ public abstract class Inventory extends ItemContainer return; } } - - // no free slots - put on first - setPaperdollItem(PAPERDOLL_DECO1, item); } public int getArtifactSlots() @@ -2571,9 +2568,6 @@ public abstract class Inventory extends ItemContainer return; } } - - // no free slots - put on first - setPaperdollItem(PAPERDOLL_BROOCH_JEWEL1, item); } public int getAgathionSlots() @@ -2608,9 +2602,6 @@ public abstract class Inventory extends ItemContainer return; } } - - // no free slots - put on first - setPaperdollItem(PAPERDOLL_AGATHION1, item); } public boolean canEquipCloak() diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 6c937231aa..8c4bca54b7 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -227,7 +227,7 @@ public class UseItem implements IClientIncomingPacket { if (!item.isEquipped() && (player.getInventory().getTalismanSlots() == 0)) { - player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); + player.sendPacket(SystemMessageId.NO_EQUIPMENT_SLOT_AVAILABLE); return; } } @@ -245,7 +245,7 @@ public class UseItem implements IClientIncomingPacket { if (!item.isEquipped() && (player.getInventory().getAgathionSlots() == 0)) { - player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); + player.sendPacket(SystemMessageId.NO_EQUIPMENT_SLOT_AVAILABLE); return; } }