Merge pull request #219 from Sunnickel/fix/fix-disconnect

fix: disconnect bug

Author: ReCore-sys

src/bin/src/packet_handlers/play_packets/set_player_position.rs

@@ -2,6 +2,7 @@ use bevy_ecs::prelude::{Entity, EventWriter, Query, Res};
 use ferrumc_core::chunks::cross_chunk_boundary_event::CrossChunkBoundaryEvent;
 use ferrumc_core::identity::player_identity::PlayerIdentity;
 use ferrumc_net::SetPlayerPositionPacketReceiver;
+use std::sync::atomic::Ordering;
 use tracing::{debug, error, trace, warn};
 
 use crate::errors::BinaryError;
@@ -151,7 +152,7 @@ fn update_pos_for_all(
     };
 
     for (entity, conn) in conn_query.iter() {
-        if !state.players.is_connected(entity) {
+        if !state.players.is_connected(entity) || !conn.running.load(Ordering::Relaxed) {
             warn!(
                 "Player {} is not connected, skipping position update",
                 entity
@@ -161,6 +162,9 @@ fn update_pos_for_all(
                 let v = player_l.value();
                 debug!("Player list: {} - {}", k, v.1);
             }
+            state
+                .players
+                .disconnect(entity, Some(String::from("Player not connected anymore.")));
             continue;
         }
         conn.send_packet_ref(&packet)?;

src/bin/src/packet_handlers/player/head_rot.rs

@@ -16,7 +16,10 @@ pub fn handle_player_move(
     for event in events.read() {
         let entity = event.entity;
 
-        let (rot, identity) = query.get(entity).unwrap();
+        let Ok((rot, identity)) = query.get(entity) else {
+            continue;
+        };
+
         let head_rot_packet = SetHeadRotationPacket::new(
             identity.uuid.as_u128() as i32,
             NetAngle::from_degrees(rot.yaw as f64),

src/bin/src/systems/connection_killer.rs

@@ -42,10 +42,10 @@ pub fn connection_killer(
                         player_identity.username
                     );
                 }
+                cmd.entity(entity).despawn();
             } else {
                 // Broadcast the disconnection to other players
             }
-            cmd.entity(entity).despawn();
         }
     }
 }