From f8ac90e4b0d2e572bd951eb1829b21574850b16b Mon Sep 17 00:00:00 2001 From: PainOchoco Date: Thu, 5 May 2022 13:26:21 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fixed=20DiscordSRV=20handling?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../net/laboulangerie/townychat/TownyChat.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/net/laboulangerie/townychat/TownyChat.java b/src/main/java/net/laboulangerie/townychat/TownyChat.java index a1407f7..62c5df2 100644 --- a/src/main/java/net/laboulangerie/townychat/TownyChat.java +++ b/src/main/java/net/laboulangerie/townychat/TownyChat.java @@ -78,19 +78,21 @@ public void onEnable() { this.registerShortcutCommands(); - DiscordHook discordHook = new DiscordHook(); - this.listeners = new ArrayList<>(Arrays.asList( new TownyChatListener(), new MiscListener(), - new TownyListener(), - discordHook)); - - this.registerListeners(); + new TownyListener())); // Is DiscordSRV enabled? It's a softdepend if (getServer().getPluginManager().getPlugin("DiscordSRV") != null) { + DiscordHook discordHook = new DiscordHook(); + + this.listeners.add(discordHook); + this.registerListeners(); DiscordSRV.getPlugin().getPluginHooks().add(discordHook); + getLogger().info("Hooked to DiscordSRV!"); + } else { + this.registerListeners(); } getLogger().info("Plugin started");