From b96867bb06e6f29b0327c2d7a634484ba12f1293 Mon Sep 17 00:00:00 2001 From: Adam Date: Sat, 18 Jun 2022 22:28:51 -0400 Subject: [PATCH] Require Attack option for dying npcs --- .../src/main/java/net/runelite/client/game/NpcUtil.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/game/NpcUtil.java b/runelite-client/src/main/java/net/runelite/client/game/NpcUtil.java index a34c0abf1c..ee4f580512 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/NpcUtil.java +++ b/runelite-client/src/main/java/net/runelite/client/game/NpcUtil.java @@ -28,8 +28,10 @@ package net.runelite.client.game; import java.util.Set; import javax.inject.Inject; import net.runelite.api.NPC; +import net.runelite.api.NPCComposition; import net.runelite.api.NpcID; import net.runelite.client.RuntimeConfig; +import org.apache.commons.lang3.ArrayUtils; public class NpcUtil { @@ -96,7 +98,9 @@ public class NpcUtil return false; } - return npc.isDead(); + final NPCComposition npcComposition = npc.getTransformedComposition(); + boolean hasAttack = npcComposition != null && ArrayUtils.contains(npcComposition.getActions(), "Attack"); + return hasAttack && npc.isDead(); } } }