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

Avoid RGB controller error spam (#16440)

Browse Source
This commit is contained in:
Leon Friedrich
2023-05-15 08:18:14 +12:00
committed by GitHub
parent 80d339de65
commit 7065341171
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Content.Client/Light/RgbLightControllerSystem.cs
View File

@@ -99,6 +99,7 @@ namespace Content.Client.Light
rgb.HolderLayers.Add(key); rgb.HolderLayers.Add(key);
} }
} }
private void OnHandleState(EntityUid uid, RgbLightControllerComponent rgb, ref ComponentHandleState args) private void OnHandleState(EntityUid uid, RgbLightControllerComponent rgb, ref ComponentHandleState args)
{ {
if (args.Current is not RgbLightControllerState state) if (args.Current is not RgbLightControllerState state)
@@ -176,9 +177,10 @@ namespace Content.Client.Light
if (rgb.Layers != null) if (rgb.Layers != null)
{ {
foreach (var layer in rgb.Layers) foreach (var index in rgb.Layers)
{ {
sprite.LayerSetColor(layer, color); if (sprite.TryGetLayer(index, out var layer))
layer.Color = color;
} }
} }
@@ -188,11 +190,12 @@ namespace Content.Client.Light
foreach (var layer in rgb.HolderLayers) foreach (var layer in rgb.HolderLayers)
{ {
holderSprite.LayerSetColor(layer, color); if (holderSprite.LayerMapTryGet(layer, out var index))
holderSprite.LayerSetColor(index, color);
} }
} }
foreach (var (rgb, map) in EntityQuery<RgbLightControllerComponent, MapLightComponent>()) foreach (var (map, rgb) in EntityQuery<MapLightComponent, RgbLightControllerComponent>())
{ {
var color = GetCurrentRgbColor(_gameTiming.RealTime, rgb.CreationTick.Value * _gameTiming.TickPeriod, rgb); var color = GetCurrentRgbColor(_gameTiming.RealTime, rgb.CreationTick.Value * _gameTiming.TickPeriod, rgb);
map.AmbientLightColor = color; map.AmbientLightColor = color;