Merge branch 'master' into 'master'

Commander quest mode

See merge request core-developers/forge!1053
This commit is contained in:
Michael Kamensky
2018-11-10 16:18:16 +00:00
20 changed files with 565 additions and 37 deletions

View File

@@ -78,7 +78,8 @@ public class GameRules {
}
public boolean hasCommander() {
return appliedVariants.contains(GameType.Commander) || appliedVariants.contains(GameType.TinyLeaders)
return appliedVariants.contains(GameType.Commander)
|| appliedVariants.contains(GameType.TinyLeaders)
|| appliedVariants.contains(GameType.Brawl);
}