From da5d244449b6d2ca8c89213de8df67285de49346 Mon Sep 17 00:00:00 2001
From: tomoron <tomoron@student.42angouleme.fr>
Date: Thu, 14 Nov 2024 14:27:09 +0100
Subject: [PATCH] change tournament leave function

---
 .../djangoserver/file/server/server/Tournament.py         | 8 ++++----
 .../djangoserver/file/server/server/TournamentGame.py     | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docker-compose/requirements/djangoserver/file/server/server/Tournament.py b/docker-compose/requirements/djangoserver/file/server/server/Tournament.py
index 99beeaa..7e7b2d3 100644
--- a/docker-compose/requirements/djangoserver/file/server/server/Tournament.py
+++ b/docker-compose/requirements/djangoserver/file/server/server/Tournament.py
@@ -6,7 +6,7 @@
 #    By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2024/10/04 17:17:07 by tomoron           #+#    #+#              #
-#    Updated: 2024/11/14 13:42:03 by tomoron          ###   ########.fr        #
+#    Updated: 2024/11/14 13:46:45 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -69,13 +69,13 @@ class Tournament:
 		return(-1)
 
 	def leave(self, socket):
-		if(self.started):
-			return;
 		index = self.playerFromSocket(socket)
 		if(index == -1):
 			return;
-		self.players.pop(index)
 		socket.tournament = None
+		if(self.started):
+			return;
+		self.players.pop(index)
 		self.broadcast({"action":2,"id":index})
 
 	def join(self, socket, skin=0, goal=0, isBot=False):
diff --git a/docker-compose/requirements/djangoserver/file/server/server/TournamentGame.py b/docker-compose/requirements/djangoserver/file/server/server/TournamentGame.py
index 0109913..eaecc55 100644
--- a/docker-compose/requirements/djangoserver/file/server/server/TournamentGame.py
+++ b/docker-compose/requirements/djangoserver/file/server/server/TournamentGame.py
@@ -6,7 +6,7 @@
 #    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2024/10/22 01:37:00 by tomoron           #+#    #+#              #
-#    Updated: 2024/10/22 01:37:12 by tomoron          ###   ########.fr        #
+#    Updated: 2024/11/14 13:59:35 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -38,7 +38,7 @@ class TournamentGame:
 			print("waiting for player")
 			nbLoop += 1
 			await asyncio.sleep(0.1)
-		if(not l.socket.online or not r.socket.online):
+		if(not l.socket.tournament == self.tournament  or not r.socket.tournament == self.tournament):
 			print("player is not online, opponent is winner")
 			self.winner = l if l.socket.online else r
 			return;