a

metalgearsloth · Nov 19, 2023 · cb8cb9b · cb8cb9b
1 parent 412a626
commit cb8cb9b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/Robust.Server/GameStates/PvsSystem.cs b/Robust.Server/GameStates/PvsSystem.cs
@@ -839,7 +839,8 @@ internal GameTick CalculateEntityStates(ICommonSession session,
             {
                 (uid, meta) = GetEntityData(netEntity);
                 changed = _compChangePool.Get();
-                entityStates.Add(GetFullEntityState(session, uid, meta, changed));
+                var netComps = _netCompPool.Get();
+                entityStates.Add(GetFullEntityState(session, uid, meta, netComps, changed));
                 continue;
             }
 
@@ -1294,10 +1295,14 @@ private EntityState GetEntityState(ICommonSession? player, EntityUid entityUid,
     /// <summary>
     ///     Variant of <see cref="GetEntityState"/> that includes all entity data, including data that can be inferred implicitly from the entity prototype.
     /// </summary>
-    private EntityState GetFullEntityState(ICommonSession player, EntityUid entityUid, MetaDataComponent meta, List<ComponentChange> changed)
+    private EntityState GetFullEntityState(
+        ICommonSession player,
+        EntityUid entityUid,
+        MetaDataComponent meta,
+        HashSet<ushort> netComps,
+        List<ComponentChange> changed)
     {
         var bus = EntityManager.EventBus;
-        var netComps = _netCompPool.Get();
 
         foreach (var (netId, component) in meta.NetComponents)
         {

diff --git a/Robust.Server/GameStates/ServerGameStateManager.cs b/Robust.Server/GameStates/ServerGameStateManager.cs
@@ -109,7 +109,7 @@ private void PrintPvsAckInfo(IConsoleShell shell, string argstr, string[] args)
                 .Select(x => x.Key)
                 .Select(x => $"{x.Name} ({_entityManager.ToPrettyString(x.AttachedEntity)})");
 
-            var deletedNents = new List<NetEntity>();
+            var deletedNents = _nentListPool.Get();
             _pvs.GetDeletedEntities(GameTick.First, deletedNents);
 
             shell.WriteLine($@"Current tick: {_gameTiming.CurTick}
@@ -118,6 +118,8 @@ private void PrintPvsAckInfo(IConsoleShell shell, string argstr, string[] args)
 Actual oldest: {ack}
 Oldest acked clients: {string.Join(", ", players)}
 ");
+
+            _nentListPool.Return(deletedNents);
         }
 
         private void ResetParallelism()