Merge remote-tracking branch 'runelite/master'

This commit is contained in:
Owain van Brakel
2020-05-01 20:08:11 +02:00
4 changed files with 11 additions and 13 deletions

View File

@@ -60,6 +60,10 @@ public enum WorldType
* Tournament world type.
*/
TOURNAMENT(1 << 25),
/**
* Deadman Tournament world type.
*/
DEADMAN_TOURNAMENT(1 << 26),
/**
* Deadman world type.
*/
@@ -77,7 +81,7 @@ public enum WorldType
}
private static final EnumSet<WorldType> PVP_WORLD_TYPES = EnumSet.of(
DEADMAN,
DEADMAN, // dmmt worlds are also flaged as DEADMAN
PVP
);