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)