From 5e52857f70c87373c41aa0e48803ce9b2aff95eb Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Wed, 21 Dec 2022 22:49:10 +0000 Subject: [PATCH] Pets cannot use shields or sigils. Contributed by petryxa. --- .../network/clientpackets/pet/ExPetEquipItem.java | 8 ++++++++ .../network/clientpackets/pet/ExPetEquipItem.java | 8 ++++++++ .../network/clientpackets/pet/ExPetEquipItem.java | 8 ++++++++ .../network/clientpackets/pet/ExPetEquipItem.java | 8 ++++++++ 4 files changed, 32 insertions(+) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java index 6925a28496..7ea752451c 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java @@ -12,6 +12,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; @@ -170,6 +171,13 @@ public class ExPetEquipItem implements ClientPacket return; } + // Pets cannot use shields or sigils. + if (item.isArmor() && ((item.getArmorItem().getItemType() == ArmorType.SHIELD) || (item.getArmorItem().getItemType() == ArmorType.SIGIL))) + { + player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); + return; + } + // Pets cannot use time-limited items. if (item.isTimeLimitedItem() || item.isShadowItem()) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java index 6925a28496..7ea752451c 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java @@ -12,6 +12,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; @@ -170,6 +171,13 @@ public class ExPetEquipItem implements ClientPacket return; } + // Pets cannot use shields or sigils. + if (item.isArmor() && ((item.getArmorItem().getItemType() == ArmorType.SHIELD) || (item.getArmorItem().getItemType() == ArmorType.SIGIL))) + { + player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); + return; + } + // Pets cannot use time-limited items. if (item.isTimeLimitedItem() || item.isShadowItem()) { diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java index 6925a28496..7ea752451c 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java @@ -12,6 +12,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; @@ -170,6 +171,13 @@ public class ExPetEquipItem implements ClientPacket return; } + // Pets cannot use shields or sigils. + if (item.isArmor() && ((item.getArmorItem().getItemType() == ArmorType.SHIELD) || (item.getArmorItem().getItemType() == ArmorType.SIGIL))) + { + player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); + return; + } + // Pets cannot use time-limited items. if (item.isTimeLimitedItem() || item.isShadowItem()) { diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java index 43c40f1327..b8df06cb13 100644 --- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java +++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java @@ -12,6 +12,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; @@ -170,6 +171,13 @@ public class ExPetEquipItem implements ClientPacket return; } + // Pets cannot use shields or sigils. + if (item.isArmor() && ((item.getArmorItem().getItemType() == ArmorType.SHIELD) || (item.getArmorItem().getItemType() == ArmorType.SIGIL))) + { + player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); + return; + } + // Pets cannot use time-limited items. if (item.isTimeLimitedItem() || item.isShadowItem()) {