Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 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

7
Content.Server/Tiles/FloorTileItemComponent.cs
View File

@@ -20,6 +20,7 @@ namespace Content.Server.Tiles
[RegisterComponent]
public class FloorTileItemComponent : Component, IAfterInteract
{
[Dependency] private readonly IEntityManager _entMan = default!;
[Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!;
public override string Name => "FloorTile";
@@ -58,16 +59,16 @@ namespace Content.Server.Tiles
if (!eventArgs.InRangeUnobstructed(ignoreInsideBlocker: true, popup: true))
return true;
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(Owner, out StackComponent? stack))
if (!_entMan.TryGetComponent(Owner, out StackComponent? stack))
return true;
var mapManager = IoCManager.Resolve<IMapManager>();
var location = eventArgs.ClickLocation.AlignWithClosestGridTile();
var locationMap = location.ToMap(IoCManager.Resolve<IEntityManager>());
var locationMap = location.ToMap(_entMan);
if (locationMap.MapId == MapId.Nullspace)
return true;
mapManager.TryGetGrid(location.GetGridId(IoCManager.Resolve<IEntityManager>()), out var mapGrid);
mapManager.TryGetGrid(location.GetGridId(_entMan), out var mapGrid);
if (_outputTiles == null)
return true;