diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusPlugin.java index 8bd0cf393a..18e9d4b38b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusPlugin.java @@ -159,6 +159,10 @@ public class NpcStatusPlugin extends Plugin { for (MemorizedNPC mn : memorizedNPCs) { + if (mn.getNpcIndex() != ((NPC) event.getActor()).getIndex()) + { + continue; + } if (mn.getStatus() == MemorizedNPC.Status.OUT_OF_COMBAT || (mn.getStatus() == MemorizedNPC.Status.IN_COMBAT && mn.getCombatTimerEnd() - client.getTickCount() < 1) || mn.getLastinteracted() == null) { mn.setStatus(MemorizedNPC.Status.FLINCHING); @@ -184,7 +188,11 @@ public class NpcStatusPlugin extends Plugin { for (MemorizedNPC mn : memorizedNPCs) { - if (mn.getStatus() == MemorizedNPC.Status.OUT_OF_COMBAT || (mn.getStatus() == MemorizedNPC.Status.IN_COMBAT && mn.getCombatTimerEnd() - client.getTickCount() < 2) || mn.getLastinteracted() == null) + if (mn.getNpcIndex() != ((NPC) event.getActor()).getIndex()) + { + continue; + } + if (mn.getStatus() == MemorizedNPC.Status.OUT_OF_COMBAT || (mn.getStatus() == MemorizedNPC.Status.IN_COMBAT && mn.getCombatTimerEnd() - client.getTickCount() < 2) || event.getActor().getInteracting() == null) { mn.setStatus(MemorizedNPC.Status.FLINCHING); mn.setCombatTimerEnd(-1);