From 44813ce177e2feb8a9c70a76a234e26b1d7c35cb Mon Sep 17 00:00:00 2001 From: Adam Date: Sat, 16 Jun 2018 13:44:42 -0400 Subject: [PATCH] runelite-client: remove various redundant null checks --- .../runelite/client/plugins/devtools/SceneOverlay.java | 8 -------- .../client/plugins/instancemap/InstanceMapOverlay.java | 5 ----- .../plugins/kourendlibrary/KourendLibraryOverlay.java | 5 ----- .../plugins/puzzlesolver/solver/pathfinding/IDAStar.java | 5 ----- 4 files changed, 23 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/SceneOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/SceneOverlay.java index cc8a703d2a..c1363a9e8e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/SceneOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/SceneOverlay.java @@ -252,10 +252,6 @@ public class SceneOverlay extends Overlay lp = new LocalPoint( lp.getX() + dx * Perspective.LOCAL_TILE_SIZE + dx * Perspective.LOCAL_TILE_SIZE * (area.getWidth() - 1) / 2, lp.getY() + dy * Perspective.LOCAL_TILE_SIZE + dy * Perspective.LOCAL_TILE_SIZE * (area.getHeight() - 1) / 2); - if (lp == null) - { - return; - } Polygon poly = Perspective.getCanvasTilePoly(client, lp); if (poly == null) @@ -313,10 +309,6 @@ public class SceneOverlay extends Overlay private void renderTileIfHasLineOfSight(Graphics2D graphics, WorldArea start, int targetX, int targetY) { WorldPoint targetLocation = new WorldPoint(targetX, targetY, start.getPlane()); - if (targetLocation == null) - { - return; - } // Running the line of sight algorithm 100 times per frame doesn't // seem to use much CPU time, however rendering 100 tiles does diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapOverlay.java index 7118070f9e..6277d1d6a0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapOverlay.java @@ -172,11 +172,6 @@ class InstanceMapOverlay extends Overlay drawPlayerDot(graphics, client.getLocalPlayer(), Color.white, Color.black); } - if (image == null) - { - return null; - } - return new Dimension(image.getWidth(), image.getHeight()); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryOverlay.java index 6b1f1a4c6d..b459016f88 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryOverlay.java @@ -86,11 +86,6 @@ public class KourendLibraryOverlay extends Overlay List allBookcases = library.getBookcasesOnLevel(client.getPlane()); - if (allBookcases == null) - { - return null; - } - for (Bookcase bookcase : allBookcases) { // AABB diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/pathfinding/IDAStar.java b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/pathfinding/IDAStar.java index 1c1275a25e..b43418a291 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/pathfinding/IDAStar.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/pathfinding/IDAStar.java @@ -47,11 +47,6 @@ public class IDAStar extends Pathfinder { PuzzleState goalNode = path(root); - if (goalNode == null) - { - return null; - } - List path = new ArrayList<>(); PuzzleState parent = goalNode;