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

object indicators: use WorldPoint getRegionX/Y

Browse Source
This commit is contained in:
Adam
2019-11-21 17:22:41 -05:00
parent ff6658f0e9
commit 8528ba72c6
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsPlugin.java
View File

@@ -43,7 +43,6 @@ import lombok.AccessLevel;
import lombok.Getter; import lombok.Getter;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Client; import net.runelite.api.Client;
import static net.runelite.api.Constants.REGION_SIZE;
import net.runelite.api.DecorativeObject; import net.runelite.api.DecorativeObject;
import net.runelite.api.GameObject; import net.runelite.api.GameObject;
import net.runelite.api.GameState; import net.runelite.api.GameState;
@@ -325,8 +324,8 @@ public class ObjectIndicatorsPlugin extends Plugin implements KeyListener
for (ObjectPoint objectPoint : objectPoints) for (ObjectPoint objectPoint : objectPoints)
{ {
if ((worldPoint.getX() & (REGION_SIZE - 1)) == objectPoint.getRegionX() if (worldPoint.getRegionX() == objectPoint.getRegionX()
&& (worldPoint.getY() & (REGION_SIZE - 1)) == objectPoint.getRegionY()) && worldPoint.getRegionY() == objectPoint.getRegionY())
{ {
// Transform object to get the name which matches against what we've stored // Transform object to get the name which matches against what we've stored
if (objectPoint.getName().equals(getObjectComposition(object.getId()).getName())) if (objectPoint.getName().equals(getObjectComposition(object.getId()).getName()))
@@ -419,8 +418,8 @@ public class ObjectIndicatorsPlugin extends Plugin implements KeyListener
final ObjectPoint point = new ObjectPoint( final ObjectPoint point = new ObjectPoint(
name, name,
regionId, regionId,
worldPoint.getX() & (REGION_SIZE - 1), worldPoint.getRegionX(),
worldPoint.getY() & (REGION_SIZE - 1), worldPoint.getRegionY(),
client.getPlane()); client.getPlane());
Set<ObjectPoint> objectPoints = points.computeIfAbsent(regionId, k -> new HashSet<>()); Set<ObjectPoint> objectPoints = points.computeIfAbsent(regionId, k -> new HashSet<>());