From 1675a7e0a18e6a079b9a2ef0dd96c85668b46444 Mon Sep 17 00:00:00 2001 From: Jordan Atwood Date: Sun, 17 Feb 2019 19:26:56 -0800 Subject: [PATCH] worldpoint: Add static fromRegion method --- .../main/java/net/runelite/api/coords/WorldPoint.java | 11 +++++++++++ .../plugins/groundmarkers/GroundMarkerPlugin.java | 7 +------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/coords/WorldPoint.java b/runelite-api/src/main/java/net/runelite/api/coords/WorldPoint.java index a0a23e6674..e1ab0b0cac 100644 --- a/runelite-api/src/main/java/net/runelite/api/coords/WorldPoint.java +++ b/runelite-api/src/main/java/net/runelite/api/coords/WorldPoint.java @@ -326,4 +326,15 @@ public class WorldPoint { return ((x >> 6) << 8) | (y >> 6); } + + /** + * Converts the passed region ID and coordinates to a world coordinate + */ + public static WorldPoint fromRegion(int regionId, int regionX, int regionY, int plane) + { + return new WorldPoint( + ((regionId >>> 8) << 6) + regionX, + ((regionId & 0xff) << 6) + regionY, + plane); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPlugin.java index 2cb7ebf1c2..db848c30f5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPlugin.java @@ -163,12 +163,7 @@ public class GroundMarkerPlugin extends Plugin int regionY = point.getRegionY(); int z = point.getZ(); - // world point of the tile marker - return new WorldPoint( - ((regionId >>> 8) << 6) + regionX, - ((regionId & 0xff) << 6) + regionY, - z - ); + return WorldPoint.fromRegion(regionId, regionX, regionY, z); }) .flatMap(wp -> WorldPoint.toLocalInstance(client, wp).stream()) .collect(Collectors.toList());