Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

caninsert entitystorage tweaks (#20589)

Browse Source
This commit is contained in:
Nemanja
2023-09-28 23:55:29 -04:00
committed by GitHub
parent d664c906ad
commit 90605212fc
5 changed files with 41 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Content.Server/StationEvents/Events/RandomEntityStorageSpawnRule.cs
View File

@@ -2,6 +2,7 @@ using Content.Server.GameTicking.Rules.Components;
using Content.Server.StationEvents.Components;
using Content.Server.Storage.Components;
using Content.Server.Storage.EntitySystems;
using Robust.Shared.Map;
using Robust.Shared.Random;
namespace Content.Server.StationEvents.Events;
@@ -17,7 +18,8 @@ public sealed class RandomEntityStorageSpawnRule : StationEventSystem<RandomEnti
if (!TryGetRandomStation(out var station))
return;
var validLockers = new List<(EntityUid, EntityStorageComponent, TransformComponent)>();
var validLockers = new List<(EntityUid, EntityStorageComponent)>();
var spawn = Spawn(comp.Prototype, MapCoordinates.Nullspace);
var query = EntityQueryEnumerator<EntityStorageComponent, TransformComponent>();
while (query.MoveNext(out var ent, out var storage, out var xform))
@@ -25,17 +27,19 @@ public sealed class RandomEntityStorageSpawnRule : StationEventSystem<RandomEnti
if (StationSystem.GetOwningStation(ent, xform) != station)
continue;
if (!_entityStorage.CanInsert(ent, storage) || storage.Open)
if (!_entityStorage.CanInsert(spawn, ent, storage))
continue;
validLockers.Add((ent, storage, xform));
validLockers.Add((ent, storage));
}
if (validLockers.Count == 0)
{
Del(spawn);
return;
}
var (locker, storageComp, xformComp) = RobustRandom.Pick(validLockers);
var spawn = Spawn(comp.Prototype, xformComp.Coordinates);
var (locker, storageComp) = RobustRandom.Pick(validLockers);
if (!_entityStorage.Insert(spawn, locker, storageComp))
{
Del(spawn);