From 8a12c59a1634e1c7089c7dc4308cabcc034fccd0 Mon Sep 17 00:00:00 2001
From: "NG (Graham)" <ngniusness@gmail.com>
Date: Sat, 6 Dec 2025 10:47:51 -0500
Subject: [PATCH] Skip sending win/lose messages to ClientAIs in more cases

---
 rc_multiplayer/src/matches/modes/pit.rs              | 1 +
 rc_multiplayer/src/matches/modes/team_death_match.rs | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/rc_multiplayer/src/matches/modes/pit.rs b/rc_multiplayer/src/matches/modes/pit.rs
index 7ca07c7..cd5c184 100644
--- a/rc_multiplayer/src/matches/modes/pit.rs
+++ b/rc_multiplayer/src/matches/modes/pit.rs
@@ -24,6 +24,7 @@ impl WinTracker {
         };
         let winning_team_i32 = winning_team as i32;
         for (player_id, player_info) in generic.user_descriptors().iter() {
+            if player_info.descriptor.user_id.is_none() { continue; } // skip non-user players
             let event = if player_info.descriptor.team == winning_team_i32 {
                 rlnl::event_code::NetworkEvent::GameWon
             } else {
diff --git a/rc_multiplayer/src/matches/modes/team_death_match.rs b/rc_multiplayer/src/matches/modes/team_death_match.rs
index 608cafa..a8ca2c1 100644
--- a/rc_multiplayer/src/matches/modes/team_death_match.rs
+++ b/rc_multiplayer/src/matches/modes/team_death_match.rs
@@ -87,6 +87,7 @@ impl ScoreTracker {
             };
             let winning_team_i32 = winning_team as i32;
             for (player_id, player_info) in generic.user_descriptors().iter() {
+                if player_info.descriptor.user_id.is_none() { continue; } // skip non-user players
                 let event = if player_info.descriptor.team == winning_team_i32 {
                     rlnl::event_code::NetworkEvent::GameWonBaseDestroyed
                 } else {
@@ -112,6 +113,7 @@ impl ScoreTracker {
         };
         let winning_team_i32 = winning_team as i32;
         for (player_id, player_info) in generic.user_descriptors().iter() {
+            if player_info.descriptor.user_id.is_none() { continue; } // skip non-user players
             let event = if player_info.descriptor.team == winning_team_i32 {
                 rlnl::event_code::NetworkEvent::GameWonBaseDestroyed
             } else {