From 332cffb2d24ce5bbe13c5d1bf240da27717b9f8b Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 8 Sep 2017 19:28:36 +0000 Subject: [PATCH] Fixed L2PcInstance doCast NPE. --- .../l2jmobius/gameserver/model/actor/instance/L2PcInstance.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index 790fdb159a..f37205e286 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -4547,7 +4547,7 @@ public final class L2PcInstance extends L2Playable @Override public void doCast(Skill skill) { - if (!checkUseMagicConditions(skill, getCurrentSkill().isCtrlPressed(), getCurrentSkill().isShiftPressed())) + if ((_currentSkill != null) && !checkUseMagicConditions(skill, _currentSkill.isCtrlPressed(), _currentSkill.isShiftPressed())) { setIsCastingNow(false); setIsCastingSimultaneouslyNow(false);