From 1e472cb1cd521b62722c3e823cff56afbe0a792c Mon Sep 17 00:00:00 2001
From: Adam <Adam@anope.org>
Date: Mon, 29 Jan 2018 14:18:59 -0500
Subject: [PATCH] slayer plugin: fix getting -1 count left on tasks

Don't readd a new infobox for each kill due to config update triggers
---
 .../client/plugins/slayer/SlayerPlugin.java   | 35 +++++++++++++++----
 1 file changed, 29 insertions(+), 6 deletions(-)

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java
index f43625c840..49ac588d21 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java
@@ -109,7 +109,7 @@ public class SlayerPlugin extends Plugin
 	@Override
 	protected void shutDown() throws Exception
 	{
-		infoBoxManager.removeIf(t -> t instanceof TaskCounter);
+		removeCounter();
 	}
 
 	@Override
@@ -282,21 +282,33 @@ public class SlayerPlugin extends Plugin
 			return;
 		}
 
-		infoBoxManager.removeIf(t -> t instanceof TaskCounter);
-		if (config.enabled() && config.showInfobox() && counter != null)
+		boolean enabled = config.enabled() && config.showInfobox();
+		if (enabled && counter == null)
 		{
-			infoBoxManager.addInfoBox(counter);
+			addCounter();
+		}
+		else if (!enabled && counter != null)
+		{
+			removeCounter();
 		}
 	}
 
 	private void killedOne()
 	{
+		if (amount == 0)
+		{
+			return;
+		}
+
 		amount--;
-		save();
+		config.amount(amount); // save changed value
+
 		if (!config.showInfobox())
 		{
 			return;
 		}
+
+		// update counter
 		counter.setText(String.valueOf(amount));
 	}
 
@@ -306,13 +318,18 @@ public class SlayerPlugin extends Plugin
 		amount = amt;
 		save();
 
-		infoBoxManager.removeIf(t -> t instanceof TaskCounter);
+		removeCounter();
 
 		if (taskName.isEmpty() || !config.showInfobox())
 		{
 			return;
 		}
 
+		addCounter();
+	}
+
+	private void addCounter()
+	{
 		Task task = Task.getTask(taskName);
 		int itemSpriteId = ItemID.ENCHANTED_GEM;
 		if (task == null)
@@ -332,6 +349,12 @@ public class SlayerPlugin extends Plugin
 		infoBoxManager.addInfoBox(counter);
 	}
 
+	private void removeCounter()
+	{
+		infoBoxManager.removeInfoBox(counter);
+		counter = null;
+	}
+
 	//Getters
 	@Override
 	public Overlay getOverlay()