summaryrefslogtreecommitdiff
path: root/sw-server
diff options
context:
space:
mode:
authorjoffrey-bion <joffrey.bion@gmail.com>2020-12-12 02:41:33 +0100
committerjoffrey-bion <joffrey.bion@gmail.com>2020-12-12 03:04:22 +0100
commitb4cb5e9ed50d1c94b78cd29485f37c5cd184bc9e (patch)
tree938ce933ff427a66fcf2ad0c1def93b554148596 /sw-server
parentAdd checks for race conditions (diff)
downloadseven-wonders-b4cb5e9ed50d1c94b78cd29485f37c5cd184bc9e.tar.gz
seven-wonders-b4cb5e9ed50d1c94b78cd29485f37c5cd184bc9e.tar.bz2
seven-wonders-b4cb5e9ed50d1c94b78cd29485f37c5cd184bc9e.zip
Delete game at the end of a game
Diffstat (limited to 'sw-server')
-rw-r--r--sw-server/src/main/kotlin/org/luxons/sevenwonders/server/controllers/GameController.kt9
1 files changed, 8 insertions, 1 deletions
diff --git a/sw-server/src/main/kotlin/org/luxons/sevenwonders/server/controllers/GameController.kt b/sw-server/src/main/kotlin/org/luxons/sevenwonders/server/controllers/GameController.kt
index 94ebceab..8bd3eb2b 100644
--- a/sw-server/src/main/kotlin/org/luxons/sevenwonders/server/controllers/GameController.kt
+++ b/sw-server/src/main/kotlin/org/luxons/sevenwonders/server/controllers/GameController.kt
@@ -5,6 +5,7 @@ import org.luxons.sevenwonders.model.api.actions.PrepareMoveAction
import org.luxons.sevenwonders.model.cards.PreparedCard
import org.luxons.sevenwonders.model.hideHandsAndWaitForReadiness
import org.luxons.sevenwonders.server.lobby.Player
+import org.luxons.sevenwonders.server.repositories.LobbyRepository
import org.luxons.sevenwonders.server.repositories.PlayerRepository
import org.slf4j.LoggerFactory
import org.springframework.messaging.handler.annotation.MessageMapping
@@ -19,6 +20,7 @@ import java.security.Principal
class GameController(
private val template: SimpMessagingTemplate,
private val playerRepository: PlayerRepository,
+ private val lobbyRepository: LobbyRepository,
) {
private val Principal.player
get() = playerRepository.find(name)
@@ -116,8 +118,13 @@ class GameController(
fun leave(principal: Principal) {
val player = principal.player
val game = player.game
- player.leave()
+ val lobby = player.lobby
+ lobby.removePlayer(player.username)
logger.info("Game {}: player {} left the game", game.id, principal.name)
+ if (lobby.getPlayers().isEmpty()) {
+ lobbyRepository.remove(lobby.id)
+ logger.info("Game {}: game deleted", game.id, principal.name)
+ }
}
companion object {
bgstack15