From c2f7ca4cffbc577b53e1300bab0ed35c9474ebfa Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sun, 25 Sep 2022 23:30:52 +0000
Subject: [PATCH] Show lifestone when variation window opens. Contributed by
 Index.

---
 .../gameserver/network/clientpackets/UseItem.java     |  2 ++
 .../ExPutIntensiveResultForVariationMake.java         | 11 +++++++++--
 .../gameserver/network/clientpackets/UseItem.java     |  2 ++
 .../ExPutIntensiveResultForVariationMake.java         | 11 +++++++++--
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
index 5906bc346a..121b56214a 100644
--- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
+++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
@@ -48,6 +48,7 @@ import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.PacketLogger;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
+import org.l2jmobius.gameserver.network.serverpackets.ExPutIntensiveResultForVariationMake;
 import org.l2jmobius.gameserver.network.serverpackets.ExUseSharedGroupItem;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import org.l2jmobius.gameserver.network.serverpackets.variation.ExShowVariationMakeWindow;
@@ -307,6 +308,7 @@ public class UseItem implements IClientIncomingPacket
 			if ((etcItem != null) && etcItem.isMineral())
 			{
 				player.sendPacket(ExShowVariationMakeWindow.STATIC_PACKET);
+				player.sendPacket(new ExPutIntensiveResultForVariationMake(item.getObjectId()));
 			}
 		}
 	}
diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java
index 40db72d92d..077a180ab9 100644
--- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java
+++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java
@@ -25,7 +25,14 @@ public class ExPutIntensiveResultForVariationMake implements IClientOutgoingPack
 	private final int _lifestoneItemId;
 	private final int _insertResult;
 	
-	public ExPutIntensiveResultForVariationMake(int refinerItemObjId, int lifeStoneId, int insertResult)
+	public ExPutIntensiveResultForVariationMake(int lifeStoneId)
+	{
+		_lifestoneItemId = lifeStoneId;
+		_refinerItemObjId = 0;
+		_insertResult = 0;
+	}
+	
+	public ExPutIntensiveResultForVariationMake(int lifeStoneId, int refinerItemObjId, int insertResult)
 	{
 		_refinerItemObjId = refinerItemObjId;
 		_lifestoneItemId = lifeStoneId;
@@ -36,8 +43,8 @@ public class ExPutIntensiveResultForVariationMake implements IClientOutgoingPack
 	public boolean write(PacketWriter packet)
 	{
 		OutgoingPackets.EX_PUT_INTENSIVE_RESULT_FOR_VARIATION_MAKE.writeId(packet);
-		packet.writeD(_refinerItemObjId);
 		packet.writeD(_lifestoneItemId);
+		packet.writeD(_refinerItemObjId);
 		packet.writeC(_insertResult);
 		return true;
 	}
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
index c8d2bb99ae..21bf550f2a 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
@@ -53,6 +53,7 @@ import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.PacketLogger;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
+import org.l2jmobius.gameserver.network.serverpackets.ExPutIntensiveResultForVariationMake;
 import org.l2jmobius.gameserver.network.serverpackets.ExUseSharedGroupItem;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import org.l2jmobius.gameserver.network.serverpackets.ensoul.ExShowEnsoulWindow;
@@ -337,6 +338,7 @@ public class UseItem implements IClientIncomingPacket
 				if (etcItem.isMineral())
 				{
 					player.sendPacket(ExShowVariationMakeWindow.STATIC_PACKET);
+					player.sendPacket(new ExPutIntensiveResultForVariationMake(item.getObjectId()));
 				}
 				else if (etcItem.isEnsoulStone())
 				{
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java
index 40db72d92d..077a180ab9 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java
@@ -25,7 +25,14 @@ public class ExPutIntensiveResultForVariationMake implements IClientOutgoingPack
 	private final int _lifestoneItemId;
 	private final int _insertResult;
 	
-	public ExPutIntensiveResultForVariationMake(int refinerItemObjId, int lifeStoneId, int insertResult)
+	public ExPutIntensiveResultForVariationMake(int lifeStoneId)
+	{
+		_lifestoneItemId = lifeStoneId;
+		_refinerItemObjId = 0;
+		_insertResult = 0;
+	}
+	
+	public ExPutIntensiveResultForVariationMake(int lifeStoneId, int refinerItemObjId, int insertResult)
 	{
 		_refinerItemObjId = refinerItemObjId;
 		_lifestoneItemId = lifeStoneId;
@@ -36,8 +43,8 @@ public class ExPutIntensiveResultForVariationMake implements IClientOutgoingPack
 	public boolean write(PacketWriter packet)
 	{
 		OutgoingPackets.EX_PUT_INTENSIVE_RESULT_FOR_VARIATION_MAKE.writeId(packet);
-		packet.writeD(_refinerItemObjId);
 		packet.writeD(_lifestoneItemId);
+		packet.writeD(_refinerItemObjId);
 		packet.writeC(_insertResult);
 		return true;
 	}