From cfeabc9731258a294e2ff19f3e4012594d27049c Mon Sep 17 00:00:00 2001 From: Rapidgame7 Date: Mon, 10 Oct 2022 19:19:58 -0300 Subject: [PATCH] Reordered item insertion checks (#11822) --- .../Storage/EntitySystems/StorageSystem.cs | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Content.Server/Storage/EntitySystems/StorageSystem.cs b/Content.Server/Storage/EntitySystems/StorageSystem.cs index 64a29aaf29..8fd6c02569 100644 --- a/Content.Server/Storage/EntitySystems/StorageSystem.cs +++ b/Content.Server/Storage/EntitySystems/StorageSystem.cs @@ -522,17 +522,9 @@ namespace Content.Server.Storage.EntitySystems return false; } - if (TryComp(insertEnt, out ServerStorageComponent? storage) && - storage.StorageCapacityMax >= storageComp.StorageCapacityMax) + if (TryComp(insertEnt, out TransformComponent? transformComp) && transformComp.Anchored) { - reason = "comp-storage-insufficient-capacity"; - return false; - } - - if (TryComp(insertEnt, out ItemComponent? itemComp) && - itemComp.Size > storageComp.StorageCapacityMax - storageComp.StorageUsed) - { - reason = "comp-storage-insufficient-capacity"; + reason = "comp-storage-anchored-failure"; return false; } @@ -548,9 +540,17 @@ namespace Content.Server.Storage.EntitySystems return false; } - if (TryComp(insertEnt, out TransformComponent? transformComp) && transformComp.Anchored) + if (TryComp(insertEnt, out ServerStorageComponent? storage) && + storage.StorageCapacityMax >= storageComp.StorageCapacityMax) { - reason = "comp-storage-anchored-failure"; + reason = "comp-storage-insufficient-capacity"; + return false; + } + + if (TryComp(insertEnt, out ItemComponent? itemComp) && + itemComp.Size > storageComp.StorageCapacityMax - storageComp.StorageUsed) + { + reason = "comp-storage-insufficient-capacity"; return false; }