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

object indicators: fix NPE thrown on logging in on a marked object

Browse Source
This commit is contained in:
Ron Young
2020-05-04 14:58:42 -05:00
committed by Tomas Slusny
parent 4817d8bdcd
commit 9f8e967f91
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,6 +39,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import javax.annotation.Nullable;
import javax.inject.Inject; import javax.inject.Inject;
import lombok.AccessLevel; import lombok.AccessLevel;
import lombok.Getter; import lombok.Getter;
@@ -335,7 +336,8 @@ public class ObjectIndicatorsPlugin extends Plugin implements KeyListener
&& worldPoint.getPlane() == objectPoint.getZ()) && worldPoint.getPlane() == objectPoint.getZ())
{ {
// 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())) ObjectComposition composition = getObjectComposition(object.getId());
if (composition != null && objectPoint.getName().equals(composition.getName()))
{ {
log.debug("Marking object {} due to matching {}", object, objectPoint); log.debug("Marking object {} due to matching {}", object, objectPoint);
objects.add(new ColorTileObject(object, objectPoint.getColor())); objects.add(new ColorTileObject(object, objectPoint.getColor()));
@@ -494,6 +496,7 @@ public class ObjectIndicatorsPlugin extends Plugin implements KeyListener
.collect(Collectors.toSet()); .collect(Collectors.toSet());
} }
@Nullable
private ObjectComposition getObjectComposition(int id) private ObjectComposition getObjectComposition(int id)
{ {
ObjectComposition objectComposition = client.getObjectDefinition(id); ObjectComposition objectComposition = client.getObjectDefinition(id);