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

Revert "Update submodule (again)" (#7730)

Browse Source
This commit is contained in:
metalgearsloth
2022-04-24 02:26:00 +10:00
committed by GitHub
parent 7feea724fd
commit ecaad9c349
36 changed files with 151 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -164,7 +164,7 @@ namespace Content.Shared.Maps
if (!GetWorldTileBox(turf, out var worldBox))
return Enumerable.Empty<EntityUid>();
return lookupSystem.GetEntitiesIntersecting(turf.GridIndex, worldBox, flags);
return lookupSystem.GetEntitiesIntersecting(turf.MapIndex, worldBox, flags);
}
/// <summary>
@@ -193,18 +193,15 @@ namespace Content.Shared.Maps
/// </summary>
public static bool IsBlockedTurf(this TileRef turf, bool filterMobs)
{
// TODO: Deprecate this with entitylookup.
var physics = EntitySystem.Get<EntityLookupSystem>();
var physics = EntitySystem.Get<SharedPhysicsSystem>();
if (!GetWorldTileBox(turf, out var worldBox))
return false;
var entManager = IoCManager.Resolve<IEntityManager>();
var query = physics.GetEntitiesIntersecting(turf.GridIndex, worldBox);
var query = physics.GetCollidingEntities(turf.MapIndex, in worldBox);
foreach (var ent in query)
foreach (var body in query)
{
var body = entManager.GetComponent<PhysicsComponent>(ent);
if (body.CanCollide && body.Hard && (body.CollisionLayer & (int) CollisionGroup.Impassable) != 0)
return true;