Merge pull request #6881 from Nightfirecat/add-dmmt-worldtypes

Add DMMT world types, handle them in plugins, update SDMM teleblock timers
This commit is contained in:
Adam
2018-12-09 12:19:43 -05:00
committed by GitHub
9 changed files with 32 additions and 11 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.
*/
@@ -76,8 +80,9 @@ public enum WorldType
this.mask = mask;
}
private static EnumSet<WorldType> PVP_WORLD_TYPES = EnumSet.of(
private static final EnumSet<WorldType> PVP_WORLD_TYPES = EnumSet.of(
DEADMAN,
DEADMAN_TOURNAMENT,
PVP,
PVP_HIGH_RISK,
SEASONAL_DEADMAN