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

Remove 700 usages of Component.Owner (#21100)

Browse Source
This commit is contained in:
DrSmugleaf
2023-10-19 12:34:31 -07:00
committed by GitHub
parent 5825ffb95c
commit f560f88eb5
261 changed files with 2291 additions and 2036 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Client/Commands/HideMechanismsCommand.cs
View File

@@ -16,18 +16,18 @@ namespace Content.Client.Commands
{
var entityManager = IoCManager.Resolve<IEntityManager>();
var containerSys = entityManager.System<SharedContainerSystem>();
var organs = entityManager.EntityQuery<OrganComponent>(true);
var query = entityManager.AllEntityQueryEnumerator<OrganComponent>();
foreach (var part in organs)
while (query.MoveNext(out var uid, out _))
{
if (!entityManager.TryGetComponent(part.Owner, out SpriteComponent? sprite))
if (!entityManager.TryGetComponent(uid, out SpriteComponent? sprite))
{
continue;
}
sprite.ContainerOccluded = false;
var tempParent = part.Owner;
var tempParent = uid;
while (containerSys.TryGetContainingContainer(tempParent, out var container))
{
if (!container.ShowContents)

9
Content.Client/Commands/ShowMechanismsCommand.cs
View File

@@ -17,14 +17,11 @@ namespace Content.Client.Commands
public void Execute(IConsoleShell shell, string argStr, string[] args)
{
var entityManager = IoCManager.Resolve<IEntityManager>();
var organs = entityManager.EntityQuery<OrganComponent>(true);
var query = entityManager.AllEntityQueryEnumerator<OrganComponent, SpriteComponent>();
foreach (var mechanism in organs)
while (query.MoveNext(out _, out var sprite))
{
if (entityManager.TryGetComponent(mechanism.Owner, out SpriteComponent? sprite))
{
sprite.ContainerOccluded = false;
}
sprite.ContainerOccluded = false;
}
IoCManager.Resolve<IClientConsoleHost>().ExecuteCommand("showcontainedcontext");