tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests 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/AI/Utility/AiLogic/UtilityAI.cs
View File

@@ -28,9 +28,9 @@ namespace Content.Server.AI.Utility.AiLogic
// TODO: Look at having ParallelOperators (probably no more than that as then you'd have a full-blown BT)
// Also RepeatOperators (e.g. if we're following an entity keep repeating MoveToEntity)
private AiActionSystem _planner;
private AiActionSystem _planner = default!;
public Blackboard Blackboard => _blackboard;
private Blackboard _blackboard;
private Blackboard _blackboard = default!;
/// <summary>
/// The sum of all BehaviorSets gives us what actions the AI can take
@@ -43,7 +43,7 @@ namespace Content.Server.AI.Utility.AiLogic
/// <summary>
/// The currently running action; most importantly are the operators.
/// </summary>
public UtilityAction CurrentAction { get; private set; }
public UtilityAction? CurrentAction { get; private set; }
/// <summary>
/// How frequently we can re-plan. If an AI's in combat you could decrease the cooldown,
@@ -55,9 +55,9 @@ namespace Content.Server.AI.Utility.AiLogic
/// <summary>
/// If we've requested a plan then wait patiently for the action
/// </summary>
private AiActionRequestJob _actionRequest;
private AiActionRequestJob? _actionRequest;
private CancellationTokenSource _actionCancellation;
private CancellationTokenSource? _actionCancellation;
/// <summary>
/// If we can't do anything then stop thinking; should probably use ActionBlocker instead
@@ -126,6 +126,11 @@ namespace Content.Server.AI.Utility.AiLogic
private void ReceivedAction()
{
if (_actionRequest == null)
{
return;
}
switch (_actionRequest.Exception)
{
case null: