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

Fix jenkins build

Browse Source
This commit is contained in:
Víctor Aguilera Puerto
2020-09-06 17:16:08 +02:00
parent 48b61f6bcc
commit 6724a9e6ab
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Content.Client/GameObjects/Components/LightBehaviourComponent.cs
View File

@@ -1,5 +1,4 @@
 using System;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using Robust.Client.GameObjects; using Robust.Client.GameObjects;
using Robust.Shared.Animations; using Robust.Shared.Animations;
@@ -13,8 +12,6 @@ using Robust.Shared.Log;
using Robust.Shared.Maths; using Robust.Shared.Maths;
using Robust.Shared.Interfaces.Serialization; using Robust.Shared.Interfaces.Serialization;
using Robust.Client.Animations; using Robust.Client.Animations;
using Robust.Shared.Interfaces.GameObjects;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Robust.Client.GameObjects.Components.Animations; using Robust.Client.GameObjects.Components.Animations;
using System.Linq; using System.Linq;
@@ -43,7 +40,7 @@ namespace Content.Client.GameObjects.Components
protected IRobustRandom RobustRandom = default; protected IRobustRandom RobustRandom = default;
private float _maxTime = default; private float _maxTime = default;
public virtual void ExposeData(ObjectSerializer serializer) public virtual void ExposeData(ObjectSerializer serializer)
{ {
serializer.DataField(this, x => x.ID, "id", string.Empty); serializer.DataField(this, x => x.ID, "id", string.Empty);
@@ -83,7 +80,7 @@ namespace Content.Client.GameObjects.Components
MaxTime = MaxDuration; MaxTime = MaxDuration;
} }
owner.Length = TimeSpan.FromSeconds(MaxTime); owner.Length = TimeSpan.FromSeconds(MaxTime);
} }
public override (int KeyFrameIndex, float FramePlayingTime) InitPlayback() public override (int KeyFrameIndex, float FramePlayingTime) InitPlayback()
@@ -344,7 +341,7 @@ namespace Content.Client.GameObjects.Components
/// A component which applies a specific behaviour to a PointLightComponent on its owner. /// A component which applies a specific behaviour to a PointLightComponent on its owner.
/// </summary> /// </summary>
[RegisterComponent] [RegisterComponent]
public class LightBehaviourComponent : SharedLightBehaviourComponent public class LightBehaviourComponent : SharedLightBehaviourComponent
{ {
private const string KeyPrefix = nameof(LightBehaviourComponent); private const string KeyPrefix = nameof(LightBehaviourComponent);
@@ -387,7 +384,7 @@ namespace Content.Client.GameObjects.Components
container.LightBehaviour.Initialize(_lightComponent); container.LightBehaviour.Initialize(_lightComponent);
} }
// we need to initialize all behaviours before starting any // we need to initialize all behaviours before starting any
foreach (var container in _animations) foreach (var container in _animations)
{ {
if (container.LightBehaviour.Enabled) if (container.LightBehaviour.Enabled)

5
Content.Server/GameObjects/Components/LightBehaviourComponent.cs
View File

@@ -1,5 +1,4 @@
 using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects;
using Content.Shared.GameObjects.Components; using Content.Shared.GameObjects.Components;
namespace Content.Server.GameObjects.Components namespace Content.Server.GameObjects.Components
@@ -8,7 +7,7 @@ namespace Content.Server.GameObjects.Components
/// A component which applies a specific behaviour to a PointLightComponent on its owner. /// A component which applies a specific behaviour to a PointLightComponent on its owner.
/// </summary> /// </summary>
[RegisterComponent] [RegisterComponent]
public class LightBehaviourComponent : SharedLightBehaviourComponent public class LightBehaviourComponent : SharedLightBehaviourComponent
{ {
} }