Merge remote-tracking branch 'origin/commanderDeckGenerator' into commanderDeckGenerator

This commit is contained in:
austinio7116
2018-02-26 23:57:30 +00:00
committed by maustin

View File

@@ -621,10 +621,7 @@ public class FDeckChooser extends FScreen {
break; break;
case STANDARD_CARDGEN_DECK: case STANDARD_CARDGEN_DECK:
maxSelections = 1; maxSelections = 1;
pool= new ArrayList<>();
if(FModel.isdeckGenMatrixLoaded()) {
pool = CardThemedDeckGenerator.getMatrixDecks(FModel.getFormats().getStandard(), isAi); pool = CardThemedDeckGenerator.getMatrixDecks(FModel.getFormats().getStandard(), isAi);
}
config = ItemManagerConfig.STRING_ONLY; config = ItemManagerConfig.STRING_ONLY;
break; break;
case MODERN_CARDGEN_DECK: case MODERN_CARDGEN_DECK: