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

whoops

Browse Source
This commit is contained in:
Víctor Aguilera Puerto
2020-09-06 17:15:16 +02:00
parent e239b707c5
commit d58b7f0ebe
3 changed files with 43 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Shared/Maps/TurfHelpers.cs
View File

@@ -5,7 +5,6 @@ using System.Runtime.CompilerServices;
using System.Diagnostics.CodeAnalysis;
using Content.Shared.Physics;
using Content.Shared.Utility;
using Robust.Server.GameObjects.EntitySystems.TileLookup;
using Robust.Shared.GameObjects.Systems;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Map;
@@ -127,9 +126,9 @@ namespace Content.Shared.Maps
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static IEnumerable<IEntity> GetEntitiesInTile(this TileRef turf, bool approximate = false)
{
var gridTileLookup = EntitySystem.Get<GridTileLookupSystem>();
var entityManager = IoCManager.Resolve<IEntityManager>();
return gridTileLookup.GetEntitiesIntersecting(turf.GridIndex, turf.GridIndices);
return entityManager.GetEntitiesIntersecting(turf.MapIndex, GetWorldTileBox(turf), approximate);
}
/// <summary>