From b3a2aab6e583b1e6dd2a788e1cb79a3ba0caf4f6 Mon Sep 17 00:00:00 2001 From: Sloth Date: Mon, 4 Mar 2013 18:36:28 +0000 Subject: [PATCH] - Fixed mandatory targets not being enforced for the human. --- .../card/spellability/TargetSelection.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/main/java/forge/card/spellability/TargetSelection.java b/src/main/java/forge/card/spellability/TargetSelection.java index f6d61793f33..d3f228f6084 100644 --- a/src/main/java/forge/card/spellability/TargetSelection.java +++ b/src/main/java/forge/card/spellability/TargetSelection.java @@ -411,13 +411,19 @@ public class TargetSelection { // If reached Minimum targets, enable OK button if (!tgt.isMinTargetsChosen(sa.getSourceCard(), sa) || tgt.isDividedAsYouChoose()) { - ButtonUtil.enableOnlyCancel(); + if (mandatory && tgt.hasCandidates(sa, true)) { + // Player has to click on a target + ButtonUtil.disableAll(); + } else { + ButtonUtil.enableOnlyCancel(); + } } else { - ButtonUtil.enableAllFocusOk(); - } - - if (mandatory && tgt.hasCandidates(sa, true)) { - ButtonUtil.enableOnlyOk(); + if (mandatory && tgt.hasCandidates(sa, true)) { + // Player has to click on a target or ok + ButtonUtil.enableOnlyOk(); + } else { + ButtonUtil.enableAllFocusOk(); + } } }