From 787a053d983988b2901dc7c9da260a899a1930c4 Mon Sep 17 00:00:00 2001 From: Kqliber Date: Wed, 8 Jan 2025 18:21:43 +0000 Subject: [PATCH 1/2] fix for all expansions stop loading after an exception is thrown (#1094) --- .../expansion/manager/LocalExpansionManager.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/me/clip/placeholderapi/expansion/manager/LocalExpansionManager.java b/src/main/java/me/clip/placeholderapi/expansion/manager/LocalExpansionManager.java index 1584a5f..c5d720b 100644 --- a/src/main/java/me/clip/placeholderapi/expansion/manager/LocalExpansionManager.java +++ b/src/main/java/me/clip/placeholderapi/expansion/manager/LocalExpansionManager.java @@ -37,6 +37,7 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionException; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.locks.ReentrantLock; +import java.util.logging.Level; import java.util.stream.Collectors; import me.clip.placeholderapi.PlaceholderAPIPlugin; import me.clip.placeholderapi.events.ExpansionRegisterEvent; @@ -66,6 +67,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Unmodifiable; +import javax.swing.text.html.Option; + public final class LocalExpansionManager implements Listener { @NotNull @@ -440,7 +443,8 @@ public final class LocalExpansionManager implements Listener { Msg.severe("Failed to load expansion %s (is a dependency missing?)", e, file.getName()); return null; } catch (Exception e) { - throw new CompletionException(e.getMessage() + " (expansion file: " + file.getAbsolutePath() + ")", e); + plugin.getLogger().log(Level.SEVERE, "Failed to load expansion file: " + file.getAbsolutePath(), e); + return null; } }); } From ef22d564f3a6e5a9919419f8a64f1fe0e67e240e Mon Sep 17 00:00:00 2001 From: Kqliber Date: Wed, 8 Jan 2025 18:23:49 +0000 Subject: [PATCH 2/2] remove imports --- .../expansion/manager/LocalExpansionManager.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/java/me/clip/placeholderapi/expansion/manager/LocalExpansionManager.java b/src/main/java/me/clip/placeholderapi/expansion/manager/LocalExpansionManager.java index c5d720b..6128a64 100644 --- a/src/main/java/me/clip/placeholderapi/expansion/manager/LocalExpansionManager.java +++ b/src/main/java/me/clip/placeholderapi/expansion/manager/LocalExpansionManager.java @@ -34,7 +34,6 @@ import java.util.Objects; import java.util.Optional; import java.util.Set; import java.util.concurrent.CompletableFuture; -import java.util.concurrent.CompletionException; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.locks.ReentrantLock; import java.util.logging.Level; @@ -67,8 +66,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Unmodifiable; -import javax.swing.text.html.Option; - public final class LocalExpansionManager implements Listener { @NotNull