Merge remote-tracking branch 'runelite/master'

This commit is contained in:
Owain van Brakel
2019-11-18 01:27:29 +01:00
31 changed files with 222 additions and 116 deletions

View File

@@ -35,9 +35,8 @@ enum ServiceWorldType
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),
DEADMAN(WorldType.DEADMAN, 1 << 29),
SEASONAL_DEADMAN(WorldType.SEASONAL_DEADMAN, 1 << 30);
LEAGUE(WorldType.LEAGUE, 1 << 30);
private final WorldType apiType;
private final int mask;