From 73c9b8c911aa281eac37abde61ac7228e198c725 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Mon, 29 Dec 2014 13:39:26 +0100 Subject: [PATCH] * Force Away - Fixed that the draw / discard effect was not optional (fixes #651). --- .../effects/common/DrawDiscardControllerEffect.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Mage/src/mage/abilities/effects/common/DrawDiscardControllerEffect.java b/Mage/src/mage/abilities/effects/common/DrawDiscardControllerEffect.java index 18d40a552a..73e05f62eb 100644 --- a/Mage/src/mage/abilities/effects/common/DrawDiscardControllerEffect.java +++ b/Mage/src/mage/abilities/effects/common/DrawDiscardControllerEffect.java @@ -57,6 +57,7 @@ public class DrawDiscardControllerEffect extends OneShotEffect { super(Outcome.DrawCard); this.cardsToDraw = cardsToDraw; this.cardsToDiscard = cardsToDiscard; + this.optional = optional; staticText = new StringBuilder("Draw ") .append(cardsToDraw == 1?"a": CardUtil.numberToText(cardsToDraw)) .append(" card").append(cardsToDraw == 1?" ": "s") @@ -81,9 +82,9 @@ public class DrawDiscardControllerEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player player = game.getPlayer(source.getControllerId()); if (player != null) { - if (!optional || player.chooseUse(outcome, "User draw, then discard effect?", game)) { + if (!optional || player.chooseUse(outcome, "Use draw, then discard effect?", game)) { player.drawCards(cardsToDraw, game); - player.discard(cardsToDiscard, source, game); + player.discard(cardsToDiscard, false, source, game); } return true; }