fix: account for instanced regions for safe check (#221)

pajlads · Apr 25, 2023 · 67c1391 · 67c1391
1 parent 3c6039c
commit 67c1391
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ## Unreleased
 
+- Bugfix: Ignore deaths and player kills in instanced regions that are safe. (#221)
 - Dev: Improve test suite reliability for uploading screenshots. (#219)
 
 ## 1.4.0

diff --git a/src/main/java/dinkplugin/notifiers/DeathNotifier.java b/src/main/java/dinkplugin/notifiers/DeathNotifier.java
@@ -347,7 +347,7 @@ private static boolean isDangerous(Client client) {
             return true; // normally dangerous
 
         // inferno and fight cave are technically safe, but we want death notification regardless
-        int regionId = client.getLocalPlayer().getWorldLocation().getRegionID();
+        int regionId = WorldUtils.getLocation(client).getRegionID();
         return WorldUtils.isInferno(regionId) || WorldUtils.isTzHaarFightCave(regionId);
     }
 

diff --git a/src/main/java/dinkplugin/notifiers/PlayerKillNotifier.java b/src/main/java/dinkplugin/notifiers/PlayerKillNotifier.java
@@ -108,7 +108,7 @@ private void handleKill(Player target, int myLastDamage) {
             target.getCombatLevel(),
             equipment,
             sendLocation ? client.getWorld() : null,
-            sendLocation ? target.getWorldLocation() : null,
+            sendLocation ? WorldUtils.getLocation(client, target) : null,
             client.getBoostedSkillLevel(Skill.HITPOINTS),
             myLastDamage
         );

diff --git a/src/main/java/dinkplugin/util/WorldUtils.java b/src/main/java/dinkplugin/util/WorldUtils.java
@@ -2,8 +2,10 @@
 
 import com.google.common.collect.ImmutableSet;
 import lombok.experimental.UtilityClass;
+import net.runelite.api.Actor;
 import net.runelite.api.Client;
 import net.runelite.api.WorldType;
+import net.runelite.api.coords.WorldPoint;
 import net.runelite.api.vars.AccountType;
 import net.runelite.api.widgets.Widget;
 import net.runelite.api.widgets.WidgetInfo;
@@ -31,6 +33,17 @@ public class WorldUtils {
     private final int TZHAAR_CAVE = 9551;
     public final @VisibleForTesting int TZHAAR_PIT = 9552;
 
+    public static WorldPoint getLocation(Client client) {
+        return getLocation(client, client.getLocalPlayer());
+    }
+
+    public static WorldPoint getLocation(Client client, Actor actor) {
+        if (client.isInInstancedRegion())
+            return WorldPoint.fromLocalInstance(client, actor.getLocalLocation());
+
+        return actor.getWorldLocation();
+    }
+
     public boolean isIgnoredWorld(Set<WorldType> worldType) {
         return !Collections.disjoint(IGNORED_WORLDS, worldType);
     }
@@ -69,7 +82,7 @@ public boolean isInferno(int regionId) {
     }
 
     public boolean isLastManStanding(Client client) {
-        if (LMS_REGIONS.contains(client.getLocalPlayer().getWorldLocation().getRegionID()))
+        if (LMS_REGIONS.contains(getLocation(client).getRegionID()))
             return true;
 
         Widget widget = client.getWidget(WidgetInfo.LMS_KDA);
@@ -90,7 +103,7 @@ public boolean isPlayerOwnedHouse(int regionId) {
     }
 
     public boolean isSafeArea(Client client) {
-        int regionId = client.getLocalPlayer().getWorldLocation().getRegionID();
+        int regionId = getLocation(client).getRegionID();
 
         if (isBarbarianAssault(regionId) || isChambersOfXeric(regionId) || isInferno(regionId) ||
             isNightmareZone(regionId) || isTzHaarFightCave(regionId) || isPestControl(client)) {