Fix SteamwarUser.setLocale

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/observer/ObserverTracerListener.java

@@ -46,7 +46,7 @@ public class ObserverTracerListener implements Listener {
     public ObserverTracerListener() {
         Bukkit.getScheduler().runTaskTimer(BauSystem.getInstance(), () -> {
             SWPlayer.allWithSingleComponent(ObserverTracer.class).forEach(pair -> {
-                if (pair.getSwPlayer().getPlayer().getGameMode() != GameMode.SPECTATOR) return;
+                if (pair.getPlayer().getGameMode() != GameMode.SPECTATOR) return;
                 pair.getComponent().show();
             });
         }, 15L, 15L);

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

@@ -53,7 +53,7 @@ public class NoClipCommand extends SWCommand implements Listener {
 
         @Override
         public void onUnmount(SWPlayer player) {
-            player.getPlayer().setGameMode(GameMode.CREATIVE);
+            player.setGameMode(GameMode.CREATIVE);
         }
     }
 

CommonCore/SQL/src/de/steamwar/sql/SteamwarUser.kt

@@ -307,12 +307,12 @@ class SteamwarUser(id: EntityID<Int>) : IntEntity(id) {
             punishments[punishment] = Punishment.createPunishment(this@SteamwarUser.id.value, from, punishment, reason, time, perma)
         }
 
-    fun setLocale(locale: Locale?, manualeLocale: Boolean) {
+    fun setLocale(locale: Locale?, manualLocale: Boolean) {
         if (locale == null || (this.manualLocale && !manualLocale)) return
 
         useDb {
             this@SteamwarUser.locale = locale
-            this@SteamwarUser.manualLocale = manualeLocale
+            this@SteamwarUser.manualLocale = manualLocale
         }
     }
 

SpigotCore/SpigotCore_Main/src/de/steamwar/core/SWPlayer.java

@@ -21,8 +21,8 @@ package de.steamwar.core;
 
 import de.steamwar.message.Message;
 import lombok.Data;
-import lombok.Getter;
 import lombok.NonNull;
+import lombok.experimental.Delegate;
 import net.md_5.bungee.api.ChatMessageType;
 import net.md_5.bungee.api.chat.ClickEvent;
 import org.bukkit.Bukkit;
@@ -99,11 +99,11 @@ public class SWPlayer {
 
     @Data
     public static final class SWPlayerWithComponent<T extends Component> {
-        private final SWPlayer swPlayer;
+        private final SWPlayer player;
         private final T component;
     }
 
-    @Getter
+    @Delegate
     private final Player player;
     private final Map<Class<? extends Component>, Component> components = new HashMap<>();
 

SpigotCore/SpigotCore_Main/src/de/steamwar/core/worldedit/SteamEditWand.java

@@ -20,7 +20,6 @@
 package de.steamwar.core.worldedit;
 
 import com.comphenix.tinyprotocol.TinyProtocol;
-import com.sk89q.worldedit.IncompleteRegionException;
 import com.sk89q.worldedit.LocalSession;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
 import com.sk89q.worldedit.bukkit.WorldEditPlugin;
@@ -122,7 +121,13 @@ public class SteamEditWand implements Listener {
         }
 
         public void setLocation(Location location) {
+            float distance = (float) player.getLocation().distanceSquared(location);
             wireframe.setPos1And2(location, location);
+            float width = distance / 1600;
+            width = ((int) (width * 16)) / 16F;
+            width = Math.max(width, 1 / 16F);
+            width = Math.min(width, 1 / 2F);
+            wireframe.setWidth(width);
             wireframe.setBlock(WorldEditRendererCUIEditor.Type.CURSOR.getMaterial(player).createBlockData());
         }
     }
@@ -333,11 +338,7 @@ public class SteamEditWand implements Listener {
     }
 
     private void selectPos1(RegionSelector regionSelector, Player player, LocalSession session, BlockVector3 pos1) {
-        try {
-            if (!pos1.equals(regionSelector.getPrimaryPosition())) {
-                SWPlayer.of(player).setComponent(new Pos1Message(regionSelector, player, session, pos1));
-            }
-        } catch (IncompleteRegionException e) {
+        if (!pos1.equals(regionSelector.getPrimaryPosition())) {
             SWPlayer.of(player).setComponent(new Pos1Message(regionSelector, player, session, pos1));
         }
         regionSelector.selectPrimary(pos1, PermissiveSelectorLimits.getInstance());
@@ -361,11 +362,7 @@ public class SteamEditWand implements Listener {
     }
 
     private void selectPos2(RegionSelector regionSelector, Player player, LocalSession session, BlockVector3 pos2) {
-        try {
-            if (regionSelector.getVertices().size() == 2 && !pos2.equals(regionSelector.getVertices().get(1))) {
-                SWPlayer.of(player).setComponent(new Pos2Message(regionSelector, player, session, pos2));
-            }
-        } catch (IncompleteRegionException e) {
+        if (regionSelector.getVertices().size() == 2 && !pos2.equals(regionSelector.getVertices().get(1))) {
             SWPlayer.of(player).setComponent(new Pos2Message(regionSelector, player, session, pos2));
         }
         regionSelector.selectSecondary(pos2, PermissiveSelectorLimits.getInstance());

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

@@ -287,10 +287,6 @@ public class TeamCommand extends SWCommand {
 
     @Register(value = "info", description = "TEAM_INFO_USAGE")
     public void info(Chatter sender, @ErrorMessage("UNKNOWN_TEAM") Team team) {
-        if (team.getMembers().isEmpty()) {
-            sender.system("UNKNOWN_TEAM");
-            return;
-        }
         List<SteamwarUser> users = team.getMembers().stream().map(SteamwarUser::byId).toList();
 
         sender.system("TEAM_INFO_TEAM", team.getTeamName(), team.getTeamColor(), team.getTeamKuerzel());

VelocityCore/src/de/steamwar/velocitycore/mods/FML2.java

@@ -38,7 +38,7 @@ import net.kyori.adventure.text.Component;
 import java.util.*;
 import java.util.logging.Level;
 
-//@Linked
+@Linked
 public class FML2 extends BasicListener {
     // FML2: https://wiki.vg/Minecraft_Forge_Handshake#FML2_protocol_.281.13_-_Current.29
     // FML3: https://github.com/adde0109/Ambassador/tree/non-api/src/main/java/org/adde0109/ambassador/forge