From 592ce098035a67e3c35d72752de0b624524c511d Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Wed, 30 May 2018 10:40:31 +0000
Subject: [PATCH] Fixed Henna packets. Contributed by proGenitor.

---
 .../gameserver/network/serverpackets/HennaEquipList.java      | 1 -
 .../gameserver/network/serverpackets/HennaItemDrawInfo.java   | 4 ----
 .../gameserver/network/serverpackets/HennaRemoveList.java     | 3 +--
 .../gameserver/network/serverpackets/HennaEquipList.java      | 1 -
 .../gameserver/network/serverpackets/HennaItemDrawInfo.java   | 4 ----
 .../gameserver/network/serverpackets/HennaRemoveList.java     | 3 +--
 .../gameserver/network/serverpackets/HennaItemDrawInfo.java   | 4 ----
 .../gameserver/network/serverpackets/HennaRemoveList.java     | 2 +-
 8 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java
index dd10c1edb5..313324b091 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java
@@ -63,7 +63,6 @@ public class HennaEquipList implements IClientOutgoingPacket
 				packet.writeQ(henna.getWearCount()); // amount of dyes required
 				packet.writeQ(henna.getWearFee()); // amount of Adena required
 				packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // meet the requirement or not
-				packet.writeD(0x00); // TODO: Find me!
 			}
 		}
 		return true;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java
index 9037e5f20c..e7188829a1 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java
@@ -59,10 +59,6 @@ public class HennaItemDrawInfo implements IClientOutgoingPacket
 		packet.writeH(_activeChar.getDEX() + _activeChar.getHennaValue(BaseStats.DEX)); // equip DEX
 		packet.writeD(_activeChar.getWIT()); // current WIT
 		packet.writeH(_activeChar.getWIT() + _activeChar.getHennaValue(BaseStats.WIT)); // equip WIT
-		packet.writeD(_activeChar.getLUC()); // current LUC
-		packet.writeH(_activeChar.getLUC() + _activeChar.getHennaValue(BaseStats.LUC)); // equip LUC
-		packet.writeD(_activeChar.getCHA()); // current CHA
-		packet.writeH(_activeChar.getCHA() + _activeChar.getHennaValue(BaseStats.CHA)); // equip CHA
 		packet.writeD(0x00); // TODO: Find me!
 		return true;
 	}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java
index 9d7a59b79d..d8de8f1922 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java
@@ -50,8 +50,7 @@ public class HennaRemoveList implements IClientOutgoingPacket
 				packet.writeD(henna.getDyeItemId());
 				packet.writeQ(henna.getCancelCount());
 				packet.writeQ(henna.getCancelFee());
-				packet.writeD(0x00);
-				packet.writeD(0x00);
+				packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00);
 			}
 		}
 		return true;
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java
index dd10c1edb5..313324b091 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java
@@ -63,7 +63,6 @@ public class HennaEquipList implements IClientOutgoingPacket
 				packet.writeQ(henna.getWearCount()); // amount of dyes required
 				packet.writeQ(henna.getWearFee()); // amount of Adena required
 				packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // meet the requirement or not
-				packet.writeD(0x00); // TODO: Find me!
 			}
 		}
 		return true;
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java
index 9037e5f20c..e7188829a1 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java
@@ -59,10 +59,6 @@ public class HennaItemDrawInfo implements IClientOutgoingPacket
 		packet.writeH(_activeChar.getDEX() + _activeChar.getHennaValue(BaseStats.DEX)); // equip DEX
 		packet.writeD(_activeChar.getWIT()); // current WIT
 		packet.writeH(_activeChar.getWIT() + _activeChar.getHennaValue(BaseStats.WIT)); // equip WIT
-		packet.writeD(_activeChar.getLUC()); // current LUC
-		packet.writeH(_activeChar.getLUC() + _activeChar.getHennaValue(BaseStats.LUC)); // equip LUC
-		packet.writeD(_activeChar.getCHA()); // current CHA
-		packet.writeH(_activeChar.getCHA() + _activeChar.getHennaValue(BaseStats.CHA)); // equip CHA
 		packet.writeD(0x00); // TODO: Find me!
 		return true;
 	}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java
index 9d7a59b79d..d8de8f1922 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java
@@ -50,8 +50,7 @@ public class HennaRemoveList implements IClientOutgoingPacket
 				packet.writeD(henna.getDyeItemId());
 				packet.writeQ(henna.getCancelCount());
 				packet.writeQ(henna.getCancelFee());
-				packet.writeD(0x00);
-				packet.writeD(0x00);
+				packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00);
 			}
 		}
 		return true;
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java
index 9037e5f20c..e7188829a1 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java
@@ -59,10 +59,6 @@ public class HennaItemDrawInfo implements IClientOutgoingPacket
 		packet.writeH(_activeChar.getDEX() + _activeChar.getHennaValue(BaseStats.DEX)); // equip DEX
 		packet.writeD(_activeChar.getWIT()); // current WIT
 		packet.writeH(_activeChar.getWIT() + _activeChar.getHennaValue(BaseStats.WIT)); // equip WIT
-		packet.writeD(_activeChar.getLUC()); // current LUC
-		packet.writeH(_activeChar.getLUC() + _activeChar.getHennaValue(BaseStats.LUC)); // equip LUC
-		packet.writeD(_activeChar.getCHA()); // current CHA
-		packet.writeH(_activeChar.getCHA() + _activeChar.getHennaValue(BaseStats.CHA)); // equip CHA
 		packet.writeD(0x00); // TODO: Find me!
 		return true;
 	}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java
index eccca03abc..d8de8f1922 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java
@@ -50,7 +50,7 @@ public class HennaRemoveList implements IClientOutgoingPacket
 				packet.writeD(henna.getDyeItemId());
 				packet.writeQ(henna.getCancelCount());
 				packet.writeQ(henna.getCancelFee());
-				packet.writeD(0x00);
+				packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00);
 			}
 		}
 		return true;