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

safespot: Merge nested if statements

Browse Source
This commit is contained in:
sdburns1998
2019-07-07 18:36:13 +02:00
parent 71a1bf765d
commit 45dad20947
2 changed files with 13 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
runelite-client/src/main/java/net/runelite/client/plugins/safespot/SafeSpotOverlay.java
View File

@@ -42,25 +42,19 @@ public class SafeSpotOverlay extends Overlay
@Override
public Dimension render(Graphics2D graphics)
{
if (safeSpotPlugin.isSafeSpotsRenderable())
if (safeSpotPlugin.isSafeSpotsRenderable() && safeSpotPlugin.getSafeSpotList() != null && safeSpotPlugin.getSafeSpotList().size() > 0)
{
if (safeSpotPlugin.getSafeSpotList() != null)
safeSpotPlugin.getSafeSpotList().forEach(tile ->
{
if (safeSpotPlugin.getSafeSpotList().size() > 0)
if (tile != null && tile.getLocalLocation() != null)
{
safeSpotPlugin.getSafeSpotList().forEach(tile ->
final Polygon poly = Perspective.getCanvasTilePoly(client, tile.getLocalLocation());
if (poly != null)
{
if (tile != null && tile.getLocalLocation() != null)
{
final Polygon poly = Perspective.getCanvasTilePoly(client, tile.getLocalLocation());
if (poly != null)
{
OverlayUtil.renderPolygon(graphics, poly, safeSpotPlugin.getTileColor());
}
}
});
OverlayUtil.renderPolygon(graphics, poly, safeSpotPlugin.getTileColor());
}
}
}
});
}
return null;
}

12
runelite-client/src/main/java/net/runelite/client/plugins/safespot/SafeSpotPlugin.java
View File

@@ -173,16 +173,14 @@ public class SafeSpotPlugin extends Plugin
{
bit = Objects.requireNonNull(client.getCollisionMaps())[plane].getFlags()[toPoint.getSceneX()][toPoint.getSceneY()];
}
if (toTile != null && toTile.hasLineOfSightTo(fromTile) && !fromTile.hasLineOfSightTo(toTile))
{
if (!((bit & CollisionDataFlag.BLOCK_MOVEMENT_OBJECT) == CollisionDataFlag.BLOCK_MOVEMENT_OBJECT ||
if (toTile != null && toTile.hasLineOfSightTo(fromTile) && !fromTile.hasLineOfSightTo(toTile) &&
(!((bit & CollisionDataFlag.BLOCK_MOVEMENT_OBJECT) == CollisionDataFlag.BLOCK_MOVEMENT_OBJECT ||
(bit & CollisionDataFlag.BLOCK_MOVEMENT_FLOOR_DECORATION)
== CollisionDataFlag.BLOCK_MOVEMENT_FLOOR_DECORATION ||
(bit & CollisionDataFlag.BLOCK_MOVEMENT_FLOOR) == CollisionDataFlag.BLOCK_MOVEMENT_FLOOR ||
(bit & CollisionDataFlag.BLOCK_MOVEMENT_FULL) == CollisionDataFlag.BLOCK_MOVEMENT_FULL))
{
safeSpotList.add(toTile);
}
(bit & CollisionDataFlag.BLOCK_MOVEMENT_FULL) == CollisionDataFlag.BLOCK_MOVEMENT_FULL)))
{
safeSpotList.add(toTile);
}
}
return safeSpotList;