Merge branch 'main' into SpigotCore/SWPlayer

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/MaterialLazyInit.java

@@ -87,6 +87,7 @@ public class MaterialLazyInit {
                 Block block = Bukkit.getWorlds().get(0).getBlockAt(0, 0, 0);
                 block.setType(material);
                 unmoveable = block.getPistonMoveReaction() == PistonMoveReaction.BLOCK || block.getPistonMoveReaction() == PistonMoveReaction.IGNORE || block.getState() instanceof TileState;
+                block.setType(Material.AIR);
             }
 
             if (material.isItem() && material != Material.AIR) {

README.md

@@ -1 +1 @@
-# SteamWar
+# SteamWar

VelocityCore/src/de/steamwar/messages/BungeeCore.properties

@@ -578,7 +578,7 @@ CHAT_EMPTY=§cDon\'t write meaningless empty messages.
 CHAT_SERVERTEAM=§8STC §e{0}§8» §f{2}
 CHAT_DISCORD_SERVERTEAM=§8STC §e{0}§8» §f{2}
 CHAT_GLOBAL={3}{4}{5}{6}{0}§8» {7}{2}
-CHAT_DISCORD_GLOBAL=§8Dc {5}{6}{0}§8» {7}{2}
+CHAT_DISCORD_GLOBAL={3}{4}{5}{6}{0}§8» {7}{2}
 CHAT_TEAM=§8TC §e{0}§8» §f{2}
 CHAT_MSG=§e{0}§8»§e{1} §7{2}
 

VelocityCore/src/de/steamwar/messages/BungeeCore_de.properties

@@ -552,7 +552,7 @@ CHAT_EMPTY=§cSchreibe keine inhaltslosen Nachrichten.
 CHAT_SERVERTEAM=§8STC §e{0}§8» §f{2}
 CHAT_DISCORD_SERVERTEAM=§8STC §e{0}§8» §f{2}
 CHAT_GLOBAL={3}{4}{5}{6}{0}§8» {7}{2}
-CHAT_DISCORD_GLOBAL=§8Dc {5}{6}{0}§8» {7}{2}
+CHAT_DISCORD_GLOBAL={3}{4}{5}{6}{0}§8» {7}{2}
 CHAT_TEAM=§8TC §e{0}§8» §f{2}
 CHAT_MSG=§e{0}§8»§e{1} §7{2}
 

VelocityCore/src/de/steamwar/velocitycore/discord/channels/CouncilChannel.java

@@ -20,17 +20,16 @@
 package de.steamwar.velocitycore.discord.channels;
 
 import de.steamwar.sql.SteamwarUser;
+import de.steamwar.velocitycore.VelocityCore;
 import de.steamwar.velocitycore.discord.DiscordBot;
 import it.unimi.dsi.fastutil.Pair;
 import net.dv8tion.jda.api.EmbedBuilder;
+import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Role;
 import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel;
 import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder;
 
-import java.util.Comparator;
+import java.util.*;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.UUID;
 
 public class CouncilChannel extends StaticMessageChannel {
 
@@ -45,8 +44,17 @@ public class CouncilChannel extends StaticMessageChannel {
             MessageCreateBuilder messageCreateBuilder = new MessageCreateBuilder();
             messageCreateBuilder.setContent("# Ratsmitglieder");
 
-            DiscordBot.getGuild().findMembersWithRoles(role).get()
+            List<Member> members;
-                    .stream()
+            try {
+                members = DiscordBot.getGuild().findMembersWithRoles(role).onError(throwable -> {
+                    // Ignore
+                }).get();
+            } catch (Exception e) {
+                VelocityCore.getLogger().warning("Could not get members for " + role.getName());
+                return messageCreateBuilder;
+            }
+
+            members.stream()
                     .map(member -> {
                         SteamwarUser steamwarUser = SteamwarUser.get(member.getIdLong());
                         String name = steamwarUser == null ? member.getEffectiveName() : steamwarUser.getUserName();

VelocityCore/src/de/steamwar/velocitycore/discord/channels/StaticMessageChannel.java

@@ -19,6 +19,7 @@
 
 package de.steamwar.velocitycore.discord.channels;
 
+import de.steamwar.velocitycore.VelocityCore;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
@@ -26,6 +27,7 @@ import net.dv8tion.jda.api.events.interaction.component.GenericComponentInteract
 import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder;
 import net.dv8tion.jda.api.utils.messages.MessageEditData;
 
+import java.util.concurrent.TimeoutException;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
@@ -63,7 +65,7 @@ public class StaticMessageChannel extends DiscordChannel {
         if(getChannel().getLatestMessageIdLong() != 0)
             message = getChannel().getIterableHistory().complete().stream().filter(m -> m.getAuthor().isBot()).findFirst().orElse(null);
 
-        update();
+        VelocityCore.schedule(this::update);
     }
 
     public void update() {

VelocityCore/src/de/steamwar/velocitycore/listeners/ChatListener.java

@@ -189,7 +189,7 @@ public class ChatListener extends BasicListener {
         if(format.equals("CHAT_GLOBAL")) {
             DiscordBot.withBot(bot -> chatToReciever(bot.getIngameChat(), msgReceiver, user, format, coloredMessage));
         } else if (format.equals("CHAT_SERVERTEAM")) {
-            DiscordBot.withBot(bot -> chatToReciever(bot.getServerTeamChat(), msgReceiver, user, format, coloredMessage));
+            DiscordBot.withBot(bot -> chatToReciever(bot.getServerTeamChat(), msgReceiver, user, "CHAT_GLOBAL", coloredMessage));
         } else if (noReceiver) {
             sender.system("CHAT_NO_RECEIVER");
         }