|
@@ -74,8 +74,12 @@ public final class RequestDestroyItem extends L2GameClientPacket
|
|
|
}
|
|
|
|
|
|
L2ItemInstance itemToRemove = activeChar.getInventory().getItemByObjectId(_objectId);
|
|
|
- // if we can't find requested item, its actually a cheat!
|
|
|
- if (itemToRemove == null) return;
|
|
|
+ // if we can't find the requested item, its actually a cheat
|
|
|
+ if (itemToRemove == null)
|
|
|
+ {
|
|
|
+ activeChar.sendPacket(new SystemMessage(SystemMessageId.CANNOT_DISCARD_THIS_ITEM));
|
|
|
+ return;
|
|
|
+ }
|
|
|
|
|
|
// Cannot discard item that the skill is consuming
|
|
|
if (activeChar.isCastingNow())
|
|
@@ -86,7 +90,6 @@ public final class RequestDestroyItem extends L2GameClientPacket
|
|
|
return;
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
// Cannot discard item that the skill is consuming
|
|
|
if (activeChar.isCastingSimultaneouslyNow())
|
|
|
{
|
|
@@ -98,9 +101,14 @@ public final class RequestDestroyItem extends L2GameClientPacket
|
|
|
}
|
|
|
|
|
|
int itemId = itemToRemove.getItemId();
|
|
|
- if (itemToRemove == null || itemToRemove.isWear() || (!activeChar.isGM() && !itemToRemove.isDestroyable()) || CursedWeaponsManager.getInstance().isCursed(itemId))
|
|
|
+
|
|
|
+ if (itemToRemove.isWear() || (!activeChar.isGM() && !itemToRemove.isDestroyable())
|
|
|
+ || CursedWeaponsManager.getInstance().isCursed(itemId))
|
|
|
{
|
|
|
- activeChar.sendPacket(new SystemMessage(SystemMessageId.CANNOT_DISCARD_THIS_ITEM));
|
|
|
+ if (itemToRemove.isHeroItem())
|
|
|
+ activeChar.sendPacket(new SystemMessage(SystemMessageId.HERO_WEAPONS_CANT_DESTROYED));
|
|
|
+ else
|
|
|
+ activeChar.sendPacket(new SystemMessage(SystemMessageId.CANNOT_DISCARD_THIS_ITEM));
|
|
|
return;
|
|
|
}
|
|
|
|