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

Fix some comp dirty / appearance warnings (#13193)

Browse Source 
* Fix some comp dirty / appearance warnings

* also dis
This commit is contained in:
metalgearsloth
2022-12-28 03:58:53 +11:00
committed by GitHub
parent d3d8dde42c
commit 007b079330
12 changed files with 43 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Content.Shared/SubFloor/TrayScannerSystem.cs
View File

@@ -11,10 +11,12 @@ namespace Content.Shared.SubFloor;
public sealed class TrayScannerSystem : EntitySystem
{
[Dependency] private IMapManager _mapManager = default!;
[Dependency] private IGameTiming _gameTiming = default!;
[Dependency] private SharedSubFloorHideSystem _subfloorSystem = default!;
[Dependency] private SharedContainerSystem _containerSystem = default!;
[Dependency] private readonly IMapManager _mapManager = default!;
[Dependency] private readonly IGameTiming _gameTiming = default!;
[Dependency] private readonly SharedAppearanceSystem _appearance = default!;
[Dependency] private readonly SharedSubFloorHideSystem _subfloorSystem = default!;
[Dependency] private readonly SharedContainerSystem _containerSystem = default!;
[Dependency] private readonly SharedTransformSystem _transform = default!;
private HashSet<EntityUid> _activeScanners = new();
private RemQueue<EntityUid> _invalidScanners = new();
@@ -50,7 +52,7 @@ public sealed class TrayScannerSystem : EntitySystem
if (EntityManager.TryGetComponent<AppearanceComponent>(uid, out var appearance))
{
appearance.SetData(TrayScannerVisual.Visual, scanner.Enabled == true ? TrayScannerVisual.On : TrayScannerVisual.Off);
_appearance.SetData(uid, TrayScannerVisual.Visual, scanner.Enabled ? TrayScannerVisual.On : TrayScannerVisual.Off, appearance);
}
}
@@ -83,7 +85,8 @@ public sealed class TrayScannerSystem : EntitySystem
if (!_gameTiming.IsFirstTimePredicted)
return;
if (!_activeScanners.Any()) return;
if (!_activeScanners.Any())
return;
foreach (var scanner in _activeScanners)
{
@@ -96,7 +99,9 @@ public sealed class TrayScannerSystem : EntitySystem
}
foreach (var invalidScanner in _invalidScanners)
{
_activeScanners.Remove(invalidScanner);
}
_invalidScanners.List?.Clear();
}
@@ -148,15 +153,16 @@ public sealed class TrayScannerSystem : EntitySystem
}
var pos = transform.LocalPosition;
var parent = _transform.GetParent(transform);
// zero vector implies container
//
// this means we should get the entity transform's parent
if (pos == Vector2.Zero
&& transform.Parent != null
&& parent != null
&& _containerSystem.ContainsEntity(transform.ParentUid, uid))
{
pos = transform.Parent.LocalPosition;
pos = parent.LocalPosition;
// if this is also zero, we can check one more time
//
@@ -165,7 +171,7 @@ public sealed class TrayScannerSystem : EntitySystem
// that doesn't work, just don't bother any further
if (pos == Vector2.Zero)
{
var gpTransform = transform.Parent.Parent;
var gpTransform = _transform.GetParent(parent);
if (gpTransform != null
&& _containerSystem.ContainsEntity(gpTransform.Owner, transform.ParentUid))
{