space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-02-14 19:29:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix YamlException handling in PrototypeManager.LoadDirectory

Browse Source
This commit is contained in:
Pieter-Jan Briers
2020-01-24 16:38:43 +01:00
parent 5fd0718f6a
commit 6870cef9e6
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Robust.Shared/Prototypes/PrototypeManager.cs
View File

@@ -203,6 +203,7 @@ namespace Robust.Shared.Prototypes
/// <inheritdoc />
public void LoadDirectory(ResourcePath path)
{
var sawmill = Logger.GetSawmill("eng");
_hasEverBeenReloaded = true;
var yamlStreams = _resources.ContentFindFiles(path).ToList().AsParallel()
.Where(filePath => filePath.Extension == "yml" && !filePath.Filename.StartsWith("."))
@@ -218,7 +219,7 @@ namespace Robust.Shared.Prototypes
}
catch (YamlException e)
{
Logger.ErrorS("eng", $"Exception whilst loading prototypes from {filePath}: {e}");
sawmill.Error("YamlException whilst loading prototypes from {0}: {1}", filePath, e.Message);
return (null, null);
}
})