]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
fix water coolers (#38681)
authorslarticodefast <161409025+slarticodefast@users.noreply.github.com>
Tue, 1 Jul 2025 10:25:52 +0000 (12:25 +0200)
committerGitHub <noreply@github.com>
Tue, 1 Jul 2025 10:25:52 +0000 (03:25 -0700)
Content.Shared/Storage/EntitySystems/BinSystem.cs

index 3b57dd8feaf2d5d79868ae0ce776a03959705c67..9009df37533a83a3f5ae825324bfd6d66ab41a4d 100644 (file)
@@ -67,12 +67,18 @@ public sealed class BinSystem : EntitySystem
 
     private void OnEntInserted(Entity<BinComponent> 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<BinComponent> 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)