修复当玩家在房间WaitForReady状态下触发断线重连后点击准备按钮时客户端panic

phira-mp-server/src/room.rs

@@ -88,10 +88,14 @@ impl Room {
             .to_client(self.chart.read().await.as_ref().map(|it| it.id))
     }
 
+    pub async fn fake_room_state(&self) -> RoomState {
+        RoomState::SelectChart(self.chart.read().await.as_ref().map(|it| it.id))
+    }
+
     pub async fn client_state(&self, user: &User) -> ClientRoomState {
         ClientRoomState {
             id: self.id.clone(),
-            state: self.client_room_state().await,
+            state: self.fake_room_state().await,
             live: self.is_live(),
             locked: self.is_locked(),
             cycle: self.is_cycle(),

phira-mp-server/src/session.rs

@@ -5,7 +5,7 @@ use crate::{
 use anyhow::{anyhow, bail, Result};
 use phira_mp_common::{
     ClientCommand, JoinRoomResponse, Message, ServerCommand, Stream, UserInfo,
-    HEARTBEAT_DISCONNECT_TIMEOUT,
+    RoomState, HEARTBEAT_DISCONNECT_TIMEOUT,
 };
 use serde::Deserialize;
 use std::{
@@ -253,6 +253,18 @@ impl Session {
                                             room_state,
                                         ))))
                                         .await;
+
+                                    if let Some(room) = user.room.read().await.as_ref() {
+                                        let state = room.client_room_state().await;
+
+                                        if !matches!(state, RoomState::SelectChart(_)) {
+
+                                            time::sleep(Duration::from_nanos(1)).await;
+
+                                            let _ = send_tx.send(ServerCommand::ChangeState(state)).await;
+                                        }
+                                    };
+
                                     waiting_for_authenticate.store(false, Ordering::SeqCst);
                                 }
                                 return;