Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into ups

Browse Source
This commit is contained in:
Jabak
2024-07-26 21:32:42 +03:00
parent be8545d181 2e0704bb13
commit 53e4d2bfe5
790 changed files with 5278 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs
View File

@@ -361,7 +361,7 @@ public abstract class SharedEntityStorageSystem : EntitySystem
return false;
}
if (_container.IsEntityInContainer(target))
if (_container.IsEntityInContainer(target) && !_container.ContainsEntity(target, user)) // WD EDIT
{
if (_container.TryGetOuterContainer(target,Transform(target) ,out var container) &&
!HasComp<HandsComponent>(container.Owner))