From c1acd101000a76e980d351aa1b298b1d59e74fd2 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Fri, 19 Jun 2020 01:04:24 +0000
Subject: [PATCH] Assign proper artifact item types. Thanks to Liamxroy.

---
 .../java/org/l2jmobius/gameserver/model/items/Armor.java   | 7 ++++++-
 .../java/org/l2jmobius/gameserver/model/items/Armor.java   | 7 ++++++-
 .../java/org/l2jmobius/gameserver/model/items/Armor.java   | 7 ++++++-
 .../java/org/l2jmobius/gameserver/model/items/Armor.java   | 7 ++++++-
 .../java/org/l2jmobius/gameserver/model/items/Armor.java   | 7 ++++++-
 .../java/org/l2jmobius/gameserver/model/items/Armor.java   | 7 ++++++-
 6 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/Armor.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/Armor.java
index 87eabd5ad6..82639c05cd 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/Armor.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/Armor.java
@@ -42,7 +42,12 @@ public class Armor extends Item
 		_type = set.getEnum("armor_type", ArmorType.class, ArmorType.NONE);
 		
 		final long bodyPart = getBodyPart();
-		if ((bodyPart == Item.SLOT_NECK) || ((bodyPart & Item.SLOT_L_EAR) != 0) || ((bodyPart & Item.SLOT_L_FINGER) != 0) || ((bodyPart & Item.SLOT_R_BRACELET) != 0) || ((bodyPart & Item.SLOT_L_BRACELET) != 0) || ((bodyPart & Item.SLOT_ARTIFACT_BOOK) != 0))
+		if (bodyPart == Item.SLOT_ARTIFACT)
+		{
+			_type1 = Item.TYPE1_SHIELD_ARMOR;
+			_type2 = Item.TYPE2_ACCESSORY;
+		}
+		else if ((bodyPart == Item.SLOT_NECK) || ((bodyPart & Item.SLOT_L_EAR) != 0) || ((bodyPart & Item.SLOT_L_FINGER) != 0) || ((bodyPart & Item.SLOT_R_BRACELET) != 0) || ((bodyPart & Item.SLOT_L_BRACELET) != 0) || ((bodyPart & Item.SLOT_ARTIFACT_BOOK) != 0))
 		{
 			_type1 = Item.TYPE1_WEAPON_RING_EARRING_NECKLACE;
 			_type2 = Item.TYPE2_ACCESSORY;
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/Armor.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/Armor.java
index 87eabd5ad6..82639c05cd 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/Armor.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/Armor.java
@@ -42,7 +42,12 @@ public class Armor extends Item
 		_type = set.getEnum("armor_type", ArmorType.class, ArmorType.NONE);
 		
 		final long bodyPart = getBodyPart();
-		if ((bodyPart == Item.SLOT_NECK) || ((bodyPart & Item.SLOT_L_EAR) != 0) || ((bodyPart & Item.SLOT_L_FINGER) != 0) || ((bodyPart & Item.SLOT_R_BRACELET) != 0) || ((bodyPart & Item.SLOT_L_BRACELET) != 0) || ((bodyPart & Item.SLOT_ARTIFACT_BOOK) != 0))
+		if (bodyPart == Item.SLOT_ARTIFACT)
+		{
+			_type1 = Item.TYPE1_SHIELD_ARMOR;
+			_type2 = Item.TYPE2_ACCESSORY;
+		}
+		else if ((bodyPart == Item.SLOT_NECK) || ((bodyPart & Item.SLOT_L_EAR) != 0) || ((bodyPart & Item.SLOT_L_FINGER) != 0) || ((bodyPart & Item.SLOT_R_BRACELET) != 0) || ((bodyPart & Item.SLOT_L_BRACELET) != 0) || ((bodyPart & Item.SLOT_ARTIFACT_BOOK) != 0))
 		{
 			_type1 = Item.TYPE1_WEAPON_RING_EARRING_NECKLACE;
 			_type2 = Item.TYPE2_ACCESSORY;
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/Armor.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/Armor.java
index 87eabd5ad6..82639c05cd 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/Armor.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/Armor.java
@@ -42,7 +42,12 @@ public class Armor extends Item
 		_type = set.getEnum("armor_type", ArmorType.class, ArmorType.NONE);
 		
 		final long bodyPart = getBodyPart();
-		if ((bodyPart == Item.SLOT_NECK) || ((bodyPart & Item.SLOT_L_EAR) != 0) || ((bodyPart & Item.SLOT_L_FINGER) != 0) || ((bodyPart & Item.SLOT_R_BRACELET) != 0) || ((bodyPart & Item.SLOT_L_BRACELET) != 0) || ((bodyPart & Item.SLOT_ARTIFACT_BOOK) != 0))
+		if (bodyPart == Item.SLOT_ARTIFACT)
+		{
+			_type1 = Item.TYPE1_SHIELD_ARMOR;
+			_type2 = Item.TYPE2_ACCESSORY;
+		}
+		else if ((bodyPart == Item.SLOT_NECK) || ((bodyPart & Item.SLOT_L_EAR) != 0) || ((bodyPart & Item.SLOT_L_FINGER) != 0) || ((bodyPart & Item.SLOT_R_BRACELET) != 0) || ((bodyPart & Item.SLOT_L_BRACELET) != 0) || ((bodyPart & Item.SLOT_ARTIFACT_BOOK) != 0))
 		{
 			_type1 = Item.TYPE1_WEAPON_RING_EARRING_NECKLACE;
 			_type2 = Item.TYPE2_ACCESSORY;
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/Armor.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/Armor.java
index 87eabd5ad6..82639c05cd 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/Armor.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/Armor.java
@@ -42,7 +42,12 @@ public class Armor extends Item
 		_type = set.getEnum("armor_type", ArmorType.class, ArmorType.NONE);
 		
 		final long bodyPart = getBodyPart();
-		if ((bodyPart == Item.SLOT_NECK) || ((bodyPart & Item.SLOT_L_EAR) != 0) || ((bodyPart & Item.SLOT_L_FINGER) != 0) || ((bodyPart & Item.SLOT_R_BRACELET) != 0) || ((bodyPart & Item.SLOT_L_BRACELET) != 0) || ((bodyPart & Item.SLOT_ARTIFACT_BOOK) != 0))
+		if (bodyPart == Item.SLOT_ARTIFACT)
+		{
+			_type1 = Item.TYPE1_SHIELD_ARMOR;
+			_type2 = Item.TYPE2_ACCESSORY;
+		}
+		else if ((bodyPart == Item.SLOT_NECK) || ((bodyPart & Item.SLOT_L_EAR) != 0) || ((bodyPart & Item.SLOT_L_FINGER) != 0) || ((bodyPart & Item.SLOT_R_BRACELET) != 0) || ((bodyPart & Item.SLOT_L_BRACELET) != 0) || ((bodyPart & Item.SLOT_ARTIFACT_BOOK) != 0))
 		{
 			_type1 = Item.TYPE1_WEAPON_RING_EARRING_NECKLACE;
 			_type2 = Item.TYPE2_ACCESSORY;
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/Armor.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/Armor.java
index 87eabd5ad6..82639c05cd 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/Armor.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/Armor.java
@@ -42,7 +42,12 @@ public class Armor extends Item
 		_type = set.getEnum("armor_type", ArmorType.class, ArmorType.NONE);
 		
 		final long bodyPart = getBodyPart();
-		if ((bodyPart == Item.SLOT_NECK) || ((bodyPart & Item.SLOT_L_EAR) != 0) || ((bodyPart & Item.SLOT_L_FINGER) != 0) || ((bodyPart & Item.SLOT_R_BRACELET) != 0) || ((bodyPart & Item.SLOT_L_BRACELET) != 0) || ((bodyPart & Item.SLOT_ARTIFACT_BOOK) != 0))
+		if (bodyPart == Item.SLOT_ARTIFACT)
+		{
+			_type1 = Item.TYPE1_SHIELD_ARMOR;
+			_type2 = Item.TYPE2_ACCESSORY;
+		}
+		else if ((bodyPart == Item.SLOT_NECK) || ((bodyPart & Item.SLOT_L_EAR) != 0) || ((bodyPart & Item.SLOT_L_FINGER) != 0) || ((bodyPart & Item.SLOT_R_BRACELET) != 0) || ((bodyPart & Item.SLOT_L_BRACELET) != 0) || ((bodyPart & Item.SLOT_ARTIFACT_BOOK) != 0))
 		{
 			_type1 = Item.TYPE1_WEAPON_RING_EARRING_NECKLACE;
 			_type2 = Item.TYPE2_ACCESSORY;
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/Armor.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/Armor.java
index 87eabd5ad6..82639c05cd 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/Armor.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/Armor.java
@@ -42,7 +42,12 @@ public class Armor extends Item
 		_type = set.getEnum("armor_type", ArmorType.class, ArmorType.NONE);
 		
 		final long bodyPart = getBodyPart();
-		if ((bodyPart == Item.SLOT_NECK) || ((bodyPart & Item.SLOT_L_EAR) != 0) || ((bodyPart & Item.SLOT_L_FINGER) != 0) || ((bodyPart & Item.SLOT_R_BRACELET) != 0) || ((bodyPart & Item.SLOT_L_BRACELET) != 0) || ((bodyPart & Item.SLOT_ARTIFACT_BOOK) != 0))
+		if (bodyPart == Item.SLOT_ARTIFACT)
+		{
+			_type1 = Item.TYPE1_SHIELD_ARMOR;
+			_type2 = Item.TYPE2_ACCESSORY;
+		}
+		else if ((bodyPart == Item.SLOT_NECK) || ((bodyPart & Item.SLOT_L_EAR) != 0) || ((bodyPart & Item.SLOT_L_FINGER) != 0) || ((bodyPart & Item.SLOT_R_BRACELET) != 0) || ((bodyPart & Item.SLOT_L_BRACELET) != 0) || ((bodyPart & Item.SLOT_ARTIFACT_BOOK) != 0))
 		{
 			_type1 = Item.TYPE1_WEAPON_RING_EARRING_NECKLACE;
 			_type2 = Item.TYPE2_ACCESSORY;