tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't play storage fill sounds on mapinit (#10653)

Browse Source
This commit is contained in:
metalgearsloth
2022-08-18 12:34:52 +10:00
committed by GitHub
parent 1d875ec5b2
commit 2b916391ca
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Server/Storage/EntitySystems/StorageSystem.Fill.cs
View File

@@ -8,7 +8,6 @@ public sealed partial class StorageSystem
private void OnStorageFillMapInit(EntityUid uid, StorageFillComponent component, MapInitEvent args)
{
if (component.Contents.Count == 0) return;
if (!EntityManager.EntitySysManager.TryGetEntitySystem<EntityStorageSystem>(out var entityStorage)) return;
TryComp<ServerStorageComponent>(uid, out var serverStorageComp);
TryComp<EntityStorageComponent>(uid, out var entityStorageComp);
@@ -27,10 +26,10 @@ public sealed partial class StorageSystem
var ent = EntityManager.SpawnEntity(item, coordinates);
// handle depending on storage component, again this should be unified after ECS
if (entityStorageComp != null && entityStorage.Insert(ent, uid))
if (entityStorageComp != null && _entityStorage.Insert(ent, uid))
continue;
if (serverStorageComp != null && Insert(uid, ent, serverStorageComp))
if (serverStorageComp != null && Insert(uid, ent, serverStorageComp, false))
continue;
Logger.ErrorS("storage", $"Tried to StorageFill {item} inside {ToPrettyString(uid)} but can't.");