Gain HP bonus only from enchanted armor items.

L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java

@@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.data.xml.impl.EnchantItemHPBonusData;
 import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.actor.instance.L2PetInstance;
+import com.l2jmobius.gameserver.model.items.L2Item;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jmobius.gameserver.model.stats.BaseStats;
 import com.l2jmobius.gameserver.model.stats.IStatsFunction;
@@ -53,7 +54,14 @@ public class MaxHpFinalizer implements IStatsFunction
 				// Apply enchanted item's bonus HP
 				for (L2ItemInstance item : player.getInventory().getPaperdollItems(L2ItemInstance::isEnchanted))
 				{
-					baseValue += EnchantItemHPBonusData.getInstance().getHPBonus(item);
+					if (item.isArmor())
+					{
+						final int bodyPart = item.getItem().getBodyPart();
+						if ((bodyPart != L2Item.SLOT_NECK) && (bodyPart != L2Item.SLOT_LR_EAR) && (bodyPart != L2Item.SLOT_LR_FINGER))
+						{
+							baseValue += EnchantItemHPBonusData.getInstance().getHPBonus(item);
+						}
+					}
 				}
 			}
 		}

L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java

@@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.data.xml.impl.EnchantItemHPBonusData;
 import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.actor.instance.L2PetInstance;
+import com.l2jmobius.gameserver.model.items.L2Item;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jmobius.gameserver.model.stats.BaseStats;
 import com.l2jmobius.gameserver.model.stats.IStatsFunction;
@@ -53,7 +54,14 @@ public class MaxHpFinalizer implements IStatsFunction
 				// Apply enchanted item's bonus HP
 				for (L2ItemInstance item : player.getInventory().getPaperdollItems(L2ItemInstance::isEnchanted))
 				{
-					baseValue += EnchantItemHPBonusData.getInstance().getHPBonus(item);
+					if (item.isArmor())
+					{
+						final int bodyPart = item.getItem().getBodyPart();
+						if ((bodyPart != L2Item.SLOT_NECK) && (bodyPart != L2Item.SLOT_LR_EAR) && (bodyPart != L2Item.SLOT_LR_FINGER))
+						{
+							baseValue += EnchantItemHPBonusData.getInstance().getHPBonus(item);
+						}
+					}
 				}
 			}
 		}

L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java

@@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.data.xml.impl.EnchantItemHPBonusData;
 import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.actor.instance.L2PetInstance;
+import com.l2jmobius.gameserver.model.items.L2Item;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jmobius.gameserver.model.stats.BaseStats;
 import com.l2jmobius.gameserver.model.stats.IStatsFunction;
@@ -53,7 +54,14 @@ public class MaxHpFinalizer implements IStatsFunction
 				// Apply enchanted item's bonus HP
 				for (L2ItemInstance item : player.getInventory().getPaperdollItems(L2ItemInstance::isEnchanted))
 				{
-					baseValue += EnchantItemHPBonusData.getInstance().getHPBonus(item);
+					if (item.isArmor())
+					{
+						final int bodyPart = item.getItem().getBodyPart();
+						if ((bodyPart != L2Item.SLOT_NECK) && (bodyPart != L2Item.SLOT_LR_EAR) && (bodyPart != L2Item.SLOT_LR_FINGER))
+						{
+							baseValue += EnchantItemHPBonusData.getInstance().getHPBonus(item);
+						}
+					}
 				}
 			}
 		}

L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java

@@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.data.xml.impl.EnchantItemHPBonusData;
 import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.actor.instance.L2PetInstance;
+import com.l2jmobius.gameserver.model.items.L2Item;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jmobius.gameserver.model.stats.BaseStats;
 import com.l2jmobius.gameserver.model.stats.IStatsFunction;
@@ -53,7 +54,14 @@ public class MaxHpFinalizer implements IStatsFunction
 				// Apply enchanted item's bonus HP
 				for (L2ItemInstance item : player.getInventory().getPaperdollItems(L2ItemInstance::isEnchanted))
 				{
-					baseValue += EnchantItemHPBonusData.getInstance().getHPBonus(item);
+					if (item.isArmor())
+					{
+						final int bodyPart = item.getItem().getBodyPart();
+						if ((bodyPart != L2Item.SLOT_NECK) && (bodyPart != L2Item.SLOT_LR_EAR) && (bodyPart != L2Item.SLOT_LR_FINGER))
+						{
+							baseValue += EnchantItemHPBonusData.getInstance().getHPBonus(item);
+						}
+					}
 				}
 			}
 		}

L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java

@@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.data.xml.impl.EnchantItemHPBonusData;
 import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.actor.instance.L2PetInstance;
+import com.l2jmobius.gameserver.model.items.L2Item;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jmobius.gameserver.model.stats.BaseStats;
 import com.l2jmobius.gameserver.model.stats.IStatsFunction;
@@ -53,7 +54,14 @@ public class MaxHpFinalizer implements IStatsFunction
 				// Apply enchanted item's bonus HP
 				for (L2ItemInstance item : player.getInventory().getPaperdollItems(L2ItemInstance::isEnchanted))
 				{
-					baseValue += EnchantItemHPBonusData.getInstance().getHPBonus(item);
+					if (item.isArmor())
+					{
+						final long bodyPart = item.getItem().getBodyPart();
+						if ((bodyPart != L2Item.SLOT_NECK) && (bodyPart != L2Item.SLOT_LR_EAR) && (bodyPart != L2Item.SLOT_LR_FINGER))
+						{
+							baseValue += EnchantItemHPBonusData.getInstance().getHPBonus(item);
+						}
+					}
 				}
 			}
 		}

L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java

@@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.data.xml.impl.EnchantItemHPBonusData;
 import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.actor.instance.L2PetInstance;
+import com.l2jmobius.gameserver.model.items.L2Item;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jmobius.gameserver.model.stats.BaseStats;
 import com.l2jmobius.gameserver.model.stats.IStatsFunction;
@@ -53,7 +54,14 @@ public class MaxHpFinalizer implements IStatsFunction
 				// Apply enchanted item's bonus HP
 				for (L2ItemInstance item : player.getInventory().getPaperdollItems(L2ItemInstance::isEnchanted))
 				{
-					baseValue += EnchantItemHPBonusData.getInstance().getHPBonus(item);
+					if (item.isArmor())
+					{
+						final long bodyPart = item.getItem().getBodyPart();
+						if ((bodyPart != L2Item.SLOT_NECK) && (bodyPart != L2Item.SLOT_LR_EAR) && (bodyPart != L2Item.SLOT_LR_FINGER))
+						{
+							baseValue += EnchantItemHPBonusData.getInstance().getHPBonus(item);
+						}
+					}
 				}
 			}
 		}

L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/type/ArmorType.java

@@ -26,9 +26,6 @@ public enum ArmorType implements ItemType
 	HEAVY,
 	MAGIC,
 	SIGIL,
-	RING,
-	EARRING,
-	NECKLACE,
 	
 	// L2J CUSTOM
 	SHIELD;

L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java

@@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.data.xml.impl.EnchantItemHPBonusData;
 import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.actor.instance.L2PetInstance;
+import com.l2jmobius.gameserver.model.items.L2Item;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jmobius.gameserver.model.stats.BaseStats;
 import com.l2jmobius.gameserver.model.stats.IStatsFunction;
@@ -53,7 +54,14 @@ public class MaxHpFinalizer implements IStatsFunction
 				// Apply enchanted item's bonus HP
 				for (L2ItemInstance item : player.getInventory().getPaperdollItems(L2ItemInstance::isEnchanted))
 				{
-					baseValue += EnchantItemHPBonusData.getInstance().getHPBonus(item);
+					if (item.isArmor())
+					{
+						final int bodyPart = item.getItem().getBodyPart();
+						if ((bodyPart != L2Item.SLOT_NECK) && (bodyPart != L2Item.SLOT_LR_EAR) && (bodyPart != L2Item.SLOT_LR_FINGER))
+						{
+							baseValue += EnchantItemHPBonusData.getInstance().getHPBonus(item);
+						}
+					}
 				}
 			}
 		}

L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/items/type/ArmorType.java

@@ -26,9 +26,6 @@ public enum ArmorType implements ItemType
 	HEAVY,
 	MAGIC,
 	SIGIL,
-	RING,
-	EARRING,
-	NECKLACE,
 	
 	// L2J CUSTOM
 	SHIELD;

L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java

@@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.data.xml.impl.EnchantItemHPBonusData;
 import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.actor.instance.L2PetInstance;
+import com.l2jmobius.gameserver.model.items.L2Item;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jmobius.gameserver.model.stats.BaseStats;
 import com.l2jmobius.gameserver.model.stats.IStatsFunction;
@@ -53,7 +54,14 @@ public class MaxHpFinalizer implements IStatsFunction
 				// Apply enchanted item's bonus HP
 				for (L2ItemInstance item : player.getInventory().getPaperdollItems(L2ItemInstance::isEnchanted))
 				{
-					baseValue += EnchantItemHPBonusData.getInstance().getHPBonus(item);
+					if (item.isArmor())
+					{
+						final int bodyPart = item.getItem().getBodyPart();
+						if ((bodyPart != L2Item.SLOT_NECK) && (bodyPart != L2Item.SLOT_LR_EAR) && (bodyPart != L2Item.SLOT_LR_FINGER))
+						{
+							baseValue += EnchantItemHPBonusData.getInstance().getHPBonus(item);
+						}
+					}
 				}
 			}
 		}

L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/items/type/ArmorType.java

@@ -26,9 +26,6 @@ public enum ArmorType implements ItemType
 	HEAVY,
 	MAGIC,
 	SIGIL,
-	RING,
-	EARRING,
-	NECKLACE,
 	
 	// L2J CUSTOM
 	SHIELD;

L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java

@@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.data.xml.impl.EnchantItemHPBonusData;
 import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.actor.instance.L2PetInstance;
+import com.l2jmobius.gameserver.model.items.L2Item;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jmobius.gameserver.model.stats.BaseStats;
 import com.l2jmobius.gameserver.model.stats.IStatsFunction;
@@ -53,7 +54,14 @@ public class MaxHpFinalizer implements IStatsFunction
 				// Apply enchanted item's bonus HP
 				for (L2ItemInstance item : player.getInventory().getPaperdollItems(L2ItemInstance::isEnchanted))
 				{
-					baseValue += EnchantItemHPBonusData.getInstance().getHPBonus(item);
+					if (item.isArmor())
+					{
+						final long bodyPart = item.getItem().getBodyPart();
+						if ((bodyPart != L2Item.SLOT_NECK) && (bodyPart != L2Item.SLOT_LR_EAR) && (bodyPart != L2Item.SLOT_LR_FINGER))
+						{
+							baseValue += EnchantItemHPBonusData.getInstance().getHPBonus(item);
+						}
+					}
 				}
 			}
 		}

L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/items/type/ArmorType.java

@@ -26,9 +26,6 @@ public enum ArmorType implements ItemType
 	HEAVY,
 	MAGIC,
 	SIGIL,
-	RING,
-	EARRING,
-	NECKLACE,
 	
 	// L2J CUSTOM
 	SHIELD;

L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java

@@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.data.xml.impl.EnchantItemHPBonusData;
 import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.actor.instance.L2PetInstance;
+import com.l2jmobius.gameserver.model.items.L2Item;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jmobius.gameserver.model.stats.BaseStats;
 import com.l2jmobius.gameserver.model.stats.IStatsFunction;
@@ -53,7 +54,14 @@ public class MaxHpFinalizer implements IStatsFunction
 				// Apply enchanted item's bonus HP
 				for (L2ItemInstance item : player.getInventory().getPaperdollItems(L2ItemInstance::isEnchanted))
 				{
-					baseValue += EnchantItemHPBonusData.getInstance().getHPBonus(item);
+					if (item.isArmor())
+					{
+						final long bodyPart = item.getItem().getBodyPart();
+						if ((bodyPart != L2Item.SLOT_NECK) && (bodyPart != L2Item.SLOT_LR_EAR) && (bodyPart != L2Item.SLOT_LR_FINGER))
+						{
+							baseValue += EnchantItemHPBonusData.getInstance().getHPBonus(item);
+						}
+					}
 				}
 			}
 		}