From 99e4d4943c3814be0534be86191470f3c963d83e Mon Sep 17 00:00:00 2001 From: tomoron Date: Wed, 13 Nov 2024 13:47:24 +0100 Subject: [PATCH] fix ranked match making leave, add tolerance to anti cheat, set ball at middle when a goal is scored --- .../requirements/djangoserver/file/server/server/Game.py | 6 ++++-- .../djangoserver/file/server/server/GameSettings.py | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/docker-compose/requirements/djangoserver/file/server/server/Game.py b/docker-compose/requirements/djangoserver/file/server/server/Game.py index a6cf505..e511584 100644 --- a/docker-compose/requirements/djangoserver/file/server/server/Game.py +++ b/docker-compose/requirements/djangoserver/file/server/server/Game.py @@ -201,8 +201,8 @@ class Game: self.p2.setGame(None) if(Game.waitingForPlayer == self): Game.waitingForPlayer = None - if(self in Game.waitingForPlayerRanked): - Game.waitingForPlayerRanked.remove(self) + if(self in Game.rankedWaitingForPlayer): + Game.rankedWaitingForPlayer.remove(self) if(self.p2 != None): self.endGame(1 if self.left == 2 else 2) self.end=True @@ -260,6 +260,8 @@ class Game: print("new score :", self.score) self.p1.socket.sync_send({"type":"game","content":{"action":6, "is_opponent": player == 2}}) self.p2.socket.sync_send({"type":"game","content":{"action":6, "is_opponent": player == 1}}) + self.prepareGame(True); + self.sendNewBallInfo(True); await asyncio.sleep(4.5) if(self.checkGameEndGoal()): return diff --git a/docker-compose/requirements/djangoserver/file/server/server/GameSettings.py b/docker-compose/requirements/djangoserver/file/server/server/GameSettings.py index 7cde8c2..33dc76b 100644 --- a/docker-compose/requirements/djangoserver/file/server/server/GameSettings.py +++ b/docker-compose/requirements/djangoserver/file/server/server/GameSettings.py @@ -6,7 +6,7 @@ # By: edbernar