Fix CanImplant returning true when there's no implant (#21637)
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:
@@ -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;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user