wisplite/distant-horizons-core-sharded
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix world generator not being started corrected in DhClientServerLevel

Browse Source
This commit is contained in:
James Seibel
2023-04-08 10:19:22 -05:00
parent 4d9264321c
commit b013d93908
1 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/seibel/lod/core/level/DhClientServerLevel.java
+19 -22
View File
@@ -96,33 +96,30 @@ public class DhClientServerLevel extends AbstractDhClientLevel implements IDhCli
{
WorldGenState worldGenState = this.worldGenStateRef.get();
// if the world generator config changes, add/remove the world generator
if (this.worldGeneratorEnabledConfig.pollNewValue())
// create/destroy the world generator as necessary
boolean shouldDoWorldGen = this.worldGeneratorEnabledConfig.get() && this.ClientRenderStateRef.get() != null;
if (shouldDoWorldGen && worldGenState == null)
{
boolean shouldDoWorldGen = this.worldGeneratorEnabledConfig.get() && this.ClientRenderStateRef.get() != null;
if (shouldDoWorldGen && worldGenState == null)
// create the new world generator
WorldGenState newWgs = new WorldGenState(this);
if (!this.worldGenStateRef.compareAndSet(null, newWgs))
{
// create the new world generator
WorldGenState newWgs = new WorldGenState(this);
if (!this.worldGenStateRef.compareAndSet(null, newWgs))
LOGGER.warn("Failed to start world gen due to concurrency");
newWgs.closeAsync(false);
}
}
else if (!shouldDoWorldGen && worldGenState != null)
{
// shut down the world generator
while (!this.worldGenStateRef.compareAndSet(worldGenState, null))
{
worldGenState = this.worldGenStateRef.get();
if (worldGenState == null)
{
LOGGER.warn("Failed to start world gen due to concurrency");
newWgs.closeAsync(false);
return;
}
}
else if (!shouldDoWorldGen && worldGenState != null)
{
// shut down the world generator
while (!this.worldGenStateRef.compareAndSet(worldGenState, null))
{
worldGenState = this.worldGenStateRef.get();
if (worldGenState == null)
{
return;
}
}
worldGenState.closeAsync(true).join(); //TODO: Make it async.
}
worldGenState.closeAsync(true).join(); //TODO: Make it async.
}