Merge remote-tracking branch 'origin/master'

src/de/steamwar/bungeecore/bot/events/SchematicsManager.java

@@ -67,7 +67,7 @@ public class SchematicsManager {
         if (message == null) {
             message = textChannel.sendMessage(messageBuilder.build()).complete();
         } else {
-            message.editMessage(messageBuilder.build()).complete();
+            message.editMessage(messageBuilder.build()).queue();
         }
     }
 }

src/de/steamwar/bungeecore/bot/listeners/IngameChatListener.java

@@ -63,6 +63,6 @@ public class IngameChatListener extends BasicDiscordListener {
         assert textChannel != null;
         MessageBuilder messageBuilder = new MessageBuilder();
         messageBuilder.append(message.replace("&", "").replace("@everyone", "`@everyone`").replace("@here", "`@here`").replaceAll("<[@#]!?\\d+>", "`$0`"));
-        textChannel.sendMessage(messageBuilder.build()).complete();
+        textChannel.sendMessage(messageBuilder.build()).queue();
     }
 }

src/de/steamwar/bungeecore/bot/listeners/ServerTeamChatListener.java

@@ -54,6 +54,6 @@ public class ServerTeamChatListener extends BasicDiscordListener {
         assert textChannel != null;
         MessageBuilder messageBuilder = new MessageBuilder();
         messageBuilder.append(message.replace("&", ""));
-        textChannel.sendMessage(messageBuilder.build()).complete();
+        textChannel.sendMessage(messageBuilder.build()).queue();
     }
 }

src/de/steamwar/bungeecore/bot/util/DiscordSchemAlert.java

@@ -49,7 +49,7 @@ public class DiscordSchemAlert {
             MessageBuilder messageBuilder = new MessageBuilder();
             messageBuilder.setEmbeds(builder.build());
             try {
-                dcUser.openPrivateChannel().complete().sendMessage(messageBuilder.build()).complete();
+                dcUser.openPrivateChannel().complete().sendMessage(messageBuilder.build()).queue();
             } catch (Exception e) {
                 // Ignored
             }
@@ -70,7 +70,7 @@ public class DiscordSchemAlert {
             messageBuilder.setEmbeds(builder.build());
             messageBuilder.setActionRows(ActionRow.of(Button.success("tada", Emoji.fromUnicode("U+1F389"))));
             try {
-                dcUser.openPrivateChannel().complete().sendMessage(messageBuilder.build()).complete();
+                dcUser.openPrivateChannel().complete().sendMessage(messageBuilder.build()).queue();
             } catch (Exception e) {
                 // Ignored
             }

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

@@ -37,8 +37,33 @@ public class AlertCommand extends BasicCommand {
             return;
         }
 
-        String s = String.join(" ", args);
+        String s;
+        boolean discordAnnounce = false;
+        if (args[0].equals("-discord")) {
+            if (args.length == 1) {
+                Message.send("USAGE_ALERT", sender);
+                return;
+            }
+            discordAnnounce = true;
+            s = join(1, args);
+        } else {
+            s = join(0, args);
+        }
+
         Message.broadcast("ALERT", ChatColor.translateAlternateColorCodes('&', s));
+        if (discordAnnounce) {
             SteamwarDiscordBot.instance().getAnnouncementListener().announce(s);
         }
     }
+
+    private String join(int startIndex, String... strings) {
+        StringBuilder st = new StringBuilder();
+        for (int i = startIndex; i < strings.length; i++) {
+            if (i != startIndex) {
+                st.append(" ");
+            }
+            st.append(strings[i]);
+        }
+        return st.toString();
+    }
+}