Skip to content

Commit 14ed8a6

Browse files
committed
fix(network): remove FreeReservationRequest
Not needed now that games can be prepared without reservations.
1 parent d68a741 commit 14ed8a6

File tree

4 files changed

+1
-21
lines changed

4 files changed

+1
-21
lines changed

sdk/src/server-api/sc/networking/clients/AdminClient.kt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package sc.networking.clients
22

3-
import sc.protocol.requests.FreeReservationRequest
43
import sc.protocol.requests.ObservationRequest
54
import sc.protocol.requests.PrepareGameRequest
65
import sc.protocol.room.RoomMessage
@@ -21,9 +20,4 @@ class AdminClient(private val client: LobbyClient) {
2120
client.send(ObservationRequest(roomId))
2221
}
2322

24-
/** Opens up a previously reserved slot. */
25-
fun freeReservation(reservation: String) {
26-
client.send(FreeReservationRequest(reservation))
27-
}
28-
2923
}

sdk/src/server-api/sc/protocol/LobbyProtocol.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ object LobbyProtocol {
1616
fun registerMessages(xStream: XStream): XStream {
1717
registerAdditionalMessages(xStream, listOf(ErrorPacket::class.java, ErrorMessage::class.java, GamePaused::class.java, JoinedRoomResponse::class.java, RemovedFromGame::class.java, MementoMessage::class.java, GamePreparedResponse::class.java, ObservationResponse::class.java, RoomPacket::class.java, WelcomeMessage::class.java))
1818

19-
registerAdditionalMessages(xStream, listOf(AuthenticateRequest::class.java, CancelRequest::class.java, FreeReservationRequest::class.java, JoinPreparedRoomRequest::class.java, JoinRoomRequest::class.java, ObservationRequest::class.java, PauseGameRequest::class.java, PrepareGameRequest::class.java, StepRequest::class.java, PlayerScoreRequest::class.java, TestModeRequest::class.java, PlayerScoreResponse::class.java, TestModeResponse::class.java, RoomWasJoinedEvent::class.java))
19+
registerAdditionalMessages(xStream, listOf(AuthenticateRequest::class.java, CancelRequest::class.java, JoinPreparedRoomRequest::class.java, JoinRoomRequest::class.java, ObservationRequest::class.java, PauseGameRequest::class.java, PrepareGameRequest::class.java, StepRequest::class.java, PlayerScoreRequest::class.java, TestModeRequest::class.java, PlayerScoreResponse::class.java, TestModeResponse::class.java, RoomWasJoinedEvent::class.java))
2020

2121
registerAdditionalMessages(xStream, listOf(GameResult::class.java, PlayerScore::class.java, ScoreAggregation::class.java, ITeam::class.java, ScoreCause::class.java, ScoreDefinition::class.java, ScoreFragment::class.java, WinCondition::class.java, SlotDescriptor::class.java, Score::class.java, ScoreValue::class.java))
2222

sdk/src/server-api/sc/protocol/requests/FreeReservationRequest.kt

Lines changed: 0 additions & 11 deletions
This file was deleted.

server/src/sc/server/Lobby.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,6 @@ class Lobby: GameRoomManager(), Closeable, IClientRequestListener {
5454
is PrepareGameRequest -> {
5555
source.send(this.prepareGame(packet))
5656
}
57-
is FreeReservationRequest -> {
58-
ReservationManager.freeReservation(packet.reservation)
59-
}
6057
is ObservationRequest -> {
6158
val room = this.findRoom(packet.roomId)
6259
room.addObserver(source)

0 commit comments

Comments
 (0)