From e8ceda3a129d48a938a8e7129e8d7fb27baee0e9 Mon Sep 17 00:00:00 2001 From: Agetian Date: Thu, 20 Jun 2019 19:30:36 +0300 Subject: [PATCH 1/2] - Fix an issue with the theme deck generator hanging on certain decks (-1 -1 BG Counters, Lands WRG) --- forge-gui/res/quest/themes/Lands WRG.thm | 5 +---- .../src/main/java/forge/deck/DeckGeneratorTheme.java | 11 +++++------ 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/forge-gui/res/quest/themes/Lands WRG.thm b/forge-gui/res/quest/themes/Lands WRG.thm index 74f07df2452..e0a667844f6 100644 --- a/forge-gui/res/quest/themes/Lands WRG.thm +++ b/forge-gui/res/quest/themes/Lands WRG.thm @@ -15,13 +15,10 @@ Treetop Village Dryad Arbor [/Group] -[Group MaxCnt=2 Percentage=5] +[Group MaxCnt=4 Percentage=5] Kabira Crossroads Karakas The Tabernacle at Pendrell Vale -The Tabernacle at Pendrell Vale -The Tabernacle at Pendrell Vale -The Tabernacle at Pendrell Vale [/Group] [Group MaxCnt=4 Percentage=10] diff --git a/forge-gui/src/main/java/forge/deck/DeckGeneratorTheme.java b/forge-gui/src/main/java/forge/deck/DeckGeneratorTheme.java index f58b986ac60..281425fd157 100644 --- a/forge-gui/src/main/java/forge/deck/DeckGeneratorTheme.java +++ b/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]); From a686573ea7c0b8b7ba1e172b3f9dc9a2c5f60d19 Mon Sep 17 00:00:00 2001 From: Agetian Date: Thu, 20 Jun 2019 19:33:42 +0300 Subject: [PATCH 2/2] - One of the changes in Lands WRG unneeded --- forge-gui/res/quest/themes/Lands WRG.thm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/forge-gui/res/quest/themes/Lands WRG.thm b/forge-gui/res/quest/themes/Lands WRG.thm index e0a667844f6..6af7344d22e 100644 --- a/forge-gui/res/quest/themes/Lands WRG.thm +++ b/forge-gui/res/quest/themes/Lands WRG.thm @@ -19,6 +19,9 @@ Dryad Arbor Kabira Crossroads Karakas The Tabernacle at Pendrell Vale +The Tabernacle at Pendrell Vale +The Tabernacle at Pendrell Vale +The Tabernacle at Pendrell Vale [/Group] [Group MaxCnt=4 Percentage=10]