tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests 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

18
Content.Client/Storage/Systems/ItemMapperSystem.cs
View File

@@ -21,26 +21,27 @@ public sealed class ItemMapperSystem : SharedItemMapperSystem
{
if (TryComp<SpriteComponent>(uid, out var sprite))
{
component.RSIPath ??= sprite.BaseRSI!.Path!;
component.RSIPath ??= sprite.BaseRSI!.Path;
}
}
private void OnAppearance(EntityUid uid, ItemMapperComponent component, ref AppearanceChangeEvent args)
{
if (TryComp<SpriteComponent>(component.Owner, out var spriteComponent))
if (TryComp<SpriteComponent>(uid, out var spriteComponent))
{
if (component.SpriteLayers.Count == 0)
{
InitLayers(component, spriteComponent, args.Component);
InitLayers((uid, component, spriteComponent, args.Component));
}
EnableLayers(component, spriteComponent, args.Component);
EnableLayers((uid, component, spriteComponent, args.Component));
}
}
private void InitLayers(ItemMapperComponent component, SpriteComponent spriteComponent, AppearanceComponent appearance)
private void InitLayers(Entity<ItemMapperComponent, SpriteComponent, AppearanceComponent> ent)
{
if (!_appearance.TryGetData<ShowLayerData>(appearance.Owner, StorageMapVisuals.InitLayers, out var wrapper, appearance))
var (owner, component, spriteComponent, appearance) = ent;
if (!_appearance.TryGetData<ShowLayerData>(owner, StorageMapVisuals.InitLayers, out var wrapper, appearance))
return;
component.SpriteLayers.AddRange(wrapper.QueuedEntities);
@@ -53,9 +54,10 @@ public sealed class ItemMapperSystem : SharedItemMapperSystem
}
}
private void EnableLayers(ItemMapperComponent component, SpriteComponent spriteComponent, AppearanceComponent appearance)
private void EnableLayers(Entity<ItemMapperComponent, SpriteComponent, AppearanceComponent> ent)
{
if (!_appearance.TryGetData<ShowLayerData>(appearance.Owner, StorageMapVisuals.LayerChanged, out var wrapper, appearance))
var (owner, component, spriteComponent, appearance) = ent;
if (!_appearance.TryGetData<ShowLayerData>(owner, StorageMapVisuals.LayerChanged, out var wrapper, appearance))
return;
foreach (var layerName in component.SpriteLayers)