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

Fix storage closing bounds on rotated grids (#5033)

Browse Source
This commit is contained in:
metalgearsloth
2021-10-27 19:27:25 +11:00
committed by GitHub
parent 14b401f9b3
commit f320c6dd8f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Conveyor/ConveyorSystem.cs
View File

@@ -133,7 +133,7 @@ namespace Content.Server.Conveyor
public IEnumerable<(IEntity, IPhysBody)> GetEntitiesToMove(ConveyorComponent comp) public IEnumerable<(IEntity, IPhysBody)> GetEntitiesToMove(ConveyorComponent comp)
{ {
//todo uuuhhh cache this //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) if (entity.Deleted)
{ {

2
Content.Server/Storage/Components/EntityStorageComponent.cs
View File

@@ -426,7 +426,7 @@ namespace Content.Server.Storage.Components
protected virtual IEnumerable<IEntity> DetermineCollidingEntities() protected virtual IEnumerable<IEntity> DetermineCollidingEntities()
{ {
var entityLookup = IoCManager.Resolve<IEntityLookup>(); var entityLookup = IoCManager.Resolve<IEntityLookup>();
return entityLookup.GetEntitiesIntersecting(Owner, LookupFlags.None); return entityLookup.GetEntitiesIntersecting(Owner, -0.015f, LookupFlags.Approximate);
} }
void IExAct.OnExplosion(ExplosionEventArgs eventArgs) void IExAct.OnExplosion(ExplosionEventArgs eventArgs)