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

fixes a bunch of warnings

Browse Source
This commit is contained in:
Paul
2021-12-20 13:58:30 +01:00
parent 21174366b7
commit d4d85b663f
68 changed files with 113 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/AI/Utility/Actions/Idle/CloseLastEntityStorage.cs
View File

@@ -25,7 +25,7 @@ namespace Content.Server.AI.Utility.Actions.Idle
{
var lastStorage = context.GetState<LastOpenedStorageState>().GetValue();
if (lastStorage == null)
if (!lastStorage.Valid)
{
ActionOperators = new Queue<AiOperator>(new AiOperator[]
{

2
Content.Server/AI/Utility/Considerations/ActionBlocker/CanMoveCon.cs
View File

@@ -12,7 +12,7 @@ namespace Content.Server.AI.Utility.Considerations.ActionBlocker
{
var self = context.GetState<SelfState>().GetValue();
if (self == null || !EntitySystem.Get<ActionBlockerSystem>().CanMove(self))
if (!self.Valid || !EntitySystem.Get<ActionBlockerSystem>().CanMove(self))
{
return 0.0f;
}

2
Content.Server/AI/Utility/Considerations/Combat/Melee/MeleeWeaponDamageCon.cs
View File

@@ -12,7 +12,7 @@ namespace Content.Server.AI.Utility.Considerations.Combat.Melee
{
var target = context.GetState<WeaponEntityState>().GetValue();
if (target == null || !IoCManager.Resolve<IEntityManager>().TryGetComponent(target, out MeleeWeaponComponent? meleeWeaponComponent))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(target, out MeleeWeaponComponent? meleeWeaponComponent))
{
return 0.0f;
}

12
Content.Server/AI/Utility/Considerations/Combat/Melee/MeleeWeaponEquippedCon.cs
View File

@@ -10,14 +10,10 @@ namespace Content.Server.AI.Utility.Considerations.Combat.Melee
{
protected override float GetScore(Blackboard context)
{
var equipped = context.GetState<EquippedEntityState>().GetValue();
if (equipped == null)
{
return 0.0f;
}
return IoCManager.Resolve<IEntityManager>().HasComponent<MeleeWeaponComponent>(equipped) ? 1.0f : 0.0f;
return IoCManager.Resolve<IEntityManager>()
.HasComponent<MeleeWeaponComponent>(context.GetState<EquippedEntityState>().GetValue())
? 1.0f
: 0.0f;
}
}
}

2
Content.Server/AI/Utility/Considerations/Combat/Melee/MeleeWeaponSpeedCon.cs
View File

@@ -12,7 +12,7 @@ namespace Content.Server.AI.Utility.Considerations.Combat.Melee
{
var target = context.GetState<WeaponEntityState>().GetValue();
if (target == null || !IoCManager.Resolve<IEntityManager>().TryGetComponent(target, out MeleeWeaponComponent? meleeWeaponComponent))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(target, out MeleeWeaponComponent? meleeWeaponComponent))
{
return 0.0f;
}

2
Content.Server/AI/Utility/Considerations/Combat/TargetHealthCon.cs
View File

@@ -12,7 +12,7 @@ namespace Content.Server.AI.Utility.Considerations.Combat
{
var target = context.GetState<TargetEntityState>().GetValue();
if (target == null || !IoCManager.Resolve<IEntityManager>().TryGetComponent(target, out DamageableComponent? damageableComponent))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(target, out DamageableComponent? damageableComponent))
{
return 0.0f;
}

2
Content.Server/AI/Utility/Considerations/Combat/TargetIsCritCon.cs
View File

@@ -12,7 +12,7 @@ namespace Content.Server.AI.Utility.Considerations.Combat
{
var target = context.GetState<TargetEntityState>().GetValue();
if (target == null || !IoCManager.Resolve<IEntityManager>().TryGetComponent(target, out MobStateComponent? mobState))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(target, out MobStateComponent? mobState))
{
return 0.0f;
}

2
Content.Server/AI/Utility/Considerations/Combat/TargetIsDeadCon.cs
View File

@@ -12,7 +12,7 @@ namespace Content.Server.AI.Utility.Considerations.Combat
{
var target = context.GetState<TargetEntityState>().GetValue();
if (target == null || !IoCManager.Resolve<IEntityManager>().TryGetComponent(target, out MobStateComponent? mobState))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(target, out MobStateComponent? mobState))
{
return 0.0f;
}

2
Content.Server/AI/Utility/Considerations/Containers/TargetAccessibleCon.cs
View File

@@ -43,7 +43,7 @@ namespace Content.Server.AI.Utility.Considerations.Containers
var owner = context.GetState<SelfState>().GetValue();
if (owner == null)
if (!owner.Valid)
{
return 0;
}

2
Content.Server/AI/Utility/Considerations/Hands/FreeHandCon.cs
View File

@@ -12,7 +12,7 @@ namespace Content.Server.AI.Utility.Considerations.Hands
{
var owner = context.GetState<SelfState>().GetValue();
if (owner == null || !IoCManager.Resolve<IEntityManager>().TryGetComponent(owner, out HandsComponent? handsComponent))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(owner, out HandsComponent? handsComponent))
{
return 0.0f;
}

2
Content.Server/AI/Utility/Considerations/Inventory/CanPutTargetInInventoryCon.cs
View File

@@ -16,7 +16,7 @@ namespace Content.Server.AI.Utility.Considerations.Inventory
// If not then check if we have a free hand
var target = context.GetState<TargetEntityState>().GetValue();
if (target == null || !IoCManager.Resolve<IEntityManager>().HasComponent<ItemComponent>(target))
if (!IoCManager.Resolve<IEntityManager>().HasComponent<ItemComponent>(target))
{
return 0.0f;
}

2
Content.Server/AI/Utility/Considerations/Inventory/TargetInOurInventoryCon.cs
View File

@@ -13,7 +13,7 @@ namespace Content.Server.AI.Utility.Considerations.Inventory
{
var target = context.GetState<TargetEntityState>().GetValue();
if (target == null || !IoCManager.Resolve<IEntityManager>().HasComponent<ItemComponent>(target))
if (!IoCManager.Resolve<IEntityManager>().HasComponent<ItemComponent>(target))
{
return 0.0f;
}

3
Content.Server/AI/Utility/Considerations/Nutrition/Drink/DrinkValueCon.cs
View File

@@ -13,8 +13,7 @@ namespace Content.Server.AI.Utility.Considerations.Nutrition.Drink
{
var target = context.GetState<TargetEntityState>().GetValue();
if (target == null
|| IoCManager.Resolve<IEntityManager>().Deleted(target)
if (IoCManager.Resolve<IEntityManager>().Deleted(target)
|| !EntitySystem.Get<SolutionContainerSystem>().TryGetSolution(target, DrinkComponent.DefaultSolutionName, out var drink))
{
return 0.0f;

2
Content.Server/AI/Utility/Considerations/Nutrition/Drink/ThirstCon.cs
View File

@@ -13,7 +13,7 @@ namespace Content.Server.AI.Utility.Considerations.Nutrition.Drink
{
var owner = context.GetState<SelfState>().GetValue();
if (owner == null || !IoCManager.Resolve<IEntityManager>().TryGetComponent(owner, out ThirstComponent? thirst))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(owner, out ThirstComponent? thirst))
{
return 0.0f;
}

5
Content.Server/AI/Utility/Considerations/Nutrition/Food/FoodValueCon.cs
View File

@@ -13,8 +13,9 @@ namespace Content.Server.AI.Utility.Considerations.Nutrition.Food
{
var target = context.GetState<TargetEntityState>().GetValue();
if (target == null || !IoCManager.Resolve<IEntityManager>().TryGetComponent<FoodComponent?>(target, out var foodComp)
|| !EntitySystem.Get<SolutionContainerSystem>().TryGetSolution(target, foodComp.SolutionName, out var food))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent<FoodComponent?>(target, out var foodComp)
|| !EntitySystem.Get<SolutionContainerSystem>()
.TryGetSolution(target, foodComp.SolutionName, out var food))
{
return 0.0f;
}

2
Content.Server/AI/Utility/Considerations/Nutrition/Food/HungerCon.cs
View File

@@ -14,7 +14,7 @@ namespace Content.Server.AI.Utility.Considerations.Nutrition.Food
{
var owner = context.GetState<SelfState>().GetValue();
if (owner == null || !IoCManager.Resolve<IEntityManager>().TryGetComponent(owner, out HungerComponent? hunger))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(owner, out HungerComponent? hunger))
{
return 0.0f;
}

2
Content.Server/AI/Utility/Considerations/State/StoredStateEntityIsNullCon.cs
View File

@@ -28,7 +28,7 @@ namespace Content.Server.AI.Utility.Considerations.State
}
context.GetStoredState(stateData, out StoredStateData<EntityUid> state);
return state.GetValue() == null ? 1.0f : 0.0f;
return state.GetValue().Valid ? 0.0f : 1.0f;
}
}
}

1
Content.Server/AI/Utility/NpcBehaviorManager.cs
View File

@@ -28,7 +28,6 @@ namespace Content.Server.AI.Utility
internal sealed class NpcBehaviorManager : INpcBehaviorManager
{
[Dependency] private readonly IDynamicTypeFactory _typeFactory = default!;
[Dependency] private readonly IEntityManager _entityManager = default!;
private readonly NpcActionComparer _comparer = new();