summaryrefslogtreecommitdiff
path: root/sw-server/src/main
diff options
context:
space:
mode:
authorJoffrey Bion <joffrey.bion@booking.com>2020-08-20 15:36:49 +0200
committerJoffrey Bion <joffrey.bion@booking.com>2020-08-20 15:44:47 +0200
commit53cdfdfd3d7f4a8fed08ee475b2d5936155f6875 (patch)
tree51410abd200b107b06c3ff144c77ba5a687a4480 /sw-server/src/main
parentUpgrade to Spring Boot 2.3.3 (diff)
downloadseven-wonders-53cdfdfd3d7f4a8fed08ee475b2d5936155f6875.tar.gz
seven-wonders-53cdfdfd3d7f4a8fed08ee475b2d5936155f6875.tar.bz2
seven-wonders-53cdfdfd3d7f4a8fed08ee475b2d5936155f6875.zip
Fix style & sort imports
Diffstat (limited to 'sw-server/src/main')
-rw-r--r--sw-server/src/main/kotlin/org/luxons/sevenwonders/server/controllers/GameController.kt4
-rw-r--r--sw-server/src/main/kotlin/org/luxons/sevenwonders/server/lobby/Lobby.kt4
2 files changed, 4 insertions, 4 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 40a9407d..c15f7a68 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
@@ -93,10 +93,10 @@ class GameController(
}
private fun sendPlayerReady(gameId: Long, player: Player) =
- template.convertAndSend("/topic/game/$gameId/playerReady", "\"${player.username}\"")
+ template.convertAndSend("/topic/game/$gameId/playerReady", "\"${player.username}\"")
private fun sendPreparedCard(gameId: Long, preparedCard: PreparedCard) =
- template.convertAndSend("/topic/game/$gameId/prepared", preparedCard)
+ template.convertAndSend("/topic/game/$gameId/prepared", preparedCard)
private fun sendTurnInfo(players: List<Player>, game: Game, hideHands: Boolean) {
val turns = game.getCurrentTurnInfo()
diff --git a/sw-server/src/main/kotlin/org/luxons/sevenwonders/server/lobby/Lobby.kt b/sw-server/src/main/kotlin/org/luxons/sevenwonders/server/lobby/Lobby.kt
index 2962e5df..ed8add56 100644
--- a/sw-server/src/main/kotlin/org/luxons/sevenwonders/server/lobby/Lobby.kt
+++ b/sw-server/src/main/kotlin/org/luxons/sevenwonders/server/lobby/Lobby.kt
@@ -2,10 +2,10 @@ package org.luxons.sevenwonders.server.lobby
import org.luxons.sevenwonders.engine.Game
import org.luxons.sevenwonders.engine.data.GameDefinition
-import org.luxons.sevenwonders.model.wonders.AssignedWonder
-import org.luxons.sevenwonders.model.wonders.PreGameWonder
import org.luxons.sevenwonders.model.Settings
import org.luxons.sevenwonders.model.api.State
+import org.luxons.sevenwonders.model.wonders.AssignedWonder
+import org.luxons.sevenwonders.model.wonders.PreGameWonder
import org.luxons.sevenwonders.model.wonders.withRandomSide
class Lobby(
bgstack15