enemy damage sync

Lobby/lobbySocket.ts

@@ -1,6 +1,8 @@
 import { lobbyMessage } from "../Classes/lobbyMessage";
+import { lobbyState } from "../Classes/lobbyState";
 import { playerData } from "../Classes/playerData"
 import { playerInventory } from "../Classes/playerInventory";
+import { userData } from "../Classes/userData";
 import { game } from "../game";
 
 export function registerLobbyCallbacks(socket){
@@ -12,7 +14,11 @@ export function registerLobbyCallbacks(socket){
 
         socket.player.characterId = data1.characterId
         game.lobbyState.addUser(socket.user, socket.player)
-        game.socketIO.emit("lobby/playerJoin", JSON.stringify(game.lobbyState))
+
+        let newLobbyState : lobbyState = Object.assign({}, game.lobbyState);
+        newLobbyState.users = newLobbyState.users.map(u=> userData.makeSafe(u))
+
+        game.socketIO.emit("lobby/playerJoin", JSON.stringify(newLobbyState))
         game.addMessage(new lobbyMessage(socket.user.login + " joined"))
     });
 
@@ -22,24 +28,17 @@ export function registerLobbyCallbacks(socket){
         let buff = Buffer.from(data, 'base64');
         let data1 : playerData = JSON.parse(buff.toString('utf-8'));
 
-        let player = game.lobbyState.findPlayer(socket.user.id)
+        let player : playerData = socket.player
         if(player == null){
             console.log("Error! Player not spawned!")
         }
         else{
+            player.room = data1.room
             player.rigidbody = data1.rigidbody
+            player.damageInfo = player.damageInfo.concat(data1.damageInfo)
         }
     });
 
-    socket.on('lobby/lobbyUpdate', (data) => {
-        if(!socket.hasOwnProperty("user")) return;
-
-        let buff = Buffer.from(data, 'base64');
-        let data1 = JSON.parse(buff.toString('utf-8'));
-
-        game.lobbyState.objects = data1.objects
-    });
-
     socket.on('lobby/loadoutChanged', (data) => {
         if(!socket.hasOwnProperty("user")) return;