]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Fix CanImplant returning true when there's no implant (#21637)
authorBakke <luringens@protonmail.com>
Mon, 13 Nov 2023 22:53:54 +0000 (23:53 +0100)
committerGitHub <noreply@github.com>
Mon, 13 Nov 2023 22:53:54 +0000 (15:53 -0700)
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.

Content.Shared/Implants/SharedImplanterSystem.cs

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