From 7bf6dd9f15df333ad5abeb1b188704b640ee9a9e Mon Sep 17 00:00:00 2001 From: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Date: Tue, 1 Jul 2025 12:25:52 +0200 Subject: [PATCH] fix water coolers (#38681) --- Content.Shared/Storage/EntitySystems/BinSystem.cs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Content.Shared/Storage/EntitySystems/BinSystem.cs b/Content.Shared/Storage/EntitySystems/BinSystem.cs index 3b57dd8fea..9009df3753 100644 --- a/Content.Shared/Storage/EntitySystems/BinSystem.cs +++ b/Content.Shared/Storage/EntitySystems/BinSystem.cs @@ -67,12 +67,18 @@ public sealed class BinSystem : EntitySystem private void OnEntInserted(Entity ent, ref EntInsertedIntoContainerMessage args) { + if (args.Container.ID != ent.Comp.ContainerId) + return; + ent.Comp.Items.Add(args.Entity); } - private void OnEntRemoved(EntityUid uid, BinComponent component, EntRemovedFromContainerMessage args) + private void OnEntRemoved(Entity ent, ref EntRemovedFromContainerMessage args) { - component.Items.Remove(args.Entity); + if (args.Container.ID != ent.Comp.ContainerId) + return; + + ent.Comp.Items.Remove(args.Entity); } private void OnInteractHand(EntityUid uid, BinComponent component, InteractHandEvent args)