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

Predict StorageComponent (#19682)

Browse Source
This commit is contained in:
metalgearsloth
2023-09-11 21:20:46 +10:00
committed by GitHub
parent 99b77bc2d3
commit d5bd1c6f86
68 changed files with 1124 additions and 1121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Content.Shared/Storage/EntitySystems/DumpableSystem.cs
View File

@@ -1,5 +1,5 @@
using System.Linq;
using Content.Shared.Disposal;
using Content.Shared.Disposal.Components;
using Content.Shared.DoAfter;
using Content.Shared.Interaction;
using Content.Shared.Placeable;
@@ -49,7 +49,7 @@ public sealed class DumpableSystem : EntitySystem
if (!args.CanAccess || !args.CanInteract)
return;
if (!TryComp<SharedStorageComponent>(uid, out var storage) || storage.StoredEntities == null || storage.StoredEntities.Count == 0)
if (!TryComp<StorageComponent>(uid, out var storage) || !storage.Container.ContainedEntities.Any())
return;
AlternativeVerb verb = new()
@@ -69,7 +69,7 @@ public sealed class DumpableSystem : EntitySystem
if (!args.CanAccess || !args.CanInteract)
return;
if (!TryComp<SharedStorageComponent>(uid, out var storage) || storage.StoredEntities == null || storage.StoredEntities.Count == 0)
if (!TryComp<StorageComponent>(uid, out var storage) || !storage.Container.ContainedEntities.Any())
return;
if (_disposalUnitSystem.HasDisposals(args.Target))
@@ -103,10 +103,10 @@ public sealed class DumpableSystem : EntitySystem
public void StartDoAfter(EntityUid storageUid, EntityUid? targetUid, EntityUid userUid, DumpableComponent dumpable)
{
if (!TryComp<SharedStorageComponent>(storageUid, out var storage) || storage.StoredEntities == null)
if (!TryComp<StorageComponent>(storageUid, out var storage))
return;
float delay = storage.StoredEntities.Count * (float) dumpable.DelayPerItem.TotalSeconds * dumpable.Multiplier;
float delay = storage.Container.ContainedEntities.Count * (float) dumpable.DelayPerItem.TotalSeconds * dumpable.Multiplier;
_doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, userUid, delay, new DumpableDoAfterEvent(), storageUid, target: targetUid, used: storageUid)
{
@@ -118,11 +118,11 @@ public sealed class DumpableSystem : EntitySystem
private void OnDoAfter(EntityUid uid, DumpableComponent component, DoAfterEvent args)
{
if (args.Handled || args.Cancelled || !TryComp<SharedStorageComponent>(uid, out var storage) || storage.StoredEntities == null)
if (args.Handled || args.Cancelled || !TryComp<StorageComponent>(uid, out var storage))
return;
Queue<EntityUid> dumpQueue = new();
foreach (var entity in storage.StoredEntities)
foreach (var entity in storage.Container.ContainedEntities)
{
dumpQueue.Enqueue(entity);
}