From 9fc8197f03e1fb64838674fca1dd7c23c4384a54 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sun, 20 Mar 2022 23:12:43 +0000 Subject: [PATCH] Fixed probable Player getHenna NPE. --- .../java/org/l2jmobius/gameserver/model/actor/Player.java | 8 +++++++- .../java/org/l2jmobius/gameserver/model/actor/Player.java | 8 +++++++- 2 files changed, 14 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 e23a7b599d..d269b604cd 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 @@ -8257,7 +8257,13 @@ public class Player extends Playable return null; } - return _hennaPoten[slot - 1].getHenna(); + final HennaPoten poten = _hennaPoten[slot - 1]; + if (poten == null) + { + return null; + } + + return poten.getHenna(); } /** 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 e23a7b599d..d269b604cd 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 @@ -8257,7 +8257,13 @@ public class Player extends Playable return null; } - return _hennaPoten[slot - 1].getHenna(); + final HennaPoten poten = _hennaPoten[slot - 1]; + if (poten == null) + { + return null; + } + + return poten.getHenna(); } /**