Skip to content

Commit e25f2f2

Browse files
committed
Merge remote-tracking branch 'origin/feat/34' into feat/34
# Conflicts: # backend/src/main/java/io/f1/backend/domain/game/websocket/service/SessionService.java
2 parents a568032 + f1dd3a2 commit e25f2f2

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

backend/src/main/java/io/f1/backend/domain/game/model/Room.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ public Room(Long id, RoomSetting roomSetting, GameSetting gameSetting, Player ho
5151
this.host = host;
5252
}
5353

54-
public void addValidatedUserId(Long userId) {validatedUserIds.add(userId);
54+
public void addValidatedUserId(Long userId) {
55+
validatedUserIds.add(userId);
5556
}
5657

5758
public int getCurrentUserCnt() {

backend/src/main/java/io/f1/backend/domain/game/websocket/eventlistener/WebsocketEventListener.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ public void handleSubscribeListener(SessionSubscribeEvent event) {
3939

4040
String sessionId = getSessionId(message);
4141

42-
String destination = getRoomSubscriptionDestination(message);
42+
String destination = getRoomSubscriptionDestination(message);
4343

44-
//todo 인덱스 길이 유효성 추가
44+
// todo 인덱스 길이 유효성 추가
4545
String[] subscribeType = destination.split("/");
4646

4747
if (subscribeType[2].equals("room")) {

0 commit comments

Comments
 (0)