From 04a0780225d33a82922cf8064bdad9a6deadea22 Mon Sep 17 00:00:00 2001
From: Oliver-Akins <Tyler.Akins1999@gmail.com>
Date: Sun, 28 Feb 2021 19:38:15 -0700
Subject: [PATCH] Get the correct hand from the team for spirits reconnecting

---
 server/src/events/JoinGame.ts | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/server/src/events/JoinGame.ts b/server/src/events/JoinGame.ts
index 5e20bac..972947c 100644
--- a/server/src/events/JoinGame.ts
+++ b/server/src/events/JoinGame.ts
@@ -122,19 +122,24 @@ export default (io: Server, socket: Socket, data: JoinGame) => {
 				let rooms: string[] = [game.id];
 				game.log.info(`Player Reconnected to the game (name=${data.name})`);
 
-				// Get the hand of the player's team if they are a guesser
 				let hand: string[] = [];
-				if (sameName.team && sameName.role == `guesser`) {
-					hand = game.teams[sameName.team - 1].hand;
-				};
 
 				// Ensure that the user has a role before connecting them to
 				// the websocket rooms
-				if (sameName.role) {
+				if (sameName.role && sameName.team) {
 					rooms.push(
 						`${game.id}:*:${sameName.role}`,
 						`${game.id}:${sameName.team}:${sameName.role}`
 					);
+
+					switch (sameName.role) {
+						case "guesser":
+							hand = game.teams[sameName.team - 1].hand;
+							break;
+						case "writer":
+							hand = game.teams[sameName.team - 1].spiritHand;
+							break;
+					};
 				};
 
 				socket.join(rooms);