Predict StorageComponent (#19682)

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

View File

@@ -1,4 +1,4 @@
using Content.Server.Storage.Components;
using Content.Shared.Storage;
using Content.Shared.Storage.Components;
using Content.Shared.Storage.EntitySystems;
using JetBrains.Annotations;
@@ -11,16 +11,16 @@ namespace Content.Server.Storage.EntitySystems
{
protected override int? GetCount(ContainerModifiedMessage msg, ItemCounterComponent itemCounter)
{
if (!EntityManager.TryGetComponent(msg.Container.Owner, out ServerStorageComponent? component)
|| component.StoredEntities == null)
if (!EntityManager.TryGetComponent(msg.Container.Owner, out StorageComponent? component))
{
return null;
}
var count = 0;
foreach (var entity in component.StoredEntities)
foreach (var entity in component.Container.ContainedEntities)
{
if (itemCounter.Count.IsValid(entity)) count++;
if (itemCounter.Count.IsValid(entity))
count++;
}
return count;