From 3a90fbb49c9052ed1b21f3a08f58780f33f046b5 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Mon, 4 Feb 2013 21:19:12 +0100
Subject: [PATCH] Fixed a bug in CreatureCastManaCondition leading to an
 endless loop. Improved ConditionalAnyColorManaAbility to use also with one
 choice but X mana.

---
 .../mana/ConditionalAnyColorManaAbility.java     | 16 +++++++++++++---
 .../conditional/CreatureCastManaCondition.java   |  2 +-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/Mage/src/mage/abilities/mana/ConditionalAnyColorManaAbility.java b/Mage/src/mage/abilities/mana/ConditionalAnyColorManaAbility.java
index a68e72f12a7..cd98f201a45 100644
--- a/Mage/src/mage/abilities/mana/ConditionalAnyColorManaAbility.java
+++ b/Mage/src/mage/abilities/mana/ConditionalAnyColorManaAbility.java
@@ -47,8 +47,19 @@ public class ConditionalAnyColorManaAbility extends ManaAbility<ConditionalAnyCo
     }
 
     public ConditionalAnyColorManaAbility(Cost cost, int amount, ConditionalManaBuilder manaBuilder) {
-        super(Constants.Zone.BATTLEFIELD, new AddConditionalManaOfAnyColorEffect(amount, manaBuilder), cost);
-        for (int i = 0; i < amount; i++) {
+        this(cost, amount, manaBuilder, false);
+    }
+
+    public ConditionalAnyColorManaAbility(Cost cost, int amount, ConditionalManaBuilder manaBuilder, boolean oneChoice) {
+        super(Constants.Zone.BATTLEFIELD, new AddConditionalManaOfAnyColorEffect(oneChoice ? 1 :amount, manaBuilder), cost);
+        int choices = amount;
+        if (oneChoice) {
+            for (int i = 1; i < amount; i++) {
+                this.addEffect(new AddConditionalManaOfAnyColorEffect(1 , manaBuilder));
+            }
+            choices = 1;
+        }
+        for (int i = 0; i < choices; i++) {
             this.addChoice(new ChoiceColor());
         }
         this.netMana.setAny(amount);
@@ -63,4 +74,3 @@ public class ConditionalAnyColorManaAbility extends ManaAbility<ConditionalAnyCo
         return new ConditionalAnyColorManaAbility(this);
     }
 }
-
diff --git a/Mage/src/mage/abilities/mana/conditional/CreatureCastManaCondition.java b/Mage/src/mage/abilities/mana/conditional/CreatureCastManaCondition.java
index 9615ca93e34..1f5332df69e 100644
--- a/Mage/src/mage/abilities/mana/conditional/CreatureCastManaCondition.java
+++ b/Mage/src/mage/abilities/mana/conditional/CreatureCastManaCondition.java
@@ -53,6 +53,6 @@ public class CreatureCastManaCondition extends ManaCondition implements Conditio
 
     @Override
     public boolean apply(Game game, Ability source, UUID originalId) {
-        return apply(game, source, null);
+        return apply(game, source);
     }
 }
\ No newline at end of file