Remove DEADMAN_TOURNAMENT world type

Co-authored-by: Hydrox6 <ikada@protonmail.ch>

http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreEndpoint.java

@@ -34,8 +34,7 @@ public enum HiscoreEndpoint
 	IRONMAN("Ironman", "https://services.runescape.com/m=hiscore_oldschool_ironman/index_lite.ws"),
 	HARDCORE_IRONMAN("Hardcore Ironman", "https://services.runescape.com/m=hiscore_oldschool_hardcore_ironman/index_lite.ws"),
 	ULTIMATE_IRONMAN("Ultimate Ironman", "https://services.runescape.com/m=hiscore_oldschool_ultimate/index_lite.ws"),
-	DEADMAN("Deadman", "https://services.runescape.com/m=hiscore_oldschool_deadman/index_lite.ws"),
+	DEADMAN("Deadman", "https://services.runescape.com/m=hiscore_oldschool_deadman/index_lite.ws");
-	DEADMAN_TOURNAMENT("Deadman Tournament", "https://services.runescape.com/m=hiscore_oldschool_tournament/index_lite.ws");
 
 	private final String name;
 	private final HttpUrl hiscoreURL;

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

@@ -33,6 +33,5 @@ public enum WorldType
 	HIGH_RISK,
 	LAST_MAN_STANDING,
 	TOURNAMENT,
-	DEADMAN,
+	DEADMAN;
-	DEADMAN_TOURNAMENT
 }

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

@@ -35,7 +35,6 @@ 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);
 
 	private final WorldType apiType;

runelite-api/src/main/java/net/runelite/api/WorldType.java

@@ -60,10 +60,6 @@ public enum WorldType
 	 * Tournament world type.
 	 */
 	TOURNAMENT(1 << 25),
-	/**
-	 * Deadman Tournament world type.
-	 */
-	DEADMAN_TOURNAMENT(1 << 26),
 	/**
 	 * Deadman world type.
 	 */
@@ -78,7 +74,6 @@ public enum WorldType
 
 	private static final EnumSet<WorldType> PVP_WORLD_TYPES = EnumSet.of(
 		DEADMAN,
-		DEADMAN_TOURNAMENT,
 		PVP
 	);
 

runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java

@@ -647,11 +647,7 @@ public class HiscorePanel extends PluginPanel
 		{
 			EnumSet<WorldType> wTypes = client.getWorldType();
 
-			if (wTypes.contains(WorldType.DEADMAN_TOURNAMENT))
+			if (wTypes.contains(WorldType.DEADMAN))
-			{
-				return HiscoreEndpoint.DEADMAN_TOURNAMENT;
-			}
-			else if (wTypes.contains(WorldType.DEADMAN))
 			{
 				return HiscoreEndpoint.DEADMAN;
 			}

runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoPlugin.java

@@ -113,11 +113,7 @@ public class OpponentInfoPlugin extends Plugin
 		}
 
 		final EnumSet<WorldType> worldType = client.getWorldType();
-		if (worldType.contains(WorldType.DEADMAN_TOURNAMENT))
+		if (worldType.contains(WorldType.DEADMAN))
-		{
-			hiscoreEndpoint = HiscoreEndpoint.DEADMAN_TOURNAMENT;
-		}
-		else if (worldType.contains(WorldType.DEADMAN))
 		{
 			hiscoreEndpoint = HiscoreEndpoint.DEADMAN;
 		}

runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java

@@ -615,12 +615,9 @@ public class ScreenshotPlugin extends Plugin
 		if (client.getLocalPlayer() != null && client.getLocalPlayer().getName() != null)
 		{
 			final EnumSet<WorldType> worldTypes = client.getWorldType();
-			final boolean dmm = worldTypes.contains(WorldType.DEADMAN);
-			final boolean dmmt = worldTypes.contains(WorldType.DEADMAN_TOURNAMENT);
-			final boolean isDmmWorld = dmm || dmmt;
 
 			String playerDir = client.getLocalPlayer().getName();
-			if (isDmmWorld)
+			if (worldTypes.contains(WorldType.DEADMAN))
 			{
 				playerDir += "-Deadman";
 			}

runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java

@@ -541,8 +541,7 @@ public class TimersPlugin extends Plugin
 			}
 			else if (HALF_TELEBLOCK_PATTERN.matcher(event.getMessage()).find())
 			{
-				if (client.getWorldType().contains(WorldType.DEADMAN)
+				if (client.getWorldType().contains(WorldType.DEADMAN))
-					&& !client.getWorldType().contains(WorldType.DEADMAN_TOURNAMENT))
 				{
 					createGameTimer(DMM_FULLTB);
 				}

runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpWorldType.java

@@ -30,8 +30,7 @@ enum XpWorldType
 {
 	NORMAL,
 	TOURNEY,
-	DMM,
+	DMM;
-	DMMT;
 
 	static XpWorldType of(WorldType type)
 	{
@@ -41,8 +40,6 @@ enum XpWorldType
 				return TOURNEY;
 			case DEADMAN:
 				return DMM;
-			case DEADMAN_TOURNAMENT:
-				return DMMT;
 			default:
 				return NORMAL;
 		}