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

Changes needed for new notnullableflaganalyzer (#12957)

Browse Source
This commit is contained in:
Paul Ritter
2022-12-11 00:19:37 +01:00
committed by GitHub
parent 95358f3b66
commit 5715b0c2be
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Client/Actions/ActionsSystem.cs
View File

@@ -295,7 +295,7 @@ namespace Content.Client.Actions
if (!map.TryGet("action", out var actionNode))
continue;
var action = _serialization.Read<ActionType>(actionNode);
var action = _serialization.Read<ActionType>(actionNode, notNullableOverride: true);
if (PlayerActions.Actions.TryGetValue(action, out var existingAction))
{
@@ -310,7 +310,7 @@ namespace Content.Client.Actions
if (!map.TryGet("assignments", out var assignmentNode))
continue;
var nodeAssignments = _serialization.Read<List<(byte Hotbar, byte Slot)>>(assignmentNode);
var nodeAssignments = _serialization.Read<List<(byte Hotbar, byte Slot)>>(assignmentNode, notNullableOverride: true);
foreach (var index in nodeAssignments)
{

2
Content.Client/Changelog/ChangelogManager.cs
View File

@@ -81,7 +81,7 @@ namespace Content.Client.Changelog
return new List<ChangelogEntry>();
var node = (MappingDataNode)yamlData.Documents[0].RootNode.ToDataNode();
return _serialization.Read<List<ChangelogEntry>>(node["Entries"]);
return _serialization.Read<List<ChangelogEntry>>(node["Entries"], notNullableOverride: true);
});
}

4
Content.Shared/Damage/DamageSpecifierDictionarySerializer.cs
View File

@@ -40,7 +40,7 @@ public sealed class DamageSpecifierDictionarySerializer : ITypeReader<Dictionary
// Add all the damage types by just copying the type dictionary (if it is not null).
if (node.TryGet("types", out var typesNode))
{
serializationManager.Read(typesNode, instanceProvider: () => dict);
serializationManager.Read(typesNode, instanceProvider: () => dict, notNullableOverride: true);
}
if (!node.TryGet("groups", out var groupsNode))
@@ -48,7 +48,7 @@ public sealed class DamageSpecifierDictionarySerializer : ITypeReader<Dictionary
// Then resolve damage groups and add them
var prototypeManager = dependencies.Resolve<IPrototypeManager>();
foreach (var entry in serializationManager.Read<Dictionary<string, FixedPoint2>>(groupsNode))
foreach (var entry in serializationManager.Read<Dictionary<string, FixedPoint2>>(groupsNode, notNullableOverride: true))
{
if (!prototypeManager.TryIndex<DamageGroupPrototype>(entry.Key, out var group))
{

2
Content.Shared/Decals/DecalGridChunkCollectionTypeSerializer.cs
View File

@@ -20,7 +20,7 @@ namespace Content.Shared.Decals
IDependencyCollection dependencies, bool skipHook, ISerializationContext? context = null,
ISerializationManager.InstantiationDelegate<DecalGridComponent.DecalGridChunkCollection>? _ = default)
{
var dictionary = serializationManager.Read<Dictionary<Vector2i, Dictionary<uint, Decal>>>(node, context, skipHook);
var dictionary = serializationManager.Read<Dictionary<Vector2i, Dictionary<uint, Decal>>>(node, context, skipHook, notNullableOverride: true);
var uids = new SortedSet<uint>();
var uidChunkMap = new Dictionary<uint, Vector2i>();