ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

warindicators: Merge nested if statements

Browse Source
This commit is contained in:
sdburns1998
2019-07-07 21:52:34 +02:00
parent 7e178ff57f
commit f98fe21126
2 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorMiniMapOverlay.java
View File

@@ -68,13 +68,10 @@ public class WarIndicatorMiniMapOverlay extends Overlay
String[] callers = plugin.getGetActiveCallers().split(", "); String[] callers = plugin.getGetActiveCallers().split(", ");
String[] targets = plugin.getGetTargetedSnipes().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())) if (plugin.isSnipeMinimap() && ArrayUtils.contains(targets, actor.getName()))
{ {

10
runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorOverlay.java
View File

@@ -73,21 +73,15 @@ public class WarIndicatorOverlay extends Overlay
String[] callers = plugin.getGetActiveCallers().split(", "); String[] callers = plugin.getGetActiveCallers().split(", ");
String[] targets = plugin.getGetTargetedSnipes().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', ' '); String name = actor.getName().replace('\u00A0', ' ');
int offset = actor.getLogicalHeight() + 40; int offset = actor.getLogicalHeight() + 40;