tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Even more resolve removals.

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-08 17:32:32 +01:00
parent 684cb76173
commit cdc8336695
61 changed files with 364 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Shared/Storage/SharedStorageComponent.cs
View File

@@ -16,6 +16,8 @@ namespace Content.Shared.Storage
[NetworkedComponent()]
public abstract class SharedStorageComponent : Component, IDraggable
{
[Dependency] private readonly IEntityManager _entMan = default!;
public override string Name => "Storage";
public abstract IReadOnlyList<EntityUid>? StoredEntities { get; }
@@ -29,7 +31,7 @@ namespace Content.Shared.Storage
bool IDraggable.CanDrop(CanDropEvent args)
{
return IoCManager.Resolve<IEntityManager>().TryGetComponent(args.Target, out PlaceableSurfaceComponent? placeable) &&
return _entMan.TryGetComponent(args.Target, out PlaceableSurfaceComponent? placeable) &&
placeable.IsPlaceable;
}
@@ -52,7 +54,7 @@ namespace Content.Shared.Storage
{
if (Remove(storedEntity))
{
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(storedEntity).WorldPosition = eventArgs.DropLocation.Position;
_entMan.GetComponent<TransformComponent>(storedEntity).WorldPosition = eventArgs.DropLocation.Position;
}
}