Fix: 'API c:player_profiles_list invocation failed: Host Profile is consumed or invalid, machine_id may have conflict.'

Author: burningtnt

src/controller/rooms/experimental/room.rs

@@ -388,7 +388,7 @@ pub fn start_guest(room: Room, player: Option<String>, capture: AppStateCapture)
     }
     logging!("RoomExperiment", "MC connection is OK.");
 
-    let local = ProfileSnapshot {
+    let local_profile = ProfileSnapshot {
         machine_id: MACHINE_ID.to_string(),
         name: player.unwrap_or("Terracotta Anonymous Guest".to_string()),
         vendor: VENDOR.to_string(),
@@ -408,7 +408,7 @@ pub fn start_guest(room: Room, player: Option<String>, capture: AppStateCapture)
                 room,
                 easytier,
                 server: FakeServer::create(local_port, crate::MOTD),
-                profiles: vec![local.clone()],
+                profiles: vec![local_profile.clone()],
             }
         })
     };
@@ -420,9 +420,9 @@ pub fn start_guest(room: Room, player: Option<String>, capture: AppStateCapture)
             {
                 let Some(_) = session.send_sync(("c", "player_ping"), |body| {
                     serde_json::to_writer(body, &json!({
-                        "machine_id": local.get_machine_id(),
-                        "name": local.get_name(),
-                        "vendor": local.get_vendor()
+                        "machine_id": local_profile.get_machine_id(),
+                        "name": local_profile.get_name(),
+                        "vendor": local_profile.get_vendor()
                     })).unwrap();
                 }) else {
                     fail(capture);
@@ -431,7 +431,7 @@ pub fn start_guest(room: Room, player: Option<String>, capture: AppStateCapture)
             }
 
             {
-                let Some(mut server_profiles) = session.send_sync(("c", "player_profiles_list"), |_| {}).map(|response| {
+                let Some(server_profiles) = session.send_sync(("c", "player_profiles_list"), |_| {}).map(|response| {
                     let PacketResponse::Ok { data } = response else {
                         unreachable!();
                     };
@@ -476,6 +476,9 @@ pub fn start_guest(room: Room, player: Option<String>, capture: AppStateCapture)
                         logging!("RoomExperiment", "API c:player_profiles_list invocation failed: No host detected.");
                         return None;
                     }
+                    if !local {
+                        server_players.push(local_profile.clone());
+                    }
 
                     server_players.sort_by_cached_key(|profile| profile.get_machine_id().to_string());
                     for profile in server_players.windows(2) {
@@ -501,10 +504,6 @@ pub fn start_guest(room: Room, player: Option<String>, capture: AppStateCapture)
                     return;
                 }
 
-                if server_profiles.binary_search_by_key(&*MACHINE_ID, |profile| profile.get_machine_id()).is_err() {
-                    server_profiles.push(local.clone());
-                }
-
                 let mut used = vec![false; server_profiles.len()];
                 let mut changed = false;
                 for i in (0..profiles.len()).rev() {
@@ -549,6 +548,8 @@ pub fn start_guest(room: Room, player: Option<String>, capture: AppStateCapture)
                         },
                     }
                 }
+
+                let mut server_profiles = server_profiles;
                 for i in (0..server_profiles.len()).rev() {
                     let profile = server_profiles.pop().unwrap();
                     if !used[i] && *profile.get_kind() != ProfileKind::LOCAL {