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

remove timeout from chunk IoWorker in world gen

Browse Source
This commit is contained in:
James Seibel
2024-12-14 23:35:29 -06:00
parent 7d6aecc4c7
commit fc3c944e3d
1 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/BatchGenerationEnvironment.java
+1 -13
View File
@@ -629,13 +629,9 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
return CompletableFuture.completedFuture(ioWorker.load(chunkPos));
#else
// timeout should prevent locking up the thread if the ioWorker dies or has issues
int maxGetTimeInSec = 60 * 3; // 3 minutes (same as old timeout config default)
// when running in vanilla MC, loadAsync will run on this same thread due to a vanilla threading mixin,
// however if a mod like C2ME is installed this will run on a C2ME thread instead
return ioWorker.loadAsync(chunkPos)
.orTimeout(maxGetTimeInSec, TimeUnit.SECONDS)
.thenApply(optional -> optional.orElse(null))
.exceptionally((throwable) ->
{
@@ -646,15 +642,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
actualThrowable = completionException.getCause();
}
if (actualThrowable instanceof TimeoutException)
{
LOAD_LOGGER.warn("Unable to get chunk at pos ["+chunkPos+"] after ["+maxGetTimeInSec+"] milliseconds.", actualThrowable);
}
else
{
LOAD_LOGGER.warn("DistantHorizons: Couldn't load or make chunk ["+chunkPos+"], error: ["+actualThrowable.getMessage()+"].", actualThrowable);
}
LOAD_LOGGER.warn("DistantHorizons: Couldn't load or make chunk ["+chunkPos+"], error: ["+actualThrowable.getMessage()+"].", actualThrowable);
return null;
});
#endif