Fix not networking whitelist and blacklist in storage component (#28238)
This commit is contained in:
@@ -21,6 +21,7 @@ using Content.Shared.Stacks;
|
|||||||
using Content.Shared.Storage.Components;
|
using Content.Shared.Storage.Components;
|
||||||
using Content.Shared.Timing;
|
using Content.Shared.Timing;
|
||||||
using Content.Shared.Verbs;
|
using Content.Shared.Verbs;
|
||||||
|
using Content.Shared.Whitelist;
|
||||||
using Robust.Shared.Audio.Systems;
|
using Robust.Shared.Audio.Systems;
|
||||||
using Robust.Shared.Containers;
|
using Robust.Shared.Containers;
|
||||||
using Robust.Shared.GameStates;
|
using Robust.Shared.GameStates;
|
||||||
@@ -151,7 +152,9 @@ public abstract class SharedStorageSystem : EntitySystem
|
|||||||
Grid = new List<Box2i>(component.Grid),
|
Grid = new List<Box2i>(component.Grid),
|
||||||
MaxItemSize = component.MaxItemSize,
|
MaxItemSize = component.MaxItemSize,
|
||||||
StoredItems = storedItems,
|
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.Clear();
|
||||||
component.Grid.AddRange(state.Grid);
|
component.Grid.AddRange(state.Grid);
|
||||||
component.MaxItemSize = state.MaxItemSize;
|
component.MaxItemSize = state.MaxItemSize;
|
||||||
|
component.Whitelist = state.Whitelist;
|
||||||
|
component.Blacklist = state.Blacklist;
|
||||||
|
|
||||||
component.StoredItems.Clear();
|
component.StoredItems.Clear();
|
||||||
|
|
||||||
@@ -1490,5 +1495,9 @@ public abstract class SharedStorageSystem : EntitySystem
|
|||||||
public List<Box2i> Grid = new();
|
public List<Box2i> Grid = new();
|
||||||
|
|
||||||
public ProtoId<ItemSizePrototype>? MaxItemSize;
|
public ProtoId<ItemSizePrototype>? MaxItemSize;
|
||||||
|
|
||||||
|
public EntityWhitelist? Whitelist;
|
||||||
|
|
||||||
|
public EntityWhitelist? Blacklist;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user