From 22d18954f24712db6b6043e66ca9b35a816bdee4 Mon Sep 17 00:00:00 2001 From: Kyle <48519776+xKylee@users.noreply.github.com> Date: Thu, 30 Jan 2020 10:04:49 +0000 Subject: [PATCH] Revert "pvpupdate: attackable pvp world levels from 15 to 10 (#2293)" This reverts commit 17f997a141cea738f81dec91c4ed40460bf157f8. --- .../src/main/java/net/runelite/client/util/MiscUtils.java | 2 +- .../src/main/java/net/runelite/client/util/PvPUtil.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/util/MiscUtils.java b/runelite-client/src/main/java/net/runelite/client/util/MiscUtils.java index e489bdc20d..29e7d7b93f 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/MiscUtils.java +++ b/runelite-client/src/main/java/net/runelite/client/util/MiscUtils.java @@ -70,7 +70,7 @@ public class MiscUtils if (client.getWorldType().stream().anyMatch(worldType -> worldType == WorldType.PVP || worldType == WorldType.HIGH_RISK)) { - wildernessLevel += 10; + wildernessLevel += 15; } return Math.max(0, wildernessLevel); 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 22b277b0d0..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 @@ -72,9 +72,9 @@ public class PvPUtil { if (client.getVar(Varbits.IN_WILDERNESS) != 1) { - return Math.abs(client.getLocalPlayer().getCombatLevel() - player.getCombatLevel()) <= 10; + return Math.abs(client.getLocalPlayer().getCombatLevel() - player.getCombatLevel()) <= 15; } - wildernessLevel = 10; + wildernessLevel = 15; } return Math.abs(client.getLocalPlayer().getCombatLevel() - player.getCombatLevel()) < (getWildernessLevelFrom(client.getLocalPlayer().getWorldLocation()) + wildernessLevel);