Merge pull request 'Fix possible exceptions' (#302) from DiscordBotFix into master

Reviewed-on: #302
Reviewed-by: Lixfel <lixfel@steamwar.de>

src/de/steamwar/bungeecore/commands/AlertCommand.java

@@ -51,7 +51,7 @@ public class AlertCommand extends BasicCommand {
         }
 
         Message.broadcast("ALERT", ChatColor.translateAlternateColorCodes('&', s));
-        if (discordAnnounce) {
+        if (discordAnnounce && SteamwarDiscordBot.instance() != null) {
             SteamwarDiscordBot.instance().getAnnouncementListener().announce(s);
         }
     }

src/de/steamwar/bungeecore/commands/ServerTeamchatCommand.java

@@ -54,11 +54,13 @@ public class ServerTeamchatCommand extends BasicCommand {
             String msg = msgBuilder.toString();
             msg = ChatColor.translateAlternateColorCodes('&', msg);
 
+            if (SteamwarDiscordBot.instance() != null) {
                 try {
                     SteamwarDiscordBot.instance().getServerTeamChatListener().send("<t:" + (System.currentTimeMillis() / 1000) + "> " + (player.getName() + "» " + msg).replaceAll("§[a-f0-9r]", ""));
                 } catch (Exception e) {
                     BungeeCore.get().getLogger().log(Level.SEVERE, "Could not send stc message to discord", e);
                 }
+            }
             sendToTeam(msg, player);
         }
     }

src/de/steamwar/bungeecore/listeners/ChatListener.java

@@ -212,11 +212,13 @@ public class ChatListener extends BasicListener {
             msg = "§" + team.getTeamColor() + team.getTeamKuerzel() + " §r" + msg;
         }
 
+        if (SteamwarDiscordBot.instance() != null) {
             try {
                 SteamwarDiscordBot.instance().getIngameChatListener().send("<t:" + (System.currentTimeMillis() / 1000) + "> " + msg.replaceAll("§[a-f0-9r]", ""));
             } catch (Exception e) {
                 BungeeCore.get().getLogger().log(Level.SEVERE, "Could not send chat message to discord", e);
             }
+        }
         for(ProxiedPlayer target  : ProxyServer.getInstance().getPlayers()){
             Subserver targetServer = Subserver.getSubserver(target);
             if(!(targetServer == null || targetServer.getType() != Servertype.ARENA || targetServer.getServer() != target.getServer().getInfo())) continue;