Ignore LeaveReq before game start.

w3champions · Nov 5, 2024 · 9c04608 · 9c04608
1 parent 6f3d393
commit 9c04608
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/crates/client/src/lan/game/lobby.rs b/crates/client/src/lan/game/lobby.rs
@@ -83,12 +83,8 @@ impl<'a> LobbyHandler<'a> {
           let pkt = next?;
           if let Some(pkt) = pkt {
             if pkt.type_id() == LeaveReq::PACKET_TYPE_ID {
-              if let Some(node_stream) = self.node_stream.as_mut() {
-                node_stream.report_slot_status(SlotClientStatus::Connected).await.ok();
-              }
-              self.stream.send(Packet::simple(LeaveAck)?).await?;
-              self.stream.flush().await?;
-              return Ok(LobbyAction::Leave)
+              tracing::warn!("received leave request during lobby, ignoring");
+              continue;
             }
 
             self.handle_packet(&mut join_state, base_t, pkt).await?;

diff --git a/crates/client/src/lan/game/proxy.rs b/crates/client/src/lan/game/proxy.rs
@@ -444,11 +444,8 @@ impl State {
                   node_stream.report_slot_status(SlotClientStatus::Loaded).await?;
                 },
                 LeaveReq::PACKET_TYPE_ID => {
-                  tracing::debug!("leave: {:?}", my_slot_player_id);
-                  node_stream.report_slot_status(SlotClientStatus::Connected).await.ok();
-                  stream.send(Packet::simple(LeaveAck)?).await?;
-                  stream.flush().await?;
-                  break;
+                  tracing::warn!("received leave request during loading, ignoring");
+                  continue;
                 }
                 PongToHost::PACKET_TYPE_ID => {}
                 _ => {