From f49351dcdffd1bdc571bd89794f061d0965e914a Mon Sep 17 00:00:00 2001 From: James Ketrenos Date: Thu, 10 Mar 2022 23:27:50 -0800 Subject: [PATCH] Allow reselecting the same color Signed-off-by: James Ketrenos --- client/src/PlayerList.js | 6 ++++++ server/routes/games.js | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/client/src/PlayerList.js b/client/src/PlayerList.js index 05c8f22..df78595 100644 --- a/client/src/PlayerList.js +++ b/client/src/PlayerList.js @@ -17,13 +17,19 @@ const PlayerList = () => { const data = JSON.parse(event.data); switch (data.type) { case 'game-update': + console.log(`PlayerList - onWsMessage`); if (data.update.players) { + let found = false; for (let key in data.update.players) { if (data.update.players[key].name === name) { + found = true; setColor(key); break; } } + if (!found) { + setColor(undefined); + } setPlayers(data.update.players); } if (data.update.state) { diff --git a/server/routes/games.js b/server/routes/games.js index c3be448..1817b8a 100755 --- a/server/routes/games.js +++ b/server/routes/games.js @@ -3024,7 +3024,7 @@ router.ws("/ws/:id", async (ws, req) => { break; case 'set': - console.log(`${id}:${getName(session)} - ${data.type}`); + console.log(`${id}:${getName(session)} - ${data.type} = ${data.value}`); update = {}; switch (data.field) { case 'color':