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

Mining Fix (#10347)

Browse Source
This commit is contained in:
Nemanja
2022-08-05 23:16:17 -04:00
committed by GitHub
parent 064112a045
commit 6d88c6ba88
4 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Shared/Storage/EntitySpawnEntry.cs
View File

@@ -13,8 +13,8 @@ namespace Content.Shared.Storage;
public struct EntitySpawnEntry : IPopulateDefaultValues
{
[ViewVariables(VVAccess.ReadWrite)]
[DataField("id", required: true, customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
public string PrototypeId;
[DataField("id", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
public string? PrototypeId;
/// <summary>
/// The probability that an item will spawn. Takes decimal form so 0.05 is 5%, 0.50 is 50% etc.
@@ -83,12 +83,12 @@ public static class EntitySpawnCollection
/// <param name="entries">The entity spawn entries.</param>
/// <param name="random">Resolve param.</param>
/// <returns>A list of entity prototypes that should be spawned.</returns>
public static List<string> GetSpawns(IEnumerable<EntitySpawnEntry> entries,
public static List<string?> GetSpawns(IEnumerable<EntitySpawnEntry> entries,
IRobustRandom? random = null)
{
IoCManager.Resolve(ref random);
var spawned = new List<string>();
var spawned = new List<string?>();
var orGroupedSpawns = new Dictionary<string, OrGroup>();
// collect groups together, create singular items that pass probability