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

worldpoint: Add static fromRegion method

Browse Source
This commit is contained in:
Jordan Atwood
2019-02-17 19:26:56 -08:00
committed by Tomas Slusny
parent b6ab78b501
commit 1675a7e0a1
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
runelite-api/src/main/java/net/runelite/api/coords/WorldPoint.java
View File

@@ -326,4 +326,15 @@ public class WorldPoint
{ {
return ((x >> 6) << 8) | (y >> 6); 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);
}
} }

7
runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPlugin.java
View File

@@ -163,12 +163,7 @@ public class GroundMarkerPlugin extends Plugin
int regionY = point.getRegionY(); int regionY = point.getRegionY();
int z = point.getZ(); int z = point.getZ();
// world point of the tile marker return WorldPoint.fromRegion(regionId, regionX, regionY, z);
return new WorldPoint(
((regionId >>> 8) << 6) + regionX,
((regionId & 0xff) << 6) + regionY,
z
);
}) })
.flatMap(wp -> WorldPoint.toLocalInstance(client, wp).stream()) .flatMap(wp -> WorldPoint.toLocalInstance(client, wp).stream())
.collect(Collectors.toList()); .collect(Collectors.toList());