external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 04:08:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

store variants in an enumset

Browse Source
This commit is contained in:
Maxmtg
2014-01-25 09:45:47 +00:00
parent b6409b11c7
commit ed7369c98f
6 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
forge-gui/src/main/java/forge/control/FControl.java
View File

@@ -567,7 +567,7 @@ public enum FControl implements KeyEventDispatcher {
}
public void startMatch(GameType gameType, List<RegisteredPlayer> players) {
startMatch(gameType, new ArrayList<GameType>(0), players);
startMatch(gameType, null, players);
}
public void startMatch(GameType gameType, List<GameType> appliedVariants, List<RegisteredPlayer> players) {
@@ -577,7 +577,8 @@ public enum FControl implements KeyEventDispatcher {
}
GameRules rules = new GameRules(gameType);
rules.setAppliedVariants(appliedVariants);
if( null != appliedVariants )
rules.setAppliedVariants(appliedVariants);
rules.setPlayForAnte(Singletons.getModel().getPreferences().getPrefBoolean(FPref.UI_ANTE));
rules.setManaBurn(Singletons.getModel().getPreferences().getPrefBoolean(FPref.UI_MANABURN));
rules.canCloneUseTargetsImage = Singletons.getModel().getPreferences().getPrefBoolean(FPref.UI_CLONE_MODE_SOURCE);

2
forge-gui/src/main/java/forge/gui/GuiDisplayUtil.java
View File

@@ -445,7 +445,7 @@ public final class GuiDisplayUtil {
public static void devModePlaneswalkTo() {
final Game game = getGame();
if (!game.getRules().getAppliedVariants().contains(GameType.Planechase)) { return; }
if (!game.getRules().hasAppliedVariant(GameType.Planechase)) { return; }
final Player p = game.getPhaseHandler().getPlayerTurn();
final List<PaperCard> allPlanars = new ArrayList<PaperCard>();