From beae6e6ce0d55ad8ce310307e2d3dde95ca9ea1f Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Sat, 12 Sep 2020 01:54:45 +0200 Subject: [PATCH] Config and such --- .../discordplugin/DiscordPlugin.java | 1 + .../mcchat/MinecraftChatModule.java | 18 +++++++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java b/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java index f99bcbd..7d60a22 100755 --- a/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java +++ b/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java @@ -231,6 +231,7 @@ public class DiscordPlugin extends ButtonPlugin { } else { dc.updatePresence(Presence.online(Activity.playing("testing"))).subscribe(); } + getLogger().info("Loaded!"); } catch (Exception e) { TBMCCoreAPI.SendException("An error occurred while enabling DiscordPlugin!", e); } diff --git a/src/main/java/buttondevteam/discordplugin/mcchat/MinecraftChatModule.java b/src/main/java/buttondevteam/discordplugin/mcchat/MinecraftChatModule.java index 5313bfc..de4dfdd 100644 --- a/src/main/java/buttondevteam/discordplugin/mcchat/MinecraftChatModule.java +++ b/src/main/java/buttondevteam/discordplugin/mcchat/MinecraftChatModule.java @@ -117,6 +117,7 @@ public class MinecraftChatModule extends Component { /** * Whether players logged on from Discord should be recognised by other plugins. Some plugins might break if it's turned off. + * But it's really hacky. */ public final ConfigData addFakePlayersToBukkit = getConfig().getData("addFakePlayersToBukkit", true); @@ -164,18 +165,21 @@ public class MinecraftChatModule extends Component { //e.printStackTrace(); } - try { //TODO: Config ^^ - serverWatcher = new ServerWatcher(); - serverWatcher.enableDisable(true); - } catch (Exception e) { - TBMCCoreAPI.SendException("Failed to hack the server (object)!", e); + if (addFakePlayersToBukkit.get()) { + try { + serverWatcher = new ServerWatcher(); + serverWatcher.enableDisable(true); + } catch (Exception e) { + TBMCCoreAPI.SendException("Failed to hack the server (object)!", e); + } } } @Override protected void disable() { - try { - serverWatcher.enableDisable(false); + try { //If it's not enabled it won't do anything + if (serverWatcher != null) + serverWatcher.enableDisable(false); } catch (Exception e) { TBMCCoreAPI.SendException("Failed to restore the server object!", e); }