commit c9dd3eb0bc115edac23a69202bd99b177c87e71c
author Alex Fandrianto <alexfandrianto@google.com> Tue Dec 08 18:51:22 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Dec 08 18:51:22 2015 +0000
tree 6e38f0599e96d4d84ab1d19d85aaa21c0369711f
parent 52642f5b53e0945d3bcc38ccfd39198d42aa2f64
parent ed15fadde215017b0d6746084db348c357e97a81

Merge "croupier: Fix a bug with Board when no take target exists"

lib/components/board.dart

diff --git a/lib/components/board.dart b/lib/components/board.dart
index 6491981..41b072c 100644
--- a/lib/components/board.dart
+++ b/lib/components/board.dart
@@ -261,11 +261,14 @@
     double cccSize = sizeRatio * config.width;
 
     HeartsGame game = config.game;
+    List<logic_card.Card> cardsToTake = [];
+    int takeTarget = game.getTakeTarget(playerNumber);
+    if (takeTarget != null) {
+      cardsToTake = game.cardCollections[
+          game.getTakeTarget(playerNumber) + HeartsGame.OFFSET_PASS];
+    }
     return new CardCollectionComponent(
-        game.cardCollections[
-            game.getTakeTarget(playerNumber) + HeartsGame.OFFSET_PASS],
-        false,
-        CardCollectionOrientation.horz,
+        cardsToTake, false, CardCollectionOrientation.horz,
         backgroundColor: Colors.grey[300],
         width: cccSize,
         widthCard: config.cardWidth / 2,