diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Player.java index 72fa721374..299b6afc9c 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -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 diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Player.java index ffad4c19c1..2b1554080d 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -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 diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Player.java index 2a35f36465..d83be70a63 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -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 diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Player.java index 9cd8f54d01..6d41299f7c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -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 diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Player.java index 0087a91dbd..d06ce82e5d 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -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 diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Player.java index 8fdac98b0f..8034ba587b 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -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 diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Player.java index 976d040639..8dc9cf5aeb 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -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 diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java index 795ffd9eb4..965e3b0fb4 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -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 diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java index a447ba7596..610ebd74d3 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -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 diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java index 21e7d94552..d7dba54109 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -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 diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java index 160e30a455..1f42e79092 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -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 diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Player.java index 0a172d01d5..c45d944575 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -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 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java index 81a5949579..afbe88b3b8 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -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 diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Player.java index 62a5450855..29f22e1579 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -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); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Player.java index bfef69c9ce..ca4be2bd2e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -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); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java index 344f69ec66..7bafba504d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -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 diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Player.java index e7b8bf8fac..9956a3e02c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -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 diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Player.java index 84f856025a..341b3ed89f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -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 diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Player.java index 3eaed20507..2c59847990 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -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 diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Player.java index f00e6b7589..91d308b2d0 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -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 diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Player.java index 5f5aa01137..7bc611cb8e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -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 diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java index d6b34fa92d..88323c7967 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -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 diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java index 2bceafcd45..c4fa80e4ac 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -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 diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java index b9d9bc40e2..507b0bb436 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -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 diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Player.java index 7d322729eb..ca6ae73932 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -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