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

fix potted plant (#6983)

Browse Source
This commit is contained in:
Leon Friedrich
2022-03-04 19:54:26 +13:00
committed by GitHub
parent 0f599ad160
commit 49831aff9d
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Server/Storage/EntitySystems/SecretStashSystem.cs
View File

@@ -1,12 +1,10 @@
using Content.Server.Clothing.Components; using Content.Server.Clothing.Components;
using Content.Server.Popups; using Content.Server.Popups;
using Content.Server.Storage.Components; using Content.Server.Storage.Components;
using Content.Shared.Acts; using Content.Shared.Acts;
using Content.Shared.Hands.Components; using Content.Shared.Hands.Components;
using Content.Shared.Item;
using Robust.Shared.Containers; using Robust.Shared.Containers;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Localization;
using Robust.Shared.Player; using Robust.Shared.Player;
namespace Content.Server.Storage.EntitySystems namespace Content.Server.Storage.EntitySystems
@@ -55,7 +53,7 @@ namespace Content.Server.Storage.EntitySystems
/// </summary> /// </summary>
/// <returns>True if item was hidden inside stash</returns> /// <returns>True if item was hidden inside stash</returns>
public bool TryHideItem(EntityUid uid, EntityUid userUid, EntityUid itemToHideUid, public bool TryHideItem(EntityUid uid, EntityUid userUid, EntityUid itemToHideUid,
SecretStashComponent? component = null, ItemComponent? item = null, SecretStashComponent? component = null, SharedItemComponent? item = null,
MetaDataComponent? itemMeta = null, SharedHandsComponent? hands = null) MetaDataComponent? itemMeta = null, SharedHandsComponent? hands = null)
{ {
if (!Resolve(uid, ref component)) if (!Resolve(uid, ref component))
@@ -119,7 +117,7 @@ namespace Content.Server.Storage.EntitySystems
// get item inside container // get item inside container
var itemUid = container.ContainedEntity; var itemUid = container.ContainedEntity;
if (!EntityManager.TryGetComponent(itemUid, out ItemComponent? item)) if (!EntityManager.TryGetComponent(itemUid, out SharedItemComponent? item))
{ {
return false; return false;
} }