Don't request blocks that are already requested

kaczy93 · Dec 21, 2023 · e5d6d6e · e5d6d6e
1 parent 6640bc9
commit e5d6d6e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/Client/CentrEDClient.cs b/Client/CentrEDClient.cs
@@ -22,6 +22,7 @@ public sealed class CentrEDClient : BaseCentrED, IDisposable
     public ushort X { get; private set; }
     public ushort Y { get; private set; }
     internal Stack<Packet> UndoStack = new();
+    internal List<BlockCoords> RequestedBlocks = new();
     public List<String> Clients { get; } = new();
     public bool Running;
     private string? _status;
@@ -129,10 +130,11 @@ public void InitLandscape(ushort width, ushort height)
     public void LoadBlocks(List<BlockCoords> blockCoords)
     {
         var filteredBlockCoords = blockCoords.FindAll
-            (b => !Landscape.BlockCache.Contains(Block.Id(b.X, b.Y)) && isValidX(b.X) && isValidY(b.Y));
+            (b => !Landscape.BlockCache.Contains(Block.Id(b.X, b.Y)) && !RequestedBlocks.Contains(b) && isValidX(b.X) && isValidY(b.Y));
         if (filteredBlockCoords.Count <= 0)
             return;
         Send(new RequestBlocksPacket(filteredBlockCoords));
+        RequestedBlocks.AddRange(filteredBlockCoords);
     }
 
     public bool isValidX(int x)

diff --git a/Client/Map/ClientLandscapePacketHandlers.cs b/Client/Map/ClientLandscapePacketHandlers.cs
@@ -25,6 +25,7 @@ private void OnBlockPacket(BinaryReader reader, NetState<CentrEDClient> ns)
             var block = new Block(landBlock, staticBlock);
             if(BlockCache.Add(Block.Id(block), block))
                 ns.Parent.OnBlockLoaded(block);
+            ns.Parent.RequestedBlocks.Remove(coords);
         }
     }