From e320d6ca088dbe58038b8eb4a25578382c46ce3d Mon Sep 17 00:00:00 2001
From: Zoey76 <zoey_76@msn.com>
Date: Sun, 24 Jan 2021 23:00:16 -0300
Subject: [PATCH] Minor fix for Target target handler
Reported by: @m443556
---
.../datapack/handlers/targethandlers/Target.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
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 f523c9f0ec..6fe0165c3a 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);
--
GitLab