]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Fix not networking whitelist and blacklist in storage component (#28238)
authorDrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com>
Sat, 25 May 2024 20:07:37 +0000 (13:07 -0700)
committerGitHub <noreply@github.com>
Sat, 25 May 2024 20:07:37 +0000 (16:07 -0400)
Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs

index 778e2b2e74e93b0ee53cb02a58c3afd2cd8e3a1d..18a8f20afc7e6ad31aa6310bbff8a4118f74051c 100644 (file)
@@ -21,6 +21,7 @@ using Content.Shared.Stacks;
 using Content.Shared.Storage.Components;
 using Content.Shared.Timing;
 using Content.Shared.Verbs;
+using Content.Shared.Whitelist;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
@@ -151,7 +152,9 @@ public abstract class SharedStorageSystem : EntitySystem
             Grid = new List<Box2i>(component.Grid),
             MaxItemSize = component.MaxItemSize,
             StoredItems = storedItems,
-            SavedLocations = component.SavedLocations
+            SavedLocations = component.SavedLocations,
+            Whitelist = component.Whitelist,
+            Blacklist = component.Blacklist
         };
     }
 
@@ -163,6 +166,8 @@ public abstract class SharedStorageSystem : EntitySystem
         component.Grid.Clear();
         component.Grid.AddRange(state.Grid);
         component.MaxItemSize = state.MaxItemSize;
+        component.Whitelist = state.Whitelist;
+        component.Blacklist = state.Blacklist;
 
         component.StoredItems.Clear();
 
@@ -1490,5 +1495,9 @@ public abstract class SharedStorageSystem : EntitySystem
         public List<Box2i> Grid = new();
 
         public ProtoId<ItemSizePrototype>? MaxItemSize;
+
+        public EntityWhitelist? Whitelist;
+
+        public EntityWhitelist? Blacklist;
     }
 }