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

object indicators: fix marking multilocs after var changes

Browse Source 
If a var changes after the marked objects are loaded, causing the object's name
to match a marked object, it would not be identified due to it not firing spawn
events
This commit is contained in:
Adam
2021-02-14 18:25:28 -05:00
parent 0b993b635c
commit 611ba39764
3 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,6 +27,7 @@ package net.runelite.client.plugins.objectindicators;
import java.awt.Color; import java.awt.Color;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.Value; import lombok.Value;
import net.runelite.api.ObjectComposition;
import net.runelite.api.TileObject; import net.runelite.api.TileObject;
/** /**
@@ -38,5 +39,13 @@ import net.runelite.api.TileObject;
class ColorTileObject class ColorTileObject
{ {
private final TileObject tileObject; private final TileObject tileObject;
/**
* Non-transformed object composition for the object
*/
private final ObjectComposition composition;
/**
* Name to highlight for multilocs
*/
private final String name;
private final Color color; private final Color color;
} }

13
runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsOverlay.java
View File

@@ -33,6 +33,7 @@ import net.runelite.api.Client;
import net.runelite.api.DecorativeObject; import net.runelite.api.DecorativeObject;
import net.runelite.api.GameObject; import net.runelite.api.GameObject;
import net.runelite.api.GroundObject; import net.runelite.api.GroundObject;
import net.runelite.api.ObjectComposition;
import net.runelite.api.TileObject; import net.runelite.api.TileObject;
import net.runelite.api.WallObject; import net.runelite.api.WallObject;
import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.Overlay;
@@ -71,6 +72,18 @@ class ObjectIndicatorsOverlay extends Overlay
continue; continue;
} }
ObjectComposition composition = colorTileObject.getComposition();
if (composition.getImpostorIds() != null)
{
// This is a multiloc
composition = composition.getImpostor();
// Only mark the object if the name still matches
if (composition == null || !composition.getName().equals(colorTileObject.getName()))
{
continue;
}
}
if (color == null || !config.rememberObjectColors()) if (color == null || !config.rememberObjectColors())
{ {
// Fallback to the current config if the object is marked before the addition of multiple colors // Fallback to the current config if the object is marked before the addition of multiple colors

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

@@ -292,16 +292,15 @@ public class ObjectIndicatorsPlugin extends Plugin
{ {
if (worldPoint.getRegionX() == objectPoint.getRegionX() if (worldPoint.getRegionX() == objectPoint.getRegionX()
&& worldPoint.getRegionY() == objectPoint.getRegionY() && worldPoint.getRegionY() == objectPoint.getRegionY()
&& worldPoint.getPlane() == objectPoint.getZ()) && worldPoint.getPlane() == objectPoint.getZ()
&& objectPoint.getId() == object.getId())
{ {
// Transform object to get the name which matches against what we've stored log.debug("Marking object {} due to matching {}", object, objectPoint);
ObjectComposition composition = getObjectComposition(object.getId()); objects.add(new ColorTileObject(object,
if (composition != null && objectPoint.getName().equals(composition.getName())) client.getObjectDefinition(object.getId()),
{ objectPoint.getName(),
log.debug("Marking object {} due to matching {}", object, objectPoint); objectPoint.getColor()));
objects.add(new ColorTileObject(object, objectPoint.getColor())); break;
break;
}
} }
} }
} }
@@ -415,7 +414,10 @@ public class ObjectIndicatorsPlugin extends Plugin
else else
{ {
objectPoints.add(point); objectPoints.add(point);
objects.add(new ColorTileObject(object, color)); objects.add(new ColorTileObject(object,
client.getObjectDefinition(object.getId()),
name,
color));
log.debug("Marking object: {}", point); log.debug("Marking object: {}", point);
} }