From 0f74a60cb3a8167e0db13566a4089fd964cd9e71 Mon Sep 17 00:00:00 2001 From: Oliver-Akins Date: Sun, 10 Jan 2021 15:41:48 -0700 Subject: [PATCH] Adjust logs and comments & a couple assignments --- server/src/events/JoinGame.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/server/src/events/JoinGame.ts b/server/src/events/JoinGame.ts index 3509e39..c6c745b 100644 --- a/server/src/events/JoinGame.ts +++ b/server/src/events/JoinGame.ts @@ -10,8 +10,9 @@ export default (io: Server, socket: Socket, data: JoinGame) => { // Game object and bring it back to being alive let hibernatedIndex = hibernatedGames.indexOf(data.game_code) if (hibernatedIndex >= 0) { - log.info(`Recreating game from datastore.`); + log.info(`Attempting to recreate game from datastore.`); + // Reinstantiate the game using the data from the disk let datastore = JSON.parse(readFileSync( `${conf.datastores.directory}/${data.game_code}.${conf.datastores.filetype}`, `utf-8` @@ -32,6 +33,10 @@ export default (io: Server, socket: Socket, data: JoinGame) => { // Instantiate the host's player object let host = new Player(data.name, socket, true); + host.role = playerData.role; + host.team = playerData.team; + + // Re-instantiate the game object let game = Game.fromJSON(host, datastore); game.log = log.getChildLogger({ displayLoggerName: true, @@ -57,7 +62,7 @@ export default (io: Server, socket: Socket, data: JoinGame) => { `${game.id}:*:${host.role}`, `${game.id}:${host.team}:${host.role}` ]); - game.log.debug(`Host assigned to team`); + game.log.debug(`Host assigned to team object`); }; hibernatedGames.splice(hibernatedIndex, 1);