Merge branch 'master' into 'master'

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

Closes #1024

See merge request core-developers/forge!1896

forge-gui/res/quest/themes/Lands WRG.thm

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

forge-gui/src/main/java/forge/deck/DeckGeneratorTheme.java

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