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

PoweredLight uses PointLights for appearance (#4540)

Browse Source 
* PoweredLight uses PointLights for appearance

Previously this just set PointLightComponent data via the visualizer which lead to desyncs in the data between client and server. If the server pointlight was dirtied at any point then the pointlight data set via appearance visualizers was bulldozed.

* Address review
This commit is contained in:
metalgearsloth
2021-08-31 18:45:02 +10:00
committed by GitHub
parent 09ff15da1f
commit df7d6c4d90
3 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Content.Server/Light/Components/PoweredLightComponent.cs
View File

@@ -17,6 +17,7 @@ using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Prototypes;
using Robust.Shared.Localization;
using Robust.Shared.Maths;
using Robust.Shared.Player;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.Timing;
@@ -89,7 +90,7 @@ namespace Content.Server.Light.Components
{
base.Initialize();
DamageType = IoCManager.Resolve<IPrototypeManager>().Index<DamageTypePrototype>(_damageTypeID);
_lightBulbContainer = ContainerHelpers.EnsureContainer<ContainerSlot>(Owner, "light_bulb");
_lightBulbContainer = Owner.EnsureContainer<ContainerSlot>("light_bulb");
}
[ViewVariables]
@@ -236,10 +237,9 @@ namespace Content.Server.Light.Components
case LightBulbState.Normal:
if (powerReceiver.Powered && _on)
{
_currentLit = true;
SetLight(true, LightBulb.Color);
powerReceiver.Load = LightBulb.PowerUse;
_appearance?.SetData(PoweredLightVisuals.BulbState, PoweredLightState.On);
_appearance?.SetData(PoweredLightVisuals.BulbColor, LightBulb.Color);
var time = _gameTiming.CurTime;
if (time > _lastThunk + _thunkDelay)
{
@@ -249,21 +249,32 @@ namespace Content.Server.Light.Components
}
else
{
_currentLit = false;
SetLight(false);
_appearance?.SetData(PoweredLightVisuals.BulbState, PoweredLightState.Off);
}
break;
case LightBulbState.Broken:
_currentLit = false;
SetLight(false);
_appearance?.SetData(PoweredLightVisuals.BulbState, PoweredLightState.Broken);
break;
case LightBulbState.Burned:
_currentLit = false;
SetLight(false);
_appearance?.SetData(PoweredLightVisuals.BulbState, PoweredLightState.Burned);
break;
}
}
private void SetLight(bool value, Color? color = null)
{
_currentLit = value;
if (!Owner.TryGetComponent(out PointLightComponent? pointLight)) return;
pointLight.Enabled = value;
if (color != null)
pointLight.Color = color.Value;
}
public override void HandleMessage(ComponentMessage message, IComponent? component)
{
base.HandleMessage(message, component);