From 313e75cc9c9de016724761ba68fefe2985a7e0f9 Mon Sep 17 00:00:00 2001 From: Rsl1122 Date: Sun, 29 Oct 2017 12:31:39 +0200 Subject: [PATCH] Fixed LiteBans detection #367 --- Plan/pom.xml | 4 ++-- Plan/src/main/resources/bungee.yml | 2 +- Plan/src/main/resources/plugin.yml | 2 +- PlanPluginBridge/pom.xml | 2 +- .../main/java/com/djrapitops/pluginbridge/plan/Bridge.java | 7 ++++++- .../main/java/com/djrapitops/pluginbridge/plan/Hook.java | 7 ++++++- .../pluginbridge/plan/litebans/LiteBansHook.java | 2 +- 7 files changed, 18 insertions(+), 8 deletions(-) diff --git a/Plan/pom.xml b/Plan/pom.xml index a5e086d4f..0b8cdbdd7 100644 --- a/Plan/pom.xml +++ b/Plan/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.djrapitops Plan - 4.0.0 + 4.0.3 jar @@ -70,7 +70,7 @@ com.djrapitops PlanPluginBridge - 4.0.0 + 4.0.3 compile diff --git a/Plan/src/main/resources/bungee.yml b/Plan/src/main/resources/bungee.yml index 4dce77009..c3700fd37 100644 --- a/Plan/src/main/resources/bungee.yml +++ b/Plan/src/main/resources/bungee.yml @@ -1,4 +1,4 @@ name: Plan author: Rsl1122 main: main.java.com.djrapitops.plan.PlanBungee -version: 4.0.2 \ No newline at end of file +version: 4.0.3 \ No newline at end of file diff --git a/Plan/src/main/resources/plugin.yml b/Plan/src/main/resources/plugin.yml index ebfec80e8..2be3cb850 100644 --- a/Plan/src/main/resources/plugin.yml +++ b/Plan/src/main/resources/plugin.yml @@ -1,7 +1,7 @@ name: Plan author: Rsl1122 main: main.java.com.djrapitops.plan.Plan -version: 4.0.2 +version: 4.0.3 softdepend: - OnTime - EssentialsX diff --git a/PlanPluginBridge/pom.xml b/PlanPluginBridge/pom.xml index f8d9a382a..8ca2327c6 100644 --- a/PlanPluginBridge/pom.xml +++ b/PlanPluginBridge/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.djrapitops PlanPluginBridge - 4.0.0 + 4.0.3 jar diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/Bridge.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/Bridge.java index 356c31735..00741cd4c 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/Bridge.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/Bridge.java @@ -13,6 +13,8 @@ import com.djrapitops.pluginbridge.plan.superbvote.SuperbVoteHook; import com.djrapitops.pluginbridge.plan.towny.TownyHook; import com.djrapitops.pluginbridge.plan.vault.VaultHook; import com.djrapitops.pluginbridge.plan.viaversion.ViaVersionHook; +import main.java.com.djrapitops.plan.Log; +import main.java.com.djrapitops.plan.Settings; import main.java.com.djrapitops.plan.data.additional.HookHandler; /** @@ -56,7 +58,10 @@ public class Bridge { for (Hook hook : hooks) { try { hook.hook(); - } catch (Exception | NoClassDefFoundError ignore) { + } catch (Exception | NoClassDefFoundError e) { + if (Settings.DEV_MODE.isTrue()) { + Log.toLog("PluginBridge", e); + } } } } 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 ed05e7351..6eb17d5d8 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/Hook.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/Hook.java @@ -21,6 +21,10 @@ public abstract class Hook { protected HookHandler hookHandler; + private Hook() { + throw new IllegalStateException(); + } + /** * Class constructor. *

@@ -45,8 +49,9 @@ public abstract class Hook { /** * Constructor to set enabled to false. */ - public Hook() { + public Hook(HookHandler hookHandler) { enabled = false; + this.hookHandler = hookHandler; } protected void addPluginDataSource(PluginData pluginData) { diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/litebans/LiteBansHook.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/litebans/LiteBansHook.java index 5e954d5eb..8d59d1b36 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/litebans/LiteBansHook.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/litebans/LiteBansHook.java @@ -25,7 +25,7 @@ public class LiteBansHook extends Hook { */ @SuppressWarnings("ResultOfMethodCallIgnored") public LiteBansHook(HookHandler hookH) { - super(); + super(hookH); try { Database.get(); enabled = true;