core overlay: cleanup

Avoid checking config if there is no core npc
This commit is contained in:
Adam
2020-09-08 23:40:52 -04:00
parent cd40cade89
commit d2c72d6cbe

View File

@@ -29,7 +29,6 @@ import java.awt.Dimension;
import java.awt.Graphics2D; import java.awt.Graphics2D;
import java.awt.Polygon; import java.awt.Polygon;
import javax.inject.Inject; import javax.inject.Inject;
import net.runelite.api.Client;
import net.runelite.api.NPC; import net.runelite.api.NPC;
import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.Overlay;
import net.runelite.client.ui.overlay.OverlayLayer; import net.runelite.client.ui.overlay.OverlayLayer;
@@ -38,16 +37,14 @@ import net.runelite.client.ui.overlay.OverlayUtil;
class CoreOverlay extends Overlay class CoreOverlay extends Overlay
{ {
private final Client client;
private final CorpPlugin corpPlugin; private final CorpPlugin corpPlugin;
private final CorpConfig config; private final CorpConfig config;
@Inject @Inject
private CoreOverlay(Client client, CorpPlugin corpPlugin, CorpConfig corpConfig) private CoreOverlay(CorpPlugin corpPlugin, CorpConfig corpConfig)
{ {
setPosition(OverlayPosition.DYNAMIC); setPosition(OverlayPosition.DYNAMIC);
setLayer(OverlayLayer.ABOVE_SCENE); setLayer(OverlayLayer.ABOVE_SCENE);
this.client = client;
this.corpPlugin = corpPlugin; this.corpPlugin = corpPlugin;
this.config = corpConfig; this.config = corpConfig;
} }
@@ -55,13 +52,8 @@ class CoreOverlay extends Overlay
@Override @Override
public Dimension render(Graphics2D graphics) public Dimension render(Graphics2D graphics)
{ {
if (!config.markDarkCore())
{
return null;
}
NPC core = corpPlugin.getCore(); NPC core = corpPlugin.getCore();
if (core != null) if (core != null && config.markDarkCore())
{ {
Polygon canvasTilePoly = core.getCanvasTilePoly(); Polygon canvasTilePoly = core.getCanvasTilePoly();
if (canvasTilePoly != null) if (canvasTilePoly != null)