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

Merge branch 'fix+gonti' into 'master'

Browse Source 
Fixing Mana types being inappropriately referenced in relation to Matrices

See merge request core-developers/forge!883
This commit is contained in:
Jamin Collins
2018-10-12 23:13:33 +00:00
parent bfa43bf157 8ac960168d
commit 51bc066238
18 changed files with 143 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/PlayerControllerForTests.java
View File

@@ -30,6 +30,7 @@ import forge.game.cost.Cost;
import forge.game.cost.CostPart;
import forge.game.cost.CostPartMana;
import forge.game.mana.Mana;
import forge.game.mana.ManaConversionMatrix;
import forge.game.mana.ManaCostBeingPaid;
import forge.game.player.*;
import forge.game.replacement.ReplacementEffect;
@@ -591,7 +592,7 @@ public class PlayerControllerForTests extends PlayerController {
}
@Override
public boolean payManaCost(ManaCost toPay, CostPartMana costPartMana, SpellAbility sa, String prompt /* ai needs hints as well */, boolean isActivatedSa ) {
public boolean payManaCost(ManaCost toPay, CostPartMana costPartMana, SpellAbility sa, String prompt /* ai needs hints as well */, ManaConversionMatrix matrix, boolean isActivatedSa) {
// TODO Auto-generated method stub
ManaCostBeingPaid cost = new ManaCostBeingPaid(toPay);
return ComputerUtilMana.payManaCost(cost, sa, player);