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

Fix decal state exceptions (#13075)

Browse Source
This commit is contained in:
Leon Friedrich
2022-12-19 09:44:14 +13:00
committed by GitHub
parent b0456d62f8
commit decce17e94
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Content.Client/Decals/DecalSystem.cs
View File

@@ -100,9 +100,11 @@ namespace Content.Client.Decals
} }
} }
RemoveChunks(gridUid, gridComp, removedChunks); if (removedChunks.Count > 0)
UpdateChunks(gridUid, gridComp, state.Chunks); RemoveChunks(gridUid, gridComp, removedChunks);
return;
if (state.Chunks.Count > 0)
UpdateChunks(gridUid, gridComp, state.Chunks);
} }
private void OnChunkUpdate(DecalChunkUpdateEvent ev) private void OnChunkUpdate(DecalChunkUpdateEvent ev)
@@ -138,9 +140,14 @@ namespace Content.Client.Decals
private void UpdateChunks(EntityUid gridId, DecalGridComponent gridComp, Dictionary<Vector2i, DecalChunk> updatedGridChunks) private void UpdateChunks(EntityUid gridId, DecalGridComponent gridComp, Dictionary<Vector2i, DecalChunk> updatedGridChunks)
{ {
var chunkCollection = gridComp.ChunkCollection.ChunkCollection; var chunkCollection = gridComp.ChunkCollection.ChunkCollection;
var chunkIndex = ChunkIndex[gridId];
var renderIndex = DecalRenderIndex[gridId]; if (!ChunkIndex.TryGetValue(gridId, out var chunkIndex) ||
var zIndexIndex = _decalZIndexIndex[gridId]; !DecalRenderIndex.TryGetValue(gridId, out var renderIndex) ||
!_decalZIndexIndex.TryGetValue(gridId, out var zIndexIndex))
{
Logger.Error($"Grid missing from dictionaries while updating decal chunks for grid {ToPrettyString(gridId)}");
return;
}
// Update any existing data / remove decals we didn't receive data for. // Update any existing data / remove decals we didn't receive data for.
foreach (var (indices, newChunkData) in updatedGridChunks) foreach (var (indices, newChunkData) in updatedGridChunks)
@@ -173,7 +180,12 @@ namespace Content.Client.Decals
private void RemoveChunks(EntityUid gridId, DecalGridComponent gridComp, IEnumerable<Vector2i> chunks) private void RemoveChunks(EntityUid gridId, DecalGridComponent gridComp, IEnumerable<Vector2i> chunks)
{ {
var chunkCollection = gridComp.ChunkCollection.ChunkCollection; var chunkCollection = gridComp.ChunkCollection.ChunkCollection;
var chunkIndex = ChunkIndex[gridId];
if (!ChunkIndex.TryGetValue(gridId, out var chunkIndex))
{
Logger.Error($"Missing grid in ChunkIndex dictionary while removing chunks from grid {ToPrettyString(gridId)}");
return;
}
foreach (var index in chunks) foreach (var index in chunks)
{ {