IdleNotifier: change isAttackable to support deadman mode (#2144)

* change isAttackable to support deadman mode, where anyone from lvl 3 - 126 is attackable
open-osrs · Dec 20, 2019 · 2af5ecb · 2af5ecb
1 parent 006900d
commit 2af5ecb
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/runelite-client/src/main/java/net/runelite/client/util/PvPUtil.java b/runelite-client/src/main/java/net/runelite/client/util/PvPUtil.java
@@ -55,10 +55,19 @@ public static int getWildernessLevelFrom(WorldPoint point)
 	public static boolean isAttackable(Client client, Player player)
 	{
 		int wildernessLevel = 0;
-		if (!(client.getVar(Varbits.IN_WILDERNESS) == 1 || WorldType.isPvpWorld(client.getWorldType())))
+
+		if (!(client.getVar(Varbits.IN_WILDERNESS) == 1
+			|| WorldType.isPvpWorld(client.getWorldType())
+			|| WorldType.isDeadmanWorld(client.getWorldType())))
 		{
 			return false;
 		}
+
+		if (WorldType.isDeadmanWorld(client.getWorldType()))
+		{
+			return true;
+		}
+
 		if (WorldType.isPvpWorld(client.getWorldType()))
 		{
 			if (client.getVar(Varbits.IN_WILDERNESS) != 1)