Make held entity nullable (#5923)

2021-12-30 18:27:15 -08:00
parent 761dfb48af
commit abba1e1c2c
11 changed files with 68 additions and 86 deletions
--- a/Content.Server/Access/Systems/IdCardSystem.cs
+++ b/Content.Server/Access/Systems/IdCardSystem.cs
@@ -92,7 +92,7 @@ namespace Content.Server.Access.Systems
            // check held item?
            if (EntityManager.TryGetComponent(uid, out SharedHandsComponent? hands) &&
                hands.TryGetActiveHeldEntity(out var heldItem) &&
-                TryGetIdCard(heldItem, out idCard))
+                TryGetIdCard(heldItem.Value, out idCard))
            {
                return true;
            }