From 298bc0395b7ec242114972b02537e886f0a81cd9 Mon Sep 17 00:00:00 2001
From: Zoey76 <zoey_76@msn.com>
Date: Thu, 10 Dec 2020 23:28:36 -0300
Subject: [PATCH] Enemy Only target handler should not work on non-attackable
NPC
Reported by: @ShinichiYao
Fixes #312
---
.../datapack/handlers/targethandlers/EnemyOnly.java | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/EnemyOnly.java b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/EnemyOnly.java
index 8ec49db721..99ce88b139 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/targethandlers/EnemyOnly.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/targethandlers/EnemyOnly.java
@@ -51,10 +51,14 @@ public class EnemyOnly implements ITargetTypeHandler {
return EMPTY_TARGET_LIST;
}
- if (target.isAttackable()) {
- return new L2Character[] {
- target
- };
+ if (target.isNpc()) {
+ if (target.isAttackable()) {
+ return new L2Character[] {
+ target
+ };
+ }
+ activeChar.sendPacket(INCORRECT_TARGET);
+ return EMPTY_TARGET_LIST;
}
final var player = activeChar.getActingPlayer();
--
GitLab