From d4cc2b9ee332a22963c8cbe7971568bc6641c35e Mon Sep 17 00:00:00 2001
From: H4CK3R-01 <resiaknairolf@gmail.com>
Date: Thu, 17 Jun 2021 10:01:11 +0200
Subject: [PATCH] Try to fix server

---
 Webservice/server.js | 53 +++++++++++++++++++++++++-------------------
 1 file changed, 30 insertions(+), 23 deletions(-)

diff --git a/Webservice/server.js b/Webservice/server.js
index 0e7d735..98f88f9 100644
--- a/Webservice/server.js
+++ b/Webservice/server.js
@@ -65,16 +65,18 @@ io.on('connection', socket => {
     });
 
     socket.on('new message', function (data) {
-        socket.broadcast.to(socket.room).emit('new message', {
-            username: socket.username,
-            message: data
-        });
+        if (gameState[socket.room] !== undefined && addedUser) {
+            socket.broadcast.to(socket.room).emit('new message', {
+                username: socket.username,
+                message: data
+            });
 
-        generate_log_message(socket.room, socket.username, "MESSAGE", data);
+            generate_log_message(socket.room, socket.username, "MESSAGE", data);
+        }
     });
 
     socket.on('disconnect', function () {
-        if (addedUser) {
+        if (gameState[socket.room] !== undefined && addedUser) {
             socket.broadcast.to(socket.room).emit('user left', socket.username);
             let index = -1;
             for (let i = 0; i < gameState[socket.room].players.length; i++) {
@@ -102,34 +104,39 @@ io.on('connection', socket => {
 
     // Game
     socket.on('roll dice', function () {
+        if (gameState[socket.room] !== undefined && addedUser) {
+            if (gameState[socket.room].players[gameState[socket.room].whosNext].socketUsername === socket.username) {
+                gameState[socket.room].started = true;
+                let sides = 3;
+                let randomNumber = Math.floor(Math.random() * sides) + 1;
 
-        if (gameState[socket.room].players[gameState[socket.room].whosNext].socketUsername === socket.username) {
-            gameState[socket.room].started = true;
-            let sides = 3;
-            let randomNumber = Math.floor(Math.random() * sides) + 1;
+                io.in(socket.room).emit('dice', randomNumber);
 
-            io.in(socket.room).emit('dice', randomNumber);
-
-            generate_log_message(socket.room, socket.username, "DICE", randomNumber);
-        } else {
-            // TODO
+                generate_log_message(socket.room, socket.username, "DICE", randomNumber);
+            } else {
+                // TODO
+            }
         }
     });
 
     socket.on('get card', function (difficulty) {
-        if (gameState[socket.room].players[gameState[socket.room].whosNext].socketUsername === socket.username) {
-            io.in(socket.room).emit('card', {'username': socket.username, 'card': getRandomCard(difficulty)});
+        if (gameState[socket.room] !== undefined && addedUser) {
+            if (gameState[socket.room].players[gameState[socket.room].whosNext].socketUsername === socket.username) {
+                io.in(socket.room).emit('card', {'username': socket.username, 'card': getRandomCard(difficulty)});
 
-            generate_log_message(socket.room, socket.username, "CARD", difficulty);
-        } else {
-            // TODO
+                generate_log_message(socket.room, socket.username, "CARD", difficulty);
+            } else {
+                // TODO
+            }
         }
     });
 
     socket.on('card finished', function (difficulty, answerIsCorrect) {
-        if (answerIsCorrect) gameState[socket.room].players[gameState[socket.room].whosNext].move(difficulty);
-        io.in(socket.room).emit('card destroyed');
-        gameState[socket.room].finish_turn();
+        if (gameState[socket.room] !== undefined && addedUser) {
+            if (answerIsCorrect) gameState[socket.room].players[gameState[socket.room].whosNext].move(difficulty);
+            io.in(socket.room).emit('card destroyed');
+            gameState[socket.room].finish_turn();
+        }
     });
 });
 
-- 
2.45.2