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

Additional check for Player destroyItemByItemId method.

Browse Source 
Thanks to Enryu.
This commit is contained in:
MobiusDevelopment
2022-02-09 11:23:30 +00:00
parent 413c709bca
commit 384abd5695
25 changed files with 98 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@ -3818,7 +3818,8 @@ public class Player extends Playable
public boolean destroyItemByItemId(String process, int itemId, int count, WorldObject reference, boolean sendMessage)
{
final Item item = _inventory.getItemByItemId(itemId);
if ((item == null) || (item.getCount() < count) || (_inventory.destroyItemByItemId(process, itemId, count, this, reference) == null))
final int quantity = (count < 0) && (item != null) ? item.getCount() : count;
if ((item == null) || (item.getCount() < quantity) || (quantity <= 0) || (_inventory.destroyItemByItemId(process, itemId, quantity, this, reference) == null))
{
if (sendMessage)
{
@ -3847,11 +3848,11 @@ public class Player extends Playable
// Sends message to client if requested
if (sendMessage)
{
if (count > 1)
if (quantity > 1)
{
final SystemMessage sm = new SystemMessage(SystemMessageId.S2_S1_HAS_DISAPPEARED);
sm.addItemName(item.getItemId());
sm.addNumber(count);
sm.addNumber(quantity);
sendPacket(sm);
}
else