From b384ff776edd97fa47d5c2fb109da9c879cd69b4 Mon Sep 17 00:00:00 2001
From: Adam <Adam@sigterm.info>
Date: Thu, 28 Mar 2019 20:10:09 -0400
Subject: [PATCH] speccounter: fix tracking multiple weapons in party

---
 .../client/plugins/specialcounter/SpecialCounter.java      | 6 +++++-
 .../plugins/specialcounter/SpecialCounterPlugin.java       | 7 +------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounter.java b/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounter.java
index 425c781b45..482fb45089 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounter.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounter.java
@@ -25,13 +25,18 @@
 package net.runelite.client.plugins.specialcounter;
 
 import java.awt.image.BufferedImage;
+import java.util.HashMap;
 import java.util.Map;
+import lombok.AccessLevel;
+import lombok.Getter;
 import net.runelite.client.ui.overlay.infobox.Counter;
 
 class SpecialCounter extends Counter
 {
 	private final SpecialCounterPlugin plugin;
 	private SpecialWeapon weapon;
+	@Getter(AccessLevel.PACKAGE)
+	private final Map<String, Integer> partySpecs = new HashMap<>();
 
 	SpecialCounter(BufferedImage image, SpecialCounterPlugin plugin, int hitValue, SpecialWeapon weapon)
 	{
@@ -49,7 +54,6 @@ class SpecialCounter extends Counter
 	@Override
 	public String getTooltip()
 	{
-		Map<String, Integer> partySpecs = plugin.getPartySpecs();
 		int hitValue = getCount();
 
 		if (partySpecs.isEmpty())
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 4ff5b8ae6f..4f1041a67b 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,13 +24,10 @@
  */
 package net.runelite.client.plugins.specialcounter;
 
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 import javax.inject.Inject;
-import lombok.AccessLevel;
-import lombok.Getter;
 import net.runelite.api.Actor;
 import net.runelite.api.Client;
 import net.runelite.api.EquipmentInventorySlot;
@@ -72,8 +69,6 @@ public class SpecialCounterPlugin extends Plugin
 	private SpecialWeapon specialWeapon;
 	private final Set<Integer> interactedNpcIds = new HashSet<>();
 	private final SpecialCounter[] specialCounter = new SpecialCounter[SpecialWeapon.values().length];
-	@Getter(AccessLevel.PACKAGE)
-	private final Map<String, Integer> partySpecs = new HashMap<>();
 
 	@Inject
 	private Client client;
@@ -300,6 +295,7 @@ public class SpecialCounterPlugin extends Plugin
 		}
 
 		// If in a party, add hit to partySpecs for the infobox tooltip
+		Map<String, Integer> partySpecs = counter.getPartySpecs();
 		if (!party.getMembers().isEmpty())
 		{
 			if (partySpecs.containsKey(name))
@@ -316,7 +312,6 @@ public class SpecialCounterPlugin extends Plugin
 	private void removeCounters()
 	{
 		interactedNpcIds.clear();
-		partySpecs.clear();
 
 		for (int i = 0; i < specialCounter.length; ++i)
 		{