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

Fix storage interactions not preventing afterinteract for the item (#7973)

Browse Source
This commit is contained in:
Kara
2022-05-06 03:59:03 -07:00
committed by GitHub
parent f2e4b3a237
commit 623b2a101a
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -185,6 +185,9 @@ namespace Content.Server.Storage.EntitySystems
/// <returns>true if inserted, false otherwise</returns> /// <returns>true if inserted, false otherwise</returns>
private void OnInteractUsing(EntityUid uid, ServerStorageComponent storageComp, InteractUsingEvent args) private void OnInteractUsing(EntityUid uid, ServerStorageComponent storageComp, InteractUsingEvent args)
{ {
if (args.Handled)
return;
if (!storageComp.ClickInsert) if (!storageComp.ClickInsert)
return; return;
@@ -193,7 +196,8 @@ namespace Content.Server.Storage.EntitySystems
if (HasComp<PlaceableSurfaceComponent>(uid)) if (HasComp<PlaceableSurfaceComponent>(uid))
return; return;
PlayerInsertHeldEntity(uid, args.User, storageComp); if (PlayerInsertHeldEntity(uid, args.User, storageComp))
args.Handled = true;
} }
/// <summary> /// <summary>