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

Fix error when trying to change layer that doesn't exist in SpriteChange and SpriteStateChange.

Browse Source
This commit is contained in:
Víctor Aguilera Puerto
2020-10-12 12:54:41 +02:00
parent 99ba632afc
commit c904a7e9c4
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Construction/Completions/SpriteChange.cs
View File

@@ -1,4 +1,5 @@
#nullable enable #nullable enable
using System;
using System.Threading.Tasks; using System.Threading.Tasks;
using Content.Shared.Construction; using Content.Shared.Construction;
using JetBrains.Annotations; using JetBrains.Annotations;
@@ -27,6 +28,9 @@ namespace Content.Server.Construction.Completions
if (!entity.TryGetComponent(out SpriteComponent? sprite)) return; if (!entity.TryGetComponent(out SpriteComponent? sprite)) return;
// That layer doesn't exist, we do nothing.
if (sprite.LayerCount <= Layer) return;
sprite.LayerSetSprite(Layer, SpriteSpecifier); sprite.LayerSetSprite(Layer, SpriteSpecifier);
} }
} }

8
Content.Server/Construction/Completions/SpriteStateChange.cs
View File

@@ -22,17 +22,15 @@ namespace Content.Server.Construction.Completions
public int Layer { get; private set; } = 0; public int Layer { get; private set; } = 0;
public string? State { get; private set; } = string.Empty; public string? State { get; private set; } = string.Empty;
public async Task StepCompleted(IEntity entity, IEntity user)
{
await PerformAction(entity, user);
}
public async Task PerformAction(IEntity entity, IEntity? user) public async Task PerformAction(IEntity entity, IEntity? user)
{ {
if (entity.Deleted || string.IsNullOrEmpty(State)) return; if (entity.Deleted || string.IsNullOrEmpty(State)) return;
if (!entity.TryGetComponent(out SpriteComponent? sprite)) return; if (!entity.TryGetComponent(out SpriteComponent? sprite)) return;
// That layer doesn't exist, we do nothing.
if (sprite.LayerCount <= Layer) return;
sprite.LayerSetState(Layer, State); sprite.LayerSetState(Layer, State);
} }
} }