Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 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

12
Content.Server/Revenant/EntitySystems/CorporealSystem.cs
View File

@@ -17,9 +17,9 @@ public sealed class CorporealSystem : SharedCorporealSystem
if (TryComp<VisibilityComponent>(uid, out var visibility))
{
_visibilitySystem.RemoveLayer(visibility, (int) VisibilityFlags.Ghost, false);
_visibilitySystem.AddLayer(visibility, (int) VisibilityFlags.Normal, false);
_visibilitySystem.RefreshVisibility(visibility);
_visibilitySystem.RemoveLayer(uid, visibility, (int) VisibilityFlags.Ghost, false);
_visibilitySystem.AddLayer(uid, visibility, (int) VisibilityFlags.Normal, false);
_visibilitySystem.RefreshVisibility(uid, visibility);
}
}
@@ -29,9 +29,9 @@ public sealed class CorporealSystem : SharedCorporealSystem
if (TryComp<VisibilityComponent>(uid, out var visibility) && _ticker.RunLevel != GameRunLevel.PostRound)
{
_visibilitySystem.AddLayer(visibility, (int) VisibilityFlags.Ghost, false);
_visibilitySystem.RemoveLayer(visibility, (int) VisibilityFlags.Normal, false);
_visibilitySystem.RefreshVisibility(visibility);
_visibilitySystem.AddLayer(uid, visibility, (int) VisibilityFlags.Ghost, false);
_visibilitySystem.RemoveLayer(uid, visibility, (int) VisibilityFlags.Normal, false);
_visibilitySystem.RefreshVisibility(uid, visibility);
}
}
}

7
Content.Server/Revenant/EntitySystems/RevenantOverloadedLightsSystem.cs
View File

@@ -11,12 +11,13 @@ public sealed class RevenantOverloadedLightsSystem : SharedRevenantOverloadedLig
{
[Dependency] private readonly BeamSystem _beam = default!;
protected override void OnZap(RevenantOverloadedLightsComponent component)
protected override void OnZap(Entity<RevenantOverloadedLightsComponent> lights)
{
var component = lights.Comp;
if (component.Target == null)
return;
var lxform = Transform(component.Owner);
var lxform = Transform(lights);
var txform = Transform(component.Target.Value);
if (!lxform.Coordinates.TryDistance(EntityManager, txform.Coordinates, out var distance))
@@ -24,6 +25,6 @@ public sealed class RevenantOverloadedLightsSystem : SharedRevenantOverloadedLig
if (distance > component.ZapRange)
return;
_beam.TryCreateBeam(component.Owner, component.Target.Value, component.ZapBeamEntityId);
_beam.TryCreateBeam(lights, component.Target.Value, component.ZapBeamEntityId);
}
}

24
Content.Server/Revenant/EntitySystems/RevenantSystem.cs
View File

@@ -77,9 +77,9 @@ public sealed partial class RevenantSystem : EntitySystem
if (_ticker.RunLevel == GameRunLevel.PostRound && TryComp<VisibilityComponent>(uid, out var visibility))
{
_visibility.AddLayer(visibility, (int) VisibilityFlags.Ghost, false);
_visibility.RemoveLayer(visibility, (int) VisibilityFlags.Normal, false);
_visibility.RefreshVisibility(visibility);
_visibility.AddLayer(uid, visibility, (int) VisibilityFlags.Ghost, false);
_visibility.RemoveLayer(uid, visibility, (int) VisibilityFlags.Normal, false);
_visibility.RefreshVisibility(uid, visibility);
}
//ghost vision
@@ -185,19 +185,20 @@ public sealed partial class RevenantSystem : EntitySystem
public void MakeVisible(bool visible)
{
foreach (var (_, vis) in EntityQuery<RevenantComponent, VisibilityComponent>())
var query = EntityQueryEnumerator<RevenantComponent, VisibilityComponent>();
while (query.MoveNext(out var uid, out _, out var vis))
{
if (visible)
{
_visibility.AddLayer(vis, (int) VisibilityFlags.Normal, false);
_visibility.RemoveLayer(vis, (int) VisibilityFlags.Ghost, false);
_visibility.AddLayer(uid, vis, (int) VisibilityFlags.Normal, false);
_visibility.RemoveLayer(uid, vis, (int) VisibilityFlags.Ghost, false);
}
else
{
_visibility.AddLayer(vis, (int) VisibilityFlags.Ghost, false);
_visibility.RemoveLayer(vis, (int) VisibilityFlags.Normal, false);
_visibility.AddLayer(uid, vis, (int) VisibilityFlags.Ghost, false);
_visibility.RemoveLayer(uid, vis, (int) VisibilityFlags.Normal, false);
}
_visibility.RefreshVisibility(vis);
_visibility.RefreshVisibility(uid, vis);
}
}
@@ -205,7 +206,8 @@ public sealed partial class RevenantSystem : EntitySystem
{
base.Update(frameTime);
foreach (var rev in EntityQuery<RevenantComponent>())
var query = EntityQueryEnumerator<RevenantComponent>();
while (query.MoveNext(out var uid, out var rev))
{
rev.Accumulator += frameTime;
@@ -215,7 +217,7 @@ public sealed partial class RevenantSystem : EntitySystem
if (rev.Essence < rev.EssenceRegenCap)
{
ChangeEssenceAmount(rev.Owner, rev.EssencePerSecond, rev, regenCap: true);
ChangeEssenceAmount(uid, rev.EssencePerSecond, rev, regenCap: true);
}
}
}