From 207501a2f83035cdda087dfc1504537f735196a3 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Wed, 23 Nov 2022 00:05:19 +0000
Subject: [PATCH] Compound system resetting improvements.

---
 .../clientpackets/compound/RequestNewEnchantPushTwo.java     | 2 +-
 .../clientpackets/compound/RequestNewEnchantRemoveOne.java   | 5 +++++
 .../clientpackets/compound/RequestNewEnchantRemoveTwo.java   | 5 +++++
 .../network/clientpackets/compound/RequestNewEnchantTry.java | 2 +-
 .../network/serverpackets/compound/ExEnchantOneOK.java       | 4 ++++
 .../clientpackets/compound/RequestNewEnchantPushTwo.java     | 2 +-
 .../clientpackets/compound/RequestNewEnchantRemoveOne.java   | 5 +++++
 .../clientpackets/compound/RequestNewEnchantRemoveTwo.java   | 5 +++++
 .../network/clientpackets/compound/RequestNewEnchantTry.java | 3 ++-
 .../network/serverpackets/compound/ExEnchantOneOK.java       | 4 ++++
 .../clientpackets/compound/RequestNewEnchantPushTwo.java     | 2 +-
 .../clientpackets/compound/RequestNewEnchantRemoveOne.java   | 5 +++++
 .../clientpackets/compound/RequestNewEnchantRemoveTwo.java   | 5 +++++
 .../network/clientpackets/compound/RequestNewEnchantTry.java | 3 ++-
 .../network/serverpackets/compound/ExEnchantOneOK.java       | 4 ++++
 .../clientpackets/compound/RequestNewEnchantPushTwo.java     | 2 +-
 .../clientpackets/compound/RequestNewEnchantRemoveOne.java   | 5 +++++
 .../clientpackets/compound/RequestNewEnchantRemoveTwo.java   | 5 +++++
 .../network/clientpackets/compound/RequestNewEnchantTry.java | 2 +-
 .../network/serverpackets/compound/ExEnchantOneOK.java       | 4 ++++
 .../clientpackets/compound/RequestNewEnchantPushTwo.java     | 2 +-
 .../clientpackets/compound/RequestNewEnchantRemoveOne.java   | 5 +++++
 .../clientpackets/compound/RequestNewEnchantRemoveTwo.java   | 5 +++++
 .../network/clientpackets/compound/RequestNewEnchantTry.java | 2 +-
 .../network/serverpackets/compound/ExEnchantOneOK.java       | 4 ++++
 .../clientpackets/compound/RequestNewEnchantPushTwo.java     | 2 +-
 .../clientpackets/compound/RequestNewEnchantRemoveOne.java   | 5 +++++
 .../clientpackets/compound/RequestNewEnchantRemoveTwo.java   | 5 +++++
 .../network/clientpackets/compound/RequestNewEnchantTry.java | 2 +-
 .../network/serverpackets/compound/ExEnchantOneOK.java       | 4 ++++
 30 files changed, 98 insertions(+), 12 deletions(-)

diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
index 6bf8ea0508..a454fccb24 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
@@ -83,7 +83,7 @@ public class RequestNewEnchantPushTwo implements ClientPacket
 		}
 		
 		// Lets prevent using same item twice. Also stackable item check.
-		if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2))
+		if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2)))
 		{
 			player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
 			return;
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
index 07e3121e2b..4eb7e4c779 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
@@ -76,7 +76,12 @@ public class RequestNewEnchantRemoveOne implements ClientPacket
 			player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
 			return;
 		}
+		
 		request.setItemOne(0);
+		if (request.getItemTwo() == null)
+		{
+			player.removeRequest(request.getClass());
+		}
 		
 		player.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
 	}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
index 6294161e37..635863a6e1 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
@@ -76,7 +76,12 @@ public class RequestNewEnchantRemoveTwo implements ClientPacket
 			player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
 			return;
 		}
+		
 		request.setItemTwo(0);
+		if (request.getItemOne() == null)
+		{
+			player.removeRequest(request.getClass());
+		}
 		
 		player.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
 	}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
index 9ec1e045ba..2091881020 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
@@ -79,7 +79,7 @@ public class RequestNewEnchantTry implements ClientPacket
 		}
 		
 		// Lets prevent using same item twice. Also stackable item check.
-		if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2))
+		if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2)))
 		{
 			player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
 			player.removeRequest(request.getClass());
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneOK.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneOK.java
index 16e96a30cb..295f9ee61f 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneOK.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneOK.java
@@ -26,6 +26,10 @@ public class ExEnchantOneOK extends ServerPacket
 {
 	public static final ExEnchantOneOK STATIC_PACKET = new ExEnchantOneOK();
 	
+	private ExEnchantOneOK()
+	{
+	}
+	
 	@Override
 	public void write()
 	{
diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
index 6bf8ea0508..a454fccb24 100644
--- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
+++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
@@ -83,7 +83,7 @@ public class RequestNewEnchantPushTwo implements ClientPacket
 		}
 		
 		// Lets prevent using same item twice. Also stackable item check.
-		if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2))
+		if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2)))
 		{
 			player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
 			return;
diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
index 07e3121e2b..4eb7e4c779 100644
--- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
+++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
@@ -76,7 +76,12 @@ public class RequestNewEnchantRemoveOne implements ClientPacket
 			player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
 			return;
 		}
+		
 		request.setItemOne(0);
+		if (request.getItemTwo() == null)
+		{
+			player.removeRequest(request.getClass());
+		}
 		
 		player.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
 	}
diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
index 6294161e37..635863a6e1 100644
--- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
+++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
@@ -76,7 +76,12 @@ public class RequestNewEnchantRemoveTwo implements ClientPacket
 			player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
 			return;
 		}
+		
 		request.setItemTwo(0);
+		if (request.getItemOne() == null)
+		{
+			player.removeRequest(request.getClass());
+		}
 		
 		player.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
 	}
diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
index a15f675416..f3e70a06bb 100644
--- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
+++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
@@ -82,7 +82,7 @@ public class RequestNewEnchantTry implements ClientPacket
 		}
 		
 		// Lets prevent using same item twice. Also stackable item check.
-		if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2))
+		if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2)))
 		{
 			player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
 			player.removeRequest(request.getClass());
@@ -121,6 +121,7 @@ public class RequestNewEnchantTry implements ClientPacket
 			{
 				player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
 			}
+			
 			// Notify to scripts.
 			if (EventDispatcher.getInstance().hasListener(EventType.ON_ITEM_COMPOUND))
 			{
diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneOK.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneOK.java
index 16e96a30cb..295f9ee61f 100644
--- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneOK.java
+++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneOK.java
@@ -26,6 +26,10 @@ public class ExEnchantOneOK extends ServerPacket
 {
 	public static final ExEnchantOneOK STATIC_PACKET = new ExEnchantOneOK();
 	
+	private ExEnchantOneOK()
+	{
+	}
+	
 	@Override
 	public void write()
 	{
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
index 6bf8ea0508..a454fccb24 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
@@ -83,7 +83,7 @@ public class RequestNewEnchantPushTwo implements ClientPacket
 		}
 		
 		// Lets prevent using same item twice. Also stackable item check.
-		if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2))
+		if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2)))
 		{
 			player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
 			return;
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
index 07e3121e2b..4eb7e4c779 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
@@ -76,7 +76,12 @@ public class RequestNewEnchantRemoveOne implements ClientPacket
 			player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
 			return;
 		}
+		
 		request.setItemOne(0);
+		if (request.getItemTwo() == null)
+		{
+			player.removeRequest(request.getClass());
+		}
 		
 		player.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
 	}
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
index 6294161e37..635863a6e1 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
@@ -76,7 +76,12 @@ public class RequestNewEnchantRemoveTwo implements ClientPacket
 			player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
 			return;
 		}
+		
 		request.setItemTwo(0);
+		if (request.getItemOne() == null)
+		{
+			player.removeRequest(request.getClass());
+		}
 		
 		player.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
 	}
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
index a15f675416..f3e70a06bb 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
@@ -82,7 +82,7 @@ public class RequestNewEnchantTry implements ClientPacket
 		}
 		
 		// Lets prevent using same item twice. Also stackable item check.
-		if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2))
+		if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2)))
 		{
 			player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
 			player.removeRequest(request.getClass());
@@ -121,6 +121,7 @@ public class RequestNewEnchantTry implements ClientPacket
 			{
 				player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
 			}
+			
 			// Notify to scripts.
 			if (EventDispatcher.getInstance().hasListener(EventType.ON_ITEM_COMPOUND))
 			{
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneOK.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneOK.java
index 16e96a30cb..295f9ee61f 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneOK.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneOK.java
@@ -26,6 +26,10 @@ public class ExEnchantOneOK extends ServerPacket
 {
 	public static final ExEnchantOneOK STATIC_PACKET = new ExEnchantOneOK();
 	
+	private ExEnchantOneOK()
+	{
+	}
+	
 	@Override
 	public void write()
 	{
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 6bf8ea0508..a454fccb24 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
@@ -83,7 +83,7 @@ public class RequestNewEnchantPushTwo implements ClientPacket
 		}
 		
 		// Lets prevent using same item twice. Also stackable item check.
-		if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2))
+		if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2)))
 		{
 			player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
 			return;
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
index 07e3121e2b..4eb7e4c779 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
@@ -76,7 +76,12 @@ public class RequestNewEnchantRemoveOne implements ClientPacket
 			player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
 			return;
 		}
+		
 		request.setItemOne(0);
+		if (request.getItemTwo() == null)
+		{
+			player.removeRequest(request.getClass());
+		}
 		
 		player.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
 	}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
index 6294161e37..635863a6e1 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
@@ -76,7 +76,12 @@ public class RequestNewEnchantRemoveTwo implements ClientPacket
 			player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
 			return;
 		}
+		
 		request.setItemTwo(0);
+		if (request.getItemOne() == null)
+		{
+			player.removeRequest(request.getClass());
+		}
 		
 		player.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
 	}
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 9ec1e045ba..2091881020 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
@@ -79,7 +79,7 @@ public class RequestNewEnchantTry implements ClientPacket
 		}
 		
 		// Lets prevent using same item twice. Also stackable item check.
-		if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2))
+		if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2)))
 		{
 			player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
 			player.removeRequest(request.getClass());
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneOK.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneOK.java
index 16e96a30cb..295f9ee61f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneOK.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneOK.java
@@ -26,6 +26,10 @@ public class ExEnchantOneOK extends ServerPacket
 {
 	public static final ExEnchantOneOK STATIC_PACKET = new ExEnchantOneOK();
 	
+	private ExEnchantOneOK()
+	{
+	}
+	
 	@Override
 	public void write()
 	{
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
index 6bf8ea0508..a454fccb24 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
@@ -83,7 +83,7 @@ public class RequestNewEnchantPushTwo implements ClientPacket
 		}
 		
 		// Lets prevent using same item twice. Also stackable item check.
-		if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2))
+		if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2)))
 		{
 			player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
 			return;
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
index 07e3121e2b..4eb7e4c779 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
@@ -76,7 +76,12 @@ public class RequestNewEnchantRemoveOne implements ClientPacket
 			player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
 			return;
 		}
+		
 		request.setItemOne(0);
+		if (request.getItemTwo() == null)
+		{
+			player.removeRequest(request.getClass());
+		}
 		
 		player.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
 	}
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
index 6294161e37..635863a6e1 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
@@ -76,7 +76,12 @@ public class RequestNewEnchantRemoveTwo implements ClientPacket
 			player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
 			return;
 		}
+		
 		request.setItemTwo(0);
+		if (request.getItemOne() == null)
+		{
+			player.removeRequest(request.getClass());
+		}
 		
 		player.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
 	}
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
index 9ec1e045ba..2091881020 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
@@ -79,7 +79,7 @@ public class RequestNewEnchantTry implements ClientPacket
 		}
 		
 		// Lets prevent using same item twice. Also stackable item check.
-		if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2))
+		if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2)))
 		{
 			player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
 			player.removeRequest(request.getClass());
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneOK.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneOK.java
index 16e96a30cb..295f9ee61f 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneOK.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneOK.java
@@ -26,6 +26,10 @@ public class ExEnchantOneOK extends ServerPacket
 {
 	public static final ExEnchantOneOK STATIC_PACKET = new ExEnchantOneOK();
 	
+	private ExEnchantOneOK()
+	{
+	}
+	
 	@Override
 	public void write()
 	{
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
index 6bf8ea0508..a454fccb24 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
@@ -83,7 +83,7 @@ public class RequestNewEnchantPushTwo implements ClientPacket
 		}
 		
 		// Lets prevent using same item twice. Also stackable item check.
-		if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2))
+		if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2)))
 		{
 			player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
 			return;
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
index 07e3121e2b..4eb7e4c779 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
@@ -76,7 +76,12 @@ public class RequestNewEnchantRemoveOne implements ClientPacket
 			player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
 			return;
 		}
+		
 		request.setItemOne(0);
+		if (request.getItemTwo() == null)
+		{
+			player.removeRequest(request.getClass());
+		}
 		
 		player.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
 	}
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
index 6294161e37..635863a6e1 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
@@ -76,7 +76,12 @@ public class RequestNewEnchantRemoveTwo implements ClientPacket
 			player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
 			return;
 		}
+		
 		request.setItemTwo(0);
+		if (request.getItemOne() == null)
+		{
+			player.removeRequest(request.getClass());
+		}
 		
 		player.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
 	}
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
index 9ec1e045ba..2091881020 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
@@ -79,7 +79,7 @@ public class RequestNewEnchantTry implements ClientPacket
 		}
 		
 		// Lets prevent using same item twice. Also stackable item check.
-		if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2))
+		if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2)))
 		{
 			player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
 			player.removeRequest(request.getClass());
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneOK.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneOK.java
index 16e96a30cb..295f9ee61f 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneOK.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneOK.java
@@ -26,6 +26,10 @@ public class ExEnchantOneOK extends ServerPacket
 {
 	public static final ExEnchantOneOK STATIC_PACKET = new ExEnchantOneOK();
 	
+	private ExEnchantOneOK()
+	{
+	}
+	
 	@Override
 	public void write()
 	{