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

Fixing warnings (#8131)

Browse Source
This commit is contained in:
wrexbe
2022-05-12 22:35:13 -07:00
committed by GitHub
parent 16ad873688
commit 61d147aea9
32 changed files with 22 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Content.Server/AI/Utility/AiLogic/UtilityAI.cs
View File

@@ -1,7 +1,3 @@
using System;
using System.Collections.Generic;
using System.Runtime.ExceptionServices;
using System.Threading;
using Content.Server.AI.Components;
using Content.Server.AI.EntitySystems;
using Content.Server.AI.LoadBalancer;
@@ -11,12 +7,9 @@ using Content.Server.AI.WorldState;
using Content.Server.AI.WorldState.States.Utility;
using Content.Server.CPUJob.JobQueues;
using Content.Shared.Movement.Components;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Log;
using Robust.Shared.Serialization;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Set;
using System.Runtime.ExceptionServices;
using System.Threading;
namespace Content.Server.AI.Utility.AiLogic
{
@@ -24,7 +17,7 @@ namespace Content.Server.AI.Utility.AiLogic
[RegisterComponent]
[ComponentProtoName("UtilityAI")]
[ComponentReference(typeof(AiControllerComponent)), ComponentReference(typeof(IMoverComponent))]
public sealed class UtilityAi : AiControllerComponent, ISerializationHooks
public sealed class UtilityAi : AiControllerComponent
{
// 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)

5
Content.Server/AI/WorldState/States/Clothing/NearbyClothingState.cs
View File

@@ -4,6 +4,7 @@ using Content.Server.AI.Utils;
using Content.Server.Clothing.Components;
using Content.Server.Storage.Components;
using JetBrains.Annotations;
using Robust.Server.Containers;
using Robust.Shared.Containers;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
@@ -24,10 +25,10 @@ namespace Content.Server.AI.WorldState.States.Clothing
{
return result;
}
var containerSystem = IoCManager.Resolve<ContainerSystem>();
foreach (var entity in Visibility.GetNearestEntities(entMan.GetComponent<TransformComponent>(Owner).Coordinates, typeof(ClothingComponent), controller.VisionRadius))
{
if (entity.TryGetContainer(out var container))
if (containerSystem.TryGetContainingContainer(entity, out var container))
{
if (!entMan.HasComponent<EntityStorageComponent>(container.Owner))
{