From e6cab7118f9b3024ad1d7ea4d8523884bba8a298 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Fri, 15 Nov 2019 23:22:15 +0000
Subject: [PATCH] Baylor NPE fix. Contributed by Sahar.

---
 .../instances/CrystalCaverns/CrystalCaverns.java    | 13 +++++++++----
 .../instances/CrystalCaverns/CrystalCaverns.java    | 13 +++++++++----
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java
index 7dccfedc4b..30b4bf2f43 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java
@@ -1732,12 +1732,17 @@ public class CrystalCaverns extends AbstractInstance
 			}
 			if (npc.getId() == ALARMID)
 			{
-				world._baylor.removeSkill(5244);
-				world._baylor.removeSkill(5245);
 				world._alarm = null;
-				if ((world._baylor.getMaxHp() * 0.3) < world._baylor.getStatus().getCurrentHp())
+				
+				if (world._baylor != null)
 				{
-					startQuestTimer("baylor_alarm", 40000, world._baylor, null);
+					world._baylor.removeSkill(5244);
+					world._baylor.removeSkill(5245);
+					
+					if ((world._baylor.getMaxHp() * 0.3) < world._baylor.getStatus().getCurrentHp())
+					{
+						startQuestTimer("baylor_alarm", 40000, world._baylor, null);
+					}
 				}
 			}
 			else if (npc.getId() == BAYLOR)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java
index 7dccfedc4b..30b4bf2f43 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java
@@ -1732,12 +1732,17 @@ public class CrystalCaverns extends AbstractInstance
 			}
 			if (npc.getId() == ALARMID)
 			{
-				world._baylor.removeSkill(5244);
-				world._baylor.removeSkill(5245);
 				world._alarm = null;
-				if ((world._baylor.getMaxHp() * 0.3) < world._baylor.getStatus().getCurrentHp())
+				
+				if (world._baylor != null)
 				{
-					startQuestTimer("baylor_alarm", 40000, world._baylor, null);
+					world._baylor.removeSkill(5244);
+					world._baylor.removeSkill(5245);
+					
+					if ((world._baylor.getMaxHp() * 0.3) < world._baylor.getStatus().getCurrentHp())
+					{
+						startQuestTimer("baylor_alarm", 40000, world._baylor, null);
+					}
 				}
 			}
 			else if (npc.getId() == BAYLOR)