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

Fix trashbags picking up atmos entities that are anchored (#5035)

Browse Source
This commit is contained in:
Saphire Lattice
2021-10-27 14:12:36 +07:00
committed by GitHub
parent ae2f9fb83a
commit 0da8a5b9d0
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Server/Storage/Components/ServerStorageComponent.cs
View File

@@ -139,6 +139,11 @@ namespace Content.Server.Storage.Components
return false; return false;
} }
if (entity.Transform.Anchored)
{
return false;
}
return true; return true;
} }
@@ -512,7 +517,7 @@ namespace Content.Server.Storage.Components
if (_areaInsert && (eventArgs.Target == null || !eventArgs.Target.HasComponent<SharedItemComponent>())) if (_areaInsert && (eventArgs.Target == null || !eventArgs.Target.HasComponent<SharedItemComponent>()))
{ {
var validStorables = new List<IEntity>(); var validStorables = new List<IEntity>();
foreach (var entity in IoCManager.Resolve<IEntityLookup>().GetEntitiesInRange(eventArgs.ClickLocation, _areaInsertRadius)) foreach (var entity in IoCManager.Resolve<IEntityLookup>().GetEntitiesInRange(eventArgs.ClickLocation, _areaInsertRadius, LookupFlags.None))
{ {
if (entity.IsInContainer() if (entity.IsInContainer()
|| entity == eventArgs.User || entity == eventArgs.User