From 959dd4e718d12fb4e483bb9c6fe29966a0ef2e1b Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sat, 22 Jul 2023 12:34:20 -0500 Subject: [PATCH] Add a config for world gen timeout --- .../wrappers/worldGeneration/BatchGenerationEnvironment.java | 4 +--- coreSubProjects | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/BatchGenerationEnvironment.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/BatchGenerationEnvironment.java index b0e334b6b..974122e6c 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/BatchGenerationEnvironment.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/BatchGenerationEnvironment.java @@ -158,8 +158,6 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv } } - public static final int TIMEOUT_SECONDS = 60; - private final IDhServerLevel serverlevel; //=================Generation Step=================== @@ -335,7 +333,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv iter.remove(); } - else if (event.hasTimeout(TIMEOUT_SECONDS, TimeUnit.SECONDS)) + else if (event.hasTimeout(Config.Client.Advanced.WorldGenerator.worldGenerationTimeoutLengthInSeconds.get(), TimeUnit.SECONDS)) { EVENT_LOGGER.error("Batching World Generator: " + event + " timed out and terminated!"); EVENT_LOGGER.info("Dump PrefEvent: " + event.timer); diff --git a/coreSubProjects b/coreSubProjects index 4df1bd10a..860374fd1 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit 4df1bd10a9b17902522646a30d8816a08e1518ee +Subproject commit 860374fd1bb35eb3f8770d6f7d0d30ad80f2c01a