Merge branch 'main' into VelocityCore/NoEvent

.gitignore

@@ -21,4 +21,3 @@ lib
 /WebsiteBackend/logs
 /WebsiteBackend/skins
 /WebsiteBackend/config.json
-/WebsiteBackend/sessions

BauSystem/BauSystem_21/src/de/steamwar/bausystem/utils/TickManager21.java

@@ -100,6 +100,7 @@ public class TickManager21 implements TickManager {
             manager.setFrozen(true);
             bukkitTask.cancel();
         }, 1, 1);
+        manager.tick();
     }
 
     @Override

BauSystem/BauSystem_Main/src/BauSystem.properties

@@ -52,9 +52,6 @@ FLAG_ITEMS=Items
 FLAG_NO_GRAVITY = No Gravity
 FLAG_TESTBLOCK=Testblock
 FLAG_CHANGED=Changed
-FLAG_WATER_DESTROY=Water Destroy
-FLAG_WATER_DESTROY_ALLOW=§coff
-FLAG_WATER_DESTROY_DENY=§aon
 FLAG_FIRE_ALLOW=§con
 FLAG_FIRE_DENY=§aoff
 FLAG_FREEZE_ACTIVE=§aon
@@ -143,7 +140,6 @@ BAU_INFO_ITEM_LORE_ITEMS=§7Items§8: §e{0}
 BAU_INFO_ITEM_LORE_NO_GRAVITY = §7NoGravity§8: §e{0}
 BAU_INFO_ITEM_LORE_TESTBLOCK=§7Testblock§8: §e{0}
 BAU_INFO_ITEM_LORE_CHANGED=§7Changed§8: §e{0}
-BAU_INFO_ITEM_LORE_WATER_DESTROY=§7Water Destroy§8: §e{0}
 BAU_INFO_COMMAND_HELP=§8/§ebauinfo §8- §7Information regarding this build server
 BAU_INFO_COMMAND_OWNER=§7Owner§8: §e{0}
 BAU_INFO_COMMAND_MEMBER=§7{0} §8[§7{1}§8]§8: §e{2}
@@ -760,9 +756,6 @@ REGION_FIRE_DISABLED=§aFire damage activated in this region
 REGION_FREEZE_HELP=§8/§efreeze §8- §7Toggle Freeze
 REGION_FREEZE_ENABLED=§cRegion frozen
 REGION_FREEZE_DISABLED=§aRegion thawed
-REGION_WATER_HELP=§8/§ewaterdestroy §8- §7Toggle water damage
-REGION_WATER_ENABLED=§aWater damage deactivated in this region
-REGION_WATER_DISABLED=§cWater damage activated in this region
 REGION_ITEMS_HELP=§8/§eitems §8- §7Toggle Items
 REGION_ITEMS_ENABLED=§aItems enabled in this region
 REGION_ITEMS_DISABLED=§cItems disabled in this region

BauSystem/BauSystem_Main/src/BauSystem_de.properties

@@ -54,9 +54,6 @@ FLAG_FREEZE_ACTIVE=§aan
 FLAG_FREEZE_INACTIVE=§caus
 FLAG_PROTECT_ACTIVE=§aan
 FLAG_PROTECT_INACTIVE=§caus
-FLAG_WATER_DESTROY=Wasserschaden
-FLAG_WATER_DESTROY_ALLOW=§cerlaubt
-FLAG_WATER_DESTROY_DENY=§aaus
 FLAG_TNT_ALLOW=§aan
 FLAG_TNT_DENY=§caus
 FLAG_TNT_ONLY_TB=§7Kein §eBaurahmen
@@ -125,7 +122,6 @@ BAU_INFO_ITEM_NAME=§eBau-Management
 BAU_INFO_ITEM_LORE_FIRE=§7Feuer§8: §e{0}
 BAU_INFO_ITEM_LORE_COLOR=§7Farbe§8: §e{0}
 BAU_INFO_ITEM_LORE_CHANGED=§7Verändert§8: §e{0}
-BAU_INFO_ITEM_LORE_WATER_DESTROY=§7Wasserschaden§8: §e{0}
 BAU_INFO_COMMAND_HELP=§8/§ebauinfo §8- §7Gibt Informationen über den Bau
 BAU_INFO_COMMAND_OWNER=§7Besitzer§8: §e{0}
 BAU_INFO_COMMAND_MEMBER=§7{0} §8[§7{1}§8]§8: §e{2}
@@ -708,9 +704,6 @@ REGION_PROTECT_FALSE_REGION=§cDu befindest dich derzeit in keiner (M)WG-Region
 REGION_NO_GRAVITY_HELP = §8/§enogravity §8- §7Toggle NoGravity
 REGION_NO_GRAVITY_ENABLED = §aNoGravity aktiviert in dieser Region
 REGION_NO_GRAVITY_DISABLED = §cNoGravity deaktiviert in dieser Region
-REGION_WATER_HELP=§8/§ewaterblock §8- §7Wasserschaden umschalten
-REGION_WATER_ENABLED=§aWasserschaden deaktiviert
-REGION_WATER_DISABLED=§cWasserschaden aktiviert
 REGION_REGION_HELP_UNDO=§8/§eregion undo §8- §7Mache die letzten 20 /testblock oder /reset rückgängig
 REGION_REGION_HELP_REDO=§8/§eregion redo §8- §7Wiederhole die letzten 20 §8/§7rg undo
 REGION_REGION_HELP_RESTORE=§8/§eregion restore §8- §7Setzte die Region zurück, ohne das Gebaute zu löschen

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java

@@ -40,13 +40,10 @@ import de.steamwar.bausystem.worlddata.WorldData;
 import de.steamwar.command.AbstractValidator;
 import de.steamwar.command.SWCommandUtils;
 import de.steamwar.core.CRIUSleepEvent;
-import de.steamwar.core.Core;
 import de.steamwar.core.WorldEditRendererCUIEditor;
-import de.steamwar.core.WorldIdentifier;
 import de.steamwar.linkage.AbstractLinker;
 import de.steamwar.linkage.SpigotLinker;
 import de.steamwar.message.Message;
-import de.steamwar.providers.BauServerInfo;
 import lombok.Getter;
 import org.bukkit.Bukkit;
 import org.bukkit.GameRule;
@@ -124,7 +121,6 @@ public class BauSystem extends JavaPlugin implements Listener {
         } catch (AbstractLinker.LinkException e) {
             getLogger().log(Level.SEVERE, "Could not link a class.", e);
             Bukkit.shutdown();
-            return;
         }
 
         TickListener.impl.init();
@@ -135,9 +131,6 @@ public class BauSystem extends JavaPlugin implements Listener {
         new WorldEditRendererCUIEditor();
 
         Bukkit.getWorlds().get(0).setGameRule(GameRule.SEND_COMMAND_FEEDBACK, false);
-
-        String identifier = BauServerInfo.getOwnerUser().getUUID().toString().replace("-", "");
-        WorldIdentifier.set("bau/" + Core.getVersion() + "/" + identifier);
     }
 
     @EventHandler

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/design/endstone/DesignEndStone.java

@@ -31,7 +31,10 @@ import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.entity.Player;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 public class DesignEndStone {
@@ -53,10 +56,11 @@ public class DesignEndStone {
         this.maxY = region.getBuildArea().getMaxPoint(false).getY();
         this.maxZ = region.getBuildArea().getMaxPoint(false).getZ();
 
-        limited = Arrays.stream(Material.values())
+        limited = region.getGameModeConfig().Schematic.Limited
-                .filter(Material::isBlock)
+                .entrySet()
-                .filter(material -> !material.isLegacy())
+                .stream()
-                .filter(material -> material.getBlastResistance() > region.getGameModeConfig().Schematic.MaxDesignBlastResistance)
+                .filter(entry -> entry.getValue() == 0)
+                .flatMap(entry -> entry.getKey().stream())
                 .collect(Collectors.toSet());
         calculateFromBottom = region.getGameModeConfig().Arena.NoFloor;
 

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

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

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FreezeListener.java

@@ -46,16 +46,6 @@ import org.bukkit.event.player.PlayerInteractEvent;
 @Linked
 public class FreezeListener implements Listener, ScoreboardElement {
 
-    @EventHandler
-    public void onBlockExplode(BlockExplodeEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.INACTIVE)) return;
-        e.setCancelled(true);
-        BlockState state = e.getBlock().getState();
-        Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
-            state.update(true, false);
-        }, 1L);
-    }
-
     @EventHandler
     public void onEntitySpawn(EntitySpawnEvent e) {
         if (Region.getRegion(e.getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.INACTIVE)) return;

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/WaterDestroyCommand.java

@@ -1,64 +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.bausystem.features.region;
-
-import de.steamwar.bausystem.region.Region;
-import de.steamwar.bausystem.region.RegionUtils;
-import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.region.flags.WaterDestroyMode;
-import de.steamwar.command.SWCommand;
-import de.steamwar.linkage.Linked;
-import org.bukkit.entity.Player;
-
-@Linked
-public class WaterDestroyCommand extends SWCommand {
-    public WaterDestroyCommand() {
-        super("waterdestroy");
-    }
-
-    private String getEnableMessage(){
-        return "REGION_WATER_ENABLED";
-    }
-
-    private String getDisableMessage(){
-        return "REGION_WATER_DISABLED";
-    }
-
-    @Register(description = "REGION_WATER_HELP")
-    public void toggleCommand(@Validator Player p) {
-        Region region = Region.getRegion(p.getLocation());
-
-        if (toggle(region)) {
-            RegionUtils.actionBar(region, getEnableMessage());
-        } else {
-            RegionUtils.actionBar(region, getDisableMessage());
-        }
-    }
-
-    private boolean toggle(Region region) {
-        if (region.getRegionData().get(Flag.WATER_DESTROY).isWithDefault(WaterDestroyMode.DENY)) {
-            region.getRegionData().set(Flag.WATER_DESTROY, WaterDestroyMode.ALLOW);
-            return false;
-        } else {
-            region.getRegionData().set(Flag.WATER_DESTROY, WaterDestroyMode.DENY);
-            return true;
-        }
-    }
-}

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/WaterDestroyListener.java

@@ -1,57 +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.bausystem.features.region;
-
-import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.region.Region;
-import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.region.flags.WaterDestroyMode;
-import de.steamwar.bausystem.utils.ScoreboardElement;
-import de.steamwar.linkage.Linked;
-import org.bukkit.Material;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.block.BlockFromToEvent;
-
-@Linked
-public class WaterDestroyListener implements Listener, ScoreboardElement {
-
-    @EventHandler
-    public void onBlockFromTo(BlockFromToEvent event) {
-        if (event.getBlock().getType() == Material.WATER && event.getToBlock().getType() != Material.AIR && Region.getRegion(event.getBlock().getLocation()).getRegionData().get(Flag.WATER_DESTROY).isWithDefault(WaterDestroyMode.DENY)) event.setCancelled(true);
-    }
-
-    @Override
-    public ScoreboardGroup getGroup() {
-        return ScoreboardGroup.REGION;
-    }
-
-    @Override
-    public int order() {
-        return 5;
-    }
-
-    @Override
-    public String get(Region region, Player p) {
-        if (region.getRegionData().get(Flag.WATER_DESTROY).isWithDefault(WaterDestroyMode.ALLOW)) return null;
-        return "§e" + BauSystem.MESSAGE.parse(Flag.WATER_DESTROY.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getRegionData().get(Flag.WATER_DESTROY).getWithDefault().getChatValue(), p);
-    }
-}

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/event/EventListener.java

@@ -51,8 +51,8 @@ public class EventListener implements Listener {
         Bukkit.getScheduler().runTaskTimer(BauSystem.getInstance(), () -> {
             long millis = System.currentTimeMillis();
             SWPlayer.allWithSingleComponent(ScriptRunner.ScriptData.class)
-                    .filter(pair -> millis - pair.getComponent().getLastF() > 200)
+                    .filter(pair -> millis - pair.getValue().getLastF() > 200)
-                    .forEach(pair -> pair.getComponent().setLastF(Long.MAX_VALUE));
+                    .forEach(pair -> pair.getValue().setLastF(Long.MAX_VALUE));
         }, 1, 1);
     }
 

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorObserverGui.java

@@ -150,13 +150,11 @@ public class SimulatorObserverGui extends SimulatorScrollGui<ObserverPhase> {
         Consumer<Integer> setter = observerPhase::setTickOffset;
         return new SWItem[] {
                 new SWItem(SWItem.getDye(getter.get() < max ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8:§e +5"), false, clickType -> {
-                    if (clickType == ClickType.DOUBLE_CLICK) return;
                     setter.accept(Math.min(max, getter.get() + (clickType.isShiftClick() ? 5 : 1)));
                     SimulatorWatcher.update(simulator);
                 }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED),
                 observer,
                 new SWItem(SWItem.getDye(getter.get() > min ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8:§e -5"), false, clickType -> {
-                    if (clickType == ClickType.DOUBLE_CLICK) return;
                     setter.accept(Math.max(min, getter.get() - (clickType.isShiftClick() ? 5 : 1)));
                     SimulatorWatcher.update(simulator);
                 }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED),

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorObserverPhaseSettingsGui.java

@@ -32,7 +32,6 @@ import de.steamwar.inventory.SWItem;
 import org.bukkit.Material;
 import org.bukkit.block.BlockFace;
 import org.bukkit.entity.Player;
-import org.bukkit.event.inventory.ClickType;
 
 import java.util.Arrays;
 
@@ -98,7 +97,6 @@ public class SimulatorObserverPhaseSettingsGui extends SimulatorBaseGui {
         //Tick Offset
         int offset = observer.getTickOffset();
         inventory.setItem(10, new SWItem(SWItem.getDye(offset < max ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
-            if (clickType == ClickType.DOUBLE_CLICK) return;
             observer.setTickOffset(Math.min(max, offset + (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -115,7 +113,6 @@ public class SimulatorObserverPhaseSettingsGui extends SimulatorBaseGui {
         inventory.setItem(19, offsetItem);
 
         inventory.setItem(28, new SWItem(SWItem.getDye(offset > min ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
-            if (clickType == ClickType.DOUBLE_CLICK) return;
             observer.setTickOffset(Math.max(min, offset - (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
@@ -123,7 +120,6 @@ public class SimulatorObserverPhaseSettingsGui extends SimulatorBaseGui {
         //Order
         int order = observer.getOrder();
         inventory.setItem(13, new SWItem(SWItem.getDye(order < SimulatorPhase.ORDER_LIMIT ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
-            if (clickType == ClickType.DOUBLE_CLICK) return;
             observer.setOrder(Math.min(SimulatorPhase.ORDER_LIMIT, order + (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -142,7 +138,6 @@ public class SimulatorObserverPhaseSettingsGui extends SimulatorBaseGui {
         inventory.setItem(22, orderItem);
 
         inventory.setItem(31, new SWItem(SWItem.getDye(order > -SimulatorPhase.ORDER_LIMIT ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
-            if (clickType == ClickType.DOUBLE_CLICK) return;
             observer.setOrder(Math.max(-SimulatorPhase.ORDER_LIMIT, order - (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorObserverSettingsGui.java

@@ -28,7 +28,6 @@ import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWItem;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
-import org.bukkit.event.inventory.ClickType;
 
 import java.util.Arrays;
 
@@ -68,7 +67,6 @@ public class SimulatorObserverSettingsGui extends SimulatorBaseGui {
         // Base Tick
         int baseTicks = observer.getBaseTick();
         inventory.setItem(9, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
-            if (clickType == ClickType.DOUBLE_CLICK) return;
             observer.changeBaseTicks(clickType.isShiftClick() ? 5 : 1);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -83,7 +81,6 @@ public class SimulatorObserverSettingsGui extends SimulatorBaseGui {
         baseTick.getItemStack().setAmount(Math.max(1, Math.min(baseTicks, 64)));
         inventory.setItem(18, baseTick);
         inventory.setItem(27, new SWItem(SWItem.getDye(baseTicks > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
-            if (clickType == ClickType.DOUBLE_CLICK) return;
             if (baseTicks - (clickType.isShiftClick() ? 5 : 1) < 0) {
                 observer.changeBaseTicks(-baseTicks);
             } else {
@@ -94,7 +91,6 @@ public class SimulatorObserverSettingsGui extends SimulatorBaseGui {
 
         //Pos X
         inventory.setItem(15,  new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
-            if (clickType == ClickType.DOUBLE_CLICK) return;
             observer.move(clickType.isShiftClick() ? 5 : 1, 0, 0);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -106,14 +102,12 @@ public class SimulatorObserverSettingsGui extends SimulatorBaseGui {
             }, this).open();
         }));
         inventory.setItem(33, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
-            if (clickType == ClickType.DOUBLE_CLICK) return;
             observer.move(clickType.isShiftClick() ? -5 : -1, 0, 0);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         //Pos Y
         inventory.setItem(16, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
-            if (clickType == ClickType.DOUBLE_CLICK) return;
             observer.move(0, clickType.isShiftClick() ? 5 : 1, 0);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.ENABLED_OR_DISABLED));
@@ -125,14 +119,12 @@ public class SimulatorObserverSettingsGui extends SimulatorBaseGui {
             }, this).open();
         }));
         inventory.setItem(34, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
-            if (clickType == ClickType.DOUBLE_CLICK) return;
             observer.move(0, clickType.isShiftClick() ? -5 : -1, 0);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         //Pos Z
         inventory.setItem(17, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
-            if (clickType == ClickType.DOUBLE_CLICK) return;
             observer.move(0, 0, clickType.isShiftClick() ? 5 : 1);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.ENABLED_OR_DISABLED));
@@ -144,7 +136,6 @@ public class SimulatorObserverSettingsGui extends SimulatorBaseGui {
             }, this).open();
         }));
         inventory.setItem(35, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
-            if (clickType == ClickType.DOUBLE_CLICK) return;
             observer.move(0, 0, clickType.isShiftClick() ? -5 : -1);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorRedstoneGui.java

@@ -165,13 +165,11 @@ public class SimulatorRedstoneGui extends SimulatorScrollGui<SimulatorRedstoneGu
         Consumer<Integer> setter = redstoneSubPhase.place ? redstoneSubPhase.phase::setTickOffset : redstoneSubPhase.phase::setLifetime;
         return new SWItem[] {
                 new SWItem(SWItem.getDye(getter.get() < max ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8:§e +5"), false, clickType -> {
-                    if (clickType == ClickType.DOUBLE_CLICK) return;
                     setter.accept(Math.min(max, getter.get() + (clickType.isShiftClick() ? 5 : 1)));
                     SimulatorWatcher.update(simulator);
                 }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED),
                 redstone,
                 new SWItem(SWItem.getDye(getter.get() > min ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8:§e -5"), false, clickType -> {
-                    if (clickType == ClickType.DOUBLE_CLICK) return;
                     setter.accept(Math.max(min, getter.get() - (clickType.isShiftClick() ? 5 : 1)));
                     SimulatorWatcher.update(simulator);
                 }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED),

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorRedstonePhaseSettingsGui.java

@@ -31,7 +31,6 @@ import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWItem;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
-import org.bukkit.event.inventory.ClickType;
 
 import java.util.Arrays;
 
@@ -99,7 +98,6 @@ public class SimulatorRedstonePhaseSettingsGui extends SimulatorBaseGui {
         //Tick Offset
         int offset = redstone.getTickOffset();
         inventory.setItem(10, new SWItem(SWItem.getDye(offset < maxOffset ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
-            if (clickType == ClickType.DOUBLE_CLICK) return;
             redstone.setTickOffset(Math.min(maxOffset, offset + (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -116,7 +114,6 @@ public class SimulatorRedstonePhaseSettingsGui extends SimulatorBaseGui {
         inventory.setItem(19, offsetItem);
 
         inventory.setItem(28, new SWItem(SWItem.getDye(offset > min ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
-            if (clickType == ClickType.DOUBLE_CLICK) return;
             redstone.setTickOffset(Math.max(min, offset - (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
@@ -124,7 +121,6 @@ public class SimulatorRedstonePhaseSettingsGui extends SimulatorBaseGui {
         //Lifetime
         int lifetime = redstone.getLifetime();
         inventory.setItem(11, new SWItem(SWItem.getDye(lifetime < maxLifetime ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
-            if (clickType == ClickType.DOUBLE_CLICK) return;
             redstone.setLifetime(Math.min(maxLifetime, lifetime + (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -141,7 +137,6 @@ public class SimulatorRedstonePhaseSettingsGui extends SimulatorBaseGui {
         inventory.setItem(20, lifetimeItem);
 
         inventory.setItem(29, new SWItem(SWItem.getDye(lifetime > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
-            if (clickType == ClickType.DOUBLE_CLICK) return;
             redstone.setLifetime(Math.max(0, lifetime - (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
@@ -149,7 +144,6 @@ public class SimulatorRedstonePhaseSettingsGui extends SimulatorBaseGui {
         //Order
         int order = redstone.getOrder();
         inventory.setItem(13, new SWItem(SWItem.getDye(order < SimulatorPhase.ORDER_LIMIT ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
-            if (clickType == ClickType.DOUBLE_CLICK) return;
             redstone.setOrder(Math.min(SimulatorPhase.ORDER_LIMIT, order + (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -168,7 +162,6 @@ public class SimulatorRedstonePhaseSettingsGui extends SimulatorBaseGui {
         inventory.setItem(22, orderItem);
 
         inventory.setItem(31, new SWItem(SWItem.getDye(order > -SimulatorPhase.ORDER_LIMIT ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
-            if (clickType == ClickType.DOUBLE_CLICK) return;
             redstone.setOrder(Math.max(-SimulatorPhase.ORDER_LIMIT, order - (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorRedstoneSettingsGui.java

@@ -28,7 +28,6 @@ import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWItem;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
-import org.bukkit.event.inventory.ClickType;
 
 import java.util.Arrays;
 
@@ -67,7 +66,6 @@ public class SimulatorRedstoneSettingsGui extends SimulatorBaseGui {
         // Base Tick
         int baseTicks = redstone.getBaseTick();
         inventory.setItem(9, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
-            if (clickType == ClickType.DOUBLE_CLICK) return;
             redstone.changeBaseTicks(clickType.isShiftClick() ? 5 : 1);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -82,7 +80,6 @@ public class SimulatorRedstoneSettingsGui extends SimulatorBaseGui {
         baseTick.getItemStack().setAmount(Math.max(1, Math.min(baseTicks, 64)));
         inventory.setItem(18, baseTick);
         inventory.setItem(27, new SWItem(SWItem.getDye(baseTicks > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
-            if (clickType == ClickType.DOUBLE_CLICK) return;
             if (baseTicks - (clickType.isShiftClick() ? 5 : 1) < 0) {
                 redstone.changeBaseTicks(-baseTicks);
             } else {
@@ -93,7 +90,6 @@ public class SimulatorRedstoneSettingsGui extends SimulatorBaseGui {
 
         //Pos X
         inventory.setItem(15, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
-            if (clickType == ClickType.DOUBLE_CLICK) return;
             redstone.move(clickType.isShiftClick() ? 5 : 1, 0, 0);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -105,14 +101,12 @@ public class SimulatorRedstoneSettingsGui extends SimulatorBaseGui {
             }, this).open();
         }));
         inventory.setItem(33, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
-            if (clickType == ClickType.DOUBLE_CLICK) return;
             redstone.move(clickType.isShiftClick() ? -5 : -1, 0, 0);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         //Pos Y
         inventory.setItem(16, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
-            if (clickType == ClickType.DOUBLE_CLICK) return;
             redstone.move(0, clickType.isShiftClick() ? 5 : 1, 0);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -124,14 +118,12 @@ public class SimulatorRedstoneSettingsGui extends SimulatorBaseGui {
             }, this).open();
         }));
         inventory.setItem(34, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
-            if (clickType == ClickType.DOUBLE_CLICK) return;
             redstone.move(0, clickType.isShiftClick() ? -5 : -1, 0);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         //Pos Z
         inventory.setItem(17, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
-            if (clickType == ClickType.DOUBLE_CLICK) return;
             redstone.move(0, 0, clickType.isShiftClick() ? 5 : 1);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -143,7 +135,6 @@ public class SimulatorRedstoneSettingsGui extends SimulatorBaseGui {
             }, this).open();
         }));
         inventory.setItem(35, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
-            if (clickType == ClickType.DOUBLE_CLICK) return;
             redstone.move(0, 0, clickType.isShiftClick() ? -5 : -1);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorTNTGui.java

@@ -138,13 +138,11 @@ public class SimulatorTNTGui extends SimulatorScrollGui<TNTPhase> {
 
         return new SWItem[]{
                 new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8:§e +5"), false, clickType -> {
-                    if (clickType == ClickType.DOUBLE_CLICK) return;
                     tntSetting.setCount(tntSetting.getCount() + (clickType.isShiftClick() ? 5 : 1));
                     SimulatorWatcher.update(simulator);
                 }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED),
                 tnt,
                 new SWItem(SWItem.getDye(tntSetting.getCount() > 1 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8:§e -5"), false, clickType -> {
-                    if (clickType == ClickType.DOUBLE_CLICK) return;
                     tntSetting.setCount(Math.max(1, tntSetting.getCount() - (clickType.isShiftClick() ? 5 : 1)));
                     SimulatorWatcher.update(simulator);
                 }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED),

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorTNTPhaseSettingsGui.java

@@ -31,7 +31,6 @@ import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWItem;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
-import org.bukkit.event.inventory.ClickType;
 
 import java.util.Arrays;
 
@@ -79,7 +78,6 @@ public class SimulatorTNTPhaseSettingsGui extends SimulatorBaseGui {
         //Count
         int count = tnt.getCount();
         inventory.setItem(9, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
-            if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.setCount(count + (clickType.isShiftClick() ? 5 : 1));
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -96,7 +94,6 @@ public class SimulatorTNTPhaseSettingsGui extends SimulatorBaseGui {
         inventory.setItem(18, countItem);
 
         inventory.setItem(27, new SWItem(SWItem.getDye(count > 1 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
-            if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.setCount(Math.max(1, count - (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
@@ -104,7 +101,6 @@ public class SimulatorTNTPhaseSettingsGui extends SimulatorBaseGui {
         //Tick Offset
         int offset = tnt.getTickOffset();
         inventory.setItem(10, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
-            if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.setTickOffset(offset + (clickType.isShiftClick() ? 5 : 1));
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -121,7 +117,6 @@ public class SimulatorTNTPhaseSettingsGui extends SimulatorBaseGui {
         inventory.setItem(19, offsetItem);
 
         inventory.setItem(28, new SWItem(SWItem.getDye(offset > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
-            if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.setTickOffset(Math.max(0, offset - (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
@@ -129,7 +124,6 @@ public class SimulatorTNTPhaseSettingsGui extends SimulatorBaseGui {
         //Lifetime
         int lifetime = tnt.getLifetime();
         inventory.setItem(11, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
-            if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.setLifetime(lifetime + (clickType.isShiftClick() ? 5 : 1));
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -146,7 +140,6 @@ public class SimulatorTNTPhaseSettingsGui extends SimulatorBaseGui {
         inventory.setItem(20, lifetimeItem);
 
         inventory.setItem(29, new SWItem(SWItem.getDye(lifetime > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
-            if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.setLifetime(Math.max(1, lifetime - (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
@@ -154,7 +147,6 @@ public class SimulatorTNTPhaseSettingsGui extends SimulatorBaseGui {
         //Order
         int order = tnt.getOrder();
         inventory.setItem(13, new SWItem(SWItem.getDye(order < SimulatorPhase.ORDER_LIMIT ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
-            if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.setOrder(Math.min(SimulatorPhase.ORDER_LIMIT, order + (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -173,35 +165,30 @@ public class SimulatorTNTPhaseSettingsGui extends SimulatorBaseGui {
         inventory.setItem(22, orderItem);
 
         inventory.setItem(31, new SWItem(SWItem.getDye(order > -SimulatorPhase.ORDER_LIMIT ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
-            if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.setOrder(Math.max(-SimulatorPhase.ORDER_LIMIT, order - (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         //Jump
         SWItem jumpX = new SWItem(tnt.isXJump() ? Material.LIME_WOOL : Material.RED_WOOL, "§7TNT §eJump X§8: " + (tnt.isZJump() ? "§aon" : "§coff"), clickType -> {
-            if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.setXJump(!tnt.isXJump());
             SimulatorWatcher.update(simulator);
         });
         inventory.setItem(33, jumpX);
 
         SWItem jumpY = new SWItem(tnt.isYJump() ? Material.LIME_WOOL : Material.RED_WOOL, "§7TNT §eJump Y§8: " + (tnt.isYJump() ? "§aon" : "§coff"), clickType -> {
-            if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.setYJump(!tnt.isYJump());
             SimulatorWatcher.update(simulator);
         });
         inventory.setItem(16, jumpY);
 
         SWItem jumpZ = new SWItem(tnt.isZJump() ? Material.LIME_WOOL : Material.RED_WOOL, "§7TNT §eJump Z§8: " + (tnt.isZJump() ? "§aon" : "§coff"), clickType -> {
-            if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.setZJump(!tnt.isZJump());
             SimulatorWatcher.update(simulator);
         });
         inventory.setItem(35, jumpZ);
 
         SWItem jumpAll = new SWItem(Material.TNT, "§7TNT §eJump §8: " + (tnt.hasJump() ? "§aon" : "§coff"), clickType -> {
-            if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.setJump(!tnt.hasJump());
             SimulatorWatcher.update(simulator);
         });

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorTNTSettingsGui.java

@@ -28,7 +28,6 @@ import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWItem;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
-import org.bukkit.event.inventory.ClickType;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -76,7 +75,6 @@ public class SimulatorTNTSettingsGui extends SimulatorBaseGui {
         // Base Tick
         int baseTicks = tnt.getBaseTick();
         inventory.setItem(9, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
-            if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.changeBaseTicks(clickType.isShiftClick() ? 5 : 1);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -91,7 +89,6 @@ public class SimulatorTNTSettingsGui extends SimulatorBaseGui {
         baseTick.getItemStack().setAmount(Math.max(1, Math.min(baseTicks, 64)));
         inventory.setItem(18, baseTick);
         inventory.setItem(27, new SWItem(SWItem.getDye(baseTicks > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
-            if (clickType == ClickType.DOUBLE_CLICK) return;
             if (baseTicks - (clickType.isShiftClick() ? 5 : 1) < 0) {
                 tnt.changeBaseTicks(-baseTicks);
             } else {
@@ -139,7 +136,6 @@ public class SimulatorTNTSettingsGui extends SimulatorBaseGui {
 
         // Pos X
         inventory.setItem(15, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+0.0625"), false, clickType -> {
-            if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.move(clickType.isShiftClick() ? 0.0625 : 1, 0, 0);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -151,14 +147,12 @@ public class SimulatorTNTSettingsGui extends SimulatorBaseGui {
             }, this).open();
         }));
         inventory.setItem(33, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-0.0625"), false, clickType -> {
-            if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.move(clickType.isShiftClick() ? -0.0625 : -1, 0, 0);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         // Pos Y
         inventory.setItem(16, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+0.0625"), false, clickType -> {
-            if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.move(0, clickType.isShiftClick() ? 0.0625 : 1, 0);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -170,14 +164,12 @@ public class SimulatorTNTSettingsGui extends SimulatorBaseGui {
             }, this).open();
         }));
         inventory.setItem(34, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-0.0625"), false, clickType -> {
-            if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.move(0, clickType.isShiftClick() ? -0.0625 : -1, 0);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         // Pos Z
         inventory.setItem(17, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+0.0625"), false, clickType -> {
-            if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.move(0, 0, clickType.isShiftClick() ? 0.0625 : 1);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -189,7 +181,6 @@ public class SimulatorTNTSettingsGui extends SimulatorBaseGui {
             }, this).open();
         }));
         inventory.setItem(35, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-0.0625"), false, clickType -> {
-            if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.move(0, 0, clickType.isShiftClick() ? -0.0625 : -1);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/BlockBoundingBox.java

@@ -101,7 +101,7 @@ public class BlockBoundingBox {
         addPixel(Material.END_STONE.createBlockData(), 0, 0, 0, 16, 16, 16, null);
 
         addPixel(NMSWrapper.impl.pathMaterial().createBlockData(), 0, 0, 0, 16, 15, 16, createItem("LAUFBAU_BLOCK_GRASS_PATH", NMSWrapper.impl.pathMaterial()));
-        addPixel(Material.MUD.createBlockData(), 0, 0, 0, 16, 14, 16, createItem("LAUFBAU_BLOCK_SOUL_SAND", Material.SOUL_SAND));
+        addPixel(Material.SOUL_SAND.createBlockData(), 0, 0, 0, 16, 14, 16, createItem("LAUFBAU_BLOCK_SOUL_SAND", Material.SOUL_SAND));
 
         Cocoa cocoaNorth = (Cocoa) Material.COCOA.createBlockData();
         cocoaNorth.setAge(2);

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/LaufbauCommand.java

@@ -25,14 +25,12 @@ import de.steamwar.bausystem.shared.Pair;
 import de.steamwar.bausystem.utils.WorldEditUtils;
 import de.steamwar.command.SWCommand;
 import de.steamwar.linkage.Linked;
-import de.steamwar.linkage.MinVersion;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
 
 @Linked
-@MinVersion(19)
 public class LaufbauCommand extends SWCommand {
 
     public LaufbauCommand() {

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceManager.java

@@ -45,6 +45,8 @@ public class TraceManager implements Listener {
         instance = this;
     }
 
+
+
     public void init() {
         if (!tracesFolder.exists())
             tracesFolder.mkdir();

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/SelectAdjacent.java

@@ -0,0 +1,189 @@
+/*
+ *   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.bausystem.features.worldedit;
+
+import de.steamwar.bausystem.BauSystem;
+import de.steamwar.bausystem.region.Point;
+import de.steamwar.bausystem.region.Region;
+import de.steamwar.bausystem.utils.FlatteningWrapper;
+import de.steamwar.core.SWPlayer;
+import de.steamwar.core.WorldEditRenderer;
+import de.steamwar.linkage.Linked;
+import de.steamwar.linkage.MinVersion;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.block.Action;
+import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.scheduler.BukkitTask;
+import org.bukkit.util.Vector;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.function.Predicate;
+
+@Linked
+@MinVersion(20)
+public class SelectAdjacent implements Listener {
+
+    private Vector[] FACES = {
+            new Vector(1, 0, 0),
+            new Vector(-1, 0, 0),
+            new Vector(0, 1, 0),
+            new Vector(0, -1, 0),
+            new Vector(0, 0, 1),
+            new Vector(0, 0, -1),
+
+            new Vector(1, 1, 0),
+            new Vector(1, -1, 0),
+            new Vector(1, 0, 1),
+            new Vector(1, 0, -1),
+            new Vector(-1, 1, 0),
+            new Vector(-1, -1, 0),
+            new Vector(-1, 0, 1),
+            new Vector(-1, 0, -1),
+            new Vector(0, 1, 1),
+            new Vector(0, 1, -1),
+            new Vector(0, -1, 1),
+            new Vector(0, -1, -1),
+    };
+
+    @EventHandler
+    public void onPlayerInteract(PlayerInteractEvent event) {
+        if (!event.hasItem()) return;
+        if (event.getItem().getType() != Material.WOODEN_AXE) return;
+        if (!event.getPlayer().isSneaking()) return;
+        if (event.getAction() != Action.LEFT_CLICK_BLOCK) return;
+        Material material = event.getPlayer().getInventory().getItemInOffHand().getType();
+        Selector selector;
+        if (material.isAir()) {
+            selector = new Selector(event.getClickedBlock(), event.getPlayer(), __ -> true);
+        } else {
+            selector = new Selector(event.getClickedBlock(), event.getPlayer(), type -> type == material);
+        }
+        SWPlayer.of(event.getPlayer()).setComponent(selector);
+    }
+
+    private class Selector implements SWPlayer.Component {
+
+        private static final int MAX_BLOCKS = 500_000;
+
+        private int minX;
+        private int minY;
+        private int minZ;
+        private int maxX;
+        private int maxY;
+        private int maxZ;
+
+        private BukkitTask bukkitTask;
+        private Predicate<Material> predicate;
+        private Set<Location> seen = new HashSet<>();
+        private Set<Location> toCalc = new HashSet<>();
+
+        private Region.Area area;
+
+        public Selector(Block block, Player player, Predicate<Material> predicate) {
+            this.predicate = predicate;
+            toCalc.add(block.getLocation());
+            minX = block.getX();
+            minY = block.getY();
+            minZ = block.getZ();
+            maxX = block.getX();
+            maxY = block.getY();
+            maxZ = block.getZ();
+
+            Region region = Region.getRegion(block.getLocation());
+            area = Region.Area.EMPTY;
+            if (region.getBuildArea().inRegion(block.getLocation(), true)) {
+                area = region.getBuildArea();
+            } else if (region.getTestblockArea().inRegion(block.getLocation(), true)) {
+                area = region.getTestblockArea();
+            } else if (region.getArea().inRegion(block.getLocation(), true)) {
+                area = region.getArea();
+            }
+
+            bukkitTask = Bukkit.getScheduler().runTaskTimer(BauSystem.getInstance(), () -> {
+                run();
+
+                long volume = (long)(maxX - minX + 1) * (long)(maxY - minY + 1) * (long)(maxZ - minZ + 1);
+                player.sendTitle("", "§e" + volume + " §7Blocks", 0, 5, 0);
+
+                Point minPoint = new Point(minX, minY, minZ);
+                Point maxPoint = new Point(maxX, maxY, maxZ);
+
+                FlatteningWrapper.impl.setSelection(player, minPoint, maxPoint);
+                WorldEditRenderer.renderPlayer(player);
+
+                // boolean finished = toCalc.stream().allMatch(location -> {
+                //     return location.getBlockX() >= minX && location.getBlockY() >= minY && location.getBlockZ() >= minZ &&
+                //             location.getBlockX() <= maxX && location.getBlockY() <= maxY && location.getBlockZ() <= maxZ;
+                // });
+
+                if (toCalc.isEmpty() || seen.size() > MAX_BLOCKS) {
+                    bukkitTask.cancel();
+                    player.sendTitle("§aDone", "§e" + volume + " §7Blocks", 0, 20, 5);
+                    SWPlayer.of(player).removeComponent(Selector.class);
+                }
+            }, 1, 1);
+        }
+
+        private void cancel() {
+            bukkitTask.cancel();
+        }
+
+        private void run() {
+            Set<Location> current = toCalc;
+            toCalc = new HashSet<>();
+
+            for (Location location : current) {
+                Block block = location.getBlock();
+                if (block.isEmpty() || block.isLiquid()) continue;
+                if (!predicate.test(block.getType())) continue;
+                seen.add(location);
+                if (!area.inRegion(block.getLocation(), true)) continue;
+
+                minX = Math.min(minX, location.getBlockX());
+                maxX = Math.max(maxX, location.getBlockX());
+                minY = Math.min(minY, location.getBlockY());
+                maxY = Math.max(maxY, location.getBlockY());
+                minZ = Math.min(minZ, location.getBlockZ());
+                maxZ = Math.max(maxZ, location.getBlockZ());
+
+                for (Vector face : FACES) {
+                    Block next = block.getRelative(face.getBlockX(), face.getBlockY(), face.getBlockZ());
+                    if (next.isEmpty() || next.isLiquid()) continue;
+                    if (!predicate.test(next.getType())) continue;
+                    Location loc = next.getLocation();
+                    if (seen.contains(loc)) continue;
+                    toCalc.add(loc);
+                }
+            }
+        }
+
+        @Override
+        public void onUnmount(SWPlayer player) {
+            cancel();
+        }
+    }
+}

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/mask/above/FAWEAboveMaskParser.java

@@ -26,7 +26,6 @@ import com.sk89q.worldedit.extension.input.ParserContext;
 import com.sk89q.worldedit.function.mask.Mask;
 import de.steamwar.bausystem.features.worldedit.utils.FAWEMaskParser;
 import de.steamwar.linkage.Linked;
-import de.steamwar.linkage.MinVersion;
 import de.steamwar.linkage.PluginCheck;
 
 import javax.annotation.Nonnull;
@@ -34,7 +33,6 @@ import java.util.stream.Stream;
 
 @Linked
 @PluginCheck("FastAsyncWorldEdit")
-@MinVersion(19)
 public class FAWEAboveMaskParser extends FAWEMaskParser {
 
     public FAWEAboveMaskParser() {

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/mask/below/FAWEBelowMaskParser.java

@@ -26,7 +26,6 @@ import com.sk89q.worldedit.extension.input.ParserContext;
 import com.sk89q.worldedit.function.mask.Mask;
 import de.steamwar.bausystem.features.worldedit.utils.FAWEMaskParser;
 import de.steamwar.linkage.Linked;
-import de.steamwar.linkage.MinVersion;
 import de.steamwar.linkage.PluginCheck;
 
 import javax.annotation.Nonnull;
@@ -34,7 +33,6 @@ import java.util.stream.Stream;
 
 @Linked
 @PluginCheck("FastAsyncWorldEdit")
-@MinVersion(19)
 public class FAWEBelowMaskParser extends FAWEMaskParser {
 
     public FAWEBelowMaskParser() {

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/mask/checkerboard3d/FAWECheckerboard3DMaskParser.java

@@ -25,7 +25,6 @@ import com.sk89q.worldedit.extension.input.ParserContext;
 import com.sk89q.worldedit.function.mask.Mask;
 import de.steamwar.bausystem.features.worldedit.utils.FAWEMaskParser;
 import de.steamwar.linkage.Linked;
-import de.steamwar.linkage.MinVersion;
 import de.steamwar.linkage.PluginCheck;
 
 import javax.annotation.Nonnull;
@@ -33,7 +32,6 @@ import java.util.stream.Stream;
 
 @Linked
 @PluginCheck("FastAsyncWorldEdit")
-@MinVersion(19)
 public class FAWECheckerboard3DMaskParser extends FAWEMaskParser {
 
     public FAWECheckerboard3DMaskParser() {

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/mask/checkerboard3d/FAWECheckerboardMaskParser.java

@@ -25,7 +25,6 @@ import com.sk89q.worldedit.extension.input.ParserContext;
 import com.sk89q.worldedit.function.mask.Mask;
 import de.steamwar.bausystem.features.worldedit.utils.FAWEMaskParser;
 import de.steamwar.linkage.Linked;
-import de.steamwar.linkage.MinVersion;
 import de.steamwar.linkage.PluginCheck;
 
 import javax.annotation.Nonnull;
@@ -33,7 +32,6 @@ import java.util.stream.Stream;
 
 @Linked
 @PluginCheck("FastAsyncWorldEdit")
-@MinVersion(19)
 public class FAWECheckerboardMaskParser extends FAWEMaskParser {
 
     public FAWECheckerboardMaskParser() {

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/mask/grid/FAWEGridMaskParser.java

@@ -25,7 +25,6 @@ import com.sk89q.worldedit.extension.input.ParserContext;
 import com.sk89q.worldedit.function.mask.Mask;
 import de.steamwar.bausystem.features.worldedit.utils.FAWEMaskParser;
 import de.steamwar.linkage.Linked;
-import de.steamwar.linkage.MinVersion;
 import de.steamwar.linkage.PluginCheck;
 
 import javax.annotation.Nonnull;
@@ -33,7 +32,6 @@ import java.util.stream.Stream;
 
 @Linked
 @PluginCheck("FastAsyncWorldEdit")
-@MinVersion(19)
 public class FAWEGridMaskParser extends FAWEMaskParser {
 
     public FAWEGridMaskParser() {

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/pattern/gradient/FAWEGradientPatternParser.java

@@ -27,7 +27,6 @@ import com.sk89q.worldedit.regions.Region;
 import de.steamwar.bausystem.features.worldedit.utils.FAWEPatternParser;
 import de.steamwar.bausystem.utils.WorldEditUtils;
 import de.steamwar.linkage.Linked;
-import de.steamwar.linkage.MinVersion;
 import de.steamwar.linkage.PluginCheck;
 import org.bukkit.Axis;
 
@@ -36,7 +35,6 @@ import java.util.stream.Stream;
 
 @Linked
 @PluginCheck("FastAsyncWorldEdit")
-@MinVersion(19)
 public class FAWEGradientPatternParser extends FAWEPatternParser {
 
     public FAWEGradientPatternParser() {

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/Flag.java

@@ -43,7 +43,6 @@ public final class Flag<T extends Enum<T> & Flag.Value<T>> implements EnumDispla
     public static final Flag<NoGravityMode> NO_GRAVITY = new Flag<>("NO_GRAVITY", "FLAG_NO_GRAVITY", NoGravityMode.class, NoGravityMode.INACTIVE);
     public static final Flag<TestblockMode> TESTBLOCK = new Flag<>("TESTBLOCK", "FLAG_TESTBLOCK", TestblockMode.class, TestblockMode.NO_VALUE);
     public static final Flag<ChangedMode> CHANGED = new Flag<>("CHANGED", "FLAG_CHANGED", ChangedMode.class, ChangedMode.NO_CHANGE);
-    public static final Flag<WaterDestroyMode> WATER_DESTROY = new Flag<>("WATER_DESTROY", "FLAG_WATER_DESTROY", WaterDestroyMode.class, WaterDestroyMode.ALLOW);
 
     private String name;
     private int ordinal;

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/WaterDestroyMode.java

@@ -1,56 +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.bausystem.region.flags;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@Getter
-@AllArgsConstructor
-public enum WaterDestroyMode implements Flag.Value<WaterDestroyMode> {
-
-    ALLOW("FLAG_WATER_DESTROY_ALLOW"),
-    DENY("FLAG_WATER_DESTROY_DENY");
-
-    private static WaterDestroyMode[] values;
-    private final String chatValue;
-
-    @Override
-    public WaterDestroyMode[] getValues() {
-        if (WaterDestroyMode.values == null) {
-            WaterDestroyMode.values = WaterDestroyMode.values();
-        }
-        return WaterDestroyMode.values;
-    }
-
-    @Override
-    public WaterDestroyMode getValue() {
-        return this;
-    }
-
-    @Override
-    public WaterDestroyMode getValueOf(final String name) {
-        try {
-            return WaterDestroyMode.valueOf(name.toUpperCase());
-        } catch (IllegalArgumentException e) {
-            return ALLOW;
-        }
-    }
-}

BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegionData.java

@@ -34,7 +34,7 @@ public class FixedRegionData extends RegionData {
 
     @Override
     public @NonNull <T extends Enum<T> & Flag.Value<T>> RegionFlagPolicy has(@NonNull Flag<T> flag) {
-        if (flag.oneOf(Flag.COLOR, Flag.TNT, Flag.FIRE, Flag.FREEZE, Flag.PROTECT, Flag.NO_GRAVITY, Flag.CHANGED, Flag.WATER_DESTROY)) {
+        if (flag.oneOf(Flag.COLOR, Flag.TNT, Flag.FIRE, Flag.FREEZE, Flag.PROTECT, Flag.NO_GRAVITY, Flag.CHANGED)) {
             return RegionFlagPolicy.WRITABLE;
         }
         if (flag.oneOf(Flag.ITEMS) && Core.getVersion() >= 20) {

CommonCore/Linkage/src/de/steamwar/linkage/AbstractLinker.java

@@ -56,9 +56,7 @@ public abstract class AbstractLinker<T> {
                     .map(s -> {
                         try {
                             return Class.forName(s, false, plugin.getClass().getClassLoader());
-                        } catch (NoClassDefFoundError error) {
+                        } catch (ClassNotFoundException | NoClassDefFoundError e) {
-                            return null;
-                        } catch (ClassNotFoundException e) {
                             throw new SecurityException(e.getMessage(), e);
                         }
                     })

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

@@ -35,11 +35,7 @@ import java.time.Instant
 object BannedUserIPsTable: CompositeIdTable("BannedUserIPs") {
     val userId = reference("UserID", SteamwarUserTable)
     val timestamp = timestamp("Timestamp")
-    val ip = varchar("IP", 45).entityId()
+    val ip = varchar("IP", 45)
-
-    init {
-        addIdColumn(userId)
-    }
 
     override val primaryKey = PrimaryKey(userId, ip)
 }

CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java

@@ -402,13 +402,6 @@ public final class GameModeConfig<M, W> {
          */
         public final int WaterDepth;
 
-        /**
-         * If TNT should break blocks even underwater
-         *
-         * @implSpec {@code true} by default
-         */
-        public final boolean WaterDamage;
-
         /**
          * The outer border of the arena, measured in blocks around the schematic areas
          */
@@ -464,7 +457,6 @@ public final class GameModeConfig<M, W> {
         private ArenaConfig(YMLWrapper loader, SchematicConfig.SizeConfig Size, List<Integer> EnterStages) {
             loaded = loader.canLoad();
             WaterDepth = loader.getInt("WaterDepth", 0);
-            WaterDamage = loader.getBoolean("WaterDamage", true);
             Schem2Border = new Schem2BorderConfig(loader.with("Schem2Border"));
             SpawnOffset = new SpawnOffsetConfig(loader.with("SpawnOffset"), Size);
             BorderFromSchematic = loader.getInt("BorderFromSchematic", 21);
@@ -605,18 +597,18 @@ public final class GameModeConfig<M, W> {
         public final boolean IgnorePublicOnly;
 
         /**
-         * Replacements that should be done during PRE_RUNNING with no block updates
+         * If obsidian and bedrock should be replaced during PRE_RUNNING
          *
-         * @implSpec {@code {}} by default
+         * @implSpec {@code false} by default
          */
-        public final Map<M, M> ReplacementsWithoutBlockUpdates;
+        public final boolean ReplaceObsidianBedrock;
 
         /**
-         * Replacements that should be done during PRE_RUNNING with block updates
+         * If the replacement should happen with block updates
          *
-         * @implSpec {@code {}} by default
+         * @implSpec {@code false} by default
          */
-        public final Map<M, M> ReplacementsWithBlockUpdates;
+        public final boolean ReplaceWithBlockupdates;
 
         /**
          * If the schematic perparation arena mode is time limited
@@ -649,7 +641,7 @@ public final class GameModeConfig<M, W> {
         /**
          * Maximal blast resistance for the design blocks
          *
-         * @implSpec {@link SchematicConfig#MaxBlastResistance} by default
+         * @implSpec {@code Double.MAX_VALUE} by default
          */
         public final double MaxDesignBlastResistance;
 
@@ -673,11 +665,13 @@ public final class GameModeConfig<M, W> {
             PasteAligned = loader.getBoolean("PasteAligned", false);
             OnlyPublicSchematics = loader.getBoolean("OnlyPublicSchematics", false);
             IgnorePublicOnly = loader.getBoolean("IgnorePublicOnly", false);
+            ReplaceObsidianBedrock = loader.getBoolean("ReplaceObsidianBedrock", false);
+            ReplaceWithBlockupdates = loader.getBoolean("ReplaceWithBlockupdates", false);
             UnlimitedPrepare = loader.getBoolean("UnlimitedPrepare", false);
             MaxBlocks = loader.getInt("MaxBlocks", 0);
             MaxDispenserItems = loader.getInt("MaxDispenserItems", 128);
             MaxBlastResistance = loader.getDouble("MaxBlastResistance", Double.MAX_VALUE);
-            MaxDesignBlastResistance = loader.getDouble("MaxDesignBlastResistance", MaxBlastResistance);
+            MaxDesignBlastResistance = loader.getDouble("MaxDesignBlastResistance", Double.MAX_VALUE);
 
             Map<Set<M>, Integer> Limited = new HashMap<>();
             for (Map<?, ?> entry : loader.getMapList("Limited")) {
@@ -696,9 +690,6 @@ public final class GameModeConfig<M, W> {
                 Limited.put(Collections.singleton((M) material), 0);
             });
             this.Limited = Collections.unmodifiableMap(Limited);
-
-            this.ReplacementsWithoutBlockUpdates = loader.getMap("ReplacementsWithoutBlockUpdates", loader.materialMapper, loader.materialMapper);
-            this.ReplacementsWithBlockUpdates = loader.getMap("ReplacementsWithBlockUpdates", loader.materialMapper, loader.materialMapper);
         }
 
         @ToString

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

@@ -88,6 +88,8 @@ class NodeData(id: EntityID<CompositeID>): CompositeEntity(id) {
         schemData.inputStream.let { if(decompress) GZIPInputStream(it) else it }
     }
 
+    fun schemData() = schemData(true)
+
     override fun delete() = useDb { super.delete() }
 
     enum class SchematicFormat(val fileEnding: String) {

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

@@ -33,8 +33,8 @@ object PersonalKitTable: CompositeIdTable("PersonalKit") {
     val userId = reference("UserId", SteamwarUserTable)
     val gamemode = varchar("Gamemode", 64).entityId()
     val kitName = varchar("Name", 64).entityId()
-    val inventory = text("Inventory", eagerLoading = true)
+    val inventory = text("Inventory")
-    val armor = text("Armor", eagerLoading = true)
+    val armor = text("Armor")
     val inUse = bool("InUse")
 
     override val primaryKey = PrimaryKey(userId, gamemode, kitName)
@@ -48,17 +48,14 @@ class InternalKit(id: EntityID<CompositeID>): CompositeEntity(id) {
     companion object: CompositeEntityClass<InternalKit>(PersonalKitTable) {
         @JvmStatic
         fun get(userId: Int, gamemode: String) = useDb {
-            find { PersonalKitTable.userId eq userId and (PersonalKitTable.gamemode eq gamemode) }
+            find { PersonalKitTable.userId eq userId and (PersonalKitTable.gamemode eq gamemode) and (PersonalKitTable.inUse eq true) }
                 .toList()
         }
 
         @JvmStatic
         fun get(userId: Int, gamemode: String, kitName: String) = useDb {
-            findById(CompositeID {
+            find { PersonalKitTable.userId eq userId and (PersonalKitTable.gamemode eq gamemode) and (PersonalKitTable.kitName eq kitName) and (PersonalKitTable.inUse eq true) }
-                it[PersonalKitTable.userId] = EntityID(userId, SteamwarUserTable)
+                .firstOrNull()
-                it[PersonalKitTable.gamemode] = gamemode
-                it[PersonalKitTable.kitName] = kitName
-            })
         }
 
         @JvmStatic
@@ -70,10 +67,10 @@ class InternalKit(id: EntityID<CompositeID>): CompositeEntity(id) {
                     it[PersonalKitTable.kitName] = kitName
                 }
             ) {
-                this.rawInventory = rawInventory
+                this.inventory = rawInventory
-                this.rawArmor = rawArmor
+                this.armor = rawArmor
-                this.inUse = false
+                this.inUse = true
-            }.also { it.setDefault() }
+            }
         }
 
         @JvmStatic
@@ -110,7 +107,6 @@ class InternalKit(id: EntityID<CompositeID>): CompositeEntity(id) {
 
     fun setDefault() = useDb {
         find { PersonalKitTable.userId eq userID and (PersonalKitTable.gamemode eq gameMode) and (PersonalKitTable.inUse eq true) }
-            .filter { it.id.value != this@InternalKit.id.value }
             .forEach { it.inUse = false }
         inUse = true
     }

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

@@ -179,6 +179,14 @@ class Punishment(id: EntityID<Int>) : IntEntity(id) {
             "UNNOTEAMSERVER",
             UserPerm.MODERATION
         ),
+        NoEvent(
+            "NOEVENT_TEAM",
+            "NOEVENT_PERMA",
+            "NOEVENT_UNTIL",
+            "NOEVENT_ERROR",
+            "UNNOEVENT",
+            UserPerm.MODERATION
+        ),
         Note("NOTE_TEAM", null, null, null, null, UserPerm.PUNISHMENTS, true);
 
         fun isMulti() = multi

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

@@ -0,0 +1,74 @@
+/*
+ *   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.sql
+
+import de.steamwar.sql.internal.useDb
+import org.jetbrains.exposed.v1.core.and
+import org.jetbrains.exposed.v1.core.dao.id.CompositeID
+import org.jetbrains.exposed.v1.core.dao.id.CompositeIdTable
+import org.jetbrains.exposed.v1.core.dao.id.EntityID
+import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.v1.dao.CompositeEntity
+import org.jetbrains.exposed.v1.dao.CompositeEntityClass
+import org.jetbrains.exposed.v1.jdbc.insertIgnore
+
+object SchemEloTable: CompositeIdTable("SchemElo") {
+    val schemId = reference("SchemId", SchematicNodeTable)
+    val season = integer("Season").entityId()
+    val elo = integer("Elo")
+
+    override val primaryKey = PrimaryKey(schemId, season)
+
+    init {
+        addIdColumn(schemId)
+    }
+}
+
+class SchemElo(id: EntityID<CompositeID>): CompositeEntity(id) {
+    companion object: CompositeEntityClass<SchemElo>(SchemEloTable) {
+        @JvmStatic
+        fun getElo(node: SchematicNode, season: Int, defaultElo: Int = 0) = useDb {
+            find { (SchemEloTable.schemId eq node.id) and (SchemEloTable.season eq season) }.firstOrNull()?.elo ?: defaultElo
+        }
+
+        @JvmStatic
+        fun getCurrentElo(schemId: Int) = getElo(SchematicNode.byId(schemId)!!, Season.getSeason())
+
+        @JvmStatic
+        fun setElo(node: Int, elo: Int) = useDb {
+            findByIdAndUpdate(CompositeID {
+                it[SchemEloTable.schemId] = node
+                it[SchemEloTable.season] = Season.getSeason()
+            }) {
+                it.elo = elo
+            } ?: SchemEloTable.insertIgnore {
+                it[SchemEloTable.schemId] = node
+                it[SchemEloTable.season] = Season.getSeason()
+                it[SchemEloTable.elo] = elo
+            }
+
+            return@useDb
+        }
+    }
+
+    var node by SchemEloTable.schemId
+    var season by SchemEloTable.season
+    var elo by SchemEloTable.elo
+}

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

@@ -116,7 +116,7 @@ class SchematicNode(id: EntityID<Int>) : IntEntity(id) {
 
         @JvmStatic
         fun schematicAccessibleForUser(user: SteamwarUser, schematicId: Int?) = fromSql(
-            "WITH RECURSIVE Nodes AS (SELECT NodeId, ParentId as ParentNode FROM NodeMember WHERE UserId = ? UNION SELECT NodeId, ParentNode FROM SchematicNode WHERE NodeOwner = ?), RSN AS ( SELECT NodeId, ParentNode FROM Nodes UNION SELECT SN.NodeId, SN.ParentNode FROM SchematicNode SN, RSN WHERE SN.ParentNode = RSN.NodeId ) SELECT SN.*, ? AS EffectiveOwner FROM RSN INNER JOIN SchematicNode SN ON RSN.NodeId = SN.NodeId WHERE SN.NodeId = ?",
+            "WITH RECURSIVE Nodes AS (SELECT NodeId, ParentId as ParentNode FROM NodeMember WHERE UserId = ? UNION SELECT NodeId, ParentNode FROM SchematicNode WHERE NodeOwner = ?), RSN AS ( SELECT NodeId, ParentNode FROM Nodes UNION SELECT SN.NodeId, SN.ParentNode FROM SchematicNode SN, RSN WHERE SN.ParentNode = RSN.NodeId ) SELECT SN.*, ? AS EffectiveOwner FROM RSN INNER JOIN SchematicNode SN ON RSN.NodeId = SN.NodeId WHERE NodeId = ?",
             listOf(
                 IntegerColumnType() to user.getId(),
                 IntegerColumnType() to user.getId(),
@@ -146,91 +146,7 @@ class SchematicNode(id: EntityID<Int>) : IntEntity(id) {
 
         @JvmStatic
         fun parentsOfNode(user: SteamwarUser, id: Int) = fromSql(
-            """
+            "WITH RECURSIVE R AS (SELECT NodeId, ParentNode FROM EffectiveSchematicNode WHERE NodeId = ? UNION SELECT E.NodeId, E.ParentNode FROM R, EffectiveSchematicNode E WHERE R.ParentNode = E.NodeId AND E.EffectiveOwner = ?) SELECT SN.NodeId, SN.NodeOwner, SN.NodeName, R.ParentNode, SN.LastUpdate, SN.NodeItem, SN.NodeType, SN.NodeRank, SN.Config FROM R INNER JOIN SchematicNode SN ON SN.NodeId = R.NodeId",
-            WITH RECURSIVE
-                ESN_R AS (
-                    SELECT SchematicNode.NodeId AS NodeId,
-                           NM.UserId AS EffectiveOwner,
-                           NM.ParentId AS ParentNode
-                    FROM SchematicNode
-                    INNER JOIN NodeMember NM ON NM.NodeId = SchematicNode.NodeId
-                    UNION ALL
-                    SELECT S.NodeId AS NodeId,
-                           ESN_R.EffectiveOwner AS EffectiveOwner,
-                           S.ParentNode AS ParentNode
-                    FROM SchematicNode S
-                    INNER JOIN ESN_R ON S.ParentNode = ESN_R.NodeId
-                ),
-                ESN_R2 AS (
-                    SELECT SchematicNode.NodeId AS NodeId,
-                           NM.UserId AS UserId,
-                           SchematicNode.NodeOwner AS EffectiveOwner,
-                           SchematicNode.ParentNode AS ParentNode
-                    FROM SchematicNode
-                    INNER JOIN NodeMember NM ON NM.NodeId = SchematicNode.NodeId
-                    UNION ALL
-                    SELECT S.NodeId AS NodeId,
-                           ESN_R2.EffectiveOwner AS EffectiveOwner,
-                           ESN_R2.UserId AS UserId,
-                           S.ParentNode AS ParentNode
-                    FROM SchematicNode S
-                    INNER JOIN ESN_R2 ON S.ParentNode = ESN_R2.NodeId
-                    WHERE S.NodeOwner <> ESN_R2.EffectiveOwner
-                ),
-                ESN_R3 AS (
-                    SELECT SchematicNode.NodeId AS NodeId,
-                           SchematicNode.NodeOwner AS NodeOwner,
-                           SchematicNode.NodeOwner AS EffectiveOwner,
-                           SchematicNode.ParentNode AS ParentNode
-                    FROM SchematicNode
-                    UNION ALL
-                    SELECT S.NodeId AS NodeId,
-                           S.NodeOwner AS NodeOwner,
-                           ESN_R3.EffectiveOwner AS EffectiveOwner,
-                           S.ParentNode AS ParentNode
-                    FROM SchematicNode S
-                    INNER JOIN ESN_R3 ON S.ParentNode = ESN_R3.NodeId
-                    WHERE ESN_R3.NodeOwner <> S.NodeOwner
-                ),
-                ResolvedNodes AS (
-                    SELECT ESN_R.NodeId AS NodeId,
-                           ESN_R.EffectiveOwner AS EffectiveOwner,
-                           ESN_R.ParentNode AS ParentNode
-                    FROM ESN_R
-                    UNION
-                    SELECT ESN_R2.NodeId AS NodeId,
-                           ESN_R2.UserId AS EffectiveOwner,
-                           ESN_R2.ParentNode AS ParentNode
-                    FROM ESN_R2
-                    INNER JOIN SchematicNode SN2 ON ESN_R2.NodeId = SN2.NodeId
-                    WHERE ESN_R2.ParentNode IS NOT NULL
-                      AND SN2.NodeOwner <> ESN_R2.EffectiveOwner
-                    UNION
-                    SELECT ESN_R3.NodeId AS NodeId,
-                           ESN_R3.EffectiveOwner AS EffectiveOwner,
-                           ESN_R3.ParentNode AS ParentNode
-                    FROM ESN_R3
-                    WHERE ESN_R3.NodeOwner <> ESN_R3.EffectiveOwner
-                    UNION
-                    SELECT SchematicNode.NodeId AS NodeId,
-                           SchematicNode.NodeOwner AS EffectiveOwner,
-                           SchematicNode.ParentNode AS ParentNode
-                    FROM SchematicNode
-                ),
-                R AS (
-                    SELECT NodeId, ParentNode
-                    FROM ResolvedNodes
-                    WHERE NodeId = ?
-                    UNION
-                    SELECT E.NodeId, E.ParentNode
-                    FROM R
-                    INNER JOIN ResolvedNodes E ON R.ParentNode = E.NodeId
-                    WHERE E.EffectiveOwner = ?
-                )
-            SELECT SN.NodeId, SN.NodeOwner, SN.NodeName, R.ParentNode, SN.LastUpdate, SN.NodeItem, SN.NodeType, SN.NodeRank, SN.Config
-            FROM R
-            INNER JOIN SchematicNode SN ON SN.NodeId = R.NodeId
-            """.trimIndent(),
             listOf(
                 IntegerColumnType() to id,
                 IntegerColumnType() to user.getId()
@@ -368,7 +284,7 @@ class SchematicNode(id: EntityID<Int>) : IntEntity(id) {
             val list = mutableListOf<String>()
             if (s.contains("/")) {
                 val preTab = s.take(s.lastIndexOf("/") + 1)
-                val pa = getNodeFromPath(user, preTab) ?: return mutableListOf()
+                val pa = getNodeFromPath(user, preTab) ?: return emptyList()
                 val nodes: List<SchematicNode> = list(user, pa.getId())
                 val br = pa.generateBreadcrumbs(user)
                 nodes.forEach(Consumer { node: SchematicNode? -> list.add((if (sws) "/" else "") + br + node!!.name + (if (node.isDir()) "/" else "")) })
@@ -449,6 +365,8 @@ class SchematicNode(id: EntityID<Int>) : IntEntity(id) {
         }
     }
 
+    fun getElo(season: Int) = SchemElo.getElo(this, season)
+
     override fun delete() = useDb {
         super.delete()
     }

CommonCore/SQL/src/de/steamwar/sql/Season.java

@@ -0,0 +1,61 @@
+/*
+ *   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.sql;
+
+import java.util.Calendar;
+
+public class Season {
+    private Season() {}
+
+    public static int getSeason() {
+        Calendar calendar = Calendar.getInstance();
+        int yearIndex = calendar.get(Calendar.MONTH) / 4;
+        return (calendar.get(Calendar.YEAR) * 3 + yearIndex);
+    }
+
+    public static String getSeasonStart() {
+        Calendar calendar = Calendar.getInstance();
+        int month = calendar.get(Calendar.MONTH);
+        if (month <= 3) {
+            return calendar.get(Calendar.YEAR) + "-1-1";
+        } else if (month <= 7) {
+            return calendar.get(Calendar.YEAR) + "-5-1";
+        } else {
+            return calendar.get(Calendar.YEAR) + "-9-1";
+        }
+    }
+
+    public static String convertSeasonToString(int season){
+        if (season == -1) return "";
+        int yearSeason = season % 3;
+        int year = (season - yearSeason) / 3;
+        return String.format("%d-%d", year, yearSeason + 1);
+    }
+
+    public static int convertSeasonToNumber(String season){
+        if (season.isEmpty()) return -1;
+        String[] split = season.split("-");
+        try {
+            return Integer.parseInt(split[0]) * 3 + Integer.parseInt(split[1]) - 1;
+        } catch (NumberFormatException e) {
+            return -1;
+        }
+    }
+}

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

@@ -170,7 +170,7 @@ class SteamwarUser(id: EntityID<Int>): IntEntity(id) {
     fun isLeader() = leader
 
     var locale: Locale by SteamwarUserTable.locale
-        .transform({ it.toLanguageTag() }, { it?.let { Locale.forLanguageTag(it) } ?: Locale.ENGLISH })
+        .transform({ it.toLanguageTag() }, { it?.let { Locale.forLanguageTag(it) } ?: Locale.getDefault()})
     var manualLocale by SteamwarUserTable.manualLocale
     var bedrock by SteamwarUserTable.bedrock
     private var passwordInternal by SteamwarUserTable.password
@@ -186,10 +186,10 @@ class SteamwarUser(id: EntityID<Int>): IntEntity(id) {
 
             val salt = ByteArray(16)
             random.nextBytes(salt)
-            val saltString = Base64.getEncoder().encodeToString(salt)
+            val saltString = Base64.getEncoder().encode(salt)
 
             val hash = generateHash(value, salt)
-            val hashString = Base64.getEncoder().encodeToString(hash)
+            val hashString = Base64.getEncoder().encode(hash)
 
             useDb {
                 passwordInternal = "$hashString:$saltString"
@@ -254,27 +254,12 @@ class SteamwarUser(id: EntityID<Int>): IntEntity(id) {
         punishments[punishment] = Punishment.createPunishment(this@SteamwarUser.id.value, from, punishment, reason, time, perma)
     }
 
-    fun setJoinLocale(locale: Locale?) {
+    fun setLocale(locale: Locale?, manualeLocale: Boolean) {
-        if (locale == null || this.manualLocale) return
+        if (locale == null || (this.manualLocale && !manualLocale)) return
-        setCurrentLocale(locale)
-    }
 
-    fun setCurrentLocale(locale: Locale?) {
-        if (locale == null) return
         useDb {
             this@SteamwarUser.locale = locale
-        }
+            this@SteamwarUser.manualLocale = manualeLocale
-    }
-
-    fun lockLocale() {
-        useDb {
-            this@SteamwarUser.manualLocale = true
-        }
-    }
-
-    fun unlockLocale() {
-        useDb {
-            this@SteamwarUser.manualLocale = false
         }
     }
 

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

@@ -32,19 +32,19 @@ object TeamTable : IntIdTable("Team", "TeamID") {
     val color = char("TeamColor", 1).default("8")
     val name = varchar("TeamName", 16)
     val deleted = bool("TeamDeleted").default(false)
+    val address = text("Address").nullable()
+    val port = ushort("Port").default(25565u)
 }
 
 class Team(id: EntityID<Int>) : IntEntity(id) {
     companion object : IntEntityClass<Team>(TeamTable) {
-        const val PUBLIC: Int = 0
-
         private val teamCache = mutableMapOf<Int, Team>()
 
         @JvmStatic
-        fun clear() = synchronized(teamCache) { teamCache.clear() }
+        fun clear() = teamCache.clear()
 
         @JvmStatic
-        fun byId(id: Int) = synchronized(teamCache) { teamCache.computeIfAbsent(id) { useDb { Team[id] } } }
+        fun byId(id: Int) = teamCache.computeIfAbsent(id) { useDb { Team[id] } }
 
         @JvmStatic
         fun get(name: String) = useDb { find { (TeamTable.name.lowerCase() eq name.lowercase() or (TeamTable.kuerzel.lowerCase() eq name.lowercase())) and not(TeamTable.deleted) }.firstOrNull() }
@@ -67,6 +67,8 @@ class Team(id: EntityID<Int>) : IntEntity(id) {
     private var name by TeamTable.name
     var deleted by TeamTable.deleted
         private set
+    private var teamAddress by TeamTable.address
+    private var teamPort by TeamTable.port
     val members by lazy { useDb { SteamwarUserTable.select(SteamwarUserTable.id).where { SteamwarUserTable.team eq teamId }.map { it[SteamwarUserTable.id].value } } }
 
     fun size() = useDb { SteamwarUser.find { SteamwarUserTable.team eq teamId }.count().toInt() }
@@ -94,4 +96,16 @@ class Team(id: EntityID<Int>) : IntEntity(id) {
         set(value) = useDb {
             name = value
         }
+
+    var address: String?
+        get() = teamAddress
+        set(value) = useDb {
+            teamAddress = value
+        }
+
+    var port: Int
+        get() = teamPort.toInt()
+        set(value) = useDb {
+            teamPort = value.toUShort()
+        }
 }

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

@@ -0,0 +1,170 @@
+/*
+ *   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.sql
+
+import de.steamwar.sql.internal.useDb
+import org.jetbrains.exposed.v1.core.*
+import org.jetbrains.exposed.v1.core.dao.id.CompositeID
+import org.jetbrains.exposed.v1.core.dao.id.CompositeIdTable
+import org.jetbrains.exposed.v1.core.dao.id.EntityID
+import org.jetbrains.exposed.v1.dao.CompositeEntity
+import org.jetbrains.exposed.v1.dao.CompositeEntityClass
+import org.jetbrains.exposed.v1.jdbc.insertIgnore
+import org.jetbrains.exposed.v1.jdbc.select
+import java.util.concurrent.ConcurrentHashMap
+
+object UserEloTable : CompositeIdTable("UserElo") {
+    val season = integer("Season").entityId()
+    val gameMode = varchar("GameMode", 16).entityId()
+    val userId = reference("UserID", SteamwarUserTable)
+    val elo = integer("Elo")
+
+    override val primaryKey = PrimaryKey(season, gameMode, userId)
+
+    init {
+        addIdColumn(season)
+        addIdColumn(gameMode)
+    }
+}
+
+class UserElo(id: EntityID<CompositeID>) : CompositeEntity(id) {
+    companion object : CompositeEntityClass<UserElo>(UserEloTable) {
+        private const val ELO_DEFAULT = 0
+
+        private val gameModeUserEloCache: MutableMap<String, MutableMap<Int, Int?>> = ConcurrentHashMap()
+        private val emblemCache: MutableMap<Int, String> = ConcurrentHashMap()
+
+        @JvmStatic
+        fun clear() {
+            gameModeUserEloCache.clear()
+            emblemCache.clear()
+        }
+
+        @JvmStatic
+        fun getEloOrDefault(userId: Int, gameMode: String) =
+            getElo(userId, gameMode) ?: ELO_DEFAULT
+
+        @JvmStatic
+        fun getElo(userId: Int, gameMode: String) =
+            gameModeUserEloCache.getOrPut(gameMode) { mutableMapOf() }
+                .getOrPut(userId) { getEloFromDb(userId, gameMode)?.elo }
+
+        private fun getEloFromDb(userId: Int, gameMode: String) = useDb {
+            find { (UserEloTable.userId eq userId) and (UserEloTable.gameMode eq gameMode) and (UserEloTable.season eq Season.getSeason()) }.firstOrNull()
+        }
+
+        @JvmStatic
+        fun getFightsOfSeason(userId: Int, gamemode: String) = useDb {
+            exec(
+                "SELECT COUNT(*) AS Fights FROM FightPlayer INNER JOIN Fight F on FightPlayer.FightID = F.FightID WHERE UserID = ? AND GameMode = ? AND UNIX_TIMESTAMP(StartTime) + Duration >= UNIX_TIMESTAMP(?)",
+                args = listOf(
+                    IntegerColumnType() to userId,
+                    VarCharColumnType() to gamemode,
+                    VarCharColumnType() to Season.getSeasonStart()
+                )
+            ) {
+                return@exec if (it.next()) {
+                    it.getInt("Fights")
+                } else {
+                    0
+                }
+            } ?: 0
+        }
+
+        @JvmStatic
+        fun setElo(userId: Int, gameMode: String, elo: Int) {
+            emblemCache.remove(userId)
+            gameModeUserEloCache.getOrDefault(gameMode, mutableMapOf()).remove(userId)
+            useDb {
+                findByIdAndUpdate(CompositeID {
+                    it[UserEloTable.userId] = userId
+                    it[UserEloTable.gameMode] = gameMode
+                    it[UserEloTable.season] = Season.getSeason()
+                }) {
+                    it.elo = elo
+                } ?: UserEloTable.insertIgnore {
+                    it[UserEloTable.userId] = userId
+                    it[UserEloTable.gameMode] = gameMode
+                    it[UserEloTable.season] = Season.getSeason()
+                    it[UserEloTable.elo] = elo
+                }
+            }
+        }
+
+        @JvmStatic
+        fun getPlacement(elo: Int, gamemode: String) = useDb {
+            UserEloTable.select(UserEloTable.userId.count()).where {
+                (UserEloTable.gameMode eq gamemode) and (UserEloTable.elo greater elo) and (UserEloTable.season eq Season.getSeason())
+            }.firstOrNull()?.get(UserEloTable.userId.count())?.let { it + 1 }?.toInt() ?: -1
+        }
+
+        @JvmStatic
+        fun getEmblem(user: SteamwarUser, rankedModes: List<String>) =
+            emblemCache.getOrPut(user.id.value) {
+                var emblemProgression = -1
+                for (mode in rankedModes) {
+                    if (getFightsOfSeason(user.id.value, mode) == 0) continue
+                    val progression = getProgression(user.id.value, mode)
+                    if (progression > emblemProgression) {
+                        emblemProgression = progression
+                    }
+                }
+                return toEmblem(emblemProgression)
+            }
+
+        @JvmStatic
+        fun getEmblemProgression(gameMode: String, userId: Int): String =
+            when (getProgression(userId, gameMode)) {
+                -1 -> "§8❱❱❱❱ ❂"
+                0 -> "§e❱§8❱❱❱ ❂"
+                1 -> "§e❱❱§8❱❱ ❂"
+                2 -> "§e❱❱❱§8❱ ❂"
+                3 -> "§e❱❱❱❱§8 ❂"
+                4 -> "§8❱❱❱❱ §5❂"
+                else -> throw SecurityException("Progression is not in range")
+            }
+
+
+        @JvmStatic
+        fun getProgression(userId: Int, gameMode: String) = useDb { getElo(userId, gameMode) ?: -1 }.let {
+            when {
+                it < 0 -> -1
+                it < 150 -> 0
+                it < 350 -> 1
+                it < 600 -> 2
+                it < 900 -> 3
+                else -> 4
+            }
+        }
+
+        @JvmStatic
+        fun toEmblem(progression: Int) = when (progression) {
+            -1 -> ""
+            0 -> "§e❱ "
+            1 -> "§e❱❱ "
+            2 -> "§e❱❱❱ "
+            3 -> "§e❱❱❱❱ "
+            4 -> "§5❂ "
+            else -> throw SecurityException("Progression out of range")
+        }
+    }
+
+    var elo by UserEloTable.elo
+}

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

@@ -60,7 +60,7 @@ enum class UserPerm {
         @JvmField
         val prefixes = mapOf(
             PREFIX_NONE to emptyPrefix,
-            PREFIX_YOUTUBER to Prefix("§x§8§A§2§B§E§5", "CC"), // 8A2BE5
+            PREFIX_YOUTUBER to Prefix("§7", "YT"),
             PREFIX_GUIDE to Prefix("§x§e§7§6§2§e§d", "Guide"), // E762ED
             PREFIX_SUPPORTER to Prefix("§x§6§0§9§5§F§B", "Sup"), // 6095FB
             PREFIX_MODERATOR to Prefix("§x§F§F§A§2§5§C", "Mod"), // FFA25C

CommonCore/SQL/src/de/steamwar/sql/YMLWrapper.java

@@ -24,7 +24,10 @@ import org.yaml.snakeyaml.Yaml;
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
-import java.util.*;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -157,22 +160,6 @@ final class YMLWrapper<M, W> {
         }
     }
 
-    public <K, V> Map<K, V> getMap(String path, Function<String, K> keyFunction, Function<String, V> valueFunction) {
-        Object data = this.document.get(path);
-        if (data instanceof Map) {
-            Map<K, V> result = new HashMap<>();
-            ((Map<String, String>) data).forEach((keyString, valueString) -> {
-                K key = keyFunction.apply(keyString.toUpperCase());
-                V value = valueFunction.apply(valueString.toUpperCase());
-                if (key == null || value == null) return;
-                result.put(key, value);
-            });
-            return Collections.unmodifiableMap(result);
-        } else {
-            return Collections.emptyMap();
-        }
-    }
-
     public List<Map<?, ?>> getMapList(String path) {
         Object value = this.document.get(path);
         if (value instanceof List) {

CommonCore/SQL/src/de/steamwar/sql/internal/KotlinDatabase.kt

@@ -23,7 +23,6 @@ import org.intellij.lang.annotations.Language
 import org.jetbrains.exposed.v1.core.ColumnType
 import org.jetbrains.exposed.v1.core.Expression
 import org.jetbrains.exposed.v1.core.ResultRow
-import org.jetbrains.exposed.v1.core.StdOutSqlLogger
 import org.jetbrains.exposed.v1.core.statements.StatementType
 import org.jetbrains.exposed.v1.dao.IntEntity
 import org.jetbrains.exposed.v1.dao.IntEntityClass

FightSystem/FightSystem_21/src/de/steamwar/fightsystem/utils/ReflectionWrapper21.java

@@ -19,27 +19,11 @@
 
 package de.steamwar.fightsystem.utils;
 
-import io.papermc.paper.datacomponent.DataComponentType;
 import io.papermc.paper.datacomponent.DataComponentTypes;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
-import java.util.HashSet;
-import java.util.Set;
-
 public class ReflectionWrapper21 implements ReflectionWrapper {
-    private static final Set<DataComponentType> FORBIDDEN_TYPES = new HashSet<>();
-
-    static {
-        FORBIDDEN_TYPES.add(DataComponentTypes.CUSTOM_NAME);
-        FORBIDDEN_TYPES.add(DataComponentTypes.PROFILE);
-        FORBIDDEN_TYPES.add(DataComponentTypes.UNBREAKABLE);
-        FORBIDDEN_TYPES.add(DataComponentTypes.BLOCK_DATA);
-        FORBIDDEN_TYPES.add(DataComponentTypes.BLOCKS_ATTACKS);
-        FORBIDDEN_TYPES.add(DataComponentTypes.BUNDLE_CONTENTS);
-        FORBIDDEN_TYPES.add(DataComponentTypes.CUSTOM_MODEL_DATA);
-    }
-
     @Override
     public Object explosionHider(Player player, Object packet, PacketHiderFunction packetHiderFunction) {
         return packet;
@@ -47,7 +31,6 @@ public class ReflectionWrapper21 implements ReflectionWrapper {
 
     @Override
     public boolean hasItems(ItemStack stack) {
-        FORBIDDEN_TYPES.forEach(stack::resetData);
+        return stack.getDataTypes().stream().anyMatch(dataComponentType -> dataComponentType != DataComponentTypes.ENCHANTMENTS || dataComponentType != DataComponentTypes.DAMAGE);
-        return false;
     }
 }

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/FightSystem.properties

@@ -44,6 +44,7 @@ REMOVE_HELP=§8/§eremove §8[§eplayer§8]
 NOT_FIGHTLEADER=§cYou are not the fight leader
 WIN_HELP=§8/§7win §8[§eteam §8or §etie§8]
 
+INFO_RANKED=§7Ranked§8: §e{0}
 INFO_LEADER=§7Leader {0}§8: {1}
 INFO_SCHEMATIC=§7Schematic {0}§8: §e{1} §7from {2}, Rank: {3}
 
@@ -166,6 +167,7 @@ TPS_WARNING=§c{0} §7TPS
 UI_PRE_RUNNING=§7Kits distributed
 UI_RUNNING=§aFight started
 UI_SKIP=§7Skipping to next event
+UI_UNRANKED=§7Unranked match
 UI_PLAYER_JOINS=§a§l» {0}{1}
 UI_PLAYER_LEAVES=§c§l« {0}{1}
 UI_LEADER_JOINS=§a§l» {0}Leader {1}

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/FightSystem_de.properties

@@ -154,6 +154,7 @@ COMMAND_CURRENTLY_UNAVAILABLE=§cDieser Befehl ist zu diesem Kampfzeitpunkt nich
 UI_PRE_RUNNING=§7Kits verteilt
 UI_RUNNING=§aArena freigegeben
 UI_SKIP=§7Sprung zum nächsten Ereignis
+UI_UNRANKED=§7Ungewerteter Kampf
 UI_LEADER_JOINS=§a§l» {0}Leader {1}
 UI_PLAYER_DEATH={0}{1} §7ist gestorben
 UI_PLAYER_LEAVE={0}{1} §7hat den Kampf verlassen

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/ai/DummyAI.java

@@ -37,6 +37,7 @@ public class DummyAI extends AI {
     public DummyAI(FightTeam team) {
         super(team, SteamwarUser.get("public"));
 
+        FightStatistics.unrank();
         getEntity().setInvulnerable(true);
     }
 

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/GUI.java

@@ -182,7 +182,7 @@ public class GUI {
                     }
                     Kit prototype = Kit.getAvailableKits(Fight.getFightPlayer(p).isLeader()).get(0);
                     PersonalKit kit = PersonalKit.create(user.getId(), Config.GameModeConfig.Schematic.Type.toDB(), s, prototype.getInventory(), prototype.getArmor());
-                    Bukkit.getScheduler().runTask(FightSystem.getPlugin(), () -> PersonalKitCreator.openKitCreator(p, kit));
+                    PersonalKitCreator.openKitCreator(p, kit);
                 });
                 anvilInv.open();
             });

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/InfoCommand.java

@@ -51,6 +51,7 @@ public class InfoCommand implements CommandExecutor {
         if(!SteamwarUser.get(player.getUniqueId()).hasPerm(UserPerm.CHECK))
             return false;
 
+        FightSystem.getMessage().send("INFO_RANKED", player, !FightStatistics.isUnranked());
         for(FightTeam team : Fight.teams()) {
             if(!team.isLeaderless())
                 FightSystem.getMessage().send("INFO_LEADER", player, team.getColoredName(), team.getLeader().getEntity().getName());

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/UnrankCommand.java

@@ -0,0 +1,51 @@
+/*
+ *   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.fightsystem.commands;
+
+import de.steamwar.fightsystem.ArenaMode;
+import de.steamwar.fightsystem.states.FightState;
+import de.steamwar.fightsystem.states.StateDependentCommand;
+import de.steamwar.fightsystem.utils.FightStatistics;
+import de.steamwar.linkage.Linked;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+@Linked
+public class UnrankCommand implements CommandExecutor {
+
+    public UnrankCommand () {
+        new StateDependentCommand(ArenaMode.VariableTeams, FightState.Setup, "unrank", this);
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if(!(sender instanceof Player))
+            return false;
+        Player player = (Player) sender;
+
+        if(Commands.checkGetLeader(player) == null)
+            return false;
+
+        FightStatistics.unrank();
+        return false;
+    }
+}

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/event/TNTDistributor.java

@@ -35,7 +35,7 @@ public class TNTDistributor {
             if(!fp.isLiving())
                 return;
 
-            fp.ifPlayer(player -> player.getInventory().addItem(new ItemStack(Material.TNT, 1)));
+            fp.ifPlayer(player -> player.getInventory().addItem(new ItemStack(Material.TNT, 20)));
-        })), 20, 20);
+        })), 300, 300);
     }
 }

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightSchematic.java

@@ -45,7 +45,6 @@ import org.bukkit.util.Vector;
 
 import java.io.IOException;
 import java.util.List;
-import java.util.Map;
 import java.util.Random;
 import java.util.logging.Level;
 
@@ -180,24 +179,18 @@ public class FightSchematic extends StateDependent {
 
     @Override
     public void disable() {
-        if (Config.mode == ArenaMode.PREPARE) {
+        if(!Config.GameModeConfig.Schematic.ReplaceObsidianBedrock || Config.mode == ArenaMode.PREPARE)
             return;
-        }
 
         FreezeWorld freezer = null;
-        if (!Config.GameModeConfig.Schematic.ReplacementsWithoutBlockUpdates.isEmpty()) {
+        if(!Config.GameModeConfig.Schematic.ReplaceWithBlockupdates)
             freezer = new FreezeWorld();
-        }
-        for (Map.Entry<Material, Material> replacement : Config.GameModeConfig.Schematic.ReplacementsWithoutBlockUpdates.entrySet()) {
-            replaceSync(replacement.getKey(), replacement.getValue());
-        }
-        if (freezer != null) {
-            freezer.disable();
-        }
 
-        for (Map.Entry<Material, Material> replacement : Config.GameModeConfig.Schematic.ReplacementsWithBlockUpdates.entrySet()) {
+        replaceSync(Material.OBSIDIAN, Material.TNT);
-            replaceSync(replacement.getKey(), replacement.getValue());
+        replaceSync(Material.BEDROCK, Material.SLIME_BLOCK);
-        }
+
+        if(!Config.GameModeConfig.Schematic.ReplaceWithBlockupdates)
+            freezer.disable();
     }
 
     public void pasteTeamName(){

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightTeam.java

@@ -393,6 +393,7 @@ public class FightTeam {
 
     public void pasteSchem(SchematicNode schematic){
         if(schematic.getSchemtype().check()) {
+            FightStatistics.unrank();
             FightSystem.getMessage().broadcast("SCHEMATIC_UNCHECKED", getColoredName());
         }
 

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/HotbarKitListener.java

@@ -34,7 +34,6 @@ import org.bukkit.event.block.Action;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.inventory.EquipmentSlot;
-import org.bukkit.inventory.PlayerInventory;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -63,7 +62,6 @@ public class HotbarKitListener implements Listener {
     public void onInventoryClick(InventoryClickEvent event) {
         int slot = event.getSlot();
         if (slot < 0 || slot >= HotbarKit.HOTBAR_SIZE) return;
-        if (!(event.getClickedInventory() instanceof PlayerInventory)) return;
 
         Player player = (Player) event.getWhoClicked();
         click(player, slot, event);

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/Kit.java

@@ -117,7 +117,7 @@ public class Kit {
         if(kit.isList("Armor"))
             armor = Objects.requireNonNull(kit.getList("Armor")).toArray(new ItemStack[0]);
         else
-            armor = new ItemStack[]{ null, null, null, null};
+            armor = null;
         leaderAllowed = kit.getBoolean("LeaderAllowed");
         memberAllowed = kit.getBoolean("MemberAllowed");
         if(kit.isList("Effects"))
@@ -261,7 +261,7 @@ public class Kit {
         player.getInventory().setContents(inventory);
         if(armor != null)
             player.getInventory().setArmorContents(armor);
-        player.updateInventory(); //TODO issue in 1.21.6?
+        player.updateInventory();
         if(effects != null)
             player.addPotionEffects(effects);
     }

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Permanent.java

@@ -35,7 +35,6 @@ import org.bukkit.GameMode;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
-import org.bukkit.entity.TNTPrimed;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
@@ -181,8 +180,6 @@ public class Permanent implements Listener {
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onExplosion(EntityExplodeEvent e) {
-        if (!(e.getEntity() instanceof TNTPrimed)) return;
-        if (!Config.GameModeConfig.Arena.WaterDamage) return;
         e.blockList().removeIf(block -> {
             if(block.getType() == Material.TNT) {
                 return false;

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/WaterRemover.java

@@ -73,7 +73,7 @@ public class WaterRemover implements Listener {
         event.setYield(0); //No drops (additionally to world config)
 
         FightTeam spawn = tnt.remove(event.getEntity().getEntityId());
-        if(Config.GameModeConfig.Arena.WaterDamage && spawn != null && !spawn.getExtendRegion().inRegion(event.getLocation())) {
+        if(spawn != null && !spawn.getExtendRegion().inRegion(event.getLocation())) {
             Block b = event.getLocation().getBlock();
             for(int y = -1; y <= 1; y++) {
                 for(int z = -1; z <= 1; z++) {

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java

@@ -36,6 +36,7 @@ import de.steamwar.fightsystem.fight.FreezeWorld;
 import de.steamwar.fightsystem.listener.FightScoreboard;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.utils.*;
+import de.steamwar.sql.SchematicData;
 import de.steamwar.sql.SchematicNode;
 import de.steamwar.sql.SteamwarUser;
 import de.steamwar.sql.Team;
@@ -519,12 +520,12 @@ public class PacketProcessor implements Listener {
 
     private void pasteEmbeddedSchem(FightTeam team) throws IOException {
         int schemId = source.readInt();
-        Clipboard clipboard = WorldEditWrapper.impl.getClipboard(new FilterInputStream(source) {
+        Clipboard clipboard = SchematicData.clipboardFromStream(new FilterInputStream(source) {
             @Override
             public void close() {
                 // FAWE 1.12 calls close...
             }
-        });
+        }, WorldEditWrapper.impl.getNativeFormat());
 
         execSync(() -> team.pasteSchem(schemId, clipboard));
     }

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/Recorder.java

@@ -283,7 +283,7 @@ public interface Recorder {
 
         ByteArrayOutputStream buffer = new ByteArrayOutputStream();
         try{
-            copy(NodeData.getLatest(SchematicNode.getSchematicNode(schemId)).schemData(true), buffer);
+            copy(NodeData.getLatest(SchematicNode.getSchematicNode(schemId)).schemData(), buffer);
         }catch (EOFException e) {
             Bukkit.getLogger().log(Level.INFO, "EOFException ignored");
         } catch (IOException e) {

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/FightStatistics.java

@@ -32,16 +32,20 @@ import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.OneShotStateDependent;
 import de.steamwar.fightsystem.winconditions.Wincondition;
 import de.steamwar.linkage.Linked;
+import de.steamwar.network.NetworkSender;
+import de.steamwar.network.packets.common.FightEndsPacket;
 import de.steamwar.sql.EventFight;
 import de.steamwar.sql.EventRelation;
 import de.steamwar.sql.SchematicNode;
 import de.steamwar.sql.SteamwarUser;
+import lombok.Getter;
 import org.bukkit.Bukkit;
 
 import java.nio.file.Files;
 import java.sql.Timestamp;
 import java.time.Instant;
 import java.util.logging.Level;
+import java.util.stream.Collectors;
 
 import static de.steamwar.sql.Fight.create;
 import static de.steamwar.sql.Fight.markReplayAvailable;
@@ -49,6 +53,14 @@ import static de.steamwar.sql.Fight.markReplayAvailable;
 @Linked
 public class FightStatistics {
 
+    @Getter
+    private static boolean unranked = false;
+
+    public static void unrank() {
+        unranked = true;
+        FightUI.addSubtitle("UI_UNRANKED");
+    }
+
     private Timestamp starttime = Timestamp.from(Instant.now());
 
     public FightStatistics() {
@@ -133,6 +145,12 @@ public class FightStatistics {
         } catch (Exception e) {
             Bukkit.getLogger().log(Level.SEVERE, "Failed to save statistics", e);
         }
+
+        if (!Bukkit.getOnlinePlayers().isEmpty() && !unranked) {
+            NetworkSender.send(new FightEndsPacket((byte) win, blueSchem == null ? 0 : blueSchem, redSchem == null ? 0 : redSchem, Fight.getBlueTeam().getPlayers().stream().map(FightPlayer::getUser).map(SteamwarUser::getId).collect(Collectors.toList()), Fight.getRedTeam().getPlayers().stream().map(FightPlayer::getUser).map(SteamwarUser::getId).collect(Collectors.toList()), gameMode, (int)(endTime.getEpochSecond() - starttime.toInstant().getEpochSecond())));
+        }
+
+        unranked = false;
     }
 
     private int getLeader(FightTeam team) {

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionBasePercent.java

@@ -91,7 +91,7 @@ public abstract class WinconditionBasePercent extends Wincondition implements Pr
         @EventHandler
         public void onEntityExplode(EntityExplodeEvent event) {
             if (
-                    event.getEntityType() != EntityType.PRIMED_TNT ||
+                    event.getEntityType() == EntityType.FIREBALL ||
                     !team.getExtendRegion().inRegion(event.getEntity().getLocation()) ||
                     (!Config.GameModeConfig.WinConditionParams.PercentEntern && !Config.GameModeConfig.EnterStages.isEmpty() && Config.GameModeConfig.EnterStages.get(0) >= Wincondition.getTimeOverCountdown().getTimeLeft())
             ) {

FightSystem/build.gradle.kts

@@ -82,13 +82,3 @@ tasks.register<FightServer>("SpaceCraftDev20") {
     worldName = "arenas/AS_Horizon"
     config = "SpaceCraftDev20.yml"
 }
-
-tasks.register<FightServer>("QuickGear20") {
-    group = "run"
-    description = "Run a QuickGear 1.20 Fight Server"
-    dependsOn(":SpigotCore:shadowJar")
-    dependsOn(":FightSystem:shadowJar")
-    template = "QuickGear20"
-    worldName = "arenas/WarGearPark"
-    config = "QuickGear20.yml"
-}

SchematicSystem/SchematicSystem_15/src/de/steamwar/schematicsystem/autocheck/AutoChecker15.java

@@ -53,7 +53,7 @@ public class AutoChecker15 implements AutoChecker.IAutoChecker {
                         checkInventory(result, block, material, new BlockPos(x, y, z));
                     }
 
-                    if(x == min.getBlockX() || x == max.getBlockX() || y == max.getBlockY() || z == min.getBlockZ() || z == max.getBlockZ()) {
+                    if(x == 0 || x == max.getBlockX() - 1 || y == max.getBlockY() - 1 || z == 0 || z == max.getBlockZ() - 1) {
                         result.getDesignBlocks().computeIfAbsent(material, m -> new ArrayList<>()).add(new BlockPos(x, y, z));
                     }
                 }

SchematicSystem/SchematicSystem_Core/src/SchematicSystem.properties

@@ -59,6 +59,7 @@ UTIL_INFO_TYPE_DIR=§eDIR
 UTIL_INFO_RANK=§7Rank: §e{0}
 UTIL_INFO_COLOR=§7Color translation: {0}
 UTIL_INFO_REPLAY=§7Replay playback: {0}
+UTIL_INFO_ELO=§7Elo: §e{0}
 UTIL_INFO_FORMAT=§7Format: §e{0}
 UTIL_INFO_STATUS=§cState: §c{0}: {1}
 UTIL_INFO_MEMBER=§7Members: §e{0}
@@ -104,7 +105,6 @@ UTIL_SUBMIT_COLOR_ON=§aReplace pink to team color
 UTIL_SUBMIT_COLOR_OFF=§cDo not replace pink
 UTIL_SUBMIT_DIRECT=§eSubmit directly
 UTIL_SUBMIT_DIRECT_DONE=§aThe Schematic will be reviewed in a timely manner
-UTIL_SUBMIT_DIRECT_PLAYABLE=§aYou can now use this Schematic in the arena! Good luck and have fun.
 UTIL_SUBMIT_EXTEND=§eExtend Schematic
 UTIL_SUBMIT_EXTEND_DONE=§aThe preparation server is starting
 UTIL_CHECK_TYPE_NOT_FOUND=§cThe type {0} was not found

SchematicSystem/SchematicSystem_Core/src/SchematicSystem_de.properties

@@ -88,7 +88,6 @@ UTIL_SUBMIT_COLOR_ON=§aPink zu Teamfarbe ersetzen
 UTIL_SUBMIT_COLOR_OFF=§cPink nicht ersetzen
 UTIL_SUBMIT_DIRECT=§eDirekt einsenden
 UTIL_SUBMIT_DIRECT_DONE=§aDie Schematic wird zeitnah überprüft
-UTIL_SUBMIT_DIRECT_PLAYABLE=§aDu kannst die Schematic jetzt in der Arena verwenden! Viel Glück und viel Spaß.
 UTIL_SUBMIT_EXTEND=§eSchematic ausfahren
 UTIL_SUBMIT_EXTEND_DONE=§aDer Vorbereitungsserver wird gestartet
 UTIL_INFO_ACTION_REVISIONS_HOVER=§eVersionen anzeigen

SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/autocheck/AutoCheckerResult.java

@@ -20,8 +20,9 @@
 package de.steamwar.schematicsystem.autocheck;
 
 import de.steamwar.core.Core;
-import de.steamwar.schematicsystem.SchematicSystem;
 import de.steamwar.sql.GameModeConfig;
+import de.steamwar.schematicsystem.SchematicSystem;
+import de.steamwar.sql.SchematicType;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.ToString;
@@ -101,9 +102,7 @@ public class AutoCheckerResult {
     }
 
     public boolean isDesignBlastResistanceOK() {
-        return blockScanResult.getDesignBlocks().keySet().stream()
+        return blockScanResult.getDesignBlocks().keySet().stream().map(Material::getBlastResistance).noneMatch(i -> i > type.Schematic.MaxDesignBlastResistance);
-                .filter(material -> material != Material.WATER && material != Material.LAVA)
-                .map(Material::getBlastResistance).noneMatch(i -> i > type.Schematic.MaxDesignBlastResistance);
     }
 
     public void sendErrorMessage(Player p, String schemName) {
@@ -149,7 +148,6 @@ public class AutoCheckerResult {
         });
         if(Core.getVersion() > 12) {
             blockScanResult.getDesignBlocks().forEach((material, poss) -> {
-                if (material == Material.WATER || material == Material.LAVA) return;
                 if(material.getBlastResistance() > type.Schematic.MaxDesignBlastResistance) {
                     poss.forEach(pos -> {
                         SchematicSystem.MESSAGE.sendPrefixless("AUTO_CHECKER_RESULT_DESIGN_BLOCK", p, SchematicSystem.MESSAGE.parse("AUTO_CHECKER_RESULT_TELEPORT_HERE", p), tpCommandTo(pos), material.name(), pos.getBlockX(), pos.getBlockY(), pos.getBlockZ());

SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommandUtils.java

@@ -248,6 +248,7 @@ public class SchematicCommandUtils {
             if (node.getSchemtype().fightType()) {
                 SchematicSystem.MESSAGE.sendPrefixless("UTIL_INFO_COLOR", player, SchematicSystem.MESSAGE.parse(node.replaceColor() ? "ON" : "OFF", player));
                 SchematicSystem.MESSAGE.sendPrefixless("UTIL_INFO_REPLAY", player, SchematicSystem.MESSAGE.parse(node.allowReplay() ? "ON" : "OFF", player));
+                SchematicSystem.MESSAGE.sendPrefixless("UTIL_INFO_ELO", player, node.getElo(Season.getSeason()));
             }
 
             SchematicSystem.MESSAGE.sendPrefixless("UTIL_INFO_FORMAT", player, node.getFileEnding());
@@ -481,7 +482,7 @@ public class SchematicCommandUtils {
                 SchematicSystem.MESSAGE.send("UTIL_TYPE_EXTEND", player);
             } else {
                 node.setSchemtype(type.checkType());
-                SchematicSystem.MESSAGE.send(type.getManualCheck() ? "UTIL_SUBMIT_DIRECT_DONE" : "UTIL_SUBMIT_DIRECT_PLAYABLE", player);
+                SchematicSystem.MESSAGE.send("UTIL_SUBMIT_DIRECT_DONE", player);
             }
         }
     }
@@ -498,7 +499,7 @@ public class SchematicCommandUtils {
         });
         inv.setItem(7, SWItem.getDye(7), (byte) 7, SchematicSystem.MESSAGE.parse("UTIL_SUBMIT_DIRECT", player), click -> {
             node.setSchemtype(type.checkType());
-            SchematicSystem.MESSAGE.send(type.getManualCheck() ? "UTIL_SUBMIT_DIRECT_DONE" : "UTIL_SUBMIT_DIRECT_PLAYABLE", player);
+            SchematicSystem.MESSAGE.send("UTIL_SUBMIT_DIRECT_DONE", player);
             player.closeInventory();
         });
         inv.setItem(8, SWItem.getDye(10), (byte) 10, SchematicSystem.MESSAGE.parse("UTIL_SUBMIT_EXTEND", player), click -> {

SpigotCore/SpigotCore_14/src/de/steamwar/core/WorldEditWrapper14.java

@@ -67,24 +67,26 @@ public class WorldEditWrapper14 implements WorldEditWrapper {
     }
 
     @Override
-    public void setPlayerClipboard(Player player, Clipboard clipboard) {
+    public void setPlayerClipboard(Player player, InputStream is, NodeData.SchematicFormat schemFormat) {
+        Clipboard clipboard = null;
+        try {
+            clipboard = getClipboard(is, schemFormat);
+        } catch (IOException e) {
+            throw new RuntimeException(e.getMessage(), e);
+        }
+
+        if (clipboard == null)
+            throw new NoClipboardException();
+
         Actor actor = WorldEditWrapper.getWorldEditPlugin().wrapCommandSender(player);
         WorldEditWrapper.getWorldEditPlugin().getWorldEdit().getSessionManager().get(actor).setClipboard(new ClipboardHolder(clipboard));
     }
 
     @Override
-    public Clipboard getClipboard(NodeData data) throws IOException {
+    public Clipboard getClipboard(InputStream is, NodeData.SchematicFormat schemFormat) throws IOException {
-        InputStream is = data.schemData(true);
+        try {
-        return readClipboard(is, data.getNodeFormat());
-    }
 
-    @Override
+            switch (schemFormat) {
-    public Clipboard getClipboard(InputStream inputStream) throws IOException {
-        return readClipboard(inputStream, getNativeFormat());
-    }
-
-    private Clipboard readClipboard(InputStream is, NodeData.SchematicFormat format) throws IOException {
-        switch (format) {
                 case SPONGE_V2:
                 case SPONGE_V3:
                     return new SpongeSchematicReader(new NBTInputStream(is), this).read();
@@ -93,6 +95,9 @@ public class WorldEditWrapper14 implements WorldEditWrapper {
                 default:
                     throw new IOException("This schematic format is currently not supported");
             }
+        } catch (NullPointerException e) {
+            throw new NoClipboardException();
+        }
     }
 
     @Override

SpigotCore/SpigotCore_19/build.gradle.kts

@@ -22,7 +22,6 @@ plugins {
 }
 
 dependencies {
-    compileOnly(project(":CommonCore", "default"))
     compileOnly(project(":SpigotCore:SpigotCore_Main", "default"))
     compileOnly(project(":SpigotCore:SpigotCore_14", "default"))
     compileOnly(project(":SpigotCore:SpigotCore_18", "default"))

SpigotCore/SpigotCore_19/src/de/steamwar/core/WorldIdentifier19.java

@@ -1,68 +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.core;
-
-import com.comphenix.tinyprotocol.TinyProtocol;
-import de.steamwar.Reflection;
-import net.minecraft.network.protocol.game.PacketPlayOutLogin;
-import net.minecraft.resources.ResourceKey;
-import net.minecraft.world.level.World;
-
-public class WorldIdentifier19 implements WorldIdentifier.IWorldIdentifier {
-
-    private static ResourceKey<World> resourceKey = null;
-
-    private static final Class<?> resourceKeyClass = Reflection.getClass("net.minecraft.resources.ResourceKey");
-    private static final Class<?> minecraftKeyClass = Reflection.getClass("net.minecraft.resources.MinecraftKey");
-    private static final Reflection.Constructor resourceKeyConstructor = Reflection.getConstructor(resourceKeyClass, minecraftKeyClass, minecraftKeyClass);
-    private static final Reflection.Constructor minecraftKeyConstructor = Reflection.getConstructor(minecraftKeyClass, String.class, String.class);
-
-    @Override
-    public void setResourceKey(String name) {
-        resourceKey = (ResourceKey<World>) resourceKeyConstructor.invoke(minecraftKeyConstructor.invoke("minecraft", "dimension"), minecraftKeyConstructor.invoke("steamwar", name));
-    }
-
-    public WorldIdentifier19() {
-        TinyProtocol.instance.addFilter(PacketPlayOutLogin.class, (player, o) -> {
-            if (resourceKey == null) return o;
-            PacketPlayOutLogin packet = (PacketPlayOutLogin) o;
-
-            return new PacketPlayOutLogin(
-                    packet.b(),
-                    packet.c(),
-                    packet.d(),
-                    packet.e(),
-                    packet.f(),
-                    packet.g(),
-                    packet.h(),
-                    resourceKey,
-                    packet.j(),
-                    packet.k(),
-                    packet.l(),
-                    packet.m(),
-                    packet.n(),
-                    packet.o(),
-                    packet.p(),
-                    packet.q(),
-                    packet.r()
-            );
-        });
-    }
-}

SpigotCore/SpigotCore_19/src/de/steamwar/core/authlib/SteamwarGameProfileRepository19.java

@@ -1,68 +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.core.authlib;
-
-import com.mojang.authlib.Agent;
-import com.mojang.authlib.GameProfile;
-import com.mojang.authlib.GameProfileRepository;
-import com.mojang.authlib.ProfileLookupCallback;
-import de.steamwar.Reflection;
-import de.steamwar.sql.SteamwarUser;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.Services;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class SteamwarGameProfileRepository19 extends SteamwarGameProfileRepository {
-    private static final GameProfileRepository fallback;
-    private static final Reflection.Field<Services> field;
-    private static final Services current;
-
-    static {
-        Class<?> clazz = MinecraftServer.getServer().getClass();
-        field = Reflection.getField(clazz, Services.class, 0);
-        current = field.get(MinecraftServer.getServer());
-        fallback = current.c();
-    }
-
-    @Override
-    public void inject() {
-        Services newServices = new Services(current.a(), current.b(), this, current.d(), current.paperConfigurations());
-        field.set(MinecraftServer.getServer(), newServices);
-    }
-
-    @Override
-    public void findProfilesByNames(String[] strings, Agent agent, ProfileLookupCallback profileLookupCallback) {
-        List<String> unknownNames = new ArrayList<>();
-        for (String name:strings) {
-            SteamwarUser user = SteamwarUser.get(name);
-            if(user == null) {
-                unknownNames.add(name);
-                continue;
-            }
-
-            profileLookupCallback.onProfileLookupSucceeded(new GameProfile(user.getUUID(), user.getUserName()));
-        }
-        if(!unknownNames.isEmpty()) {
-            fallback.findProfilesByNames(unknownNames.toArray(new String[0]), agent, profileLookupCallback);
-        }
-    }
-}

SpigotCore/SpigotCore_20/src/de/steamwar/core/WorldIdentifier20.java

@@ -1,70 +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.core;
-
-import com.comphenix.tinyprotocol.TinyProtocol;
-import de.steamwar.Reflection;
-import net.minecraft.network.protocol.game.PacketPlayOutLogin;
-import net.minecraft.resources.ResourceKey;
-import net.minecraft.world.level.World;
-
-public class WorldIdentifier20 implements WorldIdentifier.IWorldIdentifier {
-
-    private static ResourceKey<World> resourceKey = null;
-
-    private static final Reflection.Field<Integer> playerId = Reflection.getField(PacketPlayOutLogin.class, int.class, 0);
-    private static final Class<?> resourceKeyClass = Reflection.getClass("net.minecraft.resources.ResourceKey");
-    private static final Class<?> minecraftKeyClass = Reflection.getClass("net.minecraft.resources.MinecraftKey");
-    private static final Reflection.Constructor resourceKeyConstructor = Reflection.getConstructor(resourceKeyClass, minecraftKeyClass, minecraftKeyClass);
-    private static final Reflection.Constructor minecraftKeyConstructor = Reflection.getConstructor(minecraftKeyClass, String.class, String.class);
-
-    @Override
-    public void setResourceKey(String name) {
-        resourceKey = (ResourceKey<World>) resourceKeyConstructor.invoke(minecraftKeyConstructor.invoke("minecraft", "dimension"), minecraftKeyConstructor.invoke("steamwar", name));
-    }
-
-    public WorldIdentifier20() {
-        TinyProtocol.instance.addFilter(PacketPlayOutLogin.class, (player, o) -> {
-            if (resourceKey == null) return o;
-            PacketPlayOutLogin packet = (PacketPlayOutLogin) o;
-
-            return new PacketPlayOutLogin(
-                    playerId.get(packet),
-                    packet.c(),
-                    packet.d(),
-                    packet.e(),
-                    packet.f(),
-                    packet.g(),
-                    packet.h(),
-                    resourceKey,
-                    packet.j(),
-                    packet.k(),
-                    packet.l(),
-                    packet.m(),
-                    packet.n(),
-                    packet.o(),
-                    packet.p(),
-                    packet.q(),
-                    packet.r(),
-                    packet.s()
-            );
-        });
-    }
-}

SpigotCore/SpigotCore_21/src/de/steamwar/core/WorldEditWrapper21.java

@@ -19,13 +19,12 @@
 
 package de.steamwar.core;
 
-import com.fastasyncworldedit.core.extent.clipboard.io.FastSchematicReaderV2;
-import com.fastasyncworldedit.core.extent.clipboard.io.FastSchematicReaderV3;
 import com.sk89q.jnbt.NBTInputStream;
 import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldedit.extent.clipboard.Clipboard;
-import com.sk89q.worldedit.extent.clipboard.io.*;
+import com.sk89q.worldedit.extent.clipboard.io.BuiltInClipboardFormat;
-import com.sk89q.worldedit.extent.clipboard.io.sponge.SpongeSchematicV1Reader;
+import com.sk89q.worldedit.extent.clipboard.io.ClipboardWriter;
+import com.sk89q.worldedit.extent.clipboard.io.MCEditSchematicReader;
 import com.sk89q.worldedit.extent.clipboard.io.sponge.SpongeSchematicV2Reader;
 import com.sk89q.worldedit.extent.clipboard.io.sponge.SpongeSchematicV3Reader;
 import com.sk89q.worldedit.math.Vector3;
@@ -38,12 +37,10 @@ import org.bukkit.util.Vector;
 import org.enginehub.linbus.stream.LinBinaryIO;
 
 import java.io.DataInputStream;
-import java.io.FilterInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.function.Function;
 
 public class WorldEditWrapper21 implements WorldEditWrapper {
 
@@ -57,68 +54,43 @@ public class WorldEditWrapper21 implements WorldEditWrapper {
     }
 
     @Override
-    public void setPlayerClipboard(Player player, Clipboard clipboard) {
+    public void setPlayerClipboard(Player player, InputStream is, NodeData.SchematicFormat schemFormat) {
+        Clipboard clipboard = null;
+        try {
+            clipboard = getClipboard(is, schemFormat);
+        } catch (IOException e) {
+            throw new RuntimeException(e.getMessage(), e);
+        }
+
+        if (clipboard == null)
+            throw new SecurityException("Clipboard is null");
+
         Actor actor = WorldEditWrapper.getWorldEditPlugin().wrapCommandSender(player);
         WorldEditWrapper.getWorldEditPlugin().getWorldEdit().getSessionManager().get(actor).setClipboard(new ClipboardHolder(clipboard));
     }
 
     @Override
-    public Clipboard getClipboard(NodeData data) throws IOException {
-        ResetableInputStream is = new ResetableInputStream(data.schemData(false));
-        for (ClipboardFormat clipboardFormat : ClipboardFormats.getAll()) {
-            FilterInputStream fis = new FilterInputStream(is) {
-                @Override
-                public void close() throws IOException {
-                    // Ignore close call!
-                }
-            };
-            boolean canBeRead = clipboardFormat.isFormat(fis);
-            is.reset();
-            if (!canBeRead) continue;
-            return clipboardFormat.load(is);
-        }
-        throw new IOException("No clipboard found");
-    }
-
-    private static final Function<InputStream, ClipboardReader> FastV3 = FastSchematicReaderV3::new;
     @SuppressWarnings("removal")
-    private static final Function<InputStream, ClipboardReader> FastV2 = inputStream -> new FastSchematicReaderV2(new NBTInputStream(inputStream));
+    public Clipboard getClipboard(InputStream is, NodeData.SchematicFormat ignored) throws IOException {
-    @SuppressWarnings("removal")
+        ResetableInputStream ris = new ResetableInputStream(is);
-    private static final Function<InputStream, ClipboardReader> McEdit = inputStream -> new MCEditSchematicReader(new NBTInputStream(inputStream));
+        for (NodeData.SchematicFormat schemFormat : NodeData.SchematicFormat.values()) {
-    private static final Function<InputStream, ClipboardReader> SpongeV3 = inputStream -> new SpongeSchematicV3Reader(LinBinaryIO.read(new DataInputStream(inputStream)));
-    private static final Function<InputStream, ClipboardReader> SpongeV2 = inputStream -> new SpongeSchematicV2Reader(LinBinaryIO.read(new DataInputStream(inputStream)));
-    private static final Function<InputStream, ClipboardReader> SpongeV1 = inputStream -> new SpongeSchematicV1Reader(LinBinaryIO.read(new DataInputStream(inputStream)));
-
-    private static final Function<InputStream, ClipboardReader>[] READERS = new Function[]{
-            FastV3,
-            FastV2,
-            SpongeV3,
-            SpongeV2,
-            SpongeV1,
-            McEdit
-    };
-
-    @Override
-    public Clipboard getClipboard(InputStream inputStream) throws IOException {
-        ResetableInputStream is = new ResetableInputStream(inputStream);
-        for (Function<InputStream, ClipboardReader> reader : READERS) {
-            FilterInputStream fis = new FilterInputStream(is) {
-                @Override
-                public void close() throws IOException {
-                    // Ignore close call!
-                }
-            };
             try {
-                return reader.apply(fis).read();
+                Clipboard clipboard = switch (schemFormat) {
+                    case MCEDIT -> new MCEditSchematicReader(new NBTInputStream(ris)).read();
+                    case SPONGE_V2 -> new SpongeSchematicV2Reader(LinBinaryIO.read(new DataInputStream(ris))).read();
+                    case SPONGE_V3 -> new SpongeSchematicV3Reader(LinBinaryIO.read(new DataInputStream(ris))).read();
+                };
+                ris.close();
+                return clipboard;
             } catch (Exception e) {
-                is.reset();
+                // Ignore
             }
+            ris.reset();
         }
-        is.close();
         throw new IOException("No clipboard found");
     }
 
-    private static class ResetableInputStream extends InputStream {
+    private class ResetableInputStream extends InputStream {
 
         private InputStream inputStream;
         private int pointer = 0;

SpigotCore/SpigotCore_21/src/de/steamwar/core/WorldIdentifier21.java

@@ -1,73 +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.core;
-
-import com.comphenix.tinyprotocol.TinyProtocol;
-import de.steamwar.Reflection;
-import net.minecraft.network.protocol.game.ClientboundLoginPacket;
-import net.minecraft.network.protocol.game.CommonPlayerSpawnInfo;
-import net.minecraft.resources.ResourceKey;
-import net.minecraft.world.level.Level;
-
-public class WorldIdentifier21 implements WorldIdentifier.IWorldIdentifier {
-
-    private static ResourceKey<Level> resourceKey = null;
-
-    private static final Class<?> resourceKeyClass = Reflection.getClass("net.minecraft.resources.ResourceKey");
-    private static final Class<?> minecraftKeyClass = Reflection.getClass("net.minecraft.resources.MinecraftKey");
-    private static final Reflection.Constructor resourceKeyConstructor = Reflection.getConstructor(resourceKeyClass, minecraftKeyClass, minecraftKeyClass);
-    private static final Reflection.Constructor minecraftKeyConstructor = Reflection.getConstructor(minecraftKeyClass, String.class, String.class);
-
-    @Override
-    public void setResourceKey(String name) {
-        resourceKey = (ResourceKey<Level>) resourceKeyConstructor.invoke(minecraftKeyConstructor.invoke("minecraft", "dimension"), minecraftKeyConstructor.invoke("steamwar", name));
-    }
-
-    public WorldIdentifier21() {
-        TinyProtocol.instance.addFilter(ClientboundLoginPacket.class, (player, o) -> {
-            if (resourceKey == null) return o;
-            ClientboundLoginPacket packet = (ClientboundLoginPacket) o;
-
-            return new ClientboundLoginPacket(packet.playerId(),
-                    packet.hardcore(),
-                    packet.levels(),
-                    packet.maxPlayers(),
-                    packet.chunkRadius(),
-                    packet.simulationDistance(),
-                    packet.reducedDebugInfo(),
-                    packet.showDeathScreen(),
-                    packet.doLimitedCrafting(),
-                    new CommonPlayerSpawnInfo(
-                            packet.commonPlayerSpawnInfo().dimensionType(),
-                            resourceKey,
-                            packet.commonPlayerSpawnInfo().seed(),
-                            packet.commonPlayerSpawnInfo().gameType(),
-                            packet.commonPlayerSpawnInfo().previousGameType(),
-                            packet.commonPlayerSpawnInfo().isDebug(),
-                            packet.commonPlayerSpawnInfo().isFlat(),
-                            packet.commonPlayerSpawnInfo().lastDeathLocation(),
-                            packet.commonPlayerSpawnInfo().portalCooldown(),
-                            packet.commonPlayerSpawnInfo().seaLevel()
-                    ),
-                    packet.enforcesSecureChat()
-            );
-        });
-    }
-}

SpigotCore/SpigotCore_8/src/de/steamwar/core/WorldEditWrapper8.java

@@ -22,10 +22,7 @@ package de.steamwar.core;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Maps;
 import com.sk89q.jnbt.*;
-import com.sk89q.worldedit.BlockVector;
+import com.sk89q.worldedit.*;
-import com.sk89q.worldedit.Vector;
-import com.sk89q.worldedit.WorldEdit;
-import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.bukkit.BukkitWorld;
 import com.sk89q.worldedit.extension.input.ParserContext;
@@ -60,25 +57,22 @@ public class WorldEditWrapper8 implements WorldEditWrapper {
     }
 
     @Override
-    public void setPlayerClipboard(Player player, Clipboard clipboard) {
+    public void setPlayerClipboard(Player player, InputStream is, NodeData.SchematicFormat schemFormat) {
         WorldData world = new BukkitWorld(player.getWorld()).getWorldData();
+        Clipboard clipboard;
+        try {
+            clipboard = getClipboard(is, schemFormat);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+
         Actor actor = WorldEditWrapper.getWorldEditPlugin().wrapCommandSender(player);
         WorldEditWrapper.getWorldEditPlugin().getWorldEdit().getSessionManager().get(actor).setClipboard(new ClipboardHolder(clipboard, world));
     }
 
     @Override
-    public Clipboard getClipboard(NodeData data) throws IOException {
+    public Clipboard getClipboard(InputStream is, NodeData.SchematicFormat schemFormat) throws IOException {
-        InputStream is = data.schemData(true);
+        switch (schemFormat) {
-        return readClipboard(is, data.getNodeFormat());
-    }
-
-    @Override
-    public Clipboard getClipboard(InputStream inputStream) throws IOException {
-        return readClipboard(inputStream, getNativeFormat());
-    }
-
-    private Clipboard readClipboard(InputStream is, NodeData.SchematicFormat format) throws IOException {
-        switch (format) {
             case MCEDIT:
                 return new SchematicReader(new NBTInputStream(is)).read(WorldEdit.getInstance().getServer().getWorlds().get(0).getWorldData());
             case SPONGE_V2:

SpigotCore/SpigotCore_8/src/de/steamwar/core/WorldIdentifier8.java

@@ -1,27 +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.core;
-
-public class WorldIdentifier8 implements WorldIdentifier.IWorldIdentifier {
-
-    @Override
-    public void setResourceKey(String name) {
-    }
-}

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

@@ -66,7 +66,7 @@ public class Core extends JavaPlugin {
 	private static String serverName = "";
 
 	public static void setServerName(String serverName) {
-		if (Core.serverName.isEmpty()) {
+		if (serverName.isEmpty()) {
 			Core.serverName = serverName;
 		}
 	}

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

@@ -20,7 +20,6 @@
 package de.steamwar.core;
 
 import de.steamwar.message.Message;
-import lombok.Data;
 import lombok.NonNull;
 import lombok.experimental.Delegate;
 import net.md_5.bungee.api.ChatMessageType;
@@ -92,16 +91,10 @@ public class SWPlayer {
         return players.values().stream();
     }
 
-    public static <T extends Component> @NonNull Stream<SWPlayerWithComponent<T>> allWithSingleComponent(Class<T> component) {
+    public static <T extends Component> @NonNull Stream<Pair<SWPlayer, T>> allWithSingleComponent(Class<T> component) {
         return players.values().stream()
                 .filter(player -> player.components.containsKey(component))
-                .map(player -> new SWPlayerWithComponent<>(player, (T) player.components.get(component)));
+                .map(player -> Pair.of(player, (T) player.components.get(component)));
-    }
-
-    @Data
-    public static final class SWPlayerWithComponent<T extends Component> {
-        private final SWPlayer player;
-        private final T component;
     }
 
     @Delegate

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

@@ -22,10 +22,10 @@ package de.steamwar.core;
 import com.sk89q.worldedit.EmptyClipboardException;
 import com.sk89q.worldedit.bukkit.WorldEditPlugin;
 import com.sk89q.worldedit.extent.clipboard.Clipboard;
-import com.sk89q.worldedit.math.transform.Transform;
-import com.sk89q.worldedit.regions.Region;
 import com.sk89q.worldedit.session.ClipboardHolder;
 import de.steamwar.sql.NoClipboardException;
+import com.sk89q.worldedit.math.transform.Transform;
+import com.sk89q.worldedit.regions.Region;
 import de.steamwar.sql.NodeData;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
@@ -38,10 +38,8 @@ public interface WorldEditWrapper {
     WorldEditWrapper impl = VersionDependent.getVersionImpl(Core.getInstance());
 
     InputStream getPlayerClipboard(Player player);
-
+    void setPlayerClipboard(Player player, InputStream is, NodeData.SchematicFormat schemFormat);
-    void setPlayerClipboard(Player player, Clipboard clipboard);
+    Clipboard getClipboard(InputStream is, NodeData.SchematicFormat schemFormat) throws IOException;
-    Clipboard getClipboard(NodeData data) throws IOException;
-    Clipboard getClipboard(InputStream inputStream) throws IOException;
 
     Vector getOrigin(Clipboard clipboard);
     Vector getMinimum(Region region);

SpigotCore/SpigotCore_Main/src/de/steamwar/sql/PersonalKit.java

@@ -55,7 +55,7 @@ public class PersonalKit {
 
     public ItemStack[] getArmor(){
         YamlConfiguration config = YamlConfiguration.loadConfiguration(new StringReader(getRawArmor()));
-        return Objects.requireNonNull(config.getList("Armor")).toArray(new ItemStack[4]);
+        return Objects.requireNonNull(config.getList("Armor")).toArray(new ItemStack[0]);
     }
 
     public void setInUse() {

SpigotCore/SpigotCore_Main/src/de/steamwar/sql/SQLWrapperImpl.java

@@ -28,9 +28,9 @@ import org.bukkit.entity.Player;
 
 import java.io.File;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 public class SQLWrapperImpl implements SQLWrapper<Material> {
 
@@ -46,12 +46,11 @@ public class SQLWrapperImpl implements SQLWrapper<Material> {
 
     @Override
     public List<Material> getMaterialWithGreaterBlastResistance(double maxBlastResistance) {
-        if (Core.getVersion() <= 12) {
+        Stream<Material> stream = Arrays.stream(Material.values());
-            return Collections.emptyList();
+        if (Core.getVersion() > 12) {
+            stream = stream.filter(material -> !material.isLegacy());
         }
-        return Arrays.stream(Material.values())
+        return stream.filter(Material::isBlock)
-                .filter(material -> !material.isLegacy())
-                .filter(Material::isBlock)
                 .filter(material -> material.getBlastResistance() > maxBlastResistance)
                 .collect(Collectors.toList());
     }

SpigotCore/SpigotCore_Main/src/de/steamwar/sql/SchematicData.java

@@ -29,6 +29,14 @@ import java.io.InputStream;
 
 public class SchematicData {
 
+    public static Clipboard clipboardFromStream(InputStream is, NodeData.SchematicFormat schemFormat) {
+        try {
+            return WorldEditWrapper.impl.getClipboard(is, schemFormat);
+        } catch (IOException e) {
+            throw new SecurityException("Could not read schem", e);
+        }
+    }
+
     private final NodeData data;
 
     public SchematicData(SchematicNode node) {
@@ -52,11 +60,11 @@ public class SchematicData {
     }
 
     public Clipboard load() throws IOException, NoClipboardException {
-        return WorldEditWrapper.impl.getClipboard(data);
+        return WorldEditWrapper.impl.getClipboard(data.schemData(), data.getNodeFormat());
     }
 
     public void loadToPlayer(Player player) throws IOException, NoClipboardException {
-        WorldEditWrapper.impl.setPlayerClipboard(player, WorldEditWrapper.impl.getClipboard(data));
+        WorldEditWrapper.impl.setPlayerClipboard(player, data.schemData(), data.getNodeFormat());
     }
 
     public static void saveFromPlayer(Player player, SchematicNode node) throws IOException, NoClipboardException {

Teamserver/src/de/steamwar/teamserver/listener/SelectAdjacent.java

@@ -0,0 +1,181 @@
+/*
+ *   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.teamserver.listener;
+
+import com.sk89q.worldedit.bukkit.BukkitWorld;
+import com.sk89q.worldedit.bukkit.WorldEditPlugin;
+import com.sk89q.worldedit.math.BlockVector3;
+import com.sk89q.worldedit.regions.selector.CuboidRegionSelector;
+import com.sk89q.worldedit.world.World;
+import de.steamwar.core.WorldEditRenderer;
+import de.steamwar.linkage.Linked;
+import de.steamwar.linkage.MinVersion;
+import de.steamwar.teamserver.Builder;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.block.Action;
+import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
+import org.bukkit.scheduler.BukkitTask;
+import org.bukkit.util.Vector;
+
+import java.util.*;
+import java.util.function.Predicate;
+
+@Linked
+@MinVersion(20)
+public class SelectAdjacent implements Listener {
+
+    private Vector[] FACES = {
+            new Vector(1, 0, 0),
+            new Vector(-1, 0, 0),
+            new Vector(0, 1, 0),
+            new Vector(0, -1, 0),
+            new Vector(0, 0, 1),
+            new Vector(0, 0, -1),
+
+            new Vector(1, 1, 0),
+            new Vector(1, -1, 0),
+            new Vector(1, 0, 1),
+            new Vector(1, 0, -1),
+            new Vector(-1, 1, 0),
+            new Vector(-1, -1, 0),
+            new Vector(-1, 0, 1),
+            new Vector(-1, 0, -1),
+            new Vector(0, 1, 1),
+            new Vector(0, 1, -1),
+            new Vector(0, -1, 1),
+            new Vector(0, -1, -1),
+    };
+
+    private Map<Player, Selector> selectors = new HashMap<>();
+
+    @EventHandler
+    public void onPlayerInteract(PlayerInteractEvent event) {
+        if (!event.hasItem()) return;
+        if (event.getItem().getType() != Material.WOODEN_AXE) return;
+        if (!event.getPlayer().isSneaking()) return;
+        if (event.getAction() != Action.LEFT_CLICK_BLOCK) return;
+        Selector selector = selectors.get(event.getPlayer());
+        if (selector != null) selector.cancel();
+        Material material = event.getPlayer().getInventory().getItemInOffHand().getType();
+        if (material.isAir()) {
+            selector = new Selector(event.getClickedBlock(), event.getPlayer(), __ -> true);
+        } else {
+            selector = new Selector(event.getClickedBlock(), event.getPlayer(), type -> type == material);
+        }
+        selectors.put(event.getPlayer(), selector);
+    }
+
+    @EventHandler
+    public void onPlayerQuit(PlayerQuitEvent event) {
+        Selector selector = selectors.remove(event.getPlayer());
+        if (selector != null) selector.cancel();
+    }
+
+    private static final WorldEditPlugin WORLDEDIT_PLUGIN = Objects.requireNonNull((WorldEditPlugin) Bukkit.getPluginManager().getPlugin("WorldEdit"));
+    private static final World BUKKITWORLD = new BukkitWorld(Bukkit.getWorlds().get(0));
+
+    private class Selector {
+
+        private static final int MAX_BLOCKS = 1_000_000;
+
+        private int minX;
+        private int minY;
+        private int minZ;
+        private int maxX;
+        private int maxY;
+        private int maxZ;
+
+        private BukkitTask bukkitTask;
+        private Predicate<Material> predicate;
+        private Set<Location> seen = new HashSet<>();
+        private Set<Location> toCalc = new HashSet<>();
+
+        public Selector(Block block, Player player, Predicate<Material> predicate) {
+            this.predicate = predicate;
+            toCalc.add(block.getLocation());
+            minX = block.getX();
+            minY = block.getY();
+            minZ = block.getZ();
+            maxX = block.getX();
+            maxY = block.getY();
+            maxZ = block.getZ();
+
+            bukkitTask = Bukkit.getScheduler().runTaskTimer(Builder.getInstance(), () -> {
+                run();
+
+                long volume = (long)(maxX - minX + 1) * (long)(maxY - minY + 1) * (long)(maxZ - minZ + 1);
+                player.sendTitle("", "§e" + volume + " §7Blocks", 0, 5, 0);
+
+                WORLDEDIT_PLUGIN.getSession(player).setRegionSelector(BUKKITWORLD, new CuboidRegionSelector(BUKKITWORLD, BlockVector3.at(minX, minY, minZ), BlockVector3.at(maxX, maxY, maxZ)));
+                WorldEditRenderer.renderPlayer(player);
+
+                // boolean finished = toCalc.stream().allMatch(location -> {
+                //     return location.getBlockX() >= minX && location.getBlockY() >= minY && location.getBlockZ() >= minZ &&
+                //             location.getBlockX() <= maxX && location.getBlockY() <= maxY && location.getBlockZ() <= maxZ;
+                // });
+
+                if (toCalc.isEmpty() || seen.size() > MAX_BLOCKS) {
+                    bukkitTask.cancel();
+                    player.sendTitle("§aDone", "§e" + volume + " §7Blocks", 0, 20, 5);
+                }
+            }, 1, 1);
+        }
+
+        private void cancel() {
+            bukkitTask.cancel();
+        }
+
+        private void run() {
+            Set<Location> current = toCalc;
+            toCalc = new HashSet<>();
+
+            for (Location location : current) {
+                Block block = location.getBlock();
+                if (block.isEmpty() || block.isLiquid()) continue;
+                if (!predicate.test(block.getType())) continue;
+                seen.add(location);
+
+                minX = Math.min(minX, location.getBlockX());
+                maxX = Math.max(maxX, location.getBlockX());
+                minY = Math.min(minY, location.getBlockY());
+                maxY = Math.max(maxY, location.getBlockY());
+                minZ = Math.min(minZ, location.getBlockZ());
+                maxZ = Math.max(maxZ, location.getBlockZ());
+
+                for (Vector face : FACES) {
+                    Block next = block.getRelative(face.getBlockX(), face.getBlockY(), face.getBlockZ());
+                    if (next.isEmpty() || next.isLiquid()) continue;
+                    if (!predicate.test(next.getType())) continue;
+                    Location loc = next.getLocation();
+                    if (seen.contains(loc)) continue;
+                    toCalc.add(loc);
+                }
+            }
+        }
+    }
+}

VelocityCore/Dependencies/build.gradle.kts

@@ -57,6 +57,7 @@ dependencies {
     implementation(libs.mysql)
 
     implementation(libs.msgpack)
+    implementation(libs.apolloprotos)
 
     implementation(libs.nbt)
 

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

@@ -17,19 +17,6 @@
 #   along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-LOCALE = English
-
-SETTINGS_TITLE = Settings
-SETTINGS_LOCALE_ITEM = §fLocale
-SETTINGS_LOCALE_CURRENT = §fCurrent locale §e{0}§8.
-SETTINGS_LOCALE_LOCKED = §cLocked§f to the current locale§8.
-SETTINGS_LOCALE_UNLOCKED = §aChanged§f by Client locale§8.
-SETTINGS_PREFIX_ITEM = §fChat prefix
-SETTINGS_PREFIX_SELECTED = §a> {0}
-SETTINGS_PREFIX_UNSELECTED = §f> {0}
-SETTINGS_PREFIX_SW = §eS§8W
-SETTINGS_PREFIX_TEAM = §{0}{1}
-
 COMMAND_SYSTEM_ERROR = §cError executing the command!
 COMMAND_HELP_HEAD=§7---=== (§e{0}§7) ===---
 
@@ -221,6 +208,14 @@ NOTEAMSERVER_UNTIL=§7You are excluded from §e§lteam servers§7 §euntil {0}§
 UNNOTEAMSERVER_ERROR=§cThe player is not excluded from team servers.
 UNNOTEAMSERVER=§e{0} §7may now set §e§lteam servers§7 again§8.
 
+NOEVENT_TEAM=§e{0} §7was excluded from §e{1} {2} §7from §e§levents§8: §f{3}
+NOEVENT_PERMA=§7You are §epermanently§7 excluded from §e§levents§8: §e{0}
+NOEVENT_UNTIL=§7You are excluded from §e§levents§7 §euntil {0}§8: §e{1}
+NOEVENT_ERROR=§cThe player is not excluded from events.
+UNNOEVENT=§e{0} §7may now participate in §e§levents§7 again§8.
+NOEVENT_PLAYER_PUNISHED=§7A player in your Team is excluded from §e§levents§8.§7 Your team cannot participate§8.
+NOEVENT_INVITED_PUNISHED=§cThe player you invited cannot attend §e§levents§8.§7 If they join your future Event participation will be restricted§8.
+
 NOTE_TEAM=§e{0} §7received a §e§lnote§7 from §e{1} {2}: §f{3}
 
 #BugCommand
@@ -432,6 +427,7 @@ TEAM_NOT_IN_EVENT=§cThis is not possible during an event.
 TEAM_HELP_HEADER=§7Manage your team with §e/team.
 TEAM_HELP_LIST=§8/§7team list §8- §7List all teams.
 TEAM_HELP_INFO=§8/§7team info §8- §7Get information on a team.
+TEAM_HELP_TP=§8/§7team tp §8(§7Team§8) §8- §7Teleport to a team server.
 TEAM_HELP_CREATE=§8/§7team create §8- §7Create your own team.
 TEAM_HELP_JOIN=§8/§7team join §8- §7Join a team.
 TEAM_HELP_CHAT=§8/§7teamchat §8- §7Send messages to your team.
@@ -668,6 +664,14 @@ HOURS_PLAYED=§7Your playtime is§8: §e{0}h
 #Arena command
 ARENA_NOT_FOUND=§cThe specified arena could not be found
 
+#Rank
+RANK_PLAYER_NOT_FOUND=§cPlayer not found
+RANK_PLAYER_SELF=§eRank §7Season §e{0}
+RANK_PLAYER_FOUND=§eRank §7of §e{0} §7Season §e{1}
+RANK_DATA={0} §e{1} {2}
+RANK_UNPLACED=§7unranked
+RANK_PLACED=§e{0}§8. §7with §e{1} §7Elo§8.
+
 #Fabric Mod Sender
 MODIFICATION_BAN_MESSAGE=You tried to bypass / modify the FabricModSender!
 MODIFICATION_BAN_LOG={0} has tried to edit / bypass the FabricModSender! Reason: {1}

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

@@ -17,8 +17,6 @@
 #   along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-LOCALE = Deutsch
-
 COMMAND_SYSTEM_ERROR = §cFehler beim Ausführen des Befehls!
 
 PREFIX=§eSteam§8War»
@@ -192,6 +190,14 @@ NOTEAMSERVER_UNTIL=§7Du bist §ebis zum {0} §7vom §e§lTeamserver§7 setzen a
 UNNOTEAMSERVER_ERROR=§cDer Spieler ist nicht vom Teamserver setzten ausgeschlossen.
 UNNOTEAMSERVER=§e{0} §7darf nun wieder §e§lTeamserver§7 setzen§8.
 
+NOEVENT_TEAM=§e{0} §7wurde von §e{1} {2} §7aus §e§lEvents§8 ausgeschlossen: §f{3}
+NOEVENT_PERMA=§7Du bist §epermanent§7 von §e§lEvents§8 ausgeschlossen: §e{0}
+NOEVENT_UNTIL=§7Du bist §ebis zum {0}§7 von §e§lEvents§7 ausgeschlossen§8: §e{1}
+NOEVENT_ERROR=§cDer Spieler ist nicht von Events ausgeschlossen.
+UNNOEVENT=§e{0} §7kann nun wieder an §e§lEvents§7 teilnehmen§8.
+NOEVENT_PLAYER_PUNISHED=§7Ein Spieler deines Teams ist von §e§lEvents§7 ausgeschlossen§8.§7 Dein Team kann nicht teilnehmen§8.
+NOEVENT_INVITED_PUNISHED=§cDer von dir eingeladene Spieler kann nicht an §e§lEvents§7 teilnehmen§8.§7 Wenn er beitritt, wird deine zukünftige Teilnahme an Events eingeschränkt§8.
+
 NOTE_TEAM=§e{0} §7erhielt von §e{1} {2} §7die §e§lNotiz§7§8: §f{3}
 
 #BugCommand
@@ -393,6 +399,7 @@ TEAM_NOT_IN_EVENT=§cDies ist während eines Events nicht möglich.
 TEAM_HELP_HEADER=§7Mit §e/team §7verwaltest du dein Team.
 TEAM_HELP_LIST=§8/§7team list §8- §7Liste alle Teams auf.
 TEAM_HELP_INFO=§8/§7team info §8- §7Informiere dich über ein Team.
+TEAM_HELP_TP=§8/§7team tp §8(§7Team§8) §8- §7Teleportiert zum Teamserver.
 TEAM_HELP_CREATE=§8/§7team create §8- §7Erstelle dein eigenes Team.
 TEAM_HELP_JOIN=§8/§7team join §8- §7Trete einem Team bei.
 TEAM_HELP_CHAT=§8/§7teamchat §8- §7Sende Nachrichten an dein Team.
@@ -625,6 +632,14 @@ HOURS_PLAYED=§7Deine Spielzeit beträgt§8: §e{0}h
 #Arena command
 ARENA_NOT_FOUND=§cDie angegebene Arena konnte nicht gefunden werden
 
+#Rank
+RANK_PLAYER_NOT_FOUND=§cSpieler nicht gefunden
+RANK_PLAYER_SELF=§eRang §7Saison §e{0}
+RANK_PLAYER_FOUND=§eRang §7von §e{0} §7Saison §e{1}
+RANK_DATA={0} §e{1} {2}
+RANK_UNPLACED=§7unplatziert
+RANK_PLACED=§e{0}§8. §7mit §e{1} §7Elo§8.
+
 #Fabric Mod Sender
 MODIFICATION_BAN_MESSAGE=Du hast probiert den FabricModSender zu umgehen / zu modifizieren!
 MODIFICATION_BAN_LOG={0} hat probiert den Fabric Mod Sender zu editieren / umzugehen! Grund: {1}

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

@@ -38,6 +38,7 @@ import de.steamwar.persistent.ReloadablePlugin;
 import de.steamwar.sql.Punishment;
 import de.steamwar.sql.SteamwarUser;
 import de.steamwar.sql.Team;
+import de.steamwar.sql.UserElo;
 import de.steamwar.sql.internal.Statement;
 import de.steamwar.velocitycore.commands.PunishmentCommand;
 import de.steamwar.velocitycore.commands.ServerSwitchCommand;
@@ -148,6 +149,7 @@ public class VelocityCore implements ReloadablePlugin {
         new PunishmentCommand("nodev", Punishment.PunishmentType.NoDevServer);
         new PunishmentCommand("nofight", Punishment.PunishmentType.NoFightServer);
         new PunishmentCommand("noteamserver", Punishment.PunishmentType.NoTeamServer);
+        new PunishmentCommand("noevent", Punishment.PunishmentType.NoEvent);
         new PunishmentCommand("note", Punishment.PunishmentType.Note);
 
         linker = new AbstractLinker<>(this) {
@@ -183,6 +185,7 @@ public class VelocityCore implements ReloadablePlugin {
 
         schedule(() -> {
             SteamwarUser.clear();
+            UserElo.clear();
             Team.clear();
         }).repeat(1, TimeUnit.HOURS).schedule();
 

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

@@ -128,10 +128,8 @@ public class DevCommand extends SWCommand {
         if (serverFiles != null) {
             for (String serverFile : serverFiles) {
                 String[] server = serverFile.split("\\.");
-                int version = Integer.parseInt(server[2]);
-                if (version == 0) continue;
                 devServerPorts.put(server[0], Integer.parseInt(server[1]));
-                devServerVersions.put(server[0], version);
+                devServerVersions.put(server[0], Integer.parseInt(server[2]));
             }
         }
 

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

@@ -19,14 +19,14 @@
 
 package de.steamwar.velocitycore.commands;
 
-import de.steamwar.command.SWCommand;
 import de.steamwar.linkage.Linked;
+import de.steamwar.velocitycore.VelocityCore;
+import de.steamwar.command.SWCommand;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.PlayerChatter;
 import de.steamwar.sql.SteamwarUser;
 import de.steamwar.sql.UserPerm;
 import de.steamwar.sql.internal.Statement;
-import de.steamwar.velocitycore.VelocityCore;
 
 import java.io.*;
 import java.util.zip.ZipEntry;
@@ -76,11 +76,13 @@ public class GDPRQuery extends SWCommand {
         sqlCSV(user, out, bauweltMember, "BuildMember.csv");
         sqlCSV(user, out, bauweltMembers, "BuildMembers.csv");
         sqlCSV(user, out, checkedSchems, "SchematicChecksessions.csv");
+        sqlCSV(user, out, userElo, "UserElo.csv");
         sqlCSV(user, out, fights, "Fights.csv");
         sqlCSV(user, out, ignoredPlayers, "IgnoredPlayers.csv");
         sqlCSV(user, out, ignoringPlayers, "IgnoringPlayers.csv");
         sqlCSV(user, out, schematicMember, "SchematicMember.csv");
         sqlCSV(user, out, schematicMembers, "SchematicMembers.csv");
+        sqlCSV(user, out, pollAnswers, "PollAnswers.csv");
         sqlCSV(user, out, punishments, "Punishments.csv");
         sqlCSV(user, out, sessions, "Sessions.csv");
         sqlCSV(user, out, userData, "UserData.csv");
@@ -102,11 +104,13 @@ public class GDPRQuery extends SWCommand {
     private static final Statement bauweltMember = new Statement("SELECT BauweltID AS Bauwelt, WorldEdit, World FROM BauweltMember WHERE MemberID = ?");
     private static final Statement bauweltMembers = new Statement("SELECT u.UserName AS 'User', m.WorldEdit AS WorldEdit, m.World AS World FROM BauweltMember m INNER JOIN UserData u ON m.MemberID = u.id WHERE m.BauweltID = ?");
     private static final Statement checkedSchems = new Statement("SELECT NodeName AS Schematic, StartTime, EndTime, DeclineReason AS Result FROM CheckedSchematic WHERE NodeOwner = ? ORDER BY StartTime ASC");
+    private static final Statement userElo = new Statement("SELECT GameMode, Elo, Season FROM Elo WHERE UserID = ?");
     private static final Statement fights = new Statement("SELECT p.Team AS Team, p.Kit AS Kit, p.Kills AS Kills, p.IsOut AS Died, f.GameMode AS GameMode, f.Server AS Server, f.StartTime AS StartTime, f.Duration AS Duration, (f.BlueLeader = p.UserID) AS IsBlueLeader, (f.RedLeader = p.UserID) AS IsRedLeader, f.Win AS Winner, f.WinCondition AS WinCondition FROM Fight f INNER JOIN FightPlayer p ON f.FightID = p.FightID WHERE p.UserID = ? ORDER BY StartTime ASC");
     private static final Statement ignoredPlayers = new Statement("SELECT u.UserName AS IgnoredPlayer FROM IgnoredPlayers i INNER JOIN UserData u ON i.Ignored = u.id WHERE Ignorer = ?");
     private static final Statement ignoringPlayers = new Statement("SELECT Ignorer AS IgnoringPlayers FROM IgnoredPlayers WHERE Ignored = ?");
     private static final Statement schematicMember = new Statement("SELECT s.NodeName AS SchematicName, u.UserName AS SchematicOwner FROM NodeMember m INNER JOIN SchematicNode s ON m.NodeId = s.NodeId INNER JOIN UserData u ON s.NodeOwner = u.id WHERE m.UserId = ?");
     private static final Statement schematicMembers = new Statement("SELECT s.NodeName AS SchematicName, u.UserName AS Member FROM NodeMember m INNER JOIN SchematicNode s ON m.NodeId = s.NodeId INNER JOIN UserData u ON m.UserId = u.id WHERE s.NodeOwner = ?");
+    private static final Statement pollAnswers = new Statement("SELECT Question, Answer FROM PollAnswer WHERE UserID = ?");
     private static final Statement punishments = new Statement("SELECT Type, StartTime, EndTime, Perma, Reason FROM Punishments WHERE UserId = ?");
     private static final Statement sessions = new Statement("SELECT StartTime, EndTime FROM Session WHERE UserID = ?");
     private static final Statement userData = new Statement("SELECT * FROM UserData WHERE id = ?");

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

@@ -26,10 +26,7 @@ import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeMapper;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.Message;
-import de.steamwar.sql.BannedUserIPs;
+import de.steamwar.sql.*;
-import de.steamwar.sql.Punishment;
-import de.steamwar.sql.SteamwarUser;
-import de.steamwar.sql.UserPerm;
 import de.steamwar.velocitycore.VelocityCore;
 import de.steamwar.velocitycore.listeners.IPSanitizer;
 
@@ -213,6 +210,11 @@ public class PunishmentCommand {
             if(punishmentType == Punishment.PunishmentType.Ban)
                 ban(target, banTime, msg, punisher, isPerma);
             Chatter.serverteam().system(punishmentType.getTeamMessage(), target, sender, new Message((isPerma ? "PUNISHMENT_PERMA" : "PUNISHMENT_UNTIL"), banTime), msg);
+            if (punishmentType == Punishment.PunishmentType.NoEvent) {
+                int teamId = target.getTeam();
+                if (teamId == 0) return;
+                TeamTeilnahme.deleteFuture(teamId);
+            }
         }
 
         @Register

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

@@ -0,0 +1,68 @@
+/*
+ *   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.commands;
+
+import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
+import de.steamwar.messages.Chatter;
+import de.steamwar.messages.Message;
+import de.steamwar.sql.GameModeConfig;
+import de.steamwar.sql.Season;
+import de.steamwar.sql.SteamwarUser;
+import de.steamwar.sql.UserElo;
+import de.steamwar.velocitycore.ArenaMode;
+
+@Linked
+public class RankCommand extends SWCommand {
+
+    public RankCommand() {
+        super("rank");
+    }
+
+    @Register
+    public void ownRank(Chatter sender) {
+        rank(sender, sender.user());
+    }
+
+    @Register
+    public void rank(Chatter sender, @ErrorMessage("RANK_PLAYER_NOT_FOUND") SteamwarUser user) {
+        if (!sender.user().equals(user)) {
+            sender.prefixless("RANK_PLAYER_FOUND", user, Season.convertSeasonToString(Season.getSeason()));
+        } else {
+            sender.prefixless("RANK_PLAYER_SELF", Season.convertSeasonToString(Season.getSeason()));
+        }
+
+        for(GameModeConfig<String, String> mode : ArenaMode.getAllModes()) {
+            if (!mode.Server.Ranked)
+                continue;
+
+            Integer elo = UserElo.getElo(user.getId(), mode.getSchemTypeOrInternalName());
+            Message eloMsg;
+            if (elo != null) {
+                int placement = UserElo.getPlacement(elo, mode.getSchemTypeOrInternalName());
+                eloMsg = new Message("RANK_PLACED", placement, elo);
+            } else {
+                eloMsg = new Message("RANK_UNPLACED");
+            }
+
+            sender.prefixless("RANK_DATA", UserElo.getEmblemProgression(mode.getChatName(), user.getId()), mode.getChatName(), eloMsg);
+        }
+    }
+}

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

@@ -17,17 +17,25 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.core;
+package de.steamwar.velocitycore.commands;
 
-public class WorldIdentifier {
+import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
+import de.steamwar.messages.PlayerChatter;
+import de.steamwar.network.packets.server.LocaleInvalidationPacket;
+import de.steamwar.velocitycore.network.NetworkSender;
 
-    private static final IWorldIdentifier impl = VersionDependent.getVersionImpl(Core.getInstance());
+@Linked
+public class SetLocaleCommand extends SWCommand {
 
-    public static void set(String name) {
+    public SetLocaleCommand() {
-        impl.setResourceKey(name);
+        super("setlocale", "setlanguage");
     }
 
-    protected interface IWorldIdentifier {
+    @Register
-        void setResourceKey(String name);
+    public void genericCommand(PlayerChatter sender) {
+        sender.user().setLocale(sender.getPlayer().getPlayerSettings().getLocale(), true);
+        sender.withPlayer(player -> NetworkSender.send(player, new LocaleInvalidationPacket(sender.user().getId())));
+        sender.system("LOCK_LOCALE_CHANGED");
     }
 }

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

@@ -1,74 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2026 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.commands;
-
-import de.steamwar.command.SWCommand;
-import de.steamwar.linkage.Linked;
-import de.steamwar.messages.Message;
-import de.steamwar.messages.PlayerChatter;
-import de.steamwar.sql.SteamwarUser;
-import de.steamwar.sql.Team;
-import de.steamwar.sql.UserPerm;
-import de.steamwar.velocitycore.inventory.SWInventory;
-import de.steamwar.velocitycore.inventory.SWItem;
-
-@Linked
-public class SettingsCommand extends SWCommand {
-
-    public SettingsCommand() {
-        super("settings");
-    }
-
-    @Register
-    public void genericCommand(PlayerChatter sender) {
-        SWInventory inventory = new SWInventory(sender, 9, new Message("SETTINGS_TITLE"));
-        SteamwarUser user = sender.user();
-        String localeItem = user.getManualLocale() ? "BOOK" : "BOOK_AND_QUILL";
-        SWItem localeSwItem = new SWItem(localeItem, new Message("SETTINGS_LOCALE_ITEM"));
-        localeSwItem.addLore(new Message("SETTINGS_LOCALE_CURRENT", new Message("LOCALE")));
-        if (user.getManualLocale()) {
-            localeSwItem.addLore(new Message("SETTINGS_LOCALE_LOCKED"));
-        } else {
-            localeSwItem.addLore(new Message("SETTINGS_LOCALE_UNLOCKED"));
-        }
-        inventory.addItem(2, localeSwItem, click -> {
-            if (user.getManualLocale()) {
-                user.unlockLocale();
-            } else {
-                user.lockLocale();
-            }
-            genericCommand(sender);
-        });
-
-        Team team = Team.byId(user.getTeam());
-        String chatPrefixItem = !user.hasPerm(UserPerm.TEAM) ? "BARRIER" : "NAME_TAG";
-        SWItem swItem = new SWItem(chatPrefixItem, new Message("SETTINGS_PREFIX_ITEM"));
-        if (user.hasPerm(UserPerm.TEAM)) {
-            swItem.addLore(new Message("SETTINGS_PREFIX_SELECTED", new Message("SETTINGS_PREFIX_SW")));
-        }
-        if (user.getTeam() != Team.PUBLIC) {
-            swItem.addLore(new Message("SETTINGS_PREFIX_UNSELECTED", new Message("SETTINGS_PREFIX_TEAM", team.getTeamColor(), team.getTeamKuerzel())));
-        }
-        inventory.addItem(6, swItem, click -> {
-        });
-
-        inventory.open();
-    }
-}

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

@@ -19,6 +19,12 @@
 
 package de.steamwar.velocitycore.commands;
 
+import com.velocitypowered.api.proxy.ConnectionRequestBuilder;
+import com.velocitypowered.api.proxy.server.RegisteredServer;
+import com.velocitypowered.api.proxy.server.ServerInfo;
+import com.velocitypowered.api.proxy.server.ServerPing;
+import com.viaversion.viaversion.api.Via;
+import com.viaversion.viaversion.velocity.platform.VelocityViaConfig;
 import de.steamwar.command.PreviousArguments;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeMapper;
@@ -27,19 +33,19 @@ import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.Message;
 import de.steamwar.messages.PlayerChatter;
-import de.steamwar.sql.Event;
+import de.steamwar.persistent.Storage;
-import de.steamwar.sql.SteamwarUser;
+import de.steamwar.sql.*;
-import de.steamwar.sql.Team;
-import de.steamwar.sql.TeamTeilnahme;
 import de.steamwar.velocitycore.VelocityCore;
 import de.steamwar.velocitycore.discord.DiscordBot;
 import de.steamwar.velocitycore.inventory.SWItem;
 import de.steamwar.velocitycore.inventory.SWListInv;
+import lombok.val;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.event.ClickEvent;
 import net.kyori.adventure.text.event.HoverEvent;
 import net.kyori.adventure.text.format.NamedTextColor;
 
+import java.net.*;
 import java.time.Instant;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
@@ -57,10 +63,10 @@ public class TeamCommand extends SWCommand {
 
     @Register(noTabComplete = true)
     public void help(Chatter sender, String... args){
-        helpMessages(sender, "TEAM_HELP_HEADER", "TEAM_HELP_LIST", "TEAM_HELP_INFO");
+        helpMessages(sender, "TEAM_HELP_HEADER", "TEAM_HELP_LIST", "TEAM_HELP_INFO", "TEAM_HELP_TP");
 
         SteamwarUser user = sender.user();
-        if(user.getTeam() == Team.PUBLIC) {
+        if(user.getTeam() == 0) {
             helpMessages(sender, "TEAM_HELP_CREATE", "TEAM_HELP_JOIN");
         }else{
             helpMessages(sender, "TEAM_HELP_CHAT", "TEAM_HELP_EVENT", "TEAM_HELP_LEAVE");
@@ -135,6 +141,9 @@ public class TeamCommand extends SWCommand {
         user.setTeam(t);
         teamInvitations.remove(user.getId());
         sender.system("TEAM_JOIN_JOINED", Team.byId(t).getTeamName());
+        if (user.isPunished(Punishment.PunishmentType.NoEvent)) {
+            TeamTeilnahme.deleteFuture(t);
+        }
     }
 
     @Register("stepback")
@@ -162,7 +171,7 @@ public class TeamCommand extends SWCommand {
             return;
         }
 
-        user.setTeam(Team.PUBLIC);
+        user.setTeam(0);
 
         if(teamSize == 1)
             team.disband(user);
@@ -182,7 +191,7 @@ public class TeamCommand extends SWCommand {
         if(notDuringEvent(sender))
             return;
 
-        if(target.getTeam() != Team.PUBLIC){
+        if(target.getTeam() != 0){
             sender.system("TEAM_INVITE_IN_TEAM");
             return;
         }
@@ -195,6 +204,9 @@ public class TeamCommand extends SWCommand {
 
         invitations.add(team.getTeamId());
         sender.system("TEAM_INVITE_INVITED", target.getUserName());
+        if (target.isPunished(Punishment.PunishmentType.NoEvent)) {
+            sender.system("NOEVENT_INVITED_PUNISHED");
+        }
         Chatter.of(target).system("TEAM_INVITE_INVITED_TARGET", team.getTeamColor(), team.getTeamName());
     }
 
@@ -218,7 +230,7 @@ public class TeamCommand extends SWCommand {
             return;
         }
 
-        target.setTeam(Team.PUBLIC);
+        target.setTeam(0);
 
         sender.system("TEAM_REMOVE_REMOVED");
         Chatter.of(target).system("TEAM_REMOVE_REMOVED_TARGET");
@@ -416,6 +428,12 @@ public class TeamCommand extends SWCommand {
             TeamTeilnahme.notTeilnehmen(team.getTeamId(), event.getEventID());
             sender.system("TEAM_EVENT_LEFT");
         }else{
+            if (team.getMembers().stream().anyMatch(integer -> {
+                return SteamwarUser.get(integer).isPunished(Punishment.PunishmentType.NoEvent);
+            })) {
+                sender.system("NOEVENT_PLAYER_PUNISHED");
+                return;
+            }
             TeamTeilnahme.teilnehmen(team.getTeamId(), event.getEventID());
             sender.system("TEAM_EVENT_JOINED", event.getEventName());
             sender.prefixless("TEAM_EVENT_HOW_TO_LEAVE");
@@ -424,6 +442,83 @@ public class TeamCommand extends SWCommand {
         DiscordBot.withBot(bot -> bot.getEventChannel().update());
     }
 
+    @Register("tp")
+    public void tp(@Validator("isInTeam") PlayerChatter sender) {
+        Team team = Team.byId(sender.user().getTeam());
+        tp(sender, team);
+    }
+
+    @Register("tp")
+    public void tp(PlayerChatter sender, @ErrorMessage("TEAM_TP_NO_TEAM") Team targetTeam) {
+        if (targetTeam.getAddress() == null || targetTeam.getAddress().isEmpty()) {
+            sender.system("TEAM_NO_ADDRESS");
+            return;
+        }
+
+        InetSocketAddress address;
+        ServerInfo serverInfo;
+        try {
+            address = new InetSocketAddress(targetTeam.getAddress(), targetTeam.getPort());
+            serverInfo = Storage.teamServers.computeIfAbsent(targetTeam.getTeamId(), integer -> {
+                ServerInfo info = new ServerInfo("Team " + targetTeam.getTeamKuerzel(), address);
+                RegisteredServer server = VelocityCore.getProxy().registerServer(info);
+                ServerPing serverPing = server.ping().join();
+                ((VelocityViaConfig) Via.getConfig()).getVelocityServerProtocols().put(info.getName(), serverPing.getVersion().getProtocol());
+                return info;
+            });
+        } catch (Exception e) {
+            sender.system("TEAM_NO_ADDRESS");
+            return;
+        }
+
+        if (!address.equals(serverInfo.getAddress())) {
+            VelocityCore.getProxy().unregisterServer(Storage.teamServers.remove(targetTeam.getTeamId()));
+            tp(sender, targetTeam);
+            return;
+        }
+
+        sender.getPlayer().createConnectionRequest(VelocityCore.getProxy().getServer(serverInfo.getName()).orElseThrow()).connect().whenComplete((result, throwable) -> {
+            if(result.getStatus() != ConnectionRequestBuilder.Status.SUCCESS || throwable != null)
+                sender.system("TEAM_OFFLINE");
+        });
+    }
+
+    @Register(value = "server", description = "TEAM_SERVER_USAGE")
+    public void server(@Validator("isLeader") Chatter sender, String server, @Min(intValue = 1) @Max(intValue = 65535) @ErrorMessage("TEAM_SERVER_PORT_INVALID") int port){
+        Team team = Team.byId(sender.user().getTeam());
+        if (PunishmentCommand.isPunishedWithMessage(sender, Punishment.PunishmentType.NoTeamServer)) {
+            return;
+        }
+
+        try {
+            if (isLocalhost(InetAddress.getByName(server))) {
+                sender.system("TEAM_SERVER_ADDRESS_INVALID");
+                return;
+            }
+        } catch (UnknownHostException e) {
+            sender.system("TEAM_SERVER_ADDRESS_INVALID");
+            return;
+        }
+
+        team.setAddress(server);
+        team.setPort(port);
+        Storage.teamServers.remove(team.getTeamId());
+        sender.system("TEAM_SERVER_SET");
+    }
+
+    public static boolean isLocalhost(InetAddress addr) {
+        // Check if the address is a valid special local or loop back
+        if (addr.isAnyLocalAddress() || addr.isLoopbackAddress())
+            return true;
+
+        // Check if the address is defined on any interface
+        try {
+            return NetworkInterface.getByInetAddress(addr) != null;
+        } catch (SocketException e) {
+            return false;
+        }
+    }
+
     private static final Map<String, Integer> COLOR_CODES = new HashMap<>();
 
     static {
@@ -463,14 +558,10 @@ public class TeamCommand extends SWCommand {
 
     @ClassMapper(Event.class)
     public TypeMapper<Event> eventTypeMapper() {
-        return new TypeMapper<>() {
+        return new TypeMapper<Event>() {
             @Override
             public Event map(Chatter sender, PreviousArguments previousArguments, String s) {
-                return Event.getComing()
+                return Event.get(s);
-                        .stream()
-                        .filter(event -> event.getEventName().replace(" ", "").equalsIgnoreCase(s))
-                        .findFirst()
-                        .orElse(null);
             }
 
             @Override
@@ -485,7 +576,7 @@ public class TeamCommand extends SWCommand {
 
             @Override
             public Collection<String> tabCompletes(Chatter sender, PreviousArguments previousArguments, String s) {
-                return Event.getComing().stream().map(Event::getEventName).map(e -> e.replace(" ", "")).toList();
+                return Event.getComing().stream().map(Event::getEventName).toList();
             }
         };
     }
@@ -493,7 +584,7 @@ public class TeamCommand extends SWCommand {
     @Validator(value = "isNotInTeam", local = true)
     public TypeValidator<Chatter> isNotInTeamValidator() {
         return (sender, value, messageSender) -> {
-            if (sender.user().getTeam() != Team.PUBLIC) {
+            if (sender.user().getTeam() != 0) {
                 messageSender.send("TEAM_IN_TEAM");
                 return false;
             }
@@ -504,7 +595,7 @@ public class TeamCommand extends SWCommand {
     @Validator(value = "isInTeam", local = true)
     public TypeValidator<Chatter> isInTeamValidator() {
         return (sender, value, messageSender) -> {
-            if (sender.user().getTeam() == Team.PUBLIC) {
+            if (sender.user().getTeam() == 0) {
                 messageSender.send("TEAM_NOT_IN_TEAM");
                 return false;
             }
@@ -516,7 +607,7 @@ public class TeamCommand extends SWCommand {
     public TypeValidator<Chatter> isLeaderValidator() {
         return (sender, value, messageSender) -> {
             SteamwarUser user = sender.user();
-            if (user.getTeam() == Team.PUBLIC) {
+            if (user.getTeam() == 0) {
                 messageSender.send("TEAM_NOT_IN_TEAM");
                 return false;
             }

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

@@ -26,23 +26,19 @@ import net.dv8tion.jda.api.interactions.components.buttons.ButtonStyle;
 
 @AllArgsConstructor
 public enum DiscordTicketType {
-    REPORT("U+1F46E", "Spieler melden", ButtonStyle.DANGER, null),
+    REPORT("U+1F46E", "Spieler melden", ButtonStyle.DANGER),
-    IDEA("U+1F4A1", "Feature vorschlagen", ButtonStyle.SUCCESS, null),
+    IDEA("U+1F4A1", "Feature vorschlagen", ButtonStyle.SUCCESS),
-    BUG("U+1F41B", "Bug melden", ButtonStyle.LINK, "https://git.steamwar.de/SteamWar/SteamWar/issues/new"),
+    BUG("U+1F41B", "Bug melden", ButtonStyle.SECONDARY),
-    QUESTION("U+2753", "Fragen", ButtonStyle.PRIMARY, null),
+    QUESTION("U+2753", "Fragen", ButtonStyle.PRIMARY),
-    APPEAL("U+1F528", "Entbannungsantrag", ButtonStyle.SECONDARY, null),
+    APPEAL("U+1F528", "Entbannungsantrag", ButtonStyle.SECONDARY),
-    SCHEMATIC("U+1F4BE", "Schematic melden", ButtonStyle.DANGER, null);
+    SCHEMATIC("U+1F4BE", "Schematic melden", ButtonStyle.DANGER);
 
 
     private final String emoji;
     private final String label;
     private final ButtonStyle style;
-    private final String url;
 
     public Button toButton() {
-        if(style == ButtonStyle.LINK) {
-            return Button.link(url, label).withEmoji(Emoji.fromUnicode(emoji));
-        }
         return Button.of(style, name().toLowerCase(), Emoji.fromUnicode(emoji)).withLabel(label);
     }