From 7993c0257fb70105b28df752b0e322fae40fe7df Mon Sep 17 00:00:00 2001
From: Oliver-Akins <Tyler.Akins1999@gmail.com>
Date: Thu, 7 Jan 2021 16:12:15 -0700
Subject: [PATCH] Fix data not being populated properly.

---
 server/src/events/JoinGame.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/server/src/events/JoinGame.ts b/server/src/events/JoinGame.ts
index 9388c33..80fd70d 100644
--- a/server/src/events/JoinGame.ts
+++ b/server/src/events/JoinGame.ts
@@ -23,6 +23,8 @@ export default (io: Server, socket: Socket, data: JoinGame) => {
 				name: game.id,
 			});
 
+			game.ingame = datastore.ingame;
+
 			// Get the specific information for team
 			let playerData = datastore.players.find(p => p.name === data.name);
 			if (playerData) {
@@ -33,10 +35,10 @@ export default (io: Server, socket: Socket, data: JoinGame) => {
 			let hand: string[] = [];
 			if (host.team) {
 				let team = game.teams[host.team - 1];
-				hand = team.hand;
 				switch (host.role) {
 					case "guesser":
 						game.log.silly(`${host.name} is one of the team's guessers`);
+						hand = team.hand;
 						team.guessers.push(host);
 						socket.join([
 							`${game.id}:*:guesser`,
@@ -105,7 +107,7 @@ export default (io: Server, socket: Socket, data: JoinGame) => {
 
 				// Get the hand of the player's team
 				let hand: string[] = [];
-				if (sameName.team) {
+				if (sameName.team && sameName.role == `guesser`) {
 					hand = game.teams[sameName.team - 1].hand;
 				};