From 1f60357a957a2f8427bb5e88da8ec4d54b37fa23 Mon Sep 17 00:00:00 2001 From: tom lee Date: Sat, 5 Feb 2022 14:36:24 +0800 Subject: [PATCH] Update core --- .../BatchGenerationEnvironment.java | 15 +++++++++------ core | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/BatchGenerationEnvironment.java b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/BatchGenerationEnvironment.java index 5a2cbdae7..33215122b 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/BatchGenerationEnvironment.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/BatchGenerationEnvironment.java @@ -79,7 +79,7 @@ Lod Generation: 0.269023348s */ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnvionmentWrapper { - public static final boolean ENABLE_PERF_LOGGING = true; + public static final boolean ENABLE_PERF_LOGGING = false; public static final boolean ENABLE_EVENT_LOGGING = false; public static final boolean ENABLE_LOAD_EVENT_LOGGING = false; // TODO: Make actual proper support for StarLight @@ -460,14 +460,17 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv } @Override - public void stop() { + public void stop(boolean blocking) { ClientApi.LOGGER.info("Batch Chunk Generator shutting down..."); executors.shutdownNow(); - try { - if (!executors.awaitTermination(10, TimeUnit.SECONDS)) { - ClientApi.LOGGER.error("Batch Chunk Generator shutdown failed! Ignoring child threads..."); + if (blocking) { + try { + if (!executors.awaitTermination(10, TimeUnit.SECONDS)) { + ClientApi.LOGGER.error("Batch Chunk Generator shutdown failed! Ignoring child threads..."); + } + } catch (InterruptedException e) { + ClientApi.LOGGER.error("Batch Chunk Generator shutdown failed! Ignoring child threads...", e); } - } catch (InterruptedException e) { } } } diff --git a/core b/core index 068622895..aff7e90e3 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 068622895fab70dd7b7eef17c51c0ea753b0889b +Subproject commit aff7e90e37560a7f270ea444f1e08f35b729e540