Merge branch 'main' into exposed

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/commands/BauCommand.java

@@ -39,7 +39,7 @@ import de.steamwar.velocitycore.inventory.SWInventory;
 import de.steamwar.velocitycore.inventory.SWItem;
 import de.steamwar.velocitycore.network.NetworkSender;
 import de.steamwar.velocitycore.util.BauLock;
-import de.steamwar.velocitycore.util.BauLockState;
+import de.steamwar.data.BauLockState;
 
 import java.util.Collection;
 import java.util.function.Consumer;

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.HashSet;
-import java.util.Set;
-import java.util.UUID;
+import java.util.*;
 
 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()
-                    .stream()
+            List<Member> members;
+            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");
         }

VelocityCore/src/de/steamwar/velocitycore/util/BauLock.java

@@ -19,11 +19,15 @@
 
 package de.steamwar.velocitycore.util;
 
+import de.steamwar.data.BauLockState;
 import de.steamwar.messages.Chatter;
+import de.steamwar.network.packets.server.BaulockUpdatePacket;
+import de.steamwar.persistent.Bauserver;
 import de.steamwar.sql.BauweltMember;
 import de.steamwar.sql.SteamwarUser;
 import de.steamwar.sql.UserConfig;
 import de.steamwar.sql.UserPerm;
+import de.steamwar.velocitycore.network.NetworkSender;
 import lombok.experimental.UtilityClass;
 
 @UtilityClass
@@ -33,6 +37,10 @@ public class BauLock {
     public static void setLocked(Chatter owner, BauLockState state) {
         UserConfig.updatePlayerConfig(owner.user().getId(), BAU_LOCK_CONFIG_NAME, state == BauLockState.OPEN ? null : state.name());
         owner.system("BAU_LOCKED_" + state.name());
+
+        Bauserver bauserver = Bauserver.get(owner.user().getUUID());
+        if(bauserver != null)
+            bauserver.getRegisteredServer().getPlayersConnected().stream().findAny().ifPresent(player -> NetworkSender.send(player, new BaulockUpdatePacket()));
     }
 
     public static boolean isLocked(SteamwarUser owner, SteamwarUser target) {

VelocityCore/src/de/steamwar/velocitycore/util/BauLockState.java

@@ -1,30 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.velocitycore.util;
-
-public enum BauLockState {
-
-    NOBODY, // Locks the build server for all users
-    SUPERVISOR, // Locks the build server for supervisors
-    SERVERTEAM, // opens the build server only for every added user which is a server team member
-    TEAM_AND_SERVERTEAM, //opens the build server only for every added user which is in the same team as the buildOwner and every server team member
-    TEAM, //opens the build server only for every added user which is in the same team as the buildOwner
-    OPEN  //unlocks the build server for all users
-}