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

fix paper bin exception (#13874)

Browse Source
This commit is contained in:
Nemanja
2023-02-02 20:05:30 -05:00
committed by GitHub
parent 986b9cd69f
commit eb9c407717
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Shared/Storage/EntitySystems/BinSystem.cs
View File

@@ -1,5 +1,4 @@
using System.Diagnostics.CodeAnalysis; using System.Linq;
using System.Linq;
using Content.Shared.Administration.Logs; using Content.Shared.Administration.Logs;
using Content.Shared.Database; using Content.Shared.Database;
using Content.Shared.Hands.EntitySystems; using Content.Shared.Hands.EntitySystems;
@@ -141,12 +140,15 @@ public sealed class BinSystem : EntitySystem
/// <param name="toRemove"></param> /// <param name="toRemove"></param>
/// <param name="component"></param> /// <param name="component"></param>
/// <returns></returns> /// <returns></returns>
public bool TryRemoveFromBin(EntityUid uid, [NotNullWhen(true)] EntityUid? toRemove, BinComponent? component = null) public bool TryRemoveFromBin(EntityUid uid, EntityUid? toRemove, BinComponent? component = null)
{ {
if (!Resolve(uid, ref component)) if (!Resolve(uid, ref component))
return false; return false;
if (toRemove != component.Items.Last()) if (!component.Items.Any())
return false;
if (toRemove == null || toRemove != component.Items.LastOrDefault())
return false; return false;
if (!component.ItemContainer.Remove(toRemove.Value)) if (!component.ItemContainer.Remove(toRemove.Value))