From 3c9e3de9a22dc9c4debf2d5d1ea8e32dbc166e0a Mon Sep 17 00:00:00 2001 From: magenoxx Date: Tue, 12 Jun 2012 10:54:47 +0400 Subject: [PATCH] Fixed color mana payment --- .../mage/test/cards/mana/phyrexian/PhyrexianManaTest.java | 7 +++++-- Mage/src/mage/abilities/costs/mana/ManaCostImpl.java | 5 +++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/mana/phyrexian/PhyrexianManaTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/mana/phyrexian/PhyrexianManaTest.java index 44d5b2132ed..b8730f24c47 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/mana/phyrexian/PhyrexianManaTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/mana/phyrexian/PhyrexianManaTest.java @@ -2,6 +2,7 @@ package org.mage.test.cards.mana.phyrexian; import mage.Constants; import mage.Constants.PhaseStep; +import org.junit.Assert; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -22,8 +23,10 @@ public class PhyrexianManaTest extends CardTestPlayerBase { setStopAt(1, PhaseStep.END_TURN); execute(); - assertLife(playerA, 20); - assertHandCount(playerA, 1); + int life = playerA.getLife(); + int hand = playerA.getHand().size(); + // can be played only through life pay + Assert.assertTrue(life == 20 && hand == 1 || life == 18 && hand == 0); } } diff --git a/Mage/src/mage/abilities/costs/mana/ManaCostImpl.java b/Mage/src/mage/abilities/costs/mana/ManaCostImpl.java index 1383f270972..55630805641 100644 --- a/Mage/src/mage/abilities/costs/mana/ManaCostImpl.java +++ b/Mage/src/mage/abilities/costs/mana/ManaCostImpl.java @@ -28,8 +28,6 @@ package mage.abilities.costs.mana; -import java.util.UUID; - import mage.Constants.ColoredManaSymbol; import mage.Constants.ManaType; import mage.Mana; @@ -41,6 +39,8 @@ import mage.game.Game; import mage.players.ManaPool; import mage.players.Player; +import java.util.UUID; + public abstract class ManaCostImpl> extends CostImpl implements ManaCost { protected Mana payment; @@ -116,6 +116,7 @@ public abstract class ManaCostImpl> extends CostImpl