diff --git a/src/backend/server.py b/src/backend/server.py index 0f67d36..7a13957 100644 --- a/src/backend/server.py +++ b/src/backend/server.py @@ -9,7 +9,7 @@ T_PlayerStateDict = dict[str, T_PlayerDict | bool] T_SpectatorStateDict = dict[str, T_PlayerDict] MAX_PLAYERS = 2 -PLAYERS: set[Player] = set() +PLAYERS: list[Player] = [] def num_players() -> int: @@ -62,11 +62,6 @@ async def broadcast(message): async def handler(websocket: ServerConnection): - # client_id = next(CLIENT_IDS) - # CLIENTS.add(Client(websocket)) - - player: Player | None = None - try: async for msg in websocket: raw_action = json.loads(msg) @@ -75,7 +70,7 @@ async def handler(websocket: ServerConnection): if raw_action["action"] == "join": name = raw_action["name"] player = Player(websocket, name, is_spectator()) - PLAYERS.add(player) + PLAYERS.append(player) await player.send_message({"player": player.as_dict()}) @@ -97,8 +92,21 @@ async def handler(websocket: ServerConnection): await player.send_message({"player": player.as_dict()}) else: - if player is None: - raise Exception("Player has not joined.") + query = list( + filter( + lambda player: player.websocket is not None + and player.websocket.id == websocket.id, + PLAYERS, + ) + ) + + if len(query) == 0: + raise Exception("Player did not join yet.") + + player = query[0] + + if player.is_disconnected: + raise Exception("Player is not connected.") if raw_action["action"] == "toggleRole": if player.is_spectator: