Merge pull request #193 from runelite-extended/cannon

Fix Cannon Notifier Spam

runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonPlugin.java

@@ -118,6 +118,8 @@ public class CannonPlugin extends Plugin
 	@Inject
 	private ClientThread clientThread;
 
+	private boolean lock;
+
 	@Provides
 	CannonConfig provideConfig(ConfigManager configManager)
 	{
@@ -129,6 +131,7 @@ public class CannonPlugin extends Plugin
 	{
 		overlayManager.add(cannonOverlay);
 		overlayManager.add(cannonSpotOverlay);
+		lock = false;
 	}
 
 	@Override
@@ -139,6 +142,7 @@ public class CannonPlugin extends Plugin
 		overlayManager.remove(cannonSpotOverlay);
 		cannonPlaced = false;
 		cannonPosition = null;
+		lock = false;
 		cballsLeft = 0;
 		removeCounter();
 		skipProjectileCheckThisTick = false;
@@ -373,6 +377,7 @@ public class CannonPlugin extends Plugin
 	{
 		if (cballsLeft > 15)
 		{
+			lock = false;
 			return Color.green;
 		}
 		else if (cballsLeft > 5)
@@ -381,9 +386,10 @@ public class CannonPlugin extends Plugin
 		}
 		else if (cballsLeft <= config.ammoAmount())
 		{
-			if (config.notifyAmmoLeft())
+			if (config.notifyAmmoLeft() && !lock)
 			{
 				notifier.notify("Your cannon has " + config.ammoAmount() + " balls left!");
+				lock = true;
 			}
 		}