Merge origin/master into Network_Upgrade

This commit is contained in:
LevelX2 2015-08-27 14:37:49 +02:00
commit 155b7fafd0
160 changed files with 9032 additions and 1585 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);
}
});
}