Fix linter error (#20334)

This commit is contained in:
Leon Friedrich
2023-09-19 21:08:34 +12:00
committed by GitHub
parent b8697d86c4
commit 39af74e0a3

View File

@@ -77,7 +77,26 @@ namespace Content.YAMLLinter
await instance.WaitPost(() => await instance.WaitPost(() =>
{ {
var engineErrors = protoMan.ValidateDirectory(new ResPath("/EnginePrototypes"), out var engPrototypes);
yamlErrors = protoMan.ValidateDirectory(new ResPath("/Prototypes"), out var prototypes); yamlErrors = protoMan.ValidateDirectory(new ResPath("/Prototypes"), out var prototypes);
// Merge engine & content prototypes
foreach (var (kind, instances) in engPrototypes)
{
if (prototypes.TryGetValue(kind, out var existing))
existing.UnionWith(instances);
else
prototypes[kind] = instances;
}
foreach (var (kind, set) in engineErrors)
{
if (yamlErrors.TryGetValue(kind, out var existing))
existing.UnionWith(set);
else
yamlErrors[kind] = set;
}
fieldErrors = protoMan.ValidateFields(prototypes); fieldErrors = protoMan.ValidateFields(prototypes);
}); });