From 3604379b0c1aa85cec5cb2eb9e78a8ddf1b4f396 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Rapha=C3=ABl=20Jakse?= <raphael.jakse@univ-grenoble-alpes.fr>
Date: Sun, 5 Apr 2020 12:32:31 +0200
Subject: [PATCH] fix game unconditionally being reset

---
 trivabble-server.js | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/trivabble-server.js b/trivabble-server.js
index f5dc09c..0345eb5 100644
--- a/trivabble-server.js
+++ b/trivabble-server.js
@@ -418,14 +418,12 @@ function countTiles(rack) {
     return count;
 }
 
-function joinGame(gameNumber, game, playerName) {
+function joinGame(gameNumber, playerName) {
     if (!gameNumber) {
         gameNumber = newGameId();
     }
 
-    if (!game) {
-        game = games[gameNumber] = new Game();
-    }
+    const game = games[gameNumber] || (games[gameNumber] = new Game());
 
     game.playerJoined(playerName);
 
@@ -433,9 +431,9 @@ function joinGame(gameNumber, game, playerName) {
 }
 
 function handleCommand(cmd, gameNumber, playerName, response) {
-    var game = games[gameNumber];
+    var game;
 
-    ({gameNumber, game} = joinGame(gameNumber, game, playerName));
+    ({gameNumber, game} = joinGame(gameNumber, playerName));
     game.lastUpdated = new Date();
 
     var rack = null;
@@ -659,7 +657,7 @@ function handleCommand(cmd, gameNumber, playerName, response) {
 
 function handleCommands(cmds, responseAndIsES) {
     if (!cmds.cmds || !cmds.cmds.length) {
-        var {gameNumber, game} = joinGame(cmds.gameNumber, game, cmds.playerName);
+        var {gameNumber, game} = joinGame(cmds.gameNumber, cmds.playerName);
 
         writeResponse(responseAndIsES,
             JSON.stringify({
-- 
2.30.2