From 5d84d8b2965a456681a727b83ab34b848fc17702 Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Mon, 19 Sep 2022 18:07:24 +1200
Subject: [PATCH] Fix nukie bug (#11399)

---
 .../Configurations/NukeopsRuleConfiguration.cs |  3 +++
 .../GameTicking/Rules/NukeopsRuleSystem.cs     | 18 ++++++++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/Content.Server/GameTicking/Rules/Configurations/NukeopsRuleConfiguration.cs b/Content.Server/GameTicking/Rules/Configurations/NukeopsRuleConfiguration.cs
index b3ced1f989..49c3b5ede5 100644
--- a/Content.Server/GameTicking/Rules/Configurations/NukeopsRuleConfiguration.cs
+++ b/Content.Server/GameTicking/Rules/Configurations/NukeopsRuleConfiguration.cs
@@ -16,6 +16,9 @@ public sealed class NukeopsRuleConfiguration : GameRuleConfiguration
     [DataField("minPlayers")]
     public int MinPlayers = 15;
 
+    /// <summary>
+    ///     This INCLUDES the operatives. So a value of 3 is satisfied by 2 players & 1 operative
+    /// </summary>
     [DataField("playersPerOperative")]
     public int PlayersPerOperative = 5;
 
diff --git a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
index 13f170cfef..9e1e10a972 100644
--- a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
@@ -56,6 +56,7 @@ public sealed class NukeopsRuleSystem : GameRuleSystem
     [Dependency] private readonly ShuttleSystem _shuttleSystem = default!;
     [Dependency] private readonly RoundEndSystem _roundEndSystem = default!;
     [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
+    [Dependency] private readonly GameTicker _ticker = default!;
 
 
     private enum WinType
@@ -118,6 +119,9 @@ public sealed class NukeopsRuleSystem : GameRuleSystem
     private List<WinCondition> _winConditions = new ();
 
     private MapId? _nukiePlanet;
+
+    // TODO: use components, don't just cache entity UIDs
+    // There have been (and probably still are) bugs where these refer to deleted entities from old rounds.
     private EntityUid? _nukieOutpost;
     private EntityUid? _nukieShuttle;
     private EntityUid? _targetStation;
@@ -245,6 +249,7 @@ public sealed class NukeopsRuleSystem : GameRuleSystem
             return;
         }
 
+        var filter = Filter.Empty();
         foreach (var nukie in EntityQuery<NukeOperativeComponent>())
         {
             if (!TryComp<ActorComponent>(nukie.Owner, out var actor))
@@ -253,7 +258,10 @@ public sealed class NukeopsRuleSystem : GameRuleSystem
             }
 
             _chatManager.DispatchServerMessage(actor.PlayerSession, Loc.GetString("nukeops-welcome", ("station", _targetStation.Value)));
+            filter.AddPlayer(actor.PlayerSession);
         }
+
+        _audioSystem.PlayGlobal(_nukeopsRuleConfig.GreetSound, filter);
     }
 
     private void OnRoundEnd()
@@ -542,11 +550,6 @@ public sealed class NukeopsRuleSystem : GameRuleSystem
             GameTicker.PlayerJoinGame(session);
             _operativePlayers.Add(session);
         }
-
-        if (_nukeopsRuleConfig.GreetSound == null)
-            return;
-
-        _audioSystem.PlayGlobal(_nukeopsRuleConfig.GreetSound, Filter.Empty().AddPlayers(operatives), AudioParams.Default);
     }
 
     private void OnPlayersGhostSpawning(EntityUid uid, NukeOperativeComponent component, GhostRoleSpawnerUsedEvent args)
@@ -583,8 +586,11 @@ public sealed class NukeopsRuleSystem : GameRuleSystem
 
         _operativePlayers.Add(playerSession);
 
+        if (_ticker.RunLevel != GameRunLevel.InRound)
+            return;
+
         if (_nukeopsRuleConfig.GreetSound != null)
-            _audioSystem.PlayGlobal(_nukeopsRuleConfig.GreetSound, Filter.Empty().AddPlayer(playerSession), AudioParams.Default);
+            _audioSystem.PlayGlobal(_nukeopsRuleConfig.GreetSound, Filter.Empty().AddPlayer(playerSession));
 
         if (_targetStation != null && !string.IsNullOrEmpty(Name(_targetStation.Value)))
             _chatManager.DispatchServerMessage(playerSession, Loc.GetString("nukeops-welcome", ("station", _targetStation.Value)));