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

Fix declaration of war (#20399)

Browse Source
This commit is contained in:
Repo
2023-09-24 09:00:12 +13:00
committed by GitHub
parent f5ddbcf123
commit 16b70ca8f6
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -122,11 +122,14 @@ public sealed class NukeopsRuleSystem : GameRuleSystem<NukeopsRuleComponent>
if (!GameTicker.IsGameRuleAdded(ruleEnt, gameRule))
continue;
var found = nukeops.OperativePlayers.Values.Any(v => v == opUid);
if (found)
if (_mind.TryGetMind(opUid, out var mind, out _))
{
comps = (nukeops, gameRule);
return true;
var found = nukeops.OperativePlayers.Values.Any(v => v == mind);
if (found)
{
comps = (nukeops, gameRule);
return true;
}
}
}
@@ -990,6 +993,14 @@ public sealed class NukeopsRuleSystem : GameRuleSystem<NukeopsRuleComponent>
//ok hardcoded value bad but so is everything else here
_roles.MindAddRole(mindId, new NukeopsRoleComponent { PrototypeId = NukeopsId }, mind);
if (mind.CurrentEntity != null)
{
foreach (var (nukeops, gameRule) in EntityQuery<NukeopsRuleComponent, GameRuleComponent>())
{
nukeops.OperativePlayers.Add(mind.CharacterName!, mind.CurrentEntity.GetValueOrDefault());
}
}
SetOutfitCommand.SetOutfit(mind.OwnedEntity.Value, "SyndicateOperativeGearFull", EntityManager);
}