From dcd8f6a8372fdd12679b2d51c2f7815066bc5d97 Mon Sep 17 00:00:00 2001 From: Lucwousin Date: Sun, 28 Jun 2020 02:35:37 +0200 Subject: [PATCH] Fix PvPUtil.isAttackable --- .../net/runelite/client/util/PvPUtil.java | 26 +++++-------------- 1 file changed, 7 insertions(+), 19 deletions(-) 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 de4968d476..935f8b953d 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 @@ -24,9 +24,6 @@ import java.util.Comparator; import java.util.Objects; import java.util.TreeMap; -/** - * - */ public class PvPUtil { private static final Polygon NOT_WILDERNESS_BLACK_KNIGHTS = new Polygon( // this is black knights castle @@ -81,29 +78,20 @@ public class PvPUtil public static boolean isAttackable(Client client, Player player) { int wildernessLevel = 0; - - 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) - { - return Math.abs(client.getLocalPlayer().getCombatLevel() - player.getCombatLevel()) <= 15; - } - wildernessLevel = 15; + wildernessLevel += 15; } - return Math.abs(client.getLocalPlayer().getCombatLevel() - player.getCombatLevel()) - < (getWildernessLevelFrom(client.getLocalPlayer().getWorldLocation()) + wildernessLevel); + if (client.getVar(Varbits.IN_WILDERNESS) == 1) + { + wildernessLevel += getWildernessLevelFrom(client.getLocalPlayer().getWorldLocation()); + } + return wildernessLevel != 0 && Math.abs(client.getLocalPlayer().getCombatLevel() - player.getCombatLevel()) <= wildernessLevel; } public static int calculateRisk(Client client, ItemManager itemManager)