lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor cannot equip item message correction.

Browse Source
This commit is contained in:
MobiusDev 2019-02-07 07:40:29 +00:00
parent b0fae6743e
commit ed20b40a22
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java
View File

@ -65,7 +65,6 @@ public final class UseItem extends L2GameClientPacket
} }
final L2ItemInstance item = activeChar.getInventory().getItemByObjectId(_objectId); final L2ItemInstance item = activeChar.getInventory().getItemByObjectId(_objectId);
if (item == null) if (item == null)
{ {
return; return;
@ -200,35 +199,35 @@ public final class UseItem extends L2GameClientPacket
// A shield that can only be used by the members of a clan that owns a castle. // A shield that can only be used by the members of a clan that owns a castle.
if (((cl == null) || (cl.getHasCastle() == 0)) && (itemId == 7015) && Config.CASTLE_SHIELD && !activeChar.isGM()) if (((cl == null) || (cl.getHasCastle() == 0)) && (itemId == 7015) && Config.CASTLE_SHIELD && !activeChar.isGM())
{ {
activeChar.sendMessage("You can't equip that"); activeChar.sendMessage("You can't equip that.");
return; return;
} }
// A shield that can only be used by the members of a clan that owns a clan hall. // A shield that can only be used by the members of a clan that owns a clan hall.
if (((cl == null) || (cl.getHasHideout() == 0)) && (itemId == 6902) && Config.CLANHALL_SHIELD && !activeChar.isGM()) if (((cl == null) || (cl.getHasHideout() == 0)) && (itemId == 6902) && Config.CLANHALL_SHIELD && !activeChar.isGM())
{ {
activeChar.sendMessage("You can't equip that"); activeChar.sendMessage("You can't equip that.");
return; return;
} }
// Apella armor used by clan members may be worn by a Baron or a higher level Aristocrat. // Apella armor used by clan members may be worn by a Baron or a higher level Aristocrat.
if ((itemId >= 7860) && (itemId <= 7879) && Config.APELLA_ARMORS && ((cl == null) || (activeChar.getPledgeClass() < 5)) && !activeChar.isGM()) if ((itemId >= 7860) && (itemId <= 7879) && Config.APELLA_ARMORS && ((cl == null) || (activeChar.getPledgeClass() < 5)) && !activeChar.isGM())
{ {
activeChar.sendMessage("You can't equip that"); activeChar.sendMessage("You can't equip that.");
return; return;
} }
// Clan Oath armor used by all clan members // Clan Oath armor used by all clan members
if ((itemId >= 7850) && (itemId <= 7859) && Config.OATH_ARMORS && (cl == null) && !activeChar.isGM()) if ((itemId >= 7850) && (itemId <= 7859) && Config.OATH_ARMORS && (cl == null) && !activeChar.isGM())
{ {
activeChar.sendMessage("You can't equip that"); activeChar.sendMessage("You can't equip that.");
return; return;
} }
// The Lord's Crown used by castle lords only // The Lord's Crown used by castle lords only
if ((itemId == 6841) && Config.CASTLE_CROWN && ((cl == null) || (cl.getHasCastle() == 0) || !activeChar.isClanLeader()) && !activeChar.isGM()) if ((itemId == 6841) && Config.CASTLE_CROWN && ((cl == null) || (cl.getHasCastle() == 0) || !activeChar.isClanLeader()) && !activeChar.isGM())
{ {
activeChar.sendMessage("You can't equip that"); activeChar.sendMessage("You can't equip that.");
return; return;
} }
@ -243,14 +242,14 @@ public final class UseItem extends L2GameClientPacket
{ {
if (cl == null) if (cl == null)
{ {
activeChar.sendMessage("You can't equip that"); activeChar.sendMessage("You can't equip that.");
return; return;
} }
final int circletId = CastleManager.getInstance().getCircletByCastleId(cl.getHasCastle()); final int circletId = CastleManager.getInstance().getCircletByCastleId(cl.getHasCastle());
if ((activeChar.getPledgeType() == -1) || (circletId != itemId)) if ((activeChar.getPledgeType() == -1) || (circletId != itemId))
{ {
activeChar.sendMessage("You can't equip that"); activeChar.sendMessage("You can't equip that.");
return; return;
} }
} }