From ff3145336deb292406d7041636cc67fac9a882d0 Mon Sep 17 00:00:00 2001 From: s809 <43530948+s809@users.noreply.github.com> Date: Sat, 20 Dec 2025 14:32:39 +0500 Subject: [PATCH] Revert "Run plugin messages on a DH thread" This reverts commit 280181c91e622db2b02b1a41706a7e867a2f96e4. --- .../core/api/internal/ClientApi.java | 26 +++---------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/core/src/main/java/com/seibel/distanthorizons/core/api/internal/ClientApi.java b/core/src/main/java/com/seibel/distanthorizons/core/api/internal/ClientApi.java index 96345b233..f1dba1805 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/api/internal/ClientApi.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/api/internal/ClientApi.java @@ -32,8 +32,6 @@ import com.seibel.distanthorizons.core.render.DhApiRenderProxy; import com.seibel.distanthorizons.core.render.renderer.*; import com.seibel.distanthorizons.core.util.TimerUtil; import com.seibel.distanthorizons.core.util.objects.Pair; -import com.seibel.distanthorizons.core.util.threading.PriorityTaskPicker; -import com.seibel.distanthorizons.core.util.threading.ThreadPoolUtil; import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper; import com.seibel.distanthorizons.coreapi.DependencyInjection.ApiEventInjector; import com.seibel.distanthorizons.core.config.Config; @@ -62,7 +60,6 @@ import java.lang.management.GarbageCollectorMXBean; import java.lang.management.ManagementFactory; import java.util.*; import java.util.concurrent.LinkedBlockingQueue; -import java.util.concurrent.RejectedExecutionException; /** * This holds the methods that should be called @@ -335,27 +332,10 @@ public class ClientApi */ public void pluginMessageReceived(@NotNull AbstractNetworkMessage message) { - PriorityTaskPicker.Executor executor = ThreadPoolUtil.getNetworkCompressionExecutor(); - if (executor == null) + NetworkSession networkSession = this.pluginChannelApi.networkSession; + if (networkSession != null) { - LOGGER.warn("warn"); - return; - } - - try - { - executor.runTask(() -> - { - NetworkSession networkSession = this.pluginChannelApi.networkSession; - if (networkSession != null) - { - networkSession.tryHandleMessage(message); - } - }); - } - catch (RejectedExecutionException e) - { - LOGGER.warn("Plugin message executor rejected"); + networkSession.tryHandleMessage(message); } }