From bca66488bf98b0f1bcdeef737873a14383c64f70 Mon Sep 17 00:00:00 2001 From: Paul Ritter Date: Sun, 11 Dec 2022 00:25:04 +0100 Subject: [PATCH] more proper serv4 usage because i forgot to push for the last pr (#12965) --- Content.Server/Disease/DiseaseSystem.cs | 2 +- Content.Server/Humanoid/Systems/RandomHumanoidSystem.cs | 2 +- Content.Server/Traits/TraitSystem.cs | 3 +-- .../Decals/DecalGridChunkCollectionTypeSerializer.cs | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Content.Server/Disease/DiseaseSystem.cs b/Content.Server/Disease/DiseaseSystem.cs index 36c9d90c45..443ae721a7 100644 --- a/Content.Server/Disease/DiseaseSystem.cs +++ b/Content.Server/Disease/DiseaseSystem.cs @@ -384,7 +384,7 @@ namespace Content.Server.Disease return; } - var freshDisease = _serializationManager.CreateCopy(addedDisease); + var freshDisease = _serializationManager.CreateCopy(addedDisease, notNullableOverride: true); if (freshDisease == null) return; diff --git a/Content.Server/Humanoid/Systems/RandomHumanoidSystem.cs b/Content.Server/Humanoid/Systems/RandomHumanoidSystem.cs index 7719e5e136..5a109b2cc9 100644 --- a/Content.Server/Humanoid/Systems/RandomHumanoidSystem.cs +++ b/Content.Server/Humanoid/Systems/RandomHumanoidSystem.cs @@ -56,7 +56,7 @@ public sealed class RandomHumanoidSystem : EntitySystem foreach (var entry in prototype.Components.Values) { - var comp = (Component) _serialization.CreateCopy(entry.Component); + var comp = (Component) _serialization.CreateCopy(entry.Component, notNullableOverride: true); comp.Owner = humanoid; EntityManager.AddComponent(humanoid, comp, true); } diff --git a/Content.Server/Traits/TraitSystem.cs b/Content.Server/Traits/TraitSystem.cs index 760c0bdcb5..a153990afa 100644 --- a/Content.Server/Traits/TraitSystem.cs +++ b/Content.Server/Traits/TraitSystem.cs @@ -1,6 +1,5 @@ using Content.Server.GameTicking; using Content.Shared.Traits; -using Content.Shared.Whitelist; using Robust.Shared.Prototypes; using Robust.Shared.Serialization.Manager; @@ -38,7 +37,7 @@ public sealed class TraitSystem : EntitySystem // Add all components required by the prototype foreach (var entry in traitPrototype.Components.Values) { - var comp = (Component) _serializationManager.CreateCopy(entry.Component); + var comp = (Component) _serializationManager.CreateCopy(entry.Component, notNullableOverride: true); comp.Owner = args.Mob; EntityManager.AddComponent(args.Mob, comp); } diff --git a/Content.Shared/Decals/DecalGridChunkCollectionTypeSerializer.cs b/Content.Shared/Decals/DecalGridChunkCollectionTypeSerializer.cs index 1bbcd03a1c..6dacb001df 100644 --- a/Content.Shared/Decals/DecalGridChunkCollectionTypeSerializer.cs +++ b/Content.Shared/Decals/DecalGridChunkCollectionTypeSerializer.cs @@ -57,7 +57,7 @@ namespace Content.Shared.Decals bool alwaysWrite = false, ISerializationContext? context = null) { - return serializationManager.WriteValue(value.ChunkCollection, alwaysWrite, context); + return serializationManager.WriteValue(value.ChunkCollection, alwaysWrite, context, notNullableOverride: true); } } }