From 2deadaed2e9df1fb600d1756f76e591df27d9b31 Mon Sep 17 00:00:00 2001 From: Trevor Date: Tue, 24 Mar 2020 13:05:44 -0400 Subject: [PATCH 1/2] spec counter plugin: fix other NPC hitsplats affecting specs --- .../specialcounter/SpecialCounterPlugin.java | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) 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 562b263a17..946c4d2cde 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 @@ -61,7 +61,7 @@ public class SpecialCounterPlugin extends Plugin { private int currentWorld = -1; private int specialPercentage = -1; - private boolean specialUsed; + private NPC specedNPC; private SpecialWeapon specialWeapon; private final Set interactedNpcIds = new HashSet<>(); @@ -129,7 +129,11 @@ public class SpecialCounterPlugin extends Plugin this.specialPercentage = specialPercentage; this.specialWeapon = usedSpecialWeapon(); - specialUsed = true; + Actor interacting = client.getLocalPlayer().getInteracting(); + if (interacting instanceof NPC) + { + specedNPC = (NPC) interacting; + } } @Subscribe @@ -152,9 +156,9 @@ public class SpecialCounterPlugin extends Plugin addInteracting(interactingId); } - if (specialUsed) + if (specedNPC == hitsplatApplied.getActor()) { - specialUsed = false; + specedNPC = null; if (specialWeapon != null) { @@ -189,6 +193,12 @@ public class SpecialCounterPlugin extends Plugin { NPC actor = npcDespawned.getNpc(); + // if the NPC despawns before the hitsplat is shown + if (specedNPC == actor) + { + specedNPC = null; + } + if (actor.isDead() && interactedNpcIds.contains(actor.getId())) { removeCounters(); From 1d45b1474c61282266a866795c5bbc708396fe36 Mon Sep 17 00:00:00 2001 From: Adam Date: Wed, 25 Mar 2020 18:08:41 -0400 Subject: [PATCH 2/2] boss timers: update Sarachnis time to 10 seconds --- .../main/java/net/runelite/client/plugins/bosstimer/Boss.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/bosstimer/Boss.java b/runelite-client/src/main/java/net/runelite/client/plugins/bosstimer/Boss.java index 3bd2cd68f5..f76348a7b7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/bosstimer/Boss.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/bosstimer/Boss.java @@ -58,7 +58,7 @@ enum Boss KALPHITE_QUEEN(NpcID.KALPHITE_QUEEN_965, 30, ChronoUnit.SECONDS, ItemID.KALPHITE_PRINCESS), DUSK(NpcID.DUSK_7889, 2, ChronoUnit.MINUTES, ItemID.NOON), ALCHEMICAL_HYDRA(NpcID.ALCHEMICAL_HYDRA_8622, 25200, ChronoUnit.MILLIS, ItemID.IKKLE_HYDRA), - SARACHNIS(NpcID.SARACHNIS, 30, ChronoUnit.SECONDS, ItemID.SRARACHA), + SARACHNIS(NpcID.SARACHNIS, 10, ChronoUnit.SECONDS, ItemID.SRARACHA), ZALCANO(NpcID.ZALCANO_9050, 21600, ChronoUnit.MILLIS, ItemID.SMOLCANO); private static final Map bosses;