Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

EntityLookup as a system for content (#6931)

Browse Source
This commit is contained in:
metalgearsloth
2022-03-03 21:18:35 +11:00
committed by GitHub
parent 614bb6d34e
commit 836930e733
36 changed files with 42 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -475,7 +475,7 @@ namespace Content.Server.Storage.Components
protected virtual IEnumerable<EntityUid> DetermineCollidingEntities()
{
var entityLookup = IoCManager.Resolve<IEntityLookup>();
var entityLookup = EntitySystem.Get<EntityLookupSystem>();
return entityLookup.GetEntitiesIntersecting(Owner, _enteringRange, LookupFlags.Approximate);
}

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

@@ -565,7 +565,7 @@ namespace Content.Server.Storage.Components
if (_areaInsert && (eventArgs.Target == null || !_entityManager.HasComponent<SharedItemComponent>(eventArgs.Target.Value)))
{
var validStorables = new List<EntityUid>();
foreach (var entity in IoCManager.Resolve<IEntityLookup>().GetEntitiesInRange(eventArgs.ClickLocation, _areaInsertRadius, LookupFlags.None))
foreach (var entity in EntitySystem.Get<EntityLookupSystem>().GetEntitiesInRange(eventArgs.ClickLocation, _areaInsertRadius, LookupFlags.None))
{
if (entity.IsInContainer()
|| entity == eventArgs.User