From 21d46db9873a98b2ef4783b7873e124c95090702 Mon Sep 17 00:00:00 2001 From: moomarc Date: Mon, 3 Jun 2013 06:06:40 +0000 Subject: [PATCH] - Won't be asked to select/order cards to play from opening hand if there are none to play --- src/main/java/forge/game/GameAction.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/forge/game/GameAction.java b/src/main/java/forge/game/GameAction.java index 9b136a1aa04..26d5959059a 100644 --- a/src/main/java/forge/game/GameAction.java +++ b/src/main/java/forge/game/GameAction.java @@ -1572,10 +1572,12 @@ public class GameAction { } } } - + // Players are supposed to return the effects in an order they want those to be resolved (Rule 103.5) - usableFromOpeningHand = takesAction.getController().chooseSaToActivateFromOpeningHand(usableFromOpeningHand); - + if (!usableFromOpeningHand.isEmpty()) { + usableFromOpeningHand = takesAction.getController().chooseSaToActivateFromOpeningHand(usableFromOpeningHand); + } + for(final SpellAbility sa : usableFromOpeningHand ) { if (!takesAction.getZone(ZoneType.Hand).contains(sa.getSourceCard())) continue;