From bfef8b125c106771d28ba9b82a279a647e556b5f Mon Sep 17 00:00:00 2001 From: Agetian Date: Wed, 24 Jan 2018 16:41:12 +0300 Subject: [PATCH] - Fixed the cost "discard your hand" not allowing to order the cards going to graveyard when and if needed. --- forge-ai/src/main/java/forge/ai/AiCostDecision.java | 5 ++++- forge-gui/src/main/java/forge/player/HumanCostDecision.java | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/forge-ai/src/main/java/forge/ai/AiCostDecision.java b/forge-ai/src/main/java/forge/ai/AiCostDecision.java index b5fa4d79c8e..562ba047a76 100644 --- a/forge-ai/src/main/java/forge/ai/AiCostDecision.java +++ b/forge-ai/src/main/java/forge/ai/AiCostDecision.java @@ -63,8 +63,8 @@ public class AiCostDecision extends CostDecisionMakerBase { @Override public PaymentDecision visit(CostDiscard cost) { final String type = cost.getType(); + CardCollectionView hand = player.getCardsIn(ZoneType.Hand); - final CardCollectionView hand = player.getCardsIn(ZoneType.Hand); if (type.equals("LastDrawn")) { if (!hand.contains(player.getLastDrawnCard())) { return null; @@ -79,6 +79,9 @@ public class AiCostDecision extends CostDecisionMakerBase { return PaymentDecision.card(source); } else if (type.equals("Hand")) { + if (ability.getActivatingPlayer() != null) { + hand = ability.getActivatingPlayer().getController().orderMoveToZoneList(hand, ZoneType.Graveyard); + } return PaymentDecision.card(hand); } diff --git a/forge-gui/src/main/java/forge/player/HumanCostDecision.java b/forge-gui/src/main/java/forge/player/HumanCostDecision.java index f49a382a98f..039658de751 100644 --- a/forge-gui/src/main/java/forge/player/HumanCostDecision.java +++ b/forge-gui/src/main/java/forge/player/HumanCostDecision.java @@ -91,6 +91,9 @@ public class HumanCostDecision extends CostDecisionMakerBase { } if (discardType.equals("Hand")) { + if (ability.getActivatingPlayer() != null) { + hand = ability.getActivatingPlayer().getController().orderMoveToZoneList(hand, ZoneType.Graveyard); + } return PaymentDecision.card(hand); }