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

Make more uids nullable (#5794)

Browse Source
This commit is contained in:
Leon Friedrich
2021-12-26 15:32:45 +13:00
committed by GitHub
parent 83114de0e4
commit afc3ae6335
42 changed files with 161 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/AI/WorldState/States/Combat/WeaponEntityState.cs
View File

@@ -4,13 +4,13 @@ using Robust.Shared.GameObjects;
namespace Content.Server.AI.WorldState.States.Combat
{
[UsedImplicitly]
public sealed class WeaponEntityState : PlanningStateData<EntityUid>
public sealed class WeaponEntityState : PlanningStateData<EntityUid?>
{
// Similar to TargetEntity
public override string Name => "WeaponEntity";
public override void Reset()
{
Value = default;
Value = null;
}
}
}

11
Content.Server/AI/WorldState/States/Inventory/EquippedEntityState.cs
View File

@@ -9,18 +9,13 @@ namespace Content.Server.AI.WorldState.States.Inventory
/// AKA what's in active hand
/// </summary>
[UsedImplicitly]
public sealed class EquippedEntityState : StateData<EntityUid>
public sealed class EquippedEntityState : StateData<EntityUid?>
{
public override string Name => "EquippedEntity";
public override EntityUid GetValue()
public override EntityUid? GetValue()
{
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(Owner, out HandsComponent? handsComponent))
{
return default;
}
return handsComponent.GetActiveHand?.Owner ?? default;
return IoCManager.Resolve<IEntityManager>().GetComponentOrNull<HandsComponent>(Owner)?.GetActiveHand?.Owner;
}
}
}

4
Content.Server/AI/WorldState/States/Movement/MoveTargetState.cs
View File

@@ -4,12 +4,12 @@ using Robust.Shared.GameObjects;
namespace Content.Server.AI.WorldState.States.Movement
{
[UsedImplicitly]
public sealed class MoveTargetState : PlanningStateData<EntityUid>
public sealed class MoveTargetState : PlanningStateData<EntityUid?>
{
public override string Name => "MoveTarget";
public override void Reset()
{
Value = default;
Value = null;
}
}
}

4
Content.Server/AI/WorldState/States/TargetEntityState.cs
View File

@@ -7,13 +7,13 @@ namespace Content.Server.AI.WorldState.States
/// Could be target item to equip, target to attack, etc.
/// </summary>
[UsedImplicitly]
public sealed class TargetEntityState : PlanningStateData<EntityUid>
public sealed class TargetEntityState : PlanningStateData<EntityUid?>
{
public override string Name => "TargetEntity";
public override void Reset()
{
Value = default;
Value = null;
}
}
}