Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix regions loading hack #375

Merged
merged 1 commit into from
Jun 16, 2023
Merged

Fix regions loading hack #375

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions Obsidian/WorldData/World.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -741,20 +741,14 @@ internal async Task GenerateWorldAsync(bool setWorldSpawn = false)

int regionPregenRange = (pregenerationRange >> Region.CubicRegionSizeShift) + 1;

Parallel.For(-regionPregenRange, regionPregenRange, async x =>
await Parallel.ForEachAsync(Enumerable.Range(-regionPregenRange, regionPregenRange * 2 + 1), async (x, _) =>
{
for (int z = -regionPregenRange; z < regionPregenRange; z++)
{
await LoadRegionAsync(x, z);
};
});

// I don't know why we still have null regions when we get here ¯\_(ツ)_/¯
while (Regions.Any(r => r.Value is null))
{
await Task.Delay(100);
}

for (int x = -pregenerationRange; x < pregenerationRange; x++)
{
for (int z = -pregenerationRange; z < pregenerationRange; z++)
Expand Down