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

Replace GetEntitiesInTile with EntityLookupSystem equivalent (#36756)

Browse Source 
* commit GET!!

* minor cleanup
This commit is contained in:
Kyle Tyo
2025-04-20 08:57:53 -04:00
committed by GitHub
parent d35c9ac17c
commit f77f000b93
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Shared/Construction/Conditions/EmptyOrWindowValidInTile.cs
View File

@@ -13,9 +13,13 @@ namespace Content.Shared.Construction.Conditions
public bool Condition(EntityUid user, EntityCoordinates location, Direction direction) public bool Condition(EntityUid user, EntityCoordinates location, Direction direction)
{ {
var entManager = IoCManager.Resolve<IEntityManager>();
var lookupSys = entManager.System<EntityLookupSystem>();
var result = false; var result = false;
foreach (var entity in location.GetEntitiesInTile(LookupFlags.Approximate | LookupFlags.Static))
foreach (var entity in lookupSys.GetEntitiesIntersecting(location, LookupFlags.Approximate | LookupFlags.Static))
{ {
if (IoCManager.Resolve<IEntityManager>().HasComponent<SharedCanBuildWindowOnTopComponent>(entity)) if (IoCManager.Resolve<IEntityManager>().HasComponent<SharedCanBuildWindowOnTopComponent>(entity))
result = true; result = true;

3
Content.Shared/Construction/Conditions/NoWindowsInTile.cs
View File

@@ -17,8 +17,9 @@ namespace Content.Shared.Construction.Conditions
var entManager = IoCManager.Resolve<IEntityManager>(); var entManager = IoCManager.Resolve<IEntityManager>();
var sysMan = entManager.EntitySysManager; var sysMan = entManager.EntitySysManager;
var tagSystem = sysMan.GetEntitySystem<TagSystem>(); var tagSystem = sysMan.GetEntitySystem<TagSystem>();
var lookupSys = sysMan.GetEntitySystem<EntityLookupSystem>();
foreach (var entity in location.GetEntitiesInTile(LookupFlags.Static)) foreach (var entity in lookupSys.GetEntitiesIntersecting(location, LookupFlags.Static))
{ {
if (tagSystem.HasTag(entity, WindowTag)) if (tagSystem.HasTag(entity, WindowTag))
return false; return false;