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

5
Content.Server/NPC/Systems/NPCPerceptionSystem.RecentlyInjected.cs
View File

@@ -10,14 +10,15 @@ public sealed partial class NPCPerceptionSystem
/// <param name="frameTime"></param>
private void UpdateRecentlyInjected(float frameTime)
{
foreach (var entity in EntityQuery<NPCRecentlyInjectedComponent>())
var query = EntityQueryEnumerator<NPCRecentlyInjectedComponent>();
while (query.MoveNext(out var uid, out var entity))
{
entity.Accumulator += frameTime;
if (entity.Accumulator < entity.RemoveTime.TotalSeconds)
continue;
entity.Accumulator = 0;
RemComp<NPCRecentlyInjectedComponent>(entity.Owner);
RemComp<NPCRecentlyInjectedComponent>(uid);
}
}
}

2
Content.Server/NPC/Systems/NPCUtilitySystem.cs
View File

@@ -365,7 +365,7 @@ public sealed class NPCUtilitySystem : EntitySystem
var compZero = comps[0];
comps.RemoveAt(0);
foreach (var comp in _lookup.GetComponentsInRange(compZero.Component.GetType(), mapPos, vision))
foreach (var comp in _lookup.GetEntitiesInRange(compZero.Component.GetType(), mapPos, vision))
{
var ent = comp.Owner;

12
Content.Server/NPC/Systems/NpcFactionSystem.cs
View File

@@ -1,7 +1,7 @@
using Content.Server.NPC.Components;
using Robust.Shared.Prototypes;
using System.Linq;
using Content.Server.NPC.Components;
using JetBrains.Annotations;
using Robust.Shared.Prototypes;
namespace Content.Server.NPC.Systems;
@@ -160,15 +160,15 @@ public sealed partial class NpcFactionSystem : EntitySystem
if (!xformQuery.TryGetComponent(entity, out var entityXform))
yield break;
foreach (var comp in _lookup.GetComponentsInRange<NpcFactionMemberComponent>(entityXform.MapPosition, range))
foreach (var ent in _lookup.GetEntitiesInRange<NpcFactionMemberComponent>(entityXform.MapPosition, range))
{
if (comp.Owner == entity)
if (ent.Owner == entity)
continue;
if (!factions.Overlaps(comp.Factions))
if (!factions.Overlaps(ent.Comp.Factions))
continue;
yield return comp.Owner;
yield return ent.Owner;
}
}