score by default the last player who played

diff --git a/public/trivabble.js b/public/trivabble.js
index 62a9d52686c63a9a156c0924fbf0e78d2c5980c1..0914a0cff459c4054e8bfc9fcce3590ad959abc7 100644 (file)
--- a/public/trivabble.js
+++ b/public/trivabble.js
@@ -194,6 +194,8 @@
     let currentMessageId = 1;
     const waitingMsgs = [];
 
+    let lastPlayer = null;
+
     let serverVersion = 0;
 
     function mouseDown(ele, fun, stop) {
@@ -1061,6 +1063,8 @@
                     participants.removeChild(participants.rows[1]);
                 }
                 sendCmds([{cmd: "hello"}]);
+
+                lastPlayer = null;
                 break;
 
             case "moveLetter":
@@ -1075,9 +1079,19 @@
                 } else if (data.to === "rack") {
                     setRackCell(data.indexTo, data.letter);
                 }
+
+                if (data.player) {
+                    lastPlayer = data.player;
+                }
+
                 break;
             case "setCell":
                 setCell(data.indexTo, data.letter, Object.prototype.hasOwnProperty.call(data, "player") && data.player !== getSetting("PlayerName"));
+
+                if (data.player) {
+                    lastPlayer = data.player;
+                }
+
                 if ((data.letter !== "") && (currentTilePlayed[data.indexTo] === "-")) {
                     currentTilePlayed[data.indexTo] = data.letter;
                 }
@@ -1894,11 +1908,11 @@
 
                 sendCmds([{
                     cmd: "score",
-                    player: currentPlayer,
+                    player: name,
                     score: parseInt(getScoreCell(name).textContent) + totalScore
                 }]);
             },
-            currentPlayer || getSetting("PlayerName")
+            lastPlayer || currentPlayer || getSetting("PlayerName")
         );
     }