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

Mana cost additions were incorrect - X was discarded!

Browse Source
This commit is contained in:
Maxmtg
2013-04-16 17:25:12 +00:00
parent 78a75188cb
commit 6f9be4ff8f
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/forge/card/mana/ManaCostBeingPaid.java
View File

@@ -50,8 +50,9 @@ import forge.util.MyRandom;
public class ManaCostBeingPaid { public class ManaCostBeingPaid {
private class ManaCostBeingPaidIterator implements IParserManaCost { private class ManaCostBeingPaidIterator implements IParserManaCost {
private Iterator<ManaCostShard> mch; private Iterator<ManaCostShard> mch;
private ManaCostShard nextShard; private ManaCostShard nextShard = null;
private int remainingShards = 0; private int remainingShards = 0;
private boolean hasSentX = false;
public ManaCostBeingPaidIterator() { public ManaCostBeingPaidIterator() {
mch = unpaidShards.keySet().iterator(); mch = unpaidShards.keySet().iterator();
@@ -73,6 +74,14 @@ public class ManaCostBeingPaid {
@Override @Override
public boolean hasNext() { public boolean hasNext() {
if ( remainingShards > 0 ) return true; if ( remainingShards > 0 ) return true;
if ( !hasSentX ) {
if ( nextShard != ManaCostShard.X && cntX > 0) {
nextShard = ManaCostShard.X;
remainingShards = cntX;
return true;
} else
hasSentX = true;
}
if ( !mch.hasNext() ) return false; if ( !mch.hasNext() ) return false;
nextShard = mch.next(); nextShard = mch.next();