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

Make held entity nullable (#5923)

Browse Source
This commit is contained in:
wrexbe
2021-12-30 18:27:15 -08:00
committed by GitHub
parent 761dfb48af
commit abba1e1c2c
11 changed files with 68 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Server/Hands/Systems/HandVirtualItemSystem.cs
View File

@@ -1,4 +1,4 @@
using Content.Server.Hands.Components;
using Content.Server.Hands.Components;
using Content.Shared.Hands;
using Content.Shared.Hands.Components;
using Content.Shared.Interaction;
@@ -27,7 +27,7 @@ namespace Content.Server.Hands.Systems
foreach (var handName in hands.ActivePriorityEnumerable())
{
var hand = hands.GetHand(handName);
if (!hand.IsEmpty)
if (hand.HeldEntity != null)
continue;
var pos = EntityManager.GetComponent<TransformComponent>(hands.Owner).Coordinates;
@@ -87,13 +87,11 @@ namespace Content.Server.Hands.Systems
foreach (var handName in hands.ActivePriorityEnumerable())
{
var hand = hands.GetHand(handName);
if (hand.IsEmpty)
if (!(hand.HeldEntity is { } heldEntity))
continue;
if (hand.HeldEntity == default)
continue;
if (EntityManager.TryGetComponent<HandVirtualItemComponent>(hand.HeldEntity, out var virt)
if (EntityManager.TryGetComponent<HandVirtualItemComponent>(heldEntity, out var virt)
&& virt.BlockingEntity == matching)
{
Delete(virt, user);