diff --git a/src/client/Main.ts b/src/client/Main.ts index f7c0af249..f1cd9ccf6 100644 --- a/src/client/Main.ts +++ b/src/client/Main.ts @@ -202,8 +202,8 @@ class Client { consolex.log("joining lobby, stopping existing game"); this.gameStop(); } + console.log("territoryPattern", localStorage.getItem("territoryPattern")); const config = await getServerConfigFromClient(); - this.gameStop = joinLobby( { gameID: lobby.gameID, diff --git a/src/client/Transport.ts b/src/client/Transport.ts index 42b47e058..44eb78679 100644 --- a/src/client/Transport.ts +++ b/src/client/Transport.ts @@ -339,7 +339,7 @@ export class Transport { persistentID: this.lobbyConfig.persistentID, username: this.lobbyConfig.playerName, flag: this.lobbyConfig.flag, - pattern: localStorage.getItem("territoryPattern"), + pattern: this.lobbyConfig.pattern, }), ), ); diff --git a/src/server/Client.ts b/src/server/Client.ts index 27bbd8d75..20ece4df4 100644 --- a/src/server/Client.ts +++ b/src/server/Client.ts @@ -17,5 +17,6 @@ export class Client { public readonly username: string, public readonly ws: WebSocket, public readonly flag: string | null, + public readonly pattern: string | null, ) {} } diff --git a/src/server/GameServer.ts b/src/server/GameServer.ts index a267c4f3a..59490141b 100644 --- a/src/server/GameServer.ts +++ b/src/server/GameServer.ts @@ -273,6 +273,7 @@ export class GameServer { playerID: c.playerID, username: c.username, clientID: c.clientID, + pattern: c.pattern, flag: c.flag, })), }); diff --git a/src/server/Worker.ts b/src/server/Worker.ts index 8a6d0ddd4..569099d7b 100644 --- a/src/server/Worker.ts +++ b/src/server/Worker.ts @@ -301,6 +301,7 @@ export function startWorker() { clientMsg.username, ws, clientMsg.flag, + clientMsg.pattern, ); const wasFound = gm.addClient(