From db29a29a74883661865c67524a6331cabf8fd691 Mon Sep 17 00:00:00 2001
From: sdburns1998 <sdburn1998@gmail.com>
Date: Sun, 7 Jul 2019 04:10:34 +0200
Subject: [PATCH] flexo: MErge nested if statements

---
 .../client/plugins/flexo/FlexoPlugin.java     | 54 ++++++++-----------
 1 file changed, 21 insertions(+), 33 deletions(-)

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoPlugin.java
index 2bd8470bcf..e0e1b57b20 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoPlugin.java
@@ -172,15 +172,12 @@ public class FlexoPlugin extends Plugin
 			{
 				for (NPC npc : client.getNpcs())
 				{
-					if (npc != null)
+					if (npc != null && npc.getConvexHull() != null)
 					{
-						if (npc.getConvexHull() != null)
-						{
-							Rectangle r = FlexoMouse.getClickArea(npc.getConvexHull().getBounds());
-							this.clickAreas.add(r);
-							java.awt.Point p = FlexoMouse.getClickPoint(r);
-							this.clickPoints.add(p);
-						}
+						Rectangle r = FlexoMouse.getClickArea(npc.getConvexHull().getBounds());
+						this.clickAreas.add(r);
+						java.awt.Point p = FlexoMouse.getClickPoint(r);
+						this.clickPoints.add(p);
 					}
 				}
 			}
@@ -194,15 +191,12 @@ public class FlexoPlugin extends Plugin
 			{
 				for (Player player : client.getPlayers())
 				{
-					if (player != null)
+					if (player != null && player.getConvexHull() != null)
 					{
-						if (player.getConvexHull() != null)
-						{
-							Rectangle r = FlexoMouse.getClickArea(player.getConvexHull().getBounds());
-							this.clickAreas.add(r);
-							java.awt.Point p = FlexoMouse.getClickPoint(r);
-							this.clickPoints.add(p);
-						}
+						Rectangle r = FlexoMouse.getClickArea(player.getConvexHull().getBounds());
+						this.clickAreas.add(r);
+						java.awt.Point p = FlexoMouse.getClickPoint(r);
+						this.clickPoints.add(p);
 					}
 				}
 			}
@@ -214,27 +208,21 @@ public class FlexoPlugin extends Plugin
 			Flexo.isStretched = client.isStretchedEnabled();
 			Flexo.scale = this.scalingFactor;
 
-			if (flexo != null)
+			if (flexo != null && GroundItemsPlugin.getCollectedGroundItems() != null)
 			{
-				if (GroundItemsPlugin.getCollectedGroundItems() != null)
+				for (GroundItem gi : GroundItemsPlugin.getCollectedGroundItems().values())
 				{
-					for (GroundItem gi : GroundItemsPlugin.getCollectedGroundItems().values())
+					if (gi != null)
 					{
-						if (gi != null)
+						LocalPoint lp = LocalPoint.fromWorld(client, gi.getLocation());
+						if (lp != null && Perspective.getCanvasTilePoly(client, lp) != null)
 						{
-							LocalPoint lp = LocalPoint.fromWorld(client, gi.getLocation());
-							if (lp != null)
-							{
-								if (Perspective.getCanvasTilePoly(client, lp) != null)
-								{
-									Rectangle r1 = FlexoMouse.getClickArea(Perspective.getCanvasTilePoly(client, lp).getBounds());
-									Rectangle r2 = FlexoMouse.getClickArea(r1);
-									Rectangle r3 = FlexoMouse.getClickArea(r2);
-									this.clickAreas.add(r3);
-									java.awt.Point p = FlexoMouse.getClickPoint(r3);
-									this.clickPoints.add(p);
-								}
-							}
+							Rectangle r1 = FlexoMouse.getClickArea(Perspective.getCanvasTilePoly(client, lp).getBounds());
+							Rectangle r2 = FlexoMouse.getClickArea(r1);
+							Rectangle r3 = FlexoMouse.getClickArea(r2);
+							this.clickAreas.add(r3);
+							java.awt.Point p = FlexoMouse.getClickPoint(r3);
+							this.clickPoints.add(p);
 						}
 					}
 				}