From 7926fde131cc36218136187a756ed5119efe9150 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Wed, 5 Jan 2022 01:15:34 +0000 Subject: [PATCH] Fixed Death Knight shield inconsistencies between Goddess and Essence. --- .../network/serverpackets/CharInfo.java | 17 ----------------- .../network/clientpackets/UseItem.java | 11 +++++++++++ .../network/serverpackets/CharInfo.java | 17 ----------------- .../network/clientpackets/UseItem.java | 10 ++++++++++ .../network/serverpackets/CharInfo.java | 17 ----------------- .../network/clientpackets/UseItem.java | 10 ++++++++++ .../network/serverpackets/CharInfo.java | 17 ----------------- 7 files changed, 31 insertions(+), 68 deletions(-) diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index b0d9eaf9a0..09760649cf 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -20,8 +20,6 @@ import java.util.Set; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.data.xml.CategoryData; -import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager; import org.l2jmobius.gameserver.instancemanager.RankManager; @@ -134,16 +132,8 @@ public class CharInfo implements IClientOutgoingPacket packet.writeC(_player.getAppearance().isFemale() ? 1 : 0); // Confirmed packet.writeD(_player.isDeathKnight() && _player.isSubClassActive() ? 0 : _player.getBaseTemplate().getClassId().getRootClassId().getId()); - final boolean isDeathKnightClass = CategoryData.getInstance().isInCategory(CategoryType.DEATH_KNIGHT_ALL_CLASS, _player.getClassId().getId()); for (int slot : getPaperdollOrder()) { - // Left hand items do not show on Death Knight characters. - if ((slot == Inventory.PAPERDOLL_LHAND) && isDeathKnightClass) - { - packet.writeD(0); - continue; - } - packet.writeD(_player.getInventory().getPaperdollItemDisplayId(slot)); // Confirmed } @@ -158,13 +148,6 @@ public class CharInfo implements IClientOutgoingPacket for (int slot : getPaperdollOrderVisualId()) { - // Left hand items do not show on Death Knight characters. - if ((slot == Inventory.PAPERDOLL_LHAND) && isDeathKnightClass) - { - packet.writeD(0); - continue; - } - packet.writeD(_player.getInventory().getPaperdollItemVisualId(slot)); } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 96f0d966ac..a4c6f92f3e 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -26,7 +26,9 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.ai.NextAction; +import org.l2jmobius.gameserver.data.xml.CategoryData; import org.l2jmobius.gameserver.data.xml.VariationData; +import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.ItemSkillType; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.handler.AdminCommandHandler; @@ -42,6 +44,7 @@ import org.l2jmobius.gameserver.model.item.EtcItem; import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.type.ActionType; +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.PacketLogger; @@ -205,6 +208,14 @@ public class UseItem implements IClientIncomingPacket player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); return; } + + // Prevent equip shields for Death Knight players. + if (item.isArmor() && (item.getArmorItem().getItemType() == ArmorType.SHIELD) && CategoryData.getInstance().isInCategory(CategoryType.DEATH_KNIGHT_ALL_CLASS, player.getClassId().getId())) + { + player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); + return; + } + // Prevent players to equip weapon while wearing combat flag // Don't allow weapon/shield equipment if a cursed weapon is equipped. if ((item.getItem().getBodyPart() == ItemTemplate.SLOT_LR_HAND) || (item.getItem().getBodyPart() == ItemTemplate.SLOT_L_HAND) || (item.getItem().getBodyPart() == ItemTemplate.SLOT_R_HAND)) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index 2c57810a11..f635495c17 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -20,8 +20,6 @@ import java.util.Set; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.data.xml.CategoryData; -import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager; import org.l2jmobius.gameserver.instancemanager.RankManager; @@ -134,16 +132,8 @@ public class CharInfo implements IClientOutgoingPacket packet.writeC(_player.getAppearance().isFemale() ? 1 : 0); // Confirmed packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); - final boolean isDeathKnightClass = CategoryData.getInstance().isInCategory(CategoryType.DEATH_KNIGHT_ALL_CLASS, _player.getClassId().getId()); for (int slot : getPaperdollOrder()) { - // Left hand items do not show on Death Knight characters. - if ((slot == Inventory.PAPERDOLL_LHAND) && isDeathKnightClass) - { - packet.writeD(0); - continue; - } - packet.writeD(_player.getInventory().getPaperdollItemDisplayId(slot)); // Confirmed } @@ -158,13 +148,6 @@ public class CharInfo implements IClientOutgoingPacket for (int slot : getPaperdollOrderVisualId()) { - // Left hand items do not show on Death Knight characters. - if ((slot == Inventory.PAPERDOLL_LHAND) && isDeathKnightClass) - { - packet.writeD(0); - continue; - } - packet.writeD(_player.getInventory().getPaperdollItemVisualId(slot)); } 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 4b9b76d898..99dc9a7d88 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 @@ -26,7 +26,9 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.ai.NextAction; +import org.l2jmobius.gameserver.data.xml.CategoryData; import org.l2jmobius.gameserver.data.xml.VariationData; +import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.ItemSkillType; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.enums.Race; @@ -43,6 +45,7 @@ import org.l2jmobius.gameserver.model.item.EtcItem; import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; @@ -208,6 +211,13 @@ public class UseItem implements IClientIncomingPacket return; } + // Prevent equip shields for Death Knight players. + if (item.isArmor() && (item.getArmorItem().getItemType() == ArmorType.SHIELD) && CategoryData.getInstance().isInCategory(CategoryType.DEATH_KNIGHT_ALL_CLASS, player.getClassId().getId())) + { + player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); + return; + } + // Prevent equip pistols for non Sylph players. if (item.isWeapon() && (item.getWeaponItem().getItemType() == WeaponType.PISTOLS) && (player.getRace() != Race.SYLPH)) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index 2c57810a11..f635495c17 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -20,8 +20,6 @@ import java.util.Set; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.data.xml.CategoryData; -import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager; import org.l2jmobius.gameserver.instancemanager.RankManager; @@ -134,16 +132,8 @@ public class CharInfo implements IClientOutgoingPacket packet.writeC(_player.getAppearance().isFemale() ? 1 : 0); // Confirmed packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); - final boolean isDeathKnightClass = CategoryData.getInstance().isInCategory(CategoryType.DEATH_KNIGHT_ALL_CLASS, _player.getClassId().getId()); for (int slot : getPaperdollOrder()) { - // Left hand items do not show on Death Knight characters. - if ((slot == Inventory.PAPERDOLL_LHAND) && isDeathKnightClass) - { - packet.writeD(0); - continue; - } - packet.writeD(_player.getInventory().getPaperdollItemDisplayId(slot)); // Confirmed } @@ -158,13 +148,6 @@ public class CharInfo implements IClientOutgoingPacket for (int slot : getPaperdollOrderVisualId()) { - // Left hand items do not show on Death Knight characters. - if ((slot == Inventory.PAPERDOLL_LHAND) && isDeathKnightClass) - { - packet.writeD(0); - continue; - } - packet.writeD(_player.getInventory().getPaperdollItemVisualId(slot)); } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 4b9b76d898..99dc9a7d88 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -26,7 +26,9 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.ai.NextAction; +import org.l2jmobius.gameserver.data.xml.CategoryData; import org.l2jmobius.gameserver.data.xml.VariationData; +import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.ItemSkillType; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.enums.Race; @@ -43,6 +45,7 @@ import org.l2jmobius.gameserver.model.item.EtcItem; import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; @@ -208,6 +211,13 @@ public class UseItem implements IClientIncomingPacket return; } + // Prevent equip shields for Death Knight players. + if (item.isArmor() && (item.getArmorItem().getItemType() == ArmorType.SHIELD) && CategoryData.getInstance().isInCategory(CategoryType.DEATH_KNIGHT_ALL_CLASS, player.getClassId().getId())) + { + player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); + return; + } + // Prevent equip pistols for non Sylph players. if (item.isWeapon() && (item.getWeaponItem().getItemType() == WeaponType.PISTOLS) && (player.getRace() != Race.SYLPH)) { diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index 72dc961926..dbab053663 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -20,8 +20,6 @@ import java.util.Set; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.data.xml.CategoryData; -import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager; import org.l2jmobius.gameserver.instancemanager.RankManager; @@ -134,16 +132,8 @@ public class CharInfo implements IClientOutgoingPacket packet.writeC(_player.getAppearance().isFemale() ? 1 : 0); // Confirmed packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); - final boolean isDeathKnightClass = CategoryData.getInstance().isInCategory(CategoryType.DEATH_KNIGHT_ALL_CLASS, _player.getClassId().getId()); for (int slot : getPaperdollOrder()) { - // Left hand items do not show on Death Knight characters. - if ((slot == Inventory.PAPERDOLL_LHAND) && isDeathKnightClass) - { - packet.writeD(0); - continue; - } - packet.writeD(_player.getInventory().getPaperdollItemDisplayId(slot)); // Confirmed } @@ -158,13 +148,6 @@ public class CharInfo implements IClientOutgoingPacket for (int slot : getPaperdollOrderVisualId()) { - // Left hand items do not show on Death Knight characters. - if ((slot == Inventory.PAPERDOLL_LHAND) && isDeathKnightClass) - { - packet.writeD(0); - continue; - } - packet.writeD(_player.getInventory().getPaperdollItemVisualId(slot)); }