Skip to content

Commit f4000d2

Browse files
committed
Merge remote-tracking branch 'origin/feat/49' into feat/49
# Conflicts: # backend/src/main/java/io/f1/backend/domain/game/websocket/GameSocketController.java
2 parents 157ca1c + fa917d7 commit f4000d2

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

backend/src/main/java/io/f1/backend/domain/game/websocket/GameSocketController.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,17 @@ public void initializeRoomSocket(@DestinationVariable Long roomId, Message<?> me
3131
String websocketSessionId = getSessionId(message);
3232

3333
RoomInitialData roomInitialData =
34-
roomService.initializeRoomSocket(roomId, websocketSessionId);
34+
roomService.initializeRoomSocket(roomId, websocketSessionId);
3535
String destination = roomInitialData.destination();
3636

3737
messageSender.send(
38-
destination, MessageType.ROOM_SETTING, roomInitialData.roomSettingResponse());
38+
destination, MessageType.ROOM_SETTING, roomInitialData.roomSettingResponse());
3939
messageSender.send(
40-
destination, MessageType.GAME_SETTING, roomInitialData.gameSettingResponse());
40+
destination, MessageType.GAME_SETTING, roomInitialData.gameSettingResponse());
4141
messageSender.send(
42-
destination, MessageType.PLAYER_LIST, roomInitialData.playerListResponse());
42+
destination, MessageType.PLAYER_LIST, roomInitialData.playerListResponse());
4343
messageSender.send(
44-
destination, MessageType.SYSTEM_NOTICE, roomInitialData.systemNoticeResponse());
44+
destination, MessageType.SYSTEM_NOTICE, roomInitialData.systemNoticeResponse());
4545
}
4646

4747
@MessageMapping("/room/exit/{roomId}")
@@ -55,9 +55,9 @@ public void exitRoom(@DestinationVariable Long roomId, Message<?> message) {
5555

5656
if (!roomExitData.isRemovedRoom()) {
5757
messageSender.send(
58-
destination, MessageType.PLAYER_LIST, roomExitData.getPlayerListResponses());
58+
destination, MessageType.PLAYER_LIST, roomExitData.getPlayerListResponses());
5959
messageSender.send(
60-
destination, MessageType.SYSTEM_NOTICE, roomExitData.getSystemNoticeResponse());
60+
destination, MessageType.SYSTEM_NOTICE, roomExitData.getSystemNoticeResponse());
6161
}
6262
}
6363

0 commit comments

Comments
 (0)