tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add more centcomm spawning logs (#22726)

Browse Source
This commit is contained in:
Leon Friedrich
2023-12-18 20:35:31 -05:00
committed by GitHub
parent 59c1798835
commit ca90a2819f
5 changed files with 84 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
View File

@@ -383,7 +383,7 @@ public sealed class NukeopsRuleSystem : GameRuleSystem<NukeopsRuleComponent>
continue;
// UH OH
if (centcomms.Contains(nukeTransform.MapID))
if (nukeTransform.MapUid != null && centcomms.Contains(nukeTransform.MapUid.Value))
{
component.WinConditions.Add(WinCondition.NukeActiveAtCentCom);
SetWinType(uid, WinType.OpsMajor, component);
@@ -447,8 +447,7 @@ public sealed class NukeopsRuleSystem : GameRuleSystem<NukeopsRuleComponent>
while (diskQuery.MoveNext(out _, out var transform))
{
var diskMapId = transform.MapID;
diskAtCentCom = centcomms.Contains(diskMapId);
diskAtCentCom = transform.MapUid != null && centcomms.Contains(transform.MapUid.Value);
// TODO: The target station should be stored, and the nuke disk should store its original station.
// This is fine for now, because we can assume a single station in base SS14.