* Fixed that conditional mana (e.g. River of Tears) did not trigger mana adding effects like Vorinclex, Voice of Hunger.

Mage/src/mage/abilities/decorator/ConditionalManaEffect.java

@@ -25,7 +25,6 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-
 package mage.abilities.decorator;
 
 import mage.Mana;
@@ -33,14 +32,14 @@ import mage.abilities.Ability;
 import mage.abilities.condition.Condition;
 import mage.abilities.effects.common.BasicManaEffect;
 import mage.abilities.effects.common.ManaEffect;
+import mage.choices.ChoiceColor;
 import mage.game.Game;
+import mage.players.Player;
 
 /**
  *
  * @author LevelX2
  */
-
-
 public class ConditionalManaEffect extends ManaEffect {
 
     private BasicManaEffect effect;
@@ -70,14 +69,46 @@ public class ConditionalManaEffect extends ManaEffect {
 
     @Override
     public boolean apply(Game game, Ability source) {
+        Player controller = game.getPlayer(source.getControllerId());
+        if (controller == null) {
+            return false;
+        }
         if (condition.apply(game, source)) {
             effect.setTargetPointer(this.targetPointer);
-            return effect.apply(game, source);
         } else if (otherwiseEffect != null) {
             otherwiseEffect.setTargetPointer(this.targetPointer);
-            return otherwiseEffect.apply(game, source);
         }
-        return false;
+        Mana mana = getMana(game, source);
+
+        if (mana != null && mana.getAny() > 0) {
+            int amount = mana.getAny();
+
+            ChoiceColor choice = new ChoiceColor(true);
+            Mana createdMana = null;
+            if (controller.choose(outcome, choice, game)) {
+                if (choice.getColor() == null) {
+                    return false; // it happens, don't know how
+                }
+
+                if (choice.getColor().isBlack()) {
+                    createdMana = Mana.BlackMana(amount);
+                } else if (choice.getColor().isBlue()) {
+                    createdMana = Mana.BlueMana(amount);
+                } else if (choice.getColor().isRed()) {
+                    createdMana = Mana.RedMana(amount);
+                } else if (choice.getColor().isGreen()) {
+                    createdMana = Mana.GreenMana(amount);
+                } else if (choice.getColor().isWhite()) {
+                    createdMana = Mana.WhiteMana(amount);
+                }
+            }
+            mana = createdMana;
+        }
+
+        if (mana != null) {
+            controller.getManaPool().addMana(mana, game, source);
+        }
+        return true;
     }
 
     @Override
@@ -85,12 +116,18 @@ public class ConditionalManaEffect extends ManaEffect {
         return new ConditionalManaEffect(this);
     }
 
-    public Mana getMana(Game game, Ability source) {
+    @Override
+    public Mana getMana(Game game, Ability source
+    ) {
+        Mana mana = null;
         if (condition.apply(game, source)) {
-            return effect.getMana();
+            mana = effect.getMana();
         } else if (otherwiseEffect != null) {
-            return otherwiseEffect.getMana();
+            mana = otherwiseEffect.getMana();
         }
-        return null;
+        if (mana != null) {
+            checkToFirePossibleEvents(mana, game, source);
+        }
+        return mana;
     }
 }

Mage/src/mage/abilities/mana/TriggeredManaAbility.java

@@ -1,16 +1,16 @@
 /*
  *  Copyright 2011 BetaSteward_at_googlemail.com. All rights reserved.
- * 
+ *
  *  Redistribution and use in source and binary forms, with or without modification, are
  *  permitted provided that the following conditions are met:
- * 
+ *
  *     1. Redistributions of source code must retain the above copyright notice, this list of
  *        conditions and the following disclaimer.
- * 
+ *
  *     2. Redistributions in binary form must reproduce the above copyright notice, this list
  *        of conditions and the following disclaimer in the documentation and/or other materials
  *        provided with the distribution.
- * 
+ *
  *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
  *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
  *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
@@ -20,7 +20,7 @@
  *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  *  The views and conclusions contained in the software and documentation are those of the
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
@@ -29,10 +29,12 @@ package mage.abilities.mana;
 
 import mage.abilities.TriggeredAbilityImpl;
 import mage.abilities.effects.common.ManaEffect;
+import mage.constants.AbilityType;
 import mage.constants.Zone;
 
 /**
  * see 20110715 - 605.1b
+ *
  * @author BetaSteward_at_googlemail.com
  */
 public abstract class TriggeredManaAbility extends TriggeredAbilityImpl {
@@ -44,6 +46,7 @@ public abstract class TriggeredManaAbility extends TriggeredAbilityImpl {
     public TriggeredManaAbility(Zone zone, ManaEffect effect, boolean optional) {
         super(zone, effect, optional);
         this.usesStack = false;
+        this.abilityType = AbilityType.MANA;
     }
 
     public TriggeredManaAbility(final TriggeredManaAbility ability) {