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 51ed7a4a9d..9e015b7e42 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 @@ -128,11 +128,13 @@ public class CannonPlugin extends Plugin protected void startUp() throws Exception { overlayManager.add(cannonOverlay); + overlayManager.add(cannonSpotOverlay); } @Override protected void shutDown() throws Exception { + cannonSpotOverlay.setHidden(true); overlayManager.remove(cannonOverlay); overlayManager.remove(cannonSpotOverlay); cannonPlaced = false; @@ -190,14 +192,7 @@ public class CannonPlugin extends Plugin } } - if (hasAll) - { - overlayManager.add(cannonSpotOverlay); - } - else - { - overlayManager.remove(cannonSpotOverlay); - } + cannonSpotOverlay.setHidden(!hasAll); } @Subscribe diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonSpotOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonSpotOverlay.java index a7f3975b23..dc25e74be8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonSpotOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonSpotOverlay.java @@ -30,6 +30,8 @@ import java.awt.Graphics2D; import java.awt.Polygon; import java.awt.image.BufferedImage; import javax.inject.Inject; +import lombok.AccessLevel; +import lombok.Setter; import net.runelite.api.Client; import static net.runelite.api.ItemID.CANNONBALL; import net.runelite.api.Perspective; @@ -52,6 +54,9 @@ public class CannonSpotOverlay extends Overlay @Inject private ItemManager itemManager; + @Setter(AccessLevel.PACKAGE) + private boolean hidden; + @Inject CannonSpotOverlay(Client client, CannonPlugin plugin, CannonConfig config) { @@ -64,7 +69,7 @@ public class CannonSpotOverlay extends Overlay @Override public Dimension render(Graphics2D graphics) { - if (!config.showCannonSpots() || plugin.isCannonPlaced()) + if (hidden || !config.showCannonSpots() || plugin.isCannonPlaced()) { return null; }