From 08d72b1ec8944993aa1a6a072eccf3a065dab194 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sat, 15 Aug 2020 05:15:24 +0000
Subject: [PATCH] Fixed invisible trade items.

---
 .../serverpackets/AbstractItemPacket.java       | 15 +++++++++++++++
 .../network/serverpackets/TradeOtherAdd.java    |  2 +-
 .../network/serverpackets/TradeOwnAdd.java      |  2 +-
 .../network/serverpackets/TradeUpdate.java      |  2 +-
 .../serverpackets/AbstractItemPacket.java       | 17 +++++++++++++++++
 .../network/serverpackets/TradeOtherAdd.java    |  2 +-
 .../network/serverpackets/TradeOwnAdd.java      |  2 +-
 .../network/serverpackets/TradeUpdate.java      |  2 +-
 8 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java
index fc8d960e2a..0d9f84c2f2 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java
@@ -62,6 +62,21 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket<ItemListType
 		writeItem(packet, new ItemInfo(item));
 	}
 	
+	protected void writeTradeItem(PacketWriter packet, TradeItem item)
+	{
+		packet.writeH(item.getItem().getType1());
+		packet.writeD(item.getObjectId()); // ObjectId
+		packet.writeD(item.getItem().getDisplayId()); // ItemId
+		packet.writeQ(item.getCount()); // Quantity
+		packet.writeC(item.getItem().getType2()); // Item Type 2 : 00-weapon, 01-shield/armor, 02-ring/earring/necklace, 03-questitem, 04-adena, 05-item
+		packet.writeC(item.getCustomType1()); // Filler (always 0)
+		packet.writeQ(item.getItem().getBodyPart()); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand
+		packet.writeH(item.getEnchant()); // Enchant level (pet level shown in control item)
+		packet.writeH(0x00); // Equipped : 00-No, 01-yes
+		packet.writeH(item.getCustomType2());
+		writeItemElementalAndEnchant(packet, new ItemInfo(item));
+	}
+	
 	protected void writeItem(PacketWriter packet, ItemInfo item)
 	{
 		final int mask = calculateMask(item);
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java
index 613b709eb8..db2b49f575 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java
@@ -37,7 +37,7 @@ public class TradeOtherAdd extends AbstractItemPacket
 	{
 		OutgoingPackets.TRADE_OTHER_ADD.writeId(packet);
 		packet.writeH(1); // item count
-		writeItem(packet, _item);
+		writeTradeItem(packet, _item);
 		return true;
 	}
 }
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java
index e15002cc3b..1633ce9303 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java
@@ -37,7 +37,7 @@ public class TradeOwnAdd extends AbstractItemPacket
 	{
 		OutgoingPackets.TRADE_OWN_ADD.writeId(packet);
 		packet.writeH(1); // items added count
-		writeItem(packet, _item);
+		writeTradeItem(packet, _item);
 		return true;
 	}
 }
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java
index f4254f2649..dde10addfa 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java
@@ -42,7 +42,7 @@ public class TradeUpdate extends AbstractItemPacket
 		
 		packet.writeH(1);
 		packet.writeH((_newCount > 0) && _item.getItem().isStackable() ? 3 : 2);
-		writeItem(packet, _item);
+		writeTradeItem(packet, _item);
 		return true;
 	}
 }
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java
index d9901cb32c..02b5af31fe 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java
@@ -63,6 +63,23 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket<ItemListType
 		writeItem(packet, new ItemInfo(item));
 	}
 	
+	protected void writeTradeItem(PacketWriter packet, TradeItem item)
+	{
+		packet.writeH(item.getItem().getType1());
+		packet.writeD(item.getObjectId()); // ObjectId
+		packet.writeD(item.getItem().getDisplayId()); // ItemId
+		packet.writeQ(item.getCount()); // Quantity
+		packet.writeC(item.getItem().getType2()); // Item Type 2 : 00-weapon, 01-shield/armor, 02-ring/earring/necklace, 03-questitem, 04-adena, 05-item
+		packet.writeC(item.getCustomType1()); // Filler (always 0)
+		packet.writeQ(item.getItem().getBodyPart()); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand
+		packet.writeH(item.getEnchant()); // Enchant level (pet level shown in control item)
+		packet.writeH(0x00); // Equipped : 00-No, 01-yes
+		packet.writeH(item.getCustomType2());
+		final ItemInfo iteminfo = new ItemInfo(item);
+		writeItemElementalAndEnchant(packet, iteminfo);
+		writeItemEnsoulOptions(packet, iteminfo);
+	}
+	
 	protected void writeItem(PacketWriter packet, ItemInfo item)
 	{
 		final int mask = calculateMask(item);
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java
index 613b709eb8..db2b49f575 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java
@@ -37,7 +37,7 @@ public class TradeOtherAdd extends AbstractItemPacket
 	{
 		OutgoingPackets.TRADE_OTHER_ADD.writeId(packet);
 		packet.writeH(1); // item count
-		writeItem(packet, _item);
+		writeTradeItem(packet, _item);
 		return true;
 	}
 }
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java
index e15002cc3b..1633ce9303 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java
@@ -37,7 +37,7 @@ public class TradeOwnAdd extends AbstractItemPacket
 	{
 		OutgoingPackets.TRADE_OWN_ADD.writeId(packet);
 		packet.writeH(1); // items added count
-		writeItem(packet, _item);
+		writeTradeItem(packet, _item);
 		return true;
 	}
 }
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java
index f4254f2649..dde10addfa 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java
@@ -42,7 +42,7 @@ public class TradeUpdate extends AbstractItemPacket
 		
 		packet.writeH(1);
 		packet.writeH((_newCount > 0) && _item.getItem().isStackable() ? 3 : 2);
-		writeItem(packet, _item);
+		writeTradeItem(packet, _item);
 		return true;
 	}
 }