From a20b209802c0fa6f3f4cbada8431cdf13a68ff9a Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Thu, 30 Dec 2021 22:07:05 +0000
Subject: [PATCH] Beauty shop should work for Death Knight dualclass.

---
 .../scripts/ai/others/LaVieEnRose/LaVieEnRose.java |  4 +++-
 .../gameserver/model/CharSelectInfoPackage.java    | 14 ++++++++++++++
 .../l2jmobius/gameserver/model/actor/Player.java   | 12 ++++++++++++
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/others/LaVieEnRose/LaVieEnRose.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/others/LaVieEnRose/LaVieEnRose.java
index 758b91a046..293ef358c0 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/others/LaVieEnRose/LaVieEnRose.java
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/others/LaVieEnRose/LaVieEnRose.java
@@ -16,6 +16,8 @@
  */
 package ai.others.LaVieEnRose;
 
+import org.l2jmobius.gameserver.data.xml.CategoryData;
+import org.l2jmobius.gameserver.enums.CategoryType;
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
@@ -133,7 +135,7 @@ public class LaVieEnRose extends AbstractNpcAI
 			return false;
 		}
 		
-		if (player.isDeathKnight())
+		if (CategoryData.getInstance().isInCategory(CategoryType.DEATH_KNIGHT_ALL_CLASS, player.getClassId().getId()))
 		{
 			player.sendPacket(SystemMessageId.DEATH_KNIGHT_CLASSES_ARE_UNAVAILABLE);
 			return false;
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/CharSelectInfoPackage.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/CharSelectInfoPackage.java
index 6111fbdb73..46585ff258 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/CharSelectInfoPackage.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/CharSelectInfoPackage.java
@@ -16,6 +16,8 @@
  */
 package org.l2jmobius.gameserver.model;
 
+import org.l2jmobius.gameserver.data.xml.CategoryData;
+import org.l2jmobius.gameserver.enums.CategoryType;
 import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory;
 import org.l2jmobius.gameserver.model.variables.PlayerVariables;
 
@@ -207,6 +209,10 @@ public class CharSelectInfoPackage
 	
 	public int getFace()
 	{
+		if (CategoryData.getInstance().isInCategory(CategoryType.DEATH_KNIGHT_ALL_CLASS, _classId))
+		{
+			return _face;
+		}
 		return _vars.getInt("visualFaceId", _face);
 	}
 	
@@ -217,6 +223,10 @@ public class CharSelectInfoPackage
 	
 	public int getHairColor()
 	{
+		if (CategoryData.getInstance().isInCategory(CategoryType.DEATH_KNIGHT_ALL_CLASS, _classId))
+		{
+			return _hairColor;
+		}
 		return _vars.getInt("visualHairColorId", _hairColor);
 	}
 	
@@ -227,6 +237,10 @@ public class CharSelectInfoPackage
 	
 	public int getHairStyle()
 	{
+		if (CategoryData.getInstance().isInCategory(CategoryType.DEATH_KNIGHT_ALL_CLASS, _classId))
+		{
+			return _hairStyle;
+		}
 		return _vars.getInt("visualHairId", _hairStyle);
 	}
 	
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java
index cb9001035f..5870bf294e 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -13698,6 +13698,10 @@ public class Player extends Playable
 	 */
 	public int getVisualHair()
 	{
+		if (CategoryData.getInstance().isInCategory(CategoryType.DEATH_KNIGHT_ALL_CLASS, getClassId().getId()))
+		{
+			return _appearance.getHairStyle();
+		}
 		return getVariables().getInt("visualHairId", _appearance.getHairStyle());
 	}
 	
@@ -13706,6 +13710,10 @@ public class Player extends Playable
 	 */
 	public int getVisualHairColor()
 	{
+		if (CategoryData.getInstance().isInCategory(CategoryType.DEATH_KNIGHT_ALL_CLASS, getClassId().getId()))
+		{
+			return _appearance.getHairColor();
+		}
 		return getVariables().getInt("visualHairColorId", _appearance.getHairColor());
 	}
 	
@@ -13714,6 +13722,10 @@ public class Player extends Playable
 	 */
 	public int getVisualFace()
 	{
+		if (CategoryData.getInstance().isInCategory(CategoryType.DEATH_KNIGHT_ALL_CLASS, getClassId().getId()))
+		{
+			return _appearance.getFace();
+		}
 		return getVariables().getInt("visualFaceId", _appearance.getFace());
 	}