Correctly implement end of game

1 files changed, 7 insertions, 9 deletions

diff --git a/back/src/Game.ts b/back/src/Game.ts
index 9b0b5d6..61bbdf9 100644
--- a/back/src/Game.ts
+++ b/back/src/Game.ts
@@ -67,19 +67,17 @@ export default class Game {
 		}
 		const startingPlayer = this.players[0]; // Pick a random starting player instead??
 		this.playerTurn = this.players.indexOf(startingPlayer);
+		this.playersFinished = this.room.clients.length;
+		// Run the game
 		while (true) {
-			// Check if game ended
-			// Rewrite
 			const playersLeft: Player[] = [];
 			this.players.forEach((p: Player) => {
-				if (!p.rank && !p.disconnected)
-					playersLeft.push(p);
+				if (!p.rank && !p.disconnected) {
+					if (p.cards.length === 0) p.rank = this.playersFinished--;
+					else playersLeft.push(p);
+				}
 			});
-			if (playersLeft.length < 2) {
-				if (playersLeft.length === 1)
-					playersLeft[0].rank = ++this.playersFinished; // rank is reversed, fix later
-				break;
-			}
+			if (playersLeft.length === 1) break;
 			await this.round();
 		}
 		this.broadcastGameState();