From 027c3ce8432e6f72789615b1e900365b10b5bc43 Mon Sep 17 00:00:00 2001 From: Tomas Slusny Date: Fri, 3 Aug 2018 22:26:34 +0200 Subject: [PATCH] Add Tournament world type Fixes #4682 Signed-off-by: Tomas Slusny --- .../src/main/java/net/runelite/http/api/worlds/WorldType.java | 1 + .../net/runelite/http/service/worlds/ServiceWorldType.java | 3 ++- runelite-api/src/main/java/net/runelite/api/WorldType.java | 4 ++++ .../net/runelite/client/plugins/xptracker/XpWorldType.java | 3 +++ 4 files changed, 10 insertions(+), 1 deletion(-) 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 61d6630cd5..a913f63bb5 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 @@ -32,6 +32,7 @@ public enum WorldType SKILL_TOTAL, PVP_HIGH_RISK, LAST_MAN_STANDING, + TOURNAMENT, DEADMAN, SEASONAL_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 cc99e52ea3..1c7bf52180 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 @@ -34,13 +34,14 @@ enum ServiceWorldType SKILL_TOTAL(WorldType.SKILL_TOTAL, 1 << 7), PVP_HIGH_RISK(WorldType.PVP_HIGH_RISK, 1 << 10), LAST_MAN_STANDING(WorldType.LAST_MAN_STANDING, 1 << 14), + TOURNAMENT(WorldType.TOURNAMENT, 1 << 25), DEADMAN(WorldType.DEADMAN, 1 << 29), SEASONAL_DEADMAN(WorldType.SEASONAL_DEADMAN, 1 << 30); private final WorldType apiType; private final int mask; - private ServiceWorldType(WorldType apiType, int mask) + ServiceWorldType(WorldType apiType, int mask) { this.apiType = apiType; this.mask = mask; 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 e8ea3e3b77..88741753b3 100644 --- a/runelite-api/src/main/java/net/runelite/api/WorldType.java +++ b/runelite-api/src/main/java/net/runelite/api/WorldType.java @@ -55,6 +55,10 @@ public enum WorldType * Last man standing world type. */ LAST_MAN_STANDING(1 << 14), + /** + * Tournament world type. + */ + TOURNAMENT(1 << 25), /** * Deadman world type. */ diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpWorldType.java b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpWorldType.java index 7b5d545c10..e411024326 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpWorldType.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpWorldType.java @@ -29,6 +29,7 @@ import net.runelite.api.WorldType; enum XpWorldType { NORMAL, + TOURNEY, DMM, SDMM; @@ -36,6 +37,8 @@ enum XpWorldType { switch (type) { + case TOURNAMENT: + return TOURNEY; case DEADMAN: return DMM; case SEASONAL_DEADMAN: