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

Merge branch 'master' into 'master'

Browse Source 
Fix an issue with the theme deck generator hanging on certain decks

Closes #1024

See merge request core-developers/forge!1896
This commit is contained in:
Michael Kamensky
2019-06-20 16:34:22 +00:00
parent e92456bba1 a686573ea7
commit d91e36ab7f
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-gui/res/quest/themes/Lands WRG.thm
View File

@@ -15,7 +15,7 @@ Treetop Village
Dryad Arbor Dryad Arbor
[/Group] [/Group]
[Group MaxCnt=2 Percentage=5] [Group MaxCnt=4 Percentage=5]
Kabira Crossroads Kabira Crossroads
Karakas Karakas
The Tabernacle at Pendrell Vale The Tabernacle at Pendrell Vale

5
forge-gui/src/main/java/forge/deck/DeckGeneratorTheme.java
View File

@@ -131,17 +131,16 @@ public class DeckGeneratorTheme extends DeckGeneratorBase {
ss = s.split("\\|"); ss = s.split("\\|");
int lc = 0; int lc = 0;
while ((cardCounts.get(ss[0]) >= g.maxCnt) || (lc > 999)) { while ((cardCounts.get(ss[0]) >= g.maxCnt)) {
// looping // looping
// forever // forever
s = g.cardnames.get(MyRandom.getRandom().nextInt(cnSize)); s = g.cardnames.get(MyRandom.getRandom().nextInt(cnSize));
ss = s.split("\\|"); ss = s.split("\\|");
lc++;
}
if (lc > 999) { if (lc > 999) {
throw new RuntimeException("ThemeDeckGenerator : getThemeDeck -- looped too much -- filename is " throw new RuntimeException("ThemeDeckGenerator : getThemeDeck -- looped too much -- filename is "
+ tFileName); + tFileName);
} }
}
final int n = cardCounts.get(ss[0]); final int n = cardCounts.get(ss[0]);
if (ss.length == 1) { if (ss.length == 1) {