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

- Fixed singleton mode freezing.

Browse Source
This commit is contained in:
Sloth
2012-04-16 15:04:23 +00:00
parent 6fa076abe6
commit c6e520d5fa
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/forge/deck/generate/GenerateColoredDeckBase.java
View File

@@ -82,7 +82,7 @@ public abstract class GenerateColoredDeckBase {
do { do {
c = source.get(this.r.nextInt(source.size())); c = source.get(this.r.nextInt(source.size()));
lc++; lc++;
} while ((this.cardCounts.get(c.getName()) > (this.maxDuplicates - 1)) || (lc > 100)); } while ((this.cardCounts.get(c.getName()) > (this.maxDuplicates - 1)) && (lc <= 100));
if (lc > 100) { if (lc > 100) {
throw new RuntimeException("Generate2ColorDeck : get2ColorDeck -- looped too much -- Cr12"); throw new RuntimeException("Generate2ColorDeck : get2ColorDeck -- looped too much -- Cr12");
@@ -103,7 +103,7 @@ public abstract class GenerateColoredDeckBase {
do { do {
s = source.get(this.r.nextInt(source.size())); s = source.get(this.r.nextInt(source.size()));
lc++; lc++;
} while ((this.cardCounts.get(s) > (this.maxDuplicates - 1)) || (lc > 20)); } while ((this.cardCounts.get(s) > 3) && (lc <= 20));
// not an error if looped too much - could play singleton mode, with 6 slots for 3 non-basic lands. // not an error if looped too much - could play singleton mode, with 6 slots for 3 non-basic lands.
tDeck.add(CardDb.instance().getCard(s)); tDeck.add(CardDb.instance().getCard(s));