Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix CanImplant returning true when there's no implant (#21637)

Browse Source 
In CanImplant, FirstOrDefault would make up a new implant with default
values if there wasn't any to inject. This resulted in localization
errors and exceptions. Replacing with FirstOrNull fixes the issue.
This commit is contained in:
Bakke
2023-11-13 23:53:54 +01:00
committed by GitHub
parent e3307fcd9d
commit 966201c6b3
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Shared/Implants/SharedImplanterSystem.cs
View File

@@ -9,6 +9,7 @@ using Content.Shared.Popups;
using Content.Shared.Whitelist; using Content.Shared.Whitelist;
using Robust.Shared.Containers; using Robust.Shared.Containers;
using Robust.Shared.Serialization; using Robust.Shared.Serialization;
using Robust.Shared.Utility;
namespace Content.Shared.Implants; namespace Content.Shared.Implants;
@@ -82,7 +83,7 @@ public abstract class SharedImplanterSystem : EntitySystem
[NotNullWhen(true)] out EntityUid? implant, [NotNullWhen(true)] out EntityUid? implant,
[NotNullWhen(true)] out SubdermalImplantComponent? implantComp) [NotNullWhen(true)] out SubdermalImplantComponent? implantComp)
{ {
implant = component.ImplanterSlot.ContainerSlot?.ContainedEntities.FirstOrDefault(); implant = component.ImplanterSlot.ContainerSlot?.ContainedEntities.FirstOrNull();
if (!TryComp(implant, out implantComp)) if (!TryComp(implant, out implantComp))
return false; return false;