From 416f110ca6c73c3457d1d416f75892f60aa57341 Mon Sep 17 00:00:00 2001 From: alisolarflare Date: Wed, 23 Nov 2016 11:44:08 -0500 Subject: [PATCH] Revert "Added bot-room channel" This reverts commit 0ba98036446c9638a63a1e43198b168061507263. --- .../java/buttondevteam/discordplugin/DiscordPlugin.java | 9 +++------ .../discordplugin/listeners/DebugMessageListener.java | 2 +- .../discordplugin/listeners/ExceptionListener.java | 2 +- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java b/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java index bfd147c..86482ae 100644 --- a/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java +++ b/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java @@ -75,7 +75,6 @@ public class DiscordPlugin extends JavaPlugin implements IListener { public static IChannel annchannel; public static IChannel genchannel; public static IChannel chatchannel; - public static IChannel botroomchannel; public static boolean Test = true; @@ -94,13 +93,11 @@ public class DiscordPlugin extends JavaPlugin implements IListener { annchannel = mainServer.getChannelByID("126795071927353344"); // announcements genchannel = mainServer.getChannelByID("125813020357165056"); // general chatchannel = mainServer.getChannelByID("249663564057411596"); // minecraft_chat - botroomchannel = devServer.getChannelByID("239519012529111040");//bot-room dc.changeStatus(Status.game("on TBMC")); } else { - botchannel = devServer.getChannelByID("239519012529111040"); // bot-room - annchannel = devServer.getChannelByID("239519012529111040"); // bot-room - genchannel = devServer.getChannelByID("239519012529111040"); // bot-room - botroomchannel = devServer.getChannelByID("239519012529111040");//bot-room + botchannel = devServer.getChannelByID("239519012529111040"); // bottest + annchannel = devServer.getChannelByID("239519012529111040"); // bottest + genchannel = devServer.getChannelByID("239519012529111040"); // bottest chatchannel = devServer.getChannelByID("248185455508455424"); // minecraft_chat_test dc.changeStatus(Status.game("testing")); } diff --git a/src/main/java/buttondevteam/discordplugin/listeners/DebugMessageListener.java b/src/main/java/buttondevteam/discordplugin/listeners/DebugMessageListener.java index a19c09c..4f4b692 100644 --- a/src/main/java/buttondevteam/discordplugin/listeners/DebugMessageListener.java +++ b/src/main/java/buttondevteam/discordplugin/listeners/DebugMessageListener.java @@ -20,7 +20,7 @@ public class DebugMessageListener implements Listener{ message = message.substring(0, 2000); sb.append(message).append("\n"); sb.append("```"); - DiscordPlugin.sendMessageToChannel(DiscordPlugin.botroomchannel, sb.toString()); + DiscordPlugin.sendMessageToChannel(DiscordPlugin.botchannel, sb.toString()); } catch (Exception ex) { ex.printStackTrace(); } diff --git a/src/main/java/buttondevteam/discordplugin/listeners/ExceptionListener.java b/src/main/java/buttondevteam/discordplugin/listeners/ExceptionListener.java index 894c5a8..6a460f9 100644 --- a/src/main/java/buttondevteam/discordplugin/listeners/ExceptionListener.java +++ b/src/main/java/buttondevteam/discordplugin/listeners/ExceptionListener.java @@ -24,7 +24,7 @@ public class ExceptionListener implements Listener { stackTrace = stackTrace.substring(0, 2000); sb.append(stackTrace).append("\n"); sb.append("```"); - DiscordPlugin.sendMessageToChannel(DiscordPlugin.botroomchannel, sb.toString()); + DiscordPlugin.sendMessageToChannel(DiscordPlugin.botchannel, sb.toString()); } catch (Exception ex) { ex.printStackTrace(); }