Skip to content

Commit

Permalink
Update
Browse files Browse the repository at this point in the history
  • Loading branch information
metalgearsloth committed Sep 12, 2024
1 parent d3d897d commit a44be0f
Showing 1 changed file with 5 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -956,8 +956,11 @@ private void Smimsh(EntityUid uid, FixturesComponent? manager = null, MapGridCom
if (!Resolve(uid, ref manager, ref grid, ref xform) || xform.MapUid == null)
return;

if (!TryComp(xform.MapUid, out BroadphaseComponent? lookup))
return;

// Flatten anything not parented to a grid.
var transform = _physics.GetPhysicsTransform(uid, xform);
var transform = _physics.GetRelativePhysicsTransform((uid, xform), xform.MapUid.Value);
var aabbs = new List<Box2>(manager.Fixtures.Count);
var tileSet = new List<(Vector2i, Tile)>();

Expand All @@ -979,7 +982,7 @@ private void Smimsh(EntityUid uid, FixturesComponent? manager = null, MapGridCom
_lookupEnts.Clear();
_immuneEnts.Clear();
// TODO: Ideally we'd query first BEFORE moving grid but needs adjustments above.
_lookup.GetEntitiesIntersecting(xform.MapID, fixture.Shape, transform, _lookupEnts, LookupFlags.Uncontained);
_lookup.GetLocalEntitiesIntersecting(xform.MapUid.Value, fixture.Shape, transform, _lookupEnts, flags: LookupFlags.Uncontained, lookup: lookup);

foreach (var ent in _lookupEnts)
{
Expand Down

0 comments on commit a44be0f

Please sign in to comment.