From 175265be8498cfe8eaba590be664e3495243e627 Mon Sep 17 00:00:00 2001
From: Jonas Zeunert <jonas@zeunert.org>
Date: Thu, 1 Sep 2022 00:45:17 +0200
Subject: [PATCH] ich will fertig werden

---
 GameState.py           | 4 ++++
 events/EndBallEvent.py | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/GameState.py b/GameState.py
index 07e60e5..a13bb21 100644
--- a/GameState.py
+++ b/GameState.py
@@ -8,6 +8,7 @@ import asyncio
 import threading
 
 class GameState:
+    playerCount = 0
     players = None
     credits = config.BALLS_PER_GAME
     isPlaying = False
@@ -44,9 +45,11 @@ class GameState:
     def endGame(self):
         self.writeHighscore()
         self.players = None
+        self.playerCount = 0
         self._currentPlayer = self.dummyPlayer
         self.isPlaying = False
         self.isStarted = False
+
         logging.info("Game ended")
         self.startIdleLoop()
 
@@ -89,6 +92,7 @@ class GameState:
             self.deactivate_all()
 
     def createPlayers(self, playerCount):
+        self.playerCount = playerCount
         players = []
         for i in range(playerCount):
             player = self.playerStateFactory.createPlayerState(i)
diff --git a/events/EndBallEvent.py b/events/EndBallEvent.py
index 84603a2..8f6816d 100644
--- a/events/EndBallEvent.py
+++ b/events/EndBallEvent.py
@@ -41,7 +41,7 @@ class EndBallEvent(Event):
         self.scorePoints()
         self.gameState.currentPlayer.deactivate()
 
-        if self.gameState.currentPlayer.ballsLeft == 0 and self.gameState.currentPlayer.id == len(self.gameState.players):
+        if self.gameState.currentPlayer.ballsLeft == 0 and self.gameState.currentPlayer.id == len(self.gameState.players) - 1:
             self.gameState.endGame()
             return