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

Fix ContainerSlot not serializing correctly when empty.

Browse Source
This commit is contained in:
Pieter-Jan Briers
2019-07-08 13:35:05 +02:00
parent 0a6e5c6d01
commit b9215d214e
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Content.Server/GameObjects/ContainerSlot.cs
View File

@@ -1,4 +1,5 @@
using Robust.Server.GameObjects.Components.Container; using System;
using Robust.Server.GameObjects.Components.Container;
using Robust.Server.Interfaces.GameObjects; using Robust.Server.Interfaces.GameObjects;
using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using System.Collections.Generic; using System.Collections.Generic;
@@ -12,7 +13,18 @@ namespace Content.Server.GameObjects
public IEntity ContainedEntity { get; private set; } = null; public IEntity ContainedEntity { get; private set; } = null;
/// <inheritdoc /> /// <inheritdoc />
public override IReadOnlyCollection<IEntity> ContainedEntities => new List<IEntity> { ContainedEntity }.AsReadOnly(); public override IReadOnlyCollection<IEntity> ContainedEntities
{
get
{
if (ContainedEntity == null)
{
return Array.Empty<IEntity>();
}
return new List<IEntity> {ContainedEntity}.AsReadOnly();
}
}
public ContainerSlot(string id, IContainerManager manager) : base(id, manager) public ContainerSlot(string id, IContainerManager manager) : base(id, manager)
{ {