github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-03-07 20:53:18 -10:00
Code Issues Projects Releases Packages Wiki Activity

Fix DoIfCostPaid effect when it is not optional.

Browse source
This commit is contained in:
Quercitron 2016-05-02 16:06:56 +03:00
parent 0495c5a17a
commit 596e2f7f19
2 changed files with 33 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
Mage.Tests/src/test/java/org/mage/test/cards/conditional/DoIfCostPaidTest.java Normal file
View file

@ -0,0 +1,32 @@
package org.mage.test.cards.conditional;
import mage.constants.PhaseStep;
import mage.constants.Zone;
import org.junit.Test;
import org.mage.test.serverside.base.CardTestPlayerBase;
/**
*
* @author Quercitron
*/
public class DoIfCostPaidTest extends CardTestPlayerBase {
@Test
public void testPayIsNotOptional() {
addCard(Zone.BATTLEFIELD, playerA, "Mountain", 1);
// Shock deals 2 damage to target creature or player.
addCard(Zone.HAND, playerA, "Shock", 1);
// When a source an opponent controls deals damage to you, sacrifice Awaken the Sky Tyrant.
// If you do, put a 5/5 red Dragon creature token with flying onto the battlefield.
addCard(Zone.BATTLEFIELD, playerB, "Awaken the Sky Tyrant");
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Shock", playerB);
setStopAt(1, PhaseStep.BEGIN_COMBAT);
execute();
assertPermanentCount(playerB, "Awaken the Sky Tyrant", 0);
assertPermanentCount(playerB, "Dragon", 1);
}
}

2
Mage/src/main/java/mage/abilities/effects/common/DoIfCostPaid.java
View file

@ -67,7 +67,7 @@ public class DoIfCostPaid extends OneShotEffect {
message = CardUtil.replaceSourceName(message, mageObject.getLogName());
boolean result = true;
if (cost.canPay(source, source.getSourceId(), player.getId(), game)
&& (optional && player.chooseUse(executingEffects.get(0).getOutcome(), message, source, game))) {
&& (!optional || player.chooseUse(executingEffects.get(0).getOutcome(), message, source, game))) {
cost.clearPaid();
if (cost.pay(source, game, source.getSourceId(), player.getId(), false)) {
for (Effect effect : executingEffects) {