From 8758b8ec5bf29e108668013954c5757fd04183b6 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Thu, 31 Aug 2017 18:47:22 +0000
Subject: [PATCH] Fixed some possible NPEs.

---
 .../scripts/ai/npc/PriestOfBlessing/PriestOfBlessing.java     | 4 ++--
 .../game/data/scripts/custom/Validators/SubClassSkills.java   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/PriestOfBlessing/PriestOfBlessing.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/PriestOfBlessing/PriestOfBlessing.java
index de37d5a84e..4872d12402 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/PriestOfBlessing/PriestOfBlessing.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/PriestOfBlessing/PriestOfBlessing.java
@@ -109,8 +109,8 @@ public final class PriestOfBlessing extends AbstractNpcAI
 		{
 			if (player.getAdena() >= PRICE_VOICE)
 			{
-				final String value = player.getVariables().getString("PriestOfBlessing_voice");
-				final long _reuse_time = value == "" ? 0 : Long.parseLong(value);
+				final String value = player.getVariables().getString("PriestOfBlessing_voice", "");
+				final long _reuse_time = value.isEmpty() ? 0 : Long.parseLong(value);
 				
 				if (System.currentTimeMillis() > _reuse_time)
 				{
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/Validators/SubClassSkills.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/Validators/SubClassSkills.java
index 78131cddfe..38e7eff0d7 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/Validators/SubClassSkills.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/Validators/SubClassSkills.java
@@ -150,7 +150,7 @@ public final class SubClassSkills extends Quest
 			for (int j = Config.MAX_SUBCLASS; j > 0; j--)
 			{
 				qName = VARS[i] + j;
-				qValue = player.getVariables().getString(qName);
+				qValue = player.getVariables().getString(qName, "");
 				if ((qValue == null) || qValue.isEmpty())
 				{
 					continue;