diff --git a/PlanPluginBridge/PlanPluginBridge-4.5.0.jar b/PlanPluginBridge/PlanPluginBridge-4.5.0.jar index 7cf5a7621..a7cfc316f 100644 Binary files a/PlanPluginBridge/PlanPluginBridge-4.5.0.jar and b/PlanPluginBridge/PlanPluginBridge-4.5.0.jar differ diff --git a/PlanPluginBridge/pom.xml b/PlanPluginBridge/pom.xml index addb35946..c64c72f15 100644 --- a/PlanPluginBridge/pom.xml +++ b/PlanPluginBridge/pom.xml @@ -87,7 +87,7 @@ discordsrv-repo - https://ci.scarsz.me/plugin/repository/everything/ + https://nexus.scarsz.me/content/groups/public/ @@ -183,8 +183,8 @@ provided - github.scarsz.discordsrv - DiscordSRV + com.discordsrv + discordsrv 1.16.4 provided diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/Hook.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/Hook.java index 1e3a29573..091e821b3 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/Hook.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/Hook.java @@ -23,7 +23,7 @@ public abstract class Hook { * * @param pluginClass Class path string of the plugin's main JavaPlugin class. */ - protected Hook(String pluginClass) { + public Hook(String pluginClass) { enabled = Check.isAvailable(pluginClass); } @@ -32,7 +32,7 @@ public abstract class Hook { /** * Constructor to set enabled to false. */ - protected Hook() { + public Hook() { enabled = false; } } diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/sponge/SpongeEconomyHook.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/sponge/SpongeEconomyHook.java index d56bba94c..30ca1fa5e 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/sponge/SpongeEconomyHook.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/sponge/SpongeEconomyHook.java @@ -1,6 +1,8 @@ package com.djrapitops.pluginbridge.plan.sponge; import com.djrapitops.plan.data.plugin.HookHandler; +import com.djrapitops.plugin.logging.L; +import com.djrapitops.plugin.logging.error.ErrorHandler; import com.djrapitops.pluginbridge.plan.Hook; import org.spongepowered.api.Sponge; import org.spongepowered.api.service.economy.EconomyService; @@ -19,7 +21,9 @@ import java.util.Optional; public class SpongeEconomyHook extends Hook { @Inject - public SpongeEconomyHook() { + public SpongeEconomyHook( + ErrorHandler errorHandler + ) { super("org.spongepowered.api.Sponge"); try { @@ -27,6 +31,8 @@ public class SpongeEconomyHook extends Hook { enabled = serviceOpt.isPresent(); } catch(NoClassDefFoundError e) { enabled = false; + } catch (IllegalStateException e) { + errorHandler.log(L.WARN, this.getClass(), e); } }