Skip to content

Commit aaae74e

Browse files
authored
refactor(server): log game leave (#228)
1 parent e602410 commit aaae74e

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

sdk/src/server-api/sc/networking/clients/LobbyClient.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,11 @@ private void onGameOver(String roomId, GameResult data) {
116116
}
117117

118118
private void onGameLeft(String roomId) {
119+
logger.info("Received LeftGameEvent");
119120
for (ILobbyClientListener listener : this.listeners) {
120121
listener.onGameLeft(roomId);
121122
}
123+
logger.info("Left {}", roomId);
122124
}
123125

124126
private void onGameJoined(String roomId) {

server/src/sc/server/Lobby.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ open class Lobby: GameRoomManager(), IClientListener, Closeable {
5858
is JoinPreparedRoomRequest ->
5959
try {
6060
ReservationManager.redeemReservationCode(source, packet.reservationCode)
61-
} catch(e: RescuableClientException) {
61+
} catch (e: RescuableClientException) {
6262
source.send(ProtocolErrorMessage(packet, e.message))
6363
}
6464
is JoinRoomRequest -> {
6565
val gameRoomMessage = this.joinOrCreateGame(source, packet.gameType)
6666
// null is returned if join was unsuccessful
67-
if(gameRoomMessage != null) {
67+
if (gameRoomMessage != null) {
6868
clientManager.clients
6969
.filter { it.isAdministrator }
7070
.forEach { it.send(gameRoomMessage) }
@@ -109,14 +109,14 @@ open class Lobby: GameRoomManager(), IClientListener, Closeable {
109109
room.step(packet.forced)
110110
}
111111
is CancelRequest -> {
112+
requireNotNull(packet.roomId) { "Can't cancel a game with roomId null!" }
112113
val room = this.findRoom(packet.roomId)
113114
room.cancel()
114-
// TODO check whether all clients receive game over message
115115
}
116116
is PlayerScoreRequest -> {
117117
val displayName = packet.displayName
118118
val score = getScoreOfPlayer(displayName)
119-
?: throw IllegalArgumentException("Score for \"$displayName\" could not be found!")
119+
?: throw IllegalArgumentException("Score for \"$displayName\" could not be found!")
120120
logger.debug("Sending score of player \"{}\"", displayName)
121121
source.send(PlayerScoreResponse(score))
122122
}

0 commit comments

Comments
 (0)