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

flexo: MErge nested if statements

Browse Source
This commit is contained in:
sdburns1998
2019-07-07 04:10:34 +02:00
parent b6fa83fcf9
commit db29a29a74
1 changed files with 21 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoPlugin.java
View File

@@ -172,15 +172,12 @@ public class FlexoPlugin extends Plugin
{ {
for (NPC npc : client.getNpcs()) 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);
Rectangle r = FlexoMouse.getClickArea(npc.getConvexHull().getBounds()); java.awt.Point p = FlexoMouse.getClickPoint(r);
this.clickAreas.add(r); this.clickPoints.add(p);
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()) 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);
Rectangle r = FlexoMouse.getClickArea(player.getConvexHull().getBounds()); java.awt.Point p = FlexoMouse.getClickPoint(r);
this.clickAreas.add(r); this.clickPoints.add(p);
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.isStretched = client.isStretchedEnabled();
Flexo.scale = this.scalingFactor; 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()); Rectangle r1 = FlexoMouse.getClickArea(Perspective.getCanvasTilePoly(client, lp).getBounds());
if (lp != null) Rectangle r2 = FlexoMouse.getClickArea(r1);
{ Rectangle r3 = FlexoMouse.getClickArea(r2);
if (Perspective.getCanvasTilePoly(client, lp) != null) this.clickAreas.add(r3);
{ java.awt.Point p = FlexoMouse.getClickPoint(r3);
Rectangle r1 = FlexoMouse.getClickArea(Perspective.getCanvasTilePoly(client, lp).getBounds()); this.clickPoints.add(p);
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);
}
}
} }
} }
} }