From 82e76a5ccb36cac90f16d8109863358e8dda3359 Mon Sep 17 00:00:00 2001 From: Scott Burns Date: Thu, 16 May 2019 01:15:53 +0200 Subject: [PATCH] Refactor Safespot --- .../plugins/safespot/SafeSpotOverlay.java | 2 +- .../client/plugins/safespot/SafeSpotPlugin.java | 17 ++++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/safespot/SafeSpotOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/safespot/SafeSpotOverlay.java index 26f11c3be6..be044aa554 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/safespot/SafeSpotOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/safespot/SafeSpotOverlay.java @@ -44,7 +44,7 @@ public class SafeSpotOverlay extends Overlay { if (safeSpotPlugin.isSafeSpotsRenderable()) { - if(safeSpotPlugin.getSafeSpotList() != null) + if (safeSpotPlugin.getSafeSpotList() != null) { if (safeSpotPlugin.getSafeSpotList().size() > 0) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/safespot/SafeSpotPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/safespot/SafeSpotPlugin.java index 13deb896cd..f63662c390 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/safespot/SafeSpotPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/safespot/SafeSpotPlugin.java @@ -40,16 +40,18 @@ import net.runelite.client.ui.overlay.OverlayManager; ) public class SafeSpotPlugin extends Plugin { - @Inject private Client client; + @Inject OverlayManager overlayManager; + @Inject private SafeSpotConfig config; @Getter private ArrayList safeSpotList; + @Getter private boolean safeSpotsRenderable = false; @@ -132,7 +134,8 @@ public class SafeSpotPlugin extends Plugin /** * The ArrayList of 1-way safe spots - * @param actor - The Actor that the tiles are a safe spot against + * + * @param actor - The Actor that the tiles are a safe spot against * @param worldPoints - Worldpoints in the current scene * @return an ArrayList of Tiles where current player can attack actor but actor cannot attack local player */ @@ -140,7 +143,7 @@ public class SafeSpotPlugin extends Plugin { ArrayList safeSpotList = new ArrayList<>(); Tile[][][] tiles = client.getScene().getTiles(); - for (WorldPoint w:worldPoints) + for (WorldPoint w : worldPoints) { LocalPoint toPoint = LocalPoint.fromWorld(client, w); Tile fromTile = tiles[client.getPlane()][actor.getLocalLocation().getSceneX()] @@ -151,11 +154,11 @@ public class SafeSpotPlugin extends Plugin int bit = client.getCollisionMaps()[plane].getFlags()[toPoint.getSceneX()][toPoint.getSceneY()]; if (toTile.hasLineOfSightTo(fromTile) && !fromTile.hasLineOfSightTo(toTile)) { - if (!((bit & CollisionDataFlag.BLOCK_MOVEMENT_OBJECT ) == CollisionDataFlag.BLOCK_MOVEMENT_OBJECT || - (bit & CollisionDataFlag.BLOCK_MOVEMENT_FLOOR_DECORATION ) + if (!((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)) + (bit & CollisionDataFlag.BLOCK_MOVEMENT_FLOOR) == CollisionDataFlag.BLOCK_MOVEMENT_FLOOR || + (bit & CollisionDataFlag.BLOCK_MOVEMENT_FULL) == CollisionDataFlag.BLOCK_MOVEMENT_FULL)) { safeSpotList.add(toTile); }