From 57711cc9ffa1190039aa70a5ff49e0256a21a4c2 Mon Sep 17 00:00:00 2001 From: Davis Cook Date: Fri, 23 Nov 2018 16:23:41 -0500 Subject: [PATCH] Fix incorrect slayer kill remaining count in xp tracker (#6615) Properly check for combat skill when trying to update NPC experience Fixes #6614 --- .../net/runelite/client/plugins/xptracker/XpStateSingle.java | 3 ++- .../net/runelite/client/plugins/xptracker/XpTrackerPlugin.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpStateSingle.java b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpStateSingle.java index 6a9825cd33..7f4eef8d1c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpStateSingle.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpStateSingle.java @@ -196,7 +196,8 @@ class XpStateSingle } else { - // So we have a decent average off the bat, lets populate all values with what we see. + // populate all values in our action history array with this first value that we see + // so the average value of our action history starts out as this first value we see for (int i = 0; i < action.getActionExps().length; i++) { action.getActionExps()[i] = actionExp; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java index f3ca559e4a..92f8e7daa8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java @@ -263,7 +263,7 @@ public class XpTrackerPlugin extends Plugin state.setActionType(XpActionType.EXPERIENCE); final Actor interacting = client.getLocalPlayer().getInteracting(); - if (interacting instanceof NPC) + if (interacting instanceof NPC && COMBAT.contains(skill)) { final NPC npc = (NPC) interacting; xpState.updateNpcExperience(skill, npc, npcManager.getHealth(npc.getName(), npc.getCombatLevel()));