From 298c27953c7134311ed3b0adf4abb6c5f4895cdb Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Thu, 10 Mar 2022 23:24:58 +0000
Subject: [PATCH] Fixed probable henna restoration NPE.

---
 .../java/org/l2jmobius/gameserver/model/actor/Player.java    | 5 ++++-
 .../java/org/l2jmobius/gameserver/model/actor/Player.java    | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Player.java
index 767989fd38..e23a7b599d 100644
--- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -7959,8 +7959,11 @@ public class Player extends Playable
 						continue;
 					}
 					
-					// retail mobius final Henna henna = HennaData.getInstance().getHenna(symbolId);
 					final Henna henna = HennaData.getInstance().getHennaByDyeId(symbolId);
+					if (henna == null)
+					{
+						continue;
+					}
 					
 					// Task for henna duration
 					if (henna.getDuration() > 0)
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Player.java
index 767989fd38..e23a7b599d 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -7959,8 +7959,11 @@ public class Player extends Playable
 						continue;
 					}
 					
-					// retail mobius final Henna henna = HennaData.getInstance().getHenna(symbolId);
 					final Henna henna = HennaData.getInstance().getHennaByDyeId(symbolId);
+					if (henna == null)
+					{
+						continue;
+					}
 					
 					// Task for henna duration
 					if (henna.getDuration() > 0)