diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java index 4fc84e51ee..951e1c2ac5 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java @@ -82,7 +82,7 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket } // 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); return; diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java index cd825ba984..50dba5c776 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java @@ -84,7 +84,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket } // 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())); player.removeRequest(request.getClass()); @@ -103,7 +103,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket final InventoryUpdate iu = new InventoryUpdate(); 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)) { diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java index 4fc84e51ee..951e1c2ac5 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java @@ -82,7 +82,7 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket } // 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); return; diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java index cd825ba984..50dba5c776 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java @@ -84,7 +84,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket } // 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())); player.removeRequest(request.getClass()); @@ -103,7 +103,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket final InventoryUpdate iu = new InventoryUpdate(); 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)) { diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java index 4fc84e51ee..951e1c2ac5 100644 --- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java +++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java @@ -82,7 +82,7 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket } // 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); return; diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java index cd825ba984..50dba5c776 100644 --- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java +++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java @@ -84,7 +84,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket } // 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())); player.removeRequest(request.getClass()); @@ -103,7 +103,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket final InventoryUpdate iu = new InventoryUpdate(); 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)) { diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java index 4fc84e51ee..951e1c2ac5 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java @@ -82,7 +82,7 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket } // 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); return; diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java index cd825ba984..50dba5c776 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java @@ -84,7 +84,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket } // 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())); player.removeRequest(request.getClass()); @@ -103,7 +103,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket final InventoryUpdate iu = new InventoryUpdate(); 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)) { diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java index 4fc84e51ee..951e1c2ac5 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java +++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java @@ -82,7 +82,7 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket } // 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); return; diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java index cd825ba984..50dba5c776 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java +++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java @@ -84,7 +84,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket } // 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())); player.removeRequest(request.getClass()); @@ -103,7 +103,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket final InventoryUpdate iu = new InventoryUpdate(); 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)) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java index 4fc84e51ee..951e1c2ac5 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java @@ -82,7 +82,7 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket } // 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); return; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java index cd825ba984..50dba5c776 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java @@ -84,7 +84,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket } // 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())); player.removeRequest(request.getClass()); @@ -103,7 +103,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket final InventoryUpdate iu = new InventoryUpdate(); 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)) {