From fb43bc503c0b7605dbb153e404a4866bd4109f86 Mon Sep 17 00:00:00 2001 From: Maxmtg Date: Wed, 22 May 2013 15:01:25 +0000 Subject: [PATCH] force ante - three-state boolean behaviour restored --- src/main/java/forge/game/MatchController.java | 5 +++-- src/main/java/forge/gui/home/quest/SSubmenuQuestUtil.java | 2 +- src/main/java/forge/quest/QuestEventChallenge.java | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/forge/game/MatchController.java b/src/main/java/forge/game/MatchController.java index c267569d961..f0ebb1f1df5 100644 --- a/src/main/java/forge/game/MatchController.java +++ b/src/main/java/forge/game/MatchController.java @@ -68,9 +68,10 @@ public class MatchController { gameType = type; } - public MatchController(GameType type, Map map, boolean forceAnte) { + public MatchController(GameType type, Map map, Boolean forceAnte) { this(type, map); - this.useAnte |= forceAnte; + if( forceAnte != null ) + this.useAnte |= forceAnte.booleanValue(); } /** diff --git a/src/main/java/forge/gui/home/quest/SSubmenuQuestUtil.java b/src/main/java/forge/gui/home/quest/SSubmenuQuestUtil.java index c01c546b675..14403fb91dd 100644 --- a/src/main/java/forge/gui/home/quest/SSubmenuQuestUtil.java +++ b/src/main/java/forge/gui/home/quest/SSubmenuQuestUtil.java @@ -403,7 +403,7 @@ public class SSubmenuQuestUtil { int extraLifeHuman = 0; Integer lifeHuman = null; boolean useBazaar = true; - boolean forceAnte = false; + Boolean forceAnte = null; int lifeAI = 20; if (event instanceof QuestEventChallenge) { QuestEventChallenge qc = ((QuestEventChallenge) event); diff --git a/src/main/java/forge/quest/QuestEventChallenge.java b/src/main/java/forge/quest/QuestEventChallenge.java index b6008d3edc3..7213a2d777a 100644 --- a/src/main/java/forge/quest/QuestEventChallenge.java +++ b/src/main/java/forge/quest/QuestEventChallenge.java @@ -58,7 +58,7 @@ public class QuestEventChallenge extends QuestEvent { private boolean repeatable = false; private boolean useBazaar = true; - private boolean forceAnte = false; + private Boolean forceAnte = false; /** The wins reqd. */ private int winsReqd = 20; @@ -289,14 +289,14 @@ public class QuestEventChallenge extends QuestEvent { /** * @return the forceAnte */ - public boolean isForceAnte() { + public Boolean isForceAnte() { return forceAnte; } /** * @param forceAnte the forceAnte to set */ - public void setForceAnte(boolean forceAnte) { + public void setForceAnte(Boolean forceAnte) { this.forceAnte = forceAnte; }