Merge branch 'assorted-fixes' into 'master'

Fixed a bug that caused the deck not to reset properly after playing Momir/MoJhoSto.

Closes #510

See merge request core-developers/forge!407
This commit is contained in:
austinio7116
2018-04-15 10:53:15 +00:00

View File

@@ -437,6 +437,7 @@ public abstract class GameLobby implements IHasGameType {
} }
else if (autoGenerateVariant != null) { else if (autoGenerateVariant != null) {
Deck autoDeck = autoGenerateVariant.autoGenerateDeck(rp); Deck autoDeck = autoGenerateVariant.autoGenerateDeck(rp);
deck = new Deck();
for (DeckSection d : DeckSection.values()) { for (DeckSection d : DeckSection.values()) {
if (autoDeck.has(d)) { if (autoDeck.has(d)) {
deck.getOrCreate(d).clear(); deck.getOrCreate(d).clear();