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

Removed stackable checks from compound clientpackets.

Browse Source 
Contributed by nasseka.
This commit is contained in:
MobiusDevelopment 2021-07-23 22:47:11 +00:00
parent 55ad1bd328
commit c16d5940a6
12 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
View File

@ -82,7 +82,7 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
} }
// Lets prevent using same item twice. Also stackable item check. // Lets prevent using same item twice. Also stackable item check.
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2))) if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2))
{ {
client.sendPacket(ExEnchantTwoFail.STATIC_PACKET); client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return; return;

4
L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
View File

@ -84,7 +84,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
} }
// Lets prevent using same item twice. Also stackable item check. // Lets prevent using same item twice. Also stackable item check.
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2))) if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2))
{ {
client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId())); client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass()); player.removeRequest(request.getClass());
@ -103,7 +103,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
final InventoryUpdate iu = new InventoryUpdate(); final InventoryUpdate iu = new InventoryUpdate();
iu.addRemovedItem(itemOne); iu.addRemovedItem(itemOne);
iu.addRemovedItem(itemTwo); // iu.addRemovedItem(itemTwo);
if (player.destroyItem("Compound-Item-One", itemOne, 1, null, true) && player.destroyItem("Compound-Item-Two", itemTwo, 1, null, true)) if (player.destroyItem("Compound-Item-One", itemOne, 1, null, true) && player.destroyItem("Compound-Item-Two", itemTwo, 1, null, true))
{ {

2
L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
View File

@ -82,7 +82,7 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
} }
// Lets prevent using same item twice. Also stackable item check. // Lets prevent using same item twice. Also stackable item check.
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2))) if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2))
{ {
client.sendPacket(ExEnchantTwoFail.STATIC_PACKET); client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return; return;

4
L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
View File

@ -84,7 +84,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
} }
// Lets prevent using same item twice. Also stackable item check. // Lets prevent using same item twice. Also stackable item check.
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2))) if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2))
{ {
client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId())); client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass()); player.removeRequest(request.getClass());
@ -103,7 +103,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
final InventoryUpdate iu = new InventoryUpdate(); final InventoryUpdate iu = new InventoryUpdate();
iu.addRemovedItem(itemOne); iu.addRemovedItem(itemOne);
iu.addRemovedItem(itemTwo); // iu.addRemovedItem(itemTwo);
if (player.destroyItem("Compound-Item-One", itemOne, 1, null, true) && player.destroyItem("Compound-Item-Two", itemTwo, 1, null, true)) if (player.destroyItem("Compound-Item-One", itemOne, 1, null, true) && player.destroyItem("Compound-Item-Two", itemTwo, 1, null, true))
{ {

2
L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
View File

@ -82,7 +82,7 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
} }
// Lets prevent using same item twice. Also stackable item check. // Lets prevent using same item twice. Also stackable item check.
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2))) if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2))
{ {
client.sendPacket(ExEnchantTwoFail.STATIC_PACKET); client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return; return;

4
L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
View File

@ -84,7 +84,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
} }
// Lets prevent using same item twice. Also stackable item check. // Lets prevent using same item twice. Also stackable item check.
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2))) if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2))
{ {
client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId())); client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass()); player.removeRequest(request.getClass());
@ -103,7 +103,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
final InventoryUpdate iu = new InventoryUpdate(); final InventoryUpdate iu = new InventoryUpdate();
iu.addRemovedItem(itemOne); iu.addRemovedItem(itemOne);
iu.addRemovedItem(itemTwo); // iu.addRemovedItem(itemTwo);
if (player.destroyItem("Compound-Item-One", itemOne, 1, null, true) && player.destroyItem("Compound-Item-Two", itemTwo, 1, null, true)) if (player.destroyItem("Compound-Item-One", itemOne, 1, null, true) && player.destroyItem("Compound-Item-Two", itemTwo, 1, null, true))
{ {

2
L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
View File

@ -82,7 +82,7 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
} }
// Lets prevent using same item twice. Also stackable item check. // Lets prevent using same item twice. Also stackable item check.
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2))) if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2))
{ {
client.sendPacket(ExEnchantTwoFail.STATIC_PACKET); client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return; return;

4
L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
View File

@ -84,7 +84,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
} }
// Lets prevent using same item twice. Also stackable item check. // Lets prevent using same item twice. Also stackable item check.
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2))) if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2))
{ {
client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId())); client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass()); player.removeRequest(request.getClass());
@ -103,7 +103,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
final InventoryUpdate iu = new InventoryUpdate(); final InventoryUpdate iu = new InventoryUpdate();
iu.addRemovedItem(itemOne); iu.addRemovedItem(itemOne);
iu.addRemovedItem(itemTwo); // iu.addRemovedItem(itemTwo);
if (player.destroyItem("Compound-Item-One", itemOne, 1, null, true) && player.destroyItem("Compound-Item-Two", itemTwo, 1, null, true)) if (player.destroyItem("Compound-Item-One", itemOne, 1, null, true) && player.destroyItem("Compound-Item-Two", itemTwo, 1, null, true))
{ {

2
L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
View File

@ -82,7 +82,7 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
} }
// Lets prevent using same item twice. Also stackable item check. // Lets prevent using same item twice. Also stackable item check.
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2))) if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2))
{ {
client.sendPacket(ExEnchantTwoFail.STATIC_PACKET); client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return; return;

4
L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
View File

@ -84,7 +84,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
} }
// Lets prevent using same item twice. Also stackable item check. // Lets prevent using same item twice. Also stackable item check.
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2))) if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2))
{ {
client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId())); client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass()); player.removeRequest(request.getClass());
@ -103,7 +103,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
final InventoryUpdate iu = new InventoryUpdate(); final InventoryUpdate iu = new InventoryUpdate();
iu.addRemovedItem(itemOne); iu.addRemovedItem(itemOne);
iu.addRemovedItem(itemTwo); // iu.addRemovedItem(itemTwo);
if (player.destroyItem("Compound-Item-One", itemOne, 1, null, true) && player.destroyItem("Compound-Item-Two", itemTwo, 1, null, true)) if (player.destroyItem("Compound-Item-One", itemOne, 1, null, true) && player.destroyItem("Compound-Item-Two", itemTwo, 1, null, true))
{ {

2
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
View File

@ -82,7 +82,7 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
} }
// Lets prevent using same item twice. Also stackable item check. // Lets prevent using same item twice. Also stackable item check.
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2))) if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2))
{ {
client.sendPacket(ExEnchantTwoFail.STATIC_PACKET); client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return; return;

4
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
View File

@ -84,7 +84,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
} }
// Lets prevent using same item twice. Also stackable item check. // Lets prevent using same item twice. Also stackable item check.
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2))) if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2))
{ {
client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId())); client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass()); player.removeRequest(request.getClass());
@ -103,7 +103,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
final InventoryUpdate iu = new InventoryUpdate(); final InventoryUpdate iu = new InventoryUpdate();
iu.addRemovedItem(itemOne); iu.addRemovedItem(itemOne);
iu.addRemovedItem(itemTwo); // iu.addRemovedItem(itemTwo);
if (player.destroyItem("Compound-Item-One", itemOne, 1, null, true) && player.destroyItem("Compound-Item-Two", itemTwo, 1, null, true)) if (player.destroyItem("Compound-Item-One", itemOne, 1, null, true) && player.destroyItem("Compound-Item-Two", itemTwo, 1, null, true))
{ {