Precaution for probable inventory NPE.

L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -51,6 +51,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder;
 import org.l2jmobius.gameserver.model.items.EtcItem;
 import org.l2jmobius.gameserver.model.items.Item;
+import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone;
 import org.l2jmobius.gameserver.model.items.appearance.AppearanceType;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.model.items.type.EtcItemType;
@@ -492,10 +493,17 @@ public abstract class Inventory extends ItemContainer
 			
 			// Verify and apply visual set
 			final int itemVisualId = item.getVisualId();
-			if ((itemVisualId > 0) && (AppearanceItemData.getInstance().getStone(itemVisualId).getType() == AppearanceType.FIXED) && verifyAndApply(player, item, ItemInstance::getVisualId))
+			if (itemVisualId > 0)
+			{
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				if (stone != null)
+				{
+					if ((stone.getType() == AppearanceType.FIXED) && verifyAndApply(player, item, ItemInstance::getVisualId))
 					{
 						update = true;
 					}
+				}
+			}
 			
 			if (update)
 			{

L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -51,6 +51,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder;
 import org.l2jmobius.gameserver.model.items.EtcItem;
 import org.l2jmobius.gameserver.model.items.Item;
+import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone;
 import org.l2jmobius.gameserver.model.items.appearance.AppearanceType;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.model.items.type.EtcItemType;
@@ -509,10 +510,17 @@ public abstract class Inventory extends ItemContainer
 			
 			// Verify and apply visual set
 			final int itemVisualId = item.getVisualId();
-			if ((itemVisualId > 0) && (AppearanceItemData.getInstance().getStone(itemVisualId).getType() == AppearanceType.FIXED) && verifyAndApply(player, item, ItemInstance::getVisualId))
+			if (itemVisualId > 0)
+			{
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				if (stone != null)
+				{
+					if ((stone.getType() == AppearanceType.FIXED) && verifyAndApply(player, item, ItemInstance::getVisualId))
 					{
 						update = true;
 					}
+				}
+			}
 			
 			if (update)
 			{

L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -51,6 +51,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder;
 import org.l2jmobius.gameserver.model.items.EtcItem;
 import org.l2jmobius.gameserver.model.items.Item;
+import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone;
 import org.l2jmobius.gameserver.model.items.appearance.AppearanceType;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.model.items.type.EtcItemType;
@@ -509,10 +510,17 @@ public abstract class Inventory extends ItemContainer
 			
 			// Verify and apply visual set
 			final int itemVisualId = item.getVisualId();
-			if ((itemVisualId > 0) && (AppearanceItemData.getInstance().getStone(itemVisualId).getType() == AppearanceType.FIXED) && verifyAndApply(player, item, ItemInstance::getVisualId))
+			if (itemVisualId > 0)
+			{
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				if (stone != null)
+				{
+					if ((stone.getType() == AppearanceType.FIXED) && verifyAndApply(player, item, ItemInstance::getVisualId))
 					{
 						update = true;
 					}
+				}
+			}
 			
 			if (update)
 			{

L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -51,6 +51,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder;
 import org.l2jmobius.gameserver.model.items.EtcItem;
 import org.l2jmobius.gameserver.model.items.Item;
+import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone;
 import org.l2jmobius.gameserver.model.items.appearance.AppearanceType;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.model.items.type.EtcItemType;
@@ -509,10 +510,17 @@ public abstract class Inventory extends ItemContainer
 			
 			// Verify and apply visual set
 			final int itemVisualId = item.getVisualId();
-			if ((itemVisualId > 0) && (AppearanceItemData.getInstance().getStone(itemVisualId).getType() == AppearanceType.FIXED) && verifyAndApply(player, item, ItemInstance::getVisualId))
+			if (itemVisualId > 0)
+			{
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				if (stone != null)
+				{
+					if ((stone.getType() == AppearanceType.FIXED) && verifyAndApply(player, item, ItemInstance::getVisualId))
 					{
 						update = true;
 					}
+				}
+			}
 			
 			if (update)
 			{

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -51,6 +51,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder;
 import org.l2jmobius.gameserver.model.items.EtcItem;
 import org.l2jmobius.gameserver.model.items.Item;
+import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone;
 import org.l2jmobius.gameserver.model.items.appearance.AppearanceType;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.model.items.type.EtcItemType;
@@ -514,10 +515,17 @@ public abstract class Inventory extends ItemContainer
 			
 			// Verify and apply visual set
 			final int itemVisualId = item.getVisualId();
-			if ((itemVisualId > 0) && (AppearanceItemData.getInstance().getStone(itemVisualId).getType() == AppearanceType.FIXED) && verifyAndApply(player, item, ItemInstance::getVisualId))
+			if (itemVisualId > 0)
+			{
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				if (stone != null)
+				{
+					if ((stone.getType() == AppearanceType.FIXED) && verifyAndApply(player, item, ItemInstance::getVisualId))
 					{
 						update = true;
 					}
+				}
+			}
 			
 			if (update)
 			{

L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -51,6 +51,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder;
 import org.l2jmobius.gameserver.model.items.EtcItem;
 import org.l2jmobius.gameserver.model.items.Item;
+import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone;
 import org.l2jmobius.gameserver.model.items.appearance.AppearanceType;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.model.items.type.EtcItemType;
@@ -537,10 +538,17 @@ public abstract class Inventory extends ItemContainer
 			
 			// Verify and apply visual set
 			final int itemVisualId = item.getVisualId();
-			if ((itemVisualId > 0) && (AppearanceItemData.getInstance().getStone(itemVisualId).getType() == AppearanceType.FIXED) && verifyAndApply(player, item, ItemInstance::getVisualId))
+			if (itemVisualId > 0)
+			{
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				if (stone != null)
+				{
+					if ((stone.getType() == AppearanceType.FIXED) && verifyAndApply(player, item, ItemInstance::getVisualId))
 					{
 						update = true;
 					}
+				}
+			}
 			
 			if (update)
 			{

L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -51,6 +51,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder;
 import org.l2jmobius.gameserver.model.items.EtcItem;
 import org.l2jmobius.gameserver.model.items.Item;
+import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone;
 import org.l2jmobius.gameserver.model.items.appearance.AppearanceType;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.model.items.type.EtcItemType;
@@ -537,10 +538,17 @@ public abstract class Inventory extends ItemContainer
 			
 			// Verify and apply visual set
 			final int itemVisualId = item.getVisualId();
-			if ((itemVisualId > 0) && (AppearanceItemData.getInstance().getStone(itemVisualId).getType() == AppearanceType.FIXED) && verifyAndApply(player, item, ItemInstance::getVisualId))
+			if (itemVisualId > 0)
+			{
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				if (stone != null)
+				{
+					if ((stone.getType() == AppearanceType.FIXED) && verifyAndApply(player, item, ItemInstance::getVisualId))
 					{
 						update = true;
 					}
+				}
+			}
 			
 			if (update)
 			{

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -51,6 +51,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder;
 import org.l2jmobius.gameserver.model.items.EtcItem;
 import org.l2jmobius.gameserver.model.items.Item;
+import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone;
 import org.l2jmobius.gameserver.model.items.appearance.AppearanceType;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.model.items.type.EtcItemType;
@@ -509,10 +510,17 @@ public abstract class Inventory extends ItemContainer
 			
 			// Verify and apply visual set
 			final int itemVisualId = item.getVisualId();
-			if ((itemVisualId > 0) && (AppearanceItemData.getInstance().getStone(itemVisualId).getType() == AppearanceType.FIXED) && verifyAndApply(player, item, ItemInstance::getVisualId))
+			if (itemVisualId > 0)
+			{
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				if (stone != null)
+				{
+					if ((stone.getType() == AppearanceType.FIXED) && verifyAndApply(player, item, ItemInstance::getVisualId))
 					{
 						update = true;
 					}
+				}
+			}
 			
 			if (update)
 			{

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -51,6 +51,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder;
 import org.l2jmobius.gameserver.model.items.EtcItem;
 import org.l2jmobius.gameserver.model.items.Item;
+import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone;
 import org.l2jmobius.gameserver.model.items.appearance.AppearanceType;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.model.items.type.EtcItemType;
@@ -509,10 +510,17 @@ public abstract class Inventory extends ItemContainer
 			
 			// Verify and apply visual set
 			final int itemVisualId = item.getVisualId();
-			if ((itemVisualId > 0) && (AppearanceItemData.getInstance().getStone(itemVisualId).getType() == AppearanceType.FIXED) && verifyAndApply(player, item, ItemInstance::getVisualId))
+			if (itemVisualId > 0)
+			{
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				if (stone != null)
+				{
+					if ((stone.getType() == AppearanceType.FIXED) && verifyAndApply(player, item, ItemInstance::getVisualId))
 					{
 						update = true;
 					}
+				}
+			}
 			
 			if (update)
 			{

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -51,6 +51,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder;
 import org.l2jmobius.gameserver.model.items.EtcItem;
 import org.l2jmobius.gameserver.model.items.Item;
+import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone;
 import org.l2jmobius.gameserver.model.items.appearance.AppearanceType;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.model.items.type.EtcItemType;
@@ -514,10 +515,17 @@ public abstract class Inventory extends ItemContainer
 			
 			// Verify and apply visual set
 			final int itemVisualId = item.getVisualId();
-			if ((itemVisualId > 0) && (AppearanceItemData.getInstance().getStone(itemVisualId).getType() == AppearanceType.FIXED) && verifyAndApply(player, item, ItemInstance::getVisualId))
+			if (itemVisualId > 0)
+			{
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				if (stone != null)
+				{
+					if ((stone.getType() == AppearanceType.FIXED) && verifyAndApply(player, item, ItemInstance::getVisualId))
 					{
 						update = true;
 					}
+				}
+			}
 			
 			if (update)
 			{

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -51,6 +51,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder;
 import org.l2jmobius.gameserver.model.items.EtcItem;
 import org.l2jmobius.gameserver.model.items.Item;
+import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone;
 import org.l2jmobius.gameserver.model.items.appearance.AppearanceType;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.model.items.type.EtcItemType;
@@ -537,10 +538,17 @@ public abstract class Inventory extends ItemContainer
 			
 			// Verify and apply visual set
 			final int itemVisualId = item.getVisualId();
-			if ((itemVisualId > 0) && (AppearanceItemData.getInstance().getStone(itemVisualId).getType() == AppearanceType.FIXED) && verifyAndApply(player, item, ItemInstance::getVisualId))
+			if (itemVisualId > 0)
+			{
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				if (stone != null)
+				{
+					if ((stone.getType() == AppearanceType.FIXED) && verifyAndApply(player, item, ItemInstance::getVisualId))
 					{
 						update = true;
 					}
+				}
+			}
 			
 			if (update)
 			{

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -51,6 +51,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder;
 import org.l2jmobius.gameserver.model.items.EtcItem;
 import org.l2jmobius.gameserver.model.items.Item;
+import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone;
 import org.l2jmobius.gameserver.model.items.appearance.AppearanceType;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.model.items.type.EtcItemType;
@@ -537,10 +538,17 @@ public abstract class Inventory extends ItemContainer
 			
 			// Verify and apply visual set
 			final int itemVisualId = item.getVisualId();
-			if ((itemVisualId > 0) && (AppearanceItemData.getInstance().getStone(itemVisualId).getType() == AppearanceType.FIXED) && verifyAndApply(player, item, ItemInstance::getVisualId))
+			if (itemVisualId > 0)
+			{
+				final AppearanceStone stone = AppearanceItemData.getInstance().getStone(itemVisualId);
+				if (stone != null)
+				{
+					if ((stone.getType() == AppearanceType.FIXED) && verifyAndApply(player, item, ItemInstance::getVisualId))
 					{
 						update = true;
 					}
+				}
+			}
 			
 			if (update)
 			{