Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Enable nullability in Content.Server (#3685)

Browse Source
This commit is contained in:
DrSmugleaf
2021-03-16 15:50:20 +01:00
committed by GitHub
parent 90fec0ed24
commit a5ade526b7
306 changed files with 1616 additions and 1441 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Content.Server/GameTicking/GamePresets/PresetTraitor.cs
View File

@@ -22,6 +22,7 @@ using Robust.Shared.Log;
using Robust.Shared.Maths;
using Robust.Shared.Prototypes;
using Robust.Shared.Random;
using Robust.Shared.Utility;
namespace Content.Server.GameTicking.GamePresets
{
@@ -107,7 +108,6 @@ namespace Content.Server.GameTicking.GamePresets
Logger.InfoS("preset", "Selected a preferred traitor.");
}
var mind = traitor.Data.ContentData()?.Mind;
var traitorRole = new TraitorRole(mind);
if (mind == null)
{
Logger.ErrorS("preset", "Failed getting mind for picked traitor.");
@@ -117,9 +117,11 @@ namespace Content.Server.GameTicking.GamePresets
// creadth: we need to create uplink for the antag.
// PDA should be in place already, so we just need to
// initiate uplink account.
var uplinkAccount = new UplinkAccount(mind.OwnedEntity.Uid, StartingBalance);
DebugTools.AssertNotNull(mind.OwnedEntity);
var uplinkAccount = new UplinkAccount(mind.OwnedEntity!.Uid, StartingBalance);
var inventory = mind.OwnedEntity.GetComponent<InventoryComponent>();
if (!inventory.TryGetSlotItem(EquipmentSlotDefines.Slots.IDCARD, out ItemComponent pdaItem))
if (!inventory.TryGetSlotItem(EquipmentSlotDefines.Slots.IDCARD, out ItemComponent? pdaItem))
{
Logger.ErrorS("preset", "Failed getting pda for picked traitor.");
continue;
@@ -134,6 +136,8 @@ namespace Content.Server.GameTicking.GamePresets
continue;
}
var traitorRole = new TraitorRole(mind);
mind.AddRole(traitorRole);
_traitors.Add(traitorRole);
pdaComponent.InitUplinkAccount(uplinkAccount);
@@ -185,7 +189,10 @@ namespace Content.Server.GameTicking.GamePresets
foreach (var traitor in _traitors)
{
result += "\n"+Loc.GetString("traitor-user-was-a-traitor", ("user", traitor.Mind.Session.Name));
if (traitor.Mind.TryGetSession(out var session))
{
result += "\n" + Loc.GetString("traitor-user-was-a-traitor", ("user", session.Name));
}
var objectives = traitor.Mind.AllObjectives.ToArray();
if (objectives.Length == 0)