From 7c8db8025e35adc03999965bef656e3b8fb9297d Mon Sep 17 00:00:00 2001 From: Adam Date: Sat, 28 Apr 2018 17:21:20 -0400 Subject: [PATCH] Revert "Fix cannon cannonball count" This reverts commit 9d215b4b285711e511997157b944a2fb745b873e. --- .../client/plugins/cannon/CannonPlugin.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonPlugin.java index bed1d16f22..d72e04d453 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonPlugin.java @@ -67,6 +67,7 @@ import net.runelite.client.ui.overlay.infobox.InfoBoxManager; public class CannonPlugin extends Plugin { private static final Pattern NUMBER_PATTERN = Pattern.compile("([0-9]+)"); + private static final int MAX_CBALLS = 30; private CannonCounter counter; @@ -235,7 +236,16 @@ public class CannonPlugin extends Plugin if (m.find()) { int amt = Integer.valueOf(m.group()); - cballsLeft += amt; + + // make sure cballs doesn't go above MAX_CBALLS + if (amt + cballsLeft > MAX_CBALLS) + { + cballsLeft = MAX_CBALLS; + } + else + { + cballsLeft += amt; + } } } @@ -246,6 +256,8 @@ public class CannonPlugin extends Plugin if (event.getMessage().contains("Your cannon is out of ammo!")) { + cballsLeft = 0; + if (config.showEmptyCannonNotification()) { notifier.notify("Your cannon is out of ammo!");