Remove DEADMAN_TOURNAMENT world type
Co-authored-by: Hydrox6 <ikada@protonmail.ch>
This commit is contained in:
@@ -647,11 +647,7 @@ public class HiscorePanel extends PluginPanel
|
||||
{
|
||||
EnumSet<WorldType> wTypes = client.getWorldType();
|
||||
|
||||
if (wTypes.contains(WorldType.DEADMAN_TOURNAMENT))
|
||||
{
|
||||
return HiscoreEndpoint.DEADMAN_TOURNAMENT;
|
||||
}
|
||||
else if (wTypes.contains(WorldType.DEADMAN))
|
||||
if (wTypes.contains(WorldType.DEADMAN))
|
||||
{
|
||||
return HiscoreEndpoint.DEADMAN;
|
||||
}
|
||||
|
||||
@@ -113,11 +113,7 @@ public class OpponentInfoPlugin extends Plugin
|
||||
}
|
||||
|
||||
final EnumSet<WorldType> worldType = client.getWorldType();
|
||||
if (worldType.contains(WorldType.DEADMAN_TOURNAMENT))
|
||||
{
|
||||
hiscoreEndpoint = HiscoreEndpoint.DEADMAN_TOURNAMENT;
|
||||
}
|
||||
else if (worldType.contains(WorldType.DEADMAN))
|
||||
if (worldType.contains(WorldType.DEADMAN))
|
||||
{
|
||||
hiscoreEndpoint = HiscoreEndpoint.DEADMAN;
|
||||
}
|
||||
|
||||
@@ -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";
|
||||
}
|
||||
|
||||
@@ -541,8 +541,7 @@ public class TimersPlugin extends Plugin
|
||||
}
|
||||
else if (HALF_TELEBLOCK_PATTERN.matcher(event.getMessage()).find())
|
||||
{
|
||||
if (client.getWorldType().contains(WorldType.DEADMAN)
|
||||
&& !client.getWorldType().contains(WorldType.DEADMAN_TOURNAMENT))
|
||||
if (client.getWorldType().contains(WorldType.DEADMAN))
|
||||
{
|
||||
createGameTimer(DMM_FULLTB);
|
||||
}
|
||||
|
||||
@@ -30,8 +30,7 @@ enum XpWorldType
|
||||
{
|
||||
NORMAL,
|
||||
TOURNEY,
|
||||
DMM,
|
||||
DMMT;
|
||||
DMM;
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 2.9 KiB |
Reference in New Issue
Block a user