From e0c68052feb5538bda46b6a1d46d406084344e73 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Mon, 15 Jun 2020 21:31:39 +0000
Subject: [PATCH] Adjustments for singular accessory slot.

---
 .../model/itemcontainer/Inventory.java        | 104 +++++++++---------
 .../gameserver/model/items/Item.java          |   4 +-
 2 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index 28cee9aea7..e536b7e24a 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -69,8 +69,8 @@ public abstract class Inventory extends ItemContainer
 	public static final int PAPERDOLL_BACK = 13;
 	public static final int PAPERDOLL_LRHAND = 14;
 	public static final int PAPERDOLL_FACE = 15;
-	public static final int PAPERDOLL_HAIR = 16;
-	public static final int PAPERDOLL_DHAIR = 17;
+	public static final int PAPERDOLL_HAIR = 15; // 16 - Added after C4.
+	public static final int PAPERDOLL_DHAIR = 15; // 17 - Added after C4.
 	
 	public static final int PAPERDOLL_TOTALSLOTS = 18;
 	
@@ -957,16 +957,16 @@ public abstract class Inventory extends ItemContainer
 				slot = Item.SLOT_L_FINGER;
 				break;
 			}
-			case PAPERDOLL_HAIR:
-			{
-				slot = Item.SLOT_HAIR;
-				break;
-			}
-			case PAPERDOLL_FACE:
-			{
-				slot = Item.SLOT_FACE;
-				break;
-			}
+			// case PAPERDOLL_HAIR:
+			// {
+			// slot = Item.SLOT_HAIR;
+			// break;
+			// }
+			// case PAPERDOLL_FACE:
+			// {
+			// slot = Item.SLOT_FACE;
+			// break;
+			// }
 			case PAPERDOLL_DHAIR:
 			{
 				slot = Item.SLOT_DHAIR;
@@ -1118,16 +1118,16 @@ public abstract class Inventory extends ItemContainer
 				pdollSlot = PAPERDOLL_LFINGER;
 				break;
 			}
-			case Item.SLOT_HAIR:
-			{
-				pdollSlot = PAPERDOLL_HAIR;
-				break;
-			}
-			case Item.SLOT_FACE:
-			{
-				pdollSlot = PAPERDOLL_FACE;
-				break;
-			}
+			// case Item.SLOT_HAIR:
+			// {
+			// pdollSlot = PAPERDOLL_HAIR;
+			// break;
+			// }
+			// case Item.SLOT_FACE:
+			// {
+			// pdollSlot = PAPERDOLL_FACE;
+			// break;
+			// }
 			case Item.SLOT_DHAIR:
 			{
 				setPaperdollItem(PAPERDOLL_HAIR, null);
@@ -1375,36 +1375,36 @@ public abstract class Inventory extends ItemContainer
 				setPaperdollItem(PAPERDOLL_HEAD, item);
 				break;
 			}
-			case Item.SLOT_HAIR:
-			{
-				if (setPaperdollItem(PAPERDOLL_DHAIR, null) != null)
-				{
-					setPaperdollItem(PAPERDOLL_DHAIR, null);
-					setPaperdollItem(PAPERDOLL_HAIR, null);
-					setPaperdollItem(PAPERDOLL_FACE, null);
-				}
-				else
-				{
-					setPaperdollItem(PAPERDOLL_HAIR, null);
-				}
-				setPaperdollItem(PAPERDOLL_HAIR, item);
-				break;
-			}
-			case Item.SLOT_FACE:
-			{
-				if (setPaperdollItem(PAPERDOLL_DHAIR, null) != null)
-				{
-					setPaperdollItem(PAPERDOLL_DHAIR, null);
-					setPaperdollItem(PAPERDOLL_HAIR, null);
-					setPaperdollItem(PAPERDOLL_FACE, null);
-				}
-				else
-				{
-					setPaperdollItem(PAPERDOLL_FACE, null);
-				}
-				setPaperdollItem(PAPERDOLL_FACE, item);
-				break;
-			}
+			// case Item.SLOT_HAIR:
+			// {
+			// if (setPaperdollItem(PAPERDOLL_DHAIR, null) != null)
+			// {
+			// setPaperdollItem(PAPERDOLL_DHAIR, null);
+			// setPaperdollItem(PAPERDOLL_HAIR, null);
+			// setPaperdollItem(PAPERDOLL_FACE, null);
+			// }
+			// else
+			// {
+			// setPaperdollItem(PAPERDOLL_HAIR, null);
+			// }
+			// setPaperdollItem(PAPERDOLL_HAIR, item);
+			// break;
+			// }
+			// case Item.SLOT_FACE:
+			// {
+			// if (setPaperdollItem(PAPERDOLL_DHAIR, null) != null)
+			// {
+			// setPaperdollItem(PAPERDOLL_DHAIR, null);
+			// setPaperdollItem(PAPERDOLL_HAIR, null);
+			// setPaperdollItem(PAPERDOLL_FACE, null);
+			// }
+			// else
+			// {
+			// setPaperdollItem(PAPERDOLL_FACE, null);
+			// }
+			// setPaperdollItem(PAPERDOLL_FACE, item);
+			// break;
+			// }
 			case Item.SLOT_DHAIR:
 			{
 				if (setPaperdollItem(PAPERDOLL_HAIR, null) != null)
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/items/Item.java
index bcd58d956d..c32bbfc0fa 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/items/Item.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/items/Item.java
@@ -78,8 +78,8 @@ public abstract class Item
 	public static final int SLOT_HATCHLING = 0x100000;
 	public static final int SLOT_STRIDER = 0x200000;
 	public static final int SLOT_BABYPET = 0x400000;
-	public static final int SLOT_FACE = 0x040000;
-	public static final int SLOT_DHAIR = 0x080000;
+	public static final int SLOT_FACE = 0x010000; // 0x040000 - Added after C4.
+	public static final int SLOT_DHAIR = 0x010000; // 0x080000 - Added after C4.
 	
 	public static final int CRYSTAL_NONE = 0x00;
 	public static final int CRYSTAL_D = 0x01;