Proper RequestDropItem discard SystemMessageId.

Contributed by CostyKiller.
This commit is contained in:
MobiusDevelopment
2022-12-05 07:09:20 +00:00
parent e8efb64cb0
commit df89c6e8df
26 changed files with 104 additions and 104 deletions

View File

@ -76,7 +76,7 @@ public class RequestDropItem implements ClientPacket
final Item item = player.getInventory().getItemByObjectId(_objectId);
if ((item == null) || (_count == 0) || !player.validateItemManipulation(_objectId, "drop") || (!Config.ALLOW_DISCARDITEM && !player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS)) || (!item.isDropable() && !(player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS) && Config.GM_TRADE_RESTRICTED_ITEMS)) || ((item.getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()) || player.isInsideZone(ZoneId.NO_ITEM_DROP))
{
player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED);
player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED);
return;
}
@ -87,13 +87,13 @@ public class RequestDropItem implements ClientPacket
if (_count > item.getCount())
{
player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED);
player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED);
return;
}
if ((Config.PLAYER_SPAWN_PROTECTION > 0) && player.isInvul() && !player.isGM())
{
player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED);
player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED);
return;
}
@ -149,7 +149,7 @@ public class RequestDropItem implements ClientPacket
// Cannot discard item that the skill is consuming.
if (player.isCastingNow(s -> (s.getSkill().getItemConsumeId() == item.getId()) && (item.getTemplate().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS)))
{
player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED);
player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED);
return;
}