tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Stack storage fixes (#17651)

Browse Source
This commit is contained in:
Nemanja
2023-06-27 20:30:03 -04:00
committed by GitHub
parent 76cd2be31a
commit 6fb7879041
3 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Content.Server/Storage/EntitySystems/StorageSystem.cs
View File

@@ -484,7 +484,7 @@ namespace Content.Server.Storage.EntitySystems
/// <summary>
/// Verifies if an entity can be stored and if it fits
/// </summary>
/// <param name="entity">The entity to check</param>
/// <param name="uid">The entity to check</param>
/// <param name="reason">If returning false, the reason displayed to the player</param>
/// <returns>true if it can be inserted, false otherwise</returns>
public bool CanInsert(EntityUid uid, EntityUid insertEnt, out string? reason, ServerStorageComponent? storageComp = null)
@@ -523,16 +523,8 @@ namespace Content.Server.Storage.EntitySystems
if (TryComp(insertEnt, out ItemComponent? itemComp) &&
itemComp.Size > storageComp.StorageCapacityMax - storageComp.StorageUsed)
{
// If this is a stack, we may be able to combine it with an existing stack in the storage.
// If so, no extra space would be used.
//
// TODO: This doesn't allow any sort of top-up behavior.
// You either combine the whole stack, or insert nothing.
if (!TryComp(insertEnt, out StackComponent? stackComp) || !CanCombineStacks(storageComp, stackComp))
{
reason = "comp-storage-insufficient-capacity";
return false;
}
reason = "comp-storage-insufficient-capacity";
return false;
}
reason = null;