sideboarding affects the next match correctly

This commit is contained in:
Maxmtg
2013-02-04 15:36:22 +00:00
parent 9481a8a27c
commit 8fa9abc946

View File

@@ -111,8 +111,6 @@ public class GameNew {
initVariantsZones(player, psc); initVariantsZones(player, psc);
Deck myDeck = psc.getCurrentDeck();
GameType gameType = Singletons.getModel().getMatch().getGameType(); GameType gameType = Singletons.getModel().getMatch().getGameType();
boolean isFirstGame = Singletons.getModel().getMatch().getPlayedGames().isEmpty(); boolean isFirstGame = Singletons.getModel().getMatch().getPlayedGames().isEmpty();
boolean hasSideboard = !psc.getOriginalDeck().getSideboard().isEmpty(); boolean hasSideboard = !psc.getOriginalDeck().getSideboard().isEmpty();
@@ -122,8 +120,8 @@ public class GameNew {
psc.setCurrentDeck(player.getController().sideboard(psc.getCurrentDeck(), gameType)); psc.setCurrentDeck(player.getController().sideboard(psc.getCurrentDeck(), gameType));
} else { } else {
psc.restoreOriginalDeck(); psc.restoreOriginalDeck();
myDeck = psc.getCurrentDeck();
} }
Deck myDeck = psc.getCurrentDeck();
Set<CardPrinted> myRemovedAnteCards = useAnte ? null : getRemovedAnteCards(myDeck); Set<CardPrinted> myRemovedAnteCards = useAnte ? null : getRemovedAnteCards(myDeck);
Random generator = MyRandom.getRandom(); Random generator = MyRandom.getRandom();