merge stable into master (#37055)

2025-04-30 02:42:06 +02:00 · 2025-04-30 02:42:06 +02:00 · 97d4e80685
parent 0ee4babc55 0e586e3fae
commit 97d4e80685
1 changed files with 1 additions and 0 deletions
--- a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
@ -347,6 +347,7 @@ public abstract class SharedStorageSystem : EntitySystem
        storage = null;

        if (!ContainerSystem.TryGetContainingContainer(itemEnt, out container) ||
+            container.ID != StorageComponent.ContainerId ||
            !TryComp(container.Owner, out storage) ||
            !_itemQuery.Resolve(itemEnt, ref itemEnt.Comp, false))
        {