external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 12:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Fix for Trigger Wrapper incorrectly prompting for Unless Cost twice.

Browse Source
This commit is contained in:
Sol
2011-10-23 20:51:14 +00:00
parent a896e55deb
commit 7fe600c265
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/forge/card/abilityFactory/AbilityFactory.java
View File

@@ -2142,7 +2142,7 @@ public class AbilityFactory {
//check conditions //check conditions
if (AbilityFactory.checkConditional(sa)) { if (AbilityFactory.checkConditional(sa)) {
if (params.get("UnlessCost") == null) { if (params.get("UnlessCost") == null || sa.isWrapper()) {
sa.resolve(); sa.resolve();
//try to resolve subabilities (see null check above) //try to resolve subabilities (see null check above)

4
src/main/java/forge/gui/input/Input_PayManaCost_Ability.java
View File

@@ -104,7 +104,6 @@ public class Input_PayManaCost_Ability extends Input {
public void selectCard(Card card, PlayerZone zone) { public void selectCard(Card card, PlayerZone zone) {
//only tap card if the mana is needed //only tap card if the mana is needed
manaCost = Input_PayManaCostUtil.activateManaAbility(fakeAbility, card, manaCost); manaCost = Input_PayManaCostUtil.activateManaAbility(fakeAbility, card, manaCost);
showMessage();
if (manaCost.isPaid()) { if (manaCost.isPaid()) {
resetManaCost(); resetManaCost();
@@ -112,6 +111,9 @@ public class Input_PayManaCost_Ability extends Input {
stop(); stop();
paidCommand.execute(); paidCommand.execute();
} }
else{
showMessage();
}
} }
/** {@inheritDoc} */ /** {@inheritDoc} */