From 2992bd74cd69ec9f3e1a5bc94bc90c52e15b048e Mon Sep 17 00:00:00 2001 From: Vera Aguilera Puerto Date: Sat, 2 Oct 2021 11:21:25 +0200 Subject: [PATCH] Fix ServerStorageComponent making bad assumptions about GetEntity/GetComponent. It assumed they returned null instead of throwing, and had wrong/invalid logic as a result. --- .../Storage/Components/ServerStorageComponent.cs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Content.Server/Storage/Components/ServerStorageComponent.cs b/Content.Server/Storage/Components/ServerStorageComponent.cs index 664028a1c8..ede22b0eba 100644 --- a/Content.Server/Storage/Components/ServerStorageComponent.cs +++ b/Content.Server/Storage/Components/ServerStorageComponent.cs @@ -374,7 +374,7 @@ namespace Content.Server.Storage.Components base.Initialize(); // ReSharper disable once StringLiteralTypo - _storage = ContainerHelpers.EnsureContainer(Owner, "storagebase"); + _storage = Owner.EnsureContainer("storagebase"); _storage.OccludesLight = _occludesLight; } @@ -409,15 +409,12 @@ namespace Content.Server.Storage.Components break; } - var entity = Owner.EntityManager.GetEntity(remove.EntityUid); - - if (entity == null || _storage?.Contains(entity) == false) + if (!Owner.EntityManager.TryGetEntity(remove.EntityUid, out var entity) || _storage?.Contains(entity) == false) { break; } - var item = entity.GetComponent(); - if (item == null || !player.TryGetComponent(out HandsComponent? hands)) + if (!entity.TryGetComponent(out ItemComponent? item) || !player.TryGetComponent(out HandsComponent? hands)) { break; }