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

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

Browse Source 
Fix high risk world type name, remove from PVP world types
This commit is contained in:
Adam
2019-04-23 17:18:39 -04:00
committed by GitHub
parent 30d834075c 011791d823
commit 02fa354b92
6 changed files with 7 additions and 11 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, PVP,
BOUNTY, BOUNTY,
SKILL_TOTAL, SKILL_TOTAL,
PVP_HIGH_RISK, HIGH_RISK,
LAST_MAN_STANDING, LAST_MAN_STANDING,
TOURNAMENT, TOURNAMENT,
DEADMAN, 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), PVP(WorldType.PVP, 1 << 2),
BOUNTY(WorldType.BOUNTY, 1 << 5), BOUNTY(WorldType.BOUNTY, 1 << 5),
SKILL_TOTAL(WorldType.SKILL_TOTAL, 1 << 7), 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), LAST_MAN_STANDING(WorldType.LAST_MAN_STANDING, 1 << 14),
TOURNAMENT(WorldType.TOURNAMENT, 1 << 25), TOURNAMENT(WorldType.TOURNAMENT, 1 << 25),
DEADMAN_TOURNAMENT(WorldType.DEADMAN_TOURNAMENT, 1 << 26), DEADMAN_TOURNAMENT(WorldType.DEADMAN_TOURNAMENT, 1 << 26),

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

@@ -49,9 +49,9 @@ public enum WorldType
*/ */
SKILL_TOTAL(1 << 7), 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. * Last man standing world type.
*/ */
@@ -84,7 +84,6 @@ public enum WorldType
DEADMAN, DEADMAN,
DEADMAN_TOURNAMENT, DEADMAN_TOURNAMENT,
PVP, 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.PVP_HIGH_RISK))
{ {
return false; return false;
} }

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

@@ -509,7 +509,7 @@ public class WorldHopperPlugin extends Plugin
if (config.quickhopOutOfDanger()) if (config.quickhopOutOfDanger())
{ {
currentWorldTypes.remove(WorldType.PVP); 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 // Don't regard these worlds as a type that must be hopped between
currentWorldTypes.remove(WorldType.BOUNTY); currentWorldTypes.remove(WorldType.BOUNTY);

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

@@ -244,7 +244,7 @@ class WorldTableRow extends JPanel
return; return;
} }
else if (world.getTypes().contains(WorldType.PVP) 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.DEADMAN)
|| world.getTypes().contains(WorldType.SEASONAL_DEADMAN)) || world.getTypes().contains(WorldType.SEASONAL_DEADMAN))
{ {