From 347d5b2ef76e342a10927e89c53a1fe738bc05fa Mon Sep 17 00:00:00 2001 From: Kamiel <35824069+Kamielvf@users.noreply.github.com> Date: Mon, 1 Oct 2018 21:34:30 +0200 Subject: [PATCH] Make raids scout overlay not show at Olm (#5734) This will prevent the scout overlay from rendering while at Olm as the information there is obsolete. Closes #5721 --- .../net/runelite/client/plugins/raids/RaidsOverlay.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsOverlay.java index 682cacab69..cceb8ef64b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsOverlay.java @@ -29,6 +29,7 @@ import java.awt.Dimension; import java.awt.Graphics2D; import javax.inject.Inject; import lombok.Setter; +import net.runelite.api.Client; import net.runelite.client.plugins.raids.solver.Room; import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.OverlayPosition; @@ -39,6 +40,9 @@ import net.runelite.client.ui.overlay.components.TitleComponent; public class RaidsOverlay extends Overlay { + private static final int OLM_PLANE = 0; + + private Client client; private RaidsPlugin plugin; private RaidsConfig config; private final PanelComponent panelComponent = new PanelComponent(); @@ -47,10 +51,11 @@ public class RaidsOverlay extends Overlay private boolean scoutOverlayShown = false; @Inject - public RaidsOverlay(RaidsPlugin plugin, RaidsConfig config) + public RaidsOverlay(Client client, RaidsPlugin plugin, RaidsConfig config) { setPosition(OverlayPosition.TOP_LEFT); setPriority(OverlayPriority.LOW); + this.client = client; this.plugin = plugin; this.config = config; } @@ -58,7 +63,7 @@ public class RaidsOverlay extends Overlay @Override public Dimension render(Graphics2D graphics) { - if (!config.scoutOverlay() || !scoutOverlayShown) + if (!config.scoutOverlay() || !scoutOverlayShown || client.getPlane() == OLM_PLANE) { return null; }