diff --git a/games/objects/Game.py b/games/objects/Game.py index b2e767c..d071a72 100644 --- a/games/objects/Game.py +++ b/games/objects/Game.py @@ -134,15 +134,14 @@ class Game(AbstractRoom): if (self._everbody_is_here()): self.start() - self._update_player(player) + self.update_player(player) return player - def _update_player(self, player: Player): + def update_player(self, player: Player): self._updated_players.append(player) def finish(self, winner: Player): - print("yo") self.broadcast("finish", {"winner": winner.to_dict()}) self.model.finish(winner.user_id) @@ -156,7 +155,7 @@ class Game(AbstractRoom): self.finish(last_player) return - self._update_player(player) + self.update_player(player) def _spectator_join(self, user_id: int, socket: WebsocketConsumer): diff --git a/games/objects/Player.py b/games/objects/Player.py index 7f13ee6..5832264 100644 --- a/games/objects/Player.py +++ b/games/objects/Player.py @@ -92,7 +92,7 @@ class Player(Spectator): invalid_pos: bool = new_position.position != new_position_verified.position if (new_position != self.position): - self.game._update_player(self) + self.game.update_player(self) self.position = new_position @@ -102,14 +102,13 @@ class Player(Spectator): def connect(self, socket: WebsocketConsumer): self.socket = socket self.accept() - self.game._update_player(self) + self.game.update_player(self) def is_connected(self): return self.socket != None def disconnect(self, code: int = 1000): self.socket = None - print("bozoman") self.game.leave(self) def add_goal(self): @@ -118,8 +117,6 @@ class Player(Spectator): self.score.append(timestamp) - print(self.score) - return timestamp def to_dict(self) -> dict: diff --git a/games/routine.py b/games/routine.py index e28da1c..8f10c98 100644 --- a/games/routine.py +++ b/games/routine.py @@ -277,7 +277,7 @@ async def render_players(game: Game): while True: for player in game._updated_players: - game.broadcast("update_paddle", player.to_dict(), [player]) + await SyncToAsync(game.broadcast)("update_paddle", player.to_dict(), [player]) game._updated_players.clear()