Merge branch 'master' into Network_Upgrade

This commit is contained in:
betasteward 2015-08-26 16:02:53 -04:00
commit d10bb2ed40
110 changed files with 5981 additions and 1574 deletions

View file

@ -851,7 +851,8 @@ public class GameController implements GameCallback {
perform(playerId, new Command() {
@Override
public void execute(UUID playerId) {
getGameSession(playerId).target(question, new CardsView(abilities, game), null, required, options);
CardsView cardsView = new CardsView(abilities, game);
getGameSession(playerId).target(question, cardsView, null, required, options);
}
});
}