another fix (non-mandatory choice from hand)

This commit is contained in:
Maxmtg
2013-05-07 16:05:01 +00:00
parent 6d4a1210f6
commit f7d8fd81ff

View File

@@ -749,7 +749,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
inp.setCancelAllowed(!mustChoose); inp.setCancelAllowed(!mustChoose);
inp.setMessage(selectPrompt); inp.setMessage(selectPrompt);
FThreads.setInputAndWait(inp); FThreads.setInputAndWait(inp);
c = inp.getSelected().get(0); c = inp.hasCancelled() ? null : inp.getSelected().get(0);
} }
else { else {
List<Card> chosen = GuiChoose.getChoices(selectPrompt, 0, mustChoose ? 1 : 0, fetchList); List<Card> chosen = GuiChoose.getChoices(selectPrompt, 0, mustChoose ? 1 : 0, fetchList);