From 1f2785cd1e595091b1a42a121d9ab5c357ee4f69 Mon Sep 17 00:00:00 2001
From: Alec Maier <Maier.144@osu.edu>
Date: Sat, 7 Sep 2019 16:48:44 -0400
Subject: [PATCH] Null check to fix app crash bug

---
 server.js | 38 +++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/server.js b/server.js
index a98d5b7..7b568b7 100644
--- a/server.js
+++ b/server.js
@@ -145,26 +145,30 @@ io.on('connection', function(socket) {
     });
     socket.on("timerExpired", function(code) {
         let game = activeGames[Object.keys(activeGames).find((key) => key === code)];
-        game.winningTeam = "wolf";
-        game.state = "ended";
-        io.to(code).emit('state', game);
-    });
-    socket.on('killPlayer', function(id, code) {
-        let game = activeGames[Object.keys(activeGames).find((key) => key === code)];
-        let player = game.players.find((player) => player.id === id);
-        game.players.find((player) => player.id === id).dead = true;
-        game.message = player.name + ", a " + player.card.role + ", has been killed!";
-        const winCheck = teamWon(game);
-        if (winCheck === "wolf") {
+        if (game) {
             game.winningTeam = "wolf";
             game.state = "ended";
             io.to(code).emit('state', game);
-        } else if (winCheck === "village") {
-            game.winningTeam = "village";
-            game.state = "ended";
-            io.to(code).emit('state', game);
-        } else {
-            io.to(code).emit('state', game);
+        }
+    });
+    socket.on('killPlayer', function(id, code) {
+        let game = activeGames[Object.keys(activeGames).find((key) => key === code)];
+        if (game) {
+            let player = game.players.find((player) => player.id === id);
+            game.players.find((player) => player.id === id).dead = true;
+            game.message = player.name + ", a " + player.card.role + ", has been killed!";
+            const winCheck = teamWon(game);
+            if (winCheck === "wolf") {
+                game.winningTeam = "wolf";
+                game.state = "ended";
+                io.to(code).emit('state', game);
+            } else if (winCheck === "village") {
+                game.winningTeam = "village";
+                game.state = "ended";
+                io.to(code).emit('state', game);
+            } else {
+                io.to(code).emit('state', game);
+            }
         }
     });
 });