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

Remove PVP references to HIGH_RISK world type

Browse Source 
As described in 5bebd34bb, HIGH_RISK is not a PVP world type.

Note: this will not affect the world hopper plugin, as it both
explicitly references the high risk world type, and references the
http-api WorldType implementation, not the runelite-api WorldType which
is being modified in this commit.

Fixes runelite/runelite#8605
Fixes runelite/runelite#8624
This commit is contained in:
Jordan Atwood
2019-04-23 12:40:43 -07:00
committed by Ganom
parent 3be1c41cb9
commit 48d428edf5
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
runelite-api/src/main/java/net/runelite/api/WorldType.java
View File

@@ -84,7 +84,6 @@ public enum WorldType
DEADMAN, DEADMAN,
DEADMAN_TOURNAMENT, DEADMAN_TOURNAMENT,
PVP, PVP,
HIGH_RISK,
SEASONAL_DEADMAN SEASONAL_DEADMAN
); );

5
runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java
View File

@@ -406,10 +406,7 @@ public class DiscordPlugin extends Plugin
final EnumSet<WorldType> worldType = client.getWorldType(); final EnumSet<WorldType> worldType = client.getWorldType();
// Do not show location in PVP activities // Do not show location in PVP activities
if (worldType.contains(WorldType.SEASONAL_DEADMAN) || if (WorldType.isPvpWorld(worldType))
worldType.contains(WorldType.DEADMAN) ||
worldType.contains(WorldType.PVP) ||
worldType.contains(WorldType.HIGH_RISK))
{ {
return false; return false;
} }