From 08f7e83adea2787cfd74a415bc41fa186851ffc8 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Wed, 28 Apr 2021 22:09:48 +0000
Subject: [PATCH] Adjustments for abstract item packet.

---
 .../serverpackets/AbstractItemPacket.java     | 25 ++++++++++---------
 .../serverpackets/AbstractItemPacket.java     | 25 ++++++++++---------
 .../serverpackets/AbstractItemPacket.java     |  6 ++---
 .../serverpackets/AbstractItemPacket.java     |  6 ++---
 4 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java
index da1d1ad1a9..bb04421b8f 100644
--- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java
+++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java
@@ -72,8 +72,7 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket<ItemListType
 	{
 		final int mask = calculateMask(item);
 		
-		packet.writeC(mask);
-		packet.writeC(0x00); // item.getItem().isBlessed() ? 0x01 : 0x00 - 286 protocol
+		packet.writeH(mask);
 		packet.writeD(item.getObjectId()); // ObjectId
 		packet.writeD(item.getItem().getDisplayId()); // ItemId
 		packet.writeC(item.getItem().isQuestItem() || (item.getEquipped() == 1) ? 0xFF : item.getLocation()); // T1
@@ -82,8 +81,7 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket<ItemListType
 		packet.writeC(item.getCustomType1()); // Filler (always 0)
 		packet.writeH(item.getEquipped()); // Equipped : 00-No, 01-yes
 		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.writeC(item.getEnchantLevel()); // Enchant level (pet level shown in control item)
-		packet.writeC(0x00); // 286 protocol
+		packet.writeH(item.getEnchantLevel()); // Enchant level (pet level shown in control item)
 		packet.writeD(item.getMana());
 		packet.writeC(0x00); // 270 protocol
 		packet.writeD(item.getTime());
@@ -111,9 +109,9 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket<ItemListType
 		{
 			writeItemEnsoulOptions(packet, item);
 		}
-		// if (item.getItem().isBlessed())
+		// if (containsMask(mask, ItemListType.BLESSED))
 		// {
-		// packet.writeC(item.getItem().isBlessed() ? 0x01 : 0x00);
+		// packet.writeC(0x01);
 		// }
 	}
 	
@@ -121,8 +119,7 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket<ItemListType
 	{
 		final int mask = calculateMask(item);
 		
-		packet.writeC(mask);
-		packet.writeC(0x00); // item.getItem().isBlessed() ? 0x01 : 0x00 - 286 protocol
+		packet.writeH(mask);
 		packet.writeD(item.getObjectId()); // ObjectId
 		packet.writeD(item.getItem().getDisplayId()); // ItemId
 		packet.writeC(item.getItem().isQuestItem() || (item.getEquipped() == 1) ? 0xFF : item.getLocation()); // T1
@@ -131,8 +128,7 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket<ItemListType
 		packet.writeC(item.getCustomType1()); // Filler (always 0)
 		packet.writeH(item.getEquipped()); // Equipped : 00-No, 01-yes
 		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.writeC(item.getEnchantLevel()); // Enchant level (pet level shown in control item)
-		packet.writeC(0x00); // 286 protocol
+		packet.writeH(item.getEnchantLevel()); // Enchant level (pet level shown in control item)
 		packet.writeD(item.getMana());
 		packet.writeC(0x00); // 270 protocol
 		packet.writeD(item.getTime());
@@ -160,9 +156,9 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket<ItemListType
 		{
 			writeItemEnsoulOptions(packet, item);
 		}
-		// if (item.getItem().isBlessed())
+		// if (containsMask(mask, ItemListType.BLESSED))
 		// {
-		// packet.writeC(item.getItem().isBlessed() ? 0x01 : 0x00);
+		// packet.writeC(0x01);
 		// }
 	}
 	
@@ -201,6 +197,11 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket<ItemListType
 			mask |= ItemListType.SOUL_CRYSTAL.getMask();
 		}
 		
+		// if (item.isBlessed())
+		// {
+		// mask |= ItemListType.BLESSED.getMask();
+		// }
+		
 		return mask;
 	}
 	
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java
index da1d1ad1a9..bb04421b8f 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java
@@ -72,8 +72,7 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket<ItemListType
 	{
 		final int mask = calculateMask(item);
 		
-		packet.writeC(mask);
-		packet.writeC(0x00); // item.getItem().isBlessed() ? 0x01 : 0x00 - 286 protocol
+		packet.writeH(mask);
 		packet.writeD(item.getObjectId()); // ObjectId
 		packet.writeD(item.getItem().getDisplayId()); // ItemId
 		packet.writeC(item.getItem().isQuestItem() || (item.getEquipped() == 1) ? 0xFF : item.getLocation()); // T1
@@ -82,8 +81,7 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket<ItemListType
 		packet.writeC(item.getCustomType1()); // Filler (always 0)
 		packet.writeH(item.getEquipped()); // Equipped : 00-No, 01-yes
 		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.writeC(item.getEnchantLevel()); // Enchant level (pet level shown in control item)
-		packet.writeC(0x00); // 286 protocol
+		packet.writeH(item.getEnchantLevel()); // Enchant level (pet level shown in control item)
 		packet.writeD(item.getMana());
 		packet.writeC(0x00); // 270 protocol
 		packet.writeD(item.getTime());
@@ -111,9 +109,9 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket<ItemListType
 		{
 			writeItemEnsoulOptions(packet, item);
 		}
-		// if (item.getItem().isBlessed())
+		// if (containsMask(mask, ItemListType.BLESSED))
 		// {
-		// packet.writeC(item.getItem().isBlessed() ? 0x01 : 0x00);
+		// packet.writeC(0x01);
 		// }
 	}
 	
@@ -121,8 +119,7 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket<ItemListType
 	{
 		final int mask = calculateMask(item);
 		
-		packet.writeC(mask);
-		packet.writeC(0x00); // item.getItem().isBlessed() ? 0x01 : 0x00 - 286 protocol
+		packet.writeH(mask);
 		packet.writeD(item.getObjectId()); // ObjectId
 		packet.writeD(item.getItem().getDisplayId()); // ItemId
 		packet.writeC(item.getItem().isQuestItem() || (item.getEquipped() == 1) ? 0xFF : item.getLocation()); // T1
@@ -131,8 +128,7 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket<ItemListType
 		packet.writeC(item.getCustomType1()); // Filler (always 0)
 		packet.writeH(item.getEquipped()); // Equipped : 00-No, 01-yes
 		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.writeC(item.getEnchantLevel()); // Enchant level (pet level shown in control item)
-		packet.writeC(0x00); // 286 protocol
+		packet.writeH(item.getEnchantLevel()); // Enchant level (pet level shown in control item)
 		packet.writeD(item.getMana());
 		packet.writeC(0x00); // 270 protocol
 		packet.writeD(item.getTime());
@@ -160,9 +156,9 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket<ItemListType
 		{
 			writeItemEnsoulOptions(packet, item);
 		}
-		// if (item.getItem().isBlessed())
+		// if (containsMask(mask, ItemListType.BLESSED))
 		// {
-		// packet.writeC(item.getItem().isBlessed() ? 0x01 : 0x00);
+		// packet.writeC(0x01);
 		// }
 	}
 	
@@ -201,6 +197,11 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket<ItemListType
 			mask |= ItemListType.SOUL_CRYSTAL.getMask();
 		}
 		
+		// if (item.isBlessed())
+		// {
+		// mask |= ItemListType.BLESSED.getMask();
+		// }
+		
 		return mask;
 	}
 	
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java
index 242f251d35..7a7123d370 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java
@@ -81,8 +81,7 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket<ItemListType
 		packet.writeC(item.getCustomType1()); // Filler (always 0)
 		packet.writeH(item.getEquipped()); // Equipped : 00-No, 01-yes
 		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.writeC(item.getEnchantLevel()); // Enchant level (pet level shown in control item)
-		packet.writeC(0x00); // 286 protocol
+		packet.writeH(item.getEnchantLevel()); // Enchant level (pet level shown in control item)
 		packet.writeD(item.getMana());
 		packet.writeC(0x00); // 270 protocol
 		packet.writeD(item.getTime());
@@ -129,8 +128,7 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket<ItemListType
 		packet.writeC(item.getCustomType1()); // Filler (always 0)
 		packet.writeH(item.getEquipped()); // Equipped : 00-No, 01-yes
 		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.writeC(item.getEnchantLevel()); // Enchant level (pet level shown in control item)
-		packet.writeC(0x00); // 286 protocol
+		packet.writeH(item.getEnchantLevel()); // Enchant level (pet level shown in control item)
 		packet.writeD(item.getMana());
 		packet.writeC(0x00); // 270 protocol
 		packet.writeD(item.getTime());
diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java
index 242f251d35..7a7123d370 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java
+++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java
@@ -81,8 +81,7 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket<ItemListType
 		packet.writeC(item.getCustomType1()); // Filler (always 0)
 		packet.writeH(item.getEquipped()); // Equipped : 00-No, 01-yes
 		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.writeC(item.getEnchantLevel()); // Enchant level (pet level shown in control item)
-		packet.writeC(0x00); // 286 protocol
+		packet.writeH(item.getEnchantLevel()); // Enchant level (pet level shown in control item)
 		packet.writeD(item.getMana());
 		packet.writeC(0x00); // 270 protocol
 		packet.writeD(item.getTime());
@@ -129,8 +128,7 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket<ItemListType
 		packet.writeC(item.getCustomType1()); // Filler (always 0)
 		packet.writeH(item.getEquipped()); // Equipped : 00-No, 01-yes
 		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.writeC(item.getEnchantLevel()); // Enchant level (pet level shown in control item)
-		packet.writeC(0x00); // 286 protocol
+		packet.writeH(item.getEnchantLevel()); // Enchant level (pet level shown in control item)
 		packet.writeD(item.getMana());
 		packet.writeC(0x00); // 270 protocol
 		packet.writeD(item.getTime());