From 911e28b4f8ab176ef3af8195cd12f12c604cd29e Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 6 Dec 2019 23:54:09 +0000 Subject: [PATCH] Support for combining stackable items. --- .../clientpackets/compound/RequestNewEnchantPushTwo.java | 4 ++-- .../network/clientpackets/compound/RequestNewEnchantTry.java | 4 ++-- .../clientpackets/compound/RequestNewEnchantPushTwo.java | 4 ++-- .../network/clientpackets/compound/RequestNewEnchantTry.java | 4 ++-- .../clientpackets/compound/RequestNewEnchantPushTwo.java | 4 ++-- .../network/clientpackets/compound/RequestNewEnchantTry.java | 4 ++-- .../clientpackets/compound/RequestNewEnchantPushTwo.java | 4 ++-- .../network/clientpackets/compound/RequestNewEnchantTry.java | 4 ++-- .../clientpackets/compound/RequestNewEnchantPushTwo.java | 4 ++-- .../network/clientpackets/compound/RequestNewEnchantTry.java | 4 ++-- .../clientpackets/compound/RequestNewEnchantPushTwo.java | 4 ++-- .../network/clientpackets/compound/RequestNewEnchantTry.java | 4 ++-- .../clientpackets/compound/RequestNewEnchantPushTwo.java | 4 ++-- .../network/clientpackets/compound/RequestNewEnchantTry.java | 4 ++-- .../clientpackets/compound/RequestNewEnchantPushTwo.java | 4 ++-- .../network/clientpackets/compound/RequestNewEnchantTry.java | 4 ++-- .../clientpackets/compound/RequestNewEnchantPushTwo.java | 4 ++-- .../network/clientpackets/compound/RequestNewEnchantTry.java | 4 ++-- .../clientpackets/compound/RequestNewEnchantPushTwo.java | 4 ++-- .../network/clientpackets/compound/RequestNewEnchantTry.java | 4 ++-- .../clientpackets/compound/RequestNewEnchantPushTwo.java | 4 ++-- .../network/clientpackets/compound/RequestNewEnchantTry.java | 4 ++-- .../clientpackets/compound/RequestNewEnchantPushTwo.java | 4 ++-- .../network/clientpackets/compound/RequestNewEnchantTry.java | 4 ++-- .../clientpackets/compound/RequestNewEnchantPushTwo.java | 4 ++-- .../network/clientpackets/compound/RequestNewEnchantTry.java | 4 ++-- .../clientpackets/compound/RequestNewEnchantPushTwo.java | 4 ++-- .../network/clientpackets/compound/RequestNewEnchantTry.java | 4 ++-- .../clientpackets/compound/RequestNewEnchantPushTwo.java | 4 ++-- .../network/clientpackets/compound/RequestNewEnchantTry.java | 4 ++-- 30 files changed, 60 insertions(+), 60 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java index 7d2a2589f3..236926644a 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java @@ -81,8 +81,8 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket return; } - // Lets prevent using same item twice - if (itemOne.getObjectId() == itemTwo.getObjectId()) + // 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))) { client.sendPacket(ExEnchantTwoFail.STATIC_PACKET); return; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java index 2a3924a98f..420f59b761 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java @@ -83,8 +83,8 @@ public class RequestNewEnchantTry implements IClientIncomingPacket return; } - // Lets prevent using same item twice - if (itemOne.getObjectId() == itemTwo.getObjectId()) + // 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))) { client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId())); player.removeRequest(request.getClass()); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java index 7d2a2589f3..236926644a 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java @@ -81,8 +81,8 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket return; } - // Lets prevent using same item twice - if (itemOne.getObjectId() == itemTwo.getObjectId()) + // 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))) { client.sendPacket(ExEnchantTwoFail.STATIC_PACKET); return; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java index 2a3924a98f..420f59b761 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java @@ -83,8 +83,8 @@ public class RequestNewEnchantTry implements IClientIncomingPacket return; } - // Lets prevent using same item twice - if (itemOne.getObjectId() == itemTwo.getObjectId()) + // 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))) { client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId())); player.removeRequest(request.getClass()); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java index 7d2a2589f3..236926644a 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java @@ -81,8 +81,8 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket return; } - // Lets prevent using same item twice - if (itemOne.getObjectId() == itemTwo.getObjectId()) + // 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))) { client.sendPacket(ExEnchantTwoFail.STATIC_PACKET); return; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java index 2a3924a98f..420f59b761 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java @@ -83,8 +83,8 @@ public class RequestNewEnchantTry implements IClientIncomingPacket return; } - // Lets prevent using same item twice - if (itemOne.getObjectId() == itemTwo.getObjectId()) + // 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))) { client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId())); player.removeRequest(request.getClass()); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java index 7d2a2589f3..236926644a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java @@ -81,8 +81,8 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket return; } - // Lets prevent using same item twice - if (itemOne.getObjectId() == itemTwo.getObjectId()) + // 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))) { client.sendPacket(ExEnchantTwoFail.STATIC_PACKET); return; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java index 2a3924a98f..420f59b761 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java @@ -83,8 +83,8 @@ public class RequestNewEnchantTry implements IClientIncomingPacket return; } - // Lets prevent using same item twice - if (itemOne.getObjectId() == itemTwo.getObjectId()) + // 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))) { client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId())); player.removeRequest(request.getClass()); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java index 7d2a2589f3..236926644a 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java @@ -81,8 +81,8 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket return; } - // Lets prevent using same item twice - if (itemOne.getObjectId() == itemTwo.getObjectId()) + // 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))) { client.sendPacket(ExEnchantTwoFail.STATIC_PACKET); return; diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java index 2a3924a98f..420f59b761 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java @@ -83,8 +83,8 @@ public class RequestNewEnchantTry implements IClientIncomingPacket return; } - // Lets prevent using same item twice - if (itemOne.getObjectId() == itemTwo.getObjectId()) + // 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))) { client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId())); player.removeRequest(request.getClass()); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java index 7d2a2589f3..236926644a 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java @@ -81,8 +81,8 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket return; } - // Lets prevent using same item twice - if (itemOne.getObjectId() == itemTwo.getObjectId()) + // 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))) { client.sendPacket(ExEnchantTwoFail.STATIC_PACKET); return; diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java index 2a3924a98f..420f59b761 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java @@ -83,8 +83,8 @@ public class RequestNewEnchantTry implements IClientIncomingPacket return; } - // Lets prevent using same item twice - if (itemOne.getObjectId() == itemTwo.getObjectId()) + // 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))) { client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId())); player.removeRequest(request.getClass()); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java index 7d2a2589f3..236926644a 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java @@ -81,8 +81,8 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket return; } - // Lets prevent using same item twice - if (itemOne.getObjectId() == itemTwo.getObjectId()) + // 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))) { client.sendPacket(ExEnchantTwoFail.STATIC_PACKET); return; diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java index 2a3924a98f..420f59b761 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java @@ -83,8 +83,8 @@ public class RequestNewEnchantTry implements IClientIncomingPacket return; } - // Lets prevent using same item twice - if (itemOne.getObjectId() == itemTwo.getObjectId()) + // 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))) { client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId())); player.removeRequest(request.getClass()); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java index 7d2a2589f3..236926644a 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java @@ -81,8 +81,8 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket return; } - // Lets prevent using same item twice - if (itemOne.getObjectId() == itemTwo.getObjectId()) + // 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))) { client.sendPacket(ExEnchantTwoFail.STATIC_PACKET); return; diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java index 2a3924a98f..420f59b761 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java @@ -83,8 +83,8 @@ public class RequestNewEnchantTry implements IClientIncomingPacket return; } - // Lets prevent using same item twice - if (itemOne.getObjectId() == itemTwo.getObjectId()) + // 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))) { client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId())); player.removeRequest(request.getClass()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java index 7d2a2589f3..236926644a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java @@ -81,8 +81,8 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket return; } - // Lets prevent using same item twice - if (itemOne.getObjectId() == itemTwo.getObjectId()) + // 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))) { client.sendPacket(ExEnchantTwoFail.STATIC_PACKET); return; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java index 2a3924a98f..420f59b761 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java @@ -83,8 +83,8 @@ public class RequestNewEnchantTry implements IClientIncomingPacket return; } - // Lets prevent using same item twice - if (itemOne.getObjectId() == itemTwo.getObjectId()) + // 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))) { client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId())); player.removeRequest(request.getClass()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java index 7d2a2589f3..236926644a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java @@ -81,8 +81,8 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket return; } - // Lets prevent using same item twice - if (itemOne.getObjectId() == itemTwo.getObjectId()) + // 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))) { client.sendPacket(ExEnchantTwoFail.STATIC_PACKET); return; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java index 2a3924a98f..420f59b761 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java @@ -83,8 +83,8 @@ public class RequestNewEnchantTry implements IClientIncomingPacket return; } - // Lets prevent using same item twice - if (itemOne.getObjectId() == itemTwo.getObjectId()) + // 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))) { client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId())); player.removeRequest(request.getClass()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java index 7d2a2589f3..236926644a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java @@ -81,8 +81,8 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket return; } - // Lets prevent using same item twice - if (itemOne.getObjectId() == itemTwo.getObjectId()) + // 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))) { client.sendPacket(ExEnchantTwoFail.STATIC_PACKET); return; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java index 2a3924a98f..420f59b761 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java @@ -83,8 +83,8 @@ public class RequestNewEnchantTry implements IClientIncomingPacket return; } - // Lets prevent using same item twice - if (itemOne.getObjectId() == itemTwo.getObjectId()) + // 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))) { client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId())); player.removeRequest(request.getClass()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java index 7d2a2589f3..236926644a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java @@ -81,8 +81,8 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket return; } - // Lets prevent using same item twice - if (itemOne.getObjectId() == itemTwo.getObjectId()) + // 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))) { client.sendPacket(ExEnchantTwoFail.STATIC_PACKET); return; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java index 2a3924a98f..420f59b761 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java @@ -83,8 +83,8 @@ public class RequestNewEnchantTry implements IClientIncomingPacket return; } - // Lets prevent using same item twice - if (itemOne.getObjectId() == itemTwo.getObjectId()) + // 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))) { client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId())); player.removeRequest(request.getClass()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java index 7d2a2589f3..236926644a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java @@ -81,8 +81,8 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket return; } - // Lets prevent using same item twice - if (itemOne.getObjectId() == itemTwo.getObjectId()) + // 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))) { client.sendPacket(ExEnchantTwoFail.STATIC_PACKET); return; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java index 2a3924a98f..420f59b761 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java @@ -83,8 +83,8 @@ public class RequestNewEnchantTry implements IClientIncomingPacket return; } - // Lets prevent using same item twice - if (itemOne.getObjectId() == itemTwo.getObjectId()) + // 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))) { client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId())); player.removeRequest(request.getClass()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java index 7d2a2589f3..236926644a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java @@ -81,8 +81,8 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket return; } - // Lets prevent using same item twice - if (itemOne.getObjectId() == itemTwo.getObjectId()) + // 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))) { client.sendPacket(ExEnchantTwoFail.STATIC_PACKET); return; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java index 2a3924a98f..420f59b761 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java @@ -83,8 +83,8 @@ public class RequestNewEnchantTry implements IClientIncomingPacket return; } - // Lets prevent using same item twice - if (itemOne.getObjectId() == itemTwo.getObjectId()) + // 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))) { client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId())); player.removeRequest(request.getClass()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java index 7d2a2589f3..236926644a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java @@ -81,8 +81,8 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket return; } - // Lets prevent using same item twice - if (itemOne.getObjectId() == itemTwo.getObjectId()) + // 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))) { client.sendPacket(ExEnchantTwoFail.STATIC_PACKET); return; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java index 2a3924a98f..420f59b761 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java @@ -83,8 +83,8 @@ public class RequestNewEnchantTry implements IClientIncomingPacket return; } - // Lets prevent using same item twice - if (itemOne.getObjectId() == itemTwo.getObjectId()) + // 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))) { client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId())); player.removeRequest(request.getClass());