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

Merge pull request #7502 from deathbeam/skip-out-of-scene

Browse Source 
Null-check local location in trap overlay
This commit is contained in:
Adam
2019-01-22 19:14:24 -05:00
committed by GitHub
parent 31b52d779c 538da43d68
commit f0a7d653e8
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runelite-api/src/main/java/net/runelite/api/Perspective.java
View File

@@ -79,6 +79,7 @@ public class Perspective
* @return a {@link Point} on screen corresponding to the position in * @return a {@link Point} on screen corresponding to the position in
* 3D-space * 3D-space
*/ */
@Nullable
public static Point localToCanvas(@Nonnull Client client, @Nonnull LocalPoint point, int plane) public static Point localToCanvas(@Nonnull Client client, @Nonnull LocalPoint point, int plane)
{ {
return localToCanvas(client, point, plane, 0); return localToCanvas(client, point, plane, 0);
@@ -95,6 +96,7 @@ public class Perspective
* @return a {@link Point} on screen corresponding to the position in * @return a {@link Point} on screen corresponding to the position in
* 3D-space * 3D-space
*/ */
@Nullable
public static Point localToCanvas(@Nonnull Client client, @Nonnull LocalPoint point, int plane, int zOffset) public static Point localToCanvas(@Nonnull Client client, @Nonnull LocalPoint point, int plane, int zOffset)
{ {
final int tileHeight = getTileHeight(client, point, plane); final int tileHeight = getTileHeight(client, point, plane);

5
runelite-client/src/main/java/net/runelite/client/plugins/hunter/TrapOverlay.java
View File

@@ -143,6 +143,11 @@ public class TrapOverlay extends Overlay
} }
net.runelite.api.Point loc = Perspective.localToCanvas(client, localLoc, client.getPlane()); net.runelite.api.Point loc = Perspective.localToCanvas(client, localLoc, client.getPlane());
if (loc == null)
{
return;
}
double timeLeft = 1 - trap.getTrapTimeRelative(); double timeLeft = 1 - trap.getTrapTimeRelative();
ProgressPieComponent pie = new ProgressPieComponent(); ProgressPieComponent pie = new ProgressPieComponent();