space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-02-15 03:30:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Respect ignored prototypes even if the kind name is registered (#4340)

Browse Source
This commit is contained in:
DrSmugleaf
2023-08-30 21:01:47 -07:00
committed by GitHub
parent 749ac2c364
commit bcd1566440
2 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Robust.Shared/Prototypes/PrototypeManager.YamlLoad.cs
View File

@@ -7,10 +7,8 @@ using Robust.Shared.Random;
using Robust.Shared.Serialization.Markdown;
using Robust.Shared.Serialization.Markdown.Mapping;
using Robust.Shared.Serialization.Markdown.Sequence;
using Robust.Shared.Serialization.Markdown.Validation;
using Robust.Shared.Serialization.Markdown.Value;
using Robust.Shared.Utility;
using YamlDotNet.RepresentationModel;
namespace Robust.Shared.Prototypes;
@@ -155,11 +153,11 @@ public partial class PrototypeManager
private ExtractedMappingData? ExtractMapping(MappingDataNode dataNode)
{
var type = dataNode.Get<ValueDataNode>("type").Value;
if (_ignoredPrototypeTypes.Contains(type))
return null;
if (!_kindNames.TryGetValue(type, out var kind))
{
if (_ignoredPrototypeTypes.Contains(type))
return null;
throw new PrototypeLoadException($"Unknown prototype type: '{type}'");
}

10
Robust.Shared/Prototypes/PrototypeManager.YamlValidate.cs
View File

@@ -1,16 +1,12 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using Robust.Shared.Serialization;
using Robust.Shared.Serialization.Manager;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.Serialization.Markdown;
using Robust.Shared.Serialization.Markdown.Mapping;
using Robust.Shared.Serialization.Markdown.Validation;
using Robust.Shared.Serialization.Markdown.Value;
using Robust.Shared.Utility;
using YamlDotNet.Core;
using YamlDotNet.RepresentationModel;
namespace Robust.Shared.Prototypes;
@@ -46,11 +42,11 @@ public partial class PrototypeManager
foreach (YamlMappingNode node in rootNode.Cast<YamlMappingNode>())
{
var typeId = node.GetNode("type").AsString();
if (_ignoredPrototypeTypes.Contains(typeId))
continue;
if (!_kindNames.TryGetValue(typeId, out var type))
{
if (_ignoredPrototypeTypes.Contains(typeId))
continue;
throw new PrototypeLoadException($"Unknown prototype type: '{typeId}'");
}