diff --git a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Target.java b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Target.java index f523c9f0ec95efad32476a55c95383aee25d2c3a..6fe0165c3af02ae24b8e933c9fcb484e674c6b4a 100644 --- a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Target.java +++ b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/Target.java @@ -40,9 +40,12 @@ public class Target implements ITargetTypeHandler { } final var player = activeChar.getActingPlayer(); - if ((player != null) && !player.getCurrentSkill().isCtrlPressed() && target.isAutoAttackable(activeChar)) { - activeChar.sendPacket(INCORRECT_TARGET); - return EMPTY_TARGET_LIST; + if (player != null) { + final var currentSkill = player.getCurrentSkill(); + if ((currentSkill != null) && !currentSkill.isCtrlPressed() && target.isAutoAttackable(activeChar)) { + activeChar.sendPacket(INCORRECT_TARGET); + return EMPTY_TARGET_LIST; + } } return skill.getAffectScope().affectTargets(activeChar, target, skill).toArray(EMPTY_TARGET_LIST);