From 9f3de07bd857ddf9265cf3c91178787dd4ec686e Mon Sep 17 00:00:00 2001 From: James Seibel Date: Tue, 18 Jun 2024 07:12:01 -0500 Subject: [PATCH] Increase default world gen timeout to 3 minutes (from 60 sec) --- .../wrappers/worldGeneration/BatchGenerationEnvironment.java | 2 +- coreSubProjects | 2 +- 2 files changed, 2 insertions(+), 2 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 a3cf7bc3e..b7a46b875 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 @@ -346,7 +346,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv } 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.error("Batching World Generator: " + event + " timed out and terminated! Please lower your CPU load."); EVENT_LOGGER.info("Dump PrefEvent: " + event.timer); try { diff --git a/coreSubProjects b/coreSubProjects index 7f50de17c..0d16c037f 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit 7f50de17c03a0e0cf4ac25fb1de62129adfdbab1 +Subproject commit 0d16c037f50e3e03d4f54ca1046e6f34c96d48a5