From aeb710d7645b26cbdc0c2f33f30a0b8b0a333e2e Mon Sep 17 00:00:00 2001 From: drdev Date: Tue, 14 Oct 2014 18:44:49 +0000 Subject: [PATCH] Allow cancelling ability of Nullmage Shephard while in the process of selecting creatures to tap --- forge-gui/src/main/java/forge/player/HumanCostDecision.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/forge-gui/src/main/java/forge/player/HumanCostDecision.java b/forge-gui/src/main/java/forge/player/HumanCostDecision.java index 0b62f26b6d1..50afafaa9b0 100644 --- a/forge-gui/src/main/java/forge/player/HumanCostDecision.java +++ b/forge-gui/src/main/java/forge/player/HumanCostDecision.java @@ -653,9 +653,9 @@ public class HumanCostDecision extends CostDecisionMakerBase { inp.setCancelAllowed(true); inp.showAndWait(); - if (inp.hasCancelled()) + if (inp.hasCancelled()) { return null; - + } return PaymentDecision.card(inp.getSelected()); } @@ -1090,6 +1090,7 @@ public class HumanCostDecision extends CostDecisionMakerBase { } InputSelectCardsFromList inp = new InputSelectCardsFromList(controller, c, c, typeList); + inp.setCancelAllowed(true); inp.setMessage("Select a " + cost.getDescriptiveType() + " to tap (%d left)"); inp.showAndWait(); if (inp.hasCancelled()) {