omg i hate github merges.

Author: Sunnickel

src/bin/src/systems/connection_killer.rs

@@ -17,41 +17,44 @@ pub fn connection_killer(
     state: Res<GlobalStateResource>,
 ) {
     while let Some((disconnecting_entity, reason)) = state.0.players.disconnection_queue.pop() {
-        for (entity, conn, player_identity, mut disconnect_handle) in query.iter_mut() {
-            if disconnecting_entity == entity {
-                info!(
-                    "Player {} ({}) disconnected: {}",
-                    player_identity.username,
-                    player_identity.uuid,
-                    reason.as_deref().unwrap_or("No reason")
-                );
-                if conn.running.load(std::sync::atomic::Ordering::Relaxed) {
-                    trace!(
-                        "Sending disconnect packet to player {}",
-                        player_identity.username
-                    );
-                    if let Err(e) = conn.send_packet_ref(
-                        &ferrumc_net::packets::outgoing::disconnect::DisconnectPacket {
-                            reason: TextComponent::from(
-                                reason.as_deref().unwrap_or("Disconnected"),
-                            ),
-                        },
-                    ) {
-                        warn!(
-                            "Failed to send disconnect packet to player {}: {:?}",
-                            player_identity.username, e
+        let entity_result = query.get(disconnecting_entity);
+        match entity_result {
+            Ok(disconnecting_player) => {
+                for (entity, conn, player_identity, mut disconnect_handle) in query.iter_mut() {
+                    if disconnecting_entity == entity {
+                        info!(
+                            "Player {} ({}) disconnected: {}",
+                            player_identity.username,
+                            player_identity.uuid,
+                            reason.as_deref().unwrap_or("No reason")
                         );
-                    }
-                    if let Some(sender) = disconnect_handle.sender.take() {
-                        if let Err(_) = sender.send(()) {
-                            trace!("Failed to send disconnect signal (receiver already dropped)");
-                        }
-                    }
-                } else {
-                    trace!(
-                        "Connection for player {} is not running, skipping disconnect packet",
-                        player_identity.username
-                    );
+                        if conn.running.load(std::sync::atomic::Ordering::Relaxed) {
+                            trace!(
+                                "Sending disconnect packet to player {}",
+                                player_identity.username
+                            );
+                            if let Err(e) = conn.send_packet_ref(
+                                &ferrumc_net::packets::outgoing::disconnect::DisconnectPacket {
+                                    reason: TextComponent::from(
+                                        reason.as_deref().unwrap_or("Disconnected"),
+                                    ),
+                                },
+                            ) {
+                                warn!(
+                                    "Failed to send disconnect packet to player {}: {:?}",
+                                    player_identity.username, e
+                                );
+                            }
+                            if let Some(sender) = disconnect_handle.sender.take() {
+                                if let Err(_) = sender.send(()) {
+                                    trace!("Failed to send disconnect signal (receiver already dropped)");
+                                }
+                            }
+                        } else {
+                            trace!(
+                                "Connection for player {} is not running, skipping disconnect packet",
+                                player_identity.username
+                            );
                         }
                     } else {
                         system_messages::player_leave::handle(disconnecting_player.2, entity);