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.Shared/Access/Systems/AccessReaderSystem.cs
+++ b/Content.Shared/Access/Systems/AccessReaderSystem.cs
@@ -71,7 +71,7 @@ namespace Content.Shared.Access.Systems
            if (EntityManager.TryGetComponent(uid, out SharedHandsComponent? hands))
            {
                if (hands.TryGetActiveHeldEntity(out var heldItem) &&
-                    FindAccessTagsItem(heldItem, out tags))
+                    FindAccessTagsItem(heldItem.Value, out tags))
                {
                    return tags;
                }