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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@ -3575,13 +3575,13 @@ public class Player extends Playable
}
final Item item = _inventory.getItemByItemId(itemId);
if ((item == null) || (item.getCount() < count) || (_inventory.destroyItemByItemId(process, itemId, count, this, reference) == null))
final long 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)
{
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
}
return false;
}
@ -3607,11 +3607,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_S_DISAPPEARED);
sm.addItemName(itemId);
sm.addLong(count);
sm.addLong(quantity);
sendPacket(sm);
}
else

8
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@ -3577,13 +3577,13 @@ public class Player extends Playable
}
final Item item = _inventory.getItemByItemId(itemId);
if ((item == null) || (item.getCount() < count) || (_inventory.destroyItemByItemId(process, itemId, count, this, reference) == null))
final long 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)
{
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
}
return false;
}
@ -3609,11 +3609,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_S_DISAPPEARED);
sm.addItemName(itemId);
sm.addLong(count);
sm.addLong(quantity);
sendPacket(sm);
}
else

8
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@ -3579,13 +3579,13 @@ public class Player extends Playable
}
final Item item = _inventory.getItemByItemId(itemId);
if ((item == null) || (item.getCount() < count) || (_inventory.destroyItemByItemId(process, itemId, count, this, reference) == null))
final long 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)
{
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
}
return false;
}
@ -3611,11 +3611,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_S_DISAPPEARED);
sm.addItemName(itemId);
sm.addLong(count);
sm.addLong(quantity);
sendPacket(sm);
}
else

8
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@ -3575,13 +3575,13 @@ public class Player extends Playable
}
final Item item = _inventory.getItemByItemId(itemId);
if ((item == null) || (item.getCount() < count) || (_inventory.destroyItemByItemId(process, itemId, count, this, reference) == null))
final long 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)
{
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
}
return false;
}
@ -3607,11 +3607,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_S_DISAPPEARED);
sm.addItemName(itemId);
sm.addLong(count);
sm.addLong(quantity);
sendPacket(sm);
}
else

8
L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@ -3604,13 +3604,13 @@ public class Player extends Playable
}
final Item item = _inventory.getItemByItemId(itemId);
if ((item == null) || (item.getCount() < count) || (_inventory.destroyItemByItemId(process, itemId, count, this, reference) == null))
final long 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)
{
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
}
return false;
}
@ -3636,11 +3636,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_S_DISAPPEARED);
sm.addItemName(itemId);
sm.addLong(count);
sm.addLong(quantity);
sendPacket(sm);
}
else

8
L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@ -3604,13 +3604,13 @@ public class Player extends Playable
}
final Item item = _inventory.getItemByItemId(itemId);
if ((item == null) || (item.getCount() < count) || (_inventory.destroyItemByItemId(process, itemId, count, this, reference) == null))
final long 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)
{
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
}
return false;
}
@ -3636,11 +3636,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_S_DISAPPEARED);
sm.addItemName(itemId);
sm.addLong(count);
sm.addLong(quantity);
sendPacket(sm);
}
else

8
L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@ -3605,13 +3605,13 @@ public class Player extends Playable
}
final Item item = _inventory.getItemByItemId(itemId);
if ((item == null) || (item.getCount() < count) || (_inventory.destroyItemByItemId(process, itemId, count, this, reference) == null))
final long 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)
{
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
}
return false;
}
@ -3637,11 +3637,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_S_DISAPPEARED);
sm.addItemName(itemId);
sm.addLong(count);
sm.addLong(quantity);
sendPacket(sm);
}
else

8
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@ -3542,13 +3542,13 @@ public class Player extends Playable
}
final Item item = _inventory.getItemByItemId(itemId);
if ((item == null) || (item.getCount() < count) || (_inventory.destroyItemByItemId(process, itemId, count, this, reference) == null))
final long 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)
{
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
}
return false;
}
@ -3574,11 +3574,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_S_DISAPPEARED);
sm.addItemName(itemId);
sm.addLong(count);
sm.addLong(quantity);
sendPacket(sm);
}
else

8
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@ -3573,13 +3573,13 @@ public class Player extends Playable
}
final Item item = _inventory.getItemByItemId(itemId);
if ((item == null) || (item.getCount() < count) || (_inventory.destroyItemByItemId(process, itemId, count, this, reference) == null))
final long 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)
{
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
}
return false;
}
@ -3605,11 +3605,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_S_DISAPPEARED);
sm.addItemName(itemId);
sm.addLong(count);
sm.addLong(quantity);
sendPacket(sm);
}
else

8
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@ -3590,13 +3590,13 @@ public class Player extends Playable
}
final Item item = _inventory.getItemByItemId(itemId);
if ((item == null) || (item.getCount() < count) || (_inventory.destroyItemByItemId(process, itemId, count, this, reference) == null))
final long 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)
{
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
}
return false;
}
@ -3622,11 +3622,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_S_DISAPPEARED);
sm.addItemName(itemId);
sm.addLong(count);
sm.addLong(quantity);
sendPacket(sm);
}
else

8
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@ -3598,13 +3598,13 @@ public class Player extends Playable
}
final Item item = _inventory.getItemByItemId(itemId);
if ((item == null) || (item.getCount() < count) || (_inventory.destroyItemByItemId(process, itemId, count, this, reference) == null))
final long 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)
{
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
}
return false;
}
@ -3630,11 +3630,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.S1_X_S2_DISAPPEARED);
sm.addItemName(itemId);
sm.addLong(count);
sm.addLong(quantity);
sendPacket(sm);
}
else

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

@ -3742,7 +3742,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)
{
@ -3771,11 +3772,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

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

6
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@ -3583,13 +3583,13 @@ public class Player extends Playable
}
final Item item = _inventory.getItemByItemId(itemId);
if ((item == null) || (item.getCount() < count) || (_inventory.destroyItemByItemId(process, itemId, count, this, reference) == null))
final long 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)
{
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
}
return false;
}
@ -3614,7 +3614,7 @@ public class Player extends Playable
if (sendMessage)
{
final SystemMessage sm;
if (count > 1)
if (quantity > 1)
{
sm = new SystemMessage(SystemMessageId.S2_S1_HAS_DISAPPEARED);
sm.addItemName(itemId);

6
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@ -3494,13 +3494,13 @@ public class Player extends Playable
}
final Item item = _inventory.getItemByItemId(itemId);
if ((item == null) || (item.getCount() < count) || (_inventory.destroyItemByItemId(process, itemId, count, this, reference) == null))
final long 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)
{
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
}
return false;
}
@ -3525,7 +3525,7 @@ public class Player extends Playable
if (sendMessage)
{
final SystemMessage sm;
if (count > 1)
if (quantity > 1)
{
sm = new SystemMessage(SystemMessageId.S2_S1_HAS_DISAPPEARED);
sm.addItemName(itemId);

8
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@ -3552,13 +3552,13 @@ public class Player extends Playable
}
final Item item = _inventory.getItemByItemId(itemId);
if ((item == null) || (item.getCount() < count) || (_inventory.destroyItemByItemId(process, itemId, count, this, reference) == null))
final long 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)
{
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
}
return false;
}
@ -3584,11 +3584,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_S_DISAPPEARED);
sm.addItemName(itemId);
sm.addLong(count);
sm.addLong(quantity);
sendPacket(sm);
}
else

8
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@ -3552,13 +3552,13 @@ public class Player extends Playable
}
final Item item = _inventory.getItemByItemId(itemId);
if ((item == null) || (item.getCount() < count) || (_inventory.destroyItemByItemId(process, itemId, count, this, reference) == null))
final long 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)
{
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
}
return false;
}
@ -3584,11 +3584,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_S_DISAPPEARED);
sm.addItemName(itemId);
sm.addLong(count);
sm.addLong(quantity);
sendPacket(sm);
}
else

8
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@ -3550,13 +3550,13 @@ public class Player extends Playable
}
final Item item = _inventory.getItemByItemId(itemId);
if ((item == null) || (item.getCount() < count) || (_inventory.destroyItemByItemId(process, itemId, count, this, reference) == null))
final long 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)
{
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
}
return false;
}
@ -3582,11 +3582,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_S_DISAPPEARED);
sm.addItemName(itemId);
sm.addLong(count);
sm.addLong(quantity);
sendPacket(sm);
}
else

8
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@ -3564,13 +3564,13 @@ public class Player extends Playable
}
final Item item = _inventory.getItemByItemId(itemId);
if ((item == null) || (item.getCount() < count) || (_inventory.destroyItemByItemId(process, itemId, count, this, reference) == null))
final long 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)
{
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
}
return false;
}
@ -3596,11 +3596,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_S_DISAPPEARED);
sm.addItemName(itemId);
sm.addLong(count);
sm.addLong(quantity);
sendPacket(sm);
}
else

8
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@ -3564,13 +3564,13 @@ public class Player extends Playable
}
final Item item = _inventory.getItemByItemId(itemId);
if ((item == null) || (item.getCount() < count) || (_inventory.destroyItemByItemId(process, itemId, count, this, reference) == null))
final long 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)
{
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
}
return false;
}
@ -3596,11 +3596,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_S_DISAPPEARED);
sm.addItemName(itemId);
sm.addLong(count);
sm.addLong(quantity);
sendPacket(sm);
}
else

8
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@ -3491,13 +3491,13 @@ public class Player extends Playable
}
final Item item = _inventory.getItemByItemId(itemId);
if ((item == null) || (item.getCount() < count) || (_inventory.destroyItemByItemId(process, itemId, count, this, reference) == null))
final long 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)
{
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
}
return false;
}
@ -3523,11 +3523,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_S_DISAPPEARED);
sm.addItemName(itemId);
sm.addLong(count);
sm.addLong(quantity);
sendPacket(sm);
}
else

8
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@ -3533,13 +3533,13 @@ public class Player extends Playable
}
final Item item = _inventory.getItemByItemId(itemId);
if ((item == null) || (item.getCount() < count) || (_inventory.destroyItemByItemId(process, itemId, count, this, reference) == null))
final long 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)
{
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
}
return false;
}
@ -3565,11 +3565,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_S_DISAPPEARED);
sm.addItemName(itemId);
sm.addLong(count);
sm.addLong(quantity);
sendPacket(sm);
}
else

8
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@ -3559,13 +3559,13 @@ public class Player extends Playable
}
final Item item = _inventory.getItemByItemId(itemId);
if ((item == null) || (item.getCount() < count) || (_inventory.destroyItemByItemId(process, itemId, count, this, reference) == null))
final long 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)
{
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
}
return false;
}
@ -3591,11 +3591,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_S_DISAPPEARED);
sm.addItemName(itemId);
sm.addLong(count);
sm.addLong(quantity);
sendPacket(sm);
}
else

8
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@ -3600,13 +3600,13 @@ public class Player extends Playable
}
final Item item = _inventory.getItemByItemId(itemId);
if ((item == null) || (item.getCount() < count) || (_inventory.destroyItemByItemId(process, itemId, count, this, reference) == null))
final long 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)
{
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
}
return false;
}
@ -3632,11 +3632,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_S_DISAPPEARED);
sm.addItemName(itemId);
sm.addLong(count);
sm.addLong(quantity);
sendPacket(sm);
}
else

8
L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@ -3600,13 +3600,13 @@ public class Player extends Playable
}
final Item item = _inventory.getItemByItemId(itemId);
if ((item == null) || (item.getCount() < count) || (_inventory.destroyItemByItemId(process, itemId, count, this, reference) == null))
final long 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)
{
sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT_2);
}
return false;
}
@ -3632,11 +3632,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.S1_X_S2_DISAPPEARED);
sm.addItemName(itemId);
sm.addLong(count);
sm.addLong(quantity);
sendPacket(sm);
}
else