From 5bebd34bbf81da5143237fe6d524f7d532107ecd Mon Sep 17 00:00:00 2001 From: Jordan Atwood Date: Tue, 23 Apr 2019 12:38:17 -0700 Subject: [PATCH 1/2] WorldType: Fix HIGH_RISK world type name This world type is not specifically a PVP world type; at the time of this commit, world 365 is a non-PVP high-risk world, where the world is the same as a regular members' world, except that the Protect Item prayer is disabled. --- .../main/java/net/runelite/http/api/worlds/WorldType.java | 2 +- .../net/runelite/http/service/worlds/ServiceWorldType.java | 2 +- runelite-api/src/main/java/net/runelite/api/WorldType.java | 6 +++--- .../net/runelite/client/plugins/discord/DiscordPlugin.java | 2 +- .../client/plugins/worldhopper/WorldHopperPlugin.java | 2 +- .../runelite/client/plugins/worldhopper/WorldTableRow.java | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/http-api/src/main/java/net/runelite/http/api/worlds/WorldType.java b/http-api/src/main/java/net/runelite/http/api/worlds/WorldType.java index 3bea0a4cbc..c94a7c70e6 100644 --- a/http-api/src/main/java/net/runelite/http/api/worlds/WorldType.java +++ b/http-api/src/main/java/net/runelite/http/api/worlds/WorldType.java @@ -30,7 +30,7 @@ public enum WorldType PVP, BOUNTY, SKILL_TOTAL, - PVP_HIGH_RISK, + HIGH_RISK, LAST_MAN_STANDING, TOURNAMENT, DEADMAN, diff --git a/http-service/src/main/java/net/runelite/http/service/worlds/ServiceWorldType.java b/http-service/src/main/java/net/runelite/http/service/worlds/ServiceWorldType.java index 1a3c1271f9..c6aa598321 100644 --- a/http-service/src/main/java/net/runelite/http/service/worlds/ServiceWorldType.java +++ b/http-service/src/main/java/net/runelite/http/service/worlds/ServiceWorldType.java @@ -32,7 +32,7 @@ enum ServiceWorldType PVP(WorldType.PVP, 1 << 2), BOUNTY(WorldType.BOUNTY, 1 << 5), SKILL_TOTAL(WorldType.SKILL_TOTAL, 1 << 7), - PVP_HIGH_RISK(WorldType.PVP_HIGH_RISK, 1 << 10), + HIGH_RISK(WorldType.HIGH_RISK, 1 << 10), LAST_MAN_STANDING(WorldType.LAST_MAN_STANDING, 1 << 14), TOURNAMENT(WorldType.TOURNAMENT, 1 << 25), DEADMAN_TOURNAMENT(WorldType.DEADMAN_TOURNAMENT, 1 << 26), 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 b22bc17fb3..8929691be0 100644 --- a/runelite-api/src/main/java/net/runelite/api/WorldType.java +++ b/runelite-api/src/main/java/net/runelite/api/WorldType.java @@ -49,9 +49,9 @@ public enum WorldType */ SKILL_TOTAL(1 << 7), /** - * Pvp high risk world type. + * High risk world type. */ - PVP_HIGH_RISK(1 << 10), + HIGH_RISK(1 << 10), /** * Last man standing world type. */ @@ -84,7 +84,7 @@ public enum WorldType DEADMAN, DEADMAN_TOURNAMENT, PVP, - PVP_HIGH_RISK, + 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 9598b7eff5..c5a86c6df2 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 @@ -409,7 +409,7 @@ public class DiscordPlugin extends Plugin if (worldType.contains(WorldType.SEASONAL_DEADMAN) || worldType.contains(WorldType.DEADMAN) || worldType.contains(WorldType.PVP) || - worldType.contains(WorldType.PVP_HIGH_RISK)) + worldType.contains(WorldType.HIGH_RISK)) { return false; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java index a6d52f7025..a161be1af6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java @@ -509,7 +509,7 @@ public class WorldHopperPlugin extends Plugin if (config.quickhopOutOfDanger()) { currentWorldTypes.remove(WorldType.PVP); - currentWorldTypes.remove(WorldType.PVP_HIGH_RISK); + currentWorldTypes.remove(WorldType.HIGH_RISK); } // Don't regard these worlds as a type that must be hopped between currentWorldTypes.remove(WorldType.BOUNTY); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableRow.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableRow.java index c23face9ba..2cf20ddd4f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableRow.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableRow.java @@ -244,7 +244,7 @@ class WorldTableRow extends JPanel return; } else if (world.getTypes().contains(WorldType.PVP) - || world.getTypes().contains(WorldType.PVP_HIGH_RISK) + || world.getTypes().contains(WorldType.HIGH_RISK) || world.getTypes().contains(WorldType.DEADMAN) || world.getTypes().contains(WorldType.SEASONAL_DEADMAN)) { From 011791d82374c21964d4e4a0b762c6bc3119c063 Mon Sep 17 00:00:00 2001 From: Jordan Atwood Date: Tue, 23 Apr 2019 12:40:43 -0700 Subject: [PATCH 2/2] 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; }