Decal fix (#21761)

- Don't send stale chunks for deleted grid as client just errors it anyway.
- Store some allocations in fields.

diff --git a/Content.Client/Decals/DecalSystem.cs b/Content.Client/Decals/DecalSystem.cs
index 66b30545dad1348237fdcdb6a4655e4a18af9852..be442ab8a0a2eac21571eb6b285097c657249812 100644 (file)
--- a/Content.Client/Decals/DecalSystem.cs
+++ b/Content.Client/Decals/DecalSystem.cs
@@ -15,6 +15,9 @@ namespace Content.Client.Decals
 
         private DecalOverlay _overlay = default!;
 
+        private HashSet<uint> _removedUids = new();
+        private readonly List<Vector2i> _removedChunks = new();
+
         public override void Initialize()
         {
             base.Initialize();
@@ -65,13 +68,14 @@ namespace Content.Client.Decals
                 return;
 
             // is this a delta or full state?
-            var removedChunks = new List<Vector2i>();
+            _removedChunks.Clear();
+
             if (!state.FullState)
             {
                 foreach (var key in gridComp.ChunkCollection.ChunkCollection.Keys)
                 {
                     if (!state.AllChunks!.Contains(key))
-                        removedChunks.Add(key);
+                        _removedChunks.Add(key);
                 }
             }
             else
@@ -79,12 +83,12 @@ namespace Content.Client.Decals
                 foreach (var key in gridComp.ChunkCollection.ChunkCollection.Keys)
                 {
                     if (!state.Chunks.ContainsKey(key))
-                        removedChunks.Add(key);
+                        _removedChunks.Add(key);
                 }
             }
 
-            if (removedChunks.Count > 0)
-                RemoveChunks(gridUid, gridComp, removedChunks);
+            if (_removedChunks.Count > 0)
+                RemoveChunks(gridUid, gridComp, _removedChunks);
 
             if (state.Chunks.Count > 0)
                 UpdateChunks(gridUid, gridComp, state.Chunks);
@@ -137,9 +141,10 @@ namespace Content.Client.Decals
             {
                 if (chunkCollection.TryGetValue(indices, out var chunk))
                 {
-                    var removedUids = new HashSet<uint>(chunk.Decals.Keys);
-                    removedUids.ExceptWith(newChunkData.Decals.Keys);
-                    foreach (var removedUid in removedUids)
+                    _removedUids.Clear();
+                    _removedUids.UnionWith(chunk.Decals.Keys);
+                    _removedUids.ExceptWith(newChunkData.Decals.Keys);
+                    foreach (var removedUid in _removedUids)
                     {
                         OnDecalRemoved(gridId, removedUid, gridComp, indices, chunk);
                         gridComp.DecalIndex.Remove(removedUid);
@@ -166,7 +171,8 @@ namespace Content.Client.Decals
 
             foreach (var index in chunks)
             {
-                if (!chunkCollection.TryGetValue(index, out var chunk)) continue;
+                if (!chunkCollection.TryGetValue(index, out var chunk))
+                    continue;
 
                 foreach (var decalId  in chunk.Decals.Keys)
                 {

diff --git a/Content.Server/Decals/DecalSystem.cs b/Content.Server/Decals/DecalSystem.cs
index ce2e0711e74a1a940edb1998adfc237d138610ff..3a3ab0bbcd8e0a8d1fbb67bea00146fb1b70d3b1 100644 (file)
--- a/Content.Server/Decals/DecalSystem.cs
+++ b/Content.Server/Decals/DecalSystem.cs
@@ -454,9 +454,7 @@ namespace Content.Server.Decals
                     previouslySent.Remove(netGrid);
 
                     // Was the grid deleted?
-                    if (!TryGetEntity(netGrid, out var gridId) || !MapManager.IsGrid(gridId.Value))
-                        staleChunks[netGrid] = oldIndices;
-                    else
+                    if (TryGetEntity(netGrid, out var gridId) && !MapManager.IsGrid(gridId.Value))
                     {
                         // If grid was deleted then don't worry about telling the client to delete the chunk.
                         oldIndices.Clear();