From 011791d82374c21964d4e4a0b762c6bc3119c063 Mon Sep 17 00:00:00 2001 From: Jordan Atwood Date: Tue, 23 Apr 2019 12:40:43 -0700 Subject: [PATCH] Remove PVP references to HIGH_RISK world type 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 --- runelite-api/src/main/java/net/runelite/api/WorldType.java | 1 - .../net/runelite/client/plugins/discord/DiscordPlugin.java | 5 +---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/WorldType.java b/runelite-api/src/main/java/net/runelite/api/WorldType.java index 8929691be0..0ecfd1ed94 100644 --- a/runelite-api/src/main/java/net/runelite/api/WorldType.java +++ b/runelite-api/src/main/java/net/runelite/api/WorldType.java @@ -84,7 +84,6 @@ public enum WorldType DEADMAN, DEADMAN_TOURNAMENT, PVP, - HIGH_RISK, SEASONAL_DEADMAN ); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java index c5a86c6df2..443dd8ac12 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java @@ -406,10 +406,7 @@ public class DiscordPlugin extends Plugin final EnumSet worldType = client.getWorldType(); // Do not show location in PVP activities - if (worldType.contains(WorldType.SEASONAL_DEADMAN) || - worldType.contains(WorldType.DEADMAN) || - worldType.contains(WorldType.PVP) || - worldType.contains(WorldType.HIGH_RISK)) + if (WorldType.isPvpWorld(worldType)) { return false; }