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

10
Content.Server/AI/Operators/Combat/Melee/UnarmedCombatOperator.cs
View File

@@ -13,7 +13,7 @@ namespace Content.Server.AI.Operators.Combat.Melee
private readonly IEntity _owner;
private readonly IEntity _target;
private UnarmedCombatComponent _unarmedCombat;
private UnarmedCombatComponent? _unarmedCombat;
public UnarmedCombatOperator(IEntity owner, IEntity target, float burstTime = 1.0f)
{
@@ -29,7 +29,7 @@ namespace Content.Server.AI.Operators.Combat.Melee
return true;
}
if (!_owner.TryGetComponent(out CombatModeComponent combatModeComponent))
if (!_owner.TryGetComponent(out CombatModeComponent? combatModeComponent))
{
return false;
}
@@ -39,7 +39,7 @@ namespace Content.Server.AI.Operators.Combat.Melee
combatModeComponent.IsInCombatMode = true;
}
if (_owner.TryGetComponent(out UnarmedCombatComponent unarmedCombatComponent))
if (_owner.TryGetComponent(out UnarmedCombatComponent? unarmedCombatComponent))
{
_unarmedCombat = unarmedCombatComponent;
}
@@ -56,7 +56,7 @@ namespace Content.Server.AI.Operators.Combat.Melee
if (!base.Shutdown(outcome))
return false;
if (_owner.TryGetComponent(out CombatModeComponent combatModeComponent))
if (_owner.TryGetComponent(out CombatModeComponent? combatModeComponent))
{
combatModeComponent.IsInCombatMode = false;
}
@@ -71,7 +71,7 @@ namespace Content.Server.AI.Operators.Combat.Melee
return Outcome.Success;
}
if (_unarmedCombat.Deleted)
if (_unarmedCombat?.Deleted ?? true)
{
return Outcome.Failed;
}