diff --git a/Classes/physicsObject.ts b/Classes/physicsObject.ts index ec07f2b..230bdf6 100644 --- a/Classes/physicsObject.ts +++ b/Classes/physicsObject.ts @@ -1,8 +1,8 @@ export class physicsObject{ name : string //array of floats [3] - position : number[] = [] - rotation : number[] = [] - velocity : number[] = [] - angularVelocity : number[] = [] + position : number[] = [0,0,0] + rotation : number[] = [0,0,0] + velocity : number[] = [0,0,0] + angularVelocity : number[] = [0,0,0] } \ No newline at end of file diff --git a/Lobby/lobbySocket.ts b/Lobby/lobbySocket.ts index 94fefb7..3152945 100644 --- a/Lobby/lobbySocket.ts +++ b/Lobby/lobbySocket.ts @@ -11,16 +11,16 @@ export function registerLobbyCallbacks(socket){ let buff = Buffer.from(data, 'base64'); let data1 : playerData = JSON.parse(buff.toString('utf-8')); - if(socket.user.playerData == null){ - let pd = new playerData() - socket.user.playerData = pd - } - - socket.user.playerData.characterId = data1.characterId; - socket.user.playerData.socketId = socket.id + let pd = new playerData() + pd.socketId = socket.id + pd.userName = socket.user.login + pd.characterId = data1.characterId; + pd.inventory = data1.inventory; + socket.user.playerData = pd game.lobbyState.players.push(socket.user.playerData) - game.socketIO.emit("lobby/playerJoin", JSON.stringify(socket.user.playerData)) + game.socketIO.emit("lobby/playerJoin", JSON.stringify(game.lobbyState)) + socket.emit('lobby/messages', JSON.stringify(game.messages)) }); socket.on('lobby/playerUpdate', (data) => { @@ -32,12 +32,10 @@ export function registerLobbyCallbacks(socket){ let idx = game.lobbyState.players.findIndex((pl) => pl.socketId == socket.id) if(idx == -1){ - socket.player = data1 - game.lobbyState.players.push(data1) - socket.emit('lobby/messages', JSON.stringify(game.messages)) + console.log("Error! Player not spawned!") } else{ - game.lobbyState.players[idx] = data1 + game.lobbyState.players[idx].rigidbody = data1.rigidbody } });