From f98fe211261beff4ce0c24dba8fc7711b6202c9a Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 21:52:34 +0200 Subject: [PATCH] warindicators: Merge nested if statements --- .../warindicators/WarIndicatorMiniMapOverlay.java | 7 ++----- .../plugins/warindicators/WarIndicatorOverlay.java | 14 ++++---------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorMiniMapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorMiniMapOverlay.java index 3e278405e5..5e3e253797 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorMiniMapOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorMiniMapOverlay.java @@ -68,12 +68,9 @@ public class WarIndicatorMiniMapOverlay extends Overlay String[] callers = plugin.getGetActiveCallers().split(", "); String[] targets = plugin.getGetTargetedSnipes().split(", "); - if (plugin.isCallerMinimap() && ArrayUtils.contains(callers, actor.getName())) + if (plugin.isCallerMinimap() && ArrayUtils.contains(callers, actor.getName()) && minimapLocation != null) { - if (minimapLocation != null) - { - OverlayUtil.renderTextLocation(graphics, minimapLocation, name, color); - } + OverlayUtil.renderTextLocation(graphics, minimapLocation, name, color); } if (plugin.isSnipeMinimap() && ArrayUtils.contains(targets, actor.getName())) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorOverlay.java index 4d24401d7d..c430a3ba28 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorOverlay.java @@ -73,20 +73,14 @@ public class WarIndicatorOverlay extends Overlay String[] callers = plugin.getGetActiveCallers().split(", "); String[] targets = plugin.getGetTargetedSnipes().split(", "); - if (plugin.isCallerTile() && ArrayUtils.contains(callers, actor.getName())) + if (plugin.isCallerTile() && ArrayUtils.contains(callers, actor.getName()) && poly != null) { - if (poly != null) - { - OverlayUtil.renderPolygon(graphics, poly, color); - } + OverlayUtil.renderPolygon(graphics, poly, color); } - if (plugin.isSnipeTile() && ArrayUtils.contains(targets, actor.getName())) + if (plugin.isSnipeTile() && ArrayUtils.contains(targets, actor.getName()) && poly != null) { - if (poly != null) - { - OverlayUtil.renderPolygon(graphics, poly, color); - } + OverlayUtil.renderPolygon(graphics, poly, color); } String name = actor.getName().replace('\u00A0', ' ');