Merge branch 'main' into world-system

VelocityCore/build.gradle.kts

@@ -26,11 +26,6 @@ tasks.build {
     finalizedBy(tasks.shadowJar)
 }
 
-java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
-}
-
 dependencies {
     compileOnly(libs.classindex)
     annotationProcessor(libs.classindex)

VelocityCore/src/de/steamwar/velocitycore/commands/CheckCommand.java

@@ -316,8 +316,18 @@ public class CheckCommand extends SWCommand {
                 SchematicNode node = SchematicNode.createSchematic(-1, name, teamFolder.getNodeId());
                 NodeData.saveFromStream(node, data.schemData(false), data.getNodeFormat());
 
-                // Accept the team folder schematic and set other to Normal
+                // Accept the team folder schematic and set other to Normal as well as adding the original owner on the schematic
                 node.setSchemtype(GameModeConfig.getBySchematicType(schematic.getSchemtype()).Schematic.Type);
+                NodeMember.createNodeMember(node.getNodeId(), schematic.getOwner());
+
+                // Remove any added players from the schematic in the folder
+                for (SchematicNode schematicNode : SchematicNode.getSchematicNodeInNode(teamFolder.getNodeId())) {
+                    if (schematicNode.getNodeId() == node.getNodeId()) continue;
+                    for (NodeMember nodeMember : NodeMember.getNodeMembers(schematicNode.getNodeId())) {
+                        NodeMember.createNodeMember(node.getNodeId(), nodeMember.getMember());
+                        nodeMember.delete();
+                    }
+                }
 
                 // Conclude by setting send in schematic to normal and broadcast
                 concludeCheckSession("freigegeben", SchematicType.Normal, () -> {

VelocityCore/src/de/steamwar/velocitycore/commands/WhoisCommand.java

@@ -50,7 +50,7 @@ public class WhoisCommand extends SWCommand {
 
     @Register(description = "WHOIS_USAGE")
     public void whois(Chatter sender, long id, WhoisParameterTypes... parameters) {
-        if(!sender.user().hasPerm(UserPerm.ADMINISTRATION)) {
+        if(!sender.user().hasPerm(UserPerm.ADMINISTRATION) && !sender.user().hasPerm(UserPerm.PREFIX_DEVELOPER)) {
             sender.system("UNKNOWN_PLAYER");
             return;
         }

VelocityCore/src/de/steamwar/velocitycore/discord/DiscordTicketType.java

@@ -28,7 +28,7 @@ import net.dv8tion.jda.api.interactions.components.buttons.ButtonStyle;
 public enum DiscordTicketType {
     REPORT("U+1F46E", "Spieler melden", ButtonStyle.DANGER, null),
     IDEA("U+1F4A1", "Feature vorschlagen", ButtonStyle.SUCCESS, null),
-    BUG("U+1F41B", "Bug melden", ButtonStyle.LINK, "https://git.steamwar.de/SteamWar/SteamWar/issues/new"),
+    BUG("U+1F41B", "Bug melden", ButtonStyle.LINK, "https://git.steamwar.de/SteamWar/SteamWar/issues/new/choose"),
     QUESTION("U+2753", "Fragen", ButtonStyle.PRIMARY, null),
     APPEAL("U+1F528", "Entbannungsantrag", ButtonStyle.SECONDARY, null),
     SCHEMATIC("U+1F4BE", "Schematic melden", ButtonStyle.DANGER, null);

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

@@ -26,6 +26,7 @@ import de.steamwar.velocitycore.discord.DiscordBot;
 import de.steamwar.velocitycore.discord.listeners.ChannelListener;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
+import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.User;
 import net.dv8tion.jda.api.entities.Webhook;
 import net.dv8tion.jda.api.entities.WebhookClient;
@@ -104,10 +105,16 @@ public class DiscordChannel extends Chatter.PlayerlessChatter {
                 return;
             }
 
-            String avatarUrl;
+            String avatarUrl = null;
             if (user.getDiscordId() != null) {
-                avatarUrl = DiscordBot.getGuild().retrieveMemberById(user.getDiscordId()).complete().getEffectiveAvatarUrl();
-            } else {
+                Member member = DiscordBot.getGuild().retrieveMemberById(user.getDiscordId())
+                        .onErrorMap(throwable -> null)
+                        .complete();
+                if (member != null) {
+                    avatarUrl = member.getEffectiveAvatarUrl();
+                }
+            }
+            if (avatarUrl == null) {
                 avatarUrl = DiscordBot.getInstance().getJda().getSelfUser().getAvatarUrl();
             }