Added safe mode

src/main/java/buttondevteam/discordplugin/DiscordPlugin.java

@@ -8,6 +8,7 @@ import java.util.List;
 import org.bukkit.Bukkit;
 import org.bukkit.plugin.RegisteredServiceProvider;
 import org.bukkit.plugin.java.JavaPlugin;
+import org.bukkit.scheduler.BukkitTask;
 
 import com.google.common.io.Files;
 import com.google.gson.*;
@@ -30,6 +31,7 @@ public class DiscordPlugin extends JavaPlugin implements IListener<ReadyEvent> {
 	private static boolean stop = false;
 	public static IDiscordClient dc;
 	public static DiscordPlugin plugin;
+	public static boolean SafeMode = true;
 
 	@Override
 	public void onEnable() {
@@ -62,50 +64,53 @@ public class DiscordPlugin extends JavaPlugin implements IListener<ReadyEvent> {
 	public static IChannel annchannel;
 	public static IChannel genchannel;
 	public static IChannel chatchannel;
-	public static IChannel issuechannel;
 	public static IChannel botroomchannel;
 	/**
 	 * Don't send messages, just receive, the same channel is used when testing
 	 */
 	public static IChannel officechannel;
-	public static IChannel coffeechannel;
 	public static IChannel updatechannel;
 	public static IGuild mainServer;
 	public static IGuild devServer;
 
+	private static volatile BukkitTask task;
+
 	@Override
 	public void handle(ReadyEvent event) {
 		try {
-			int retryc = 0;
+			task = Bukkit.getScheduler().runTaskTimerAsynchronously(this, () -> {
-			do {
+				if (mainServer == null || devServer == null) {
-				mainServer = event.getClient().getGuildByID("125813020357165056");
+					mainServer = event.getClient().getGuildByID("125813020357165056");
-				devServer = event.getClient().getGuildByID("219529124321034241");
+					devServer = event.getClient().getGuildByID("219529124321034241");
-				Thread.sleep(100);
+				}
-			} while ((mainServer == null || devServer == null) && retryc++ < 10);
+				if (mainServer == null || devServer == null)
-			if (!TBMCCoreAPI.IsTestServer()) {
+					return; // Retry
-				botchannel = mainServer.getChannelByID("209720707188260864"); // bot
+				if (!TBMCCoreAPI.IsTestServer()) {
-				annchannel = mainServer.getChannelByID("126795071927353344"); // announcements
+					botchannel = mainServer.getChannelByID("209720707188260864"); // bot
-				genchannel = mainServer.getChannelByID("125813020357165056"); // general
+					annchannel = mainServer.getChannelByID("126795071927353344"); // announcements
-				chatchannel = mainServer.getChannelByID("249663564057411596"); // minecraft_chat
+					genchannel = mainServer.getChannelByID("125813020357165056"); // general
-				issuechannel = devServer.getChannelByID("219643416496046081"); // server-issues
+					chatchannel = mainServer.getChannelByID("249663564057411596"); // minecraft_chat
-				botroomchannel = devServer.getChannelByID("239519012529111040"); // bot-room
+					botroomchannel = devServer.getChannelByID("239519012529111040"); // bot-room
-				officechannel = devServer.getChannelByID("219626707458457603"); // developers-office
+					officechannel = devServer.getChannelByID("219626707458457603"); // developers-office
-				coffeechannel = devServer.getChannelByID("219530035365675010"); // coffee-table
+					updatechannel = devServer.getChannelByID("233724163519414272"); // server-updates
-				updatechannel = devServer.getChannelByID("233724163519414272"); // server-updates
+					dc.changeStatus(Status.game("on TBMC"));
-				dc.changeStatus(Status.game("on TBMC"));
+				} else {
-			} else {
+					botchannel = devServer.getChannelByID("239519012529111040"); // bot-room
-				botchannel = devServer.getChannelByID("239519012529111040"); // bot-room
+					annchannel = botchannel; // bot-room
-				annchannel = botchannel; // bot-room
+					genchannel = botchannel; // bot-room
-				genchannel = botchannel; // bot-room
+					botroomchannel = botchannel;// bot-room
-				botroomchannel = botchannel;// bot-room
+					chatchannel = devServer.getChannelByID("248185455508455424"); // minecraft_chat_test
-				issuechannel = botchannel; // bot-room
+					officechannel = devServer.getChannelByID("219626707458457603"); // developers-office
-				chatchannel = devServer.getChannelByID("248185455508455424"); // minecraft_chat_test
+					updatechannel = botchannel;
-				officechannel = devServer.getChannelByID("219626707458457603"); // developers-office
+					dc.changeStatus(Status.game("testing"));
-				coffeechannel = botchannel; // bot-room
+				}
-				updatechannel = botchannel;
+				if (botchannel == null || annchannel == null || genchannel == null || botroomchannel == null
-				dc.changeStatus(Status.game("testing"));
+						|| chatchannel == null || officechannel == null || updatechannel == null)
-			}
+					return; // Retry
-
+				SafeMode = false;
+				if (task != null)
+					task.cancel();
+			}, 0, 10);
 			for (IListener<?> listener : CommandListener.getListeners())
 				dc.getDispatcher().registerListener(listener);
 			MCChatListener mcchat = new MCChatListener();
@@ -165,6 +170,10 @@ public class DiscordPlugin extends JavaPlugin implements IListener<ReadyEvent> {
 	private void AnnouncementGetterThreadMethod() {
 		while (!stop) {
 			try {
+				if (SafeMode) {
+					Thread.sleep(10000);
+					continue;
+				}
 				String body = TBMCCoreAPI.DownloadString(SubredditURL + "/new/.json?limit=10");
 				JsonArray json = new JsonParser().parse(body).getAsJsonObject().get("data").getAsJsonObject()
 						.get("children").getAsJsonArray();
@@ -230,6 +239,8 @@ public class DiscordPlugin extends JavaPlugin implements IListener<ReadyEvent> {
 				e2.printStackTrace();
 			}
 			try {
+				if (SafeMode)
+					return null;
 				if (channel == chatchannel)
 					MCChatListener.resetLastMessage(); // If this is a chat message, it'll be set again
 				final String content = TBMCCoreAPI.IsTestServer() && channel != chatchannel

src/main/java/buttondevteam/discordplugin/listeners/AutoUpdaterListener.java

@@ -1,7 +1,6 @@
 package buttondevteam.discordplugin.listeners;
 
 import java.awt.Color;
-import java.util.function.Predicate;
 import java.util.function.Supplier;
 
 import buttondevteam.discordplugin.DiscordPlugin;
@@ -16,6 +15,8 @@ import sx.blah.discord.util.RateLimitException;
 public class AutoUpdaterListener implements IListener<MessageReceivedEvent> {
 	@Override
 	public void handle(MessageReceivedEvent event) {
+		if (DiscordPlugin.SafeMode)
+			return;
 		if (!event.getMessage().getChannel().getID().equals(DiscordPlugin.officechannel.getID()))
 			return;
 		if (!"239123781401051138".equals(event.getMessage().getWebhookID()))

src/main/java/buttondevteam/discordplugin/listeners/CommandListener.java

@@ -14,6 +14,8 @@ public class CommandListener {
 		return new IListener[] { new IListener<MentionEvent>() {
 			@Override
 			public void handle(MentionEvent event) {
+				if (DiscordPlugin.SafeMode)
+					return;
 				if (event.getMessage().getAuthor().isBot())
 					return;
 				final IChannel channel = event.getMessage().getChannel();
@@ -24,6 +26,8 @@ public class CommandListener {
 		}, new IListener<MessageReceivedEvent>() {
 			@Override
 			public void handle(MessageReceivedEvent event) {
+				if (DiscordPlugin.SafeMode)
+					return;
 				if (!event.getMessage().getChannel().isPrivate())
 					return;
 				if (event.getMessage().getAuthor().isBot())
@@ -43,6 +47,8 @@ public class CommandListener {
 	 * @return Whether it ran the command (always true if mentionedonly is false)
 	 */
 	public static boolean runCommand(IMessage message, boolean mentionedonly) {
+		if (DiscordPlugin.SafeMode)
+			return true;
 		message.getChannel().setTypingStatus(true);
 		final StringBuilder cmdwithargs = new StringBuilder(message.getContent());
 		final String mention = DiscordPlugin.dc.getOurUser().mention(false);

src/main/java/buttondevteam/discordplugin/listeners/DebugMessageListener.java

@@ -13,6 +13,8 @@ public class DebugMessageListener implements Listener{
 	}
 
 	private static void SendMessage(String message) {
+		if (DiscordPlugin.SafeMode)
+			return;
 		try {
 			StringBuilder sb = new StringBuilder();
 			sb.append("```").append("\n");

src/main/java/buttondevteam/discordplugin/listeners/ExceptionListener.java

@@ -18,6 +18,8 @@ public class ExceptionListener implements Listener {
 
 	@EventHandler
 	public void onException(TBMCExceptionEvent e) {
+		if (DiscordPlugin.SafeMode)
+			return;
 		if (lastthrown.stream()
 				.anyMatch(ex -> Arrays.equals(e.getException().getStackTrace(), ex.getStackTrace())
 						&& e.getException().getMessage().equals(ex.getMessage()))

src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java

@@ -57,6 +57,8 @@ public class MCChatListener implements Listener, IListener<MessageReceivedEvent>
 
 	private static IMessage lastmessage = null;
 	private static long lastmsgtime = 0;
+	private static short lastlist = 0;
+	private static short lastlistp = 0;
 
 	public static final HashMap<String, DiscordSender> UnconnectedSenders = new HashMap<>();
 	public static final HashMap<String, DiscordPlayerSender> ConnectedSenders = new HashMap<>();
@@ -73,6 +75,7 @@ public class MCChatListener implements Listener, IListener<MessageReceivedEvent>
 		/* && !(event.getMessage().getChannel().isPrivate() && privatechat) */)
 			return;
 		lastmessage = null;
+		lastlist++;
 		if (author.isBot())
 			return;
 		if (CommandListener.runCommand(event.getMessage(), true))
@@ -115,12 +118,17 @@ public class MCChatListener implements Listener, IListener<MessageReceivedEvent>
 									+ DiscordPlugin.botchannel.mention());
 					return;
 				}
-				if (cmd.equals("list") && Bukkit.getOnlinePlayers().size() == 0 && ListC++ > 2) // Lowered already
+				if (lastlist > 5) {
+					ListC = 0;
+					lastlist = 0;
+				}
+				if (cmd.equals("list") && Bukkit.getOnlinePlayers().size() == lastlistp && ListC++ > 2) // Lowered already
 				{
 					dsender.sendMessage("Stop it. You know the answer.");
-					ListC = 0;
+					lastlist = 0;
 				} else
 					Bukkit.dispatchCommand(dsender, cmd);
+				lastlistp = (short) Bukkit.getOnlinePlayers().size();
 			} else
 				TBMCChatAPI.SendChatMessage(Channel.GlobalChat, dsender,
 						dmessage + (event.getMessage().getAttachments().size() > 0 ? "\n" + event.getMessage()

src/main/java/buttondevteam/discordplugin/listeners/MCListener.java

@@ -39,6 +39,8 @@ public class MCListener implements Listener {
 
 	@EventHandler
 	public void onGetInfo(TBMCPlayerGetInfoEvent e) {
+		if (DiscordPlugin.SafeMode)
+			return;
 		DiscordPlayer dp = e.getPlayer().asPluginPlayer(DiscordPlayer.class);
 		if (dp.getDiscordID() == null || dp.getDiscordID() == "")
 			return;