From aa1cd2c7ff79e368db6769d1c09f6b8a11c917d9 Mon Sep 17 00:00:00 2001 From: Adam Date: Thu, 7 Jan 2021 16:45:10 -0500 Subject: [PATCH] spec counter: prevent dark core, zombified spawn, and combat dummies from reseting counter These are commonly attacked during boss fights or whilst speccing down bosses and shouldn't reset the counter Co-authored-by: vitorebom --- .../plugins/specialcounter/SpecialCounterPlugin.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounterPlugin.java index dbe313272c..5ca87940ff 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounterPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounterPlugin.java @@ -24,6 +24,7 @@ */ package net.runelite.client.plugins.specialcounter; +import com.google.common.collect.ImmutableSet; import java.util.HashSet; import java.util.Map; import java.util.Set; @@ -38,6 +39,7 @@ import net.runelite.api.InventoryID; import net.runelite.api.Item; import net.runelite.api.ItemContainer; import net.runelite.api.NPC; +import net.runelite.api.NpcID; import net.runelite.api.VarPlayer; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.HitsplatApplied; @@ -62,6 +64,11 @@ import net.runelite.client.ws.WSClient; @Slf4j public class SpecialCounterPlugin extends Plugin { + private static final Set IGNORED_NPCS = ImmutableSet.of( + NpcID.DARK_ENERGY_CORE, NpcID.ZOMBIFIED_SPAWN, NpcID.ZOMBIFIED_SPAWN_8063, + NpcID.COMBAT_DUMMY, NpcID.UNDEAD_COMBAT_DUMMY + ); + private int currentWorld; private int specialPercentage; private Actor lastSpecTarget; @@ -191,6 +198,11 @@ public class SpecialCounterPlugin extends Plugin NPC npc = (NPC) target; int interactingId = npc.getId(); + if (IGNORED_NPCS.contains(interactingId)) + { + return; + } + // If this is a new NPC reset the counters if (!interactedNpcIds.contains(interactingId)) {