Merge pull request #81 from saffron-lockdown/roundfix

properly refer to round

src/server/game.js

@@ -103,10 +103,13 @@ export class Game {
 
   // get the current drawing to be either captioned or guessed for the current turn
   getViewDrawing() {
-    if (this.getCurrentRound()) {
-      return this.getCurrentTurn().getDrawing();
+    this.log('getViewDrawing');
+    const round = this.getCurrentRound();
+    if (!round) {
+      this.log('getViewDrawing:getCurrentRound returned null');
+      return null;
     }
-    return null;
+    return round.getCurrentTurn().getDrawing();
   }
 
   // get the captions from the current turn
@@ -254,6 +257,10 @@ export class Game {
 
   startCaptionPhase() {
     this.cancelCountdown();
+
+    if (!this.getCurrentRound().allDrawingsIn()) {
+      this.log('Caption phase started but not all drawings in');
+    }
     this._phase = PHASES.CAPTION;
     this.startCountdown(this.startGuessPhase);
   }
@@ -360,6 +367,7 @@ export class Game {
   sync() {
     this.log('syncing all players, current game plan:');
     this.log(this._gameplan);
+
     this._players.forEach((player) => {
       player.sync();
     });

src/server/player.js

@@ -100,6 +100,11 @@ export class Player {
       ...playerState,
     };
 
+    if (gameState.timeRemaining === gameState.timerDuration) {
+      this.log(this._game && this._game.gameplan);
+      this.log(gameState);
+    }
+
     this.emit('sync', state);
   }
 

src/server/turn.js

@@ -45,10 +45,15 @@ export class Turn {
   }
 
   submitDrawing(drawing) {
+    if (drawing === null) {
+      this.log('null drawing submitted to turn');
+    }
+
     // only allow one drawing to be submitted
     if (this._drawingSubmitted) {
       return;
     }
+
     this._drawing = drawing;
     this._drawingSubmitted = true;
   }