From f320c6dd8f4ce39d71f650747a403aa487483205 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Wed, 27 Oct 2021 19:27:25 +1100 Subject: [PATCH] Fix storage closing bounds on rotated grids (#5033) --- Content.Server/Conveyor/ConveyorSystem.cs | 2 +- Content.Server/Storage/Components/EntityStorageComponent.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Content.Server/Conveyor/ConveyorSystem.cs b/Content.Server/Conveyor/ConveyorSystem.cs index 03dc9ed6e1..9d7ffbe1dc 100644 --- a/Content.Server/Conveyor/ConveyorSystem.cs +++ b/Content.Server/Conveyor/ConveyorSystem.cs @@ -133,7 +133,7 @@ namespace Content.Server.Conveyor public IEnumerable<(IEntity, IPhysBody)> GetEntitiesToMove(ConveyorComponent comp) { //todo uuuhhh cache this - foreach (var entity in _entityLookup.GetEntitiesIntersecting(comp.Owner, LookupFlags.Approximate)) + foreach (var entity in _entityLookup.GetEntitiesIntersecting(comp.Owner, flags: LookupFlags.Approximate)) { if (entity.Deleted) { diff --git a/Content.Server/Storage/Components/EntityStorageComponent.cs b/Content.Server/Storage/Components/EntityStorageComponent.cs index 55e6a87b50..7a8b5426d2 100644 --- a/Content.Server/Storage/Components/EntityStorageComponent.cs +++ b/Content.Server/Storage/Components/EntityStorageComponent.cs @@ -426,7 +426,7 @@ namespace Content.Server.Storage.Components protected virtual IEnumerable DetermineCollidingEntities() { var entityLookup = IoCManager.Resolve(); - return entityLookup.GetEntitiesIntersecting(Owner, LookupFlags.None); + return entityLookup.GetEntitiesIntersecting(Owner, -0.015f, LookupFlags.Approximate); } void IExAct.OnExplosion(ExplosionEventArgs eventArgs)