From dbc1e2a664ac3b9ca03d6ef7eb0b4803cc2f5cd7 Mon Sep 17 00:00:00 2001 From: fullwall Date: Sat, 13 Jan 2024 23:38:23 +0800 Subject: [PATCH] Use the common forkjoin pool instead of a dedicated thread --- src/main/java/net/citizensnpcs/api/LocationLookup.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/net/citizensnpcs/api/LocationLookup.java b/src/main/java/net/citizensnpcs/api/LocationLookup.java index 0a45b22d..426615ba 100644 --- a/src/main/java/net/citizensnpcs/api/LocationLookup.java +++ b/src/main/java/net/citizensnpcs/api/LocationLookup.java @@ -6,8 +6,7 @@ import java.util.UUID; import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; +import java.util.concurrent.ForkJoinPool; import java.util.concurrent.Future; import java.util.function.BiConsumer; @@ -28,7 +27,6 @@ import net.citizensnpcs.api.npc.NPC; public class LocationLookup extends BukkitRunnable { - private final ExecutorService async = Executors.newSingleThreadExecutor(); private final Map> metadata = Maps.newHashMap(); private Future>> npcFuture = null; private Map> npcWorlds = Maps.newHashMap(); @@ -123,7 +121,7 @@ public void run() { uid -> Lists.newArrayList()); nodes.add(new TreeFactory.Node<>(new double[] { loc.getX(), loc.getY(), loc.getZ() }, npc)); } - npcFuture = async.submit(new TreeFactory<>(map)); + npcFuture = ForkJoinPool.commonPool().submit(new TreeFactory<>(map)); } if (playerFuture != null && playerFuture.isDone()) { try { @@ -145,7 +143,7 @@ public void run() { return new TreeFactory.Node<>(new double[] { loc.getX(), loc.getY(), loc.getZ() }, p); })); } - playerFuture = async.submit(new TreeFactory<>(map)); + playerFuture = ForkJoinPool.commonPool().submit(new TreeFactory<>(map)); } }