From 2af5ecb6ac5f091d1bcbaf8cd4a8539968d40dd6 Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 20 Dec 2019 04:59:50 -0500 Subject: [PATCH] IdleNotifier: change isAttackable to support deadman mode (#2144) * change isAttackable to support deadman mode, where anyone from lvl 3 - 126 is attackable --- .../main/java/net/runelite/client/util/PvPUtil.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 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 index 7dbe269289..03c2a1a07c 100644 --- 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)