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

Fix TurfHelpers

Browse Source
This commit is contained in:
Víctor Aguilera Puerto
2020-09-06 17:05:01 +02:00
parent d758e84e8d
commit 2b426405eb
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,6 +5,8 @@ using System.Runtime.CompilerServices;
using System.Diagnostics.CodeAnalysis; using System.Diagnostics.CodeAnalysis;
using Content.Shared.Physics; using Content.Shared.Physics;
using Content.Shared.Utility; using Content.Shared.Utility;
using Robust.Server.GameObjects.EntitySystems.TileLookup;
using Robust.Shared.GameObjects.Systems;
using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Map; using Robust.Shared.Interfaces.Map;
using Robust.Shared.Interfaces.Physics; using Robust.Shared.Interfaces.Physics;
@@ -59,7 +61,7 @@ namespace Content.Shared.Maps
if (!mapManager.TryGetGrid(coordinates.GetGridId(entityManager), out var grid)) if (!mapManager.TryGetGrid(coordinates.GetGridId(entityManager), out var grid))
return null; return null;
if (!grid.TryGetTileRef(coordinates.ToMapIndices(entityManager, mapManager), out var tile)) if (!grid.TryGetTileRef(coordinates, out var tile))
return null; return null;
return tile; return tile;
@@ -125,15 +127,15 @@ namespace Content.Shared.Maps
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
public static IEnumerable<IEntity> GetEntitiesInTile(this TileRef turf, bool approximate = false) public static IEnumerable<IEntity> GetEntitiesInTile(this TileRef turf, bool approximate = false)
{ {
var entityManager = IoCManager.Resolve<IEntityManager>(); var gridTileLookup = EntitySystem.Get<GridTileLookupSystem>();
return entityManager.GetEntitiesIntersecting(turf.MapIndex, GetWorldTileBox(turf), approximate); return gridTileLookup.GetEntitiesIntersecting(turf.GridIndex, turf.GridIndices);
} }
/// <summary> /// <summary>
/// Helper that returns all entities in a turf. /// Helper that returns all entities in a turf.
/// </summary> /// </summary>
public static IEnumerable<IEntity> GetEntitiesInTile(this GridCoordinates coordinates, bool approximate = false) public static IEnumerable<IEntity> GetEntitiesInTile(this EntityCoordinates coordinates, bool approximate = false)
{ {
var turf = coordinates.GetTileRef(); var turf = coordinates.GetTileRef();