Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix map yaml linter (#6433)

Browse Source
This commit is contained in:
metalgearsloth
2022-02-02 00:05:55 +11:00
committed by GitHub
parent 1803c29626
commit 434580845b
10 changed files with 30 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Salvage/SalvageMapPrototype.cs
View File

@@ -3,6 +3,8 @@ using System.Linq;
using Content.Server.Objectives.Interfaces;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.Serialization.TypeSerializers.Implementations;
using Robust.Shared.Utility;
using Robust.Shared.ViewVariables;
namespace Content.Server.Salvage
@@ -19,7 +21,7 @@ namespace Content.Server.Salvage
/// </summary>
[ViewVariables]
[DataField("mapPath", required: true)]
public string MapPath { get; } = default!;
public ResourcePath MapPath { get; } = default!;
/// <summary>
/// Size *from 0,0* in units of the map (used to determine if it fits)

2
Content.Server/Salvage/SalvageSystem.cs
View File

@@ -278,7 +278,7 @@ namespace Content.Server.Salvage
Report("salvage-system-announcement-spawn-no-debris-available");
return false;
}
var bp = _mapLoader.LoadBlueprint(spl.MapId, map.MapPath);
var bp = _mapLoader.LoadBlueprint(spl.MapId, map.MapPath.ToString());
if (bp == null)
{
Report("salvage-system-announcement-spawn-debris-disintegrated");