From ce7797b8ab1f74c20f86af5f03ddddd991f535e1 Mon Sep 17 00:00:00 2001 From: BursegSardaukar <> Date: Sun, 1 Nov 2015 16:42:59 -0500 Subject: [PATCH] Pulled from trunk. --- .../src/main/java/mage/player/ai/ComputerPlayer.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java b/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java index c9913b4f111..d967799a0d1 100644 --- a/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java +++ b/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java @@ -322,9 +322,10 @@ public class ComputerPlayer extends PlayerImpl implements Player { return target.isChosen(); } - if (target instanceof TargetCardInHand) { + if (target instanceof TargetCardInHand + || (target.getZone().equals(Zone.HAND) && (target instanceof TargetCard))) { List cards = new ArrayList<>(); - for (UUID cardId : ((TargetCardInHand) target).possibleTargets(sourceId, this.getId(), game)) { + for (UUID cardId : target.possibleTargets(sourceId, this.getId(), game)) { Card card = game.getCard(cardId); if (card != null) { cards.add(card); @@ -1135,7 +1136,7 @@ public class ComputerPlayer extends PlayerImpl implements Player { protected boolean playManaHandling(Ability ability, ManaCost unpaid, Game game) { // log.info("paying for " + unpaid.getText()); - boolean spendAnyMana = game.getContinuousEffects().asThough(ability.getSourceId(), AsThoughEffectType.SPEND_ANY_MANA, ability, ability.getControllerId(), game); + boolean spendAnyMana = game.getContinuousEffects().asThough(ability.getSourceId(), AsThoughEffectType.SPEND_OTHER_MANA, ability, ability.getControllerId(), game); ManaCost cost; List producers; if (unpaid instanceof ManaCosts) {