Merge branch 'master' into 'master'

Fix "Assorted Card Art" in the generate basic lands dialog.

See merge request core-developers/forge!5427
This commit is contained in:
Michael Kamensky
2021-09-25 06:51:42 +00:00
2 changed files with 4 additions and 2 deletions

View File

@@ -58,6 +58,7 @@ import forge.toolbox.FSkin;
import forge.toolbox.FSkin.SkinnedPanel; import forge.toolbox.FSkin.SkinnedPanel;
import forge.toolbox.FTextField; import forge.toolbox.FTextField;
import forge.util.Localizer; import forge.util.Localizer;
import forge.util.MyRandom;
import forge.view.arcane.CardPanel; import forge.view.arcane.CardPanel;
@@ -365,7 +366,7 @@ public class AddBasicLandsDialog {
} }
else { else {
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
pool.add(generateCard(artIndex)); pool.add(generateCard(MyRandom.getRandom().nextInt(cbLandArt.getItemCount())));
} }
} }
} }

View File

@@ -50,6 +50,7 @@ import forge.toolbox.FScrollPane;
import forge.toolbox.FTextArea; import forge.toolbox.FTextArea;
import forge.util.Callback; import forge.util.Callback;
import forge.util.Localizer; import forge.util.Localizer;
import forge.util.MyRandom;
import forge.util.Utils; import forge.util.Utils;
@@ -356,7 +357,7 @@ public class AddBasicLandsDialog extends FDialog {
} }
else { else {
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
pool.add(generateCard(artIndex)); pool.add(generateCard(MyRandom.getRandom().nextInt(cbLandArt.getItemCount())));
} }
} }
} }