ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #2299 from open-osrs/revert-2293-jamflex-wildershiii

Browse Source 
pvpupdate: attackable pvp world levels from 10 to 15
This commit is contained in:
Kyle
2020-01-30 10:15:30 +00:00
committed by GitHub
parent 8563ec6123 22d18954f2
commit 2ab5d72b52
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runelite-client/src/main/java/net/runelite/client/util/MiscUtils.java
View File

@@ -70,7 +70,7 @@ public class MiscUtils
if (client.getWorldType().stream().anyMatch(worldType -> worldType == WorldType.PVP || worldType == WorldType.HIGH_RISK)) if (client.getWorldType().stream().anyMatch(worldType -> worldType == WorldType.PVP || worldType == WorldType.HIGH_RISK))
{ {
wildernessLevel += 10; wildernessLevel += 15;
} }
return Math.max(0, wildernessLevel); return Math.max(0, wildernessLevel);

4
runelite-client/src/main/java/net/runelite/client/util/PvPUtil.java
View File

@@ -72,9 +72,9 @@ public class PvPUtil
{ {
if (client.getVar(Varbits.IN_WILDERNESS) != 1) 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()) return Math.abs(client.getLocalPlayer().getCombatLevel() - player.getCombatLevel())
< (getWildernessLevelFrom(client.getLocalPlayer().getWorldLocation()) + wildernessLevel); < (getWildernessLevelFrom(client.getLocalPlayer().getWorldLocation()) + wildernessLevel);