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

WorldType: Fix HIGH_RISK world type name

Browse Source 
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.
This commit is contained in:
Jordan Atwood
2019-04-23 12:38:17 -07:00
committed by Ganom
parent 1c5f64f336
commit 3be1c41cb9
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
http-api/src/main/java/net/runelite/http/api/worlds/WorldType.java
View File

@@ -30,7 +30,7 @@ public enum WorldType
PVP,
BOUNTY,
SKILL_TOTAL,
PVP_HIGH_RISK,
HIGH_RISK,
LAST_MAN_STANDING,
TOURNAMENT,
DEADMAN,

2
http-service/src/main/java/net/runelite/http/service/worlds/ServiceWorldType.java
View File

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

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

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

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

@@ -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;
}

2
runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java
View File

@@ -554,7 +554,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);

2
runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableRow.java
View File

@@ -245,7 +245,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))
{