From 599f853f1903fb36d6bcf4414999af0f2c971769 Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Thu, 22 Dec 2016 21:17:24 +0100 Subject: [PATCH] Made it use the core's test detection --- .../java/buttondevteam/discordplugin/DiscordPlugin.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java b/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java index c5eb466..c0d94b5 100644 --- a/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java +++ b/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java @@ -47,7 +47,6 @@ public class DiscordPlugin extends JavaPlugin implements IListener { } else { lastannouncementtime = getConfig().getLong("lastannouncementtime"); lastseentime = getConfig().getLong("lastseentime"); - Test = getConfig().getBoolean("test", true); saveConfig(); } ClientBuilder cb = new ClientBuilder(); @@ -79,8 +78,6 @@ public class DiscordPlugin extends JavaPlugin implements IListener { public static IGuild mainServer; public static IGuild devServer; - public static boolean Test = true; - @Override public void handle(ReadyEvent event) { try { @@ -90,7 +87,7 @@ public class DiscordPlugin extends JavaPlugin implements IListener { devServer = event.getClient().getGuildByID("219529124321034241"); Thread.sleep(100); } while ((mainServer == null || devServer == null) && retryc++ < 10); - if (!Test) { + if (!TBMCCoreAPI.IsTestServer()) { botchannel = mainServer.getChannelByID("209720707188260864"); // bot annchannel = mainServer.getChannelByID("126795071927353344"); // announcements genchannel = mainServer.getChannelByID("125813020357165056"); // general @@ -211,7 +208,7 @@ public class DiscordPlugin extends JavaPlugin implements IListener { e2.printStackTrace(); } try { - return channel.sendMessage(Test && channel != chatchannel + return channel.sendMessage(TBMCCoreAPI.IsTestServer() && channel != chatchannel ? "*The following message is from a test server*\n" + message : message); } catch (RateLimitException e) { try {