Merge pull request #8625 from Nightfirecat/fix-high-risk-worlds

Fix high risk world type name, remove from PVP world types

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,

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),

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,6 @@ public enum WorldType
 		DEADMAN,
 		DEADMAN_TOURNAMENT,
 		PVP,
-		PVP_HIGH_RISK,
 		SEASONAL_DEADMAN
 	);
 

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

@@ -406,10 +406,7 @@ public class DiscordPlugin extends Plugin
 		final EnumSet<WorldType> 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.PVP_HIGH_RISK))
+		if (WorldType.isPvpWorld(worldType))
 		{
 			return false;
 		}

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);

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))
 		{