Skip to content

Commit dbbbe59

Browse files
committed
Rs2ActorModel: fix actor::getWorldLocation
1 parent 541157b commit dbbbe59

1 file changed

Lines changed: 7 additions & 2 deletions

File tree

  • runelite-client/src/main/java/net/runelite/client/plugins/microbot/api/actor

runelite-client/src/main/java/net/runelite/client/plugins/microbot/api/actor/Rs2ActorModel.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public WorldPoint getWorldLocation()
7676
return Microbot.getClientThread().invoke(this::projectActorLocationToMainWorld);
7777
}
7878

79-
return actor.getWorldLocation();
79+
return Microbot.getClientThread().runOnClientThreadOptional(() -> actor.getWorldLocation()).orElse(null);
8080
}
8181

8282
@Override
@@ -450,7 +450,12 @@ public long getHash()
450450
}
451451

452452
public WorldPoint projectActorLocationToMainWorld() {
453-
WorldPoint actorLocation = actor.getWorldLocation();
453+
WorldPoint actorLocation = Microbot.getClientThread().runOnClientThreadOptional(() -> actor.getWorldLocation()).orElse(null);
454+
if (actorLocation == null)
455+
{
456+
return getWorldLocation();
457+
}
458+
454459
LocalPoint localPoint = LocalPoint.fromWorld(
455460
getWorldView(),
456461
actorLocation

0 commit comments

Comments
 (0)