tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix biome recursion (#17982)

Browse Source
This commit is contained in:
metalgearsloth
2023-07-12 14:26:19 +10:00
committed by GitHub
parent ab5287e546
commit e6d639b21b
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Content.Server/Parallax/BiomeSystem.cs
View File

@@ -417,7 +417,7 @@ public sealed partial class BiomeSystem : SharedBiomeSystem
var startNodeY = rand.Next(lower, upper + 1); var startNodeY = rand.Next(lower, upper + 1);
var startNode = new Vector2i(startNodeX, startNodeY); var startNode = new Vector2i(startNodeX, startNodeY);
frontier.Clear(); frontier.Clear();
frontier.Add(startNode); frontier.Add(startNode + chunk);
while (groupCount > 0 && frontier.Count > 0) while (groupCount > 0 && frontier.Count > 0)
{ {
@@ -434,40 +434,39 @@ public sealed partial class BiomeSystem : SharedBiomeSystem
continue; continue;
var neighbor = new Vector2i(x + node.X, y + node.Y); var neighbor = new Vector2i(x + node.X, y + node.Y);
var chunkOffset = neighbor - chunk;
// Check if it's inbounds. // Check if it's inbounds.
if (neighbor.X < lower || if (chunkOffset.X < lower ||
neighbor.Y < lower || chunkOffset.Y < lower ||
neighbor.X > upper || chunkOffset.X > upper ||
neighbor.Y > upper) chunkOffset.Y > upper)
{ {
continue; continue;
} }
if (!spawnSet.Add(neighbor))
continue;
frontier.Add(neighbor); frontier.Add(neighbor);
} }
} }
var actualNode = node + chunk;
if (!spawnSet.Add(actualNode))
continue;
// Check if it's a valid spawn, if so then use it. // Check if it's a valid spawn, if so then use it.
var enumerator = grid.GetAnchoredEntitiesEnumerator(actualNode); var enumerator = grid.GetAnchoredEntitiesEnumerator(node);
if (enumerator.MoveNext(out _)) if (enumerator.MoveNext(out _))
continue; continue;
// Check if mask matches. // Check if mask matches.
TryGetEntity(actualNode, component.Layers, noiseCopy, grid, out var proto); TryGetEntity(node, component.Layers, noiseCopy, grid, out var proto);
if (proto != layerProto.EntityMask) if (proto != layerProto.EntityMask)
{ {
continue; continue;
} }
var chunkOrigin = SharedMapSystem.GetChunkIndices(actualNode, ChunkSize) * ChunkSize; var chunkOrigin = SharedMapSystem.GetChunkIndices(node, ChunkSize) * ChunkSize;
if (!pending.TryGetValue(chunkOrigin, out var pendingMarkers)) if (!pending.TryGetValue(chunkOrigin, out var pendingMarkers))
{ {
@@ -482,7 +481,7 @@ public sealed partial class BiomeSystem : SharedBiomeSystem
} }
// Log.Info($"Added node at {actualNode} for chunk {chunkOrigin}"); // Log.Info($"Added node at {actualNode} for chunk {chunkOrigin}");
layerMarkers.Add(actualNode); layerMarkers.Add(node);
groupCount--; groupCount--;
} }
} }