From cf52b503334a56cf1181947e185f9dec0aca2938 Mon Sep 17 00:00:00 2001
From: Chaoscaot <chaos@chaoscaot.de>
Date: Thu, 31 Jul 2025 10:43:40 +0200
Subject: [PATCH 001/214] Introduce support for Minecraft 1.21: Add
 ReflectionWrapper21, ChunkHider21, and enhance version compatibility across
 systems.

---
 .../features/techhider/TechHiderCommand.java  |   5 +-
 FightSystem/FightSystem_21/build.gradle.kts   |   1 +
 .../fightsystem/utils/BlockIdWrapper21.java   |  87 ++++++++++
 .../utils/ReflectionWrapper21.java            |  36 ++++
 .../fightsystem/utils/ReflectionWrapper8.java |  59 +++++++
 .../de/steamwar/fightsystem/fight/Kit.java    |  12 +-
 .../steamwar/fightsystem/utils/HullHider.java |  11 +-
 .../fightsystem/utils/ReflectionWrapper.java  |  37 +++++
 .../fightsystem/utils/TechHiderWrapper.java   |   4 +-
 FightSystem/FightSystem_Core/src/plugin.yml   |   2 +-
 FightSystem/build.gradle.kts                  |  11 ++
 SpigotCore/SpigotCore_21/build.gradle.kts     |   3 +
 .../de/steamwar/techhider/ChunkHider21.java   | 155 ++++++++++++++++++
 .../src/de/steamwar/Reflection.java           |  11 +-
 .../src/de/steamwar/techhider/ChunkHider.java |  26 ++-
 .../de/steamwar/techhider/ProtocolUtils.java  |  10 ++
 .../src/de/steamwar/techhider/TechHider.java  |   1 +
 SpigotCore/SpigotCore_Main/src/plugin.yml     |   2 +-
 settings.gradle.kts                           |   2 +-
 19 files changed, 448 insertions(+), 27 deletions(-)
 create mode 100644 FightSystem/FightSystem_21/src/de/steamwar/fightsystem/utils/BlockIdWrapper21.java
 create mode 100644 FightSystem/FightSystem_21/src/de/steamwar/fightsystem/utils/ReflectionWrapper21.java
 create mode 100644 FightSystem/FightSystem_8/src/de/steamwar/fightsystem/utils/ReflectionWrapper8.java
 create mode 100644 FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/ReflectionWrapper.java
 create mode 100644 SpigotCore/SpigotCore_21/src/de/steamwar/techhider/ChunkHider21.java

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/techhider/TechHiderCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/techhider/TechHiderCommand.java
index 38725cf0..17d3563c 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/techhider/TechHiderCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/techhider/TechHiderCommand.java
@@ -34,6 +34,7 @@ import de.steamwar.linkage.LinkedInstance;
 import de.steamwar.techhider.TechHider;
 import net.md_5.bungee.api.ChatMessageType;
 import org.bukkit.Bukkit;
+import org.bukkit.Chunk;
 import org.bukkit.Material;
 import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.file.FileConfiguration;
@@ -86,8 +87,8 @@ public class TechHiderCommand extends SWCommand implements Listener, ScoreboardE
             Set<String> hiddenBlockEntities = Collections.unmodifiableSet(new HashSet<>(config.getStringList("Techhider.HiddenBlockEntities")));
 
             TechHider current = new TechHider((TechHider.LocationEvaluator) (p, cX, cY) -> {
-                if (rg.buildChunkOutside(cX, cY)) return true;
-                return !hidden.get(rg).contains(p);
+                Chunk playerChunk = p.getLocation().getChunk();
+                return playerChunk.getX() == cX && playerChunk.getZ() == cY;
             }, Material.valueOf(obfuscateWith.toUpperCase()), hiddenBlocks.stream().map(String::toUpperCase).map(Material::valueOf).collect(Collectors.toSet()), hiddenBlockEntities);
             current.enable();
 
diff --git a/FightSystem/FightSystem_21/build.gradle.kts b/FightSystem/FightSystem_21/build.gradle.kts
index a05590d1..3309134f 100644
--- a/FightSystem/FightSystem_21/build.gradle.kts
+++ b/FightSystem/FightSystem_21/build.gradle.kts
@@ -24,6 +24,7 @@ plugins {
 dependencies {
     compileOnly(project(":FightSystem:FightSystem_Core", "default"))
     compileOnly(project(":FightSystem:FightSystem_18", "default"))
+    compileOnly(project(":SpigotCore", "default"))
 
     compileOnly(libs.paperapi21) {
         attributes {
diff --git a/FightSystem/FightSystem_21/src/de/steamwar/fightsystem/utils/BlockIdWrapper21.java b/FightSystem/FightSystem_21/src/de/steamwar/fightsystem/utils/BlockIdWrapper21.java
new file mode 100644
index 00000000..32e2e6e4
--- /dev/null
+++ b/FightSystem/FightSystem_21/src/de/steamwar/fightsystem/utils/BlockIdWrapper21.java
@@ -0,0 +1,87 @@
+/*
+ *   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.utils;
+
+import de.steamwar.Reflection;
+import de.steamwar.fightsystem.Config;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import net.minecraft.core.BlockPos;
+import net.minecraft.server.level.ChunkMap;
+import net.minecraft.server.level.ServerChunkCache;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.level.block.state.BlockState;
+import org.bukkit.Material;
+import org.bukkit.World;
+import org.bukkit.block.Block;
+import org.bukkit.craftbukkit.CraftWorld;
+import org.bukkit.craftbukkit.block.CraftBlockState;
+import org.bukkit.craftbukkit.entity.CraftPlayer;
+import org.bukkit.craftbukkit.util.CraftMagicNumbers;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+
+public class BlockIdWrapper21 implements BlockIdWrapper {
+    static Int2ObjectMap<ChunkMap.TrackedEntity> tracker;
+
+    static Reflection.Field<Object> chunkMap = Reflection.getField(ServerChunkCache.class, "chunkMap", Object.class);
+    static {
+        ServerChunkCache chunkCache = ((CraftWorld) Config.world).getHandle().getChunkSource();
+        Object map = chunkMap.get(chunkCache);
+        Reflection.Field<Int2ObjectMap> eMapField = Reflection.getField(map.getClass(), "entityMap", Int2ObjectMap.class);
+        tracker = eMapField.get(map);
+    }
+
+    @Override
+    public Material idToMaterial(int blockState) {
+        return CraftMagicNumbers.getMaterial(net.minecraft.world.level.block.Block.stateById(blockState)).getItemType();
+    }
+
+    @Override
+    public int blockToId(Block block) {
+        return net.minecraft.world.level.block.Block.getId(((CraftBlockState) block.getState()).getHandle());
+    }
+
+    @Override
+    public void setBlock(World world, int x, int y, int z, int blockState) {
+        BlockState blockData = net.minecraft.world.level.block.Block.stateById(blockState);
+        ServerLevel level = ((CraftWorld) world).getHandle();
+        BlockPos pos = new BlockPos(x, y, z);
+
+        level.removeBlockEntity(pos);
+        level.setBlock(pos, blockData, blockState);
+        level.getChunkSource().blockChanged(pos);
+    }
+
+    @Override
+    public void trackEntity(Player player, Entity entity) {
+        ChunkMap.TrackedEntity trackedEntity = tracker.get(entity.getEntityId());
+        if (trackedEntity != null) {
+            trackedEntity.updatePlayer(((CraftPlayer) player).getHandle());
+        }
+    }
+
+    @Override
+    public void untrackEntity(Player player, Entity entity) {
+        ChunkMap.TrackedEntity trackedEntity = tracker.get(entity.getEntityId());
+        if (trackedEntity != null) {
+            trackedEntity.removePlayer(((CraftPlayer) player).getHandle());
+        }
+    }
+}
diff --git a/FightSystem/FightSystem_21/src/de/steamwar/fightsystem/utils/ReflectionWrapper21.java b/FightSystem/FightSystem_21/src/de/steamwar/fightsystem/utils/ReflectionWrapper21.java
new file mode 100644
index 00000000..118bfba1
--- /dev/null
+++ b/FightSystem/FightSystem_21/src/de/steamwar/fightsystem/utils/ReflectionWrapper21.java
@@ -0,0 +1,36 @@
+/*
+ *   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.utils;
+
+import io.papermc.paper.datacomponent.DataComponentTypes;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+
+public class ReflectionWrapper21 implements ReflectionWrapper {
+    @Override
+    public Object explosionHider(Player player, Object packet, PacketHiderFunction packetHiderFunction) {
+        return packet;
+    }
+
+    @Override
+    public boolean hasItems(ItemStack stack) {
+        return stack.getDataTypes().stream().anyMatch(dataComponentType -> dataComponentType != DataComponentTypes.ENCHANTMENTS || dataComponentType != DataComponentTypes.DAMAGE);
+    }
+}
diff --git a/FightSystem/FightSystem_8/src/de/steamwar/fightsystem/utils/ReflectionWrapper8.java b/FightSystem/FightSystem_8/src/de/steamwar/fightsystem/utils/ReflectionWrapper8.java
new file mode 100644
index 00000000..6da5308a
--- /dev/null
+++ b/FightSystem/FightSystem_8/src/de/steamwar/fightsystem/utils/ReflectionWrapper8.java
@@ -0,0 +1,59 @@
+/*
+ *   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.utils;
+
+import de.steamwar.Reflection;
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.function.Function;
+
+public class ReflectionWrapper8 implements ReflectionWrapper {
+
+    private static final Class<?> packetPlayOutExplosion = Reflection.getClass("net.minecraft.network.protocol.game.ClientboundExplodePacket");
+    private static final Reflection.Field<List> explosionBlocks = Reflection.getField(packetPlayOutExplosion, List.class, 0);
+    private static final Function<Object, Location> explosionLocation = HullHider.posPacketToLocation(packetPlayOutExplosion, double.class, 1.0);
+
+    @Override
+    public Object explosionHider(Player player, Object packet, PacketHiderFunction packetHiderFunction) {
+        if(explosionBlocks.get(packet).isEmpty())
+            return packetHiderFunction.hide(player, packet, explosionLocation.apply(packet));
+
+        return packet;
+    }
+
+
+    private static final Class<?> itemStack = Reflection.getClass("net.minecraft.world.item.ItemStack");
+    private static final Reflection.Method asNMSCopy = Reflection.getTypedMethod(Reflection.getClass("org.bukkit.craftbukkit.inventory.CraftItemStack"), "asNMSCopy", itemStack, ItemStack.class);
+    private static final Class<?> nbtTagCompound = Reflection.getClass("net.minecraft.nbt.CompoundTag");
+    private static final Reflection.Method getTag = Reflection.getTypedMethod(itemStack, null, nbtTagCompound);
+    private static final Reflection.Method getKeys = Reflection.getTypedMethod(nbtTagCompound, null, Set.class);
+    @Override
+    public boolean hasItems(ItemStack stack) {
+        Set<String> keys = new HashSet<>((Set<String>) getKeys.invoke(getTag.invoke(asNMSCopy.invoke(null, stack))));
+        keys.remove("Enchantments");
+        keys.remove("Damage");
+        return !keys.isEmpty();
+    }
+}
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/Kit.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/Kit.java
index db97aa27..48a18bde 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/Kit.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/Kit.java
@@ -26,6 +26,7 @@ import de.steamwar.fightsystem.commands.Commands;
 import de.steamwar.fightsystem.commands.GUI;
 import de.steamwar.fightsystem.listener.PersonalKitCreator;
 import de.steamwar.fightsystem.utils.FlatteningWrapper;
+import de.steamwar.fightsystem.utils.ReflectionWrapper;
 import de.steamwar.inventory.SWInventory;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.sql.PersonalKit;
@@ -214,17 +215,8 @@ public class Kit {
         assert normal != null;
         return !normal.isEnchantmentInKit(stack) && !stack.getEnchantments().isEmpty();
     }
-
-    private static final Class<?> itemStack = Reflection.getClass("net.minecraft.world.item.ItemStack");
-    private static final Reflection.Method asNMSCopy = Reflection.getTypedMethod(Reflection.getClass("org.bukkit.craftbukkit.inventory.CraftItemStack"), "asNMSCopy", itemStack, ItemStack.class);
-    private static final Class<?> nbtTagCompound = Reflection.getClass("net.minecraft.nbt.CompoundTag");
-    private static final Reflection.Method getTag = Reflection.getTypedMethod(itemStack, null, nbtTagCompound);
-    private static final Reflection.Method getKeys = Reflection.getTypedMethod(nbtTagCompound, null, Set.class);
     public static boolean hasItems(ItemStack stack) {
-        Set<String> keys = new HashSet<>((Set<String>) getKeys.invoke(getTag.invoke(asNMSCopy.invoke(null, stack))));
-        keys.remove("Enchantments");
-        keys.remove("Damage");
-        return !keys.isEmpty();
+        return ReflectionWrapper.impl.hasItems(stack);
     }
 
     private boolean isEnchantmentInKit(ItemStack stack){
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/HullHider.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/HullHider.java
index c050656d..137e2082 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/HullHider.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/HullHider.java
@@ -62,6 +62,7 @@ public class HullHider implements Listener {
     private final Hull[] hulls;
     private final Map<Class<?>, BiFunction<Player, Object, Object>> packetHiders = new HashMap<>();
 
+    private static final Class<?> packetPlayOutExplosion = Reflection.getClass("net.minecraft.network.protocol.game.ClientboundExplodePacket");
     public HullHider() {
         if(!TechHiderWrapper.ENABLED) {
             hulls = new Hull[0];
@@ -208,14 +209,8 @@ public class HullHider implements Listener {
         return packetHider(player, packet, new Location(Config.world, TechHider.blockPositionX.get(baseBlock), blockPositionY.get(baseBlock), TechHider.blockPositionZ.get(baseBlock)));
     }
 
-    private static final Class<?> packetPlayOutExplosion = Reflection.getClass("net.minecraft.network.protocol.game.ClientboundExplodePacket");
-    private static final Reflection.Field<List> explosionBlocks = Reflection.getField(packetPlayOutExplosion, List.class, 0);
-    private static final Function<Object, Location> explosionLocation = posPacketToLocation(packetPlayOutExplosion, double.class, 1.0);
     private Object explosionHider(Player player, Object packet) {
-        if(explosionBlocks.get(packet).isEmpty())
-            return packetHider(player, packet, explosionLocation.apply(packet));
-
-        return packet;
+        return ReflectionWrapper.impl.explosionHider(player, packet, this::packetHider);
     }
 
     private void posHiderGenerator(String typeName, Class<? extends Number> posType, double factor) {
@@ -224,7 +219,7 @@ public class HullHider implements Listener {
         packetHiders.put(type, (player, packet) -> packetHider(player, packet, location.apply(packet)));
     }
 
-    private static Function<Object, Location> posPacketToLocation(Class<?> type, Class<? extends Number> posType, double factor) {
+    public static Function<Object, Location> posPacketToLocation(Class<?> type, Class<? extends Number> posType, double factor) {
         Reflection.Field<? extends Number> x = Reflection.getField(type, posType, 0);
         Reflection.Field<? extends Number> y = Reflection.getField(type, posType, 1);
         Reflection.Field<? extends Number> z = Reflection.getField(type, posType, 2);
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/ReflectionWrapper.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/ReflectionWrapper.java
new file mode 100644
index 00000000..cbc9f807
--- /dev/null
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/ReflectionWrapper.java
@@ -0,0 +1,37 @@
+/*
+ *   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.utils;
+
+import de.steamwar.core.VersionDependent;
+import de.steamwar.fightsystem.FightSystem;
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+
+public interface ReflectionWrapper {
+    ReflectionWrapper impl = VersionDependent.getVersionImpl(FightSystem.getPlugin());
+
+    Object explosionHider(Player player, Object packet, PacketHiderFunction packetHiderFunction);
+    boolean hasItems(ItemStack stack);
+
+    public interface PacketHiderFunction {
+        Object hide(Player player, Object packet, Location location);
+    }
+}
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/TechHiderWrapper.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/TechHiderWrapper.java
index bf890168..fde87959 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/TechHiderWrapper.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/TechHiderWrapper.java
@@ -59,7 +59,7 @@ public class TechHiderWrapper extends StateDependent implements TechHider.Locati
     private final SecretKey key;
 
     public TechHiderWrapper() {
-        super(ENABLED, FightState.Schem);
+        super(ENABLED, FightState.All);
         techHider = new TechHider(this, Config.ObfuscateWith, Config.HiddenBlocks, Config.HiddenBlockEntities);
 
         try {
@@ -68,7 +68,7 @@ public class TechHiderWrapper extends StateDependent implements TechHider.Locati
             throw new SecurityException(e);
         }
 
-        new StateDependentListener(ENABLED, FightState.Schem, this);
+        new StateDependentListener(ENABLED, FightState.All, this);
         register();
     }
 
diff --git a/FightSystem/FightSystem_Core/src/plugin.yml b/FightSystem/FightSystem_Core/src/plugin.yml
index 6925bf69..09702025 100644
--- a/FightSystem/FightSystem_Core/src/plugin.yml
+++ b/FightSystem/FightSystem_Core/src/plugin.yml
@@ -8,7 +8,7 @@ softdepend:
   - SpigotCore
 depend:
   - WorldEdit
-api-version: "1.13"
+api-version: "1.21.6"
 
 commands:
   ak:
diff --git a/FightSystem/build.gradle.kts b/FightSystem/build.gradle.kts
index 9013824d..6338609a 100644
--- a/FightSystem/build.gradle.kts
+++ b/FightSystem/build.gradle.kts
@@ -50,6 +50,17 @@ tasks.register<FightServer>("WarGear20") {
     config = "WarGear20.yml"
 }
 
+tasks.register<FightServer>("WarGear21") {
+    group = "run"
+    description = "Run a WarGear 1.21 Fight Server"
+    dependsOn(":SpigotCore:shadowJar")
+    dependsOn(":FightSystem:shadowJar")
+    template = "WarGear21"
+    worldName = "arenas/Pentraki"
+    config = "WarGear20.yml"
+    jar = "/jars/paper-1.21.6.jar"
+}
+
 tasks.register<FightServer>("SpaceCraftDev20") {
     group = "run"
     description = "Run a SpaceCraftDev 1.20 Fight Server"
diff --git a/SpigotCore/SpigotCore_21/build.gradle.kts b/SpigotCore/SpigotCore_21/build.gradle.kts
index 8f2acba4..4b26ba16 100644
--- a/SpigotCore/SpigotCore_21/build.gradle.kts
+++ b/SpigotCore/SpigotCore_21/build.gradle.kts
@@ -37,4 +37,7 @@ dependencies {
 
     compileOnly(libs.paperapi21)
     compileOnly(libs.nms21)
+    compileOnly(libs.datafixer)
+    compileOnly(libs.netty)
+    compileOnly(libs.authlib)
 }
diff --git a/SpigotCore/SpigotCore_21/src/de/steamwar/techhider/ChunkHider21.java b/SpigotCore/SpigotCore_21/src/de/steamwar/techhider/ChunkHider21.java
new file mode 100644
index 00000000..c31e5f8f
--- /dev/null
+++ b/SpigotCore/SpigotCore_21/src/de/steamwar/techhider/ChunkHider21.java
@@ -0,0 +1,155 @@
+/*
+ *   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.techhider;
+
+import de.steamwar.Reflection;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import net.minecraft.network.protocol.game.ClientboundLevelChunkPacketData;
+import net.minecraft.network.protocol.game.ClientboundLevelChunkWithLightPacket;
+import net.minecraft.util.SimpleBitStorage;
+import net.minecraft.world.level.block.entity.BlockEntityType;
+import org.bukkit.entity.Player;
+
+import java.util.List;
+import java.util.Set;
+import java.util.function.BiFunction;
+import java.util.function.UnaryOperator;
+import java.util.stream.Collectors;
+
+public class ChunkHider21 implements ChunkHider {
+    @Override
+    public Class<?> mapChunkPacket() {
+        return ClientboundLevelChunkWithLightPacket.class;
+    }
+
+    private static final UnaryOperator<Object> chunkPacketCloner = ProtocolUtils.shallowCloneGenerator(ClientboundLevelChunkWithLightPacket.class);
+    private static final UnaryOperator<Object> chunkDataCloner = ProtocolUtils.shallowCloneGenerator(ClientboundLevelChunkPacketData.class);
+
+    private static final Reflection.Field<Integer> chunkXField = Reflection.getField(ClientboundLevelChunkWithLightPacket.class, int.class, 0);
+    private static final Reflection.Field<Integer> chunkZField = Reflection.getField(ClientboundLevelChunkWithLightPacket.class, int.class, 1);
+    private static final Reflection.Field<ClientboundLevelChunkPacketData> chunkData = Reflection.getField(ClientboundLevelChunkWithLightPacket.class, ClientboundLevelChunkPacketData.class, 0);
+
+    private static final Reflection.Field<byte[]> dataField = Reflection.getField(ClientboundLevelChunkPacketData.class, byte[].class, 0);
+    private static final Reflection.Field<List> tileEntities = Reflection.getField(ClientboundLevelChunkPacketData.class, List.class, 0);
+
+    @Override
+    public BiFunction<Player, Object, Object> chunkHiderGenerator(TechHider techHider) {
+        return (p, packet) -> {
+            int chunkX = chunkXField.get(packet);
+            int chunkZ = chunkZField.get(packet);
+            if (techHider.getLocationEvaluator().skipChunk(p, chunkX, chunkZ))
+                return packet;
+
+            packet = chunkPacketCloner.apply(packet);
+            Object dataWrapper = chunkDataCloner.apply(chunkData.get(packet));
+
+            Set<String> hiddenBlockEntities = techHider.getHiddenBlockEntities();
+            tileEntities.set(dataWrapper, ((List<?>)tileEntities.get(dataWrapper)).stream().filter(te -> tileEntityVisible(hiddenBlockEntities, te)).collect(Collectors.toList()));
+
+            ByteBuf in = Unpooled.wrappedBuffer(dataField.get(dataWrapper));
+            ByteBuf out = Unpooled.buffer(in.readableBytes() + 64);
+            for(int yOffset = p.getWorld().getMinHeight(); yOffset < p.getWorld().getMaxHeight(); yOffset += 16) {
+                SectionHider section = new SectionHider(p, techHider, in, out, chunkX, yOffset/16, chunkZ);
+                section.copyBlockCount();
+
+                blocks(section);
+                biomes(section);
+            }
+
+            if (in.readableBytes() != 0) {
+                throw new IllegalStateException("ChunkHider21: Incomplete chunk data, " + in.readableBytes() + " bytes left");
+            }
+
+            byte[] data = new byte[out.readableBytes()];
+            out.readBytes(data);
+            dataField.set(dataWrapper, data);
+
+            chunkData.set(packet, dataWrapper);
+            return packet;
+        };
+    }
+
+    public static final Class<?> tileEntity = Reflection.getClass("net.minecraft.network.protocol.game.ClientboundLevelChunkPacketData$BlockEntityInfo");
+    protected static final Reflection.Field<BlockEntityType> entityType = Reflection.getField(tileEntity, BlockEntityType.class, 0);
+    private static final Class<?> builtInRegestries = Reflection.getClass("net.minecraft.core.registries.BuiltInRegistries");
+    private static final Class<?> registry = Reflection.getClass("net.minecraft.core.Registry");
+    private static final Reflection.Field<?> nameField = Reflection.getField(builtInRegestries, "BLOCK_ENTITY_TYPE", registry);
+    private static final Class<?> resourceLocation = Reflection.getClass("net.minecraft.resources.ResourceLocation");
+    private static final Reflection.Method getKey = Reflection.getTypedMethod(registry, "getKey", resourceLocation, Object.class);
+    private static final Reflection.Method getName = Reflection.getTypedMethod(resourceLocation, "getPath", String.class);
+    protected boolean tileEntityVisible(Set<String> hiddenBlockEntities, Object tile) {
+        return !hiddenBlockEntities.contains(getName.invoke(getKey.invoke(nameField.get(null), entityType.get(tile))));
+    }
+
+    private void blocks(SectionHider section) {
+        section.copyBitsPerBlock();
+
+        boolean singleValued = section.getBitsPerBlock() == 0;
+        if (singleValued) {
+            int value = ProtocolUtils.readVarInt(section.getIn());
+            ProtocolUtils.writeVarInt(section.getOut(), !section.isSkipSection() && section.getObfuscate().contains(value) ? section.getTarget() : value);
+            return;
+        } else {
+            section.processPalette();
+        }
+
+        if (section.isSkipSection() || (!section.blockPrecise() && section.isPaletted())) {
+            section.skipNewDataArray(4096);
+            return;
+        }
+
+        SimpleBitStorage values = new SimpleBitStorage(section.getBitsPerBlock(), 4096, section.readNewDataArray(4096));
+
+        for (int y = 0; y < 16; y++) {
+            for (int z = 0; z < 16; z++) {
+                for (int x = 0; x < 16; x++) {
+                    int pos = (((y * 16) + z) * 16) + x;
+
+                    switch (section.test(x, y, z)) {
+                        case SKIP:
+                            break;
+                        case CHECK:
+                            if (!section.getObfuscate().contains(values.get(pos)))
+                                break;
+                        case HIDE:
+                            values.set(pos, section.getTarget());
+                            break;
+                        case HIDE_AIR:
+                        default:
+                            values.set(pos, section.getAir());
+                    }
+                }
+            }
+        }
+
+        section.writeDataArray(values.getRaw());
+    }
+
+    private void biomes(SectionHider section) {
+        section.copyBitsPerBlock();
+        if(section.getBitsPerBlock() == 0) {
+            section.copyVarInt();
+        } else if(section.getBitsPerBlock() < 6) {
+            section.skipPalette();
+            section.skipNewDataArray(64);
+        }
+    }
+}
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/Reflection.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/Reflection.java
index 86dca0bf..7c34fca9 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/Reflection.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/Reflection.java
@@ -157,7 +157,16 @@ public final class Reflection {
 			} else if(MAJOR_VERSION < 21 || MINOR_VERSION < 4) {
 				return Class.forName(spigotClassnames.getOrDefault(name, name));
 			} else {
-				return Class.forName(name);
+				Class<?> clazz = Class.forName(name);
+				if (clazz.getName().equals(name)) {
+					return clazz;
+				}
+
+				try {
+					return Core.class.getClassLoader().getParent().loadClass(name);
+				} catch (ClassNotFoundException e) {
+					return clazz;
+				}
 			}
 		} catch (ClassNotFoundException e) {
 			throw new IllegalArgumentException("Cannot find " + name, e);
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/ChunkHider.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/ChunkHider.java
index a74feb42..fbd6e364 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/ChunkHider.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/ChunkHider.java
@@ -53,6 +53,7 @@ public interface ChunkHider {
 
         private boolean paletted;
         private int bitsPerBlock;
+        private int blockCount;
         private int air;
         private int target;
         private Set<Integer> obfuscate;
@@ -86,7 +87,8 @@ public interface ChunkHider {
         }
 
         public void copyBlockCount() {
-            out.writeShort(in.readShort());
+            this.blockCount = in.readShort();
+            out.writeShort(blockCount);
         }
 
         public void copyBitsPerBlock() {
@@ -140,6 +142,15 @@ public interface ChunkHider {
             out.writeBytes(in, dataArrayLength*8);
         }
 
+        public void skipNewDataArray(int entries) {
+            if (bitsPerBlock == 0) {
+                return;
+            }
+
+            int longs = (int) (((long) entries * bitsPerBlock + 63) >> 6);
+            out.writeBytes(in, longs * Long.BYTES);
+        }
+
         public long[] readDataArray() {
             long[] array = new long[copyVarInt()];
             for(int i = 0; i < array.length; i++)
@@ -148,6 +159,19 @@ public interface ChunkHider {
             return array;
         }
 
+        public long[] readNewDataArray(int entries) {
+            if (bitsPerBlock == 0) {
+                return new long[entries];
+            }
+
+            int longs = (int) (((long) entries * bitsPerBlock + 63) >> 6);
+            long[] array = new long[longs];
+            for(int i = 0; i < longs; i++)
+                array[i] = in.readLong();
+
+            return array;
+        }
+
         public void writeDataArray(long[] array) {
             for(long l : array)
                 out.writeLong(l);
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/ProtocolUtils.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/ProtocolUtils.java
index 57f27921..3949d7ed 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/ProtocolUtils.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/ProtocolUtils.java
@@ -58,6 +58,16 @@ public class ProtocolUtils {
         };
     }
 
+    public static <T> UnaryOperator<T> shallowTypedCloneGenerator(Class<T> clazz) {
+        BiConsumer<Object, Object> filler = shallowFill(clazz);
+
+        return source -> {
+            Object clone = Reflection.newInstance(clazz);
+            filler.accept(source, clone);
+            return (T) clone;
+        };
+    }
+
     private static BiConsumer<Object, Object> shallowFill(Class<?> clazz) {
         if(clazz == null)
             return (source, clone) -> {};
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/TechHider.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/TechHider.java
index 021d2fe4..b231e97f 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/TechHider.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/TechHider.java
@@ -79,6 +79,7 @@ public class TechHider {
         techhiders.put(blockChangePacket, this::blockChangeHider);
         techhiders.put(tileEntityDataPacket, this::tileEntityDataHider);
         techhiders.put(multiBlockChangePacket, ProtocolWrapper.impl.multiBlockChangeGenerator(this));
+        System.out.println(ChunkHider.impl.mapChunkPacket().getName());
         techhiders.put(ChunkHider.impl.mapChunkPacket(), ChunkHider.impl.chunkHiderGenerator(this));
 
         if(Core.getVersion() > 12 && Core.getVersion() < 19) {
diff --git a/SpigotCore/SpigotCore_Main/src/plugin.yml b/SpigotCore/SpigotCore_Main/src/plugin.yml
index a29249d2..cd807cd2 100644
--- a/SpigotCore/SpigotCore_Main/src/plugin.yml
+++ b/SpigotCore/SpigotCore_Main/src/plugin.yml
@@ -1,7 +1,7 @@
 name: SpigotCore
 version: "2.0"
 author: Lixfel
-api-version: "1.13"
+api-version: "1.21"
 load: STARTUP
 softdepend:
   - WorldEdit
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 8ab618ff..6665697f 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -126,7 +126,7 @@ dependencyResolutionManagement {
             library("nms18", "de.steamwar:spigot:1.18")
             library("nms19", "de.steamwar:spigot:1.19")
             library("nms20", "de.steamwar:spigot:1.20")
-            library("nms21", "de.steamwar:spigot:1.21.5")
+            library("nms21", "de.steamwar:spigot:1.21.6")
 
             library("axiom", "de.steamwar:axiompaper:RELEASE")
             library("worldedit12", "de.steamwar:worldedit:1.12")

From e7803dcf822a070734cffc0f134019c7e18326e8 Mon Sep 17 00:00:00 2001
From: Chaoscaot <chaos@chaoscaot.de>
Date: Thu, 31 Jul 2025 11:34:56 +0200
Subject: [PATCH 002/214] Enhance compatibility and feature support for
 Minecraft 1.21: Add ProtocolWrapper21, update gamerule management, streamline
 entity tracking, and refine chunk hider logic.

---
 .../features/techhider/TechHiderCommand.java  |  4 +-
 .../utils/CraftbukkitWrapper10.java           |  3 +
 .../utils/CraftbukkitWrapper12.java           |  3 +
 .../utils/CraftbukkitWrapper14.java           |  3 +
 .../utils/CraftbukkitWrapper15.java           |  3 +
 .../utils/CraftbukkitWrapper18.java           |  3 +
 FightSystem/FightSystem_21/build.gradle.kts   |  1 +
 .../fightsystem/utils/BlockIdWrapper21.java   | 36 ++++------
 .../utils/CraftbukkitWrapper21.java           |  7 ++
 .../utils/CraftbukkitWrapper8.java            |  3 +
 .../utils/CraftbukkitWrapper9.java            |  3 +
 .../de/steamwar/fightsystem/FightSystem.java  |  2 +
 .../fightsystem/utils/CraftbukkitWrapper.java |  2 +
 .../fightsystem/utils/TechHiderWrapper.java   |  4 +-
 .../de/steamwar/core/ProtocolWrapper21.java   | 66 +++++++++++++++++++
 .../de/steamwar/techhider/ChunkHider21.java   |  4 +-
 .../src/de/steamwar/Reflection.java           | 11 +++-
 .../src/de/steamwar/techhider/ChunkHider.java | 12 ++--
 18 files changed, 135 insertions(+), 35 deletions(-)
 create mode 100644 SpigotCore/SpigotCore_21/src/de/steamwar/core/ProtocolWrapper21.java

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/techhider/TechHiderCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/techhider/TechHiderCommand.java
index 17d3563c..0c1d8af5 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/techhider/TechHiderCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/techhider/TechHiderCommand.java
@@ -87,8 +87,8 @@ public class TechHiderCommand extends SWCommand implements Listener, ScoreboardE
             Set<String> hiddenBlockEntities = Collections.unmodifiableSet(new HashSet<>(config.getStringList("Techhider.HiddenBlockEntities")));
 
             TechHider current = new TechHider((TechHider.LocationEvaluator) (p, cX, cY) -> {
-                Chunk playerChunk = p.getLocation().getChunk();
-                return playerChunk.getX() == cX && playerChunk.getZ() == cY;
+                if (rg.buildChunkOutside(cX, cY)) return true;
+                return !hidden.get(rg).contains(p);
             }, Material.valueOf(obfuscateWith.toUpperCase()), hiddenBlocks.stream().map(String::toUpperCase).map(Material::valueOf).collect(Collectors.toSet()), hiddenBlockEntities);
             current.enable();
 
diff --git a/FightSystem/FightSystem_10/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper10.java b/FightSystem/FightSystem_10/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper10.java
index 78dd79a5..d5f654ae 100644
--- a/FightSystem/FightSystem_10/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper10.java
+++ b/FightSystem/FightSystem_10/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper10.java
@@ -55,4 +55,7 @@ public class CraftbukkitWrapper10 implements CraftbukkitWrapper {
     public Stream<?> entityIterator() {
         return ((CraftWorld) Config.world).getHandle().entityList.stream();
     }
+
+    @Override
+    public void setupGamerule() { }
 }
diff --git a/FightSystem/FightSystem_12/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper12.java b/FightSystem/FightSystem_12/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper12.java
index f8e843bc..a134b9fe 100644
--- a/FightSystem/FightSystem_12/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper12.java
+++ b/FightSystem/FightSystem_12/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper12.java
@@ -55,4 +55,7 @@ public class CraftbukkitWrapper12 implements CraftbukkitWrapper {
     public Stream<?> entityIterator() {
         return ((CraftWorld) Config.world).getHandle().entityList.stream();
     }
+
+    @Override
+    public void setupGamerule() { }
 }
diff --git a/FightSystem/FightSystem_14/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper14.java b/FightSystem/FightSystem_14/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper14.java
index 07c525d4..8e2f96ab 100644
--- a/FightSystem/FightSystem_14/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper14.java
+++ b/FightSystem/FightSystem_14/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper14.java
@@ -56,4 +56,7 @@ public class CraftbukkitWrapper14 implements CraftbukkitWrapper {
     public Stream<?> entityIterator() {
         return ((CraftWorld) Config.world).getHandle().entitiesById.values().stream();
     }
+
+    @Override
+    public void setupGamerule() { }
 }
diff --git a/FightSystem/FightSystem_15/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper15.java b/FightSystem/FightSystem_15/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper15.java
index 70d9e8c5..64a0f9e1 100644
--- a/FightSystem/FightSystem_15/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper15.java
+++ b/FightSystem/FightSystem_15/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper15.java
@@ -56,4 +56,7 @@ public class CraftbukkitWrapper15 implements CraftbukkitWrapper {
     public Stream<?> entityIterator() {
         return ((CraftWorld) Config.world).getHandle().entitiesById.values().stream();
     }
+
+    @Override
+    public void setupGamerule() { }
 }
diff --git a/FightSystem/FightSystem_18/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper18.java b/FightSystem/FightSystem_18/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper18.java
index 8fa8e7de..aafd5c08 100644
--- a/FightSystem/FightSystem_18/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper18.java
+++ b/FightSystem/FightSystem_18/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper18.java
@@ -62,4 +62,7 @@ public class CraftbukkitWrapper18 implements CraftbukkitWrapper {
     public Stream<?> entityIterator() {
         return StreamSupport.stream(((Iterable<?>) getIterable.invoke(getWorldEntities.invoke(getWorld.invoke(Config.world)))).spliterator(), false);
     }
+
+    @Override
+    public void setupGamerule() { }
 }
diff --git a/FightSystem/FightSystem_21/build.gradle.kts b/FightSystem/FightSystem_21/build.gradle.kts
index 3309134f..2da59fce 100644
--- a/FightSystem/FightSystem_21/build.gradle.kts
+++ b/FightSystem/FightSystem_21/build.gradle.kts
@@ -41,4 +41,5 @@ dependencies {
     }
 
     compileOnly(libs.fastutil)
+    compileOnly(libs.authlib)
 }
diff --git a/FightSystem/FightSystem_21/src/de/steamwar/fightsystem/utils/BlockIdWrapper21.java b/FightSystem/FightSystem_21/src/de/steamwar/fightsystem/utils/BlockIdWrapper21.java
index 32e2e6e4..105bbe36 100644
--- a/FightSystem/FightSystem_21/src/de/steamwar/fightsystem/utils/BlockIdWrapper21.java
+++ b/FightSystem/FightSystem_21/src/de/steamwar/fightsystem/utils/BlockIdWrapper21.java
@@ -19,34 +19,24 @@
 
 package de.steamwar.fightsystem.utils;
 
-import de.steamwar.Reflection;
-import de.steamwar.fightsystem.Config;
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import com.comphenix.tinyprotocol.TinyProtocol;
+import com.mojang.authlib.GameProfile;
+import de.steamwar.core.ProtocolWrapper;
+import de.steamwar.fightsystem.FightSystem;
 import net.minecraft.core.BlockPos;
-import net.minecraft.server.level.ChunkMap;
-import net.minecraft.server.level.ServerChunkCache;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.block.state.BlockState;
+import org.bukkit.GameMode;
 import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.block.Block;
 import org.bukkit.craftbukkit.CraftWorld;
 import org.bukkit.craftbukkit.block.CraftBlockState;
-import org.bukkit.craftbukkit.entity.CraftPlayer;
 import org.bukkit.craftbukkit.util.CraftMagicNumbers;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 
 public class BlockIdWrapper21 implements BlockIdWrapper {
-    static Int2ObjectMap<ChunkMap.TrackedEntity> tracker;
-
-    static Reflection.Field<Object> chunkMap = Reflection.getField(ServerChunkCache.class, "chunkMap", Object.class);
-    static {
-        ServerChunkCache chunkCache = ((CraftWorld) Config.world).getHandle().getChunkSource();
-        Object map = chunkMap.get(chunkCache);
-        Reflection.Field<Int2ObjectMap> eMapField = Reflection.getField(map.getClass(), "entityMap", Int2ObjectMap.class);
-        tracker = eMapField.get(map);
-    }
 
     @Override
     public Material idToMaterial(int blockState) {
@@ -71,17 +61,17 @@ public class BlockIdWrapper21 implements BlockIdWrapper {
 
     @Override
     public void trackEntity(Player player, Entity entity) {
-        ChunkMap.TrackedEntity trackedEntity = tracker.get(entity.getEntityId());
-        if (trackedEntity != null) {
-            trackedEntity.updatePlayer(((CraftPlayer) player).getHandle());
-        }
+        if(entity instanceof Player)
+            TinyProtocol.instance.sendPacket(player, ProtocolWrapper.impl.playerInfoPacketConstructor(ProtocolWrapper.PlayerInfoAction.REMOVE, new GameProfile(entity.getUniqueId(), entity.getName()), GameMode.CREATIVE));
+
+        player.showEntity(FightSystem.getPlugin(), entity);
     }
 
     @Override
     public void untrackEntity(Player player, Entity entity) {
-        ChunkMap.TrackedEntity trackedEntity = tracker.get(entity.getEntityId());
-        if (trackedEntity != null) {
-            trackedEntity.removePlayer(((CraftPlayer) player).getHandle());
-        }
+        player.hideEntity(FightSystem.getPlugin(), entity);
+
+        if(entity instanceof Player)
+            TinyProtocol.instance.sendPacket(player, ProtocolWrapper.impl.playerInfoPacketConstructor(ProtocolWrapper.PlayerInfoAction.ADD, new GameProfile(entity.getUniqueId(), entity.getName()), GameMode.CREATIVE));
     }
 }
diff --git a/FightSystem/FightSystem_21/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper21.java b/FightSystem/FightSystem_21/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper21.java
index b5c920a7..68f35171 100644
--- a/FightSystem/FightSystem_21/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper21.java
+++ b/FightSystem/FightSystem_21/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper21.java
@@ -19,6 +19,8 @@
 
 package de.steamwar.fightsystem.utils;
 
+import de.steamwar.fightsystem.Config;
+import org.bukkit.GameRule;
 import org.bukkit.entity.Entity;
 
 public class CraftbukkitWrapper21 extends CraftbukkitWrapper18 {
@@ -27,4 +29,9 @@ public class CraftbukkitWrapper21 extends CraftbukkitWrapper18 {
     public float headRotation(Entity e) {
         return getEntity(e).getYHeadRot();
     }
+
+    @Override
+    public void setupGamerule() {
+        Config.world.setGameRule(GameRule.LOCATOR_BAR, false);
+    }
 }
diff --git a/FightSystem/FightSystem_8/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper8.java b/FightSystem/FightSystem_8/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper8.java
index 8d743ae7..e7597dd7 100644
--- a/FightSystem/FightSystem_8/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper8.java
+++ b/FightSystem/FightSystem_8/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper8.java
@@ -52,4 +52,7 @@ public class CraftbukkitWrapper8 implements CraftbukkitWrapper {
     public Stream<?> entityIterator() {
         return ((CraftWorld) Config.world).getHandle().entityList.stream();
     }
+
+    @Override
+    public void setupGamerule() { }
 }
diff --git a/FightSystem/FightSystem_9/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper9.java b/FightSystem/FightSystem_9/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper9.java
index 54281ed3..c7f393b3 100644
--- a/FightSystem/FightSystem_9/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper9.java
+++ b/FightSystem/FightSystem_9/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper9.java
@@ -55,4 +55,7 @@ public class CraftbukkitWrapper9 implements CraftbukkitWrapper {
     public Stream<?> entityIterator() {
         return ((CraftWorld) Config.world).getHandle().entityList.stream();
     }
+
+    @Override
+    public void setupGamerule() { }
 }
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/FightSystem.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/FightSystem.java
index 1ff85e23..a95670a0 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/FightSystem.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/FightSystem.java
@@ -188,6 +188,8 @@ public class FightSystem extends JavaPlugin {
         }else if(Config.mode == ArenaMode.PREPARE) {
             Fight.getUnrotated().setSchem(SchematicNode.getSchematicNode(Config.PrepareSchemID));
         }
+
+        CraftbukkitWrapper.impl.setupGamerule();
     }
 
     @Override
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper.java
index 242119f5..e008a3bd 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper.java
@@ -33,4 +33,6 @@ public interface CraftbukkitWrapper {
     float headRotation(Entity e);
 
     Stream<?> entityIterator();
+
+    void setupGamerule();
 }
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/TechHiderWrapper.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/TechHiderWrapper.java
index fde87959..bf890168 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/TechHiderWrapper.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/TechHiderWrapper.java
@@ -59,7 +59,7 @@ public class TechHiderWrapper extends StateDependent implements TechHider.Locati
     private final SecretKey key;
 
     public TechHiderWrapper() {
-        super(ENABLED, FightState.All);
+        super(ENABLED, FightState.Schem);
         techHider = new TechHider(this, Config.ObfuscateWith, Config.HiddenBlocks, Config.HiddenBlockEntities);
 
         try {
@@ -68,7 +68,7 @@ public class TechHiderWrapper extends StateDependent implements TechHider.Locati
             throw new SecurityException(e);
         }
 
-        new StateDependentListener(ENABLED, FightState.All, this);
+        new StateDependentListener(ENABLED, FightState.Schem, this);
         register();
     }
 
diff --git a/SpigotCore/SpigotCore_21/src/de/steamwar/core/ProtocolWrapper21.java b/SpigotCore/SpigotCore_21/src/de/steamwar/core/ProtocolWrapper21.java
new file mode 100644
index 00000000..7018aa64
--- /dev/null
+++ b/SpigotCore/SpigotCore_21/src/de/steamwar/core/ProtocolWrapper21.java
@@ -0,0 +1,66 @@
+/*
+ *    This file is a part of the SteamWar software.
+ *
+ *    Copyright (C) 2022  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.mojang.authlib.GameProfile;
+import com.mojang.datafixers.util.Pair;
+import de.steamwar.Reflection;
+import net.minecraft.Util;
+import net.minecraft.network.protocol.game.ClientboundPlayerInfoRemovePacket;
+import net.minecraft.network.protocol.game.ClientboundPlayerInfoUpdatePacket;
+import net.minecraft.world.level.GameType;
+import org.bukkit.GameMode;
+
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.function.LongSupplier;
+
+public class ProtocolWrapper21 implements ProtocolWrapper {
+
+    private static final Reflection.Field<List> equipmentStack = Reflection.getField(equipmentPacket, List.class, 0);
+    @Override
+    public void setEquipmentPacketStack(Object packet, Object slot, Object stack) {
+        equipmentStack.set(packet, Collections.singletonList(new Pair<>(slot, stack)));
+    }
+
+    private static final Reflection.Constructor removePacketConstructor = Reflection.getConstructor(ClientboundPlayerInfoRemovePacket.class, List.class);
+
+    @Override
+    @SuppressWarnings("deprecation")
+    public Object playerInfoPacketConstructor(PlayerInfoAction action, GameProfile profile, GameMode mode) {
+        if(action == PlayerInfoAction.REMOVE)
+            return removePacketConstructor.invoke(Collections.singletonList(profile.getId()));
+        return switch (action) {
+            case ADD -> new ClientboundPlayerInfoUpdatePacket(EnumSet.of(ClientboundPlayerInfoUpdatePacket.Action.ADD_PLAYER, ClientboundPlayerInfoUpdatePacket.Action.UPDATE_GAME_MODE), new ClientboundPlayerInfoUpdatePacket.Entry(
+                    profile.getId(), profile, true, 0, GameType.byId(mode.getValue()), null, true, 0, null
+            ));
+            case GAMEMODE -> new ClientboundPlayerInfoUpdatePacket(EnumSet.of(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_GAME_MODE), new ClientboundPlayerInfoUpdatePacket.Entry(
+                    profile.getId(), profile, true, 0, GameType.byId(mode.getValue()), null, true, 0, null
+            ));
+            default -> null;
+        };
+    }
+
+    @Override
+    public void initTPSWarp(LongSupplier longSupplier) {
+        Util.timeSource = () -> System.nanoTime() + longSupplier.getAsLong();
+    }
+}
diff --git a/SpigotCore/SpigotCore_21/src/de/steamwar/techhider/ChunkHider21.java b/SpigotCore/SpigotCore_21/src/de/steamwar/techhider/ChunkHider21.java
index c31e5f8f..0d0cb782 100644
--- a/SpigotCore/SpigotCore_21/src/de/steamwar/techhider/ChunkHider21.java
+++ b/SpigotCore/SpigotCore_21/src/de/steamwar/techhider/ChunkHider21.java
@@ -123,7 +123,9 @@ public class ChunkHider21 implements ChunkHider {
                 for (int x = 0; x < 16; x++) {
                     int pos = (((y * 16) + z) * 16) + x;
 
-                    switch (section.test(x, y, z)) {
+                    TechHider.State test = section.test(x, y, z);
+
+                    switch (test) {
                         case SKIP:
                             break;
                         case CHECK:
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/Reflection.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/Reflection.java
index 7c34fca9..ff298c1a 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/Reflection.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/Reflection.java
@@ -157,14 +157,21 @@ public final class Reflection {
 			} else if(MAJOR_VERSION < 21 || MINOR_VERSION < 4) {
 				return Class.forName(spigotClassnames.getOrDefault(name, name));
 			} else {
-				Class<?> clazz = Class.forName(name);
-				if (clazz.getName().equals(name)) {
+				Class<?> clazz = null;
+				try {
+					clazz = Class.forName(name);
+				} catch (ClassNotFoundException e) {}
+				if (clazz != null && clazz.getName().equals(name)) {
 					return clazz;
 				}
 
 				try {
 					return Core.class.getClassLoader().getParent().loadClass(name);
 				} catch (ClassNotFoundException e) {
+					if (clazz == null) {
+						throw e;
+					}
+
 					return clazz;
 				}
 			}
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/ChunkHider.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/ChunkHider.java
index fbd6e364..e1d2b5e9 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/ChunkHider.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/ChunkHider.java
@@ -147,8 +147,9 @@ public interface ChunkHider {
                 return;
             }
 
-            int longs = (int) (((long) entries * bitsPerBlock + 63) >> 6);
-            out.writeBytes(in, longs * Long.BYTES);
+            char valuesPerLong = (char)(64 / bitsPerBlock);
+            int i1 = (entries + valuesPerLong - 1) / valuesPerLong;
+            out.writeBytes(in, i1 * Long.BYTES);
         }
 
         public long[] readDataArray() {
@@ -164,9 +165,10 @@ public interface ChunkHider {
                 return new long[entries];
             }
 
-            int longs = (int) (((long) entries * bitsPerBlock + 63) >> 6);
-            long[] array = new long[longs];
-            for(int i = 0; i < longs; i++)
+            char valuesPerLong = (char) (64 / bitsPerBlock);
+            int i1 = (entries + valuesPerLong - 1) / valuesPerLong;
+            long[] array = new long[i1];
+            for(int i = 0; i < i1; i++)
                 array[i] = in.readLong();
 
             return array;

From 6623e9d808fb29c4d84ba4fefa410bd6fefef271 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Fri, 1 Aug 2025 10:43:37 +0200
Subject: [PATCH 003/214] Add VacationCommand

---
 .../velocitycore/discord/DiscordBot.java      |  10 +-
 .../velocitycore/discord/VacationCommand.java | 189 ++++++++++++++++++
 2 files changed, 197 insertions(+), 2 deletions(-)
 create mode 100644 VelocityCore/src/de/steamwar/velocitycore/discord/VacationCommand.java

diff --git a/VelocityCore/src/de/steamwar/velocitycore/discord/DiscordBot.java b/VelocityCore/src/de/steamwar/velocitycore/discord/DiscordBot.java
index 28cd0c22..53714c52 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/discord/DiscordBot.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/discord/DiscordBot.java
@@ -54,8 +54,8 @@ import net.dv8tion.jda.api.utils.MemberCachePolicy;
 import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder;
 
 import java.awt.*;
-import java.util.List;
 import java.util.*;
+import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 
@@ -193,14 +193,20 @@ public class DiscordBot {
 
         VelocityCore.schedule(CouncilChannel::updateAll).repeat(1, TimeUnit.HOURS).schedule();
 
+        VacationCommand vacationCommand = new VacationCommand();
         jda.addEventListener(
                 new DiscordTicketHandler(),
                 new DiscordTeamEvent(),
                 new ChannelListener(),
-                new DiscordSchemUpload()
+                new DiscordSchemUpload(),
+                vacationCommand
         );
 
         commandSetup(jda.retrieveCommands().complete(), jda.updateCommands());
+
+        jda.getGuildById(1241489896909180998L)
+                .upsertCommand(vacationCommand.COMMAND)
+                .queue();
     }
 
     private final OptionData commandArgument = new OptionData(OptionType.STRING, ARGUMENT_NAME, "Command arguments", false);
diff --git a/VelocityCore/src/de/steamwar/velocitycore/discord/VacationCommand.java b/VelocityCore/src/de/steamwar/velocitycore/discord/VacationCommand.java
new file mode 100644
index 00000000..ace8dcf6
--- /dev/null
+++ b/VelocityCore/src/de/steamwar/velocitycore/discord/VacationCommand.java
@@ -0,0 +1,189 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2020  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.discord;
+
+import it.unimi.dsi.fastutil.Pair;
+import net.dv8tion.jda.api.entities.Guild;
+import net.dv8tion.jda.api.entities.ScheduledEvent;
+import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
+import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
+import net.dv8tion.jda.api.hooks.ListenerAdapter;
+import net.dv8tion.jda.api.interactions.InteractionHook;
+import net.dv8tion.jda.api.interactions.commands.Command;
+import net.dv8tion.jda.api.interactions.commands.OptionType;
+import net.dv8tion.jda.api.interactions.commands.build.OptionData;
+import net.dv8tion.jda.api.interactions.commands.build.SubcommandData;
+import net.dv8tion.jda.internal.interactions.CommandDataImpl;
+import org.jetbrains.annotations.NotNull;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+public class VacationCommand extends ListenerAdapter {
+
+    private final Guild guild = Objects.requireNonNull(DiscordBot.getInstance().getJda().getGuildById(1241489896909180998L));
+
+    public final CommandDataImpl COMMAND = new CommandDataImpl("vacation", "Verwalte deinen Urlaub");
+
+    public VacationCommand() {
+        COMMAND.addSubcommands(new SubcommandData("create", "Erstelle deinen Urlaub")
+                .addOptions(new OptionData(OptionType.STRING, "from", "Datum (TT.MM.JJJJ)", true),
+                        new OptionData(OptionType.STRING, "to", "Datum (TT.MM.JJJJ)", true)));
+        COMMAND.addSubcommands(new SubcommandData("delete", "Lösche deinen Urlaub")
+                .addOptions(new OptionData(OptionType.INTEGER, "vacation", "Dein Urlaub", true, true)));
+    }
+
+    @Override
+    public void onSlashCommandInteraction(@NotNull SlashCommandInteractionEvent event) {
+        if (!event.getName().equals("vacation")) return;
+        switch (event.getSubcommandName()) {
+            case "create":
+                createVacation(event);
+                break;
+            case "delete":
+                deleteVacation(event);
+                break;
+            default:
+                break;
+        }
+    }
+
+    public static final DateTimeFormatter PARSER = DateTimeFormatter.ofPattern("dd.MM.uuuu");
+
+    private void createVacation(SlashCommandInteractionEvent event) {
+        InteractionHook interactionHook = event.deferReply(true).complete();
+        String from = event.getOption("from").getAsString();
+        String to = event.getOption("to").getAsString();
+
+        LocalDateTime fromDate;
+        try {
+            fromDate = LocalDate.parse(from, PARSER).atStartOfDay();
+        } catch (DateTimeParseException e) {
+            interactionHook.editOriginal("Das Datumsformat ist falsch! Bitte verwenden Sie TT.MM.JJJJ für den ersten Tag deines Urlaubs").queue();
+            return;
+        }
+        if (fromDate == null) {
+            interactionHook.editOriginal("Das Datumsformat ist falsch! Bitte verwenden Sie TT.MM.JJJJ für den ersten Tag deines Urlaubs").queue();
+            return;
+        }
+        if (!fromDate.isAfter(LocalDateTime.now())) {
+            interactionHook.editOriginal("Bitte gib ein Datum in der Zukunft an!").queue();
+            return;
+        }
+
+        LocalDateTime toDate;
+        try {
+            toDate = LocalDate.parse(to, PARSER).atTime(23, 59, 59);
+        } catch (DateTimeParseException e) {
+            interactionHook.editOriginal("Das Datumsformat ist falsch! Bitte verwenden Sie TT.MM.JJJJ für den letzten Tag deines Urlaubs").queue();
+            return;
+        }
+        if (toDate == null) {
+            interactionHook.editOriginal("Das Datumsformat ist falsch! Bitte verwenden Sie TT.MM.JJJJ für den letzten Tag deines Urlaubs").queue();
+            return;
+        }
+        if (!toDate.isAfter(LocalDateTime.now())) {
+            interactionHook.editOriginal("Bitte gib ein Datum in der Zukunft an!").queue();
+            return;
+        }
+        if (!toDate.isAfter(fromDate)) {
+            interactionHook.editOriginal("Bitte gib ein Datum nach dem ersten Urlaubstag an!").queue();
+            return;
+        }
+
+        guild.createScheduledEvent(
+                        "Urlaub " + event.getMember().getEffectiveName(),
+                        event.getMember().getId(),
+                        OffsetDateTime.of(fromDate, ZoneId.of("Europe/Berlin").getRules().getOffset(fromDate)),
+                        OffsetDateTime.of(toDate, ZoneId.of("Europe/Berlin").getRules().getOffset(toDate))
+                ).onSuccess(scheduledEvent -> {
+                    interactionHook.editOriginal("Urlaub erstellt!").queue();
+                })
+                .onErrorMap(throwable -> {
+                    interactionHook.editOriginal("Urlaub konnte nicht erstellt werden!").queue();
+                    return null;
+                })
+                .queue();
+    }
+
+    private void deleteVacation(SlashCommandInteractionEvent event) {
+        InteractionHook interactionHook = event.deferReply(true).complete();
+        long eventId = event.getOption("vacation").getAsLong();
+        ScheduledEvent scheduledEvent = guild.getScheduledEventById(eventId);
+        if (scheduledEvent == null) {
+            interactionHook.editOriginal("Konnte den Urlaub nicht finden!").queue();
+            return;
+        }
+        scheduledEvent.delete()
+                .onSuccess(unused -> {
+                    interactionHook.editOriginal("Urlaub gelöscht!").queue();
+                })
+                .onErrorMap(throwable -> {
+                    interactionHook.editOriginal("Urlaub konnte nicht gelöscht werden!").queue();
+                    return null;
+                })
+                .queue();
+    }
+
+    @Override
+    public void onCommandAutoCompleteInteraction(@NotNull CommandAutoCompleteInteractionEvent event) {
+        if (!event.getName().equals("vacation")) return;
+        switch (event.getFocusedOption().getName()) {
+            case "vacation":
+                listVacations(event);
+                break;
+            default:
+                break;
+        }
+    }
+
+    private void listVacations(CommandAutoCompleteInteractionEvent event) {
+        String vacation = event.getOption("vacation").getAsString();
+        List<Command.Choice> choices = guild.getScheduledEvents()
+                .stream()
+                .filter(scheduledEvent -> scheduledEvent.getLocation().equals(event.getMember().getId()))
+                .map(scheduledEvent -> {
+                    StringBuilder st = new StringBuilder();
+                    st.append(String.format("%02d", scheduledEvent.getStartTime().getDayOfMonth())).append(".");
+                    st.append(String.format("%02d", scheduledEvent.getStartTime().getMonth())).append(".");
+                    st.append(scheduledEvent.getStartTime().getYear());
+                    st.append(" - ");
+                    st.append(String.format("%02d", scheduledEvent.getEndTime().getDayOfMonth())).append(".");
+                    st.append(String.format("%02d", scheduledEvent.getEndTime().getDayOfMonth())).append(".");
+                    st.append(scheduledEvent.getEndTime().getYear());
+                    return Pair.of(scheduledEvent, st.toString());
+                })
+                .filter(pair -> pair.right().startsWith(vacation))
+                .limit(25)
+                .map(pair -> {
+                    return new Command.Choice(pair.right(), pair.left().getLocation());
+                })
+                .collect(Collectors.toList());
+        event.replyChoices(choices)
+                .queue();
+    }
+}

From d14022e69ef06648ffb4433719f019b3a93936c9 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Fri, 1 Aug 2025 10:46:54 +0200
Subject: [PATCH 004/214] Fix ChannelListener

---
 .../steamwar/velocitycore/discord/listeners/ChannelListener.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/VelocityCore/src/de/steamwar/velocitycore/discord/listeners/ChannelListener.java b/VelocityCore/src/de/steamwar/velocitycore/discord/listeners/ChannelListener.java
index bebf194c..bfecf313 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/discord/listeners/ChannelListener.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/discord/listeners/ChannelListener.java
@@ -70,6 +70,7 @@ public class ChannelListener extends ListenerAdapter {
 
     @Override
     public void onSlashCommandInteraction(@NotNull SlashCommandInteractionEvent event) {
+        if (event.getGuild().getIdLong() == 1241489896909180998L) return;
         InteractionReply.reply(event, sender -> {
             if(sender.user().getDiscordId() == null)
                 return;

From 9e629d09a80c90a5d36ea630f8a6597e353cd122 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Fri, 1 Aug 2025 10:48:17 +0200
Subject: [PATCH 005/214] Fix VacationCommand

---
 .../src/de/steamwar/velocitycore/discord/VacationCommand.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/VelocityCore/src/de/steamwar/velocitycore/discord/VacationCommand.java b/VelocityCore/src/de/steamwar/velocitycore/discord/VacationCommand.java
index ace8dcf6..2c43356c 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/discord/VacationCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/discord/VacationCommand.java
@@ -169,11 +169,11 @@ public class VacationCommand extends ListenerAdapter {
                 .map(scheduledEvent -> {
                     StringBuilder st = new StringBuilder();
                     st.append(String.format("%02d", scheduledEvent.getStartTime().getDayOfMonth())).append(".");
-                    st.append(String.format("%02d", scheduledEvent.getStartTime().getMonth())).append(".");
+                    st.append(String.format("%02d", scheduledEvent.getStartTime().getMonthValue())).append(".");
                     st.append(scheduledEvent.getStartTime().getYear());
                     st.append(" - ");
                     st.append(String.format("%02d", scheduledEvent.getEndTime().getDayOfMonth())).append(".");
-                    st.append(String.format("%02d", scheduledEvent.getEndTime().getDayOfMonth())).append(".");
+                    st.append(String.format("%02d", scheduledEvent.getEndTime().getMonthValue())).append(".");
                     st.append(scheduledEvent.getEndTime().getYear());
                     return Pair.of(scheduledEvent, st.toString());
                 })

From d9681877509654f9730d8e0a3e92a138eb10eda4 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Fri, 1 Aug 2025 10:49:28 +0200
Subject: [PATCH 006/214] Fix VacationCommand

---
 .../src/de/steamwar/velocitycore/discord/VacationCommand.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VelocityCore/src/de/steamwar/velocitycore/discord/VacationCommand.java b/VelocityCore/src/de/steamwar/velocitycore/discord/VacationCommand.java
index 2c43356c..f4121468 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/discord/VacationCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/discord/VacationCommand.java
@@ -180,7 +180,7 @@ public class VacationCommand extends ListenerAdapter {
                 .filter(pair -> pair.right().startsWith(vacation))
                 .limit(25)
                 .map(pair -> {
-                    return new Command.Choice(pair.right(), pair.left().getLocation());
+                    return new Command.Choice(pair.right(), Long.parseLong(pair.left().getLocation()));
                 })
                 .collect(Collectors.toList());
         event.replyChoices(choices)

From 01f55c43093f6641d387fafc6a189c99057470ed Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Fri, 1 Aug 2025 10:51:17 +0200
Subject: [PATCH 007/214] Fix VacationCommand

---
 .../de/steamwar/velocitycore/discord/VacationCommand.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/VelocityCore/src/de/steamwar/velocitycore/discord/VacationCommand.java b/VelocityCore/src/de/steamwar/velocitycore/discord/VacationCommand.java
index f4121468..5be79f9e 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/discord/VacationCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/discord/VacationCommand.java
@@ -54,7 +54,7 @@ public class VacationCommand extends ListenerAdapter {
                 .addOptions(new OptionData(OptionType.STRING, "from", "Datum (TT.MM.JJJJ)", true),
                         new OptionData(OptionType.STRING, "to", "Datum (TT.MM.JJJJ)", true)));
         COMMAND.addSubcommands(new SubcommandData("delete", "Lösche deinen Urlaub")
-                .addOptions(new OptionData(OptionType.INTEGER, "vacation", "Dein Urlaub", true, true)));
+                .addOptions(new OptionData(OptionType.STRING, "vacation", "Dein Urlaub", true, true)));
     }
 
     @Override
@@ -132,7 +132,7 @@ public class VacationCommand extends ListenerAdapter {
 
     private void deleteVacation(SlashCommandInteractionEvent event) {
         InteractionHook interactionHook = event.deferReply(true).complete();
-        long eventId = event.getOption("vacation").getAsLong();
+        String eventId = event.getOption("vacation").getAsString();
         ScheduledEvent scheduledEvent = guild.getScheduledEventById(eventId);
         if (scheduledEvent == null) {
             interactionHook.editOriginal("Konnte den Urlaub nicht finden!").queue();
@@ -180,7 +180,7 @@ public class VacationCommand extends ListenerAdapter {
                 .filter(pair -> pair.right().startsWith(vacation))
                 .limit(25)
                 .map(pair -> {
-                    return new Command.Choice(pair.right(), Long.parseLong(pair.left().getLocation()));
+                    return new Command.Choice(pair.right(), pair.left().getId());
                 })
                 .collect(Collectors.toList());
         event.replyChoices(choices)

From 3a13fc7bb92e080a4cd6c388596c3b18d1d1ee9e Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Fri, 1 Aug 2025 17:51:19 +0200
Subject: [PATCH 008/214] Reduce MAX_BLOCKS of SelectAdjacent

---
 .../steamwar/bausystem/features/worldedit/SelectAdjacent.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/SelectAdjacent.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/SelectAdjacent.java
index 9afcd59e..c92b5aa2 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/SelectAdjacent.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/SelectAdjacent.java
@@ -97,7 +97,7 @@ public class SelectAdjacent implements Listener {
 
     private class Selector {
 
-        private static final int MAX_BLOCKS = 1_000_000;
+        private static final int MAX_BLOCKS = 100_000;
 
         private int minX;
         private int minY;

From 2166096ba55af0bc8c4773e48c680b1e980c076e Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Fri, 1 Aug 2025 21:17:58 +0200
Subject: [PATCH 009/214] Fix PistonCalculator

---
 .../steamwar/bausystem/features/util/PistonCalculator.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/PistonCalculator.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/PistonCalculator.java
index 4479ff63..6bf9b0c9 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/PistonCalculator.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/PistonCalculator.java
@@ -55,8 +55,9 @@ public class PistonCalculator implements Listener {
     public void onPlayerInteract(PlayerInteractEvent event) {
         if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
         if (event.getAction() != Action.RIGHT_CLICK_BLOCK) return;
-        if (event.hasItem() && event.getItem().getType() == Material.SLIME_BALL) {
-        } else if (event.hasItem()) return;
+        if (event.getItem() == null) {}
+        else if (event.getItem() != null && event.getItem().getType() == Material.SLIME_BALL) {}
+        else return;
         if (event.getClickedBlock() == null) return;
         Block clickedBlock = event.getClickedBlock();
         Material blockType = clickedBlock.getType();

From 70d0f179ccd0851700e510d2ce9f57a8db64a70d Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sat, 2 Aug 2025 11:34:41 +0200
Subject: [PATCH 010/214] Fix stuff in DiscordBot

---
 .../velocitycore/discord/DiscordBot.java      | 49 ++++++-------------
 1 file changed, 16 insertions(+), 33 deletions(-)

diff --git a/VelocityCore/src/de/steamwar/velocitycore/discord/DiscordBot.java b/VelocityCore/src/de/steamwar/velocitycore/discord/DiscordBot.java
index 53714c52..68d5d316 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/discord/DiscordBot.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/discord/DiscordBot.java
@@ -41,7 +41,6 @@ import net.dv8tion.jda.api.entities.Role;
 import net.dv8tion.jda.api.entities.emoji.Emoji;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import net.dv8tion.jda.api.exceptions.ErrorResponseException;
-import net.dv8tion.jda.api.interactions.commands.Command;
 import net.dv8tion.jda.api.interactions.commands.OptionType;
 import net.dv8tion.jda.api.interactions.commands.build.CommandData;
 import net.dv8tion.jda.api.interactions.commands.build.Commands;
@@ -49,13 +48,14 @@ import net.dv8tion.jda.api.interactions.commands.build.OptionData;
 import net.dv8tion.jda.api.interactions.components.ActionRow;
 import net.dv8tion.jda.api.interactions.components.buttons.Button;
 import net.dv8tion.jda.api.requests.GatewayIntent;
-import net.dv8tion.jda.api.requests.restaction.CommandListUpdateAction;
 import net.dv8tion.jda.api.utils.MemberCachePolicy;
 import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder;
 
 import java.awt.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 
@@ -67,9 +67,10 @@ public class DiscordBot {
 
     @Getter
     private static final Map<String, SWCommand> commands = new HashMap<>();
+    private final OptionData commandArgument = new OptionData(OptionType.STRING, ARGUMENT_NAME, "Command arguments", false);
 
     public static void withBot(Consumer<DiscordBot> consumer) {
-        if(instance != null)
+        if (instance != null)
             consumer.accept(instance);
     }
 
@@ -141,7 +142,7 @@ public class DiscordBot {
                         ActionRow.of(Button.link("https://steamwar.de", "Website"), Button.link("https://steamwar.de/youtube", "YouTube")),
                         ActionRow.of(Button.primary("auth", Emoji.fromUnicode("U+2705")).withLabel("Minecraft verknüpfen"))
                 ), event -> {
-            if(event.getComponentId().equals("auth"))
+            if (event.getComponentId().equals("auth"))
                 event.reply("Gebe innerhalb der nächsten 10 Minuten ``/verify " + AuthManager.createDiscordAuthToken(event.getUser()) + "`` auf dem Minecraft Server ein").setEphemeral(true).queue();
         });
         List<ActionRow> actionRows = new ArrayList<>();
@@ -202,42 +203,24 @@ public class DiscordBot {
                 vacationCommand
         );
 
-        commandSetup(jda.retrieveCommands().complete(), jda.updateCommands());
+        jda.updateCommands()
+                .addCommands(commands.keySet()
+                        .stream()
+                        .filter(command -> command.matches("^[\\w-]+$"))
+                        .map(command -> Commands.slash(command, command).addOptions(commandArgument))
+                        .toArray(CommandData[]::new))
+                .queue();
+        jda.getGuildById(690530484920385586L).updateCommands().queue();
 
         jda.getGuildById(1241489896909180998L)
                 .upsertCommand(vacationCommand.COMMAND)
                 .queue();
     }
 
-    private final OptionData commandArgument = new OptionData(OptionType.STRING, ARGUMENT_NAME, "Command arguments", false);
-    private void commandSetup(List<Command> existing, CommandListUpdateAction updateCommands) {
-        Set<String> correctCommands = new HashSet<>();
-        for(Command command : existing) {
-            if(!commands.containsKey(command.getName())) {
-                command.delete().complete();
-                continue;
-            }
-
-            List<Command.Option> options = command.getOptions();
-            if(options.size() != 1 || options.get(0).getType() != OptionType.STRING)
-                command.editCommand().clearOptions().addOptions(commandArgument).complete();
-
-            correctCommands.add(command.getName());
-        }
-
-        updateCommands
-                .addCommands(commands
-                        .keySet().stream()
-                        .filter(command -> !correctCommands.contains(command))
-                        .filter(command -> command.matches("^[\\w-]+$"))
-                        .map(command -> Commands.slash(command, command).addOptions(commandArgument))
-                        .toArray(CommandData[]::new))
-                .queue();
-    }
-
     private boolean activityToggle = false;
+
     private void activity() {
-        if(activityToggle) {
+        if (activityToggle) {
             Event event = Event.get();
             jda.getPresence().setActivity(event != null ? Activity.competing("dem Event " + event.getEventName()) : Activity.playing("auf SteamWar.de"));
         } else {

From 018b9a971f62ea37b1755ec55087134bcf022460 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sat, 2 Aug 2025 11:36:08 +0200
Subject: [PATCH 011/214] Fix stuff in DiscordBot

---
 .../src/de/steamwar/velocitycore/discord/DiscordBot.java         | 1 -
 1 file changed, 1 deletion(-)

diff --git a/VelocityCore/src/de/steamwar/velocitycore/discord/DiscordBot.java b/VelocityCore/src/de/steamwar/velocitycore/discord/DiscordBot.java
index 68d5d316..e2930bb6 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/discord/DiscordBot.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/discord/DiscordBot.java
@@ -210,7 +210,6 @@ public class DiscordBot {
                         .map(command -> Commands.slash(command, command).addOptions(commandArgument))
                         .toArray(CommandData[]::new))
                 .queue();
-        jda.getGuildById(690530484920385586L).updateCommands().queue();
 
         jda.getGuildById(1241489896909180998L)
                 .upsertCommand(vacationCommand.COMMAND)

From 2e91a5a582b4e07f38dedc970e4ba90158cef3b1 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sat, 2 Aug 2025 11:42:39 +0200
Subject: [PATCH 012/214] Trigger rebuild

---
 .../src/de/steamwar/velocitycore/discord/DiscordBot.java       | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/VelocityCore/src/de/steamwar/velocitycore/discord/DiscordBot.java b/VelocityCore/src/de/steamwar/velocitycore/discord/DiscordBot.java
index e2930bb6..ae9decbd 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/discord/DiscordBot.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/discord/DiscordBot.java
@@ -131,6 +131,7 @@ public class DiscordBot {
                 reply.system("DC_ROLE_ADDED", role.getAsMention());
             }
         }));
+
         new StaticMessageChannel(config.channel("rules"), () -> new MessageCreateBuilder()
                 .setEmbeds(new EmbedBuilder()
                         .setDescription(String.join("\n", config.getRules()))
@@ -145,6 +146,7 @@ public class DiscordBot {
             if (event.getComponentId().equals("auth"))
                 event.reply("Gebe innerhalb der nächsten 10 Minuten ``/verify " + AuthManager.createDiscordAuthToken(event.getUser()) + "`` auf dem Minecraft Server ein").setEphemeral(true).queue();
         });
+
         List<ActionRow> actionRows = new ArrayList<>();
         List<Button> list = new ArrayList<>();
         for (DiscordTicketType type : DiscordTicketType.values()) {
@@ -164,6 +166,7 @@ public class DiscordBot {
                         .setColor(Color.RED)
                         .build())
                 .setComponents(actionRows), DiscordTicketHandler::openTicket);
+
         eventChannel = new StaticMessageChannel(config.channel("events"), EventChannel::get);
         checklistChannel = new ChecklistChannel(config.channel("checklist"));
         config.getCouncilThread().forEach((roleId, threadId) -> new CouncilChannel(DiscordBot.getGuild().getRoleById(roleId), DiscordBot.getGuild().getThreadChannelById(threadId)));

From 8d1b15b0195e9f9c81f963ebe7274ee58f8a6f0c Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sat, 2 Aug 2025 13:14:05 +0200
Subject: [PATCH 013/214] Fix PistonCalculator

---
 .../de/steamwar/bausystem/features/util/PistonCalculator.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/PistonCalculator.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/PistonCalculator.java
index 6bf9b0c9..5cc4b744 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/PistonCalculator.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/PistonCalculator.java
@@ -57,6 +57,10 @@ public class PistonCalculator implements Listener {
         if (event.getAction() != Action.RIGHT_CLICK_BLOCK) return;
         if (event.getItem() == null) {}
         else if (event.getItem() != null && event.getItem().getType() == Material.SLIME_BALL) {}
+        else if (!event.getItem().getType().isBlock()) {
+            DEBOUNCE.put(event.getPlayer(), System.currentTimeMillis());
+            return;
+        }
         else return;
         if (event.getClickedBlock() == null) return;
         Block clickedBlock = event.getClickedBlock();

From 45646b6ba3f0159bffc482179b57c51c44565e5e Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sat, 2 Aug 2025 13:23:03 +0200
Subject: [PATCH 014/214] Update SelectAdjacent

---
 .../steamwar/bausystem/features/worldedit/SelectAdjacent.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/SelectAdjacent.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/SelectAdjacent.java
index c92b5aa2..7e3ade3c 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/SelectAdjacent.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/SelectAdjacent.java
@@ -97,7 +97,7 @@ public class SelectAdjacent implements Listener {
 
     private class Selector {
 
-        private static final int MAX_BLOCKS = 100_000;
+        private static final int MAX_BLOCKS = 500_000;
 
         private int minX;
         private int minY;

From 96daa2c861ad69a2fbb2792379dcb4ed3981bd05 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Fri, 4 Oct 2024 19:55:58 +0200
Subject: [PATCH 015/214] Update some part of Region

---
 .../bausystem/utils/FlatteningWrapper15.java  |   2 +-
 .../features/backup/BackupCommand.java        |   5 -
 .../features/countingwand/Countingwand.java   |   2 +-
 .../countingwand/CountingwandListener.java    |   2 +-
 .../killchecker/KillcheckerVisualizer.java    |   2 +-
 .../features/observer/ObserverTracer.java     |   2 +-
 .../features/region/RegionCommand.java        |   2 +-
 .../region/items/ColorBauGuiItem.java         |   2 +-
 .../features/script/lua/libs/LuaLib.java      |   2 +-
 .../script/lua/libs/WorldEditLib.java         |   2 +-
 .../features/slaves/laufbau/Cuboid.java       |   2 +-
 .../laufbau/states/CreatingLaufState.java     |   2 +-
 .../laufbau/states/ProcessingTracesState.java |   2 +-
 .../team/boundary/BoundaryViewer.java         |   2 +-
 .../features/util/SelectCommand.java          |   4 +-
 .../worldedit/ColorReplaceCommand.java        |   2 +-
 .../de/steamwar/bausystem/region/Color.java   |  39 -----
 .../de/steamwar/bausystem/region/Region.java  |   1 +
 .../region/flags/flagvalues/ColorMode.java    |   2 +-
 .../steamwar/bausystem/regionnew/Color.java   |  39 +++++
 .../bausystem/regionnew/FlagStorage.java      |  29 ++++
 .../{region => regionnew}/Point.java          |  26 +--
 .../steamwar/bausystem/regionnew/Region.java  |  81 +++++++++
 .../bausystem/regionnew/RegionFlagPolicy.java |  34 ++++
 .../bausystem/regionnew/RegionSide.java       |  25 +++
 .../bausystem/regionnew/RegionSystem.java     |  40 +++++
 .../bausystem/regionnew/RegionType.java       |  32 ++++
 .../regionnew/flags/ChangedMode.java          |  57 ++++++
 .../bausystem/regionnew/flags/ColorMode.java  |  71 ++++++++
 .../bausystem/regionnew/flags/FireMode.java   |  59 +++++++
 .../bausystem/regionnew/flags/Flag.java       | 102 +++++++++++
 .../bausystem/regionnew/flags/FreezeMode.java |  60 +++++++
 .../bausystem/regionnew/flags/ItemMode.java   |  59 +++++++
 .../regionnew/flags/NoGravityMode.java        |  59 +++++++
 .../regionnew/flags/ProtectMode.java          |  59 +++++++
 .../bausystem/regionnew/flags/TNTMode.java    |  58 +++++++
 .../regionnew/flags/TestblockMode.java        |  61 +++++++
 .../bausystem/utils/FlatteningWrapper.java    |   2 +-
 .../bausystem/utils/PasteBuilder.java         |   4 +-
 .../BauSystem_RegionFixed/build.gradle.kts    |  47 +++++
 .../bausystem/regionnew/FixedFlagStorage.java |  55 ++++++
 .../regionnew/FixedGlobalRegion.java          | 164 ++++++++++++++++++
 .../bausystem/regionnew/FixedRegion.java      | 148 ++++++++++++++++
 .../regionnew/FixedRegionSystem.java          |  70 ++++++++
 BauSystem/build.gradle.kts                    |   1 +
 settings.gradle.kts                           |   3 +-
 46 files changed, 1445 insertions(+), 79 deletions(-)
 delete mode 100644 BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Color.java
 create mode 100644 BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/Color.java
 create mode 100644 BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/FlagStorage.java
 rename BauSystem/BauSystem_Main/src/de/steamwar/bausystem/{region => regionnew}/Point.java (67%)
 create mode 100644 BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/Region.java
 create mode 100644 BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/RegionFlagPolicy.java
 create mode 100644 BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/RegionSide.java
 create mode 100644 BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/RegionSystem.java
 create mode 100644 BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/RegionType.java
 create mode 100644 BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/ChangedMode.java
 create mode 100644 BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/ColorMode.java
 create mode 100644 BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/FireMode.java
 create mode 100644 BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/Flag.java
 create mode 100644 BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/FreezeMode.java
 create mode 100644 BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/ItemMode.java
 create mode 100644 BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/NoGravityMode.java
 create mode 100644 BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/ProtectMode.java
 create mode 100644 BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/TNTMode.java
 create mode 100644 BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/TestblockMode.java
 create mode 100644 BauSystem/BauSystem_RegionFixed/build.gradle.kts
 create mode 100644 BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionnew/FixedFlagStorage.java
 create mode 100644 BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionnew/FixedGlobalRegion.java
 create mode 100644 BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionnew/FixedRegion.java
 create mode 100644 BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionnew/FixedRegionSystem.java

diff --git a/BauSystem/BauSystem_15/src/de/steamwar/bausystem/utils/FlatteningWrapper15.java b/BauSystem/BauSystem_15/src/de/steamwar/bausystem/utils/FlatteningWrapper15.java
index 266326e0..69872f57 100644
--- a/BauSystem/BauSystem_15/src/de/steamwar/bausystem/utils/FlatteningWrapper15.java
+++ b/BauSystem/BauSystem_15/src/de/steamwar/bausystem/utils/FlatteningWrapper15.java
@@ -42,7 +42,7 @@ import com.sk89q.worldedit.session.ClipboardHolder;
 import com.sk89q.worldedit.world.World;
 import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockTypes;
-import de.steamwar.bausystem.region.Point;
+import de.steamwar.bausystem.regionnew.Point;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/backup/BackupCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/backup/BackupCommand.java
index b7911275..6abe927a 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/backup/BackupCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/backup/BackupCommand.java
@@ -21,17 +21,12 @@ package de.steamwar.bausystem.features.backup;
 
 import com.sk89q.worldedit.EditSession;
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.region.Color;
 import de.steamwar.bausystem.region.Region;
-import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.region.flags.flagvalues.ColorMode;
 import de.steamwar.bausystem.region.tags.Tag;
 import de.steamwar.bausystem.utils.PasteBuilder;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.SWCommandUtils;
 import de.steamwar.command.TypeMapper;
-import de.steamwar.command.TypeValidator;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.inventory.SWListInv;
 import de.steamwar.linkage.Linked;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/countingwand/Countingwand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/countingwand/Countingwand.java
index fb9316b9..6c667ba7 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/countingwand/Countingwand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/countingwand/Countingwand.java
@@ -20,7 +20,7 @@
 package de.steamwar.bausystem.features.countingwand;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.region.Point;
+import de.steamwar.bausystem.regionnew.Point;
 import de.steamwar.bausystem.shared.Pair;
 import de.steamwar.bausystem.utils.ItemUtils;
 import de.steamwar.inventory.SWItem;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/countingwand/CountingwandListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/countingwand/CountingwandListener.java
index 7233670a..9d811f28 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/countingwand/CountingwandListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/countingwand/CountingwandListener.java
@@ -19,7 +19,7 @@
 
 package de.steamwar.bausystem.features.countingwand;
 
-import de.steamwar.bausystem.region.Point;
+import de.steamwar.bausystem.regionnew.Point;
 import de.steamwar.linkage.Linked;
 import org.bukkit.FluidCollisionMode;
 import org.bukkit.event.EventHandler;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/killchecker/KillcheckerVisualizer.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/killchecker/KillcheckerVisualizer.java
index 04822aa8..d7145f37 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/killchecker/KillcheckerVisualizer.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/killchecker/KillcheckerVisualizer.java
@@ -20,7 +20,7 @@
 package de.steamwar.bausystem.features.killchecker;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.region.Point;
+import de.steamwar.bausystem.regionnew.Point;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.utils.RegionExtensionType;
 import de.steamwar.bausystem.region.utils.RegionType;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/observer/ObserverTracer.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/observer/ObserverTracer.java
index c1e08fcf..e4aedd0a 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/observer/ObserverTracer.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/observer/ObserverTracer.java
@@ -20,7 +20,7 @@
 package de.steamwar.bausystem.features.observer;
 
 import de.steamwar.Reflection;
-import de.steamwar.bausystem.region.Point;
+import de.steamwar.bausystem.regionnew.Point;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.Particle;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionCommand.java
index 6d8d6f4d..e7cedc22 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionCommand.java
@@ -28,7 +28,7 @@ import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.session.ClipboardHolder;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.util.SelectCommand;
-import de.steamwar.bausystem.region.Point;
+import de.steamwar.bausystem.regionnew.Point;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.RegionUtils;
 import de.steamwar.bausystem.region.flags.Flag;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/ColorBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/ColorBauGuiItem.java
index a38c397f..b886e756 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/ColorBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/ColorBauGuiItem.java
@@ -22,7 +22,7 @@ package de.steamwar.bausystem.features.region.items;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
-import de.steamwar.bausystem.region.Color;
+import de.steamwar.bausystem.regionnew.Color;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.flags.Flag;
 import de.steamwar.bausystem.region.flags.flagvalues.ColorMode;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/LuaLib.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/LuaLib.java
index a4af0d3a..a86542df 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/LuaLib.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/LuaLib.java
@@ -19,7 +19,7 @@
 
 package de.steamwar.bausystem.features.script.lua.libs;
 
-import de.steamwar.bausystem.region.Point;
+import de.steamwar.bausystem.regionnew.Point;
 import lombok.AllArgsConstructor;
 import org.bukkit.entity.Player;
 import org.luaj.vm2.*;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/WorldEditLib.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/WorldEditLib.java
index 87d1f9fb..7f0cac4d 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/WorldEditLib.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/WorldEditLib.java
@@ -22,7 +22,7 @@ package de.steamwar.bausystem.features.script.lua.libs;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.bukkit.BukkitPlayer;
 import com.sk89q.worldedit.math.BlockVector3;
-import de.steamwar.bausystem.region.Point;
+import de.steamwar.bausystem.regionnew.Point;
 import de.steamwar.bausystem.utils.FlatteningWrapper;
 import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/Cuboid.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/Cuboid.java
index c31653a5..e5699aaa 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/Cuboid.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/Cuboid.java
@@ -19,7 +19,7 @@
 
 package de.steamwar.bausystem.features.slaves.laufbau;
 
-import de.steamwar.bausystem.region.Point;
+import de.steamwar.bausystem.regionnew.Point;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/states/CreatingLaufState.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/states/CreatingLaufState.java
index e4ed312b..369ca0d9 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/states/CreatingLaufState.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/states/CreatingLaufState.java
@@ -27,7 +27,7 @@ import com.sk89q.worldedit.world.block.BlockTypes;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.slaves.laufbau.BlockBoundingBox;
 import de.steamwar.bausystem.features.slaves.laufbau.Cuboid;
-import de.steamwar.bausystem.region.Point;
+import de.steamwar.bausystem.regionnew.Point;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.entity.Player;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/states/ProcessingTracesState.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/states/ProcessingTracesState.java
index 94eb6549..04c43fd3 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/states/ProcessingTracesState.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/states/ProcessingTracesState.java
@@ -26,7 +26,7 @@ import de.steamwar.bausystem.features.slaves.laufbau.Cuboid;
 import de.steamwar.bausystem.features.tracer.TNTPoint;
 import de.steamwar.bausystem.features.tracer.Trace;
 import de.steamwar.bausystem.features.tracer.TraceManager;
-import de.steamwar.bausystem.region.Point;
+import de.steamwar.bausystem.regionnew.Point;
 import de.steamwar.bausystem.utils.FlatteningWrapper;
 import org.bukkit.Location;
 import org.bukkit.World;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/team/boundary/BoundaryViewer.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/team/boundary/BoundaryViewer.java
index 51bef65c..808e6398 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/team/boundary/BoundaryViewer.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/team/boundary/BoundaryViewer.java
@@ -20,7 +20,7 @@
 package de.steamwar.bausystem.features.team.boundary;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.region.Point;
+import de.steamwar.bausystem.regionnew.Point;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.utils.RegionType;
 import de.steamwar.core.TrickyParticleWrapper;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/SelectCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/SelectCommand.java
index e9c2c09a..4f1df1af 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/SelectCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/SelectCommand.java
@@ -1,14 +1,12 @@
 package de.steamwar.bausystem.features.util;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.region.Point;
+import de.steamwar.bausystem.regionnew.Point;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.utils.RegionExtensionType;
 import de.steamwar.bausystem.region.utils.RegionType;
 import de.steamwar.bausystem.utils.FlatteningWrapper;
 import de.steamwar.command.SWCommand;
-import de.steamwar.command.TypeValidator;
 import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/ColorReplaceCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/ColorReplaceCommand.java
index 6b6659ba..3df0755c 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/ColorReplaceCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/ColorReplaceCommand.java
@@ -28,7 +28,7 @@ import com.sk89q.worldedit.util.formatting.text.TextComponent;
 import com.sk89q.worldedit.util.formatting.text.TranslatableComponent;
 import de.steamwar.bausystem.features.world.WorldEditListener;
 import de.steamwar.bausystem.features.worldedit.utils.SpecialReplace;
-import de.steamwar.bausystem.region.Color;
+import de.steamwar.bausystem.regionnew.Color;
 import de.steamwar.bausystem.shared.Pair;
 import de.steamwar.bausystem.utils.WorldEditUtils;
 import de.steamwar.command.PreviousArguments;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Color.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Color.java
deleted file mode 100644
index a50c7cb0..00000000
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Color.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * This file is a part of the SteamWar software.
- *
- * Copyright (C) 2021  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;
-
-public enum Color {
-    WHITE,
-    ORANGE,
-    MAGENTA,
-    LIGHT_BLUE,
-    YELLOW,
-    LIME,
-    PINK,
-    GRAY,
-    LIGHT_GRAY,
-    CYAN,
-    PURPLE,
-    BLUE,
-    BROWN,
-    GREEN,
-    RED,
-    BLACK;
-}
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
index c6f8b5c7..bf8477e9 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
@@ -28,6 +28,7 @@ import de.steamwar.bausystem.region.flags.flagvalues.TNTMode;
 import de.steamwar.bausystem.region.tags.Tag;
 import de.steamwar.bausystem.region.utils.RegionExtensionType;
 import de.steamwar.bausystem.region.utils.RegionType;
+import de.steamwar.bausystem.regionnew.Point;
 import de.steamwar.bausystem.shared.SizedStack;
 import de.steamwar.bausystem.utils.FlatteningWrapper;
 import de.steamwar.bausystem.utils.PasteBuilder;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/ColorMode.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/ColorMode.java
index 6902a2fb..6159c959 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/ColorMode.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/ColorMode.java
@@ -19,7 +19,7 @@
 
 package de.steamwar.bausystem.region.flags.flagvalues;
 
-import de.steamwar.bausystem.region.Color;
+import de.steamwar.bausystem.regionnew.Color;
 import de.steamwar.bausystem.region.flags.Flag;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/Color.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/Color.java
new file mode 100644
index 00000000..6292fbe1
--- /dev/null
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/Color.java
@@ -0,0 +1,39 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2024  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.regionnew;
+
+public enum Color {
+    WHITE,
+    ORANGE,
+    MAGENTA,
+    LIGHT_BLUE,
+    YELLOW,
+    LIME,
+    PINK,
+    GRAY,
+    LIGHT_GRAY,
+    CYAN,
+    PURPLE,
+    BLUE,
+    BROWN,
+    GREEN,
+    RED,
+    BLACK;
+}
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/FlagStorage.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/FlagStorage.java
new file mode 100644
index 00000000..57a9523c
--- /dev/null
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/FlagStorage.java
@@ -0,0 +1,29 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2024  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.regionnew;
+
+import de.steamwar.bausystem.regionnew.flags.Flag;
+
+public interface FlagStorage {
+
+    <T extends Enum<T> & Flag.Value<T>> boolean set(Flag<T> flag, Flag.Value<T> value);
+
+    <T extends Enum<T> & Flag.Value<T>> Flag.Value<T> get(Flag<T> flag);
+}
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Point.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/Point.java
similarity index 67%
rename from BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Point.java
rename to BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/Point.java
index 6f8c5929..a9f3534c 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Point.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/Point.java
@@ -1,23 +1,23 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   Copyright (C) 2024  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 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.
+ *   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/>.
+ *   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;
+package de.steamwar.bausystem.regionnew;
 
 import com.sk89q.worldedit.math.BlockVector3;
 import lombok.AllArgsConstructor;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/Region.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/Region.java
new file mode 100644
index 00000000..8c3a61eb
--- /dev/null
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/Region.java
@@ -0,0 +1,81 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2024  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.regionnew;
+
+import com.sk89q.worldedit.EditSession;
+import de.steamwar.bausystem.regionnew.flags.Flag;
+import de.steamwar.sql.SchematicNode;
+import lombok.NonNull;
+import org.bukkit.Location;
+
+import javax.annotation.Nullable;
+import java.io.File;
+import java.util.Optional;
+
+public interface Region {
+
+    RegionType getType();
+
+    <T extends Enum<T> & Flag.Value<T>> RegionFlagPolicy hasFlag(@NonNull Flag<T> flag);
+
+    <T extends Enum<T> & Flag.Value<T>> boolean setFlag(@NonNull Flag<T> flag, Flag.Value<T> value);
+
+    <T extends Enum<T> & Flag.Value<T>> Optional<Flag.Value<T>> getFlag(@NonNull Flag<T> flag);
+
+    Point getMinPoint();
+
+    Point getMaxPoint();
+
+    boolean inRegion(Location location);
+
+    Optional<Point> getBuildMinPoint(boolean extension);
+
+    Optional<Point> getBuildMaxPoint(boolean extension);
+
+    boolean inBuildRegion(boolean extension);
+
+    Optional<Point> getTestblockMinPoint(boolean extension);
+
+    Optional<Point> getTestblockMaxPoint(boolean extension);
+
+    boolean inTestblockRegion(boolean extension);
+
+    // TODO: Add forEachChunk and getChunkOutsidePredicate
+
+    Optional<File> getGameModeConfig();
+
+    Optional<EditSession> copy();
+
+    Optional<EditSession> copyBuild();
+
+    Optional<EditSession> copyTestblock();
+
+    void reset();
+
+    void resetBuild(@Nullable SchematicNode schematicNode, boolean extension);
+
+    void resetTestblock(@Nullable SchematicNode schematicNode, boolean extension);
+
+    void remember(EditSession editSession);
+
+    boolean undo();
+
+    boolean redo();
+}
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/RegionFlagPolicy.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/RegionFlagPolicy.java
new file mode 100644
index 00000000..7878a79a
--- /dev/null
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/RegionFlagPolicy.java
@@ -0,0 +1,34 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2024  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.regionnew;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+@Getter
+public enum RegionFlagPolicy {
+    NOT_APPLICABLE(false, false),
+    READ_ONLY(true, false),
+    WRITABLE(true, true);
+
+    private final boolean readable;
+    private final boolean writable;
+}
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/RegionSide.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/RegionSide.java
new file mode 100644
index 00000000..6834e300
--- /dev/null
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/RegionSide.java
@@ -0,0 +1,25 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2024  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.regionnew;
+
+public enum RegionSide {
+    NORTH,
+    SOUTH
+}
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/RegionSystem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/RegionSystem.java
new file mode 100644
index 00000000..b5e8d63b
--- /dev/null
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/RegionSystem.java
@@ -0,0 +1,40 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2024  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.regionnew;
+
+import org.bukkit.Location;
+
+import java.util.Optional;
+import java.util.stream.Stream;
+
+public interface RegionSystem {
+
+    void load();
+    void save();
+
+    Region getGlobalRegion();
+
+    Region get(Location location);
+    Optional<Region> getRegion(String name);
+
+    Stream<Region> getRegions();
+
+    boolean isModular();
+}
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/RegionType.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/RegionType.java
new file mode 100644
index 00000000..ff91fcd5
--- /dev/null
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/RegionType.java
@@ -0,0 +1,32 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2024  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.regionnew;
+
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+public enum RegionType {
+
+    GLOBAL(true),
+    NORMAL(false),
+    ;
+
+    private final boolean global;
+}
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/ChangedMode.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/ChangedMode.java
new file mode 100644
index 00000000..85e70f01
--- /dev/null
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/ChangedMode.java
@@ -0,0 +1,57 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2024  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.regionnew.flags;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum ChangedMode implements Flag.Value<ChangedMode> {
+
+	NO_CHANGE("FLAG_CHANGED_NO_CHANGE", false),
+	HAS_CHANGE("FLAG_CHANGED_HAS_CHANGE", true);
+
+	private static ChangedMode[] values;
+	private final String chatValue;
+	private final Boolean changed;
+
+	@Override
+	public ChangedMode[] getValues() {
+		if (ChangedMode.values == null) {
+			ChangedMode.values = ChangedMode.values(); //NOSONAR
+		}
+		return ChangedMode.values;
+	}
+
+	@Override
+	public ChangedMode getValue() {
+		return this;
+	}
+
+	@Override
+	public ChangedMode getValueOf(final String name) {
+		try {
+			return ChangedMode.valueOf(name.toUpperCase());
+		} catch (IllegalArgumentException e) {
+			return NO_CHANGE;
+		}
+	}
+}
\ No newline at end of file
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/ColorMode.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/ColorMode.java
new file mode 100644
index 00000000..229301c3
--- /dev/null
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/ColorMode.java
@@ -0,0 +1,71 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2024  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.regionnew.flags;
+
+import de.steamwar.bausystem.regionnew.Color;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum ColorMode implements Flag.Value<ColorMode> {
+    WHITE("FLAG_COLOR_WHITE", Color.WHITE),
+    ORANGE("FLAG_COLOR_ORANGE", Color.ORANGE),
+    MAGENTA("FLAG_COLOR_MAGENTA", Color.MAGENTA),
+    LIGHT_BLUE("FLAG_COLOR_LIGHT_BLUE", Color.LIGHT_BLUE),
+    YELLOW("FLAG_COLOR_YELLOW", Color.YELLOW),
+    LIME("FLAG_COLOR_LIME", Color.LIME),
+    PINK("FLAG_COLOR_PINK", Color.PINK),
+    GRAY("FLAG_COLOR_GRAY", Color.GRAY),
+    LIGHT_GRAY("FLAG_COLOR_LIGHT_GRAY", Color.LIGHT_GRAY),
+    CYAN("FLAG_COLOR_CYAN", Color.CYAN),
+    PURPLE("FLAG_COLOR_PURPLE", Color.PURPLE),
+    BLUE("FLAG_COLOR_BLUE", Color.BLUE),
+    BROWN("FLAG_COLOR_BROWN", Color.BROWN),
+    GREEN("FLAG_COLOR_GREEN", Color.GREEN),
+    RED("FLAG_COLOR_RED", Color.RED),
+    BLACK("FLAG_COLOR_BLACK", Color.BLACK);
+
+    private static ColorMode[] values;
+    private final String chatValue;
+    private final Color color;
+
+    @Override
+    public ColorMode[] getValues() {
+        if (ColorMode.values == null) {
+            ColorMode.values = ColorMode.values(); //NOSONAR
+        }
+        return ColorMode.values;
+    }
+
+    @Override
+    public ColorMode getValue() {
+        return this;
+    }
+
+    @Override
+    public ColorMode getValueOf(final String name) {
+        try {
+            return ColorMode.valueOf(name.toUpperCase());
+        } catch (IllegalArgumentException e) {
+            return ColorMode.YELLOW;
+        }
+    }
+}
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/FireMode.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/FireMode.java
new file mode 100644
index 00000000..f628bd47
--- /dev/null
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/FireMode.java
@@ -0,0 +1,59 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2024  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.regionnew.flags;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum FireMode implements Flag.Value<FireMode> {
+
+	ALLOW("FLAG_FIRE_ALLOW"),
+	DENY("FLAG_FIRE_DENY");
+
+	private static FireMode[] values;
+	private final String chatValue;
+
+	@Override
+	public FireMode[] getValues() {
+		if (FireMode.values == null) {
+			FireMode.values = FireMode.values(); //NOSONAR
+		}
+		return FireMode.values;
+	}
+
+	@Override
+	public FireMode getValue() {
+		return this;
+	}
+
+	@Override
+	public FireMode getValueOf(final String name) {
+		try {
+			return FireMode.valueOf(name.toUpperCase());
+		} catch (IllegalArgumentException e) {
+			if (name.equalsIgnoreCase("false")) {
+				return FireMode.DENY;
+			}
+			return FireMode.ALLOW;
+		}
+	}
+}
\ No newline at end of file
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/Flag.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/Flag.java
new file mode 100644
index 00000000..d915c216
--- /dev/null
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/Flag.java
@@ -0,0 +1,102 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2024  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.regionnew.flags;
+
+import de.steamwar.bausystem.shared.EnumDisplay;
+import lombok.Getter;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
+
+public class Flag<T extends Enum<T> & Flag.Value<T>> implements EnumDisplay {
+
+    public static final Flag<ColorMode> COLOR = new Flag<>("COLOR", "FLAG_COLOR", ColorMode.class, ColorMode.YELLOW);
+    public static final Flag<TNTMode> TNT = new Flag<>("TNT", "FLAG_TNT", TNTMode.class, TNTMode.ONLY_TB);
+    public static final Flag<FireMode> FIRE = new Flag<>("FIRE", "FLAG_FIRE", FireMode.class, FireMode.ALLOW);
+    public static final Flag<FreezeMode> FREEZE = new Flag<>("FREEZE", "FLAG_FREEZE", FreezeMode.class, FreezeMode.INACTIVE);
+    public static final Flag<ProtectMode> PROTECT = new Flag<>("PROTECT", "FLAG_PROTECT", ProtectMode.class, ProtectMode.ACTIVE);
+    public static final Flag<ItemMode> ITEMS = new Flag<>("ITEMS", "FLAG_ITEMS", ItemMode.class, ItemMode.INACTIVE);
+    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);
+
+    @Getter
+    private static final Set<Flag> flags = new HashSet<>();
+
+    private static AtomicInteger counter = new AtomicInteger(0);
+
+    private String name;
+    private int ordinal;
+
+    @Getter
+    private String chatValue;
+
+    @Getter
+    private final Class<? extends Flag.Value<?>> valueType;
+
+    @Getter
+    private final Flag.Value<?> defaultValue;
+
+    @Getter
+    private final Flag.Value<?>[] values;
+
+    private Flag(String name, String chatValue, Class<? extends Flag.Value<T>> valueType, Value<T> defaultValue) {
+        flags.add(this);
+
+        this.name = name;
+        this.ordinal = counter.getAndIncrement();
+        this.chatValue = chatValue;
+
+        this.valueType = valueType;
+        this.defaultValue = defaultValue;
+        this.values = defaultValue.getValues();
+    }
+
+    public String name() {
+        return name;
+    }
+
+    public int ordinal() {
+        return ordinal;
+    }
+
+    public boolean oneOff(Flag<?>... flags) {
+        for (Flag<?> flag : flags) {
+            if (flag == this) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public interface Value<T extends Enum<T> & Flag.Value<T>> extends EnumDisplay {
+
+        T getValue();
+
+        T getValueOf(final String name);
+
+        T[] getValues();
+
+        default String getName() {
+            return this.getValue().name().toLowerCase();
+        }
+    }
+}
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/FreezeMode.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/FreezeMode.java
new file mode 100644
index 00000000..f3da631c
--- /dev/null
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/FreezeMode.java
@@ -0,0 +1,60 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2024  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.regionnew.flags;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum FreezeMode implements Flag.Value<FreezeMode> {
+
+	ACTIVE("FLAG_FREEZE_ACTIVE"),
+	INACTIVE("FLAG_FREEZE_INACTIVE");
+
+	private static FreezeMode[] values;
+	private final String chatValue;
+
+	@Override
+	public FreezeMode[] getValues() {
+		if (FreezeMode.values == null) {
+			FreezeMode.values = FreezeMode.values(); //NOSONAR
+		}
+		return FreezeMode.values;
+	}
+
+	@Override
+	public FreezeMode getValue() {
+		return this;
+	}
+
+	@Override
+	public FreezeMode getValueOf(final String name) {
+		try {
+			return FreezeMode.valueOf(name.toUpperCase());
+		} catch (IllegalArgumentException e) {
+			if (name.equalsIgnoreCase("false")) {
+				return FreezeMode.INACTIVE;
+			}
+			return FreezeMode.INACTIVE;
+		}
+	}
+}
\ No newline at end of file
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/ItemMode.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/ItemMode.java
new file mode 100644
index 00000000..7d29899c
--- /dev/null
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/ItemMode.java
@@ -0,0 +1,59 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2024  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.regionnew.flags;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum ItemMode implements Flag.Value<ItemMode> {
+
+    ACTIVE("FLAG_ITEMS_ACTIVE"),
+    INACTIVE("FLAG_ITEMS_INACTIVE");
+
+    private static ItemMode[] values;
+    private final String chatValue;
+
+    @Override
+    public ItemMode[] getValues() {
+        if (ItemMode.values == null) {
+            ItemMode.values = ItemMode.values(); //NOSONAR
+        }
+        return ItemMode.values;
+    }
+
+    @Override
+    public ItemMode getValue() {
+        return this;
+    }
+
+    @Override
+    public ItemMode getValueOf(final String name) {
+        try {
+            return ItemMode.valueOf(name.toUpperCase());
+        } catch (IllegalArgumentException e) {
+            if (name.equalsIgnoreCase("false")) {
+                return ItemMode.INACTIVE;
+            }
+            return ItemMode.ACTIVE;
+        }
+    }
+}
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/NoGravityMode.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/NoGravityMode.java
new file mode 100644
index 00000000..68e9fa6b
--- /dev/null
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/NoGravityMode.java
@@ -0,0 +1,59 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2024  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.regionnew.flags;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum NoGravityMode implements Flag.Value<NoGravityMode> {
+
+    ACTIVE("FLAG_NO_GRAVITY_ACTIVE"),
+    INACTIVE("FLAG_NO_GRAVITY_INACTIVE");
+
+    private static NoGravityMode[] values;
+    private final String chatValue;
+
+    @Override
+    public NoGravityMode[] getValues() {
+        if (NoGravityMode.values == null) {
+            NoGravityMode.values = NoGravityMode.values(); //NOSONAR
+        }
+        return NoGravityMode.values;
+    }
+
+    @Override
+    public NoGravityMode getValue() {
+        return this;
+    }
+
+    @Override
+    public NoGravityMode getValueOf(final String name) {
+        try {
+            return NoGravityMode.valueOf(name.toUpperCase());
+        } catch (IllegalArgumentException e) {
+            if (name.equalsIgnoreCase("false")) {
+                return NoGravityMode.INACTIVE;
+            }
+            return NoGravityMode.ACTIVE;
+        }
+    }
+}
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/ProtectMode.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/ProtectMode.java
new file mode 100644
index 00000000..2f510daa
--- /dev/null
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/ProtectMode.java
@@ -0,0 +1,59 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2024  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.regionnew.flags;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum ProtectMode implements Flag.Value<ProtectMode> {
+
+    ACTIVE("FLAG_PROTECT_ACTIVE"),
+    INACTIVE("FLAG_PROTECT_INACTIVE");
+
+    private static ProtectMode[] values;
+    private final String chatValue;
+
+    @Override
+    public ProtectMode[] getValues() {
+        if (ProtectMode.values == null) {
+            ProtectMode.values = ProtectMode.values(); //NOSONAR
+        }
+        return ProtectMode.values;
+    }
+
+    @Override
+    public ProtectMode getValue() {
+        return this;
+    }
+
+    @Override
+    public ProtectMode getValueOf(final String name) {
+        try {
+            return ProtectMode.valueOf(name.toUpperCase());
+        } catch (IllegalArgumentException e) {
+            if (name.equalsIgnoreCase("false")) {
+                return ProtectMode.INACTIVE;
+            }
+            return ProtectMode.ACTIVE;
+        }
+    }
+}
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/TNTMode.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/TNTMode.java
new file mode 100644
index 00000000..e483a81b
--- /dev/null
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/TNTMode.java
@@ -0,0 +1,58 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2024  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.regionnew.flags;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum TNTMode implements Flag.Value<TNTMode> {
+
+	ALLOW("FLAG_TNT_ALLOW"),
+	DENY("FLAG_TNT_DENY"),
+	ONLY_TB("FLAG_TNT_ONLY_TB"),
+	ONLY_BUILD("FLAG_TNT_ONLY_BUILD");
+
+	private static TNTMode[] values;
+	private final String chatValue;
+
+	@Override
+	public TNTMode[] getValues() {
+		if (TNTMode.values == null) {
+			TNTMode.values = TNTMode.values(); //NOSONAR
+		}
+		return TNTMode.values;
+	}
+
+	@Override
+	public TNTMode getValue() {
+		return this;
+	}
+
+	@Override
+	public TNTMode getValueOf(final String name) {
+		try {
+			return TNTMode.valueOf(name.toUpperCase());
+		} catch (IllegalArgumentException e) {
+			return TNTMode.ALLOW;
+		}
+	}
+}
\ No newline at end of file
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/TestblockMode.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/TestblockMode.java
new file mode 100644
index 00000000..d6d8075c
--- /dev/null
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/TestblockMode.java
@@ -0,0 +1,61 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2024  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.regionnew.flags;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum TestblockMode implements Flag.Value<TestblockMode> {
+
+	NO_VALUE("FLAG_TESTBLOCK_NO_VALUE", false, false),
+	NORTH("FLAG_TESTBLOCK_NORTH", false, true),
+	SOUTH("FLAG_TESTBLOCK_SOUTH", false, false),
+	FIXED_NORTH("FLAG_TESTBLOCK_NORTH", true, true),
+	FIXED_SOUTH("FLAG_TESTBLOCK_SOUTH", true, false);
+
+	private static TestblockMode[] values;
+	private final String chatValue;
+	private final boolean fixed;
+	private final boolean north;
+
+	@Override
+	public TestblockMode[] getValues() {
+		if (TestblockMode.values == null) {
+			TestblockMode.values = TestblockMode.values(); //NOSONAR
+		}
+		return TestblockMode.values;
+	}
+
+	@Override
+	public TestblockMode getValue() {
+		return this;
+	}
+
+	@Override
+	public TestblockMode getValueOf(final String name) {
+		try {
+			return TestblockMode.valueOf(name.toUpperCase());
+		} catch (IllegalArgumentException e) {
+			return NO_VALUE;
+		}
+	}
+}
\ No newline at end of file
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/FlatteningWrapper.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/FlatteningWrapper.java
index 3cd96295..12b7a78a 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/FlatteningWrapper.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/FlatteningWrapper.java
@@ -22,7 +22,7 @@ package de.steamwar.bausystem.utils;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.extent.clipboard.Clipboard;
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.region.Point;
+import de.steamwar.bausystem.regionnew.Point;
 import de.steamwar.core.VersionDependent;
 import org.bukkit.Material;
 import org.bukkit.World;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/PasteBuilder.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/PasteBuilder.java
index a4a74e17..8c3813ac 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/PasteBuilder.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/PasteBuilder.java
@@ -26,8 +26,8 @@ import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockType;
 import com.sk89q.worldedit.world.block.BlockTypes;
-import de.steamwar.bausystem.region.Color;
-import de.steamwar.bausystem.region.Point;
+import de.steamwar.bausystem.regionnew.Color;
+import de.steamwar.bausystem.regionnew.Point;
 import de.steamwar.sql.SchematicData;
 import de.steamwar.sql.SchematicNode;
 import lombok.Getter;
diff --git a/BauSystem/BauSystem_RegionFixed/build.gradle.kts b/BauSystem/BauSystem_RegionFixed/build.gradle.kts
new file mode 100644
index 00000000..bb84c063
--- /dev/null
+++ b/BauSystem/BauSystem_RegionFixed/build.gradle.kts
@@ -0,0 +1,47 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2024  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/>.
+ */
+
+plugins {
+    steamwar.java
+}
+
+tasks.compileJava {
+    options.isWarnings = false
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
+
+dependencies {
+    compileOnly(project(":BauSystem:BauSystem_Main"))
+    compileOnly(project(":SpigotCore"))
+
+    compileOnly(libs.spigotapi)
+    compileOnly(libs.axiom)
+    compileOnly(libs.authlib)
+    compileOnly(libs.viaapi)
+
+    compileOnly(libs.nms20)
+    compileOnly(libs.fawe18)
+
+    implementation(libs.luaj)
+    implementation(files("$projectDir/../libs/YAPION-SNAPSHOT.jar"))
+}
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionnew/FixedFlagStorage.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionnew/FixedFlagStorage.java
new file mode 100644
index 00000000..1af55086
--- /dev/null
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionnew/FixedFlagStorage.java
@@ -0,0 +1,55 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2024  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.regionnew;
+
+import de.steamwar.bausystem.regionnew.flags.Flag;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+
+public class FixedFlagStorage implements FlagStorage {
+
+    private Map<Flag<?>, Flag.Value<?>> flagMap = new HashMap<>();
+
+    public static FlagStorage createFromRegion(Region region) {
+        FlagStorage flagStorage = new FixedFlagStorage();
+        Flag.getFlags().forEach(flag -> {
+            if (region.hasFlag(flag).isReadable()) {
+                flagStorage.set(flag, flag.getDefaultValue());
+            }
+        });
+        return flagStorage;
+    }
+
+    public static FlagStorage createFromFile(File file) {
+        throw new IllegalStateException("Not implemented yet");
+    }
+
+    @Override
+    public <T extends Enum<T> & Flag.Value<T>> boolean set(Flag<T> flag, Flag.Value<T> value) {
+        return flagMap.put(flag, value) != value;
+    }
+
+    @Override
+    public <T extends Enum<T> & Flag.Value<T>> Flag.Value<T> get(Flag<T> flag) {
+        return (Flag.Value<T>) flagMap.get(flag);
+    }
+}
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionnew/FixedGlobalRegion.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionnew/FixedGlobalRegion.java
new file mode 100644
index 00000000..8288a057
--- /dev/null
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionnew/FixedGlobalRegion.java
@@ -0,0 +1,164 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2024  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.regionnew;
+
+import com.sk89q.worldedit.EditSession;
+import de.steamwar.bausystem.regionnew.flags.Flag;
+import de.steamwar.sql.SchematicNode;
+import lombok.NonNull;
+import org.bukkit.Location;
+
+import javax.annotation.Nullable;
+import java.io.File;
+import java.util.Optional;
+
+public final class FixedGlobalRegion implements Region {
+
+    public static final FixedGlobalRegion INSTANCE = new FixedGlobalRegion();
+
+    private static final Point MIN_POINT = new Point(Integer.MIN_VALUE, Integer.MIN_VALUE, Integer.MIN_VALUE);
+    private static final Point MAX_POINT = new Point(Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE);
+    private final FlagStorage FLAG_STORAGE = FixedFlagStorage.createFromRegion(this); // TODO: Update to either File or Region creation!
+
+    private FixedGlobalRegion() {
+    }
+
+    @Override
+    public RegionType getType() {
+        return RegionType.GLOBAL;
+    }
+
+    @Override
+    public <T extends Enum<T> & Flag.Value<T>> RegionFlagPolicy hasFlag(@NonNull Flag<T> flag) {
+        if (flag.oneOff(Flag.TNT, Flag.FIRE, Flag.FREEZE, Flag.ITEMS)) {
+            return RegionFlagPolicy.WRITABLE;
+        }
+        return RegionFlagPolicy.NOT_APPLICABLE;
+    }
+
+    @Override
+    public <T extends Enum<T> & Flag.Value<T>> boolean setFlag(@NonNull Flag<T> flag, Flag.Value<T> value) {
+        return hasFlag(flag).isWritable() && FLAG_STORAGE.set(flag, value);
+    }
+
+    @Override
+    public <T extends Enum<T> & Flag.Value<T>> Optional<Flag.Value<T>> getFlag(@NonNull Flag<T> flag) {
+        if (hasFlag(flag).isReadable()) {
+            return Optional.of(FLAG_STORAGE.get(flag));
+        } else {
+            return Optional.empty();
+        }
+    }
+
+    @Override
+    public Point getMinPoint() {
+        return MIN_POINT;
+    }
+
+    @Override
+    public Point getMaxPoint() {
+        return MAX_POINT;
+    }
+
+    @Override
+    public boolean inRegion(Location location) {
+        return true;
+    }
+
+    @Override
+    public Optional<Point> getBuildMinPoint(boolean extension) {
+        return Optional.empty();
+    }
+
+    @Override
+    public Optional<Point> getBuildMaxPoint(boolean extension) {
+        return Optional.empty();
+    }
+
+    @Override
+    public boolean inBuildRegion(boolean extension) {
+        return false;
+    }
+
+    @Override
+    public Optional<Point> getTestblockMinPoint(boolean extension) {
+        return Optional.empty();
+    }
+
+    @Override
+    public Optional<Point> getTestblockMaxPoint(boolean extension) {
+        return Optional.empty();
+    }
+
+    @Override
+    public boolean inTestblockRegion(boolean extension) {
+        return false;
+    }
+
+    @Override
+    public Optional<File> getGameModeConfig() {
+        return Optional.empty();
+    }
+
+    @Override
+    public Optional<EditSession> copy() {
+        return Optional.empty();
+    }
+
+    @Override
+    public Optional<EditSession> copyBuild() {
+        return Optional.empty();
+    }
+
+    @Override
+    public Optional<EditSession> copyTestblock() {
+        return Optional.empty();
+    }
+
+    @Override
+    public void reset() {
+
+    }
+
+    @Override
+    public void resetBuild(@Nullable SchematicNode schematicNode, boolean extension) {
+
+    }
+
+    @Override
+    public void resetTestblock(@Nullable SchematicNode schematicNode, boolean extension) {
+
+    }
+
+    @Override
+    public void remember(EditSession editSession) {
+
+    }
+
+    @Override
+    public boolean undo() {
+        return false;
+    }
+
+    @Override
+    public boolean redo() {
+        return false;
+    }
+}
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionnew/FixedRegion.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionnew/FixedRegion.java
new file mode 100644
index 00000000..9d5bd31e
--- /dev/null
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionnew/FixedRegion.java
@@ -0,0 +1,148 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2024  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.regionnew;
+
+import com.sk89q.worldedit.EditSession;
+import de.steamwar.bausystem.regionnew.flags.Flag;
+import de.steamwar.sql.SchematicNode;
+import lombok.NonNull;
+import org.bukkit.Location;
+
+import javax.annotation.Nullable;
+import java.io.File;
+import java.util.Optional;
+
+public class FixedRegion implements Region { // TODO: Implement!
+
+    @Override
+    public RegionType getType() {
+        return RegionType.NORMAL;
+    }
+
+    @Override
+    public <T extends Enum<T> & Flag.Value<T>> RegionFlagPolicy hasFlag(@NonNull Flag<T> flag) {
+        return null;
+    }
+
+    @Override
+    public <T extends Enum<T> & Flag.Value<T>> boolean setFlag(@NonNull Flag<T> flag, Flag.Value<T> value) {
+        return false;
+    }
+
+    @Override
+    public <T extends Enum<T> & Flag.Value<T>> Optional<Flag.Value<T>> getFlag(@NonNull Flag<T> flag) {
+        return Optional.empty();
+    }
+
+    @Override
+    public Point getMinPoint() {
+        return null;
+    }
+
+    @Override
+    public Point getMaxPoint() {
+        return null;
+    }
+
+    @Override
+    public boolean inRegion(Location location) {
+        return false;
+    }
+
+    @Override
+    public Optional<Point> getBuildMinPoint(boolean extension) {
+        return Optional.empty();
+    }
+
+    @Override
+    public Optional<Point> getBuildMaxPoint(boolean extension) {
+        return Optional.empty();
+    }
+
+    @Override
+    public boolean inBuildRegion(boolean extension) {
+        return false;
+    }
+
+    @Override
+    public Optional<Point> getTestblockMinPoint(boolean extension) {
+        return Optional.empty();
+    }
+
+    @Override
+    public Optional<Point> getTestblockMaxPoint(boolean extension) {
+        return Optional.empty();
+    }
+
+    @Override
+    public boolean inTestblockRegion(boolean extension) {
+        return false;
+    }
+
+    @Override
+    public Optional<File> getGameModeConfig() {
+        return Optional.empty();
+    }
+
+    @Override
+    public Optional<EditSession> copy() {
+        return Optional.empty();
+    }
+
+    @Override
+    public Optional<EditSession> copyBuild() {
+        return Optional.empty();
+    }
+
+    @Override
+    public Optional<EditSession> copyTestblock() {
+        return Optional.empty();
+    }
+
+    @Override
+    public void reset() {
+
+    }
+
+    @Override
+    public void resetBuild(@Nullable SchematicNode schematicNode, boolean extension) {
+
+    }
+
+    @Override
+    public void resetTestblock(@Nullable SchematicNode schematicNode, boolean extension) {
+
+    }
+
+    @Override
+    public void remember(EditSession editSession) {
+
+    }
+
+    @Override
+    public boolean undo() {
+        return false;
+    }
+
+    @Override
+    public boolean redo() {
+        return false;
+    }
+}
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionnew/FixedRegionSystem.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionnew/FixedRegionSystem.java
new file mode 100644
index 00000000..f29b1ebc
--- /dev/null
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionnew/FixedRegionSystem.java
@@ -0,0 +1,70 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2024  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.regionnew;
+
+import org.bukkit.Location;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Stream;
+
+public class FixedRegionSystem implements RegionSystem {
+
+    private static final Map<String, Region> REGION_MAP = new HashMap<>();
+
+    @Override
+    public void load() {
+        // TODO: Implement
+    }
+
+    @Override
+    public void save() {
+        // TODO: Implement
+    }
+
+    @Override
+    public Region getGlobalRegion() {
+        return FixedGlobalRegion.INSTANCE;
+    }
+
+    @Override
+    public Region get(Location location) {
+        return REGION_MAP.values().stream()
+                .filter(region -> region.inRegion(location))
+                .findFirst()
+                .orElse(FixedGlobalRegion.INSTANCE);
+    }
+
+    @Override
+    public Optional<Region> getRegion(String name) {
+        return Optional.ofNullable(REGION_MAP.get(name));
+    }
+
+    @Override
+    public Stream<Region> getRegions() {
+        return REGION_MAP.values().stream();
+    }
+
+    @Override
+    public boolean isModular() {
+        return false;
+    }
+}
diff --git a/BauSystem/build.gradle.kts b/BauSystem/build.gradle.kts
index ebb9422d..5c1f2608 100644
--- a/BauSystem/build.gradle.kts
+++ b/BauSystem/build.gradle.kts
@@ -27,6 +27,7 @@ tasks.build {
 }
 
 dependencies {
+    implementation(project(":BauSystem:BauSystem_RegionFixed"))
     implementation(project(":BauSystem:BauSystem_Main"))
     implementation(project(":BauSystem:BauSystem_15"))
     implementation(project(":BauSystem:BauSystem_18"))
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 8ab618ff..999b22ee 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -177,7 +177,8 @@ include(
     "BauSystem:BauSystem_19",
     "BauSystem:BauSystem_20",
     "BauSystem:BauSystem_21",
-    "BauSystem:BauSystem_Main"
+    "BauSystem:BauSystem_Main",
+    "BauSystem:BauSystem_RegionFixed"
 )
 
 include("CommandFramework")

From 4e70a675c255363cbff46c0e0987c4a5bee06846 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sun, 3 Nov 2024 13:27:35 +0100
Subject: [PATCH 016/214] Update Region.inBuildRegion and
 Region.inTestblockRegion

---
 .../steamwar/bausystem/regionnew/Region.java  |  8 +++-
 .../bausystem/regionnew/RegionSystem.java     | 47 +++++++++++++++++++
 .../regionnew/FixedGlobalRegion.java          |  4 +-
 .../bausystem/regionnew/FixedRegion.java      |  4 +-
 4 files changed, 57 insertions(+), 6 deletions(-)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/Region.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/Region.java
index 8c3a61eb..1bdab641 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/Region.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/Region.java
@@ -31,6 +31,10 @@ import java.util.Optional;
 
 public interface Region {
 
+    static Region getRegion(Location location) {
+        return RegionSystem.REGION_SYSTEM.get(location);
+    }
+
     RegionType getType();
 
     <T extends Enum<T> & Flag.Value<T>> RegionFlagPolicy hasFlag(@NonNull Flag<T> flag);
@@ -49,13 +53,13 @@ public interface Region {
 
     Optional<Point> getBuildMaxPoint(boolean extension);
 
-    boolean inBuildRegion(boolean extension);
+    boolean inBuildRegion(Location location, boolean extension);
 
     Optional<Point> getTestblockMinPoint(boolean extension);
 
     Optional<Point> getTestblockMaxPoint(boolean extension);
 
-    boolean inTestblockRegion(boolean extension);
+    boolean inTestblockRegion(Location location, boolean extension);
 
     // TODO: Add forEachChunk and getChunkOutsidePredicate
 
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/RegionSystem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/RegionSystem.java
index b5e8d63b..bbe4960d 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/RegionSystem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/RegionSystem.java
@@ -21,11 +21,14 @@ package de.steamwar.bausystem.regionnew;
 
 import org.bukkit.Location;
 
+import java.lang.reflect.InvocationTargetException;
 import java.util.Optional;
 import java.util.stream.Stream;
 
 public interface RegionSystem {
 
+    RegionSystem REGION_SYSTEM = init();
+
     void load();
     void save();
 
@@ -37,4 +40,48 @@ public interface RegionSystem {
     Stream<Region> getRegions();
 
     boolean isModular();
+
+    private static RegionSystem init() {
+        try {
+            return (RegionSystem) Class.forName("de.steamwar.bausystem.regionnew.FixedRegionSystem").getConstructor().newInstance();
+        } catch (ClassNotFoundException | NoSuchMethodException | InstantiationException | IllegalAccessException |
+                 InvocationTargetException e) {
+            return new RegionSystem() {
+                @Override
+                public void load() {
+                    throw new UnsupportedOperationException();
+                }
+
+                @Override
+                public void save() {
+                    throw new UnsupportedOperationException();
+                }
+
+                @Override
+                public Region getGlobalRegion() {
+                    throw new UnsupportedOperationException();
+                }
+
+                @Override
+                public Region get(Location location) {
+                    throw new UnsupportedOperationException();
+                }
+
+                @Override
+                public Optional<Region> getRegion(String name) {
+                    throw new UnsupportedOperationException();
+                }
+
+                @Override
+                public Stream<Region> getRegions() {
+                    throw new UnsupportedOperationException();
+                }
+
+                @Override
+                public boolean isModular() {
+                    throw new UnsupportedOperationException();
+                }
+            };
+        }
+    }
 }
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionnew/FixedGlobalRegion.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionnew/FixedGlobalRegion.java
index 8288a057..81b39197 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionnew/FixedGlobalRegion.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionnew/FixedGlobalRegion.java
@@ -93,7 +93,7 @@ public final class FixedGlobalRegion implements Region {
     }
 
     @Override
-    public boolean inBuildRegion(boolean extension) {
+    public boolean inBuildRegion(Location location, boolean extension) {
         return false;
     }
 
@@ -108,7 +108,7 @@ public final class FixedGlobalRegion implements Region {
     }
 
     @Override
-    public boolean inTestblockRegion(boolean extension) {
+    public boolean inTestblockRegion(Location location, boolean extension) {
         return false;
     }
 
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionnew/FixedRegion.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionnew/FixedRegion.java
index 9d5bd31e..c89cdf61 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionnew/FixedRegion.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionnew/FixedRegion.java
@@ -77,7 +77,7 @@ public class FixedRegion implements Region { // TODO: Implement!
     }
 
     @Override
-    public boolean inBuildRegion(boolean extension) {
+    public boolean inBuildRegion(Location location, boolean extension) {
         return false;
     }
 
@@ -92,7 +92,7 @@ public class FixedRegion implements Region { // TODO: Implement!
     }
 
     @Override
-    public boolean inTestblockRegion(boolean extension) {
+    public boolean inTestblockRegion(Location location, boolean extension) {
         return false;
     }
 

From 7f41559647444c1292c5e5640e32ff861ba3ea50 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Tue, 12 Nov 2024 16:15:37 +0100
Subject: [PATCH 017/214] Fix build.gradle.kts as of 43618fc2

---
 BauSystem/BauSystem_RegionFixed/build.gradle.kts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/BauSystem/BauSystem_RegionFixed/build.gradle.kts b/BauSystem/BauSystem_RegionFixed/build.gradle.kts
index bb84c063..b33f5f0a 100644
--- a/BauSystem/BauSystem_RegionFixed/build.gradle.kts
+++ b/BauSystem/BauSystem_RegionFixed/build.gradle.kts
@@ -31,8 +31,8 @@ java {
 }
 
 dependencies {
-    compileOnly(project(":BauSystem:BauSystem_Main"))
-    compileOnly(project(":SpigotCore"))
+    compileOnly(project(":BauSystem:BauSystem_Main", "default"))
+    compileOnly(project(":SpigotCore", "default"))
 
     compileOnly(libs.spigotapi)
     compileOnly(libs.axiom)

From 8427ae36f2989fe52a253bdfb387cd09381fb666 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Tue, 12 Nov 2024 16:31:45 +0100
Subject: [PATCH 018/214] Remove unused TestblockMode

---
 .../bausystem/regionnew/flags/TestblockMode.java         | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/TestblockMode.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/TestblockMode.java
index d6d8075c..e7ff3e7b 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/TestblockMode.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/TestblockMode.java
@@ -26,15 +26,12 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum TestblockMode implements Flag.Value<TestblockMode> {
 
-	NO_VALUE("FLAG_TESTBLOCK_NO_VALUE", false, false),
-	NORTH("FLAG_TESTBLOCK_NORTH", false, true),
-	SOUTH("FLAG_TESTBLOCK_SOUTH", false, false),
-	FIXED_NORTH("FLAG_TESTBLOCK_NORTH", true, true),
-	FIXED_SOUTH("FLAG_TESTBLOCK_SOUTH", true, false);
+	NO_VALUE("FLAG_TESTBLOCK_NO_VALUE", false),
+	NORTH("FLAG_TESTBLOCK_NORTH", true),
+	SOUTH("FLAG_TESTBLOCK_SOUTH", false);
 
 	private static TestblockMode[] values;
 	private final String chatValue;
-	private final boolean fixed;
 	private final boolean north;
 
 	@Override

From 6822dc796fe6d25f03860eac3e200c49ae784834 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sat, 21 Dec 2024 19:30:31 +0100
Subject: [PATCH 019/214] Update Region System of BauSystem

---
 .../bausystem/utils/FlatteningWrapper15.java  |   2 +-
 .../features/autostart/AutostartListener.java |   8 +-
 .../features/backup/BackupCommand.java        |   8 +-
 .../features/cannon/CannonDetector.java       |   5 +-
 .../features/cannon/depth/Depth.java          |   4 +-
 .../features/countingwand/Countingwand.java   |   2 +-
 .../countingwand/CountingwandListener.java    |   2 +-
 .../endstone/DesignEndStoneCommand.java       |   3 +-
 .../killchecker/KillcheckerVisualizer.java    |   2 +-
 .../features/observer/ObserverTracer.java     |   2 +-
 .../features/region/RegionCommand.java        |   2 +-
 .../region/items/ColorBauGuiItem.java         |   2 +-
 .../features/script/lua/libs/LuaLib.java      |   2 +-
 .../script/lua/libs/WorldEditLib.java         |   2 +-
 .../features/simulator/data/tnt/TNTPhase.java |   3 +-
 .../features/slaves/laufbau/Cuboid.java       |   2 +-
 .../laufbau/states/CreatingLaufState.java     |   2 +-
 .../laufbau/states/ProcessingTracesState.java |   2 +-
 .../bausystem/features/team/SkinCommand.java  |   6 +-
 .../team/boundary/BoundaryViewer.java         |   9 +-
 .../blockcounter/BlockCounterListener.java    |   8 +-
 .../bausystem/features/tracer/TNTPoint.java   |  12 +-
 .../features/util/KillAllCommand.java         |  10 +-
 .../features/util/SelectCommand.java          |   2 +-
 .../features/world/BauScoreboard.java         |   9 +-
 .../worldedit/ColorReplaceCommand.java        |   2 +-
 .../bausystem/region/BackupScheduler.java     |  42 +-
 .../{regionnew => region}/Color.java          |  41 +-
 .../bausystem/region/FlagStorage.java         | 110 +---
 .../bausystem/region/GlobalRegion.java        |  42 --
 .../{regionnew => region}/Point.java          |   2 +-
 .../de/steamwar/bausystem/region/Region.java  | 613 +++---------------
 .../RegionFlagPolicy.java                     |   6 +-
 .../{regionnew => region}/RegionSystem.java   |   6 +-
 .../{regionnew => region}/RegionType.java     |   4 +-
 .../bausystem/region/RegionUtils.java         | 100 +--
 .../flags/ChangedMode.java                    |   2 +-
 .../flags/ColorMode.java                      |   4 +-
 .../{regionnew => region}/flags/FireMode.java |   2 +-
 .../steamwar/bausystem/region/flags/Flag.java | 134 ++--
 .../flags/FreezeMode.java                     |   2 +-
 .../{regionnew => region}/flags/ItemMode.java |   2 +-
 .../flags/NoGravityMode.java                  |   2 +-
 .../flags/ProtectMode.java                    |   2 +-
 .../{regionnew => region}/flags/TNTMode.java  |   2 +-
 .../flags/TestblockMode.java                  |   2 +-
 .../region/flags/flagvalues/ColorMode.java    |  72 --
 .../region/flags/flagvalues/FireMode.java     |  60 --
 .../region/flags/flagvalues/FreezeMode.java   |  61 --
 .../region/flags/flagvalues/ItemMode.java     |  60 --
 .../flags/flagvalues/NoGravityMode.java       |  60 --
 .../region/flags/flagvalues/ProtectMode.java  |  60 --
 .../region/flags/flagvalues/TNTMode.java      |  59 --
 .../steamwar/bausystem/region/tags/Tag.java   |  24 -
 .../region/utils/RegionExtensionType.java     |  25 -
 .../region/utils/RegionSelectionType.java     |   3 +-
 .../bausystem/region/utils/RegionType.java    |  34 -
 .../bausystem/regionnew/FlagStorage.java      |  29 -
 .../steamwar/bausystem/regionnew/Region.java  |  85 ---
 .../bausystem/regionnew/RegionSide.java       |  25 -
 .../bausystem/regionnew/flags/Flag.java       | 102 ---
 .../Prototype.java.txt}                       |   0
 .../bausystem/regionold/Region.java.txt       | 584 +++++++++++++++++
 .../loader/PrototypeLoader.java.txt}          |   0
 .../loader/RegionLoader.java.txt}             |   0
 .../loader/Updater.java.txt}                  |   0
 .../bausystem/utils/FlatteningWrapper.java    |   2 +-
 .../bausystem/utils/PasteBuilder.java         |   4 +-
 .../utils/bossbar/GlobalBossbar.java          |   4 +-
 .../FixedFlagStorage.java                     |  10 +-
 .../FixedGlobalRegion.java                    |  62 +-
 .../{regionnew => region}/FixedRegion.java    |  63 +-
 .../FixedRegionSystem.java                    |   2 +-
 73 files changed, 927 insertions(+), 1796 deletions(-)
 rename BauSystem/BauSystem_Main/src/de/steamwar/bausystem/{regionnew => region}/Color.java (65%)
 delete mode 100644 BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/GlobalRegion.java
 rename BauSystem/BauSystem_Main/src/de/steamwar/bausystem/{regionnew => region}/Point.java (98%)
 rename BauSystem/BauSystem_Main/src/de/steamwar/bausystem/{regionnew => region}/RegionFlagPolicy.java (90%)
 rename BauSystem/BauSystem_Main/src/de/steamwar/bausystem/{regionnew => region}/RegionSystem.java (94%)
 rename BauSystem/BauSystem_Main/src/de/steamwar/bausystem/{regionnew => region}/RegionType.java (93%)
 rename BauSystem/BauSystem_Main/src/de/steamwar/bausystem/{regionnew => region}/flags/ChangedMode.java (97%)
 rename BauSystem/BauSystem_Main/src/de/steamwar/bausystem/{regionnew => region}/flags/ColorMode.java (96%)
 rename BauSystem/BauSystem_Main/src/de/steamwar/bausystem/{regionnew => region}/flags/FireMode.java (96%)
 rename BauSystem/BauSystem_Main/src/de/steamwar/bausystem/{regionnew => region}/flags/FreezeMode.java (97%)
 rename BauSystem/BauSystem_Main/src/de/steamwar/bausystem/{regionnew => region}/flags/ItemMode.java (97%)
 rename BauSystem/BauSystem_Main/src/de/steamwar/bausystem/{regionnew => region}/flags/NoGravityMode.java (97%)
 rename BauSystem/BauSystem_Main/src/de/steamwar/bausystem/{regionnew => region}/flags/ProtectMode.java (97%)
 rename BauSystem/BauSystem_Main/src/de/steamwar/bausystem/{regionnew => region}/flags/TNTMode.java (96%)
 rename BauSystem/BauSystem_Main/src/de/steamwar/bausystem/{regionnew => region}/flags/TestblockMode.java (97%)
 delete mode 100644 BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/ColorMode.java
 delete mode 100644 BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/FireMode.java
 delete mode 100644 BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/FreezeMode.java
 delete mode 100644 BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/ItemMode.java
 delete mode 100644 BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/NoGravityMode.java
 delete mode 100644 BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/ProtectMode.java
 delete mode 100644 BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/TNTMode.java
 delete mode 100644 BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/tags/Tag.java
 delete mode 100644 BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/utils/RegionExtensionType.java
 delete mode 100644 BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/utils/RegionType.java
 delete mode 100644 BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/FlagStorage.java
 delete mode 100644 BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/Region.java
 delete mode 100644 BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/RegionSide.java
 delete mode 100644 BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/Flag.java
 rename BauSystem/BauSystem_Main/src/de/steamwar/bausystem/{region/Prototype.java => regionold/Prototype.java.txt} (100%)
 create mode 100644 BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionold/Region.java.txt
 rename BauSystem/BauSystem_Main/src/de/steamwar/bausystem/{region/loader/PrototypeLoader.java => regionold/loader/PrototypeLoader.java.txt} (100%)
 rename BauSystem/BauSystem_Main/src/de/steamwar/bausystem/{region/loader/RegionLoader.java => regionold/loader/RegionLoader.java.txt} (100%)
 rename BauSystem/BauSystem_Main/src/de/steamwar/bausystem/{region/loader/Updater.java => regionold/loader/Updater.java.txt} (100%)
 rename BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/{regionnew => region}/FixedFlagStorage.java (86%)
 rename BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/{regionnew => region}/FixedGlobalRegion.java (65%)
 rename BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/{regionnew => region}/FixedRegion.java (61%)
 rename BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/{regionnew => region}/FixedRegionSystem.java (97%)

diff --git a/BauSystem/BauSystem_15/src/de/steamwar/bausystem/utils/FlatteningWrapper15.java b/BauSystem/BauSystem_15/src/de/steamwar/bausystem/utils/FlatteningWrapper15.java
index 69872f57..266326e0 100644
--- a/BauSystem/BauSystem_15/src/de/steamwar/bausystem/utils/FlatteningWrapper15.java
+++ b/BauSystem/BauSystem_15/src/de/steamwar/bausystem/utils/FlatteningWrapper15.java
@@ -42,7 +42,7 @@ import com.sk89q.worldedit.session.ClipboardHolder;
 import com.sk89q.worldedit.world.World;
 import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockTypes;
-import de.steamwar.bausystem.regionnew.Point;
+import de.steamwar.bausystem.region.Point;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/autostart/AutostartListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/autostart/AutostartListener.java
index 28126ec5..3185c66c 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/autostart/AutostartListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/autostart/AutostartListener.java
@@ -44,7 +44,6 @@ import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.inventory.ItemStack;
 
 import java.io.File;
-import java.text.SimpleDateFormat;
 import java.util.*;
 
 @Linked
@@ -106,11 +105,11 @@ public class AutostartListener implements Listener {
 
     public void activate(Player player) {
         Region region = Region.getRegion(player.getLocation());
-        if (region.isGlobal()) {
+        if (region.getType().isGlobal()) {
             BauSystem.MESSAGE.send("AUTOSTART_MESSAGE_NO_REGION", player);
             return;
         }
-        if (!region.hasType(RegionType.TESTBLOCK)) {
+        if (region.getTestblockArea().isPresent()) {
             BauSystem.MESSAGE.send("AUTOSTART_MESSAGE_NO_REGION", player);
             return;
         }
@@ -131,8 +130,7 @@ public class AutostartListener implements Listener {
         event.blockList().forEach(block -> {
             Region region = Region.getRegion(block.getLocation());
             if (!regionStartTime.containsKey(region)) return;
-            if (!region.hasType(RegionType.TESTBLOCK)) return;
-            if (!region.inRegion(block.getLocation(), RegionType.TESTBLOCK, RegionExtensionType.EXTENSION)) return;
+            if (!region.getTestblockArea().inRegion(block.getLocation(), true)) return;
             long tickDiff = TPSUtils.currentRealTick.get() - regionStartTime.remove(region);
             long preFightDurationInSeconds = getPreFightDurationInSeconds(region);
             RegionUtils.message(region, "AUTOSTART_MESSAGE_RESULT1", tickDiff);
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/backup/BackupCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/backup/BackupCommand.java
index 6abe927a..919c08cd 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/backup/BackupCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/backup/BackupCommand.java
@@ -22,7 +22,7 @@ package de.steamwar.bausystem.features.backup;
 import com.sk89q.worldedit.EditSession;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.region.Region;
-import de.steamwar.bausystem.region.tags.Tag;
+import de.steamwar.bausystem.region.flags.Flag;
 import de.steamwar.bausystem.utils.PasteBuilder;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.SWCommandUtils;
@@ -49,7 +49,7 @@ public class BackupCommand extends SWCommand {
     }
 
     static boolean checkGlobalRegion(Region region, Player p) {
-        if (region.isGlobal()) {
+        if (region.getType().isGlobal()) {
             BauSystem.MESSAGE.send("BACKUP_REGION_NO_REGION", p);
             return true;
         }
@@ -62,11 +62,11 @@ public class BackupCommand extends SWCommand {
         if (checkGlobalRegion(region, p)) {
             return;
         }
-        if (!region.get(Tag.CHANGED)) {
+        if (region.getFlag(Flag.CHANGED).isPresent()) {
             BauSystem.MESSAGE.send("BACKUP_CREATE_NO_CHANGE", p);
             return;
         }
-        if (region.backup()) {
+        if (region.backup(false)) {
             BauSystem.MESSAGE.send("BACKUP_CREATE_SUCCESS", p);
         } else {
             BauSystem.MESSAGE.send("BACKUP_CREATE_FAILURE", p);
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/cannon/CannonDetector.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/cannon/CannonDetector.java
index 3ab4fe70..7c73888d 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/cannon/CannonDetector.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/cannon/CannonDetector.java
@@ -23,7 +23,6 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.cannon.depth.Depth;
 import de.steamwar.bausystem.features.cannon.depth.DepthManager;
 import de.steamwar.bausystem.region.Region;
-import de.steamwar.bausystem.region.utils.RegionType;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.TNTPrimed;
@@ -85,8 +84,8 @@ public class CannonDetector implements Listener {
             grouped.forEach((cannonKey, tntPrimeds) -> {
                 if (tntPrimeds.size() <= 5) return;
                 Region region = Region.getRegion(tntPrimeds.get(0).getLocation());
-                if (region.isGlobal()) return;
-                if (!region.hasType(RegionType.TESTBLOCK)) return;
+                if (region.getType().isGlobal()) return;
+                if (region.getTestblockArea().isEmpty()) return;
                 Depth depth = new Depth(region);
                 DepthManager.init(tntPrimeds, depth);
             });
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/cannon/depth/Depth.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/cannon/depth/Depth.java
index 22ce7fde..4cfacb98 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/cannon/depth/Depth.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/cannon/depth/Depth.java
@@ -23,8 +23,6 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.configplayer.Config;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.RegionUtils;
-import de.steamwar.bausystem.region.utils.RegionExtensionType;
-import de.steamwar.bausystem.region.utils.RegionType;
 import net.md_5.bungee.api.chat.BaseComponent;
 import net.md_5.bungee.api.chat.HoverEvent;
 import net.md_5.bungee.api.chat.TextComponent;
@@ -50,7 +48,7 @@ public class Depth {
 
     public void update(List<Block> blocks) {
         List<Block> blocksList = blocks.stream()
-                .filter(block -> region.inRegion(block.getLocation(), RegionType.TESTBLOCK, RegionExtensionType.EXTENSION))
+                .filter(block -> region.getTestblockArea().inRegion(block.getLocation(), true))
                 .collect(Collectors.toList());
         tntCount++;
         for (Block block : blocksList) {
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/countingwand/Countingwand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/countingwand/Countingwand.java
index 6c667ba7..fb9316b9 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/countingwand/Countingwand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/countingwand/Countingwand.java
@@ -20,7 +20,7 @@
 package de.steamwar.bausystem.features.countingwand;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.regionnew.Point;
+import de.steamwar.bausystem.region.Point;
 import de.steamwar.bausystem.shared.Pair;
 import de.steamwar.bausystem.utils.ItemUtils;
 import de.steamwar.inventory.SWItem;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/countingwand/CountingwandListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/countingwand/CountingwandListener.java
index 9d811f28..7233670a 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/countingwand/CountingwandListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/countingwand/CountingwandListener.java
@@ -19,7 +19,7 @@
 
 package de.steamwar.bausystem.features.countingwand;
 
-import de.steamwar.bausystem.regionnew.Point;
+import de.steamwar.bausystem.region.Point;
 import de.steamwar.linkage.Linked;
 import org.bukkit.FluidCollisionMode;
 import org.bukkit.event.EventHandler;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/design/endstone/DesignEndStoneCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/design/endstone/DesignEndStoneCommand.java
index 92934c23..e50541a8 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/design/endstone/DesignEndStoneCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/design/endstone/DesignEndStoneCommand.java
@@ -21,7 +21,6 @@ package de.steamwar.bausystem.features.design.endstone;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.region.Region;
-import de.steamwar.bausystem.region.utils.RegionType;
 import de.steamwar.bausystem.utils.BauMemberUpdateEvent;
 import de.steamwar.command.SWCommand;
 import de.steamwar.linkage.Linked;
@@ -49,7 +48,7 @@ public class DesignEndStoneCommand extends SWCommand implements Listener {
     @Register(description = "DESIGN_ENDSTONE_COMMAND_HELP")
     public void genericCommand(@Validator Player player) {
         Region region = Region.getRegion(player.getLocation());
-        if (!region.hasType(RegionType.BUILD)) {
+        if (region.getBuildArea().isEmpty()) {
             BauSystem.MESSAGE.send("DESIGN_ENDSTONE_REGION_ERROR", player);
             return;
         }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/killchecker/KillcheckerVisualizer.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/killchecker/KillcheckerVisualizer.java
index d7145f37..04822aa8 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/killchecker/KillcheckerVisualizer.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/killchecker/KillcheckerVisualizer.java
@@ -20,7 +20,7 @@
 package de.steamwar.bausystem.features.killchecker;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.regionnew.Point;
+import de.steamwar.bausystem.region.Point;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.utils.RegionExtensionType;
 import de.steamwar.bausystem.region.utils.RegionType;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/observer/ObserverTracer.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/observer/ObserverTracer.java
index e4aedd0a..c1e08fcf 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/observer/ObserverTracer.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/observer/ObserverTracer.java
@@ -20,7 +20,7 @@
 package de.steamwar.bausystem.features.observer;
 
 import de.steamwar.Reflection;
-import de.steamwar.bausystem.regionnew.Point;
+import de.steamwar.bausystem.region.Point;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.Particle;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionCommand.java
index e7cedc22..6d8d6f4d 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionCommand.java
@@ -28,7 +28,7 @@ import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.session.ClipboardHolder;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.util.SelectCommand;
-import de.steamwar.bausystem.regionnew.Point;
+import de.steamwar.bausystem.region.Point;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.RegionUtils;
 import de.steamwar.bausystem.region.flags.Flag;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/ColorBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/ColorBauGuiItem.java
index b886e756..a38c397f 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/ColorBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/ColorBauGuiItem.java
@@ -22,7 +22,7 @@ package de.steamwar.bausystem.features.region.items;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
-import de.steamwar.bausystem.regionnew.Color;
+import de.steamwar.bausystem.region.Color;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.flags.Flag;
 import de.steamwar.bausystem.region.flags.flagvalues.ColorMode;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/LuaLib.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/LuaLib.java
index a86542df..a4af0d3a 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/LuaLib.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/LuaLib.java
@@ -19,7 +19,7 @@
 
 package de.steamwar.bausystem.features.script.lua.libs;
 
-import de.steamwar.bausystem.regionnew.Point;
+import de.steamwar.bausystem.region.Point;
 import lombok.AllArgsConstructor;
 import org.bukkit.entity.Player;
 import org.luaj.vm2.*;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/WorldEditLib.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/WorldEditLib.java
index 7f0cac4d..87d1f9fb 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/WorldEditLib.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/WorldEditLib.java
@@ -22,7 +22,7 @@ package de.steamwar.bausystem.features.script.lua.libs;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.bukkit.BukkitPlayer;
 import com.sk89q.worldedit.math.BlockVector3;
-import de.steamwar.bausystem.regionnew.Point;
+import de.steamwar.bausystem.region.Point;
 import de.steamwar.bausystem.utils.FlatteningWrapper;
 import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/tnt/TNTPhase.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/tnt/TNTPhase.java
index 29f59d93..20fe8d41 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/tnt/TNTPhase.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/tnt/TNTPhase.java
@@ -23,7 +23,6 @@ import de.steamwar.bausystem.features.simulator.data.SimulatorPhase;
 import de.steamwar.bausystem.features.simulator.execute.SimulatorAction;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.region.flags.flagvalues.FreezeMode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -65,7 +64,7 @@ public final class TNTPhase extends SimulatorPhase {
             @Override
             public void accept(World world) {
                 Location location = position.toLocation(world);
-                if (Region.getRegion(location).get(Flag.FREEZE) == FreezeMode.ACTIVE) return;
+                if (Region.getRegion(location).getFlag(Flag.FREEZE).isPresent()) return;
                 TNTPrimed tnt = world.spawn(location, TNTPrimed.class);
                 if (!xJump) tnt.setVelocity(tnt.getVelocity().setX(0));
                 if (!yJump) tnt.setVelocity(tnt.getVelocity().setY(0));
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/Cuboid.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/Cuboid.java
index e5699aaa..c31653a5 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/Cuboid.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/Cuboid.java
@@ -19,7 +19,7 @@
 
 package de.steamwar.bausystem.features.slaves.laufbau;
 
-import de.steamwar.bausystem.regionnew.Point;
+import de.steamwar.bausystem.region.Point;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/states/CreatingLaufState.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/states/CreatingLaufState.java
index 369ca0d9..e4ed312b 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/states/CreatingLaufState.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/states/CreatingLaufState.java
@@ -27,7 +27,7 @@ import com.sk89q.worldedit.world.block.BlockTypes;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.slaves.laufbau.BlockBoundingBox;
 import de.steamwar.bausystem.features.slaves.laufbau.Cuboid;
-import de.steamwar.bausystem.regionnew.Point;
+import de.steamwar.bausystem.region.Point;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.entity.Player;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/states/ProcessingTracesState.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/states/ProcessingTracesState.java
index 04c43fd3..94eb6549 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/states/ProcessingTracesState.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/states/ProcessingTracesState.java
@@ -26,7 +26,7 @@ import de.steamwar.bausystem.features.slaves.laufbau.Cuboid;
 import de.steamwar.bausystem.features.tracer.TNTPoint;
 import de.steamwar.bausystem.features.tracer.Trace;
 import de.steamwar.bausystem.features.tracer.TraceManager;
-import de.steamwar.bausystem.regionnew.Point;
+import de.steamwar.bausystem.region.Point;
 import de.steamwar.bausystem.utils.FlatteningWrapper;
 import org.bukkit.Location;
 import org.bukkit.World;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/team/SkinCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/team/SkinCommand.java
index 8394691e..ae466066 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/team/SkinCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/team/SkinCommand.java
@@ -21,9 +21,7 @@ package de.steamwar.bausystem.features.team;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.team.boundary.BoundaryViewer;
-import de.steamwar.bausystem.region.Prototype;
 import de.steamwar.bausystem.region.Region;
-import de.steamwar.bausystem.region.utils.RegionType;
 import de.steamwar.command.PreviousArguments;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeMapper;
@@ -69,14 +67,14 @@ public class SkinCommand extends SWCommand {
             return;
         }
         Region region = Region.getRegion(p.getLocation());
-        if (region.isGlobal()) {
+        if (region.getType().isGlobal()) {
             BauSystem.MESSAGE.send("SKIN_NO_REGION", p);
             return;
         }
 
         String name = String.join(" ", names);
         File arenaFile = new File("sections19/" + name + "/" + typeKuerzel + "Arena.schem");
-        File testblockFile = region.hasType(RegionType.TESTBLOCK) ? new File("sections19/" + name + "/" + typeKuerzel + "Testblock.schem") : null;
+        File testblockFile = region.getTestblockArea().isPresent() ? new File("sections19/" + name + "/" + typeKuerzel + "Testblock.schem") : null;
 
         arenaFile.getParentFile().mkdirs();
         if (testblockFile != null) {
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/team/boundary/BoundaryViewer.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/team/boundary/BoundaryViewer.java
index 808e6398..4d2b34a7 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/team/boundary/BoundaryViewer.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/team/boundary/BoundaryViewer.java
@@ -48,21 +48,18 @@ public class BoundaryViewer implements Listener {
             }
             viewers.forEach(player -> {
                 Region region = Region.getRegion(player.getLocation());
-                if (region.isGlobal()) return;
+                if (region.getType().isGlobal()) return;
                 showRegion(region, player);
-                if (region.getLinkedRegion() != null) {
-                    showRegion(region.getLinkedRegion(), player);
-                }
             });
         }, 20, 20);
     }
 
     private void showRegion(Region region, Player player) {
         drawCuboid(player, TrickyParticleWrapper.impl.getVillagerHappy(), region.getMinPoint(), region.getMaxPoint());
-        if (region.hasType(RegionType.TESTBLOCK)) {
+        if (region.getTestblockArea().isPresent()) {
             drawCuboid(player, Particle.END_ROD, region.getMinPointTestblockExtension(), region.getMaxPointTestblockExtension());
         }
-        if (region.hasType(RegionType.BUILD)) {
+        if (region.getBuildArea().isPresent()) {
             drawCuboid(player, Particle.END_ROD, region.getMinPointBuildExtension(), region.getMaxPointBuildExtension());
         }
     }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/testblock/blockcounter/BlockCounterListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/testblock/blockcounter/BlockCounterListener.java
index 979e5fe3..a891b76f 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/testblock/blockcounter/BlockCounterListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/testblock/blockcounter/BlockCounterListener.java
@@ -20,8 +20,6 @@
 package de.steamwar.bausystem.features.testblock.blockcounter;
 
 import de.steamwar.bausystem.region.Region;
-import de.steamwar.bausystem.region.utils.RegionExtensionType;
-import de.steamwar.bausystem.region.utils.RegionType;
 import de.steamwar.linkage.Linked;
 import org.bukkit.block.Block;
 import org.bukkit.event.EventHandler;
@@ -37,11 +35,13 @@ public class BlockCounterListener implements Listener {
     @EventHandler
     public void onEntityExplode(EntityExplodeEvent event) {
         Region region = Region.getRegion(event.getLocation());
-        if (region.isGlobal()) {
+        if (region.getType().isGlobal()) {
             return;
         }
         List<Block> blockList = event.blockList();
-        blockList = blockList.stream().filter(block -> region.inRegion(block.getLocation(), RegionType.TESTBLOCK, RegionExtensionType.EXTENSION)).collect(Collectors.toList());
+        blockList = blockList.stream()
+                .filter(block -> region.getTestblockArea().inRegion(block.getLocation(), true))
+                .collect(Collectors.toList());
         if (blockList.isEmpty()) {
             return;
         }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TNTPoint.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TNTPoint.java
index a33c52f0..73315d9a 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TNTPoint.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TNTPoint.java
@@ -20,8 +20,6 @@
 package de.steamwar.bausystem.features.tracer;
 
 import de.steamwar.bausystem.region.Region;
-import de.steamwar.bausystem.region.utils.RegionExtensionType;
-import de.steamwar.bausystem.region.utils.RegionType;
 import de.steamwar.core.Core;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -39,7 +37,7 @@ import java.util.Optional;
  */
 @AllArgsConstructor(access = AccessLevel.PACKAGE)
 @Getter
-public class TNTPoint{
+public class TNTPoint {
     /**
      * Unique number to identify records being of the same tnt
      */
@@ -99,7 +97,7 @@ public class TNTPoint{
      * Constructor for object creation in trace recording
      */
     protected TNTPoint(int tntId, TNTPrimed tnt, boolean explosion, boolean afterFirstExplosion, long ticksSinceStart,
-                    List<TNTPoint> history, List<Block> destroyedBlocks) {
+                       List<TNTPoint> history, List<Block> destroyedBlocks) {
         this.tntId = tntId;
         this.explosion = explosion;
         if (Core.getVersion() > 15) {
@@ -117,12 +115,10 @@ public class TNTPoint{
         boolean buildDestroy = false;
         boolean testblockDestroy = false;
         for (Block destroyedBlock : destroyedBlocks) {
-            if (Region.getRegion(destroyedBlock.getLocation()).inRegion(destroyedBlock.getLocation(), RegionType.BUILD,
-                    RegionExtensionType.EXTENSION)) {
+            if (Region.getRegion(destroyedBlock.getLocation()).getBuildArea().inRegion(destroyedBlock.getLocation(), true)) {
                 buildDestroy = true;
             }
-            if (Region.getRegion(destroyedBlock.getLocation()).inRegion(destroyedBlock.getLocation(),
-                    RegionType.TESTBLOCK, RegionExtensionType.EXTENSION)) {
+            if (Region.getRegion(destroyedBlock.getLocation()).getTestblockArea().inRegion(destroyedBlock.getLocation(), true)) {
                 testblockDestroy = true;
             }
         }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/KillAllCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/KillAllCommand.java
index e08b40c0..c0d99689 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/KillAllCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/KillAllCommand.java
@@ -21,12 +21,9 @@ package de.steamwar.bausystem.features.util;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.SWUtils;
-import de.steamwar.bausystem.region.GlobalRegion;
 import de.steamwar.bausystem.region.Region;
-import de.steamwar.bausystem.region.RegionUtils;
-import de.steamwar.bausystem.region.utils.RegionExtensionType;
 import de.steamwar.bausystem.region.utils.RegionSelectionType;
-import de.steamwar.bausystem.region.utils.RegionType;
+import de.steamwar.bausystem.region.RegionUtils;
 import de.steamwar.command.SWCommand;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
@@ -53,7 +50,7 @@ public class KillAllCommand extends SWCommand {
     public void genericCommand(@Validator Player player, RegionSelectionType regionSelectionType) {
         Region region = Region.getRegion(player.getLocation());
         AtomicLong count = new AtomicLong(0);
-        if (regionSelectionType == RegionSelectionType.GLOBAL || GlobalRegion.getInstance() == region) {
+        if (regionSelectionType == RegionSelectionType.GLOBAL || region.getType().isGlobal()) {
             WORLD.getEntities()
                     .stream()
                     .filter(e -> !(e instanceof Player))
@@ -66,7 +63,7 @@ public class KillAllCommand extends SWCommand {
             WORLD.getEntities()
                     .stream()
                     .filter(e -> !(e instanceof Player))
-                    .filter(e -> region.inRegion(e.getLocation(), RegionType.NORMAL, RegionExtensionType.NORMAL))
+                    .filter(e -> region.inRegion(e.getLocation()))
                     .forEach(entity -> {
                         entity.remove();
                         count.incrementAndGet();
@@ -74,5 +71,4 @@ public class KillAllCommand extends SWCommand {
             RegionUtils.actionBar(region, "OTHER_KILLALL_REGION", count.get());
         }
     }
-
 }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/SelectCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/SelectCommand.java
index 4f1df1af..7a11d678 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/SelectCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/SelectCommand.java
@@ -1,7 +1,7 @@
 package de.steamwar.bausystem.features.util;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.regionnew.Point;
+import de.steamwar.bausystem.region.Point;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.utils.RegionExtensionType;
 import de.steamwar.bausystem.region.utils.RegionType;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/BauScoreboard.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/BauScoreboard.java
index 5bd1e06d..38aa4039 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/BauScoreboard.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/BauScoreboard.java
@@ -1,7 +1,5 @@
 package de.steamwar.bausystem.features.world;
 
-import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.region.GlobalRegion;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.flags.Flag;
 import de.steamwar.bausystem.utils.ScoreboardElement;
@@ -101,8 +99,11 @@ public class BauScoreboard implements Listener {
             @Override
             public String getTitle() {
                 Region region = Region.getRegion(player.getLocation());
-                if (GlobalRegion.getInstance() == region) return "§eSteam§8War";
-                String colorCode = BauSystem.MESSAGE.parse(region.get(Flag.COLOR).getChatValue(), player).substring(0, 2);
+                if (region.getType().isGlobal()) return "§eSteam§8War";
+                String colorCode = "§e";
+                if (region.hasFlag(Flag.COLOR).isReadable()) {
+                    colorCode = "§" + region.getFlag(Flag.COLOR).get().getColor().getColorCode();
+                }
                 return colorCode + "■ §eSteam§8War " + colorCode + "■"; // ■
             }
         });
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/ColorReplaceCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/ColorReplaceCommand.java
index 3df0755c..6b6659ba 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/ColorReplaceCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/ColorReplaceCommand.java
@@ -28,7 +28,7 @@ import com.sk89q.worldedit.util.formatting.text.TextComponent;
 import com.sk89q.worldedit.util.formatting.text.TranslatableComponent;
 import de.steamwar.bausystem.features.world.WorldEditListener;
 import de.steamwar.bausystem.features.worldedit.utils.SpecialReplace;
-import de.steamwar.bausystem.regionnew.Color;
+import de.steamwar.bausystem.region.Color;
 import de.steamwar.bausystem.shared.Pair;
 import de.steamwar.bausystem.utils.WorldEditUtils;
 import de.steamwar.command.PreviousArguments;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/BackupScheduler.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/BackupScheduler.java
index 44b57332..eb57e09f 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/BackupScheduler.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/BackupScheduler.java
@@ -1,33 +1,14 @@
-/*
- * This file is a part of the SteamWar software.
- *
- * Copyright (C) 2021  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;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.region.tags.Tag;
+import de.steamwar.bausystem.region.flags.ChangedMode;
+import de.steamwar.bausystem.region.flags.Flag;
 import de.steamwar.linkage.Linked;
 import de.steamwar.linkage.api.Enable;
 import org.bukkit.scheduler.BukkitRunnable;
 
 import java.util.Iterator;
 
-
 @Linked
 public class BackupScheduler implements Enable {
 
@@ -39,26 +20,29 @@ public class BackupScheduler implements Enable {
         new BukkitRunnable() {
             @Override
             public void run() {
-                final Iterator<Region> regions = Region.getREGION_MAP().values().stream().filter(region -> region.get(Tag.CHANGED)).iterator();
-                BackupScheduler.this.doBackup(regions);
+                Iterator<Region> regionsToBackup = RegionSystem.INSTANCE.getRegions()
+                        .filter(region -> region.isFlag(Flag.CHANGED, ChangedMode.HAS_CHANGE))
+                        .iterator();
+                if (!regionsToBackup.hasNext()) return;
+                doBackup(regionsToBackup);
             }
         }.runTaskTimer(BauSystem.getInstance(), INITIAL, PERIOD);
     }
 
-    public void doBackup(final Iterator<Region> regionIterator) {
+    private void doBackup(Iterator<Region> regionsToBackup) {
         new BukkitRunnable() {
             @Override
             public void run() {
-                if (!regionIterator.hasNext()) {
+                if (!regionsToBackup.hasNext()) {
                     this.cancel();
                     return;
                 }
 
-                final Region region = regionIterator.next();
-                if (region.backup()) {
-                    region.remove(Tag.CHANGED);
+                Region region = regionsToBackup.next();
+                if (region.backup(true)) {
+                    region.setFlag(Flag.CHANGED, ChangedMode.NO_CHANGE);
                 }
             }
         }.runTaskTimer(BauSystem.getInstance(), 0, 20 * 60);
     }
-}
\ No newline at end of file
+}
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/Color.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Color.java
similarity index 65%
rename from BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/Color.java
rename to BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Color.java
index 6292fbe1..72052d74 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/Color.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Color.java
@@ -17,23 +17,30 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bausystem.regionnew;
+package de.steamwar.bausystem.region;
 
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+@Getter
 public enum Color {
-    WHITE,
-    ORANGE,
-    MAGENTA,
-    LIGHT_BLUE,
-    YELLOW,
-    LIME,
-    PINK,
-    GRAY,
-    LIGHT_GRAY,
-    CYAN,
-    PURPLE,
-    BLUE,
-    BROWN,
-    GREEN,
-    RED,
-    BLACK;
+    WHITE('f'),
+    ORANGE('6'),
+    MAGENTA('5'),
+    LIGHT_BLUE('b'),
+    YELLOW('e'),
+    LIME('a'),
+    PINK('d'),
+    GRAY('8'),
+    LIGHT_GRAY('7'),
+    CYAN('3'),
+    PURPLE('5'),
+    BLUE('9'),
+    BROWN('e'),
+    GREEN('2'),
+    RED('c'),
+    BLACK('1');
+
+    private final char colorCode;
 }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/FlagStorage.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/FlagStorage.java
index e0ee43a5..3ca76ace 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/FlagStorage.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/FlagStorage.java
@@ -1,107 +1,29 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   Copyright (C) 2024  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 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.
+ *   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/>.
+ *   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;
 
 import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.region.tags.Tag;
-import yapion.hierarchy.types.YAPIONObject;
 
-import java.util.EnumMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
+public interface FlagStorage {
 
-/**
- * Tags and Flags are not allowed to have overlaping names.
- */
-public class FlagStorage {
+    <T extends Enum<T> & Flag.Value<T>> boolean set(Flag<T> flag, T value);
 
-	public static FlagStorage createStorage(YAPIONObject yapionObject) {
-		FlagStorage flagStorage = new FlagStorage();
-		for (final Flag flag : Flag.getFlags()) {
-			try {
-				String s = yapionObject.getPlainValue(flag.name());
-				flagStorage.set(flag, flag.getFlagValueOf(s));
-			} catch (Exception e) {
-				flagStorage.set(flag, flag.getDefaultValue());
-			}
-		}
-		for (final Tag tag : Tag.values()) {
-			if (yapionObject.containsKey(tag.name())) {
-				flagStorage.set(tag);
-			}
-		}
-		return flagStorage;
-	}
-
-	public static YAPIONObject toYAPION(FlagStorage flagStorage) {
-		YAPIONObject yapionObject = new YAPIONObject();
-		for (final Flag flag : Flag.getFlags()) {
-			if (flag.getDefaultValue() == flagStorage.flags.getOrDefault(flag, flag.getDefaultValue())) {
-				yapionObject.remove(flag.name());
-			} else {
-				yapionObject.add(flag.name(), flagStorage.get(flag).getValue().name());
-			}
-		}
-		for (Tag tag : Tag.values()) {
-			if (flagStorage.tagSet.contains(tag)) {
-				yapionObject.add(tag.name(), "");
-			} else {
-				yapionObject.remove(tag.name());
-			}
-		}
-		return yapionObject;
-	}
-
-	protected Map<Flag, Flag.Value<?>> flags;
-	protected Set<Tag> tagSet;
-
-	public FlagStorage() {
-		flags = new EnumMap<>(Flag.class);
-		tagSet = new HashSet<>();
-		readKeys();
-	}
-
-	public boolean set(final Flag flagType, final Flag.Value<?> value) {
-		return flags.put(flagType, value) != value;
-	}
-
-	public Flag.Value<?> get(final Flag flagType) {
-		return flags.getOrDefault(flagType, flagType.getDefaultValue());
-	}
-
-	public boolean set(final Tag tag) {
-		return tagSet.add(tag);
-	}
-
-	public boolean remove(final Tag tag) {
-		return tagSet.remove(tag);
-	}
-
-	public boolean is(final Tag tag) {
-		return tagSet.contains(tag);
-	}
-
-	private void readKeys() {
-		for (final Flag flag : Flag.getFlags()) {
-			flags.put(flag, flag.getDefaultValue());
-		}
-	}
-}
\ No newline at end of file
+    <T extends Enum<T> & Flag.Value<T>> T get(Flag<T> flag);
+}
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/GlobalRegion.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/GlobalRegion.java
deleted file mode 100644
index 83623989..00000000
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/GlobalRegion.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * This file is a part of the SteamWar software.
- *
- * Copyright (C) 2021  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;
-
-import de.steamwar.bausystem.region.utils.RegionExtensionType;
-import de.steamwar.bausystem.region.utils.RegionType;
-import lombok.Getter;
-import org.bukkit.Location;
-import yapion.hierarchy.types.YAPIONObject;
-
-public class GlobalRegion extends Region {
-
-    @Getter
-    static GlobalRegion instance;
-
-    public GlobalRegion(FlagStorage flagStorage, YAPIONObject regionData) {
-        super("global", null, new YAPIONObject(), flagStorage, regionData);
-        instance = this;
-    }
-
-    @Override
-    public boolean inRegion(Location location, RegionType regionType, RegionExtensionType regionExtensionType) {
-        return true;
-    }
-}
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/Point.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Point.java
similarity index 98%
rename from BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/Point.java
rename to BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Point.java
index a9f3534c..3dad7a51 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/Point.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Point.java
@@ -17,7 +17,7 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bausystem.regionnew;
+package de.steamwar.bausystem.region;
 
 import com.sk89q.worldedit.math.BlockVector3;
 import lombok.AllArgsConstructor;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
index bf8477e9..72a007a0 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
@@ -1,585 +1,128 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   Copyright (C) 2024  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 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.
+ *   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/>.
+ *   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;
 
 import com.sk89q.worldedit.EditSession;
-import com.sk89q.worldedit.WorldEdit;
-import com.sk89q.worldedit.bukkit.BukkitWorld;
-import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.region.flags.flagvalues.TNTMode;
-import de.steamwar.bausystem.region.tags.Tag;
-import de.steamwar.bausystem.region.utils.RegionExtensionType;
-import de.steamwar.bausystem.region.utils.RegionType;
-import de.steamwar.bausystem.regionnew.Point;
-import de.steamwar.bausystem.shared.SizedStack;
-import de.steamwar.bausystem.utils.FlatteningWrapper;
-import de.steamwar.bausystem.utils.PasteBuilder;
-import de.steamwar.core.Core;
-import de.steamwar.sql.SchematicType;
-import lombok.AccessLevel;
-import lombok.Getter;
+import de.steamwar.sql.SchematicNode;
 import lombok.NonNull;
-import org.bukkit.Bukkit;
 import org.bukkit.Location;
-import yapion.hierarchy.types.YAPIONObject;
-import yapion.hierarchy.types.YAPIONType;
-import yapion.hierarchy.types.YAPIONValue;
 
+import javax.annotation.Nullable;
 import java.io.File;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.*;
-import java.util.function.ObjIntConsumer;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
+import java.util.Optional;
 
-@Getter
-public class Region {
+public interface Region {
 
-    @Getter
-    private static final Map<String, Region> REGION_MAP = new HashMap<>();
-    private static final File backupFolder = new File(Bukkit.getWorlds().get(0).getWorldFolder(), "backup");
-    private static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy.MM.dd' 'HH:mm:ss");
-
-    public static Region getRegion(Location location) {
-        return REGION_MAP.values().stream()
-                .filter(r -> r.inRegion(location, r.minPoint, r.maxPoint))
-                .findFirst()
-                .orElse(GlobalRegion.instance);
+    static Region getRegion(Location location) {
+        return RegionSystem.INSTANCE.get(location);
     }
 
-    public static Set<Region> getRegion(Prototype prototype) {
-        return REGION_MAP.values().stream()
-                .filter(r -> r.getPrototype() == prototype)
-                .collect(Collectors.toSet());
+    RegionType getType();
+
+    <T extends Enum<T> & Flag.Value<T>> RegionFlagPolicy hasFlag(@NonNull Flag<T> flag);
+
+    <T extends Enum<T> & Flag.Value<T>> boolean setFlag(@NonNull Flag<T> flag, T value);
+
+    <T extends Enum<T> & Flag.Value<T>> Optional<T> getFlag(@NonNull Flag<T> flag);
+
+    default <T extends Enum<T> & Flag.Value<T>> boolean isFlag(@NonNull Flag<T> flag, T value) {
+        if (hasFlag(flag).isReadable()) {
+            Optional<T> optional = getFlag(flag);
+            return optional.isPresent() && optional.get() == value;
+        }
+        return false;
     }
 
-    public static void setGlobal(Flag flagType, Flag.Value<?> value) {
-        REGION_MAP.values().forEach(region -> region.set(flagType, value));
-    }
+    Point getMinPoint();
 
-    YAPIONObject regionData;
+    Point getMaxPoint();
 
-    private String name;
-    private Prototype prototype;
-    private Set<String> prototypes;
-    private String skin;
+    boolean inRegion(Location location);
 
-    private Point minPoint;
-    private Point maxPoint;
+    Inner getBuildArea();
 
-    private Point minPointTestblock;
-    private Point maxPointTestblock;
+    Inner getTestblockArea();
 
-    private Point minPointTestblockExtension;
-    private Point maxPointTestblockExtension;
+    // TODO: Add forEachChunk and getChunkOutsidePredicate
 
-    private Point minPointBuild;
-    private Point maxPointBuild;
+    Optional<File> getGameModeConfig();
 
-    private Point minPointBuildExtension;
-    private Point maxPointBuildExtension;
+    boolean backup(boolean automatic);
 
-    private int floorLevel;
-    private int waterLevel;
+    Optional<EditSession> copy();
 
-    private Point copyPoint; // Nullable
-    private Point testBlockPoint; // Nullable
+    void reset();
 
-    private String linkedRegionName = null; // Nullable
-    private Region linkedRegion = null; // Nullable
+    void remember(EditSession editSession);
 
-    private FlagStorage flagStorage;
+    boolean undo();
 
-    @Getter(AccessLevel.PRIVATE)
-    private SizedStack<EditSession> undoSessions;
+    boolean redo();
 
-    @Getter(AccessLevel.PRIVATE)
-    private SizedStack<EditSession> redoSessions;
+    interface Inner {
 
-    public Region(String name, Prototype prototype, YAPIONObject regionConfig, FlagStorage flagStorage, YAPIONObject regionData) {
-        this.name = name;
-        this.regionData = regionData;
-        if (prototype != null) {
-            REGION_MAP.put(name, this);
-        }
+        Inner EMPTY = new Inner() {
+            private static final Point ZERO = new Point(0, 0, 0);
 
-        linkedRegionName = regionConfig.getPlainValueOrDefault("optionsLinkedWith", null);
-
-        prototypes = new HashSet<>();
-        if (regionConfig.containsKey("prototypes", YAPIONType.ARRAY)) {
-            regionConfig.getArray("prototypes").forEach(yapionAnyType -> {
-                if (yapionAnyType instanceof YAPIONValue) {
-                    prototypes.add(((YAPIONValue<String>) yapionAnyType).get());
-                }
-            });
-        }
-        if (regionConfig.containsKey("prototype")) {
-            prototypes.add(regionConfig.getPlainValue("prototype"));
-        }
-
-        this.flagStorage = flagStorage;
-        Point point = null;
-        if (regionConfig.containsKey("minX", Integer.class) && regionConfig.containsKey("minY", Integer.class) && regionConfig.containsKey("minZ", Integer.class)) {
-            point = new Point(regionConfig.getPlainValue("minX"), regionConfig.getPlainValue("minY"), regionConfig.getPlainValue("minZ"));
-        }
-        if (prototype != null && prototypes.contains(prototype.getName())) {
-            generatePrototypeData(prototype, point);
-        } else if (regionConfig.containsKey("prototype")) {
-            generatePrototypeData(Prototype.getByName(regionConfig.getPlainValue("prototype")), point);
-        }
-        if (prototype != null) {
-            skin = regionData.getPlainValueOrDefault("skin", prototype.getDefaultSkin());
-            if (!prototype.getSkinMap().containsKey(skin)) {
-                skin = prototype.getDefaultSkin();
+            @Override
+            public Point getMinPoint(boolean extension) {
+                return ZERO;
             }
-        }
-        regionData.add("skin", skin);
 
-        if (!hasType(RegionType.BUILD) || !hasType(RegionType.TESTBLOCK)) {
-            flagStorage.set(Flag.TNT, TNTMode.DENY);
-        }
-    }
-
-    private void generatePrototypeData(Prototype prototype, Point point) {
-        if (prototype == null) {
-            return;
-        }
-
-        this.prototype = prototype;
-        this.skin = prototype.getDefaultSkin();
-
-        this.minPoint = point;
-        this.maxPoint = point.add(prototype.getSizeX() - 1, prototype.getSizeY() - 1, prototype.getSizeZ() - 1);
-
-        if (prototype.getTestblock() != null) {
-            this.minPointTestblock = point.add(prototype.getTestblock().getOffsetX(), prototype.getTestblock().getOffsetY(), prototype.getTestblock().getOffsetZ());
-            this.maxPointTestblock = this.minPointTestblock.add(prototype.getTestblock().getSizeX() - 1, prototype.getTestblock().getSizeY() - 1, prototype.getTestblock().getSizeZ() - 1);
-
-            this.minPointTestblockExtension = this.minPointTestblock.subtract(prototype.getTestblock().getExtensionNegativeX(), prototype.getTestblock().getExtensionNegativeY(), prototype.getTestblock().getExtensionNegativeZ());
-            this.maxPointTestblockExtension = this.maxPointTestblock.add(prototype.getTestblock().getExtensionPositiveX(), prototype.getTestblock().getExtensionPositiveY(), prototype.getTestblock().getExtensionPositiveZ());
-
-            if (prototype.getTestblock().getCopyOffsetX() != 0 || prototype.getTestblock().getCopyOffsetY() != 0 || prototype.getTestblock().getCopyOffsetZ() != 0) {
-                this.testBlockPoint = this.minPointTestblock.add(prototype.getTestblock().getCopyOffsetX(), prototype.getTestblock().getCopyOffsetY(), prototype.getTestblock().getCopyOffsetZ());
-            } else {
-                this.testBlockPoint = this.minPointTestblock.add(prototype.getTestblock().getSizeX() / 2, 0, -1);
+            @Override
+            public Point getMaxPoint(boolean extension) {
+                return ZERO;
             }
-        }
 
-        if (prototype.getBuild() != null) {
-            this.minPointBuild = point.add(prototype.getBuild().getOffsetX(), prototype.getBuild().getOffsetY(), prototype.getBuild().getOffsetZ());
-            this.maxPointBuild = this.minPointBuild.add(prototype.getBuild().getSizeX() - 1, prototype.getBuild().getSizeY() - 1, prototype.getBuild().getSizeZ() - 1);
-
-            this.minPointBuildExtension = this.minPointBuild.subtract(prototype.getBuild().getExtensionNegativeX(), prototype.getBuild().getExtensionNegativeY(), prototype.getBuild().getExtensionNegativeZ());
-            this.maxPointBuildExtension = this.maxPointBuild.add(prototype.getBuild().getExtensionPositiveX(), prototype.getBuild().getExtensionPositiveY(), prototype.getBuild().getExtensionPositiveZ());
-
-            if (!prototype.getBuild().isHasCopyPoint() && (prototype.getCopyPointOffsetX() != 0 || prototype.getCopyPointOffsetY() != 0 || prototype.getCopyPointOffsetZ() != 0)) {
-                this.copyPoint = minPoint.add(prototype.getCopyPointOffsetX(), prototype.getCopyPointOffsetY(), prototype.getCopyPointOffsetZ());
-            } else if (prototype.getBuild().getCopyOffsetX() != 0 || prototype.getBuild().getCopyOffsetY() != 0 || prototype.getBuild().getCopyOffsetZ() != 0) {
-                this.copyPoint = this.minPointBuild.add(prototype.getBuild().getCopyOffsetX(), prototype.getBuild().getCopyOffsetY(), prototype.getBuild().getCopyOffsetZ());
-            } else {
-                this.copyPoint = this.minPointBuild.add(prototype.getBuild().getSizeX() / 2, 0, prototype.getBuild().getSizeZ());
-            }
-        } else if (prototype.getCopyPointOffsetX() != 0 || prototype.getCopyPointOffsetY() != 0 || prototype.getCopyPointOffsetZ() != 0) {
-            this.copyPoint = minPoint.add(prototype.getCopyPointOffsetX(), prototype.getCopyPointOffsetY(), prototype.getCopyPointOffsetZ());
-        }
-
-        if (prototype.getFloorOffset() != 0) {
-            floorLevel = minPoint.getY() + prototype.getFloorOffset();
-        } else {
-            floorLevel = 0;
-        }
-
-        if (prototype.getWaterOffset() != 0) {
-            waterLevel = minPoint.getY() + prototype.getWaterOffset();
-        } else {
-            waterLevel = 0;
-        }
-    }
-
-    public boolean inRegion(Location location, RegionType regionType, RegionExtensionType regionExtensionType) {
-        if (!hasType(regionType)) {
-            return false;
-        }
-        switch (regionType) {
-            case BUILD:
-                Point minBPoint = regionExtensionType == RegionExtensionType.EXTENSION ? minPointBuildExtension : minPointBuild;
-                Point maxBPoint = regionExtensionType == RegionExtensionType.EXTENSION ? maxPointBuildExtension : maxPointBuild;
-                return inRegion(location, minBPoint, maxBPoint);
-            case TESTBLOCK:
-                Point minTBPoint = regionExtensionType == RegionExtensionType.EXTENSION ? minPointTestblockExtension : minPointTestblock;
-                Point maxTBPoint = regionExtensionType == RegionExtensionType.EXTENSION ? maxPointTestblockExtension : maxPointTestblock;
-                return inRegion(location, minTBPoint, maxTBPoint);
-            default:
-            case NORMAL:
-                return inRegion(location, minPoint, maxPoint);
-        }
-    }
-
-    private boolean inRegion(Location location, Point minPoint, Point maxPoint) {
-        int blockX = location.getBlockX();
-        int blockY = location.getBlockY();
-        int blockZ = location.getBlockZ();
-        return blockX >= minPoint.getX() && blockX <= maxPoint.getX() &&
-                blockY >= minPoint.getY() && blockY <= maxPoint.getY() &&
-                blockZ >= minPoint.getZ() && blockZ <= maxPoint.getZ();
-    }
-
-    public boolean hasType(RegionType regionType) {
-        if (prototype == null) {
-            return false;
-        }
-        if (regionType == null) {
-            return false;
-        }
-        switch (regionType) {
-            case BUILD:
-                return prototype.getBuild() != null;
-            case TESTBLOCK:
-                return prototype.getTestblock() != null;
-            default:
-            case NORMAL:
-                return true;
-        }
-    }
-
-    public boolean hasExtensionType(RegionType regionType) {
-        if (!hasType(regionType)) {
-            return false;
-        }
-        switch (regionType) {
-            case BUILD:
-                return prototype.getBuild().isExtensionRegistered();
-            case TESTBLOCK:
-                return prototype.getTestblock().isExtensionRegistered();
-            default:
-            case NORMAL:
+            @Override
+            public boolean inRegion(Location location, boolean extension) {
                 return false;
-        }
-    }
-
-    public String getDisplayName() {
-        return prototype != null ? prototype.getSkinMap().get(skin).getName() : "";
-    }
-
-    private void setLinkedRegion(Predicate<Region> regionConsumer) {
-        if (linkedRegionName == null) {
-            return;
-        }
-        if (linkedRegion != null) {
-            if (regionConsumer.test(linkedRegion)) {
-                RegionUtils.save(linkedRegion);
             }
-            return;
-        }
-        for (Region region : REGION_MAP.values()) {
-            if (region.name.equals(linkedRegionName)) {
-                linkedRegion = region;
-                if (regionConsumer.test(linkedRegion)) {
-                    RegionUtils.save(linkedRegion);
-                }
-                return;
+
+            @Override
+            public Optional<EditSession> copy(boolean extension) {
+                return Optional.empty();
             }
-        }
-    }
 
-    public Region getLinkedRegion() {
-        if (linkedRegion == null && linkedRegionName != null) {
-            setLinkedRegion(region -> false);
-        }
-        return linkedRegion;
-    }
-
-    public boolean setPrototype(@NonNull Prototype prototype) {
-        if (!prototypes.contains(prototype.getName())) {
-            return false;
-        }
-        return _setPrototype(prototype);
-    }
-
-    boolean _setPrototype(@NonNull Prototype prototype) {
-        generatePrototypeData(prototype, minPoint);
-        RegionUtils.save(this);
-        return true;
-    }
-
-    public boolean setSkin(@NonNull String skinName) {
-        if (!prototype.getSkinMap().containsKey(skinName)) {
-            return false;
-        }
-        this.skin = skinName;
-        setLinkedRegion(region -> {
-            region.skin = skinName;
-            return true;
-        });
-        regionData.add("skin", skin);
-        return true;
-    }
-
-    public void set(Flag flagType, Flag.Value<?> value) {
-        if (flagStorage.set(flagType, value)) {
-            RegionUtils.save(this);
-        }
-        setLinkedRegion(region -> region.flagStorage.set(flagType, value));
-    }
-
-    public void set(Tag tag) {
-        if (flagStorage.set(tag)) {
-            RegionUtils.save(this);
-        }
-        setLinkedRegion(region -> region.flagStorage.set(tag));
-    }
-
-    public void remove(Tag tag) {
-        if (flagStorage.remove(tag)) {
-            RegionUtils.save(this);
-        }
-    }
-
-    public Flag.Value<?> get(Flag flagType) {
-        return flagStorage.get(flagType);
-    }
-
-    public boolean get(Tag tagType) {
-        return flagStorage.is(tagType);
-    }
-
-    public <T extends Enum<T> & Flag.Value<T>> T getPlain(Flag flagType) {
-        return (T) flagStorage.get(flagType).getValue();
-    }
-
-    public <T extends Enum<T> & Flag.Value<T>> T getPlain(Flag flagType, Class<T> type) {
-        return (T) flagStorage.get(flagType).getValue();
-    }
-
-    public Point getMinPoint(RegionType regionType, RegionExtensionType regionExtensionType) {
-        switch (regionType) {
-            case TESTBLOCK:
-                return (regionExtensionType == null || regionExtensionType == RegionExtensionType.NORMAL) ? minPointTestblock : minPointTestblockExtension;
-            case BUILD:
-                return (regionExtensionType == null || regionExtensionType == RegionExtensionType.NORMAL) ? minPointBuild : minPointBuildExtension;
-            default:
-            case NORMAL:
-                return minPoint;
-        }
-    }
-
-    public Point getMaxPoint(RegionType regionType, RegionExtensionType regionExtensionType) {
-        switch (regionType) {
-            case TESTBLOCK:
-                return (regionExtensionType == null || regionExtensionType == RegionExtensionType.NORMAL) ? maxPointTestblock : maxPointTestblockExtension;
-            case BUILD:
-                return (regionExtensionType == null || regionExtensionType == RegionExtensionType.NORMAL) ? maxPointBuild : maxPointBuildExtension;
-            default:
-            case NORMAL:
-                return maxPoint;
-        }
-    }
-
-    boolean hasReset(RegionType regionType) {
-        if (!hasType(regionType)) {
-            return false;
-        }
-        switch (regionType) {
-            case TESTBLOCK:
-                return prototype.getSkinMap().get(skin).getTestblockSchematicFile() != null;
-            case BUILD:
-                return prototype.getSkinMap().get(skin).getBuildSchematicFile() != null;
-            default:
-            case NORMAL:
-                return prototype.getSkinMap().get(skin).getSchematicFile() != null;
-        }
-    }
-
-    public File getResetFile(RegionType regionType) {
-        if (!hasReset(regionType)) {
-            return null;
-        }
-        switch (regionType) {
-            case TESTBLOCK:
-                return prototype.getSkinMap().get(skin).getTestblockSchematicFile();
-            case BUILD:
-                return prototype.getSkinMap().get(skin).getBuildSchematicFile();
-            default:
-            case NORMAL:
-                return prototype.getSkinMap().get(skin).getSchematicFile();
-        }
-    }
-
-    public void reset(PasteBuilder pasteBuilder, RegionType regionType, RegionExtensionType regionExtensionType) {
-        if (!hasReset(regionType)) {
-            return;
-        }
-        if (regionExtensionType == RegionExtensionType.EXTENSION && !hasExtensionType(regionType)) {
-            regionExtensionType = RegionExtensionType.NORMAL;
-        }
-
-        pasteBuilder.reset(regionExtensionType == RegionExtensionType.EXTENSION)
-                .minPoint(getMinPoint(regionType, regionExtensionType))
-                .maxPoint(getMaxPoint(regionType, regionExtensionType))
-                .waterLevel(waterLevel);
-        if (pasteBuilder.getClipboardProvider().is(PasteBuilder.SchematicProvider.class)) {
-            SchematicType schematicType = pasteBuilder.getClipboardProvider().as(PasteBuilder.SchematicProvider.class).getSchematic().getSchemtype();
-            pasteBuilder.rotate(schematicType.fightType() || schematicType.check());
-        }
-
-        switch (regionType) {
-            case BUILD:
-                pasteBuilder.pastePoint(minPointBuild.add(prototype.getBuild().getSizeX() / 2, 0, prototype.getBuild().getSizeZ() / 2));
-                break;
-            case TESTBLOCK:
-                Point pastePoint = minPointTestblock.add(prototype.getTestblock().getSizeX() / 2, 0, prototype.getTestblock().getSizeZ() / 2);
-                if (pasteBuilder.getClipboardProvider().is(PasteBuilder.SchematicProvider.class)) {
-                    SchematicType schematicType = pasteBuilder.getClipboardProvider().as(PasteBuilder.SchematicProvider.class).getSchematic().getSchemtype();
-                    if (schematicType.getKuerzel().equalsIgnoreCase("wg")) {
-                        pastePoint = pastePoint.add(0, 0, 1);
-                    }
-                    if (schematicType.getKuerzel().equalsIgnoreCase("ws")) {
-                        pastePoint = pastePoint.add(-1, 0, 1);
-                    }
-                    if (schematicType.getKuerzel().equalsIgnoreCase("as")) {
-                        pastePoint = pastePoint.add(-1, 0, 1);
-                    }
-                }
-                pasteBuilder.pastePoint(pastePoint);
-                break;
-            default:
-            case NORMAL:
-                pasteBuilder.pastePoint(minPoint.add(prototype.getSizeX() / 2, 0, prototype.getSizeZ() / 2));
-                break;
-        }
-
-        initSessions();
-        undoSessions.push(pasteBuilder.run());
-    }
-
-    public void remember(EditSession editSession) {
-        initSessions();
-        undoSessions.push(editSession);
-    }
-
-    public boolean isGlobal() {
-        return this == GlobalRegion.getInstance();
-    }
-
-    private void initSessions() {
-        if (undoSessions == null) {
-            undoSessions = new SizedStack<>(20);
-            redoSessions = new SizedStack<>(20);
-        }
-    }
-
-    public boolean undo() {
-        initSessions();
-        EditSession session = undoSessions.pop();
-        if (session == null)
-            return false;
-
-        try (EditSession e = WorldEdit.getInstance().getEditSessionFactory().getEditSession(new BukkitWorld(Bukkit.getWorlds().get(0)), -1)) {
-            session.undo(e);
-            redoSessions.push(e);
-        }
-        return true;
-    }
-
-    public boolean redo() {
-        initSessions();
-        EditSession session = redoSessions.pop();
-        if (session == null)
-            return false;
-
-        try (EditSession e = WorldEdit.getInstance().getEditSessionFactory().getEditSession(new BukkitWorld(Bukkit.getWorlds().get(0)), -1)) {
-            session.redo(e);
-            undoSessions.push(e);
-        }
-        return true;
-    }
-
-    public boolean backup() {
-        final File definedBackupFolder = new File(new File(backupFolder, prototype.getName()), name);
-        //noinspection ResultOfMethodCallIgnored
-        definedBackupFolder.mkdirs();
-
-        File[] currentBackups = definedBackupFolder.listFiles();
-        if (currentBackups != null && currentBackups.length >= 20) {
-            List<File> files = new ArrayList<>(Arrays.asList(currentBackups));
-            files.sort(Comparator.comparingLong(File::lastModified));
-            while (files.size() >= 20) files.remove(0).delete();
-        }
-
-        final File backupFile = new File(definedBackupFolder, LocalDateTime.now().format(formatter) + ".schem");
-        return FlatteningWrapper.impl.backup(minPoint, maxPoint, backupFile);
-    }
-
-    public static boolean copy(Point minPoint, Point maxPoint, File file) {
-        return FlatteningWrapper.impl.backup(minPoint, maxPoint, file);
-    }
-
-    public List<String> listBackup() {
-        final File definedBackupFolder = new File(new File(backupFolder, prototype.getName()), name);
-        //noinspection ResultOfMethodCallIgnored
-        definedBackupFolder.mkdirs();
-
-        File[] currentBackups = definedBackupFolder.listFiles();
-        List<File> files = new ArrayList<>(Arrays.asList(currentBackups));
-        files.sort(Comparator.comparingLong(File::lastModified));
-        return files.stream().map(File::getName).collect(Collectors.toList());
-    }
-
-    public File getBackupFile(String backupName) {
-        final File definedBackupFolder = new File(new File(backupFolder, prototype.getName()), name);
-        //noinspection ResultOfMethodCallIgnored
-        definedBackupFolder.mkdirs();
-        File[] files = definedBackupFolder.listFiles((dir, name) -> name.equals(backupName + ".schem"));
-        if (files == null || files.length == 0) return null;
-        return files[0];
-    }
-
-    public void forEachChunk(ObjIntConsumer<Integer> executor) {
-        for (int x = (int) Math.floor(minPoint.getX() / 16.0); x <= (int) Math.ceil(maxPoint.getX() / 16.0); x++) {
-            for (int z = (int) Math.floor(minPoint.getZ() / 16.0); z <= (int) Math.ceil(maxPoint.getZ() / 16.0); z++) {
-                executor.accept(x, z);
+            @Override
+            public void reset(@Nullable SchematicNode schematicNode, boolean extension) {
             }
-        }
-    }
+        };
 
-    public boolean buildChunkOutside(int chunkX, int chunkY) {
-        if (!hasType(RegionType.BUILD)) {
-            return Math.floor(minPoint.getX() / 16.0) > chunkX || chunkX >= Math.ceil(maxPoint.getX() / 16.0) ||
-                    Math.floor(minPoint.getZ() / 16.0) > chunkY || chunkY >= Math.ceil(maxPoint.getZ() / 16.0);
+        default boolean isEmpty() {
+            return this == EMPTY;
         }
-        if (!hasExtensionType(RegionType.BUILD)) {
-            return Math.floor(minPointBuild.getX() / 16.0) > chunkX || chunkX >= Math.ceil(maxPointBuild.getX() / 16.0) ||
-                    Math.floor(minPointBuild.getZ() / 16.0) > chunkY || chunkY >= Math.ceil(maxPointBuild.getZ() / 16.0);
-        }
-        return Math.floor(minPointBuildExtension.getX() / 16.0) > chunkX || chunkX >= Math.ceil(maxPointBuildExtension.getX() / 16.0) ||
-                Math.floor(minPointBuildExtension.getZ() / 16.0) > chunkY || chunkY >= Math.ceil(maxPointBuildExtension.getZ() / 16.0);
-    }
 
-    public File gameModeConfig() {
-        File baseFile = new File(BauSystem.getInstance().getDataFolder().getParentFile(), "FightSystem");
-        for (int version = Core.getVersion(); version >= 15; version--) {
-            File specific = new File(baseFile, prototype.getDisplayName() + version + ".yml");
-            if (specific.exists()) return specific;
+        default boolean isPresent() {
+            return this != EMPTY;
         }
-        return null;
+
+        Point getMinPoint(boolean extension);
+
+        Point getMaxPoint(boolean extension);
+
+        boolean inRegion(Location location, boolean extension);
+
+        Optional<EditSession> copy(boolean extension);
+
+        void reset(@Nullable SchematicNode schematicNode, boolean extension);
     }
-}
\ No newline at end of file
+}
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/RegionFlagPolicy.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionFlagPolicy.java
similarity index 90%
rename from BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/RegionFlagPolicy.java
rename to BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionFlagPolicy.java
index 7878a79a..ecc3d136 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/RegionFlagPolicy.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionFlagPolicy.java
@@ -17,7 +17,7 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bausystem.regionnew;
+package de.steamwar.bausystem.region;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
@@ -31,4 +31,8 @@ public enum RegionFlagPolicy {
 
     private final boolean readable;
     private final boolean writable;
+
+    public boolean isApplicable() {
+        return readable || writable;
+    }
 }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/RegionSystem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionSystem.java
similarity index 94%
rename from BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/RegionSystem.java
rename to BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionSystem.java
index bbe4960d..9c480219 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/RegionSystem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionSystem.java
@@ -17,7 +17,7 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bausystem.regionnew;
+package de.steamwar.bausystem.region;
 
 import org.bukkit.Location;
 
@@ -27,7 +27,7 @@ import java.util.stream.Stream;
 
 public interface RegionSystem {
 
-    RegionSystem REGION_SYSTEM = init();
+    RegionSystem INSTANCE = init();
 
     void load();
     void save();
@@ -43,7 +43,7 @@ public interface RegionSystem {
 
     private static RegionSystem init() {
         try {
-            return (RegionSystem) Class.forName("de.steamwar.bausystem.regionnew.FixedRegionSystem").getConstructor().newInstance();
+            return (RegionSystem) Class.forName("de.steamwar.bausystem.region.FixedRegionSystem").getConstructor().newInstance();
         } catch (ClassNotFoundException | NoSuchMethodException | InstantiationException | IllegalAccessException |
                  InvocationTargetException e) {
             return new RegionSystem() {
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/RegionType.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionType.java
similarity index 93%
rename from BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/RegionType.java
rename to BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionType.java
index ff91fcd5..dda01029 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/RegionType.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionType.java
@@ -17,11 +17,13 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bausystem.regionnew;
+package de.steamwar.bausystem.region;
 
+import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
 @RequiredArgsConstructor
+@Getter
 public enum RegionType {
 
     GLOBAL(true),
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionUtils.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionUtils.java
index e30c3ed9..1559025b 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionUtils.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionUtils.java
@@ -1,92 +1,48 @@
-/*
- * This file is a part of the SteamWar software.
- *
- * Copyright (C) 2021  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;
 
-import com.sk89q.worldedit.EditSession;
-import com.sk89q.worldedit.extent.clipboard.Clipboard;
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.region.utils.RegionExtensionType;
-import de.steamwar.bausystem.region.utils.RegionType;
-import de.steamwar.bausystem.utils.FlatteningWrapper;
-import de.steamwar.bausystem.worlddata.WorldData;
 import lombok.experimental.UtilityClass;
 import net.md_5.bungee.api.ChatMessageType;
 import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
-import java.io.File;
 import java.util.function.Consumer;
 import java.util.function.Function;
 
-
 @UtilityClass
 public class RegionUtils {
 
     public void actionBar(Region region, String s, Object... objects) {
+        forEachInRegion(region, player -> {
+            player.spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText(BauSystem.MESSAGE.parse(s, player, objects)));
+        });
+    }
+
+    public void message(Region region, String s, Object... objects) {
+        forEachInRegion(region, player -> BauSystem.MESSAGE.send(s, player, objects));
+    }
+
+    public void message(Region region, Function<Player, String> function) {
+        forEachInRegion(region, player -> {
+            String message = function.apply(player);
+            if (message == null) {
+                return;
+            }
+
+            player.sendMessage(message);
+        });
+    }
+
+    public void message(Region region, Consumer<Player> consumer) {
+        forEachInRegion(region, consumer);
+    }
+
+    public void forEachInRegion(Region region, Consumer<Player> consumer) {
         Bukkit.getOnlinePlayers()
                 .stream()
-                .filter(player -> region.inRegion(player.getLocation(), RegionType.NORMAL, RegionExtensionType.NORMAL))
-                .filter(player -> !region.isGlobal() || Region.getRegion(player.getLocation()).isGlobal())
-                .forEach(player -> player.spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText(BauSystem.MESSAGE.parse(s, player, objects))));
+                .filter(player -> region.inRegion(player.getLocation()))
+                .filter(player -> !region.getType().isGlobal() || Region.getRegion(player.getLocation()).getType().isGlobal())
+                .forEach(consumer);
     }
-
-    public static void message(Region region, String message, Object... objects) {
-        Bukkit.getOnlinePlayers()
-                .stream()
-                .filter(player -> region.inRegion(player.getLocation(), RegionType.NORMAL, RegionExtensionType.NORMAL))
-                .filter(player -> !region.isGlobal() || Region.getRegion(player.getLocation()).isGlobal())
-                .forEach(player -> BauSystem.MESSAGE.send(message, player, objects));
-    }
-
-    public static void message(Region region, Function<Player, String> function) {
-        Bukkit.getOnlinePlayers()
-                .stream()
-                .filter(player -> region.inRegion(player.getLocation(), RegionType.NORMAL, RegionExtensionType.NORMAL))
-                .filter(player -> !region.isGlobal() || Region.getRegion(player.getLocation()).isGlobal())
-                .forEach(player -> {
-                    String message = function.apply(player);
-                    if (message == null) {
-                        return;
-                    }
-
-                    player.sendMessage(message);
-                });
-    }
-
-    public static void message(Region region, Consumer<Player> function) {
-        Bukkit.getOnlinePlayers()
-                .stream()
-                .filter(player -> region.inRegion(player.getLocation(), RegionType.NORMAL, RegionExtensionType.NORMAL))
-                .filter(player -> !region.isGlobal() || Region.getRegion(player.getLocation()).isGlobal())
-                .forEach(player -> {
-                    function.accept(player);
-                });
-    }
-
-    static void save(Region region) {
-        if (region.getPrototype() != null) {
-            region.regionData.add("prototype", region.getPrototype().getName());
-        }
-        region.regionData.add("flagStorage", FlagStorage.toYAPION(region.getFlagStorage()));
-        WorldData.write();
-    }
-
 }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/ChangedMode.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ChangedMode.java
similarity index 97%
rename from BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/ChangedMode.java
rename to BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ChangedMode.java
index 85e70f01..ee7e7399 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/ChangedMode.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ChangedMode.java
@@ -17,7 +17,7 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bausystem.regionnew.flags;
+package de.steamwar.bausystem.region.flags;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/ColorMode.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ColorMode.java
similarity index 96%
rename from BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/ColorMode.java
rename to BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ColorMode.java
index 229301c3..e266d874 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/ColorMode.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ColorMode.java
@@ -17,9 +17,9 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bausystem.regionnew.flags;
+package de.steamwar.bausystem.region.flags;
 
-import de.steamwar.bausystem.regionnew.Color;
+import de.steamwar.bausystem.region.Color;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/FireMode.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/FireMode.java
similarity index 96%
rename from BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/FireMode.java
rename to BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/FireMode.java
index f628bd47..48deb0b7 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/FireMode.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/FireMode.java
@@ -17,7 +17,7 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bausystem.regionnew.flags;
+package de.steamwar.bausystem.region.flags;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/Flag.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/Flag.java
index 3c9f3173..7cfa0347 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/Flag.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/Flag.java
@@ -1,85 +1,103 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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 de.steamwar.bausystem.region.flags.flagvalues.*;
 import de.steamwar.bausystem.shared.EnumDisplay;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
-import java.util.EnumSet;
+import java.util.HashSet;
 import java.util.Set;
-import java.util.stream.Collectors;
+import java.util.concurrent.atomic.AtomicInteger;
 
-@Getter
-@AllArgsConstructor
-public enum Flag implements EnumDisplay {
+public final class Flag<T extends Enum<T> & Flag.Value<T>> implements EnumDisplay {
 
-	COLOR("FLAG_COLOR", ColorMode.class, ColorMode.YELLOW, false),
-	TNT("FLAG_TNT", TNTMode.class, TNTMode.ONLY_TB, true),
-	FIRE("FLAG_FIRE", FireMode.class, FireMode.ALLOW, true),
-	FREEZE("FLAG_FREEZE", FreezeMode.class, FreezeMode.INACTIVE, true),
-	PROTECT("FLAG_PROTECT", ProtectMode.class, ProtectMode.ACTIVE, true),
-	ITEMS("FLAG_ITEMS", ItemMode.class, ItemMode.INACTIVE, true),
-	NO_GRAVITY("FLAG_NO_GRAVITY", NoGravityMode.class, NoGravityMode.INACTIVE, true),
-	;
+    public static final Flag<ColorMode> COLOR = new Flag<>("COLOR", "FLAG_COLOR", ColorMode.class, ColorMode.YELLOW);
+    public static final Flag<TNTMode> TNT = new Flag<>("TNT", "FLAG_TNT", TNTMode.class, TNTMode.ONLY_TB);
+    public static final Flag<FireMode> FIRE = new Flag<>("FIRE", "FLAG_FIRE", FireMode.class, FireMode.ALLOW);
+    public static final Flag<FreezeMode> FREEZE = new Flag<>("FREEZE", "FLAG_FREEZE", FreezeMode.class, FreezeMode.INACTIVE);
+    public static final Flag<ProtectMode> PROTECT = new Flag<>("PROTECT", "FLAG_PROTECT", ProtectMode.class, ProtectMode.ACTIVE);
+    public static final Flag<ItemMode> ITEMS = new Flag<>("ITEMS", "FLAG_ITEMS", ItemMode.class, ItemMode.INACTIVE);
+    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);
 
-	@Getter
-	private static final Set<Flag> flags;
-	@Getter
-	private static final Set<Flag> resetFlags;
+    @Getter
+    private static final Set<Flag> flags = new HashSet<>();
 
-	static {
-		flags = EnumSet.allOf(Flag.class);
-		resetFlags = flags.stream().filter(flag -> flag.reset).collect(Collectors.toUnmodifiableSet());
-	}
+    private static AtomicInteger counter = new AtomicInteger(0);
 
-	private final String chatValue;
-	private final Class<? extends Value<?>> valueType;
-	private final Flag.Value<?> defaultValue;
-	private final boolean reset;
+    private String name;
+    private int ordinal;
 
-	public Value<?> getFlagValueOf(final String name) {
-		return this.defaultValue.getValueOf(name);
-	}
+    @Getter
+    private String chatValue;
 
-	@Override
-	public String toString() {
-		return this.name().toLowerCase();
-	}
+    @Getter
+    private final Class<? extends Flag.Value<T>> valueType;
 
-	@Override
-	public String getChatValue() {
-		return chatValue;
-	}
+    @Getter
+    private final Flag.Value<?> defaultValue;
 
-	public interface Value<T extends Enum<T> & Value<T>> extends EnumDisplay {
+    @Getter
+    private final Flag.Value<?>[] values;
 
-		T getValue();
+    private Flag(String name, String chatValue, Class<? extends Flag.Value<T>> valueType, Value<T> defaultValue) {
+        flags.add(this);
 
-		T getValueOf(final String name);
+        this.name = name;
+        this.ordinal = counter.getAndIncrement();
+        this.chatValue = chatValue;
 
-		T[] getValues();
+        this.valueType = valueType;
+        this.defaultValue = defaultValue;
+        this.values = defaultValue.getValues();
+    }
 
-		default String getName() {
-			return this.getValue().name().toLowerCase();
-		}
-	}
-}
\ No newline at end of file
+    public String name() {
+        return name;
+    }
+
+    public int ordinal() {
+        return ordinal;
+    }
+
+    public boolean oneOf(Flag<?>... flags) {
+        for (Flag<?> flag : flags) {
+            if (flag == this) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public interface Value<T extends Enum<T> & Value<T>> extends EnumDisplay {
+
+        T getValue();
+
+        T getValueOf(final String name);
+
+        T[] getValues();
+
+        default String getName() {
+            return this.getValue().name().toLowerCase();
+        }
+    }
+}
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/FreezeMode.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/FreezeMode.java
similarity index 97%
rename from BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/FreezeMode.java
rename to BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/FreezeMode.java
index f3da631c..4f80ca57 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/FreezeMode.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/FreezeMode.java
@@ -17,7 +17,7 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bausystem.regionnew.flags;
+package de.steamwar.bausystem.region.flags;
 
 
 import lombok.AllArgsConstructor;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/ItemMode.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ItemMode.java
similarity index 97%
rename from BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/ItemMode.java
rename to BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ItemMode.java
index 7d29899c..a846a53c 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/ItemMode.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ItemMode.java
@@ -17,7 +17,7 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bausystem.regionnew.flags;
+package de.steamwar.bausystem.region.flags;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/NoGravityMode.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/NoGravityMode.java
similarity index 97%
rename from BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/NoGravityMode.java
rename to BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/NoGravityMode.java
index 68e9fa6b..921d36ea 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/NoGravityMode.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/NoGravityMode.java
@@ -17,7 +17,7 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bausystem.regionnew.flags;
+package de.steamwar.bausystem.region.flags;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/ProtectMode.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ProtectMode.java
similarity index 97%
rename from BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/ProtectMode.java
rename to BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ProtectMode.java
index 2f510daa..be4f6132 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/ProtectMode.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ProtectMode.java
@@ -17,7 +17,7 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bausystem.regionnew.flags;
+package de.steamwar.bausystem.region.flags;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/TNTMode.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/TNTMode.java
similarity index 96%
rename from BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/TNTMode.java
rename to BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/TNTMode.java
index e483a81b..0f73f81b 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/TNTMode.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/TNTMode.java
@@ -17,7 +17,7 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bausystem.regionnew.flags;
+package de.steamwar.bausystem.region.flags;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/TestblockMode.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/TestblockMode.java
similarity index 97%
rename from BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/TestblockMode.java
rename to BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/TestblockMode.java
index e7ff3e7b..ba1b8f61 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/TestblockMode.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/TestblockMode.java
@@ -17,7 +17,7 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bausystem.regionnew.flags;
+package de.steamwar.bausystem.region.flags;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/ColorMode.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/ColorMode.java
deleted file mode 100644
index 6159c959..00000000
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/ColorMode.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * This file is a part of the SteamWar software.
- *
- * Copyright (C) 2021  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.flagvalues;
-
-import de.steamwar.bausystem.regionnew.Color;
-import de.steamwar.bausystem.region.flags.Flag;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@Getter
-@AllArgsConstructor
-public enum ColorMode implements Flag.Value<ColorMode> {
-    WHITE("FLAG_COLOR_WHITE", Color.WHITE),
-    ORANGE("FLAG_COLOR_ORANGE", Color.ORANGE),
-    MAGENTA("FLAG_COLOR_MAGENTA", Color.MAGENTA),
-    LIGHT_BLUE("FLAG_COLOR_LIGHT_BLUE", Color.LIGHT_BLUE),
-    YELLOW("FLAG_COLOR_YELLOW", Color.YELLOW),
-    LIME("FLAG_COLOR_LIME", Color.LIME),
-    PINK("FLAG_COLOR_PINK", Color.PINK),
-    GRAY("FLAG_COLOR_GRAY", Color.GRAY),
-    LIGHT_GRAY("FLAG_COLOR_LIGHT_GRAY", Color.LIGHT_GRAY),
-    CYAN("FLAG_COLOR_CYAN", Color.CYAN),
-    PURPLE("FLAG_COLOR_PURPLE", Color.PURPLE),
-    BLUE("FLAG_COLOR_BLUE", Color.BLUE),
-    BROWN("FLAG_COLOR_BROWN", Color.BROWN),
-    GREEN("FLAG_COLOR_GREEN", Color.GREEN),
-    RED("FLAG_COLOR_RED", Color.RED),
-    BLACK("FLAG_COLOR_BLACK", Color.BLACK);
-
-    private static ColorMode[] values;
-    private final String chatValue;
-    private final Color color;
-
-    @Override
-    public ColorMode[] getValues() {
-        if (ColorMode.values == null) {
-            ColorMode.values = ColorMode.values(); //NOSONAR
-        }
-        return ColorMode.values;
-    }
-
-    @Override
-    public ColorMode getValue() {
-        return this;
-    }
-
-    @Override
-    public ColorMode getValueOf(final String name) {
-        try {
-            return ColorMode.valueOf(name.toUpperCase());
-        } catch (IllegalArgumentException e) {
-            return ColorMode.YELLOW;
-        }
-    }
-}
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/FireMode.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/FireMode.java
deleted file mode 100644
index cf0fab31..00000000
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/FireMode.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * This file is a part of the SteamWar software.
- *
- * Copyright (C) 2021  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.flagvalues;
-
-import de.steamwar.bausystem.region.flags.Flag;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@Getter
-@AllArgsConstructor
-public enum FireMode implements Flag.Value<FireMode> {
-
-	ALLOW("FLAG_FIRE_ALLOW"),
-	DENY("FLAG_FIRE_DENY");
-
-	private static FireMode[] values;
-	private final String chatValue;
-
-	@Override
-	public FireMode[] getValues() {
-		if (FireMode.values == null) {
-			FireMode.values = FireMode.values(); //NOSONAR
-		}
-		return FireMode.values;
-	}
-
-	@Override
-	public FireMode getValue() {
-		return this;
-	}
-
-	@Override
-	public FireMode getValueOf(final String name) {
-		try {
-			return FireMode.valueOf(name.toUpperCase());
-		} catch (IllegalArgumentException e) {
-			if (name.equalsIgnoreCase("false")) {
-				return FireMode.DENY;
-			}
-			return FireMode.ALLOW;
-		}
-	}
-}
\ No newline at end of file
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/FreezeMode.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/FreezeMode.java
deleted file mode 100644
index 1b1774c7..00000000
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/FreezeMode.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * This file is a part of the SteamWar software.
- *
- * Copyright (C) 2021  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.flagvalues;
-
-
-import de.steamwar.bausystem.region.flags.Flag;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@Getter
-@AllArgsConstructor
-public enum FreezeMode implements Flag.Value<FreezeMode> {
-
-	ACTIVE("FLAG_FREEZE_ACTIVE"),
-	INACTIVE("FLAG_FREEZE_INACTIVE");
-
-	private static FreezeMode[] values;
-	private final String chatValue;
-
-	@Override
-	public FreezeMode[] getValues() {
-		if (FreezeMode.values == null) {
-			FreezeMode.values = FreezeMode.values(); //NOSONAR
-		}
-		return FreezeMode.values;
-	}
-
-	@Override
-	public FreezeMode getValue() {
-		return this;
-	}
-
-	@Override
-	public FreezeMode getValueOf(final String name) {
-		try {
-			return FreezeMode.valueOf(name.toUpperCase());
-		} catch (IllegalArgumentException e) {
-			if (name.equalsIgnoreCase("false")) {
-				return FreezeMode.INACTIVE;
-			}
-			return FreezeMode.INACTIVE;
-		}
-	}
-}
\ No newline at end of file
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/ItemMode.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/ItemMode.java
deleted file mode 100644
index c0cefa38..00000000
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/ItemMode.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * This file is a part of the SteamWar software.
- *
- * Copyright (C) 2021  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.flagvalues;
-
-import de.steamwar.bausystem.region.flags.Flag;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@Getter
-@AllArgsConstructor
-public enum ItemMode implements Flag.Value<ItemMode> {
-
-    ACTIVE("FLAG_ITEMS_ACTIVE"),
-    INACTIVE("FLAG_ITEMS_INACTIVE");
-
-    private static ItemMode[] values;
-    private final String chatValue;
-
-    @Override
-    public ItemMode[] getValues() {
-        if (ItemMode.values == null) {
-            ItemMode.values = ItemMode.values(); //NOSONAR
-        }
-        return ItemMode.values;
-    }
-
-    @Override
-    public ItemMode getValue() {
-        return this;
-    }
-
-    @Override
-    public ItemMode getValueOf(final String name) {
-        try {
-            return ItemMode.valueOf(name.toUpperCase());
-        } catch (IllegalArgumentException e) {
-            if (name.equalsIgnoreCase("false")) {
-                return ItemMode.INACTIVE;
-            }
-            return ItemMode.ACTIVE;
-        }
-    }
-}
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/NoGravityMode.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/NoGravityMode.java
deleted file mode 100644
index 33368a35..00000000
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/NoGravityMode.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * This file is a part of the SteamWar software.
- *
- * Copyright (C) 2021  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.flagvalues;
-
-import de.steamwar.bausystem.region.flags.Flag;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@Getter
-@AllArgsConstructor
-public enum NoGravityMode implements Flag.Value<NoGravityMode> {
-
-    ACTIVE("FLAG_NO_GRAVITY_ACTIVE"),
-    INACTIVE("FLAG_NO_GRAVITY_INACTIVE");
-
-    private static NoGravityMode[] values;
-    private final String chatValue;
-
-    @Override
-    public NoGravityMode[] getValues() {
-        if (NoGravityMode.values == null) {
-            NoGravityMode.values = NoGravityMode.values(); //NOSONAR
-        }
-        return NoGravityMode.values;
-    }
-
-    @Override
-    public NoGravityMode getValue() {
-        return this;
-    }
-
-    @Override
-    public NoGravityMode getValueOf(final String name) {
-        try {
-            return NoGravityMode.valueOf(name.toUpperCase());
-        } catch (IllegalArgumentException e) {
-            if (name.equalsIgnoreCase("false")) {
-                return NoGravityMode.INACTIVE;
-            }
-            return NoGravityMode.ACTIVE;
-        }
-    }
-}
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/ProtectMode.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/ProtectMode.java
deleted file mode 100644
index 18ea897b..00000000
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/ProtectMode.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * This file is a part of the SteamWar software.
- *
- * Copyright (C) 2021  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.flagvalues;
-
-import de.steamwar.bausystem.region.flags.Flag;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@Getter
-@AllArgsConstructor
-public enum ProtectMode implements Flag.Value<ProtectMode> {
-
-    ACTIVE("FLAG_PROTECT_ACTIVE"),
-    INACTIVE("FLAG_PROTECT_INACTIVE");
-
-    private static ProtectMode[] values;
-    private final String chatValue;
-
-    @Override
-    public ProtectMode[] getValues() {
-        if (ProtectMode.values == null) {
-            ProtectMode.values = ProtectMode.values(); //NOSONAR
-        }
-        return ProtectMode.values;
-    }
-
-    @Override
-    public ProtectMode getValue() {
-        return this;
-    }
-
-    @Override
-    public ProtectMode getValueOf(final String name) {
-        try {
-            return ProtectMode.valueOf(name.toUpperCase());
-        } catch (IllegalArgumentException e) {
-            if (name.equalsIgnoreCase("false")) {
-                return ProtectMode.INACTIVE;
-            }
-            return ProtectMode.ACTIVE;
-        }
-    }
-}
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/TNTMode.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/TNTMode.java
deleted file mode 100644
index 9b05d6b5..00000000
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/TNTMode.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * This file is a part of the SteamWar software.
- *
- * Copyright (C) 2021  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.flagvalues;
-
-import de.steamwar.bausystem.region.flags.Flag;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@Getter
-@AllArgsConstructor
-public enum TNTMode implements Flag.Value<TNTMode> {
-
-	ALLOW("FLAG_TNT_ALLOW"),
-	DENY("FLAG_TNT_DENY"),
-	ONLY_TB("FLAG_TNT_ONLY_TB"),
-	ONLY_BUILD("FLAG_TNT_ONLY_BUILD");
-
-	private static TNTMode[] values;
-	private final String chatValue;
-
-	@Override
-	public TNTMode[] getValues() {
-		if (TNTMode.values == null) {
-			TNTMode.values = TNTMode.values(); //NOSONAR
-		}
-		return TNTMode.values;
-	}
-
-	@Override
-	public TNTMode getValue() {
-		return this;
-	}
-
-	@Override
-	public TNTMode getValueOf(final String name) {
-		try {
-			return TNTMode.valueOf(name.toUpperCase());
-		} catch (IllegalArgumentException e) {
-			return TNTMode.ALLOW;
-		}
-	}
-}
\ No newline at end of file
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/tags/Tag.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/tags/Tag.java
deleted file mode 100644
index e37751d9..00000000
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/tags/Tag.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is a part of the SteamWar software.
- *
- * Copyright (C) 2021  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.tags;
-
-public enum Tag {
-    CHANGED,
-}
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/utils/RegionExtensionType.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/utils/RegionExtensionType.java
deleted file mode 100644
index 446e0d97..00000000
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/utils/RegionExtensionType.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * This file is a part of the SteamWar software.
- *
- * Copyright (C) 2020  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.utils;
-
-public enum RegionExtensionType {
-    NORMAL,
-    EXTENSION
-}
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/utils/RegionSelectionType.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/utils/RegionSelectionType.java
index aeac38eb..00d54bb2 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/utils/RegionSelectionType.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/utils/RegionSelectionType.java
@@ -2,5 +2,6 @@ package de.steamwar.bausystem.region.utils;
 
 public enum RegionSelectionType {
     LOCAL,
-    GLOBAL
+    GLOBAL,
+    ;
 }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/utils/RegionType.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/utils/RegionType.java
deleted file mode 100644
index a618c644..00000000
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/utils/RegionType.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * This file is a part of the SteamWar software.
- *
- * Copyright (C) 2020  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.utils;
-
-import de.steamwar.bausystem.shared.EnumDisplay;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@AllArgsConstructor
-public enum RegionType implements EnumDisplay {
-    NORMAL("REGION_TYPE_NORMAL"),
-    BUILD("REGION_TYPE_BUILD"),
-    TESTBLOCK("REGION_TYPE_ONLY_TB");
-
-    @Getter
-    private String chatValue;
-}
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/FlagStorage.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/FlagStorage.java
deleted file mode 100644
index 57a9523c..00000000
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/FlagStorage.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2024  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.regionnew;
-
-import de.steamwar.bausystem.regionnew.flags.Flag;
-
-public interface FlagStorage {
-
-    <T extends Enum<T> & Flag.Value<T>> boolean set(Flag<T> flag, Flag.Value<T> value);
-
-    <T extends Enum<T> & Flag.Value<T>> Flag.Value<T> get(Flag<T> flag);
-}
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/Region.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/Region.java
deleted file mode 100644
index 1bdab641..00000000
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/Region.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2024  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.regionnew;
-
-import com.sk89q.worldedit.EditSession;
-import de.steamwar.bausystem.regionnew.flags.Flag;
-import de.steamwar.sql.SchematicNode;
-import lombok.NonNull;
-import org.bukkit.Location;
-
-import javax.annotation.Nullable;
-import java.io.File;
-import java.util.Optional;
-
-public interface Region {
-
-    static Region getRegion(Location location) {
-        return RegionSystem.REGION_SYSTEM.get(location);
-    }
-
-    RegionType getType();
-
-    <T extends Enum<T> & Flag.Value<T>> RegionFlagPolicy hasFlag(@NonNull Flag<T> flag);
-
-    <T extends Enum<T> & Flag.Value<T>> boolean setFlag(@NonNull Flag<T> flag, Flag.Value<T> value);
-
-    <T extends Enum<T> & Flag.Value<T>> Optional<Flag.Value<T>> getFlag(@NonNull Flag<T> flag);
-
-    Point getMinPoint();
-
-    Point getMaxPoint();
-
-    boolean inRegion(Location location);
-
-    Optional<Point> getBuildMinPoint(boolean extension);
-
-    Optional<Point> getBuildMaxPoint(boolean extension);
-
-    boolean inBuildRegion(Location location, boolean extension);
-
-    Optional<Point> getTestblockMinPoint(boolean extension);
-
-    Optional<Point> getTestblockMaxPoint(boolean extension);
-
-    boolean inTestblockRegion(Location location, boolean extension);
-
-    // TODO: Add forEachChunk and getChunkOutsidePredicate
-
-    Optional<File> getGameModeConfig();
-
-    Optional<EditSession> copy();
-
-    Optional<EditSession> copyBuild();
-
-    Optional<EditSession> copyTestblock();
-
-    void reset();
-
-    void resetBuild(@Nullable SchematicNode schematicNode, boolean extension);
-
-    void resetTestblock(@Nullable SchematicNode schematicNode, boolean extension);
-
-    void remember(EditSession editSession);
-
-    boolean undo();
-
-    boolean redo();
-}
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/RegionSide.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/RegionSide.java
deleted file mode 100644
index 6834e300..00000000
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/RegionSide.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2024  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.regionnew;
-
-public enum RegionSide {
-    NORTH,
-    SOUTH
-}
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/Flag.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/Flag.java
deleted file mode 100644
index d915c216..00000000
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionnew/flags/Flag.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2024  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.regionnew.flags;
-
-import de.steamwar.bausystem.shared.EnumDisplay;
-import lombok.Getter;
-
-import java.util.HashSet;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicInteger;
-
-public class Flag<T extends Enum<T> & Flag.Value<T>> implements EnumDisplay {
-
-    public static final Flag<ColorMode> COLOR = new Flag<>("COLOR", "FLAG_COLOR", ColorMode.class, ColorMode.YELLOW);
-    public static final Flag<TNTMode> TNT = new Flag<>("TNT", "FLAG_TNT", TNTMode.class, TNTMode.ONLY_TB);
-    public static final Flag<FireMode> FIRE = new Flag<>("FIRE", "FLAG_FIRE", FireMode.class, FireMode.ALLOW);
-    public static final Flag<FreezeMode> FREEZE = new Flag<>("FREEZE", "FLAG_FREEZE", FreezeMode.class, FreezeMode.INACTIVE);
-    public static final Flag<ProtectMode> PROTECT = new Flag<>("PROTECT", "FLAG_PROTECT", ProtectMode.class, ProtectMode.ACTIVE);
-    public static final Flag<ItemMode> ITEMS = new Flag<>("ITEMS", "FLAG_ITEMS", ItemMode.class, ItemMode.INACTIVE);
-    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);
-
-    @Getter
-    private static final Set<Flag> flags = new HashSet<>();
-
-    private static AtomicInteger counter = new AtomicInteger(0);
-
-    private String name;
-    private int ordinal;
-
-    @Getter
-    private String chatValue;
-
-    @Getter
-    private final Class<? extends Flag.Value<?>> valueType;
-
-    @Getter
-    private final Flag.Value<?> defaultValue;
-
-    @Getter
-    private final Flag.Value<?>[] values;
-
-    private Flag(String name, String chatValue, Class<? extends Flag.Value<T>> valueType, Value<T> defaultValue) {
-        flags.add(this);
-
-        this.name = name;
-        this.ordinal = counter.getAndIncrement();
-        this.chatValue = chatValue;
-
-        this.valueType = valueType;
-        this.defaultValue = defaultValue;
-        this.values = defaultValue.getValues();
-    }
-
-    public String name() {
-        return name;
-    }
-
-    public int ordinal() {
-        return ordinal;
-    }
-
-    public boolean oneOff(Flag<?>... flags) {
-        for (Flag<?> flag : flags) {
-            if (flag == this) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public interface Value<T extends Enum<T> & Flag.Value<T>> extends EnumDisplay {
-
-        T getValue();
-
-        T getValueOf(final String name);
-
-        T[] getValues();
-
-        default String getName() {
-            return this.getValue().name().toLowerCase();
-        }
-    }
-}
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Prototype.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionold/Prototype.java.txt
similarity index 100%
rename from BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Prototype.java
rename to BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionold/Prototype.java.txt
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionold/Region.java.txt b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionold/Region.java.txt
new file mode 100644
index 00000000..c6f8b5c7
--- /dev/null
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionold/Region.java.txt
@@ -0,0 +1,584 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2021  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;
+
+import com.sk89q.worldedit.EditSession;
+import com.sk89q.worldedit.WorldEdit;
+import com.sk89q.worldedit.bukkit.BukkitWorld;
+import de.steamwar.bausystem.BauSystem;
+import de.steamwar.bausystem.region.flags.Flag;
+import de.steamwar.bausystem.region.flags.flagvalues.TNTMode;
+import de.steamwar.bausystem.region.tags.Tag;
+import de.steamwar.bausystem.region.utils.RegionExtensionType;
+import de.steamwar.bausystem.region.utils.RegionType;
+import de.steamwar.bausystem.shared.SizedStack;
+import de.steamwar.bausystem.utils.FlatteningWrapper;
+import de.steamwar.bausystem.utils.PasteBuilder;
+import de.steamwar.core.Core;
+import de.steamwar.sql.SchematicType;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NonNull;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import yapion.hierarchy.types.YAPIONObject;
+import yapion.hierarchy.types.YAPIONType;
+import yapion.hierarchy.types.YAPIONValue;
+
+import java.io.File;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.function.ObjIntConsumer;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
+@Getter
+public class Region {
+
+    @Getter
+    private static final Map<String, Region> REGION_MAP = new HashMap<>();
+    private static final File backupFolder = new File(Bukkit.getWorlds().get(0).getWorldFolder(), "backup");
+    private static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy.MM.dd' 'HH:mm:ss");
+
+    public static Region getRegion(Location location) {
+        return REGION_MAP.values().stream()
+                .filter(r -> r.inRegion(location, r.minPoint, r.maxPoint))
+                .findFirst()
+                .orElse(GlobalRegion.instance);
+    }
+
+    public static Set<Region> getRegion(Prototype prototype) {
+        return REGION_MAP.values().stream()
+                .filter(r -> r.getPrototype() == prototype)
+                .collect(Collectors.toSet());
+    }
+
+    public static void setGlobal(Flag flagType, Flag.Value<?> value) {
+        REGION_MAP.values().forEach(region -> region.set(flagType, value));
+    }
+
+    YAPIONObject regionData;
+
+    private String name;
+    private Prototype prototype;
+    private Set<String> prototypes;
+    private String skin;
+
+    private Point minPoint;
+    private Point maxPoint;
+
+    private Point minPointTestblock;
+    private Point maxPointTestblock;
+
+    private Point minPointTestblockExtension;
+    private Point maxPointTestblockExtension;
+
+    private Point minPointBuild;
+    private Point maxPointBuild;
+
+    private Point minPointBuildExtension;
+    private Point maxPointBuildExtension;
+
+    private int floorLevel;
+    private int waterLevel;
+
+    private Point copyPoint; // Nullable
+    private Point testBlockPoint; // Nullable
+
+    private String linkedRegionName = null; // Nullable
+    private Region linkedRegion = null; // Nullable
+
+    private FlagStorage flagStorage;
+
+    @Getter(AccessLevel.PRIVATE)
+    private SizedStack<EditSession> undoSessions;
+
+    @Getter(AccessLevel.PRIVATE)
+    private SizedStack<EditSession> redoSessions;
+
+    public Region(String name, Prototype prototype, YAPIONObject regionConfig, FlagStorage flagStorage, YAPIONObject regionData) {
+        this.name = name;
+        this.regionData = regionData;
+        if (prototype != null) {
+            REGION_MAP.put(name, this);
+        }
+
+        linkedRegionName = regionConfig.getPlainValueOrDefault("optionsLinkedWith", null);
+
+        prototypes = new HashSet<>();
+        if (regionConfig.containsKey("prototypes", YAPIONType.ARRAY)) {
+            regionConfig.getArray("prototypes").forEach(yapionAnyType -> {
+                if (yapionAnyType instanceof YAPIONValue) {
+                    prototypes.add(((YAPIONValue<String>) yapionAnyType).get());
+                }
+            });
+        }
+        if (regionConfig.containsKey("prototype")) {
+            prototypes.add(regionConfig.getPlainValue("prototype"));
+        }
+
+        this.flagStorage = flagStorage;
+        Point point = null;
+        if (regionConfig.containsKey("minX", Integer.class) && regionConfig.containsKey("minY", Integer.class) && regionConfig.containsKey("minZ", Integer.class)) {
+            point = new Point(regionConfig.getPlainValue("minX"), regionConfig.getPlainValue("minY"), regionConfig.getPlainValue("minZ"));
+        }
+        if (prototype != null && prototypes.contains(prototype.getName())) {
+            generatePrototypeData(prototype, point);
+        } else if (regionConfig.containsKey("prototype")) {
+            generatePrototypeData(Prototype.getByName(regionConfig.getPlainValue("prototype")), point);
+        }
+        if (prototype != null) {
+            skin = regionData.getPlainValueOrDefault("skin", prototype.getDefaultSkin());
+            if (!prototype.getSkinMap().containsKey(skin)) {
+                skin = prototype.getDefaultSkin();
+            }
+        }
+        regionData.add("skin", skin);
+
+        if (!hasType(RegionType.BUILD) || !hasType(RegionType.TESTBLOCK)) {
+            flagStorage.set(Flag.TNT, TNTMode.DENY);
+        }
+    }
+
+    private void generatePrototypeData(Prototype prototype, Point point) {
+        if (prototype == null) {
+            return;
+        }
+
+        this.prototype = prototype;
+        this.skin = prototype.getDefaultSkin();
+
+        this.minPoint = point;
+        this.maxPoint = point.add(prototype.getSizeX() - 1, prototype.getSizeY() - 1, prototype.getSizeZ() - 1);
+
+        if (prototype.getTestblock() != null) {
+            this.minPointTestblock = point.add(prototype.getTestblock().getOffsetX(), prototype.getTestblock().getOffsetY(), prototype.getTestblock().getOffsetZ());
+            this.maxPointTestblock = this.minPointTestblock.add(prototype.getTestblock().getSizeX() - 1, prototype.getTestblock().getSizeY() - 1, prototype.getTestblock().getSizeZ() - 1);
+
+            this.minPointTestblockExtension = this.minPointTestblock.subtract(prototype.getTestblock().getExtensionNegativeX(), prototype.getTestblock().getExtensionNegativeY(), prototype.getTestblock().getExtensionNegativeZ());
+            this.maxPointTestblockExtension = this.maxPointTestblock.add(prototype.getTestblock().getExtensionPositiveX(), prototype.getTestblock().getExtensionPositiveY(), prototype.getTestblock().getExtensionPositiveZ());
+
+            if (prototype.getTestblock().getCopyOffsetX() != 0 || prototype.getTestblock().getCopyOffsetY() != 0 || prototype.getTestblock().getCopyOffsetZ() != 0) {
+                this.testBlockPoint = this.minPointTestblock.add(prototype.getTestblock().getCopyOffsetX(), prototype.getTestblock().getCopyOffsetY(), prototype.getTestblock().getCopyOffsetZ());
+            } else {
+                this.testBlockPoint = this.minPointTestblock.add(prototype.getTestblock().getSizeX() / 2, 0, -1);
+            }
+        }
+
+        if (prototype.getBuild() != null) {
+            this.minPointBuild = point.add(prototype.getBuild().getOffsetX(), prototype.getBuild().getOffsetY(), prototype.getBuild().getOffsetZ());
+            this.maxPointBuild = this.minPointBuild.add(prototype.getBuild().getSizeX() - 1, prototype.getBuild().getSizeY() - 1, prototype.getBuild().getSizeZ() - 1);
+
+            this.minPointBuildExtension = this.minPointBuild.subtract(prototype.getBuild().getExtensionNegativeX(), prototype.getBuild().getExtensionNegativeY(), prototype.getBuild().getExtensionNegativeZ());
+            this.maxPointBuildExtension = this.maxPointBuild.add(prototype.getBuild().getExtensionPositiveX(), prototype.getBuild().getExtensionPositiveY(), prototype.getBuild().getExtensionPositiveZ());
+
+            if (!prototype.getBuild().isHasCopyPoint() && (prototype.getCopyPointOffsetX() != 0 || prototype.getCopyPointOffsetY() != 0 || prototype.getCopyPointOffsetZ() != 0)) {
+                this.copyPoint = minPoint.add(prototype.getCopyPointOffsetX(), prototype.getCopyPointOffsetY(), prototype.getCopyPointOffsetZ());
+            } else if (prototype.getBuild().getCopyOffsetX() != 0 || prototype.getBuild().getCopyOffsetY() != 0 || prototype.getBuild().getCopyOffsetZ() != 0) {
+                this.copyPoint = this.minPointBuild.add(prototype.getBuild().getCopyOffsetX(), prototype.getBuild().getCopyOffsetY(), prototype.getBuild().getCopyOffsetZ());
+            } else {
+                this.copyPoint = this.minPointBuild.add(prototype.getBuild().getSizeX() / 2, 0, prototype.getBuild().getSizeZ());
+            }
+        } else if (prototype.getCopyPointOffsetX() != 0 || prototype.getCopyPointOffsetY() != 0 || prototype.getCopyPointOffsetZ() != 0) {
+            this.copyPoint = minPoint.add(prototype.getCopyPointOffsetX(), prototype.getCopyPointOffsetY(), prototype.getCopyPointOffsetZ());
+        }
+
+        if (prototype.getFloorOffset() != 0) {
+            floorLevel = minPoint.getY() + prototype.getFloorOffset();
+        } else {
+            floorLevel = 0;
+        }
+
+        if (prototype.getWaterOffset() != 0) {
+            waterLevel = minPoint.getY() + prototype.getWaterOffset();
+        } else {
+            waterLevel = 0;
+        }
+    }
+
+    public boolean inRegion(Location location, RegionType regionType, RegionExtensionType regionExtensionType) {
+        if (!hasType(regionType)) {
+            return false;
+        }
+        switch (regionType) {
+            case BUILD:
+                Point minBPoint = regionExtensionType == RegionExtensionType.EXTENSION ? minPointBuildExtension : minPointBuild;
+                Point maxBPoint = regionExtensionType == RegionExtensionType.EXTENSION ? maxPointBuildExtension : maxPointBuild;
+                return inRegion(location, minBPoint, maxBPoint);
+            case TESTBLOCK:
+                Point minTBPoint = regionExtensionType == RegionExtensionType.EXTENSION ? minPointTestblockExtension : minPointTestblock;
+                Point maxTBPoint = regionExtensionType == RegionExtensionType.EXTENSION ? maxPointTestblockExtension : maxPointTestblock;
+                return inRegion(location, minTBPoint, maxTBPoint);
+            default:
+            case NORMAL:
+                return inRegion(location, minPoint, maxPoint);
+        }
+    }
+
+    private boolean inRegion(Location location, Point minPoint, Point maxPoint) {
+        int blockX = location.getBlockX();
+        int blockY = location.getBlockY();
+        int blockZ = location.getBlockZ();
+        return blockX >= minPoint.getX() && blockX <= maxPoint.getX() &&
+                blockY >= minPoint.getY() && blockY <= maxPoint.getY() &&
+                blockZ >= minPoint.getZ() && blockZ <= maxPoint.getZ();
+    }
+
+    public boolean hasType(RegionType regionType) {
+        if (prototype == null) {
+            return false;
+        }
+        if (regionType == null) {
+            return false;
+        }
+        switch (regionType) {
+            case BUILD:
+                return prototype.getBuild() != null;
+            case TESTBLOCK:
+                return prototype.getTestblock() != null;
+            default:
+            case NORMAL:
+                return true;
+        }
+    }
+
+    public boolean hasExtensionType(RegionType regionType) {
+        if (!hasType(regionType)) {
+            return false;
+        }
+        switch (regionType) {
+            case BUILD:
+                return prototype.getBuild().isExtensionRegistered();
+            case TESTBLOCK:
+                return prototype.getTestblock().isExtensionRegistered();
+            default:
+            case NORMAL:
+                return false;
+        }
+    }
+
+    public String getDisplayName() {
+        return prototype != null ? prototype.getSkinMap().get(skin).getName() : "";
+    }
+
+    private void setLinkedRegion(Predicate<Region> regionConsumer) {
+        if (linkedRegionName == null) {
+            return;
+        }
+        if (linkedRegion != null) {
+            if (regionConsumer.test(linkedRegion)) {
+                RegionUtils.save(linkedRegion);
+            }
+            return;
+        }
+        for (Region region : REGION_MAP.values()) {
+            if (region.name.equals(linkedRegionName)) {
+                linkedRegion = region;
+                if (regionConsumer.test(linkedRegion)) {
+                    RegionUtils.save(linkedRegion);
+                }
+                return;
+            }
+        }
+    }
+
+    public Region getLinkedRegion() {
+        if (linkedRegion == null && linkedRegionName != null) {
+            setLinkedRegion(region -> false);
+        }
+        return linkedRegion;
+    }
+
+    public boolean setPrototype(@NonNull Prototype prototype) {
+        if (!prototypes.contains(prototype.getName())) {
+            return false;
+        }
+        return _setPrototype(prototype);
+    }
+
+    boolean _setPrototype(@NonNull Prototype prototype) {
+        generatePrototypeData(prototype, minPoint);
+        RegionUtils.save(this);
+        return true;
+    }
+
+    public boolean setSkin(@NonNull String skinName) {
+        if (!prototype.getSkinMap().containsKey(skinName)) {
+            return false;
+        }
+        this.skin = skinName;
+        setLinkedRegion(region -> {
+            region.skin = skinName;
+            return true;
+        });
+        regionData.add("skin", skin);
+        return true;
+    }
+
+    public void set(Flag flagType, Flag.Value<?> value) {
+        if (flagStorage.set(flagType, value)) {
+            RegionUtils.save(this);
+        }
+        setLinkedRegion(region -> region.flagStorage.set(flagType, value));
+    }
+
+    public void set(Tag tag) {
+        if (flagStorage.set(tag)) {
+            RegionUtils.save(this);
+        }
+        setLinkedRegion(region -> region.flagStorage.set(tag));
+    }
+
+    public void remove(Tag tag) {
+        if (flagStorage.remove(tag)) {
+            RegionUtils.save(this);
+        }
+    }
+
+    public Flag.Value<?> get(Flag flagType) {
+        return flagStorage.get(flagType);
+    }
+
+    public boolean get(Tag tagType) {
+        return flagStorage.is(tagType);
+    }
+
+    public <T extends Enum<T> & Flag.Value<T>> T getPlain(Flag flagType) {
+        return (T) flagStorage.get(flagType).getValue();
+    }
+
+    public <T extends Enum<T> & Flag.Value<T>> T getPlain(Flag flagType, Class<T> type) {
+        return (T) flagStorage.get(flagType).getValue();
+    }
+
+    public Point getMinPoint(RegionType regionType, RegionExtensionType regionExtensionType) {
+        switch (regionType) {
+            case TESTBLOCK:
+                return (regionExtensionType == null || regionExtensionType == RegionExtensionType.NORMAL) ? minPointTestblock : minPointTestblockExtension;
+            case BUILD:
+                return (regionExtensionType == null || regionExtensionType == RegionExtensionType.NORMAL) ? minPointBuild : minPointBuildExtension;
+            default:
+            case NORMAL:
+                return minPoint;
+        }
+    }
+
+    public Point getMaxPoint(RegionType regionType, RegionExtensionType regionExtensionType) {
+        switch (regionType) {
+            case TESTBLOCK:
+                return (regionExtensionType == null || regionExtensionType == RegionExtensionType.NORMAL) ? maxPointTestblock : maxPointTestblockExtension;
+            case BUILD:
+                return (regionExtensionType == null || regionExtensionType == RegionExtensionType.NORMAL) ? maxPointBuild : maxPointBuildExtension;
+            default:
+            case NORMAL:
+                return maxPoint;
+        }
+    }
+
+    boolean hasReset(RegionType regionType) {
+        if (!hasType(regionType)) {
+            return false;
+        }
+        switch (regionType) {
+            case TESTBLOCK:
+                return prototype.getSkinMap().get(skin).getTestblockSchematicFile() != null;
+            case BUILD:
+                return prototype.getSkinMap().get(skin).getBuildSchematicFile() != null;
+            default:
+            case NORMAL:
+                return prototype.getSkinMap().get(skin).getSchematicFile() != null;
+        }
+    }
+
+    public File getResetFile(RegionType regionType) {
+        if (!hasReset(regionType)) {
+            return null;
+        }
+        switch (regionType) {
+            case TESTBLOCK:
+                return prototype.getSkinMap().get(skin).getTestblockSchematicFile();
+            case BUILD:
+                return prototype.getSkinMap().get(skin).getBuildSchematicFile();
+            default:
+            case NORMAL:
+                return prototype.getSkinMap().get(skin).getSchematicFile();
+        }
+    }
+
+    public void reset(PasteBuilder pasteBuilder, RegionType regionType, RegionExtensionType regionExtensionType) {
+        if (!hasReset(regionType)) {
+            return;
+        }
+        if (regionExtensionType == RegionExtensionType.EXTENSION && !hasExtensionType(regionType)) {
+            regionExtensionType = RegionExtensionType.NORMAL;
+        }
+
+        pasteBuilder.reset(regionExtensionType == RegionExtensionType.EXTENSION)
+                .minPoint(getMinPoint(regionType, regionExtensionType))
+                .maxPoint(getMaxPoint(regionType, regionExtensionType))
+                .waterLevel(waterLevel);
+        if (pasteBuilder.getClipboardProvider().is(PasteBuilder.SchematicProvider.class)) {
+            SchematicType schematicType = pasteBuilder.getClipboardProvider().as(PasteBuilder.SchematicProvider.class).getSchematic().getSchemtype();
+            pasteBuilder.rotate(schematicType.fightType() || schematicType.check());
+        }
+
+        switch (regionType) {
+            case BUILD:
+                pasteBuilder.pastePoint(minPointBuild.add(prototype.getBuild().getSizeX() / 2, 0, prototype.getBuild().getSizeZ() / 2));
+                break;
+            case TESTBLOCK:
+                Point pastePoint = minPointTestblock.add(prototype.getTestblock().getSizeX() / 2, 0, prototype.getTestblock().getSizeZ() / 2);
+                if (pasteBuilder.getClipboardProvider().is(PasteBuilder.SchematicProvider.class)) {
+                    SchematicType schematicType = pasteBuilder.getClipboardProvider().as(PasteBuilder.SchematicProvider.class).getSchematic().getSchemtype();
+                    if (schematicType.getKuerzel().equalsIgnoreCase("wg")) {
+                        pastePoint = pastePoint.add(0, 0, 1);
+                    }
+                    if (schematicType.getKuerzel().equalsIgnoreCase("ws")) {
+                        pastePoint = pastePoint.add(-1, 0, 1);
+                    }
+                    if (schematicType.getKuerzel().equalsIgnoreCase("as")) {
+                        pastePoint = pastePoint.add(-1, 0, 1);
+                    }
+                }
+                pasteBuilder.pastePoint(pastePoint);
+                break;
+            default:
+            case NORMAL:
+                pasteBuilder.pastePoint(minPoint.add(prototype.getSizeX() / 2, 0, prototype.getSizeZ() / 2));
+                break;
+        }
+
+        initSessions();
+        undoSessions.push(pasteBuilder.run());
+    }
+
+    public void remember(EditSession editSession) {
+        initSessions();
+        undoSessions.push(editSession);
+    }
+
+    public boolean isGlobal() {
+        return this == GlobalRegion.getInstance();
+    }
+
+    private void initSessions() {
+        if (undoSessions == null) {
+            undoSessions = new SizedStack<>(20);
+            redoSessions = new SizedStack<>(20);
+        }
+    }
+
+    public boolean undo() {
+        initSessions();
+        EditSession session = undoSessions.pop();
+        if (session == null)
+            return false;
+
+        try (EditSession e = WorldEdit.getInstance().getEditSessionFactory().getEditSession(new BukkitWorld(Bukkit.getWorlds().get(0)), -1)) {
+            session.undo(e);
+            redoSessions.push(e);
+        }
+        return true;
+    }
+
+    public boolean redo() {
+        initSessions();
+        EditSession session = redoSessions.pop();
+        if (session == null)
+            return false;
+
+        try (EditSession e = WorldEdit.getInstance().getEditSessionFactory().getEditSession(new BukkitWorld(Bukkit.getWorlds().get(0)), -1)) {
+            session.redo(e);
+            undoSessions.push(e);
+        }
+        return true;
+    }
+
+    public boolean backup() {
+        final File definedBackupFolder = new File(new File(backupFolder, prototype.getName()), name);
+        //noinspection ResultOfMethodCallIgnored
+        definedBackupFolder.mkdirs();
+
+        File[] currentBackups = definedBackupFolder.listFiles();
+        if (currentBackups != null && currentBackups.length >= 20) {
+            List<File> files = new ArrayList<>(Arrays.asList(currentBackups));
+            files.sort(Comparator.comparingLong(File::lastModified));
+            while (files.size() >= 20) files.remove(0).delete();
+        }
+
+        final File backupFile = new File(definedBackupFolder, LocalDateTime.now().format(formatter) + ".schem");
+        return FlatteningWrapper.impl.backup(minPoint, maxPoint, backupFile);
+    }
+
+    public static boolean copy(Point minPoint, Point maxPoint, File file) {
+        return FlatteningWrapper.impl.backup(minPoint, maxPoint, file);
+    }
+
+    public List<String> listBackup() {
+        final File definedBackupFolder = new File(new File(backupFolder, prototype.getName()), name);
+        //noinspection ResultOfMethodCallIgnored
+        definedBackupFolder.mkdirs();
+
+        File[] currentBackups = definedBackupFolder.listFiles();
+        List<File> files = new ArrayList<>(Arrays.asList(currentBackups));
+        files.sort(Comparator.comparingLong(File::lastModified));
+        return files.stream().map(File::getName).collect(Collectors.toList());
+    }
+
+    public File getBackupFile(String backupName) {
+        final File definedBackupFolder = new File(new File(backupFolder, prototype.getName()), name);
+        //noinspection ResultOfMethodCallIgnored
+        definedBackupFolder.mkdirs();
+        File[] files = definedBackupFolder.listFiles((dir, name) -> name.equals(backupName + ".schem"));
+        if (files == null || files.length == 0) return null;
+        return files[0];
+    }
+
+    public void forEachChunk(ObjIntConsumer<Integer> executor) {
+        for (int x = (int) Math.floor(minPoint.getX() / 16.0); x <= (int) Math.ceil(maxPoint.getX() / 16.0); x++) {
+            for (int z = (int) Math.floor(minPoint.getZ() / 16.0); z <= (int) Math.ceil(maxPoint.getZ() / 16.0); z++) {
+                executor.accept(x, z);
+            }
+        }
+    }
+
+    public boolean buildChunkOutside(int chunkX, int chunkY) {
+        if (!hasType(RegionType.BUILD)) {
+            return Math.floor(minPoint.getX() / 16.0) > chunkX || chunkX >= Math.ceil(maxPoint.getX() / 16.0) ||
+                    Math.floor(minPoint.getZ() / 16.0) > chunkY || chunkY >= Math.ceil(maxPoint.getZ() / 16.0);
+        }
+        if (!hasExtensionType(RegionType.BUILD)) {
+            return Math.floor(minPointBuild.getX() / 16.0) > chunkX || chunkX >= Math.ceil(maxPointBuild.getX() / 16.0) ||
+                    Math.floor(minPointBuild.getZ() / 16.0) > chunkY || chunkY >= Math.ceil(maxPointBuild.getZ() / 16.0);
+        }
+        return Math.floor(minPointBuildExtension.getX() / 16.0) > chunkX || chunkX >= Math.ceil(maxPointBuildExtension.getX() / 16.0) ||
+                Math.floor(minPointBuildExtension.getZ() / 16.0) > chunkY || chunkY >= Math.ceil(maxPointBuildExtension.getZ() / 16.0);
+    }
+
+    public File gameModeConfig() {
+        File baseFile = new File(BauSystem.getInstance().getDataFolder().getParentFile(), "FightSystem");
+        for (int version = Core.getVersion(); version >= 15; version--) {
+            File specific = new File(baseFile, prototype.getDisplayName() + version + ".yml");
+            if (specific.exists()) return specific;
+        }
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/loader/PrototypeLoader.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionold/loader/PrototypeLoader.java.txt
similarity index 100%
rename from BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/loader/PrototypeLoader.java
rename to BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionold/loader/PrototypeLoader.java.txt
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/loader/RegionLoader.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionold/loader/RegionLoader.java.txt
similarity index 100%
rename from BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/loader/RegionLoader.java
rename to BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionold/loader/RegionLoader.java.txt
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/loader/Updater.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionold/loader/Updater.java.txt
similarity index 100%
rename from BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/loader/Updater.java
rename to BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionold/loader/Updater.java.txt
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/FlatteningWrapper.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/FlatteningWrapper.java
index 12b7a78a..3cd96295 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/FlatteningWrapper.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/FlatteningWrapper.java
@@ -22,7 +22,7 @@ package de.steamwar.bausystem.utils;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.extent.clipboard.Clipboard;
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.regionnew.Point;
+import de.steamwar.bausystem.region.Point;
 import de.steamwar.core.VersionDependent;
 import org.bukkit.Material;
 import org.bukkit.World;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/PasteBuilder.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/PasteBuilder.java
index 8c3813ac..a4a74e17 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/PasteBuilder.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/PasteBuilder.java
@@ -26,8 +26,8 @@ import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockType;
 import com.sk89q.worldedit.world.block.BlockTypes;
-import de.steamwar.bausystem.regionnew.Color;
-import de.steamwar.bausystem.regionnew.Point;
+import de.steamwar.bausystem.region.Color;
+import de.steamwar.bausystem.region.Point;
 import de.steamwar.sql.SchematicData;
 import de.steamwar.sql.SchematicNode;
 import lombok.Getter;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/bossbar/GlobalBossbar.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/bossbar/GlobalBossbar.java
index a5aaf9fe..47f57907 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/bossbar/GlobalBossbar.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/bossbar/GlobalBossbar.java
@@ -19,8 +19,8 @@
 
 package de.steamwar.bausystem.utils.bossbar;
 
-import de.steamwar.bausystem.region.GlobalRegion;
 import de.steamwar.bausystem.region.Region;
+import de.steamwar.bausystem.region.RegionSystem;
 import org.bukkit.boss.BarColor;
 import org.bukkit.boss.BarFlag;
 import org.bukkit.boss.BarStyle;
@@ -101,7 +101,7 @@ public class GlobalBossbar implements BauSystemBossbar {
 
     @Override
     public Region getRegion() {
-        return GlobalRegion.getInstance();
+        return RegionSystem.INSTANCE.getGlobalRegion();
     }
 
     @Override
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionnew/FixedFlagStorage.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedFlagStorage.java
similarity index 86%
rename from BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionnew/FixedFlagStorage.java
rename to BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedFlagStorage.java
index 1af55086..af44866a 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionnew/FixedFlagStorage.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedFlagStorage.java
@@ -17,9 +17,9 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bausystem.regionnew;
+package de.steamwar.bausystem.region;
 
-import de.steamwar.bausystem.regionnew.flags.Flag;
+import de.steamwar.bausystem.region.flags.Flag;
 
 import java.io.File;
 import java.util.HashMap;
@@ -44,12 +44,12 @@ public class FixedFlagStorage implements FlagStorage {
     }
 
     @Override
-    public <T extends Enum<T> & Flag.Value<T>> boolean set(Flag<T> flag, Flag.Value<T> value) {
+    public <T extends Enum<T> & Flag.Value<T>> boolean set(Flag<T> flag, T value) {
         return flagMap.put(flag, value) != value;
     }
 
     @Override
-    public <T extends Enum<T> & Flag.Value<T>> Flag.Value<T> get(Flag<T> flag) {
-        return (Flag.Value<T>) flagMap.get(flag);
+    public <T extends Enum<T> & Flag.Value<T>> T get(Flag<T> flag) {
+        return (T) flagMap.get(flag);
     }
 }
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionnew/FixedGlobalRegion.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedGlobalRegion.java
similarity index 65%
rename from BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionnew/FixedGlobalRegion.java
rename to BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedGlobalRegion.java
index 81b39197..b36ddecb 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionnew/FixedGlobalRegion.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedGlobalRegion.java
@@ -17,15 +17,13 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bausystem.regionnew;
+package de.steamwar.bausystem.region;
 
 import com.sk89q.worldedit.EditSession;
-import de.steamwar.bausystem.regionnew.flags.Flag;
-import de.steamwar.sql.SchematicNode;
+import de.steamwar.bausystem.region.flags.Flag;
 import lombok.NonNull;
 import org.bukkit.Location;
 
-import javax.annotation.Nullable;
 import java.io.File;
 import java.util.Optional;
 
@@ -35,6 +33,7 @@ public final class FixedGlobalRegion implements Region {
 
     private static final Point MIN_POINT = new Point(Integer.MIN_VALUE, Integer.MIN_VALUE, Integer.MIN_VALUE);
     private static final Point MAX_POINT = new Point(Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE);
+
     private final FlagStorage FLAG_STORAGE = FixedFlagStorage.createFromRegion(this); // TODO: Update to either File or Region creation!
 
     private FixedGlobalRegion() {
@@ -47,21 +46,21 @@ public final class FixedGlobalRegion implements Region {
 
     @Override
     public <T extends Enum<T> & Flag.Value<T>> RegionFlagPolicy hasFlag(@NonNull Flag<T> flag) {
-        if (flag.oneOff(Flag.TNT, Flag.FIRE, Flag.FREEZE, Flag.ITEMS)) {
+        if (flag.oneOf(Flag.TNT, Flag.FIRE, Flag.FREEZE, Flag.ITEMS, Flag.NO_GRAVITY)) {
             return RegionFlagPolicy.WRITABLE;
         }
         return RegionFlagPolicy.NOT_APPLICABLE;
     }
 
     @Override
-    public <T extends Enum<T> & Flag.Value<T>> boolean setFlag(@NonNull Flag<T> flag, Flag.Value<T> value) {
+    public <T extends Enum<T> & Flag.Value<T>> boolean setFlag(@NonNull Flag<T> flag, T value) {
         return hasFlag(flag).isWritable() && FLAG_STORAGE.set(flag, value);
     }
 
     @Override
-    public <T extends Enum<T> & Flag.Value<T>> Optional<Flag.Value<T>> getFlag(@NonNull Flag<T> flag) {
+    public <T extends Enum<T> & Flag.Value<T>> Optional<T> getFlag(@NonNull Flag<T> flag) {
         if (hasFlag(flag).isReadable()) {
-            return Optional.of(FLAG_STORAGE.get(flag));
+            return Optional.ofNullable(FLAG_STORAGE.get(flag));
         } else {
             return Optional.empty();
         }
@@ -83,33 +82,13 @@ public final class FixedGlobalRegion implements Region {
     }
 
     @Override
-    public Optional<Point> getBuildMinPoint(boolean extension) {
-        return Optional.empty();
+    public Inner getBuildArea() {
+        return Inner.EMPTY;
     }
 
     @Override
-    public Optional<Point> getBuildMaxPoint(boolean extension) {
-        return Optional.empty();
-    }
-
-    @Override
-    public boolean inBuildRegion(Location location, boolean extension) {
-        return false;
-    }
-
-    @Override
-    public Optional<Point> getTestblockMinPoint(boolean extension) {
-        return Optional.empty();
-    }
-
-    @Override
-    public Optional<Point> getTestblockMaxPoint(boolean extension) {
-        return Optional.empty();
-    }
-
-    @Override
-    public boolean inTestblockRegion(Location location, boolean extension) {
-        return false;
+    public Inner getTestblockArea() {
+        return Inner.EMPTY;
     }
 
     @Override
@@ -123,13 +102,8 @@ public final class FixedGlobalRegion implements Region {
     }
 
     @Override
-    public Optional<EditSession> copyBuild() {
-        return Optional.empty();
-    }
-
-    @Override
-    public Optional<EditSession> copyTestblock() {
-        return Optional.empty();
+    public boolean backup(boolean automatic) {
+        return false;
     }
 
     @Override
@@ -137,16 +111,6 @@ public final class FixedGlobalRegion implements Region {
 
     }
 
-    @Override
-    public void resetBuild(@Nullable SchematicNode schematicNode, boolean extension) {
-
-    }
-
-    @Override
-    public void resetTestblock(@Nullable SchematicNode schematicNode, boolean extension) {
-
-    }
-
     @Override
     public void remember(EditSession editSession) {
 
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionnew/FixedRegion.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedRegion.java
similarity index 61%
rename from BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionnew/FixedRegion.java
rename to BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedRegion.java
index c89cdf61..0023060d 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionnew/FixedRegion.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedRegion.java
@@ -17,15 +17,13 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bausystem.regionnew;
+package de.steamwar.bausystem.region;
 
 import com.sk89q.worldedit.EditSession;
-import de.steamwar.bausystem.regionnew.flags.Flag;
-import de.steamwar.sql.SchematicNode;
+import de.steamwar.bausystem.region.flags.Flag;
 import lombok.NonNull;
 import org.bukkit.Location;
 
-import javax.annotation.Nullable;
 import java.io.File;
 import java.util.Optional;
 
@@ -42,12 +40,12 @@ public class FixedRegion implements Region { // TODO: Implement!
     }
 
     @Override
-    public <T extends Enum<T> & Flag.Value<T>> boolean setFlag(@NonNull Flag<T> flag, Flag.Value<T> value) {
+    public <T extends Enum<T> & Flag.Value<T>> boolean setFlag(@NonNull Flag<T> flag, T value) {
         return false;
     }
 
     @Override
-    public <T extends Enum<T> & Flag.Value<T>> Optional<Flag.Value<T>> getFlag(@NonNull Flag<T> flag) {
+    public <T extends Enum<T> & Flag.Value<T>> Optional<T> getFlag(@NonNull Flag<T> flag) {
         return Optional.empty();
     }
 
@@ -67,33 +65,13 @@ public class FixedRegion implements Region { // TODO: Implement!
     }
 
     @Override
-    public Optional<Point> getBuildMinPoint(boolean extension) {
-        return Optional.empty();
+    public Inner getBuildArea() {
+        return Inner.EMPTY;
     }
 
     @Override
-    public Optional<Point> getBuildMaxPoint(boolean extension) {
-        return Optional.empty();
-    }
-
-    @Override
-    public boolean inBuildRegion(Location location, boolean extension) {
-        return false;
-    }
-
-    @Override
-    public Optional<Point> getTestblockMinPoint(boolean extension) {
-        return Optional.empty();
-    }
-
-    @Override
-    public Optional<Point> getTestblockMaxPoint(boolean extension) {
-        return Optional.empty();
-    }
-
-    @Override
-    public boolean inTestblockRegion(Location location, boolean extension) {
-        return false;
+    public Inner getTestblockArea() {
+        return Inner.EMPTY;
     }
 
     @Override
@@ -101,36 +79,21 @@ public class FixedRegion implements Region { // TODO: Implement!
         return Optional.empty();
     }
 
+    @Override
+    public boolean backup(boolean automatic) {
+        return false;
+    }
+
     @Override
     public Optional<EditSession> copy() {
         return Optional.empty();
     }
 
-    @Override
-    public Optional<EditSession> copyBuild() {
-        return Optional.empty();
-    }
-
-    @Override
-    public Optional<EditSession> copyTestblock() {
-        return Optional.empty();
-    }
-
     @Override
     public void reset() {
 
     }
 
-    @Override
-    public void resetBuild(@Nullable SchematicNode schematicNode, boolean extension) {
-
-    }
-
-    @Override
-    public void resetTestblock(@Nullable SchematicNode schematicNode, boolean extension) {
-
-    }
-
     @Override
     public void remember(EditSession editSession) {
 
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionnew/FixedRegionSystem.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedRegionSystem.java
similarity index 97%
rename from BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionnew/FixedRegionSystem.java
rename to BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedRegionSystem.java
index f29b1ebc..dfdaf3f3 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionnew/FixedRegionSystem.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedRegionSystem.java
@@ -17,7 +17,7 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bausystem.regionnew;
+package de.steamwar.bausystem.region;
 
 import org.bukkit.Location;
 

From 9a506a34f83b59a393272666e29e721e686df632 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sun, 22 Dec 2024 13:09:15 +0100
Subject: [PATCH 020/214] Fix things and optimize imports

---
 .../BauSystem_Main/src/BauSystem.properties   |   1 +
 .../src/BauSystem_de.properties               |   1 +
 .../src/de/steamwar/bausystem/Permission.java |   2 -
 .../AttributeRemoveCommand.java               |   1 -
 .../features/autostart/AutostartListener.java |   8 +-
 .../features/bau/ForceSpectatorCommand.java   |   2 -
 .../bausystem/features/cannon/CannonKey.java  |   1 -
 .../killchecker/KillcheckerCommand.java       |   5 +-
 .../killchecker/KillcheckerVisualizer.java    |   6 +-
 .../features/loader/LoaderRecorder.java       |   1 -
 .../features/loadtimer/Loadtimer.java         |   4 +-
 .../observer/ObserverTracerCommand.java       |   1 -
 .../features/region/FireCommand.java          |  18 +--
 .../features/region/FireListener.java         |  10 +-
 .../features/region/FreezeCommand.java        |  18 +--
 .../features/region/FreezeListener.java       | 148 +++---------------
 .../features/region/ItemsCommand.java         |  19 +--
 .../features/region/ItemsListener.java        |  12 +-
 .../features/region/NoGravityCommand.java     |  16 +-
 .../features/region/NoGravityListener.java    |  12 +-
 .../features/region/ProtectCommand.java       |  22 +--
 .../features/region/ProtectListener.java      |  20 ++-
 .../features/region/RegionListener.java       |   5 +-
 .../region/RegionScoreboardElement.java       |   8 +-
 .../bausystem/features/region/TNTCommand.java |   2 -
 .../features/region/TNTListener.java          |  23 +--
 .../features/region/TestblockCommand.java     |   4 -
 .../features/region/items/FireBauGuiItem.java |   7 +-
 .../region/items/FreezeBauGuiItem.java        |   7 +-
 .../region/items/ProtectBauGuiItem.java       |   7 +-
 .../bausystem/features/script/ScriptGUI.java  |   1 -
 .../script/event/CommandListener.java         |   1 -
 .../features/script/event/EventListener.java  |   6 +-
 .../script/lua/SteamWarLuaPlugin.java         |   7 -
 .../script/lua/libs/ScoreboardLib.java        |   2 -
 .../features/script/lua/libs/ServerLib.java   |   1 -
 .../impl/PistonConfiguration.java             |   1 -
 .../simulator/data/SimulatorElement.java      |   1 -
 .../simulator/data/SimulatorPhase.java        |   2 -
 .../slaves/laufbau/LaufbauCommand.java        |   2 -
 .../slaves/panzern/PanzernCommand.java        |   2 -
 .../testblock/blockcounter/BlockCount.java    |   1 -
 .../features/tracer/TraceManager.java         |   2 -
 .../bausystem/features/util/BindCommand.java  |   7 +-
 .../bausystem/features/util/ClearCommand.java |   2 -
 .../features/util/KillAllCommand.java         |   2 +-
 .../features/util/PistonCalculator.java       |   5 +-
 .../bausystem/features/util/TimeCommand.java  |   5 +-
 .../bausystem/features/warp/WarpCommand.java  |   2 -
 .../features/world/BauMemberUpdate.java       |   3 +-
 .../features/world/KickallCommand.java        |   1 -
 .../world/WorldEditSelectionSaver.java        |   1 -
 .../de/steamwar/bausystem/region/Region.java  |   6 +-
 .../steamwar/bausystem/region/flags/Flag.java |   4 +-
 .../bausystem/utils/PlaceItemUtils.java       |   5 +-
 .../utils/bossbar/RegionedBossbar.java        |   4 +-
 56 files changed, 151 insertions(+), 316 deletions(-)

diff --git a/BauSystem/BauSystem_Main/src/BauSystem.properties b/BauSystem/BauSystem_Main/src/BauSystem.properties
index 61c95dc7..20bb5f87 100644
--- a/BauSystem/BauSystem_Main/src/BauSystem.properties
+++ b/BauSystem/BauSystem_Main/src/BauSystem.properties
@@ -403,6 +403,7 @@ KILLCHECKER_INFO=§7Shows the overlaps of cannon kills in your build area.
 KILLCHECKER_INFO2=§7Only colorable blocks like Wool, Terractotta, Stained Glass and Concrete are counted.
 KILLCHECKER_ENABLE=§aKillchecker activated
 KILLCHECKER_DISABLE=§cKillchecker deactivated
+KILLCHECKER_NO_BUILD=§cThere is no Build Area in this Region
 KILLCHECKER_BOSSBAR=§e§l{0} §7(§e{1}%§7)   §e§l{2}§7 cannons
 # BlockCounter
 BLOCK_COUNTER_HELP_TOGGLE=§8/§eblockcounter §8- §7Toggle on/off
diff --git a/BauSystem/BauSystem_Main/src/BauSystem_de.properties b/BauSystem/BauSystem_Main/src/BauSystem_de.properties
index 3acad9fe..8af9ba4b 100644
--- a/BauSystem/BauSystem_Main/src/BauSystem_de.properties
+++ b/BauSystem/BauSystem_Main/src/BauSystem_de.properties
@@ -362,6 +362,7 @@ KILLCHECKER_INFO=§7Zeigt Überlappungen der Kanonen Kills im Baubereich an.
 KILLCHECKER_INFO2=§7Nur farbige Blöcke wie Wolle, Terracotta, Stained Glass und Concrete wird gezählt.
 KILLCHECKER_ENABLE=§aKillchecker aktiviert
 KILLCHECKER_DISABLE=§cKillchecker deaktiviert
+KILLCHECKER_NO_BUILD=§cEs gibt keinen Baubereich in dieser Region
 KILLCHECKER_BOSSBAR=§e§l{0} §7(§e{1}%§7)   §e§l{2}§7 Kanonnen
 # BlockCounter
 BLOCK_COUNTER_HELP_TOGGLE=§8/§eblockcounter §8- §7Wechsel zwischen an und aus
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/Permission.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/Permission.java
index 0985a62d..a4cefb9a 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/Permission.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/Permission.java
@@ -21,11 +21,9 @@ package de.steamwar.bausystem;
 
 import de.steamwar.bausystem.config.BauServer;
 import de.steamwar.bausystem.features.world.BauMemberUpdate;
-import de.steamwar.bausystem.utils.BauMemberUpdateEvent;
 import de.steamwar.sql.BauweltMember;
 import de.steamwar.sql.SteamwarUser;
 import lombok.AllArgsConstructor;
-import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
 import java.util.HashSet;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/attributescopy/AttributeRemoveCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/attributescopy/AttributeRemoveCommand.java
index 689be980..eb621256 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/attributescopy/AttributeRemoveCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/attributescopy/AttributeRemoveCommand.java
@@ -24,7 +24,6 @@ import de.steamwar.command.PreviousArguments;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeMapper;
 import de.steamwar.linkage.Linked;
-import de.steamwar.linkage.MinVersion;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/autostart/AutostartListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/autostart/AutostartListener.java
index 3185c66c..3e477955 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/autostart/AutostartListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/autostart/AutostartListener.java
@@ -24,8 +24,6 @@ import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.features.tpslimit.TPSUtils;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.RegionUtils;
-import de.steamwar.bausystem.region.utils.RegionExtensionType;
-import de.steamwar.bausystem.region.utils.RegionType;
 import de.steamwar.bausystem.utils.ItemUtils;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.linkage.Linked;
@@ -44,7 +42,9 @@ import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.inventory.ItemStack;
 
 import java.io.File;
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
 
 @Linked
 public class AutostartListener implements Listener {
@@ -140,7 +140,7 @@ public class AutostartListener implements Listener {
     }
 
     private int getPreFightDurationInSeconds(Region region) {
-        File file = region.gameModeConfig();
+        File file = region.getGameModeConfig().orElse(null);
         if (file == null) return 30;
         FileConfiguration config = YamlConfiguration.loadConfiguration(file);
         return config.getInt("Times.PreFightDuration", 30);
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/bau/ForceSpectatorCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/bau/ForceSpectatorCommand.java
index 7bef91df..a192fec5 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/bau/ForceSpectatorCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/bau/ForceSpectatorCommand.java
@@ -19,13 +19,11 @@
 
 package de.steamwar.bausystem.features.bau;
 
-import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.command.PreviousArguments;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeMapper;
 import de.steamwar.linkage.Linked;
-import de.steamwar.techhider.TechHider;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/cannon/CannonKey.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/cannon/CannonKey.java
index c260e8a9..08912f6f 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/cannon/CannonKey.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/cannon/CannonKey.java
@@ -22,7 +22,6 @@ package de.steamwar.bausystem.features.cannon;
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
-import org.bukkit.entity.TNTPrimed;
 import org.bukkit.util.Vector;
 
 import java.util.Set;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/killchecker/KillcheckerCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/killchecker/KillcheckerCommand.java
index 9ca7a480..1c6a3b41 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/killchecker/KillcheckerCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/killchecker/KillcheckerCommand.java
@@ -38,7 +38,6 @@ import org.bukkit.event.player.PlayerQuitEvent;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
-import java.util.Set;
 
 @Linked
 public class KillcheckerCommand extends SWCommand implements Listener {
@@ -57,6 +56,10 @@ public class KillcheckerCommand extends SWCommand implements Listener {
     @Register(value = "enable", description = "KILLCHECKER_HELP_ENABLE")
     public void genericCommand(@Validator Player player, @OptionalValue("-outline") @StaticValue(value = {"-area", "-outline"}, allowISE = true) boolean onlyOutline) {
         Region region = Region.getRegion(player.getLocation());
+        if (region.getBuildArea().isEmpty()) {
+            BauSystem.MESSAGE.send("KILLCHECKER_NO_BUILD", player);
+            return;
+        }
         KillcheckerVisualizer killcheckerVisualizer = visualizers.computeIfAbsent(region, region1 -> new KillcheckerVisualizer(region1, bossBarService));
         killcheckerVisualizer.recalc();
         killcheckerVisualizer.show(player, onlyOutline);
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/killchecker/KillcheckerVisualizer.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/killchecker/KillcheckerVisualizer.java
index 04822aa8..52eae2b6 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/killchecker/KillcheckerVisualizer.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/killchecker/KillcheckerVisualizer.java
@@ -22,8 +22,6 @@ package de.steamwar.bausystem.features.killchecker;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.region.Point;
 import de.steamwar.bausystem.region.Region;
-import de.steamwar.bausystem.region.utils.RegionExtensionType;
-import de.steamwar.bausystem.region.utils.RegionType;
 import de.steamwar.bausystem.utils.bossbar.BauSystemBossbar;
 import de.steamwar.bausystem.utils.bossbar.BossBarService;
 import de.steamwar.entity.REntity;
@@ -75,8 +73,8 @@ public class KillcheckerVisualizer {
 
     public KillcheckerVisualizer(Region region, BossBarService bossBarService) {
         this.region = region;
-        this.minPoint = region.getMinPoint(RegionType.BUILD, RegionExtensionType.NORMAL);
-        this.maxPoint = region.getMaxPoint(RegionType.BUILD, RegionExtensionType.NORMAL);
+        this.minPoint = region.getBuildArea().getMinPoint(false);
+        this.maxPoint = region.getBuildArea().getMaxPoint(false);
 
         yArea = (maxPoint.getX() - minPoint.getX()) * (maxPoint.getZ() - minPoint.getZ());
         zArea = (maxPoint.getX() - minPoint.getX()) * (maxPoint.getY() - minPoint.getY());
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/LoaderRecorder.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/LoaderRecorder.java
index cc3dce23..d3e2fcfb 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/LoaderRecorder.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/LoaderRecorder.java
@@ -44,7 +44,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.function.BiConsumer;
-import java.util.function.Consumer;
 
 public class LoaderRecorder implements Listener {
 
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loadtimer/Loadtimer.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loadtimer/Loadtimer.java
index 116edba5..12a4d867 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loadtimer/Loadtimer.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loadtimer/Loadtimer.java
@@ -22,8 +22,6 @@ package de.steamwar.bausystem.features.loadtimer;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.tpslimit.TPSUtils;
 import de.steamwar.bausystem.region.Region;
-import de.steamwar.bausystem.region.utils.RegionExtensionType;
-import de.steamwar.bausystem.region.utils.RegionType;
 import lombok.Getter;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
@@ -158,7 +156,7 @@ public class Loadtimer implements Listener {
     }
 
     public void onTntExplode(EntityExplodeEvent event) {
-        if (region.inRegion(event.getLocation(), RegionType.BUILD, RegionExtensionType.EXTENSION) && stage == Stage.IGNITION) {
+        if (region.getBuildArea().inRegion(event.getLocation(), true) && stage == Stage.IGNITION) {
             stage = Stage.END;
             explode = TPSUtils.currentRealTick.get();
             print();
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/observer/ObserverTracerCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/observer/ObserverTracerCommand.java
index 531eda68..c09d3c18 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/observer/ObserverTracerCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/observer/ObserverTracerCommand.java
@@ -20,7 +20,6 @@
 package de.steamwar.bausystem.features.observer;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.Permission;
 import de.steamwar.command.SWCommand;
 import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FireCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FireCommand.java
index 3a0d4403..c7372eb3 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FireCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FireCommand.java
@@ -19,13 +19,11 @@
 
 package de.steamwar.bausystem.features.region;
 
-import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.RegionUtils;
+import de.steamwar.bausystem.region.flags.FireMode;
 import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.region.flags.flagvalues.FireMode;
 import de.steamwar.command.SWCommand;
-import de.steamwar.command.TypeValidator;
 import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 
@@ -55,14 +53,12 @@ public class FireCommand extends SWCommand {
     }
 
     private boolean toggle(Region region) {
-        switch (region.getPlain(Flag.FIRE, FireMode.class)) {
-            case ALLOW:
-                region.set(Flag.FIRE, FireMode.DENY);
-                return true;
-            default:
-            case DENY:
-                region.set(Flag.FIRE, FireMode.ALLOW);
-                return false;
+        if (region.isFlag(Flag.FIRE, FireMode.ALLOW)) {
+            region.setFlag(Flag.FIRE, FireMode.DENY);
+            return true;
+        } else {
+            region.setFlag(Flag.FIRE, FireMode.ALLOW);
+            return false;
         }
     }
 }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FireListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FireListener.java
index 3cf4d1dc..840356d4 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FireListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FireListener.java
@@ -2,8 +2,8 @@ package de.steamwar.bausystem.features.region;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.region.Region;
+import de.steamwar.bausystem.region.flags.FireMode;
 import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.region.flags.flagvalues.FireMode;
 import de.steamwar.bausystem.utils.ScoreboardElement;
 import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
@@ -17,12 +17,12 @@ public class FireListener implements Listener, ScoreboardElement {
 
     @EventHandler
     public void onFireDamage(BlockBurnEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getPlain(Flag.FIRE, FireMode.class) == FireMode.DENY) e.setCancelled(true);
+        if (Region.getRegion(e.getBlock().getLocation()).isFlag(Flag.FIRE, FireMode.DENY)) e.setCancelled(true);
     }
 
     @EventHandler
     public void onFireSpread(BlockSpreadEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getPlain(Flag.FIRE, FireMode.class) == FireMode.DENY) e.setCancelled(true);
+        if (Region.getRegion(e.getBlock().getLocation()).isFlag(Flag.FIRE, FireMode.DENY)) e.setCancelled(true);
     }
 
     @Override
@@ -37,7 +37,7 @@ public class FireListener implements Listener, ScoreboardElement {
 
     @Override
     public String get(Region region, Player p) {
-        if (region.get(Flag.FIRE) == Flag.FIRE.getDefaultValue()) return null;
-        return "§e" + BauSystem.MESSAGE.parse(Flag.FIRE.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.get(Flag.FIRE).getChatValue(), p);
+        if (region.isFlag(Flag.FIRE, Flag.FIRE.getDefaultValue(), true)) return null;
+        return "§e" + BauSystem.MESSAGE.parse(Flag.FIRE.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getFlag(Flag.FIRE).get().getChatValue(), p);
     }
 }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FreezeCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FreezeCommand.java
index d154ce66..aee10390 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FreezeCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FreezeCommand.java
@@ -19,13 +19,11 @@
 
 package de.steamwar.bausystem.features.region;
 
-import de.steamwar.bausystem.Permission;
 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.flagvalues.FreezeMode;
+import de.steamwar.bausystem.region.flags.FreezeMode;
 import de.steamwar.command.SWCommand;
-import de.steamwar.command.TypeValidator;
 import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 
@@ -55,14 +53,12 @@ public class FreezeCommand extends SWCommand {
     }
 
     private boolean toggle(Region region) {
-        switch (region.getPlain(Flag.FREEZE, FreezeMode.class)) {
-            case ACTIVE:
-                region.set(Flag.FREEZE, FreezeMode.INACTIVE);
-                return false;
-            default:
-            case INACTIVE:
-                region.set(Flag.FREEZE, FreezeMode.ACTIVE);
-                return true;
+        if (region.isFlag(Flag.FREEZE, FreezeMode.ACTIVE)) {
+            region.setFlag(Flag.FREEZE, FreezeMode.INACTIVE);
+            return false;
+        } else {
+            region.setFlag(Flag.FREEZE, FreezeMode.ACTIVE);
+            return true;
         }
     }
 }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FreezeListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FreezeListener.java
index 673867e7..fb15e84e 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FreezeListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FreezeListener.java
@@ -29,9 +29,7 @@ public class FreezeListener implements Listener, ScoreboardElement {
 
     @EventHandler
     public void onEntitySpawn(EntitySpawnEvent e) {
-        if (Region.getRegion(e.getLocation()).get(Flag.FREEZE) == FreezeMode.INACTIVE) {
-            return;
-        }
+        if (Region.getRegion(e.getLocation()).isFlag(Flag.FREEZE, FreezeMode.INACTIVE, true)) return;
         e.setCancelled(true);
         if (e.getEntityType() == TrickyTrialsWrapper.impl.getTntEntityType()) {
             Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
@@ -43,8 +41,7 @@ public class FreezeListener implements Listener, ScoreboardElement {
     @EventHandler
     public void onBlockCanBuild(BlockCanBuildEvent e) {
         if (!e.isBuildable()) return;
-        if (Region.getRegion(e.getBlock().getLocation()).get(Flag.FREEZE) == FreezeMode.INACTIVE)
-            return;
+        if (Region.getRegion(e.getBlock().getLocation()).isFlag(Flag.FREEZE, FreezeMode.INACTIVE, true)) return;
         if (e.getMaterial() == Material.TNT) {
             e.setBuildable(false);
             e.getBlock().setType(Material.TNT, false);
@@ -53,14 +50,14 @@ public class FreezeListener implements Listener, ScoreboardElement {
 
     @EventHandler
     public void onEntityChangeBlock(EntityChangeBlockEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).get(Flag.FREEZE) == FreezeMode.ACTIVE) {
+        if (Region.getRegion(e.getBlock().getLocation()).isFlag(Flag.FREEZE, FreezeMode.ACTIVE)) {
             e.setCancelled(true);
         }
     }
 
     @EventHandler
     public void onPhysicsEvent(BlockPhysicsEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).get(Flag.FREEZE) == FreezeMode.ACTIVE) {
+        if (Region.getRegion(e.getBlock().getLocation()).isFlag(Flag.FREEZE, FreezeMode.ACTIVE)) {
             if (e.getSourceBlock().getType() == Material.NOTE_BLOCK) {
                 BlockState state = e.getSourceBlock().getState();
                 NoteBlock noteBlock = (NoteBlock) state.getBlockData();
@@ -85,143 +82,44 @@ public class FreezeListener implements Listener, ScoreboardElement {
 
     @EventHandler
     public void onPistonExtend(BlockPistonExtendEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).get(Flag.FREEZE) == FreezeMode.ACTIVE) {
+        if (Region.getRegion(e.getBlock().getLocation()).isFlag(Flag.FREEZE, FreezeMode.ACTIVE)) {
             e.setCancelled(true);
         }
     }
 
-    @EventHandler
-    public void onNotePlay(NotePlayEvent event) {
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=45, z=98},type=CYAN_TERRACOTTA,data=Block{minecraft:cyan_terracotta},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-107, y=45, z=98},type=SMOOTH_STONE,data=Block{minecraft:smooth_stone},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=45, z=98},type=CYAN_TERRACOTTA,data=Block{minecraft:cyan_terracotta},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-105, y=45, z=98},type=CYAN_TERRACOTTA,data=Block{minecraft:cyan_terracotta},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=45, z=98},type=CYAN_TERRACOTTA,data=Block{minecraft:cyan_terracotta},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=44, z=98},type=CYAN_TERRACOTTA,data=Block{minecraft:cyan_terracotta},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=45, z=98},type=CYAN_TERRACOTTA,data=Block{minecraft:cyan_terracotta},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=46, z=98},type=BARRIER,data=Block{minecraft:barrier},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=45, z=98},type=CYAN_TERRACOTTA,data=Block{minecraft:cyan_terracotta},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=45, z=97},type=CYAN_TERRACOTTA,data=Block{minecraft:cyan_terracotta},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=45, z=98},type=CYAN_TERRACOTTA,data=Block{minecraft:cyan_terracotta},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=45, z=99},type=SMOOTH_STONE,data=Block{minecraft:smooth_stone},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
-
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=custom_head,note=9,powered=true],fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-107, y=47, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=custom_head,note=9,powered=true],fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-105, y=47, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=custom_head,note=9,powered=true],fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=46, z=98},type=BARRIER,data=Block{minecraft:barrier},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=custom_head,note=9,powered=true],fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=48, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=custom_head,note=9,powered=true],fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=47, z=97},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=custom_head,note=9,powered=true],fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=47, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
-
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=46, z=97},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-107, y=46, z=97},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=46, z=97},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-105, y=46, z=97},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=46, z=97},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=45, z=97},type=CYAN_TERRACOTTA,data=Block{minecraft:cyan_terracotta},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=46, z=97},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=47, z=97},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=46, z=97},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=46, z=96},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=46, z=97},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=46, z=98},type=BARRIER,data=Block{minecraft:barrier},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=46, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-107, y=46, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=46, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-105, y=46, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=46, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=45, z=99},type=SMOOTH_STONE,data=Block{minecraft:smooth_stone},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=46, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=47, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=46, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=46, z=98},type=BARRIER,data=Block{minecraft:barrier},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=46, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=46, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-107, y=46, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-108, y=46, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-107, y=46, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=46, z=98},type=BARRIER,data=Block{minecraft:barrier},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-107, y=46, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-107, y=45, z=98},type=SMOOTH_STONE,data=Block{minecraft:smooth_stone},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-107, y=46, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-107, y=47, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-107, y=46, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-107, y=46, z=97},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-107, y=46, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-107, y=46, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-105, y=46, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=46, z=98},type=BARRIER,data=Block{minecraft:barrier},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-105, y=46, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-104, y=46, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-105, y=46, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-105, y=45, z=98},type=CYAN_TERRACOTTA,data=Block{minecraft:cyan_terracotta},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-105, y=46, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-105, y=47, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-105, y=46, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-105, y=46, z=97},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-105, y=46, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-105, y=46, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
-
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=harp,note=9,powered=true],fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=harp,note=9,powered=true],fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=harp,note=9,powered=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-107, y=47, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=harp,note=9,powered=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-105, y=47, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=harp,note=9,powered=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=46, z=98},type=BARRIER,data=Block{minecraft:barrier},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=harp,note=9,powered=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=48, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=harp,note=9,powered=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=47, z=97},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=harp,note=9,powered=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=47, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=harp,note=9,powered=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=harp,note=9,powered=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
-
-
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=46, z=100},type=SMOOTH_STONE,data=Block{minecraft:smooth_stone},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-107, y=46, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=46, z=100},type=SMOOTH_STONE,data=Block{minecraft:smooth_stone},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-105, y=46, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=46, z=100},type=SMOOTH_STONE,data=Block{minecraft:smooth_stone},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=45, z=100},type=SMOOTH_STONE,data=Block{minecraft:smooth_stone},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=46, z=100},type=SMOOTH_STONE,data=Block{minecraft:smooth_stone},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=47, z=100},type=STONE_SLAB,data=Block{minecraft:stone_slab}[type=bottom,waterlogged=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=46, z=100},type=SMOOTH_STONE,data=Block{minecraft:smooth_stone},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=46, z=99},type=SMOOTH_STONE,data=Block{minecraft:smooth_stone},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=46, z=100},type=SMOOTH_STONE,data=Block{minecraft:smooth_stone},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=46, z=101},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
-
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=48, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-107, y=48, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=48, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-105, y=48, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=48, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=47, z=100},type=STONE_SLAB,data=Block{minecraft:stone_slab}[type=bottom,waterlogged=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=48, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=49, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=48, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=48, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=48, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=48, z=101},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-107, y=47, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-105, y=47, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=46, z=99},type=SMOOTH_STONE,data=Block{minecraft:smooth_stone},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=48, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
-        ////[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=basedrum,note=9,powered=true],fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=47, z=100},type=STONE_SLAB,data=Block{minecraft:stone_slab}[type=bottom,waterlogged=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=101},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-107, y=47, z=101},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=101},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-105, y=47, z=101},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=101},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=46, z=101},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=101},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=48, z=101},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=101},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=47, z=100},type=STONE_SLAB,data=Block{minecraft:stone_slab}[type=bottom,waterlogged=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=101},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=47, z=102},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-107, y=47, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-108, y=47, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-107, y=47, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=47, z=100},type=STONE_SLAB,data=Block{minecraft:stone_slab}[type=bottom,waterlogged=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-107, y=47, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-107, y=46, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-107, y=47, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-107, y=48, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-107, y=47, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-107, y=47, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-107, y=47, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-107, y=47, z=101},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-105, y=47, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=47, z=100},type=STONE_SLAB,data=Block{minecraft:stone_slab}[type=bottom,waterlogged=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-105, y=47, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-104, y=47, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-105, y=47, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-105, y=46, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-105, y=47, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-105, y=48, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-105, y=47, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-105, y=47, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-105, y=47, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-105, y=47, z=101},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
-
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=basedrum,note=9,powered=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-107, y=47, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=basedrum,note=9,powered=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-105, y=47, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=basedrum,note=9,powered=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=46, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=basedrum,note=9,powered=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=48, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=basedrum,note=9,powered=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=47, z=97},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=basedrum,note=9,powered=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=47, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
-        //[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=basedrum,note=9,powered=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=basedrum,note=9,powered=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
-    }
-
-
     @EventHandler
     public void onPistonRetract(BlockPistonRetractEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).get(Flag.FREEZE) == FreezeMode.ACTIVE) {
+        if (Region.getRegion(e.getBlock().getLocation()).isFlag(Flag.FREEZE, FreezeMode.ACTIVE)) {
             e.setCancelled(true);
         }
     }
 
     @EventHandler
     public void onBlockGrow(BlockGrowEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).get(Flag.FREEZE) == FreezeMode.ACTIVE) {
+        if (Region.getRegion(e.getBlock().getLocation()).isFlag(Flag.FREEZE, FreezeMode.ACTIVE)) {
             e.setCancelled(true);
         }
     }
 
     @EventHandler
     public void onRedstoneEvent(BlockRedstoneEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).get(Flag.FREEZE) == FreezeMode.ACTIVE) {
+        if (Region.getRegion(e.getBlock().getLocation()).isFlag(Flag.FREEZE, FreezeMode.ACTIVE)) {
             e.setNewCurrent(e.getOldCurrent());
         }
     }
 
     @EventHandler
     public void onBlockDispense(BlockDispenseEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).get(Flag.FREEZE) == FreezeMode.ACTIVE) {
+        if (Region.getRegion(e.getBlock().getLocation()).isFlag(Flag.FREEZE, FreezeMode.ACTIVE)) {
             e.setCancelled(true);
         }
     }
 
     @EventHandler
     public void onInventoryMoveEvent(InventoryMoveItemEvent e) {
-        if (e.getDestination().getLocation() != null && Region.getRegion(e.getDestination().getLocation()).get(Flag.FREEZE) == FreezeMode.ACTIVE) {
+        if (e.getDestination().getLocation() != null && Region.getRegion(e.getDestination().getLocation()).isFlag(Flag.FREEZE, FreezeMode.ACTIVE)) {
             e.setCancelled(true);
-        } else if (e.getSource().getLocation() != null && Region.getRegion(e.getSource().getLocation()).get(Flag.FREEZE) == FreezeMode.ACTIVE) {
+        } else if (e.getSource().getLocation() != null && Region.getRegion(e.getSource().getLocation()).isFlag(Flag.FREEZE, FreezeMode.ACTIVE)) {
             e.setCancelled(true);
         }
     }
@@ -230,7 +128,7 @@ public class FreezeListener implements Listener, ScoreboardElement {
     public void onBlockBreak(BlockBreakEvent e) {
         if (Core.getVersion() < 19) return;
         if (e.getPlayer().getInventory().getItemInMainHand().getType() == Material.DEBUG_STICK) return;
-        if (Region.getRegion(e.getBlock().getLocation()).get(Flag.FREEZE) == FreezeMode.ACTIVE) {
+        if (Region.getRegion(e.getBlock().getLocation()).isFlag(Flag.FREEZE, FreezeMode.ACTIVE)) {
             e.setCancelled(true);
             e.getBlock().setType(Material.BARRIER, false);
             e.getBlock().setType(Material.AIR, false);
@@ -253,35 +151,35 @@ public class FreezeListener implements Listener, ScoreboardElement {
 
     @EventHandler
     public void onFluidLevelChange(FluidLevelChangeEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).get(Flag.FREEZE) == FreezeMode.ACTIVE) {
+        if (Region.getRegion(e.getBlock().getLocation()).isFlag(Flag.FREEZE, FreezeMode.ACTIVE)) {
             e.setCancelled(true);
         }
     }
 
     @EventHandler
     public void onBlockSpread(BlockSpreadEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).get(Flag.FREEZE) == FreezeMode.ACTIVE) {
+        if (Region.getRegion(e.getBlock().getLocation()).isFlag(Flag.FREEZE, FreezeMode.ACTIVE)) {
             e.setCancelled(true);
         }
     }
 
     @EventHandler
     public void onBlockFromTo(BlockFromToEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).get(Flag.FREEZE) == FreezeMode.ACTIVE) {
+        if (Region.getRegion(e.getBlock().getLocation()).isFlag(Flag.FREEZE, FreezeMode.ACTIVE)) {
             e.setCancelled(true);
         }
     }
 
     @EventHandler
     public void onSpongeAbsorb(SpongeAbsorbEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).get(Flag.FREEZE) == FreezeMode.ACTIVE) {
+        if (Region.getRegion(e.getBlock().getLocation()).isFlag(Flag.FREEZE, FreezeMode.ACTIVE)) {
             e.setCancelled(true);
         }
     }
 
     @EventHandler
     public void onBlockForm(BlockFormEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).get(Flag.FREEZE) == FreezeMode.ACTIVE) {
+        if (Region.getRegion(e.getBlock().getLocation()).isFlag(Flag.FREEZE, FreezeMode.ACTIVE)) {
             e.setCancelled(true);
         }
     }
@@ -289,7 +187,7 @@ public class FreezeListener implements Listener, ScoreboardElement {
     @EventHandler
     public void onPlayerInteract(PlayerInteractEvent e) {
         if (e.getAction() != Action.RIGHT_CLICK_BLOCK) return;
-        if (Region.getRegion(e.getClickedBlock().getLocation()).get(Flag.FREEZE) == FreezeMode.ACTIVE) {
+        if (Region.getRegion(e.getClickedBlock().getLocation()).isFlag(Flag.FREEZE, FreezeMode.ACTIVE)) {
             Block block = e.getClickedBlock();
             if (block.getType() == Material.LEVER) {
                 Switch data = ((Switch) block.getBlockData());
@@ -300,9 +198,9 @@ public class FreezeListener implements Listener, ScoreboardElement {
     }
 
     @EventHandler
-    public void onBlockFade(BlockFadeEvent event) {
-        if (Region.getRegion(event.getBlock().getLocation()).get(Flag.FREEZE) == FreezeMode.ACTIVE) {
-            event.setCancelled(true);
+    public void onBlockFade(BlockFadeEvent e) {
+        if (Region.getRegion(e.getBlock().getLocation()).isFlag(Flag.FREEZE, FreezeMode.ACTIVE)) {
+            e.setCancelled(true);
         }
     }
 
@@ -318,7 +216,7 @@ public class FreezeListener implements Listener, ScoreboardElement {
 
     @Override
     public String get(Region region, Player p) {
-        if (region.get(Flag.FREEZE) == Flag.FREEZE.getDefaultValue()) return null;
-        return "§e" + BauSystem.MESSAGE.parse(Flag.FREEZE.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.get(Flag.FREEZE).getChatValue(), p);
+        if (region.isFlag(Flag.FREEZE, Flag.FREEZE.getDefaultValue(), true)) return null;
+        return "§e" + BauSystem.MESSAGE.parse(Flag.FREEZE.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getFlag(Flag.FREEZE).get().getChatValue(), p);
     }
 }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ItemsCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ItemsCommand.java
index 8c4452cb..3003912c 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ItemsCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ItemsCommand.java
@@ -19,14 +19,11 @@
 
 package de.steamwar.bausystem.features.region;
 
-import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.region.GlobalRegion;
 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.flagvalues.ItemMode;
+import de.steamwar.bausystem.region.flags.ItemMode;
 import de.steamwar.command.SWCommand;
-import de.steamwar.command.TypeValidator;
 import de.steamwar.linkage.Linked;
 import de.steamwar.linkage.MinVersion;
 import org.bukkit.entity.Player;
@@ -58,14 +55,12 @@ public class ItemsCommand extends SWCommand {
     }
 
     private boolean toggle(Region region) {
-        switch (region.getPlain(Flag.ITEMS, ItemMode.class)) {
-            case ACTIVE:
-                region.set(Flag.ITEMS, ItemMode.INACTIVE);
-                return false;
-            default:
-            case INACTIVE:
-                region.set(Flag.ITEMS, ItemMode.ACTIVE);
-                return true;
+        if (region.isFlag(Flag.ITEMS, ItemMode.ACTIVE)) {
+            region.setFlag(Flag.ITEMS, ItemMode.INACTIVE);
+            return false;
+        } else {
+            region.setFlag(Flag.ITEMS, ItemMode.ACTIVE);
+            return true;
         }
     }
 }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ItemsListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ItemsListener.java
index 66e1fdb7..b673bb93 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ItemsListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ItemsListener.java
@@ -22,7 +22,7 @@ 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.flagvalues.ItemMode;
+import de.steamwar.bausystem.region.flags.ItemMode;
 import de.steamwar.bausystem.utils.ScoreboardElement;
 import de.steamwar.linkage.Linked;
 import de.steamwar.linkage.MinVersion;
@@ -35,13 +35,9 @@ import org.bukkit.event.entity.ItemSpawnEvent;
 @MinVersion(19)
 public class ItemsListener implements Listener, ScoreboardElement {
 
-    private static ItemMode getMode(Region region) {
-        return region.getPlain(Flag.ITEMS, ItemMode.class);
-    }
-
     @EventHandler
     public void onItemSpawn(ItemSpawnEvent event) {
-        if (getMode(Region.getRegion(event.getLocation())) == ItemMode.INACTIVE) {
+        if (Region.getRegion(event.getLocation()).isFlag(Flag.ITEMS, ItemMode.INACTIVE, true)) {
             event.setCancelled(true);
         }
     }
@@ -58,7 +54,7 @@ public class ItemsListener implements Listener, ScoreboardElement {
 
     @Override
     public String get(Region region, Player p) {
-        if (region.get(Flag.ITEMS) == Flag.ITEMS.getDefaultValue()) return null;
-        return "§e" + BauSystem.MESSAGE.parse(Flag.ITEMS.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.get(Flag.ITEMS).getChatValue(), p);
+        if (region.isFlag(Flag.ITEMS, Flag.ITEMS.getDefaultValue(), true)) return null;
+        return "§e" + BauSystem.MESSAGE.parse(Flag.ITEMS.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getFlag(Flag.ITEMS).get().getChatValue(), p);
     }
 }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/NoGravityCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/NoGravityCommand.java
index aeeaf588..3d3b6b61 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/NoGravityCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/NoGravityCommand.java
@@ -22,7 +22,7 @@ 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.flagvalues.NoGravityMode;
+import de.steamwar.bausystem.region.flags.NoGravityMode;
 import de.steamwar.command.SWCommand;
 import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
@@ -53,14 +53,12 @@ public class NoGravityCommand extends SWCommand {
     }
 
     private boolean toggle(Region region) {
-        switch (region.getPlain(Flag.NO_GRAVITY, NoGravityMode.class)) {
-            case ACTIVE:
-                region.set(Flag.NO_GRAVITY, NoGravityMode.INACTIVE);
-                return false;
-            default:
-            case INACTIVE:
-                region.set(Flag.NO_GRAVITY, NoGravityMode.ACTIVE);
-                return true;
+        if (region.isFlag(Flag.NO_GRAVITY, NoGravityMode.ACTIVE)) {
+            region.setFlag(Flag.NO_GRAVITY, NoGravityMode.INACTIVE);
+            return false;
+        } else {
+            region.setFlag(Flag.NO_GRAVITY, NoGravityMode.ACTIVE);
+            return true;
         }
     }
 }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/NoGravityListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/NoGravityListener.java
index f86403f9..e69b8225 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/NoGravityListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/NoGravityListener.java
@@ -22,7 +22,7 @@ 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.flagvalues.NoGravityMode;
+import de.steamwar.bausystem.region.flags.NoGravityMode;
 import de.steamwar.bausystem.utils.ScoreboardElement;
 import de.steamwar.linkage.Linked;
 import org.bukkit.entity.EntityType;
@@ -34,14 +34,10 @@ import org.bukkit.event.entity.EntitySpawnEvent;
 @Linked
 public class NoGravityListener implements Listener, ScoreboardElement {
 
-    private static NoGravityMode getMode(Region region) {
-        return region.getPlain(Flag.NO_GRAVITY, NoGravityMode.class);
-    }
-
     @EventHandler
     public void onEntitySpawn(EntitySpawnEvent event) {
         if (event.getEntityType() == EntityType.PLAYER) return;
-        if (getMode(Region.getRegion(event.getLocation())) == NoGravityMode.ACTIVE) {
+        if (Region.getRegion(event.getLocation()).isFlag(Flag.NO_GRAVITY, NoGravityMode.ACTIVE)) {
             event.getEntity().setGravity(false);
         }
     }
@@ -58,7 +54,7 @@ public class NoGravityListener implements Listener, ScoreboardElement {
 
     @Override
     public String get(Region region, Player p) {
-        if (region.get(Flag.NO_GRAVITY) == Flag.NO_GRAVITY.getDefaultValue()) return null;
-        return "§e" + BauSystem.MESSAGE.parse(Flag.NO_GRAVITY.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.get(Flag.NO_GRAVITY).getChatValue(), p);
+        if (region.isFlag(Flag.NO_GRAVITY, Flag.NO_GRAVITY.getDefaultValue(), true)) return null;
+        return "§e" + BauSystem.MESSAGE.parse(Flag.NO_GRAVITY.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getFlag(Flag.NO_GRAVITY).get().getChatValue(), p);
     }
 }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ProtectCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ProtectCommand.java
index 4fc33cf0..04383c38 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ProtectCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ProtectCommand.java
@@ -20,13 +20,11 @@
 package de.steamwar.bausystem.features.region;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.Permission;
 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.flagvalues.ProtectMode;
+import de.steamwar.bausystem.region.flags.ProtectMode;
 import de.steamwar.command.SWCommand;
-import de.steamwar.command.TypeValidator;
 import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 
@@ -41,22 +39,18 @@ public class ProtectCommand extends SWCommand {
     public void genericProtectCommand(@Validator Player p) {
         Region region = regionCheck(p);
         if (region == null) return;
-        switch (region.getPlain(Flag.PROTECT, ProtectMode.class)) {
-            case ACTIVE:
-                region.set(Flag.PROTECT, ProtectMode.INACTIVE);
-                RegionUtils.actionBar(region, "REGION_PROTECT_DISABLE");
-                break;
-            default:
-            case INACTIVE:
-                region.set(Flag.PROTECT, ProtectMode.ACTIVE);
-                RegionUtils.actionBar(region, "REGION_PROTECT_ENABLE");
-                break;
+        if (region.isFlag(Flag.PROTECT, ProtectMode.ACTIVE)) {
+            region.setFlag(Flag.PROTECT, ProtectMode.INACTIVE);
+            RegionUtils.actionBar(region, "REGION_PROTECT_DISABLE");
+        } else {
+            region.setFlag(Flag.PROTECT, ProtectMode.ACTIVE);
+            RegionUtils.actionBar(region, "REGION_PROTECT_ENABLE");
         }
     }
 
     private Region regionCheck(Player player) {
         Region region = Region.getRegion(player.getLocation());
-        if (region.getFloorLevel() == 0) {
+        if (!region.hasFlag(Flag.PROTECT).isApplicable()) {
             BauSystem.MESSAGE.send("REGION_PROTECT_FALSE_REGION", player);
             return null;
         }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ProtectListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ProtectListener.java
index 65ec30de..b90aa779 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ProtectListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ProtectListener.java
@@ -1,9 +1,10 @@
 package de.steamwar.bausystem.features.region;
 
 import de.steamwar.bausystem.BauSystem;
+import de.steamwar.bausystem.region.Point;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.region.flags.flagvalues.ProtectMode;
+import de.steamwar.bausystem.region.flags.ProtectMode;
 import de.steamwar.bausystem.utils.ScoreboardElement;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Location;
@@ -21,13 +22,11 @@ public class ProtectListener implements Listener, ScoreboardElement {
 
     private void explode(List<Block> blockList, Location location) {
         Region region = Region.getRegion(location);
-        if (region.getFloorLevel() == 0) {
-            return;
-        }
-        if (region.getPlain(Flag.PROTECT, ProtectMode.class) == ProtectMode.INACTIVE) {
-            return;
-        }
-        blockList.removeIf(block -> block.getY() < region.getFloorLevel());
+        if (region.isFlag(Flag.PROTECT, ProtectMode.INACTIVE)) return;
+        Point p1 = region.getBuildArea().getMinPoint(true);
+        Point p2 = region.getTestblockArea().getMinPoint(true);
+        int floorLevel = Math.min(p1.getY(), p2.getY());
+        blockList.removeIf(block -> block.getY() < floorLevel);
     }
 
     @EventHandler
@@ -52,8 +51,7 @@ public class ProtectListener implements Listener, ScoreboardElement {
 
     @Override
     public String get(Region region, Player p) {
-        if (region.getFloorLevel() == 0) return null;
-        if (region.get(Flag.PROTECT) != Flag.PROTECT.getDefaultValue()) return null;
-        return "§e" + BauSystem.MESSAGE.parse(Flag.PROTECT.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.get(Flag.PROTECT).getChatValue(), p);
+        if (region.isFlag(Flag.PROTECT, Flag.PROTECT.getDefaultValue(), true)) return null;
+        return "§e" + BauSystem.MESSAGE.parse(Flag.PROTECT.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getFlag(Flag.PROTECT).get().getChatValue(), p);
     }
 }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionListener.java
index 38b6532e..990c3379 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionListener.java
@@ -21,7 +21,8 @@ package de.steamwar.bausystem.features.region;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.region.Region;
-import de.steamwar.bausystem.region.tags.Tag;
+import de.steamwar.bausystem.region.flags.ChangedMode;
+import de.steamwar.bausystem.region.flags.Flag;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Location;
 import org.bukkit.event.EventHandler;
@@ -185,7 +186,7 @@ public class RegionListener implements Listener {
         new BukkitRunnable() {
             @Override
             public void run() {
-                Region.getRegion(location).set(Tag.CHANGED);
+                Region.getRegion(location).setFlag(Flag.CHANGED, ChangedMode.HAS_CHANGE);
             }
         }.runTaskAsynchronously(BauSystem.getInstance());
     }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionScoreboardElement.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionScoreboardElement.java
index 246b9a01..7ad6dea1 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionScoreboardElement.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionScoreboardElement.java
@@ -19,8 +19,6 @@
 
 package de.steamwar.bausystem.features.region;
 
-import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.region.GlobalRegion;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.utils.ScoreboardElement;
 import de.steamwar.linkage.Linked;
@@ -41,7 +39,9 @@ public class RegionScoreboardElement implements ScoreboardElement {
 
     @Override
     public String get(Region region, Player p) {
-        if (GlobalRegion.getInstance() == region) return null;
-        return "§e" + BauSystem.MESSAGE.parse("SCOREBOARD_REGION", p) + "§8: §7" + region.getDisplayName();
+        if (region.getType().isGlobal()) return null;
+        // TODO: Fix this!
+        // return "§e" + BauSystem.MESSAGE.parse("SCOREBOARD_REGION", p) + "§8: §7" + region.getName();
+        return null;
     }
 }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TNTCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TNTCommand.java
index 27dcbe8f..0aa8a4c9 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TNTCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TNTCommand.java
@@ -20,7 +20,6 @@
 package de.steamwar.bausystem.features.region;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.RegionUtils;
 import de.steamwar.bausystem.region.flags.Flag;
@@ -29,7 +28,6 @@ import de.steamwar.bausystem.region.utils.RegionType;
 import de.steamwar.command.PreviousArguments;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeMapper;
-import de.steamwar.command.TypeValidator;
 import de.steamwar.linkage.Linked;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TNTListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TNTListener.java
index a8d34de5..6b1e899c 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TNTListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TNTListener.java
@@ -23,9 +23,7 @@ import de.steamwar.bausystem.BauSystem;
 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.flagvalues.TNTMode;
-import de.steamwar.bausystem.region.utils.RegionExtensionType;
-import de.steamwar.bausystem.region.utils.RegionType;
+import de.steamwar.bausystem.region.flags.TNTMode;
 import de.steamwar.bausystem.utils.ScoreboardElement;
 import de.steamwar.linkage.Linked;
 import org.bukkit.block.Block;
@@ -37,7 +35,6 @@ import org.bukkit.event.block.BlockExplodeEvent;
 import org.bukkit.event.entity.EntityExplodeEvent;
 
 import java.util.List;
-import java.util.concurrent.atomic.AtomicBoolean;
 
 @Linked
 public class TNTListener implements Listener, ScoreboardElement {
@@ -45,24 +42,17 @@ public class TNTListener implements Listener, ScoreboardElement {
     private void explode(List<Block> blockList) {
         blockList.removeIf(block -> {
             Region region = Region.getRegion(block.getLocation());
-            TNTMode value = region.getPlain(Flag.TNT);
+            if (!region.hasFlag(Flag.TNT).isReadable()) return false;
+            TNTMode value = region.getFlag(Flag.TNT).get();
             if (value == TNTMode.ALLOW) {
                 return false;
             } else if (value == TNTMode.ONLY_TB) {
-                if (region.hasType(RegionType.BUILD) && region.inRegion(block.getLocation(), RegionType.BUILD, RegionExtensionType.NORMAL)) {
-                    RegionUtils.actionBar(region, "REGION_TNT_BUILD_DESTROY");
-                    return true;
-                }
-                if (region.hasType(RegionType.BUILD) && region.inRegion(block.getLocation(), RegionType.BUILD, RegionExtensionType.EXTENSION)) {
+                if (region.getBuildArea().inRegion(block.getLocation(), true)) {
                     RegionUtils.actionBar(region, "REGION_TNT_BUILD_DESTROY");
                     return true;
                 }
             } else if (value == TNTMode.ONLY_BUILD) {
-                if (region.hasType(RegionType.TESTBLOCK) && region.inRegion(block.getLocation(), RegionType.TESTBLOCK, RegionExtensionType.NORMAL)) {
-                    RegionUtils.actionBar(region, "REGION_TNT_TB_DESTROY");
-                    return true;
-                }
-                if (region.hasType(RegionType.TESTBLOCK) && region.inRegion(block.getLocation(), RegionType.TESTBLOCK, RegionExtensionType.EXTENSION)) {
+                if (region.getTestblockArea().inRegion(block.getLocation(), true)) {
                     RegionUtils.actionBar(region, "REGION_TNT_TB_DESTROY");
                     return true;
                 }
@@ -93,6 +83,7 @@ public class TNTListener implements Listener, ScoreboardElement {
 
     @Override
     public String get(Region region, Player p) {
-        return "§e" + BauSystem.MESSAGE.parse(Flag.TNT.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.get(Flag.TNT).getChatValue(), p);
+        if (!region.hasFlag(Flag.TNT).isReadable()) return null;
+        return "§e" + BauSystem.MESSAGE.parse(Flag.TNT.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getFlag(Flag.TNT).get().getChatValue(), p);
     }
 }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java
index 6b319062..a56718c9 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java
@@ -20,7 +20,6 @@
 package de.steamwar.bausystem.features.region;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.config.BauServer;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.RegionUtils;
@@ -32,7 +31,6 @@ import de.steamwar.bausystem.utils.PasteBuilder;
 import de.steamwar.command.PreviousArguments;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeMapper;
-import de.steamwar.command.TypeValidator;
 import de.steamwar.linkage.Linked;
 import de.steamwar.linkage.LinkedInstance;
 import de.steamwar.sql.Punishment;
@@ -43,10 +41,8 @@ import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import java.io.IOException;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.Consumer;
 import java.util.function.Supplier;
 import java.util.logging.Level;
 import java.util.stream.Collectors;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/FireBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/FireBauGuiItem.java
index 79101ee9..4a69b708 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/FireBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/FireBauGuiItem.java
@@ -23,8 +23,8 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
 import de.steamwar.bausystem.region.Region;
+import de.steamwar.bausystem.region.flags.FireMode;
 import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.region.flags.flagvalues.FireMode;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
@@ -42,7 +42,10 @@ public class FireBauGuiItem extends BauGuiItem {
     @Override
     public ItemStack getItem(Player player) {
         Region region = Region.getRegion(player.getLocation());
-        if (region.getPlain(Flag.FIRE, FireMode.class) == FireMode.ALLOW) {
+        if (!region.hasFlag(Flag.FIRE).isApplicable()) {
+            return new SWItem(Material.BARRIER, "").getItemStack();
+        }
+        if (region.isFlag(Flag.FIRE, FireMode.ALLOW)) {
             return new SWItem(Material.FIRE_CHARGE, BauSystem.MESSAGE.parse("REGION_ITEM_FIRE_ALLOW", player)).getItemStack();
         } else {
             return new SWItem(Material.FIREWORK_STAR, BauSystem.MESSAGE.parse("REGION_ITEM_FIRE_DISALLOW", player)).getItemStack();
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/FreezeBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/FreezeBauGuiItem.java
index 1406638c..0fecdfa8 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/FreezeBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/FreezeBauGuiItem.java
@@ -24,7 +24,7 @@ import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.region.flags.flagvalues.FreezeMode;
+import de.steamwar.bausystem.region.flags.FreezeMode;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
@@ -42,7 +42,10 @@ public class FreezeBauGuiItem extends BauGuiItem {
     @Override
     public ItemStack getItem(Player player) {
         Region region = Region.getRegion(player.getLocation());
-        if (region.getPlain(Flag.FREEZE, FreezeMode.class) == FreezeMode.ACTIVE) {
+        if (!region.hasFlag(Flag.FREEZE).isApplicable()) {
+            return new SWItem(Material.BARRIER, "").getItemStack();
+        }
+        if (region.isFlag(Flag.FREEZE, FreezeMode.ACTIVE)) {
             return new SWItem(Material.GUNPOWDER, BauSystem.MESSAGE.parse("REGION_ITEM_FREEZE_ALLOW", player)).getItemStack();
         } else {
             return new SWItem(Material.REDSTONE, BauSystem.MESSAGE.parse("REGION_ITEM_FREEZE_DISALLOW", player)).getItemStack();
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/ProtectBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/ProtectBauGuiItem.java
index a11e508d..5453414e 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/ProtectBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/ProtectBauGuiItem.java
@@ -25,7 +25,7 @@ import de.steamwar.bausystem.SWUtils;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.region.flags.flagvalues.ProtectMode;
+import de.steamwar.bausystem.region.flags.ProtectMode;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
@@ -43,7 +43,10 @@ public class ProtectBauGuiItem extends BauGuiItem {
     @Override
     public ItemStack getItem(Player player) {
         Region region = Region.getRegion(player.getLocation());
-        if (region.getPlain(Flag.PROTECT, ProtectMode.class) == ProtectMode.ACTIVE) {
+        if (!region.hasFlag(Flag.PROTECT).isApplicable()) {
+            return new SWItem(Material.BARRIER, "").getItemStack();
+        }
+        if (region.isFlag(Flag.PROTECT, ProtectMode.ACTIVE)) {
             return SWUtils.setCustomModelData(new SWItem(Material.OBSIDIAN, BauSystem.MESSAGE.parse("REGION_ITEM_PROTECT_ALLOW", player)), 1).getItemStack();
         } else {
             return SWUtils.setCustomModelData(new SWItem(Material.STONE, BauSystem.MESSAGE.parse("REGION_ITEM_PROTECT_DISALLOW", player)), 1).getItemStack();
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/ScriptGUI.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/ScriptGUI.java
index add7ad81..fd6fd3f2 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/ScriptGUI.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/ScriptGUI.java
@@ -22,7 +22,6 @@ package de.steamwar.bausystem.features.script;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.SWUtils;
 import de.steamwar.bausystem.features.script.lua.SteamWarPlatform;
-import de.steamwar.bausystem.utils.ItemUtils;
 import de.steamwar.inventory.SWAnvilInv;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.inventory.SWListInv;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/event/CommandListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/event/CommandListener.java
index da5f1f21..7cf88d1e 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/event/CommandListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/event/CommandListener.java
@@ -28,7 +28,6 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
-import org.luaj.vm2.LuaValue;
 
 import java.util.HashMap;
 import java.util.HashSet;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/event/EventListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/event/EventListener.java
index 4c5feada..958d13a4 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/event/EventListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/event/EventListener.java
@@ -153,7 +153,7 @@ public class EventListener implements Listener {
 
         for (Player player : Bukkit.getOnlinePlayers()) {
             if(!Permission.BUILD.hasPermission(player)) continue;
-            if (tntRegion.inRegion(player.getLocation(), RegionType.NORMAL, RegionExtensionType.NORMAL)) {
+            if (tntRegion.inRegion(player.getLocation())) {
                 ScriptRunner.callEvent(player, SteamWarGlobalLuaPlugin.EventType.TNTSpawn, LuaValue.NIL, event);
             }
         }
@@ -171,11 +171,11 @@ public class EventListener implements Listener {
         table.set("y", event.getLocation().getY());
         table.set("z", event.getLocation().getZ());
 
-        boolean inBuild = event.blockList().stream().anyMatch(block -> tntRegion.inRegion(block.getLocation(), RegionType.BUILD, RegionExtensionType.EXTENSION));
+        boolean inBuild = event.blockList().stream().anyMatch(block -> tntRegion.getBuildArea().inRegion(block.getLocation(), true));
 
         for (Player player : Bukkit.getOnlinePlayers()) {
             if(!Permission.BUILD.hasPermission(player)) continue;
-            if (tntRegion.inRegion(player.getLocation(), RegionType.NORMAL, RegionExtensionType.NORMAL)) {
+            if (tntRegion.inRegion(player.getLocation())) {
                 ScriptRunner.callEvent(player, SteamWarGlobalLuaPlugin.EventType.TNTExplode, table, event);
                 if (inBuild) {
                     ScriptRunner.callEvent(player, SteamWarGlobalLuaPlugin.EventType.TNTExplodeInBuild, table, event);
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/SteamWarLuaPlugin.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/SteamWarLuaPlugin.java
index c3370904..a17943a9 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/SteamWarLuaPlugin.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/SteamWarLuaPlugin.java
@@ -22,19 +22,14 @@ package de.steamwar.bausystem.features.script.lua;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
-import com.sk89q.worldedit.bukkit.BukkitPlayer;
-import com.sk89q.worldedit.bukkit.WorldEditPlugin;
 import com.sk89q.worldedit.event.platform.CommandEvent;
 import com.sk89q.worldedit.extension.platform.Actor;
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.configplayer.Config;
 import de.steamwar.bausystem.features.script.ScriptRunner;
 import de.steamwar.bausystem.features.script.lua.libs.LuaLib;
 import de.steamwar.bausystem.features.world.WorldEditListener;
 import de.steamwar.bausystem.utils.WorldEditUtils;
 import de.steamwar.inventory.SWAnvilInv;
-import net.md_5.bungee.api.ChatMessageType;
-import net.md_5.bungee.api.chat.BaseComponent;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
@@ -47,8 +42,6 @@ import org.luaj.vm2.LuaValue;
 import org.luaj.vm2.Varargs;
 import org.luaj.vm2.lib.*;
 
-import java.lang.reflect.Proxy;
-import java.net.InetSocketAddress;
 import java.util.*;
 import java.util.logging.Level;
 
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/ScoreboardLib.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/ScoreboardLib.java
index af9c67ae..ff09ac9a 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/ScoreboardLib.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/ScoreboardLib.java
@@ -24,9 +24,7 @@ import de.steamwar.bausystem.utils.ScoreboardElement;
 import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 import org.luaj.vm2.LuaTable;
-import org.luaj.vm2.LuaValue;
 import org.luaj.vm2.Varargs;
-import org.luaj.vm2.lib.TwoArgFunction;
 import org.luaj.vm2.lib.VarArgFunction;
 
 @Linked
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/ServerLib.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/ServerLib.java
index 10a41830..039b849f 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/ServerLib.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/ServerLib.java
@@ -21,7 +21,6 @@ package de.steamwar.bausystem.features.script.lua.libs;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.features.loader.Loader;
 import de.steamwar.bausystem.features.loader.LoaderRecorder;
 import de.steamwar.bausystem.features.tpslimit.TPSUtils;
 import de.steamwar.inventory.SWItem;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/shieldprinting/impl/PistonConfiguration.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/shieldprinting/impl/PistonConfiguration.java
index dab77b8e..c3efb459 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/shieldprinting/impl/PistonConfiguration.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/shieldprinting/impl/PistonConfiguration.java
@@ -23,7 +23,6 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.shieldprinting.BlockDataConfiguration;
 import de.steamwar.inventory.SWItem;
 import org.bukkit.Material;
-import org.bukkit.block.data.BlockData;
 import org.bukkit.block.data.type.Piston;
 import org.bukkit.entity.Player;
 
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/SimulatorElement.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/SimulatorElement.java
index 119143db..88aaaa96 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/SimulatorElement.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/SimulatorElement.java
@@ -33,7 +33,6 @@ import yapion.hierarchy.types.YAPIONObject;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
-import java.util.Map;
 import java.util.function.BiConsumer;
 
 @Getter
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/SimulatorPhase.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/SimulatorPhase.java
index b226d124..f69977a6 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/SimulatorPhase.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/SimulatorPhase.java
@@ -25,8 +25,6 @@ import lombok.Setter;
 import org.bukkit.util.Vector;
 import yapion.hierarchy.types.YAPIONObject;
 
-import java.util.List;
-import java.util.Map;
 import java.util.function.BiConsumer;
 
 @Getter
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/LaufbauCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/LaufbauCommand.java
index daff9d87..34beeee7 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/LaufbauCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/LaufbauCommand.java
@@ -20,12 +20,10 @@
 package de.steamwar.bausystem.features.slaves.laufbau;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.SWUtils;
 import de.steamwar.bausystem.shared.Pair;
 import de.steamwar.bausystem.utils.WorldEditUtils;
 import de.steamwar.command.SWCommand;
-import de.steamwar.command.TypeValidator;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/PanzernCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/PanzernCommand.java
index cca7a266..6c983358 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/PanzernCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/PanzernCommand.java
@@ -20,14 +20,12 @@
 package de.steamwar.bausystem.features.slaves.panzern;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.SWUtils;
 import de.steamwar.bausystem.shared.Pair;
 import de.steamwar.bausystem.utils.WorldEditUtils;
 import de.steamwar.command.PreviousArguments;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeMapper;
-import de.steamwar.command.TypeValidator;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/testblock/blockcounter/BlockCount.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/testblock/blockcounter/BlockCount.java
index 84853b8c..e0e79f77 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/testblock/blockcounter/BlockCount.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/testblock/blockcounter/BlockCount.java
@@ -24,7 +24,6 @@ import de.steamwar.bausystem.features.tpslimit.TPSUtils;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.RegionUtils;
 import lombok.ToString;
-import org.bukkit.Bukkit;
 import org.bukkit.block.Block;
 import org.bukkit.scheduler.BukkitTask;
 
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceManager.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceManager.java
index 060db33b..a61ed1f6 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceManager.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceManager.java
@@ -25,12 +25,10 @@ import de.steamwar.bausystem.features.tracer.rendering.dynamicflags.AtFlag;
 import de.steamwar.bausystem.features.tracer.rendering.dynamicflags.IsolateFlag;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.linkage.Linked;
-import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerQuitEvent;
-import org.bukkit.event.server.PluginEnableEvent;
 
 import java.io.File;
 import java.util.*;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/BindCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/BindCommand.java
index 9a93977e..c71c8400 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/BindCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/BindCommand.java
@@ -8,7 +8,6 @@ import com.sk89q.worldedit.extension.platform.Actor;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.SWUtils;
-import de.steamwar.bausystem.features.script.ScriptCommand;
 import de.steamwar.bausystem.features.script.ScriptRunner;
 import de.steamwar.bausystem.features.world.WorldEditListener;
 import de.steamwar.bausystem.utils.WorldEditUtils;
@@ -28,10 +27,12 @@ import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.persistence.PersistentDataType;
-import org.luaj.vm2.LuaValue;
 
 import java.lang.reflect.Field;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
 import java.util.logging.Level;
 import java.util.stream.Collectors;
 
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/ClearCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/ClearCommand.java
index 1df08e5d..f1e64ce5 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/ClearCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/ClearCommand.java
@@ -20,9 +20,7 @@
 package de.steamwar.bausystem.features.util;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.Permission;
 import de.steamwar.command.SWCommand;
-import de.steamwar.command.TypeValidator;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/KillAllCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/KillAllCommand.java
index c0d99689..0812255e 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/KillAllCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/KillAllCommand.java
@@ -22,8 +22,8 @@ package de.steamwar.bausystem.features.util;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.SWUtils;
 import de.steamwar.bausystem.region.Region;
-import de.steamwar.bausystem.region.utils.RegionSelectionType;
 import de.steamwar.bausystem.region.RegionUtils;
+import de.steamwar.bausystem.region.utils.RegionSelectionType;
 import de.steamwar.command.SWCommand;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/PistonCalculator.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/PistonCalculator.java
index 5cc4b744..b50ab2fa 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/PistonCalculator.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/PistonCalculator.java
@@ -21,7 +21,10 @@ package de.steamwar.bausystem.features.util;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
-import de.steamwar.entity.*;
+import de.steamwar.entity.CWireframe;
+import de.steamwar.entity.REntity;
+import de.steamwar.entity.REntityServer;
+import de.steamwar.entity.RTextDisplay;
 import de.steamwar.linkage.Linked;
 import de.steamwar.linkage.MinVersion;
 import org.bukkit.Bukkit;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/TimeCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/TimeCommand.java
index 249f4072..ea38d446 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/TimeCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/TimeCommand.java
@@ -20,8 +20,9 @@
 package de.steamwar.bausystem.features.util;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.Permission;
-import de.steamwar.command.*;
+import de.steamwar.command.SWCommand;
+import de.steamwar.command.SWCommandUtils;
+import de.steamwar.command.TypeMapper;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/warp/WarpCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/warp/WarpCommand.java
index aad07fcb..4b35cef7 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/warp/WarpCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/warp/WarpCommand.java
@@ -20,13 +20,11 @@
 package de.steamwar.bausystem.features.warp;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.utils.ListChatView;
 import de.steamwar.bausystem.worlddata.WorldData;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.SWCommandUtils;
 import de.steamwar.command.TypeMapper;
-import de.steamwar.command.TypeValidator;
 import de.steamwar.linkage.Linked;
 import de.steamwar.linkage.api.Disable;
 import de.steamwar.linkage.api.Enable;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/BauMemberUpdate.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/BauMemberUpdate.java
index d5aa97d5..1e1eba45 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/BauMemberUpdate.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/BauMemberUpdate.java
@@ -22,6 +22,7 @@ package de.steamwar.bausystem.features.world;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.region.GlobalRegion;
+import de.steamwar.bausystem.region.RegionSystem;
 import de.steamwar.bausystem.utils.BauMemberUpdateEvent;
 import de.steamwar.bausystem.utils.bossbar.BauSystemBossbar;
 import de.steamwar.bausystem.utils.bossbar.BossBarService;
@@ -94,7 +95,7 @@ public class BauMemberUpdate extends PacketHandler implements Listener {
     }
 
     private static void showSpectatorNotice(Player player) {
-        BauSystemBossbar bossbar = BossBarService.instance.get(player, GlobalRegion.getInstance(), "spectator");
+        BauSystemBossbar bossbar = BossBarService.instance.get(player, RegionSystem.INSTANCE.getGlobalRegion(), "spectator");
         bossbar.setTitle(BauSystem.MESSAGE.parse("SPECTATOR", player));
         bossbar.setColor(BarColor.WHITE);
         bossbar.setStyle(BarStyle.SOLID);
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/KickallCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/KickallCommand.java
index d4e5d3f7..44bdb818 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/KickallCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/KickallCommand.java
@@ -22,7 +22,6 @@ package de.steamwar.bausystem.features.world;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.config.BauServer;
 import de.steamwar.command.SWCommand;
-import de.steamwar.command.TypeValidator;
 import de.steamwar.linkage.Linked;
 import de.steamwar.linkage.LinkedInstance;
 import org.bukkit.Bukkit;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/WorldEditSelectionSaver.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/WorldEditSelectionSaver.java
index 1d989226..85351f06 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/WorldEditSelectionSaver.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/WorldEditSelectionSaver.java
@@ -32,7 +32,6 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
-import org.checkerframework.checker.units.qual.min;
 
 import java.io.*;
 import java.util.List;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
index 72a007a0..53959621 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
@@ -44,11 +44,15 @@ public interface Region {
     <T extends Enum<T> & Flag.Value<T>> Optional<T> getFlag(@NonNull Flag<T> flag);
 
     default <T extends Enum<T> & Flag.Value<T>> boolean isFlag(@NonNull Flag<T> flag, T value) {
+        return isFlag(flag, value, false);
+    }
+
+    default <T extends Enum<T> & Flag.Value<T>> boolean isFlag(@NonNull Flag<T> flag, T value, boolean defaultValue) {
         if (hasFlag(flag).isReadable()) {
             Optional<T> optional = getFlag(flag);
             return optional.isPresent() && optional.get() == value;
         }
-        return false;
+        return defaultValue;
     }
 
     Point getMinPoint();
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/Flag.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/Flag.java
index 7cfa0347..e9eb963b 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/Flag.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/Flag.java
@@ -54,12 +54,12 @@ public final class Flag<T extends Enum<T> & Flag.Value<T>> implements EnumDispla
     private final Class<? extends Flag.Value<T>> valueType;
 
     @Getter
-    private final Flag.Value<?> defaultValue;
+    private final T defaultValue;
 
     @Getter
     private final Flag.Value<?>[] values;
 
-    private Flag(String name, String chatValue, Class<? extends Flag.Value<T>> valueType, Value<T> defaultValue) {
+    private Flag(String name, String chatValue, Class<? extends Flag.Value<T>> valueType, T defaultValue) {
         flags.add(this);
 
         this.name = name;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/PlaceItemUtils.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/PlaceItemUtils.java
index 3202c88e..6ada6d86 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/PlaceItemUtils.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/PlaceItemUtils.java
@@ -27,7 +27,6 @@ import org.bukkit.*;
 import org.bukkit.block.*;
 import org.bukkit.block.data.*;
 import org.bukkit.block.data.type.Hopper;
-import org.bukkit.block.data.type.Observer;
 import org.bukkit.block.data.type.*;
 import org.bukkit.entity.Player;
 import org.bukkit.event.block.BlockCanBuildEvent;
@@ -38,7 +37,9 @@ import org.bukkit.inventory.meta.*;
 import org.bukkit.util.RayTraceResult;
 import org.bukkit.util.Vector;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
 
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/bossbar/RegionedBossbar.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/bossbar/RegionedBossbar.java
index 5fb1cc99..843c8500 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/bossbar/RegionedBossbar.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/bossbar/RegionedBossbar.java
@@ -21,8 +21,6 @@ package de.steamwar.bausystem.utils.bossbar;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.region.Region;
-import de.steamwar.bausystem.region.utils.RegionExtensionType;
-import de.steamwar.bausystem.region.utils.RegionType;
 import org.bukkit.Bukkit;
 import org.bukkit.boss.BarColor;
 import org.bukkit.boss.BarFlag;
@@ -120,7 +118,7 @@ public class RegionedBossbar implements BauSystemBossbar, Listener {
     @EventHandler
     public void onPlayerMove(PlayerMoveEvent event) {
         if (event.getPlayer() != player) return;
-        if (region.inRegion(event.getTo(), RegionType.NORMAL, RegionExtensionType.NORMAL)) {
+        if (region.inRegion(event.getTo())) {
             bossBar.addPlayer(player);
         } else {
             bossBar.removePlayer(player);

From ae15e16daeafb0862459cf645f8b3cb00c4f7417 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sun, 22 Dec 2024 22:13:25 +0100
Subject: [PATCH 021/214] Update BauMemberUpdate

---
 .../de/steamwar/bausystem/features/world/BauMemberUpdate.java  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/BauMemberUpdate.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/BauMemberUpdate.java
index 1e1eba45..7077cd56 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/BauMemberUpdate.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/BauMemberUpdate.java
@@ -21,7 +21,6 @@ package de.steamwar.bausystem.features.world;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.region.GlobalRegion;
 import de.steamwar.bausystem.region.RegionSystem;
 import de.steamwar.bausystem.utils.BauMemberUpdateEvent;
 import de.steamwar.bausystem.utils.bossbar.BauSystemBossbar;
@@ -76,7 +75,7 @@ public class BauMemberUpdate extends PacketHandler implements Listener {
                     SPECTATORS.remove(player);
                     newBuilder.add(player);
                     player.removePotionEffect(PotionEffectType.GLOWING);
-                    BossBarService.instance.remove(player, GlobalRegion.getInstance(), "spectator");
+                    BossBarService.instance.remove(player, RegionSystem.INSTANCE.getGlobalRegion(), "spectator");
                 }
             }
         });

From ef19959eb25249f6140a7c9ef3945b90a80627c4 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Mon, 23 Dec 2024 10:45:20 +0100
Subject: [PATCH 022/214] Fix some more build errors

---
 .../BauSystem_Main/src/BauSystem.properties   |  1 -
 .../src/BauSystem_de.properties               |  1 -
 .../bausystem/features/region/TNTCommand.java |  2 +-
 .../features/region/TestblockCommand.java     |  4 +-
 .../features/util/KillAllCommand.java         |  1 -
 .../util}/RegionSelectionType.java            |  2 +-
 .../features/util/SelectCommand.java          | 12 ++----
 .../util/items/KillAllBauGuiItem.java         |  2 +-
 .../region/utils/RegionExtensionType.java     | 14 +++++++
 .../bausystem/region/utils/RegionType.java    | 39 +++++++++++++++++++
 10 files changed, 62 insertions(+), 16 deletions(-)
 rename BauSystem/BauSystem_Main/src/de/steamwar/bausystem/{region/utils => features/util}/RegionSelectionType.java (59%)
 create mode 100644 BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/utils/RegionExtensionType.java
 create mode 100644 BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/utils/RegionType.java

diff --git a/BauSystem/BauSystem_Main/src/BauSystem.properties b/BauSystem/BauSystem_Main/src/BauSystem.properties
index 20bb5f87..e7bf15eb 100644
--- a/BauSystem/BauSystem_Main/src/BauSystem.properties
+++ b/BauSystem/BauSystem_Main/src/BauSystem.properties
@@ -940,7 +940,6 @@ SELECT_HELP=§8/§eselect §8[§7RegionsTyp§8] §8- §7Select a region type
 SELECT_EXTENSION_HELP=§8/§eselect §8[§7RegionsTyp§8] §8[§7Extension§8] §8- §7Select a region type with or without extension
 SELECT_GLOBAL_REGION=§cThe global region cannot be selected
 SELECT_NO_TYPE=§cThis region has no {0}
-SELECT_NO_EXTENSION=§cThis region has no extension
 SELECT_MESSAGE=§7WorldEdit selection set to {0}, {1}, {2} and {3}, {4}, {5}
 SKULL_HELP=§8/§eskull §8[§eplayer§8] §8-§7 Receive a player head
 SKULL_INVALID=§cInvalid player name
diff --git a/BauSystem/BauSystem_Main/src/BauSystem_de.properties b/BauSystem/BauSystem_Main/src/BauSystem_de.properties
index 8af9ba4b..101eba76 100644
--- a/BauSystem/BauSystem_Main/src/BauSystem_de.properties
+++ b/BauSystem/BauSystem_Main/src/BauSystem_de.properties
@@ -878,7 +878,6 @@ SELECT_HELP=§8/§eselect §8[§7RegionsTyp§8] §8- §7Wähle einen RegionsTyp
 SELECT_EXTENSION_HELP=§8/§eselect §8[§7RegionsTyp§8] §8[§7Extension§8] §8- §7Wähle einen RegionsTyp aus mit oder ohne Extension
 SELECT_GLOBAL_REGION=§cDie globale Region kannst du nicht auswählen
 SELECT_NO_TYPE=§cDiese Region hat keinen {0}
-SELECT_NO_EXTENSION=§cDiese Region hat keine Ausfahrmaße
 SELECT_MESSAGE=§7WorldEdit auswahl auf {0}, {1}, {2} und {3}, {4}, {5} gesetzt
 SKULL_HELP=§8/§eskull §8[§eSpieler§8] §8-§7 Gibt einen SpielerKopf
 SKULL_INVALID=§cUngültiger Spieler
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TNTCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TNTCommand.java
index 0aa8a4c9..3c862f4f 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TNTCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TNTCommand.java
@@ -23,7 +23,7 @@ import de.steamwar.bausystem.BauSystem;
 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.flagvalues.TNTMode;
+import de.steamwar.bausystem.region.flags.TNTMode;
 import de.steamwar.bausystem.region.utils.RegionType;
 import de.steamwar.command.PreviousArguments;
 import de.steamwar.command.SWCommand;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java
index a56718c9..987d53db 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java
@@ -23,8 +23,8 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.config.BauServer;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.RegionUtils;
+import de.steamwar.bausystem.region.flags.ColorMode;
 import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.region.flags.flagvalues.ColorMode;
 import de.steamwar.bausystem.region.utils.RegionExtensionType;
 import de.steamwar.bausystem.region.utils.RegionType;
 import de.steamwar.bausystem.utils.PasteBuilder;
@@ -101,7 +101,7 @@ public class TestblockCommand extends SWCommand {
                     .onlyColors(onlyColors)
                     .removeTNT(removeTNT)
                     .removeWater(removeWater)
-                    .color(region.getPlain(Flag.COLOR, ColorMode.class).getColor());
+                    .color(region.getFlag(Flag.COLOR).orElse(ColorMode.YELLOW).getColor());
             region.reset(pasteBuilder, RegionType.TESTBLOCK, regionExtensionType);
             RegionUtils.message(region, "REGION_TB_DONE");
         } catch (SecurityException e) {
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/KillAllCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/KillAllCommand.java
index 0812255e..b461939f 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/KillAllCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/KillAllCommand.java
@@ -23,7 +23,6 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.SWUtils;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.RegionUtils;
-import de.steamwar.bausystem.region.utils.RegionSelectionType;
 import de.steamwar.command.SWCommand;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/utils/RegionSelectionType.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/RegionSelectionType.java
similarity index 59%
rename from BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/utils/RegionSelectionType.java
rename to BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/RegionSelectionType.java
index 00d54bb2..4103dd42 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/utils/RegionSelectionType.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/RegionSelectionType.java
@@ -1,4 +1,4 @@
-package de.steamwar.bausystem.region.utils;
+package de.steamwar.bausystem.features.util;
 
 public enum RegionSelectionType {
     LOCAL,
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/SelectCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/SelectCommand.java
index 7a11d678..73739e40 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/SelectCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/SelectCommand.java
@@ -21,19 +21,15 @@ public class SelectCommand extends SWCommand {
     public void baurahmenCommand(@Validator Player p, RegionType regionType, @OptionalValue("NORMAL") RegionExtensionType regionExtensionType) {
         Region region = Region.getRegion(p.getLocation());
 
-        if (region.isGlobal()) {
+        if (region.getType().isGlobal()) {
             BauSystem.MESSAGE.send("SELECT_GLOBAL_REGION", p);
             return;
         }
 
-        if (!region.hasType(regionType)) {
+        if (!regionType.getHasType().test(region)) {
             BauSystem.MESSAGE.send("SELECT_NO_TYPE", p, BauSystem.MESSAGE.parse(regionType.getChatValue(), p));
             return;
         }
-        if (regionExtensionType == RegionExtensionType.EXTENSION && !region.hasExtensionType(regionType)) {
-            BauSystem.MESSAGE.send("SELECT_NO_EXTENSION", p);
-            return;
-        }
 
         setSelection(regionType, regionExtensionType, region, p);
     }
@@ -44,8 +40,8 @@ public class SelectCommand extends SWCommand {
     }
 
     private void setSelection(RegionType regionType, RegionExtensionType regionExtensionType, Region region, Player p) {
-        Point minPoint = region.getMinPoint(regionType, regionExtensionType);
-        Point maxPoint = region.getMaxPoint(regionType, regionExtensionType);
+        Point minPoint = regionType.getToMinPoint().apply(region, regionExtensionType.isExtension());
+        Point maxPoint = regionType.getToMaxPoint().apply(region, regionExtensionType.isExtension());
 
         FlatteningWrapper.impl.setSelection(p, minPoint, maxPoint);
         BauSystem.MESSAGE.send("SELECT_MESSAGE", p, minPoint.getX(), minPoint.getY(), minPoint.getZ(), maxPoint.getX(), maxPoint.getY(), maxPoint.getZ());
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/KillAllBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/KillAllBauGuiItem.java
index a5f76346..a4dd4882 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/KillAllBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/KillAllBauGuiItem.java
@@ -23,7 +23,7 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.features.util.KillAllCommand;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
-import de.steamwar.bausystem.region.utils.RegionSelectionType;
+import de.steamwar.bausystem.features.util.RegionSelectionType;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.linkage.Linked;
 import de.steamwar.linkage.LinkedInstance;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/utils/RegionExtensionType.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/utils/RegionExtensionType.java
new file mode 100644
index 00000000..b28031f5
--- /dev/null
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/utils/RegionExtensionType.java
@@ -0,0 +1,14 @@
+package de.steamwar.bausystem.region.utils;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+@Getter
+public enum RegionExtensionType {
+    NORMAL(false),
+    EXTENSION(true),
+    ;
+
+    private final boolean extension;
+}
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/utils/RegionType.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/utils/RegionType.java
new file mode 100644
index 00000000..79d83ff7
--- /dev/null
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/utils/RegionType.java
@@ -0,0 +1,39 @@
+package de.steamwar.bausystem.region.utils;
+
+import de.steamwar.bausystem.region.Point;
+import de.steamwar.bausystem.region.Region;
+import de.steamwar.bausystem.shared.EnumDisplay;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.function.BiFunction;
+import java.util.function.Function;
+import java.util.function.Predicate;
+
+@AllArgsConstructor
+@Getter
+public enum RegionType implements EnumDisplay {
+    NORMAL("REGION_TYPE_NORMAL",
+            region -> true,
+            region -> null,
+            (region, extension) -> region.getMinPoint(),
+            (region, extension) -> region.getMaxPoint()),
+    BUILD("REGION_TYPE_BUILD",
+            region -> region.getBuildArea().isPresent(),
+            Region::getBuildArea,
+            (region, extension) -> region.getBuildArea().getMinPoint(extension),
+            (region, extension) -> region.getBuildArea().getMaxPoint(extension)),
+    TESTBLOCK("REGION_TYPE_ONLY_TB",
+            region -> region.getTestblockArea().isPresent(),
+            Region::getTestblockArea,
+            (region, extension) -> region.getTestblockArea().getMinPoint(extension),
+            (region, extension) -> region.getTestblockArea().getMaxPoint(extension)),
+    ;
+
+    private String chatValue;
+
+    private Predicate<Region> hasType;
+    private Function<Region, Region.Inner> toInner;
+    private BiFunction<Region, Boolean, Point> toMinPoint;
+    private BiFunction<Region, Boolean, Point> toMaxPoint;
+}

From 5e5bfedb524060d0c316d66c886a355cd5c503d0 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Mon, 23 Dec 2024 12:12:06 +0100
Subject: [PATCH 023/214] Fix some more build errors

---
 .../src/de/steamwar/bausystem/BauSystem.java  |  8 +++---
 .../features/region/ColorCommand.java         |  6 ++---
 .../features/region/RegionCommand.java        |  4 +--
 .../features/region/ResetCommand.java         |  6 ++---
 .../region/items/ColorBauGuiItem.java         |  2 +-
 .../features/region/items/TntBauGuiItem.java  |  2 +-
 .../features/script/lua/libs/RegionLib.java   | 27 +++++++------------
 7 files changed, 25 insertions(+), 30 deletions(-)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java
index 1d47beb8..4774565c 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java
@@ -32,9 +32,7 @@ import de.steamwar.bausystem.features.tracer.TraceManager;
 import de.steamwar.bausystem.features.tracer.TraceRecorder;
 import de.steamwar.bausystem.features.world.BauScoreboard;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
-import de.steamwar.bausystem.region.loader.PrototypeLoader;
-import de.steamwar.bausystem.region.loader.RegionLoader;
-import de.steamwar.bausystem.region.loader.Updater;
+import de.steamwar.bausystem.region.RegionSystem;
 import de.steamwar.bausystem.utils.ScoreboardElement;
 import de.steamwar.bausystem.utils.TickListener;
 import de.steamwar.bausystem.utils.TickManager;
@@ -95,6 +93,8 @@ public class BauSystem extends JavaPlugin {
         instance = this;
         SWUtils.setBausystem(instance);
 
+        RegionSystem.INSTANCE.load();
+        /*
         try {
             PrototypeLoader.load();
             RegionLoader.load();
@@ -107,6 +107,7 @@ public class BauSystem extends JavaPlugin {
 
         new Updater(PrototypeLoader.file, PrototypeLoader::load);
         new Updater(RegionLoader.file, RegionLoader::load);
+         */
 
         SWCommandUtils.addValidator(Player.class, validator(Permission.BUILD));
         SWCommandUtils.addValidator(CommandSender.class, validator(Permission.BUILD));
@@ -223,6 +224,7 @@ public class BauSystem extends JavaPlugin {
         });
 
         WorldData.write();
+        RegionSystem.INSTANCE.save();
         Config.getInstance().saveAll();
     }
 
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ColorCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ColorCommand.java
index 545219a2..34401970 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ColorCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ColorCommand.java
@@ -23,8 +23,8 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.config.BauServer;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.RegionUtils;
+import de.steamwar.bausystem.region.flags.ColorMode;
 import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.region.flags.flagvalues.ColorMode;
 import de.steamwar.bausystem.region.utils.RegionExtensionType;
 import de.steamwar.bausystem.region.utils.RegionType;
 import de.steamwar.bausystem.utils.PasteBuilder;
@@ -57,11 +57,11 @@ public class ColorCommand extends SWCommand {
             return;
         }
         Region region = Region.getRegion(p.getLocation());
-        if (region.isGlobal()) {
+        if (region.getType().isGlobal()) {
             BauSystem.MESSAGE.send("REGION_COLOR_NO_REGION", p);
             return;
         }
-        region.set(Flag.COLOR, color);
+        region.setFlag(Flag.COLOR, color);
         try {
             PasteBuilder pasteBuilder = new PasteBuilder(new PasteBuilder.FileProvider(region.getResetFile(RegionType.NORMAL)))
                     .ignoreAir(true)
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionCommand.java
index 6d8d6f4d..e9183e32 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionCommand.java
@@ -32,7 +32,7 @@ import de.steamwar.bausystem.region.Point;
 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.flagvalues.ColorMode;
+import de.steamwar.bausystem.region.flags.ColorMode;
 import de.steamwar.bausystem.region.utils.RegionExtensionType;
 import de.steamwar.bausystem.region.utils.RegionType;
 import de.steamwar.bausystem.shared.Pair;
@@ -71,7 +71,7 @@ public class RegionCommand extends SWCommand {
     }
 
     static boolean checkGlobalRegion(Region region, Player p) {
-        if (region.isGlobal()) {
+        if (region.getType().isGlobal()) {
             BauSystem.MESSAGE.send("REGION_REGION_NO_REGION", p);
             return true;
         }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ResetCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ResetCommand.java
index 4490a146..cc12f7b8 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ResetCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ResetCommand.java
@@ -21,11 +21,11 @@ package de.steamwar.bausystem.features.region;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.config.BauServer;
-import de.steamwar.bausystem.region.GlobalRegion;
 import de.steamwar.bausystem.region.Region;
+import de.steamwar.bausystem.region.RegionSystem;
 import de.steamwar.bausystem.region.RegionUtils;
 import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.region.flags.flagvalues.ColorMode;
+import de.steamwar.bausystem.region.flags.ColorMode;
 import de.steamwar.bausystem.region.utils.RegionExtensionType;
 import de.steamwar.bausystem.region.utils.RegionType;
 import de.steamwar.bausystem.utils.PasteBuilder;
@@ -99,7 +99,7 @@ public class ResetCommand extends SWCommand {
 
     private Region regionCheck(Player player) {
         Region region = Region.getRegion(player.getLocation());
-        if (region == GlobalRegion.getInstance()) {
+        if (region == RegionSystem.INSTANCE.getGlobalRegion()) {
             BauSystem.MESSAGE.send("REGION_RESET_NO_REGION", player);
             return null;
         }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/ColorBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/ColorBauGuiItem.java
index a38c397f..119b6fae 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/ColorBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/ColorBauGuiItem.java
@@ -25,7 +25,7 @@ import de.steamwar.bausystem.linkage.specific.BauGuiItem;
 import de.steamwar.bausystem.region.Color;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.region.flags.flagvalues.ColorMode;
+import de.steamwar.bausystem.region.flags.ColorMode;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.inventory.SWListInv;
 import de.steamwar.linkage.Linked;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/TntBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/TntBauGuiItem.java
index 38f1b04a..77969ff8 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/TntBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/TntBauGuiItem.java
@@ -24,7 +24,7 @@ import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.region.flags.flagvalues.TNTMode;
+import de.steamwar.bausystem.region.flags.TNTMode;
 import de.steamwar.bausystem.region.utils.RegionType;
 import de.steamwar.inventory.SWInventory;
 import de.steamwar.inventory.SWItem;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/RegionLib.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/RegionLib.java
index f615dad3..c0c5a3d5 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/RegionLib.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/RegionLib.java
@@ -20,13 +20,8 @@
 package de.steamwar.bausystem.features.script.lua.libs;
 
 import de.steamwar.bausystem.features.loader.Loader;
-import de.steamwar.bausystem.region.GlobalRegion;
 import de.steamwar.bausystem.region.Region;
-import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.region.flags.flagvalues.FireMode;
-import de.steamwar.bausystem.region.flags.flagvalues.FreezeMode;
-import de.steamwar.bausystem.region.flags.flagvalues.ProtectMode;
-import de.steamwar.bausystem.region.flags.flagvalues.TNTMode;
+import de.steamwar.bausystem.region.flags.*;
 import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 import org.luaj.vm2.LuaTable;
@@ -49,24 +44,22 @@ public class RegionLib implements LuaLib {
         table.set("name", getter(() -> region.get().getName()));
         table.set("type", getter(() -> {
             Region region1 = region.get();
-            if (region1 instanceof GlobalRegion) {
+            if (region1.getType().isGlobal()) {
                 return "global";
-            } else {
-                return region1.getPrototype().getName();
             }
+            return region1.getPrototype().getName();
         }));
 
         LuaValue tntLib = LuaValue.tableOf();
-        tntLib.set("mode", getter(() -> region.get().getPlain(Flag.TNT, TNTMode.class).name()));
-        tntLib.set("enabled", getter(() -> region.get().getPlain(Flag.TNT, TNTMode.class) != TNTMode.DENY));
-        tntLib.set("onlyTb", getter(() -> region.get().getPlain(Flag.TNT, TNTMode.class) == TNTMode.ONLY_TB));
-        tntLib.set("onlyBuild", getter(() -> region.get().getPlain(Flag.TNT, TNTMode.class) == TNTMode.ONLY_BUILD));
-
+        tntLib.set("mode", getter(() -> region.get().getFlag(Flag.TNT).get().name()));
+        tntLib.set("enabled", getter(() -> region.get().getFlag(Flag.TNT).get() != TNTMode.DENY));
+        tntLib.set("onlyTb", getter(() -> region.get().getFlag(Flag.TNT).get() == TNTMode.ONLY_TB));
+        tntLib.set("onlyBuild", getter(() -> region.get().getFlag(Flag.TNT).get() == TNTMode.ONLY_BUILD));
         table.set("tnt", tntLib);
 
-        table.set("fire", getter(() -> region.get().getPlain(Flag.FIRE, FireMode.class) == FireMode.ALLOW));
-        table.set("freeze", getter(() -> region.get().getPlain(Flag.FREEZE, FreezeMode.class) == FreezeMode.ACTIVE));
-        table.set("protect", getter(() -> region.get().getPlain(Flag.PROTECT, ProtectMode.class) == ProtectMode.ACTIVE));
+        table.set("fire", getter(() -> region.get().getFlag(Flag.FIRE).get() == FireMode.ALLOW));
+        table.set("freeze", getter(() -> region.get().getFlag(Flag.FREEZE).get() == FreezeMode.ACTIVE));
+        table.set("protect", getter(() -> region.get().getFlag(Flag.PROTECT).get() == ProtectMode.ACTIVE));
 
         //LuaValue traceLib = LuaValue.tableOf();
         //traceLib.set("active", getter(() -> !region.get().isGlobal() && Recorder.INSTANCE.get(region.get()) instanceof ActiveTracer));

From 3d0e5fc28d2cb48beec31449ef4dac773988de53 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Tue, 24 Dec 2024 14:47:23 +0100
Subject: [PATCH 024/214] Fix many things

---
 .../features/design/endstone/DesignEndStone.java     | 12 ++++++------
 .../features/loadtimer/LoadtimerCommand.java         |  4 ++--
 .../features/loadtimer/LoadtimerGuiItem.java         |  4 ++--
 .../bausystem/features/region/RegionCommand.java     | 12 ++++++------
 .../features/script/lua/libs/StorageLib.java         |  3 ++-
 .../shieldprinting/ShieldPrintingCommand.java        |  6 +++---
 .../features/techhider/TechHiderCommand.java         |  2 +-
 .../bausystem/features/tracer/TraceRepository.java   |  4 +++-
 .../bausystem/features/xray/XrayCommand.java         |  2 +-
 .../src/de/steamwar/bausystem/region/Region.java     |  7 +++++++
 .../bausystem/utils/bossbar/BossBarService.java      |  2 +-
 11 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/design/endstone/DesignEndStone.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/design/endstone/DesignEndStone.java
index f04fd5e9..3b7645b6 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/design/endstone/DesignEndStone.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/design/endstone/DesignEndStone.java
@@ -48,12 +48,12 @@ public class DesignEndStone {
     private double maxBlastResistance;
 
     public DesignEndStone(Region region) {
-        this.minX = region.getMinPointBuild().getX();
-        this.minY = region.getMinPointBuild().getY();
-        this.minZ = region.getMinPointBuild().getZ();
-        this.maxX = region.getMaxPointBuild().getX();
-        this.maxY = region.getMaxPointBuild().getY();
-        this.maxZ = region.getMaxPointBuild().getZ();
+        this.minX = region.getBuildArea().getMinPoint(false).getX();
+        this.minY = region.getBuildArea().getMinPoint(false).getY();
+        this.minZ = region.getBuildArea().getMinPoint(false).getZ();
+        this.maxX = region.getBuildArea().getMaxPoint(false).getX();
+        this.maxY = region.getBuildArea().getMaxPoint(false).getY();
+        this.maxZ = region.getBuildArea().getMaxPoint(false).getZ();
         wsOrAs = region.getName().startsWith("ws") || region.getName().startsWith("as");
         maxBlastResistance = wsOrAs ? 6.1 : 9.0;
 
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loadtimer/LoadtimerCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loadtimer/LoadtimerCommand.java
index 503c1b47..b0dcba38 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loadtimer/LoadtimerCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loadtimer/LoadtimerCommand.java
@@ -39,7 +39,7 @@ public class LoadtimerCommand extends SWCommand {
     @Register(value = "start", description = {"LOADTIMER_HELP_START_2", "LOADTIMER_HELP_START_3"})
     public void start(@Validator Player p, TimerMode mode) {
         Region r = Region.getRegion(p.getLocation());
-        if (r.isGlobal()) return;
+        if (r.getType().isGlobal()) return;
         if (!Loadtimer.hasTimer(r))
             Loadtimer.createLoadtimer(r, mode == TimerMode.HALF);
     }
@@ -47,7 +47,7 @@ public class LoadtimerCommand extends SWCommand {
     @Register(value = "stop", description = "LOADTIMER_HELP_STOP")
     public void stop(@Validator Player p) {
         Region r = Region.getRegion(p.getLocation());
-        if (r.isGlobal()) return;
+        if (r.getType().isGlobal()) return;
         if (Loadtimer.hasTimer(r))
             Loadtimer.getTimer(r).delete();
     }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loadtimer/LoadtimerGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loadtimer/LoadtimerGuiItem.java
index f190d9f0..1df6c898 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loadtimer/LoadtimerGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loadtimer/LoadtimerGuiItem.java
@@ -46,7 +46,7 @@ public class LoadtimerGuiItem extends BauGuiItem {
     @Override
     public ItemStack getItem(Player player) {
         Region r = Region.getRegion(player.getLocation());
-        if (r.isGlobal())
+        if (r.getType().isGlobal())
             return new SWItem(Material.BOWL, BauSystem.MESSAGE.parse("LOADTIMER_GUI_GLOBAL", player)).getItemStack();
         if (Loadtimer.hasTimer(r)) {
             return new SWItem(Material.BOW, BauSystem.MESSAGE.parse("LOADTIMER_GUI_STOP", player)).getItemStack();
@@ -58,7 +58,7 @@ public class LoadtimerGuiItem extends BauGuiItem {
     @Override
     public boolean click(ClickType click, Player p) {
         Region r = Region.getRegion(p.getLocation());
-        if (r.isGlobal()) return false;
+        if (r.getType().isGlobal()) return false;
         if (Loadtimer.hasTimer(r)) {
             p.performCommand("lt stop");
         } else {
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionCommand.java
index e9183e32..6d5daa3d 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionCommand.java
@@ -31,8 +31,8 @@ import de.steamwar.bausystem.features.util.SelectCommand;
 import de.steamwar.bausystem.region.Point;
 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.ColorMode;
+import de.steamwar.bausystem.region.flags.Flag;
 import de.steamwar.bausystem.region.utils.RegionExtensionType;
 import de.steamwar.bausystem.region.utils.RegionType;
 import de.steamwar.bausystem.shared.Pair;
@@ -220,14 +220,14 @@ public class RegionCommand extends SWCommand {
             return;
         }
 
-        Point minPoint = region.getMinPoint(RegionType.BUILD, RegionExtensionType.NORMAL);
-        Point maxPoint = region.getMaxPoint(RegionType.BUILD, RegionExtensionType.NORMAL);
+        Point minPoint = region.getBuildArea().getMinPoint(false);
+        Point maxPoint = region.getBuildArea().getMaxPoint(false);
         switch (option) {
             case 0:
                 break;
             case 1:
-                minPoint = region.getMinPoint(RegionType.BUILD, RegionExtensionType.EXTENSION);
-                maxPoint = region.getMaxPoint(RegionType.BUILD, RegionExtensionType.EXTENSION);
+                minPoint = region.getBuildArea().getMinPoint(true);
+                maxPoint = region.getBuildArea().getMaxPoint(true);
                 break;
             case 2:
                 Pair<Location, Location> selection = WorldEditUtils.getSelection(p);
@@ -312,7 +312,7 @@ public class RegionCommand extends SWCommand {
             public List<String> tabCompletes(CommandSender commandSender, PreviousArguments previousArguments, String s) {
                 Player p = (Player) commandSender;
                 Region region = Region.getRegion(p.getLocation());
-                if (region.isGlobal()) {
+                if (region.getType().isGlobal()) {
                     return Collections.emptyList();
                 }
                 return region.getPrototype().getSkinMap().keySet().stream().map(c -> c.replace(' ', '_')).collect(Collectors.toList());
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/StorageLib.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/StorageLib.java
index 898b68a7..51a35bd7 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/StorageLib.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/StorageLib.java
@@ -21,6 +21,7 @@ package de.steamwar.bausystem.features.script.lua.libs;
 
 import com.google.gson.*;
 import de.steamwar.bausystem.region.Region;
+import de.steamwar.bausystem.region.RegionSystem;
 import de.steamwar.core.Core;
 import de.steamwar.linkage.Linked;
 import de.steamwar.linkage.api.Disable;
@@ -74,7 +75,7 @@ public class StorageLib implements LuaLib, Enable, Disable {
                 jsonObject.keySet().forEach(key -> {
                     map.put(key, fromJson(jsonObject.get(key)));
                 });
-                Region region = Region.getREGION_MAP().get(regionStorage.getName().substring(0, regionStorage.getName().length() - ".json".length()));
+                Region region = RegionSystem.INSTANCE.getRegion(regionStorage.getName().substring(0, regionStorage.getName().length() - ".json".length())).orElse(null);
                 REGION_STORAGE.put(region, map);
             } catch (Exception e) {}
         }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/shieldprinting/ShieldPrintingCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/shieldprinting/ShieldPrintingCommand.java
index 5bb60219..b09259fb 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/shieldprinting/ShieldPrintingCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/shieldprinting/ShieldPrintingCommand.java
@@ -54,7 +54,7 @@ public class ShieldPrintingCommand extends SWCommand implements Listener {
     @Register
     public void genericCommand(@Validator Player player, ShieldPrintingState shieldPrintingState) {
         Region region = Region.getRegion(player.getLocation());
-        if (region.isGlobal()) {
+        if (region.getType().isGlobal()) {
             BauSystem.MESSAGE.send("SHIELD_PRINTING_NO_REGION", player);
             return;
         }
@@ -90,7 +90,7 @@ public class ShieldPrintingCommand extends SWCommand implements Listener {
     @Register("stop")
     public void stopCommand(@Validator Player player) {
         Region region = Region.getRegion(player.getLocation());
-        if (region.isGlobal()) {
+        if (region.getType().isGlobal()) {
             BauSystem.MESSAGE.send("SHIELD_PRINTING_NO_REGION", player);
             return;
         }
@@ -111,7 +111,7 @@ public class ShieldPrintingCommand extends SWCommand implements Listener {
                 return false;
             }
             Region region = Region.getRegion(player.getLocation());
-            if (region.isGlobal()) {
+            if (region.getType().isGlobal()) {
                 messageSender.send("SHIELD_PRINTING_NO_REGION", player);
                 return false;
             }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/techhider/TechHiderCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/techhider/TechHiderCommand.java
index 38725cf0..8ac94d2d 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/techhider/TechHiderCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/techhider/TechHiderCommand.java
@@ -63,7 +63,7 @@ public class TechHiderCommand extends SWCommand implements Listener, ScoreboardE
     @Register(description = "TECHHIDER_HELP")
     public void toggleHider(@Validator Player player) {
         Region region = Region.getRegion(player.getLocation());
-        if (region.isGlobal()) {
+        if (region.getType().isGlobal()) {
             BauSystem.MESSAGE.send("TECHHIDER_GLOBAL", player);
             return;
         }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceRepository.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceRepository.java
index 899ea5f1..e20ec561 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceRepository.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceRepository.java
@@ -1,6 +1,7 @@
 package de.steamwar.bausystem.features.tracer;
 
 import de.steamwar.bausystem.region.Region;
+import de.steamwar.bausystem.region.RegionSystem;
 import lombok.Cleanup;
 import lombok.SneakyThrows;
 import org.bukkit.Bukkit;
@@ -31,7 +32,8 @@ public class TraceRepository {
         @Cleanup
         ObjectInputStream reader = new ObjectInputStream(new GZIPInputStream(new FileInputStream(recordsFile)));
         UUID uuid = UUID.fromString(reader.readUTF());
-        Region region = Region.getREGION_MAP().get(reader.readUTF());
+        Region region = RegionSystem.INSTANCE.getRegion(reader.readUTF()).orElse(null);
+        if (region == null) return null;
         Date date = (Date) reader.readObject();
         int serialisationVersion = reader.readInt();
         if (serialisationVersion != SERIALISATION_VERSION) {
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/xray/XrayCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/xray/XrayCommand.java
index cad5b633..b18c54d7 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/xray/XrayCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/xray/XrayCommand.java
@@ -64,7 +64,7 @@ public class XrayCommand extends SWCommand implements Listener, ScoreboardElemen
     @Register(description = "XRAY_HELP")
     public void toggleHider(@Validator Player player) {
         Region region = Region.getRegion(player.getLocation());
-        if (region.isGlobal()) {
+        if (region.getType().isGlobal()) {
             BauSystem.MESSAGE.send("XRAY_GLOBAL", player);
             return;
         }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
index 53959621..6c8dce46 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
@@ -96,6 +96,11 @@ public interface Region {
                 return ZERO;
             }
 
+            @Override
+            public Point getCopyPoint() {
+                return ZERO;
+            }
+
             @Override
             public boolean inRegion(Location location, boolean extension) {
                 return false;
@@ -123,6 +128,8 @@ public interface Region {
 
         Point getMaxPoint(boolean extension);
 
+        Point getCopyPoint();
+
         boolean inRegion(Location location, boolean extension);
 
         Optional<EditSession> copy(boolean extension);
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/bossbar/BossBarService.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/bossbar/BossBarService.java
index e6ea2c16..7bb57c78 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/bossbar/BossBarService.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/bossbar/BossBarService.java
@@ -51,7 +51,7 @@ public class BossBarService implements Listener {
                 .computeIfAbsent(key, k -> {
                     BossBar bossBar = Bukkit.createBossBar("", BarColor.WHITE, BarStyle.SOLID);
                     bossBar.addPlayer(player);
-                    if (region.isGlobal()) {
+                    if (region.getType().isGlobal()) {
                         return new GlobalBossbar(bossBar);
                     } else {
                         return new RegionedBossbar(bossBar, region, player);

From 3bb84d0dcc71c3db6ab44e7c0cbd1f81abdef11d Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Wed, 12 Mar 2025 09:11:38 +0100
Subject: [PATCH 025/214] Fixup BoundaryViewer to trigger rebuild

---
 .../bausystem/features/team/boundary/BoundaryViewer.java  | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/team/boundary/BoundaryViewer.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/team/boundary/BoundaryViewer.java
index 4d2b34a7..f6636c4f 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/team/boundary/BoundaryViewer.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/team/boundary/BoundaryViewer.java
@@ -20,11 +20,9 @@
 package de.steamwar.bausystem.features.team.boundary;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.regionnew.Point;
+import de.steamwar.bausystem.region.Point;
 import de.steamwar.bausystem.region.Region;
-import de.steamwar.bausystem.region.utils.RegionType;
 import de.steamwar.core.TrickyParticleWrapper;
-import de.steamwar.core.TrickyTrialsWrapper;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
 import org.bukkit.Particle;
@@ -57,10 +55,10 @@ public class BoundaryViewer implements Listener {
     private void showRegion(Region region, Player player) {
         drawCuboid(player, TrickyParticleWrapper.impl.getVillagerHappy(), region.getMinPoint(), region.getMaxPoint());
         if (region.getTestblockArea().isPresent()) {
-            drawCuboid(player, Particle.END_ROD, region.getMinPointTestblockExtension(), region.getMaxPointTestblockExtension());
+            drawCuboid(player, Particle.END_ROD, region.getTestblockArea().getMinPoint(true), region.getTestblockArea().getMaxPoint(true));
         }
         if (region.getBuildArea().isPresent()) {
-            drawCuboid(player, Particle.END_ROD, region.getMinPointBuildExtension(), region.getMaxPointBuildExtension());
+            drawCuboid(player, Particle.END_ROD, region.getBuildArea().getMinPoint(true), region.getBuildArea().getMaxPoint(true));
         }
     }
 

From 7dc9da549c381db215a7eb665ae297ac7d6515ed Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Thu, 3 Jul 2025 09:52:56 +0200
Subject: [PATCH 026/214] Fix some more stuff

---
 .../features/region/FreezeListener.java       |  2 +-
 .../features/script/lua/libs/RegionLib.java   | 31 ++++++++++---------
 .../features/script/lua/libs/StorageLib.java  |  4 +--
 .../simulator/execute/StabFinalizer.java      |  9 +++---
 .../simulator/execute/StabGenerator.java      | 10 +++---
 .../features/tracer/TraceRepository.java      |  4 +--
 .../de/steamwar/bausystem/region/Region.java  |  3 ++
 .../bausystem/region/RegionSystem.java        |  5 +--
 8 files changed, 39 insertions(+), 29 deletions(-)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FreezeListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FreezeListener.java
index fb15e84e..d0b63900 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FreezeListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FreezeListener.java
@@ -3,7 +3,7 @@ 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.flagvalues.FreezeMode;
+import de.steamwar.bausystem.region.flags.FreezeMode;
 import de.steamwar.bausystem.utils.ScoreboardElement;
 import de.steamwar.core.Core;
 import de.steamwar.core.TrickyTrialsWrapper;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/RegionLib.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/RegionLib.java
index c0c5a3d5..18b8760a 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/RegionLib.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/RegionLib.java
@@ -21,6 +21,7 @@ package de.steamwar.bausystem.features.script.lua.libs;
 
 import de.steamwar.bausystem.features.loader.Loader;
 import de.steamwar.bausystem.region.Region;
+import de.steamwar.bausystem.region.RegionSystem;
 import de.steamwar.bausystem.region.flags.*;
 import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
@@ -28,6 +29,7 @@ import org.luaj.vm2.LuaTable;
 import org.luaj.vm2.LuaValue;
 import org.luaj.vm2.lib.OneArgFunction;
 
+import java.util.UUID;
 import java.util.function.Supplier;
 
 @Linked
@@ -41,13 +43,14 @@ public class RegionLib implements LuaLib {
     private LuaTable create(Supplier<Region> region, Player player) {
         LuaTable table = LuaValue.tableOf();
 
-        table.set("name", getter(() -> region.get().getName()));
+        table.set("name", getter(() -> region.get().getID().toString()));
+        table.set("id", getter(() -> region.get().getID().toString()));
         table.set("type", getter(() -> {
             Region region1 = region.get();
             if (region1.getType().isGlobal()) {
                 return "global";
             }
-            return region1.getPrototype().getName();
+            return region1.getType().name().toLowerCase();
         }));
 
         LuaValue tntLib = LuaValue.tableOf();
@@ -72,16 +75,16 @@ public class RegionLib implements LuaLib {
         Loader loader = Loader.getLoader(player);
         table.set("loader", getter(() -> loader == null ? "OFF" : loader.getStage().name()));
         
-        table.set("copyPoint", getter(() -> toPos(region.get().getCopyPoint())));
-        table.set("minPointBuild", getter(() -> toPos(region.get().getMinPointBuild())));
-        table.set("maxPointBuild", getter(() -> toPos(region.get().getMaxPointBuild())));
-        table.set("minPointBuildExtension", getter(() -> toPos(region.get().getMinPointBuildExtension())));
-        table.set("maxPointBuildExtension", getter(() -> toPos(region.get().getMaxPointBuildExtension())));
-        table.set("testblockPoint", getter(() -> toPos(region.get().getTestBlockPoint())));
-        table.set("minPointTestblock", getter(() -> toPos(region.get().getMinPointTestblock())));
-        table.set("maxPointTestblock", getter(() -> toPos(region.get().getMaxPointTestblock())));
-        table.set("minPointTestblockExtension", getter(() -> toPos(region.get().getMinPointTestblockExtension())));
-        table.set("maxPointTestblockExtension", getter(() -> toPos(region.get().getMaxPointTestblockExtension())));
+        table.set("copyPoint", getter(() -> toPos(region.get().getBuildArea().getCopyPoint())));
+        table.set("minPointBuild", getter(() -> toPos(region.get().getBuildArea().getMinPoint(false))));
+        table.set("maxPointBuild", getter(() -> toPos(region.get().getBuildArea().getMinPoint(false))));
+        table.set("minPointBuildExtension", getter(() -> toPos(region.get().getBuildArea().getMinPoint(true))));
+        table.set("maxPointBuildExtension", getter(() -> toPos(region.get().getBuildArea().getMinPoint(true))));
+        table.set("testblockPoint", getter(() -> toPos(region.get().getTestblockArea().getCopyPoint())));
+        table.set("minPointTestblock", getter(() -> toPos(region.get().getTestblockArea().getMinPoint(false))));
+        table.set("maxPointTestblock", getter(() -> toPos(region.get().getTestblockArea().getMinPoint(false))));
+        table.set("minPointTestblockExtension", getter(() -> toPos(region.get().getTestblockArea().getMinPoint(true))));
+        table.set("maxPointTestblockExtension", getter(() -> toPos(region.get().getTestblockArea().getMinPoint(true))));
 
         return table;
     }
@@ -92,11 +95,11 @@ public class RegionLib implements LuaLib {
         table.set("get", new OneArgFunction() {
             @Override
             public LuaValue call(LuaValue arg) {
-                return create(() -> Region.getREGION_MAP().get(arg.checkjstring()), player);
+                return create(() -> RegionSystem.INSTANCE.getRegion(UUID.fromString(arg.checkjstring())).orElse(RegionSystem.INSTANCE.getGlobalRegion()), player);
             }
         });
 
-        table.set("list", getter(() -> LuaValue.listOf(Region.getREGION_MAP().values().stream().map(region -> create(() -> region, player)).toArray(LuaTable[]::new))));
+        table.set("list", getter(() -> LuaValue.listOf(RegionSystem.INSTANCE.getRegions().map(region -> create(() -> region, player)).toArray(LuaTable[]::new))));
 
         return table;
     }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/StorageLib.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/StorageLib.java
index 51a35bd7..37454427 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/StorageLib.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/StorageLib.java
@@ -75,7 +75,7 @@ public class StorageLib implements LuaLib, Enable, Disable {
                 jsonObject.keySet().forEach(key -> {
                     map.put(key, fromJson(jsonObject.get(key)));
                 });
-                Region region = RegionSystem.INSTANCE.getRegion(regionStorage.getName().substring(0, regionStorage.getName().length() - ".json".length())).orElse(null);
+                Region region = RegionSystem.INSTANCE.getRegion(UUID.fromString(regionStorage.getName().substring(0, regionStorage.getName().length() - ".json".length()))).orElse(null);
                 REGION_STORAGE.put(region, map);
             } catch (Exception e) {}
         }
@@ -144,7 +144,7 @@ public class StorageLib implements LuaLib, Enable, Disable {
         regionStorageDirectory.mkdirs();
         for (Map.Entry<Region, HashMap<String, LuaValue>> entry : REGION_STORAGE.entrySet()) {
             try {
-                FileWriter fileWriter = new FileWriter(new File(regionStorageDirectory, entry.getKey().getName() + ".json"));
+                FileWriter fileWriter = new FileWriter(new File(regionStorageDirectory, entry.getKey().getID().toString() + ".json"));
                 gson.toJson(toJson(entry.getValue()), fileWriter);
                 fileWriter.close();
             } catch (IOException e) {}
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabFinalizer.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabFinalizer.java
index 5c0d77aa..79148cc3 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabFinalizer.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabFinalizer.java
@@ -19,10 +19,9 @@
 
 package de.steamwar.bausystem.features.simulator.execute;
 
-import de.steamwar.bausystem.features.tracer.Trace;
 import de.steamwar.bausystem.features.tracer.TraceRecorder;
+import de.steamwar.bausystem.region.flags.ColorMode;
 import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.region.flags.flagvalues.ColorMode;
 import de.steamwar.bausystem.region.utils.RegionExtensionType;
 import de.steamwar.bausystem.region.utils.RegionType;
 import de.steamwar.bausystem.utils.PasteBuilder;
@@ -38,8 +37,10 @@ public class StabFinalizer extends StabStep {
     protected void start() {
         try {
             PasteBuilder.ClipboardProvider clipboardProvider = new PasteBuilder.ClipboardProviderImpl(data.clipboard);
-            PasteBuilder pasteBuilder = new PasteBuilder(clipboardProvider)
-                    .color(data.region.getPlain(Flag.COLOR, ColorMode.class).getColor());
+            PasteBuilder pasteBuilder = new PasteBuilder(clipboardProvider);
+            if (data.region.hasFlag(Flag.COLOR).isReadable()) {
+                pasteBuilder.color(data.region.getFlag(Flag.COLOR).get().getColor());
+            }
             data.region.reset(pasteBuilder, RegionType.TESTBLOCK, RegionExtensionType.EXTENSION);
         } catch (SecurityException e) {
             stop();
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabGenerator.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabGenerator.java
index 4a15ebcb..a53e0093 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabGenerator.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabGenerator.java
@@ -22,7 +22,6 @@ package de.steamwar.bausystem.features.simulator.execute;
 import de.steamwar.bausystem.features.simulator.data.tnt.TNTPhase;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.region.flags.flagvalues.ColorMode;
 import de.steamwar.bausystem.region.utils.RegionExtensionType;
 import de.steamwar.bausystem.region.utils.RegionType;
 import de.steamwar.bausystem.utils.PasteBuilder;
@@ -56,7 +55,8 @@ public class StabGenerator extends StabStep implements Listener {
     public void onEntityExplode(EntityExplodeEvent event) {
         if (Region.getRegion(event.getEntity().getLocation()) == data.region) {
             event.blockList().forEach(block -> {
-                if (!data.region.inRegion(block.getLocation(), RegionType.TESTBLOCK, RegionExtensionType.EXTENSION)) return;
+                if (!data.region.inRegion(block.getLocation(), RegionType.TESTBLOCK, RegionExtensionType.EXTENSION))
+                    return;
                 int component = data.direction.component.apply(block.getLocation().toVector());
                 destroyedBlocksPerSlice.computeIfAbsent(component, __ -> new HashSet<>())
                         .add(block.getLocation());
@@ -72,8 +72,10 @@ public class StabGenerator extends StabStep implements Listener {
     protected void start() {
         try {
             PasteBuilder.ClipboardProvider clipboardProvider = new PasteBuilder.ClipboardProviderImpl(data.clipboard);
-            PasteBuilder pasteBuilder = new PasteBuilder(clipboardProvider)
-                    .color(data.region.getPlain(Flag.COLOR, ColorMode.class).getColor());
+            PasteBuilder pasteBuilder = new PasteBuilder(clipboardProvider);
+            if (data.region.hasFlag(Flag.COLOR).isReadable()) {
+                pasteBuilder.color(data.region.getFlag(Flag.COLOR).get().getColor());
+            }
             data.region.reset(pasteBuilder, RegionType.TESTBLOCK, RegionExtensionType.EXTENSION);
         } catch (SecurityException e) {
             stop();
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceRepository.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceRepository.java
index e20ec561..0765d92b 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceRepository.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceRepository.java
@@ -32,7 +32,7 @@ public class TraceRepository {
         @Cleanup
         ObjectInputStream reader = new ObjectInputStream(new GZIPInputStream(new FileInputStream(recordsFile)));
         UUID uuid = UUID.fromString(reader.readUTF());
-        Region region = RegionSystem.INSTANCE.getRegion(reader.readUTF()).orElse(null);
+        Region region = RegionSystem.INSTANCE.getRegion(UUID.fromString(reader.readUTF())).orElse(null);
         if (region == null) return null;
         Date date = (Date) reader.readObject();
         int serialisationVersion = reader.readInt();
@@ -48,7 +48,7 @@ public class TraceRepository {
     protected static void writeTrace(Trace trace, List<TNTPoint> records) {
         ObjectOutputStream outputStream = new ObjectOutputStream(new GZIPOutputStream(new FileOutputStream(trace.getRecordsSaveFile())));
         outputStream.writeUTF(trace.getUuid().toString());
-        outputStream.writeUTF(trace.getRegion().getName());
+        outputStream.writeUTF(trace.getRegion().getID().toString());
         outputStream.writeObject(trace.getDate());
         outputStream.writeInt(SERIALISATION_VERSION);
 
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
index 6c8dce46..74a4fcec 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
@@ -28,6 +28,7 @@ import org.bukkit.Location;
 import javax.annotation.Nullable;
 import java.io.File;
 import java.util.Optional;
+import java.util.UUID;
 
 public interface Region {
 
@@ -35,6 +36,8 @@ public interface Region {
         return RegionSystem.INSTANCE.get(location);
     }
 
+    UUID getID();
+
     RegionType getType();
 
     <T extends Enum<T> & Flag.Value<T>> RegionFlagPolicy hasFlag(@NonNull Flag<T> flag);
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionSystem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionSystem.java
index 9c480219..26ee4bc6 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionSystem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionSystem.java
@@ -23,6 +23,7 @@ import org.bukkit.Location;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.Optional;
+import java.util.UUID;
 import java.util.stream.Stream;
 
 public interface RegionSystem {
@@ -35,7 +36,7 @@ public interface RegionSystem {
     Region getGlobalRegion();
 
     Region get(Location location);
-    Optional<Region> getRegion(String name);
+    Optional<Region> getRegion(UUID id);
 
     Stream<Region> getRegions();
 
@@ -68,7 +69,7 @@ public interface RegionSystem {
                 }
 
                 @Override
-                public Optional<Region> getRegion(String name) {
+                public Optional<Region> getRegion(UUID id) {
                     throw new UnsupportedOperationException();
                 }
 

From e98f53bbabdee2d52ab3bfccd3e53253c57940ee Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Thu, 3 Jul 2025 10:22:56 +0200
Subject: [PATCH 027/214] Update Region

---
 .../bausystem/region/FlagStorage.java         |  6 +-
 .../de/steamwar/bausystem/region/Region.java  | 90 +++----------------
 .../bausystem/region/RegionHistory.java       | 31 +++++++
 3 files changed, 47 insertions(+), 80 deletions(-)
 create mode 100644 BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionHistory.java

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/FlagStorage.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/FlagStorage.java
index 3ca76ace..1c8048b6 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/FlagStorage.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/FlagStorage.java
@@ -21,9 +21,13 @@ package de.steamwar.bausystem.region;
 
 import de.steamwar.bausystem.region.flags.Flag;
 
+import java.util.Optional;
+
 public interface FlagStorage {
 
+    <T extends Enum<T> & Flag.Value<T>> RegionFlagPolicy has(Flag<T> flag);
+
     <T extends Enum<T> & Flag.Value<T>> boolean set(Flag<T> flag, T value);
 
-    <T extends Enum<T> & Flag.Value<T>> T get(Flag<T> flag);
+    <T extends Enum<T> & Flag.Value<T>> Optional<T> get(Flag<T> flag);
 }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
index 74a4fcec..34d69f45 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
@@ -20,15 +20,14 @@
 package de.steamwar.bausystem.region;
 
 import com.sk89q.worldedit.EditSession;
-import de.steamwar.bausystem.region.flags.Flag;
 import de.steamwar.sql.SchematicNode;
-import lombok.NonNull;
 import org.bukkit.Location;
 
 import javax.annotation.Nullable;
 import java.io.File;
 import java.util.Optional;
 import java.util.UUID;
+import java.util.function.BiConsumer;
 
 public interface Region {
 
@@ -40,92 +39,21 @@ public interface Region {
 
     RegionType getType();
 
-    <T extends Enum<T> & Flag.Value<T>> RegionFlagPolicy hasFlag(@NonNull Flag<T> flag);
+    FlagStorage getFlags();
 
-    <T extends Enum<T> & Flag.Value<T>> boolean setFlag(@NonNull Flag<T> flag, T value);
+    Area getArea();
 
-    <T extends Enum<T> & Flag.Value<T>> Optional<T> getFlag(@NonNull Flag<T> flag);
+    Optional<Area> getBuildArea();
 
-    default <T extends Enum<T> & Flag.Value<T>> boolean isFlag(@NonNull Flag<T> flag, T value) {
-        return isFlag(flag, value, false);
-    }
-
-    default <T extends Enum<T> & Flag.Value<T>> boolean isFlag(@NonNull Flag<T> flag, T value, boolean defaultValue) {
-        if (hasFlag(flag).isReadable()) {
-            Optional<T> optional = getFlag(flag);
-            return optional.isPresent() && optional.get() == value;
-        }
-        return defaultValue;
-    }
-
-    Point getMinPoint();
-
-    Point getMaxPoint();
-
-    boolean inRegion(Location location);
-
-    Inner getBuildArea();
-
-    Inner getTestblockArea();
+    Optional<Area> getTestblockArea();
 
     // TODO: Add forEachChunk and getChunkOutsidePredicate
 
     Optional<File> getGameModeConfig();
 
-    boolean backup(boolean automatic);
+    RegionHistory getHistory();
 
-    Optional<EditSession> copy();
-
-    void reset();
-
-    void remember(EditSession editSession);
-
-    boolean undo();
-
-    boolean redo();
-
-    interface Inner {
-
-        Inner EMPTY = new Inner() {
-            private static final Point ZERO = new Point(0, 0, 0);
-
-            @Override
-            public Point getMinPoint(boolean extension) {
-                return ZERO;
-            }
-
-            @Override
-            public Point getMaxPoint(boolean extension) {
-                return ZERO;
-            }
-
-            @Override
-            public Point getCopyPoint() {
-                return ZERO;
-            }
-
-            @Override
-            public boolean inRegion(Location location, boolean extension) {
-                return false;
-            }
-
-            @Override
-            public Optional<EditSession> copy(boolean extension) {
-                return Optional.empty();
-            }
-
-            @Override
-            public void reset(@Nullable SchematicNode schematicNode, boolean extension) {
-            }
-        };
-
-        default boolean isEmpty() {
-            return this == EMPTY;
-        }
-
-        default boolean isPresent() {
-            return this != EMPTY;
-        }
+    interface Area {
 
         Point getMinPoint(boolean extension);
 
@@ -138,5 +66,9 @@ public interface Region {
         Optional<EditSession> copy(boolean extension);
 
         void reset(@Nullable SchematicNode schematicNode, boolean extension);
+
+        void forEachChunk(BiConsumer<Integer, Integer> executor);
+
+        boolean isChunkOutside(int chunkX, int chunkZ);
     }
 }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionHistory.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionHistory.java
new file mode 100644
index 00000000..17ff9c19
--- /dev/null
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionHistory.java
@@ -0,0 +1,31 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2020  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;
+
+import com.sk89q.worldedit.EditSession;
+
+public interface RegionHistory {
+
+    void remember(EditSession editSession);
+
+    boolean undo();
+
+    boolean redo();
+}

From 314aaf7a760663533cdea6603cb05b47d4aba6ff Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Thu, 3 Jul 2025 15:37:22 +0200
Subject: [PATCH 028/214] Update Region

---
 .../BauSystem_Main/src/de/steamwar/bausystem/region/Region.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
index 34d69f45..d3f51f88 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
@@ -47,8 +47,6 @@ public interface Region {
 
     Optional<Area> getTestblockArea();
 
-    // TODO: Add forEachChunk and getChunkOutsidePredicate
-
     Optional<File> getGameModeConfig();
 
     RegionHistory getHistory();

From c9b4e6ab451c3b5b98078237f8dee35eb633e306 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Thu, 3 Jul 2025 15:54:48 +0200
Subject: [PATCH 029/214] Improve Region some more

---
 .../bausystem/region/BackupScheduler.java     | 11 +++--
 .../de/steamwar/bausystem/region/Color.java   | 46 -------------------
 .../de/steamwar/bausystem/region/Region.java  |  2 +-
 .../bausystem/region/flags/ColorMode.java     | 35 +++++++-------
 .../bausystem/region/utils/RegionType.java    | 20 ++++----
 5 files changed, 35 insertions(+), 79 deletions(-)
 delete mode 100644 BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Color.java

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/BackupScheduler.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/BackupScheduler.java
index eb57e09f..512c0199 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/BackupScheduler.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/BackupScheduler.java
@@ -1,5 +1,6 @@
 package de.steamwar.bausystem.region;
 
+import com.sk89q.worldedit.EditSession;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.region.flags.ChangedMode;
 import de.steamwar.bausystem.region.flags.Flag;
@@ -21,7 +22,8 @@ public class BackupScheduler implements Enable {
             @Override
             public void run() {
                 Iterator<Region> regionsToBackup = RegionSystem.INSTANCE.getRegions()
-                        .filter(region -> region.isFlag(Flag.CHANGED, ChangedMode.HAS_CHANGE))
+                        .filter(region -> region.getFlags().has(Flag.CHANGED).isReadable())
+                        .filter(region -> region.getFlags().get(Flag.CHANGED).get() == ChangedMode.HAS_CHANGE)
                         .iterator();
                 if (!regionsToBackup.hasNext()) return;
                 doBackup(regionsToBackup);
@@ -39,9 +41,10 @@ public class BackupScheduler implements Enable {
                 }
 
                 Region region = regionsToBackup.next();
-                if (region.backup(true)) {
-                    region.setFlag(Flag.CHANGED, ChangedMode.NO_CHANGE);
-                }
+                EditSession editSession = region.getArea()
+                        .copy(false);
+                // TODO: Implement saving EditSession to schematic!
+                region.getFlags().set(Flag.CHANGED, ChangedMode.NO_CHANGE);
             }
         }.runTaskTimer(BauSystem.getInstance(), 0, 20 * 60);
     }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Color.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Color.java
deleted file mode 100644
index 72052d74..00000000
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Color.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2024  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;
-
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-
-@RequiredArgsConstructor
-@Getter
-public enum Color {
-    WHITE('f'),
-    ORANGE('6'),
-    MAGENTA('5'),
-    LIGHT_BLUE('b'),
-    YELLOW('e'),
-    LIME('a'),
-    PINK('d'),
-    GRAY('8'),
-    LIGHT_GRAY('7'),
-    CYAN('3'),
-    PURPLE('5'),
-    BLUE('9'),
-    BROWN('e'),
-    GREEN('2'),
-    RED('c'),
-    BLACK('1');
-
-    private final char colorCode;
-}
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
index d3f51f88..0b7cd049 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
@@ -61,7 +61,7 @@ public interface Region {
 
         boolean inRegion(Location location, boolean extension);
 
-        Optional<EditSession> copy(boolean extension);
+        EditSession copy(boolean extension);
 
         void reset(@Nullable SchematicNode schematicNode, boolean extension);
 
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ColorMode.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ColorMode.java
index e266d874..1f7db755 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ColorMode.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ColorMode.java
@@ -19,33 +19,32 @@
 
 package de.steamwar.bausystem.region.flags;
 
-import de.steamwar.bausystem.region.Color;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 @Getter
 @AllArgsConstructor
 public enum ColorMode implements Flag.Value<ColorMode> {
-    WHITE("FLAG_COLOR_WHITE", Color.WHITE),
-    ORANGE("FLAG_COLOR_ORANGE", Color.ORANGE),
-    MAGENTA("FLAG_COLOR_MAGENTA", Color.MAGENTA),
-    LIGHT_BLUE("FLAG_COLOR_LIGHT_BLUE", Color.LIGHT_BLUE),
-    YELLOW("FLAG_COLOR_YELLOW", Color.YELLOW),
-    LIME("FLAG_COLOR_LIME", Color.LIME),
-    PINK("FLAG_COLOR_PINK", Color.PINK),
-    GRAY("FLAG_COLOR_GRAY", Color.GRAY),
-    LIGHT_GRAY("FLAG_COLOR_LIGHT_GRAY", Color.LIGHT_GRAY),
-    CYAN("FLAG_COLOR_CYAN", Color.CYAN),
-    PURPLE("FLAG_COLOR_PURPLE", Color.PURPLE),
-    BLUE("FLAG_COLOR_BLUE", Color.BLUE),
-    BROWN("FLAG_COLOR_BROWN", Color.BROWN),
-    GREEN("FLAG_COLOR_GREEN", Color.GREEN),
-    RED("FLAG_COLOR_RED", Color.RED),
-    BLACK("FLAG_COLOR_BLACK", Color.BLACK);
+    WHITE("FLAG_COLOR_WHITE", 'f'),
+    ORANGE("FLAG_COLOR_ORANGE", '6'),
+    MAGENTA("FLAG_COLOR_MAGENTA", '5'),
+    LIGHT_BLUE("FLAG_COLOR_LIGHT_BLUE", 'b'),
+    YELLOW("FLAG_COLOR_YELLOW", 'e'),
+    LIME("FLAG_COLOR_LIME", 'a'),
+    PINK("FLAG_COLOR_PINK", 'd'),
+    GRAY("FLAG_COLOR_GRAY", '8'),
+    LIGHT_GRAY("FLAG_COLOR_LIGHT_GRAY", '7'),
+    CYAN("FLAG_COLOR_CYAN", '3'),
+    PURPLE("FLAG_COLOR_PURPLE", '5'),
+    BLUE("FLAG_COLOR_BLUE", '9'),
+    BROWN("FLAG_COLOR_BROWN", 'e'),
+    GREEN("FLAG_COLOR_GREEN", '2'),
+    RED("FLAG_COLOR_RED", 'c'),
+    BLACK("FLAG_COLOR_BLACK", '1');
 
     private static ColorMode[] values;
     private final String chatValue;
-    private final Color color;
+    private final char colorCode;
 
     @Override
     public ColorMode[] getValues() {
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/utils/RegionType.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/utils/RegionType.java
index 79d83ff7..1ea7e577 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/utils/RegionType.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/utils/RegionType.java
@@ -15,25 +15,25 @@ import java.util.function.Predicate;
 public enum RegionType implements EnumDisplay {
     NORMAL("REGION_TYPE_NORMAL",
             region -> true,
-            region -> null,
-            (region, extension) -> region.getMinPoint(),
-            (region, extension) -> region.getMaxPoint()),
+            Region::getArea,
+            (region, extension) -> region.getArea().getMinPoint(false),
+            (region, extension) -> region.getArea().getMaxPoint(false)),
     BUILD("REGION_TYPE_BUILD",
             region -> region.getBuildArea().isPresent(),
-            Region::getBuildArea,
-            (region, extension) -> region.getBuildArea().getMinPoint(extension),
-            (region, extension) -> region.getBuildArea().getMaxPoint(extension)),
+            region -> region.getBuildArea().get(),
+            (region, extension) -> region.getBuildArea().get().getMinPoint(extension),
+            (region, extension) -> region.getBuildArea().get().getMaxPoint(extension)),
     TESTBLOCK("REGION_TYPE_ONLY_TB",
             region -> region.getTestblockArea().isPresent(),
-            Region::getTestblockArea,
-            (region, extension) -> region.getTestblockArea().getMinPoint(extension),
-            (region, extension) -> region.getTestblockArea().getMaxPoint(extension)),
+            region -> region.getTestblockArea().get(),
+            (region, extension) -> region.getTestblockArea().get().getMinPoint(extension),
+            (region, extension) -> region.getTestblockArea().get().getMaxPoint(extension)),
     ;
 
     private String chatValue;
 
     private Predicate<Region> hasType;
-    private Function<Region, Region.Inner> toInner;
+    private Function<Region, Region.Area> toInner;
     private BiFunction<Region, Boolean, Point> toMinPoint;
     private BiFunction<Region, Boolean, Point> toMaxPoint;
 }

From 7e61db5e58d94e21548068e4308e1a37bd6320c9 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Thu, 10 Jul 2025 14:01:19 +0200
Subject: [PATCH 030/214] Fix some more issues

---
 .../features/region/items/ColorBauGuiItem.java | 13 ++++++-------
 .../bausystem/features/tpslimit/TPSSystem.java |  5 ++---
 .../worldedit/ColorReplaceCommand.java         | 18 +++++++++---------
 .../de/steamwar/bausystem/region/Region.java   |  3 +++
 .../steamwar/bausystem/utils/PasteBuilder.java |  8 ++++----
 5 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/ColorBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/ColorBauGuiItem.java
index 119b6fae..ae633edd 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/ColorBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/ColorBauGuiItem.java
@@ -22,10 +22,9 @@ package de.steamwar.bausystem.features.region.items;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
-import de.steamwar.bausystem.region.Color;
 import de.steamwar.bausystem.region.Region;
-import de.steamwar.bausystem.region.flags.Flag;
 import de.steamwar.bausystem.region.flags.ColorMode;
+import de.steamwar.bausystem.region.flags.Flag;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.inventory.SWListInv;
 import de.steamwar.linkage.Linked;
@@ -45,7 +44,7 @@ public class ColorBauGuiItem extends BauGuiItem {
         super(2);
     }
 
-    private static Material mapColor(Color color) {
+    private static Material mapColor(ColorMode color) {
         switch (color) {
             case RED:
                 return Material.RED_CONCRETE;
@@ -85,17 +84,17 @@ public class ColorBauGuiItem extends BauGuiItem {
     @Override
     public ItemStack getItem(Player player) {
         Region region = Region.getRegion(player.getLocation());
-        ColorMode mode = region.getPlain(Flag.COLOR, ColorMode.class);
-        return new SWItem(mapColor(mode.getColor()), BauSystem.MESSAGE.parse("REGION_ITEM_COLOR", player, BauSystem.MESSAGE.parse(mode.getChatValue(), player))).getItemStack();
+        ColorMode mode = region.getFlags().get(Flag.COLOR).orElse(ColorMode.PINK);
+        return new SWItem(mapColor(mode), BauSystem.MESSAGE.parse("REGION_ITEM_COLOR", player, BauSystem.MESSAGE.parse(mode.getChatValue(), player))).getItemStack();
     }
 
     @Override
     public boolean click(ClickType click, Player p) {
         p.closeInventory();
-        ColorMode current = Region.getRegion(p.getLocation()).getPlain(Flag.COLOR, ColorMode.class);
+        ColorMode current = Region.getRegion(p.getLocation()).getFlags().get(Flag.COLOR).orElse(ColorMode.PINK);
         List<SWListInv.SWListEntry<ColorMode>> items = new ArrayList<>();
         for (ColorMode value : ColorMode.values()) {
-            items.add(new SWListInv.SWListEntry<>(new SWItem(mapColor(value.getColor()), (byte) 0, "§f" + BauSystem.MESSAGE.parse(value.getChatValue(), p), Collections.emptyList(), value == current, clickType -> {
+            items.add(new SWListInv.SWListEntry<>(new SWItem(mapColor(value), (byte) 0, "§f" + BauSystem.MESSAGE.parse(value.getChatValue(), p), Collections.emptyList(), value == current, clickType -> {
             }), value));
         }
         SWListInv<ColorMode> inv = new SWListInv<>(p, BauSystem.MESSAGE.parse("REGION_ITEM_COLOR_CHOOSE", p), items, (clickType, colorMode) -> {
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tpslimit/TPSSystem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tpslimit/TPSSystem.java
index f84ab72e..bb03ae0a 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tpslimit/TPSSystem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tpslimit/TPSSystem.java
@@ -23,7 +23,6 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.SWUtils;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
-import de.steamwar.bausystem.region.GlobalRegion;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.utils.ScoreboardElement;
 import de.steamwar.bausystem.utils.TickEndEvent;
@@ -85,14 +84,14 @@ public class TPSSystem implements Listener {
     private void bossbar() {
         if ((TickManager.impl.isStepping() || TickManager.impl.isSprinting()) && TickManager.impl.getRemainingTicks() > 0) {
             Bukkit.getOnlinePlayers().forEach(player -> {
-                BauSystemBossbar bossbar = BossBarService.instance.get(player, GlobalRegion.getInstance(), "TickStep");
+                BauSystemBossbar bossbar = BossBarService.instance.get(player, Region.getGlobalRegion(), "TickStep");
                 bossbar.setColor(BarColor.YELLOW);
                 bossbar.setTitle(BauSystem.MESSAGE.parse("TICK_BOSSBAR", player, TickManager.impl.getDoneTicks(), TickManager.impl.getTotalTicks()));
                 bossbar.setProgress(TickManager.impl.getDoneTicks() / (double) TickManager.impl.getTotalTicks());
             });
         } else {
             Bukkit.getOnlinePlayers().forEach(player -> {
-                BossBarService.instance.remove(player, GlobalRegion.getInstance(), "TickStep");
+                BossBarService.instance.remove(player, Region.getGlobalRegion(), "TickStep");
             });
         }
     }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/ColorReplaceCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/ColorReplaceCommand.java
index 6b6659ba..f3efca4b 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/ColorReplaceCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/ColorReplaceCommand.java
@@ -28,7 +28,7 @@ import com.sk89q.worldedit.util.formatting.text.TextComponent;
 import com.sk89q.worldedit.util.formatting.text.TranslatableComponent;
 import de.steamwar.bausystem.features.world.WorldEditListener;
 import de.steamwar.bausystem.features.worldedit.utils.SpecialReplace;
-import de.steamwar.bausystem.region.Color;
+import de.steamwar.bausystem.region.flags.ColorMode;
 import de.steamwar.bausystem.shared.Pair;
 import de.steamwar.bausystem.utils.WorldEditUtils;
 import de.steamwar.command.PreviousArguments;
@@ -63,7 +63,7 @@ public class ColorReplaceCommand extends SWCommand {
 
     @Register(description = "COLORREPLACE_HELP")
     @SneakyThrows
-    public void genericCommand(@Validator Player player, Pair<Integer, Color> from, Color to) {
+    public void genericCommand(@Validator Player player, Pair<Integer, ColorMode> from, ColorMode to) {
         if (from.getValue() == to) {
             BukkitAdapter.adapt(player).printInfo(TranslatableComponent.of("worldedit.replace.replaced", new Component[]{TextComponent.of(0)}));
             return;
@@ -89,23 +89,23 @@ public class ColorReplaceCommand extends SWCommand {
     }
 
     @ClassMapper(value = Pair.class, local = true)
-    public TypeMapper<Pair<Integer, Color>> typeMapper() {
-        return new TypeMapper<Pair<Integer, Color>>() {
+    public TypeMapper<Pair<Integer, ColorMode>> typeMapper() {
+        return new TypeMapper<Pair<Integer, ColorMode>>() {
             @Override
-            public Pair<Integer, Color> map(CommandSender commandSender, PreviousArguments previousArguments, String s) {
+            public Pair<Integer, ColorMode> map(CommandSender commandSender, PreviousArguments previousArguments, String s) {
                 if (s.contains("%")) {
                     String[] split = s.split("%");
                     if (split.length != 2) {
                         return null;
                     }
-                    Color color = Color.valueOf(split[1].toUpperCase());
+                    ColorMode color = ColorMode.valueOf(split[1].toUpperCase());
                     try {
                         return new Pair<>(Integer.parseInt(split[0]), color);
                     } catch (NumberFormatException e) {
                         return null;
                     }
                 }
-                return new Pair<>(100, Color.valueOf(s.toUpperCase()));
+                return new Pair<>(100, ColorMode.valueOf(s.toUpperCase()));
             }
 
             @Override
@@ -113,12 +113,12 @@ public class ColorReplaceCommand extends SWCommand {
                 if (s.matches("[0-9].*")) {
                     if (s.contains("%")) {
                         String sub = s.substring(0, s.indexOf("%") + 1);
-                        return Arrays.stream(Color.values()).map(Color::name).map(t -> sub + t.toLowerCase()).collect(Collectors.toSet());
+                        return Arrays.stream(ColorMode.values()).map(ColorMode::name).map(t -> sub + t.toLowerCase()).collect(Collectors.toSet());
                     } else {
                         return Arrays.asList(s);
                     }
                 } else {
-                    return Arrays.stream(Color.values()).map(Color::name).map(String::toLowerCase).collect(Collectors.toSet());
+                    return Arrays.stream(ColorMode.values()).map(ColorMode::name).map(String::toLowerCase).collect(Collectors.toSet());
                 }
             }
         };
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
index 0b7cd049..d28430a2 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
@@ -34,6 +34,9 @@ public interface Region {
     static Region getRegion(Location location) {
         return RegionSystem.INSTANCE.get(location);
     }
+    static Region getGlobalRegion() {
+        return RegionSystem.INSTANCE.getGlobalRegion();
+    }
 
     UUID getID();
 
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/PasteBuilder.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/PasteBuilder.java
index a4a74e17..0622bb11 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/PasteBuilder.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/PasteBuilder.java
@@ -26,8 +26,8 @@ import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockType;
 import com.sk89q.worldedit.world.block.BlockTypes;
-import de.steamwar.bausystem.region.Color;
 import de.steamwar.bausystem.region.Point;
+import de.steamwar.bausystem.region.flags.ColorMode;
 import de.steamwar.sql.SchematicData;
 import de.steamwar.sql.SchematicNode;
 import lombok.Getter;
@@ -102,8 +102,8 @@ public class PasteBuilder {
         return this;
     }
 
-    public PasteBuilder color(Color color) {
-        if (color == Color.PINK) return this;
+    public PasteBuilder color(ColorMode color) {
+        if (color == ColorMode.PINK) return this;
 
         Map<String, BaseBlock> blockCache = new HashMap<>();
         return map((clipboard, blockVector3) -> {
@@ -122,7 +122,7 @@ public class PasteBuilder {
     }
 
     /**
-     * Can only be used before {@link #color(Color)}.
+     * Can only be used before {@link #color(ColorMode)}.
      */
     public PasteBuilder onlyColors(boolean onlyColors) {
         if (!onlyColors) return this;

From 43cca3376ebef1fc7d79db0edd68ad594b1149ea Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Fri, 11 Jul 2025 21:36:50 +0200
Subject: [PATCH 031/214] Fix some more issues

---
 .../features/autostart/AutostartListener.java |  2 +-
 .../features/script/event/EventListener.java  |  4 +-
 .../features/techhider/TechHiderCommand.java  |  6 +--
 .../features/util/KillAllCommand.java         |  2 +-
 .../features/world/BauScoreboard.java         |  5 +-
 .../bausystem/features/xray/XrayCommand.java  |  4 +-
 .../de/steamwar/bausystem/region/Point.java   |  2 +
 .../de/steamwar/bausystem/region/Region.java  | 53 ++++++++++++++++++-
 8 files changed, 65 insertions(+), 13 deletions(-)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/autostart/AutostartListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/autostart/AutostartListener.java
index 3e477955..59e4fd3a 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/autostart/AutostartListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/autostart/AutostartListener.java
@@ -109,7 +109,7 @@ public class AutostartListener implements Listener {
             BauSystem.MESSAGE.send("AUTOSTART_MESSAGE_NO_REGION", player);
             return;
         }
-        if (region.getTestblockArea().isPresent()) {
+        if (region.getTestblockArea().isEmpty()) {
             BauSystem.MESSAGE.send("AUTOSTART_MESSAGE_NO_REGION", player);
             return;
         }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/event/EventListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/event/EventListener.java
index 958d13a4..54ddac4e 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/event/EventListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/event/EventListener.java
@@ -153,7 +153,7 @@ public class EventListener implements Listener {
 
         for (Player player : Bukkit.getOnlinePlayers()) {
             if(!Permission.BUILD.hasPermission(player)) continue;
-            if (tntRegion.inRegion(player.getLocation())) {
+            if (tntRegion.getArea().inRegion(player.getLocation(), false)) {
                 ScriptRunner.callEvent(player, SteamWarGlobalLuaPlugin.EventType.TNTSpawn, LuaValue.NIL, event);
             }
         }
@@ -175,7 +175,7 @@ public class EventListener implements Listener {
 
         for (Player player : Bukkit.getOnlinePlayers()) {
             if(!Permission.BUILD.hasPermission(player)) continue;
-            if (tntRegion.inRegion(player.getLocation())) {
+            if (tntRegion.getArea().inRegion(player.getLocation(), false)) {
                 ScriptRunner.callEvent(player, SteamWarGlobalLuaPlugin.EventType.TNTExplode, table, event);
                 if (inBuild) {
                     ScriptRunner.callEvent(player, SteamWarGlobalLuaPlugin.EventType.TNTExplodeInBuild, table, event);
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/techhider/TechHiderCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/techhider/TechHiderCommand.java
index 8ac94d2d..08ab82d8 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/techhider/TechHiderCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/techhider/TechHiderCommand.java
@@ -85,8 +85,8 @@ public class TechHiderCommand extends SWCommand implements Listener, ScoreboardE
             Set<String> hiddenBlocks = Collections.unmodifiableSet(new HashSet<>(config.getStringList("Techhider.HiddenBlocks")));
             Set<String> hiddenBlockEntities = Collections.unmodifiableSet(new HashSet<>(config.getStringList("Techhider.HiddenBlockEntities")));
 
-            TechHider current = new TechHider((TechHider.LocationEvaluator) (p, cX, cY) -> {
-                if (rg.buildChunkOutside(cX, cY)) return true;
+            TechHider current = new TechHider((p, cX, cY) -> {
+                if (rg.getBuildArea().isChunkOutside(cX, cY)) return true;
                 return !hidden.get(rg).contains(p);
             }, Material.valueOf(obfuscateWith.toUpperCase()), hiddenBlocks.stream().map(String::toUpperCase).map(Material::valueOf).collect(Collectors.toSet()), hiddenBlockEntities);
             current.enable();
@@ -105,7 +105,7 @@ public class TechHiderCommand extends SWCommand implements Listener, ScoreboardE
             hidden.get(region).add(player);
             BauSystem.MESSAGE.sendPrefixless("TECHHIDER_ON", player, ChatMessageType.ACTION_BAR);
         }
-        region.forEachChunk((x, z) -> {
+        region.getBuildArea().forEachChunk((x, z) -> {
             CraftbukkitWrapper.impl.sendChunk(player, x, z);
         });
     }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/KillAllCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/KillAllCommand.java
index b461939f..d82448a0 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/KillAllCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/KillAllCommand.java
@@ -62,7 +62,7 @@ public class KillAllCommand extends SWCommand {
             WORLD.getEntities()
                     .stream()
                     .filter(e -> !(e instanceof Player))
-                    .filter(e -> region.inRegion(e.getLocation()))
+                    .filter(e -> region.getArea().inRegion(e.getLocation(), false))
                     .forEach(entity -> {
                         entity.remove();
                         count.incrementAndGet();
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/BauScoreboard.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/BauScoreboard.java
index 38aa4039..b53f48c8 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/BauScoreboard.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/BauScoreboard.java
@@ -1,6 +1,7 @@
 package de.steamwar.bausystem.features.world;
 
 import de.steamwar.bausystem.region.Region;
+import de.steamwar.bausystem.region.flags.ColorMode;
 import de.steamwar.bausystem.region.flags.Flag;
 import de.steamwar.bausystem.utils.ScoreboardElement;
 import de.steamwar.linkage.Linked;
@@ -101,8 +102,8 @@ public class BauScoreboard implements Listener {
                 Region region = Region.getRegion(player.getLocation());
                 if (region.getType().isGlobal()) return "§eSteam§8War";
                 String colorCode = "§e";
-                if (region.hasFlag(Flag.COLOR).isReadable()) {
-                    colorCode = "§" + region.getFlag(Flag.COLOR).get().getColor().getColorCode();
+                if (region.getFlags().has(Flag.COLOR).isReadable()) {
+                    colorCode = "§" + region.getFlags().get(Flag.COLOR).orElse(ColorMode.PINK).getColorCode();
                 }
                 return colorCode + "■ §eSteam§8War " + colorCode + "■"; // ■
             }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/xray/XrayCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/xray/XrayCommand.java
index b18c54d7..c077d839 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/xray/XrayCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/xray/XrayCommand.java
@@ -103,7 +103,7 @@ public class XrayCommand extends SWCommand implements Listener, ScoreboardElemen
             hidden.get(region).add(player);
             BauSystem.MESSAGE.sendPrefixless("XRAY_ON", player, ChatMessageType.ACTION_BAR);
         }
-        region.forEachChunk((x, z) -> {
+        region.getBuildArea().forEachChunk((x, z) -> {
             CraftbukkitWrapper.impl.sendChunk(player, x, z);
         });
     }
@@ -149,7 +149,7 @@ public class XrayCommand extends SWCommand implements Listener, ScoreboardElemen
 
     private TechHider createXray(Region rg, Set<Material> obfuscate) {
         TechHider current = new TechHider((TechHider.LocationEvaluator) (p, cX, cY) -> {
-            if (rg.buildChunkOutside(cX, cY)) return true;
+            if (rg.getBuildArea().isChunkOutside(cX, cY)) return true;
             return !hidden.get(rg).contains(p);
         }, Material.STRUCTURE_VOID, obfuscate, new HashSet<>());
         current.enable();
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Point.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Point.java
index 3dad7a51..da8b68c5 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Point.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Point.java
@@ -34,6 +34,8 @@ import org.bukkit.entity.Player;
 @AllArgsConstructor
 public class Point {
 
+	public static final Point ZERO = new Point(0, 0, 0);
+
 	private final int x;
 	private final int y;
 	private final int z;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
index d28430a2..447a4fd5 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
@@ -46,9 +46,9 @@ public interface Region {
 
     Area getArea();
 
-    Optional<Area> getBuildArea();
+    Area getBuildArea();
 
-    Optional<Area> getTestblockArea();
+    Area getTestblockArea();
 
     Optional<File> getGameModeConfig();
 
@@ -56,6 +56,55 @@ public interface Region {
 
     interface Area {
 
+        Area EMPTY = new Area() {
+            @Override
+            public boolean isEmpty() {
+                return true;
+            }
+
+            @Override
+            public Point getMinPoint(boolean extension) {
+                return Point.ZERO;
+            }
+
+            @Override
+            public Point getMaxPoint(boolean extension) {
+                return Point.ZERO;
+            }
+
+            @Override
+            public Point getCopyPoint() {
+                return Point.ZERO;
+            }
+
+            @Override
+            public boolean inRegion(Location location, boolean extension) {
+                return false;
+            }
+
+            @Override
+            public EditSession copy(boolean extension) {
+                return null;
+            }
+
+            @Override
+            public void reset(@Nullable SchematicNode schematicNode, boolean extension) {
+            }
+
+            @Override
+            public void forEachChunk(BiConsumer<Integer, Integer> executor) {
+            }
+
+            @Override
+            public boolean isChunkOutside(int chunkX, int chunkZ) {
+                return false;
+            }
+        };
+
+        default boolean isEmpty() {
+            return false;
+        }
+
         Point getMinPoint(boolean extension);
 
         Point getMaxPoint(boolean extension);

From a6b703b8214d7c98f56bca991d07de71173549b3 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Fri, 11 Jul 2025 21:54:27 +0200
Subject: [PATCH 032/214] Fix some more issues

---
 .../features/region/FireListener.java         |  8 +-
 .../features/region/TNTListener.java          |  7 +-
 .../features/script/lua/libs/RegionLib.java   | 14 +--
 .../features/techhider/TechHiderCommand.java  |  2 +-
 .../bausystem/features/xray/XrayCommand.java  |  2 +-
 .../bausystem/region/FlagOptional.java        | 97 +++++++++++++++++++
 .../bausystem/region/FlagStorage.java         |  4 +-
 .../bausystem/region/utils/RegionType.java    | 16 +--
 8 files changed, 122 insertions(+), 28 deletions(-)
 create mode 100644 BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/FlagOptional.java

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FireListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FireListener.java
index 840356d4..7c65f00d 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FireListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FireListener.java
@@ -17,12 +17,12 @@ public class FireListener implements Listener, ScoreboardElement {
 
     @EventHandler
     public void onFireDamage(BlockBurnEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).isFlag(Flag.FIRE, FireMode.DENY)) e.setCancelled(true);
+        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FIRE).isWithDefault(FireMode.DENY)) e.setCancelled(true);
     }
 
     @EventHandler
     public void onFireSpread(BlockSpreadEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).isFlag(Flag.FIRE, FireMode.DENY)) e.setCancelled(true);
+        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FIRE).isWithDefault(FireMode.DENY)) e.setCancelled(true);
     }
 
     @Override
@@ -37,7 +37,7 @@ public class FireListener implements Listener, ScoreboardElement {
 
     @Override
     public String get(Region region, Player p) {
-        if (region.isFlag(Flag.FIRE, Flag.FIRE.getDefaultValue(), true)) return null;
-        return "§e" + BauSystem.MESSAGE.parse(Flag.FIRE.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getFlag(Flag.FIRE).get().getChatValue(), p);
+        if (region.getFlags().get(Flag.FIRE).isWithDefault(FireMode.DENY)) return null;
+        return "§e" + BauSystem.MESSAGE.parse(Flag.FIRE.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getFlags().get(Flag.FIRE).getWithDefault().getChatValue(), p);
     }
 }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TNTListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TNTListener.java
index 6b1e899c..791a9cb1 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TNTListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TNTListener.java
@@ -42,8 +42,7 @@ public class TNTListener implements Listener, ScoreboardElement {
     private void explode(List<Block> blockList) {
         blockList.removeIf(block -> {
             Region region = Region.getRegion(block.getLocation());
-            if (!region.hasFlag(Flag.TNT).isReadable()) return false;
-            TNTMode value = region.getFlag(Flag.TNT).get();
+            TNTMode value = region.getFlags().get(Flag.TNT).getWithDefault();
             if (value == TNTMode.ALLOW) {
                 return false;
             } else if (value == TNTMode.ONLY_TB) {
@@ -83,7 +82,7 @@ public class TNTListener implements Listener, ScoreboardElement {
 
     @Override
     public String get(Region region, Player p) {
-        if (!region.hasFlag(Flag.TNT).isReadable()) return null;
-        return "§e" + BauSystem.MESSAGE.parse(Flag.TNT.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getFlag(Flag.TNT).get().getChatValue(), p);
+        if (region.getFlags().get(Flag.TNT).isWithDefault(TNTMode.ALLOW)) return null;
+        return "§e" + BauSystem.MESSAGE.parse(Flag.TNT.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getFlags().get(Flag.TNT).getWithDefault().getChatValue(), p);
     }
 }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/RegionLib.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/RegionLib.java
index 18b8760a..52c97c21 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/RegionLib.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/RegionLib.java
@@ -54,15 +54,15 @@ public class RegionLib implements LuaLib {
         }));
 
         LuaValue tntLib = LuaValue.tableOf();
-        tntLib.set("mode", getter(() -> region.get().getFlag(Flag.TNT).get().name()));
-        tntLib.set("enabled", getter(() -> region.get().getFlag(Flag.TNT).get() != TNTMode.DENY));
-        tntLib.set("onlyTb", getter(() -> region.get().getFlag(Flag.TNT).get() == TNTMode.ONLY_TB));
-        tntLib.set("onlyBuild", getter(() -> region.get().getFlag(Flag.TNT).get() == TNTMode.ONLY_BUILD));
+        tntLib.set("mode", getter(() -> region.get().getFlags().get(Flag.TNT).nameWithDefault()));
+        tntLib.set("enabled", getter(() -> region.get().getFlags().get(Flag.TNT).orElse(null) != TNTMode.DENY));
+        tntLib.set("onlyTb", getter(() -> region.get().getFlags().get(Flag.TNT).orElse(null) == TNTMode.ONLY_TB));
+        tntLib.set("onlyBuild", getter(() -> region.get().getFlags().get(Flag.TNT).orElse(null) == TNTMode.ONLY_BUILD));
         table.set("tnt", tntLib);
 
-        table.set("fire", getter(() -> region.get().getFlag(Flag.FIRE).get() == FireMode.ALLOW));
-        table.set("freeze", getter(() -> region.get().getFlag(Flag.FREEZE).get() == FreezeMode.ACTIVE));
-        table.set("protect", getter(() -> region.get().getFlag(Flag.PROTECT).get() == ProtectMode.ACTIVE));
+        table.set("fire", getter(() -> region.get().getFlags().get(Flag.FIRE).orElse(null) == FireMode.ALLOW));
+        table.set("freeze", getter(() -> region.get().getFlags().get(Flag.FREEZE).orElse(null) == FreezeMode.ACTIVE));
+        table.set("protect", getter(() -> region.get().getFlags().get(Flag.PROTECT).orElse(null) == ProtectMode.ACTIVE));
 
         //LuaValue traceLib = LuaValue.tableOf();
         //traceLib.set("active", getter(() -> !region.get().isGlobal() && Recorder.INSTANCE.get(region.get()) instanceof ActiveTracer));
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/techhider/TechHiderCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/techhider/TechHiderCommand.java
index 08ab82d8..e3510306 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/techhider/TechHiderCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/techhider/TechHiderCommand.java
@@ -69,7 +69,7 @@ public class TechHiderCommand extends SWCommand implements Listener, ScoreboardE
         }
 
         Optional<TechHider> techHider = techHiders.computeIfAbsent(region, rg -> {
-            File file = rg.gameModeConfig();
+            File file = rg.getGameModeConfig().orElse(null);
             if (file == null) {
                 return Optional.empty();
             }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/xray/XrayCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/xray/XrayCommand.java
index c077d839..547e31d9 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/xray/XrayCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/xray/XrayCommand.java
@@ -70,7 +70,7 @@ public class XrayCommand extends SWCommand implements Listener, ScoreboardElemen
         }
 
         Optional<TechHider> techHider = techHiders.computeIfAbsent(region, rg -> {
-            File file = rg.gameModeConfig();
+            File file = rg.getGameModeConfig().orElse(null);
             if (file == null) {
                 return Optional.empty();
             }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/FlagOptional.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/FlagOptional.java
new file mode 100644
index 00000000..eb0bb0af
--- /dev/null
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/FlagOptional.java
@@ -0,0 +1,97 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2020  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;
+
+import de.steamwar.bausystem.region.flags.Flag;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+
+import java.util.NoSuchElementException;
+import java.util.Optional;
+
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+public class FlagOptional<T extends Enum<T> & Flag.Value<T>> {
+
+    private final Flag<T> flag;
+    private final T value;
+
+    public static <T extends Enum<T> & Flag.Value<T>> FlagOptional<T> of(Flag<T> flag) {
+        return new FlagOptional<>(flag, null);
+    }
+
+    public static <T extends Enum<T> & Flag.Value<T>> FlagOptional<T> of(Flag<T> flag, T value) {
+        return new FlagOptional<>(flag, value);
+    }
+
+    public boolean isPresent() {
+        return value != null;
+    }
+
+    public boolean isEmpty() {
+        return value == null;
+    }
+
+    public boolean is(T value) {
+        if (isEmpty()) return false;
+        return this.value.equals(value);
+    }
+
+    public boolean isWithDefault(T value) {
+        if (isEmpty()) {
+            return flag.getDefaultValue().equals(value);
+        } else {
+            return this.value.equals(value);
+        }
+    }
+
+    public T get() {
+        if (isEmpty()) {
+            throw new NoSuchElementException("No value present");
+        }
+        return value;
+    }
+
+    public T getWithDefault() {
+        if (isEmpty()) {
+            return flag.getDefaultValue();
+        } else {
+            return value;
+        }
+    }
+
+    public T orElse(T defaultValue) {
+        if (isEmpty()) {
+            return defaultValue;
+        } else {
+            return value;
+        }
+    }
+
+    public Optional<String> name() {
+        if (isEmpty()) {
+            return Optional.empty();
+        }
+        return Optional.of(value.name());
+    }
+
+    public String nameWithDefault() {
+        return getWithDefault().name();
+    }
+}
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/FlagStorage.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/FlagStorage.java
index 1c8048b6..922e1ab2 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/FlagStorage.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/FlagStorage.java
@@ -21,13 +21,11 @@ package de.steamwar.bausystem.region;
 
 import de.steamwar.bausystem.region.flags.Flag;
 
-import java.util.Optional;
-
 public interface FlagStorage {
 
     <T extends Enum<T> & Flag.Value<T>> RegionFlagPolicy has(Flag<T> flag);
 
     <T extends Enum<T> & Flag.Value<T>> boolean set(Flag<T> flag, T value);
 
-    <T extends Enum<T> & Flag.Value<T>> Optional<T> get(Flag<T> flag);
+    <T extends Enum<T> & Flag.Value<T>> FlagOptional<T> get(Flag<T> flag);
 }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/utils/RegionType.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/utils/RegionType.java
index 1ea7e577..27412cec 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/utils/RegionType.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/utils/RegionType.java
@@ -19,15 +19,15 @@ public enum RegionType implements EnumDisplay {
             (region, extension) -> region.getArea().getMinPoint(false),
             (region, extension) -> region.getArea().getMaxPoint(false)),
     BUILD("REGION_TYPE_BUILD",
-            region -> region.getBuildArea().isPresent(),
-            region -> region.getBuildArea().get(),
-            (region, extension) -> region.getBuildArea().get().getMinPoint(extension),
-            (region, extension) -> region.getBuildArea().get().getMaxPoint(extension)),
+            region -> !region.getBuildArea().isEmpty(),
+            Region::getBuildArea,
+            (region, extension) -> region.getBuildArea().getMinPoint(extension),
+            (region, extension) -> region.getBuildArea().getMaxPoint(extension)),
     TESTBLOCK("REGION_TYPE_ONLY_TB",
-            region -> region.getTestblockArea().isPresent(),
-            region -> region.getTestblockArea().get(),
-            (region, extension) -> region.getTestblockArea().get().getMinPoint(extension),
-            (region, extension) -> region.getTestblockArea().get().getMaxPoint(extension)),
+            region -> !region.getTestblockArea().isEmpty(),
+            Region::getTestblockArea,
+            (region, extension) -> region.getTestblockArea().getMinPoint(extension),
+            (region, extension) -> region.getTestblockArea().getMaxPoint(extension)),
     ;
 
     private String chatValue;

From 0287881e33ee27a82c913d9ba8e17ea05db1ff4f Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sat, 12 Jul 2025 18:17:46 +0200
Subject: [PATCH 033/214] Fix some more issues

---
 .../features/region/FireCommand.java          |  6 +--
 .../features/region/FreezeCommand.java        |  6 +--
 .../features/region/FreezeListener.java       | 42 +++++++++----------
 .../features/region/ItemsListener.java        |  6 +--
 .../features/region/NoGravityCommand.java     |  6 +--
 .../features/region/NoGravityListener.java    |  6 +--
 .../features/region/ProtectCommand.java       |  8 ++--
 .../features/region/ProtectListener.java      |  6 +--
 .../features/region/RegionListener.java       |  2 +-
 .../bausystem/features/region/TNTCommand.java | 20 ++++-----
 .../bausystem/region/FlagOptional.java        |  8 ++++
 11 files changed, 62 insertions(+), 54 deletions(-)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FireCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FireCommand.java
index c7372eb3..e694f19a 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FireCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FireCommand.java
@@ -53,11 +53,11 @@ public class FireCommand extends SWCommand {
     }
 
     private boolean toggle(Region region) {
-        if (region.isFlag(Flag.FIRE, FireMode.ALLOW)) {
-            region.setFlag(Flag.FIRE, FireMode.DENY);
+        if (region.getFlags().get(Flag.FIRE).isWithDefault(FireMode.ALLOW)) {
+            region.getFlags().set(Flag.FIRE, FireMode.DENY);
             return true;
         } else {
-            region.setFlag(Flag.FIRE, FireMode.ALLOW);
+            region.getFlags().set(Flag.FIRE, FireMode.ALLOW);
             return false;
         }
     }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FreezeCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FreezeCommand.java
index aee10390..ceba317d 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FreezeCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FreezeCommand.java
@@ -53,11 +53,11 @@ public class FreezeCommand extends SWCommand {
     }
 
     private boolean toggle(Region region) {
-        if (region.isFlag(Flag.FREEZE, FreezeMode.ACTIVE)) {
-            region.setFlag(Flag.FREEZE, FreezeMode.INACTIVE);
+        if (region.getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+            region.getFlags().set(Flag.FREEZE, FreezeMode.INACTIVE);
             return false;
         } else {
-            region.setFlag(Flag.FREEZE, FreezeMode.ACTIVE);
+            region.getFlags().set(Flag.FREEZE, FreezeMode.ACTIVE);
             return true;
         }
     }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FreezeListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FreezeListener.java
index d0b63900..c83b1561 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FreezeListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FreezeListener.java
@@ -29,7 +29,7 @@ public class FreezeListener implements Listener, ScoreboardElement {
 
     @EventHandler
     public void onEntitySpawn(EntitySpawnEvent e) {
-        if (Region.getRegion(e.getLocation()).isFlag(Flag.FREEZE, FreezeMode.INACTIVE, true)) return;
+        if (Region.getRegion(e.getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.INACTIVE)) return;
         e.setCancelled(true);
         if (e.getEntityType() == TrickyTrialsWrapper.impl.getTntEntityType()) {
             Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
@@ -41,7 +41,7 @@ public class FreezeListener implements Listener, ScoreboardElement {
     @EventHandler
     public void onBlockCanBuild(BlockCanBuildEvent e) {
         if (!e.isBuildable()) return;
-        if (Region.getRegion(e.getBlock().getLocation()).isFlag(Flag.FREEZE, FreezeMode.INACTIVE, true)) return;
+        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.INACTIVE)) return;
         if (e.getMaterial() == Material.TNT) {
             e.setBuildable(false);
             e.getBlock().setType(Material.TNT, false);
@@ -50,14 +50,14 @@ public class FreezeListener implements Listener, ScoreboardElement {
 
     @EventHandler
     public void onEntityChangeBlock(EntityChangeBlockEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).isFlag(Flag.FREEZE, FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             e.setCancelled(true);
         }
     }
 
     @EventHandler
     public void onPhysicsEvent(BlockPhysicsEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).isFlag(Flag.FREEZE, FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             if (e.getSourceBlock().getType() == Material.NOTE_BLOCK) {
                 BlockState state = e.getSourceBlock().getState();
                 NoteBlock noteBlock = (NoteBlock) state.getBlockData();
@@ -82,44 +82,44 @@ public class FreezeListener implements Listener, ScoreboardElement {
 
     @EventHandler
     public void onPistonExtend(BlockPistonExtendEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).isFlag(Flag.FREEZE, FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             e.setCancelled(true);
         }
     }
 
     @EventHandler
     public void onPistonRetract(BlockPistonRetractEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).isFlag(Flag.FREEZE, FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             e.setCancelled(true);
         }
     }
 
     @EventHandler
     public void onBlockGrow(BlockGrowEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).isFlag(Flag.FREEZE, FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             e.setCancelled(true);
         }
     }
 
     @EventHandler
     public void onRedstoneEvent(BlockRedstoneEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).isFlag(Flag.FREEZE, FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             e.setNewCurrent(e.getOldCurrent());
         }
     }
 
     @EventHandler
     public void onBlockDispense(BlockDispenseEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).isFlag(Flag.FREEZE, FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             e.setCancelled(true);
         }
     }
 
     @EventHandler
     public void onInventoryMoveEvent(InventoryMoveItemEvent e) {
-        if (e.getDestination().getLocation() != null && Region.getRegion(e.getDestination().getLocation()).isFlag(Flag.FREEZE, FreezeMode.ACTIVE)) {
+        if (e.getDestination().getLocation() != null && Region.getRegion(e.getDestination().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             e.setCancelled(true);
-        } else if (e.getSource().getLocation() != null && Region.getRegion(e.getSource().getLocation()).isFlag(Flag.FREEZE, FreezeMode.ACTIVE)) {
+        } else if (e.getSource().getLocation() != null && Region.getRegion(e.getSource().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             e.setCancelled(true);
         }
     }
@@ -128,7 +128,7 @@ public class FreezeListener implements Listener, ScoreboardElement {
     public void onBlockBreak(BlockBreakEvent e) {
         if (Core.getVersion() < 19) return;
         if (e.getPlayer().getInventory().getItemInMainHand().getType() == Material.DEBUG_STICK) return;
-        if (Region.getRegion(e.getBlock().getLocation()).isFlag(Flag.FREEZE, FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             e.setCancelled(true);
             e.getBlock().setType(Material.BARRIER, false);
             e.getBlock().setType(Material.AIR, false);
@@ -151,35 +151,35 @@ public class FreezeListener implements Listener, ScoreboardElement {
 
     @EventHandler
     public void onFluidLevelChange(FluidLevelChangeEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).isFlag(Flag.FREEZE, FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             e.setCancelled(true);
         }
     }
 
     @EventHandler
     public void onBlockSpread(BlockSpreadEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).isFlag(Flag.FREEZE, FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             e.setCancelled(true);
         }
     }
 
     @EventHandler
     public void onBlockFromTo(BlockFromToEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).isFlag(Flag.FREEZE, FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             e.setCancelled(true);
         }
     }
 
     @EventHandler
     public void onSpongeAbsorb(SpongeAbsorbEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).isFlag(Flag.FREEZE, FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             e.setCancelled(true);
         }
     }
 
     @EventHandler
     public void onBlockForm(BlockFormEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).isFlag(Flag.FREEZE, FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             e.setCancelled(true);
         }
     }
@@ -187,7 +187,7 @@ public class FreezeListener implements Listener, ScoreboardElement {
     @EventHandler
     public void onPlayerInteract(PlayerInteractEvent e) {
         if (e.getAction() != Action.RIGHT_CLICK_BLOCK) return;
-        if (Region.getRegion(e.getClickedBlock().getLocation()).isFlag(Flag.FREEZE, FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getClickedBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             Block block = e.getClickedBlock();
             if (block.getType() == Material.LEVER) {
                 Switch data = ((Switch) block.getBlockData());
@@ -199,7 +199,7 @@ public class FreezeListener implements Listener, ScoreboardElement {
 
     @EventHandler
     public void onBlockFade(BlockFadeEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).isFlag(Flag.FREEZE, FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             e.setCancelled(true);
         }
     }
@@ -216,7 +216,7 @@ public class FreezeListener implements Listener, ScoreboardElement {
 
     @Override
     public String get(Region region, Player p) {
-        if (region.isFlag(Flag.FREEZE, Flag.FREEZE.getDefaultValue(), true)) return null;
-        return "§e" + BauSystem.MESSAGE.parse(Flag.FREEZE.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getFlag(Flag.FREEZE).get().getChatValue(), p);
+        if (region.getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.INACTIVE)) return null;
+        return "§e" + BauSystem.MESSAGE.parse(Flag.FREEZE.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getFlags().get(Flag.FREEZE).getWithDefault().getChatValue(), p);
     }
 }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ItemsListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ItemsListener.java
index b673bb93..47fd27c8 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ItemsListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ItemsListener.java
@@ -37,7 +37,7 @@ public class ItemsListener implements Listener, ScoreboardElement {
 
     @EventHandler
     public void onItemSpawn(ItemSpawnEvent event) {
-        if (Region.getRegion(event.getLocation()).isFlag(Flag.ITEMS, ItemMode.INACTIVE, true)) {
+        if (Region.getRegion(event.getLocation()).getFlags().get(Flag.ITEMS).isWithDefault(ItemMode.INACTIVE)) {
             event.setCancelled(true);
         }
     }
@@ -54,7 +54,7 @@ public class ItemsListener implements Listener, ScoreboardElement {
 
     @Override
     public String get(Region region, Player p) {
-        if (region.isFlag(Flag.ITEMS, Flag.ITEMS.getDefaultValue(), true)) return null;
-        return "§e" + BauSystem.MESSAGE.parse(Flag.ITEMS.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getFlag(Flag.ITEMS).get().getChatValue(), p);
+        if (region.getFlags().get(Flag.ITEMS).isWithDefault(ItemMode.INACTIVE)) return null;
+        return "§e" + BauSystem.MESSAGE.parse(Flag.ITEMS.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getFlags().get(Flag.ITEMS).getWithDefault().getChatValue(), p);
     }
 }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/NoGravityCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/NoGravityCommand.java
index 3d3b6b61..6ef0b428 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/NoGravityCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/NoGravityCommand.java
@@ -53,11 +53,11 @@ public class NoGravityCommand extends SWCommand {
     }
 
     private boolean toggle(Region region) {
-        if (region.isFlag(Flag.NO_GRAVITY, NoGravityMode.ACTIVE)) {
-            region.setFlag(Flag.NO_GRAVITY, NoGravityMode.INACTIVE);
+        if (region.getFlags().get(Flag.NO_GRAVITY).isWithDefault(NoGravityMode.ACTIVE)) {
+            region.getFlags().set(Flag.NO_GRAVITY, NoGravityMode.INACTIVE);
             return false;
         } else {
-            region.setFlag(Flag.NO_GRAVITY, NoGravityMode.ACTIVE);
+            region.getFlags().set(Flag.NO_GRAVITY, NoGravityMode.ACTIVE);
             return true;
         }
     }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/NoGravityListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/NoGravityListener.java
index e69b8225..f874fb41 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/NoGravityListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/NoGravityListener.java
@@ -37,7 +37,7 @@ public class NoGravityListener implements Listener, ScoreboardElement {
     @EventHandler
     public void onEntitySpawn(EntitySpawnEvent event) {
         if (event.getEntityType() == EntityType.PLAYER) return;
-        if (Region.getRegion(event.getLocation()).isFlag(Flag.NO_GRAVITY, NoGravityMode.ACTIVE)) {
+        if (Region.getRegion(event.getLocation()).getFlags().get(Flag.NO_GRAVITY).isWithDefault(NoGravityMode.ACTIVE)) {
             event.getEntity().setGravity(false);
         }
     }
@@ -54,7 +54,7 @@ public class NoGravityListener implements Listener, ScoreboardElement {
 
     @Override
     public String get(Region region, Player p) {
-        if (region.isFlag(Flag.NO_GRAVITY, Flag.NO_GRAVITY.getDefaultValue(), true)) return null;
-        return "§e" + BauSystem.MESSAGE.parse(Flag.NO_GRAVITY.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getFlag(Flag.NO_GRAVITY).get().getChatValue(), p);
+        if (region.getFlags().get(Flag.NO_GRAVITY).isWithDefault(NoGravityMode.INACTIVE)) return null;
+        return "§e" + BauSystem.MESSAGE.parse(Flag.NO_GRAVITY.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getFlags().get(Flag.NO_GRAVITY).getWithDefault().getChatValue(), p);
     }
 }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ProtectCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ProtectCommand.java
index 04383c38..a390bddd 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ProtectCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ProtectCommand.java
@@ -39,18 +39,18 @@ public class ProtectCommand extends SWCommand {
     public void genericProtectCommand(@Validator Player p) {
         Region region = regionCheck(p);
         if (region == null) return;
-        if (region.isFlag(Flag.PROTECT, ProtectMode.ACTIVE)) {
-            region.setFlag(Flag.PROTECT, ProtectMode.INACTIVE);
+        if (region.getFlags().get(Flag.PROTECT).isWithDefault(ProtectMode.ACTIVE)) {
+            region.getFlags().set(Flag.PROTECT, ProtectMode.INACTIVE);
             RegionUtils.actionBar(region, "REGION_PROTECT_DISABLE");
         } else {
-            region.setFlag(Flag.PROTECT, ProtectMode.ACTIVE);
+            region.getFlags().set(Flag.PROTECT, ProtectMode.ACTIVE);
             RegionUtils.actionBar(region, "REGION_PROTECT_ENABLE");
         }
     }
 
     private Region regionCheck(Player player) {
         Region region = Region.getRegion(player.getLocation());
-        if (!region.hasFlag(Flag.PROTECT).isApplicable()) {
+        if (!region.getFlags().has(Flag.PROTECT).isApplicable()) {
             BauSystem.MESSAGE.send("REGION_PROTECT_FALSE_REGION", player);
             return null;
         }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ProtectListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ProtectListener.java
index b90aa779..2abe5569 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ProtectListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ProtectListener.java
@@ -22,7 +22,7 @@ public class ProtectListener implements Listener, ScoreboardElement {
 
     private void explode(List<Block> blockList, Location location) {
         Region region = Region.getRegion(location);
-        if (region.isFlag(Flag.PROTECT, ProtectMode.INACTIVE)) return;
+        if (region.getFlags().get(Flag.PROTECT).isWithDefault(ProtectMode.INACTIVE)) return;
         Point p1 = region.getBuildArea().getMinPoint(true);
         Point p2 = region.getTestblockArea().getMinPoint(true);
         int floorLevel = Math.min(p1.getY(), p2.getY());
@@ -51,7 +51,7 @@ public class ProtectListener implements Listener, ScoreboardElement {
 
     @Override
     public String get(Region region, Player p) {
-        if (region.isFlag(Flag.PROTECT, Flag.PROTECT.getDefaultValue(), true)) return null;
-        return "§e" + BauSystem.MESSAGE.parse(Flag.PROTECT.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getFlag(Flag.PROTECT).get().getChatValue(), p);
+        if (region.getFlags().get(Flag.PROTECT).isWithDefault(ProtectMode.INACTIVE)) return null;
+        return "§e" + BauSystem.MESSAGE.parse(Flag.PROTECT.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getFlags().get(Flag.PROTECT).getWithDefault().getChatValue(), p);
     }
 }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionListener.java
index 990c3379..78c917c1 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionListener.java
@@ -186,7 +186,7 @@ public class RegionListener implements Listener {
         new BukkitRunnable() {
             @Override
             public void run() {
-                Region.getRegion(location).setFlag(Flag.CHANGED, ChangedMode.HAS_CHANGE);
+                Region.getRegion(location).getFlags().set(Flag.CHANGED, ChangedMode.HAS_CHANGE);
             }
         }.runTaskAsynchronously(BauSystem.getInstance());
     }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TNTCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TNTCommand.java
index 3c862f4f..df5bd796 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TNTCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TNTCommand.java
@@ -24,7 +24,7 @@ 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.TNTMode;
-import de.steamwar.bausystem.region.utils.RegionType;
+import de.steamwar.bausystem.region.flags.TestblockMode;
 import de.steamwar.command.PreviousArguments;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeMapper;
@@ -96,7 +96,7 @@ public class TNTCommand extends SWCommand {
             @Override
             public List<String> tabCompletes(CommandSender sender, PreviousArguments previousArguments, String s) {
                 Region region = Region.getRegion(((Player) sender).getLocation());
-                if (region.hasType(RegionType.TESTBLOCK) && region.hasType(RegionType.BUILD)) {
+                if (region.getFlags().get(Flag.TESTBLOCK).isNotWithDefault(TestblockMode.NO_VALUE)) {
                     return new ArrayList<>(tntModeMap.keySet());
                 } else {
                     return new ArrayList<>(tntModeMapReduced.keySet());
@@ -106,7 +106,7 @@ public class TNTCommand extends SWCommand {
             @Override
             public TNTMode map(CommandSender sender, PreviousArguments previousArguments, String s) {
                 Region region = Region.getRegion(((Player) sender).getLocation());
-                if (region.hasType(RegionType.TESTBLOCK) && region.hasType(RegionType.BUILD)) {
+                if (region.getFlags().get(Flag.TESTBLOCK).isNotWithDefault(TestblockMode.NO_VALUE)) {
                     return tntModeMap.getOrDefault(s, null);
                 } else {
                     return tntModeMapReduced.getOrDefault(s, null);
@@ -132,24 +132,24 @@ public class TNTCommand extends SWCommand {
     }
 
     private void tntToggle(Region region, TNTMode requestedMode, String requestedMessage) {
-        if (requestedMode != null && region.hasType(RegionType.TESTBLOCK) && region.hasType(RegionType.BUILD)) {
-            region.set(Flag.TNT, requestedMode);
+        if (requestedMode != null && region.getFlags().get(Flag.TESTBLOCK).isNotWithDefault(TestblockMode.NO_VALUE)) {
+            region.getFlags().set(Flag.TNT, requestedMode);
             RegionUtils.actionBar(region, requestedMessage);
             return;
         }
-        switch (region.getPlain(Flag.TNT, TNTMode.class)) {
+        switch (region.getFlags().get(Flag.TNT).getWithDefault()) {
             case ALLOW:
             case ONLY_TB:
             case ONLY_BUILD:
-                region.set(Flag.TNT, TNTMode.DENY);
+                region.getFlags().set(Flag.TNT, TNTMode.DENY);
                 RegionUtils.actionBar(region, getDisableMessage());
                 break;
             case DENY:
-                if (region.hasType(RegionType.TESTBLOCK) && region.hasType(RegionType.BUILD)) {
-                    region.set(Flag.TNT, TNTMode.ONLY_TB);
+                if (region.getFlags().get(Flag.TESTBLOCK).isNotWithDefault(TestblockMode.NO_VALUE)) {
+                    region.getFlags().set(Flag.TNT, TNTMode.ONLY_TB);
                     RegionUtils.actionBar(region, getTestblockEnableMessage());
                 } else {
-                    region.set(Flag.TNT, TNTMode.ALLOW);
+                    region.getFlags().set(Flag.TNT, TNTMode.ALLOW);
                     RegionUtils.actionBar(region, getEnableMessage());
                 }
                 break;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/FlagOptional.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/FlagOptional.java
index eb0bb0af..e3e725fc 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/FlagOptional.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/FlagOptional.java
@@ -53,6 +53,10 @@ public class FlagOptional<T extends Enum<T> & Flag.Value<T>> {
         return this.value.equals(value);
     }
 
+    public boolean isNot(T value) {
+        return !is(value);
+    }
+
     public boolean isWithDefault(T value) {
         if (isEmpty()) {
             return flag.getDefaultValue().equals(value);
@@ -61,6 +65,10 @@ public class FlagOptional<T extends Enum<T> & Flag.Value<T>> {
         }
     }
 
+    public boolean isNotWithDefault(T value) {
+        return !isWithDefault(value);
+    }
+
     public T get() {
         if (isEmpty()) {
             throw new NoSuchElementException("No value present");

From 598daadd3394caf04f2482169a1f6eea17923e80 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Wed, 30 Jul 2025 18:49:54 +0200
Subject: [PATCH 034/214] Reduce to 34 compiler errors

---
 .../features/backup/BackupCommand.java        | 11 ++---
 .../features/bau/BauInfoBauGuiItem.java       |  7 ++--
 .../bausystem/features/bau/InfoCommand.java   |  7 ++--
 .../features/region/ColorCommand.java         | 10 +++--
 .../features/region/ItemsCommand.java         |  6 +--
 .../features/region/RegionCommand.java        | 42 +++++++------------
 .../features/region/ResetCommand.java         | 13 +++---
 .../features/region/TestblockCommand.java     |  7 ++--
 .../features/region/items/FireBauGuiItem.java |  4 +-
 .../region/items/FreezeBauGuiItem.java        |  4 +-
 .../region/items/ProtectBauGuiItem.java       |  4 +-
 .../features/region/items/TntBauGuiItem.java  |  8 ++--
 .../features/simulator/data/tnt/TNTPhase.java |  2 +-
 .../simulator/execute/StabDirection.java      |  2 +-
 .../simulator/execute/StabFinalizer.java      |  9 ++--
 .../simulator/execute/StabGenerator.java      | 10 ++---
 .../features/simulator/execute/StabSetup.java |  2 +-
 .../bausystem/features/team/SkinCommand.java  |  4 +-
 .../team/boundary/BoundaryViewer.java         |  6 +--
 .../features/util/PistonCalculator.java       |  5 +--
 .../bausystem/features/warp/WarpListener.java |  8 ++--
 .../de/steamwar/bausystem/region/Region.java  |  4 ++
 .../bausystem/region/RegionUtils.java         |  2 +-
 .../utils/bossbar/RegionedBossbar.java        |  2 +-
 24 files changed, 84 insertions(+), 95 deletions(-)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/backup/BackupCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/backup/BackupCommand.java
index 919c08cd..f4d610ee 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/backup/BackupCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/backup/BackupCommand.java
@@ -22,6 +22,7 @@ package de.steamwar.bausystem.features.backup;
 import com.sk89q.worldedit.EditSession;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.region.Region;
+import de.steamwar.bausystem.region.flags.ChangedMode;
 import de.steamwar.bausystem.region.flags.Flag;
 import de.steamwar.bausystem.utils.PasteBuilder;
 import de.steamwar.command.SWCommand;
@@ -62,7 +63,7 @@ public class BackupCommand extends SWCommand {
         if (checkGlobalRegion(region, p)) {
             return;
         }
-        if (region.getFlag(Flag.CHANGED).isPresent()) {
+        if (region.getFlags().get(Flag.CHANGED).isWithDefault(ChangedMode.NO_CHANGE)) {
             BauSystem.MESSAGE.send("BACKUP_CREATE_NO_CHANGE", p);
             return;
         }
@@ -86,12 +87,12 @@ public class BackupCommand extends SWCommand {
             return;
         }
         EditSession editSession = new PasteBuilder(new PasteBuilder.FileProvider(backupFile))
-                .pastePoint(region.getMinPoint().add(region.getPrototype().getSizeX() / 2, 0, region.getPrototype().getSizeZ() / 2))
-                .minPoint(region.getMinPoint())
-                .maxPoint(region.getMaxPoint())
+                .pastePoint(region.getArea().getMinPoint(false).add(region.getPrototype().getSizeX() / 2, 0, region.getPrototype().getSizeZ() / 2))
+                .minPoint(region.getArea().getMinPoint(false))
+                .maxPoint(region.getArea().getMaxPoint(false))
                 .waterLevel(region.getWaterLevel())
                 .run();
-        region.remember(editSession);
+        region.getHistory().remember(editSession);
         BauSystem.MESSAGE.send("BACKUP_LOAD", p);
     }
 
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/bau/BauInfoBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/bau/BauInfoBauGuiItem.java
index d8ba9171..2940eac0 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/bau/BauInfoBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/bau/BauInfoBauGuiItem.java
@@ -23,6 +23,7 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.config.BauServer;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
+import de.steamwar.bausystem.region.FlagOptional;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.flags.Flag;
 import de.steamwar.core.Core;
@@ -62,9 +63,9 @@ public class BauInfoBauGuiItem extends BauGuiItem {
             if (flag == Flag.ITEMS && Core.getVersion() < 19) {
                 continue;
             }
-            Flag.Value<?> value = region.get(flag);
-            if (value != null) {
-                stringList.add(BauSystem.MESSAGE.parse("BAU_INFO_ITEM_LORE_" + flag.name(), player, BauSystem.MESSAGE.parse(value.getChatValue(), player)));
+            FlagOptional<?> value = region.getFlags().get(flag);
+            if (value.isPresent()) {
+                stringList.add(BauSystem.MESSAGE.parse("BAU_INFO_ITEM_LORE_" + flag.name(), player, BauSystem.MESSAGE.parse(value.getWithDefault().getChatValue(), player)));
             }
         }
         itemStack.setLore(stringList);
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/bau/InfoCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/bau/InfoCommand.java
index 2d638888..40ec5d7a 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/bau/InfoCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/bau/InfoCommand.java
@@ -3,6 +3,7 @@ package de.steamwar.bausystem.features.bau;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.config.BauServer;
+import de.steamwar.bausystem.region.FlagOptional;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.flags.Flag;
 import de.steamwar.command.SWCommand;
@@ -33,9 +34,9 @@ public class InfoCommand extends SWCommand {
             if (flag == Flag.PROTECT && region.getFloorLevel() == 0) {
                 continue;
             }
-            Flag.Value<?> value = region.get(flag);
-            if (value != null) {
-                BauSystem.MESSAGE.send("BAU_INFO_COMMAND_FLAG", p, BauSystem.MESSAGE.parse(flag.getChatValue(), p), BauSystem.MESSAGE.parse(value.getChatValue(), p));
+            FlagOptional<?> value = region.getFlags().get(flag);
+            if (value.isPresent()) {
+                BauSystem.MESSAGE.send("BAU_INFO_COMMAND_FLAG", p, BauSystem.MESSAGE.parse(flag.getChatValue(), p), BauSystem.MESSAGE.parse(value.getWithDefault().getChatValue(), p));
             }
         }
 
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ColorCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ColorCommand.java
index 34401970..adcd1f97 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ColorCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ColorCommand.java
@@ -52,7 +52,9 @@ public class ColorCommand extends SWCommand {
     @Register(description = "REGION_COLOR_HELP_COLOR_TYPE")
     public void genericColorSet(@Validator Player p, ColorMode color, ColorizationType colorizationType) {
         if (colorizationType == ColorizationType.GLOBAL) {
-            Region.setGlobal(Flag.COLOR, color);
+            Region.getRegions().forEach(region -> {
+                region.getFlags().set(Flag.COLOR, color);
+            });
             BauSystem.MESSAGE.send("REGION_COLOR_GLOBAL", p, BauSystem.MESSAGE.parse(color.getChatValue(), p));
             return;
         }
@@ -61,13 +63,13 @@ public class ColorCommand extends SWCommand {
             BauSystem.MESSAGE.send("REGION_COLOR_NO_REGION", p);
             return;
         }
-        region.setFlag(Flag.COLOR, color);
+        region.getFlags().set(Flag.COLOR, color);
         try {
             PasteBuilder pasteBuilder = new PasteBuilder(new PasteBuilder.FileProvider(region.getResetFile(RegionType.NORMAL)))
                     .ignoreAir(true)
                     .onlyColors(true)
-                    .color(color.getColor());
-            region.reset(pasteBuilder, RegionType.NORMAL, RegionExtensionType.NORMAL);
+                    .color(color);
+            region.getArea().reset(pasteBuilder, false);
             RegionUtils.message(region, "REGION_REGION_COLORED");
             RegionUtils.message(region, "REGION_REGION_COLORED_FAILED");
         } catch (SecurityException e) {
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ItemsCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ItemsCommand.java
index 3003912c..7a8c108a 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ItemsCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ItemsCommand.java
@@ -55,11 +55,11 @@ public class ItemsCommand extends SWCommand {
     }
 
     private boolean toggle(Region region) {
-        if (region.isFlag(Flag.ITEMS, ItemMode.ACTIVE)) {
-            region.setFlag(Flag.ITEMS, ItemMode.INACTIVE);
+        if (region.getFlags().get(Flag.ITEMS).isWithDefault(ItemMode.ACTIVE)) {
+            region.getFlags().set(Flag.ITEMS, ItemMode.INACTIVE);
             return false;
         } else {
-            region.setFlag(Flag.ITEMS, ItemMode.ACTIVE);
+            region.getFlags().set(Flag.ITEMS, ItemMode.ACTIVE);
             return true;
         }
     }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionCommand.java
index 6d5daa3d..b1dafb65 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionCommand.java
@@ -31,9 +31,7 @@ import de.steamwar.bausystem.features.util.SelectCommand;
 import de.steamwar.bausystem.region.Point;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.RegionUtils;
-import de.steamwar.bausystem.region.flags.ColorMode;
 import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.region.utils.RegionExtensionType;
 import de.steamwar.bausystem.region.utils.RegionType;
 import de.steamwar.bausystem.shared.Pair;
 import de.steamwar.bausystem.utils.FlatteningWrapper;
@@ -83,7 +81,7 @@ public class RegionCommand extends SWCommand {
         Region region = Region.getRegion(p.getLocation());
         if (checkGlobalRegion(region, p)) return;
 
-        if (region.undo()) {
+        if (region.getHistory().undo()) {
             RegionUtils.message(region, "REGION_REGION_UNDID");
         } else {
             BauSystem.MESSAGE.send("REGION_REGION_NOTHING_UNDO", p);
@@ -97,7 +95,7 @@ public class RegionCommand extends SWCommand {
             return;
         }
 
-        if (region.redo()) {
+        if (region.getHistory().redo()) {
             RegionUtils.message(region, "REGION_REGION_REDID");
         } else {
             BauSystem.MESSAGE.send("REGION_REGION_NOTHING_REDO", p);
@@ -112,8 +110,8 @@ public class RegionCommand extends SWCommand {
         try {
             PasteBuilder pasteBuilder = new PasteBuilder(new PasteBuilder.FileProvider(region.getResetFile(RegionType.NORMAL)))
                     .ignoreAir(true)
-                    .color(region.getPlain(Flag.COLOR, ColorMode.class).getColor());
-            region.reset(pasteBuilder, RegionType.NORMAL, RegionExtensionType.NORMAL);
+                    .color(region.getFlags().get(Flag.COLOR).getWithDefault());
+            region.getArea().reset(pasteBuilder, true);
             RegionUtils.message(region, "REGION_REGION_RESTORED");
         } catch (SecurityException e) {
             BauSystem.MESSAGE.send("REGION_REGION_FAILED_RESTORE", p);
@@ -134,8 +132,8 @@ public class RegionCommand extends SWCommand {
         try {
             PasteBuilder pasteBuilder = new PasteBuilder(new PasteBuilder.SchematicProvider(node))
                     .ignoreAir(true)
-                    .color(region.getPlain(Flag.COLOR, ColorMode.class).getColor());
-            region.reset(pasteBuilder, RegionType.NORMAL, RegionExtensionType.NORMAL);
+                    .color(region.getFlags().get(Flag.COLOR).getWithDefault());
+            region.getArea().reset(pasteBuilder, true);
             RegionUtils.message(region, "REGION_REGION_RESTORED");
         } catch (SecurityException e) {
             BauSystem.MESSAGE.send("REGION_REGION_FAILED_RESTORE", p);
@@ -149,11 +147,11 @@ public class RegionCommand extends SWCommand {
         if (checkGlobalRegion(region, p)) {
             return;
         }
-        if (region.getCopyPoint() == null) {
+        if (region.getBuildArea().isEmpty()) {
             BauSystem.MESSAGE.send("REGION_REGION_TP_UNKNOWN", p);
             return;
         }
-        p.teleport(region.getCopyPoint().toLocation(p, 0.5, 0, 0.5), PlayerTeleportEvent.TeleportCause.COMMAND);
+        p.teleport(region.getBuildArea().getCopyPoint().toLocation(p, 0.5, 0, 0.5), PlayerTeleportEvent.TeleportCause.COMMAND);
         BauSystem.MESSAGE.send("REGION_REGION_TP_COPY", p);
     }
 
@@ -164,11 +162,11 @@ public class RegionCommand extends SWCommand {
         if (checkGlobalRegion(region, p)) {
             return;
         }
-        if (region.getTestBlockPoint() == null) {
+        if (region.getTestblockArea().isEmpty()) {
             BauSystem.MESSAGE.send("REGION_REGION_TP_UNKNOWN", p);
             return;
         }
-        p.teleport(region.getTestBlockPoint().toLocation(p, 0.5, 0, 0.5), PlayerTeleportEvent.TeleportCause.COMMAND);
+        p.teleport(region.getTestblockArea().getCopyPoint().toLocation(p, 0.5, 0, 0.5), PlayerTeleportEvent.TeleportCause.COMMAND);
         BauSystem.MESSAGE.send("REGION_REGION_TP_TEST_BLOCK", p);
     }
 
@@ -211,14 +209,10 @@ public class RegionCommand extends SWCommand {
         if (checkGlobalRegion(region, p)) {
             return;
         }
-        if (!region.hasType(RegionType.BUILD)) {
+        if (region.getBuildArea().isEmpty()) {
             BauSystem.MESSAGE.send("REGION_REGION_NO_BUILD", p);
             return;
         }
-        if (region.getCopyPoint() == null) {
-            BauSystem.MESSAGE.send("REGION_REGION_TP_UNKNOWN", p);
-            return;
-        }
 
         Point minPoint = region.getBuildArea().getMinPoint(false);
         Point maxPoint = region.getBuildArea().getMaxPoint(false);
@@ -238,7 +232,7 @@ public class RegionCommand extends SWCommand {
                 break;
         }
 
-        Clipboard clipboard = FlatteningWrapper.impl.copy(minPoint, maxPoint, region.getCopyPoint());
+        Clipboard clipboard = FlatteningWrapper.impl.copy(minPoint, maxPoint, region.getBuildArea().getCopyPoint());
         WorldEdit.getInstance()
                 .getSessionManager()
                 .get(BukkitAdapter.adapt(p))
@@ -252,14 +246,10 @@ public class RegionCommand extends SWCommand {
         if (checkGlobalRegion(region, p)) {
             return;
         }
-        if (!region.hasType(RegionType.BUILD)) {
+        if (region.getBuildArea().isEmpty()) {
             BauSystem.MESSAGE.send("REGION_REGION_NO_BUILD", p);
             return;
         }
-        if (region.getCopyPoint() == null) {
-            BauSystem.MESSAGE.send("REGION_REGION_TP_UNKNOWN", p);
-            return;
-        }
 
         ClipboardHolder clipboardHolder = WorldEdit.getInstance()
                 .getSessionManager()
@@ -287,13 +277,13 @@ public class RegionCommand extends SWCommand {
         }
 
         try (EditSession e = WorldEditUtils.getEditSession(p)) {
-            Operations.completeBlindly(clipboardHolder.createPaste(e).ignoreAirBlocks(ignoreAir).to(toBlockVector3(region.getCopyPoint())).build());
+            Operations.completeBlindly(clipboardHolder.createPaste(e).ignoreAirBlocks(ignoreAir).to(toBlockVector3(region.getBuildArea().getCopyPoint())).build());
             WorldEditUtils.addToPlayer(p, e);
 
             if (selectPasted) {
                 Clipboard clipboard = clipboardHolder.getClipboards().get(0);
-                BlockVector3 minPointSelection = clipboard.getRegion().getMinimumPoint().subtract(clipboard.getOrigin()).add(toBlockVector3(region.getCopyPoint()));
-                BlockVector3 maxPointSelection = clipboard.getRegion().getMaximumPoint().subtract(clipboard.getOrigin()).add(toBlockVector3(region.getCopyPoint()));
+                BlockVector3 minPointSelection = clipboard.getRegion().getMinimumPoint().subtract(clipboard.getOrigin()).add(toBlockVector3(region.getBuildArea().getCopyPoint()));
+                BlockVector3 maxPointSelection = clipboard.getRegion().getMaximumPoint().subtract(clipboard.getOrigin()).add(toBlockVector3(region.getBuildArea().getCopyPoint()));
                 FlatteningWrapper.impl.setSelection(p, Point.fromBlockVector3(minPointSelection), Point.fromBlockVector3(maxPointSelection));
             }
             BauSystem.MESSAGE.send("REGION_REGION_PASTE_DONE", p);
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ResetCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ResetCommand.java
index cc12f7b8..e494ac7d 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ResetCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ResetCommand.java
@@ -24,9 +24,8 @@ import de.steamwar.bausystem.config.BauServer;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.RegionSystem;
 import de.steamwar.bausystem.region.RegionUtils;
-import de.steamwar.bausystem.region.flags.Flag;
 import de.steamwar.bausystem.region.flags.ColorMode;
-import de.steamwar.bausystem.region.utils.RegionExtensionType;
+import de.steamwar.bausystem.region.flags.Flag;
 import de.steamwar.bausystem.region.utils.RegionType;
 import de.steamwar.bausystem.utils.PasteBuilder;
 import de.steamwar.command.SWCommand;
@@ -56,10 +55,10 @@ public class ResetCommand extends SWCommand {
         if (region == null) return;
         try {
             PasteBuilder pasteBuilder = new PasteBuilder(new PasteBuilder.FileProvider(region.getResetFile(RegionType.NORMAL)))
-                    .color(region.getPlain(Flag.COLOR, ColorMode.class).getColor());
-            region.reset(pasteBuilder, RegionType.NORMAL, RegionExtensionType.NORMAL);
+                    .color(region.getFlags().get(Flag.COLOR).getWithDefault());
+            region.getArea().reset(pasteBuilder, false);
             for (Flag value : Flag.getResetFlags()) {
-                region.set(value, value.getDefaultValue());
+                region.getFlags().set(value, value.getDefaultValue());
             }
             RegionUtils.message(region, "REGION_RESET_RESETED");
         } catch (SecurityException e) {
@@ -88,8 +87,8 @@ public class ResetCommand extends SWCommand {
         }
         try {
             PasteBuilder pasteBuilder = new PasteBuilder(new PasteBuilder.SchematicProvider(node))
-                    .color(region.getPlain(Flag.COLOR, ColorMode.class).getColor());
-            region.reset(pasteBuilder, RegionType.NORMAL, RegionExtensionType.NORMAL);
+                    .color(region.getFlags().get(Flag.COLOR).getWithDefault());
+            region.getArea().reset(pasteBuilder, true);
             RegionUtils.message(region, "REGION_RESET_RESETED");
         } catch (SecurityException e) {
             BauSystem.MESSAGE.send("REGION_RESET_ERROR", p);
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java
index 987d53db..ca307e6d 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java
@@ -23,7 +23,6 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.config.BauServer;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.RegionUtils;
-import de.steamwar.bausystem.region.flags.ColorMode;
 import de.steamwar.bausystem.region.flags.Flag;
 import de.steamwar.bausystem.region.utils.RegionExtensionType;
 import de.steamwar.bausystem.region.utils.RegionType;
@@ -101,8 +100,8 @@ public class TestblockCommand extends SWCommand {
                     .onlyColors(onlyColors)
                     .removeTNT(removeTNT)
                     .removeWater(removeWater)
-                    .color(region.getFlag(Flag.COLOR).orElse(ColorMode.YELLOW).getColor());
-            region.reset(pasteBuilder, RegionType.TESTBLOCK, regionExtensionType);
+                    .color(region.getFlags().get(Flag.COLOR).getWithDefault());
+            region.getTestblockArea().reset(pasteBuilder, regionExtensionType == RegionExtensionType.EXTENSION);
             RegionUtils.message(region, "REGION_TB_DONE");
         } catch (SecurityException e) {
             BauSystem.MESSAGE.send("REGION_TB_ERROR", p);
@@ -155,7 +154,7 @@ public class TestblockCommand extends SWCommand {
 
     private Region regionCheck(Player player) {
         Region region = Region.getRegion(player.getLocation());
-        if (!region.hasType(RegionType.TESTBLOCK)) {
+        if (region.getTestblockArea().isEmpty()) {
             BauSystem.MESSAGE.send("REGION_TB_NO_REGION", player);
             return null;
         }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/FireBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/FireBauGuiItem.java
index 4a69b708..e41be46b 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/FireBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/FireBauGuiItem.java
@@ -42,10 +42,10 @@ public class FireBauGuiItem extends BauGuiItem {
     @Override
     public ItemStack getItem(Player player) {
         Region region = Region.getRegion(player.getLocation());
-        if (!region.hasFlag(Flag.FIRE).isApplicable()) {
+        if (!region.getFlags().has(Flag.FIRE).isApplicable()) {
             return new SWItem(Material.BARRIER, "").getItemStack();
         }
-        if (region.isFlag(Flag.FIRE, FireMode.ALLOW)) {
+        if (region.getFlags().get(Flag.FIRE).isWithDefault(FireMode.ALLOW)) {
             return new SWItem(Material.FIRE_CHARGE, BauSystem.MESSAGE.parse("REGION_ITEM_FIRE_ALLOW", player)).getItemStack();
         } else {
             return new SWItem(Material.FIREWORK_STAR, BauSystem.MESSAGE.parse("REGION_ITEM_FIRE_DISALLOW", player)).getItemStack();
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/FreezeBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/FreezeBauGuiItem.java
index 0fecdfa8..13f1f9eb 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/FreezeBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/FreezeBauGuiItem.java
@@ -42,10 +42,10 @@ public class FreezeBauGuiItem extends BauGuiItem {
     @Override
     public ItemStack getItem(Player player) {
         Region region = Region.getRegion(player.getLocation());
-        if (!region.hasFlag(Flag.FREEZE).isApplicable()) {
+        if (!region.getFlags().has(Flag.FREEZE).isApplicable()) {
             return new SWItem(Material.BARRIER, "").getItemStack();
         }
-        if (region.isFlag(Flag.FREEZE, FreezeMode.ACTIVE)) {
+        if (region.getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             return new SWItem(Material.GUNPOWDER, BauSystem.MESSAGE.parse("REGION_ITEM_FREEZE_ALLOW", player)).getItemStack();
         } else {
             return new SWItem(Material.REDSTONE, BauSystem.MESSAGE.parse("REGION_ITEM_FREEZE_DISALLOW", player)).getItemStack();
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/ProtectBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/ProtectBauGuiItem.java
index 5453414e..75bf4eb0 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/ProtectBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/ProtectBauGuiItem.java
@@ -43,10 +43,10 @@ public class ProtectBauGuiItem extends BauGuiItem {
     @Override
     public ItemStack getItem(Player player) {
         Region region = Region.getRegion(player.getLocation());
-        if (!region.hasFlag(Flag.PROTECT).isApplicable()) {
+        if (!region.getFlags().has(Flag.PROTECT).isApplicable()) {
             return new SWItem(Material.BARRIER, "").getItemStack();
         }
-        if (region.isFlag(Flag.PROTECT, ProtectMode.ACTIVE)) {
+        if (region.getFlags().get(Flag.PROTECT).isWithDefault(ProtectMode.ACTIVE)) {
             return SWUtils.setCustomModelData(new SWItem(Material.OBSIDIAN, BauSystem.MESSAGE.parse("REGION_ITEM_PROTECT_ALLOW", player)), 1).getItemStack();
         } else {
             return SWUtils.setCustomModelData(new SWItem(Material.STONE, BauSystem.MESSAGE.parse("REGION_ITEM_PROTECT_DISALLOW", player)), 1).getItemStack();
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/TntBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/TntBauGuiItem.java
index 77969ff8..c633c569 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/TntBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/TntBauGuiItem.java
@@ -43,7 +43,7 @@ public class TntBauGuiItem extends BauGuiItem {
 
     @Override
     public ItemStack getItem(Player player) {
-        switch (Region.getRegion(player.getLocation()).getPlain(Flag.TNT, TNTMode.class)) {
+        switch (Region.getRegion(player.getLocation()).getFlags().get(Flag.TNT).getWithDefault()) {
             case DENY:
                 return new SWItem(Material.MINECART, BauSystem.MESSAGE.parse("REGION_ITEM_TNT_OFF", player)).getItemStack();
             case ONLY_TB:
@@ -58,12 +58,12 @@ public class TntBauGuiItem extends BauGuiItem {
     @Override
     public boolean click(ClickType click, Player p) {
         if (click == ClickType.LEFT) {
-            switch (Region.getRegion(p.getLocation()).getPlain(Flag.TNT, TNTMode.class)) {
+            switch (Region.getRegion(p.getLocation()).getFlags().get(Flag.TNT).getWithDefault()) {
                 case DENY:
                     updateTntMode(TNTMode.ALLOW, p);
                     break;
                 case ALLOW:
-                    if (Region.getRegion(p.getLocation()).hasType(RegionType.BUILD) && Region.getRegion(p.getLocation()).hasType(RegionType.TESTBLOCK)) {
+                    if (!Region.getRegion(p.getLocation()).getBuildArea().isEmpty() && !Region.getRegion(p.getLocation()).getTestblockArea().isEmpty()) {
                         updateTntMode(TNTMode.ONLY_TB, p);
                         break;
                     }
@@ -77,7 +77,7 @@ public class TntBauGuiItem extends BauGuiItem {
                 updateTntMode(TNTMode.ALLOW, p);
                 p.closeInventory();
             }));
-            if (Region.getRegion(p.getLocation()).hasType(RegionType.BUILD) && Region.getRegion(p.getLocation()).hasType(RegionType.TESTBLOCK)) {
+            if (!Region.getRegion(p.getLocation()).getBuildArea().isEmpty() && !Region.getRegion(p.getLocation()).getTestblockArea().isEmpty()) {
                 selector.setItem(3, new SWItem(Material.TNT_MINECART, BauSystem.MESSAGE.parse("REGION_ITEM_SELECTOR_ONLY_TB", p), clickType -> {
                     updateTntMode(TNTMode.ONLY_TB, p);
                     p.closeInventory();
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/tnt/TNTPhase.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/tnt/TNTPhase.java
index 20fe8d41..0ac9d0e9 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/tnt/TNTPhase.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/tnt/TNTPhase.java
@@ -64,7 +64,7 @@ public final class TNTPhase extends SimulatorPhase {
             @Override
             public void accept(World world) {
                 Location location = position.toLocation(world);
-                if (Region.getRegion(location).getFlag(Flag.FREEZE).isPresent()) return;
+                if (Region.getRegion(location).getFlags().get(Flag.FREEZE).isPresent()) return;
                 TNTPrimed tnt = world.spawn(location, TNTPrimed.class);
                 if (!xJump) tnt.setVelocity(tnt.getVelocity().setX(0));
                 if (!yJump) tnt.setVelocity(tnt.getVelocity().setY(0));
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabDirection.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabDirection.java
index 4be5284b..9adeaaaf 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabDirection.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabDirection.java
@@ -45,7 +45,7 @@ public class StabDirection extends StabStep {
     @Override
     protected void start() {
         try (EditSession e = WorldEdit.getInstance().getEditSessionFactory().getEditSession(new BukkitWorld(Bukkit.getWorlds().get(0)), -1)) {
-            e.setBlocks((com.sk89q.worldedit.regions.Region) new CuboidRegion(data.region.getMinPointTestblockExtension().toBlockVector3(), data.region.getMaxPointTestblockExtension().toBlockVector3()), Objects.requireNonNull(BlockTypes.AIR).getDefaultState().toBaseBlock());
+            e.setBlocks((com.sk89q.worldedit.regions.Region) new CuboidRegion(data.region.getTestblockArea().getMinPoint(true).toBlockVector3(), data.region.getTestblockArea().getMaxPoint(true).toBlockVector3()), Objects.requireNonNull(BlockTypes.AIR).getDefaultState().toBaseBlock());
         }
 
         Trace trace = TraceRecorder.instance.startRecording(data.region);
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabFinalizer.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabFinalizer.java
index 79148cc3..daa8876a 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabFinalizer.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabFinalizer.java
@@ -20,10 +20,7 @@
 package de.steamwar.bausystem.features.simulator.execute;
 
 import de.steamwar.bausystem.features.tracer.TraceRecorder;
-import de.steamwar.bausystem.region.flags.ColorMode;
 import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.region.utils.RegionExtensionType;
-import de.steamwar.bausystem.region.utils.RegionType;
 import de.steamwar.bausystem.utils.PasteBuilder;
 import de.steamwar.bausystem.utils.bossbar.BauSystemBossbar;
 
@@ -38,10 +35,10 @@ public class StabFinalizer extends StabStep {
         try {
             PasteBuilder.ClipboardProvider clipboardProvider = new PasteBuilder.ClipboardProviderImpl(data.clipboard);
             PasteBuilder pasteBuilder = new PasteBuilder(clipboardProvider);
-            if (data.region.hasFlag(Flag.COLOR).isReadable()) {
-                pasteBuilder.color(data.region.getFlag(Flag.COLOR).get().getColor());
+            if (data.region.getFlags().has(Flag.COLOR).isReadable()) {
+                pasteBuilder.color(data.region.getFlags().get(Flag.COLOR).getWithDefault());
             }
-            data.region.reset(pasteBuilder, RegionType.TESTBLOCK, RegionExtensionType.EXTENSION);
+            data.region.getTestblockArea().reset(pasteBuilder, true);
         } catch (SecurityException e) {
             stop();
             throw e;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabGenerator.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabGenerator.java
index a53e0093..3a598c1e 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabGenerator.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabGenerator.java
@@ -22,8 +22,6 @@ package de.steamwar.bausystem.features.simulator.execute;
 import de.steamwar.bausystem.features.simulator.data.tnt.TNTPhase;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.region.utils.RegionExtensionType;
-import de.steamwar.bausystem.region.utils.RegionType;
 import de.steamwar.bausystem.utils.PasteBuilder;
 import de.steamwar.bausystem.utils.bossbar.BauSystemBossbar;
 import org.bukkit.Bukkit;
@@ -55,7 +53,7 @@ public class StabGenerator extends StabStep implements Listener {
     public void onEntityExplode(EntityExplodeEvent event) {
         if (Region.getRegion(event.getEntity().getLocation()) == data.region) {
             event.blockList().forEach(block -> {
-                if (!data.region.inRegion(block.getLocation(), RegionType.TESTBLOCK, RegionExtensionType.EXTENSION))
+                if (!data.region.getTestblockArea().inRegion(block.getLocation(), true))
                     return;
                 int component = data.direction.component.apply(block.getLocation().toVector());
                 destroyedBlocksPerSlice.computeIfAbsent(component, __ -> new HashSet<>())
@@ -73,10 +71,10 @@ public class StabGenerator extends StabStep implements Listener {
         try {
             PasteBuilder.ClipboardProvider clipboardProvider = new PasteBuilder.ClipboardProviderImpl(data.clipboard);
             PasteBuilder pasteBuilder = new PasteBuilder(clipboardProvider);
-            if (data.region.hasFlag(Flag.COLOR).isReadable()) {
-                pasteBuilder.color(data.region.getFlag(Flag.COLOR).get().getColor());
+            if (data.region.getFlags().has(Flag.COLOR).isReadable()) {
+                pasteBuilder.color(data.region.getFlags().get(Flag.COLOR).getWithDefault());
             }
-            data.region.reset(pasteBuilder, RegionType.TESTBLOCK, RegionExtensionType.EXTENSION);
+            data.region.getTestblockArea().reset(pasteBuilder, true);
         } catch (SecurityException e) {
             stop();
             throw e;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabSetup.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabSetup.java
index 9662a638..78f89d8a 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabSetup.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabSetup.java
@@ -72,7 +72,7 @@ public class StabSetup extends StabStep {
         if (TraceRecorder.instance.isAutoTraceEnabledInRegion(data.region)) {
             TraceRecorder.instance.removeAutoTraceRegion(data.region);
         }
-        data.clipboard = FlatteningWrapper.impl.copy(data.region.getMinPointTestblockExtension(), data.region.getMaxPointTestblockExtension(), data.region.getTestBlockPoint());
+        data.clipboard = FlatteningWrapper.impl.copy(data.region.getTestblockArea().getMinPoint(true), data.region.getTestblockArea().getMaxPoint(true), data.region.getTestblockArea().getCopyPoint());
 
         new StabDirection(data);
     }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/team/SkinCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/team/SkinCommand.java
index ae466066..b2c2bc8c 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/team/SkinCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/team/SkinCommand.java
@@ -89,9 +89,9 @@ public class SkinCommand extends SWCommand {
             return;
         }
 
-        Region.copy(region.getMinPoint(), region.getMaxPoint(), arenaFile);
+        Region.copy(region.getArea().getMinPoint(false), region.getArea().getMaxPoint(false), arenaFile);
         if (testblockFile != null) {
-            Region.copy(region.getMinPointTestblock(), region.getMaxPointTestblock(), testblockFile);
+            Region.copy(region.getTestblockArea().getMinPoint(false), region.getTestblockArea().getMaxPoint(false), testblockFile);
         }
 
         YAPIONObject yapionObject = new YAPIONObject();
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/team/boundary/BoundaryViewer.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/team/boundary/BoundaryViewer.java
index f6636c4f..3994eee8 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/team/boundary/BoundaryViewer.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/team/boundary/BoundaryViewer.java
@@ -53,11 +53,11 @@ public class BoundaryViewer implements Listener {
     }
 
     private void showRegion(Region region, Player player) {
-        drawCuboid(player, TrickyParticleWrapper.impl.getVillagerHappy(), region.getMinPoint(), region.getMaxPoint());
-        if (region.getTestblockArea().isPresent()) {
+        drawCuboid(player, TrickyParticleWrapper.impl.getVillagerHappy(), region.getArea().getMinPoint(false), region.getArea().getMaxPoint(false));
+        if (!region.getTestblockArea().isEmpty()) {
             drawCuboid(player, Particle.END_ROD, region.getTestblockArea().getMinPoint(true), region.getTestblockArea().getMaxPoint(true));
         }
-        if (region.getBuildArea().isPresent()) {
+        if (!region.getBuildArea().isEmpty()) {
             drawCuboid(player, Particle.END_ROD, region.getBuildArea().getMinPoint(true), region.getBuildArea().getMaxPoint(true));
         }
     }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/PistonCalculator.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/PistonCalculator.java
index b50ab2fa..5cc4b744 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/PistonCalculator.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/PistonCalculator.java
@@ -21,10 +21,7 @@ package de.steamwar.bausystem.features.util;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
-import de.steamwar.entity.CWireframe;
-import de.steamwar.entity.REntity;
-import de.steamwar.entity.REntityServer;
-import de.steamwar.entity.RTextDisplay;
+import de.steamwar.entity.*;
 import de.steamwar.linkage.Linked;
 import de.steamwar.linkage.MinVersion;
 import org.bukkit.Bukkit;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/warp/WarpListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/warp/WarpListener.java
index 8940b1ee..655b36f9 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/warp/WarpListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/warp/WarpListener.java
@@ -91,11 +91,11 @@ public class WarpListener implements Listener {
                 locations.put(warp.getName(), warp.getLocation());
             });
             Region region = Region.getRegion(p.getLocation());
-            if (region.getCopyPoint() != null) {
-                locations.put("Copy", region.getCopyPoint().toLocation(p).add(0.5, 0, 0.5));
+            if (region.getBuildArea().getCopyPoint() != null) {
+                locations.put("Copy", region.getBuildArea().getCopyPoint().toLocation(p).add(0.5, 0, 0.5));
             }
-            if (region.getTestBlockPoint() != null) {
-                locations.put("TestBlock", region.getTestBlockPoint().toLocation(p).add(0.5, 0, 0.5));
+            if (region.getTestblockArea().getCopyPoint() != null) {
+                locations.put("TestBlock", region.getTestblockArea().getCopyPoint().toLocation(p).add(0.5, 0, 0.5));
             }
         }
 
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
index 447a4fd5..e2d37c2a 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
@@ -28,9 +28,13 @@ import java.io.File;
 import java.util.Optional;
 import java.util.UUID;
 import java.util.function.BiConsumer;
+import java.util.stream.Stream;
 
 public interface Region {
 
+    static Stream<Region> getRegions() {
+        return RegionSystem.INSTANCE.getRegions();
+    }
     static Region getRegion(Location location) {
         return RegionSystem.INSTANCE.get(location);
     }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionUtils.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionUtils.java
index 1559025b..be9b0887 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionUtils.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionUtils.java
@@ -41,7 +41,7 @@ public class RegionUtils {
     public void forEachInRegion(Region region, Consumer<Player> consumer) {
         Bukkit.getOnlinePlayers()
                 .stream()
-                .filter(player -> region.inRegion(player.getLocation()))
+                .filter(player -> region.getArea().inRegion(player.getLocation(), false))
                 .filter(player -> !region.getType().isGlobal() || Region.getRegion(player.getLocation()).getType().isGlobal())
                 .forEach(consumer);
     }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/bossbar/RegionedBossbar.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/bossbar/RegionedBossbar.java
index 843c8500..0df1ca4c 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/bossbar/RegionedBossbar.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/bossbar/RegionedBossbar.java
@@ -118,7 +118,7 @@ public class RegionedBossbar implements BauSystemBossbar, Listener {
     @EventHandler
     public void onPlayerMove(PlayerMoveEvent event) {
         if (event.getPlayer() != player) return;
-        if (region.inRegion(event.getTo())) {
+        if (region.getArea().inRegion(event.getTo(), false)) {
             bossBar.addPlayer(player);
         } else {
             bossBar.removePlayer(player);

From fb518efe63dedf0f0330b57b3d47564c22d98c58 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Wed, 30 Jul 2025 20:37:52 +0200
Subject: [PATCH 035/214] Reduce to 24 compiler errors

---
 .../features/backup/BackupCommand.java        | 69 +++++++++----------
 .../region/RegionScoreboardElement.java       |  5 +-
 .../features/region/ResetCommand.java         |  2 +-
 .../bausystem/features/team/SkinCommand.java  |  9 ++-
 .../bausystem/region/BackupScheduler.java     | 11 +--
 .../de/steamwar/bausystem/region/Region.java  |  4 ++
 .../bausystem/region/RegionBackups.java       | 56 +++++++++++++++
 7 files changed, 109 insertions(+), 47 deletions(-)
 create mode 100644 BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionBackups.java

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/backup/BackupCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/backup/BackupCommand.java
index f4d610ee..b2671e84 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/backup/BackupCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/backup/BackupCommand.java
@@ -19,27 +19,23 @@
 
 package de.steamwar.bausystem.features.backup;
 
-import com.sk89q.worldedit.EditSession;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.region.Region;
+import de.steamwar.bausystem.region.RegionBackups;
 import de.steamwar.bausystem.region.flags.ChangedMode;
 import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.utils.PasteBuilder;
+import de.steamwar.command.PreviousArguments;
 import de.steamwar.command.SWCommand;
-import de.steamwar.command.SWCommandUtils;
 import de.steamwar.command.TypeMapper;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.inventory.SWListInv;
 import de.steamwar.linkage.Linked;
 import net.md_5.bungee.api.chat.ClickEvent;
 import org.bukkit.Material;
+import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Linked
@@ -67,7 +63,8 @@ public class BackupCommand extends SWCommand {
             BauSystem.MESSAGE.send("BACKUP_CREATE_NO_CHANGE", p);
             return;
         }
-        if (region.backup(false)) {
+        Optional<RegionBackups.Backup> backup = region.getBackups().create(RegionBackups.BackupType.MANUAL);
+        if (backup.isPresent()) {
             BauSystem.MESSAGE.send("BACKUP_CREATE_SUCCESS", p);
         } else {
             BauSystem.MESSAGE.send("BACKUP_CREATE_FAILURE", p);
@@ -75,25 +72,17 @@ public class BackupCommand extends SWCommand {
     }
 
     @Register(value = "load", description = "BACKUP_HELP_LOAD")
-    public void backupLoad(@Validator("owner") Player p, @Mapper("backupName") String backupName) {
+    public void backupLoad(@Validator("owner") Player p, @Mapper("backup") RegionBackups.Backup backup) {
         Region region = Region.getRegion(p.getLocation());
         if (checkGlobalRegion(region, p)) {
             return;
         }
 
-        File backupFile = region.getBackupFile(backupName.replace('_', ' '));
-        if (backupFile == null) {
+        if (backup.load()) {
+            BauSystem.MESSAGE.send("BACKUP_LOAD", p);
+        } else {
             BauSystem.MESSAGE.send("BACKUP_LOAD_FAILURE", p);
-            return;
         }
-        EditSession editSession = new PasteBuilder(new PasteBuilder.FileProvider(backupFile))
-                .pastePoint(region.getArea().getMinPoint(false).add(region.getPrototype().getSizeX() / 2, 0, region.getPrototype().getSizeZ() / 2))
-                .minPoint(region.getArea().getMinPoint(false))
-                .maxPoint(region.getArea().getMaxPoint(false))
-                .waterLevel(region.getWaterLevel())
-                .run();
-        region.getHistory().remember(editSession);
-        BauSystem.MESSAGE.send("BACKUP_LOAD", p);
     }
 
     @Register(value = "list", description = "BACKUP_HELP_LIST")
@@ -102,10 +91,10 @@ public class BackupCommand extends SWCommand {
         if (checkGlobalRegion(region, p)) {
             return;
         }
-        List<String> backups = listBackup(p);
+        List<RegionBackups.Backup> backups = listBackup(p);
         BauSystem.MESSAGE.send("BACKUP_LIST_HEAD", p, backups.size());
-        backups.forEach(s -> {
-            BauSystem.MESSAGE.send("BACKUP_LIST_ENTRY", p, "/backup load " + s, new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/backup load " + s), s);
+        backups.forEach(backup -> {
+            BauSystem.MESSAGE.send("BACKUP_LIST_ENTRY", p, "/backup load " + backup.getName(), new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/backup load " + backup.getName()), backup.getName());
         });
     }
 
@@ -115,34 +104,44 @@ public class BackupCommand extends SWCommand {
         if (checkGlobalRegion(region, p)) {
             return;
         }
-        List<String> backups = listBackup(p);
-        List<SWListInv.SWListEntry<String>> swListEntries = new ArrayList<>();
+        List<RegionBackups.Backup> backups = listBackup(p);
+        List<SWListInv.SWListEntry<RegionBackups.Backup>> swListEntries = new ArrayList<>();
         List<String> lore = Arrays.asList(BauSystem.MESSAGE.parse("BACKUP_LORE", p));
         for (int i = 0; i < backups.size(); i++) {
-            String s = backups.get(i);
-            SWItem swItem = new SWItem(Material.BRICK, BauSystem.MESSAGE.parse("BACKUP_ITEM_NAME", p, s), lore, false, clickType -> {});
+            RegionBackups.Backup backup = backups.get(i);
+            SWItem swItem = new SWItem(Material.BRICK, BauSystem.MESSAGE.parse("BACKUP_ITEM_NAME", p, backup.getName()), lore, false, clickType -> {});
             swItem.getItemStack().setAmount(i + 1);
-            swListEntries.add(new SWListInv.SWListEntry<>(swItem, s));
+            swListEntries.add(new SWListInv.SWListEntry<>(swItem, backup));
         }
-        SWListInv<String> swListInv = new SWListInv<>(p, BauSystem.MESSAGE.parse("BACKUP_INV_NAME", p), swListEntries, (clickType, s) -> {
+        SWListInv<RegionBackups.Backup> swListInv = new SWListInv<>(p, BauSystem.MESSAGE.parse("BACKUP_INV_NAME", p), swListEntries, (clickType, s) -> {
             p.getOpenInventory().close();
             p.performCommand("backup load " + s);
         });
         swListInv.open();
     }
 
-    @Mapper(value = "backupName", local = true)
-    public TypeMapper<String> backupMapper() {
-        return SWCommandUtils.createMapper(s -> s, (commandSender, s) -> listBackup((Player) commandSender));
+    @Mapper(value = "backup", local = true)
+    public TypeMapper<RegionBackups.Backup> backupMapper() {
+        return new TypeMapper<RegionBackups.Backup>() {
+            @Override
+            public RegionBackups.Backup map(CommandSender commandSender, String[] previousArguments, String s) {
+                return Region.getRegion(((Player) commandSender).getLocation()).getBackups().get(s);
+            }
+
+            @Override
+            public Collection<String> tabCompletes(CommandSender sender, PreviousArguments previousArguments, String s) {
+                return listBackup((Player) sender).stream().map(RegionBackups.Backup::getName).collect(Collectors.toList());
+            }
+        };
     }
 
-    private List<String> listBackup(Player p) {
+    private List<RegionBackups.Backup> listBackup(Player p) {
         Region region = Region.getRegion(p.getLocation());
         if (checkGlobalRegion(region, p)) {
             return Collections.emptyList();
         }
         try {
-            return region.listBackup().stream().map(s -> s.substring(0, s.length() - 6).replace(' ', '_')).collect(Collectors.toList());
+            return region.getBackups().list();
         } catch (NullPointerException e) {
             return Collections.emptyList();
         }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionScoreboardElement.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionScoreboardElement.java
index 7ad6dea1..2e25bafe 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionScoreboardElement.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionScoreboardElement.java
@@ -19,6 +19,7 @@
 
 package de.steamwar.bausystem.features.region;
 
+import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.utils.ScoreboardElement;
 import de.steamwar.linkage.Linked;
@@ -40,8 +41,6 @@ public class RegionScoreboardElement implements ScoreboardElement {
     @Override
     public String get(Region region, Player p) {
         if (region.getType().isGlobal()) return null;
-        // TODO: Fix this!
-        // return "§e" + BauSystem.MESSAGE.parse("SCOREBOARD_REGION", p) + "§8: §7" + region.getName();
-        return null;
+        return "§e" + BauSystem.MESSAGE.parse("SCOREBOARD_REGION", p) + "§8: §7" + region.getName();
     }
 }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ResetCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ResetCommand.java
index e494ac7d..28f10595 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ResetCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ResetCommand.java
@@ -57,7 +57,7 @@ public class ResetCommand extends SWCommand {
             PasteBuilder pasteBuilder = new PasteBuilder(new PasteBuilder.FileProvider(region.getResetFile(RegionType.NORMAL)))
                     .color(region.getFlags().get(Flag.COLOR).getWithDefault());
             region.getArea().reset(pasteBuilder, false);
-            for (Flag value : Flag.getResetFlags()) {
+            for (Flag value : Flag.getFlags()) {
                 region.getFlags().set(value, value.getDefaultValue());
             }
             RegionUtils.message(region, "REGION_RESET_RESETED");
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/team/SkinCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/team/SkinCommand.java
index b2c2bc8c..b97127b1 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/team/SkinCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/team/SkinCommand.java
@@ -19,6 +19,7 @@
 
 package de.steamwar.bausystem.features.team;
 
+import com.sk89q.worldedit.EditSession;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.team.boundary.BoundaryViewer;
 import de.steamwar.bausystem.region.Region;
@@ -74,7 +75,7 @@ public class SkinCommand extends SWCommand {
 
         String name = String.join(" ", names);
         File arenaFile = new File("sections19/" + name + "/" + typeKuerzel + "Arena.schem");
-        File testblockFile = region.getTestblockArea().isPresent() ? new File("sections19/" + name + "/" + typeKuerzel + "Testblock.schem") : null;
+        File testblockFile = !region.getTestblockArea().isEmpty() ? new File("sections19/" + name + "/" + typeKuerzel + "Testblock.schem") : null;
 
         arenaFile.getParentFile().mkdirs();
         if (testblockFile != null) {
@@ -89,9 +90,11 @@ public class SkinCommand extends SWCommand {
             return;
         }
 
-        Region.copy(region.getArea().getMinPoint(false), region.getArea().getMaxPoint(false), arenaFile);
+        EditSession editSession = region.getArea().copy(false);
+        // TODO: Save editSession to file
         if (testblockFile != null) {
-            Region.copy(region.getTestblockArea().getMinPoint(false), region.getTestblockArea().getMaxPoint(false), testblockFile);
+            editSession = region.getTestblockArea().copy(false);
+            // TODO: Save editSession to file
         }
 
         YAPIONObject yapionObject = new YAPIONObject();
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/BackupScheduler.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/BackupScheduler.java
index 512c0199..902d4a6c 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/BackupScheduler.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/BackupScheduler.java
@@ -1,6 +1,5 @@
 package de.steamwar.bausystem.region;
 
-import com.sk89q.worldedit.EditSession;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.region.flags.ChangedMode;
 import de.steamwar.bausystem.region.flags.Flag;
@@ -9,6 +8,7 @@ import de.steamwar.linkage.api.Enable;
 import org.bukkit.scheduler.BukkitRunnable;
 
 import java.util.Iterator;
+import java.util.Optional;
 
 @Linked
 public class BackupScheduler implements Enable {
@@ -41,10 +41,11 @@ public class BackupScheduler implements Enable {
                 }
 
                 Region region = regionsToBackup.next();
-                EditSession editSession = region.getArea()
-                        .copy(false);
-                // TODO: Implement saving EditSession to schematic!
-                region.getFlags().set(Flag.CHANGED, ChangedMode.NO_CHANGE);
+                Optional<RegionBackups.Backup> backup = region.getBackups()
+                        .create(RegionBackups.BackupType.AUTOMATIC);
+                if (backup.isPresent()) {
+                    region.getFlags().set(Flag.CHANGED, ChangedMode.NO_CHANGE);
+                }
             }
         }.runTaskTimer(BauSystem.getInstance(), 0, 20 * 60);
     }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
index e2d37c2a..a41f6593 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
@@ -35,9 +35,11 @@ public interface Region {
     static Stream<Region> getRegions() {
         return RegionSystem.INSTANCE.getRegions();
     }
+
     static Region getRegion(Location location) {
         return RegionSystem.INSTANCE.get(location);
     }
+
     static Region getGlobalRegion() {
         return RegionSystem.INSTANCE.getGlobalRegion();
     }
@@ -58,6 +60,8 @@ public interface Region {
 
     RegionHistory getHistory();
 
+    RegionBackups getBackups();
+
     interface Area {
 
         Area EMPTY = new Area() {
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionBackups.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionBackups.java
new file mode 100644
index 00000000..af4bf23b
--- /dev/null
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionBackups.java
@@ -0,0 +1,56 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2020  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;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+import java.util.List;
+import java.util.Optional;
+
+public interface RegionBackups {
+
+    @RequiredArgsConstructor
+    enum BackupType {
+        MANUAL(5),
+        AUTOMATIC(20),
+        ;
+
+        private final int maxBackups;
+    }
+
+    @RequiredArgsConstructor
+    @Getter
+    abstract class Backup {
+        private final BackupType type;
+        private final String name;
+        private final FlagStorage flags;
+
+        public abstract boolean load();
+
+        public abstract void delete();
+    }
+
+    Optional<Backup> create(BackupType backupType);
+
+    List<Backup> list();
+
+    Backup get(String name);
+}

From 8fb10c92664445edef483cabc6f3391634f6100b Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Thu, 31 Jul 2025 10:25:45 +0200
Subject: [PATCH 036/214] Fix DesignEndStone and DesignEndStoneCommand Fix
 Region.Area.reset

---
 .../design/endstone/DesignEndStone.java       | 28 ++++++++++++-------
 .../endstone/DesignEndStoneCommand.java       |  4 +++
 .../de/steamwar/bausystem/region/Region.java  |  7 ++---
 3 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/design/endstone/DesignEndStone.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/design/endstone/DesignEndStone.java
index 3b7645b6..35437be8 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/design/endstone/DesignEndStone.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/design/endstone/DesignEndStone.java
@@ -29,12 +29,10 @@ import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.World;
+import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 public class DesignEndStone {
 
@@ -44,8 +42,8 @@ public class DesignEndStone {
     private REntityServer entityServer = new REntityServer();
     private List<REntity> entities = new ArrayList<>();
     private Set<Location> locations = new HashSet<>();
-    private boolean wsOrAs;
-    private double maxBlastResistance;
+    private Set<Material> limited  = new HashSet<>();
+    private boolean calculateFromBottom;
 
     public DesignEndStone(Region region) {
         this.minX = region.getBuildArea().getMinPoint(false).getX();
@@ -54,8 +52,18 @@ public class DesignEndStone {
         this.maxX = region.getBuildArea().getMaxPoint(false).getX();
         this.maxY = region.getBuildArea().getMaxPoint(false).getY();
         this.maxZ = region.getBuildArea().getMaxPoint(false).getZ();
-        wsOrAs = region.getName().startsWith("ws") || region.getName().startsWith("as");
-        maxBlastResistance = wsOrAs ? 6.1 : 9.0;
+
+        YamlConfiguration config = YamlConfiguration.loadConfiguration(region.getGameModeConfig().get());
+        for(Map<?, ?> entry : config.getMapList("Schematic.Limited")) {
+            int amount = (Integer) entry.get("Amount");
+            Set<String> materials = new HashSet<>((List<String>) entry.get("Materials"));
+            if(amount == 0) {
+                materials.forEach(s -> {
+                    limited.add(Material.getMaterial(s));
+                });
+            }
+        }
+        calculateFromBottom = config.getBoolean("Arena.NoFloor", false);
 
         entityServer.setCallback((player, rEntity, entityAction) -> {
             if (entityAction != REntityServer.EntityAction.ATTACK) return;
@@ -76,7 +84,7 @@ public class DesignEndStone {
         calc(minX, minY, maxZ, maxX, maxY, maxZ, 0, 0, -1, maxZ - minZ);
         calc(minX, minY, minZ, minX, maxY, maxZ, 1, 0, 0, maxX - minX);
         calc(maxX, minY, minZ, maxX, maxY, maxZ, -1, 0, 0, maxX - minX);
-        if (wsOrAs) {
+        if (calculateFromBottom) {
             calc(minX, minY, minZ, maxX, minY, maxZ, 0, 1, 0, maxY - minY + 1);
         } else {
             int airBlocks = 0;
@@ -106,7 +114,7 @@ public class DesignEndStone {
                         int cz = z + step * dirZ;
                         Material material = WORLD.getBlockAt(cx, cy, cz).getType();
 
-                        if (material != Material.WATER && material != Material.LAVA && material.getBlastResistance() >= maxBlastResistance) {
+                        if (material != Material.WATER && material != Material.LAVA && limited.contains(material)) {
                             Location location = new Location(WORLD, cx + 0.5, cy, cz + 0.5);
                             if (!locations.add(location)) break;
                             RFallingBlockEntity entity = new RFallingBlockEntity(entityServer, location, Material.RED_STAINED_GLASS);
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/design/endstone/DesignEndStoneCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/design/endstone/DesignEndStoneCommand.java
index e50541a8..61fa0278 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/design/endstone/DesignEndStoneCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/design/endstone/DesignEndStoneCommand.java
@@ -52,6 +52,10 @@ public class DesignEndStoneCommand extends SWCommand implements Listener {
             BauSystem.MESSAGE.send("DESIGN_ENDSTONE_REGION_ERROR", player);
             return;
         }
+        if (region.getGameModeConfig().isEmpty()) {
+            BauSystem.MESSAGE.send("DESIGN_ENDSTONE_REGION_ERROR", player);
+            return;
+        }
         designEndStoneMap.computeIfAbsent(region, DesignEndStone::new).toggle(player);
     }
 
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
index a41f6593..6c3ba0ab 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
@@ -20,10 +20,9 @@
 package de.steamwar.bausystem.region;
 
 import com.sk89q.worldedit.EditSession;
-import de.steamwar.sql.SchematicNode;
+import de.steamwar.bausystem.utils.PasteBuilder;
 import org.bukkit.Location;
 
-import javax.annotation.Nullable;
 import java.io.File;
 import java.util.Optional;
 import java.util.UUID;
@@ -96,7 +95,7 @@ public interface Region {
             }
 
             @Override
-            public void reset(@Nullable SchematicNode schematicNode, boolean extension) {
+            public void reset(PasteBuilder pasteBuilder, boolean extension) {
             }
 
             @Override
@@ -123,7 +122,7 @@ public interface Region {
 
         EditSession copy(boolean extension);
 
-        void reset(@Nullable SchematicNode schematicNode, boolean extension);
+        void reset(PasteBuilder pasteBuilder, boolean extension);
 
         void forEachChunk(BiConsumer<Integer, Integer> executor);
 

From 8a438093227350f236e7961a536b4dd25d7866bd Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Thu, 31 Jul 2025 10:29:02 +0200
Subject: [PATCH 037/214] Fix RegionScoreboardElement

---
 .../features/region/RegionScoreboardElement.java     | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionScoreboardElement.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionScoreboardElement.java
index 2e25bafe..b843097d 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionScoreboardElement.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionScoreboardElement.java
@@ -23,8 +23,13 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.utils.ScoreboardElement;
 import de.steamwar.linkage.Linked;
+import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
 
+import java.io.File;
+import java.util.List;
+import java.util.Optional;
+
 @Linked
 public class RegionScoreboardElement implements ScoreboardElement {
 
@@ -41,6 +46,11 @@ public class RegionScoreboardElement implements ScoreboardElement {
     @Override
     public String get(Region region, Player p) {
         if (region.getType().isGlobal()) return null;
-        return "§e" + BauSystem.MESSAGE.parse("SCOREBOARD_REGION", p) + "§8: §7" + region.getName();
+        Optional<File> gameModeConfig = region.getGameModeConfig();
+        if (gameModeConfig.isEmpty()) return null;
+        YamlConfiguration config = YamlConfiguration.loadConfiguration(region.getGameModeConfig().get());
+        List<String> names = config.getStringList("Server.ChatNames");
+        if (names.isEmpty()) return null;
+        return "§e" + BauSystem.MESSAGE.parse("SCOREBOARD_REGION", p) + "§8: §7" + names.get(0);
     }
 }

From 94e3eed6df19c0d603fe69d1136ab215ca40ec2b Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Thu, 31 Jul 2025 10:29:20 +0200
Subject: [PATCH 038/214] Fix RegionScoreboardElement

---
 .../bausystem/features/region/RegionScoreboardElement.java       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionScoreboardElement.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionScoreboardElement.java
index b843097d..bfc3a6e4 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionScoreboardElement.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionScoreboardElement.java
@@ -46,6 +46,7 @@ public class RegionScoreboardElement implements ScoreboardElement {
     @Override
     public String get(Region region, Player p) {
         if (region.getType().isGlobal()) return null;
+        // TODO: Improve this!
         Optional<File> gameModeConfig = region.getGameModeConfig();
         if (gameModeConfig.isEmpty()) return null;
         YamlConfiguration config = YamlConfiguration.loadConfiguration(region.getGameModeConfig().get());

From 4f24adf9fd7a1f3a243418b7298d7fbcfc6100cf Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Thu, 31 Jul 2025 12:10:49 +0200
Subject: [PATCH 039/214] Fix some more errors

---
 .../steamwar/bausystem/features/region/ColorCommand.java   | 2 +-
 .../steamwar/bausystem/features/region/RegionCommand.java  | 2 +-
 .../steamwar/bausystem/features/region/ResetCommand.java   | 2 +-
 .../bausystem/features/region/TestblockCommand.java        | 2 +-
 .../src/de/steamwar/bausystem/region/Region.java           | 7 +++++++
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ColorCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ColorCommand.java
index adcd1f97..436564ac 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ColorCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ColorCommand.java
@@ -65,7 +65,7 @@ public class ColorCommand extends SWCommand {
         }
         region.getFlags().set(Flag.COLOR, color);
         try {
-            PasteBuilder pasteBuilder = new PasteBuilder(new PasteBuilder.FileProvider(region.getResetFile(RegionType.NORMAL)))
+            PasteBuilder pasteBuilder = new PasteBuilder(new PasteBuilder.FileProvider(region.getArea().getResetFile()))
                     .ignoreAir(true)
                     .onlyColors(true)
                     .color(color);
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionCommand.java
index b1dafb65..ccf62cdb 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionCommand.java
@@ -108,7 +108,7 @@ public class RegionCommand extends SWCommand {
         if(checkGlobalRegion(region, p)) return;
 
         try {
-            PasteBuilder pasteBuilder = new PasteBuilder(new PasteBuilder.FileProvider(region.getResetFile(RegionType.NORMAL)))
+            PasteBuilder pasteBuilder = new PasteBuilder(new PasteBuilder.FileProvider(region.getArea().getResetFile()))
                     .ignoreAir(true)
                     .color(region.getFlags().get(Flag.COLOR).getWithDefault());
             region.getArea().reset(pasteBuilder, true);
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ResetCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ResetCommand.java
index 28f10595..c8d4d19d 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ResetCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ResetCommand.java
@@ -54,7 +54,7 @@ public class ResetCommand extends SWCommand {
         Region region = regionCheck(p);
         if (region == null) return;
         try {
-            PasteBuilder pasteBuilder = new PasteBuilder(new PasteBuilder.FileProvider(region.getResetFile(RegionType.NORMAL)))
+            PasteBuilder pasteBuilder = new PasteBuilder(new PasteBuilder.FileProvider(region.getArea().getResetFile()))
                     .color(region.getFlags().get(Flag.COLOR).getWithDefault());
             region.getArea().reset(pasteBuilder, false);
             for (Flag value : Flag.getFlags()) {
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java
index ca307e6d..7e4abc4b 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java
@@ -94,7 +94,7 @@ public class TestblockCommand extends SWCommand {
         }
 
         try {
-            PasteBuilder.ClipboardProvider clipboardProvider = node == null ? new PasteBuilder.FileProvider(region.getResetFile(RegionType.TESTBLOCK)) : new PasteBuilder.SchematicProvider(node);
+            PasteBuilder.ClipboardProvider clipboardProvider = node == null ? new PasteBuilder.FileProvider(region.getTestblockArea().getResetFile()) : new PasteBuilder.SchematicProvider(node);
             PasteBuilder pasteBuilder = new PasteBuilder(clipboardProvider)
                     .ignoreAir(ignoreAir)
                     .onlyColors(onlyColors)
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
index 6c3ba0ab..59b20632 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
@@ -94,6 +94,11 @@ public interface Region {
                 return null;
             }
 
+            @Override
+            public File getResetFile() {
+                return null;
+            }
+
             @Override
             public void reset(PasteBuilder pasteBuilder, boolean extension) {
             }
@@ -122,6 +127,8 @@ public interface Region {
 
         EditSession copy(boolean extension);
 
+        File getResetFile();
+
         void reset(PasteBuilder pasteBuilder, boolean extension);
 
         void forEachChunk(BiConsumer<Integer, Integer> executor);

From d55556cb47deab0be23d09cd9c093f3f365dc90d Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Thu, 31 Jul 2025 12:11:10 +0200
Subject: [PATCH 040/214] Fix some more errors

---
 .../de/steamwar/bausystem/features/region/ResetCommand.java | 6 +-----
 .../src/de/steamwar/bausystem/region/FlagStorage.java       | 2 ++
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ResetCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ResetCommand.java
index c8d4d19d..49893d1d 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ResetCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ResetCommand.java
@@ -24,9 +24,7 @@ import de.steamwar.bausystem.config.BauServer;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.RegionSystem;
 import de.steamwar.bausystem.region.RegionUtils;
-import de.steamwar.bausystem.region.flags.ColorMode;
 import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.region.utils.RegionType;
 import de.steamwar.bausystem.utils.PasteBuilder;
 import de.steamwar.command.SWCommand;
 import de.steamwar.linkage.Linked;
@@ -57,9 +55,7 @@ public class ResetCommand extends SWCommand {
             PasteBuilder pasteBuilder = new PasteBuilder(new PasteBuilder.FileProvider(region.getArea().getResetFile()))
                     .color(region.getFlags().get(Flag.COLOR).getWithDefault());
             region.getArea().reset(pasteBuilder, false);
-            for (Flag value : Flag.getFlags()) {
-                region.getFlags().set(value, value.getDefaultValue());
-            }
+            region.getFlags().clear();
             RegionUtils.message(region, "REGION_RESET_RESETED");
         } catch (SecurityException e) {
             BauSystem.MESSAGE.send("REGION_RESET_ERROR", p);
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/FlagStorage.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/FlagStorage.java
index 922e1ab2..6d51e2ef 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/FlagStorage.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/FlagStorage.java
@@ -28,4 +28,6 @@ public interface FlagStorage {
     <T extends Enum<T> & Flag.Value<T>> boolean set(Flag<T> flag, T value);
 
     <T extends Enum<T> & Flag.Value<T>> FlagOptional<T> get(Flag<T> flag);
+
+    void clear();
 }

From 6a7849919310f6f6558110cd31b5120780cab49f Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Thu, 31 Jul 2025 12:14:14 +0200
Subject: [PATCH 041/214] Fix some more errors

---
 .../steamwar/bausystem/features/bau/BauInfoBauGuiItem.java | 7 +------
 .../de/steamwar/bausystem/features/bau/InfoCommand.java    | 4 +---
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/bau/BauInfoBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/bau/BauInfoBauGuiItem.java
index 2940eac0..8a3cffb4 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/bau/BauInfoBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/bau/BauInfoBauGuiItem.java
@@ -57,12 +57,7 @@ public class BauInfoBauGuiItem extends BauGuiItem {
         Region region = Region.getRegion(player.getLocation());
         List<String> stringList = new ArrayList<>();
         for (Flag flag : Flag.getFlags()) {
-            if (flag == Flag.PROTECT && region.getFloorLevel() == 0) {
-                continue;
-            }
-            if (flag == Flag.ITEMS && Core.getVersion() < 19) {
-                continue;
-            }
+            if (!region.getFlags().has(flag).isApplicable()) continue;
             FlagOptional<?> value = region.getFlags().get(flag);
             if (value.isPresent()) {
                 stringList.add(BauSystem.MESSAGE.parse("BAU_INFO_ITEM_LORE_" + flag.name(), player, BauSystem.MESSAGE.parse(value.getWithDefault().getChatValue(), player)));
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/bau/InfoCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/bau/InfoCommand.java
index 40ec5d7a..6b3a1d85 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/bau/InfoCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/bau/InfoCommand.java
@@ -31,9 +31,7 @@ public class InfoCommand extends SWCommand {
         BauSystem.MESSAGE.send("BAU_INFO_COMMAND_OWNER", p, SteamwarUser.get(bauServer.getOwnerID()).getUserName());
         Region region = Region.getRegion(p.getLocation());
         for (Flag flag : Flag.getFlags()) {
-            if (flag == Flag.PROTECT && region.getFloorLevel() == 0) {
-                continue;
-            }
+            if (!region.getFlags().has(flag).isApplicable()) continue;
             FlagOptional<?> value = region.getFlags().get(flag);
             if (value.isPresent()) {
                 BauSystem.MESSAGE.send("BAU_INFO_COMMAND_FLAG", p, BauSystem.MESSAGE.parse(flag.getChatValue(), p), BauSystem.MESSAGE.parse(value.getWithDefault().getChatValue(), p));

From ad87ad74954c3c35657a6638c2fc386df2536473 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Thu, 31 Jul 2025 13:53:10 +0200
Subject: [PATCH 042/214] Add RegionConfig

---
 .../features/autostart/AutostartListener.java |  12 +-
 .../design/endstone/DesignEndStone.java       |  23 ++--
 .../endstone/DesignEndStoneCommand.java       |   2 +-
 .../region/RegionScoreboardElement.java       |   7 +-
 .../features/techhider/TechHiderCommand.java  |  14 +-
 .../bausystem/features/xray/XrayCommand.java  |  21 +--
 .../de/steamwar/bausystem/region/Region.java  |   3 +-
 .../bausystem/region/RegionConfig.java        | 124 ++++++++++++++++++
 8 files changed, 146 insertions(+), 60 deletions(-)
 create mode 100644 BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionConfig.java

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/autostart/AutostartListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/autostart/AutostartListener.java
index 59e4fd3a..fbc6430f 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/autostart/AutostartListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/autostart/AutostartListener.java
@@ -31,8 +31,6 @@ import lombok.Getter;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.block.data.type.Chest;
-import org.bukkit.configuration.file.FileConfiguration;
-import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -41,7 +39,6 @@ import org.bukkit.event.inventory.InventoryCloseEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.inventory.ItemStack;
 
-import java.io.File;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
@@ -132,17 +129,10 @@ public class AutostartListener implements Listener {
             if (!regionStartTime.containsKey(region)) return;
             if (!region.getTestblockArea().inRegion(block.getLocation(), true)) return;
             long tickDiff = TPSUtils.currentRealTick.get() - regionStartTime.remove(region);
-            long preFightDurationInSeconds = getPreFightDurationInSeconds(region);
+            long preFightDurationInSeconds = region.getGameModeConfig().getTimes().getPreFightDuration();
             RegionUtils.message(region, "AUTOSTART_MESSAGE_RESULT1", tickDiff);
             RegionUtils.message(region, "AUTOSTART_MESSAGE_RESULT2", preFightDurationInSeconds, ((preFightDurationInSeconds * 20) - tickDiff));
             RegionUtils.message(region, "AUTOSTART_MESSAGE_RESULT3");
         });
     }
-
-    private int getPreFightDurationInSeconds(Region region) {
-        File file = region.getGameModeConfig().orElse(null);
-        if (file == null) return 30;
-        FileConfiguration config = YamlConfiguration.loadConfiguration(file);
-        return config.getInt("Times.PreFightDuration", 30);
-    }
 }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/design/endstone/DesignEndStone.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/design/endstone/DesignEndStone.java
index 35437be8..129ebe71 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/design/endstone/DesignEndStone.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/design/endstone/DesignEndStone.java
@@ -33,6 +33,7 @@ import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 public class DesignEndStone {
 
@@ -42,7 +43,7 @@ public class DesignEndStone {
     private REntityServer entityServer = new REntityServer();
     private List<REntity> entities = new ArrayList<>();
     private Set<Location> locations = new HashSet<>();
-    private Set<Material> limited  = new HashSet<>();
+    private Set<Material> limited;
     private boolean calculateFromBottom;
 
     public DesignEndStone(Region region) {
@@ -53,17 +54,15 @@ public class DesignEndStone {
         this.maxY = region.getBuildArea().getMaxPoint(false).getY();
         this.maxZ = region.getBuildArea().getMaxPoint(false).getZ();
 
-        YamlConfiguration config = YamlConfiguration.loadConfiguration(region.getGameModeConfig().get());
-        for(Map<?, ?> entry : config.getMapList("Schematic.Limited")) {
-            int amount = (Integer) entry.get("Amount");
-            Set<String> materials = new HashSet<>((List<String>) entry.get("Materials"));
-            if(amount == 0) {
-                materials.forEach(s -> {
-                    limited.add(Material.getMaterial(s));
-                });
-            }
-        }
-        calculateFromBottom = config.getBoolean("Arena.NoFloor", false);
+        limited = region.getGameModeConfig()
+                .getSchematic()
+                .getLimited()
+                .entrySet()
+                .stream()
+                .filter(entry -> entry.getValue() == 0)
+                .flatMap(entry -> entry.getKey().stream())
+                .collect(Collectors.toSet());
+        calculateFromBottom = region.getGameModeConfig().getArena().isNoFloor();
 
         entityServer.setCallback((player, rEntity, entityAction) -> {
             if (entityAction != REntityServer.EntityAction.ATTACK) return;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/design/endstone/DesignEndStoneCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/design/endstone/DesignEndStoneCommand.java
index 61fa0278..6d10d479 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/design/endstone/DesignEndStoneCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/design/endstone/DesignEndStoneCommand.java
@@ -52,7 +52,7 @@ public class DesignEndStoneCommand extends SWCommand implements Listener {
             BauSystem.MESSAGE.send("DESIGN_ENDSTONE_REGION_ERROR", player);
             return;
         }
-        if (region.getGameModeConfig().isEmpty()) {
+        if (!region.getGameModeConfig().isLoaded()) {
             BauSystem.MESSAGE.send("DESIGN_ENDSTONE_REGION_ERROR", player);
             return;
         }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionScoreboardElement.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionScoreboardElement.java
index bfc3a6e4..b810bb1e 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionScoreboardElement.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionScoreboardElement.java
@@ -46,11 +46,8 @@ public class RegionScoreboardElement implements ScoreboardElement {
     @Override
     public String get(Region region, Player p) {
         if (region.getType().isGlobal()) return null;
-        // TODO: Improve this!
-        Optional<File> gameModeConfig = region.getGameModeConfig();
-        if (gameModeConfig.isEmpty()) return null;
-        YamlConfiguration config = YamlConfiguration.loadConfiguration(region.getGameModeConfig().get());
-        List<String> names = config.getStringList("Server.ChatNames");
+        if (!region.getGameModeConfig().isLoaded()) return null;
+        List<String> names = region.getGameModeConfig().getServer().getChatNames();
         if (names.isEmpty()) return null;
         return "§e" + BauSystem.MESSAGE.parse("SCOREBOARD_REGION", p) + "§8: §7" + names.get(0);
     }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/techhider/TechHiderCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/techhider/TechHiderCommand.java
index e3510306..5f205e79 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/techhider/TechHiderCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/techhider/TechHiderCommand.java
@@ -69,26 +69,16 @@ public class TechHiderCommand extends SWCommand implements Listener, ScoreboardE
         }
 
         Optional<TechHider> techHider = techHiders.computeIfAbsent(region, rg -> {
-            File file = rg.getGameModeConfig().orElse(null);
-            if (file == null) {
-                return Optional.empty();
-            }
-
-            FileConfiguration config = YamlConfiguration.loadConfiguration(file);
-            if (!config.getBoolean("Techhider.Active", false)) {
+            if (!region.getGameModeConfig().getTechhider().isActive()) {
                 return Optional.empty();
             }
 
             hidden.put(rg, new HashSet<>());
 
-            String obfuscateWith = config.getString("Techhider.ObfuscateWith", "end_stone");
-            Set<String> hiddenBlocks = Collections.unmodifiableSet(new HashSet<>(config.getStringList("Techhider.HiddenBlocks")));
-            Set<String> hiddenBlockEntities = Collections.unmodifiableSet(new HashSet<>(config.getStringList("Techhider.HiddenBlockEntities")));
-
             TechHider current = new TechHider((p, cX, cY) -> {
                 if (rg.getBuildArea().isChunkOutside(cX, cY)) return true;
                 return !hidden.get(rg).contains(p);
-            }, Material.valueOf(obfuscateWith.toUpperCase()), hiddenBlocks.stream().map(String::toUpperCase).map(Material::valueOf).collect(Collectors.toSet()), hiddenBlockEntities);
+            }, region.getGameModeConfig().getTechhider().getObfuscateWith(), region.getGameModeConfig().getTechhider().getHiddenBlocks(), region.getGameModeConfig().getTechhider().getHiddenBlockEntities());
             current.enable();
 
             return Optional.of(current);
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/xray/XrayCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/xray/XrayCommand.java
index 547e31d9..19f0a390 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/xray/XrayCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/xray/XrayCommand.java
@@ -19,8 +19,8 @@
 
 package de.steamwar.bausystem.features.xray;
 
-import de.steamwar.Reflection;
 import com.comphenix.tinyprotocol.TinyProtocol;
+import de.steamwar.Reflection;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.techhider.TechHiderCommand;
 import de.steamwar.bausystem.region.Region;
@@ -34,8 +34,6 @@ import de.steamwar.techhider.TechHider;
 import net.md_5.bungee.api.ChatMessageType;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
-import org.bukkit.configuration.file.FileConfiguration;
-import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -43,7 +41,6 @@ import org.bukkit.event.block.Action;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 
-import java.io.File;
 import java.util.*;
 import java.util.function.BiFunction;
 
@@ -70,24 +67,14 @@ public class XrayCommand extends SWCommand implements Listener, ScoreboardElemen
         }
 
         Optional<TechHider> techHider = techHiders.computeIfAbsent(region, rg -> {
-            File file = rg.getGameModeConfig().orElse(null);
-            if (file == null) {
+            if (!region.getGameModeConfig().getTechhider().isActive()) {
                 return Optional.empty();
             }
 
-            FileConfiguration config = YamlConfiguration.loadConfiguration(file);
-            if (!config.getBoolean("Techhider.Active", false)) {
-                Set<Material> blocks = new HashSet<>(Arrays.asList(Material.END_STONE, Material.IRON_BLOCK));
-                xrayedBlocks.put(region, blocks);
-                return Optional.of(createXray(rg, blocks));
-            }
-
             hidden.put(rg, new HashSet<>());
 
-            String obfuscateWith = config.getString("Techhider.ObfuscateWith", "end_stone");
-
-            Set<Material> blocks = new HashSet<>(Arrays.asList(Material.getMaterial(obfuscateWith.toUpperCase())));
-            if (obfuscateWith.equals("end_stone")) blocks.add(Material.END_STONE_BRICKS);
+            Set<Material> blocks = new HashSet<>(Arrays.asList(region.getGameModeConfig().getTechhider().getObfuscateWith()));
+            if (blocks.contains(Material.END_STONE)) blocks.add(Material.END_STONE_BRICKS);
             xrayedBlocks.put(region, blocks);
             return Optional.of(createXray(rg, blocks));
         });
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
index 59b20632..fb6d0f55 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
@@ -24,7 +24,6 @@ import de.steamwar.bausystem.utils.PasteBuilder;
 import org.bukkit.Location;
 
 import java.io.File;
-import java.util.Optional;
 import java.util.UUID;
 import java.util.function.BiConsumer;
 import java.util.stream.Stream;
@@ -55,7 +54,7 @@ public interface Region {
 
     Area getTestblockArea();
 
-    Optional<File> getGameModeConfig();
+    RegionConfig getGameModeConfig();
 
     RegionHistory getHistory();
 
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionConfig.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionConfig.java
new file mode 100644
index 00000000..5c7da406
--- /dev/null
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionConfig.java
@@ -0,0 +1,124 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2020  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;
+
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import org.bukkit.Material;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.file.FileConfiguration;
+import org.bukkit.configuration.file.YamlConfiguration;
+
+import java.io.File;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Getter
+public class RegionConfig {
+
+    private final boolean loaded;
+
+    private Times Times = new Times();
+    private Schematic Schematic = new Schematic();
+    private Arena Arena = new Arena();
+    private Server Server = new Server();
+    private Techhider Techhider = new Techhider();
+
+    public RegionConfig(File file) {
+        if (file == null || !file.exists()) {
+            loaded = false;
+            return;
+        }
+        loaded = true;
+
+        FileConfiguration config = YamlConfiguration.loadConfiguration(file);
+
+        Times.load(config.getConfigurationSection("Times"));
+        Schematic.load(config.getConfigurationSection("Schematic"));
+        Arena.load(config.getConfigurationSection("Arena"));
+        Server.load(config.getConfigurationSection("Server"));
+        Techhider.load(config.getConfigurationSection("Techhider"));
+    }
+
+    @NoArgsConstructor(access = AccessLevel.PRIVATE)
+    @Getter
+    public static class Times {
+        private int PreFightDuration = 30;
+
+        private void load(ConfigurationSection section) {
+            PreFightDuration = section.getInt("PreFightDuration", 30);
+        }
+    }
+
+    @NoArgsConstructor(access = AccessLevel.PRIVATE)
+    @Getter
+    public static class Schematic {
+        private Map<Set<Material>, Integer> Limited = new HashMap<>();
+
+        private void load(ConfigurationSection section) {
+            for(Map<?, ?> entry : section.getMapList("Limited")) {
+                int amount = (Integer) entry.get("Amount");
+                Set<String> materials = new HashSet<>((List<String>) entry.get("Materials"));
+                if (amount == 0) {
+                    materials.forEach(material -> Limited.put(Collections.singleton(Material.getMaterial(material)), 0));
+                } else {
+                    Limited.put(materials.stream().map(Material::getMaterial).collect(Collectors.toSet()), amount);
+                }
+            }
+        }
+    }
+
+    @NoArgsConstructor(access = AccessLevel.PRIVATE)
+    @Getter
+    public static class Arena {
+        private boolean NoFloor = false;
+
+        private void load(ConfigurationSection section) {
+            NoFloor = section.getBoolean("NoFloor", false);
+        }
+    }
+
+    @NoArgsConstructor(access = AccessLevel.PRIVATE)
+    @Getter
+    public static class Server {
+        private List<String> ChatNames;
+
+        private void load(ConfigurationSection section) {
+            ChatNames = section.getStringList("ChatNames");
+        }
+    }
+
+    @NoArgsConstructor(access = AccessLevel.PRIVATE)
+    @Getter
+    public static class Techhider {
+        private boolean Active = false;
+        private Material ObfuscateWith = Material.END_STONE;
+        private Set<Material> HiddenBlocks = new HashSet<>();
+        private Set<String> HiddenBlockEntities = new HashSet<>();
+
+        private void load(ConfigurationSection section) {
+            Active = section.getBoolean("Active", false);
+            ObfuscateWith = Material.getMaterial(section.getString("ObfuscateWith", "END_STONE"));
+            HiddenBlocks = section.getStringList("HiddenBlocks").stream().map(Material::getMaterial).collect(Collectors.toUnmodifiableSet());
+            HiddenBlockEntities = Collections.unmodifiableSet(new HashSet<>(section.getStringList("HiddenBlockEntities")));
+        }
+    }
+}

From 698f9178282be6082e2999f27b5ceedaa659573b Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Thu, 31 Jul 2025 14:11:03 +0200
Subject: [PATCH 043/214] Add RegionSkins

---
 .../features/backup/BackupCommand.java        |  7 +--
 .../features/region/RegionCommand.java        | 34 +++++-------
 .../bausystem/region/FlagStorage.java         |  9 ++-
 .../de/steamwar/bausystem/region/Region.java  | 19 +++++++
 .../bausystem/region/RegionBackups.java       | 14 ++++-
 .../bausystem/region/RegionHistory.java       |  3 +-
 .../bausystem/region/RegionSkins.java         | 55 +++++++++++++++++++
 .../bausystem/region/RegionSystem.java        | 11 +++-
 8 files changed, 118 insertions(+), 34 deletions(-)
 create mode 100644 BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionSkins.java

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/backup/BackupCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/backup/BackupCommand.java
index b2671e84..6c7708c9 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/backup/BackupCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/backup/BackupCommand.java
@@ -72,12 +72,7 @@ public class BackupCommand extends SWCommand {
     }
 
     @Register(value = "load", description = "BACKUP_HELP_LOAD")
-    public void backupLoad(@Validator("owner") Player p, @Mapper("backup") RegionBackups.Backup backup) {
-        Region region = Region.getRegion(p.getLocation());
-        if (checkGlobalRegion(region, p)) {
-            return;
-        }
-
+    public void backupLoad(@Validator("owner") Player p, @Mapper("backup") @ErrorMessage("BACKUP_LOAD_FAILURE") RegionBackups.Backup backup) {
         if (backup.load()) {
             BauSystem.MESSAGE.send("BACKUP_LOAD", p);
         } else {
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionCommand.java
index ccf62cdb..a0f2ca1c 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionCommand.java
@@ -30,9 +30,9 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.util.SelectCommand;
 import de.steamwar.bausystem.region.Point;
 import de.steamwar.bausystem.region.Region;
+import de.steamwar.bausystem.region.RegionSkins;
 import de.steamwar.bausystem.region.RegionUtils;
 import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.region.utils.RegionType;
 import de.steamwar.bausystem.shared.Pair;
 import de.steamwar.bausystem.utils.FlatteningWrapper;
 import de.steamwar.bausystem.utils.PasteBuilder;
@@ -177,8 +177,8 @@ public class RegionCommand extends SWCommand {
         if (checkGlobalRegion(region, p)) {
             return;
         }
-        BauSystem.MESSAGE.send("REGION_REGION_CHANGESKIN_INFO", p, region.getSkin());
-        String creator = region.getPrototype().getSkinMap().get(region.getSkin()).getCreator();
+        BauSystem.MESSAGE.send("REGION_REGION_CHANGESKIN_INFO", p, region.getSkins().getCurrentSkin().getName());
+        String creator = region.getSkins().getCurrentSkin().getCreator();
         if (creator != null) {
             BauSystem.MESSAGE.send("REGION_REGION_CHANGESKIN_INFO_CREATOR", p, creator);
         }
@@ -186,20 +186,12 @@ public class RegionCommand extends SWCommand {
 
     @Register(value = "changeskin", description = "REGION_REGION_HELP_CHANGESKIN")
     @Register("skin")
-    public void changeSkinCommand(@Validator Player p, @Mapper("skinTypeMapper") String s) {
-        Region region = Region.getRegion(p.getLocation());
-        if (checkGlobalRegion(region, p)) {
-            return;
-        }
-        if (!region.getPrototype().getSkinMap().containsKey(s)) {
-            BauSystem.MESSAGE.send("REGION_REGION_CHANGESKIN_UNKNOWN", p);
+    public void changeSkinCommand(@Validator Player p, @Mapper("skinTypeMapper") @ErrorMessage("REGION_REGION_CHANGESKIN_UNKNOWN") RegionSkins.Skin skin) {
+        if (skin.apply()) {
+            BauSystem.MESSAGE.send("REGION_REGION_CHANGESKIN_CHANGE", p, skin.getName());
+            BauSystem.MESSAGE.send("REGION_REGION_CHANGESKIN_CHANGE_UPDATE", p, BauSystem.MESSAGE.parse("REGION_REGION_CHANGESKIN_CHANGE_UPDATE_HOVER", p), new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/reset"));
         } else {
-            if (region.setSkin(s)) {
-                BauSystem.MESSAGE.send("REGION_REGION_CHANGESKIN_CHANGE", p, s);
-                BauSystem.MESSAGE.send("REGION_REGION_CHANGESKIN_CHANGE_UPDATE", p, BauSystem.MESSAGE.parse("REGION_REGION_CHANGESKIN_CHANGE_UPDATE_HOVER", p), new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/reset"));
-            } else {
-                BauSystem.MESSAGE.send("REGION_REGION_CHANGESKIN_INVALID", p);
-            }
+            BauSystem.MESSAGE.send("REGION_REGION_CHANGESKIN_INVALID", p);
         }
     }
 
@@ -296,8 +288,8 @@ public class RegionCommand extends SWCommand {
 
 
     @Mapper(value = "skinTypeMapper", local = true)
-    private TypeMapper<String> skinTypeMapper() {
-        return new TypeMapper<String>() {
+    private TypeMapper<RegionSkins.Skin> skinTypeMapper() {
+        return new TypeMapper<RegionSkins.Skin>() {
             @Override
             public List<String> tabCompletes(CommandSender commandSender, PreviousArguments previousArguments, String s) {
                 Player p = (Player) commandSender;
@@ -305,12 +297,12 @@ public class RegionCommand extends SWCommand {
                 if (region.getType().isGlobal()) {
                     return Collections.emptyList();
                 }
-                return region.getPrototype().getSkinMap().keySet().stream().map(c -> c.replace(' ', '_')).collect(Collectors.toList());
+                return region.getSkins().list().stream().map(skin -> skin.getName().replace(' ', '_')).collect(Collectors.toList());
             }
 
             @Override
-            public String map(CommandSender commandSender, PreviousArguments previousArguments, String s) {
-                return s.replace('_', ' ');
+            public RegionSkins.Skin map(CommandSender commandSender, PreviousArguments previousArguments, String s) {
+                return Region.getRegion(((Player) commandSender).getLocation()).getSkins().get(s.replace('_', ' '));
             }
         };
     }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/FlagStorage.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/FlagStorage.java
index 6d51e2ef..d6f1afd5 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/FlagStorage.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/FlagStorage.java
@@ -20,14 +20,17 @@
 package de.steamwar.bausystem.region;
 
 import de.steamwar.bausystem.region.flags.Flag;
+import lombok.NonNull;
 
 public interface FlagStorage {
 
-    <T extends Enum<T> & Flag.Value<T>> RegionFlagPolicy has(Flag<T> flag);
+    @NonNull
+    <T extends Enum<T> & Flag.Value<T>> RegionFlagPolicy has(@NonNull Flag<T> flag);
 
-    <T extends Enum<T> & Flag.Value<T>> boolean set(Flag<T> flag, T value);
+    <T extends Enum<T> & Flag.Value<T>> boolean set(@NonNull Flag<T> flag, @NonNull T value);
 
-    <T extends Enum<T> & Flag.Value<T>> FlagOptional<T> get(Flag<T> flag);
+    @NonNull
+    <T extends Enum<T> & Flag.Value<T>> FlagOptional<T> get(@NonNull Flag<T> flag);
 
     void clear();
 }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
index fb6d0f55..d2d97ecf 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
@@ -21,8 +21,10 @@ package de.steamwar.bausystem.region;
 
 import com.sk89q.worldedit.EditSession;
 import de.steamwar.bausystem.utils.PasteBuilder;
+import lombok.NonNull;
 import org.bukkit.Location;
 
+import javax.annotation.Nullable;
 import java.io.File;
 import java.util.UUID;
 import java.util.function.BiConsumer;
@@ -42,24 +44,36 @@ public interface Region {
         return RegionSystem.INSTANCE.getGlobalRegion();
     }
 
+    @NonNull
     UUID getID();
 
+    @NonNull
     RegionType getType();
 
+    @NonNull
     FlagStorage getFlags();
 
+    @NonNull
     Area getArea();
 
+    @NonNull
     Area getBuildArea();
 
+    @NonNull
     Area getTestblockArea();
 
+    @NonNull
     RegionConfig getGameModeConfig();
 
+    @NonNull
     RegionHistory getHistory();
 
+    @NonNull
     RegionBackups getBackups();
 
+    @NonNull
+    RegionSkins getSkins();
+
     interface Area {
 
         Area EMPTY = new Area() {
@@ -116,16 +130,21 @@ public interface Region {
             return false;
         }
 
+        @NonNull
         Point getMinPoint(boolean extension);
 
+        @NonNull
         Point getMaxPoint(boolean extension);
 
+        @NonNull
         Point getCopyPoint();
 
         boolean inRegion(Location location, boolean extension);
 
+        @Nullable
         EditSession copy(boolean extension);
 
+        @Nullable
         File getResetFile();
 
         void reset(PasteBuilder pasteBuilder, boolean extension);
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionBackups.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionBackups.java
index af4bf23b..53b3b8a7 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionBackups.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionBackups.java
@@ -20,8 +20,11 @@
 package de.steamwar.bausystem.region;
 
 import lombok.Getter;
+import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 
+import javax.annotation.CheckReturnValue;
+import javax.annotation.Nullable;
 import java.util.List;
 import java.util.Optional;
 
@@ -33,24 +36,33 @@ public interface RegionBackups {
         AUTOMATIC(20),
         ;
 
-        private final int maxBackups;
+        public final int maxBackups;
     }
 
     @RequiredArgsConstructor
     @Getter
     abstract class Backup {
+        @NonNull
         private final BackupType type;
+
+        @NonNull
         private final String name;
+
+        @NonNull
         private final FlagStorage flags;
 
+        @CheckReturnValue
         public abstract boolean load();
 
         public abstract void delete();
     }
 
+    @CheckReturnValue
     Optional<Backup> create(BackupType backupType);
 
+    @NonNull
     List<Backup> list();
 
+    @Nullable
     Backup get(String name);
 }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionHistory.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionHistory.java
index 17ff9c19..9732b325 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionHistory.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionHistory.java
@@ -20,10 +20,11 @@
 package de.steamwar.bausystem.region;
 
 import com.sk89q.worldedit.EditSession;
+import lombok.NonNull;
 
 public interface RegionHistory {
 
-    void remember(EditSession editSession);
+    void remember(@NonNull EditSession editSession);
 
     boolean undo();
 
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionSkins.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionSkins.java
new file mode 100644
index 00000000..e12f2221
--- /dev/null
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionSkins.java
@@ -0,0 +1,55 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2020  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;
+
+import lombok.Getter;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+
+import javax.annotation.CheckReturnValue;
+import javax.annotation.Nullable;
+import java.util.List;
+
+public interface RegionSkins {
+
+    @RequiredArgsConstructor
+    @Getter
+    abstract class Skin {
+        @NonNull
+        private final String name;
+
+        @NonNull
+        private final String creator;
+
+        @CheckReturnValue
+        public abstract boolean apply();
+    }
+
+    @NonNull
+    Skin getCurrentSkin();
+
+    @NonNull
+    List<Skin> list();
+
+    boolean has(@NonNull String name);
+
+    @Nullable
+    Skin get(@NonNull String name);
+}
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionSystem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionSystem.java
index 26ee4bc6..5222a415 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionSystem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionSystem.java
@@ -19,8 +19,10 @@
 
 package de.steamwar.bausystem.region;
 
+import lombok.NonNull;
 import org.bukkit.Location;
 
+import javax.annotation.CheckReturnValue;
 import java.lang.reflect.InvocationTargetException;
 import java.util.Optional;
 import java.util.UUID;
@@ -33,11 +35,16 @@ public interface RegionSystem {
     void load();
     void save();
 
+    @NonNull
     Region getGlobalRegion();
 
-    Region get(Location location);
-    Optional<Region> getRegion(UUID id);
+    @NonNull
+    Region get(@NonNull Location location);
 
+    @CheckReturnValue
+    Optional<Region> getRegion(@NonNull UUID id);
+
+    @NonNull
     Stream<Region> getRegions();
 
     boolean isModular();

From e6196251a62c462c76849fe8f6de2c6be43ee21d Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Thu, 31 Jul 2025 14:12:30 +0200
Subject: [PATCH 044/214] Remove SkinCommand Fix TickManager15

---
 .../src/de/steamwar/bausystem/utils/TickManager15.java        | 4 ++--
 .../features/team/{SkinCommand.java => SkinCommand.java.txt}  | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/team/{SkinCommand.java => SkinCommand.java.txt} (100%)

diff --git a/BauSystem/BauSystem_15/src/de/steamwar/bausystem/utils/TickManager15.java b/BauSystem/BauSystem_15/src/de/steamwar/bausystem/utils/TickManager15.java
index a56a2e35..ab279d45 100644
--- a/BauSystem/BauSystem_15/src/de/steamwar/bausystem/utils/TickManager15.java
+++ b/BauSystem/BauSystem_15/src/de/steamwar/bausystem/utils/TickManager15.java
@@ -19,7 +19,7 @@
 
 package de.steamwar.bausystem.utils;
 
-import de.steamwar.bausystem.region.GlobalRegion;
+import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.utils.bossbar.BossBarService;
 import de.steamwar.bausystem.utils.tps.TPSFreezeUtils;
 import de.steamwar.bausystem.utils.tps.TPSLimitUtils;
@@ -46,7 +46,7 @@ public class TickManager15 implements TickManager, Listener {
         if (currentlyStepping) {
             currentlyStepping = false;
             Bukkit.getOnlinePlayers().forEach(player -> {
-                BossBarService.instance.remove(player, GlobalRegion.getInstance(), "TickStep");
+                BossBarService.instance.remove(player, Region.getGlobalRegion(), "TickStep");
             });
         }
         TPSWarpUtils.warp(tickRate);
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/team/SkinCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/team/SkinCommand.java.txt
similarity index 100%
rename from BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/team/SkinCommand.java
rename to BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/team/SkinCommand.java.txt

From c49a212c0559d80ca761645dc1e6da2a7fe215ff Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Thu, 31 Jul 2025 14:14:12 +0200
Subject: [PATCH 045/214] Move regionold to RegionFixed module

---
 .../src/de/steamwar/bausystem/regionold/Prototype.java.txt        | 0
 .../src/de/steamwar/bausystem/regionold/Region.java.txt           | 0
 .../steamwar/bausystem/regionold/loader/PrototypeLoader.java.txt  | 0
 .../de/steamwar/bausystem/regionold/loader/RegionLoader.java.txt  | 0
 .../src/de/steamwar/bausystem/regionold/loader/Updater.java.txt   | 0
 5 files changed, 0 insertions(+), 0 deletions(-)
 rename BauSystem/{BauSystem_Main => BauSystem_RegionFixed}/src/de/steamwar/bausystem/regionold/Prototype.java.txt (100%)
 rename BauSystem/{BauSystem_Main => BauSystem_RegionFixed}/src/de/steamwar/bausystem/regionold/Region.java.txt (100%)
 rename BauSystem/{BauSystem_Main => BauSystem_RegionFixed}/src/de/steamwar/bausystem/regionold/loader/PrototypeLoader.java.txt (100%)
 rename BauSystem/{BauSystem_Main => BauSystem_RegionFixed}/src/de/steamwar/bausystem/regionold/loader/RegionLoader.java.txt (100%)
 rename BauSystem/{BauSystem_Main => BauSystem_RegionFixed}/src/de/steamwar/bausystem/regionold/loader/Updater.java.txt (100%)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionold/Prototype.java.txt b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionold/Prototype.java.txt
similarity index 100%
rename from BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionold/Prototype.java.txt
rename to BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionold/Prototype.java.txt
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionold/Region.java.txt b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionold/Region.java.txt
similarity index 100%
rename from BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionold/Region.java.txt
rename to BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionold/Region.java.txt
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionold/loader/PrototypeLoader.java.txt b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionold/loader/PrototypeLoader.java.txt
similarity index 100%
rename from BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionold/loader/PrototypeLoader.java.txt
rename to BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionold/loader/PrototypeLoader.java.txt
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionold/loader/RegionLoader.java.txt b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionold/loader/RegionLoader.java.txt
similarity index 100%
rename from BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionold/loader/RegionLoader.java.txt
rename to BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionold/loader/RegionLoader.java.txt
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionold/loader/Updater.java.txt b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionold/loader/Updater.java.txt
similarity index 100%
rename from BauSystem/BauSystem_Main/src/de/steamwar/bausystem/regionold/loader/Updater.java.txt
rename to BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionold/loader/Updater.java.txt

From 01d9532aa66dab0d4ce82324ad3cb1c185fcae75 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Thu, 31 Jul 2025 14:31:16 +0200
Subject: [PATCH 046/214] Pot impl a FixedGlobalRegion

---
 .../bausystem/region/RegionBackups.java       |  18 +++
 .../bausystem/region/RegionHistory.java       |  16 +++
 .../bausystem/region/RegionSkins.java         |  35 +++++
 .../steamwar/bausystem/region/flags/Flag.java |  10 +-
 .../bausystem/region/FixedFlagStorage.java    |  32 +++--
 .../bausystem/region/FixedGlobalRegion.java   | 132 ++++++++++--------
 .../bausystem/region/FixedRegion.java         | 111 ---------------
 .../bausystem/region/FixedRegionSystem.java   |  10 +-
 8 files changed, 171 insertions(+), 193 deletions(-)
 delete mode 100644 BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedRegion.java

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionBackups.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionBackups.java
index 53b3b8a7..b49e949a 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionBackups.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionBackups.java
@@ -65,4 +65,22 @@ public interface RegionBackups {
 
     @Nullable
     Backup get(String name);
+
+    RegionBackups EMPTY = new RegionBackups() {
+        @Override
+        public Optional<Backup> create(BackupType backupType) {
+            return Optional.empty();
+        }
+
+        @Override
+        public @NonNull List<Backup> list() {
+            return List.of();
+        }
+
+        @Nullable
+        @Override
+        public Backup get(String name) {
+            return null;
+        }
+    };
 }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionHistory.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionHistory.java
index 9732b325..2eb79247 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionHistory.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionHistory.java
@@ -29,4 +29,20 @@ public interface RegionHistory {
     boolean undo();
 
     boolean redo();
+
+    RegionHistory EMPTY = new RegionHistory() {
+        @Override
+        public void remember(@NonNull EditSession editSession) {
+        }
+
+        @Override
+        public boolean undo() {
+            return false;
+        }
+
+        @Override
+        public boolean redo() {
+            return false;
+        }
+    };
 }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionSkins.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionSkins.java
index e12f2221..b9413d9f 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionSkins.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionSkins.java
@@ -40,6 +40,13 @@ public interface RegionSkins {
 
         @CheckReturnValue
         public abstract boolean apply();
+
+        public static final Skin GLOBAL = new Skin("Global", "§eSteam§8War") {
+            @Override
+            public boolean apply() {
+                return false;
+            }
+        };
     }
 
     @NonNull
@@ -52,4 +59,32 @@ public interface RegionSkins {
 
     @Nullable
     Skin get(@NonNull String name);
+
+    RegionSkins GLOBAL = new RegionSkins() {
+
+        @Override
+        public @NonNull Skin getCurrentSkin() {
+            return Skin.GLOBAL;
+        }
+
+        @Override
+        public @NonNull List<Skin> list() {
+            return List.of(Skin.GLOBAL);
+        }
+
+        @Override
+        public boolean has(@NonNull String name) {
+            return Skin.GLOBAL.name.equals(name);
+        }
+
+        @Nullable
+        @Override
+        public Skin get(@NonNull String name) {
+            if (Skin.GLOBAL.name.equals(name)) {
+                return Skin.GLOBAL;
+            } else {
+                return null;
+            }
+        }
+    };
 }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/Flag.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/Flag.java
index e9eb963b..c62e0748 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/Flag.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/Flag.java
@@ -29,6 +29,11 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 public final class Flag<T extends Enum<T> & Flag.Value<T>> implements EnumDisplay {
 
+    @Getter
+    private static final Set<Flag> flags = new HashSet<>();
+
+    private static AtomicInteger counter = new AtomicInteger(0);
+
     public static final Flag<ColorMode> COLOR = new Flag<>("COLOR", "FLAG_COLOR", ColorMode.class, ColorMode.YELLOW);
     public static final Flag<TNTMode> TNT = new Flag<>("TNT", "FLAG_TNT", TNTMode.class, TNTMode.ONLY_TB);
     public static final Flag<FireMode> FIRE = new Flag<>("FIRE", "FLAG_FIRE", FireMode.class, FireMode.ALLOW);
@@ -39,11 +44,6 @@ public final class Flag<T extends Enum<T> & Flag.Value<T>> implements EnumDispla
     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);
 
-    @Getter
-    private static final Set<Flag> flags = new HashSet<>();
-
-    private static AtomicInteger counter = new AtomicInteger(0);
-
     private String name;
     private int ordinal;
 
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedFlagStorage.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedFlagStorage.java
index af44866a..7f083084 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedFlagStorage.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedFlagStorage.java
@@ -20,6 +20,7 @@
 package de.steamwar.bausystem.region;
 
 import de.steamwar.bausystem.region.flags.Flag;
+import lombok.NonNull;
 
 import java.io.File;
 import java.util.HashMap;
@@ -29,27 +30,28 @@ public class FixedFlagStorage implements FlagStorage {
 
     private Map<Flag<?>, Flag.Value<?>> flagMap = new HashMap<>();
 
-    public static FlagStorage createFromRegion(Region region) {
-        FlagStorage flagStorage = new FixedFlagStorage();
-        Flag.getFlags().forEach(flag -> {
-            if (region.hasFlag(flag).isReadable()) {
-                flagStorage.set(flag, flag.getDefaultValue());
-            }
-        });
-        return flagStorage;
-    }
-
     public static FlagStorage createFromFile(File file) {
-        throw new IllegalStateException("Not implemented yet");
+        // throw new IllegalStateException("Not implemented yet");
+        return new FixedFlagStorage();
     }
 
     @Override
-    public <T extends Enum<T> & Flag.Value<T>> boolean set(Flag<T> flag, T value) {
-        return flagMap.put(flag, value) != value;
+    public @NonNull <T extends Enum<T> & Flag.Value<T>> RegionFlagPolicy has(@NonNull Flag<T> flag) {
+        return RegionFlagPolicy.NOT_APPLICABLE;
     }
 
     @Override
-    public <T extends Enum<T> & Flag.Value<T>> T get(Flag<T> flag) {
-        return (T) flagMap.get(flag);
+    public <T extends Enum<T> & Flag.Value<T>> boolean set(@NonNull Flag<T> flag, @NonNull T value) {
+        return false;
+    }
+
+    @Override
+    public @NonNull <T extends Enum<T> & Flag.Value<T>> FlagOptional<T> get(@NonNull Flag<T> flag) {
+        return FlagOptional.of(flag);
+    }
+
+    @Override
+    public void clear() {
+        flagMap.clear();
     }
 }
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedGlobalRegion.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedGlobalRegion.java
index b36ddecb..b1545d48 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedGlobalRegion.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedGlobalRegion.java
@@ -20,12 +20,14 @@
 package de.steamwar.bausystem.region;
 
 import com.sk89q.worldedit.EditSession;
-import de.steamwar.bausystem.region.flags.Flag;
+import de.steamwar.bausystem.utils.PasteBuilder;
 import lombok.NonNull;
 import org.bukkit.Location;
 
+import javax.annotation.Nullable;
 import java.io.File;
-import java.util.Optional;
+import java.util.UUID;
+import java.util.function.BiConsumer;
 
 public final class FixedGlobalRegion implements Region {
 
@@ -34,7 +36,58 @@ public final class FixedGlobalRegion implements Region {
     private static final Point MIN_POINT = new Point(Integer.MIN_VALUE, Integer.MIN_VALUE, Integer.MIN_VALUE);
     private static final Point MAX_POINT = new Point(Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE);
 
-    private final FlagStorage FLAG_STORAGE = FixedFlagStorage.createFromRegion(this); // TODO: Update to either File or Region creation!
+    private static final FlagStorage FLAG_STORAGE = FixedFlagStorage.createFromFile(null); // TODO: Update to either File or Region creation!
+
+    private static final UUID GLOBAL_REGION_ID = new UUID(0, 0);
+
+    private static final Area GLOBAL_AREA = new Area() {
+        @Override
+        public @NonNull Point getMinPoint(boolean extension) {
+            return MIN_POINT;
+        }
+
+        @Override
+        public @NonNull Point getMaxPoint(boolean extension) {
+            return MAX_POINT;
+        }
+
+        @Override
+        public @NonNull Point getCopyPoint() {
+            return Point.ZERO;
+        }
+
+        @Override
+        public boolean inRegion(Location location, boolean extension) {
+            return true;
+        }
+
+        @Nullable
+        @Override
+        public EditSession copy(boolean extension) {
+            return null;
+        }
+
+        @Nullable
+        @Override
+        public File getResetFile() {
+            return null;
+        }
+
+        @Override
+        public void reset(PasteBuilder pasteBuilder, boolean extension) {
+        }
+
+        @Override
+        public void forEachChunk(BiConsumer<Integer, Integer> executor) {
+        }
+
+        @Override
+        public boolean isChunkOutside(int chunkX, int chunkZ) {
+            return false;
+        }
+    };
+
+    private static final RegionConfig GLOBAL_CONFIG = new RegionConfig(null);
 
     private FixedGlobalRegion() {
     }
@@ -45,84 +98,47 @@ public final class FixedGlobalRegion implements Region {
     }
 
     @Override
-    public <T extends Enum<T> & Flag.Value<T>> RegionFlagPolicy hasFlag(@NonNull Flag<T> flag) {
-        if (flag.oneOf(Flag.TNT, Flag.FIRE, Flag.FREEZE, Flag.ITEMS, Flag.NO_GRAVITY)) {
-            return RegionFlagPolicy.WRITABLE;
-        }
-        return RegionFlagPolicy.NOT_APPLICABLE;
+    public @NonNull UUID getID() {
+        return GLOBAL_REGION_ID;
     }
 
     @Override
-    public <T extends Enum<T> & Flag.Value<T>> boolean setFlag(@NonNull Flag<T> flag, T value) {
-        return hasFlag(flag).isWritable() && FLAG_STORAGE.set(flag, value);
+    public @NonNull FlagStorage getFlags() {
+        return FLAG_STORAGE;
     }
 
     @Override
-    public <T extends Enum<T> & Flag.Value<T>> Optional<T> getFlag(@NonNull Flag<T> flag) {
-        if (hasFlag(flag).isReadable()) {
-            return Optional.ofNullable(FLAG_STORAGE.get(flag));
-        } else {
-            return Optional.empty();
-        }
+    public @NonNull Area getArea() {
+        return GLOBAL_AREA;
     }
 
     @Override
-    public Point getMinPoint() {
-        return MIN_POINT;
+    public @NonNull Area getBuildArea() {
+        return Area.EMPTY;
     }
 
     @Override
-    public Point getMaxPoint() {
-        return MAX_POINT;
+    public @NonNull Area getTestblockArea() {
+        return Area.EMPTY;
     }
 
     @Override
-    public boolean inRegion(Location location) {
-        return true;
+    public @NonNull RegionConfig getGameModeConfig() {
+        return GLOBAL_CONFIG;
     }
 
     @Override
-    public Inner getBuildArea() {
-        return Inner.EMPTY;
+    public @NonNull RegionHistory getHistory() {
+        return RegionHistory.EMPTY;
     }
 
     @Override
-    public Inner getTestblockArea() {
-        return Inner.EMPTY;
+    public @NonNull RegionBackups getBackups() {
+        return RegionBackups.EMPTY;
     }
 
     @Override
-    public Optional<File> getGameModeConfig() {
-        return Optional.empty();
-    }
-
-    @Override
-    public Optional<EditSession> copy() {
-        return Optional.empty();
-    }
-
-    @Override
-    public boolean backup(boolean automatic) {
-        return false;
-    }
-
-    @Override
-    public void reset() {
-
-    }
-
-    @Override
-    public void remember(EditSession editSession) {
-
-    }
-
-    @Override
-    public boolean undo() {
-        return false;
-    }
-
-    @Override
-    public boolean redo() {
-        return false;
+    public @NonNull RegionSkins getSkins() {
+        return RegionSkins.GLOBAL;
     }
 }
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedRegion.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedRegion.java
deleted file mode 100644
index 0023060d..00000000
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedRegion.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2024  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;
-
-import com.sk89q.worldedit.EditSession;
-import de.steamwar.bausystem.region.flags.Flag;
-import lombok.NonNull;
-import org.bukkit.Location;
-
-import java.io.File;
-import java.util.Optional;
-
-public class FixedRegion implements Region { // TODO: Implement!
-
-    @Override
-    public RegionType getType() {
-        return RegionType.NORMAL;
-    }
-
-    @Override
-    public <T extends Enum<T> & Flag.Value<T>> RegionFlagPolicy hasFlag(@NonNull Flag<T> flag) {
-        return null;
-    }
-
-    @Override
-    public <T extends Enum<T> & Flag.Value<T>> boolean setFlag(@NonNull Flag<T> flag, T value) {
-        return false;
-    }
-
-    @Override
-    public <T extends Enum<T> & Flag.Value<T>> Optional<T> getFlag(@NonNull Flag<T> flag) {
-        return Optional.empty();
-    }
-
-    @Override
-    public Point getMinPoint() {
-        return null;
-    }
-
-    @Override
-    public Point getMaxPoint() {
-        return null;
-    }
-
-    @Override
-    public boolean inRegion(Location location) {
-        return false;
-    }
-
-    @Override
-    public Inner getBuildArea() {
-        return Inner.EMPTY;
-    }
-
-    @Override
-    public Inner getTestblockArea() {
-        return Inner.EMPTY;
-    }
-
-    @Override
-    public Optional<File> getGameModeConfig() {
-        return Optional.empty();
-    }
-
-    @Override
-    public boolean backup(boolean automatic) {
-        return false;
-    }
-
-    @Override
-    public Optional<EditSession> copy() {
-        return Optional.empty();
-    }
-
-    @Override
-    public void reset() {
-
-    }
-
-    @Override
-    public void remember(EditSession editSession) {
-
-    }
-
-    @Override
-    public boolean undo() {
-        return false;
-    }
-
-    @Override
-    public boolean redo() {
-        return false;
-    }
-}
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedRegionSystem.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedRegionSystem.java
index dfdaf3f3..473ec0d3 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedRegionSystem.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedRegionSystem.java
@@ -19,16 +19,18 @@
 
 package de.steamwar.bausystem.region;
 
+import lombok.NonNull;
 import org.bukkit.Location;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
+import java.util.UUID;
 import java.util.stream.Stream;
 
 public class FixedRegionSystem implements RegionSystem {
 
-    private static final Map<String, Region> REGION_MAP = new HashMap<>();
+    private static final Map<UUID, Region> REGION_MAP = new HashMap<>();
 
     @Override
     public void load() {
@@ -48,14 +50,14 @@ public class FixedRegionSystem implements RegionSystem {
     @Override
     public Region get(Location location) {
         return REGION_MAP.values().stream()
-                .filter(region -> region.inRegion(location))
+                .filter(region -> region.getArea().inRegion(location, false))
                 .findFirst()
                 .orElse(FixedGlobalRegion.INSTANCE);
     }
 
     @Override
-    public Optional<Region> getRegion(String name) {
-        return Optional.ofNullable(REGION_MAP.get(name));
+    public Optional<Region> getRegion(@NonNull UUID id) {
+        return Optional.ofNullable(REGION_MAP.get(id));
     }
 
     @Override

From 6a5507321eb0b3c6733f9e96ae19e909531edeee Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Thu, 31 Jul 2025 18:17:38 +0200
Subject: [PATCH 047/214] Add FixedGlobalFlagStorage

---
 .../steamwar/bausystem/region/flags/Flag.java |  3 +-
 .../bausystem/region/FixedFlagStorage.java    | 10 ++-
 .../region/FixedGlobalFlagStorage.java        | 78 +++++++++++++++++++
 .../bausystem/region/FixedGlobalRegion.java   |  2 +-
 4 files changed, 87 insertions(+), 6 deletions(-)
 create mode 100644 BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedGlobalFlagStorage.java

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/Flag.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/Flag.java
index c62e0748..ddee1806 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/Flag.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/Flag.java
@@ -20,7 +20,6 @@
 package de.steamwar.bausystem.region.flags;
 
 import de.steamwar.bausystem.shared.EnumDisplay;
-import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 import java.util.HashSet;
@@ -36,7 +35,7 @@ public final class Flag<T extends Enum<T> & Flag.Value<T>> implements EnumDispla
 
     public static final Flag<ColorMode> COLOR = new Flag<>("COLOR", "FLAG_COLOR", ColorMode.class, ColorMode.YELLOW);
     public static final Flag<TNTMode> TNT = new Flag<>("TNT", "FLAG_TNT", TNTMode.class, TNTMode.ONLY_TB);
-    public static final Flag<FireMode> FIRE = new Flag<>("FIRE", "FLAG_FIRE", FireMode.class, FireMode.ALLOW);
+    public static final Flag<FireMode> FIRE = new Flag<>("FIRE", "FLAG_FIRE", FireMode.class, FireMode.DENY);
     public static final Flag<FreezeMode> FREEZE = new Flag<>("FREEZE", "FLAG_FREEZE", FreezeMode.class, FreezeMode.INACTIVE);
     public static final Flag<ProtectMode> PROTECT = new Flag<>("PROTECT", "FLAG_PROTECT", ProtectMode.class, ProtectMode.ACTIVE);
     public static final Flag<ItemMode> ITEMS = new Flag<>("ITEMS", "FLAG_ITEMS", ItemMode.class, ItemMode.INACTIVE);
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedFlagStorage.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedFlagStorage.java
index 7f083084..f2c05616 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedFlagStorage.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedFlagStorage.java
@@ -20,6 +20,7 @@
 package de.steamwar.bausystem.region;
 
 import de.steamwar.bausystem.region.flags.Flag;
+import de.steamwar.core.Core;
 import lombok.NonNull;
 
 import java.io.File;
@@ -37,17 +38,20 @@ public class FixedFlagStorage implements FlagStorage {
 
     @Override
     public @NonNull <T extends Enum<T> & Flag.Value<T>> RegionFlagPolicy has(@NonNull Flag<T> flag) {
-        return RegionFlagPolicy.NOT_APPLICABLE;
+        if (flag.oneOf(Flag.ITEMS) && Core.getVersion() < 20) {
+            return RegionFlagPolicy.NOT_APPLICABLE;
+        }
+        return RegionFlagPolicy.WRITABLE;
     }
 
     @Override
     public <T extends Enum<T> & Flag.Value<T>> boolean set(@NonNull Flag<T> flag, @NonNull T value) {
-        return false;
+        return flagMap.put(flag, value) != value;
     }
 
     @Override
     public @NonNull <T extends Enum<T> & Flag.Value<T>> FlagOptional<T> get(@NonNull Flag<T> flag) {
-        return FlagOptional.of(flag);
+        return FlagOptional.of(flag, (T) flagMap.get(flag));
     }
 
     @Override
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedGlobalFlagStorage.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedGlobalFlagStorage.java
new file mode 100644
index 00000000..f20f9a02
--- /dev/null
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedGlobalFlagStorage.java
@@ -0,0 +1,78 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2020  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;
+
+import de.steamwar.bausystem.region.flags.ColorMode;
+import de.steamwar.bausystem.region.flags.Flag;
+import de.steamwar.bausystem.region.flags.ProtectMode;
+import de.steamwar.bausystem.region.flags.TNTMode;
+import de.steamwar.core.Core;
+import lombok.NonNull;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class FixedGlobalFlagStorage implements FlagStorage {
+
+    private Map<Flag<?>, Flag.Value<?>> flagMap = new HashMap<>();
+
+    public FixedGlobalFlagStorage() {
+        flagMap.put(Flag.TNT, TNTMode.DENY);
+    }
+
+    @Override
+    public @NonNull <T extends Enum<T> & Flag.Value<T>> RegionFlagPolicy has(@NonNull Flag<T> flag) {
+        if (flag.oneOf(Flag.PROTECT, Flag.TESTBLOCK, Flag.NO_GRAVITY, Flag.CHANGED)) {
+            return RegionFlagPolicy.NOT_APPLICABLE;
+        }
+        if (flag.oneOf(Flag.ITEMS) && Core.getVersion() < 20) {
+            return RegionFlagPolicy.NOT_APPLICABLE;
+        }
+        if (flag.oneOf(Flag.COLOR)) {
+            return RegionFlagPolicy.READ_ONLY;
+        }
+        return RegionFlagPolicy.WRITABLE;
+    }
+
+    @Override
+    public <T extends Enum<T> & Flag.Value<T>> boolean set(@NonNull Flag<T> flag, @NonNull T value) {
+        if (has(flag).isWritable()) {
+            return flagMap.put(flag, value) != value;
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    public @NonNull <T extends Enum<T> & Flag.Value<T>> FlagOptional<T> get(@NonNull Flag<T> flag) {
+        if (flag.oneOf(Flag.COLOR)) {
+            return FlagOptional.of((Flag) flag, ColorMode.YELLOW);
+        }
+        if (flag.oneOf(Flag.PROTECT)) {
+            return FlagOptional.of((Flag) flag, ProtectMode.INACTIVE);
+        }
+        return FlagOptional.of(flag, (T) flagMap.get(flag));
+    }
+
+    @Override
+    public void clear() {
+        flagMap.clear();
+    }
+}
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedGlobalRegion.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedGlobalRegion.java
index b1545d48..ea9eb298 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedGlobalRegion.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedGlobalRegion.java
@@ -36,7 +36,7 @@ public final class FixedGlobalRegion implements Region {
     private static final Point MIN_POINT = new Point(Integer.MIN_VALUE, Integer.MIN_VALUE, Integer.MIN_VALUE);
     private static final Point MAX_POINT = new Point(Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE);
 
-    private static final FlagStorage FLAG_STORAGE = FixedFlagStorage.createFromFile(null); // TODO: Update to either File or Region creation!
+    private static final FlagStorage FLAG_STORAGE = new FixedGlobalFlagStorage();
 
     private static final UUID GLOBAL_REGION_ID = new UUID(0, 0);
 

From 56680119e28be021e84095c33620dda1e8b8f2fa Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Thu, 31 Jul 2025 18:20:28 +0200
Subject: [PATCH 048/214] Fix ColorCommand

---
 .../src/de/steamwar/bausystem/features/region/ColorCommand.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ColorCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ColorCommand.java
index 436564ac..6c086ded 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ColorCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ColorCommand.java
@@ -59,7 +59,7 @@ public class ColorCommand extends SWCommand {
             return;
         }
         Region region = Region.getRegion(p.getLocation());
-        if (region.getType().isGlobal()) {
+        if (!region.getFlags().has(Flag.COLOR).isWritable()) {
             BauSystem.MESSAGE.send("REGION_COLOR_NO_REGION", p);
             return;
         }

From 13ef13140133be9c2989ddb556ef1f307a4e1142 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Thu, 31 Jul 2025 21:44:24 +0200
Subject: [PATCH 049/214] Remove RegionSkins

---
 .../features/region/RegionCommand.java        | 54 -----------
 .../de/steamwar/bausystem/region/Region.java  |  3 -
 .../bausystem/region/RegionSkins.java         | 90 -------------------
 .../bausystem/region/FixedGlobalRegion.java   |  5 --
 4 files changed, 152 deletions(-)
 delete mode 100644 BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionSkins.java

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionCommand.java
index a0f2ca1c..54337983 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionCommand.java
@@ -30,30 +30,22 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.util.SelectCommand;
 import de.steamwar.bausystem.region.Point;
 import de.steamwar.bausystem.region.Region;
-import de.steamwar.bausystem.region.RegionSkins;
 import de.steamwar.bausystem.region.RegionUtils;
 import de.steamwar.bausystem.region.flags.Flag;
 import de.steamwar.bausystem.shared.Pair;
 import de.steamwar.bausystem.utils.FlatteningWrapper;
 import de.steamwar.bausystem.utils.PasteBuilder;
 import de.steamwar.bausystem.utils.WorldEditUtils;
-import de.steamwar.command.PreviousArguments;
 import de.steamwar.command.SWCommand;
-import de.steamwar.command.TypeMapper;
 import de.steamwar.linkage.Linked;
 import de.steamwar.linkage.LinkedInstance;
 import de.steamwar.sql.SchematicNode;
-import net.md_5.bungee.api.chat.ClickEvent;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
-import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.event.player.PlayerTeleportEvent;
 
-import java.util.Collections;
-import java.util.List;
 import java.util.logging.Level;
-import java.util.stream.Collectors;
 
 @Linked
 public class RegionCommand extends SWCommand {
@@ -170,31 +162,6 @@ public class RegionCommand extends SWCommand {
         BauSystem.MESSAGE.send("REGION_REGION_TP_TEST_BLOCK", p);
     }
 
-    @Register(value = "changeskin", description = "REGION_REGION_HELP_CHANGESKIN_INFO")
-    @Register("skin")
-    public void changeSkinCommand(Player p) {
-        Region region = Region.getRegion(p.getLocation());
-        if (checkGlobalRegion(region, p)) {
-            return;
-        }
-        BauSystem.MESSAGE.send("REGION_REGION_CHANGESKIN_INFO", p, region.getSkins().getCurrentSkin().getName());
-        String creator = region.getSkins().getCurrentSkin().getCreator();
-        if (creator != null) {
-            BauSystem.MESSAGE.send("REGION_REGION_CHANGESKIN_INFO_CREATOR", p, creator);
-        }
-    }
-
-    @Register(value = "changeskin", description = "REGION_REGION_HELP_CHANGESKIN")
-    @Register("skin")
-    public void changeSkinCommand(@Validator Player p, @Mapper("skinTypeMapper") @ErrorMessage("REGION_REGION_CHANGESKIN_UNKNOWN") RegionSkins.Skin skin) {
-        if (skin.apply()) {
-            BauSystem.MESSAGE.send("REGION_REGION_CHANGESKIN_CHANGE", p, skin.getName());
-            BauSystem.MESSAGE.send("REGION_REGION_CHANGESKIN_CHANGE_UPDATE", p, BauSystem.MESSAGE.parse("REGION_REGION_CHANGESKIN_CHANGE_UPDATE_HOVER", p), new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/reset"));
-        } else {
-            BauSystem.MESSAGE.send("REGION_REGION_CHANGESKIN_INVALID", p);
-        }
-    }
-
     @Register(value = "copy", description = "REGION_REGION_HELP_COPY")
     public void copyCommand(@Validator Player p, @OptionalValue("") @StaticValue(value = {"", "-e", "-s"}, allowISE = true) int option) {
         Region region = Region.getRegion(p.getLocation());
@@ -285,25 +252,4 @@ public class RegionCommand extends SWCommand {
     private BlockVector3 toBlockVector3(Point point) {
         return BlockVector3.at(point.getX(), point.getY(), point.getZ());
     }
-
-
-    @Mapper(value = "skinTypeMapper", local = true)
-    private TypeMapper<RegionSkins.Skin> skinTypeMapper() {
-        return new TypeMapper<RegionSkins.Skin>() {
-            @Override
-            public List<String> tabCompletes(CommandSender commandSender, PreviousArguments previousArguments, String s) {
-                Player p = (Player) commandSender;
-                Region region = Region.getRegion(p.getLocation());
-                if (region.getType().isGlobal()) {
-                    return Collections.emptyList();
-                }
-                return region.getSkins().list().stream().map(skin -> skin.getName().replace(' ', '_')).collect(Collectors.toList());
-            }
-
-            @Override
-            public RegionSkins.Skin map(CommandSender commandSender, PreviousArguments previousArguments, String s) {
-                return Region.getRegion(((Player) commandSender).getLocation()).getSkins().get(s.replace('_', ' '));
-            }
-        };
-    }
 }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
index d2d97ecf..76dfeee1 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
@@ -71,9 +71,6 @@ public interface Region {
     @NonNull
     RegionBackups getBackups();
 
-    @NonNull
-    RegionSkins getSkins();
-
     interface Area {
 
         Area EMPTY = new Area() {
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionSkins.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionSkins.java
deleted file mode 100644
index b9413d9f..00000000
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionSkins.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * This file is a part of the SteamWar software.
- *
- * Copyright (C) 2020  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;
-
-import lombok.Getter;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-
-import javax.annotation.CheckReturnValue;
-import javax.annotation.Nullable;
-import java.util.List;
-
-public interface RegionSkins {
-
-    @RequiredArgsConstructor
-    @Getter
-    abstract class Skin {
-        @NonNull
-        private final String name;
-
-        @NonNull
-        private final String creator;
-
-        @CheckReturnValue
-        public abstract boolean apply();
-
-        public static final Skin GLOBAL = new Skin("Global", "§eSteam§8War") {
-            @Override
-            public boolean apply() {
-                return false;
-            }
-        };
-    }
-
-    @NonNull
-    Skin getCurrentSkin();
-
-    @NonNull
-    List<Skin> list();
-
-    boolean has(@NonNull String name);
-
-    @Nullable
-    Skin get(@NonNull String name);
-
-    RegionSkins GLOBAL = new RegionSkins() {
-
-        @Override
-        public @NonNull Skin getCurrentSkin() {
-            return Skin.GLOBAL;
-        }
-
-        @Override
-        public @NonNull List<Skin> list() {
-            return List.of(Skin.GLOBAL);
-        }
-
-        @Override
-        public boolean has(@NonNull String name) {
-            return Skin.GLOBAL.name.equals(name);
-        }
-
-        @Nullable
-        @Override
-        public Skin get(@NonNull String name) {
-            if (Skin.GLOBAL.name.equals(name)) {
-                return Skin.GLOBAL;
-            } else {
-                return null;
-            }
-        }
-    };
-}
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedGlobalRegion.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedGlobalRegion.java
index ea9eb298..d00b5a2c 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedGlobalRegion.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedGlobalRegion.java
@@ -136,9 +136,4 @@ public final class FixedGlobalRegion implements Region {
     public @NonNull RegionBackups getBackups() {
         return RegionBackups.EMPTY;
     }
-
-    @Override
-    public @NonNull RegionSkins getSkins() {
-        return RegionSkins.GLOBAL;
-    }
 }

From 7aff9f08d08604e00b9ad9f1bfaa0e20ce237184 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Fri, 1 Aug 2025 22:23:37 +0200
Subject: [PATCH 050/214] Remove old simulator loading

---
 .../src/de/steamwar/bausystem/worlddata/WorldData.java | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/worlddata/WorldData.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/worlddata/WorldData.java
index 36a5297d..3300692c 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/worlddata/WorldData.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/worlddata/WorldData.java
@@ -69,16 +69,6 @@ public class WorldData {
                 // Ignored
             }
         }
-
-        // Conversion from old simulator saving to new one
-        if (worldData.containsKey("simulators")) {
-            YAPIONObject yapionObject = worldData.getObject("simulators");
-            worldData.remove("simulators");
-            yapionObject.forEach((s, yapionAnyType) -> {
-                SteamwarUser steamwarUser = SteamwarUser.get(Integer.parseInt(s));
-                SimulatorData.saveSimulator(steamwarUser, new YAPIONObject().add("", yapionAnyType));
-            });
-        }
     }
 
     public void write() {

From 576ce891f63e3b6ebd2e8da0d8e69093333272f4 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Fri, 1 Aug 2025 22:25:06 +0200
Subject: [PATCH 051/214] Optimize WorldData

---
 .../src/de/steamwar/bausystem/worlddata/WorldData.java   | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/worlddata/WorldData.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/worlddata/WorldData.java
index 3300692c..bfbca11e 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/worlddata/WorldData.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/worlddata/WorldData.java
@@ -19,7 +19,6 @@
 
 package de.steamwar.bausystem.worlddata;
 
-import de.steamwar.sql.SteamwarUser;
 import lombok.experimental.UtilityClass;
 import org.bukkit.Bukkit;
 import yapion.hierarchy.output.FileOutput;
@@ -59,15 +58,11 @@ public class WorldData {
         if (optionsFile.length() != 0) {
             try (BufferedInputStream bufferedInputStream = new BufferedInputStream(new FileInputStream(optionsFile))) {
                 worldData = YAPIONParser.parse(bufferedInputStream, new StreamOptions().charset(InputStreamCharsets.UTF_8));
-                if (!worldData.containsKey("regions")) {
-                    YAPIONObject yapionObject = new YAPIONObject();
-                    yapionObject.add("regions", worldData);
-                    worldData = yapionObject;
-                    write();
-                }
             } catch (IOException e) {
                 // Ignored
             }
+        } else {
+            write();
         }
     }
 

From 91a41ccd3fc7eaf1bc4a7e8c5ce82393501cdc38 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Fri, 1 Aug 2025 22:27:00 +0200
Subject: [PATCH 052/214] Add Prototype

---
 .../{regionold/Prototype.java.txt => region/Prototype.java}       | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/{regionold/Prototype.java.txt => region/Prototype.java} (100%)

diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionold/Prototype.java.txt b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/Prototype.java
similarity index 100%
rename from BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionold/Prototype.java.txt
rename to BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/Prototype.java

From 38b061c12c8f437e9fb99c4830a9701f4b4a9b43 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Fri, 1 Aug 2025 22:32:55 +0200
Subject: [PATCH 053/214] Add JavaDoc to RegionSystem

---
 .../src/de/steamwar/bausystem/BauSystem.java  |  9 +++++++-
 .../bausystem/region/RegionSystem.java        | 21 +++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java
index 4774565c..af84b780 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java
@@ -40,6 +40,7 @@ import de.steamwar.bausystem.worlddata.WorldData;
 import de.steamwar.command.AbstractValidator;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.SWCommandUtils;
+import de.steamwar.core.CRIUSleepEvent;
 import de.steamwar.core.Core;
 import de.steamwar.core.WorldEditRendererCUIEditor;
 import de.steamwar.linkage.LinkedInstance;
@@ -54,6 +55,7 @@ import lombok.Getter;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
 import org.bukkit.event.HandlerList;
 import org.bukkit.event.Listener;
 import org.bukkit.plugin.Plugin;
@@ -72,7 +74,7 @@ import java.util.function.Consumer;
 import java.util.logging.Level;
 import java.util.stream.Collectors;
 
-public class BauSystem extends JavaPlugin {
+public class BauSystem extends JavaPlugin implements Listener {
 
     // This should be treated as final!
     public static Message MESSAGE;
@@ -212,6 +214,11 @@ public class BauSystem extends JavaPlugin {
         new WorldEditRendererCUIEditor();
     }
 
+    @EventHandler
+    public void onCRIUSleep(CRIUSleepEvent event) {
+        RegionSystem.INSTANCE.save();
+    }
+
     @Override
     public void onDisable() {
         instances.forEach((aClass, o) -> {
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionSystem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionSystem.java
index 5222a415..4289fb1b 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionSystem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionSystem.java
@@ -32,18 +32,39 @@ public interface RegionSystem {
 
     RegionSystem INSTANCE = init();
 
+    /**
+     * Loads and initializes the Regions and anything that should be loaded on startup.
+     */
     void load();
+
+    /**
+     * Saves anything that should be written to file on either CRIUSleepEvent or plugin disable.
+     */
     void save();
 
+    /**
+     * Returns the GlobalRegion. This Region should have their {@link Region#getID()} return the
+     * '00000000-0000-0000-0000-000000000000' UUID for easier retrieval with {@link #getRegion(UUID)}.
+     */
     @NonNull
     Region getGlobalRegion();
 
+    /**
+     * Should return a Region that is present at the specific Location or the {@link #getGlobalRegion()}
+     * if none are present.
+     */
     @NonNull
     Region get(@NonNull Location location);
 
+    /**
+     * Should return the Region by their UUID.
+     */
     @CheckReturnValue
     Optional<Region> getRegion(@NonNull UUID id);
 
+    /**
+     * Does and should not contain the GlobalRegion returned by {@link #getGlobalRegion()}.
+     */
     @NonNull
     Stream<Region> getRegions();
 

From 0763e4b18967b30febcf34b225276c95eb27f478 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Fri, 1 Aug 2025 22:34:51 +0200
Subject: [PATCH 054/214] Move some stuff around

---
 .../bausystem/region/FixedRegionSystem.java   |  1 +
 .../region/{ => fixed}/FixedFlagStorage.java  | 29 ++++++++++---------
 .../{ => fixed}/FixedGlobalFlagStorage.java   |  5 +++-
 .../region/{ => fixed}/FixedGlobalRegion.java | 27 ++++++++---------
 .../region/{ => fixed}/Prototype.java         |  6 ++--
 .../regionold/loader/PrototypeLoader.java.txt |  2 +-
 .../regionold/loader/RegionLoader.java.txt    |  2 +-
 7 files changed, 41 insertions(+), 31 deletions(-)
 rename BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/{ => fixed}/FixedFlagStorage.java (55%)
 rename BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/{ => fixed}/FixedGlobalFlagStorage.java (92%)
 rename BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/{ => fixed}/FixedGlobalRegion.java (77%)
 rename BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/{ => fixed}/Prototype.java (98%)

diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedRegionSystem.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedRegionSystem.java
index 473ec0d3..f9ca3d13 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedRegionSystem.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedRegionSystem.java
@@ -19,6 +19,7 @@
 
 package de.steamwar.bausystem.region;
 
+import de.steamwar.bausystem.region.fixed.FixedGlobalRegion;
 import lombok.NonNull;
 import org.bukkit.Location;
 
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedFlagStorage.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedFlagStorage.java
similarity index 55%
rename from BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedFlagStorage.java
rename to BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedFlagStorage.java
index f2c05616..3de70483 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedFlagStorage.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedFlagStorage.java
@@ -1,24 +1,27 @@
 /*
- *   This file is a part of the SteamWar software.
+ * This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ * Copyright (C) 2020  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 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.
+ * 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/>.
+ * 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;
+package de.steamwar.bausystem.region.fixed;
 
+import de.steamwar.bausystem.region.FlagOptional;
+import de.steamwar.bausystem.region.FlagStorage;
+import de.steamwar.bausystem.region.RegionFlagPolicy;
 import de.steamwar.bausystem.region.flags.Flag;
 import de.steamwar.core.Core;
 import lombok.NonNull;
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedGlobalFlagStorage.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalFlagStorage.java
similarity index 92%
rename from BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedGlobalFlagStorage.java
rename to BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalFlagStorage.java
index f20f9a02..164b40e6 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedGlobalFlagStorage.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalFlagStorage.java
@@ -17,8 +17,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bausystem.region;
+package de.steamwar.bausystem.region.fixed;
 
+import de.steamwar.bausystem.region.FlagOptional;
+import de.steamwar.bausystem.region.FlagStorage;
+import de.steamwar.bausystem.region.RegionFlagPolicy;
 import de.steamwar.bausystem.region.flags.ColorMode;
 import de.steamwar.bausystem.region.flags.Flag;
 import de.steamwar.bausystem.region.flags.ProtectMode;
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedGlobalRegion.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalRegion.java
similarity index 77%
rename from BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedGlobalRegion.java
rename to BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalRegion.java
index d00b5a2c..3dbcbdd4 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedGlobalRegion.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalRegion.java
@@ -1,25 +1,26 @@
 /*
- *   This file is a part of the SteamWar software.
+ * This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ * Copyright (C) 2020  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 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.
+ * 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/>.
+ * 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;
+package de.steamwar.bausystem.region.fixed;
 
 import com.sk89q.worldedit.EditSession;
+import de.steamwar.bausystem.region.*;
 import de.steamwar.bausystem.utils.PasteBuilder;
 import lombok.NonNull;
 import org.bukkit.Location;
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/Prototype.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/Prototype.java
similarity index 98%
rename from BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/Prototype.java
rename to BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/Prototype.java
index f4aefc56..962d9a19 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/Prototype.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/Prototype.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ * Copyright (C) 2020  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
@@ -17,8 +17,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bausystem.region;
+package de.steamwar.bausystem.region.fixed;
 
+import de.steamwar.bausystem.region.FlagStorage;
+import de.steamwar.bausystem.region.Region;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import yapion.hierarchy.types.YAPIONObject;
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionold/loader/PrototypeLoader.java.txt b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionold/loader/PrototypeLoader.java.txt
index 851cdcfd..001ab702 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionold/loader/PrototypeLoader.java.txt
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionold/loader/PrototypeLoader.java.txt
@@ -19,7 +19,7 @@
 
 package de.steamwar.bausystem.region.loader;
 
-import de.steamwar.bausystem.region.Prototype;
+import de.steamwar.bausystem.region.fixed.Prototype;
 import lombok.experimental.UtilityClass;
 import org.bukkit.Bukkit;
 import yapion.hierarchy.diff.DiffDelete;
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionold/loader/RegionLoader.java.txt b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionold/loader/RegionLoader.java.txt
index 7a66dbba..0fe7a16f 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionold/loader/RegionLoader.java.txt
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionold/loader/RegionLoader.java.txt
@@ -21,7 +21,7 @@ package de.steamwar.bausystem.region.loader;
 
 import de.steamwar.bausystem.region.FlagStorage;
 import de.steamwar.bausystem.region.GlobalRegion;
-import de.steamwar.bausystem.region.Prototype;
+import de.steamwar.bausystem.region.fixed.Prototype;
 import de.steamwar.bausystem.worlddata.WorldData;
 import lombok.experimental.UtilityClass;
 import org.bukkit.Bukkit;

From 144975d9771ea2fd6a314d203ab779cfd73fd16e Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sat, 2 Aug 2025 07:57:19 +0200
Subject: [PATCH 055/214] Remove TNTMode.ONLY_BUILD

---
 .../BauSystem_Main/src/BauSystem.properties   |  2 -
 .../src/BauSystem_de.properties               |  2 -
 .../bausystem/features/region/TNTCommand.java |  7 +-
 .../features/region/TNTListener.java          |  5 --
 .../features/region/items/TntBauGuiItem.java  | 10 ---
 .../features/script/lua/libs/RegionLib.java   |  1 -
 .../de/steamwar/bausystem/region/Region.java  | 26 +++++-
 .../bausystem/region/flags/TNTMode.java       |  3 +-
 .../region/fixed/FixedFlagStorage.java        | 20 +++--
 .../bausystem/region/fixed/FixedRegion.java   | 80 +++++++++++++++++++
 10 files changed, 120 insertions(+), 36 deletions(-)
 create mode 100644 BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java

diff --git a/BauSystem/BauSystem_Main/src/BauSystem.properties b/BauSystem/BauSystem_Main/src/BauSystem.properties
index e7bf15eb..7ae8298b 100644
--- a/BauSystem/BauSystem_Main/src/BauSystem.properties
+++ b/BauSystem/BauSystem_Main/src/BauSystem.properties
@@ -738,12 +738,10 @@ REGION_ITEM_RESET=§eReset
 REGION_ITEM_TESTBLOCK=§eDummy
 REGION_ITEM_TNT_OFF=§7TNT: §eDeactivated
 REGION_ITEM_TNT_ONLY_TB=§7TNT: §eonly dummy
-REGION_ITEM_TNT_ONLY_BUILD=§7TNT: §eonly build
 REGION_ITEM_TNT_ON=§7TNT: §eActivated
 REGION_ITEM_SELECTOR_TITLE=Tnt Mode
 REGION_ITEM_SELECTOR_ON=§eActivate
 REGION_ITEM_SELECTOR_ONLY_TB=§eonly dummy
-REGION_ITEM_SELECTOR_ONLY_BUILD=§eonly build
 REGION_ITEM_SELECTOR_OFF=§eDeactivate
 #Region
 REGION_COLOR_HELP_COLOR=§8/§ecolor §8[§7Color§8] §8- §7Sets the color of the region
diff --git a/BauSystem/BauSystem_Main/src/BauSystem_de.properties b/BauSystem/BauSystem_Main/src/BauSystem_de.properties
index 101eba76..1bcce497 100644
--- a/BauSystem/BauSystem_Main/src/BauSystem_de.properties
+++ b/BauSystem/BauSystem_Main/src/BauSystem_de.properties
@@ -681,12 +681,10 @@ REGION_ITEM_RESET=§eReset
 REGION_ITEM_TESTBLOCK=§eTestblock
 REGION_ITEM_TNT_OFF=§7TNT: §eAusgeschaltet
 REGION_ITEM_TNT_ONLY_TB=§7TNT: §enur Testblock
-REGION_ITEM_TNT_ONLY_BUILD=§7TNT: §enur Baubereich
 REGION_ITEM_TNT_ON=§7TNT: §eEingeschaltet
 REGION_ITEM_SELECTOR_TITLE=Tnt Modus
 REGION_ITEM_SELECTOR_ON=§eEinschalten
 REGION_ITEM_SELECTOR_ONLY_TB=§enur Testblock
-REGION_ITEM_SELECTOR_ONLY_BUILD=§enur Baubereich
 REGION_ITEM_SELECTOR_OFF=§eAusschalten
 #Region
 REGION_COLOR_HELP_COLOR=§8/§ecolor §8[§7Color§8] §8- §7Setze die Farbe der Region
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TNTCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TNTCommand.java
index df5bd796..97abf0bc 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TNTCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TNTCommand.java
@@ -72,9 +72,6 @@ public class TNTCommand extends SWCommand {
             case ONLY_TB:
                 requestedMessage = getTestblockEnableMessage();
                 break;
-            case ONLY_BUILD:
-                requestedMessage = getBuildEnableMessage();
-                break;
         }
         tntToggle(region, tntMode, requestedMessage);
     }
@@ -90,9 +87,8 @@ public class TNTCommand extends SWCommand {
         Map<String, TNTMode> tntModeMap = new HashMap<>(tntModeMapReduced);
         tntModeMap.put("testblock", TNTMode.ONLY_TB);
         tntModeMap.put("tb", TNTMode.ONLY_TB);
-        tntModeMap.put("build", TNTMode.ONLY_BUILD);
 
-        return new TypeMapper<TNTMode>() {
+        return new TypeMapper<>() {
             @Override
             public List<String> tabCompletes(CommandSender sender, PreviousArguments previousArguments, String s) {
                 Region region = Region.getRegion(((Player) sender).getLocation());
@@ -140,7 +136,6 @@ public class TNTCommand extends SWCommand {
         switch (region.getFlags().get(Flag.TNT).getWithDefault()) {
             case ALLOW:
             case ONLY_TB:
-            case ONLY_BUILD:
                 region.getFlags().set(Flag.TNT, TNTMode.DENY);
                 RegionUtils.actionBar(region, getDisableMessage());
                 break;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TNTListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TNTListener.java
index 791a9cb1..285b2a7f 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TNTListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TNTListener.java
@@ -50,11 +50,6 @@ public class TNTListener implements Listener, ScoreboardElement {
                     RegionUtils.actionBar(region, "REGION_TNT_BUILD_DESTROY");
                     return true;
                 }
-            } else if (value == TNTMode.ONLY_BUILD) {
-                if (region.getTestblockArea().inRegion(block.getLocation(), true)) {
-                    RegionUtils.actionBar(region, "REGION_TNT_TB_DESTROY");
-                    return true;
-                }
             }
             return value == TNTMode.DENY;
         });
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/TntBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/TntBauGuiItem.java
index c633c569..2205cf10 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/TntBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/TntBauGuiItem.java
@@ -25,7 +25,6 @@ import de.steamwar.bausystem.linkage.specific.BauGuiItem;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.flags.Flag;
 import de.steamwar.bausystem.region.flags.TNTMode;
-import de.steamwar.bausystem.region.utils.RegionType;
 import de.steamwar.inventory.SWInventory;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.linkage.Linked;
@@ -48,8 +47,6 @@ public class TntBauGuiItem extends BauGuiItem {
                 return new SWItem(Material.MINECART, BauSystem.MESSAGE.parse("REGION_ITEM_TNT_OFF", player)).getItemStack();
             case ONLY_TB:
                 return new SWItem(Material.TNT_MINECART, BauSystem.MESSAGE.parse("REGION_ITEM_TNT_ONLY_TB", player)).getItemStack();
-            case ONLY_BUILD:
-                return new SWItem(Material.OBSIDIAN, BauSystem.MESSAGE.parse("REGION_ITEM_TNT_ONLY_BUILD", player)).getItemStack();
             default:
                 return new SWItem(Material.TNT, BauSystem.MESSAGE.parse("REGION_ITEM_TNT_ON", player)).getItemStack();
         }
@@ -82,10 +79,6 @@ public class TntBauGuiItem extends BauGuiItem {
                     updateTntMode(TNTMode.ONLY_TB, p);
                     p.closeInventory();
                 }));
-                selector.setItem(5, new SWItem(Material.OBSIDIAN, BauSystem.MESSAGE.parse("REGION_ITEM_SELECTOR_ONLY_BUILD", p), clickType -> {
-                    updateTntMode(TNTMode.ONLY_BUILD, p);
-                    p.closeInventory();
-                }));
             }
             selector.setItem(7, new SWItem(Material.MINECART, BauSystem.MESSAGE.parse("REGION_ITEM_SELECTOR_OFF", p), clickType -> {
                 updateTntMode(TNTMode.DENY, p);
@@ -101,9 +94,6 @@ public class TntBauGuiItem extends BauGuiItem {
             case ONLY_TB:
                 p.performCommand("tnt tb");
                 break;
-            case ONLY_BUILD:
-                p.performCommand("tnt build");
-                break;
             case ALLOW:
                 p.performCommand("tnt on");
                 break;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/RegionLib.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/RegionLib.java
index 52c97c21..474a5b1f 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/RegionLib.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/RegionLib.java
@@ -57,7 +57,6 @@ public class RegionLib implements LuaLib {
         tntLib.set("mode", getter(() -> region.get().getFlags().get(Flag.TNT).nameWithDefault()));
         tntLib.set("enabled", getter(() -> region.get().getFlags().get(Flag.TNT).orElse(null) != TNTMode.DENY));
         tntLib.set("onlyTb", getter(() -> region.get().getFlags().get(Flag.TNT).orElse(null) == TNTMode.ONLY_TB));
-        tntLib.set("onlyBuild", getter(() -> region.get().getFlags().get(Flag.TNT).orElse(null) == TNTMode.ONLY_BUILD));
         table.set("tnt", tntLib);
 
         table.set("fire", getter(() -> region.get().getFlags().get(Flag.FIRE).orElse(null) == FireMode.ALLOW));
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
index 76dfeee1..bad3b0ef 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
@@ -136,7 +136,14 @@ public interface Region {
         @NonNull
         Point getCopyPoint();
 
-        boolean inRegion(Location location, boolean extension);
+        default boolean inRegion(Location location, boolean extension) {
+            Point minPoint = getMinPoint(extension);
+            Point maxPoint = getMaxPoint(extension);
+            if (location.getBlockX() < minPoint.getX() || location.getBlockX() > maxPoint.getX()) return false;
+            if (location.getBlockY() < minPoint.getY() || location.getBlockY() > maxPoint.getY()) return false;
+            if (location.getBlockZ() < minPoint.getZ() || location.getBlockZ() > maxPoint.getZ()) return false;
+            return true;
+        }
 
         @Nullable
         EditSession copy(boolean extension);
@@ -146,8 +153,21 @@ public interface Region {
 
         void reset(PasteBuilder pasteBuilder, boolean extension);
 
-        void forEachChunk(BiConsumer<Integer, Integer> executor);
+        default void forEachChunk(BiConsumer<Integer, Integer> executor) {
+            Point minPoint = getMinPoint(false);
+            Point maxPoint = getMaxPoint(false);
+            for (int x = (int) Math.floor(minPoint.getX() / 16.0); x <= (int) Math.ceil(maxPoint.getX() / 16.0); x++) {
+                for (int z = (int) Math.floor(minPoint.getZ() / 16.0); z <= (int) Math.ceil(maxPoint.getZ() / 16.0); z++) {
+                    executor.accept(x, z);
+                }
+            }
+        }
 
-        boolean isChunkOutside(int chunkX, int chunkZ);
+        default boolean isChunkOutside(int chunkX, int chunkZ) {
+            Point minPoint = getMinPoint(true);
+            Point maxPoint = getMaxPoint(true);
+            return Math.floor(minPoint.getX() / 16.0) > chunkX || chunkX >= Math.ceil(maxPoint.getX() / 16.0) ||
+                    Math.floor(minPoint.getZ() / 16.0) > chunkZ || chunkZ >= Math.ceil(maxPoint.getZ() / 16.0);
+        }
     }
 }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/TNTMode.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/TNTMode.java
index 0f73f81b..fe343707 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/TNTMode.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/TNTMode.java
@@ -28,8 +28,7 @@ public enum TNTMode implements Flag.Value<TNTMode> {
 
 	ALLOW("FLAG_TNT_ALLOW"),
 	DENY("FLAG_TNT_DENY"),
-	ONLY_TB("FLAG_TNT_ONLY_TB"),
-	ONLY_BUILD("FLAG_TNT_ONLY_BUILD");
+	ONLY_TB("FLAG_TNT_ONLY_TB");
 
 	private static TNTMode[] values;
 	private final String chatValue;
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedFlagStorage.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedFlagStorage.java
index 3de70483..6893f904 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedFlagStorage.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedFlagStorage.java
@@ -23,20 +23,20 @@ import de.steamwar.bausystem.region.FlagOptional;
 import de.steamwar.bausystem.region.FlagStorage;
 import de.steamwar.bausystem.region.RegionFlagPolicy;
 import de.steamwar.bausystem.region.flags.Flag;
+import de.steamwar.bausystem.region.flags.TestblockMode;
 import de.steamwar.core.Core;
 import lombok.NonNull;
 
-import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
 
 public class FixedFlagStorage implements FlagStorage {
 
+    private TestblockMode testBlockMode;
     private Map<Flag<?>, Flag.Value<?>> flagMap = new HashMap<>();
 
-    public static FlagStorage createFromFile(File file) {
-        // throw new IllegalStateException("Not implemented yet");
-        return new FixedFlagStorage();
+    public FixedFlagStorage(TestblockMode testblockMode) {
+        this.testBlockMode = testblockMode;
     }
 
     @Override
@@ -44,16 +44,26 @@ public class FixedFlagStorage implements FlagStorage {
         if (flag.oneOf(Flag.ITEMS) && Core.getVersion() < 20) {
             return RegionFlagPolicy.NOT_APPLICABLE;
         }
+        if (flag.oneOf(Flag.TESTBLOCK)) {
+            return RegionFlagPolicy.READ_ONLY;
+        }
         return RegionFlagPolicy.WRITABLE;
     }
 
     @Override
     public <T extends Enum<T> & Flag.Value<T>> boolean set(@NonNull Flag<T> flag, @NonNull T value) {
-        return flagMap.put(flag, value) != value;
+        if (has(flag).isWritable()) {
+            return flagMap.put(flag, value) != value;
+        } else {
+            return false;
+        }
     }
 
     @Override
     public @NonNull <T extends Enum<T> & Flag.Value<T>> FlagOptional<T> get(@NonNull Flag<T> flag) {
+        if (flag.oneOf(Flag.TESTBLOCK)) {
+            return FlagOptional.of((Flag) flag, testBlockMode);
+        }
         return FlagOptional.of(flag, (T) flagMap.get(flag));
     }
 
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java
new file mode 100644
index 00000000..e008fab7
--- /dev/null
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java
@@ -0,0 +1,80 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2020  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.fixed;
+
+import de.steamwar.bausystem.region.*;
+import lombok.NonNull;
+
+import java.nio.charset.StandardCharsets;
+import java.util.UUID;
+
+public class FixedRegion implements Region {
+
+    private UUID uuid;
+
+    public FixedRegion(String name) {
+        uuid = UUID.nameUUIDFromBytes(name.getBytes(StandardCharsets.UTF_8));
+    }
+
+    @Override
+    public @NonNull UUID getID() {
+        return uuid;
+    }
+
+    @Override
+    public @NonNull RegionType getType() {
+        return RegionType.NORMAL;
+    }
+
+    @Override
+    public @NonNull FlagStorage getFlags() {
+        return null;
+    }
+
+    @Override
+    public @NonNull Area getArea() {
+        return null;
+    }
+
+    @Override
+    public @NonNull Area getBuildArea() {
+        return null;
+    }
+
+    @Override
+    public @NonNull Area getTestblockArea() {
+        return null;
+    }
+
+    @Override
+    public @NonNull RegionConfig getGameModeConfig() {
+        return null;
+    }
+
+    @Override
+    public @NonNull RegionHistory getHistory() {
+        return null;
+    }
+
+    @Override
+    public @NonNull RegionBackups getBackups() {
+        return null;
+    }
+}

From bc371df796b54b288cca07b7cd56ab53b34e72ee Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sat, 2 Aug 2025 08:01:25 +0200
Subject: [PATCH 056/214] Rework FixedFlagStorage and FixedGlobalFlagStorage to
 not be sensitive on adding a new Flag

---
 .../bausystem/region/fixed/FixedFlagStorage.java   |  9 ++++++---
 .../region/fixed/FixedGlobalFlagStorage.java       | 14 +++++++-------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedFlagStorage.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedFlagStorage.java
index 6893f904..b9abc5b3 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedFlagStorage.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedFlagStorage.java
@@ -41,13 +41,16 @@ public class FixedFlagStorage implements FlagStorage {
 
     @Override
     public @NonNull <T extends Enum<T> & Flag.Value<T>> RegionFlagPolicy has(@NonNull Flag<T> flag) {
-        if (flag.oneOf(Flag.ITEMS) && Core.getVersion() < 20) {
-            return RegionFlagPolicy.NOT_APPLICABLE;
+        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) {
+            return RegionFlagPolicy.WRITABLE;
         }
         if (flag.oneOf(Flag.TESTBLOCK)) {
             return RegionFlagPolicy.READ_ONLY;
         }
-        return RegionFlagPolicy.WRITABLE;
+        return RegionFlagPolicy.NOT_APPLICABLE;
     }
 
     @Override
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalFlagStorage.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalFlagStorage.java
index 164b40e6..9017cf96 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalFlagStorage.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalFlagStorage.java
@@ -42,16 +42,16 @@ public class FixedGlobalFlagStorage implements FlagStorage {
 
     @Override
     public @NonNull <T extends Enum<T> & Flag.Value<T>> RegionFlagPolicy has(@NonNull Flag<T> flag) {
-        if (flag.oneOf(Flag.PROTECT, Flag.TESTBLOCK, Flag.NO_GRAVITY, Flag.CHANGED)) {
-            return RegionFlagPolicy.NOT_APPLICABLE;
-        }
-        if (flag.oneOf(Flag.ITEMS) && Core.getVersion() < 20) {
-            return RegionFlagPolicy.NOT_APPLICABLE;
-        }
         if (flag.oneOf(Flag.COLOR)) {
             return RegionFlagPolicy.READ_ONLY;
         }
-        return RegionFlagPolicy.WRITABLE;
+        if (flag.oneOf(Flag.ITEMS) && Core.getVersion() >= 20) {
+            return RegionFlagPolicy.WRITABLE;
+        }
+        if (flag.oneOf(Flag.TNT, Flag.FIRE, Flag.FREEZE)) {
+            return RegionFlagPolicy.WRITABLE;
+        }
+        return RegionFlagPolicy.NOT_APPLICABLE;
     }
 
     @Override

From 811bd00ed2f343659d32ec0e75215f67a87d674d Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sat, 2 Aug 2025 08:13:21 +0200
Subject: [PATCH 057/214] Fix Flag.Value to have enum methods for save/load

---
 .../src/de/steamwar/bausystem/region/FlagStorage.java     | 4 ++++
 .../src/de/steamwar/bausystem/region/flags/Flag.java      | 4 ++++
 .../steamwar/bausystem/region/fixed/FixedFlagStorage.java | 5 +++++
 .../bausystem/region/fixed/FixedGlobalFlagStorage.java    | 5 +++++
 .../de/steamwar/bausystem/region/fixed/FixedRegion.java   | 8 ++++++--
 5 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/FlagStorage.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/FlagStorage.java
index d6f1afd5..72e80301 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/FlagStorage.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/FlagStorage.java
@@ -22,6 +22,8 @@ package de.steamwar.bausystem.region;
 import de.steamwar.bausystem.region.flags.Flag;
 import lombok.NonNull;
 
+import java.util.Map;
+
 public interface FlagStorage {
 
     @NonNull
@@ -33,4 +35,6 @@ public interface FlagStorage {
     <T extends Enum<T> & Flag.Value<T>> FlagOptional<T> get(@NonNull Flag<T> flag);
 
     void clear();
+
+    Map<Flag<?>, Flag.Value<?>> getBackedMap();
 }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/Flag.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/Flag.java
index ddee1806..2be75d1f 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/Flag.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/Flag.java
@@ -89,6 +89,10 @@ public final class Flag<T extends Enum<T> & Flag.Value<T>> implements EnumDispla
 
     public interface Value<T extends Enum<T> & Value<T>> extends EnumDisplay {
 
+        String name();
+
+        int ordinal();
+
         T getValue();
 
         T getValueOf(final String name);
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedFlagStorage.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedFlagStorage.java
index b9abc5b3..71aee78e 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedFlagStorage.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedFlagStorage.java
@@ -74,4 +74,9 @@ public class FixedFlagStorage implements FlagStorage {
     public void clear() {
         flagMap.clear();
     }
+
+    @Override
+    public Map<Flag<?>, Flag.Value<?>> getBackedMap() {
+        return flagMap;
+    }
 }
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalFlagStorage.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalFlagStorage.java
index 9017cf96..acf9975a 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalFlagStorage.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalFlagStorage.java
@@ -78,4 +78,9 @@ public class FixedGlobalFlagStorage implements FlagStorage {
     public void clear() {
         flagMap.clear();
     }
+
+    @Override
+    public Map<Flag<?>, Flag.Value<?>> getBackedMap() {
+        return flagMap;
+    }
 }
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java
index e008fab7..2f914dc5 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java
@@ -28,9 +28,13 @@ import java.util.UUID;
 public class FixedRegion implements Region {
 
     private UUID uuid;
+    private FixedFlagStorage flagStorage;
+    private Prototype prototype;
 
-    public FixedRegion(String name) {
+    public FixedRegion(String name, FixedFlagStorage flagStorage, Prototype prototype) {
         uuid = UUID.nameUUIDFromBytes(name.getBytes(StandardCharsets.UTF_8));
+        this.flagStorage = flagStorage;
+        this.prototype = prototype;
     }
 
     @Override
@@ -45,7 +49,7 @@ public class FixedRegion implements Region {
 
     @Override
     public @NonNull FlagStorage getFlags() {
-        return null;
+        return flagStorage;
     }
 
     @Override

From 5550aa49305c51953cc4f02135c464de3ed08507 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sat, 2 Aug 2025 08:31:38 +0200
Subject: [PATCH 058/214] Make FixedGlobalFlagStorage load the options from
 file

---
 .../steamwar/bausystem/region/flags/Flag.java | 19 +++++++++++++
 .../bausystem/region/FixedRegionSystem.java   |  6 +++--
 .../region/fixed/FixedGlobalFlagStorage.java  | 17 +++++++++++-
 .../region/fixed/FixedGlobalRegion.java       |  4 ++-
 .../bausystem/region/fixed/Prototype.java     | 27 ++++++++++---------
 .../fixed/loader/PrototypeLoader.java}        |  4 +--
 .../fixed/loader/RegionLoader.java}           | 16 ++++-------
 7 files changed, 63 insertions(+), 30 deletions(-)
 rename BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/{regionold/loader/PrototypeLoader.java.txt => region/fixed/loader/PrototypeLoader.java} (95%)
 rename BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/{regionold/loader/RegionLoader.java.txt => region/fixed/loader/RegionLoader.java} (85%)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/Flag.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/Flag.java
index 2be75d1f..305d046c 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/Flag.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/Flag.java
@@ -21,6 +21,7 @@ package de.steamwar.bausystem.region.flags;
 
 import de.steamwar.bausystem.shared.EnumDisplay;
 import lombok.Getter;
+import lombok.NonNull;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -70,6 +71,24 @@ public final class Flag<T extends Enum<T> & Flag.Value<T>> implements EnumDispla
         this.values = defaultValue.getValues();
     }
 
+    public static Flag<?> valueOf(@NonNull String name) {
+        for (Flag<?> flag : flags) {
+            if (flag.name.equalsIgnoreCase(name)) {
+                return flag;
+            }
+        }
+        throw new IllegalArgumentException("No enum constant Flag." + name);
+    }
+
+    public Flag.Value<?> valueOfValue(@NonNull String name) {
+        for (Flag.Value<?> value : values) {
+            if (value.name().equalsIgnoreCase(name)) {
+                return value;
+            }
+        }
+        throw new IllegalArgumentException("No enum constant Flag." + this.name + "." + name);
+    }
+
     public String name() {
         return name;
     }
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedRegionSystem.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedRegionSystem.java
index f9ca3d13..68f3cd18 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedRegionSystem.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedRegionSystem.java
@@ -20,6 +20,8 @@
 package de.steamwar.bausystem.region;
 
 import de.steamwar.bausystem.region.fixed.FixedGlobalRegion;
+import de.steamwar.bausystem.region.fixed.loader.PrototypeLoader;
+import de.steamwar.bausystem.region.fixed.loader.RegionLoader;
 import lombok.NonNull;
 import org.bukkit.Location;
 
@@ -35,12 +37,12 @@ public class FixedRegionSystem implements RegionSystem {
 
     @Override
     public void load() {
-        // TODO: Implement
+        PrototypeLoader.load();
+        RegionLoader.load();
     }
 
     @Override
     public void save() {
-        // TODO: Implement
     }
 
     @Override
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalFlagStorage.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalFlagStorage.java
index acf9975a..910483cb 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalFlagStorage.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalFlagStorage.java
@@ -26,8 +26,10 @@ import de.steamwar.bausystem.region.flags.ColorMode;
 import de.steamwar.bausystem.region.flags.Flag;
 import de.steamwar.bausystem.region.flags.ProtectMode;
 import de.steamwar.bausystem.region.flags.TNTMode;
+import de.steamwar.bausystem.worlddata.WorldData;
 import de.steamwar.core.Core;
 import lombok.NonNull;
+import yapion.hierarchy.types.YAPIONObject;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -35,9 +37,20 @@ import java.util.Map;
 public class FixedGlobalFlagStorage implements FlagStorage {
 
     private Map<Flag<?>, Flag.Value<?>> flagMap = new HashMap<>();
+    private YAPIONObject data;
 
-    public FixedGlobalFlagStorage() {
+    public FixedGlobalFlagStorage(YAPIONObject data) {
         flagMap.put(Flag.TNT, TNTMode.DENY);
+        this.data = data;
+        for (final Flag flag : Flag.getFlags()) {
+            if (!has(flag).isWritable()) continue;
+            try {
+                String s = data.getPlainValue(flag.name());
+                flagMap.put(flag, flag.valueOfValue(s));
+            } catch (Exception e) {
+                flagMap.put(flag, (Flag.Value<?>) flag.getDefaultValue());
+            }
+        }
     }
 
     @Override
@@ -57,6 +70,8 @@ public class FixedGlobalFlagStorage implements FlagStorage {
     @Override
     public <T extends Enum<T> & Flag.Value<T>> boolean set(@NonNull Flag<T> flag, @NonNull T value) {
         if (has(flag).isWritable()) {
+            data.put(flag.name(), value.name());
+            WorldData.write();
             return flagMap.put(flag, value) != value;
         } else {
             return false;
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalRegion.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalRegion.java
index 3dbcbdd4..9204489e 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalRegion.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalRegion.java
@@ -23,6 +23,7 @@ import com.sk89q.worldedit.EditSession;
 import de.steamwar.bausystem.region.*;
 import de.steamwar.bausystem.utils.PasteBuilder;
 import lombok.NonNull;
+import lombok.Setter;
 import org.bukkit.Location;
 
 import javax.annotation.Nullable;
@@ -37,7 +38,8 @@ public final class FixedGlobalRegion implements Region {
     private static final Point MIN_POINT = new Point(Integer.MIN_VALUE, Integer.MIN_VALUE, Integer.MIN_VALUE);
     private static final Point MAX_POINT = new Point(Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE);
 
-    private static final FlagStorage FLAG_STORAGE = new FixedGlobalFlagStorage();
+    @Setter
+    private static FlagStorage FLAG_STORAGE;
 
     private static final UUID GLOBAL_REGION_ID = new UUID(0, 0);
 
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/Prototype.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/Prototype.java
index 962d9a19..2569b03c 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/Prototype.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/Prototype.java
@@ -127,11 +127,11 @@ public class Prototype {
             skinMap.put(displayName, new Skin(defaultSkin, null, schematicFile, testblockSchematicFile, buildSchematicFile));
         }
 
-        if (PROTOTYPE_MAP.containsKey(name)) {
-            Region.getRegion(PROTOTYPE_MAP.remove(name)).forEach(region -> {
-                region._setPrototype(this);
-            });
-        }
+        // if (PROTOTYPE_MAP.containsKey(name)) {
+        //     Region.getRegion(PROTOTYPE_MAP.remove(name)).forEach(region -> {
+        //         region._setPrototype(this);
+        //     });
+        // }
         PROTOTYPE_MAP.put(name, this);
     }
 
@@ -210,19 +210,20 @@ public class Prototype {
         }
     }
 
-    public static Region generateRegion(String name, YAPIONObject regionConfig, YAPIONObject regionData) {
+    public static void generateRegion(String name, YAPIONObject regionConfig, YAPIONObject regionData) {
         Prototype prototype;
         if (regionData.containsKey("prototype", String.class)) {
             prototype = PROTOTYPE_MAP.get(regionData.getPlainValue("prototype"));
         } else {
             prototype = PROTOTYPE_MAP.get(regionConfig.getPlainValue("prototype"));
         }
-        FlagStorage flagStorage;
-        if (regionData.containsKey("flagStorage", YAPIONType.OBJECT)) {
-            flagStorage = FlagStorage.createStorage(regionData.getObject("flagStorage"));
-        } else {
-            flagStorage = new FlagStorage();
-        }
-        return new Region(name, prototype, regionConfig, flagStorage, regionData);
+        System.out.println(name + " " + prototype);
+        // FlagStorage flagStorage;
+        // if (regionData.containsKey("flagStorage", YAPIONType.OBJECT)) {
+        //     flagStorage = FlagStorage.createStorage(regionData.getObject("flagStorage"));
+        // } else {
+        //     flagStorage = new FlagStorage();
+        // }
+        // return new Region(name, prototype, regionConfig, flagStorage, regionData);
     }
 }
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionold/loader/PrototypeLoader.java.txt b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/loader/PrototypeLoader.java
similarity index 95%
rename from BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionold/loader/PrototypeLoader.java.txt
rename to BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/loader/PrototypeLoader.java
index 001ab702..3bcdefff 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionold/loader/PrototypeLoader.java.txt
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/loader/PrototypeLoader.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ * Copyright (C) 2020  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
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bausystem.region.loader;
+package de.steamwar.bausystem.region.fixed.loader;
 
 import de.steamwar.bausystem.region.fixed.Prototype;
 import lombok.experimental.UtilityClass;
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionold/loader/RegionLoader.java.txt b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/loader/RegionLoader.java
similarity index 85%
rename from BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionold/loader/RegionLoader.java.txt
rename to BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/loader/RegionLoader.java
index 0fe7a16f..e88c24e6 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionold/loader/RegionLoader.java.txt
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/loader/RegionLoader.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ * Copyright (C) 2020  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
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bausystem.region.loader;
+package de.steamwar.bausystem.region.fixed.loader;
 
-import de.steamwar.bausystem.region.FlagStorage;
-import de.steamwar.bausystem.region.GlobalRegion;
+import de.steamwar.bausystem.region.fixed.FixedGlobalFlagStorage;
+import de.steamwar.bausystem.region.fixed.FixedGlobalRegion;
 import de.steamwar.bausystem.region.fixed.Prototype;
 import de.steamwar.bausystem.worlddata.WorldData;
 import lombok.experimental.UtilityClass;
@@ -80,12 +80,6 @@ public class RegionLoader {
             globalOptions = new YAPIONObject();
             optionsYapionObject.add("global", globalOptions);
         }
-        FlagStorage flagStorage;
-        if (globalOptions.containsKey("flagStorage", YAPIONType.OBJECT)) {
-            flagStorage = FlagStorage.createStorage(globalOptions.getObject("flagStorage"));
-        } else {
-            flagStorage = new FlagStorage();
-        }
-        new GlobalRegion(flagStorage, globalOptions);
+        FixedGlobalRegion.setFLAG_STORAGE(new FixedGlobalFlagStorage(globalOptions.getObjectOrSetDefault("flagStorage", new YAPIONObject())));
     }
 }

From 0a4dccd95a87830186d93680ba7fee0a13525d8f Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sat, 2 Aug 2025 08:33:14 +0200
Subject: [PATCH 059/214] Fix WarpListener

---
 .../src/de/steamwar/bausystem/features/warp/WarpListener.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/warp/WarpListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/warp/WarpListener.java
index 655b36f9..1d06c9e4 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/warp/WarpListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/warp/WarpListener.java
@@ -91,10 +91,10 @@ public class WarpListener implements Listener {
                 locations.put(warp.getName(), warp.getLocation());
             });
             Region region = Region.getRegion(p.getLocation());
-            if (region.getBuildArea().getCopyPoint() != null) {
+            if (!region.getBuildArea().isEmpty()) {
                 locations.put("Copy", region.getBuildArea().getCopyPoint().toLocation(p).add(0.5, 0, 0.5));
             }
-            if (region.getTestblockArea().getCopyPoint() != null) {
+            if (!region.getTestblockArea().isEmpty()) {
                 locations.put("TestBlock", region.getTestblockArea().getCopyPoint().toLocation(p).add(0.5, 0, 0.5));
             }
         }

From 30db0bb7184aefb467579bbacf76b19bce950efd Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sat, 2 Aug 2025 08:35:44 +0200
Subject: [PATCH 060/214] Fix Warp.enable

---
 .../src/de/steamwar/bausystem/features/warp/Warp.java         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/warp/Warp.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/warp/Warp.java
index a1392917..0417bb28 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/warp/Warp.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/warp/Warp.java
@@ -20,7 +20,6 @@
 package de.steamwar.bausystem.features.warp;
 
 import de.steamwar.bausystem.worlddata.WorldData;
-import de.steamwar.core.Core;
 import lombok.Getter;
 import org.bukkit.*;
 import org.bukkit.entity.Player;
@@ -36,7 +35,8 @@ public class Warp {
 
     public static void enable() {
         Warp worldSpawn = new Warp("WorldSpawn");
-        worldSpawn.setLocation(Bukkit.getWorlds().get(0).getSpawnLocation().clone().add(0.5, Core.getVersion() >= 20 ? 124 : 1, 0.5));
+        Location spawnPoint = Bukkit.getWorlds().get(0).getHighestBlockAt(org.bukkit.Bukkit.getWorlds().get(0).getSpawnLocation()).getLocation();
+        worldSpawn.setLocation(spawnPoint.add(0.5, 1, 0.5));
         worldSpawn.setMat(Material.NETHER_STAR);
         warpMap.put("WorldSpawn", worldSpawn);
     }

From 06de120fe12a98b5ab7a1e5068b44cf9cee6a842 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sat, 2 Aug 2025 08:39:46 +0200
Subject: [PATCH 061/214] Add RegionSystem.getWorldSpawn Fix Warp Update
 FixedRegionSystem

---
 .../src/de/steamwar/bausystem/features/warp/Warp.java     | 4 ++--
 .../src/de/steamwar/bausystem/region/RegionSystem.java    | 6 ++++++
 .../de/steamwar/bausystem/region/FixedRegionSystem.java   | 8 ++++++++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/warp/Warp.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/warp/Warp.java
index 0417bb28..8b1b1ee7 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/warp/Warp.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/warp/Warp.java
@@ -19,6 +19,7 @@
 
 package de.steamwar.bausystem.features.warp;
 
+import de.steamwar.bausystem.region.RegionSystem;
 import de.steamwar.bausystem.worlddata.WorldData;
 import lombok.Getter;
 import org.bukkit.*;
@@ -35,8 +36,7 @@ public class Warp {
 
     public static void enable() {
         Warp worldSpawn = new Warp("WorldSpawn");
-        Location spawnPoint = Bukkit.getWorlds().get(0).getHighestBlockAt(org.bukkit.Bukkit.getWorlds().get(0).getSpawnLocation()).getLocation();
-        worldSpawn.setLocation(spawnPoint.add(0.5, 1, 0.5));
+        worldSpawn.setLocation(RegionSystem.INSTANCE.getWorldSpawn());
         worldSpawn.setMat(Material.NETHER_STAR);
         warpMap.put("WorldSpawn", worldSpawn);
     }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionSystem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionSystem.java
index 4289fb1b..b476bfd2 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionSystem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionSystem.java
@@ -42,6 +42,12 @@ public interface RegionSystem {
      */
     void save();
 
+    /**
+     * Returns the Location to teleport players to when they first join or Warp to "WorldSpawn"
+     */
+    @NonNull
+    Location getWorldSpawn();
+
     /**
      * Returns the GlobalRegion. This Region should have their {@link Region#getID()} return the
      * '00000000-0000-0000-0000-000000000000' UUID for easier retrieval with {@link #getRegion(UUID)}.
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedRegionSystem.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedRegionSystem.java
index 68f3cd18..22ca45c5 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedRegionSystem.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedRegionSystem.java
@@ -23,6 +23,7 @@ import de.steamwar.bausystem.region.fixed.FixedGlobalRegion;
 import de.steamwar.bausystem.region.fixed.loader.PrototypeLoader;
 import de.steamwar.bausystem.region.fixed.loader.RegionLoader;
 import lombok.NonNull;
+import org.bukkit.Bukkit;
 import org.bukkit.Location;
 
 import java.util.HashMap;
@@ -45,6 +46,13 @@ public class FixedRegionSystem implements RegionSystem {
     public void save() {
     }
 
+    @Override
+    public @NonNull Location getWorldSpawn() {
+        Location spawnLocation = Bukkit.getWorlds().get(0).getSpawnLocation();
+        Location spawnPoint = Bukkit.getWorlds().get(0).getHighestBlockAt(spawnLocation).getLocation();
+        return spawnPoint.add(0.5, 1, 0.5);
+    }
+
     @Override
     public Region getGlobalRegion() {
         return FixedGlobalRegion.INSTANCE;

From 9e0e3392779dd5535941ecae156655825cd755c8 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sat, 2 Aug 2025 08:43:48 +0200
Subject: [PATCH 062/214] Finish FixedFlagStorage

---
 .../region/fixed/FixedFlagStorage.java          | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedFlagStorage.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedFlagStorage.java
index 71aee78e..c382f547 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedFlagStorage.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedFlagStorage.java
@@ -24,8 +24,10 @@ import de.steamwar.bausystem.region.FlagStorage;
 import de.steamwar.bausystem.region.RegionFlagPolicy;
 import de.steamwar.bausystem.region.flags.Flag;
 import de.steamwar.bausystem.region.flags.TestblockMode;
+import de.steamwar.bausystem.worlddata.WorldData;
 import de.steamwar.core.Core;
 import lombok.NonNull;
+import yapion.hierarchy.types.YAPIONObject;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -34,9 +36,20 @@ public class FixedFlagStorage implements FlagStorage {
 
     private TestblockMode testBlockMode;
     private Map<Flag<?>, Flag.Value<?>> flagMap = new HashMap<>();
+    private YAPIONObject data;
 
-    public FixedFlagStorage(TestblockMode testblockMode) {
+    public FixedFlagStorage(TestblockMode testblockMode, YAPIONObject data) {
         this.testBlockMode = testblockMode;
+        this.data = data;
+        for (final Flag flag : Flag.getFlags()) {
+            if (!has(flag).isWritable()) continue;
+            try {
+                String s = data.getPlainValue(flag.name());
+                flagMap.put(flag, flag.valueOfValue(s));
+            } catch (Exception e) {
+                flagMap.put(flag, (Flag.Value<?>) flag.getDefaultValue());
+            }
+        }
     }
 
     @Override
@@ -56,6 +69,8 @@ public class FixedFlagStorage implements FlagStorage {
     @Override
     public <T extends Enum<T> & Flag.Value<T>> boolean set(@NonNull Flag<T> flag, @NonNull T value) {
         if (has(flag).isWritable()) {
+            data.put(flag.name(), value.name());
+            WorldData.write();
             return flagMap.put(flag, value) != value;
         } else {
             return false;

From ecb9571624836fe6893c3df6acf4fb7a4c459cb8 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sat, 2 Aug 2025 08:49:56 +0200
Subject: [PATCH 063/214] Add toString() methods

---
 .../de/steamwar/bausystem/region/RegionSystem.java    |  5 +++++
 .../src/de/steamwar/bausystem/region/flags/Flag.java  |  5 +++++
 .../bausystem/region/fixed/FixedFlagStorage.java      |  7 +++++++
 .../region/fixed/FixedGlobalFlagStorage.java          |  7 +++++++
 .../de/steamwar/bausystem/region/fixed/Prototype.java | 11 +++--------
 5 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionSystem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionSystem.java
index b476bfd2..bc37f66f 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionSystem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionSystem.java
@@ -92,6 +92,11 @@ public interface RegionSystem {
                     throw new UnsupportedOperationException();
                 }
 
+                @Override
+                public @NonNull Location getWorldSpawn() {
+                    throw new UnsupportedOperationException();
+                }
+
                 @Override
                 public Region getGlobalRegion() {
                     throw new UnsupportedOperationException();
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/Flag.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/Flag.java
index 305d046c..19a5082f 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/Flag.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/Flag.java
@@ -106,6 +106,11 @@ public final class Flag<T extends Enum<T> & Flag.Value<T>> implements EnumDispla
         return false;
     }
 
+    @Override
+    public String toString() {
+        return name;
+    }
+
     public interface Value<T extends Enum<T> & Value<T>> extends EnumDisplay {
 
         String name();
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedFlagStorage.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedFlagStorage.java
index c382f547..5a26c0fa 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedFlagStorage.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedFlagStorage.java
@@ -94,4 +94,11 @@ public class FixedFlagStorage implements FlagStorage {
     public Map<Flag<?>, Flag.Value<?>> getBackedMap() {
         return flagMap;
     }
+
+    @Override
+    public String toString() {
+        return "FixedFlagStorage{" +
+                "flagMap=" + flagMap +
+                '}';
+    }
 }
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalFlagStorage.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalFlagStorage.java
index 910483cb..d699eb08 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalFlagStorage.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalFlagStorage.java
@@ -98,4 +98,11 @@ public class FixedGlobalFlagStorage implements FlagStorage {
     public Map<Flag<?>, Flag.Value<?>> getBackedMap() {
         return flagMap;
     }
+
+    @Override
+    public String toString() {
+        return "FixedGlobalFlagStorage{" +
+                "flagMap=" + flagMap +
+                '}';
+    }
 }
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/Prototype.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/Prototype.java
index 2569b03c..804e25f4 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/Prototype.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/Prototype.java
@@ -20,7 +20,7 @@
 package de.steamwar.bausystem.region.fixed;
 
 import de.steamwar.bausystem.region.FlagStorage;
-import de.steamwar.bausystem.region.Region;
+import de.steamwar.bausystem.region.flags.TestblockMode;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import yapion.hierarchy.types.YAPIONObject;
@@ -217,13 +217,8 @@ public class Prototype {
         } else {
             prototype = PROTOTYPE_MAP.get(regionConfig.getPlainValue("prototype"));
         }
-        System.out.println(name + " " + prototype);
-        // FlagStorage flagStorage;
-        // if (regionData.containsKey("flagStorage", YAPIONType.OBJECT)) {
-        //     flagStorage = FlagStorage.createStorage(regionData.getObject("flagStorage"));
-        // } else {
-        //     flagStorage = new FlagStorage();
-        // }
+        FlagStorage flagStorage = new FixedFlagStorage(TestblockMode.NO_VALUE, regionData.getObjectOrSetDefault("flagStorage", new YAPIONObject()));
+        System.out.println(name + " " + prototype + " " + flagStorage);
         // return new Region(name, prototype, regionConfig, flagStorage, regionData);
     }
 }

From 06333d634e3f28a81786bb474819c821463f67c4 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sat, 2 Aug 2025 12:35:11 +0200
Subject: [PATCH 064/214] Fix RegionConfig Implement FixedRegion Add
 RegionHistory.Impl

---
 .../bausystem/region/RegionConfig.java        |   3 +-
 .../bausystem/region/RegionHistory.java       |  44 ++++
 .../steamwar/bausystem/shared/SizedStack.java |   6 +
 .../bausystem/region/FixedRegionSystem.java   |   4 +
 .../region/fixed/FixedFlagStorage.java        |   8 +-
 .../bausystem/region/fixed/FixedRegion.java   | 204 +++++++++++++++++-
 .../bausystem/region/fixed/Prototype.java     |   8 +-
 7 files changed, 257 insertions(+), 20 deletions(-)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionConfig.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionConfig.java
index 5c7da406..71e347c6 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionConfig.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionConfig.java
@@ -19,6 +19,7 @@
 
 package de.steamwar.bausystem.region;
 
+import de.steamwar.core.FlatteningWrapper;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -117,7 +118,7 @@ public class RegionConfig {
         private void load(ConfigurationSection section) {
             Active = section.getBoolean("Active", false);
             ObfuscateWith = Material.getMaterial(section.getString("ObfuscateWith", "END_STONE"));
-            HiddenBlocks = section.getStringList("HiddenBlocks").stream().map(Material::getMaterial).collect(Collectors.toUnmodifiableSet());
+            HiddenBlocks = section.getStringList("HiddenBlocks").stream().map(FlatteningWrapper.impl::getMaterial).filter(Objects::nonNull).collect(Collectors.toUnmodifiableSet());
             HiddenBlockEntities = Collections.unmodifiableSet(new HashSet<>(section.getStringList("HiddenBlockEntities")));
         }
     }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionHistory.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionHistory.java
index 2eb79247..ef597cd2 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionHistory.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionHistory.java
@@ -20,7 +20,11 @@
 package de.steamwar.bausystem.region;
 
 import com.sk89q.worldedit.EditSession;
+import com.sk89q.worldedit.WorldEdit;
+import com.sk89q.worldedit.bukkit.BukkitWorld;
+import de.steamwar.bausystem.shared.SizedStack;
 import lombok.NonNull;
+import org.bukkit.Bukkit;
 
 public interface RegionHistory {
 
@@ -45,4 +49,44 @@ public interface RegionHistory {
             return false;
         }
     };
+
+    class Impl implements RegionHistory {
+
+        private SizedStack<EditSession> undoSessions;
+        private SizedStack<EditSession> redoSessions;
+
+        public Impl(int size) {
+            this.undoSessions = new SizedStack<>(size);
+            this.redoSessions = new SizedStack<>(size);
+        }
+
+        @Override
+        public void remember(@NonNull EditSession editSession) {
+            undoSessions.push(editSession);
+            if (redoSessions.empty()) return;
+            redoSessions.clear();
+        }
+
+        @Override
+        public boolean undo() {
+            EditSession session = undoSessions.pop();
+            if (session == null) return false;
+            try (EditSession e = WorldEdit.getInstance().getEditSessionFactory().getEditSession(new BukkitWorld(Bukkit.getWorlds().get(0)), -1)) {
+                session.undo(e);
+                redoSessions.push(e);
+            }
+            return true;
+        }
+
+        @Override
+        public boolean redo() {
+            EditSession session = redoSessions.pop();
+            if (session == null) return false;
+            try (EditSession e = WorldEdit.getInstance().getEditSessionFactory().getEditSession(new BukkitWorld(Bukkit.getWorlds().get(0)), -1)) {
+                session.redo(e);
+                undoSessions.push(e);
+            }
+            return true;
+        }
+    }
 }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/shared/SizedStack.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/shared/SizedStack.java
index 7d503b2e..6aa7b619 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/shared/SizedStack.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/shared/SizedStack.java
@@ -130,6 +130,12 @@ public class SizedStack<T> {
         return size;
     }
 
+    public void clear() {
+        this.data = (T[]) new Object[this.maxSize];
+        this.head = 0;
+        this.size = 0;
+    }
+
     @Override
     public String toString() {
         final StringBuilder result = new StringBuilder("[");
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedRegionSystem.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedRegionSystem.java
index 22ca45c5..8a817870 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedRegionSystem.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedRegionSystem.java
@@ -36,6 +36,10 @@ public class FixedRegionSystem implements RegionSystem {
 
     private static final Map<UUID, Region> REGION_MAP = new HashMap<>();
 
+    public static void addRegion(Region region) {
+        REGION_MAP.put(region.getID(), region);
+    }
+
     @Override
     public void load() {
         PrototypeLoader.load();
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedFlagStorage.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedFlagStorage.java
index 5a26c0fa..c860f903 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedFlagStorage.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedFlagStorage.java
@@ -23,7 +23,6 @@ import de.steamwar.bausystem.region.FlagOptional;
 import de.steamwar.bausystem.region.FlagStorage;
 import de.steamwar.bausystem.region.RegionFlagPolicy;
 import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.region.flags.TestblockMode;
 import de.steamwar.bausystem.worlddata.WorldData;
 import de.steamwar.core.Core;
 import lombok.NonNull;
@@ -34,12 +33,10 @@ import java.util.Map;
 
 public class FixedFlagStorage implements FlagStorage {
 
-    private TestblockMode testBlockMode;
     private Map<Flag<?>, Flag.Value<?>> flagMap = new HashMap<>();
     private YAPIONObject data;
 
-    public FixedFlagStorage(TestblockMode testblockMode, YAPIONObject data) {
-        this.testBlockMode = testblockMode;
+    public FixedFlagStorage(YAPIONObject data) {
         this.data = data;
         for (final Flag flag : Flag.getFlags()) {
             if (!has(flag).isWritable()) continue;
@@ -79,9 +76,6 @@ public class FixedFlagStorage implements FlagStorage {
 
     @Override
     public @NonNull <T extends Enum<T> & Flag.Value<T>> FlagOptional<T> get(@NonNull Flag<T> flag) {
-        if (flag.oneOf(Flag.TESTBLOCK)) {
-            return FlagOptional.of((Flag) flag, testBlockMode);
-        }
         return FlagOptional.of(flag, (T) flagMap.get(flag));
     }
 
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java
index 2f914dc5..7409de36 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java
@@ -19,9 +19,18 @@
 
 package de.steamwar.bausystem.region.fixed;
 
+import com.sk89q.worldedit.EditSession;
+import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.region.*;
+import de.steamwar.bausystem.region.flags.Flag;
+import de.steamwar.bausystem.region.flags.TestblockMode;
+import de.steamwar.bausystem.utils.PasteBuilder;
+import de.steamwar.core.Core;
 import lombok.NonNull;
+import yapion.hierarchy.types.YAPIONObject;
 
+import javax.annotation.Nullable;
+import java.io.File;
 import java.nio.charset.StandardCharsets;
 import java.util.UUID;
 
@@ -31,10 +40,191 @@ public class FixedRegion implements Region {
     private FixedFlagStorage flagStorage;
     private Prototype prototype;
 
-    public FixedRegion(String name, FixedFlagStorage flagStorage, Prototype prototype) {
+    private final Area area;
+    private final Area build;
+    private final Area testblock;
+    private final int floorLevel;
+    private final int waterLevel;
+    private final RegionConfig regionConfig;
+    private final RegionHistory regionHistory = new RegionHistory.Impl(20);
+
+    public FixedRegion(String name, FixedFlagStorage flagStorage, Prototype prototype, YAPIONObject regionConfig, YAPIONObject regionData) {
         uuid = UUID.nameUUIDFromBytes(name.getBytes(StandardCharsets.UTF_8));
         this.flagStorage = flagStorage;
         this.prototype = prototype;
+        System.out.println(name + " " + prototype + " " + flagStorage);
+
+        Point minPoint;
+        if (regionConfig.containsKey("minX", Integer.class) && regionConfig.containsKey("minY", Integer.class) && regionConfig.containsKey("minZ", Integer.class)) {
+            minPoint = new Point(regionConfig.getInt("minX"), regionConfig.getInt("minY"), regionConfig.getInt("minZ"));
+        } else {
+            throw new IllegalArgumentException("minX and minY and minZ are required");
+        }
+        Point maxPoint = minPoint.add(prototype.getSizeX() - 1, prototype.getSizeY() - 1, prototype.getSizeZ() - 1);
+
+        area = new Area() {
+            @Override
+            public @NonNull Point getMinPoint(boolean extension) {
+                return minPoint;
+            }
+
+            @Override
+            public @NonNull Point getMaxPoint(boolean extension) {
+                return maxPoint;
+            }
+
+            @Override
+            public @NonNull Point getCopyPoint() {
+                return minPoint;
+            }
+
+            @Nullable
+            @Override
+            public EditSession copy(boolean extension) {
+                return null; // TODO: Implement
+            }
+
+            @Nullable
+            @Override
+            public File getResetFile() {
+                return null; // TODO: Implement
+            }
+
+            @Override
+            public void reset(PasteBuilder pasteBuilder, boolean extension) {
+                // TODO: Implement
+            }
+        };
+
+        if (prototype.getBuild() != null) {
+            Point minPointBuild = minPoint.add(prototype.getBuild().getOffsetX(), prototype.getBuild().getOffsetY(), prototype.getBuild().getOffsetZ());
+            Point maxPointBuild = minPointBuild.add(prototype.getBuild().getSizeX() - 1, prototype.getBuild().getSizeY() - 1, prototype.getBuild().getSizeZ() - 1);
+
+            Point minPointBuildExtension = minPointBuild.subtract(prototype.getBuild().getExtensionNegativeX(), prototype.getBuild().getExtensionNegativeY(), prototype.getBuild().getExtensionNegativeZ());
+            Point maxPointBuildExtension = maxPointBuild.add(prototype.getBuild().getExtensionPositiveX(), prototype.getBuild().getExtensionPositiveY(), prototype.getBuild().getExtensionPositiveZ());
+
+            Point copyPoint;
+            if (!prototype.getBuild().isHasCopyPoint() && (prototype.getCopyPointOffsetX() != 0 || prototype.getCopyPointOffsetY() != 0 || prototype.getCopyPointOffsetZ() != 0)) {
+                copyPoint = minPoint.add(prototype.getCopyPointOffsetX(), prototype.getCopyPointOffsetY(), prototype.getCopyPointOffsetZ());
+            } else if (prototype.getBuild().getCopyOffsetX() != 0 || prototype.getBuild().getCopyOffsetY() != 0 || prototype.getBuild().getCopyOffsetZ() != 0) {
+                copyPoint = minPointBuild.add(prototype.getBuild().getCopyOffsetX(), prototype.getBuild().getCopyOffsetY(), prototype.getBuild().getCopyOffsetZ());
+            } else {
+                copyPoint = minPointBuild.add(prototype.getBuild().getSizeX() / 2, 0, prototype.getBuild().getSizeZ());
+            }
+
+            build = new Area() {
+                @Override
+                public @NonNull Point getMinPoint(boolean extension) {
+                    return extension ? minPointBuildExtension : minPointBuild;
+                }
+
+                @Override
+                public @NonNull Point getMaxPoint(boolean extension) {
+                    return extension ? maxPointBuildExtension : maxPointBuild;
+                }
+
+                @Override
+                public @NonNull Point getCopyPoint() {
+                    return copyPoint;
+                }
+
+                @Nullable
+                @Override
+                public EditSession copy(boolean extension) {
+                    return null; // TODO: Implement
+                }
+
+                @Nullable
+                @Override
+                public File getResetFile() {
+                    return null; // TODO: Implement
+                }
+
+                @Override
+                public void reset(PasteBuilder pasteBuilder, boolean extension) {
+                    // TODO: Implement
+                }
+            };
+        } else {
+            build = Area.EMPTY;
+        }
+
+        if (prototype.getTestblock() != null) {
+            Point minPointTestblock = minPoint.add(prototype.getTestblock().getOffsetX(), prototype.getTestblock().getOffsetY(), prototype.getTestblock().getOffsetZ());
+            Point maxPointTestblock = minPointTestblock.add(prototype.getTestblock().getSizeX() - 1, prototype.getTestblock().getSizeY() - 1, prototype.getTestblock().getSizeZ() - 1);
+
+            Point minPointTestblockExtension = minPointTestblock.subtract(prototype.getTestblock().getExtensionNegativeX(), prototype.getTestblock().getExtensionNegativeY(), prototype.getTestblock().getExtensionNegativeZ());
+            Point maxPointTestblockExtension = maxPointTestblock.add(prototype.getTestblock().getExtensionPositiveX(), prototype.getTestblock().getExtensionPositiveY(), prototype.getTestblock().getExtensionPositiveZ());
+
+            Point copyPoint;
+            if (!prototype.getTestblock().isHasCopyPoint() && (prototype.getCopyPointOffsetX() != 0 || prototype.getCopyPointOffsetY() != 0 || prototype.getCopyPointOffsetZ() != 0)) {
+                copyPoint = minPoint.add(prototype.getCopyPointOffsetX(), prototype.getCopyPointOffsetY(), prototype.getCopyPointOffsetZ());
+            } else if (prototype.getTestblock().getCopyOffsetX() != 0 || prototype.getTestblock().getCopyOffsetY() != 0 || prototype.getTestblock().getCopyOffsetZ() != 0) {
+                copyPoint = minPointTestblock.add(prototype.getTestblock().getCopyOffsetX(), prototype.getTestblock().getCopyOffsetY(), prototype.getTestblock().getCopyOffsetZ());
+            } else {
+                copyPoint = minPointTestblock.add(prototype.getTestblock().getSizeX() / 2, 0, prototype.getTestblock().getSizeZ());
+            }
+
+            testblock = new Area() {
+                @Override
+                public @NonNull Point getMinPoint(boolean extension) {
+                    return extension ? minPointTestblockExtension : minPointTestblock;
+                }
+
+                @Override
+                public @NonNull Point getMaxPoint(boolean extension) {
+                    return extension ? maxPointTestblockExtension : maxPointTestblock;
+                }
+
+                @Override
+                public @NonNull Point getCopyPoint() {
+                    return copyPoint;
+                }
+
+                @Nullable
+                @Override
+                public EditSession copy(boolean extension) {
+                    return null; // TODO: Implement
+                }
+
+                @Nullable
+                @Override
+                public File getResetFile() {
+                    return null; // TODO: Implement
+                }
+
+                @Override
+                public void reset(PasteBuilder pasteBuilder, boolean extension) {
+                    // TODO: Implement
+                }
+            };
+        } else {
+            testblock = Area.EMPTY;
+        }
+
+        if (!testblock.isEmpty() && !build.isEmpty()) {
+            if (testblock.getMinPoint(false).getZ() > build.getMinPoint(false).getZ()) {
+                flagStorage.getBackedMap().put(Flag.TESTBLOCK, TestblockMode.SOUTH);
+            } else {
+                flagStorage.getBackedMap().put(Flag.TESTBLOCK, TestblockMode.NORTH);
+            }
+        } else {
+            flagStorage.getBackedMap().put(Flag.TESTBLOCK, TestblockMode.NO_VALUE);
+        }
+
+        floorLevel = prototype.getFloorOffset() != 0 ? minPoint.getY() + prototype.getFloorOffset() : 0;
+        waterLevel = prototype.getWaterOffset() != 0 ? minPoint.getX() + prototype.getWaterOffset() : 0;
+
+        File found = null;
+        File baseFile = new File(BauSystem.getInstance().getDataFolder().getParentFile(), "FightSystem");
+        for (int version = Core.getVersion(); version >= 15; version--) {
+            File specific = new File(baseFile, prototype.getDisplayName() + version + ".yml");
+            if (specific.exists()) {
+                found = specific;
+                break;
+            }
+        }
+        this.regionConfig = new RegionConfig(found);
     }
 
     @Override
@@ -54,31 +244,31 @@ public class FixedRegion implements Region {
 
     @Override
     public @NonNull Area getArea() {
-        return null;
+        return area;
     }
 
     @Override
     public @NonNull Area getBuildArea() {
-        return null;
+        return build;
     }
 
     @Override
     public @NonNull Area getTestblockArea() {
-        return null;
+        return testblock;
     }
 
     @Override
     public @NonNull RegionConfig getGameModeConfig() {
-        return null;
+        return regionConfig;
     }
 
     @Override
     public @NonNull RegionHistory getHistory() {
-        return null;
+        return regionHistory;
     }
 
     @Override
     public @NonNull RegionBackups getBackups() {
-        return null;
+        return RegionBackups.EMPTY;
     }
 }
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/Prototype.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/Prototype.java
index 804e25f4..3e4a7248 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/Prototype.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/Prototype.java
@@ -19,8 +19,7 @@
 
 package de.steamwar.bausystem.region.fixed;
 
-import de.steamwar.bausystem.region.FlagStorage;
-import de.steamwar.bausystem.region.flags.TestblockMode;
+import de.steamwar.bausystem.region.FixedRegionSystem;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import yapion.hierarchy.types.YAPIONObject;
@@ -217,8 +216,7 @@ public class Prototype {
         } else {
             prototype = PROTOTYPE_MAP.get(regionConfig.getPlainValue("prototype"));
         }
-        FlagStorage flagStorage = new FixedFlagStorage(TestblockMode.NO_VALUE, regionData.getObjectOrSetDefault("flagStorage", new YAPIONObject()));
-        System.out.println(name + " " + prototype + " " + flagStorage);
-        // return new Region(name, prototype, regionConfig, flagStorage, regionData);
+        FixedFlagStorage flagStorage = new FixedFlagStorage(regionData.getObjectOrSetDefault("flagStorage", new YAPIONObject()));
+        FixedRegionSystem.addRegion(new FixedRegion(name, flagStorage, prototype, regionConfig, regionData));
     }
 }

From 830ca93105ddc28efe48697030189cc8c81930da Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sat, 2 Aug 2025 13:53:52 +0200
Subject: [PATCH 065/214] Implement Area for FixedRegion

---
 .../de/steamwar/bausystem/region/Region.java  |  9 ++-
 .../bausystem/region/fixed/FixedRegion.java   | 80 ++++++++++++-------
 2 files changed, 58 insertions(+), 31 deletions(-)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
index bad3b0ef..609364a1 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
@@ -19,7 +19,8 @@
 
 package de.steamwar.bausystem.region;
 
-import com.sk89q.worldedit.EditSession;
+import com.sk89q.worldedit.extent.clipboard.Clipboard;
+import de.steamwar.bausystem.utils.FlatteningWrapper;
 import de.steamwar.bausystem.utils.PasteBuilder;
 import lombok.NonNull;
 import org.bukkit.Location;
@@ -100,7 +101,7 @@ public interface Region {
             }
 
             @Override
-            public EditSession copy(boolean extension) {
+            public Clipboard copy(boolean extension) {
                 return null;
             }
 
@@ -146,7 +147,9 @@ public interface Region {
         }
 
         @Nullable
-        EditSession copy(boolean extension);
+        default Clipboard copy(boolean extension) {
+            return FlatteningWrapper.impl.copy(getMinPoint(extension), getMaxPoint(extension), getCopyPoint());
+        }
 
         @Nullable
         File getResetFile();
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java
index 7409de36..d89095c3 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java
@@ -26,6 +26,7 @@ import de.steamwar.bausystem.region.flags.Flag;
 import de.steamwar.bausystem.region.flags.TestblockMode;
 import de.steamwar.bausystem.utils.PasteBuilder;
 import de.steamwar.core.Core;
+import de.steamwar.sql.SchematicType;
 import lombok.NonNull;
 import yapion.hierarchy.types.YAPIONObject;
 
@@ -36,9 +37,10 @@ import java.util.UUID;
 
 public class FixedRegion implements Region {
 
-    private UUID uuid;
-    private FixedFlagStorage flagStorage;
-    private Prototype prototype;
+    private final UUID uuid;
+    private final FixedFlagStorage flagStorage;
+    private final Prototype prototype;
+    private final String skin;
 
     private final Area area;
     private final Area build;
@@ -52,7 +54,7 @@ public class FixedRegion implements Region {
         uuid = UUID.nameUUIDFromBytes(name.getBytes(StandardCharsets.UTF_8));
         this.flagStorage = flagStorage;
         this.prototype = prototype;
-        System.out.println(name + " " + prototype + " " + flagStorage);
+        this.skin = prototype.getDefaultSkin();
 
         Point minPoint;
         if (regionConfig.containsKey("minX", Integer.class) && regionConfig.containsKey("minY", Integer.class) && regionConfig.containsKey("minZ", Integer.class)) {
@@ -78,21 +80,24 @@ public class FixedRegion implements Region {
                 return minPoint;
             }
 
-            @Nullable
-            @Override
-            public EditSession copy(boolean extension) {
-                return null; // TODO: Implement
-            }
-
             @Nullable
             @Override
             public File getResetFile() {
-                return null; // TODO: Implement
+                return prototype.getSkinMap().get(skin).getSchematicFile();
             }
 
             @Override
             public void reset(PasteBuilder pasteBuilder, boolean extension) {
-                // TODO: Implement
+                pasteBuilder.reset(extension)
+                        .minPoint(getMinPoint(extension))
+                        .maxPoint(getMaxPoint(extension))
+                        .waterLevel(waterLevel);
+                if (pasteBuilder.getClipboardProvider().is(PasteBuilder.SchematicProvider.class)) {
+                    SchematicType schematicType = pasteBuilder.getClipboardProvider().as(PasteBuilder.SchematicProvider.class).getSchematic().getSchemtype();
+                    pasteBuilder.rotate(schematicType.fightType() || schematicType.check());
+                }
+                pasteBuilder.pastePoint(minPoint.add(prototype.getSizeX() / 2, 0, prototype.getSizeY() / 2));
+                regionHistory.remember(pasteBuilder.run());
             }
         };
 
@@ -128,21 +133,24 @@ public class FixedRegion implements Region {
                     return copyPoint;
                 }
 
-                @Nullable
-                @Override
-                public EditSession copy(boolean extension) {
-                    return null; // TODO: Implement
-                }
-
                 @Nullable
                 @Override
                 public File getResetFile() {
-                    return null; // TODO: Implement
+                    return prototype.getSkinMap().get(skin).getBuildSchematicFile();
                 }
 
                 @Override
                 public void reset(PasteBuilder pasteBuilder, boolean extension) {
-                    // TODO: Implement
+                    pasteBuilder.reset(extension)
+                            .minPoint(getMinPoint(extension))
+                            .maxPoint(getMaxPoint(extension))
+                            .waterLevel(waterLevel);
+                    if (pasteBuilder.getClipboardProvider().is(PasteBuilder.SchematicProvider.class)) {
+                        SchematicType schematicType = pasteBuilder.getClipboardProvider().as(PasteBuilder.SchematicProvider.class).getSchematic().getSchemtype();
+                        pasteBuilder.rotate(schematicType.fightType() || schematicType.check());
+                    }
+                    pasteBuilder.pastePoint(minPointBuild.add(prototype.getBuild().getSizeX() / 2, 0, prototype.getBuild().getSizeZ() / 2));
+                    regionHistory.remember(pasteBuilder.run());
                 }
             };
         } else {
@@ -181,21 +189,37 @@ public class FixedRegion implements Region {
                     return copyPoint;
                 }
 
-                @Nullable
-                @Override
-                public EditSession copy(boolean extension) {
-                    return null; // TODO: Implement
-                }
-
                 @Nullable
                 @Override
                 public File getResetFile() {
-                    return null; // TODO: Implement
+                    return prototype.getSkinMap().get(skin).getTestblockSchematicFile();
                 }
 
                 @Override
                 public void reset(PasteBuilder pasteBuilder, boolean extension) {
-                    // TODO: Implement
+                    pasteBuilder.reset(extension)
+                            .minPoint(getMinPoint(extension))
+                            .maxPoint(getMaxPoint(extension))
+                            .waterLevel(waterLevel);
+                    if (pasteBuilder.getClipboardProvider().is(PasteBuilder.SchematicProvider.class)) {
+                        SchematicType schematicType = pasteBuilder.getClipboardProvider().as(PasteBuilder.SchematicProvider.class).getSchematic().getSchemtype();
+                        pasteBuilder.rotate(schematicType.fightType() || schematicType.check());
+                    }
+                    Point pastePoint = minPointTestblock.add(prototype.getTestblock().getSizeX() / 2, 0, prototype.getTestblock().getSizeZ() / 2);
+                    if (pasteBuilder.getClipboardProvider().is(PasteBuilder.SchematicProvider.class)) {
+                        SchematicType schematicType = pasteBuilder.getClipboardProvider().as(PasteBuilder.SchematicProvider.class).getSchematic().getSchemtype();
+                        if (schematicType.getKuerzel().equalsIgnoreCase("wg")) {
+                            pastePoint = pastePoint.add(0, 0, 1);
+                        }
+                        if (schematicType.getKuerzel().equalsIgnoreCase("ws")) {
+                            pastePoint = pastePoint.add(-1, 0, 1);
+                        }
+                        if (schematicType.getKuerzel().equalsIgnoreCase("as")) {
+                            pastePoint = pastePoint.add(-1, 0, 1);
+                        }
+                    }
+                    pasteBuilder.pastePoint(pastePoint);
+                    regionHistory.remember(pasteBuilder.run());
                 }
             };
         } else {

From 0a3ae7117dea8dd92acb5aeb282a7a322f1a764e Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sat, 2 Aug 2025 13:55:22 +0200
Subject: [PATCH 066/214] Fix FixedGlobalRegion

---
 .../de/steamwar/bausystem/region/fixed/FixedGlobalRegion.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalRegion.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalRegion.java
index 9204489e..8edc97db 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalRegion.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalRegion.java
@@ -19,7 +19,7 @@
 
 package de.steamwar.bausystem.region.fixed;
 
-import com.sk89q.worldedit.EditSession;
+import com.sk89q.worldedit.extent.clipboard.Clipboard;
 import de.steamwar.bausystem.region.*;
 import de.steamwar.bausystem.utils.PasteBuilder;
 import lombok.NonNull;
@@ -66,7 +66,7 @@ public final class FixedGlobalRegion implements Region {
 
         @Nullable
         @Override
-        public EditSession copy(boolean extension) {
+        public Clipboard copy(boolean extension) {
             return null;
         }
 

From b14c39683a9365730aa1ce011010fdd3fdb219c6 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sat, 2 Aug 2025 14:31:46 +0200
Subject: [PATCH 067/214] Implement FixedRegion.regionBackups

---
 .../features/backup/BackupCommand.java        |  4 +-
 .../bausystem/region/fixed/FixedRegion.java   | 92 ++++++++++++++++++-
 2 files changed, 92 insertions(+), 4 deletions(-)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/backup/BackupCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/backup/BackupCommand.java
index 6c7708c9..393549b7 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/backup/BackupCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/backup/BackupCommand.java
@@ -120,12 +120,12 @@ public class BackupCommand extends SWCommand {
         return new TypeMapper<RegionBackups.Backup>() {
             @Override
             public RegionBackups.Backup map(CommandSender commandSender, String[] previousArguments, String s) {
-                return Region.getRegion(((Player) commandSender).getLocation()).getBackups().get(s);
+                return Region.getRegion(((Player) commandSender).getLocation()).getBackups().get(s.replace('_', ' '));
             }
 
             @Override
             public Collection<String> tabCompletes(CommandSender sender, PreviousArguments previousArguments, String s) {
-                return listBackup((Player) sender).stream().map(RegionBackups.Backup::getName).collect(Collectors.toList());
+                return listBackup((Player) sender).stream().map(RegionBackups.Backup::getName).map(name -> name.replace(' ', '_')).collect(Collectors.toList());
             }
         };
     }
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java
index d89095c3..ed109105 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java
@@ -24,19 +24,28 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.region.*;
 import de.steamwar.bausystem.region.flags.Flag;
 import de.steamwar.bausystem.region.flags.TestblockMode;
+import de.steamwar.bausystem.utils.FlatteningWrapper;
 import de.steamwar.bausystem.utils.PasteBuilder;
 import de.steamwar.core.Core;
 import de.steamwar.sql.SchematicType;
 import lombok.NonNull;
+import org.bukkit.Bukkit;
 import yapion.hierarchy.types.YAPIONObject;
 
 import javax.annotation.Nullable;
 import java.io.File;
 import java.nio.charset.StandardCharsets;
-import java.util.UUID;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.stream.Collectors;
 
 public class FixedRegion implements Region {
 
+    private static final File backupFolder = new File(Bukkit.getWorlds().get(0).getWorldFolder(), "backup");
+    private static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy.MM.dd' 'HH:mm:ss");
+
+    private final String name;
     private final UUID uuid;
     private final FixedFlagStorage flagStorage;
     private final Prototype prototype;
@@ -50,7 +59,86 @@ public class FixedRegion implements Region {
     private final RegionConfig regionConfig;
     private final RegionHistory regionHistory = new RegionHistory.Impl(20);
 
+    private final RegionBackups regionBackups = new RegionBackups() {
+        @Override
+        public Optional<Backup> create(BackupType backupType) {
+            final File definedBackupFolder = new File(new File(backupFolder, prototype.getName()), name);
+            //noinspection ResultOfMethodCallIgnored
+            definedBackupFolder.mkdirs();
+
+            File[] currentBackups = definedBackupFolder.listFiles();
+            if (currentBackups != null && currentBackups.length >= 20) {
+                List<File> files = new ArrayList<>(Arrays.asList(currentBackups));
+                files.sort(Comparator.comparingLong(File::lastModified));
+                while (files.size() >= 20) files.remove(0).delete();
+            }
+
+            final File backupFile = new File(definedBackupFolder, LocalDateTime.now().format(formatter) + ".schem");
+            Point minPoint = area.getMinPoint(false);
+            Point maxPoint = area.getMaxPoint(false);
+            if (!FlatteningWrapper.impl.backup(minPoint, maxPoint, backupFile)) {
+                return Optional.empty();
+            }
+            return Optional.of(new BackupImpl(backupFile));
+        }
+
+        @Override
+        public @NonNull List<Backup> list() {
+            final File definedBackupFolder = new File(new File(backupFolder, prototype.getName()), name);
+            //noinspection ResultOfMethodCallIgnored
+            definedBackupFolder.mkdirs();
+
+            File[] currentBackups = definedBackupFolder.listFiles();
+            if (currentBackups == null || currentBackups.length == 0) {
+                return Collections.emptyList();
+            }
+            List<File> files = new ArrayList<>(Arrays.asList(currentBackups));
+            files.sort(Comparator.comparingLong(File::lastModified));
+            return files.stream().map(BackupImpl::new).collect(Collectors.toList());
+        }
+
+        @Nullable
+        @Override
+        public Backup get(String name) {
+            final File definedBackupFolder = new File(new File(backupFolder, prototype.getName()), name);
+            //noinspection ResultOfMethodCallIgnored
+            definedBackupFolder.mkdirs();
+            File[] files = definedBackupFolder.listFiles((dir, s) -> s.equals(name + ".schem"));
+            if (files == null || files.length == 0) return null;
+            return new BackupImpl(files[0]);
+        }
+    };
+
+    private class BackupImpl extends RegionBackups.Backup {
+
+        private final File file;
+
+        public BackupImpl(File file) {
+            super(RegionBackups.BackupType.AUTOMATIC, file.getName(), flagStorage);
+            this.file = file;
+        }
+
+        @Override
+        public boolean load() {
+            if (!file.exists()) return false;
+            EditSession editSession = new PasteBuilder(new PasteBuilder.FileProvider(file))
+                    .pastePoint(area.getMinPoint(false).add(prototype.getSizeX() / 2, 0, prototype.getSizeZ() / 2))
+                    .minPoint(area.getMinPoint(false))
+                    .maxPoint(area.getMaxPoint(false))
+                    .waterLevel(waterLevel)
+                    .run();
+            regionHistory.remember(editSession);
+            return true;
+        }
+
+        @Override
+        public void delete() {
+            file.delete();
+        }
+    }
+
     public FixedRegion(String name, FixedFlagStorage flagStorage, Prototype prototype, YAPIONObject regionConfig, YAPIONObject regionData) {
+        this.name = name;
         uuid = UUID.nameUUIDFromBytes(name.getBytes(StandardCharsets.UTF_8));
         this.flagStorage = flagStorage;
         this.prototype = prototype;
@@ -293,6 +381,6 @@ public class FixedRegion implements Region {
 
     @Override
     public @NonNull RegionBackups getBackups() {
-        return RegionBackups.EMPTY;
+        return regionBackups;
     }
 }

From a3801790a4d74d96fbe2fd4e50a59cc0ef782f73 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sat, 2 Aug 2025 14:32:24 +0200
Subject: [PATCH 068/214] Remove old stuff

---
 .../bausystem/regionold/Region.java.txt       | 584 ------------------
 .../regionold/loader/Updater.java.txt         |  47 --
 2 files changed, 631 deletions(-)
 delete mode 100644 BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionold/Region.java.txt
 delete mode 100644 BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionold/loader/Updater.java.txt

diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionold/Region.java.txt b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionold/Region.java.txt
deleted file mode 100644
index c6f8b5c7..00000000
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionold/Region.java.txt
+++ /dev/null
@@ -1,584 +0,0 @@
-/*
- * This file is a part of the SteamWar software.
- *
- * Copyright (C) 2021  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;
-
-import com.sk89q.worldedit.EditSession;
-import com.sk89q.worldedit.WorldEdit;
-import com.sk89q.worldedit.bukkit.BukkitWorld;
-import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.region.flags.flagvalues.TNTMode;
-import de.steamwar.bausystem.region.tags.Tag;
-import de.steamwar.bausystem.region.utils.RegionExtensionType;
-import de.steamwar.bausystem.region.utils.RegionType;
-import de.steamwar.bausystem.shared.SizedStack;
-import de.steamwar.bausystem.utils.FlatteningWrapper;
-import de.steamwar.bausystem.utils.PasteBuilder;
-import de.steamwar.core.Core;
-import de.steamwar.sql.SchematicType;
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.NonNull;
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import yapion.hierarchy.types.YAPIONObject;
-import yapion.hierarchy.types.YAPIONType;
-import yapion.hierarchy.types.YAPIONValue;
-
-import java.io.File;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.*;
-import java.util.function.ObjIntConsumer;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-
-@Getter
-public class Region {
-
-    @Getter
-    private static final Map<String, Region> REGION_MAP = new HashMap<>();
-    private static final File backupFolder = new File(Bukkit.getWorlds().get(0).getWorldFolder(), "backup");
-    private static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy.MM.dd' 'HH:mm:ss");
-
-    public static Region getRegion(Location location) {
-        return REGION_MAP.values().stream()
-                .filter(r -> r.inRegion(location, r.minPoint, r.maxPoint))
-                .findFirst()
-                .orElse(GlobalRegion.instance);
-    }
-
-    public static Set<Region> getRegion(Prototype prototype) {
-        return REGION_MAP.values().stream()
-                .filter(r -> r.getPrototype() == prototype)
-                .collect(Collectors.toSet());
-    }
-
-    public static void setGlobal(Flag flagType, Flag.Value<?> value) {
-        REGION_MAP.values().forEach(region -> region.set(flagType, value));
-    }
-
-    YAPIONObject regionData;
-
-    private String name;
-    private Prototype prototype;
-    private Set<String> prototypes;
-    private String skin;
-
-    private Point minPoint;
-    private Point maxPoint;
-
-    private Point minPointTestblock;
-    private Point maxPointTestblock;
-
-    private Point minPointTestblockExtension;
-    private Point maxPointTestblockExtension;
-
-    private Point minPointBuild;
-    private Point maxPointBuild;
-
-    private Point minPointBuildExtension;
-    private Point maxPointBuildExtension;
-
-    private int floorLevel;
-    private int waterLevel;
-
-    private Point copyPoint; // Nullable
-    private Point testBlockPoint; // Nullable
-
-    private String linkedRegionName = null; // Nullable
-    private Region linkedRegion = null; // Nullable
-
-    private FlagStorage flagStorage;
-
-    @Getter(AccessLevel.PRIVATE)
-    private SizedStack<EditSession> undoSessions;
-
-    @Getter(AccessLevel.PRIVATE)
-    private SizedStack<EditSession> redoSessions;
-
-    public Region(String name, Prototype prototype, YAPIONObject regionConfig, FlagStorage flagStorage, YAPIONObject regionData) {
-        this.name = name;
-        this.regionData = regionData;
-        if (prototype != null) {
-            REGION_MAP.put(name, this);
-        }
-
-        linkedRegionName = regionConfig.getPlainValueOrDefault("optionsLinkedWith", null);
-
-        prototypes = new HashSet<>();
-        if (regionConfig.containsKey("prototypes", YAPIONType.ARRAY)) {
-            regionConfig.getArray("prototypes").forEach(yapionAnyType -> {
-                if (yapionAnyType instanceof YAPIONValue) {
-                    prototypes.add(((YAPIONValue<String>) yapionAnyType).get());
-                }
-            });
-        }
-        if (regionConfig.containsKey("prototype")) {
-            prototypes.add(regionConfig.getPlainValue("prototype"));
-        }
-
-        this.flagStorage = flagStorage;
-        Point point = null;
-        if (regionConfig.containsKey("minX", Integer.class) && regionConfig.containsKey("minY", Integer.class) && regionConfig.containsKey("minZ", Integer.class)) {
-            point = new Point(regionConfig.getPlainValue("minX"), regionConfig.getPlainValue("minY"), regionConfig.getPlainValue("minZ"));
-        }
-        if (prototype != null && prototypes.contains(prototype.getName())) {
-            generatePrototypeData(prototype, point);
-        } else if (regionConfig.containsKey("prototype")) {
-            generatePrototypeData(Prototype.getByName(regionConfig.getPlainValue("prototype")), point);
-        }
-        if (prototype != null) {
-            skin = regionData.getPlainValueOrDefault("skin", prototype.getDefaultSkin());
-            if (!prototype.getSkinMap().containsKey(skin)) {
-                skin = prototype.getDefaultSkin();
-            }
-        }
-        regionData.add("skin", skin);
-
-        if (!hasType(RegionType.BUILD) || !hasType(RegionType.TESTBLOCK)) {
-            flagStorage.set(Flag.TNT, TNTMode.DENY);
-        }
-    }
-
-    private void generatePrototypeData(Prototype prototype, Point point) {
-        if (prototype == null) {
-            return;
-        }
-
-        this.prototype = prototype;
-        this.skin = prototype.getDefaultSkin();
-
-        this.minPoint = point;
-        this.maxPoint = point.add(prototype.getSizeX() - 1, prototype.getSizeY() - 1, prototype.getSizeZ() - 1);
-
-        if (prototype.getTestblock() != null) {
-            this.minPointTestblock = point.add(prototype.getTestblock().getOffsetX(), prototype.getTestblock().getOffsetY(), prototype.getTestblock().getOffsetZ());
-            this.maxPointTestblock = this.minPointTestblock.add(prototype.getTestblock().getSizeX() - 1, prototype.getTestblock().getSizeY() - 1, prototype.getTestblock().getSizeZ() - 1);
-
-            this.minPointTestblockExtension = this.minPointTestblock.subtract(prototype.getTestblock().getExtensionNegativeX(), prototype.getTestblock().getExtensionNegativeY(), prototype.getTestblock().getExtensionNegativeZ());
-            this.maxPointTestblockExtension = this.maxPointTestblock.add(prototype.getTestblock().getExtensionPositiveX(), prototype.getTestblock().getExtensionPositiveY(), prototype.getTestblock().getExtensionPositiveZ());
-
-            if (prototype.getTestblock().getCopyOffsetX() != 0 || prototype.getTestblock().getCopyOffsetY() != 0 || prototype.getTestblock().getCopyOffsetZ() != 0) {
-                this.testBlockPoint = this.minPointTestblock.add(prototype.getTestblock().getCopyOffsetX(), prototype.getTestblock().getCopyOffsetY(), prototype.getTestblock().getCopyOffsetZ());
-            } else {
-                this.testBlockPoint = this.minPointTestblock.add(prototype.getTestblock().getSizeX() / 2, 0, -1);
-            }
-        }
-
-        if (prototype.getBuild() != null) {
-            this.minPointBuild = point.add(prototype.getBuild().getOffsetX(), prototype.getBuild().getOffsetY(), prototype.getBuild().getOffsetZ());
-            this.maxPointBuild = this.minPointBuild.add(prototype.getBuild().getSizeX() - 1, prototype.getBuild().getSizeY() - 1, prototype.getBuild().getSizeZ() - 1);
-
-            this.minPointBuildExtension = this.minPointBuild.subtract(prototype.getBuild().getExtensionNegativeX(), prototype.getBuild().getExtensionNegativeY(), prototype.getBuild().getExtensionNegativeZ());
-            this.maxPointBuildExtension = this.maxPointBuild.add(prototype.getBuild().getExtensionPositiveX(), prototype.getBuild().getExtensionPositiveY(), prototype.getBuild().getExtensionPositiveZ());
-
-            if (!prototype.getBuild().isHasCopyPoint() && (prototype.getCopyPointOffsetX() != 0 || prototype.getCopyPointOffsetY() != 0 || prototype.getCopyPointOffsetZ() != 0)) {
-                this.copyPoint = minPoint.add(prototype.getCopyPointOffsetX(), prototype.getCopyPointOffsetY(), prototype.getCopyPointOffsetZ());
-            } else if (prototype.getBuild().getCopyOffsetX() != 0 || prototype.getBuild().getCopyOffsetY() != 0 || prototype.getBuild().getCopyOffsetZ() != 0) {
-                this.copyPoint = this.minPointBuild.add(prototype.getBuild().getCopyOffsetX(), prototype.getBuild().getCopyOffsetY(), prototype.getBuild().getCopyOffsetZ());
-            } else {
-                this.copyPoint = this.minPointBuild.add(prototype.getBuild().getSizeX() / 2, 0, prototype.getBuild().getSizeZ());
-            }
-        } else if (prototype.getCopyPointOffsetX() != 0 || prototype.getCopyPointOffsetY() != 0 || prototype.getCopyPointOffsetZ() != 0) {
-            this.copyPoint = minPoint.add(prototype.getCopyPointOffsetX(), prototype.getCopyPointOffsetY(), prototype.getCopyPointOffsetZ());
-        }
-
-        if (prototype.getFloorOffset() != 0) {
-            floorLevel = minPoint.getY() + prototype.getFloorOffset();
-        } else {
-            floorLevel = 0;
-        }
-
-        if (prototype.getWaterOffset() != 0) {
-            waterLevel = minPoint.getY() + prototype.getWaterOffset();
-        } else {
-            waterLevel = 0;
-        }
-    }
-
-    public boolean inRegion(Location location, RegionType regionType, RegionExtensionType regionExtensionType) {
-        if (!hasType(regionType)) {
-            return false;
-        }
-        switch (regionType) {
-            case BUILD:
-                Point minBPoint = regionExtensionType == RegionExtensionType.EXTENSION ? minPointBuildExtension : minPointBuild;
-                Point maxBPoint = regionExtensionType == RegionExtensionType.EXTENSION ? maxPointBuildExtension : maxPointBuild;
-                return inRegion(location, minBPoint, maxBPoint);
-            case TESTBLOCK:
-                Point minTBPoint = regionExtensionType == RegionExtensionType.EXTENSION ? minPointTestblockExtension : minPointTestblock;
-                Point maxTBPoint = regionExtensionType == RegionExtensionType.EXTENSION ? maxPointTestblockExtension : maxPointTestblock;
-                return inRegion(location, minTBPoint, maxTBPoint);
-            default:
-            case NORMAL:
-                return inRegion(location, minPoint, maxPoint);
-        }
-    }
-
-    private boolean inRegion(Location location, Point minPoint, Point maxPoint) {
-        int blockX = location.getBlockX();
-        int blockY = location.getBlockY();
-        int blockZ = location.getBlockZ();
-        return blockX >= minPoint.getX() && blockX <= maxPoint.getX() &&
-                blockY >= minPoint.getY() && blockY <= maxPoint.getY() &&
-                blockZ >= minPoint.getZ() && blockZ <= maxPoint.getZ();
-    }
-
-    public boolean hasType(RegionType regionType) {
-        if (prototype == null) {
-            return false;
-        }
-        if (regionType == null) {
-            return false;
-        }
-        switch (regionType) {
-            case BUILD:
-                return prototype.getBuild() != null;
-            case TESTBLOCK:
-                return prototype.getTestblock() != null;
-            default:
-            case NORMAL:
-                return true;
-        }
-    }
-
-    public boolean hasExtensionType(RegionType regionType) {
-        if (!hasType(regionType)) {
-            return false;
-        }
-        switch (regionType) {
-            case BUILD:
-                return prototype.getBuild().isExtensionRegistered();
-            case TESTBLOCK:
-                return prototype.getTestblock().isExtensionRegistered();
-            default:
-            case NORMAL:
-                return false;
-        }
-    }
-
-    public String getDisplayName() {
-        return prototype != null ? prototype.getSkinMap().get(skin).getName() : "";
-    }
-
-    private void setLinkedRegion(Predicate<Region> regionConsumer) {
-        if (linkedRegionName == null) {
-            return;
-        }
-        if (linkedRegion != null) {
-            if (regionConsumer.test(linkedRegion)) {
-                RegionUtils.save(linkedRegion);
-            }
-            return;
-        }
-        for (Region region : REGION_MAP.values()) {
-            if (region.name.equals(linkedRegionName)) {
-                linkedRegion = region;
-                if (regionConsumer.test(linkedRegion)) {
-                    RegionUtils.save(linkedRegion);
-                }
-                return;
-            }
-        }
-    }
-
-    public Region getLinkedRegion() {
-        if (linkedRegion == null && linkedRegionName != null) {
-            setLinkedRegion(region -> false);
-        }
-        return linkedRegion;
-    }
-
-    public boolean setPrototype(@NonNull Prototype prototype) {
-        if (!prototypes.contains(prototype.getName())) {
-            return false;
-        }
-        return _setPrototype(prototype);
-    }
-
-    boolean _setPrototype(@NonNull Prototype prototype) {
-        generatePrototypeData(prototype, minPoint);
-        RegionUtils.save(this);
-        return true;
-    }
-
-    public boolean setSkin(@NonNull String skinName) {
-        if (!prototype.getSkinMap().containsKey(skinName)) {
-            return false;
-        }
-        this.skin = skinName;
-        setLinkedRegion(region -> {
-            region.skin = skinName;
-            return true;
-        });
-        regionData.add("skin", skin);
-        return true;
-    }
-
-    public void set(Flag flagType, Flag.Value<?> value) {
-        if (flagStorage.set(flagType, value)) {
-            RegionUtils.save(this);
-        }
-        setLinkedRegion(region -> region.flagStorage.set(flagType, value));
-    }
-
-    public void set(Tag tag) {
-        if (flagStorage.set(tag)) {
-            RegionUtils.save(this);
-        }
-        setLinkedRegion(region -> region.flagStorage.set(tag));
-    }
-
-    public void remove(Tag tag) {
-        if (flagStorage.remove(tag)) {
-            RegionUtils.save(this);
-        }
-    }
-
-    public Flag.Value<?> get(Flag flagType) {
-        return flagStorage.get(flagType);
-    }
-
-    public boolean get(Tag tagType) {
-        return flagStorage.is(tagType);
-    }
-
-    public <T extends Enum<T> & Flag.Value<T>> T getPlain(Flag flagType) {
-        return (T) flagStorage.get(flagType).getValue();
-    }
-
-    public <T extends Enum<T> & Flag.Value<T>> T getPlain(Flag flagType, Class<T> type) {
-        return (T) flagStorage.get(flagType).getValue();
-    }
-
-    public Point getMinPoint(RegionType regionType, RegionExtensionType regionExtensionType) {
-        switch (regionType) {
-            case TESTBLOCK:
-                return (regionExtensionType == null || regionExtensionType == RegionExtensionType.NORMAL) ? minPointTestblock : minPointTestblockExtension;
-            case BUILD:
-                return (regionExtensionType == null || regionExtensionType == RegionExtensionType.NORMAL) ? minPointBuild : minPointBuildExtension;
-            default:
-            case NORMAL:
-                return minPoint;
-        }
-    }
-
-    public Point getMaxPoint(RegionType regionType, RegionExtensionType regionExtensionType) {
-        switch (regionType) {
-            case TESTBLOCK:
-                return (regionExtensionType == null || regionExtensionType == RegionExtensionType.NORMAL) ? maxPointTestblock : maxPointTestblockExtension;
-            case BUILD:
-                return (regionExtensionType == null || regionExtensionType == RegionExtensionType.NORMAL) ? maxPointBuild : maxPointBuildExtension;
-            default:
-            case NORMAL:
-                return maxPoint;
-        }
-    }
-
-    boolean hasReset(RegionType regionType) {
-        if (!hasType(regionType)) {
-            return false;
-        }
-        switch (regionType) {
-            case TESTBLOCK:
-                return prototype.getSkinMap().get(skin).getTestblockSchematicFile() != null;
-            case BUILD:
-                return prototype.getSkinMap().get(skin).getBuildSchematicFile() != null;
-            default:
-            case NORMAL:
-                return prototype.getSkinMap().get(skin).getSchematicFile() != null;
-        }
-    }
-
-    public File getResetFile(RegionType regionType) {
-        if (!hasReset(regionType)) {
-            return null;
-        }
-        switch (regionType) {
-            case TESTBLOCK:
-                return prototype.getSkinMap().get(skin).getTestblockSchematicFile();
-            case BUILD:
-                return prototype.getSkinMap().get(skin).getBuildSchematicFile();
-            default:
-            case NORMAL:
-                return prototype.getSkinMap().get(skin).getSchematicFile();
-        }
-    }
-
-    public void reset(PasteBuilder pasteBuilder, RegionType regionType, RegionExtensionType regionExtensionType) {
-        if (!hasReset(regionType)) {
-            return;
-        }
-        if (regionExtensionType == RegionExtensionType.EXTENSION && !hasExtensionType(regionType)) {
-            regionExtensionType = RegionExtensionType.NORMAL;
-        }
-
-        pasteBuilder.reset(regionExtensionType == RegionExtensionType.EXTENSION)
-                .minPoint(getMinPoint(regionType, regionExtensionType))
-                .maxPoint(getMaxPoint(regionType, regionExtensionType))
-                .waterLevel(waterLevel);
-        if (pasteBuilder.getClipboardProvider().is(PasteBuilder.SchematicProvider.class)) {
-            SchematicType schematicType = pasteBuilder.getClipboardProvider().as(PasteBuilder.SchematicProvider.class).getSchematic().getSchemtype();
-            pasteBuilder.rotate(schematicType.fightType() || schematicType.check());
-        }
-
-        switch (regionType) {
-            case BUILD:
-                pasteBuilder.pastePoint(minPointBuild.add(prototype.getBuild().getSizeX() / 2, 0, prototype.getBuild().getSizeZ() / 2));
-                break;
-            case TESTBLOCK:
-                Point pastePoint = minPointTestblock.add(prototype.getTestblock().getSizeX() / 2, 0, prototype.getTestblock().getSizeZ() / 2);
-                if (pasteBuilder.getClipboardProvider().is(PasteBuilder.SchematicProvider.class)) {
-                    SchematicType schematicType = pasteBuilder.getClipboardProvider().as(PasteBuilder.SchematicProvider.class).getSchematic().getSchemtype();
-                    if (schematicType.getKuerzel().equalsIgnoreCase("wg")) {
-                        pastePoint = pastePoint.add(0, 0, 1);
-                    }
-                    if (schematicType.getKuerzel().equalsIgnoreCase("ws")) {
-                        pastePoint = pastePoint.add(-1, 0, 1);
-                    }
-                    if (schematicType.getKuerzel().equalsIgnoreCase("as")) {
-                        pastePoint = pastePoint.add(-1, 0, 1);
-                    }
-                }
-                pasteBuilder.pastePoint(pastePoint);
-                break;
-            default:
-            case NORMAL:
-                pasteBuilder.pastePoint(minPoint.add(prototype.getSizeX() / 2, 0, prototype.getSizeZ() / 2));
-                break;
-        }
-
-        initSessions();
-        undoSessions.push(pasteBuilder.run());
-    }
-
-    public void remember(EditSession editSession) {
-        initSessions();
-        undoSessions.push(editSession);
-    }
-
-    public boolean isGlobal() {
-        return this == GlobalRegion.getInstance();
-    }
-
-    private void initSessions() {
-        if (undoSessions == null) {
-            undoSessions = new SizedStack<>(20);
-            redoSessions = new SizedStack<>(20);
-        }
-    }
-
-    public boolean undo() {
-        initSessions();
-        EditSession session = undoSessions.pop();
-        if (session == null)
-            return false;
-
-        try (EditSession e = WorldEdit.getInstance().getEditSessionFactory().getEditSession(new BukkitWorld(Bukkit.getWorlds().get(0)), -1)) {
-            session.undo(e);
-            redoSessions.push(e);
-        }
-        return true;
-    }
-
-    public boolean redo() {
-        initSessions();
-        EditSession session = redoSessions.pop();
-        if (session == null)
-            return false;
-
-        try (EditSession e = WorldEdit.getInstance().getEditSessionFactory().getEditSession(new BukkitWorld(Bukkit.getWorlds().get(0)), -1)) {
-            session.redo(e);
-            undoSessions.push(e);
-        }
-        return true;
-    }
-
-    public boolean backup() {
-        final File definedBackupFolder = new File(new File(backupFolder, prototype.getName()), name);
-        //noinspection ResultOfMethodCallIgnored
-        definedBackupFolder.mkdirs();
-
-        File[] currentBackups = definedBackupFolder.listFiles();
-        if (currentBackups != null && currentBackups.length >= 20) {
-            List<File> files = new ArrayList<>(Arrays.asList(currentBackups));
-            files.sort(Comparator.comparingLong(File::lastModified));
-            while (files.size() >= 20) files.remove(0).delete();
-        }
-
-        final File backupFile = new File(definedBackupFolder, LocalDateTime.now().format(formatter) + ".schem");
-        return FlatteningWrapper.impl.backup(minPoint, maxPoint, backupFile);
-    }
-
-    public static boolean copy(Point minPoint, Point maxPoint, File file) {
-        return FlatteningWrapper.impl.backup(minPoint, maxPoint, file);
-    }
-
-    public List<String> listBackup() {
-        final File definedBackupFolder = new File(new File(backupFolder, prototype.getName()), name);
-        //noinspection ResultOfMethodCallIgnored
-        definedBackupFolder.mkdirs();
-
-        File[] currentBackups = definedBackupFolder.listFiles();
-        List<File> files = new ArrayList<>(Arrays.asList(currentBackups));
-        files.sort(Comparator.comparingLong(File::lastModified));
-        return files.stream().map(File::getName).collect(Collectors.toList());
-    }
-
-    public File getBackupFile(String backupName) {
-        final File definedBackupFolder = new File(new File(backupFolder, prototype.getName()), name);
-        //noinspection ResultOfMethodCallIgnored
-        definedBackupFolder.mkdirs();
-        File[] files = definedBackupFolder.listFiles((dir, name) -> name.equals(backupName + ".schem"));
-        if (files == null || files.length == 0) return null;
-        return files[0];
-    }
-
-    public void forEachChunk(ObjIntConsumer<Integer> executor) {
-        for (int x = (int) Math.floor(minPoint.getX() / 16.0); x <= (int) Math.ceil(maxPoint.getX() / 16.0); x++) {
-            for (int z = (int) Math.floor(minPoint.getZ() / 16.0); z <= (int) Math.ceil(maxPoint.getZ() / 16.0); z++) {
-                executor.accept(x, z);
-            }
-        }
-    }
-
-    public boolean buildChunkOutside(int chunkX, int chunkY) {
-        if (!hasType(RegionType.BUILD)) {
-            return Math.floor(minPoint.getX() / 16.0) > chunkX || chunkX >= Math.ceil(maxPoint.getX() / 16.0) ||
-                    Math.floor(minPoint.getZ() / 16.0) > chunkY || chunkY >= Math.ceil(maxPoint.getZ() / 16.0);
-        }
-        if (!hasExtensionType(RegionType.BUILD)) {
-            return Math.floor(minPointBuild.getX() / 16.0) > chunkX || chunkX >= Math.ceil(maxPointBuild.getX() / 16.0) ||
-                    Math.floor(minPointBuild.getZ() / 16.0) > chunkY || chunkY >= Math.ceil(maxPointBuild.getZ() / 16.0);
-        }
-        return Math.floor(minPointBuildExtension.getX() / 16.0) > chunkX || chunkX >= Math.ceil(maxPointBuildExtension.getX() / 16.0) ||
-                Math.floor(minPointBuildExtension.getZ() / 16.0) > chunkY || chunkY >= Math.ceil(maxPointBuildExtension.getZ() / 16.0);
-    }
-
-    public File gameModeConfig() {
-        File baseFile = new File(BauSystem.getInstance().getDataFolder().getParentFile(), "FightSystem");
-        for (int version = Core.getVersion(); version >= 15; version--) {
-            File specific = new File(baseFile, prototype.getDisplayName() + version + ".yml");
-            if (specific.exists()) return specific;
-        }
-        return null;
-    }
-}
\ No newline at end of file
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionold/loader/Updater.java.txt b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionold/loader/Updater.java.txt
deleted file mode 100644
index 5e33350a..00000000
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionold/loader/Updater.java.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * This file is a part of the SteamWar software.
- *
- * Copyright (C) 2021  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.loader;
-
-import de.steamwar.bausystem.BauSystem;
-import org.bukkit.Bukkit;
-
-import java.io.File;
-import java.util.logging.Level;
-
-public class Updater {
-
-    private long lastUpdate;
-
-    public Updater(File file, Runnable updaterCode) {
-        this.lastUpdate = file.lastModified();
-        Bukkit.getScheduler().runTaskTimer(BauSystem.getInstance(), () -> {
-            if (file.lastModified() > lastUpdate + 10) {
-                try {
-                    updaterCode.run();
-                    Bukkit.getLogger().log(Level.INFO, "Update complete of " + file.getAbsolutePath());
-                } catch (Exception e) {
-                    Bukkit.getLogger().log(Level.INFO, "Error while loading file " + file.getAbsolutePath() + " for config: " + e.getMessage(), e);
-                }
-                lastUpdate = file.lastModified();
-            }
-        }, 20, 20);
-    }
-
-}

From bbd2bcae35a1bedc214ad9ff58fbd3c02293c1fa Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sun, 3 Aug 2025 13:06:07 +0200
Subject: [PATCH 069/214] Fix BackupCommand Fix FixedRegion

---
 .../steamwar/bausystem/features/backup/BackupCommand.java   | 4 ++--
 .../src/de/steamwar/bausystem/region/fixed/FixedRegion.java | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/backup/BackupCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/backup/BackupCommand.java
index 393549b7..6c7708c9 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/backup/BackupCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/backup/BackupCommand.java
@@ -120,12 +120,12 @@ public class BackupCommand extends SWCommand {
         return new TypeMapper<RegionBackups.Backup>() {
             @Override
             public RegionBackups.Backup map(CommandSender commandSender, String[] previousArguments, String s) {
-                return Region.getRegion(((Player) commandSender).getLocation()).getBackups().get(s.replace('_', ' '));
+                return Region.getRegion(((Player) commandSender).getLocation()).getBackups().get(s);
             }
 
             @Override
             public Collection<String> tabCompletes(CommandSender sender, PreviousArguments previousArguments, String s) {
-                return listBackup((Player) sender).stream().map(RegionBackups.Backup::getName).map(name -> name.replace(' ', '_')).collect(Collectors.toList());
+                return listBackup((Player) sender).stream().map(RegionBackups.Backup::getName).collect(Collectors.toList());
             }
         };
     }
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java
index ed109105..7d58262c 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java
@@ -100,10 +100,10 @@ public class FixedRegion implements Region {
         @Nullable
         @Override
         public Backup get(String name) {
-            final File definedBackupFolder = new File(new File(backupFolder, prototype.getName()), name);
+            final File definedBackupFolder = new File(new File(backupFolder, prototype.getName()), FixedRegion.this.name);
             //noinspection ResultOfMethodCallIgnored
             definedBackupFolder.mkdirs();
-            File[] files = definedBackupFolder.listFiles((dir, s) -> s.equals(name + ".schem"));
+            File[] files = definedBackupFolder.listFiles((dir, s) -> s.equals(name.replace('_', ' ') + ".schem"));
             if (files == null || files.length == 0) return null;
             return new BackupImpl(files[0]);
         }
@@ -114,7 +114,7 @@ public class FixedRegion implements Region {
         private final File file;
 
         public BackupImpl(File file) {
-            super(RegionBackups.BackupType.AUTOMATIC, file.getName(), flagStorage);
+            super(RegionBackups.BackupType.AUTOMATIC, file.getName().replace(' ', '_'), flagStorage);
             this.file = file;
         }
 

From 50780ad9bd1f2a23a5d65dae5a0eab217d882efe Mon Sep 17 00:00:00 2001
From: Chaoscaot <chaos@chaoscaot.de>
Date: Sun, 3 Aug 2025 16:39:25 +0200
Subject: [PATCH 070/214] Add chunk reset logic for Minecraft 1.21 in
 `CraftbukkitWrapper21` to support advanced chunk management.

---
 .../utils/CraftbukkitWrapper21.java           | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/FightSystem/FightSystem_21/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper21.java b/FightSystem/FightSystem_21/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper21.java
index 68f35171..312dce88 100644
--- a/FightSystem/FightSystem_21/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper21.java
+++ b/FightSystem/FightSystem_21/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper21.java
@@ -20,9 +20,17 @@
 package de.steamwar.fightsystem.utils;
 
 import de.steamwar.fightsystem.Config;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.chunk.LevelChunk;
+import net.minecraft.world.level.chunk.LevelChunkSection;
 import org.bukkit.GameRule;
+import org.bukkit.World;
+import org.bukkit.craftbukkit.CraftWorld;
 import org.bukkit.entity.Entity;
 
+import java.util.HashSet;
+import java.util.Set;
+
 public class CraftbukkitWrapper21 extends CraftbukkitWrapper18 {
 
     @Override
@@ -34,4 +42,20 @@ public class CraftbukkitWrapper21 extends CraftbukkitWrapper18 {
     public void setupGamerule() {
         Config.world.setGameRule(GameRule.LOCATOR_BAR, false);
     }
+
+    private LevelChunk getChunk(World world, int x, int z) {
+        return ((CraftWorld) world).getHandle().getChunk(x, z);
+    }
+
+    @Override
+    public void resetChunk(World world, World backup, int x, int z) {
+        LevelChunk worldChunk = getChunk(world, x, z);
+        LevelChunk backupChunk = getChunk(backup, x, z);
+        LevelChunkSection[] sections = worldChunk.getSections();
+        System.arraycopy(backupChunk.getSections(), 0, sections, 0, sections.length);
+        Set<BlockPos> blocks = new HashSet<>(worldChunk.blockEntities.keySet());
+        blocks.stream().filter(key -> !backupChunk.blockEntities.containsKey(key)).forEach(worldChunk::removeBlockEntity);
+        worldChunk.heightmaps.clear();
+        worldChunk.heightmaps.putAll(backupChunk.heightmaps);
+    }
 }

From 285882be7021034d50cb4c61f177bbabdfd988be Mon Sep 17 00:00:00 2001
From: Chaoscaot <chaos@chaoscaot.de>
Date: Sun, 3 Aug 2025 16:42:05 +0200
Subject: [PATCH 071/214] Add chunk reset logic for Minecraft 1.21 in
 `CraftbukkitWrapper21` to support advanced chunk management.

---
 .../SpigotCore_Main/src/de/steamwar/techhider/TechHider.java     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/TechHider.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/TechHider.java
index b231e97f..021d2fe4 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/TechHider.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/TechHider.java
@@ -79,7 +79,6 @@ public class TechHider {
         techhiders.put(blockChangePacket, this::blockChangeHider);
         techhiders.put(tileEntityDataPacket, this::tileEntityDataHider);
         techhiders.put(multiBlockChangePacket, ProtocolWrapper.impl.multiBlockChangeGenerator(this));
-        System.out.println(ChunkHider.impl.mapChunkPacket().getName());
         techhiders.put(ChunkHider.impl.mapChunkPacket(), ChunkHider.impl.chunkHiderGenerator(this));
 
         if(Core.getVersion() > 12 && Core.getVersion() < 19) {

From 464d7c85bdd3c0b03ad7cd685723a75335577128 Mon Sep 17 00:00:00 2001
From: Chaoscaot <chaos@chaoscaot.de>
Date: Sun, 3 Aug 2025 22:10:15 +0200
Subject: [PATCH 072/214] Update version handling for Minecraft 1.21.5: Adjust
 `TypeUtils` and `ServerStarter` to support `PAPER_21`.

---
 VelocityCore/src/de/steamwar/command/TypeUtils.java          | 4 +++-
 VelocityCore/src/de/steamwar/velocitycore/ServerStarter.java | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/VelocityCore/src/de/steamwar/command/TypeUtils.java b/VelocityCore/src/de/steamwar/command/TypeUtils.java
index a273cda2..db22ec99 100644
--- a/VelocityCore/src/de/steamwar/command/TypeUtils.java
+++ b/VelocityCore/src/de/steamwar/command/TypeUtils.java
@@ -46,7 +46,9 @@ public class TypeUtils {
                 Player player = sender.getPlayer();
                 if (player != null && s.isEmpty()) {
                     ProtocolVersion version = player.getProtocolVersion();
-                    if (version.greaterThan(ProtocolVersion.MINECRAFT_1_19_4)) {
+                    if (version.greaterThan(ProtocolVersion.MINECRAFT_1_20_5)) {
+                        return ServerVersion.PAPER_21;
+                    } else if (version.greaterThan(ProtocolVersion.MINECRAFT_1_19_4)) {
                         return ServerVersion.PAPER_20;
                     } else if (version.greaterThan(ProtocolVersion.MINECRAFT_1_15_2)) {
                         return ServerVersion.PAPER_19;
diff --git a/VelocityCore/src/de/steamwar/velocitycore/ServerStarter.java b/VelocityCore/src/de/steamwar/velocitycore/ServerStarter.java
index 058771e7..db199b97 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/ServerStarter.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/ServerStarter.java
@@ -61,7 +61,7 @@ public class ServerStarter {
     private String worldDir = null;
 
     private Node node = null;
-    private ServerVersion version = ServerVersion.PAPER_20;
+    private ServerVersion version = ServerVersion.PAPER_21;
     private Portrange portrange = BAU_PORTS;
     private Function<Integer, String> serverNameProvider = port -> node.getName() + port;
     private BooleanSupplier startCondition = () -> true;

From b695a7e089823f56007a9b4c8b5f323562210928 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Tue, 5 Aug 2025 20:59:43 +0200
Subject: [PATCH 073/214] Update stuff from peer review

---
 .../bausystem/features/tracer/TraceRepository.java        | 2 +-
 .../region/{RegionConfig.java => GameModeConfig.java}     | 7 +++++--
 .../src/de/steamwar/bausystem/region/Region.java          | 2 +-
 .../src/de/steamwar/bausystem/region/RegionSystem.java    | 7 -------
 .../de/steamwar/bausystem/region/flags/ChangedMode.java   | 5 ++++-
 .../src/de/steamwar/bausystem/region/flags/ColorMode.java | 5 ++++-
 .../src/de/steamwar/bausystem/region/flags/FireMode.java  | 5 ++++-
 .../de/steamwar/bausystem/region/flags/FreezeMode.java    | 5 ++++-
 .../src/de/steamwar/bausystem/region/flags/ItemMode.java  | 5 ++++-
 .../de/steamwar/bausystem/region/flags/NoGravityMode.java | 5 ++++-
 .../de/steamwar/bausystem/region/flags/ProtectMode.java   | 5 ++++-
 .../src/de/steamwar/bausystem/region/flags/TNTMode.java   | 5 ++++-
 .../de/steamwar/bausystem/region/flags/TestblockMode.java | 5 ++++-
 .../de/steamwar/bausystem/region/FixedRegionSystem.java   | 5 -----
 .../bausystem/region/fixed/FixedGlobalRegion.java         | 4 ++--
 .../de/steamwar/bausystem/region/fixed/FixedRegion.java   | 8 ++++----
 16 files changed, 49 insertions(+), 31 deletions(-)
 rename BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/{RegionConfig.java => GameModeConfig.java} (97%)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceRepository.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceRepository.java
index 0765d92b..209dee9a 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceRepository.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceRepository.java
@@ -18,7 +18,7 @@ public class TraceRepository {
     /**
      * Increment this when changing serialisation format
      */
-    public static final int SERIALISATION_VERSION = 2;
+    public static final int SERIALISATION_VERSION = 3;
     public static final int WRITE_TICK_DATA = 0b00000001;
     public static final int EXPLOSION = 0b00000010;
     public static final int IN_WATER = 0b00000100;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionConfig.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/GameModeConfig.java
similarity index 97%
rename from BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionConfig.java
rename to BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/GameModeConfig.java
index 71e347c6..e0197661 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionConfig.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/GameModeConfig.java
@@ -33,17 +33,20 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 @Getter
-public class RegionConfig {
+public class GameModeConfig {
 
     private final boolean loaded;
 
+    /**
+     * See gamemode config Times key
+     */
     private Times Times = new Times();
     private Schematic Schematic = new Schematic();
     private Arena Arena = new Arena();
     private Server Server = new Server();
     private Techhider Techhider = new Techhider();
 
-    public RegionConfig(File file) {
+    public GameModeConfig(File file) {
         if (file == null || !file.exists()) {
             loaded = false;
             return;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
index 609364a1..d00cb4e1 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
@@ -64,7 +64,7 @@ public interface Region {
     Area getTestblockArea();
 
     @NonNull
-    RegionConfig getGameModeConfig();
+    GameModeConfig getGameModeConfig();
 
     @NonNull
     RegionHistory getHistory();
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionSystem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionSystem.java
index bc37f66f..5d967f1a 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionSystem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionSystem.java
@@ -74,8 +74,6 @@ public interface RegionSystem {
     @NonNull
     Stream<Region> getRegions();
 
-    boolean isModular();
-
     private static RegionSystem init() {
         try {
             return (RegionSystem) Class.forName("de.steamwar.bausystem.region.FixedRegionSystem").getConstructor().newInstance();
@@ -116,11 +114,6 @@ public interface RegionSystem {
                 public Stream<Region> getRegions() {
                     throw new UnsupportedOperationException();
                 }
-
-                @Override
-                public boolean isModular() {
-                    throw new UnsupportedOperationException();
-                }
             };
         }
     }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ChangedMode.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ChangedMode.java
index ee7e7399..07b054b7 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ChangedMode.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ChangedMode.java
@@ -22,6 +22,9 @@ package de.steamwar.bausystem.region.flags;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
+/**
+ * ChangedMode defines that a Region has changed or not
+ */
 @Getter
 @AllArgsConstructor
 public enum ChangedMode implements Flag.Value<ChangedMode> {
@@ -36,7 +39,7 @@ public enum ChangedMode implements Flag.Value<ChangedMode> {
 	@Override
 	public ChangedMode[] getValues() {
 		if (ChangedMode.values == null) {
-			ChangedMode.values = ChangedMode.values(); //NOSONAR
+			ChangedMode.values = ChangedMode.values();
 		}
 		return ChangedMode.values;
 	}
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ColorMode.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ColorMode.java
index 1f7db755..60d8abfa 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ColorMode.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ColorMode.java
@@ -22,6 +22,9 @@ package de.steamwar.bausystem.region.flags;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
+/**
+ * ColorMode defines the colors a Region can have
+ */
 @Getter
 @AllArgsConstructor
 public enum ColorMode implements Flag.Value<ColorMode> {
@@ -49,7 +52,7 @@ public enum ColorMode implements Flag.Value<ColorMode> {
     @Override
     public ColorMode[] getValues() {
         if (ColorMode.values == null) {
-            ColorMode.values = ColorMode.values(); //NOSONAR
+            ColorMode.values = ColorMode.values();
         }
         return ColorMode.values;
     }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/FireMode.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/FireMode.java
index 48deb0b7..1c48b649 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/FireMode.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/FireMode.java
@@ -22,6 +22,9 @@ package de.steamwar.bausystem.region.flags;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
+/**
+ * FireMode defines if fire should be enabled or disabled in a Region
+ */
 @Getter
 @AllArgsConstructor
 public enum FireMode implements Flag.Value<FireMode> {
@@ -35,7 +38,7 @@ public enum FireMode implements Flag.Value<FireMode> {
 	@Override
 	public FireMode[] getValues() {
 		if (FireMode.values == null) {
-			FireMode.values = FireMode.values(); //NOSONAR
+			FireMode.values = FireMode.values();
 		}
 		return FireMode.values;
 	}
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/FreezeMode.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/FreezeMode.java
index 4f80ca57..ad3f0d09 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/FreezeMode.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/FreezeMode.java
@@ -23,6 +23,9 @@ package de.steamwar.bausystem.region.flags;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
+/**
+ * FreezeMode defines if freeze should be enabled or disabled in a Region
+ */
 @Getter
 @AllArgsConstructor
 public enum FreezeMode implements Flag.Value<FreezeMode> {
@@ -36,7 +39,7 @@ public enum FreezeMode implements Flag.Value<FreezeMode> {
 	@Override
 	public FreezeMode[] getValues() {
 		if (FreezeMode.values == null) {
-			FreezeMode.values = FreezeMode.values(); //NOSONAR
+			FreezeMode.values = FreezeMode.values();
 		}
 		return FreezeMode.values;
 	}
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ItemMode.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ItemMode.java
index a846a53c..60235e4f 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ItemMode.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ItemMode.java
@@ -22,6 +22,9 @@ package de.steamwar.bausystem.region.flags;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
+/**
+ * ItemMode defines if items should be droppable or deleted in a Region
+ */
 @Getter
 @AllArgsConstructor
 public enum ItemMode implements Flag.Value<ItemMode> {
@@ -35,7 +38,7 @@ public enum ItemMode implements Flag.Value<ItemMode> {
     @Override
     public ItemMode[] getValues() {
         if (ItemMode.values == null) {
-            ItemMode.values = ItemMode.values(); //NOSONAR
+            ItemMode.values = ItemMode.values();
         }
         return ItemMode.values;
     }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/NoGravityMode.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/NoGravityMode.java
index 921d36ea..98bd0b5f 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/NoGravityMode.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/NoGravityMode.java
@@ -22,6 +22,9 @@ package de.steamwar.bausystem.region.flags;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
+/**
+ * NoGravityMode defines if entities and items should have gravity or not in a Region
+ */
 @Getter
 @AllArgsConstructor
 public enum NoGravityMode implements Flag.Value<NoGravityMode> {
@@ -35,7 +38,7 @@ public enum NoGravityMode implements Flag.Value<NoGravityMode> {
     @Override
     public NoGravityMode[] getValues() {
         if (NoGravityMode.values == null) {
-            NoGravityMode.values = NoGravityMode.values(); //NOSONAR
+            NoGravityMode.values = NoGravityMode.values();
         }
         return NoGravityMode.values;
     }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ProtectMode.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ProtectMode.java
index be4f6132..7805d49b 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ProtectMode.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ProtectMode.java
@@ -22,6 +22,9 @@ package de.steamwar.bausystem.region.flags;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
+/**
+ * ProtectMode defines if the floor should be protected inside a Region
+ */
 @Getter
 @AllArgsConstructor
 public enum ProtectMode implements Flag.Value<ProtectMode> {
@@ -35,7 +38,7 @@ public enum ProtectMode implements Flag.Value<ProtectMode> {
     @Override
     public ProtectMode[] getValues() {
         if (ProtectMode.values == null) {
-            ProtectMode.values = ProtectMode.values(); //NOSONAR
+            ProtectMode.values = ProtectMode.values();
         }
         return ProtectMode.values;
     }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/TNTMode.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/TNTMode.java
index fe343707..8c7d61f5 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/TNTMode.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/TNTMode.java
@@ -22,6 +22,9 @@ package de.steamwar.bausystem.region.flags;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
+/**
+ * TNTMode defines what TNT Explosions should destroy in a Region
+ */
 @Getter
 @AllArgsConstructor
 public enum TNTMode implements Flag.Value<TNTMode> {
@@ -36,7 +39,7 @@ public enum TNTMode implements Flag.Value<TNTMode> {
 	@Override
 	public TNTMode[] getValues() {
 		if (TNTMode.values == null) {
-			TNTMode.values = TNTMode.values(); //NOSONAR
+			TNTMode.values = TNTMode.values();
 		}
 		return TNTMode.values;
 	}
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/TestblockMode.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/TestblockMode.java
index ba1b8f61..e89ab19f 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/TestblockMode.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/TestblockMode.java
@@ -22,6 +22,9 @@ package de.steamwar.bausystem.region.flags;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
+/**
+ * TestblockMode defines where the Testblock should be inside a Region
+ */
 @Getter
 @AllArgsConstructor
 public enum TestblockMode implements Flag.Value<TestblockMode> {
@@ -37,7 +40,7 @@ public enum TestblockMode implements Flag.Value<TestblockMode> {
 	@Override
 	public TestblockMode[] getValues() {
 		if (TestblockMode.values == null) {
-			TestblockMode.values = TestblockMode.values(); //NOSONAR
+			TestblockMode.values = TestblockMode.values();
 		}
 		return TestblockMode.values;
 	}
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedRegionSystem.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedRegionSystem.java
index 8a817870..df41ac6f 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedRegionSystem.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedRegionSystem.java
@@ -79,9 +79,4 @@ public class FixedRegionSystem implements RegionSystem {
     public Stream<Region> getRegions() {
         return REGION_MAP.values().stream();
     }
-
-    @Override
-    public boolean isModular() {
-        return false;
-    }
 }
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalRegion.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalRegion.java
index 8edc97db..39e8ca1f 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalRegion.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalRegion.java
@@ -90,7 +90,7 @@ public final class FixedGlobalRegion implements Region {
         }
     };
 
-    private static final RegionConfig GLOBAL_CONFIG = new RegionConfig(null);
+    private static final GameModeConfig GLOBAL_CONFIG = new GameModeConfig(null);
 
     private FixedGlobalRegion() {
     }
@@ -126,7 +126,7 @@ public final class FixedGlobalRegion implements Region {
     }
 
     @Override
-    public @NonNull RegionConfig getGameModeConfig() {
+    public @NonNull GameModeConfig getGameModeConfig() {
         return GLOBAL_CONFIG;
     }
 
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java
index 7d58262c..ab6ae1cb 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java
@@ -56,7 +56,7 @@ public class FixedRegion implements Region {
     private final Area testblock;
     private final int floorLevel;
     private final int waterLevel;
-    private final RegionConfig regionConfig;
+    private final GameModeConfig gameModeConfig;
     private final RegionHistory regionHistory = new RegionHistory.Impl(20);
 
     private final RegionBackups regionBackups = new RegionBackups() {
@@ -336,7 +336,7 @@ public class FixedRegion implements Region {
                 break;
             }
         }
-        this.regionConfig = new RegionConfig(found);
+        this.gameModeConfig = new GameModeConfig(found);
     }
 
     @Override
@@ -370,8 +370,8 @@ public class FixedRegion implements Region {
     }
 
     @Override
-    public @NonNull RegionConfig getGameModeConfig() {
-        return regionConfig;
+    public @NonNull GameModeConfig getGameModeConfig() {
+        return gameModeConfig;
     }
 
     @Override

From b74b73b871eb381134304dc807d87dc0020cecad Mon Sep 17 00:00:00 2001
From: Chaoscaot <max@chaoscaot.de>
Date: Tue, 5 Aug 2025 21:12:35 +0200
Subject: [PATCH 074/214] 
 BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/techhider/TechHiderCommand.java
 aktualisiert

---
 .../steamwar/bausystem/features/techhider/TechHiderCommand.java  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/techhider/TechHiderCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/techhider/TechHiderCommand.java
index 0c1d8af5..38725cf0 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/techhider/TechHiderCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/techhider/TechHiderCommand.java
@@ -34,7 +34,6 @@ import de.steamwar.linkage.LinkedInstance;
 import de.steamwar.techhider.TechHider;
 import net.md_5.bungee.api.ChatMessageType;
 import org.bukkit.Bukkit;
-import org.bukkit.Chunk;
 import org.bukkit.Material;
 import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.file.FileConfiguration;

From 3b43ad3587b8e7e5926eef12367823e8022f10c6 Mon Sep 17 00:00:00 2001
From: Chaoscaot <chaos@chaoscaot.de>
Date: Sat, 9 Aug 2025 00:11:44 +0200
Subject: [PATCH 075/214] Downgrade `api-version` in `plugin.yml` to 1.13 for
 broader compatibility.

---
 FightSystem/FightSystem_Core/src/plugin.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FightSystem/FightSystem_Core/src/plugin.yml b/FightSystem/FightSystem_Core/src/plugin.yml
index 09702025..6925bf69 100644
--- a/FightSystem/FightSystem_Core/src/plugin.yml
+++ b/FightSystem/FightSystem_Core/src/plugin.yml
@@ -8,7 +8,7 @@ softdepend:
   - SpigotCore
 depend:
   - WorldEdit
-api-version: "1.21.6"
+api-version: "1.13"
 
 commands:
   ak:

From ba843633d7a8fa4b4f67c66b37c742b4f05722b5 Mon Sep 17 00:00:00 2001
From: Chaoscaot <chaos@chaoscaot.de>
Date: Sat, 9 Aug 2025 00:12:52 +0200
Subject: [PATCH 076/214] Downgrade `api-version` in `plugin.yml` to 1.13 for
 broader compatibility.

---
 SpigotCore/SpigotCore_Main/src/plugin.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SpigotCore/SpigotCore_Main/src/plugin.yml b/SpigotCore/SpigotCore_Main/src/plugin.yml
index cd807cd2..a29249d2 100644
--- a/SpigotCore/SpigotCore_Main/src/plugin.yml
+++ b/SpigotCore/SpigotCore_Main/src/plugin.yml
@@ -1,7 +1,7 @@
 name: SpigotCore
 version: "2.0"
 author: Lixfel
-api-version: "1.21"
+api-version: "1.13"
 load: STARTUP
 softdepend:
   - WorldEdit

From ba2297ca9a267c9264730851c93af364d81175a6 Mon Sep 17 00:00:00 2001
From: Chaoscaot <chaos@chaoscaot.de>
Date: Sat, 9 Aug 2025 11:18:15 +0200
Subject: [PATCH 077/214] Add new plugin message channels for extended
 compatibility and feature integration

---
 .../de/steamwar/velocitycore/listeners/PluginMessage.java   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/VelocityCore/src/de/steamwar/velocitycore/listeners/PluginMessage.java b/VelocityCore/src/de/steamwar/velocitycore/listeners/PluginMessage.java
index 2293b59a..429394f7 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/listeners/PluginMessage.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/listeners/PluginMessage.java
@@ -330,6 +330,9 @@ public class PluginMessage extends BasicListener {
                 "cpm_net:get_skin", "cpm_net:hello", "cpm_net:plugin", "cpm_net:rec_evt", "cpm_net:rec_sfy",
                 "cpm_net:set_scl", "cpm_net:set_skin", "cpm_net:srv_anim",
 
+                //https://github.com/Fuzss/forgeconfigapiport
+                "forgeconfigapiport:config_file",
+
                 //https://github.com/FrozenBlock/FrozenLib (General purpose library)
                 "frozenlib:config_sync_packet", "frozenlib:cooldown_change_packet", "frozenlib:cooldown_change_packet",
                 "frozenlib:fading_distance_sound_packet", "frozenlib:flyby_sound_packet", "frozenlib:wind_sync_packet",
@@ -371,6 +374,7 @@ public class PluginMessage extends BasicListener {
                 "flashback:instantly_lerp",
                 "flashback:remote_experience",
                 "flashback:clear_particles",
+                "flashback:set_border_lerp_start_time",
                 "flashback:remote_select_hotbar_slot", // https://github.com/Moulberry/Flashback/tree/master/src/main/java/com/moulberry/flashback/packet
                 "flashback:clear_entities" // https://github.com/Moulberry/Flashback
         ))
@@ -390,7 +394,7 @@ public class PluginMessage extends BasicListener {
                 "axiom:response_chunk_data", "axiom:register_world_properties", "axiom:set_world_property",
                 "axiom:ack_world_properties", "axiom:restrictions", "axiom:marker_data", "axiom:marker_nbt_response",
                 "axiom:custom_blocks", "axiom:editor_warning", "axiom:blueprint_manifest", "axiom:response_blueprint",
-                "axiom:annotation_update"
+                "axiom:annotation_update", "axiom:redo_handshake", "axiom:register_custom_items"
         );
         registerBiDirPassthrough("axiom:handle_big_payload", "axiom:set_editor_views");
         for(String channel : Arrays.asList(

From ef91313c29690d431cfa63d38d8ece1330a5bc21 Mon Sep 17 00:00:00 2001
From: Chaoscaot <chaos@chaoscaot.de>
Date: Sat, 9 Aug 2025 11:24:52 +0200
Subject: [PATCH 078/214] Adjust `gameStateChangeReason` field offset for
 updated packet structure in Minecraft 1.21.

---
 .../src/de/steamwar/bausystem/utils/NMSWrapper21.java           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BauSystem/BauSystem_21/src/de/steamwar/bausystem/utils/NMSWrapper21.java b/BauSystem/BauSystem_21/src/de/steamwar/bausystem/utils/NMSWrapper21.java
index 816b9bd7..977650f7 100644
--- a/BauSystem/BauSystem_21/src/de/steamwar/bausystem/utils/NMSWrapper21.java
+++ b/BauSystem/BauSystem_21/src/de/steamwar/bausystem/utils/NMSWrapper21.java
@@ -66,7 +66,7 @@ public class NMSWrapper21 implements NMSWrapper {
         player.updateInventory();
     }
 
-    private static final Reflection.Field<ClientboundGameEventPacket.Type> gameStateChangeReason = Reflection.getField(NoClipCommand.gameStateChange, ClientboundGameEventPacket.Type.class, 12);
+    private static final Reflection.Field<ClientboundGameEventPacket.Type> gameStateChangeReason = Reflection.getField(NoClipCommand.gameStateChange, ClientboundGameEventPacket.Type.class, 14);
 
     @Override
     public void setGameStateChangeReason(Object packet) {

From 5a7349b5a6c55c0802a447ef518a37d0be11e3ab Mon Sep 17 00:00:00 2001
From: Chaoscaot <chaos@chaoscaot.de>
Date: Sat, 9 Aug 2025 11:29:58 +0200
Subject: [PATCH 079/214] Refactor `NMSWrapper21` game mode handling: remove
 unused import and adjust `setInternalGameMode` to use direct field
 modification.

---
 .../src/de/steamwar/bausystem/utils/NMSWrapper21.java         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/BauSystem/BauSystem_21/src/de/steamwar/bausystem/utils/NMSWrapper21.java b/BauSystem/BauSystem_21/src/de/steamwar/bausystem/utils/NMSWrapper21.java
index 977650f7..88a08002 100644
--- a/BauSystem/BauSystem_21/src/de/steamwar/bausystem/utils/NMSWrapper21.java
+++ b/BauSystem/BauSystem_21/src/de/steamwar/bausystem/utils/NMSWrapper21.java
@@ -35,7 +35,6 @@ import org.bukkit.Material;
 import org.bukkit.craftbukkit.entity.CraftPlayer;
 import org.bukkit.craftbukkit.inventory.CraftItemStack;
 import org.bukkit.entity.Player;
-import org.bukkit.event.player.PlayerGameModeChangeEvent;
 import org.bukkit.inventory.ItemStack;
 
 import java.util.List;
@@ -44,10 +43,11 @@ import java.util.Optional;
 public class NMSWrapper21 implements NMSWrapper {
 
     private static final Reflection.Field<ServerPlayerGameMode> playerInteractManager = Reflection.getField(ServerPlayer.class, null, ServerPlayerGameMode.class);
+    private static final Reflection.Field<GameType> playerGameMode = Reflection.getField(ServerPlayerGameMode.class, GameType.class, 0);
 
     @Override
     public void setInternalGameMode(Player player, GameMode gameMode) {
-        playerInteractManager.get(((CraftPlayer) player).getHandle()).changeGameModeForPlayer(GameType.byId(gameMode.getValue()), PlayerGameModeChangeEvent.Cause.UNKNOWN, null);
+        playerGameMode.set(playerInteractManager.get(((CraftPlayer) player).getHandle()), GameType.byId(gameMode.getValue()));
     }
 
     @Override

From bfbb017c8facc04c9101688a718251f833dcd13f Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Fri, 5 Sep 2025 07:48:28 +0200
Subject: [PATCH 080/214] Remove lockreplay ModifyPart

---
 .../commands/schematiccommand/parts/ModifyPart.java       | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/ModifyPart.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/ModifyPart.java
index bc1e89c6..ab699d28 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/ModifyPart.java
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/ModifyPart.java
@@ -26,8 +26,8 @@ import de.steamwar.schematicsystem.CheckSchemType;
 import de.steamwar.schematicsystem.SafeSchematicNode;
 import de.steamwar.schematicsystem.SchematicSystem;
 import de.steamwar.schematicsystem.autocheck.AutoChecker;
-import de.steamwar.schematicsystem.commands.schematiccommand.SchematicCommandUtils;
 import de.steamwar.schematicsystem.commands.schematiccommand.SchematicCommand;
+import de.steamwar.schematicsystem.commands.schematiccommand.SchematicCommandUtils;
 import de.steamwar.sql.*;
 import net.md_5.bungee.api.ChatColor;
 import net.md_5.bungee.api.chat.ClickEvent;
@@ -174,12 +174,6 @@ public class ModifyPart extends SWCommand {
         }
     }
 
-    @Register("lockreplay")
-    public void lockreplay(Player player, @Validator("isOwnerSchematicValidator") SchematicNode node) {
-        node.setAllowReplay(false);
-        SchematicSystem.MESSAGE.send("COMMAND_LOCKREPLAY", player, node.getName());
-    }
-
     @Register("replacecolor")
     public void replacecolor(Player player, @Validator("isOwnerSchematicValidator") SchematicNode node) {
         boolean state = !node.replaceColor();

From d4eabfe9b21526c512b219f9212498d4e5e8cefb Mon Sep 17 00:00:00 2001
From: YoyoNow <yoyonow@noreply.localhost>
Date: Tue, 16 Sep 2025 08:54:29 +0200
Subject: [PATCH 081/214] Make optional parameter on 'delete' not optional

---
 .../src/de/steamwar/velocitycore/commands/BauCommand.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/BauCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/BauCommand.java
index 710bb1be..9b24434d 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/BauCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/BauCommand.java
@@ -211,7 +211,7 @@ public class BauCommand extends SWCommand {
 
     @Register("resetall")
     @Register("delete")
-    public void delete(PlayerChatter sender, @OptionalValue(value = "", onlyUINIG = true) ServerVersion version) {
+    public void delete(PlayerChatter sender, ServerVersion version) {
         SWInventory inventory = new SWInventory(sender, 9, new Message("BAU_DELETE_GUI_NAME"));
         inventory.addItem(0, new SWItem(new Message("BAU_DELETE_GUI_DELETE"), 10), click -> {
             String world = version.getWorldFolder(ServerStarter.WORLDS_BASE_PATH) + sender.user().getId();

From 43a582edd8b3129e070f9e223a68fcfbb6799be0 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sat, 27 Sep 2025 16:42:22 +0200
Subject: [PATCH 082/214] Hotfix EventRelation

---
 CommonCore/SQL/src/de/steamwar/sql/EventRelation.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CommonCore/SQL/src/de/steamwar/sql/EventRelation.java b/CommonCore/SQL/src/de/steamwar/sql/EventRelation.java
index 7d142805..3d601449 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/EventRelation.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/EventRelation.java
@@ -162,8 +162,8 @@ public class EventRelation {
                     fight.getStartTime(),
                     fight.getSpielmodus(),
                     fight.getMap(),
-                    team.get(),
                     fight.getTeamBlue(),
+                    team.get(),
                     fight.getSpectatePort()
             );
         } else {
@@ -171,8 +171,8 @@ public class EventRelation {
                     fight.getStartTime(),
                     fight.getSpielmodus(),
                     fight.getMap(),
-                    fight.getTeamRed(),
                     team.get(),
+                    fight.getTeamRed(),
                     fight.getSpectatePort()
             );
         }

From 4322547106b03071ffb88764a3ab1a80305fd371 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sat, 27 Sep 2025 17:07:22 +0200
Subject: [PATCH 083/214] Hotfix EventRelation

---
 CommonCore/SQL/src/de/steamwar/sql/EventRelation.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CommonCore/SQL/src/de/steamwar/sql/EventRelation.java b/CommonCore/SQL/src/de/steamwar/sql/EventRelation.java
index 3d601449..a4a93687 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/EventRelation.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/EventRelation.java
@@ -181,8 +181,8 @@ public class EventRelation {
     }
 
     public static enum FightTeam {
-        RED,
-        BLUE
+        BLUE,
+        RED
     }
 
     public static enum FromType {

From 56d34f0311ee1b1dbee497b5d0ff4fc318e9c3ec Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sat, 27 Sep 2025 19:50:30 +0200
Subject: [PATCH 084/214] Fix EventChannel

---
 .../steamwar/velocitycore/discord/channels/EventChannel.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/VelocityCore/src/de/steamwar/velocitycore/discord/channels/EventChannel.java b/VelocityCore/src/de/steamwar/velocitycore/discord/channels/EventChannel.java
index 051b3883..5caf0446 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/discord/channels/EventChannel.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/discord/channels/EventChannel.java
@@ -33,6 +33,7 @@ import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder;
 import java.awt.*;
 import java.sql.Timestamp;
 import java.time.Instant;
+import java.time.LocalDate;
 import java.time.temporal.ChronoUnit;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -98,6 +99,10 @@ public class EventChannel {
             Team teamBlue = Team.get(eventFight.getTeamBlue());
             Team teamRed = Team.get(eventFight.getTeamRed());
 
+            if (eventFight.getStartTime().toLocalDateTime().getDayOfYear() != LocalDate.now().getDayOfYear()) {
+                return;
+            }
+
             StringBuilder st = new StringBuilder();
             st.append("Fightbeginn: <t:").append(eventFight.getStartTime().getTime() / 1000).append(":R>");
             if(now.isAfter(eventFight.getStartTime().toInstant().plus(35, ChronoUnit.MINUTES))) {

From 21d628b33861432933b5517f7841c33d79a2d8cc Mon Sep 17 00:00:00 2001
From: Chaoscaot <chaos@chaoscaot.de>
Date: Sun, 28 Sep 2025 10:28:24 +0200
Subject: [PATCH 085/214] Refactor `EventRelation`: Fix query logic for
 `byEvent`, adjust insert fields, and update `setFrom` parameter handling.
 Update `ResponseRelation` to align with updated `EventRelation` structure.

---
 .../SQL/src/de/steamwar/sql/EventRelation.java       | 12 ++++++------
 WebsiteBackend/src/de/steamwar/routes/Events.kt      |  6 ++++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/CommonCore/SQL/src/de/steamwar/sql/EventRelation.java b/CommonCore/SQL/src/de/steamwar/sql/EventRelation.java
index a4a93687..539908de 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/EventRelation.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/EventRelation.java
@@ -43,14 +43,14 @@ public class EventRelation {
 
     private static final SelectStatement<EventRelation> get = new SelectStatement<>(table, "SELECT * FROM EventRelation WHERE FromType = ? AND FromId = ?");
     private static final SelectStatement<EventRelation> byId = new SelectStatement<>(table, "SELECT * FROM EventRelation WHERE id = ?");
-    private static final SelectStatement<EventRelation> byEvent = new SelectStatement<>(table, "SELECT ER.* FROM EventRelation ER JOIN EventFight EF ON EF.id = ER.fightId WHERE EF.EventID = ?");
-    private static final Statement insert = table.insertAll(true);
+    private static final SelectStatement<EventRelation> byEvent = new SelectStatement<>(table, "SELECT ER.* FROM EventRelation ER JOIN EventFight EF ON EF.fightId = ER.fightId WHERE EF.EventID = ?");
+    private static final Statement insert = table.insertFields(true, "fightId", "fightTeam", "fromType", "fromId", "fromPlace");
     private static final Statement update = table.update(Table.PRIMARY, "fromType", "fromId", "fromPlace");
     private static final Statement updateTeam = table.update(Table.PRIMARY, "fightTeam");
     private static final Statement delete = table.delete(Table.PRIMARY);
 
     public static List<EventRelation> get(Event event) {
-        return byId.listSelect(event.getEventID());
+        return byEvent.listSelect(event.getEventID());
     }
 
     public static EventRelation get(int id) {
@@ -125,10 +125,10 @@ public class EventRelation {
         setFrom(group.getId(), place, FromType.GROUP);
     }
 
-    private void setFrom(int id, int place, FromType type) {
-        update.update(id, type, id, place);
+    private void setFrom(int fightId, int place, FromType type) {
+        update.update(type, fightId, place, id);
         this.fromType = type;
-        this.fromId = id;
+        this.fromId = fightId;
         this.fromPlace = place;
     }
 
diff --git a/WebsiteBackend/src/de/steamwar/routes/Events.kt b/WebsiteBackend/src/de/steamwar/routes/Events.kt
index 8dbb3993..34e337ce 100644
--- a/WebsiteBackend/src/de/steamwar/routes/Events.kt
+++ b/WebsiteBackend/src/de/steamwar/routes/Events.kt
@@ -63,7 +63,8 @@ data class ResponseGroups(
 @Serializable
 data class ResponseRelation(
     val id: Int,
-    val fight: ResponseEventFight,
+    val fight: Int,
+    val team: EventRelation.FightTeam,
     val type: FromType,
     val fromFight: ResponseEventFight? = null,
     val fromGroup: ResponseGroups? = null,
@@ -71,7 +72,8 @@ data class ResponseRelation(
 ) {
     constructor(relation: EventRelation) : this(
         relation.id,
-        ResponseEventFight(relation.fight),
+        relation.fightId,
+        relation.fightTeam,
         relation.fromType,
         relation.fromFight.map { ResponseEventFight(it) }.orElse(null),
         relation.fromGroup.map { ResponseGroups(it) }.orElse(null),

From 06a7d9c7fc819b90dfeed1d462a7f553cb54c6ad Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sun, 28 Sep 2025 10:42:05 +0200
Subject: [PATCH 086/214] Add update of all coming fights if a fight is stopped

---
 VelocityCore/src/de/steamwar/velocitycore/EventStarter.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/VelocityCore/src/de/steamwar/velocitycore/EventStarter.java b/VelocityCore/src/de/steamwar/velocitycore/EventStarter.java
index 0b21cef1..2a5f85f7 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/EventStarter.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/EventStarter.java
@@ -55,7 +55,9 @@ public class EventStarter {
     }
 
     private void run() {
-        eventServer.entrySet().removeIf(entry -> Subserver.getSubserver(entry.getValue().getServer()) == null);
+        if (eventServer.entrySet().removeIf(entry -> Subserver.getSubserver(entry.getValue().getServer()) == null)) {
+            EventFight.loadAllComingFights();
+        }
         Queue<EventFight> fights = EventFight.getFights();
 
         EventFight next;

From 1231fa5c47500b8b5c33eae3c6ea6682e73eb7c0 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sun, 28 Sep 2025 13:09:07 +0200
Subject: [PATCH 087/214] Add StreamingCommand for streaming mode

---
 .../steamwar/messages/BungeeCore.properties   |  5 ++
 .../messages/BungeeCore_de.properties         |  4 ++
 .../src/de/steamwar/messages/Chatter.java     |  5 +-
 .../commands/StreamingCommand.java            | 57 +++++++++++++++++++
 .../velocitycore/commands/TeamCommand.java    | 14 ++++-
 .../commands/TeamchatCommand.java             |  2 +-
 .../velocitycore/commands/WhoisCommand.java   |  1 +
 7 files changed, 85 insertions(+), 3 deletions(-)
 create mode 100644 VelocityCore/src/de/steamwar/velocitycore/commands/StreamingCommand.java

diff --git a/VelocityCore/src/de/steamwar/messages/BungeeCore.properties b/VelocityCore/src/de/steamwar/messages/BungeeCore.properties
index 00ddba8f..e1da5e7a 100644
--- a/VelocityCore/src/de/steamwar/messages/BungeeCore.properties
+++ b/VelocityCore/src/de/steamwar/messages/BungeeCore.properties
@@ -623,6 +623,7 @@ SERVER_WORLD_ERROR=§cCreating the world failed.
 WHOIS_USAGE=§c/whois [player/ID] [-a/-m]
 WHOIS_USERNAME=§7Username§8: §e{0}
 WHOIS_PREFIX=§7Chat-Prefix§8: {0}
+WHOIS_STREAMING=§7Streaming§8: §e{0}
 WHOIS_UUID=§7UUID§8: §e{0}
 WHOIS_UUID_HOVER=§eCopy UUID
 WHOIS_ID=§7ID§8: §e{0}
@@ -735,6 +736,10 @@ INV_PAGE_NEXT=§{0}Seite vor
 #VersionAnnouncer
 SERVER_VERSION=§7This server runs on Minecraft version §e{0}
 
+#StreamingCommand
+STREAMING_ENABLE=§7Streaming mode §aenabled§8.
+STREAMING_DISABLE=§7Streaming mode §cdisabled§8.
+
 #Discord
 DC_UNLINKED=For this action your Discord account has to be linked to your Minecraft account. To link your accounts go onto the SteamWar Discord to the `regeln-infos` Channel and click on `Minecraft Verknüpfen`.
 DC_TITLE_SCHEMINFO=Schematic Info
diff --git a/VelocityCore/src/de/steamwar/messages/BungeeCore_de.properties b/VelocityCore/src/de/steamwar/messages/BungeeCore_de.properties
index b1051f94..f5d84d2e 100644
--- a/VelocityCore/src/de/steamwar/messages/BungeeCore_de.properties
+++ b/VelocityCore/src/de/steamwar/messages/BungeeCore_de.properties
@@ -683,6 +683,10 @@ INV_PAGE_NEXT=§{0}Next page
 #VersionAnnouncer
 SERVER_VERSION=§7Dieser Server läuft auf Minecraft-Version §e{0}
 
+#StreamingCommand
+STREAMING_ENABLE=§7Streaming Modus §aaktiviert§8.
+STREAMING_DISABLE=§7Streaming Modus §cdeaktiviert§8.
+
 #Discord
 DC_UNLINKED=Für diese Aktion muss dein Minecraftaccount mit deinem Discordaccount verknüpft sein, gehe dazu auf dem SteamWar-Discord in den `regeln-infos` Channel und Klicke auf `Minecraft Verknüpfen`.
 DC_TITLE_SCHEMINFO=Schematicinfo
diff --git a/VelocityCore/src/de/steamwar/messages/Chatter.java b/VelocityCore/src/de/steamwar/messages/Chatter.java
index 5de34d0c..514e9b0a 100644
--- a/VelocityCore/src/de/steamwar/messages/Chatter.java
+++ b/VelocityCore/src/de/steamwar/messages/Chatter.java
@@ -28,6 +28,7 @@ import de.steamwar.persistent.Subserver;
 import de.steamwar.sql.SteamwarUser;
 import de.steamwar.sql.UserPerm;
 import de.steamwar.velocitycore.VelocityCore;
+import de.steamwar.velocitycore.commands.StreamingCommand;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.event.ClickEvent;
 import net.kyori.adventure.text.event.HoverEvent;
@@ -68,7 +69,9 @@ public interface Chatter {
     }
 
     static ChatterGroup serverteam() {
-        return new ChatterGroup(allStream().filter(player -> player.user().hasPerm(UserPerm.TEAM)));
+        return new ChatterGroup(allStream()
+                .filter(player -> player.user().hasPerm(UserPerm.TEAM))
+                .filter(StreamingCommand::isNotStreaming));
     }
 
     SteamwarUser user();
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/StreamingCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/StreamingCommand.java
new file mode 100644
index 00000000..1e50ecd3
--- /dev/null
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/StreamingCommand.java
@@ -0,0 +1,57 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2020  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.messages.Chatter;
+import de.steamwar.sql.SteamwarUser;
+import de.steamwar.sql.UserPerm;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public class StreamingCommand extends SWCommand {
+
+    private static final Set<Integer> streaming = new HashSet<>();
+
+    public static boolean isNotStreaming(Chatter sender) {
+        return isNotStreaming(sender.user());
+    }
+
+    public static boolean isNotStreaming(SteamwarUser user) {
+        return !streaming.contains(user.getId());
+    }
+
+    public StreamingCommand() {
+        super("streaming", UserPerm.TEAM);
+    }
+
+    @Register
+    public void toggleStreamingMode(Chatter sender) {
+        int userId = sender.user().getId();
+        if (streaming.contains(userId)) {
+            streaming.remove(userId);
+            sender.system("STREAMING_DISABLE");
+        } else {
+            streaming.add(userId);
+            sender.system("STREAMING_ENABLE");
+        }
+    }
+}
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/TeamCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/TeamCommand.java
index fa396cc0..1806a8cb 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/TeamCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/TeamCommand.java
@@ -312,7 +312,19 @@ public class TeamCommand extends SWCommand {
     private String getMemberList(List<SteamwarUser> users, boolean leaders) {
         return users.stream()
                 .filter(user -> user.isLeader() == leaders)
-                .map(user -> (VelocityCore.getProxy().getPlayer(user.getUUID()).isPresent() ? "§a" : "§e") + user.getUserName())
+                .map(user -> {
+                    StringBuilder st = new StringBuilder();
+                    if (VelocityCore.getProxy().getPlayer(user.getUUID()).isPresent()) {
+                        if (!StreamingCommand.isNotStreaming(user)) {
+                            st.append("§5● ");
+                        }
+                        st.append("§a");
+                    } else {
+                        st.append("§e");
+                    }
+                    st.append(user.getUserName());
+                    return st.toString();
+                })
                 .collect(Collectors.joining(" "));
     }
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/TeamchatCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/TeamchatCommand.java
index 6e9eb8e7..8381ba94 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/TeamchatCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/TeamchatCommand.java
@@ -40,6 +40,6 @@ public class TeamchatCommand extends SWCommand {
             return;
         }
 
-        ChatListener.sendChat(sender, new ChatterGroup(Chatter.allStream().filter(p -> p.user().getTeam() == user.getTeam())), "CHAT_TEAM", null, String.join(" ", args));
+        ChatListener.sendChat(sender, new ChatterGroup(Chatter.allStream().filter(p -> p.user().getTeam() == user.getTeam()).filter(StreamingCommand::isNotStreaming)), "CHAT_TEAM", null, String.join(" ", args));
     }
 }
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/WhoisCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/WhoisCommand.java
index babf8262..7576f75f 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/WhoisCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/WhoisCommand.java
@@ -71,6 +71,7 @@ public class WhoisCommand extends SWCommand {
         if (!sender.user().hasPerm(UserPerm.TEAM))
             return;
 
+        sender.system("WHOIS_STREAMING", !StreamingCommand.isNotStreaming(user));
         if (sender.user().hasPerm(UserPerm.MODERATION) || sender.user().hasPerm(UserPerm.PREFIX_DEVELOPER)) {
             sender.system("WHOIS_ID", user.getId());
             sender.system("WHOIS_UUID", new Message("WHOIS_UUID_HOVER"), ClickEvent.copyToClipboard(user.getUUID().toString()), user.getUUID().toString());

From 4b1680967a5bfd0c45db151e614d5dfdae1b8dfc Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sun, 28 Sep 2025 14:02:38 +0200
Subject: [PATCH 088/214] Fixup VelocityCore

---
 VelocityCore/src/de/steamwar/velocitycore/VelocityCore.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/VelocityCore/src/de/steamwar/velocitycore/VelocityCore.java b/VelocityCore/src/de/steamwar/velocitycore/VelocityCore.java
index b4bc9ccc..d5ae82e9 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/VelocityCore.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/VelocityCore.java
@@ -218,6 +218,7 @@ public class VelocityCore implements ReloadablePlugin {
 
             new Broadcaster();
             new CookieEvents();
+            new StreamingCommand();
         }else{
             new EventModeListener();
         }

From 797f3a31589f04f1f3e865565ebf86147fb126a3 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sun, 28 Sep 2025 15:48:32 +0200
Subject: [PATCH 089/214] Hotfix EventModeListener

---
 .../de/steamwar/velocitycore/listeners/EventModeListener.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/VelocityCore/src/de/steamwar/velocitycore/listeners/EventModeListener.java b/VelocityCore/src/de/steamwar/velocitycore/listeners/EventModeListener.java
index cdc76b1e..7777408e 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/listeners/EventModeListener.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/listeners/EventModeListener.java
@@ -95,6 +95,9 @@ public class EventModeListener extends BasicListener {
         }
 
         SteamwarUser user = SteamwarUser.get(player.getUniqueId());
+        Event event = Event.get();
+        if (event != null && Referee.get(event.getEventID()).contains(user.getId()))
+            return;
 
         List<EventFight> activeFights = EventFight.getActiveFights();
 

From 3d3c70845ee42283f16c67d6c62f4aac85a7c789 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sun, 28 Sep 2025 16:19:37 +0200
Subject: [PATCH 090/214] Hotfix EventModeListener

---
 .../de/steamwar/velocitycore/listeners/EventModeListener.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/VelocityCore/src/de/steamwar/velocitycore/listeners/EventModeListener.java b/VelocityCore/src/de/steamwar/velocitycore/listeners/EventModeListener.java
index 7777408e..d5f188c2 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/listeners/EventModeListener.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/listeners/EventModeListener.java
@@ -103,6 +103,7 @@ public class EventModeListener extends BasicListener {
 
         if (activeFights.stream()
                 .noneMatch(fight -> fight.getTeamRed() == user.getTeam() || fight.getTeamBlue() == user.getTeam())) {
+            player.storeCookie(EVENT_TO_SPECTATE_KEY, "TRUE".getBytes());
             player.transferToHost(new InetSocketAddress("steamwar.de", 25565));
         }
     }

From 19344b9f4855e5471abc84b97f668f95d75c47ca Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sun, 28 Sep 2025 16:32:45 +0200
Subject: [PATCH 091/214] Hotfix EventFight and EventModeListener

---
 CommonCore/SQL/src/de/steamwar/sql/EventFight.java              | 2 +-
 .../de/steamwar/velocitycore/listeners/EventModeListener.java   | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/CommonCore/SQL/src/de/steamwar/sql/EventFight.java b/CommonCore/SQL/src/de/steamwar/sql/EventFight.java
index 4143c596..e26e641c 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/EventFight.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/EventFight.java
@@ -41,7 +41,7 @@ public class EventFight implements Comparable<EventFight> {
     private static final SelectStatement<EventFight> byGroupLast = new SelectStatement<EventFight>(table, "SELECT * FROM EventFight WHERE GroupID = ? ORDER BY StartTime DESC LIMIT 1");
     private static final SelectStatement<EventFight> allComing = new SelectStatement<>(table, "SELECT * FROM EventFight WHERE StartTime > now() ORDER BY StartTime ASC");
     private static final SelectStatement<EventFight> event = new SelectStatement<>(table, "SELECT * FROM EventFight WHERE EventID = ? ORDER BY StartTime ASC");
-    private static final SelectStatement<EventFight> activeFights = new SelectStatement<>(table, "SELECT * FROM EventFight WHERE Fight IS NOT NULL AND StartTime < now() AND DATEDIFF(StartTime, now()) < 0");
+    private static final SelectStatement<EventFight> activeFights = new SelectStatement<>(table, "SELECT * FROM EventFight WHERE EventID IN (SELECT EventID FROM Event WHERE Start < now() and End > now()) AND Fight IS NULL AND StartTime < now()");
     private static final Statement reschedule = table.update(Table.PRIMARY, "StartTime");
     private static final Statement setResult = table.update(Table.PRIMARY, "Ergebnis");
     private static final Statement setFight = table.update(Table.PRIMARY, "Fight");
diff --git a/VelocityCore/src/de/steamwar/velocitycore/listeners/EventModeListener.java b/VelocityCore/src/de/steamwar/velocitycore/listeners/EventModeListener.java
index d5f188c2..7777408e 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/listeners/EventModeListener.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/listeners/EventModeListener.java
@@ -103,7 +103,6 @@ public class EventModeListener extends BasicListener {
 
         if (activeFights.stream()
                 .noneMatch(fight -> fight.getTeamRed() == user.getTeam() || fight.getTeamBlue() == user.getTeam())) {
-            player.storeCookie(EVENT_TO_SPECTATE_KEY, "TRUE".getBytes());
             player.transferToHost(new InetSocketAddress("steamwar.de", 25565));
         }
     }

From 3685d662fbd981ac992407bff5ffd7e16556bbe1 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sun, 28 Sep 2025 16:47:16 +0200
Subject: [PATCH 092/214] Hotfix CookieEvents

---
 .../velocitycore/listeners/CookieEvents.java  | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/VelocityCore/src/de/steamwar/velocitycore/listeners/CookieEvents.java b/VelocityCore/src/de/steamwar/velocitycore/listeners/CookieEvents.java
index 4fb59b62..660ebc87 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/listeners/CookieEvents.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/listeners/CookieEvents.java
@@ -31,17 +31,21 @@ public class CookieEvents extends BasicListener {
 
     @Subscribe
     public void handleCookies(CookieReceiveEvent e) {
-        if (e.getOriginalKey().equals(EventModeListener.EVENT_TO_SPECTATE_KEY)) {
-            Player player = e.getPlayer();
-            SteamwarUser user = SteamwarUser.get(player.getUniqueId());
+        System.out.println(e.getOriginalKey() + " " + e.getOriginalData());
+        if (!e.getOriginalKey().namespace().equals(EventModeListener.EVENT_TO_SPECTATE_KEY.namespace()))
+            return;
+        if (!e.getOriginalKey().value().equals(EventModeListener.EVENT_TO_SPECTATE_KEY.value()))
+            return;
+        e.setResult(CookieReceiveEvent.ForwardResult.handled());
+        Player player = e.getPlayer();
+        SteamwarUser user = SteamwarUser.get(player.getUniqueId());
 
-            EventFight.getActiveFights().stream()
-                    .filter(fight -> fight.getTeamRed() == user.getTeam() || fight.getTeamBlue() == user.getTeam())
-                    .filter(fight -> fight.getSpectatePort() != null)
-                    .filter(fight -> fight.getSpectatePort() != 0)
-                    .findFirst()
-                    .flatMap(fight -> VelocityCore.getProxy().getServer(EventStarter.getSpectatePorts().get(fight.getSpectatePort())))
-                    .ifPresent(registeredServer -> player.createConnectionRequest(registeredServer).fireAndForget());
-        }
+        EventFight.getActiveFights().stream()
+                .filter(fight -> fight.getTeamRed() == user.getTeam() || fight.getTeamBlue() == user.getTeam())
+                .filter(fight -> fight.getSpectatePort() != null)
+                .filter(fight -> fight.getSpectatePort() != 0)
+                .findFirst()
+                .flatMap(fight -> VelocityCore.getProxy().getServer(EventStarter.getSpectatePorts().get(fight.getSpectatePort())))
+                .ifPresent(registeredServer -> player.createConnectionRequest(registeredServer).fireAndForget());
     }
 }

From 524ce0c57941137467e95775b5e81ae18dd03b9d Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Mon, 29 Sep 2025 08:06:15 +0200
Subject: [PATCH 093/214] Update VacationCommand add 'Abwesenheitsnotiz'
 Closes: #144

---
 .../velocitycore/discord/VacationCommand.java      | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/VelocityCore/src/de/steamwar/velocitycore/discord/VacationCommand.java b/VelocityCore/src/de/steamwar/velocitycore/discord/VacationCommand.java
index 5be79f9e..754187df 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/discord/VacationCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/discord/VacationCommand.java
@@ -27,6 +27,7 @@ import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEve
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
 import net.dv8tion.jda.api.interactions.InteractionHook;
 import net.dv8tion.jda.api.interactions.commands.Command;
+import net.dv8tion.jda.api.interactions.commands.OptionMapping;
 import net.dv8tion.jda.api.interactions.commands.OptionType;
 import net.dv8tion.jda.api.interactions.commands.build.OptionData;
 import net.dv8tion.jda.api.interactions.commands.build.SubcommandData;
@@ -52,7 +53,8 @@ public class VacationCommand extends ListenerAdapter {
     public VacationCommand() {
         COMMAND.addSubcommands(new SubcommandData("create", "Erstelle deinen Urlaub")
                 .addOptions(new OptionData(OptionType.STRING, "from", "Datum (TT.MM.JJJJ)", true),
-                        new OptionData(OptionType.STRING, "to", "Datum (TT.MM.JJJJ)", true)));
+                        new OptionData(OptionType.STRING, "to", "Datum (TT.MM.JJJJ)", true),
+                        new OptionData(OptionType.STRING, "reason", "Abwesenheitsnotiz", false)));
         COMMAND.addSubcommands(new SubcommandData("delete", "Lösche deinen Urlaub")
                 .addOptions(new OptionData(OptionType.STRING, "vacation", "Dein Urlaub", true, true)));
     }
@@ -78,6 +80,7 @@ public class VacationCommand extends ListenerAdapter {
         InteractionHook interactionHook = event.deferReply(true).complete();
         String from = event.getOption("from").getAsString();
         String to = event.getOption("to").getAsString();
+        String reason = event.getOption("reason", "", OptionMapping::getAsString);
 
         LocalDateTime fromDate;
         try {
@@ -115,12 +118,19 @@ public class VacationCommand extends ListenerAdapter {
             return;
         }
 
+        if (reason.length() > 1000) {
+            interactionHook.editOriginal("Die Abwesenheitsnotiz darf nicht länger als 1000 Zeichen sein!").queue();
+            return;
+        }
+
         guild.createScheduledEvent(
                         "Urlaub " + event.getMember().getEffectiveName(),
                         event.getMember().getId(),
                         OffsetDateTime.of(fromDate, ZoneId.of("Europe/Berlin").getRules().getOffset(fromDate)),
                         OffsetDateTime.of(toDate, ZoneId.of("Europe/Berlin").getRules().getOffset(toDate))
-                ).onSuccess(scheduledEvent -> {
+                )
+                .setDescription(reason)
+                .onSuccess(scheduledEvent -> {
                     interactionHook.editOriginal("Urlaub erstellt!").queue();
                 })
                 .onErrorMap(throwable -> {

From 5fe62d67d9ffa2e32e70415d09e64ead698148d2 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Mon, 29 Sep 2025 08:17:49 +0200
Subject: [PATCH 094/214] Improve StreamingCommand

---
 .../src/de/steamwar/persistent/Storage.java        |  7 +++----
 .../src/de/steamwar/messages/BungeeCore.properties |  1 +
 .../de/steamwar/messages/BungeeCore_de.properties  |  1 +
 .../velocitycore/commands/StreamingCommand.java    | 14 +++++---------
 .../velocitycore/commands/TeamCommand.java         |  5 +++--
 .../velocitycore/listeners/ConnectionListener.java |  6 ++++--
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/VelocityCore/Persistent/src/de/steamwar/persistent/Storage.java b/VelocityCore/Persistent/src/de/steamwar/persistent/Storage.java
index a32a577d..9128d5a5 100644
--- a/VelocityCore/Persistent/src/de/steamwar/persistent/Storage.java
+++ b/VelocityCore/Persistent/src/de/steamwar/persistent/Storage.java
@@ -25,10 +25,7 @@ import com.velocitypowered.proxy.protocol.packet.UpsertPlayerInfoPacket;
 import lombok.experimental.UtilityClass;
 
 import java.sql.Timestamp;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
 
 @UtilityClass
 public class Storage {
@@ -49,4 +46,6 @@ public class Storage {
     public static final Map<Integer, ServerInfo> teamServers = new HashMap<>(); // TeamID -> ServerInfo map
 
     public static final Map<Player, Map<UUID, UpsertPlayerInfoPacket.Entry>> directTabItems = new HashMap<>();
+
+    public static final Set<Integer> streamingPlayers = new HashSet<>(); // SteamwarUser ID
 }
diff --git a/VelocityCore/src/de/steamwar/messages/BungeeCore.properties b/VelocityCore/src/de/steamwar/messages/BungeeCore.properties
index e1da5e7a..21a4025a 100644
--- a/VelocityCore/src/de/steamwar/messages/BungeeCore.properties
+++ b/VelocityCore/src/de/steamwar/messages/BungeeCore.properties
@@ -589,6 +589,7 @@ CHECK_CHECKING=§cYou are checking a Schematic!
 JOIN_ARENA=§7Click §ehere§7 to join §e{0}
 JOIN_ARENA_HOVER=§eJoin Arena
 JOIN_FIRST=§7Please greet §e{0}§7 on the server§8!
+JOIN_STREAMING=§5Streaming Mode§7 is still active§8.§7 Keep in mind that you will not receive TeamChat nor ServerTeamChat messages§8.
 
 #EventModeListener
 EVENTMODE_KICK=§cYou are not an event participant.
diff --git a/VelocityCore/src/de/steamwar/messages/BungeeCore_de.properties b/VelocityCore/src/de/steamwar/messages/BungeeCore_de.properties
index f5d84d2e..aa2475f5 100644
--- a/VelocityCore/src/de/steamwar/messages/BungeeCore_de.properties
+++ b/VelocityCore/src/de/steamwar/messages/BungeeCore_de.properties
@@ -563,6 +563,7 @@ CHECK_CHECKING=§cDu prüfst gerade eine Schematic!
 JOIN_ARENA=§7Klicke §ehier§7, um §e{0} §7beizutreten
 JOIN_ARENA_HOVER=§eArena beitreten
 JOIN_FIRST=§7Begrüßt alle mal §e{0} §7auf dem Server§8!
+JOIN_STREAMING=§5Streaming-Modus§7 ist weiterhin aktiv§8.§7 Beachten Sie, dass Sie keine TeamChat- oder ServerTeamChat-Nachrichten erhalten§8.
 
 #EventModeListener
 EVENTMODE_KICK=§cDu bist kein Eventteilnehmer.
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/StreamingCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/StreamingCommand.java
index 1e50ecd3..edab1c5b 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/StreamingCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/StreamingCommand.java
@@ -21,22 +21,18 @@ package de.steamwar.velocitycore.commands;
 
 import de.steamwar.command.SWCommand;
 import de.steamwar.messages.Chatter;
+import de.steamwar.persistent.Storage;
 import de.steamwar.sql.SteamwarUser;
 import de.steamwar.sql.UserPerm;
 
-import java.util.HashSet;
-import java.util.Set;
-
 public class StreamingCommand extends SWCommand {
 
-    private static final Set<Integer> streaming = new HashSet<>();
-
     public static boolean isNotStreaming(Chatter sender) {
         return isNotStreaming(sender.user());
     }
 
     public static boolean isNotStreaming(SteamwarUser user) {
-        return !streaming.contains(user.getId());
+        return !Storage.streamingPlayers.contains(user.getId());
     }
 
     public StreamingCommand() {
@@ -46,11 +42,11 @@ public class StreamingCommand extends SWCommand {
     @Register
     public void toggleStreamingMode(Chatter sender) {
         int userId = sender.user().getId();
-        if (streaming.contains(userId)) {
-            streaming.remove(userId);
+        if (Storage.streamingPlayers.contains(userId)) {
+            Storage.streamingPlayers.remove(userId);
             sender.system("STREAMING_DISABLE");
         } else {
-            streaming.add(userId);
+            Storage.streamingPlayers.add(userId);
             sender.system("STREAMING_ENABLE");
         }
     }
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/TeamCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/TeamCommand.java
index 1806a8cb..f0a7be00 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/TeamCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/TeamCommand.java
@@ -316,9 +316,10 @@ public class TeamCommand extends SWCommand {
                     StringBuilder st = new StringBuilder();
                     if (VelocityCore.getProxy().getPlayer(user.getUUID()).isPresent()) {
                         if (!StreamingCommand.isNotStreaming(user)) {
-                            st.append("§5● ");
+                            st.append("§5");
+                        } else {
+                            st.append("§a");
                         }
-                        st.append("§a");
                     } else {
                         st.append("§e");
                     }
diff --git a/VelocityCore/src/de/steamwar/velocitycore/listeners/ConnectionListener.java b/VelocityCore/src/de/steamwar/velocitycore/listeners/ConnectionListener.java
index d534b29a..765d09c7 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/listeners/ConnectionListener.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/listeners/ConnectionListener.java
@@ -34,7 +34,6 @@ import de.steamwar.sql.CheckedSchematic;
 import de.steamwar.sql.SchematicType;
 import de.steamwar.sql.SteamwarUser;
 import de.steamwar.sql.UserPerm;
-import de.steamwar.velocitycore.EventStarter;
 import de.steamwar.velocitycore.commands.*;
 import de.steamwar.velocitycore.discord.DiscordBot;
 import de.steamwar.velocitycore.discord.util.DiscordRanks;
@@ -45,7 +44,6 @@ import net.kyori.adventure.text.event.ClickEvent;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.UUID;
-import java.util.function.BiConsumer;
 
 public class ConnectionListener extends BasicListener {
 
@@ -105,6 +103,10 @@ public class ConnectionListener extends BasicListener {
             newPlayers.remove(player.getUniqueId());
         }
 
+        if (!StreamingCommand.isNotStreaming(user)) {
+            chatter.system("JOIN_STREAMING");
+        }
+
         DiscordBot.withBot(bot -> DiscordRanks.update(user));
 
         if (player.getProtocolVersion().noLessThan(ProtocolVersion.MINECRAFT_1_20_5)) {

From f2073db1e8b0382527ff34969611fad0b03b573a Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Mon, 29 Sep 2025 08:33:08 +0200
Subject: [PATCH 095/214] Improve PlayerSkinHandler

---
 .../velocitycore/network/handlers/PlayerSkinHandler.java      | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/VelocityCore/src/de/steamwar/velocitycore/network/handlers/PlayerSkinHandler.java b/VelocityCore/src/de/steamwar/velocitycore/network/handlers/PlayerSkinHandler.java
index 0515212e..f33b0b9b 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/network/handlers/PlayerSkinHandler.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/network/handlers/PlayerSkinHandler.java
@@ -33,8 +33,6 @@ import de.steamwar.network.packets.common.PlayerSkinResponsePacket;
 import de.steamwar.velocitycore.VelocityCore;
 import de.steamwar.velocitycore.network.NetworkSender;
 import de.steamwar.velocitycore.network.ServerMetaInfo;
-import lombok.AllArgsConstructor;
-import lombok.Data;
 import lombok.SneakyThrows;
 
 import java.io.BufferedReader;
@@ -56,7 +54,7 @@ public class PlayerSkinHandler extends PacketHandler {
         VelocityCore.getProxy().getEventManager().register(VelocityCore.get(), this);
     }
 
-    private Map<UUID, SkinData> skins = new LinkedHashMap<>() {
+    private Map<UUID, SkinData> skins = new LinkedHashMap<>(maxCacheSize, 1, true) {
         @Override
         protected boolean removeEldestEntry(Map.Entry<UUID, SkinData> eldest) {
             return size() > maxCacheSize;

From fa6b75e2aaeef98d4f1deee7cd3f1445957dd8c0 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Mon, 29 Sep 2025 08:35:03 +0200
Subject: [PATCH 096/214] Fix RPlayer (hopefully)

---
 SpigotCore/SpigotCore_Main/src/de/steamwar/entity/RPlayer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/RPlayer.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/RPlayer.java
index 3596fc3f..a64105b7 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/RPlayer.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/RPlayer.java
@@ -87,7 +87,7 @@ public class RPlayer extends REntity {
             gameProfile.getProperties().put("textures", skinData);
             return gameProfile;
         } else {
-            return new GameProfile(actualUUID, name);
+            return new GameProfile(uuid, name);
         }
     }
 

From fa0a9a5c230a79a0ea2fc4d538382b91dbbc4dc0 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Mon, 29 Sep 2025 09:08:45 +0200
Subject: [PATCH 097/214] Fix PistonCalculator for GLAZED_TERRACOTTA Variations
 Closes: #135

---
 .../features/util/PistonCalculator.java       | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/PistonCalculator.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/PistonCalculator.java
index 5cc4b744..03ee6d5c 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/PistonCalculator.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/PistonCalculator.java
@@ -222,6 +222,29 @@ public class PistonCalculator implements Listener {
                     Block block = current.getRelative(face);
                     if (block.getType().isAir()) continue;
                     if (isImmovable(block) || block.getPistonMoveReaction() == PistonMoveReaction.BREAK) continue;
+                    if (face != direction || face == direction.getOppositeFace()) {
+                        switch (block.getType()) {
+                            case BLACK_GLAZED_TERRACOTTA:
+                            case GRAY_GLAZED_TERRACOTTA:
+                            case BLUE_GLAZED_TERRACOTTA:
+                            case BROWN_GLAZED_TERRACOTTA:
+                            case CYAN_GLAZED_TERRACOTTA:
+                            case GREEN_GLAZED_TERRACOTTA:
+                            case LIGHT_BLUE_GLAZED_TERRACOTTA:
+                            case LIGHT_GRAY_GLAZED_TERRACOTTA:
+                            case LIME_GLAZED_TERRACOTTA:
+                            case MAGENTA_GLAZED_TERRACOTTA:
+                            case ORANGE_GLAZED_TERRACOTTA:
+                            case PINK_GLAZED_TERRACOTTA:
+                            case PURPLE_GLAZED_TERRACOTTA:
+                            case RED_GLAZED_TERRACOTTA:
+                            case WHITE_GLAZED_TERRACOTTA:
+                            case YELLOW_GLAZED_TERRACOTTA:
+                                continue;
+                            default:
+                                break;
+                        }
+                    }
                     if (block.getType() != oppositeType) {
                         if (!movedBlocks.contains(block.getLocation())) toCalc.add(block);
                         calcDirection(null, origin, block, null, facing, direction, toCalc);

From ccd992f1db8ff458c58935a191129c37cbea7b5b Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Mon, 29 Sep 2025 09:23:53 +0200
Subject: [PATCH 098/214] Improve SimulatorCursor selection changing

---
 .../features/simulator/SimulatorCursor.java   | 41 +++++++++++--------
 1 file changed, 25 insertions(+), 16 deletions(-)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorCursor.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorCursor.java
index 8ffca7a9..5cfbaad6 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorCursor.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorCursor.java
@@ -19,8 +19,8 @@
 
 package de.steamwar.bausystem.features.simulator;
 
-import de.steamwar.Reflection;
 import com.comphenix.tinyprotocol.TinyProtocol;
+import de.steamwar.Reflection;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.SWUtils;
@@ -40,10 +40,13 @@ import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui;
 import de.steamwar.bausystem.utils.BauMemberUpdateEvent;
 import de.steamwar.bausystem.utils.ItemUtils;
 import de.steamwar.bausystem.utils.RayTraceUtils;
+import de.steamwar.data.CMDs;
 import de.steamwar.entity.REntity;
 import de.steamwar.entity.REntityServer;
 import de.steamwar.entity.RFallingBlockEntity;
 import de.steamwar.inventory.SWAnvilInv;
+import de.steamwar.inventory.SWInventory;
+import de.steamwar.inventory.SWItem;
 import de.steamwar.linkage.Linked;
 import de.steamwar.linkage.MinVersion;
 import lombok.AllArgsConstructor;
@@ -147,8 +150,23 @@ public class SimulatorCursor implements Listener {
             return;
         }
         if (LAST_SNEAKS.containsKey(player)) {
-            cursorType.put(player, cursorType.getOrDefault(player, CursorType.TNT).switchType());
-            calcCursor(player);
+            SWInventory swInventory = new SWInventory(player, 9, "Simulator Cursor");
+            int slot = 2;
+            CursorType currentType = cursorType.getOrDefault(player, CursorType.TNT);
+            for (CursorType type : CursorType.values()) {
+                boolean selected = type == currentType;
+                SWItem swItem = new SWItem(selected ? type.material : type.nonSelectedMaterial, "§e" + type.name)
+                        .setCustomModelData(selected ? 0 : CMDs.Simulator.NEW_PHASE)
+                        .setLore(Collections.singletonList("§eClick to select"))
+                        .setCallback(click -> {
+                            cursorType.put(player, type);
+                            calcCursor(player);
+                            player.closeInventory();
+                        });
+                swInventory.setItem(slot, swItem);
+                slot += 2;
+            }
+            swInventory.open();
         } else {
             LAST_SNEAKS.put(player, System.currentTimeMillis());
         }
@@ -331,25 +349,16 @@ public class SimulatorCursor implements Listener {
     @Getter
     @AllArgsConstructor
     public enum CursorType {
-        TNT(Material.TNT, SimulatorCursor::getPosFree, "TNT", vector -> new TNTElement(vector).add(new TNTPhase())),
-        REDSTONE_BLOCK(Material.REDSTONE_BLOCK, SimulatorCursor::getPosBlockAligned, "Redstone Block", vector -> new RedstoneElement(vector).add(new RedstonePhase())),
-        OBSERVER(Material.OBSERVER, SimulatorCursor::getPosBlockAligned, "Observer", vector -> new ObserverElement(vector).add(new ObserverPhase())),
+        TNT(Material.TNT, Material.GUNPOWDER, SimulatorCursor::getPosFree, "TNT", vector -> new TNTElement(vector).add(new TNTPhase())),
+        REDSTONE_BLOCK(Material.REDSTONE_BLOCK, Material.REDSTONE, SimulatorCursor::getPosBlockAligned, "Redstone Block", vector -> new RedstoneElement(vector).add(new RedstonePhase())),
+        OBSERVER(Material.OBSERVER, Material.QUARTZ, SimulatorCursor::getPosBlockAligned, "Observer", vector -> new ObserverElement(vector).add(new ObserverPhase())),
         ;
 
         private Material material;
+        private Material nonSelectedMaterial;
         private BiFunction<Player, RayTraceUtils.RRayTraceResult, Vector> position;
         private String name;
         private Function<Vector, SimulatorElement<?>> elementFunction;
-
-        public CursorType switchType() {
-            if (this == TNT) {
-                return REDSTONE_BLOCK;
-            }
-            if (this == REDSTONE_BLOCK) {
-                return OBSERVER;
-            }
-            return TNT;
-        }
     }
 
     @EventHandler

From 394e043db379f0c26f4ec23d66f6be4e2c86e623 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Mon, 29 Sep 2025 09:34:53 +0200
Subject: [PATCH 099/214] Hotfix FixedRegion

---
 .../src/de/steamwar/bausystem/region/fixed/FixedRegion.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java
index ab6ae1cb..4d8418ae 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java
@@ -184,7 +184,7 @@ public class FixedRegion implements Region {
                     SchematicType schematicType = pasteBuilder.getClipboardProvider().as(PasteBuilder.SchematicProvider.class).getSchematic().getSchemtype();
                     pasteBuilder.rotate(schematicType.fightType() || schematicType.check());
                 }
-                pasteBuilder.pastePoint(minPoint.add(prototype.getSizeX() / 2, 0, prototype.getSizeY() / 2));
+                pasteBuilder.pastePoint(minPoint.add(prototype.getSizeX() / 2, 0, prototype.getSizeZ() / 2));
                 regionHistory.remember(pasteBuilder.run());
             }
         };

From bfe9c7559e1d293e8433ec9831f3776feb5ffc06 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Mon, 29 Sep 2025 10:48:24 +0200
Subject: [PATCH 100/214] Improve RayVisualizerCommand

---
 .../rayvisualizer/RayVisualizerCommand.java   | 49 +++++++++++--------
 1 file changed, 29 insertions(+), 20 deletions(-)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/rayvisualizer/RayVisualizerCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/rayvisualizer/RayVisualizerCommand.java
index 134db478..908f8daa 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/rayvisualizer/RayVisualizerCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/rayvisualizer/RayVisualizerCommand.java
@@ -30,6 +30,7 @@ import de.steamwar.entity.REntityServer;
 import de.steamwar.linkage.Linked;
 import de.steamwar.linkage.MinVersion;
 import org.bukkit.*;
+import org.bukkit.block.data.BlockData;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.TNTPrimed;
 import org.bukkit.event.EventHandler;
@@ -38,15 +39,15 @@ import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.util.RayTraceResult;
 
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 
 @Linked
 @MinVersion(20)
 public class RayVisualizerCommand extends SWCommand implements Listener {
 
+    private BlockData VISIBLE = Material.LIME_CONCRETE.createBlockData();
+    private BlockData BLOCKED = Material.RED_CONCRETE.createBlockData();
+
     private class CRayData {
         private CRay[] rays = new CRay[27 * 400];
         private boolean[] used = new boolean[27 * 400];
@@ -108,28 +109,23 @@ public class RayVisualizerCommand extends SWCommand implements Listener {
 
         Bukkit.getScheduler().runTaskTimer(BauSystem.getInstance(), () -> {
             if (server.getPlayers().isEmpty()) return;
-            Map<Integer, List<TNTPrimed>> primedList = WORLD.getEntitiesByClass(TNTPrimed.class)
-                    .stream()
-                    .collect(Collectors.groupingBy(TNTPrimed::getFuseTicks));
+            List<TNTPrimed> primedList = WORLD.getEntitiesByClass(TNTPrimed.class)
+                    .stream().toList();
             rayData.reset();
             if (primedList.isEmpty()) return;
-
-            List<Integer> fuseTicks = primedList.keySet().stream().sorted().collect(Collectors.toList());
-            List<TNTPrimed> current = new ArrayList<>();
-            for (int i = 0; i < fuseTicks.size(); i++) {
-                List<TNTPrimed> tnts = primedList.get(fuseTicks.get(i));
-                calculateRays(current, tnts);
-                current.addAll(tnts);
-            }
+            calculateRays(primedList, primedList);
         }, 1, 1);
     }
 
     private void calculateRays(List<TNTPrimed> fromTNTs, List<TNTPrimed> toTNTs) {
-        for (TNTPrimed from : fromTNTs) {
-            if (!from.isInWater()) continue;
-            for (TNTPrimed to : toTNTs) {
+        for (TNTPrimed to : toTNTs) {
+            int hitting = 0;
+            int total = 0;
+            for (TNTPrimed from : fromTNTs) {
                 if (from == to) continue;
+                if (from.getFuseTicks() >= to.getFuseTicks()) continue;
                 if (to.getLocation().distanceSquared(from.getLocation()) > 25) continue;
+                if (!from.isInWater()) continue;
 
                 Location fromLoc = from.getLocation();
                 Location toLoc = to.getLocation().clone().add(-0.49, 0, -0.49);
@@ -143,16 +139,29 @@ public class RayVisualizerCommand extends SWCommand implements Listener {
                         for (int dz = 0; dz < 3; dz++) {
                             Location end = toLoc.clone().add(minX + dx * spacing, 0 + dy * spacing, minZ + dz * spacing);
                             RayTraceResult result = fromLoc.getWorld().rayTraceBlocks(fromLoc, end.clone().subtract(fromLoc).toVector(), end.distance(fromLoc), FluidCollisionMode.NEVER, true);
-                            if (result != null && result.getHitBlock() != null) {
-                                continue;
-                            }
                             CRay cRay = rayData.get(fromLoc, end);
                             if (cRay == null) continue;
                             cRay.setFrom(fromLoc);
                             cRay.setTo(end);
+                            if (result != null && result.getHitBlock() != null) {
+                                cRay.setBlock(BLOCKED);
+                            } else {
+                                cRay.setBlock(VISIBLE);
+                                hitting++;
+                            }
                         }
                     }
                 }
+                total += 27;
+            }
+
+            if (total == 0) {
+                to.setCustomNameVisible(false);
+            } else {
+                int remainder = hitting % 27;
+                int whole = hitting / 27;
+                to.setCustomNameVisible(true);
+                to.setCustomName("§e" + whole + " " + remainder + "/27");
             }
         }
     }

From f4c9ce512ea186f72b7bb67e0097596d80ed2035 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Mon, 29 Sep 2025 11:00:50 +0200
Subject: [PATCH 101/214] Improve WorldEditRendererWrapper20

---
 .../core/WorldEditRendererWrapper20.java      |  4 +-
 .../src/de/steamwar/entity/CLine.java         | 19 ++++++++-
 .../src/de/steamwar/entity/CWireframe.java    | 42 +++++++++++--------
 3 files changed, 43 insertions(+), 22 deletions(-)

diff --git a/SpigotCore/SpigotCore_20/src/de/steamwar/core/WorldEditRendererWrapper20.java b/SpigotCore/SpigotCore_20/src/de/steamwar/core/WorldEditRendererWrapper20.java
index 36ded8ef..afdcd6d9 100644
--- a/SpigotCore/SpigotCore_20/src/de/steamwar/core/WorldEditRendererWrapper20.java
+++ b/SpigotCore/SpigotCore_20/src/de/steamwar/core/WorldEditRendererWrapper20.java
@@ -87,9 +87,7 @@ public class WorldEditRendererWrapper20 implements WorldEditRendererWrapper {
             box = new CWireframe(server);
             boxPair.set(clipboard, box);
         }
-        box.setPos1(null).setPos2(null);
-        box.setPos1(pos1.toLocation(player.getWorld()));
-        box.setPos2(pos2.toLocation(player.getWorld()));
+        box.setPos1And2(pos1.toLocation(player.getWorld()), pos2.toLocation(player.getWorld()));
         box.setWidth(width);
         box.setBlock(block);
     }
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/CLine.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/CLine.java
index f8f01928..2106b04e 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/CLine.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/CLine.java
@@ -59,6 +59,14 @@ public class CLine extends CEntity {
         return this;
     }
 
+    public CLine setFromAndTo(Location from, Location to) {
+        if (Objects.equals(from, this.from) && Objects.equals(to, this.to)) return this;
+        this.from = from;
+        this.to = to;
+        tick();
+        return this;
+    }
+
     public CLine setFrom(Location from) {
         return checkAndSet(this.from, from, location -> this.from = location);
     }
@@ -99,7 +107,16 @@ public class CLine extends CEntity {
 
     @Override
     void tick() {
-        if (from == null || to == null) return;
+        if (from == null || to == null) {
+            if (startLine != null) startLine.hide(true);
+            if (middleLine != null) middleLine.hide(true);
+            if (endLine != null) endLine.hide(true);
+            return;
+        } else {
+            if (startLine != null) startLine.hide(false);
+            if (middleLine != null) middleLine.hide(false);
+            if (endLine != null) endLine.hide(false);
+        }
         if (hide) return;
         updateStart();
         updateMiddle();
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/CWireframe.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/CWireframe.java
index cf15912d..c455f7a2 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/CWireframe.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/CWireframe.java
@@ -22,11 +22,9 @@ package de.steamwar.entity;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.block.data.BlockData;
-import org.bukkit.util.Consumer;
 import org.bukkit.util.Vector;
 
 import java.util.List;
-import java.util.Objects;
 
 /**
  * Compound Box (12 CLine)
@@ -46,6 +44,13 @@ public class CWireframe extends CEntity {
         }
     }
 
+    public CWireframe setPos1And2(Location pos1, Location pos2) {
+        this.pos1 = pos1;
+        this.pos2 = pos2;
+        updateAndSpawnLines();
+        return this;
+    }
+
     public CWireframe setPos1(Location pos1) {
         this.pos1 = pos1;
         updateAndSpawnLines();
@@ -75,29 +80,30 @@ public class CWireframe extends CEntity {
     }
 
     private void updateAndSpawnLines() {
-        if (pos1 == null || pos2 == null) return;
+        List<CLine> lines = getEntitiesByType(CLine.class);
+        if (pos1 == null || pos2 == null) {
+            lines.forEach(line -> line.setFrom(null).setTo(null));
+            return;
+        }
 
         World world = pos1.getWorld();
         Vector min = Vector.getMinimum(pos1.toVector(), pos2.toVector());
         Vector max = Vector.getMaximum(pos1.toVector(), pos2.toVector())
                 .add(new Vector(1 - width, 1 - width, 1 - width));
 
-        List<CLine> lines = getEntitiesByType(CLine.class);
-        lines.forEach(line -> line.setFrom(null).setTo(null));
+        lines.get(0).setFromAndTo(new Vector(min.getX(), min.getY(), min.getZ()).toLocation(world), new Vector(max.getX() + width, min.getY(), min.getZ()).toLocation(world));
+        lines.get(1).setFromAndTo(new Vector(min.getX(), max.getY(), min.getZ()).toLocation(world), new Vector(max.getX() + width, max.getY(), min.getZ()).toLocation(world));
+        lines.get(2).setFromAndTo(new Vector(min.getX(), min.getY(), max.getZ()).toLocation(world), new Vector(max.getX() + width, min.getY(), max.getZ()).toLocation(world));
+        lines.get(3).setFromAndTo(new Vector(min.getX(), max.getY(), max.getZ()).toLocation(world), new Vector(max.getX() + width, max.getY(), max.getZ()).toLocation(world));
 
-        lines.get(0).setFrom(new Vector(min.getX(), min.getY(), min.getZ()).toLocation(world)).setTo(new Vector(max.getX() + width, min.getY(), min.getZ()).toLocation(world));
-        lines.get(1).setFrom(new Vector(min.getX(), max.getY(), min.getZ()).toLocation(world)).setTo(new Vector(max.getX() + width, max.getY(), min.getZ()).toLocation(world));
-        lines.get(2).setFrom(new Vector(min.getX(), min.getY(), max.getZ()).toLocation(world)).setTo(new Vector(max.getX() + width, min.getY(), max.getZ()).toLocation(world));
-        lines.get(3).setFrom(new Vector(min.getX(), max.getY(), max.getZ()).toLocation(world)).setTo(new Vector(max.getX() + width, max.getY(), max.getZ()).toLocation(world));
+        lines.get(4).setFromAndTo(new Vector(min.getX(), min.getY(), min.getZ()).toLocation(world), new Vector(min.getX(), max.getY() + width, min.getZ()).toLocation(world));
+        lines.get(5).setFromAndTo(new Vector(max.getX(), min.getY(), min.getZ()).toLocation(world), new Vector(max.getX(), max.getY() + width, min.getZ()).toLocation(world));
+        lines.get(6).setFromAndTo(new Vector(min.getX(), min.getY(), max.getZ()).toLocation(world), new Vector(min.getX(), max.getY() + width, max.getZ()).toLocation(world));
+        lines.get(7).setFromAndTo(new Vector(max.getX(), min.getY(), max.getZ()).toLocation(world), new Vector(max.getX(), max.getY() + width, max.getZ()).toLocation(world));
 
-        lines.get(4).setFrom(new Vector(min.getX(), min.getY(), min.getZ()).toLocation(world)).setTo(new Vector(min.getX(), max.getY() + width, min.getZ()).toLocation(world));
-        lines.get(5).setFrom(new Vector(max.getX(), min.getY(), min.getZ()).toLocation(world)).setTo(new Vector(max.getX(), max.getY() + width, min.getZ()).toLocation(world));
-        lines.get(6).setFrom(new Vector(min.getX(), min.getY(), max.getZ()).toLocation(world)).setTo(new Vector(min.getX(), max.getY() + width, max.getZ()).toLocation(world));
-        lines.get(7).setFrom(new Vector(max.getX(), min.getY(), max.getZ()).toLocation(world)).setTo(new Vector(max.getX(), max.getY() + width, max.getZ()).toLocation(world));
-
-        lines.get(8).setFrom(new Vector(min.getX(), min.getY(), min.getZ()).toLocation(world)).setTo(new Vector(min.getX(), min.getY(), max.getZ() + width).toLocation(world));
-        lines.get(9).setFrom(new Vector(max.getX(), min.getY(), min.getZ()).toLocation(world)).setTo(new Vector(max.getX(), min.getY(), max.getZ() + width).toLocation(world));
-        lines.get(10).setFrom(new Vector(min.getX(), max.getY(), min.getZ()).toLocation(world)).setTo(new Vector(min.getX(), max.getY(), max.getZ() + width).toLocation(world));
-        lines.get(11).setFrom(new Vector(max.getX(), max.getY(), min.getZ()).toLocation(world)).setTo(new Vector(max.getX(), max.getY(), max.getZ() + width).toLocation(world));
+        lines.get(8).setFromAndTo(new Vector(min.getX(), min.getY(), min.getZ()).toLocation(world), new Vector(min.getX(), min.getY(), max.getZ() + width).toLocation(world));
+        lines.get(9).setFromAndTo(new Vector(max.getX(), min.getY(), min.getZ()).toLocation(world), new Vector(max.getX(), min.getY(), max.getZ() + width).toLocation(world));
+        lines.get(10).setFromAndTo(new Vector(min.getX(), max.getY(), min.getZ()).toLocation(world), new Vector(min.getX(), max.getY(), max.getZ() + width).toLocation(world));
+        lines.get(11).setFromAndTo(new Vector(max.getX(), max.getY(), min.getZ()).toLocation(world), new Vector(max.getX(), max.getY(), max.getZ() + width).toLocation(world));
     }
 }

From 4798b160152f3b0755c1fc63e0cc9fa4b912d85e Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Mon, 29 Sep 2025 11:10:11 +0200
Subject: [PATCH 102/214] Hotfix SWItem.setCustomModelData

---
 .../SpigotCore_Main/src/de/steamwar/inventory/SWItem.java  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/SWItem.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/SWItem.java
index 7fb27810..7ca0829d 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/SWItem.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/SWItem.java
@@ -21,6 +21,7 @@ package de.steamwar.inventory;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
+import de.steamwar.core.Core;
 import de.steamwar.core.FlatteningWrapper;
 import de.steamwar.core.TrickyTrialsWrapper;
 import org.bukkit.Material;
@@ -216,8 +217,10 @@ public class SWItem {
     }
 
     public SWItem setCustomModelData(int customModelData) {
-        itemMeta.setCustomModelData(customModelData);
-        itemStack.setItemMeta(itemMeta);
+        if (Core.getVersion() > 12) {
+            itemMeta.setCustomModelData(customModelData);
+            itemStack.setItemMeta(itemMeta);
+        }
         return this;
     }
 

From d011ffa5369ed0a2a39e259787eb6b422fa9be2f Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Mon, 29 Sep 2025 11:20:32 +0200
Subject: [PATCH 103/214] Trigger rebuild

---
 steamwarci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/steamwarci.yml b/steamwarci.yml
index 5548033a..288befec 100644
--- a/steamwarci.yml
+++ b/steamwarci.yml
@@ -1,7 +1,6 @@
 build:
   - "./gradlew build --no-daemon"
 
-
 artifacts:
   "/jars/BauSystem.jar": "BauSystem/build/libs/BauSystem-all.jar"
   "/jars/BauSystem-1.12.jar": "LegacyBauSystem/build/libs/LegacyBauSystem.jar"

From daa69dc22bed730757c6c1cc4e387c28b4686810 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Mon, 29 Sep 2025 11:23:20 +0200
Subject: [PATCH 104/214] Trigger rebuild

---
 steamwarci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/steamwarci.yml b/steamwarci.yml
index 288befec..5548033a 100644
--- a/steamwarci.yml
+++ b/steamwarci.yml
@@ -1,6 +1,7 @@
 build:
   - "./gradlew build --no-daemon"
 
+
 artifacts:
   "/jars/BauSystem.jar": "BauSystem/build/libs/BauSystem-all.jar"
   "/jars/BauSystem-1.12.jar": "LegacyBauSystem/build/libs/LegacyBauSystem.jar"

From e6e475e4bbb42b6f5a599fabac4b798bdf2cadc8 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Mon, 29 Sep 2025 11:25:33 +0200
Subject: [PATCH 105/214] Trigger rebuild

---
 steamwarci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/steamwarci.yml b/steamwarci.yml
index 5548033a..288befec 100644
--- a/steamwarci.yml
+++ b/steamwarci.yml
@@ -1,7 +1,6 @@
 build:
   - "./gradlew build --no-daemon"
 
-
 artifacts:
   "/jars/BauSystem.jar": "BauSystem/build/libs/BauSystem-all.jar"
   "/jars/BauSystem-1.12.jar": "LegacyBauSystem/build/libs/LegacyBauSystem.jar"

From ed871976815c18cfb84d6e165d948edae27f8dbe Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Mon, 29 Sep 2025 11:28:02 +0200
Subject: [PATCH 106/214] Trigger rebuild

---
 steamwarci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/steamwarci.yml b/steamwarci.yml
index 288befec..5548033a 100644
--- a/steamwarci.yml
+++ b/steamwarci.yml
@@ -1,6 +1,7 @@
 build:
   - "./gradlew build --no-daemon"
 
+
 artifacts:
   "/jars/BauSystem.jar": "BauSystem/build/libs/BauSystem-all.jar"
   "/jars/BauSystem-1.12.jar": "LegacyBauSystem/build/libs/LegacyBauSystem.jar"

From e5e931d331f13e483bb7d2b1db09ea63b4cea59b Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Mon, 29 Sep 2025 12:41:39 +0200
Subject: [PATCH 107/214] Fix 'BAU_INFO_ITEM_LORE_TESTBLOCK'

---
 BauSystem/BauSystem_Main/src/BauSystem.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/BauSystem/BauSystem_Main/src/BauSystem.properties b/BauSystem/BauSystem_Main/src/BauSystem.properties
index 7ae8298b..a662545a 100644
--- a/BauSystem/BauSystem_Main/src/BauSystem.properties
+++ b/BauSystem/BauSystem_Main/src/BauSystem.properties
@@ -138,6 +138,7 @@ BAU_INFO_ITEM_LORE_COLOR=§7Color§8: §e{0}
 BAU_INFO_ITEM_LORE_PROTECT=§7Protect§8: §e{0}
 BAU_INFO_ITEM_LORE_ITEMS=§7Items§8: §e{0}
 BAU_INFO_ITEM_LORE_NO_GRAVITY = §8NoGravity§8: §e{0}
+BAU_INFO_ITEM_LORE_TESTBLOCK=§8Testblock§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}

From ad4304d7b0401a3fd93efbc87e1a447aa4caceab Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Mon, 29 Sep 2025 12:44:12 +0200
Subject: [PATCH 108/214] Fix 'BAU_INFO_ITEM_LORE_CHANGED'

---
 BauSystem/BauSystem_Main/src/BauSystem.properties    | 5 +++--
 BauSystem/BauSystem_Main/src/BauSystem_de.properties | 5 +----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/BauSystem/BauSystem_Main/src/BauSystem.properties b/BauSystem/BauSystem_Main/src/BauSystem.properties
index a662545a..34681d0d 100644
--- a/BauSystem/BauSystem_Main/src/BauSystem.properties
+++ b/BauSystem/BauSystem_Main/src/BauSystem.properties
@@ -137,8 +137,9 @@ BAU_INFO_ITEM_LORE_FIRE=§7Fire§8: §e{0}
 BAU_INFO_ITEM_LORE_COLOR=§7Color§8: §e{0}
 BAU_INFO_ITEM_LORE_PROTECT=§7Protect§8: §e{0}
 BAU_INFO_ITEM_LORE_ITEMS=§7Items§8: §e{0}
-BAU_INFO_ITEM_LORE_NO_GRAVITY = §8NoGravity§8: §e{0}
-BAU_INFO_ITEM_LORE_TESTBLOCK=§8Testblock§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_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}
diff --git a/BauSystem/BauSystem_Main/src/BauSystem_de.properties b/BauSystem/BauSystem_Main/src/BauSystem_de.properties
index 1bcce497..c5c5ca0a 100644
--- a/BauSystem/BauSystem_Main/src/BauSystem_de.properties
+++ b/BauSystem/BauSystem_Main/src/BauSystem_de.properties
@@ -119,12 +119,9 @@ BACKUP_LORE=§eKlicken zum Laden
 BAU_COMMAND_HELP_INFO=§8/§ebau info §8- §7Alias für §8/§ebauinfo
 BAU_INFO_ITEM_NAME=§eBau-Management
 ## This is used in BauInfoBauGuiItem.java
-BAU_INFO_ITEM_LORE_TNT=§7TNT§8: §e{0}
-BAU_INFO_ITEM_LORE_FREEZE=§7Freeze§8: §e{0}
-BAU_INFO_ITEM_LORE_DAMAGE=§7Damage§8: §e{0}
 BAU_INFO_ITEM_LORE_FIRE=§7Feuer§8: §e{0}
 BAU_INFO_ITEM_LORE_COLOR=§7Farbe§8: §e{0}
-BAU_INFO_ITEM_LORE_PROTECT=§7Protect§8: §e{0}
+BAU_INFO_ITEM_LORE_CHANGED=§7Verändert§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}

From 8ca1cf9b5c6679db2ebf1d9de8c6f36316ce8e9d Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Mon, 29 Sep 2025 15:26:51 +0200
Subject: [PATCH 109/214] Force rebuild

---
 steamwarci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/steamwarci.yml b/steamwarci.yml
index 5548033a..288befec 100644
--- a/steamwarci.yml
+++ b/steamwarci.yml
@@ -1,7 +1,6 @@
 build:
   - "./gradlew build --no-daemon"
 
-
 artifacts:
   "/jars/BauSystem.jar": "BauSystem/build/libs/BauSystem-all.jar"
   "/jars/BauSystem-1.12.jar": "LegacyBauSystem/build/libs/LegacyBauSystem.jar"

From 8b636a11ee494c1bbbfd94890b62536ff04ac419 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Mon, 29 Sep 2025 15:29:31 +0200
Subject: [PATCH 110/214] Force rebuild

---
 steamwarci.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/steamwarci.yml b/steamwarci.yml
index 288befec..758d179e 100644
--- a/steamwarci.yml
+++ b/steamwarci.yml
@@ -25,8 +25,6 @@ artifacts:
 
   "/jars/TowerRun.jar": "TowerRun/build/libs/TowerRun.jar"
 
-  "/jars/TutorialSystem.jar": "TutorialSystem/build/libs/TutorialSystem.jar"
-
   "/jars/PersistentVelocityCore.jar": "VelocityCore/Persistent/build/libs/Persistent.jar"
   "/jars/DependenciesVelocityCore.jar": "VelocityCore/Dependencies/build/libs/Dependencies-all.jar"
   "/jars/VelocityCore.jar": "VelocityCore/build/libs/VelocityCore-all.jar"

From 01efb9fce520a08a876ddd204f1dedec93b8dd46 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Mon, 29 Sep 2025 15:48:25 +0200
Subject: [PATCH 111/214] Hotfix TraceRepository

---
 .../bausystem/features/tracer/TraceRepository.java         | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceRepository.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceRepository.java
index 209dee9a..7e632fdc 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceRepository.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceRepository.java
@@ -31,7 +31,12 @@ public class TraceRepository {
     public static Trace readTrace(File recordsFile) {
         @Cleanup
         ObjectInputStream reader = new ObjectInputStream(new GZIPInputStream(new FileInputStream(recordsFile)));
-        UUID uuid = UUID.fromString(reader.readUTF());
+        UUID uuid;
+        try {
+            uuid = UUID.fromString(reader.readUTF());
+        } catch (IllegalArgumentException e) {
+            return null;
+        }
         Region region = RegionSystem.INSTANCE.getRegion(UUID.fromString(reader.readUTF())).orElse(null);
         if (region == null) return null;
         Date date = (Date) reader.readObject();

From 52828c8b4e057aa441bb8217570a3fb75ef1fb39 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Mon, 29 Sep 2025 15:52:13 +0200
Subject: [PATCH 112/214] Hotfix TraceRepository

---
 .../bausystem/features/tracer/TraceRepository.java       | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceRepository.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceRepository.java
index 7e632fdc..f64bb9a9 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceRepository.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceRepository.java
@@ -37,8 +37,13 @@ public class TraceRepository {
         } catch (IllegalArgumentException e) {
             return null;
         }
-        Region region = RegionSystem.INSTANCE.getRegion(UUID.fromString(reader.readUTF())).orElse(null);
-        if (region == null) return null;
+        Region region;
+        try {
+            region = RegionSystem.INSTANCE.getRegion(UUID.fromString(reader.readUTF())).orElse(null);
+            if (region == null) return null;
+        } catch (IllegalArgumentException e) {
+            return null;
+        }
         Date date = (Date) reader.readObject();
         int serialisationVersion = reader.readInt();
         if (serialisationVersion != SERIALISATION_VERSION) {

From d0d353b24ddbb7aa79b84cdcaa5a2c9ea94a7fac Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Mon, 29 Sep 2025 16:23:54 +0200
Subject: [PATCH 113/214] Fix TNTPhase

---
 .../bausystem/features/simulator/data/tnt/TNTPhase.java        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/tnt/TNTPhase.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/tnt/TNTPhase.java
index 0ac9d0e9..39fedbb5 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/tnt/TNTPhase.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/tnt/TNTPhase.java
@@ -23,6 +23,7 @@ import de.steamwar.bausystem.features.simulator.data.SimulatorPhase;
 import de.steamwar.bausystem.features.simulator.execute.SimulatorAction;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.flags.Flag;
+import de.steamwar.bausystem.region.flags.FreezeMode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -64,7 +65,7 @@ public final class TNTPhase extends SimulatorPhase {
             @Override
             public void accept(World world) {
                 Location location = position.toLocation(world);
-                if (Region.getRegion(location).getFlags().get(Flag.FREEZE).isPresent()) return;
+                if (Region.getRegion(location).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) return;
                 TNTPrimed tnt = world.spawn(location, TNTPrimed.class);
                 if (!xJump) tnt.setVelocity(tnt.getVelocity().setX(0));
                 if (!yJump) tnt.setVelocity(tnt.getVelocity().setY(0));

From 09f9a8ce327b4b93e6889797c92104ba067563a0 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Mon, 29 Sep 2025 17:33:02 +0200
Subject: [PATCH 114/214] Fix GameModeConfig

---
 .../src/de/steamwar/bausystem/region/GameModeConfig.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/GameModeConfig.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/GameModeConfig.java
index e0197661..82d59036 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/GameModeConfig.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/GameModeConfig.java
@@ -121,7 +121,7 @@ public class GameModeConfig {
         private void load(ConfigurationSection section) {
             Active = section.getBoolean("Active", false);
             ObfuscateWith = Material.getMaterial(section.getString("ObfuscateWith", "END_STONE"));
-            HiddenBlocks = section.getStringList("HiddenBlocks").stream().map(FlatteningWrapper.impl::getMaterial).filter(Objects::nonNull).collect(Collectors.toUnmodifiableSet());
+            HiddenBlocks = section.getStringList("HiddenBlocks").stream().map(String::toUpperCase).map(FlatteningWrapper.impl::getMaterial).filter(Objects::nonNull).collect(Collectors.toUnmodifiableSet());
             HiddenBlockEntities = Collections.unmodifiableSet(new HashSet<>(section.getStringList("HiddenBlockEntities")));
         }
     }

From fc002abf37be718e2f2b3a4dd8b502ee5e63f30e Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Mon, 29 Sep 2025 17:36:10 +0200
Subject: [PATCH 115/214] Fix BackupScheduler

---
 .../src/de/steamwar/bausystem/region/BackupScheduler.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/BackupScheduler.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/BackupScheduler.java
index 902d4a6c..2f42e205 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/BackupScheduler.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/BackupScheduler.java
@@ -23,7 +23,7 @@ public class BackupScheduler implements Enable {
             public void run() {
                 Iterator<Region> regionsToBackup = RegionSystem.INSTANCE.getRegions()
                         .filter(region -> region.getFlags().has(Flag.CHANGED).isReadable())
-                        .filter(region -> region.getFlags().get(Flag.CHANGED).get() == ChangedMode.HAS_CHANGE)
+                        .filter(region -> region.getFlags().get(Flag.CHANGED).getWithDefault() == ChangedMode.HAS_CHANGE)
                         .iterator();
                 if (!regionsToBackup.hasNext()) return;
                 doBackup(regionsToBackup);

From abeb2693685fd725e09bb157a7b13514a20eb0c3 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Mon, 29 Sep 2025 17:46:20 +0200
Subject: [PATCH 116/214] Fix BackupCommand

---
 .../de/steamwar/bausystem/features/backup/BackupCommand.java    | 2 +-
 .../src/de/steamwar/bausystem/region/fixed/FixedRegion.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/backup/BackupCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/backup/BackupCommand.java
index 6c7708c9..7501a6d8 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/backup/BackupCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/backup/BackupCommand.java
@@ -117,7 +117,7 @@ public class BackupCommand extends SWCommand {
 
     @Mapper(value = "backup", local = true)
     public TypeMapper<RegionBackups.Backup> backupMapper() {
-        return new TypeMapper<RegionBackups.Backup>() {
+        return new TypeMapper<>() {
             @Override
             public RegionBackups.Backup map(CommandSender commandSender, String[] previousArguments, String s) {
                 return Region.getRegion(((Player) commandSender).getLocation()).getBackups().get(s);
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java
index 4d8418ae..e551acf6 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java
@@ -114,7 +114,7 @@ public class FixedRegion implements Region {
         private final File file;
 
         public BackupImpl(File file) {
-            super(RegionBackups.BackupType.AUTOMATIC, file.getName().replace(' ', '_'), flagStorage);
+            super(RegionBackups.BackupType.AUTOMATIC, file.getName().replace(' ', '_').replace(".schem", ""), flagStorage);
             this.file = file;
         }
 

From 84b14b8c3d2b279cdab186b879d7231fc056bc65 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Thu, 2 Oct 2025 20:39:30 +0200
Subject: [PATCH 117/214] Hotfix /region testblockpoint

---
 .../src/de/steamwar/bausystem/region/fixed/FixedRegion.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java
index e551acf6..256e1c00 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java
@@ -253,12 +253,10 @@ public class FixedRegion implements Region {
             Point maxPointTestblockExtension = maxPointTestblock.add(prototype.getTestblock().getExtensionPositiveX(), prototype.getTestblock().getExtensionPositiveY(), prototype.getTestblock().getExtensionPositiveZ());
 
             Point copyPoint;
-            if (!prototype.getTestblock().isHasCopyPoint() && (prototype.getCopyPointOffsetX() != 0 || prototype.getCopyPointOffsetY() != 0 || prototype.getCopyPointOffsetZ() != 0)) {
-                copyPoint = minPoint.add(prototype.getCopyPointOffsetX(), prototype.getCopyPointOffsetY(), prototype.getCopyPointOffsetZ());
-            } else if (prototype.getTestblock().getCopyOffsetX() != 0 || prototype.getTestblock().getCopyOffsetY() != 0 || prototype.getTestblock().getCopyOffsetZ() != 0) {
+            if (prototype.getTestblock().getCopyOffsetX() != 0 || prototype.getTestblock().getCopyOffsetY() != 0 || prototype.getTestblock().getCopyOffsetZ() != 0) {
                 copyPoint = minPointTestblock.add(prototype.getTestblock().getCopyOffsetX(), prototype.getTestblock().getCopyOffsetY(), prototype.getTestblock().getCopyOffsetZ());
             } else {
-                copyPoint = minPointTestblock.add(prototype.getTestblock().getSizeX() / 2, 0, prototype.getTestblock().getSizeZ());
+                copyPoint = minPointTestblock.add(prototype.getTestblock().getSizeX() / 2, 0, -1);
             }
 
             testblock = new Area() {

From 9c5b7712cb4efdb9ab416eeb53cd90528557d21e Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Thu, 2 Oct 2025 20:41:21 +0200
Subject: [PATCH 118/214] Improve PistonCalculator

---
 .../features/util/PistonCalculator.java       | 24 ++++++++-----------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/PistonCalculator.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/PistonCalculator.java
index 03ee6d5c..b5ba6a00 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/PistonCalculator.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/PistonCalculator.java
@@ -55,13 +55,12 @@ public class PistonCalculator implements Listener {
     public void onPlayerInteract(PlayerInteractEvent event) {
         if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
         if (event.getAction() != Action.RIGHT_CLICK_BLOCK) return;
-        if (event.getItem() == null) {}
-        else if (event.getItem() != null && event.getItem().getType() == Material.SLIME_BALL) {}
-        else if (!event.getItem().getType().isBlock()) {
+        if (event.getItem() == null) {
+        } else if (event.getItem() != null && event.getItem().getType() == Material.SLIME_BALL) {
+        } else if (!event.getItem().getType().isBlock()) {
             DEBOUNCE.put(event.getPlayer(), System.currentTimeMillis());
             return;
-        }
-        else return;
+        } else return;
         if (event.getClickedBlock() == null) return;
         Block clickedBlock = event.getClickedBlock();
         Material blockType = clickedBlock.getType();
@@ -92,6 +91,7 @@ public class PistonCalculator implements Listener {
 
     @EventHandler
     public void onBlockPistonExtend(BlockPistonExtendEvent event) {
+        if (pistOrders.isEmpty()) return;
         Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
             movePistOrders(event.getDirection(), event.getBlocks());
             pistOrders.values().forEach(PistOrder::calculate);
@@ -100,6 +100,7 @@ public class PistonCalculator implements Listener {
 
     @EventHandler
     public void onBlockPistonRetract(BlockPistonRetractEvent event) {
+        if (pistOrders.isEmpty()) return;
         Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
             movePistOrders(event.getDirection(), event.getBlocks());
             pistOrders.values().forEach(PistOrder::calculate);
@@ -122,6 +123,7 @@ public class PistonCalculator implements Listener {
 
     @EventHandler
     public void onBlockPlace(BlockPlaceEvent event) {
+        if (pistOrders.isEmpty()) return;
         Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
             pistOrders.values().forEach(PistOrder::calculate);
         }, 1);
@@ -129,6 +131,7 @@ public class PistonCalculator implements Listener {
 
     @EventHandler
     public void onBlockBreak(BlockBreakEvent event) {
+        if (pistOrders.isEmpty()) return;
         if (pistOrders.containsKey(event.getBlock().getLocation())) {
             PistOrder pistOrder = pistOrders.remove(event.getBlock().getLocation());
             pistOrder.server.close();
@@ -276,7 +279,8 @@ public class PistonCalculator implements Listener {
                     immovableBlocks.add(block.getLocation());
                     return;
                 }
-                if (facing != direction && (block.equals(origin) || block.getRelative(facing.getOppositeFace()).equals(origin))) return;
+                if (facing != direction && (block.equals(origin) || block.getRelative(facing.getOppositeFace()).equals(origin)))
+                    return;
                 if (!movedBlocks.contains(block.getLocation())) toCalc.add(block);
             }
         }
@@ -372,12 +376,4 @@ public class PistonCalculator implements Listener {
                 return false;
         }
     }
-
-    private boolean isPiston(Block block) {
-        BlockData blockData = block.getBlockData();
-        if (blockData instanceof Piston) {
-            return !((Piston) blockData).isExtended();
-        }
-        return false;
-    }
 }

From ea07766460265cd168e8253cf5ac02ce8f3552bc Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Thu, 2 Oct 2025 20:55:06 +0200
Subject: [PATCH 119/214] Fix RegionCommand.genericRestoreCommand

---
 .../de/steamwar/bausystem/features/region/RegionCommand.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionCommand.java
index 54337983..8418cbba 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionCommand.java
@@ -103,7 +103,7 @@ public class RegionCommand extends SWCommand {
             PasteBuilder pasteBuilder = new PasteBuilder(new PasteBuilder.FileProvider(region.getArea().getResetFile()))
                     .ignoreAir(true)
                     .color(region.getFlags().get(Flag.COLOR).getWithDefault());
-            region.getArea().reset(pasteBuilder, true);
+            region.getArea().reset(pasteBuilder, false);
             RegionUtils.message(region, "REGION_REGION_RESTORED");
         } catch (SecurityException e) {
             BauSystem.MESSAGE.send("REGION_REGION_FAILED_RESTORE", p);
@@ -125,7 +125,7 @@ public class RegionCommand extends SWCommand {
             PasteBuilder pasteBuilder = new PasteBuilder(new PasteBuilder.SchematicProvider(node))
                     .ignoreAir(true)
                     .color(region.getFlags().get(Flag.COLOR).getWithDefault());
-            region.getArea().reset(pasteBuilder, true);
+            region.getArea().reset(pasteBuilder, false);
             RegionUtils.message(region, "REGION_REGION_RESTORED");
         } catch (SecurityException e) {
             BauSystem.MESSAGE.send("REGION_REGION_FAILED_RESTORE", p);

From 566a7deee304e81b4147c2ac216c891b0fd8d216 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Thu, 2 Oct 2025 21:14:26 +0200
Subject: [PATCH 120/214] Hotfix BackupCommand.backupGui

---
 .../de/steamwar/bausystem/features/backup/BackupCommand.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/backup/BackupCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/backup/BackupCommand.java
index 7501a6d8..6c08eb1a 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/backup/BackupCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/backup/BackupCommand.java
@@ -110,7 +110,7 @@ public class BackupCommand extends SWCommand {
         }
         SWListInv<RegionBackups.Backup> swListInv = new SWListInv<>(p, BauSystem.MESSAGE.parse("BACKUP_INV_NAME", p), swListEntries, (clickType, s) -> {
             p.getOpenInventory().close();
-            p.performCommand("backup load " + s);
+            backupLoad(p, s);
         });
         swListInv.open();
     }

From 88cc06560e54200bd41f6619db5120a08f50ba60 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Fri, 3 Oct 2025 09:13:32 +0200
Subject: [PATCH 121/214] Fix BauServer Performance

---
 .../bausystem/features/region/RegionListener.java      |  7 +------
 .../src/de/steamwar/bausystem/region/FlagStorage.java  |  3 +++
 .../bausystem/region/fixed/FixedFlagStorage.java       |  9 ++++++---
 buildSrc/src/steamwar.devserver.gradle                 | 10 ++++++++++
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionListener.java
index 78c917c1..7c4f8068 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionListener.java
@@ -183,11 +183,6 @@ public class RegionListener implements Listener {
 
 
     private static void tagChangedRegion(final Location location) {
-        new BukkitRunnable() {
-            @Override
-            public void run() {
-                Region.getRegion(location).getFlags().set(Flag.CHANGED, ChangedMode.HAS_CHANGE);
-            }
-        }.runTaskAsynchronously(BauSystem.getInstance());
+        Region.getRegion(location).getFlags().set(Flag.CHANGED, ChangedMode.HAS_CHANGE);
     }
 }
\ No newline at end of file
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/FlagStorage.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/FlagStorage.java
index 72e80301..3b2cdde3 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/FlagStorage.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/FlagStorage.java
@@ -29,6 +29,9 @@ public interface FlagStorage {
     @NonNull
     <T extends Enum<T> & Flag.Value<T>> RegionFlagPolicy has(@NonNull Flag<T> flag);
 
+    /**
+     * Returns true if the flag was changed and did not already contain the provided value
+     */
     <T extends Enum<T> & Flag.Value<T>> boolean set(@NonNull Flag<T> flag, @NonNull T value);
 
     @NonNull
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedFlagStorage.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedFlagStorage.java
index c860f903..1b6f358b 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedFlagStorage.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedFlagStorage.java
@@ -66,9 +66,12 @@ public class FixedFlagStorage implements FlagStorage {
     @Override
     public <T extends Enum<T> & Flag.Value<T>> boolean set(@NonNull Flag<T> flag, @NonNull T value) {
         if (has(flag).isWritable()) {
-            data.put(flag.name(), value.name());
-            WorldData.write();
-            return flagMap.put(flag, value) != value;
+            boolean hasChanged = flagMap.put(flag, value) != value;
+            if (hasChanged) {
+                data.put(flag.name(), value.name());
+                WorldData.write();
+            }
+            return hasChanged;
         } else {
             return false;
         }
diff --git a/buildSrc/src/steamwar.devserver.gradle b/buildSrc/src/steamwar.devserver.gradle
index 8ce30df7..1ebf39a6 100644
--- a/buildSrc/src/steamwar.devserver.gradle
+++ b/buildSrc/src/steamwar.devserver.gradle
@@ -50,6 +50,14 @@ class DevServer extends DefaultTask {
     @Optional
     String checkpointFolder = null
 
+    @Input
+    @Optional
+    Boolean profile = null
+
+    @Input
+    @Optional
+    Boolean forceUpgrade = null
+
     DevServer() {
         super()
         doFirst {
@@ -157,6 +165,8 @@ class DevServer extends DefaultTask {
         if (port != null) devPy.append(" --port $port")
         if (worldName != null) devPy.append(" -w $template/$worldName")
         if (plugins != null) devPy.append(" -p $plugins")
+        if (profile != null) devPy.append(" --profile")
+        if (forceUpgrade != null) devPy.append(" --forceUpgrade")
         if (jar != null) devPy.append(" --jar $jar")
         for (Map.Entry<String, String> dParam : dParams.entrySet()) {
             devPy.append(" -D${dParam.key}=${dParam.value}")

From 2bc295c620bf2b0a42bcd7b695979f8fdf6ac90f Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Fri, 3 Oct 2025 09:25:21 +0200
Subject: [PATCH 122/214] Fix RegionLib.type

---
 .../bausystem/features/region/RegionListener.java     |  1 -
 .../bausystem/features/script/lua/libs/RegionLib.java | 11 ++++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionListener.java
index 7c4f8068..e08e2ebf 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionListener.java
@@ -181,7 +181,6 @@ public class RegionListener implements Listener {
         }
     }
 
-
     private static void tagChangedRegion(final Location location) {
         Region.getRegion(location).getFlags().set(Flag.CHANGED, ChangedMode.HAS_CHANGE);
     }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/RegionLib.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/RegionLib.java
index 474a5b1f..d6e7b402 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/RegionLib.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/RegionLib.java
@@ -29,6 +29,7 @@ import org.luaj.vm2.LuaTable;
 import org.luaj.vm2.LuaValue;
 import org.luaj.vm2.lib.OneArgFunction;
 
+import java.util.List;
 import java.util.UUID;
 import java.util.function.Supplier;
 
@@ -46,11 +47,15 @@ public class RegionLib implements LuaLib {
         table.set("name", getter(() -> region.get().getID().toString()));
         table.set("id", getter(() -> region.get().getID().toString()));
         table.set("type", getter(() -> {
-            Region region1 = region.get();
-            if (region1.getType().isGlobal()) {
+            Region rg = region.get();
+            if (rg.getType().isGlobal()) {
                 return "global";
             }
-            return region1.getType().name().toLowerCase();
+            List<String> chatNames = rg.getGameModeConfig().getServer().getChatNames();
+            if (chatNames.isEmpty()) {
+                return "unknown";
+            }
+            return chatNames.get(0).toLowerCase();
         }));
 
         LuaValue tntLib = LuaValue.tableOf();

From c38777158a69496c66ede2494b9ef8eb92972f3f Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Fri, 3 Oct 2025 11:55:37 +0200
Subject: [PATCH 123/214] Improving SelectAdjacent

---
 .../features/worldedit/SelectAdjacent.java     | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/SelectAdjacent.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/SelectAdjacent.java
index 7e3ade3c..abc8064e 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/SelectAdjacent.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/SelectAdjacent.java
@@ -21,6 +21,7 @@ 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.WorldEditRenderer;
 import de.steamwar.linkage.Linked;
@@ -76,10 +77,10 @@ public class SelectAdjacent implements Listener {
     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();
+        if (!event.getPlayer().isSneaking()) return;
+        if (event.getAction() != Action.LEFT_CLICK_BLOCK) return;
         Material material = event.getPlayer().getInventory().getItemInOffHand().getType();
         if (material.isAir()) {
             selector = new Selector(event.getClickedBlock(), event.getPlayer(), __ -> true);
@@ -111,6 +112,8 @@ public class SelectAdjacent implements Listener {
         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());
@@ -121,6 +124,16 @@ public class SelectAdjacent implements Listener {
             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();
 
@@ -158,6 +171,7 @@ public class SelectAdjacent implements Listener {
                 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());

From e1fa8aaefa475bd69aef3beb2b7ac6491576f33e Mon Sep 17 00:00:00 2001
From: Chaoscaot <chaos@chaoscaot.de>
Date: Sun, 5 Oct 2025 11:42:44 +0200
Subject: [PATCH 124/214] Add enable/disable functionality for Piston
 Calculator and update help messages

---
 .../BauSystem_Main/src/BauSystem.properties   |  4 ++-
 .../src/BauSystem_de.properties               |  4 ++-
 .../features/util/PistonCalculator.java       | 13 +++++----
 .../util/PistonCalculatorCommand.java         | 28 ++++++++++++++++---
 4 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/BauSystem/BauSystem_Main/src/BauSystem.properties b/BauSystem/BauSystem_Main/src/BauSystem.properties
index 34681d0d..eabd9de6 100644
--- a/BauSystem/BauSystem_Main/src/BauSystem.properties
+++ b/BauSystem/BauSystem_Main/src/BauSystem.properties
@@ -980,10 +980,12 @@ SELECT_ITEM_BAUPLATTFORM=§eBuild platform
 SELECT_ITEM_TESTBLOCK=§eDummy
 CHESTFILLER_FILLED=§eChest filled
 CHESTFILLER_COUNT=§7{0}§8: §e§l{1}
-PISTON_HELP_1=§7Right click on piston with a slime ball to calculate the moved blocks.
+PISTON_HELP_1=§7Right click on piston to calculate the moved blocks.
 PISTON_HELP_2=§7Count is red, if one unmoveable block is present.
 PISTON_HELP_3=§7Count is yellow, if too many blocks are present.
 PISTON_INFO=§7Moved Blocks {0}{1}§8/§712
+PISTON_ENABLED=§aCalculator enabled
+PISTON_DISABLED=§cCalculator disabled
 # Warp
 WARP_LOC_X=§7X§8: §e{0}
 WARP_LOC_Y=§7Y§8: §e{0}
diff --git a/BauSystem/BauSystem_Main/src/BauSystem_de.properties b/BauSystem/BauSystem_Main/src/BauSystem_de.properties
index c5c5ca0a..042d1388 100644
--- a/BauSystem/BauSystem_Main/src/BauSystem_de.properties
+++ b/BauSystem/BauSystem_Main/src/BauSystem_de.properties
@@ -912,10 +912,12 @@ SELECT_ITEM_BAURAHMEN=§eBaurahmen
 SELECT_ITEM_BAUPLATTFORM=§eBauplattform
 SELECT_ITEM_TESTBLOCK=§eTestblock
 CHESTFILLER_FILLED=§eKiste gefüllt
-PISTON_HELP_1=§7Rechts Klick auf Piston mit einem Slime Ball berechnet dir die bewegten Blöcke.
+PISTON_HELP_1=§7Rechts Klick auf einen Piston berechnet dir die bewegten Blöcke.
 PISTON_HELP_2=§7Die Anzahl ist Rot, wenn ein unmovable Block vorhanden ist.
 PISTON_HELP_3=§7Die Anzahl ist Gelb, wenn zu viele Blöcke vorhanden sind.
 PISTON_INFO=§7Bewegte Blöcke {0}{1}§8/§712
+PISTON_ENABLED=§aPiston-Berechnung aktiviert
+PISTON_DISABLED=§cPiston-Berechnung deaktiviert
 # Warp
 WARP_LOC_X=§7X§8: §e{0}
 WARP_LOC_Y=§7Y§8: §e{0}
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/PistonCalculator.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/PistonCalculator.java
index b5ba6a00..2b179f14 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/PistonCalculator.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/PistonCalculator.java
@@ -49,7 +49,8 @@ import java.util.stream.Collectors;
 @MinVersion(20)
 public class PistonCalculator implements Listener {
 
-    private final Map<Player, Long> DEBOUNCE = new HashMap<>();
+    private final Map<Player, Long> debounce = new HashMap<>();
+    protected final Set<Player> disablePistonCalculator = new HashSet<>();
 
     @EventHandler
     public void onPlayerInteract(PlayerInteractEvent event) {
@@ -58,15 +59,16 @@ public class PistonCalculator implements Listener {
         if (event.getItem() == null) {
         } else if (event.getItem() != null && event.getItem().getType() == Material.SLIME_BALL) {
         } else if (!event.getItem().getType().isBlock()) {
-            DEBOUNCE.put(event.getPlayer(), System.currentTimeMillis());
+            debounce.put(event.getPlayer(), System.currentTimeMillis());
             return;
         } else return;
         if (event.getClickedBlock() == null) return;
         Block clickedBlock = event.getClickedBlock();
         Material blockType = clickedBlock.getType();
         if (!(blockType == Material.PISTON || blockType == Material.STICKY_PISTON)) return;
-        if (System.currentTimeMillis() - DEBOUNCE.getOrDefault(event.getPlayer(), 0L) <= 200) return;
-        DEBOUNCE.put(event.getPlayer(), System.currentTimeMillis());
+        if (disablePistonCalculator.contains(event.getPlayer())) return;
+        if (System.currentTimeMillis() - debounce.getOrDefault(event.getPlayer(), 0L) <= 200) return;
+        debounce.put(event.getPlayer(), System.currentTimeMillis());
 
         Location location = event.getClickedBlock().getLocation();
         if (pistOrders.containsKey(location)) {
@@ -143,7 +145,8 @@ public class PistonCalculator implements Listener {
 
     @EventHandler
     public void onPlayerQuit(PlayerQuitEvent event) {
-        DEBOUNCE.remove(event.getPlayer());
+        debounce.remove(event.getPlayer());
+        disablePistonCalculator.remove(event.getPlayer());
 
         Set<Location> toRemove = new HashSet<>();
         pistOrders.forEach((location, pistOrder) -> {
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/PistonCalculatorCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/PistonCalculatorCommand.java
index 510c6050..bf387dd5 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/PistonCalculatorCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/PistonCalculatorCommand.java
@@ -22,21 +22,41 @@ package de.steamwar.bausystem.features.util;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.command.SWCommand;
 import de.steamwar.linkage.Linked;
+import de.steamwar.linkage.LinkedInstance;
 import de.steamwar.linkage.MinVersion;
 import org.bukkit.entity.Player;
 
+import java.util.HashSet;
+import java.util.Set;
+import java.util.UUID;
+
 @Linked
 @MinVersion(20)
 public class PistonCalculatorCommand extends SWCommand {
 
+    @LinkedInstance
+    public PistonCalculator pistonCalculator;
+
+    private final Set<UUID> helpMessageShowed = new HashSet<>();
+
     public PistonCalculatorCommand() {
         super("piston", "pistoncalculator", "pistoncalc");
     }
 
     @Register
-    public void help(@Validator Player player) {
-        BauSystem.MESSAGE.send("PISTON_HELP_1", player);
-        BauSystem.MESSAGE.send("PISTON_HELP_2", player);
-        BauSystem.MESSAGE.send("PISTON_HELP_3", player);
+    public void genericCommand(@Validator Player player) {
+        if (pistonCalculator.disablePistonCalculator.contains(player)) {
+            pistonCalculator.disablePistonCalculator.remove(player);
+            if (!helpMessageShowed.contains(player.getUniqueId())) {
+                BauSystem.MESSAGE.send("PISTON_HELP_1", player);
+                BauSystem.MESSAGE.send("PISTON_HELP_2", player);
+                BauSystem.MESSAGE.send("PISTON_HELP_3", player);
+                helpMessageShowed.add(player.getUniqueId());
+            }
+            BauSystem.MESSAGE.send("PISTON_ENABLED", player);
+        } else {
+            pistonCalculator.disablePistonCalculator.add(player);
+            BauSystem.MESSAGE.send("PISTON_DISABLED", player);
+        }
     }
 }

From e69d203b99570f76f62562120b984f9786bc9c81 Mon Sep 17 00:00:00 2001
From: Chaoscaot <chaos@chaoscaot.de>
Date: Sun, 5 Oct 2025 11:45:11 +0200
Subject: [PATCH 125/214] Add `clear` command to Piston Calculator to remove
 player-related data

---
 .../steamwar/bausystem/features/util/PistonCalculator.java   | 4 +++-
 .../bausystem/features/util/PistonCalculatorCommand.java     | 5 +++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/PistonCalculator.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/PistonCalculator.java
index 2b179f14..71fbdb8a 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/PistonCalculator.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/PistonCalculator.java
@@ -147,10 +147,12 @@ public class PistonCalculator implements Listener {
     public void onPlayerQuit(PlayerQuitEvent event) {
         debounce.remove(event.getPlayer());
         disablePistonCalculator.remove(event.getPlayer());
+    }
 
+    public void clear(Player player) {
         Set<Location> toRemove = new HashSet<>();
         pistOrders.forEach((location, pistOrder) -> {
-            pistOrder.server.removePlayer(event.getPlayer());
+            pistOrder.server.removePlayer(player);
             if (pistOrder.server.getPlayers().isEmpty()) {
                 toRemove.add(location);
                 pistOrder.server.close();
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/PistonCalculatorCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/PistonCalculatorCommand.java
index bf387dd5..207c3fbd 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/PistonCalculatorCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/PistonCalculatorCommand.java
@@ -59,4 +59,9 @@ public class PistonCalculatorCommand extends SWCommand {
             BauSystem.MESSAGE.send("PISTON_DISABLED", player);
         }
     }
+
+    @Register("clear")
+    public void clearCommand(@Validator Player player) {
+        pistonCalculator.clear(player);
+    }
 }

From ac24bc4f5b5ab52f47fc2ff4df3c4b95c1364507 Mon Sep 17 00:00:00 2001
From: Chaoscaot <chaos@chaoscaot.de>
Date: Tue, 7 Oct 2025 22:39:38 +0200
Subject: [PATCH 126/214] Hotfix: Portal Permissions

---
 .../src/de/steamwar/lobby/command/PortalCommand.java       | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/LobbySystem/src/de/steamwar/lobby/command/PortalCommand.java b/LobbySystem/src/de/steamwar/lobby/command/PortalCommand.java
index 5c8649bd..e151120d 100644
--- a/LobbySystem/src/de/steamwar/lobby/command/PortalCommand.java
+++ b/LobbySystem/src/de/steamwar/lobby/command/PortalCommand.java
@@ -85,18 +85,21 @@ public class PortalCommand extends SWCommand {
     }
 
     @Register({"depth"})
-    public void portalDepth(Player player, Portal portal, double depth) {
+    public void portalDepth(Player player, Portal portal, @Max(intValue = 10) double depth) {
+        if (noPermissions(player)) return;
         portal.setDepth(depth);
     }
 
     @Register({"addblue"})
     public void portalAddBlue(Player player, Portal portal) {
+        if (noPermissions(player)) return;
         FightserverPortal handler = (FightserverPortal) portal.getHandler();
         handler.addBlue(locationOfPlayer(player));
     }
 
     @Register({"addred"})
     public void portalAddRed(Player player, Portal portal) {
+        if (noPermissions(player)) return;
         FightserverPortal handler = (FightserverPortal) portal.getHandler();
         handler.addRed(locationOfPlayer(player));
     }
@@ -110,12 +113,14 @@ public class PortalCommand extends SWCommand {
 
     @Register({"removeblue"})
     public void portalRemoveBlue(Player player, Portal portal, int i) {
+        if (noPermissions(player)) return;
         FightserverPortal handler = (FightserverPortal) portal.getHandler();
         handler.removeBlue(i-1);
     }
 
     @Register({"removered"})
     public void portalRemoveRed(Player player, Portal portal, int i) {
+        if (noPermissions(player)) return;
         FightserverPortal handler = (FightserverPortal) portal.getHandler();
         handler.removeRed(i-1);
     }

From 3bfac2d1cf33e296569c598290f0e5d4fae000bc Mon Sep 17 00:00:00 2001
From: Chaoscaot <chaos@chaoscaot.de>
Date: Tue, 7 Oct 2025 22:43:54 +0200
Subject: [PATCH 127/214] Hotfix: Portal Permissions

---
 LobbySystem/src/de/steamwar/lobby/command/PortalCommand.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LobbySystem/src/de/steamwar/lobby/command/PortalCommand.java b/LobbySystem/src/de/steamwar/lobby/command/PortalCommand.java
index e151120d..637b99e3 100644
--- a/LobbySystem/src/de/steamwar/lobby/command/PortalCommand.java
+++ b/LobbySystem/src/de/steamwar/lobby/command/PortalCommand.java
@@ -85,7 +85,7 @@ public class PortalCommand extends SWCommand {
     }
 
     @Register({"depth"})
-    public void portalDepth(Player player, Portal portal, @Max(intValue = 10) double depth) {
+    public void portalDepth(Player player, Portal portal, @Max(doubleValue = 10.0d) double depth) {
         if (noPermissions(player)) return;
         portal.setDepth(depth);
     }

From 7179daedae502d9c58266c87b78edcae20131650 Mon Sep 17 00:00:00 2001
From: Chaoscaot <chaos@chaoscaot.de>
Date: Sun, 12 Oct 2025 15:30:46 +0200
Subject: [PATCH 128/214] Add `axiom:set_no_physical_trigger` to plugin message
 channels for expanded functionality

---
 .../src/de/steamwar/velocitycore/listeners/PluginMessage.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VelocityCore/src/de/steamwar/velocitycore/listeners/PluginMessage.java b/VelocityCore/src/de/steamwar/velocitycore/listeners/PluginMessage.java
index 429394f7..b35279fb 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/listeners/PluginMessage.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/listeners/PluginMessage.java
@@ -402,7 +402,7 @@ public class PluginMessage extends BasicListener {
                 "axiom:set_world_property", "axiom:set_block", "axiom:set_hotbar_slot", "axiom:switch_active_hotbar",
                 "axiom:teleport", "axiom:request_chunk_data", "axiom:spawn_entity", "axiom:response_entity_data",
                 "axiom:manipulate_entity", "axiom:delete_entity", "axiom:marker_nbt_request", "axiom:set_buffer",
-                "axiom:allowed_gamemodes", "axiom:ignore_display_entities", "axiom:add_server_heightmap"
+                "axiom:allowed_gamemodes", "axiom:ignore_display_entities", "axiom:add_server_heightmap", "axiom:set_no_physical_trigger"
         )) {
             channelRegisterHandlers.put(channel, player -> {});
             registerPassthroughToServer(channel);

From 089503e0a00e50363818d7dd6db9b95c934ce185 Mon Sep 17 00:00:00 2001
From: Chaoscaot <chaos@chaoscaot.de>
Date: Tue, 14 Oct 2025 17:45:58 +0200
Subject: [PATCH 129/214] Synchronize access to `skins` map in
 `PlayerSkinHandler` to ensure thread safety and prevent race conditions.

---
 .../network/handlers/PlayerSkinHandler.java   | 81 ++++++++++---------
 1 file changed, 43 insertions(+), 38 deletions(-)

diff --git a/VelocityCore/src/de/steamwar/velocitycore/network/handlers/PlayerSkinHandler.java b/VelocityCore/src/de/steamwar/velocitycore/network/handlers/PlayerSkinHandler.java
index f33b0b9b..ff18d309 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/network/handlers/PlayerSkinHandler.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/network/handlers/PlayerSkinHandler.java
@@ -54,7 +54,7 @@ public class PlayerSkinHandler extends PacketHandler {
         VelocityCore.getProxy().getEventManager().register(VelocityCore.get(), this);
     }
 
-    private Map<UUID, SkinData> skins = new LinkedHashMap<>(maxCacheSize, 1, true) {
+    private final Map<UUID, SkinData> skins = new LinkedHashMap<>(maxCacheSize, 1, true) {
         @Override
         protected boolean removeEldestEntry(Map.Entry<UUID, SkinData> eldest) {
             return size() > maxCacheSize;
@@ -64,38 +64,40 @@ public class PlayerSkinHandler extends PacketHandler {
     @Handler
     @SneakyThrows
     public void handle(PlayerSkinRequestPacket packet) {
-        if (skins.containsKey(packet.getUuid())) {
-            SkinData skinData = skins.get(packet.getUuid());
-            NetworkSender.send(((ServerMetaInfo) packet.getMetaInfos()).sender().getServer(), new PlayerSkinResponsePacket(packet.getUuid(), skinData.skin, skinData.signature));
-            return;
-        }
-
-        String url = "https://sessionserver.mojang.com/session/minecraft/profile/" + packet.getUuid().toString().replace("-", "") + "?unsigned=false";
-
-        HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection();
-        connection.setReadTimeout(5000);
-        connection.setConnectTimeout(5000);
-        connection.setRequestProperty("User-Agent", "SkinFetcher");
-
-        if (connection.getResponseCode() != HttpURLConnection.HTTP_OK) {
-            return;
-        }
-
-        InputStream is = connection.getInputStream();
-        String json = new BufferedReader(new InputStreamReader(is))
-                .lines().collect(Collectors.joining("\n"));
-
-        JsonObject obj = JsonParser.parseString(json).getAsJsonObject();
-        JsonArray properties = obj.getAsJsonArray("properties");
-        for (JsonElement propElement : properties) {
-            JsonObject prop = propElement.getAsJsonObject();
-            if (prop.get("name").getAsString().equals("textures")) {
-                String skin = prop.get("value").getAsString();
-                String signature = prop.get("signature").getAsString();
-                skins.put(packet.getUuid(), new SkinData(skin, signature));
-                NetworkSender.send(((ServerMetaInfo) packet.getMetaInfos()).sender().getServer(), new PlayerSkinResponsePacket(packet.getUuid(), skin, signature));
+        synchronized (skins) {
+            if (skins.containsKey(packet.getUuid())) {
+                SkinData skinData = skins.get(packet.getUuid());
+                NetworkSender.send(((ServerMetaInfo) packet.getMetaInfos()).sender().getServer(), new PlayerSkinResponsePacket(packet.getUuid(), skinData.skin, skinData.signature));
                 return;
             }
+
+            String url = "https://sessionserver.mojang.com/session/minecraft/profile/" + packet.getUuid().toString().replace("-", "") + "?unsigned=false";
+
+            HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection();
+            connection.setReadTimeout(5000);
+            connection.setConnectTimeout(5000);
+            connection.setRequestProperty("User-Agent", "SkinFetcher");
+
+            if (connection.getResponseCode() != HttpURLConnection.HTTP_OK) {
+                return;
+            }
+
+            InputStream is = connection.getInputStream();
+            String json = new BufferedReader(new InputStreamReader(is))
+                    .lines().collect(Collectors.joining("\n"));
+
+            JsonObject obj = JsonParser.parseString(json).getAsJsonObject();
+            JsonArray properties = obj.getAsJsonArray("properties");
+            for (JsonElement propElement : properties) {
+                JsonObject prop = propElement.getAsJsonObject();
+                if (prop.get("name").getAsString().equals("textures")) {
+                    String skin = prop.get("value").getAsString();
+                    String signature = prop.get("signature").getAsString();
+                    skins.put(packet.getUuid(), new SkinData(skin, signature));
+                    NetworkSender.send(((ServerMetaInfo) packet.getMetaInfos()).sender().getServer(), new PlayerSkinResponsePacket(packet.getUuid(), skin, signature));
+                    return;
+                }
+            }
         }
     }
 
@@ -105,14 +107,17 @@ public class PlayerSkinHandler extends PacketHandler {
         GameProfile gameProfile = player.getGameProfile();
         GameProfile.Property property = gameProfile.getProperties().stream().filter(p -> p.getName().equals("textures")).findFirst().orElse(null);
         if (property == null) return;
-        skins.put(player.getUniqueId(), new SkinData(property.getValue(), property.getSignature()));
 
-        Set<UUID> uuidSet = skins.keySet();
-        VelocityCore.getProxy().getAllServers().forEach(server -> {
-            for (UUID uuid : uuidSet) {
-                NetworkSender.send(server, new PlayerSkinResponsePacket(uuid, property.getValue(), property.getSignature()));
-            }
-        });
+        synchronized (skins) {
+            skins.put(player.getUniqueId(), new SkinData(property.getValue(), property.getSignature()));
+
+            Set<UUID> uuidSet = skins.keySet();
+            VelocityCore.getProxy().getAllServers().forEach(server -> {
+                for (UUID uuid : uuidSet) {
+                    NetworkSender.send(server, new PlayerSkinResponsePacket(uuid, property.getValue(), property.getSignature()));
+                }
+            });
+        }
     }
 
     public record SkinData(String skin, String signature) {}

From 4e050106f568b776722b4033aa589e7d785f5d53 Mon Sep 17 00:00:00 2001
From: Chaoscaot <chaos@chaoscaot.de>
Date: Tue, 14 Oct 2025 19:14:31 +0200
Subject: [PATCH 130/214] Fix query in `allParentsOfNode` to use `Config` field
 instead of `ReplaceColor`.

---
 CommonCore/SQL/src/de/steamwar/sql/SchematicNode.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CommonCore/SQL/src/de/steamwar/sql/SchematicNode.java b/CommonCore/SQL/src/de/steamwar/sql/SchematicNode.java
index e355419b..d2f0bf5c 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/SchematicNode.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/SchematicNode.java
@@ -83,7 +83,7 @@ public class SchematicNode {
     private static final SelectStatement<SchematicNode> byIdAndUser = new SelectStatement<>(table,
             "SELECT NodeId, NodeOwner, ? AS EffectiveOwner, NodeName, ParentNode, LastUpdate, NodeItem, NodeType, NodeRank, Config FROM SchematicNode WHERE NodeId = ?");
     private static final SelectStatement<SchematicNode> allParentsOfNode = new SelectStatement<>(table,
-            "WITH RECURSIVE R AS (SELECT NodeId, ParentNode FROM EffectiveSchematicNode WHERE NodeId = ? AND EffectiveOwner = ? UNION SELECT E.NodeId, E.ParentNode FROM R, EffectiveSchematicNode E WHERE R.ParentNode = E.NodeId AND E.EffectiveOwner = ?) SELECT SN.NodeId, SN.NodeOwner, ? AS EffectiveOwner, SN.NodeName, R.ParentNode, SN.LastUpdate, SN.NodeItem, SN.NodeType, SN.NodeRank, SN.ReplaceColor, SN.AllowReplay FROM R INNER JOIN SchematicNode SN ON SN.NodeId = R.NodeId");
+            "WITH RECURSIVE R AS (SELECT NodeId, ParentNode FROM EffectiveSchematicNode WHERE NodeId = ? AND EffectiveOwner = ? UNION SELECT E.NodeId, E.ParentNode FROM R, EffectiveSchematicNode E WHERE R.ParentNode = E.NodeId AND E.EffectiveOwner = ?) SELECT SN.NodeId, SN.NodeOwner, ? AS EffectiveOwner, 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");
 
     static {
         NodeMember.init();

From f9c320cb333871a7ea146592b4b11480374d59b5 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Fri, 17 Oct 2025 21:36:50 +0200
Subject: [PATCH 131/214] Add RegionData Improve TestblockCommand with
 remembering the TB

---
 .../features/region/ResetCommand.java         |  1 +
 .../features/region/TestblockCommand.java     | 28 +++++-
 .../de/steamwar/bausystem/region/Region.java  |  3 +
 .../steamwar/bausystem/region/RegionData.java | 93 +++++++++++++++++++
 .../region/fixed/FixedGlobalRegion.java       |  5 +
 .../bausystem/region/fixed/FixedRegion.java   |  8 ++
 6 files changed, 136 insertions(+), 2 deletions(-)
 create mode 100644 BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionData.java

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ResetCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ResetCommand.java
index 49893d1d..097ec569 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ResetCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ResetCommand.java
@@ -56,6 +56,7 @@ public class ResetCommand extends SWCommand {
                     .color(region.getFlags().get(Flag.COLOR).getWithDefault());
             region.getArea().reset(pasteBuilder, false);
             region.getFlags().clear();
+            region.getRegionData().clear();
             RegionUtils.message(region, "REGION_RESET_RESETED");
         } catch (SecurityException e) {
             BauSystem.MESSAGE.send("REGION_RESET_ERROR", p);
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java
index 7e4abc4b..aaaef5a1 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java
@@ -25,7 +25,6 @@ import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.RegionUtils;
 import de.steamwar.bausystem.region.flags.Flag;
 import de.steamwar.bausystem.region.utils.RegionExtensionType;
-import de.steamwar.bausystem.region.utils.RegionType;
 import de.steamwar.bausystem.utils.PasteBuilder;
 import de.steamwar.command.PreviousArguments;
 import de.steamwar.command.SWCommand;
@@ -93,8 +92,33 @@ public class TestblockCommand extends SWCommand {
             }
         }
 
+        // Beta Tester enabled
+        switch (BauServer.getInstance().getOwnerID()) {
+            case 245:
+            case 403:
+            case 1898:
+            case 3320:
+            case 4603:
+            case 6032:
+            case 11888:
+                if (node == null) {
+                    node = region.getRegionData().getTestblockSchematic();
+                } else {
+                    region.getRegionData().setTestblockSchematic(node);
+                }
+                break;
+            default:
+                break;
+        }
+
+        PasteBuilder.ClipboardProvider clipboardProvider;
+        if (node == null) {
+            clipboardProvider = new PasteBuilder.FileProvider(region.getTestblockArea().getResetFile());
+        } else {
+            clipboardProvider = new PasteBuilder.SchematicProvider(node);
+        }
+
         try {
-            PasteBuilder.ClipboardProvider clipboardProvider = node == null ? new PasteBuilder.FileProvider(region.getTestblockArea().getResetFile()) : new PasteBuilder.SchematicProvider(node);
             PasteBuilder pasteBuilder = new PasteBuilder(clipboardProvider)
                     .ignoreAir(ignoreAir)
                     .onlyColors(onlyColors)
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
index d00cb4e1..4b91f9fe 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
@@ -72,6 +72,9 @@ public interface Region {
     @NonNull
     RegionBackups getBackups();
 
+    @NonNull
+    RegionData getRegionData();
+
     interface Area {
 
         Area EMPTY = new Area() {
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionData.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionData.java
new file mode 100644
index 00000000..615da706
--- /dev/null
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionData.java
@@ -0,0 +1,93 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2020  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;
+
+import de.steamwar.sql.SchematicNode;
+import yapion.hierarchy.types.YAPIONObject;
+
+import java.util.Objects;
+
+public interface RegionData {
+
+    void clear();
+
+    SchematicNode getTestblockSchematic();
+
+    void setTestblockSchematic(SchematicNode schematic);
+
+    RegionData EMPTY = new RegionData() {
+
+        @Override
+        public void clear() {
+        }
+
+        @Override
+        public SchematicNode getTestblockSchematic() {
+            return null;
+        }
+
+        @Override
+        public void setTestblockSchematic(SchematicNode schematic) {
+        }
+    };
+
+    class RegionDataImpl implements RegionData {
+
+        private final YAPIONObject yapionObject;
+        private final Runnable onChange;
+
+        public RegionDataImpl(YAPIONObject yapionObject, Runnable onChange) {
+            this.yapionObject = yapionObject;
+            this.onChange = onChange;
+
+            if (yapionObject.containsKey("testblockSchematic")) {
+                testblockSchematic = SchematicNode.getSchematicNode(yapionObject.getInt("testblockSchematic"));
+            }
+        }
+
+        @Override
+        public void clear() {
+            testblockSchematic = null;
+            yapionObject.remove("testblockSchematic");
+            onChange.run();
+        }
+
+        private SchematicNode testblockSchematic = null;
+
+        @Override
+        public SchematicNode getTestblockSchematic() {
+            return testblockSchematic;
+        }
+
+        @Override
+        public void setTestblockSchematic(SchematicNode schematic) {
+            if (Objects.equals(this.testblockSchematic, schematic)) {
+                return;
+            }
+            this.testblockSchematic = schematic;
+            if (schematic == null) {
+                yapionObject.remove("testblockSchematic");
+            } else {
+                yapionObject.put("testblockSchematic", testblockSchematic.getId());
+            }
+            onChange.run();
+        }
+    }
+}
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalRegion.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalRegion.java
index 39e8ca1f..0eaaf87c 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalRegion.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalRegion.java
@@ -139,4 +139,9 @@ public final class FixedGlobalRegion implements Region {
     public @NonNull RegionBackups getBackups() {
         return RegionBackups.EMPTY;
     }
+
+    @Override
+    public @NonNull RegionData getRegionData() {
+        return RegionData.EMPTY;
+    }
 }
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java
index 256e1c00..c04a3ef7 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java
@@ -26,6 +26,7 @@ import de.steamwar.bausystem.region.flags.Flag;
 import de.steamwar.bausystem.region.flags.TestblockMode;
 import de.steamwar.bausystem.utils.FlatteningWrapper;
 import de.steamwar.bausystem.utils.PasteBuilder;
+import de.steamwar.bausystem.worlddata.WorldData;
 import de.steamwar.core.Core;
 import de.steamwar.sql.SchematicType;
 import lombok.NonNull;
@@ -57,6 +58,7 @@ public class FixedRegion implements Region {
     private final int floorLevel;
     private final int waterLevel;
     private final GameModeConfig gameModeConfig;
+    private final RegionData regionData;
     private final RegionHistory regionHistory = new RegionHistory.Impl(20);
 
     private final RegionBackups regionBackups = new RegionBackups() {
@@ -335,6 +337,7 @@ public class FixedRegion implements Region {
             }
         }
         this.gameModeConfig = new GameModeConfig(found);
+        this.regionData = new RegionData.RegionDataImpl(regionData, WorldData::write);
     }
 
     @Override
@@ -381,4 +384,9 @@ public class FixedRegion implements Region {
     public @NonNull RegionBackups getBackups() {
         return regionBackups;
     }
+
+    @Override
+    public @NonNull RegionData getRegionData() {
+        return regionData;
+    }
 }

From a12c620744f22e58fcdd81f55d2d8ded35075be5 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Fri, 17 Oct 2025 22:14:10 +0200
Subject: [PATCH 132/214] Add Wolf36136 for TestblockCommand

---
 .../de/steamwar/bausystem/features/region/TestblockCommand.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java
index aaaef5a1..6b62a3b2 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java
@@ -101,6 +101,7 @@ public class TestblockCommand extends SWCommand {
             case 4603:
             case 6032:
             case 11888:
+            case 12258:
                 if (node == null) {
                     node = region.getRegionData().getTestblockSchematic();
                 } else {

From d154fe90a9ced4ccdb39b88a387341caa6c3d7fb Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Fri, 17 Oct 2025 22:15:23 +0200
Subject: [PATCH 133/214] Add Simon4ZX for TestblockCommand

---
 .../de/steamwar/bausystem/features/region/TestblockCommand.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java
index 6b62a3b2..f8e9c653 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java
@@ -100,6 +100,7 @@ public class TestblockCommand extends SWCommand {
             case 3320:
             case 4603:
             case 6032:
+            case 11077:
             case 11888:
             case 12258:
                 if (node == null) {

From bcdda35b445bc4c904780e6d52add711d1c4277f Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Fri, 17 Oct 2025 22:23:11 +0200
Subject: [PATCH 134/214] Fix TestblockCommand permission check for schematic

---
 .../steamwar/bausystem/features/region/TestblockCommand.java  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java
index f8e9c653..f91c3e95 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java
@@ -105,6 +105,10 @@ public class TestblockCommand extends SWCommand {
             case 12258:
                 if (node == null) {
                     node = region.getRegionData().getTestblockSchematic();
+                    if (node != null && !node.accessibleByUser(SteamwarUser.get(bauServer.getOwner()))) {
+                        node = null;
+                        region.getRegionData().setTestblockSchematic(null);
+                    }
                 } else {
                     region.getRegionData().setTestblockSchematic(node);
                 }

From 2b32cf38c7e04fa317b0ad96485357da2cc6c051 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Fri, 17 Oct 2025 22:27:01 +0200
Subject: [PATCH 135/214] Fix TestblockCommand permission check for schematic

---
 .../features/region/TestblockCommand.java          | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java
index f91c3e95..17f3e0b3 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java
@@ -31,6 +31,7 @@ import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeMapper;
 import de.steamwar.linkage.Linked;
 import de.steamwar.linkage.LinkedInstance;
+import de.steamwar.sql.BauweltMember;
 import de.steamwar.sql.Punishment;
 import de.steamwar.sql.SchematicNode;
 import de.steamwar.sql.SteamwarUser;
@@ -105,10 +106,6 @@ public class TestblockCommand extends SWCommand {
             case 12258:
                 if (node == null) {
                     node = region.getRegionData().getTestblockSchematic();
-                    if (node != null && !node.accessibleByUser(SteamwarUser.get(bauServer.getOwner()))) {
-                        node = null;
-                        region.getRegionData().setTestblockSchematic(null);
-                    }
                 } else {
                     region.getRegionData().setTestblockSchematic(node);
                 }
@@ -117,6 +114,15 @@ public class TestblockCommand extends SWCommand {
                 break;
         }
 
+        if (node != null && !node.accessibleByUser(SteamwarUser.get(bauServer.getOwner()))) {
+            node = null;
+            region.getRegionData().setTestblockSchematic(null);
+        }
+        if (node != null && BauweltMember.getBauMember(bauServer.getOwnerID(), node.getOwner()) == null) {
+            node = null;
+            region.getRegionData().setTestblockSchematic(null);
+        }
+
         PasteBuilder.ClipboardProvider clipboardProvider;
         if (node == null) {
             clipboardProvider = new PasteBuilder.FileProvider(region.getTestblockArea().getResetFile());

From 6ccb056065bab7133d4cf69ff0ebb4969bf5d1c6 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sat, 18 Oct 2025 07:33:28 +0200
Subject: [PATCH 136/214] Remove TestblockCommand permission check for
 schematic for now

---
 .../bausystem/features/region/TestblockCommand.java      | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java
index 17f3e0b3..cc650b40 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java
@@ -114,15 +114,6 @@ public class TestblockCommand extends SWCommand {
                 break;
         }
 
-        if (node != null && !node.accessibleByUser(SteamwarUser.get(bauServer.getOwner()))) {
-            node = null;
-            region.getRegionData().setTestblockSchematic(null);
-        }
-        if (node != null && BauweltMember.getBauMember(bauServer.getOwnerID(), node.getOwner()) == null) {
-            node = null;
-            region.getRegionData().setTestblockSchematic(null);
-        }
-
         PasteBuilder.ClipboardProvider clipboardProvider;
         if (node == null) {
             clipboardProvider = new PasteBuilder.FileProvider(region.getTestblockArea().getResetFile());

From 08706d705dd317f41fa198c0f8d8c5c5c75b85f0 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sat, 18 Oct 2025 07:48:29 +0200
Subject: [PATCH 137/214] Update SimulatorCursor

---
 .../features/simulator/SimulatorCursor.java   | 58 ++++++++--------
 .../gui/SimulatorCursorSwitcherGui.java       | 67 +++++++++++++++++++
 .../features/simulator/gui/SimulatorGui.java  |  7 +-
 3 files changed, 100 insertions(+), 32 deletions(-)
 create mode 100644 BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorCursorSwitcherGui.java

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorCursor.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorCursor.java
index 5cfbaad6..568b20b2 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorCursor.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorCursor.java
@@ -40,13 +40,10 @@ import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui;
 import de.steamwar.bausystem.utils.BauMemberUpdateEvent;
 import de.steamwar.bausystem.utils.ItemUtils;
 import de.steamwar.bausystem.utils.RayTraceUtils;
-import de.steamwar.data.CMDs;
 import de.steamwar.entity.REntity;
 import de.steamwar.entity.REntityServer;
 import de.steamwar.entity.RFallingBlockEntity;
 import de.steamwar.inventory.SWAnvilInv;
-import de.steamwar.inventory.SWInventory;
-import de.steamwar.inventory.SWItem;
 import de.steamwar.linkage.Linked;
 import de.steamwar.linkage.MinVersion;
 import lombok.AllArgsConstructor;
@@ -74,14 +71,14 @@ import java.util.stream.Collectors;
 @MinVersion(19)
 public class SimulatorCursor implements Listener {
 
-    private final World WORLD = Bukkit.getWorlds().get(0);
+    private static final World WORLD = Bukkit.getWorlds().get(0);
     private Class<?> position = Reflection.getClass("net.minecraft.network.protocol.game.ServerboundMovePlayerPacket$Pos");
     private Class<?> look = Reflection.getClass("net.minecraft.network.protocol.game.ServerboundMovePlayerPacket$Rot");
     private Class<?> positionLook = Reflection.getClass("net.minecraft.network.protocol.game.ServerboundMovePlayerPacket$PosRot");
 
-    private Map<Player, CursorType> cursorType = Collections.synchronizedMap(new HashMap<>());
-    private Map<Player, REntityServer> cursors = Collections.synchronizedMap(new HashMap<>());
-    private final Set<Player> calculating = new HashSet<>();
+    private static Map<Player, CursorType> cursorType = Collections.synchronizedMap(new HashMap<>());
+    private static Map<Player, REntityServer> cursors = Collections.synchronizedMap(new HashMap<>());
+    private static final Set<Player> calculating = new HashSet<>();
 
     public static boolean isSimulatorItem(ItemStack itemStack) {
         return ItemUtils.isItem(itemStack, "simulator");
@@ -121,7 +118,7 @@ public class SimulatorCursor implements Listener {
 
     @EventHandler
     public void onBauMemberUpdate(BauMemberUpdateEvent event) {
-        event.getChanged().forEach(this::calcCursor);
+        event.getChanged().forEach(SimulatorCursor::calcCursor);
     }
 
     @EventHandler
@@ -150,29 +147,28 @@ public class SimulatorCursor implements Listener {
             return;
         }
         if (LAST_SNEAKS.containsKey(player)) {
-            SWInventory swInventory = new SWInventory(player, 9, "Simulator Cursor");
-            int slot = 2;
             CursorType currentType = cursorType.getOrDefault(player, CursorType.TNT);
-            for (CursorType type : CursorType.values()) {
-                boolean selected = type == currentType;
-                SWItem swItem = new SWItem(selected ? type.material : type.nonSelectedMaterial, "§e" + type.name)
-                        .setCustomModelData(selected ? 0 : CMDs.Simulator.NEW_PHASE)
-                        .setLore(Collections.singletonList("§eClick to select"))
-                        .setCallback(click -> {
-                            cursorType.put(player, type);
-                            calcCursor(player);
-                            player.closeInventory();
-                        });
-                swInventory.setItem(slot, swItem);
-                slot += 2;
+            if (currentType == CursorType.TNT) {
+                cursorType.put(player, CursorType.REDSTONE_BLOCK);
+            } else {
+                cursorType.put(player, CursorType.TNT);
             }
-            swInventory.open();
+            calcCursor(player);
         } else {
             LAST_SNEAKS.put(player, System.currentTimeMillis());
         }
     }
 
-    public void calcCursor(Player player) {
+    public static CursorType getCursorType(Player player) {
+        return cursorType.getOrDefault(player, CursorType.TNT);
+    }
+
+    public static void setCursorType(Player player, CursorType cursorType) {
+        SimulatorCursor.cursorType.put(player, cursorType);
+        calcCursor(player);
+    }
+
+    public static void calcCursor(Player player) {
         synchronized (calculating) {
             if (calculating.contains(player)) return;
             calculating.add(player);
@@ -220,7 +216,7 @@ public class SimulatorCursor implements Listener {
         }
     }
 
-    private synchronized boolean removeCursor(Player player) {
+    private static synchronized boolean removeCursor(Player player) {
         REntityServer entityServer = cursors.get(player);
         boolean hadCursor = entityServer != null && !entityServer.getEntities().isEmpty();
         if (entityServer != null) {
@@ -229,7 +225,7 @@ public class SimulatorCursor implements Listener {
         return hadCursor;
     }
 
-    private synchronized void showCursor(Player player, RayTraceUtils.RRayTraceResult rayTraceResult, boolean hasSimulatorSelected) {
+    private static synchronized void showCursor(Player player, RayTraceUtils.RRayTraceResult rayTraceResult, boolean hasSimulatorSelected) {
         REntityServer entityServer = cursors.computeIfAbsent(player, __ -> {
             REntityServer rEntityServer = new REntityServer();
             rEntityServer.addPlayer(player);
@@ -354,11 +350,11 @@ public class SimulatorCursor implements Listener {
         OBSERVER(Material.OBSERVER, Material.QUARTZ, SimulatorCursor::getPosBlockAligned, "Observer", vector -> new ObserverElement(vector).add(new ObserverPhase())),
         ;
 
-        private Material material;
-        private Material nonSelectedMaterial;
-        private BiFunction<Player, RayTraceUtils.RRayTraceResult, Vector> position;
-        private String name;
-        private Function<Vector, SimulatorElement<?>> elementFunction;
+        public final Material material;
+        public final Material nonSelectedMaterial;
+        public final BiFunction<Player, RayTraceUtils.RRayTraceResult, Vector> position;
+        public final String name;
+        public final Function<Vector, SimulatorElement<?>> elementFunction;
     }
 
     @EventHandler
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorCursorSwitcherGui.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorCursorSwitcherGui.java
new file mode 100644
index 00000000..734fe597
--- /dev/null
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorCursorSwitcherGui.java
@@ -0,0 +1,67 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2020  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.simulator.gui;
+
+import de.steamwar.bausystem.features.simulator.SimulatorCursor;
+import de.steamwar.bausystem.features.simulator.data.Simulator;
+import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui;
+import de.steamwar.data.CMDs;
+import de.steamwar.inventory.SWItem;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+
+import java.util.Collections;
+
+public class SimulatorCursorSwitcherGui extends SimulatorBaseGui {
+
+    private SimulatorBaseGui back;
+
+    public SimulatorCursorSwitcherGui(Player player, Simulator simulator, SimulatorBaseGui back) {
+        super(player, simulator, 9);
+        this.back = back;
+    }
+
+    @Override
+    public String title() {
+        return "Simulator Cursor";
+    }
+
+    @Override
+    public void populate() {
+        inventory.setItem(0, new SWItem(Material.ARROW, "§eBack", clickType -> {
+            back.open();
+        }).setCustomModelData(CMDs.BACK));
+
+        int slot = 2;
+        SimulatorCursor.CursorType currentType = SimulatorCursor.getCursorType(player);
+        for (SimulatorCursor.CursorType type : SimulatorCursor.CursorType.values()) {
+            boolean selected = type == currentType;
+            SWItem swItem = new SWItem(selected ? type.material : type.nonSelectedMaterial, "§e" + type.name)
+                    .setCustomModelData(selected ? 0 : CMDs.Simulator.NEW_PHASE)
+                    .setLore(Collections.singletonList("§eClick to select"))
+                    .setCallback(click -> {
+                        SimulatorCursor.setCursorType(player, type);
+                        player.closeInventory();
+                    });
+            inventory.setItem(slot, swItem);
+            slot += 2;
+        }
+    }
+}
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorGui.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorGui.java
index c53e6613..22e6d39c 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorGui.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorGui.java
@@ -19,6 +19,7 @@
 
 package de.steamwar.bausystem.features.simulator.gui;
 
+import de.steamwar.bausystem.features.simulator.SimulatorCursor;
 import de.steamwar.bausystem.features.simulator.SimulatorWatcher;
 import de.steamwar.bausystem.features.simulator.data.Simulator;
 import de.steamwar.bausystem.features.simulator.data.SimulatorElement;
@@ -49,7 +50,11 @@ public class SimulatorGui extends SimulatorPageGui<SimulatorGroup> {
         inventory.setItem(4, simulator.toItem(player, clickType -> {
             new SimulatorMaterialGui(player, simulator, simulator::getMaterial, simulator::setMaterial, this).open();
         }));
-        inventory.setItem(49, new SWItem(Material.REPEATER, "§eSettings", clickType -> {
+        SimulatorCursor.CursorType cursorType = SimulatorCursor.getCursorType(player);
+        inventory.setItem(48, new SWItem(cursorType.material, "§7Placing §8-§e " + cursorType.name, clickType -> {
+            new SimulatorCursorSwitcherGui(player, simulator, this).open();
+        }));
+        inventory.setItem(50, new SWItem(Material.REPEATER, "§eSettings", clickType -> {
             new SimulatorSettingsGui(player, simulator, this).open();
         }).setCustomModelData(CMDs.Simulator.SETTINGS));
     }

From 67960bfc2a4ef139b27d9ebbda9ae0fad14fa7b1 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sat, 18 Oct 2025 13:36:15 +0200
Subject: [PATCH 138/214] Add Baumwolle_777 for TestblockCommand

---
 .../de/steamwar/bausystem/features/region/TestblockCommand.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java
index cc650b40..a51e5b72 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java
@@ -104,6 +104,7 @@ public class TestblockCommand extends SWCommand {
             case 11077:
             case 11888:
             case 12258:
+            case 16009:
                 if (node == null) {
                     node = region.getRegionData().getTestblockSchematic();
                 } else {

From ed672ec07a35f6a2b030c3a7bd0e35cbee976e6a Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sat, 18 Oct 2025 13:36:55 +0200
Subject: [PATCH 139/214] Add ExpectedCow4019 for TestblockCommand

---
 .../de/steamwar/bausystem/features/region/TestblockCommand.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java
index a51e5b72..5b628637 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java
@@ -100,6 +100,7 @@ public class TestblockCommand extends SWCommand {
             case 1898:
             case 3320:
             case 4603:
+            case 5262:
             case 6032:
             case 11077:
             case 11888:

From 3676da7679ecd19476c6ea8673fea7a44004c7b8 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Thu, 23 Oct 2025 17:12:37 +0200
Subject: [PATCH 140/214] Add zKrote for TestblockCommand

---
 .../de/steamwar/bausystem/features/region/TestblockCommand.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java
index 5b628637..9d5cf5ef 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java
@@ -101,6 +101,7 @@ public class TestblockCommand extends SWCommand {
             case 3320:
             case 4603:
             case 5262:
+            case 5399:
             case 6032:
             case 11077:
             case 11888:

From 04d796bbfc8204d2dce05c81917abe3e25485237 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Thu, 23 Oct 2025 17:17:49 +0200
Subject: [PATCH 141/214] Add millo_cracy for TestblockCommand

---
 .../de/steamwar/bausystem/features/region/TestblockCommand.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java
index 9d5cf5ef..c00b8b3d 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java
@@ -103,6 +103,7 @@ public class TestblockCommand extends SWCommand {
             case 5262:
             case 5399:
             case 6032:
+            case 7862:
             case 11077:
             case 11888:
             case 12258:

From ca589bd07c57b44a1332ce7650c8d995a5e2b25c Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Mon, 29 Sep 2025 10:17:49 +0200
Subject: [PATCH 142/214] Add Linkage to CommonCore and implement SpigotLinker
 used in BauSystem

---
 .../src/de/steamwar/bausystem/BauSystem.java  | 160 ++++--------------
 .../features/bau/BauInfoBauGuiItem.java       |   1 -
 .../features/loadtimer/LoadtimerListener.java |   1 -
 .../features/region/ColorCommand.java         |   2 -
 .../region/RegionScoreboardElement.java       |   3 -
 .../features/script/event/EventListener.java  |   2 -
 .../features/techhider/TechHiderCommand.java  |   4 -
 .../util/items/NightVisionBauGuiItem.java     |   1 -
 .../linkage/specific/ScoreboardItem.java      |  37 ----
 CommonCore/Linkage/build.gradle.kts           |  26 +++
 .../de/steamwar/linkage/AbstractLinker.java   | 152 +++++++++++++++++
 .../src/de/steamwar/linkage/Linked.java       |   0
 .../de/steamwar/linkage/LinkedInstance.java   |   0
 .../src/de/steamwar/linkage/MaxVersion.java   |   0
 .../src/de/steamwar/linkage/MinVersion.java   |   0
 .../src/de/steamwar/linkage/PluginCheck.java  |   0
 .../src/de/steamwar/linkage/api/Disable.java  |   0
 .../src/de/steamwar/linkage/api/Enable.java   |   0
 CommonCore/build.gradle.kts                   |   1 +
 .../src/de/steamwar/linkage/SpigotLinker.java |  82 +++++++++
 settings.gradle.kts                           |   3 +-
 21 files changed, 297 insertions(+), 178 deletions(-)
 delete mode 100644 BauSystem/BauSystem_Main/src/de/steamwar/bausystem/linkage/specific/ScoreboardItem.java
 create mode 100644 CommonCore/Linkage/build.gradle.kts
 create mode 100644 CommonCore/Linkage/src/de/steamwar/linkage/AbstractLinker.java
 rename {BauSystem/BauSystem_Main => CommonCore/Linkage}/src/de/steamwar/linkage/Linked.java (100%)
 rename {BauSystem/BauSystem_Main => CommonCore/Linkage}/src/de/steamwar/linkage/LinkedInstance.java (100%)
 rename {BauSystem/BauSystem_Main => CommonCore/Linkage}/src/de/steamwar/linkage/MaxVersion.java (100%)
 rename {BauSystem/BauSystem_Main => CommonCore/Linkage}/src/de/steamwar/linkage/MinVersion.java (100%)
 rename {BauSystem/BauSystem_Main => CommonCore/Linkage}/src/de/steamwar/linkage/PluginCheck.java (100%)
 rename {BauSystem/BauSystem_Main => CommonCore/Linkage}/src/de/steamwar/linkage/api/Disable.java (100%)
 rename {BauSystem/BauSystem_Main => CommonCore/Linkage}/src/de/steamwar/linkage/api/Enable.java (100%)
 create mode 100644 SpigotCore/SpigotCore_Main/src/de/steamwar/linkage/SpigotLinker.java

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java
index af84b780..4d473261 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java
@@ -38,41 +38,29 @@ import de.steamwar.bausystem.utils.TickListener;
 import de.steamwar.bausystem.utils.TickManager;
 import de.steamwar.bausystem.worlddata.WorldData;
 import de.steamwar.command.AbstractValidator;
-import de.steamwar.command.SWCommand;
 import de.steamwar.command.SWCommandUtils;
 import de.steamwar.core.CRIUSleepEvent;
-import de.steamwar.core.Core;
 import de.steamwar.core.WorldEditRendererCUIEditor;
-import de.steamwar.linkage.LinkedInstance;
-import de.steamwar.linkage.MaxVersion;
-import de.steamwar.linkage.MinVersion;
-import de.steamwar.linkage.PluginCheck;
-import de.steamwar.linkage.api.Disable;
-import de.steamwar.linkage.api.Enable;
+import de.steamwar.linkage.AbstractLinker;
+import de.steamwar.linkage.SpigotLinker;
 import de.steamwar.message.Message;
-import de.steamwar.network.packets.PacketHandler;
 import lombok.Getter;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
-import org.bukkit.event.HandlerList;
 import org.bukkit.event.Listener;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.scheduler.BukkitTask;
 
-import java.io.*;
-import java.lang.reflect.Field;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintStream;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
 import java.util.logging.Level;
-import java.util.stream.Collectors;
 
 public class BauSystem extends JavaPlugin implements Listener {
 
@@ -83,7 +71,7 @@ public class BauSystem extends JavaPlugin implements Listener {
     @Getter
     private static BauSystem instance;
 
-    private final Map<Class<?>, Object> instances = new HashMap<>();
+    private SpigotLinker linker;
 
     @Override
     public void onEnable() {
@@ -96,115 +84,43 @@ public class BauSystem extends JavaPlugin implements Listener {
         SWUtils.setBausystem(instance);
 
         RegionSystem.INSTANCE.load();
-        /*
-        try {
-            PrototypeLoader.load();
-            RegionLoader.load();
-        } catch (SecurityException e) {
-            Bukkit.getLogger().log(Level.SEVERE, e.getMessage(), e);
-            Bukkit.shutdown();
-            System.exit(1);
-            return;
-        }
-
-        new Updater(PrototypeLoader.file, PrototypeLoader::load);
-        new Updater(RegionLoader.file, RegionLoader::load);
-         */
 
         SWCommandUtils.addValidator(Player.class, validator(Permission.BUILD));
         SWCommandUtils.addValidator(CommandSender.class, validator(Permission.BUILD));
         SWCommandUtils.addValidator("supervisor", validator(Permission.SUPERVISOR));
         SWCommandUtils.addValidator("owner", validator(Permission.OWNER));
 
-        instances.put(BauServer.class, BauServer.getInstance());
-        List<Class<?>> classes = new BufferedReader(new InputStreamReader(BauSystem.class.getResourceAsStream("/META-INF/annotations/de.steamwar.linkage.Linked")))
-                .lines()
-                .map(s -> {
-                    try {
-                        return Class.forName(s, false, BauSystem.class.getClassLoader());
-                    } catch (ClassNotFoundException | NoClassDefFoundError e) {
-                        if (e.getMessage().equals(s)) {
-                            Bukkit.shutdown();
-                            throw new SecurityException(e.getMessage(), e);
-                        }
-                        return null;
-                    }
-                })
-                .filter(Objects::nonNull)
-                .collect(Collectors.toList());
-        classes.forEach(clazz -> {
-            MinVersion minVersion = clazz.getAnnotation(MinVersion.class);
-            MaxVersion maxVersion = clazz.getAnnotation(MaxVersion.class);
-            PluginCheck[] pluginChecks = clazz.getAnnotationsByType(PluginCheck.class);
-            if (minVersion != null && Core.getVersion() < minVersion.value()) {
-                return;
-            }
-            if (maxVersion != null && Core.getVersion() > maxVersion.value()) {
-                return;
-            }
-            for (PluginCheck pluginCheck : pluginChecks) {
-                if (pluginCheck.has() == PluginCheck.Has.THIS && Bukkit.getPluginManager().getPlugin(pluginCheck.value()) != null) {
-                    continue;
+        linker = new SpigotLinker(BauSystem.getInstance(), BauSystem.MESSAGE) {
+            @Override
+            protected void linkObject(Object any) {
+                super.linkObject(any);
+                if (any instanceof LuaLib) {
+                    SteamWarLuaPlugin.add((LuaLib) any);
                 }
-                if (pluginCheck.has() == PluginCheck.Has.NOT && Bukkit.getPluginManager().getPlugin(pluginCheck.value()) == null) {
-                    continue;
+                if (any instanceof ScoreboardElement) {
+                    BauScoreboard.addElement((ScoreboardElement) any);
                 }
-                return;
-            }
-
-            Object any;
-            try {
-                any = clazz.newInstance();
-            } catch (InstantiationException | IllegalAccessException e) {
-                getLogger().log(Level.SEVERE, e.getMessage(), e);
-                Bukkit.shutdown();
-                throw new SecurityException(e.getMessage());
-            }
-
-            instances.put(clazz, any);
-            if (any instanceof Enable) {
-                ((Enable) any).enable();
-            }
-            if (any instanceof SWCommand) {
-                ((SWCommand) any).setMessage(BauSystem.MESSAGE);
-            }
-            if (any instanceof Listener) {
-                Bukkit.getPluginManager().registerEvents((Listener) any, BauSystem.getInstance());
-            }
-            if (any instanceof PacketHandler) {
-                ((PacketHandler) any).register();
-            }
-            if (any instanceof LuaLib) {
-                SteamWarLuaPlugin.add((LuaLib) any);
-            }
-            if (any instanceof ScoreboardElement) {
-                BauScoreboard.addElement((ScoreboardElement) any);
-            }
-            if (any instanceof BauGuiItem) {
-                BauGUI.addItem((BauGuiItem) any);
-            }
-            if (any instanceof PanzernAlgorithm) {
-                Panzern.add((PanzernAlgorithm) any);
-            }
-            if (any instanceof ConfigConverter) {
-                Config.addConfigConverter((ConfigConverter) any);
-            }
-            if (any instanceof BoundingBoxLoader) {
-                ((BoundingBoxLoader) any).load();
-            }
-        });
-
-        instances.forEach((clazz, o) -> {
-            for (Field field : clazz.getFields()) {
-                if (field.getAnnotation(LinkedInstance.class) != null) {
-                    try {
-                        field.set(o, instances.get(field.getType()));
-                    } catch (IllegalAccessException e) {
-                        throw new RuntimeException(e);
-                    }
+                if (any instanceof BauGuiItem) {
+                    BauGUI.addItem((BauGuiItem) any);
+                }
+                if (any instanceof PanzernAlgorithm) {
+                    Panzern.add((PanzernAlgorithm) any);
+                }
+                if (any instanceof ConfigConverter) {
+                    Config.addConfigConverter((ConfigConverter) any);
+                }
+                if (any instanceof BoundingBoxLoader) {
+                    ((BoundingBoxLoader) any).load();
                 }
             }
-        });
+        };
+        try {
+            linker.addLinkableInstance(BauServer.getInstance());
+            linker.link();
+        } catch (AbstractLinker.LinkException e) {
+            getLogger().log(Level.SEVERE, "Could not link a class.", e);
+            Bukkit.shutdown();
+        }
 
         TickListener.impl.init();
 
@@ -221,15 +137,7 @@ public class BauSystem extends JavaPlugin implements Listener {
 
     @Override
     public void onDisable() {
-        instances.forEach((aClass, o) -> {
-            if (o instanceof Listener) {
-                HandlerList.unregisterAll((Listener) o);
-            }
-            if (o instanceof Disable) {
-                ((Disable) o).disable();
-            }
-        });
-
+        linker.unlink();
         WorldData.write();
         RegionSystem.INSTANCE.save();
         Config.getInstance().saveAll();
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/bau/BauInfoBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/bau/BauInfoBauGuiItem.java
index 8a3cffb4..6553f44a 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/bau/BauInfoBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/bau/BauInfoBauGuiItem.java
@@ -26,7 +26,6 @@ import de.steamwar.bausystem.linkage.specific.BauGuiItem;
 import de.steamwar.bausystem.region.FlagOptional;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.core.Core;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.linkage.Linked;
 import de.steamwar.sql.SteamwarUser;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loadtimer/LoadtimerListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loadtimer/LoadtimerListener.java
index c528b9ad..d9cf2118 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loadtimer/LoadtimerListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loadtimer/LoadtimerListener.java
@@ -23,7 +23,6 @@ import de.steamwar.bausystem.region.Region;
 import de.steamwar.core.TrickyTrialsWrapper;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
-import org.bukkit.entity.EntityType;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.BlockPlaceEvent;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ColorCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ColorCommand.java
index 6c086ded..4b03cf8a 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ColorCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ColorCommand.java
@@ -25,8 +25,6 @@ import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.RegionUtils;
 import de.steamwar.bausystem.region.flags.ColorMode;
 import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.region.utils.RegionExtensionType;
-import de.steamwar.bausystem.region.utils.RegionType;
 import de.steamwar.bausystem.utils.PasteBuilder;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeValidator;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionScoreboardElement.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionScoreboardElement.java
index b810bb1e..9164040f 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionScoreboardElement.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionScoreboardElement.java
@@ -23,12 +23,9 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.utils.ScoreboardElement;
 import de.steamwar.linkage.Linked;
-import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
 
-import java.io.File;
 import java.util.List;
-import java.util.Optional;
 
 @Linked
 public class RegionScoreboardElement implements ScoreboardElement {
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/event/EventListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/event/EventListener.java
index 54ddac4e..33946536 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/event/EventListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/event/EventListener.java
@@ -25,8 +25,6 @@ import de.steamwar.bausystem.features.script.ScriptRunner;
 import de.steamwar.bausystem.features.script.lua.SteamWarGlobalLuaPlugin;
 import de.steamwar.bausystem.features.script.lua.libs.StorageLib;
 import de.steamwar.bausystem.region.Region;
-import de.steamwar.bausystem.region.utils.RegionExtensionType;
-import de.steamwar.bausystem.region.utils.RegionType;
 import de.steamwar.core.TrickyTrialsWrapper;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/techhider/TechHiderCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/techhider/TechHiderCommand.java
index 5f205e79..91a3d3a0 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/techhider/TechHiderCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/techhider/TechHiderCommand.java
@@ -34,16 +34,12 @@ import de.steamwar.linkage.LinkedInstance;
 import de.steamwar.techhider.TechHider;
 import net.md_5.bungee.api.ChatMessageType;
 import org.bukkit.Bukkit;
-import org.bukkit.Material;
 import org.bukkit.command.CommandSender;
-import org.bukkit.configuration.file.FileConfiguration;
-import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerQuitEvent;
 
-import java.io.File;
 import java.util.*;
 import java.util.stream.Collectors;
 
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/NightVisionBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/NightVisionBauGuiItem.java
index 03ebb495..fb73dd8b 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/NightVisionBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/NightVisionBauGuiItem.java
@@ -28,7 +28,6 @@ import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
-import org.bukkit.inventory.ItemFlag;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.PotionMeta;
 import org.bukkit.potion.PotionEffectType;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/linkage/specific/ScoreboardItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/linkage/specific/ScoreboardItem.java
deleted file mode 100644
index 6a5dad27..00000000
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/linkage/specific/ScoreboardItem.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * This file is a part of the SteamWar software.
- *
- * Copyright (C) 2021  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.linkage.specific;
-
-import de.steamwar.bausystem.region.Region;
-import org.bukkit.entity.Player;
-
-public interface ScoreboardItem {
-
-    /**
-     * Returns one Scoreboard line. If {@code null} result will be ignored.
-     * If return value contains {@code '?'} it will be replaced to the color
-     * code of the current {@link Region}.
-     *
-     * @param player the player to create the scoreboard line for
-     * @param region the region the player is in
-     * @return the String to send, can be {@code null}
-     */
-    String getString(Player player, Region region);
-}
diff --git a/CommonCore/Linkage/build.gradle.kts b/CommonCore/Linkage/build.gradle.kts
new file mode 100644
index 00000000..dd139c6b
--- /dev/null
+++ b/CommonCore/Linkage/build.gradle.kts
@@ -0,0 +1,26 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2024  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/>.
+ */
+
+plugins {
+    steamwar.java
+}
+
+dependencies {
+    compileOnly(libs.classindex)
+}
diff --git a/CommonCore/Linkage/src/de/steamwar/linkage/AbstractLinker.java b/CommonCore/Linkage/src/de/steamwar/linkage/AbstractLinker.java
new file mode 100644
index 00000000..ab401aa2
--- /dev/null
+++ b/CommonCore/Linkage/src/de/steamwar/linkage/AbstractLinker.java
@@ -0,0 +1,152 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2020  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.linkage;
+
+import de.steamwar.linkage.api.Disable;
+import de.steamwar.linkage.api.Enable;
+import lombok.NonNull;
+import lombok.experimental.StandardException;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.lang.reflect.Field;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+public abstract class AbstractLinker<T> {
+
+    protected final T plugin;
+    private Map<Class<?>, Object> instances = new HashMap<>();
+
+    protected AbstractLinker(@NonNull T plugin) {
+        this.plugin = plugin;
+        instances.put(plugin.getClass(), plugin);
+    }
+
+    @StandardException
+    public static class LinkException extends Exception {
+    }
+
+    public final void link() throws LinkException {
+        List<Class<?>> classes;
+        try {
+            classes = new BufferedReader(new InputStreamReader(plugin.getClass().getResourceAsStream("/META-INF/annotations/de.steamwar.linkage.Linked")))
+                    .lines()
+                    .map(s -> {
+                        try {
+                            return Class.forName(s, false, plugin.getClass().getClassLoader());
+                        } catch (ClassNotFoundException | NoClassDefFoundError e) {
+                            throw new SecurityException(e.getMessage(), e);
+                        }
+                    })
+                    .filter(Objects::nonNull)
+                    .collect(Collectors.toList());
+        } catch (SecurityException e) {
+            Throwable cause = e.getCause();
+            throw new LinkException(cause.getMessage(), cause);
+        }
+
+        try {
+            classes.forEach(clazz -> {
+                MinVersion minVersion = clazz.getAnnotation(MinVersion.class);
+                MaxVersion maxVersion = clazz.getAnnotation(MaxVersion.class);
+                if (!versionCheck(clazz, minVersion, maxVersion)) return;
+                PluginCheck[] pluginChecks = clazz.getAnnotationsByType(PluginCheck.class);
+                for (PluginCheck pluginCheck : pluginChecks) {
+                    if (!pluginCheck(clazz, pluginCheck)) return;
+                }
+
+                Object any;
+                try {
+                    any = clazz.newInstance();
+                } catch (InstantiationException | IllegalAccessException e) {
+                    throw new SecurityException(e.getMessage());
+                }
+                instances.put(clazz, any);
+
+                if (any instanceof Enable) {
+                    ((Enable) any).enable();
+                }
+                linkObject(any);
+            });
+        } catch (SecurityException e) {
+            Throwable cause = e.getCause();
+            throw new LinkException(cause.getMessage(), cause);
+        }
+
+        try {
+            instances.forEach((clazz, o) -> {
+                for (Field field : clazz.getFields()) {
+                    if (field.getAnnotation(LinkedInstance.class) != null) {
+                        System.out.println("Setting " + field.getName() + " to " + instances.get(field.getType()));
+                        try {
+                            field.set(o, instances.get(field.getType()));
+                        } catch (IllegalAccessException e) {
+                            throw new SecurityException(e);
+                        }
+                    }
+                }
+            });
+        } catch (SecurityException e) {
+            Throwable cause = e.getCause();
+            throw new LinkException(cause.getMessage(), cause);
+        }
+    }
+
+    public final void unlink() {
+        instances.forEach((aClass, any) -> {
+            unlinkObject(any);
+            if (any instanceof Disable) {
+                ((Disable) any).disable();
+            }
+        });
+    }
+
+    public final void addLinkableInstance(@NonNull Object instance) {
+        instances.put(instance.getClass(), instance);
+    }
+
+    /**
+     * @return {@code true} if the clazz passes the checks {@code false} otherwise
+     */
+    protected boolean versionCheck(@NonNull Class<?> clazz, MinVersion minVersion, MaxVersion maxVersion) {
+        return true;
+    }
+
+    /**
+     * @return {@code true} if the clazz passes the checks {@code false} otherwise
+     */
+    protected boolean pluginCheck(@NonNull Class<?> clazz, PluginCheck pluginCheck) {
+        return true;
+    }
+
+    /**
+     * There is no need in calling {@link Enable#enable()} by this method.
+     */
+    protected abstract void linkObject(Object any);
+
+    /**
+     * There is no need in calling {@link Disable#disable()} ()} by this method.
+     */
+    protected abstract void unlinkObject(Object any);
+}
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/linkage/Linked.java b/CommonCore/Linkage/src/de/steamwar/linkage/Linked.java
similarity index 100%
rename from BauSystem/BauSystem_Main/src/de/steamwar/linkage/Linked.java
rename to CommonCore/Linkage/src/de/steamwar/linkage/Linked.java
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/linkage/LinkedInstance.java b/CommonCore/Linkage/src/de/steamwar/linkage/LinkedInstance.java
similarity index 100%
rename from BauSystem/BauSystem_Main/src/de/steamwar/linkage/LinkedInstance.java
rename to CommonCore/Linkage/src/de/steamwar/linkage/LinkedInstance.java
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/linkage/MaxVersion.java b/CommonCore/Linkage/src/de/steamwar/linkage/MaxVersion.java
similarity index 100%
rename from BauSystem/BauSystem_Main/src/de/steamwar/linkage/MaxVersion.java
rename to CommonCore/Linkage/src/de/steamwar/linkage/MaxVersion.java
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/linkage/MinVersion.java b/CommonCore/Linkage/src/de/steamwar/linkage/MinVersion.java
similarity index 100%
rename from BauSystem/BauSystem_Main/src/de/steamwar/linkage/MinVersion.java
rename to CommonCore/Linkage/src/de/steamwar/linkage/MinVersion.java
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/linkage/PluginCheck.java b/CommonCore/Linkage/src/de/steamwar/linkage/PluginCheck.java
similarity index 100%
rename from BauSystem/BauSystem_Main/src/de/steamwar/linkage/PluginCheck.java
rename to CommonCore/Linkage/src/de/steamwar/linkage/PluginCheck.java
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/linkage/api/Disable.java b/CommonCore/Linkage/src/de/steamwar/linkage/api/Disable.java
similarity index 100%
rename from BauSystem/BauSystem_Main/src/de/steamwar/linkage/api/Disable.java
rename to CommonCore/Linkage/src/de/steamwar/linkage/api/Disable.java
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/linkage/api/Enable.java b/CommonCore/Linkage/src/de/steamwar/linkage/api/Enable.java
similarity index 100%
rename from BauSystem/BauSystem_Main/src/de/steamwar/linkage/api/Enable.java
rename to CommonCore/Linkage/src/de/steamwar/linkage/api/Enable.java
diff --git a/CommonCore/build.gradle.kts b/CommonCore/build.gradle.kts
index 8e2df2bc..7105676f 100644
--- a/CommonCore/build.gradle.kts
+++ b/CommonCore/build.gradle.kts
@@ -25,4 +25,5 @@ dependencies {
     api(project(":CommonCore:SQL"))
     api(project(":CommonCore:Network"))
     api(project(":CommonCore:Data"))
+    api(project(":CommonCore:Linkage"))
 }
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/linkage/SpigotLinker.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/linkage/SpigotLinker.java
new file mode 100644
index 00000000..35abb954
--- /dev/null
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/linkage/SpigotLinker.java
@@ -0,0 +1,82 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2020  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.linkage;
+
+import de.steamwar.command.SWCommand;
+import de.steamwar.core.Core;
+import de.steamwar.message.Message;
+import de.steamwar.network.packets.PacketHandler;
+import lombok.NonNull;
+import org.bukkit.Bukkit;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.Listener;
+import org.bukkit.plugin.java.JavaPlugin;
+
+public class SpigotLinker extends AbstractLinker<JavaPlugin> {
+
+    private final Message message;
+
+    public SpigotLinker(@NonNull JavaPlugin plugin, Message message) {
+        super(plugin);
+        this.message = message;
+    }
+
+    @Override
+    protected boolean versionCheck(@NonNull Class<?> clazz, MinVersion minVersion, MaxVersion maxVersion) {
+        if (minVersion != null && Core.getVersion() < minVersion.value()) {
+            return false;
+        }
+        if (maxVersion != null && Core.getVersion() > maxVersion.value()) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    protected boolean pluginCheck(@NonNull Class<?> clazz, PluginCheck pluginCheck) {
+        if (pluginCheck.has() == PluginCheck.Has.THIS && Bukkit.getPluginManager().getPlugin(pluginCheck.value()) != null) {
+            return true;
+        }
+        if (pluginCheck.has() == PluginCheck.Has.NOT && Bukkit.getPluginManager().getPlugin(pluginCheck.value()) == null) {
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    protected void linkObject(Object any) {
+        if (any instanceof SWCommand) {
+            ((SWCommand) any).setMessage(message);
+        }
+        if (any instanceof Listener) {
+            Bukkit.getPluginManager().registerEvents((Listener) any, plugin);
+        }
+        if (any instanceof PacketHandler) {
+            ((PacketHandler) any).register();
+        }
+    }
+
+    @Override
+    protected void unlinkObject(Object any) {
+        if (any instanceof Listener) {
+            HandlerList.unregisterAll((Listener) any);
+        }
+    }
+}
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 3bb2a9d8..7be8fc09 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -187,7 +187,8 @@ include(
     "CommonCore",
     "CommonCore:Data",
     "CommonCore:SQL",
-    "CommonCore:Network"
+    "CommonCore:Network",
+    "CommonCore:Linkage"
 )
 
 include(

From d850894a003d00e8c4eaa8fefc994951edb3ad5c Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Mon, 29 Sep 2025 15:26:26 +0200
Subject: [PATCH 143/214] Update VelocityCore to use Linkage

---
 .../de/steamwar/linkage/AbstractLinker.java   |  15 ++-
 .../src/de/steamwar/linkage/EventMode.java    |  31 +++++
 .../de/steamwar/velocitycore/Broadcaster.java |   6 +-
 .../steamwar/velocitycore/EventStarter.java   |   2 +
 .../steamwar/velocitycore/VelocityCore.java   | 110 ++++--------------
 .../velocitycore/commands/AlertCommand.java   |   2 +
 .../velocitycore/commands/ArenaCommand.java   |   2 +
 .../velocitycore/commands/BauCommand.java     |   8 +-
 .../velocitycore/commands/BugCommand.java     |   7 +-
 .../commands/BuilderCloudCommand.java         |   2 +
 .../commands/ChallengeCommand.java            |   4 +
 .../velocitycore/commands/CheckCommand.java   |   2 +
 .../velocitycore/commands/DevCommand.java     |   2 +
 .../velocitycore/commands/EventCommand.java   |   2 +
 .../commands/EventRescheduleCommand.java      |   2 +
 .../commands/EventreloadCommand.java          |   2 +
 .../velocitycore/commands/FightCommand.java   |   4 +
 .../velocitycore/commands/GDPRQuery.java      |   2 +
 .../velocitycore/commands/HelpCommand.java    |   2 +
 .../commands/HistoricCommand.java             |   4 +
 .../velocitycore/commands/IgnoreCommand.java  |   2 +
 .../velocitycore/commands/JoinmeCommand.java  |   2 +
 .../velocitycore/commands/KickCommand.java    |   2 +
 .../velocitycore/commands/ListCommand.java    |   2 +
 .../velocitycore/commands/LocalCommand.java   |   2 +
 .../velocitycore/commands/ModCommand.java     |   2 +
 .../velocitycore/commands/MsgCommand.java     |   7 +-
 .../velocitycore/commands/PingCommand.java    |   2 +
 .../commands/PlaytimeCommand.java             |   2 +
 .../velocitycore/commands/PollCommand.java    |   2 +
 .../commands/PollresultCommand.java           |   2 +
 .../velocitycore/commands/RCommand.java       |   2 +
 .../velocitycore/commands/RankCommand.java    |   2 +
 .../velocitycore/commands/ReplayCommand.java  |   4 +
 .../velocitycore/commands/RulesCommand.java   |   2 +
 .../velocitycore/commands/SendCommand.java    |   2 +
 .../commands/ServerTeamchatCommand.java       |   2 +
 .../commands/SetLocaleCommand.java            |   2 +
 .../velocitycore/commands/StatCommand.java    |   2 +
 .../commands/StreamingCommand.java            |   4 +
 .../velocitycore/commands/TeamCommand.java    |   2 +
 .../commands/TeamchatCommand.java             |   2 +
 .../velocitycore/commands/TpCommand.java      |   2 +
 .../commands/UnIgnoreCommand.java             |   2 +
 .../velocitycore/commands/VerifyCommand.java  |   2 +
 .../commands/WebpasswordCommand.java          |   4 +
 .../velocitycore/commands/WhoisCommand.java   |   3 +-
 .../velocitycore/listeners/BanListener.java   |   2 +
 .../velocitycore/listeners/ChatListener.java  |   2 +
 .../velocitycore/listeners/CheckListener.java |   2 +
 .../listeners/ConnectionListener.java         |   2 +
 .../velocitycore/listeners/CookieEvents.java  |   4 +
 .../listeners/EventModeListener.java          |  18 ++-
 .../velocitycore/listeners/IPSanitizer.java   |   2 +
 .../velocitycore/listeners/PluginMessage.java |   2 +
 .../listeners/SessionManager.java             |   2 +
 .../listeners/SettingsChangedListener.java    |   2 +
 .../listeners/TexturePackSystem.java          |   2 +
 .../listeners/VersionAnnouncer.java           |   2 +
 .../steamwar/velocitycore/mods/Badlion.java   |   2 +
 .../de/steamwar/velocitycore/mods/FML2.java   |   2 +
 .../velocitycore/mods/FabricModSender.java    |   2 +
 .../steamwar/velocitycore/mods/Hostname.java  |   2 +
 .../steamwar/velocitycore/mods/ReplayMod.java |   2 +
 .../velocitycore/mods/Schematica.java         |   2 +
 .../network/handlers/AnvilAnswerHandler.java  |   2 +
 .../network/handlers/EloPlayerHandler.java    |   3 +
 .../network/handlers/EloSchemHandler.java     |   2 +
 .../handlers/ExecuteCommandHandler.java       |   2 +
 .../network/handlers/FightInfoHandler.java    |   2 +
 .../network/handlers/ImALobbyHandler.java     |   2 +
 .../handlers/InventoryCallbackHandler.java    |   2 +
 .../network/handlers/PlayerSkinHandler.java   |   2 +
 .../network/handlers/PrepareSchemHandler.java |   2 +
 .../velocitycore/tablist/TablistManager.java  |   5 +-
 75 files changed, 246 insertions(+), 109 deletions(-)
 create mode 100644 CommonCore/Linkage/src/de/steamwar/linkage/EventMode.java

diff --git a/CommonCore/Linkage/src/de/steamwar/linkage/AbstractLinker.java b/CommonCore/Linkage/src/de/steamwar/linkage/AbstractLinker.java
index ab401aa2..2c013f76 100644
--- a/CommonCore/Linkage/src/de/steamwar/linkage/AbstractLinker.java
+++ b/CommonCore/Linkage/src/de/steamwar/linkage/AbstractLinker.java
@@ -71,6 +71,8 @@ public abstract class AbstractLinker<T> {
                 MinVersion minVersion = clazz.getAnnotation(MinVersion.class);
                 MaxVersion maxVersion = clazz.getAnnotation(MaxVersion.class);
                 if (!versionCheck(clazz, minVersion, maxVersion)) return;
+                EventMode eventMode = clazz.getAnnotation(EventMode.class);
+                if (!eventModeCheck(clazz, eventMode)) return;
                 PluginCheck[] pluginChecks = clazz.getAnnotationsByType(PluginCheck.class);
                 for (PluginCheck pluginCheck : pluginChecks) {
                     if (!pluginCheck(clazz, pluginCheck)) return;
@@ -140,13 +142,22 @@ public abstract class AbstractLinker<T> {
         return true;
     }
 
+    /**
+     * @return {@code true} if the clazz passes the checks {@code false} otherwise
+     */
+    protected boolean eventModeCheck(@NonNull Class<?> clazz, EventMode eventMode) {
+        return true;
+    }
+
     /**
      * There is no need in calling {@link Enable#enable()} by this method.
      */
-    protected abstract void linkObject(Object any);
+    protected void linkObject(Object any) {
+    }
 
     /**
      * There is no need in calling {@link Disable#disable()} ()} by this method.
      */
-    protected abstract void unlinkObject(Object any);
+    protected void unlinkObject(Object any) {
+    }
 }
diff --git a/CommonCore/Linkage/src/de/steamwar/linkage/EventMode.java b/CommonCore/Linkage/src/de/steamwar/linkage/EventMode.java
new file mode 100644
index 00000000..513982aa
--- /dev/null
+++ b/CommonCore/Linkage/src/de/steamwar/linkage/EventMode.java
@@ -0,0 +1,31 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2020  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.linkage;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE})
+public @interface EventMode {
+    boolean value();
+}
diff --git a/VelocityCore/src/de/steamwar/velocitycore/Broadcaster.java b/VelocityCore/src/de/steamwar/velocitycore/Broadcaster.java
index f5df6d10..f5a05b7f 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/Broadcaster.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/Broadcaster.java
@@ -19,17 +19,21 @@
 
 package de.steamwar.velocitycore;
 
+import de.steamwar.linkage.EventMode;
+import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
 
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
+@Linked
+@EventMode(false)
 class Broadcaster {
 
     private final List<String> broadcasts = VelocityCore.get().getConfig().getBroadcasts();
     private int lastBroadCast = 0;
 
-    Broadcaster() {
+    public Broadcaster() {
         if(!broadcasts.isEmpty())
             VelocityCore.schedule(this::broadcast).repeat(10, TimeUnit.MINUTES).schedule();
     }
diff --git a/VelocityCore/src/de/steamwar/velocitycore/EventStarter.java b/VelocityCore/src/de/steamwar/velocitycore/EventStarter.java
index 2a5f85f7..6401ec30 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/EventStarter.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/EventStarter.java
@@ -19,6 +19,7 @@
 
 package de.steamwar.velocitycore;
 
+import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.Message;
 import de.steamwar.persistent.Subserver;
@@ -36,6 +37,7 @@ import java.util.concurrent.TimeUnit;
 
 import static de.steamwar.persistent.Storage.eventServer;
 
+@Linked
 public class EventStarter {
 
     @Getter
diff --git a/VelocityCore/src/de/steamwar/velocitycore/VelocityCore.java b/VelocityCore/src/de/steamwar/velocitycore/VelocityCore.java
index d5ae82e9..58a9033c 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/VelocityCore.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/VelocityCore.java
@@ -29,22 +29,24 @@ import com.velocitypowered.api.plugin.annotation.DataDirectory;
 import com.velocitypowered.api.proxy.ProxyServer;
 import com.velocitypowered.api.scheduler.Scheduler;
 import de.steamwar.command.*;
+import de.steamwar.linkage.AbstractLinker;
+import de.steamwar.linkage.EventMode;
+import de.steamwar.linkage.LinkedInstance;
 import de.steamwar.messages.Chatter;
-import de.steamwar.network.packets.PacketHandler;
 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.*;
+import de.steamwar.velocitycore.commands.PunishmentCommand;
+import de.steamwar.velocitycore.commands.ServerSwitchCommand;
+import de.steamwar.velocitycore.commands.TeamCommand;
 import de.steamwar.velocitycore.discord.DiscordBot;
 import de.steamwar.velocitycore.discord.DiscordConfig;
-import de.steamwar.velocitycore.listeners.*;
-import de.steamwar.velocitycore.mods.*;
-import de.steamwar.velocitycore.network.handlers.*;
-import de.steamwar.velocitycore.tablist.TablistManager;
+import de.steamwar.velocitycore.listeners.PollSystem;
 import lombok.Getter;
+import lombok.NonNull;
 
 import java.nio.file.Path;
 import java.sql.Driver;
@@ -94,9 +96,9 @@ public class VelocityCore implements ReloadablePlugin {
     @Getter
     private Config config;
     private ErrorLogger errorLogger;
-    private TablistManager tablistManager;
 
     @Getter
+    @LinkedInstance
     private TeamCommand teamCommand;
 
     @Inject
@@ -104,9 +106,10 @@ public class VelocityCore implements ReloadablePlugin {
         this.proxyServer = proxyServer;
         this.logger = logger;
         this.dataDirectory = dataDirectory;
-
     }
 
+    private AbstractLinker<ReloadablePlugin> linker;
+
     @Subscribe
     @Override
     public void onProxyInitialization(ProxyInitializeEvent event) {
@@ -139,64 +142,11 @@ public class VelocityCore implements ReloadablePlugin {
         initStaticServers();
         PollSystem.init();
 
-        new Hostname();
-        new PluginMessage();
-        new Schematica();
-        new Badlion();
-        new FabricModSender();
-        new ReplayMod();
-        new FML2();
-
-        new ConnectionListener();
-        new ChatListener();
-        new BanListener();
-        new CheckListener();
-        new IPSanitizer();
-        new VersionAnnouncer();
-        new TexturePackSystem();
-
         local = new Node.LocalNode();
         if(MAIN_SERVER) {
             //new Node.RemoteNode("lx");
         }
 
-        new TeamchatCommand();
-        new MsgCommand();
-        new RCommand();
-        new PingCommand();
-        new AlertCommand();
-        new KickCommand();
-        new JoinmeCommand();
-        new TpCommand();
-        HelpCommand helpCommand = new HelpCommand();
-        teamCommand = new TeamCommand();
-        new ServerTeamchatCommand();
-        new DevCommand();
-        new SendCommand();
-        new EventCommand();
-        new EventreloadCommand();
-        new EventRescheduleCommand();
-        new PollCommand();
-        new BugCommand();
-        new WhoisCommand();
-        new RulesCommand();
-        new IgnoreCommand();
-        new UnIgnoreCommand();
-        new PollresultCommand();
-        new ListCommand();
-        new StatCommand();
-        new VerifyCommand();
-        new GDPRQuery();
-        new PlaytimeCommand();
-        new ArenaCommand();
-        new RankCommand();
-        new LocalCommand();
-        new SetLocaleCommand();
-        new BuilderCloudCommand();
-        new CheckCommand();
-
-        new ModCommand();
-
         // Punishment Commands:
         new PunishmentCommand("ban", Punishment.PunishmentType.Ban);
         new PunishmentCommand("mute", Punishment.PunishmentType.Mute);
@@ -208,32 +158,19 @@ public class VelocityCore implements ReloadablePlugin {
         new PunishmentCommand("noteamserver", Punishment.PunishmentType.NoTeamServer);
         new PunishmentCommand("note", Punishment.PunishmentType.Note);
 
-        if(!config.isEventmode()){
-            new BauCommand(helpCommand);
-            new WebpasswordCommand();
-            new FightCommand();
-            new ChallengeCommand();
-            new HistoricCommand();
-            new ReplayCommand();
-
-            new Broadcaster();
-            new CookieEvents();
-            new StreamingCommand();
-        }else{
-            new EventModeListener();
+        linker = new AbstractLinker<>(this) {
+            @Override
+            protected boolean eventModeCheck(@NonNull Class<?> clazz, EventMode eventMode) {
+                return eventMode == null || eventMode.value() == config.isEventmode();
+            }
+        };
+        try {
+            linker.link();
+        } catch (AbstractLinker.LinkException e) {
+            VelocityCore.getProxy().shutdown();
+            return;
         }
 
-        for(PacketHandler handler : new PacketHandler[] {
-                new EloPlayerHandler(), new EloSchemHandler(), new ExecuteCommandHandler(), new FightInfoHandler(),
-                new ImALobbyHandler(), new InventoryCallbackHandler(), new PrepareSchemHandler(), new PlayerSkinHandler(), new AnvilAnswerHandler()
-        })
-            handler.register();
-
-        new EventStarter();
-        new SessionManager();
-        tablistManager = new TablistManager();
-        new SettingsChangedListener();
-
         schedule(() -> {
             SteamwarUser.clear();
             UserElo.clear();
@@ -269,8 +206,7 @@ public class VelocityCore implements ReloadablePlugin {
             logger.log(Level.SEVERE, "Could not shutdown discord bot", e);
         }
 
-        if(tablistManager != null)
-            tablistManager.disable();
+        linker.unlink();
         errorLogger.unregister();
         Statement.closeAll();
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/AlertCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/AlertCommand.java
index b95bbd69..b1fed2f1 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/AlertCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/AlertCommand.java
@@ -19,11 +19,13 @@
 
 package de.steamwar.velocitycore.commands;
 
+import de.steamwar.linkage.Linked;
 import de.steamwar.velocitycore.discord.DiscordBot;
 import de.steamwar.command.SWCommand;
 import de.steamwar.messages.Chatter;
 import de.steamwar.sql.UserPerm;
 
+@Linked
 public class AlertCommand extends SWCommand {
 
     public AlertCommand() {
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/ArenaCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/ArenaCommand.java
index cee6cb04..c7d19a39 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/ArenaCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/ArenaCommand.java
@@ -23,6 +23,7 @@ import com.velocitypowered.api.proxy.server.RegisteredServer;
 import de.steamwar.command.PreviousArguments;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeMapper;
+import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.PlayerChatter;
 import de.steamwar.persistent.Subserver;
@@ -31,6 +32,7 @@ import de.steamwar.velocitycore.VelocityCore;
 import java.util.Collection;
 import java.util.List;
 
+@Linked
 public class ArenaCommand extends SWCommand {
 
     public ArenaCommand() {
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/BauCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/BauCommand.java
index 9b24434d..139524a0 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/BauCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/BauCommand.java
@@ -19,6 +19,9 @@
 
 package de.steamwar.velocitycore.commands;
 
+import de.steamwar.linkage.EventMode;
+import de.steamwar.linkage.Linked;
+import de.steamwar.linkage.LinkedInstance;
 import de.steamwar.velocitycore.*;
 import de.steamwar.velocitycore.inventory.SWInventory;
 import de.steamwar.velocitycore.inventory.SWItem;
@@ -40,9 +43,12 @@ import de.steamwar.sql.SteamwarUser;
 import java.util.Collection;
 import java.util.function.Consumer;
 
+@Linked
+@EventMode(false)
 public class BauCommand extends SWCommand {
 
-    private final HelpCommand command;
+    @LinkedInstance
+    private HelpCommand command;
 
     public BauCommand(HelpCommand command) {
         super("bau", "b", "build", "gs");
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/BugCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/BugCommand.java
index 088acb09..3a89640c 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/BugCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/BugCommand.java
@@ -19,12 +19,13 @@
 
 package de.steamwar.velocitycore.commands;
 
+import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
+import de.steamwar.messages.Chatter;
 import de.steamwar.persistent.Subserver;
 import de.steamwar.sql.SWException;
-import de.steamwar.command.SWCommand;
-import de.steamwar.messages.Chatter;
-import de.steamwar.velocitycore.SubserverSystem;
 
+@Linked
 public class BugCommand extends SWCommand {
     public BugCommand() {
         super("bug");
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/BuilderCloudCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/BuilderCloudCommand.java
index 51c0f1bf..766268f5 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/BuilderCloudCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/BuilderCloudCommand.java
@@ -19,6 +19,7 @@
 
 package de.steamwar.velocitycore.commands;
 
+import de.steamwar.linkage.Linked;
 import de.steamwar.velocitycore.ArenaMode;
 import de.steamwar.velocitycore.ServerStarter;
 import de.steamwar.velocitycore.ServerVersion;
@@ -37,6 +38,7 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 
+@Linked
 public class BuilderCloudCommand extends SWCommand {
 
     public BuilderCloudCommand() {
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/ChallengeCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/ChallengeCommand.java
index 78ced8d1..9e5fc81c 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/ChallengeCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/ChallengeCommand.java
@@ -22,6 +22,8 @@ package de.steamwar.velocitycore.commands;
 import com.velocitypowered.api.proxy.Player;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeValidator;
+import de.steamwar.linkage.EventMode;
+import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.Message;
 import de.steamwar.messages.PlayerChatter;
@@ -35,6 +37,8 @@ import java.util.LinkedList;
 
 import static de.steamwar.persistent.Storage.challenges;
 
+@Linked
+@EventMode(false)
 public class ChallengeCommand extends SWCommand {
 
     public ChallengeCommand() {
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/CheckCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/CheckCommand.java
index 8d618600..864187f4 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/CheckCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/CheckCommand.java
@@ -21,6 +21,7 @@ package de.steamwar.velocitycore.commands;
 
 import com.velocitypowered.api.proxy.Player;
 import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.Message;
 import de.steamwar.messages.PlayerChatter;
@@ -44,6 +45,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.function.BooleanSupplier;
 import java.util.logging.Level;
 
+@Linked
 public class CheckCommand extends SWCommand {
     private static final Map<SchematicType, SchematicType> fightTypes = new HashMap<>();
     private static final Map<SchematicType, List<String>> checkQuestions = new HashMap<>();
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/DevCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/DevCommand.java
index 39703e36..077c663f 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/DevCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/DevCommand.java
@@ -27,6 +27,7 @@ import de.steamwar.command.SWCommand;
 import de.steamwar.command.SWCommandUtils;
 import de.steamwar.command.TypeMapper;
 import de.steamwar.command.TypeValidator;
+import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.Message;
 import de.steamwar.messages.PlayerChatter;
@@ -43,6 +44,7 @@ import java.net.InetSocketAddress;
 import java.util.HashMap;
 import java.util.Map;
 
+@Linked
 public class DevCommand extends SWCommand {
 
     private final File devServerDir = new File("/configs/DevServer");
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/EventCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/EventCommand.java
index b57d6aad..27d85a86 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/EventCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/EventCommand.java
@@ -23,6 +23,7 @@ import de.steamwar.command.PreviousArguments;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeMapper;
 import de.steamwar.command.TypeValidator;
+import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.PlayerChatter;
 import de.steamwar.persistent.Subserver;
@@ -37,6 +38,7 @@ import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+@Linked
 public class EventCommand extends SWCommand {
 
     public EventCommand() {
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/EventRescheduleCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/EventRescheduleCommand.java
index 9660eba4..857a5060 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/EventRescheduleCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/EventRescheduleCommand.java
@@ -21,6 +21,7 @@ package de.steamwar.velocitycore.commands;
 
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeMapper;
+import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
 import de.steamwar.sql.Event;
 import de.steamwar.sql.EventFight;
@@ -32,6 +33,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.ListIterator;
 
+@Linked
 public class EventRescheduleCommand extends SWCommand {
 
     public EventRescheduleCommand() {
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/EventreloadCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/EventreloadCommand.java
index 45aa61b8..64e350b9 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/EventreloadCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/EventreloadCommand.java
@@ -20,10 +20,12 @@
 package de.steamwar.velocitycore.commands;
 
 import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
 import de.steamwar.sql.EventFight;
 import de.steamwar.sql.UserPerm;
 
+@Linked
 public class EventreloadCommand extends SWCommand {
     public EventreloadCommand() {
         super("eventreload", UserPerm.MODERATION);
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/FightCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/FightCommand.java
index ee82988c..39d9beea 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/FightCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/FightCommand.java
@@ -21,6 +21,8 @@ package de.steamwar.velocitycore.commands;
 
 import com.velocitypowered.api.proxy.Player;
 import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.EventMode;
+import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.Message;
 import de.steamwar.messages.PlayerChatter;
@@ -36,6 +38,8 @@ import net.kyori.adventure.text.event.HoverEvent;
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.format.TextDecoration;
 
+@Linked
+@EventMode(false)
 public class FightCommand extends SWCommand {
 
     public FightCommand() {
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/GDPRQuery.java b/VelocityCore/src/de/steamwar/velocitycore/commands/GDPRQuery.java
index e54a7ffa..32c9b1ec 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/GDPRQuery.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/GDPRQuery.java
@@ -19,6 +19,7 @@
 
 package de.steamwar.velocitycore.commands;
 
+import de.steamwar.linkage.Linked;
 import de.steamwar.velocitycore.VelocityCore;
 import de.steamwar.command.SWCommand;
 import de.steamwar.messages.Chatter;
@@ -31,6 +32,7 @@ import java.io.*;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
+@Linked
 public class GDPRQuery extends SWCommand {
 
     public GDPRQuery() {
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/HelpCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/HelpCommand.java
index 33e595d0..bdcfa73f 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/HelpCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/HelpCommand.java
@@ -20,12 +20,14 @@
 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 net.kyori.adventure.text.event.ClickEvent;
 
 import java.util.function.Function;
 
+@Linked
 public class HelpCommand extends SWCommand {
 
     public HelpCommand() {
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/HistoricCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/HistoricCommand.java
index 395eff33..dee2cb40 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/HistoricCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/HistoricCommand.java
@@ -20,6 +20,8 @@
 package de.steamwar.velocitycore.commands;
 
 import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.EventMode;
+import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.Message;
 import de.steamwar.messages.PlayerChatter;
@@ -27,6 +29,8 @@ import de.steamwar.velocitycore.ArenaMode;
 import de.steamwar.velocitycore.ServerStarter;
 import net.kyori.adventure.text.event.ClickEvent;
 
+@Linked
+@EventMode(false)
 public class HistoricCommand extends SWCommand {
     public HistoricCommand() {
         super("historic");
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/IgnoreCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/IgnoreCommand.java
index 684ab5a6..c6165cd0 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/IgnoreCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/IgnoreCommand.java
@@ -20,10 +20,12 @@
 package de.steamwar.velocitycore.commands;
 
 import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
 import de.steamwar.sql.IgnoreSystem;
 import de.steamwar.sql.SteamwarUser;
 
+@Linked
 public class IgnoreCommand extends SWCommand {
 
     public IgnoreCommand() {
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/JoinmeCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/JoinmeCommand.java
index 4bab8d11..508b18f1 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/JoinmeCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/JoinmeCommand.java
@@ -20,12 +20,14 @@
 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.messages.PlayerChatter;
 import de.steamwar.sql.UserPerm;
 import net.kyori.adventure.text.event.ClickEvent;
 
+@Linked
 public class JoinmeCommand extends SWCommand {
 
     public JoinmeCommand() {
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/KickCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/KickCommand.java
index 4bbd8bef..b0d93bb0 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/KickCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/KickCommand.java
@@ -21,9 +21,11 @@ package de.steamwar.velocitycore.commands;
 
 import com.velocitypowered.api.proxy.Player;
 import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
 import de.steamwar.sql.UserPerm;
 
+@Linked
 public class KickCommand extends SWCommand {
 
     public KickCommand() {
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/ListCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/ListCommand.java
index dab59005..f57df245 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/ListCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/ListCommand.java
@@ -22,6 +22,7 @@ package de.steamwar.velocitycore.commands;
 import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.ServerConnection;
 import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
 import de.steamwar.persistent.Subserver;
 import de.steamwar.velocitycore.VelocityCore;
@@ -32,6 +33,7 @@ import java.util.SortedMap;
 import java.util.TreeMap;
 import java.util.stream.Collectors;
 
+@Linked
 public class ListCommand extends SWCommand {
 
     public ListCommand() {
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/LocalCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/LocalCommand.java
index d53afdb7..4ede8e76 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/LocalCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/LocalCommand.java
@@ -19,10 +19,12 @@
 
 package de.steamwar.velocitycore.commands;
 
+import de.steamwar.linkage.Linked;
 import de.steamwar.velocitycore.listeners.ChatListener;
 import de.steamwar.command.SWCommand;
 import de.steamwar.messages.PlayerChatter;
 
+@Linked
 public class LocalCommand extends SWCommand {
 
     public LocalCommand() {
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/ModCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/ModCommand.java
index c37a3e7c..220bac58 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/ModCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/ModCommand.java
@@ -19,6 +19,7 @@
 
 package de.steamwar.velocitycore.commands;
 
+import de.steamwar.linkage.Linked;
 import de.steamwar.velocitycore.inventory.SWInventory;
 import de.steamwar.velocitycore.inventory.SWItem;
 import de.steamwar.velocitycore.inventory.SWListInv;
@@ -35,6 +36,7 @@ import java.util.Map;
 import java.util.UUID;
 import java.util.function.Consumer;
 
+@Linked
 public class ModCommand extends SWCommand {
 
     public ModCommand() {
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/MsgCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/MsgCommand.java
index 5300909d..6491a27a 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/MsgCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/MsgCommand.java
@@ -20,17 +20,18 @@
 package de.steamwar.velocitycore.commands;
 
 import com.velocitypowered.api.proxy.Player;
-import com.velocitypowered.proxy.Velocity;
-import de.steamwar.velocitycore.VelocityCore;
-import de.steamwar.velocitycore.listeners.ChatListener;
 import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.ChatterGroup;
 import de.steamwar.messages.PlayerChatter;
 import de.steamwar.sql.IgnoreSystem;
+import de.steamwar.velocitycore.VelocityCore;
+import de.steamwar.velocitycore.listeners.ChatListener;
 
 import static de.steamwar.persistent.Storage.lastChats;
 
+@Linked
 public class MsgCommand extends SWCommand {
 
     public MsgCommand() {
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/PingCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/PingCommand.java
index 583f263a..e3c8c8e2 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/PingCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/PingCommand.java
@@ -20,8 +20,10 @@
 package de.steamwar.velocitycore.commands;
 
 import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
 import de.steamwar.messages.PlayerChatter;
 
+@Linked
 public class PingCommand extends SWCommand {
 
     public PingCommand() {
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/PlaytimeCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/PlaytimeCommand.java
index bf04c28a..8b13d44a 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/PlaytimeCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/PlaytimeCommand.java
@@ -20,11 +20,13 @@
 package de.steamwar.velocitycore.commands;
 
 import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
 import de.steamwar.sql.SteamwarUser;
 
 import java.text.NumberFormat;
 
+@Linked
 public class PlaytimeCommand extends SWCommand {
 
     public PlaytimeCommand() {
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/PollCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/PollCommand.java
index 72646164..7cd654b9 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/PollCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/PollCommand.java
@@ -19,12 +19,14 @@
 
 package de.steamwar.velocitycore.commands;
 
+import de.steamwar.linkage.Linked;
 import de.steamwar.velocitycore.listeners.PollSystem;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeValidator;
 import de.steamwar.messages.Chatter;
 import de.steamwar.sql.PollAnswer;
 
+@Linked
 public class PollCommand extends SWCommand {
 
     public PollCommand() {
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/PollresultCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/PollresultCommand.java
index 611fd7ed..c47d1e53 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/PollresultCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/PollresultCommand.java
@@ -19,6 +19,7 @@
 
 package de.steamwar.velocitycore.commands;
 
+import de.steamwar.linkage.Linked;
 import de.steamwar.velocitycore.listeners.PollSystem;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeValidator;
@@ -28,6 +29,7 @@ import de.steamwar.sql.UserPerm;
 
 import java.util.Map;
 
+@Linked
 public class PollresultCommand extends SWCommand {
 
     public PollresultCommand() {
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/RCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/RCommand.java
index 8ed4a38b..5430b313 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/RCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/RCommand.java
@@ -20,10 +20,12 @@
 package de.steamwar.velocitycore.commands;
 
 import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
 import de.steamwar.messages.PlayerChatter;
 
 import static de.steamwar.persistent.Storage.lastChats;
 
+@Linked
 public class RCommand extends SWCommand {
 
     public RCommand() {
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/RankCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/RankCommand.java
index 4d68f07b..45123e18 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/RankCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/RankCommand.java
@@ -20,6 +20,7 @@
 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.SteamwarUser;
@@ -28,6 +29,7 @@ import de.steamwar.velocitycore.ArenaMode;
 
 import java.util.Optional;
 
+@Linked
 public class RankCommand extends SWCommand {
 
     public RankCommand() {
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/ReplayCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/ReplayCommand.java
index fe8d9af1..6d825e2a 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/ReplayCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/ReplayCommand.java
@@ -19,6 +19,8 @@
 
 package de.steamwar.velocitycore.commands;
 
+import de.steamwar.linkage.EventMode;
+import de.steamwar.linkage.Linked;
 import de.steamwar.velocitycore.ArenaMode;
 import de.steamwar.messages.Message;
 import de.steamwar.velocitycore.ServerStarter;
@@ -32,6 +34,8 @@ import de.steamwar.sql.*;
 import java.util.ArrayList;
 import java.util.List;
 
+@Linked
+@EventMode(false)
 public class ReplayCommand extends SWCommand {
 
     public ReplayCommand() {
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/RulesCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/RulesCommand.java
index e379d6b1..8128eaff 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/RulesCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/RulesCommand.java
@@ -20,12 +20,14 @@
 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 net.kyori.adventure.text.event.ClickEvent;
 
 import java.util.Arrays;
 
+@Linked
 public class RulesCommand extends SWCommand {
     public RulesCommand() {
         super("rules", "regeln");
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/SendCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/SendCommand.java
index f1590957..78d27b4d 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/SendCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/SendCommand.java
@@ -26,6 +26,7 @@ import com.velocitypowered.api.proxy.server.ServerInfo;
 import de.steamwar.command.PreviousArguments;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeMapper;
+import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.Message;
 import de.steamwar.persistent.Subserver;
@@ -38,6 +39,7 @@ import java.util.Collection;
 import java.util.List;
 import java.util.stream.Collectors;
 
+@Linked
 public class SendCommand extends SWCommand {
 
     // /send <server> [<users>]
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/ServerTeamchatCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/ServerTeamchatCommand.java
index 927644ab..6dc9ea92 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/ServerTeamchatCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/ServerTeamchatCommand.java
@@ -19,11 +19,13 @@
 
 package de.steamwar.velocitycore.commands;
 
+import de.steamwar.linkage.Linked;
 import de.steamwar.velocitycore.listeners.ChatListener;
 import de.steamwar.command.SWCommand;
 import de.steamwar.messages.Chatter;
 import de.steamwar.sql.UserPerm;
 
+@Linked
 public class ServerTeamchatCommand extends SWCommand {
 
     public ServerTeamchatCommand() {
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/SetLocaleCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/SetLocaleCommand.java
index a2e66b6b..61abeca1 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/SetLocaleCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/SetLocaleCommand.java
@@ -20,10 +20,12 @@
 package de.steamwar.velocitycore.commands;
 
 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;
 
+@Linked
 public class SetLocaleCommand extends SWCommand {
 
     public SetLocaleCommand() {
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/StatCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/StatCommand.java
index d9694d6c..af545358 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/StatCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/StatCommand.java
@@ -19,6 +19,7 @@
 
 package de.steamwar.velocitycore.commands;
 
+import de.steamwar.linkage.Linked;
 import de.steamwar.velocitycore.Node;
 import de.steamwar.command.SWCommand;
 import de.steamwar.messages.Chatter;
@@ -29,6 +30,7 @@ import java.io.InputStreamReader;
 import java.util.HashMap;
 import java.util.Map;
 
+@Linked
 public class StatCommand extends SWCommand {
 
     public StatCommand() {
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/StreamingCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/StreamingCommand.java
index edab1c5b..04ddd6e2 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/StreamingCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/StreamingCommand.java
@@ -20,11 +20,15 @@
 package de.steamwar.velocitycore.commands;
 
 import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.EventMode;
+import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
 import de.steamwar.persistent.Storage;
 import de.steamwar.sql.SteamwarUser;
 import de.steamwar.sql.UserPerm;
 
+@Linked
+@EventMode(false)
 public class StreamingCommand extends SWCommand {
 
     public static boolean isNotStreaming(Chatter sender) {
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/TeamCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/TeamCommand.java
index f0a7be00..d95ed3b5 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/TeamCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/TeamCommand.java
@@ -29,6 +29,7 @@ import de.steamwar.command.PreviousArguments;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeMapper;
 import de.steamwar.command.TypeValidator;
+import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.Message;
 import de.steamwar.messages.PlayerChatter;
@@ -52,6 +53,7 @@ import java.util.stream.Stream;
 
 import static de.steamwar.persistent.Storage.teamInvitations;
 
+@Linked
 public class TeamCommand extends SWCommand {
 
     public TeamCommand() {
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/TeamchatCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/TeamchatCommand.java
index 8381ba94..ee74d5d6 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/TeamchatCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/TeamchatCommand.java
@@ -19,12 +19,14 @@
 
 package de.steamwar.velocitycore.commands;
 
+import de.steamwar.linkage.Linked;
 import de.steamwar.velocitycore.listeners.ChatListener;
 import de.steamwar.command.SWCommand;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.ChatterGroup;
 import de.steamwar.sql.SteamwarUser;
 
+@Linked
 public class TeamchatCommand extends SWCommand {
 
     public TeamchatCommand() {
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/TpCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/TpCommand.java
index 2292c258..9a270dde 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/TpCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/TpCommand.java
@@ -22,6 +22,7 @@ package de.steamwar.velocitycore.commands;
 import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.ServerConnection;
 import com.velocitypowered.api.proxy.server.RegisteredServer;
+import de.steamwar.linkage.Linked;
 import de.steamwar.velocitycore.*;
 import de.steamwar.velocitycore.util.BauLock;
 import de.steamwar.command.PreviousArguments;
@@ -39,6 +40,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
+@Linked
 public class TpCommand extends SWCommand {
 
     public TpCommand(){
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/UnIgnoreCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/UnIgnoreCommand.java
index 7f1a5de0..30952834 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/UnIgnoreCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/UnIgnoreCommand.java
@@ -20,10 +20,12 @@
 package de.steamwar.velocitycore.commands;
 
 import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
 import de.steamwar.sql.IgnoreSystem;
 import de.steamwar.sql.SteamwarUser;
 
+@Linked
 public class UnIgnoreCommand extends SWCommand {
 
     public UnIgnoreCommand() {
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/VerifyCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/VerifyCommand.java
index 96324de2..cf8ba5bd 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/VerifyCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/VerifyCommand.java
@@ -19,6 +19,7 @@
 
 package de.steamwar.velocitycore.commands;
 
+import de.steamwar.linkage.Linked;
 import de.steamwar.velocitycore.VelocityCore;
 import de.steamwar.velocitycore.discord.util.AuthManager;
 import de.steamwar.command.SWCommand;
@@ -28,6 +29,7 @@ import net.dv8tion.jda.api.entities.User;
 import java.util.Base64;
 import java.util.logging.Level;
 
+@Linked
 public class VerifyCommand extends SWCommand {
 
     public VerifyCommand() {
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/WebpasswordCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/WebpasswordCommand.java
index d19dedd0..8b9632b8 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/WebpasswordCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/WebpasswordCommand.java
@@ -20,9 +20,13 @@
 package de.steamwar.velocitycore.commands;
 
 import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.EventMode;
+import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
 import de.steamwar.sql.SteamwarUser;
 
+@Linked
+@EventMode(false)
 public class WebpasswordCommand extends SWCommand {
 
     public WebpasswordCommand() {
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/WhoisCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/WhoisCommand.java
index 7576f75f..a76c8ac7 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/WhoisCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/WhoisCommand.java
@@ -23,6 +23,7 @@ import com.velocitypowered.api.proxy.Player;
 import de.steamwar.command.PreviousArguments;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeMapper;
+import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.Message;
 import de.steamwar.persistent.Storage;
@@ -41,7 +42,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-
+@Linked
 public class WhoisCommand extends SWCommand {
     public WhoisCommand() {
         super("whois");
diff --git a/VelocityCore/src/de/steamwar/velocitycore/listeners/BanListener.java b/VelocityCore/src/de/steamwar/velocitycore/listeners/BanListener.java
index 1d205cc8..0ac6423c 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/listeners/BanListener.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/listeners/BanListener.java
@@ -22,6 +22,7 @@ package de.steamwar.velocitycore.listeners;
 import com.velocitypowered.api.event.Subscribe;
 import com.velocitypowered.api.event.connection.LoginEvent;
 import com.velocitypowered.api.proxy.Player;
+import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.Message;
 import de.steamwar.sql.BannedUserIPs;
@@ -36,6 +37,7 @@ import java.util.List;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+@Linked
 public class BanListener extends BasicListener {
 
     @Subscribe
diff --git a/VelocityCore/src/de/steamwar/velocitycore/listeners/ChatListener.java b/VelocityCore/src/de/steamwar/velocitycore/listeners/ChatListener.java
index dfdf5c7f..673733b9 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/listeners/ChatListener.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/listeners/ChatListener.java
@@ -29,6 +29,7 @@ import com.velocitypowered.api.proxy.ConsoleCommandSource;
 import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.ServerConnection;
 import com.velocitypowered.api.proxy.server.ServerInfo;
+import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.ChatterGroup;
 import de.steamwar.messages.Message;
@@ -50,6 +51,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
+@Linked
 public class ChatListener extends BasicListener {
 
     private static final Logger cmdLogger = Logger.getLogger("Command logger");
diff --git a/VelocityCore/src/de/steamwar/velocitycore/listeners/CheckListener.java b/VelocityCore/src/de/steamwar/velocitycore/listeners/CheckListener.java
index 4c8ef131..0c3000c1 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/listeners/CheckListener.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/listeners/CheckListener.java
@@ -24,6 +24,7 @@ import com.velocitypowered.api.event.connection.DisconnectEvent;
 import com.velocitypowered.api.event.connection.PostLoginEvent;
 import com.velocitypowered.api.event.player.ServerConnectedEvent;
 import com.velocitypowered.api.proxy.Player;
+import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
 import de.steamwar.persistent.Bauserver;
 import de.steamwar.persistent.Subserver;
@@ -34,6 +35,7 @@ import de.steamwar.velocitycore.commands.CheckCommand;
 import java.util.ArrayList;
 import java.util.List;
 
+@Linked
 public class CheckListener extends BasicListener {
 
     @Subscribe
diff --git a/VelocityCore/src/de/steamwar/velocitycore/listeners/ConnectionListener.java b/VelocityCore/src/de/steamwar/velocitycore/listeners/ConnectionListener.java
index 765d09c7..1cfd8a49 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/listeners/ConnectionListener.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/listeners/ConnectionListener.java
@@ -27,6 +27,7 @@ import com.velocitypowered.api.event.player.KickedFromServerEvent;
 import com.velocitypowered.api.network.ProtocolVersion;
 import com.velocitypowered.api.permission.Tristate;
 import com.velocitypowered.api.proxy.Player;
+import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.Message;
 import de.steamwar.persistent.Subserver;
@@ -45,6 +46,7 @@ import java.util.HashSet;
 import java.util.Set;
 import java.util.UUID;
 
+@Linked
 public class ConnectionListener extends BasicListener {
 
     private static final Set<UUID> newPlayers = new HashSet<>();
diff --git a/VelocityCore/src/de/steamwar/velocitycore/listeners/CookieEvents.java b/VelocityCore/src/de/steamwar/velocitycore/listeners/CookieEvents.java
index 660ebc87..f34fe1c5 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/listeners/CookieEvents.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/listeners/CookieEvents.java
@@ -22,11 +22,15 @@ package de.steamwar.velocitycore.listeners;
 import com.velocitypowered.api.event.Subscribe;
 import com.velocitypowered.api.event.player.CookieReceiveEvent;
 import com.velocitypowered.api.proxy.Player;
+import de.steamwar.linkage.EventMode;
+import de.steamwar.linkage.Linked;
 import de.steamwar.sql.EventFight;
 import de.steamwar.sql.SteamwarUser;
 import de.steamwar.velocitycore.EventStarter;
 import de.steamwar.velocitycore.VelocityCore;
 
+@Linked
+@EventMode(false)
 public class CookieEvents extends BasicListener {
 
     @Subscribe
diff --git a/VelocityCore/src/de/steamwar/velocitycore/listeners/EventModeListener.java b/VelocityCore/src/de/steamwar/velocitycore/listeners/EventModeListener.java
index 7777408e..ecc977ed 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/listeners/EventModeListener.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/listeners/EventModeListener.java
@@ -19,27 +19,25 @@
 
 package de.steamwar.velocitycore.listeners;
 
-import java.net.InetSocketAddress;
-import java.nio.charset.Charset;
-import java.util.List;
-
 import com.velocitypowered.api.event.Subscribe;
 import com.velocitypowered.api.event.connection.PostLoginEvent;
 import com.velocitypowered.api.event.player.ServerConnectedEvent;
 import com.velocitypowered.api.network.ProtocolVersion;
 import com.velocitypowered.api.proxy.Player;
-
+import de.steamwar.linkage.EventMode;
+import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
 import de.steamwar.persistent.Subserver;
-import de.steamwar.sql.Event;
-import de.steamwar.sql.EventFight;
-import de.steamwar.sql.Referee;
-import de.steamwar.sql.SteamwarUser;
-import de.steamwar.sql.TeamTeilnahme;
+import de.steamwar.sql.*;
 import de.steamwar.velocitycore.EventStarter;
 import de.steamwar.velocitycore.VelocityCore;
 import net.kyori.adventure.key.Key;
 
+import java.net.InetSocketAddress;
+import java.util.List;
+
+@Linked
+@EventMode(true)
 public class EventModeListener extends BasicListener {
 
     public static final Key EVENT_TO_SPECTATE_KEY = Key.key("sw", "event_to_spectate");
diff --git a/VelocityCore/src/de/steamwar/velocitycore/listeners/IPSanitizer.java b/VelocityCore/src/de/steamwar/velocitycore/listeners/IPSanitizer.java
index bc8c42ba..ca99fbed 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/listeners/IPSanitizer.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/listeners/IPSanitizer.java
@@ -26,6 +26,7 @@ import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.proxy.connection.MinecraftConnection;
 import com.velocitypowered.proxy.connection.client.ConnectedPlayer;
 import com.velocitypowered.proxy.connection.client.LoginInboundConnection;
+import de.steamwar.linkage.Linked;
 import de.steamwar.persistent.Reflection;
 import de.steamwar.velocitycore.VelocityCore;
 import de.steamwar.velocitycore.mods.Hostname;
@@ -38,6 +39,7 @@ import java.util.Map;
 import java.util.UUID;
 import java.util.logging.Level;
 
+@Linked
 public class IPSanitizer extends BasicListener {
 
     private static final Map<UUID, InetAddress> trueAddress = new HashMap<>(); // Will likely slightly leak over time
diff --git a/VelocityCore/src/de/steamwar/velocitycore/listeners/PluginMessage.java b/VelocityCore/src/de/steamwar/velocitycore/listeners/PluginMessage.java
index b35279fb..8b37cf8b 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/listeners/PluginMessage.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/listeners/PluginMessage.java
@@ -31,6 +31,7 @@ import com.velocitypowered.api.proxy.messages.ChannelMessageSource;
 import com.velocitypowered.api.proxy.messages.LegacyChannelIdentifier;
 import com.velocitypowered.api.proxy.messages.MinecraftChannelIdentifier;
 import com.velocitypowered.proxy.protocol.ProtocolUtils;
+import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
 import de.steamwar.network.packets.NetworkPacket;
 import de.steamwar.sql.SteamwarUser;
@@ -50,6 +51,7 @@ import java.util.*;
 import java.util.function.Consumer;
 import java.util.logging.Level;
 
+@Linked
 public class PluginMessage extends BasicListener {
 
     public static void send(Player player, String legacyChannel, String channel, byte[] data) {
diff --git a/VelocityCore/src/de/steamwar/velocitycore/listeners/SessionManager.java b/VelocityCore/src/de/steamwar/velocitycore/listeners/SessionManager.java
index 248fd606..30895cea 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/listeners/SessionManager.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/listeners/SessionManager.java
@@ -22,6 +22,7 @@ package de.steamwar.velocitycore.listeners;
 import com.velocitypowered.api.event.Subscribe;
 import com.velocitypowered.api.event.connection.DisconnectEvent;
 import com.velocitypowered.api.event.connection.PostLoginEvent;
+import de.steamwar.linkage.Linked;
 import de.steamwar.sql.AuditLog;
 import de.steamwar.velocitycore.VelocityCore;
 import de.steamwar.sql.Session;
@@ -32,6 +33,7 @@ import java.time.Instant;
 
 import static de.steamwar.persistent.Storage.sessions;
 
+@Linked
 public class SessionManager extends BasicListener {
 
     @Subscribe
diff --git a/VelocityCore/src/de/steamwar/velocitycore/listeners/SettingsChangedListener.java b/VelocityCore/src/de/steamwar/velocitycore/listeners/SettingsChangedListener.java
index 59693af5..3cd7ae77 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/listeners/SettingsChangedListener.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/listeners/SettingsChangedListener.java
@@ -22,11 +22,13 @@ package de.steamwar.velocitycore.listeners;
 import com.velocitypowered.api.event.Subscribe;
 import com.velocitypowered.api.event.player.PlayerSettingsChangedEvent;
 import com.velocitypowered.api.proxy.Player;
+import de.steamwar.linkage.Linked;
 import de.steamwar.velocitycore.VelocityCore;
 import de.steamwar.velocitycore.network.NetworkSender;
 import de.steamwar.sql.SteamwarUser;
 import de.steamwar.network.packets.server.LocaleInvalidationPacket;
 
+@Linked
 public class SettingsChangedListener extends BasicListener {
 
     @Subscribe
diff --git a/VelocityCore/src/de/steamwar/velocitycore/listeners/TexturePackSystem.java b/VelocityCore/src/de/steamwar/velocitycore/listeners/TexturePackSystem.java
index 8d07e0c7..65a1a621 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/listeners/TexturePackSystem.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/listeners/TexturePackSystem.java
@@ -22,6 +22,7 @@ package de.steamwar.velocitycore.listeners;
 import com.velocitypowered.api.event.Subscribe;
 import com.velocitypowered.api.event.player.ServerPostConnectEvent;
 import com.velocitypowered.api.proxy.player.ResourcePackInfo;
+import de.steamwar.linkage.Linked;
 import de.steamwar.velocitycore.VelocityCore;
 import net.kyori.adventure.text.Component;
 
@@ -33,6 +34,7 @@ import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
 // https://jd.papermc.io/velocity/3.4.0/com/velocitypowered/api/proxy/player/ResourcePackInfo.Builder.html#setHash(byte%5B%5D)
+@Linked
 public class TexturePackSystem extends BasicListener {
 
     private static final File PACKS_DIR = new File("/var/www/packs");
diff --git a/VelocityCore/src/de/steamwar/velocitycore/listeners/VersionAnnouncer.java b/VelocityCore/src/de/steamwar/velocitycore/listeners/VersionAnnouncer.java
index 5204d258..7393358c 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/listeners/VersionAnnouncer.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/listeners/VersionAnnouncer.java
@@ -26,6 +26,7 @@ import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.server.ServerInfo;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.velocity.platform.VelocityViaConfig;
+import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
 import de.steamwar.network.packets.server.ClientVersionPacket;
 import de.steamwar.persistent.Subserver;
@@ -35,6 +36,7 @@ import de.steamwar.velocitycore.network.NetworkSender;
 import java.time.Duration;
 import java.time.temporal.ChronoUnit;
 
+@Linked
 public class VersionAnnouncer extends BasicListener {
 
     @Subscribe
diff --git a/VelocityCore/src/de/steamwar/velocitycore/mods/Badlion.java b/VelocityCore/src/de/steamwar/velocitycore/mods/Badlion.java
index 57cc3986..cb26c30b 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/mods/Badlion.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/mods/Badlion.java
@@ -22,7 +22,9 @@ package de.steamwar.velocitycore.mods;
 import com.google.gson.JsonObject;
 import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.messages.MinecraftChannelIdentifier;
+import de.steamwar.linkage.Linked;
 
+@Linked
 public class Badlion {
     // https://github.com/BadlionClient/BadlionClientModAPI
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/mods/FML2.java b/VelocityCore/src/de/steamwar/velocitycore/mods/FML2.java
index fa0917dd..f2b4bc8c 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/mods/FML2.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/mods/FML2.java
@@ -25,6 +25,7 @@ import com.velocitypowered.api.proxy.LoginPhaseConnection;
 import com.velocitypowered.api.proxy.messages.MinecraftChannelIdentifier;
 import com.velocitypowered.proxy.connection.client.LoginInboundConnection;
 import com.velocitypowered.proxy.protocol.ProtocolUtils;
+import de.steamwar.linkage.Linked;
 import de.steamwar.velocitycore.VelocityCore;
 import de.steamwar.velocitycore.listeners.BasicListener;
 import de.steamwar.velocitycore.listeners.PluginMessage;
@@ -37,6 +38,7 @@ import net.kyori.adventure.text.Component;
 import java.util.*;
 import java.util.logging.Level;
 
+@Linked
 public class FML2 extends BasicListener {
     // FML2: https://wiki.vg/Minecraft_Forge_Handshake#FML2_protocol_.281.13_-_Current.29
     // FML3: https://github.com/adde0109/Ambassador/tree/non-api/src/main/java/org/adde0109/ambassador/forge
diff --git a/VelocityCore/src/de/steamwar/velocitycore/mods/FabricModSender.java b/VelocityCore/src/de/steamwar/velocitycore/mods/FabricModSender.java
index 2f492a88..209ad423 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/mods/FabricModSender.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/mods/FabricModSender.java
@@ -28,6 +28,7 @@ import com.velocitypowered.api.event.connection.PluginMessageEvent;
 import com.velocitypowered.api.event.player.ServerConnectedEvent;
 import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.proxy.protocol.ProtocolUtils;
+import de.steamwar.linkage.Linked;
 import de.steamwar.persistent.Storage;
 import de.steamwar.velocitycore.VelocityCore;
 import de.steamwar.velocitycore.listeners.BasicListener;
@@ -40,6 +41,7 @@ import io.netty.buffer.Unpooled;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
+@Linked
 public class FabricModSender extends BasicListener {
 
     private final Set<String> neededFabricMods = new HashSet<>();
diff --git a/VelocityCore/src/de/steamwar/velocitycore/mods/Hostname.java b/VelocityCore/src/de/steamwar/velocitycore/mods/Hostname.java
index 19547194..a7c00d9b 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/mods/Hostname.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/mods/Hostname.java
@@ -24,6 +24,7 @@ import com.velocitypowered.api.event.connection.ConnectionHandshakeEvent;
 import com.velocitypowered.proxy.connection.client.InitialInboundConnection;
 import com.velocitypowered.proxy.connection.client.LoginInboundConnection;
 import com.velocitypowered.proxy.protocol.packet.HandshakePacket;
+import de.steamwar.linkage.Linked;
 import de.steamwar.persistent.Reflection;
 import de.steamwar.velocitycore.VelocityCore;
 import de.steamwar.velocitycore.listeners.BasicListener;
@@ -32,6 +33,7 @@ import java.util.HashSet;
 import java.util.Set;
 import java.util.logging.Level;
 
+@Linked
 public class Hostname extends BasicListener {
 
     private static final Reflection.Field<LoginInboundConnection, InitialInboundConnection> delegate = new Reflection.Field<>(LoginInboundConnection.class, "delegate");
diff --git a/VelocityCore/src/de/steamwar/velocitycore/mods/ReplayMod.java b/VelocityCore/src/de/steamwar/velocitycore/mods/ReplayMod.java
index a09e7295..4e08ac8b 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/mods/ReplayMod.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/mods/ReplayMod.java
@@ -22,6 +22,7 @@ package de.steamwar.velocitycore.mods;
 import com.velocitypowered.api.event.Subscribe;
 import com.velocitypowered.api.event.player.ServerPostConnectEvent;
 import com.velocitypowered.api.proxy.Player;
+import de.steamwar.linkage.Linked;
 import de.steamwar.persistent.Bauserver;
 import de.steamwar.persistent.Builderserver;
 import de.steamwar.velocitycore.VelocityCore;
@@ -32,6 +33,7 @@ import de.steamwar.velocitycore.listeners.PluginMessage;
 
 import java.util.Arrays;
 
+@Linked
 public class ReplayMod extends BasicListener {
     // https://gist.github.com/Johni0702/2547c463e51f65f312cb
     // https://github.com/ReplayMod/replay-restrictions/blob/master/bungeecord/src/main/java/de/johni0702/replay/restrictions/BungeeCordPlugin.java
diff --git a/VelocityCore/src/de/steamwar/velocitycore/mods/Schematica.java b/VelocityCore/src/de/steamwar/velocitycore/mods/Schematica.java
index 9cf2c0c7..caac9a27 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/mods/Schematica.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/mods/Schematica.java
@@ -22,8 +22,10 @@ package de.steamwar.velocitycore.mods;
 import com.velocitypowered.api.event.Subscribe;
 import com.velocitypowered.api.event.connection.PostLoginEvent;
 import com.velocitypowered.api.proxy.messages.LegacyChannelIdentifier;
+import de.steamwar.linkage.Linked;
 import de.steamwar.velocitycore.listeners.BasicListener;
 
+@Linked
 public class Schematica extends BasicListener {
     // https://github.com/Lunatrius/SchematicaPlugin/blob/master/src/main/java/com/github/lunatrius/schematica/plugin/SchematicaPlugin.java
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/network/handlers/AnvilAnswerHandler.java b/VelocityCore/src/de/steamwar/velocitycore/network/handlers/AnvilAnswerHandler.java
index f0abb739..d772672e 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/network/handlers/AnvilAnswerHandler.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/network/handlers/AnvilAnswerHandler.java
@@ -19,10 +19,12 @@
 
 package de.steamwar.velocitycore.network.handlers;
 
+import de.steamwar.linkage.Linked;
 import de.steamwar.network.packets.PacketHandler;
 import de.steamwar.network.packets.client.AnvilAnswerPacket;
 import de.steamwar.velocitycore.inventory.SWAnvilInv;
 
+@Linked
 public class AnvilAnswerHandler extends PacketHandler {
 
     @Handler
diff --git a/VelocityCore/src/de/steamwar/velocitycore/network/handlers/EloPlayerHandler.java b/VelocityCore/src/de/steamwar/velocitycore/network/handlers/EloPlayerHandler.java
index 3ef4eb8f..8915cb42 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/network/handlers/EloPlayerHandler.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/network/handlers/EloPlayerHandler.java
@@ -20,6 +20,8 @@
 package de.steamwar.velocitycore.network.handlers;
 
 import com.velocitypowered.api.proxy.Player;
+import de.steamwar.linkage.EventMode;
+import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
 import de.steamwar.network.packets.PacketHandler;
 import de.steamwar.network.packets.common.FightEndsPacket;
@@ -38,6 +40,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.function.IntFunction;
 import java.util.stream.Collectors;
 
+@Linked
 public class EloPlayerHandler extends PacketHandler {
 
     private static final int MEDIAN_ELO_GAIN = 40;
diff --git a/VelocityCore/src/de/steamwar/velocitycore/network/handlers/EloSchemHandler.java b/VelocityCore/src/de/steamwar/velocitycore/network/handlers/EloSchemHandler.java
index 49da0116..eec033e1 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/network/handlers/EloSchemHandler.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/network/handlers/EloSchemHandler.java
@@ -19,6 +19,7 @@
 
 package de.steamwar.velocitycore.network.handlers;
 
+import de.steamwar.linkage.Linked;
 import de.steamwar.network.packets.PacketHandler;
 import de.steamwar.network.packets.common.FightEndsPacket;
 import de.steamwar.sql.SchemElo;
@@ -26,6 +27,7 @@ import de.steamwar.sql.SchematicNode;
 import de.steamwar.sql.SchematicType;
 import de.steamwar.velocitycore.ArenaMode;
 
+@Linked
 public class EloSchemHandler extends PacketHandler {
 
     private static final int K = 20;
diff --git a/VelocityCore/src/de/steamwar/velocitycore/network/handlers/ExecuteCommandHandler.java b/VelocityCore/src/de/steamwar/velocitycore/network/handlers/ExecuteCommandHandler.java
index e96f9286..0f79d12e 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/network/handlers/ExecuteCommandHandler.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/network/handlers/ExecuteCommandHandler.java
@@ -19,11 +19,13 @@
 
 package de.steamwar.velocitycore.network.handlers;
 
+import de.steamwar.linkage.Linked;
 import de.steamwar.velocitycore.VelocityCore;
 import de.steamwar.network.packets.PacketHandler;
 import de.steamwar.network.packets.client.ExecuteCommandPacket;
 import de.steamwar.sql.SteamwarUser;
 
+@Linked
 public class ExecuteCommandHandler extends PacketHandler {
 
     @Handler
diff --git a/VelocityCore/src/de/steamwar/velocitycore/network/handlers/FightInfoHandler.java b/VelocityCore/src/de/steamwar/velocitycore/network/handlers/FightInfoHandler.java
index 6565f1db..9d7a2067 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/network/handlers/FightInfoHandler.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/network/handlers/FightInfoHandler.java
@@ -21,6 +21,7 @@ package de.steamwar.velocitycore.network.handlers;
 
 import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.server.RegisteredServer;
+import de.steamwar.linkage.Linked;
 import de.steamwar.velocitycore.network.NetworkSender;
 import de.steamwar.velocitycore.network.ServerMetaInfo;
 import de.steamwar.velocitycore.tablist.TablistManager;
@@ -30,6 +31,7 @@ import de.steamwar.network.packets.common.FightInfoPacket;
 import java.util.HashSet;
 import java.util.Set;
 
+@Linked
 public class FightInfoHandler extends PacketHandler {
 
     private static final Set<RegisteredServer> lobbys = new HashSet<>();
diff --git a/VelocityCore/src/de/steamwar/velocitycore/network/handlers/ImALobbyHandler.java b/VelocityCore/src/de/steamwar/velocitycore/network/handlers/ImALobbyHandler.java
index 391ee1b7..b4eb48f1 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/network/handlers/ImALobbyHandler.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/network/handlers/ImALobbyHandler.java
@@ -19,10 +19,12 @@
 
 package de.steamwar.velocitycore.network.handlers;
 
+import de.steamwar.linkage.Linked;
 import de.steamwar.velocitycore.network.ServerMetaInfo;
 import de.steamwar.network.packets.PacketHandler;
 import de.steamwar.network.packets.client.ImALobbyPacket;
 
+@Linked
 public class ImALobbyHandler extends PacketHandler {
 
     @Handler
diff --git a/VelocityCore/src/de/steamwar/velocitycore/network/handlers/InventoryCallbackHandler.java b/VelocityCore/src/de/steamwar/velocitycore/network/handlers/InventoryCallbackHandler.java
index 54668d94..e8f9894b 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/network/handlers/InventoryCallbackHandler.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/network/handlers/InventoryCallbackHandler.java
@@ -20,6 +20,7 @@
 package de.steamwar.velocitycore.network.handlers;
 
 import com.velocitypowered.api.proxy.Player;
+import de.steamwar.linkage.Linked;
 import de.steamwar.velocitycore.inventory.InvCallback;
 import de.steamwar.velocitycore.inventory.SWInventory;
 import de.steamwar.velocitycore.network.NetworkSender;
@@ -33,6 +34,7 @@ import de.steamwar.sql.SteamwarUser;
 import java.util.HashMap;
 import java.util.Map;
 
+@Linked
 public class InventoryCallbackHandler extends PacketHandler {
 
     public static final Map<Integer, SWInventory> inventoryHashMap = new HashMap<>();
diff --git a/VelocityCore/src/de/steamwar/velocitycore/network/handlers/PlayerSkinHandler.java b/VelocityCore/src/de/steamwar/velocitycore/network/handlers/PlayerSkinHandler.java
index ff18d309..0293545c 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/network/handlers/PlayerSkinHandler.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/network/handlers/PlayerSkinHandler.java
@@ -27,6 +27,7 @@ import com.velocitypowered.api.event.Subscribe;
 import com.velocitypowered.api.event.connection.PostLoginEvent;
 import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.util.GameProfile;
+import de.steamwar.linkage.Linked;
 import de.steamwar.network.packets.PacketHandler;
 import de.steamwar.network.packets.common.PlayerSkinRequestPacket;
 import de.steamwar.network.packets.common.PlayerSkinResponsePacket;
@@ -46,6 +47,7 @@ import java.util.Set;
 import java.util.UUID;
 import java.util.stream.Collectors;
 
+@Linked
 public class PlayerSkinHandler extends PacketHandler {
 
     private final int maxCacheSize = 1000;
diff --git a/VelocityCore/src/de/steamwar/velocitycore/network/handlers/PrepareSchemHandler.java b/VelocityCore/src/de/steamwar/velocitycore/network/handlers/PrepareSchemHandler.java
index eec027c5..4a90f5ca 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/network/handlers/PrepareSchemHandler.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/network/handlers/PrepareSchemHandler.java
@@ -20,6 +20,7 @@
 package de.steamwar.velocitycore.network.handlers;
 
 import com.velocitypowered.api.proxy.Player;
+import de.steamwar.linkage.Linked;
 import de.steamwar.velocitycore.ArenaMode;
 import de.steamwar.velocitycore.ServerStarter;
 import de.steamwar.velocitycore.VelocityCore;
@@ -28,6 +29,7 @@ import de.steamwar.network.packets.client.PrepareSchemPacket;
 import de.steamwar.sql.SchematicType;
 import de.steamwar.sql.SteamwarUser;
 
+@Linked
 public class PrepareSchemHandler extends PacketHandler {
 
     @Handler
diff --git a/VelocityCore/src/de/steamwar/velocitycore/tablist/TablistManager.java b/VelocityCore/src/de/steamwar/velocitycore/tablist/TablistManager.java
index 205cf067..2a8c5367 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/tablist/TablistManager.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/tablist/TablistManager.java
@@ -26,6 +26,8 @@ import com.velocitypowered.api.event.player.ServerPostConnectEvent;
 import com.velocitypowered.api.network.ProtocolVersion;
 import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.server.RegisteredServer;
+import de.steamwar.linkage.Linked;
+import de.steamwar.linkage.api.Disable;
 import de.steamwar.network.packets.common.FightInfoPacket;
 import de.steamwar.persistent.Storage;
 import de.steamwar.persistent.Subserver;
@@ -38,7 +40,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-public class TablistManager extends BasicListener {
+@Linked
+public class TablistManager extends BasicListener implements Disable {
 
     private static final Map<RegisteredServer, FightInfoPacket> fightInfos = new HashMap<>();
 

From c39447863203b5c79e7bb78b9bfe7beee4b00b76 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Mon, 29 Sep 2025 17:14:00 +0200
Subject: [PATCH 144/214] Fix VelocityCore

---
 .../de/steamwar/linkage/AbstractLinker.java   |  4 ++--
 VelocityCore/build.gradle.kts                 |  3 +++
 .../de/steamwar/velocitycore/Broadcaster.java |  2 +-
 .../steamwar/velocitycore/VelocityCore.java   |  3 ++-
 .../velocitycore/commands/BauCommand.java     | 21 +++++++++----------
 5 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/CommonCore/Linkage/src/de/steamwar/linkage/AbstractLinker.java b/CommonCore/Linkage/src/de/steamwar/linkage/AbstractLinker.java
index 2c013f76..18e931ce 100644
--- a/CommonCore/Linkage/src/de/steamwar/linkage/AbstractLinker.java
+++ b/CommonCore/Linkage/src/de/steamwar/linkage/AbstractLinker.java
@@ -82,7 +82,7 @@ public abstract class AbstractLinker<T> {
                 try {
                     any = clazz.newInstance();
                 } catch (InstantiationException | IllegalAccessException e) {
-                    throw new SecurityException(e.getMessage());
+                    throw new SecurityException(e.getMessage(), e);
                 }
                 instances.put(clazz, any);
 
@@ -104,7 +104,7 @@ public abstract class AbstractLinker<T> {
                         try {
                             field.set(o, instances.get(field.getType()));
                         } catch (IllegalAccessException e) {
-                            throw new SecurityException(e);
+                            throw new SecurityException(e.getMessage(), e);
                         }
                     }
                 }
diff --git a/VelocityCore/build.gradle.kts b/VelocityCore/build.gradle.kts
index f290ed22..fd6358f1 100644
--- a/VelocityCore/build.gradle.kts
+++ b/VelocityCore/build.gradle.kts
@@ -32,6 +32,9 @@ java {
 }
 
 dependencies {
+    compileOnly(libs.classindex)
+    annotationProcessor(libs.classindex)
+
     annotationProcessor(libs.velocityapi)
     compileOnly(libs.velocity)
     compileOnly(libs.viaapi)
diff --git a/VelocityCore/src/de/steamwar/velocitycore/Broadcaster.java b/VelocityCore/src/de/steamwar/velocitycore/Broadcaster.java
index f5a05b7f..56030635 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/Broadcaster.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/Broadcaster.java
@@ -28,7 +28,7 @@ import java.util.concurrent.TimeUnit;
 
 @Linked
 @EventMode(false)
-class Broadcaster {
+public class Broadcaster {
 
     private final List<String> broadcasts = VelocityCore.get().getConfig().getBroadcasts();
     private int lastBroadCast = 0;
diff --git a/VelocityCore/src/de/steamwar/velocitycore/VelocityCore.java b/VelocityCore/src/de/steamwar/velocitycore/VelocityCore.java
index 58a9033c..86a11106 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/VelocityCore.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/VelocityCore.java
@@ -167,7 +167,8 @@ public class VelocityCore implements ReloadablePlugin {
         try {
             linker.link();
         } catch (AbstractLinker.LinkException e) {
-            VelocityCore.getProxy().shutdown();
+            logger.log(Level.SEVERE, e.getMessage(), e);
+            getProxy().shutdown();
             return;
         }
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/BauCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/BauCommand.java
index 139524a0..48192baa 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/BauCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/BauCommand.java
@@ -19,19 +19,13 @@
 
 package de.steamwar.velocitycore.commands;
 
-import de.steamwar.linkage.EventMode;
-import de.steamwar.linkage.Linked;
-import de.steamwar.linkage.LinkedInstance;
-import de.steamwar.velocitycore.*;
-import de.steamwar.velocitycore.inventory.SWInventory;
-import de.steamwar.velocitycore.inventory.SWItem;
-import de.steamwar.velocitycore.network.NetworkSender;
-import de.steamwar.velocitycore.util.BauLock;
-import de.steamwar.velocitycore.util.BauLockState;
 import de.steamwar.command.PreviousArguments;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeMapper;
 import de.steamwar.command.TypeValidator;
+import de.steamwar.linkage.EventMode;
+import de.steamwar.linkage.Linked;
+import de.steamwar.linkage.LinkedInstance;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.Message;
 import de.steamwar.messages.PlayerChatter;
@@ -39,6 +33,12 @@ import de.steamwar.network.packets.server.BaumemberUpdatePacket;
 import de.steamwar.persistent.Bauserver;
 import de.steamwar.sql.BauweltMember;
 import de.steamwar.sql.SteamwarUser;
+import de.steamwar.velocitycore.*;
+import de.steamwar.velocitycore.inventory.SWInventory;
+import de.steamwar.velocitycore.inventory.SWItem;
+import de.steamwar.velocitycore.network.NetworkSender;
+import de.steamwar.velocitycore.util.BauLock;
+import de.steamwar.velocitycore.util.BauLockState;
 
 import java.util.Collection;
 import java.util.function.Consumer;
@@ -50,9 +50,8 @@ public class BauCommand extends SWCommand {
     @LinkedInstance
     private HelpCommand command;
 
-    public BauCommand(HelpCommand command) {
+    public BauCommand() {
         super("bau", "b", "build", "gs");
-        this.command = command;
     }
 
     @Register(noTabComplete = true)

From 22d1e15ae0414fd7225627b12668a6997cdd4b7e Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Fri, 3 Oct 2025 13:16:56 +0200
Subject: [PATCH 145/214] Implement Linkage for FightSystem

---
 .../src/de/steamwar/linkage/Linked.java       |   2 +-
 .../de/steamwar/linkage/LinkedInstance.java   |   2 +-
 .../src/de/steamwar/linkage/MinVersion.java   |   2 +-
 FightSystem/FightSystem_Core/build.gradle.kts |   2 +
 .../de/steamwar/fightsystem/FightSystem.java  | 119 ++++----------
 .../fightsystem/commands/AkCommand.java       |   2 +
 .../fightsystem/commands/GamemodeCommand.java |   2 +
 .../fightsystem/commands/InfoCommand.java     |   2 +
 .../fightsystem/commands/KitCommand.java      |   2 +
 .../fightsystem/commands/LeaveCommand.java    |   2 +
 .../commands/LockschemCommand.java            |   2 +
 .../fightsystem/commands/ReadyCommand.java    |   2 +
 .../fightsystem/commands/RemoveCommand.java   |   2 +
 .../fightsystem/commands/RequestsCommand.java |   2 +
 .../fightsystem/commands/SkipCommand.java     |   2 +
 .../fightsystem/commands/StateCommand.java    |   2 +
 .../fightsystem/commands/TBCommand.java       |   2 +
 .../fightsystem/commands/TPSWarpCommand.java  |   2 +
 .../commands/TechhiderbugCommand.java         |   2 +
 .../fightsystem/commands/UnrankCommand.java   |   2 +
 .../fightsystem/commands/WGCommand.java       |   2 +
 .../fightsystem/commands/WinCommand.java      |   2 +
 .../countdown/EventSpectateCountdown.java     |   2 +
 .../countdown/NoPlayersOnlineCountdown.java   |   2 +
 .../countdown/PostSchemCountdown.java         |   2 +
 .../countdown/PreRunningCountdown.java        |   2 +
 .../countdown/PreSchemCountdown.java          |   2 +
 .../countdown/SpectateOverCountdown.java      |   2 +
 .../fightsystem/event/HellsBells.java         |   4 +-
 .../de/steamwar/fightsystem/event/Meteor.java |   3 +-
 .../steamwar/fightsystem/event/NoGravity.java |   2 +
 .../fightsystem/event/PersistentDamage.java   |   2 +
 .../fightsystem/event/TNTDistributor.java     |   2 +
 .../fightsystem/fight/FightWorld.java         |   2 +
 .../steamwar/fightsystem/fight/HotbarKit.java |  62 +-------
 .../fightsystem/fight/HotbarKitListener.java  |  81 ++++++++++
 .../fightsystem/listener/ArenaBorder.java     |   2 +
 .../fightsystem/listener/ArrowStopper.java    |   2 +
 .../listener/BlockFadeListener.java           |   2 +
 .../listener/BlockPlaceCollision.java         |   2 +
 .../steamwar/fightsystem/listener/Chat.java   |   2 +
 .../steamwar/fightsystem/listener/Check.java  |   2 +
 .../fightsystem/listener/ClickAnalyzer.java   |   2 +
 .../listener/DenyInventoryMovement.java       |   2 +
 .../listener/DenyWorldInteraction.java        |   2 +
 .../fightsystem/listener/EntityDamage.java    |   2 +
 .../fightsystem/listener/EventJoin.java       |   2 +
 .../fightsystem/listener/InFightDamage.java   |   2 +
 .../listener/InFightInventory.java            |   2 +
 .../fightsystem/listener/IngameDeath.java     |   2 +
 .../listener/JoinRequestListener.java         |   2 +
 .../fightsystem/listener/LeaveableArena.java  |   2 +
 .../fightsystem/listener/NormalJoin.java      |   2 +
 .../fightsystem/listener/Permanent.java       |   2 +
 .../listener/PersonalKitCreator.java          |   2 +
 .../fightsystem/listener/PrepareSchem.java    |   2 +
 .../fightsystem/listener/Recording.java       |   2 +
 .../listener/RunningWorldInteraction.java     |   2 +
 .../fightsystem/listener/SetupQuit.java       |   2 +
 .../fightsystem/listener/Shutdown.java        |   2 +
 .../fightsystem/listener/Spectator.java       |   3 +-
 .../fightsystem/listener/TestJoin.java        |   2 +
 .../fightsystem/listener/WaterRemover.java    |   3 +-
 .../fightsystem/record/FileRecorder.java      |   2 +
 .../fightsystem/record/LiveRecorder.java      |   2 +
 .../fightsystem/utils/BungeeFightInfo.java    |   3 +-
 .../fightsystem/utils/EnterHandler.java       |   2 +
 .../fightsystem/utils/FightStatistics.java    |   2 +
 .../steamwar/fightsystem/utils/FightUI.java   |   2 +
 .../EventTeamOffWincondition.java             |   2 +
 .../winconditions/Wincondition.java           |   2 +-
 .../winconditions/WinconditionAllDead.java    |   2 +
 .../winconditions/WinconditionAmongUs.java    |   2 +
 .../WinconditionBasePercent.java              | 133 ++++++++++++++++
 .../winconditions/WinconditionBlocks.java     |   2 +-
 .../WinconditionCaptainDead.java              |   2 +
 .../WinconditionComparisonTimeout.java        |   2 +-
 .../WinconditionHearthRatioTimeout.java       |  31 ++++
 .../winconditions/WinconditionPercent.java    | 147 +++---------------
 .../WinconditionPercentTimeout.java           |  30 ++++
 .../winconditions/WinconditionPoints.java     |   4 +-
 .../WinconditionPointsAirShip.java            |   4 +-
 .../WinconditionPumkinTechKO.java             |  30 ++++
 .../winconditions/WinconditionTimeTechKO.java |   2 +
 .../WinconditionTimedDamageTechKO.java        |   2 +
 .../winconditions/WinconditionTimeout.java    |   2 +
 .../WinconditionWaterTechKO.java              |  31 ++++
 87 files changed, 538 insertions(+), 292 deletions(-)
 create mode 100644 FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/HotbarKitListener.java
 create mode 100644 FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionBasePercent.java
 create mode 100644 FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionHearthRatioTimeout.java
 create mode 100644 FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPercentTimeout.java
 create mode 100644 FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPumkinTechKO.java
 create mode 100644 FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionWaterTechKO.java

diff --git a/CommonCore/Linkage/src/de/steamwar/linkage/Linked.java b/CommonCore/Linkage/src/de/steamwar/linkage/Linked.java
index 3b0aa9e0..f3e7ca0d 100644
--- a/CommonCore/Linkage/src/de/steamwar/linkage/Linked.java
+++ b/CommonCore/Linkage/src/de/steamwar/linkage/Linked.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ * Copyright (C) 2020  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
diff --git a/CommonCore/Linkage/src/de/steamwar/linkage/LinkedInstance.java b/CommonCore/Linkage/src/de/steamwar/linkage/LinkedInstance.java
index 04e382d1..8fdbc9be 100644
--- a/CommonCore/Linkage/src/de/steamwar/linkage/LinkedInstance.java
+++ b/CommonCore/Linkage/src/de/steamwar/linkage/LinkedInstance.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ * Copyright (C) 2020  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
diff --git a/CommonCore/Linkage/src/de/steamwar/linkage/MinVersion.java b/CommonCore/Linkage/src/de/steamwar/linkage/MinVersion.java
index 82d9ce3d..efabd281 100644
--- a/CommonCore/Linkage/src/de/steamwar/linkage/MinVersion.java
+++ b/CommonCore/Linkage/src/de/steamwar/linkage/MinVersion.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ * Copyright (C) 2020  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
diff --git a/FightSystem/FightSystem_Core/build.gradle.kts b/FightSystem/FightSystem_Core/build.gradle.kts
index 93dd59c4..140696b5 100644
--- a/FightSystem/FightSystem_Core/build.gradle.kts
+++ b/FightSystem/FightSystem_Core/build.gradle.kts
@@ -22,6 +22,8 @@ plugins {
 }
 
 dependencies {
+    compileOnly(libs.classindex)
+    annotationProcessor(libs.classindex)
     compileOnly(project(":SpigotCore", "default"))
 
     compileOnly(libs.spigotapi)
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/FightSystem.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/FightSystem.java
index a95670a0..d3ad2147 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/FightSystem.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/FightSystem.java
@@ -20,26 +20,24 @@
 package de.steamwar.fightsystem;
 
 import com.comphenix.tinyprotocol.TinyProtocol;
-import de.steamwar.core.WorldEditRendererCUIEditor;
 import de.steamwar.core.Core;
-import de.steamwar.fightsystem.commands.*;
-import de.steamwar.fightsystem.countdown.*;
-import de.steamwar.fightsystem.event.*;
+import de.steamwar.core.WorldEditRendererCUIEditor;
+import de.steamwar.fightsystem.commands.TechareaCommand;
 import de.steamwar.fightsystem.fight.Fight;
 import de.steamwar.fightsystem.fight.FightTeam;
-import de.steamwar.fightsystem.fight.FightWorld;
-import de.steamwar.fightsystem.fight.HotbarKit;
-import de.steamwar.fightsystem.listener.*;
-import de.steamwar.fightsystem.listener.Shutdown;
-import de.steamwar.fightsystem.record.FileRecorder;
+import de.steamwar.fightsystem.listener.ClickAnalyzer;
+import de.steamwar.fightsystem.listener.PistonListener;
 import de.steamwar.fightsystem.record.FileSource;
 import de.steamwar.fightsystem.record.GlobalRecorder;
-import de.steamwar.fightsystem.record.LiveRecorder;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.OneShotStateDependent;
 import de.steamwar.fightsystem.states.StateDependentListener;
 import de.steamwar.fightsystem.utils.*;
-import de.steamwar.fightsystem.winconditions.*;
+import de.steamwar.fightsystem.winconditions.Wincondition;
+import de.steamwar.fightsystem.winconditions.WinconditionComparisonTimeout;
+import de.steamwar.fightsystem.winconditions.Winconditions;
+import de.steamwar.linkage.AbstractLinker;
+import de.steamwar.linkage.SpigotLinker;
 import de.steamwar.message.Message;
 import de.steamwar.sql.NodeData;
 import de.steamwar.sql.SchematicNode;
@@ -58,6 +56,8 @@ public class FightSystem extends JavaPlugin {
     private TechHiderWrapper techHider;
     private HullHider hullHider;
 
+    private SpigotLinker spigotLinker;
+
     @Override
     public void onLoad() {
         plugin = this;
@@ -77,100 +77,32 @@ public class FightSystem extends JavaPlugin {
 
         message = new Message("de.steamwar.fightsystem.FightSystem", FightSystem.class.getClassLoader());
 
-        new EntityDamage();
-        new WaterRemover();
-        new Permanent();
+        spigotLinker = new SpigotLinker(this, message) {
+            @Override
+            protected void linkObject(Object any) {
+                // No Init needed for FightSystem!
+            }
+        };
+        try {
+            spigotLinker.link();
+        } catch (AbstractLinker.LinkException e) {
+            e.printStackTrace();
+            Bukkit.shutdown();
+            return;
+        }
+
         new PistonListener(ArenaMode.AntiTestCheckPrepare, e -> e.setCancelled(true));
         new PistonListener(ArenaMode.Test, e -> getMessage().broadcastActionbar("PISTON_PUSHED_OUTSIDE"));
         new PistonListener(ArenaMode.Prepare, e -> {
             getMessage().broadcast("PISTON_PUSHED_OUTSIDE");
             shutdown();
         });
-        new Chat();
-        new ArenaBorder();
-        new IngameDeath();
-        new InFightDamage();
-        new InFightInventory();
-        new DenyWorldInteraction();
-        new DenyInventoryMovement();
-        new EventJoin();
-        new Recording();
-        new Check();
-        new Shutdown();
-        new SetupQuit();
-        new PrepareSchem();
-        new TestJoin();
-        new NormalJoin();
-        new Spectator();
-        new RunningWorldInteraction();
-        new PersonalKitCreator();
-        new ArrowStopper();
         new StateDependentListener(ArenaMode.All, FightState.All, BountifulWrapper.impl.newDenyArrowPickupListener());
-        new BlockFadeListener();
-        new LeaveableArena();
-        new ClickAnalyzer();
-        new BlockPlaceCollision();
-        new HotbarKit.HotbarKitListener();
-        new JoinRequestListener();
         new OneShotStateDependent(ArenaMode.All, FightState.PreSchemSetup, () -> Fight.playSound(SWSound.BLOCK_NOTE_PLING.getSound(), 100.0f, 2.0f));
         new OneShotStateDependent(ArenaMode.Test, FightState.All, WorldEditRendererCUIEditor::new);
 
-        new EnterHandler();
         techHider = new TechHiderWrapper();
         hullHider = new HullHider();
-        new FightWorld();
-        new FightUI();
-        new FightStatistics();
-        new BungeeFightInfo();
-
-        new WinconditionAllDead();
-        new WinconditionCaptainDead();
-        new WinconditionBlocks(Winconditions.WATER_TECH_KO, "WaterTechKO", "BAR_WATER", FlatteningWrapper.impl::isWater);
-        new WinconditionBlocks(Winconditions.PUMPKIN_TECH_KO, "PumpkinTechKO", "BAR_CANNONS", block -> block.getType() == WinconditionBlocks.PUMPKIN_LANTERN);
-        new WinconditionPercent(Winconditions.PERCENT_SYSTEM, "Percent");
-        new WinconditionPoints();
-        new WinconditionPointsAirShip();
-        new WinconditionTimeout();
-        new WinconditionTimeTechKO();
-        new WinconditionTimedDamageTechKO();
-        new EventTeamOffWincondition();
-        new WinconditionComparisonTimeout(Winconditions.HEART_RATIO_TIMEOUT, "HeartTimeout", "WIN_MORE_HEALTH", FightTeam::getHeartRatio);
-        new WinconditionComparisonTimeout(Winconditions.PERCENT_TIMEOUT, "PercentTimeout", "WIN_LESS_DAMAGE", team -> -Wincondition.getPercentWincondition().getPercent(team));
-
-        new HellsBells();
-        new Meteor();
-        new PersistentDamage();
-        new TNTDistributor();
-        new WinconditionAmongUs();
-        new NoGravity();
-
-        new NoPlayersOnlineCountdown();
-        new PreSchemCountdown();
-        new PostSchemCountdown();
-        new PreRunningCountdown();
-        new SpectateOverCountdown();
-        new EventSpectateCountdown();
-
-        new LeaveCommand();
-        new KitCommand();
-        new RemoveCommand();
-        new RequestsCommand();
-        new InfoCommand();
-        new WGCommand();
-        new TBCommand();
-        new GamemodeCommand();
-        new ReadyCommand();
-        new AkCommand();
-        new LockschemCommand();
-        new StateCommand();
-        new SkipCommand();
-        new TechhiderbugCommand();
-        new TPSWarpCommand();
-        new UnrankCommand();
-        new WinCommand();
-
-        new LiveRecorder();
-        new FileRecorder();
 
         FileSource.startReplay();
 
@@ -196,6 +128,7 @@ public class FightSystem extends JavaPlugin {
     public void onDisable() {
         GlobalRecorder.getInstance().close();
         ClickAnalyzer.close();
+        spigotLinker.unlink();
     }
 
     public static void setSpectateState(FightTeam winFightTeam, String winreason, String subtitle, Object... params) {
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/AkCommand.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/AkCommand.java
index 27e6b797..dcb40b9d 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/AkCommand.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/AkCommand.java
@@ -25,6 +25,7 @@ import de.steamwar.fightsystem.FightSystem;
 import de.steamwar.fightsystem.fight.Kit;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentCommand;
+import de.steamwar.linkage.Linked;
 import de.steamwar.sql.SteamwarUser;
 import de.steamwar.sql.UserPerm;
 import org.bukkit.command.Command;
@@ -32,6 +33,7 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+@Linked
 public class AkCommand implements CommandExecutor {
 
     public AkCommand() {
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/GamemodeCommand.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/GamemodeCommand.java
index 5c566261..2c6b6d3a 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/GamemodeCommand.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/GamemodeCommand.java
@@ -23,6 +23,7 @@ import com.google.common.collect.ImmutableList;
 import de.steamwar.core.CommandRemover;
 import de.steamwar.fightsystem.Config;
 import de.steamwar.fightsystem.FightSystem;
+import de.steamwar.linkage.Linked;
 import net.md_5.bungee.api.ChatMessageType;
 import org.bukkit.GameMode;
 import org.bukkit.command.CommandSender;
@@ -34,6 +35,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
 
+@Linked
 public class GamemodeCommand extends BukkitCommand {
 
     private static final List<String> GAMEMODE_NAMES = ImmutableList.of("adventure", "creative", "survival",
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/InfoCommand.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/InfoCommand.java
index 4cd6c19c..ca515dad 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/InfoCommand.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/InfoCommand.java
@@ -26,6 +26,7 @@ import de.steamwar.fightsystem.fight.FightTeam;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentCommand;
 import de.steamwar.fightsystem.utils.FightStatistics;
+import de.steamwar.linkage.Linked;
 import de.steamwar.sql.SchematicNode;
 import de.steamwar.sql.SteamwarUser;
 import de.steamwar.sql.UserPerm;
@@ -34,6 +35,7 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+@Linked
 public class InfoCommand implements CommandExecutor {
 
     public InfoCommand() {
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/KitCommand.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/KitCommand.java
index 000711d8..c80004dc 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/KitCommand.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/KitCommand.java
@@ -22,11 +22,13 @@ 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.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 KitCommand implements CommandExecutor {
 
     public KitCommand() {
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/LeaveCommand.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/LeaveCommand.java
index 902f7796..61bbf816 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/LeaveCommand.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/LeaveCommand.java
@@ -22,11 +22,13 @@ 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.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 LeaveCommand implements CommandExecutor {
 
     public LeaveCommand() {
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/LockschemCommand.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/LockschemCommand.java
index 9ea0c135..eb097998 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/LockschemCommand.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/LockschemCommand.java
@@ -25,6 +25,7 @@ import de.steamwar.fightsystem.fight.Fight;
 import de.steamwar.fightsystem.fight.FightTeam;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentCommand;
+import de.steamwar.linkage.Linked;
 import de.steamwar.sql.*;
 import net.md_5.bungee.api.ChatMessageType;
 import org.bukkit.command.Command;
@@ -32,6 +33,7 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+@Linked
 public class LockschemCommand implements CommandExecutor {
 
     public LockschemCommand() {
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/ReadyCommand.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/ReadyCommand.java
index 4761ca57..2da5d3c2 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/ReadyCommand.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/ReadyCommand.java
@@ -22,11 +22,13 @@ 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.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 ReadyCommand implements CommandExecutor {
 
     public ReadyCommand() {
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/RemoveCommand.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/RemoveCommand.java
index f7c93537..d1083ecf 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/RemoveCommand.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/RemoveCommand.java
@@ -23,11 +23,13 @@ import de.steamwar.fightsystem.ArenaMode;
 import de.steamwar.fightsystem.FightSystem;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentCommand;
+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 RemoveCommand implements CommandExecutor {
 
     public RemoveCommand() {
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/RequestsCommand.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/RequestsCommand.java
index 131cc898..f998384a 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/RequestsCommand.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/RequestsCommand.java
@@ -27,6 +27,7 @@ import de.steamwar.fightsystem.fight.FightTeam;
 import de.steamwar.fightsystem.fight.JoinRequest;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentCommand;
+import de.steamwar.linkage.Linked;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
@@ -34,6 +35,7 @@ import org.bukkit.entity.Player;
 
 import java.util.function.BiConsumer;
 
+@Linked
 public class RequestsCommand implements CommandExecutor {
 
     public RequestsCommand() {
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/SkipCommand.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/SkipCommand.java
index a1bedda9..5311eecc 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/SkipCommand.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/SkipCommand.java
@@ -25,11 +25,13 @@ import de.steamwar.fightsystem.fight.Fight;
 import de.steamwar.fightsystem.record.PacketProcessor;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentCommand;
+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 SkipCommand implements CommandExecutor {
 
     public SkipCommand() {
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/StateCommand.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/StateCommand.java
index 8299a8c6..1fb3b424 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/StateCommand.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/StateCommand.java
@@ -22,11 +22,13 @@ 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.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 StateCommand implements CommandExecutor {
 
     public StateCommand() {
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/TBCommand.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/TBCommand.java
index fa18262c..9ed7a9fe 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/TBCommand.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/TBCommand.java
@@ -23,11 +23,13 @@ import de.steamwar.fightsystem.ArenaMode;
 import de.steamwar.fightsystem.fight.Fight;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentCommand;
+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 TBCommand implements CommandExecutor {
 
     public TBCommand() {
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/TPSWarpCommand.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/TPSWarpCommand.java
index 27927f72..4384f9ce 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/TPSWarpCommand.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/TPSWarpCommand.java
@@ -24,10 +24,12 @@ import de.steamwar.fightsystem.ArenaMode;
 import de.steamwar.fightsystem.FightSystem;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentCommand;
+import de.steamwar.linkage.Linked;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 
+@Linked
 public class TPSWarpCommand implements CommandExecutor {
 
     public TPSWarpCommand() {
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/TechhiderbugCommand.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/TechhiderbugCommand.java
index 3080c13e..ed8ce14c 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/TechhiderbugCommand.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/TechhiderbugCommand.java
@@ -26,6 +26,7 @@ import de.steamwar.fightsystem.FightSystem;
 import de.steamwar.fightsystem.fight.Fight;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentCommand;
+import de.steamwar.linkage.Linked;
 import de.steamwar.sql.SWException;
 import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
@@ -36,6 +37,7 @@ import java.io.StringWriter;
 import java.util.Arrays;
 import java.util.logging.Level;
 
+@Linked
 public class TechhiderbugCommand implements CommandExecutor {
 
     public TechhiderbugCommand() {
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/UnrankCommand.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/UnrankCommand.java
index 25bdf35b..7f1be4b1 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/UnrankCommand.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/UnrankCommand.java
@@ -23,11 +23,13 @@ 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 () {
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/WGCommand.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/WGCommand.java
index 1ffe7dce..30f0414e 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/WGCommand.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/WGCommand.java
@@ -24,11 +24,13 @@ import de.steamwar.fightsystem.fight.Fight;
 import de.steamwar.fightsystem.fight.FightWorld;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentCommand;
+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 WGCommand implements CommandExecutor {
 
     public WGCommand() {
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/WinCommand.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/WinCommand.java
index d522a8e2..c236442f 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/WinCommand.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/WinCommand.java
@@ -7,12 +7,14 @@ import de.steamwar.fightsystem.fight.Fight;
 import de.steamwar.fightsystem.fight.FightTeam;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentCommand;
+import de.steamwar.linkage.Linked;
 import net.md_5.bungee.api.ChatMessageType;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+@Linked
 public class WinCommand implements CommandExecutor {
 
     public WinCommand() {
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/EventSpectateCountdown.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/EventSpectateCountdown.java
index e8772398..0054def5 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/EventSpectateCountdown.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/EventSpectateCountdown.java
@@ -26,7 +26,9 @@ import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentCountdown;
 import de.steamwar.fightsystem.utils.Message;
 import de.steamwar.fightsystem.utils.SWSound;
+import de.steamwar.linkage.Linked;
 
+@Linked
 public class EventSpectateCountdown extends Countdown {
 
     public EventSpectateCountdown() {
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/NoPlayersOnlineCountdown.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/NoPlayersOnlineCountdown.java
index 94e54e28..b479be63 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/NoPlayersOnlineCountdown.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/NoPlayersOnlineCountdown.java
@@ -24,8 +24,10 @@ import de.steamwar.fightsystem.Config;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentCountdown;
 import de.steamwar.fightsystem.utils.Message;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
 
+@Linked
 public class NoPlayersOnlineCountdown extends Countdown {
 
     public NoPlayersOnlineCountdown() {
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/PostSchemCountdown.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/PostSchemCountdown.java
index cb5f2db2..307eae03 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/PostSchemCountdown.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/PostSchemCountdown.java
@@ -24,7 +24,9 @@ import de.steamwar.fightsystem.Config;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentCountdown;
 import de.steamwar.fightsystem.utils.Message;
+import de.steamwar.linkage.Linked;
 
+@Linked
 public class PostSchemCountdown extends Countdown {
 
     public PostSchemCountdown() {
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/PreRunningCountdown.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/PreRunningCountdown.java
index 17684a70..8dd7e2b2 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/PreRunningCountdown.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/PreRunningCountdown.java
@@ -25,7 +25,9 @@ import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentCountdown;
 import de.steamwar.fightsystem.utils.Message;
 import de.steamwar.fightsystem.utils.SWSound;
+import de.steamwar.linkage.Linked;
 
+@Linked
 public class PreRunningCountdown extends Countdown {
 
     public PreRunningCountdown() {
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/PreSchemCountdown.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/PreSchemCountdown.java
index 4200eb65..0a2e0e6c 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/PreSchemCountdown.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/PreSchemCountdown.java
@@ -25,7 +25,9 @@ import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentCountdown;
 import de.steamwar.fightsystem.utils.Message;
 import de.steamwar.fightsystem.utils.SWSound;
+import de.steamwar.linkage.Linked;
 
+@Linked
 public class PreSchemCountdown extends Countdown {
 
     public PreSchemCountdown() {
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/SpectateOverCountdown.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/SpectateOverCountdown.java
index 9f3cb10d..74b81f93 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/SpectateOverCountdown.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/SpectateOverCountdown.java
@@ -25,7 +25,9 @@ import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentCountdown;
 import de.steamwar.fightsystem.utils.Message;
 import de.steamwar.fightsystem.utils.SWSound;
+import de.steamwar.linkage.Linked;
 
+@Linked
 public class SpectateOverCountdown extends Countdown {
 
     public SpectateOverCountdown() {
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/event/HellsBells.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/event/HellsBells.java
index 3cfa7a87..8c2cb3f6 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/event/HellsBells.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/event/HellsBells.java
@@ -29,8 +29,8 @@ import de.steamwar.fightsystem.states.StateDependent;
 import de.steamwar.fightsystem.utils.Message;
 import de.steamwar.fightsystem.utils.SWSound;
 import de.steamwar.fightsystem.winconditions.Winconditions;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
-import org.bukkit.entity.EntityType;
 import org.bukkit.scheduler.BukkitTask;
 
 import java.util.Arrays;
@@ -39,7 +39,7 @@ import java.util.Random;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.logging.Level;
 
-
+@Linked
 public class HellsBells {
 
 	public static final Random random = new Random();
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/event/Meteor.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/event/Meteor.java
index 3f3115d6..74b4cffe 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/event/Meteor.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/event/Meteor.java
@@ -29,6 +29,7 @@ import de.steamwar.fightsystem.states.StateDependentListener;
 import de.steamwar.fightsystem.utils.Message;
 import de.steamwar.fightsystem.utils.SWSound;
 import de.steamwar.fightsystem.winconditions.Winconditions;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Fireball;
 import org.bukkit.entity.LargeFireball;
@@ -44,7 +45,7 @@ import java.util.Random;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.logging.Level;
 
-
+@Linked
 public class Meteor implements Listener {
 
 	public static final Random random = new Random();
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/event/NoGravity.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/event/NoGravity.java
index 12246f8e..4e3125ea 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/event/NoGravity.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/event/NoGravity.java
@@ -22,11 +22,13 @@ package de.steamwar.fightsystem.event;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
 import de.steamwar.fightsystem.winconditions.Winconditions;
+import de.steamwar.linkage.Linked;
 import org.bukkit.entity.EntityType;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntitySpawnEvent;
 
+@Linked
 public class NoGravity implements Listener {
 
     public NoGravity() {
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/event/PersistentDamage.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/event/PersistentDamage.java
index 543eff9e..7b50a2c9 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/event/PersistentDamage.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/event/PersistentDamage.java
@@ -28,10 +28,12 @@ import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.OneShotStateDependent;
 import de.steamwar.fightsystem.utils.WorldeditWrapper;
 import de.steamwar.fightsystem.winconditions.Winconditions;
+import de.steamwar.linkage.Linked;
 import de.steamwar.sql.SchematicNode;
 
 import java.util.logging.Level;
 
+@Linked
 public class PersistentDamage {
 
     public PersistentDamage() {
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/event/TNTDistributor.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/event/TNTDistributor.java
index 8982bb3d..c19050ac 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/event/TNTDistributor.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/event/TNTDistributor.java
@@ -23,9 +23,11 @@ import de.steamwar.fightsystem.fight.Fight;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentTask;
 import de.steamwar.fightsystem.winconditions.Winconditions;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 
+@Linked
 public class TNTDistributor {
 
     public TNTDistributor() {
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightWorld.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightWorld.java
index efcc16a3..0f6268b7 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightWorld.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightWorld.java
@@ -27,6 +27,7 @@ import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependent;
 import de.steamwar.fightsystem.utils.CraftbukkitWrapper;
 import de.steamwar.fightsystem.utils.FlatteningWrapper;
+import de.steamwar.linkage.Linked;
 import lombok.Getter;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
@@ -39,6 +40,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
+@Linked
 public class FightWorld extends StateDependent {
 
     @Getter
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/HotbarKit.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/HotbarKit.java
index 6b3df110..d80dd1ad 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/HotbarKit.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/HotbarKit.java
@@ -19,35 +19,18 @@
 
 package de.steamwar.fightsystem.fight;
 
-import de.steamwar.core.Core;
-import de.steamwar.fightsystem.ArenaMode;
 import de.steamwar.fightsystem.Config;
 import de.steamwar.fightsystem.FightSystem;
 import de.steamwar.fightsystem.commands.GUI;
-import de.steamwar.fightsystem.listener.PersonalKitCreator;
-import de.steamwar.fightsystem.states.FightState;
-import de.steamwar.fightsystem.states.StateDependentListener;
-import de.steamwar.fightsystem.states.StateDependentTask;
 import de.steamwar.fightsystem.utils.ItemBuilder;
-import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
-import org.bukkit.event.Cancellable;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.block.Action;
-import org.bukkit.event.inventory.InventoryClickEvent;
-import org.bukkit.event.inventory.InventoryOpenEvent;
-import org.bukkit.event.player.PlayerInteractEvent;
-import org.bukkit.inventory.EquipmentSlot;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.potion.PotionEffect;
 
 import java.util.Collection;
-import java.util.HashSet;
 import java.util.Objects;
-import java.util.Set;
 import java.util.function.Consumer;
 
 public class HotbarKit extends Kit {
@@ -58,10 +41,10 @@ public class HotbarKit extends Kit {
             SPECTATOR_KIT.setItem(i, "JOIN_REQUEST", new ItemBuilder(Material.PAPER).build(), GUI::joinRequest);
     }
 
-    private static final int HOTBAR_SIZE = 9;
+    protected static final int HOTBAR_SIZE = 9;
 
     private final String[] nameTags;
-    private final Consumer<Player>[] onClicks;
+    protected final Consumer<Player>[] onClicks;
 
     protected HotbarKit(String name, ItemStack[] inventory, ItemStack[] armor, Collection<PotionEffect> effects, String[] nameTags, Consumer<Player>[] onClicks) {
         super(name, inventory, armor, effects);
@@ -94,45 +77,4 @@ public class HotbarKit extends Kit {
         }
         super.loadToPlayer(player);
     }
-
-    public static class HotbarKitListener implements Listener {
-
-        private static final Set<Player> clicked = new HashSet<>();
-
-        public HotbarKitListener() {
-            new StateDependentListener(ArenaMode.AntiReplay, FightState.All, this);
-            new StateDependentTask(ArenaMode.AntiReplay, FightState.All, clicked::clear, 10, 10);
-        }
-
-        @EventHandler
-        public void handlePlayerInteract(PlayerInteractEvent event) {
-            if(event.getAction() == Action.PHYSICAL || (Core.getVersion() > 8 && event.getHand() != EquipmentSlot.HAND))
-                return;
-
-            Player player = event.getPlayer();
-            int slot = player.getInventory().getHeldItemSlot();
-            click(player, slot, event);
-        }
-
-        @EventHandler
-        public void onInventoryClick(InventoryClickEvent event) {
-            int slot = event.getSlot();
-            if (slot < 0 || slot >= HOTBAR_SIZE) return;
-
-            Player player = (Player) event.getWhoClicked();
-            click(player, slot, event);
-        }
-
-        private void click(Player player, int slot, Cancellable event) {
-            Kit activeKit = activeKits.get(player);
-            if(!(activeKit instanceof HotbarKit) || PersonalKitCreator.inKitCreator(player) || activeKit.getInventory()[slot] == null)
-                return;
-
-            event.setCancelled(true);
-            if(!clicked.add(player))
-                return;
-
-            ((HotbarKit)activeKit).onClicks[slot].accept(player);
-        }
-    }
 }
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/HotbarKitListener.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/HotbarKitListener.java
new file mode 100644
index 00000000..a321a697
--- /dev/null
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/HotbarKitListener.java
@@ -0,0 +1,81 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2020  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.fight;
+
+import de.steamwar.core.Core;
+import de.steamwar.fightsystem.ArenaMode;
+import de.steamwar.fightsystem.listener.PersonalKitCreator;
+import de.steamwar.fightsystem.states.FightState;
+import de.steamwar.fightsystem.states.StateDependentListener;
+import de.steamwar.fightsystem.states.StateDependentTask;
+import de.steamwar.linkage.Linked;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.block.Action;
+import org.bukkit.event.inventory.InventoryClickEvent;
+import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.inventory.EquipmentSlot;
+
+import java.util.HashSet;
+import java.util.Set;
+
+@Linked
+public class HotbarKitListener implements Listener {
+
+    private static final Set<Player> clicked = new HashSet<>();
+
+    public HotbarKitListener() {
+        new StateDependentListener(ArenaMode.AntiReplay, FightState.All, this);
+        new StateDependentTask(ArenaMode.AntiReplay, FightState.All, clicked::clear, 10, 10);
+    }
+
+    @EventHandler
+    public void handlePlayerInteract(PlayerInteractEvent event) {
+        if (event.getAction() == Action.PHYSICAL || (Core.getVersion() > 8 && event.getHand() != EquipmentSlot.HAND))
+            return;
+
+        Player player = event.getPlayer();
+        int slot = player.getInventory().getHeldItemSlot();
+        click(player, slot, event);
+    }
+
+    @EventHandler
+    public void onInventoryClick(InventoryClickEvent event) {
+        int slot = event.getSlot();
+        if (slot < 0 || slot >= HotbarKit.HOTBAR_SIZE) return;
+
+        Player player = (Player) event.getWhoClicked();
+        click(player, slot, event);
+    }
+
+    private void click(Player player, int slot, Cancellable event) {
+        Kit activeKit = Kit.activeKits.get(player);
+        if (!(activeKit instanceof HotbarKit) || PersonalKitCreator.inKitCreator(player) || activeKit.getInventory()[slot] == null)
+            return;
+
+        event.setCancelled(true);
+        if (!clicked.add(player))
+            return;
+
+        ((HotbarKit) activeKit).onClicks[slot].accept(player);
+    }
+}
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/ArenaBorder.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/ArenaBorder.java
index 4c0daa45..b3f846b6 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/ArenaBorder.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/ArenaBorder.java
@@ -29,6 +29,7 @@ import de.steamwar.fightsystem.fight.FightPlayer;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
 import de.steamwar.fightsystem.states.StateDependentTask;
+import de.steamwar.linkage.Linked;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -37,6 +38,7 @@ import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 
+@Linked
 public class ArenaBorder implements Listener {
 
     private final Border spectatorBorder = new Border(Config.PlayerRegion, true, 5, "NO_ARENA_LEAVING", "ArenaBorder.spectatorBorder");
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/ArrowStopper.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/ArrowStopper.java
index 361b86b6..ff77d4ca 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/ArrowStopper.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/ArrowStopper.java
@@ -24,6 +24,7 @@ import de.steamwar.fightsystem.Config;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentTask;
 import de.steamwar.fightsystem.utils.WorldOfColorWrapper;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Location;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
@@ -32,6 +33,7 @@ import org.bukkit.entity.Projectile;
 import org.bukkit.projectiles.ProjectileSource;
 import org.bukkit.util.Vector;
 
+@Linked
 public class ArrowStopper {
 
     private static final Vector NULL_VECTOR = new Vector(0, 0, 0);
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/BlockFadeListener.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/BlockFadeListener.java
index 51b5b949..750bbe44 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/BlockFadeListener.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/BlockFadeListener.java
@@ -3,11 +3,13 @@ package de.steamwar.fightsystem.listener;
 import de.steamwar.fightsystem.Config;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.BlockFadeEvent;
 
+@Linked
 public class BlockFadeListener implements Listener {
 
     public BlockFadeListener() {
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/BlockPlaceCollision.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/BlockPlaceCollision.java
index 7b3bf541..ac3c6fb5 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/BlockPlaceCollision.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/BlockPlaceCollision.java
@@ -23,6 +23,7 @@ import de.steamwar.fightsystem.ArenaMode;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
 import de.steamwar.fightsystem.utils.FlatteningWrapper;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Location;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
@@ -30,6 +31,7 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.BlockPlaceEvent;
 
+@Linked
 public class BlockPlaceCollision implements Listener {
 
     public BlockPlaceCollision() {
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Chat.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Chat.java
index 827f46c9..5e1a0114 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Chat.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Chat.java
@@ -27,6 +27,7 @@ import de.steamwar.fightsystem.fight.FightTeam;
 import de.steamwar.fightsystem.record.GlobalRecorder;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
+import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -34,6 +35,7 @@ import org.bukkit.event.player.AsyncPlayerChatEvent;
 
 import java.util.logging.Level;
 
+@Linked
 public class Chat implements Listener {
 
     public Chat(){
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Check.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Check.java
index f6efd8cc..8a413b4b 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Check.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Check.java
@@ -24,6 +24,7 @@ import de.steamwar.fightsystem.Config;
 import de.steamwar.fightsystem.FightSystem;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
+import de.steamwar.linkage.Linked;
 import de.steamwar.sql.SchematicNode;
 import de.steamwar.sql.SteamwarUser;
 import de.steamwar.sql.UserPerm;
@@ -36,6 +37,7 @@ import org.bukkit.event.player.PlayerJoinEvent;
 
 import java.util.logging.Level;
 
+@Linked
 public class Check implements Listener {
 
     public Check() {
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/ClickAnalyzer.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/ClickAnalyzer.java
index d4bd10dc..4cbe464a 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/ClickAnalyzer.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/ClickAnalyzer.java
@@ -24,10 +24,12 @@ import com.comphenix.tinyprotocol.TinyProtocol;
 import de.steamwar.core.Core;
 import de.steamwar.fightsystem.Config;
 import de.steamwar.fightsystem.utils.CraftbukkitWrapper;
+import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 
 import java.io.*;
 
+@Linked
 public class ClickAnalyzer {
 
     private static final PrintStream output;
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/DenyInventoryMovement.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/DenyInventoryMovement.java
index 6c7f71f8..746910e2 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/DenyInventoryMovement.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/DenyInventoryMovement.java
@@ -23,12 +23,14 @@ import de.steamwar.fightsystem.ArenaMode;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
 import de.steamwar.fightsystem.utils.BountifulWrapper;
+import de.steamwar.linkage.Linked;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.inventory.InventoryDragEvent;
 import org.bukkit.event.player.PlayerPickupItemEvent;
 
+@Linked
 public class DenyInventoryMovement implements Listener {
 
     public DenyInventoryMovement() {
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/DenyWorldInteraction.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/DenyWorldInteraction.java
index f494d0bc..21a5a063 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/DenyWorldInteraction.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/DenyWorldInteraction.java
@@ -25,6 +25,7 @@ import de.steamwar.fightsystem.FightSystem;
 import de.steamwar.fightsystem.fight.Fight;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
+import de.steamwar.linkage.Linked;
 import net.md_5.bungee.api.ChatMessageType;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -38,6 +39,7 @@ import org.bukkit.event.hanging.HangingBreakEvent;
 import org.bukkit.event.player.PlayerDropItemEvent;
 import org.bukkit.event.player.PlayerKickEvent;
 
+@Linked
 public class DenyWorldInteraction implements Listener {
 
     public DenyWorldInteraction() {
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/EntityDamage.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/EntityDamage.java
index 18959b68..226375f0 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/EntityDamage.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/EntityDamage.java
@@ -23,11 +23,13 @@ import de.steamwar.fightsystem.ArenaMode;
 import de.steamwar.fightsystem.Config;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
+import de.steamwar.linkage.Linked;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.bukkit.event.entity.EntityDamageEvent;
 
+@Linked
 public class EntityDamage implements Listener {
 
     public EntityDamage() {
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/EventJoin.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/EventJoin.java
index 6630becb..3d7de932 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/EventJoin.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/EventJoin.java
@@ -26,6 +26,7 @@ import de.steamwar.fightsystem.fight.Fight;
 import de.steamwar.fightsystem.fight.FightTeam;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
+import de.steamwar.linkage.Linked;
 import de.steamwar.sql.SteamwarUser;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -33,6 +34,7 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerLoginEvent;
 
+@Linked
 public class EventJoin implements Listener {
 
     public EventJoin() {
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/InFightDamage.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/InFightDamage.java
index 7194fdd6..7846d51e 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/InFightDamage.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/InFightDamage.java
@@ -25,6 +25,7 @@ import de.steamwar.fightsystem.fight.Fight;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
 import de.steamwar.fightsystem.winconditions.Winconditions;
+import de.steamwar.linkage.Linked;
 import net.md_5.bungee.api.ChatMessageType;
 import org.bukkit.entity.Arrow;
 import org.bukkit.entity.LivingEntity;
@@ -34,6 +35,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent;
 
 import java.util.Objects;
 
+@Linked
 public class InFightDamage implements Listener {
 
     public InFightDamage() {
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/InFightInventory.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/InFightInventory.java
index ad41d0a0..33b4cf78 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/InFightInventory.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/InFightInventory.java
@@ -23,6 +23,7 @@ import de.steamwar.fightsystem.ArenaMode;
 import de.steamwar.fightsystem.fight.Fight;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -35,6 +36,7 @@ import java.util.Collections;
 import java.util.EnumSet;
 import java.util.Set;
 
+@Linked
 public class InFightInventory implements Listener {
 
     private static final Set<Material> allowed = Collections.unmodifiableSet(EnumSet.of(Material.TNT, Material.AIR));
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/IngameDeath.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/IngameDeath.java
index 6ff538f4..14f020f7 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/IngameDeath.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/IngameDeath.java
@@ -26,6 +26,7 @@ import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
 import de.steamwar.fightsystem.utils.FightUI;
 import de.steamwar.fightsystem.utils.SWSound;
+import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.event.EventHandler;
@@ -36,6 +37,7 @@ import org.bukkit.event.player.PlayerQuitEvent;
 
 import java.util.function.Consumer;
 
+@Linked
 public class IngameDeath implements Listener {
 
     public IngameDeath() {
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/JoinRequestListener.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/JoinRequestListener.java
index 45121cf7..bf859d48 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/JoinRequestListener.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/JoinRequestListener.java
@@ -29,6 +29,7 @@ import de.steamwar.fightsystem.fight.JoinRequest;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.OneShotStateDependent;
 import de.steamwar.fightsystem.states.StateDependentListener;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -38,6 +39,7 @@ import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.event.player.PlayerRespawnEvent;
 
+@Linked
 public class JoinRequestListener implements Listener {
 
     public JoinRequestListener() {
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/LeaveableArena.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/LeaveableArena.java
index 36a5a189..73daed41 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/LeaveableArena.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/LeaveableArena.java
@@ -23,6 +23,7 @@ import de.steamwar.fightsystem.Config;
 import de.steamwar.fightsystem.fight.Fight;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
+import de.steamwar.linkage.Linked;
 import org.bukkit.GameMode;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -35,6 +36,7 @@ import org.spigotmc.event.player.PlayerSpawnLocationEvent;
 import java.util.HashMap;
 import java.util.Map;
 
+@Linked
 public class LeaveableArena implements Listener {
 
     private final Map<Player, GameMode> spectatorsInArena = new HashMap<>();
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/NormalJoin.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/NormalJoin.java
index 371ae75c..33e91888 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/NormalJoin.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/NormalJoin.java
@@ -24,11 +24,13 @@ import de.steamwar.fightsystem.fight.Fight;
 import de.steamwar.fightsystem.fight.FightTeam;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
+import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
 
+@Linked
 public class NormalJoin implements Listener {
 
     public NormalJoin() {
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Permanent.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Permanent.java
index 4976463c..c35eed95 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Permanent.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Permanent.java
@@ -29,6 +29,7 @@ import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
 import de.steamwar.fightsystem.utils.BountifulWrapper;
 import de.steamwar.fightsystem.utils.FlatteningWrapper;
+import de.steamwar.linkage.Linked;
 import net.md_5.bungee.api.ChatMessageType;
 import org.bukkit.GameMode;
 import org.bukkit.Material;
@@ -54,6 +55,7 @@ import org.bukkit.inventory.ItemStack;
 import org.bukkit.scoreboard.NameTagVisibility;
 import org.bukkit.scoreboard.Team;
 
+@Linked
 public class Permanent implements Listener {
 
     private static final Team spectatorTeam = FightScoreboard.getBukkitTeam("Spectator");
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/PersonalKitCreator.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/PersonalKitCreator.java
index f9a3b2d8..b003d84b 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/PersonalKitCreator.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/PersonalKitCreator.java
@@ -26,6 +26,7 @@ import de.steamwar.fightsystem.fight.FightPlayer;
 import de.steamwar.fightsystem.fight.Kit;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
+import de.steamwar.linkage.Linked;
 import de.steamwar.sql.PersonalKit;
 import net.md_5.bungee.api.ChatMessageType;
 import org.bukkit.Bukkit;
@@ -46,6 +47,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 
+@Linked
 public class PersonalKitCreator implements Listener {
 
     private static final Map<HumanEntity, InventoryBackup> openKitCreators = new HashMap<>();
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/PrepareSchem.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/PrepareSchem.java
index f02beeed..76c25640 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/PrepareSchem.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/PrepareSchem.java
@@ -31,6 +31,7 @@ import de.steamwar.fightsystem.states.StateDependentListener;
 import de.steamwar.fightsystem.utils.FlatteningWrapper;
 import de.steamwar.fightsystem.utils.Region;
 import de.steamwar.fightsystem.utils.WorldeditWrapper;
+import de.steamwar.linkage.Linked;
 import de.steamwar.sql.SchematicNode;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
@@ -42,6 +43,7 @@ import org.bukkit.util.Vector;
 import java.util.HashSet;
 import java.util.Set;
 
+@Linked
 public class PrepareSchem implements Listener {
 
     private final Set<Vector> stationaryMovingPistons = new HashSet<>();
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Recording.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Recording.java
index 117962eb..86b00816 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Recording.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Recording.java
@@ -39,6 +39,7 @@ import de.steamwar.fightsystem.utils.BountifulWrapper;
 import de.steamwar.fightsystem.utils.CraftbukkitWrapper;
 import de.steamwar.fightsystem.utils.FlatteningWrapper;
 import de.steamwar.fightsystem.utils.SWSound;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -61,6 +62,7 @@ import java.util.function.BiFunction;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 
+@Linked
 public class Recording implements Listener {
 
     private static final int AIR = 0;
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/RunningWorldInteraction.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/RunningWorldInteraction.java
index 7c00a9f1..e938b505 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/RunningWorldInteraction.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/RunningWorldInteraction.java
@@ -25,12 +25,14 @@ import de.steamwar.fightsystem.fight.Fight;
 import de.steamwar.fightsystem.fight.FightPlayer;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
+import de.steamwar.linkage.Linked;
 import net.md_5.bungee.api.ChatMessageType;
 import org.bukkit.Material;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.BlockPlaceEvent;
 
+@Linked
 public class RunningWorldInteraction implements Listener {
 
     public RunningWorldInteraction() {
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/SetupQuit.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/SetupQuit.java
index 87d4b7e9..99755f8a 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/SetupQuit.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/SetupQuit.java
@@ -24,11 +24,13 @@ import de.steamwar.fightsystem.fight.Fight;
 import de.steamwar.fightsystem.fight.FightTeam;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
+import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerQuitEvent;
 
+@Linked
 public class SetupQuit implements Listener {
 
     public SetupQuit(){
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Shutdown.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Shutdown.java
index 82057e92..08e60f43 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Shutdown.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Shutdown.java
@@ -23,11 +23,13 @@ import de.steamwar.fightsystem.ArenaMode;
 import de.steamwar.fightsystem.Config;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerQuitEvent;
 
+@Linked
 public class Shutdown implements Listener {
 
     public Shutdown(){
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Spectator.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Spectator.java
index 399970ca..3fcb820b 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Spectator.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Spectator.java
@@ -22,6 +22,7 @@ package de.steamwar.fightsystem.listener;
 import java.util.HashSet;
 import java.util.Set;
 
+import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
 import org.bukkit.entity.Player;
@@ -44,7 +45,7 @@ import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
 import de.steamwar.fightsystem.states.StateDependentTask;
 
-
+@Linked
 public class Spectator implements Listener {
 
     private final Set<Player> pseudoSpectator = new HashSet<>();
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/TestJoin.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/TestJoin.java
index 13a512a4..554d51cb 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/TestJoin.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/TestJoin.java
@@ -24,6 +24,7 @@ import de.steamwar.fightsystem.Config;
 import de.steamwar.fightsystem.FightSystem;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
+import de.steamwar.linkage.Linked;
 import de.steamwar.sql.SteamwarUser;
 import de.steamwar.sql.UserPerm;
 import org.bukkit.entity.Player;
@@ -31,6 +32,7 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
 
+@Linked
 public class TestJoin implements Listener {
 
     public TestJoin() {
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/WaterRemover.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/WaterRemover.java
index 847e647b..7f04d6db 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/WaterRemover.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/WaterRemover.java
@@ -27,10 +27,10 @@ import de.steamwar.fightsystem.fight.FightTeam;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
 import de.steamwar.fightsystem.utils.FlatteningWrapper;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Location;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
-import org.bukkit.entity.EntityType;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityExplodeEvent;
@@ -39,6 +39,7 @@ import org.bukkit.event.entity.EntitySpawnEvent;
 import java.util.HashMap;
 import java.util.Map;
 
+@Linked
 public class WaterRemover implements Listener {
 
     private static final int MIN_Y = Config.BluePasteRegion.getMinY() + Config.WaterDepth;
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/FileRecorder.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/FileRecorder.java
index 98933dd8..a80463e5 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/FileRecorder.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/FileRecorder.java
@@ -22,11 +22,13 @@ package de.steamwar.fightsystem.record;
 import de.steamwar.fightsystem.Config;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependent;
+import de.steamwar.linkage.Linked;
 import lombok.Getter;
 
 import java.io.*;
 import java.util.zip.GZIPOutputStream;
 
+@Linked
 public class FileRecorder extends StateDependent implements Recorder {
 
     @Getter
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/LiveRecorder.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/LiveRecorder.java
index 55fef032..e17aa891 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/LiveRecorder.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/LiveRecorder.java
@@ -22,12 +22,14 @@ package de.steamwar.fightsystem.record;
 import de.steamwar.fightsystem.Config;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependent;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
 
 import java.io.*;
 import java.net.Socket;
 import java.util.logging.Level;
 
+@Linked
 public class LiveRecorder extends StateDependent implements Recorder {
 
     private DataOutputStream outputStream;
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/BungeeFightInfo.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/BungeeFightInfo.java
index 783917bb..dde1e3f2 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/BungeeFightInfo.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/BungeeFightInfo.java
@@ -25,14 +25,15 @@ import de.steamwar.fightsystem.fight.Fight;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentCountdown;
 import de.steamwar.fightsystem.states.StateDependentTask;
+import de.steamwar.linkage.Linked;
 import de.steamwar.network.NetworkSender;
 import de.steamwar.network.packets.common.FightInfoPacket;
 import de.steamwar.sql.SteamwarUser;
 import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
 
 import java.util.stream.Collectors;
 
+@Linked
 public class BungeeFightInfo {
 
     public BungeeFightInfo() {
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/EnterHandler.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/EnterHandler.java
index 042efba0..53c9ffb3 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/EnterHandler.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/EnterHandler.java
@@ -24,9 +24,11 @@ import de.steamwar.fightsystem.fight.FightPlayer;
 import de.steamwar.fightsystem.fight.FightTeam;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.IStateDependent;
+import de.steamwar.linkage.Linked;
 
 import java.util.Set;
 
+@Linked
 public class EnterHandler implements IStateDependent {
     private static final Set<FightState> enabled = FightState.Running;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/FightStatistics.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/FightStatistics.java
index 3d6c5cac..92ea3826 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/FightStatistics.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/FightStatistics.java
@@ -31,6 +31,7 @@ import de.steamwar.fightsystem.record.FileSource;
 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;
@@ -49,6 +50,7 @@ import java.util.stream.Collectors;
 import static de.steamwar.sql.Fight.create;
 import static de.steamwar.sql.Fight.markReplayAvailable;
 
+@Linked
 public class FightStatistics {
 
     @Getter
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/FightUI.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/FightUI.java
index 122b6902..d17e535e 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/FightUI.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/FightUI.java
@@ -31,6 +31,7 @@ import de.steamwar.fightsystem.states.OneShotStateDependent;
 import de.steamwar.fightsystem.states.StateDependentCountdown;
 import de.steamwar.fightsystem.states.StateDependentTask;
 import de.steamwar.fightsystem.winconditions.Wincondition;
+import de.steamwar.linkage.Linked;
 import lombok.Getter;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
@@ -42,6 +43,7 @@ import java.util.Queue;
 import java.util.logging.Level;
 import java.util.stream.Collectors;
 
+@Linked
 public class FightUI {
 
     @Getter
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/EventTeamOffWincondition.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/EventTeamOffWincondition.java
index 77db2ff4..9f0252d2 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/EventTeamOffWincondition.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/EventTeamOffWincondition.java
@@ -24,7 +24,9 @@ import de.steamwar.fightsystem.fight.Fight;
 import de.steamwar.fightsystem.fight.FightTeam;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.OneShotStateDependent;
+import de.steamwar.linkage.Linked;
 
+@Linked
 public class EventTeamOffWincondition extends Wincondition{
 
     public EventTeamOffWincondition(){
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/Wincondition.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/Wincondition.java
index 3b62affa..627a62cf 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/Wincondition.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/Wincondition.java
@@ -36,7 +36,7 @@ import java.util.stream.Collectors;
 public abstract class Wincondition {
 
     @Getter
-    protected static WinconditionPercent percentWincondition = null;
+    protected static WinconditionBasePercent percentWincondition = null;
     protected static StateDependentCountdown timeOverCountdown = null;
     @Getter
     protected static final List<PrintableWincondition> printableWinconditions = new ArrayList<>();
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionAllDead.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionAllDead.java
index 8f2d73a3..c1dc6469 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionAllDead.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionAllDead.java
@@ -24,9 +24,11 @@ import de.steamwar.fightsystem.fight.Fight;
 import de.steamwar.fightsystem.fight.FightTeam;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
+import de.steamwar.linkage.Linked;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 
+@Linked
 public class WinconditionAllDead extends Wincondition implements Listener {
 
     public WinconditionAllDead(){
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionAmongUs.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionAmongUs.java
index 80572084..3e35177f 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionAmongUs.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionAmongUs.java
@@ -26,6 +26,7 @@ import de.steamwar.fightsystem.fight.FightTeam;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.OneShotStateDependent;
 import de.steamwar.fightsystem.states.StateDependentListener;
+import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -34,6 +35,7 @@ import org.bukkit.event.player.PlayerQuitEvent;
 
 import java.util.*;
 
+@Linked
 public class WinconditionAmongUs extends Wincondition implements Listener {
 
     private Map<FightTeam, FightPlayer> imposter = new HashMap<>();
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionBasePercent.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionBasePercent.java
new file mode 100644
index 00000000..e9cd3858
--- /dev/null
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionBasePercent.java
@@ -0,0 +1,133 @@
+/*
+    This file is a part of the SteamWar software.
+
+    Copyright (C) 2020  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.winconditions;
+
+import de.steamwar.fightsystem.Config;
+import de.steamwar.fightsystem.fight.Fight;
+import de.steamwar.fightsystem.fight.FightTeam;
+import de.steamwar.fightsystem.states.FightState;
+import de.steamwar.fightsystem.states.OneShotStateDependent;
+import de.steamwar.fightsystem.states.StateDependentListener;
+import de.steamwar.fightsystem.utils.Message;
+import org.bukkit.entity.EntityType;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.entity.EntityExplodeEvent;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Consumer;
+
+public abstract class WinconditionBasePercent extends Wincondition implements PrintableWincondition {
+
+    private final Map<FightTeam, TeamPercent> teamMap = new HashMap<>();
+
+    protected Consumer<FightTeam> checkWin = team -> {
+        if (getPercent(team) >= Config.PercentWin) {
+            win(Fight.getOpposite(team), "WIN_PERCENT", team.getColoredName());
+        }
+    };
+    protected Consumer<FightTeam> postEnable = team -> {};
+
+    public WinconditionBasePercent(Winconditions wincondition, String windescription) {
+        super(windescription);
+
+        if (Config.ActiveWinconditions.contains(wincondition)) {
+            printableWinconditions.add(this);
+            percentWincondition = this;
+        }
+
+        Fight.teams().forEach(team -> new TeamPercent(team, wincondition));
+    }
+
+    public Message getDisplay(FightTeam team) {
+        return new Message("BAR_PERCENT", team.getPrefix() + (Math.round(10000.0 * (1.0 - getPercent(team) / Config.PercentWin)) / 100.0));
+    }
+
+    public double getPercent(FightTeam team) {
+        return teamMap.get(team).getPercent();
+    }
+
+    protected int getTotalBlocks(FightTeam team) {
+        return teamMap.get(team).totalBlocks;
+    }
+
+    protected int getCurrentBlocks(FightTeam team) {
+        return teamMap.get(team).currentBlocks;
+    }
+
+    private class TeamPercent implements Listener {
+        private final FightTeam team;
+
+        private int totalBlocks = 0;
+        private int currentBlocks = 0;
+        private boolean countAnyBlock = false;
+
+        private TeamPercent(FightTeam team, Winconditions wincondition) {
+            this.team = team;
+
+            new OneShotStateDependent(wincondition, FightState.Running, this::enable);
+            new StateDependentListener(wincondition, FightState.Running, this).register();
+            teamMap.put(team, this);
+        }
+
+        @EventHandler
+        public void onEntityExplode(EntityExplodeEvent event) {
+            if (
+                    event.getEntityType() == EntityType.FIREBALL ||
+                    !team.getExtendRegion().inRegion(event.getEntity().getLocation()) ||
+                    (!Config.PercentEntern && !Config.EnterStages.isEmpty() && Config.EnterStages.get(0) >= Wincondition.getTimeOverCountdown().getTimeLeft())
+            ) {
+                return;
+            }
+
+            event.blockList().forEach(block -> {
+                if (countAnyBlock || Config.PercentBlocks.contains(block.getType()) == Config.PercentBlocksWhitelist) {
+                    currentBlocks--;
+                }
+            });
+
+            checkWin.accept(team);
+        }
+
+        private void enable() {
+            totalBlocks = 0;
+            countAnyBlock = false;
+            team.getSchemRegion().forEach((x, y, z) -> {
+                if (Config.PercentBlocks.contains(Config.world.getBlockAt(x, y, z).getType()) == Config.PercentBlocksWhitelist)
+                    totalBlocks++;
+            });
+            // Edge Case for DirtBlock
+            if (totalBlocks == 0) {
+                totalBlocks = team.getSchemRegion().volume();
+                countAnyBlock = true;
+            }
+            currentBlocks = totalBlocks;
+            postEnable.accept(team);
+        }
+
+        private double getPercent() {
+            if (currentBlocks >= totalBlocks) {
+                return 0;
+            }
+            return (totalBlocks - currentBlocks) * 100 / (double) totalBlocks;
+        }
+    }
+}
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionBlocks.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionBlocks.java
index 72c0873a..1d13d9bd 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionBlocks.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionBlocks.java
@@ -35,7 +35,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.function.Predicate;
 
-public class WinconditionBlocks extends Wincondition implements PrintableWincondition {
+public abstract class WinconditionBlocks extends Wincondition implements PrintableWincondition {
 
     public static final Material PUMPKIN_LANTERN = SWItem.getMaterial("JACK_O_LANTERN");
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionCaptainDead.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionCaptainDead.java
index de0205ab..ada04ad2 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionCaptainDead.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionCaptainDead.java
@@ -25,9 +25,11 @@ import de.steamwar.fightsystem.fight.FightPlayer;
 import de.steamwar.fightsystem.fight.FightTeam;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
+import de.steamwar.linkage.Linked;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 
+@Linked
 public class WinconditionCaptainDead extends Wincondition implements Listener {
 
     public WinconditionCaptainDead(){
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionComparisonTimeout.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionComparisonTimeout.java
index d3fa4c3c..6e576efd 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionComparisonTimeout.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionComparisonTimeout.java
@@ -27,7 +27,7 @@ import de.steamwar.fightsystem.states.StateDependentCountdown;
 
 import java.util.function.ToDoubleFunction;
 
-public class WinconditionComparisonTimeout extends Wincondition {
+public abstract class WinconditionComparisonTimeout extends Wincondition {
 
     public WinconditionComparisonTimeout(Winconditions wincondition, String windescription, String winMessage, ToDoubleFunction<FightTeam> evaluate) {
         super(windescription);
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionHearthRatioTimeout.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionHearthRatioTimeout.java
new file mode 100644
index 00000000..2dcd6c1b
--- /dev/null
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionHearthRatioTimeout.java
@@ -0,0 +1,31 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2020  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.winconditions;
+
+import de.steamwar.fightsystem.fight.FightTeam;
+import de.steamwar.linkage.Linked;
+
+@Linked
+public class WinconditionHearthRatioTimeout extends WinconditionComparisonTimeout {
+
+    public WinconditionHearthRatioTimeout() {
+        super(Winconditions.HEART_RATIO_TIMEOUT, "HeartTimeout", "WIN_MORE_HEALTH", FightTeam::getHeartRatio);
+    }
+}
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPercent.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPercent.java
index f98bdecc..b14f5bef 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPercent.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPercent.java
@@ -1,133 +1,30 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2020  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.winconditions;
 
-import de.steamwar.fightsystem.Config;
-import de.steamwar.fightsystem.fight.Fight;
-import de.steamwar.fightsystem.fight.FightTeam;
-import de.steamwar.fightsystem.states.FightState;
-import de.steamwar.fightsystem.states.OneShotStateDependent;
-import de.steamwar.fightsystem.states.StateDependentListener;
-import de.steamwar.fightsystem.utils.Message;
-import org.bukkit.entity.EntityType;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.entity.EntityExplodeEvent;
+import de.steamwar.linkage.Linked;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Consumer;
+@Linked
+public class WinconditionPercent extends WinconditionBasePercent {
 
-public class WinconditionPercent extends Wincondition implements PrintableWincondition {
-
-    private final Map<FightTeam, TeamPercent> teamMap = new HashMap<>();
-
-    protected Consumer<FightTeam> checkWin = team -> {
-        if (getPercent(team) >= Config.PercentWin) {
-            win(Fight.getOpposite(team), "WIN_PERCENT", team.getColoredName());
-        }
-    };
-    protected Consumer<FightTeam> postEnable = team -> {};
-
-    public WinconditionPercent(Winconditions wincondition, String windescription) {
-        super(windescription);
-
-        if (Config.ActiveWinconditions.contains(wincondition)) {
-            printableWinconditions.add(this);
-            percentWincondition = this;
-        }
-
-        Fight.teams().forEach(team -> new TeamPercent(team, wincondition));
-    }
-
-    public Message getDisplay(FightTeam team) {
-        return new Message("BAR_PERCENT", team.getPrefix() + (Math.round(10000.0 * (1.0 - getPercent(team) / Config.PercentWin)) / 100.0));
-    }
-
-    public double getPercent(FightTeam team) {
-        return teamMap.get(team).getPercent();
-    }
-
-    protected int getTotalBlocks(FightTeam team) {
-        return teamMap.get(team).totalBlocks;
-    }
-
-    protected int getCurrentBlocks(FightTeam team) {
-        return teamMap.get(team).currentBlocks;
-    }
-
-    private class TeamPercent implements Listener {
-        private final FightTeam team;
-
-        private int totalBlocks = 0;
-        private int currentBlocks = 0;
-        private boolean countAnyBlock = false;
-
-        private TeamPercent(FightTeam team, Winconditions wincondition) {
-            this.team = team;
-
-            new OneShotStateDependent(wincondition, FightState.Running, this::enable);
-            new StateDependentListener(wincondition, FightState.Running, this).register();
-            teamMap.put(team, this);
-        }
-
-        @EventHandler
-        public void onEntityExplode(EntityExplodeEvent event) {
-            if (
-                    event.getEntityType() == EntityType.FIREBALL ||
-                    !team.getExtendRegion().inRegion(event.getEntity().getLocation()) ||
-                    (!Config.PercentEntern && !Config.EnterStages.isEmpty() && Config.EnterStages.get(0) >= Wincondition.getTimeOverCountdown().getTimeLeft())
-            ) {
-                return;
-            }
-
-            event.blockList().forEach(block -> {
-                if (countAnyBlock || Config.PercentBlocks.contains(block.getType()) == Config.PercentBlocksWhitelist) {
-                    currentBlocks--;
-                }
-            });
-
-            checkWin.accept(team);
-        }
-
-        private void enable() {
-            totalBlocks = 0;
-            countAnyBlock = false;
-            team.getSchemRegion().forEach((x, y, z) -> {
-                if (Config.PercentBlocks.contains(Config.world.getBlockAt(x, y, z).getType()) == Config.PercentBlocksWhitelist)
-                    totalBlocks++;
-            });
-            // Edge Case for DirtBlock
-            if (totalBlocks == 0) {
-                totalBlocks = team.getSchemRegion().volume();
-                countAnyBlock = true;
-            }
-            currentBlocks = totalBlocks;
-            postEnable.accept(team);
-        }
-
-        private double getPercent() {
-            if (currentBlocks >= totalBlocks) {
-                return 0;
-            }
-            return (totalBlocks - currentBlocks) * 100 / (double) totalBlocks;
-        }
+    public WinconditionPercent() {
+        super(Winconditions.PERCENT_SYSTEM, "Percent");
     }
 }
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPercentTimeout.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPercentTimeout.java
new file mode 100644
index 00000000..6271dd92
--- /dev/null
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPercentTimeout.java
@@ -0,0 +1,30 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2020  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.winconditions;
+
+import de.steamwar.linkage.Linked;
+
+@Linked
+public class WinconditionPercentTimeout extends WinconditionComparisonTimeout {
+
+    public WinconditionPercentTimeout() {
+        super(Winconditions.PERCENT_TIMEOUT, "PercentTimeout", "WIN_LESS_DAMAGE", team -> -Wincondition.getPercentWincondition().getPercent(team));
+    }
+}
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPoints.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPoints.java
index 028e893e..7c96a924 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPoints.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPoints.java
@@ -27,6 +27,7 @@ import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentCountdown;
 import de.steamwar.fightsystem.states.StateDependentListener;
 import de.steamwar.fightsystem.utils.Message;
+import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -36,7 +37,8 @@ import org.bukkit.event.player.PlayerQuitEvent;
 import java.util.HashMap;
 import java.util.Map;
 
-public class WinconditionPoints extends WinconditionPercent implements Listener {
+@Linked
+public class WinconditionPoints extends WinconditionBasePercent implements Listener {
 
     private final Map<FightTeam, TeamPoints> teamMap = new HashMap<>();
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPointsAirShip.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPointsAirShip.java
index 4f166a6d..8ef84838 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPointsAirShip.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPointsAirShip.java
@@ -25,6 +25,7 @@ import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
 import de.steamwar.fightsystem.states.StateDependentTask;
 import de.steamwar.fightsystem.utils.Message;
+import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -35,7 +36,8 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-public class WinconditionPointsAirShip extends WinconditionPercent implements Listener {
+@Linked
+public class WinconditionPointsAirShip extends WinconditionBasePercent implements Listener {
 
     private double[] as = new double[] {
             0.5,
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPumkinTechKO.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPumkinTechKO.java
new file mode 100644
index 00000000..3d9a8b61
--- /dev/null
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPumkinTechKO.java
@@ -0,0 +1,30 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2020  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.winconditions;
+
+import de.steamwar.linkage.Linked;
+
+@Linked
+public class WinconditionPumkinTechKO extends WinconditionBlocks {
+
+    public WinconditionPumkinTechKO() {
+        super(Winconditions.PUMPKIN_TECH_KO, "PumpkinTechKO", "BAR_CANNONS", block -> block.getType() == WinconditionBlocks.PUMPKIN_LANTERN);
+    }
+}
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionTimeTechKO.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionTimeTechKO.java
index 789b130f..5ca79609 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionTimeTechKO.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionTimeTechKO.java
@@ -30,6 +30,7 @@ import de.steamwar.fightsystem.states.StateDependentListener;
 import de.steamwar.fightsystem.states.StateDependentTask;
 import de.steamwar.fightsystem.utils.Message;
 import de.steamwar.fightsystem.utils.SWSound;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Location;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -39,6 +40,7 @@ import org.bukkit.event.entity.EntitySpawnEvent;
 import java.util.HashMap;
 import java.util.Map;
 
+@Linked
 public class WinconditionTimeTechKO extends Wincondition implements Listener {
 
     private static final int TECH_KO_HALF_TIME = Config.TechKoTime/2;
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionTimedDamageTechKO.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionTimedDamageTechKO.java
index c561400c..7daa923a 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionTimedDamageTechKO.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionTimedDamageTechKO.java
@@ -29,6 +29,7 @@ import de.steamwar.fightsystem.states.StateDependent;
 import de.steamwar.fightsystem.states.StateDependentListener;
 import de.steamwar.fightsystem.utils.Message;
 import de.steamwar.fightsystem.utils.SWSound;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Location;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -37,6 +38,7 @@ import org.bukkit.event.entity.EntityExplodeEvent;
 import java.util.HashMap;
 import java.util.Map;
 
+@Linked
 public class WinconditionTimedDamageTechKO extends Wincondition implements PrintableWincondition, Listener {
 
     private final Map<FightTeam, TechKOCountdown> countdowns = new HashMap<>();
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionTimeout.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionTimeout.java
index 3207fee8..9a56195f 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionTimeout.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionTimeout.java
@@ -23,7 +23,9 @@ import de.steamwar.fightsystem.Config;
 import de.steamwar.fightsystem.countdown.TimeOverCountdown;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentCountdown;
+import de.steamwar.linkage.Linked;
 
+@Linked
 public class WinconditionTimeout extends Wincondition {
 
     public WinconditionTimeout() {
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionWaterTechKO.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionWaterTechKO.java
new file mode 100644
index 00000000..523fb06f
--- /dev/null
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionWaterTechKO.java
@@ -0,0 +1,31 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2020  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.winconditions;
+
+import de.steamwar.fightsystem.utils.FlatteningWrapper;
+import de.steamwar.linkage.Linked;
+
+@Linked
+public class WinconditionWaterTechKO extends WinconditionBlocks {
+
+    public WinconditionWaterTechKO() {
+        super(Winconditions.WATER_TECH_KO, "WaterTechKO", "BAR_WATER", FlatteningWrapper.impl::isWater);
+    }
+}

From 33b606060a9e0a7a96d92d25dd840318805dd9ea Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Fri, 3 Oct 2025 13:23:33 +0200
Subject: [PATCH 146/214] Implement Linkage for LobbySystem

---
 LobbySystem/build.gradle.kts                  |  2 +
 LobbySystem/src/de/steamwar/lobby/Config.java |  2 +-
 .../src/de/steamwar/lobby/Fightserver.java    |  2 +-
 .../de/steamwar/lobby/LobbyPacketHandler.java |  2 +
 .../src/de/steamwar/lobby/LobbySystem.java    | 47 +++++++------------
 .../de/steamwar/lobby/boatrace/BoatRace.java  |  4 +-
 .../de/steamwar/lobby/command/FlyCommand.java |  2 +
 .../lobby/command/HologramCommand.java        |  2 +
 .../steamwar/lobby/command/ModifyCommand.java |  4 +-
 .../steamwar/lobby/command/PortalCommand.java |  2 +
 .../steamwar/lobby/jumpandrun/JumpAndRun.java |  8 ++--
 .../lobby/jumpandrun/JumpAndRunCommand.java   |  2 +
 .../de/steamwar/lobby/listener/AlphaWall.java |  6 ++-
 .../lobby/listener/BasicListener.java         | 31 ------------
 .../lobby/listener/DoubleJumpListener.java    |  5 +-
 .../lobby/listener/InventoryInteraction.java  |  7 ++-
 .../lobby/listener/MapsRotateListener.java    |  5 +-
 .../lobby/listener/PlayerSeatListener.java    |  7 ++-
 .../steamwar/lobby/listener/PlayerSpawn.java  |  7 ++-
 .../de/steamwar/lobby/listener/Portals.java   |  5 +-
 .../lobby/listener/TeleporterListener.java    |  5 +-
 .../lobby/listener/WorldInteraction.java      |  7 +--
 .../src/de/steamwar/lobby/map/CustomMap.java  |  8 ++--
 .../lobby/particle/ParticleListener.java      |  4 +-
 .../lobby/particle/elements/Delayed.java      |  2 +-
 .../particle/elements/RandomParticle.java     |  2 +-
 .../steamwar/lobby/portal/CommandPortal.java  |  2 +-
 .../lobby/portal/FightserverPortal.java       |  2 +-
 .../steamwar/lobby/portal/TeleportPortal.java |  2 +-
 .../lobby/special/advent/AdventCommand.java   |  2 +
 .../lobby/special/advent/AdventListener.java  |  6 ++-
 .../lobby/special/advent/AdventsCalendar.java |  8 +---
 .../lobby/special/advent/Present.java         |  2 +-
 .../special/advent/PresentClickListener.java  |  6 ++-
 .../lobby/special/easter/EggHunt.java         |  2 +-
 .../de/steamwar/lobby/team/TeamPlayer.java    |  8 ++--
 .../de/steamwar/lobby/util/Leaderboard.java   |  2 +-
 37 files changed, 111 insertions(+), 111 deletions(-)
 delete mode 100644 LobbySystem/src/de/steamwar/lobby/listener/BasicListener.java

diff --git a/LobbySystem/build.gradle.kts b/LobbySystem/build.gradle.kts
index 8662545c..b36a4e79 100644
--- a/LobbySystem/build.gradle.kts
+++ b/LobbySystem/build.gradle.kts
@@ -27,6 +27,8 @@ java {
 }
 
 dependencies {
+    compileOnly(libs.classindex)
+    annotationProcessor(libs.classindex)
     compileOnly(project(":SpigotCore", "default"))
 
     compileOnly(libs.spigotapi)
diff --git a/LobbySystem/src/de/steamwar/lobby/Config.java b/LobbySystem/src/de/steamwar/lobby/Config.java
index fd8eeb1c..596b6051 100644
--- a/LobbySystem/src/de/steamwar/lobby/Config.java
+++ b/LobbySystem/src/de/steamwar/lobby/Config.java
@@ -67,6 +67,6 @@ public class Config {
         yml.set("waitingHallSpawn", waitingHallSpawn);
         yml.set("jumpPoints", JumpAndRun.actualPoints);
 
-        LobbySystem.getPlugin().saveConfig();
+        LobbySystem.getInstance().saveConfig();
     }
 }
diff --git a/LobbySystem/src/de/steamwar/lobby/Fightserver.java b/LobbySystem/src/de/steamwar/lobby/Fightserver.java
index c1ee6f9e..a5b19995 100644
--- a/LobbySystem/src/de/steamwar/lobby/Fightserver.java
+++ b/LobbySystem/src/de/steamwar/lobby/Fightserver.java
@@ -33,7 +33,7 @@ public class Fightserver {
     private static final Map<String, Fightserver> servers = new HashMap<>();
 
     public static void init() {
-        Bukkit.getScheduler().runTaskTimer(LobbySystem.getPlugin(), Fightserver::removeStopped, 20, 20);
+        Bukkit.getScheduler().runTaskTimer(LobbySystem.getInstance(), Fightserver::removeStopped, 20, 20);
     }
 
     public static void newFightInfo(FightInfoPacket in) {
diff --git a/LobbySystem/src/de/steamwar/lobby/LobbyPacketHandler.java b/LobbySystem/src/de/steamwar/lobby/LobbyPacketHandler.java
index eb9d5e7c..66638aae 100644
--- a/LobbySystem/src/de/steamwar/lobby/LobbyPacketHandler.java
+++ b/LobbySystem/src/de/steamwar/lobby/LobbyPacketHandler.java
@@ -19,6 +19,7 @@
 
 package de.steamwar.lobby;
 
+import de.steamwar.linkage.Linked;
 import de.steamwar.lobby.jumpandrun.JumpAndRun;
 import de.steamwar.network.packets.PacketHandler;
 import de.steamwar.network.packets.common.FightInfoPacket;
@@ -30,6 +31,7 @@ import org.bukkit.event.player.PlayerTeleportEvent;
 
 import java.util.Objects;
 
+@Linked
 public class LobbyPacketHandler extends PacketHandler {
 
     @Handler
diff --git a/LobbySystem/src/de/steamwar/lobby/LobbySystem.java b/LobbySystem/src/de/steamwar/lobby/LobbySystem.java
index 900d0941..29975e12 100644
--- a/LobbySystem/src/de/steamwar/lobby/LobbySystem.java
+++ b/LobbySystem/src/de/steamwar/lobby/LobbySystem.java
@@ -21,18 +21,12 @@ package de.steamwar.lobby;
 
 import de.steamwar.core.Core;
 import de.steamwar.entity.REntityServer;
-import de.steamwar.lobby.command.FlyCommand;
-import de.steamwar.lobby.command.HologramCommand;
-import de.steamwar.lobby.command.ModifyCommand;
-import de.steamwar.lobby.command.PortalCommand;
-import de.steamwar.lobby.jumpandrun.JumpAndRun;
-import de.steamwar.lobby.jumpandrun.JumpAndRunCommand;
-import de.steamwar.lobby.listener.*;
+import de.steamwar.linkage.AbstractLinker;
+import de.steamwar.linkage.SpigotLinker;
+import de.steamwar.lobby.listener.AlphaWall;
 import de.steamwar.lobby.map.CustomMap;
-import de.steamwar.lobby.particle.ParticleListener;
-import de.steamwar.lobby.special.advent.AdventsCalendar;
-import de.steamwar.lobby.team.TeamPlayer;
 import de.steamwar.message.Message;
+import org.bukkit.Bukkit;
 import org.bukkit.plugin.java.JavaPlugin;
 
 public class LobbySystem extends JavaPlugin {
@@ -43,6 +37,8 @@ public class LobbySystem extends JavaPlugin {
     private static REntityServer entityServer;
     private static REntityServer debugEntityServer;
 
+    private static SpigotLinker spigotLinker;
+
     @Override
     public void onLoad() {
         plugin = this;
@@ -56,43 +52,32 @@ public class LobbySystem extends JavaPlugin {
         Core.setServerName("Lobby");
 
         CustomMap.init();
-
         Fightserver.init();
-        new Portals();
-        new PortalCommand();
-        new HologramCommand();
-        new FlyCommand();
-        new ModifyCommand();
-
-        new JumpAndRun();
-        new JumpAndRunCommand();
 
         config = new Config(getConfig());
-        new PlayerSpawn();
-        new DoubleJumpListener();
-        new ParticleListener();
-        new InventoryInteraction();
-        new WorldInteraction();
-        new PlayerSeatListener();
-        new MapsRotateListener();
-        new TeleporterListener();
-        new TeamPlayer();
+        spigotLinker = new SpigotLinker(this, message);
+        try {
+            spigotLinker.link();
+        } catch (AbstractLinker.LinkException e) {
+            e.printStackTrace();
+            Bukkit.shutdown();
+            return;
+        }
 
         // EggHunt.init();
-        AdventsCalendar.init();
 
         new AlphaWall(l -> l.getX() > 999, AlphaWall.REFLECT_X);
         new AlphaWall(l -> l.getX() < 2977, AlphaWall.REFLECT_X);
         new AlphaWall(l -> l.getZ() > 892, AlphaWall.REFLECT_Z);
         new AlphaWall(l -> l.getZ() < 1794, AlphaWall.REFLECT_Z);
-        new LobbyPacketHandler().register();
     }
 
     @Override
     public void onDisable() {
+        spigotLinker.unlink();
     }
 
-    public static LobbySystem getPlugin() {
+    public static LobbySystem getInstance() {
         return plugin;
     }
 
diff --git a/LobbySystem/src/de/steamwar/lobby/boatrace/BoatRace.java b/LobbySystem/src/de/steamwar/lobby/boatrace/BoatRace.java
index 18e8db6c..031d8989 100644
--- a/LobbySystem/src/de/steamwar/lobby/boatrace/BoatRace.java
+++ b/LobbySystem/src/de/steamwar/lobby/boatrace/BoatRace.java
@@ -136,7 +136,7 @@ public class BoatRace implements EventListener, Listener {
         // boat.setBoatType(Boat.Type.values()[new Random().nextInt(Boat.Type.values().length)]);
         boat.addPassenger(player);
         bossBar = Bukkit.createBossBar("", BarColor.BLUE, BarStyle.SOLID);
-        task = Bukkit.getScheduler().runTaskTimer(LobbySystem.getPlugin(), () -> {
+        task = Bukkit.getScheduler().runTaskTimer(LobbySystem.getInstance(), () -> {
             hasBacked = false;
             if (nextCheckpoint != 0) {
                 double kmh = lastDistance * 20 * 3.6;
@@ -144,7 +144,7 @@ public class BoatRace implements EventListener, Listener {
                 bossBar.setTitle(LobbySystem.getMessage().parse("BOAT_RACE_TITLE", player, nextCheckpoint, renderTime(System.currentTimeMillis() - startTime), (int) kmh));
             }
         }, 0, 1);
-        Bukkit.getPluginManager().registerEvents(this, LobbySystem.getPlugin());
+        Bukkit.getPluginManager().registerEvents(this, LobbySystem.getInstance());
     }
 
     private boolean inRegion(Player p, Location loc1, Location loc2) {
diff --git a/LobbySystem/src/de/steamwar/lobby/command/FlyCommand.java b/LobbySystem/src/de/steamwar/lobby/command/FlyCommand.java
index e16c6748..56863be7 100644
--- a/LobbySystem/src/de/steamwar/lobby/command/FlyCommand.java
+++ b/LobbySystem/src/de/steamwar/lobby/command/FlyCommand.java
@@ -20,11 +20,13 @@
 package de.steamwar.lobby.command;
 
 import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
 import de.steamwar.lobby.util.LobbyPlayer;
 import de.steamwar.sql.SteamwarUser;
 import de.steamwar.sql.UserPerm;
 import org.bukkit.entity.Player;
 
+@Linked
 public class FlyCommand extends SWCommand {
 
     public FlyCommand() {
diff --git a/LobbySystem/src/de/steamwar/lobby/command/HologramCommand.java b/LobbySystem/src/de/steamwar/lobby/command/HologramCommand.java
index bfcc6b79..9166ffaa 100644
--- a/LobbySystem/src/de/steamwar/lobby/command/HologramCommand.java
+++ b/LobbySystem/src/de/steamwar/lobby/command/HologramCommand.java
@@ -20,10 +20,12 @@
 package de.steamwar.lobby.command;
 
 import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
 import de.steamwar.lobby.LobbySystem;
 import de.steamwar.lobby.display.Hologram;
 import org.bukkit.entity.Player;
 
+@Linked
 public class HologramCommand extends SWCommand {
 
     public HologramCommand() {
diff --git a/LobbySystem/src/de/steamwar/lobby/command/ModifyCommand.java b/LobbySystem/src/de/steamwar/lobby/command/ModifyCommand.java
index d782112d..0233b007 100644
--- a/LobbySystem/src/de/steamwar/lobby/command/ModifyCommand.java
+++ b/LobbySystem/src/de/steamwar/lobby/command/ModifyCommand.java
@@ -20,6 +20,7 @@
 package de.steamwar.lobby.command;
 
 import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
 import de.steamwar.lobby.LobbySystem;
 import de.steamwar.lobby.listener.PlayerSpawn;
 import de.steamwar.sql.SteamwarUser;
@@ -35,6 +36,7 @@ import org.bukkit.event.player.PlayerQuitEvent;
 import java.util.HashSet;
 import java.util.Set;
 
+@Linked
 public class ModifyCommand extends SWCommand implements Listener {
 
     private static final Set<HumanEntity> modifying = new HashSet<>();
@@ -45,7 +47,7 @@ public class ModifyCommand extends SWCommand implements Listener {
 
     public ModifyCommand() {
         super("modify");
-        Bukkit.getPluginManager().registerEvents(this, LobbySystem.getPlugin());
+        Bukkit.getPluginManager().registerEvents(this, LobbySystem.getInstance());
     }
 
     @Register
diff --git a/LobbySystem/src/de/steamwar/lobby/command/PortalCommand.java b/LobbySystem/src/de/steamwar/lobby/command/PortalCommand.java
index 637b99e3..7eb1036f 100644
--- a/LobbySystem/src/de/steamwar/lobby/command/PortalCommand.java
+++ b/LobbySystem/src/de/steamwar/lobby/command/PortalCommand.java
@@ -8,6 +8,7 @@ import com.sk89q.worldedit.regions.CuboidRegion;
 import com.sk89q.worldedit.regions.RegionSelector;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeMapper;
+import de.steamwar.linkage.Linked;
 import de.steamwar.lobby.LobbySystem;
 import de.steamwar.lobby.portal.*;
 import de.steamwar.sql.SteamwarUser;
@@ -22,6 +23,7 @@ import org.bukkit.entity.Player;
 import java.util.ArrayList;
 import java.util.List;
 
+@Linked
 public class PortalCommand extends SWCommand {
 
     public PortalCommand() {
diff --git a/LobbySystem/src/de/steamwar/lobby/jumpandrun/JumpAndRun.java b/LobbySystem/src/de/steamwar/lobby/jumpandrun/JumpAndRun.java
index 68097463..4094a5b2 100644
--- a/LobbySystem/src/de/steamwar/lobby/jumpandrun/JumpAndRun.java
+++ b/LobbySystem/src/de/steamwar/lobby/jumpandrun/JumpAndRun.java
@@ -1,7 +1,7 @@
 package de.steamwar.lobby.jumpandrun;
 
+import de.steamwar.linkage.Linked;
 import de.steamwar.lobby.LobbySystem;
-import de.steamwar.lobby.listener.BasicListener;
 import de.steamwar.lobby.listener.PlayerSpawn;
 import de.steamwar.lobby.util.Leaderboard;
 import de.steamwar.sql.UserConfig;
@@ -12,6 +12,7 @@ import org.bukkit.Material;
 import org.bukkit.Sound;
 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.PlayerMoveEvent;
@@ -22,7 +23,8 @@ import org.bukkit.util.Vector;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
-public class JumpAndRun extends BasicListener {
+@Linked
+public class JumpAndRun implements Listener {
 
     public static final String JUMP_AND_RUN_CONFIG = "jump_and_run";
 
@@ -40,7 +42,7 @@ public class JumpAndRun extends BasicListener {
     private static final Leaderboard LEADERBOARD = new Leaderboard(LobbySystem.getEntityServer(false), JUMP_AND_RUN_CONFIG, new Location(Bukkit.getWorlds().get(0), 2338.5, 42.5, 1231.5), 5);
 
     {
-        Bukkit.getScheduler().runTaskTimer(LobbySystem.getPlugin(), () -> {
+        Bukkit.getScheduler().runTaskTimer(LobbySystem.getInstance(), () -> {
             Set<Player> toReset = new HashSet<>();
             CURRENT_POS.forEach((player, index) -> {
                 if (System.currentTimeMillis() - CLICKED.getOrDefault(player, 0L) > 500) {
diff --git a/LobbySystem/src/de/steamwar/lobby/jumpandrun/JumpAndRunCommand.java b/LobbySystem/src/de/steamwar/lobby/jumpandrun/JumpAndRunCommand.java
index 7e15b7a8..4b18ef21 100644
--- a/LobbySystem/src/de/steamwar/lobby/jumpandrun/JumpAndRunCommand.java
+++ b/LobbySystem/src/de/steamwar/lobby/jumpandrun/JumpAndRunCommand.java
@@ -1,6 +1,7 @@
 package de.steamwar.lobby.jumpandrun;
 
 import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
 import de.steamwar.lobby.LobbySystem;
 import de.steamwar.sql.UserConfig;
 import org.bukkit.entity.Player;
@@ -9,6 +10,7 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
 
+@Linked
 public class JumpAndRunCommand extends SWCommand {
 
     public JumpAndRunCommand() {
diff --git a/LobbySystem/src/de/steamwar/lobby/listener/AlphaWall.java b/LobbySystem/src/de/steamwar/lobby/listener/AlphaWall.java
index 502488b5..75ae1875 100644
--- a/LobbySystem/src/de/steamwar/lobby/listener/AlphaWall.java
+++ b/LobbySystem/src/de/steamwar/lobby/listener/AlphaWall.java
@@ -19,16 +19,19 @@
 
 package de.steamwar.lobby.listener;
 
+import de.steamwar.lobby.LobbySystem;
 import de.steamwar.lobby.command.ModifyCommand;
+import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.event.player.PlayerTeleportEvent;
 
 import java.util.function.Function;
 
-public class AlphaWall extends BasicListener {
+public class AlphaWall implements Listener {
 
     public static float REFLECT_X = 360f;
     public static float REFLECT_Z = 180f;
@@ -39,6 +42,7 @@ public class AlphaWall extends BasicListener {
     public AlphaWall(Function<Location, Boolean> allowed, float reflect) {
         this.allowed = allowed;
         this.reflect = reflect;
+        Bukkit.getPluginManager().registerEvents(this, LobbySystem.getInstance());
     }
 
     @EventHandler
diff --git a/LobbySystem/src/de/steamwar/lobby/listener/BasicListener.java b/LobbySystem/src/de/steamwar/lobby/listener/BasicListener.java
deleted file mode 100644
index 1979b463..00000000
--- a/LobbySystem/src/de/steamwar/lobby/listener/BasicListener.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * This file is a part of the SteamWar software.
- *
- * Copyright (C) 2021  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.lobby.listener;
-
-import de.steamwar.lobby.LobbySystem;
-import org.bukkit.Bukkit;
-import org.bukkit.event.Listener;
-
-public class BasicListener implements Listener {
-
-    public BasicListener () {
-        Bukkit.getPluginManager().registerEvents(this, LobbySystem.getPlugin());
-    }
-}
diff --git a/LobbySystem/src/de/steamwar/lobby/listener/DoubleJumpListener.java b/LobbySystem/src/de/steamwar/lobby/listener/DoubleJumpListener.java
index ae554f64..47438002 100644
--- a/LobbySystem/src/de/steamwar/lobby/listener/DoubleJumpListener.java
+++ b/LobbySystem/src/de/steamwar/lobby/listener/DoubleJumpListener.java
@@ -19,6 +19,7 @@
 
 package de.steamwar.lobby.listener;
 
+import de.steamwar.linkage.Linked;
 import de.steamwar.lobby.jumpandrun.JumpAndRun;
 import de.steamwar.lobby.util.LobbyPlayer;
 import org.bukkit.GameMode;
@@ -26,12 +27,14 @@ import org.bukkit.Material;
 import org.bukkit.Sound;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.event.player.PlayerToggleFlightEvent;
 import org.bukkit.util.Vector;
 
-public class DoubleJumpListener extends BasicListener {
+@Linked
+public class DoubleJumpListener implements Listener {
 
     double multiplyer = 1.4;
 
diff --git a/LobbySystem/src/de/steamwar/lobby/listener/InventoryInteraction.java b/LobbySystem/src/de/steamwar/lobby/listener/InventoryInteraction.java
index 14b28d97..c9086aba 100644
--- a/LobbySystem/src/de/steamwar/lobby/listener/InventoryInteraction.java
+++ b/LobbySystem/src/de/steamwar/lobby/listener/InventoryInteraction.java
@@ -19,6 +19,7 @@
 
 package de.steamwar.lobby.listener;
 
+import de.steamwar.linkage.Linked;
 import de.steamwar.lobby.LobbySystem;
 import de.steamwar.lobby.command.ModifyCommand;
 import de.steamwar.lobby.special.advent.AdventsCalendar;
@@ -26,6 +27,7 @@ import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.player.PlayerDropItemEvent;
@@ -34,7 +36,8 @@ import org.bukkit.event.player.PlayerPickupItemEvent;
 import org.bukkit.event.player.PlayerSwapHandItemsEvent;
 import org.bukkit.inventory.ItemStack;
 
-public class InventoryInteraction extends BasicListener {
+@Linked
+public class InventoryInteraction implements Listener {
 
     @EventHandler
     public void handlePlayerInteract(PlayerInteractEvent event) {
@@ -50,7 +53,7 @@ public class InventoryInteraction extends BasicListener {
                 offset = 0;
             }
 
-            Bukkit.getScheduler().runTaskLater(LobbySystem.getPlugin(), () -> {
+            Bukkit.getScheduler().runTaskLater(LobbySystem.getInstance(), () -> {
                 event.getPlayer().getInventory().setItem(PlayerSpawn.FIREWORK_SLOT + offset, PlayerSpawn.FIREWORK);
             }, 1L);
             return;
diff --git a/LobbySystem/src/de/steamwar/lobby/listener/MapsRotateListener.java b/LobbySystem/src/de/steamwar/lobby/listener/MapsRotateListener.java
index e098da02..31825344 100644
--- a/LobbySystem/src/de/steamwar/lobby/listener/MapsRotateListener.java
+++ b/LobbySystem/src/de/steamwar/lobby/listener/MapsRotateListener.java
@@ -19,12 +19,15 @@
 
 package de.steamwar.lobby.listener;
 
+import de.steamwar.linkage.Linked;
 import de.steamwar.lobby.command.ModifyCommand;
 import org.bukkit.entity.ItemFrame;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerInteractEntityEvent;
 
-public class MapsRotateListener extends BasicListener {
+@Linked
+public class MapsRotateListener implements Listener {
 
     @EventHandler
     public void onPlayerInteractEntity(PlayerInteractEntityEvent event) {
diff --git a/LobbySystem/src/de/steamwar/lobby/listener/PlayerSeatListener.java b/LobbySystem/src/de/steamwar/lobby/listener/PlayerSeatListener.java
index 45113f57..cd6e7919 100644
--- a/LobbySystem/src/de/steamwar/lobby/listener/PlayerSeatListener.java
+++ b/LobbySystem/src/de/steamwar/lobby/listener/PlayerSeatListener.java
@@ -19,6 +19,7 @@
 
 package de.steamwar.lobby.listener;
 
+import de.steamwar.linkage.Linked;
 import de.steamwar.lobby.LobbySystem;
 import org.bukkit.*;
 import org.bukkit.block.data.Bisected;
@@ -28,6 +29,7 @@ import org.bukkit.entity.Arrow;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 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;
@@ -37,7 +39,8 @@ import org.spigotmc.event.entity.EntityDismountEvent;
 import java.util.HashSet;
 import java.util.Set;
 
-public class PlayerSeatListener extends BasicListener{
+@Linked
+public class PlayerSeatListener implements Listener {
 
     public static final World world = Bukkit.getWorlds().get(0);
 
@@ -51,7 +54,7 @@ public class PlayerSeatListener extends BasicListener{
                     arrow.setTicksLived(1);
                 }
             }
-        }.runTaskTimer(LobbySystem.getPlugin(), 20*60,20*60);
+        }.runTaskTimer(LobbySystem.getInstance(), 20*60,20*60);
     }
 
     @EventHandler
diff --git a/LobbySystem/src/de/steamwar/lobby/listener/PlayerSpawn.java b/LobbySystem/src/de/steamwar/lobby/listener/PlayerSpawn.java
index 3ca809c1..a1734233 100644
--- a/LobbySystem/src/de/steamwar/lobby/listener/PlayerSpawn.java
+++ b/LobbySystem/src/de/steamwar/lobby/listener/PlayerSpawn.java
@@ -19,6 +19,7 @@
 
 package de.steamwar.lobby.listener;
 
+import de.steamwar.linkage.Linked;
 import de.steamwar.lobby.LobbySystem;
 import de.steamwar.lobby.boatrace.BoatRace;
 import de.steamwar.lobby.special.advent.AdventsCalendar;
@@ -31,13 +32,15 @@ import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.inventory.EquipmentSlot;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;
 
-public class PlayerSpawn extends BasicListener {
+@Linked
+public class PlayerSpawn implements Listener {
 
     public static final int FIREWORK_SLOT = 2;
     public static final ItemStack FIREWORK = new ItemBuilder(Material.FIREWORK_ROCKET, 1).setDisplayName("§5Rakete").build();
@@ -62,7 +65,7 @@ public class PlayerSpawn extends BasicListener {
         LobbySystem.getEntityServer(false).addPlayer(player);
         BoatRace.boatNpcServer.addPlayer(player);
 
-        Bukkit.getScheduler().runTaskLater(LobbySystem.getPlugin(), () -> NetworkSender.send(new ImALobbyPacket(), player), 20);
+        Bukkit.getScheduler().runTaskLater(LobbySystem.getInstance(), () -> NetworkSender.send(new ImALobbyPacket(), player), 20);
     }
 
     public static void giveItems(Player player) {
diff --git a/LobbySystem/src/de/steamwar/lobby/listener/Portals.java b/LobbySystem/src/de/steamwar/lobby/listener/Portals.java
index 576d17dc..9a0e07b4 100644
--- a/LobbySystem/src/de/steamwar/lobby/listener/Portals.java
+++ b/LobbySystem/src/de/steamwar/lobby/listener/Portals.java
@@ -19,10 +19,12 @@
 
 package de.steamwar.lobby.listener;
 
+import de.steamwar.linkage.Linked;
 import de.steamwar.lobby.portal.Portal;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
@@ -32,7 +34,8 @@ import java.util.Deque;
 import java.util.HashMap;
 import java.util.Map;
 
-public class Portals extends BasicListener {
+@Linked
+public class Portals implements Listener {
 
     private static final Map<Player, Deque<Portal>> portalStack = new HashMap<>();
 
diff --git a/LobbySystem/src/de/steamwar/lobby/listener/TeleporterListener.java b/LobbySystem/src/de/steamwar/lobby/listener/TeleporterListener.java
index 28909e3c..f6a56116 100644
--- a/LobbySystem/src/de/steamwar/lobby/listener/TeleporterListener.java
+++ b/LobbySystem/src/de/steamwar/lobby/listener/TeleporterListener.java
@@ -21,13 +21,16 @@ package de.steamwar.lobby.listener;
 
 import de.steamwar.inventory.SWInventory;
 import de.steamwar.inventory.SWItem;
+import de.steamwar.linkage.Linked;
 import org.bukkit.*;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
 import org.bukkit.event.inventory.InventoryType;
 import org.bukkit.event.player.PlayerInteractEvent;
 
-public class TeleporterListener extends BasicListener {
+@Linked
+public class TeleporterListener implements Listener {
 
     private static final World world = Bukkit.getWorlds().get(0);
 
diff --git a/LobbySystem/src/de/steamwar/lobby/listener/WorldInteraction.java b/LobbySystem/src/de/steamwar/lobby/listener/WorldInteraction.java
index b4c439fc..7a1f5108 100644
--- a/LobbySystem/src/de/steamwar/lobby/listener/WorldInteraction.java
+++ b/LobbySystem/src/de/steamwar/lobby/listener/WorldInteraction.java
@@ -19,12 +19,14 @@
 
 package de.steamwar.lobby.listener;
 
+import de.steamwar.linkage.Linked;
 import de.steamwar.lobby.command.ModifyCommand;
 import org.bukkit.Material;
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.ItemFrame;
 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.block.BlockBreakEvent;
 import org.bukkit.event.block.BlockPhysicsEvent;
@@ -33,13 +35,12 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.event.entity.FoodLevelChangeEvent;
 import org.bukkit.event.hanging.HangingBreakByEntityEvent;
-import org.bukkit.event.hanging.HangingBreakEvent;
 import org.bukkit.event.player.PlayerArmorStandManipulateEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
-import org.bukkit.event.server.MapInitializeEvent;
 import org.bukkit.util.Vector;
 
-public class WorldInteraction extends BasicListener {
+@Linked
+public class WorldInteraction implements Listener {
 
     @EventHandler
     public void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
diff --git a/LobbySystem/src/de/steamwar/lobby/map/CustomMap.java b/LobbySystem/src/de/steamwar/lobby/map/CustomMap.java
index 70053b87..6587ad2a 100644
--- a/LobbySystem/src/de/steamwar/lobby/map/CustomMap.java
+++ b/LobbySystem/src/de/steamwar/lobby/map/CustomMap.java
@@ -75,12 +75,12 @@ public class CustomMap implements Listener {
             itemFrameIndex.put(itemFrames[i], i);
         }
 
-        Bukkit.getScheduler().runTaskTimer(LobbySystem.getPlugin(), () -> {
+        Bukkit.getScheduler().runTaskTimer(LobbySystem.getInstance(), () -> {
             long modified = mapFile.lastModified();
             if (modified > lastModified) {
                 lastModified = modified;
                 System.out.println("Updating Banner: " + mapFile.getName());
-                Bukkit.getScheduler().runTaskAsynchronously(LobbySystem.getPlugin(), () -> {
+                Bukkit.getScheduler().runTaskAsynchronously(LobbySystem.getInstance(), () -> {
                     try {
                         run();
                     } catch (IOException e) {
@@ -89,7 +89,7 @@ public class CustomMap implements Listener {
                 });
             }
         }, 200L, 200L);
-        Bukkit.getPluginManager().registerEvents(this, LobbySystem.getPlugin());
+        Bukkit.getPluginManager().registerEvents(this, LobbySystem.getInstance());
     }
 
     @EventHandler
@@ -169,7 +169,7 @@ public class CustomMap implements Listener {
                 if (itemFrame == null) continue;
                 int finalX = x;
                 int finalY = y;
-                Bukkit.getScheduler().runTaskLater(LobbySystem.getPlugin(), () -> {
+                Bukkit.getScheduler().runTaskLater(LobbySystem.getInstance(), () -> {
                     ItemStack itemStack = itemFrame.getItem();
                     MapMeta mapMeta = (MapMeta) itemStack.getItemMeta();
                     MapView mapView = mapMeta.getMapView();
diff --git a/LobbySystem/src/de/steamwar/lobby/particle/ParticleListener.java b/LobbySystem/src/de/steamwar/lobby/particle/ParticleListener.java
index 535ebd0b..932b7ef9 100644
--- a/LobbySystem/src/de/steamwar/lobby/particle/ParticleListener.java
+++ b/LobbySystem/src/de/steamwar/lobby/particle/ParticleListener.java
@@ -19,6 +19,7 @@
 
 package de.steamwar.lobby.particle;
 
+import de.steamwar.linkage.Linked;
 import de.steamwar.lobby.LobbySystem;
 import de.steamwar.lobby.jumpandrun.JumpAndRun;
 import de.steamwar.lobby.listener.BasicListener;
@@ -38,6 +39,7 @@ import org.bukkit.event.player.PlayerQuitEvent;
 import java.util.HashMap;
 import java.util.Map;
 
+@Linked
 public class ParticleListener extends BasicListener {
 
     private static final int PLAYER_MAX_SIZE = 20;
@@ -48,7 +50,7 @@ public class ParticleListener extends BasicListener {
     private static Map<Player, Integer> movingPlayers = new HashMap<>();
 
     public ParticleListener() {
-        Bukkit.getScheduler().runTaskTimer(LobbySystem.getPlugin(), () -> {
+        Bukkit.getScheduler().runTaskTimer(LobbySystem.getInstance(), () -> {
             movingPlayers.replaceAll((player, integer) -> integer - 1);
             movingPlayers.entrySet().removeIf(entry -> entry.getValue() <= 0);
             deg += 0.1;
diff --git a/LobbySystem/src/de/steamwar/lobby/particle/elements/Delayed.java b/LobbySystem/src/de/steamwar/lobby/particle/elements/Delayed.java
index 3fb9632e..862fb094 100644
--- a/LobbySystem/src/de/steamwar/lobby/particle/elements/Delayed.java
+++ b/LobbySystem/src/de/steamwar/lobby/particle/elements/Delayed.java
@@ -28,7 +28,7 @@ public class Delayed extends DelegatingParticleElement {
 
     public Delayed(ParticleElement particleElement, int interval) {
         super(particleElement);
-        Bukkit.getPluginManager().registerEvents(delayedData, LobbySystem.getPlugin());
+        Bukkit.getPluginManager().registerEvents(delayedData, LobbySystem.getInstance());
         this.interval = interval;
         if (interval <= 0) {
             throw new IllegalArgumentException("Interval must be greater than 0");
diff --git a/LobbySystem/src/de/steamwar/lobby/particle/elements/RandomParticle.java b/LobbySystem/src/de/steamwar/lobby/particle/elements/RandomParticle.java
index def3cabb..088ac457 100644
--- a/LobbySystem/src/de/steamwar/lobby/particle/elements/RandomParticle.java
+++ b/LobbySystem/src/de/steamwar/lobby/particle/elements/RandomParticle.java
@@ -45,7 +45,7 @@ public class RandomParticle implements ParticleElement {
             throw new IllegalArgumentException("ParticleEnums must not be empty");
         }
         this.randomData = new RandomData(particleEnums.length);
-        Bukkit.getPluginManager().registerEvents(randomData, LobbySystem.getPlugin());
+        Bukkit.getPluginManager().registerEvents(randomData, LobbySystem.getInstance());
         this.particleEnums = particleEnums;
     }
 
diff --git a/LobbySystem/src/de/steamwar/lobby/portal/CommandPortal.java b/LobbySystem/src/de/steamwar/lobby/portal/CommandPortal.java
index 36f7862a..f2a07f74 100644
--- a/LobbySystem/src/de/steamwar/lobby/portal/CommandPortal.java
+++ b/LobbySystem/src/de/steamwar/lobby/portal/CommandPortal.java
@@ -60,7 +60,7 @@ public class CommandPortal implements PortalHandler {
         String[] pieces = new String[stackIds.length];
         while (maxId > 0) {
             if(!stack.hasNext()) {
-                LobbySystem.getPlugin().getLogger().log(Level.WARNING, "Stackportal with missing elements: " + player.getName() + " /" + command);
+                LobbySystem.getInstance().getLogger().log(Level.WARNING, "Stackportal with missing elements: " + player.getName() + " /" + command);
                 player.sendMessage("§cEigentlich solltest du gerade gar nicht durch dieses Portal durchgehen können...");
                 return;
             }
diff --git a/LobbySystem/src/de/steamwar/lobby/portal/FightserverPortal.java b/LobbySystem/src/de/steamwar/lobby/portal/FightserverPortal.java
index 7d82cfdc..66031ec0 100644
--- a/LobbySystem/src/de/steamwar/lobby/portal/FightserverPortal.java
+++ b/LobbySystem/src/de/steamwar/lobby/portal/FightserverPortal.java
@@ -234,7 +234,7 @@ public class FightserverPortal implements PortalHandler, Comparable<FightserverP
             case "SPECTATE":
                 return "Zuschauerphase";
             default:
-                LobbySystem.getPlugin().getLogger().log(Level.SEVERE, "Unknown FightState " + state + " encountered");
+                LobbySystem.getInstance().getLogger().log(Level.SEVERE, "Unknown FightState " + state + " encountered");
                 return "Programmierfehler";
         }
     }
diff --git a/LobbySystem/src/de/steamwar/lobby/portal/TeleportPortal.java b/LobbySystem/src/de/steamwar/lobby/portal/TeleportPortal.java
index 9fa2443f..e7038c47 100644
--- a/LobbySystem/src/de/steamwar/lobby/portal/TeleportPortal.java
+++ b/LobbySystem/src/de/steamwar/lobby/portal/TeleportPortal.java
@@ -70,7 +70,7 @@ public class TeleportPortal implements PortalHandler {
 
     private void teleport(Player player, Location from, Location to, Portal target) {
         if(target == null) {
-            LobbySystem.getPlugin().getLogger().log(Level.WARNING, "Portal with unknown target: " + portal.getId());
+            LobbySystem.getInstance().getLogger().log(Level.WARNING, "Portal with unknown target: " + portal.getId());
             player.sendMessage("§cAus unbekannten Gründen führt dieses Portal zurzeit in den Limbus");
             return;
         }
diff --git a/LobbySystem/src/de/steamwar/lobby/special/advent/AdventCommand.java b/LobbySystem/src/de/steamwar/lobby/special/advent/AdventCommand.java
index 28b06419..18563195 100644
--- a/LobbySystem/src/de/steamwar/lobby/special/advent/AdventCommand.java
+++ b/LobbySystem/src/de/steamwar/lobby/special/advent/AdventCommand.java
@@ -23,6 +23,7 @@ import de.steamwar.command.SWCommand;
 import de.steamwar.inventory.SWInventory;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.inventory.SWListInv;
+import de.steamwar.linkage.Linked;
 import de.steamwar.lobby.LobbySystem;
 import de.steamwar.sql.NodeMember;
 import de.steamwar.sql.SchematicNode;
@@ -34,6 +35,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 
+@Linked
 public class AdventCommand extends SWCommand {
 
     public AdventCommand() {
diff --git a/LobbySystem/src/de/steamwar/lobby/special/advent/AdventListener.java b/LobbySystem/src/de/steamwar/lobby/special/advent/AdventListener.java
index 061d4ce3..7ac4970f 100644
--- a/LobbySystem/src/de/steamwar/lobby/special/advent/AdventListener.java
+++ b/LobbySystem/src/de/steamwar/lobby/special/advent/AdventListener.java
@@ -20,15 +20,17 @@
 package de.steamwar.lobby.special.advent;
 
 import de.steamwar.inventory.SWItem;
-import de.steamwar.lobby.listener.BasicListener;
+import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.inventory.ItemStack;
 
-public class AdventListener extends BasicListener {
+@Linked
+public class AdventListener implements Listener {
 
     public static final int ADVENT_SLOT = 7;
     public static final SWItem ADVENT = SWItem.getPlayerSkull("MHF_Present1");
diff --git a/LobbySystem/src/de/steamwar/lobby/special/advent/AdventsCalendar.java b/LobbySystem/src/de/steamwar/lobby/special/advent/AdventsCalendar.java
index 43ae6af4..da730458 100644
--- a/LobbySystem/src/de/steamwar/lobby/special/advent/AdventsCalendar.java
+++ b/LobbySystem/src/de/steamwar/lobby/special/advent/AdventsCalendar.java
@@ -35,15 +35,9 @@ public class AdventsCalendar {
 
     private static List<Present> presentList = new ArrayList<>();
 
-    private static File file = new File(LobbySystem.getPlugin().getDataFolder(), "presents.yml");
+    private static File file = new File(LobbySystem.getInstance().getDataFolder(), "presents.yml");
     private static FileConfiguration fileConfiguration = YamlConfiguration.loadConfiguration(file);
 
-    public static void init() {
-        new AdventCommand();
-        new AdventListener();
-        new PresentClickListener();
-    }
-
     static {
         for (int i = 1; i <= 31; i++) {
             if (i > 24 && i < 31) continue;
diff --git a/LobbySystem/src/de/steamwar/lobby/special/advent/Present.java b/LobbySystem/src/de/steamwar/lobby/special/advent/Present.java
index 86884708..780cfeec 100644
--- a/LobbySystem/src/de/steamwar/lobby/special/advent/Present.java
+++ b/LobbySystem/src/de/steamwar/lobby/special/advent/Present.java
@@ -115,7 +115,7 @@ public class Present {
             locations.add(point);
         }
         generate();
-        Bukkit.getScheduler().runTaskLater(LobbySystem.getPlugin(), () -> {
+        Bukkit.getScheduler().runTaskLater(LobbySystem.getInstance(), () -> {
             BlockData blockData = location.getBlock().getBlockData();
             players.forEach(pl -> {
                 if (pl == player) return;
diff --git a/LobbySystem/src/de/steamwar/lobby/special/advent/PresentClickListener.java b/LobbySystem/src/de/steamwar/lobby/special/advent/PresentClickListener.java
index 5e788980..79fa339f 100644
--- a/LobbySystem/src/de/steamwar/lobby/special/advent/PresentClickListener.java
+++ b/LobbySystem/src/de/steamwar/lobby/special/advent/PresentClickListener.java
@@ -19,18 +19,20 @@
 
 package de.steamwar.lobby.special.advent;
 
+import de.steamwar.linkage.Linked;
 import de.steamwar.lobby.LobbySystem;
-import de.steamwar.lobby.listener.BasicListener;
 import de.steamwar.sql.NodeMember;
 import de.steamwar.sql.SteamwarUser;
 import org.bukkit.block.Block;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
 
 import java.time.LocalDate;
 
-public class PresentClickListener extends BasicListener {
+@Linked
+public class PresentClickListener implements Listener {
 
     @EventHandler
     public void onPlayerJoin(PlayerJoinEvent event) {
diff --git a/LobbySystem/src/de/steamwar/lobby/special/easter/EggHunt.java b/LobbySystem/src/de/steamwar/lobby/special/easter/EggHunt.java
index 68f58efc..87a4a2d6 100644
--- a/LobbySystem/src/de/steamwar/lobby/special/easter/EggHunt.java
+++ b/LobbySystem/src/de/steamwar/lobby/special/easter/EggHunt.java
@@ -22,7 +22,7 @@ public class EggHunt {
     }
 
     static {
-        File file = new File(LobbySystem.getPlugin().getDataFolder(), "eggs.yml");
+        File file = new File(LobbySystem.getInstance().getDataFolder(), "eggs.yml");
         FileConfiguration fileConfiguration = YamlConfiguration.loadConfiguration(file);
         fileConfiguration.getList("eggs")
                 .forEach(o -> {
diff --git a/LobbySystem/src/de/steamwar/lobby/team/TeamPlayer.java b/LobbySystem/src/de/steamwar/lobby/team/TeamPlayer.java
index ce14aa04..eb51d1cf 100644
--- a/LobbySystem/src/de/steamwar/lobby/team/TeamPlayer.java
+++ b/LobbySystem/src/de/steamwar/lobby/team/TeamPlayer.java
@@ -19,6 +19,7 @@
 
 package de.steamwar.lobby.team;
 
+import de.steamwar.linkage.Linked;
 import de.steamwar.lobby.LobbySystem;
 import de.steamwar.lobby.display.NPC;
 import de.steamwar.lobby.listener.BasicListener;
@@ -44,6 +45,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 import java.util.logging.Level;
 import java.util.stream.Collectors;
 
+@Linked
 public class TeamPlayer extends BasicListener {
 
     private static final List<Cuboid> cuboids = new ArrayList<>();
@@ -80,8 +82,8 @@ public class TeamPlayer extends BasicListener {
         });
 
         AtomicInteger count = new AtomicInteger();
-        LobbySystem.getPlugin().getLogger().log(Level.INFO, "Loaded " + entities.size() + " team players");
-        Bukkit.getScheduler().runTaskTimer(LobbySystem.getPlugin(), () -> {
+        LobbySystem.getInstance().getLogger().log(Level.INFO, "Loaded " + entities.size() + " team players");
+        Bukkit.getScheduler().runTaskTimer(LobbySystem.getInstance(), () -> {
             Collection<Villager> active = world.getEntitiesByClass(Villager.class);
             if (active.size() > entities.size()) {
                 Set<String> duplicates = new HashSet<>();
@@ -109,7 +111,7 @@ public class TeamPlayer extends BasicListener {
                     removed.incrementAndGet();
                 });
                 if (added.get() > 0 || removed.get() > 0) {
-                    LobbySystem.getPlugin().getLogger().log(Level.INFO, "Loaded " + added.get() + " team players, removed " + removed.get() + " team players");
+                    LobbySystem.getInstance().getLogger().log(Level.INFO, "Loaded " + added.get() + " team players, removed " + removed.get() + " team players");
                 }
             }
             world.getEntitiesByClasses(Villager.class).forEach(entity -> {
diff --git a/LobbySystem/src/de/steamwar/lobby/util/Leaderboard.java b/LobbySystem/src/de/steamwar/lobby/util/Leaderboard.java
index f3182a1c..a8b84f07 100644
--- a/LobbySystem/src/de/steamwar/lobby/util/Leaderboard.java
+++ b/LobbySystem/src/de/steamwar/lobby/util/Leaderboard.java
@@ -39,7 +39,7 @@ public class Leaderboard implements Listener {
         this.configKey = configKey;
         this.location = location;
         this.best = best;
-        Bukkit.getPluginManager().registerEvents(this, LobbySystem.getPlugin());
+        Bukkit.getPluginManager().registerEvents(this, LobbySystem.getInstance());
         update();
     }
 

From 91a5da9cd274384586c6d17d179063a7b8df5b32 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Fri, 3 Oct 2025 13:30:38 +0200
Subject: [PATCH 147/214] Implement Linkage for MissileWars

---
 MissileWars/build.gradle.kts                  |  2 +
 .../steamwar/misslewars/FightScoreboard.java  |  2 +
 .../de/steamwar/misslewars/MissileWars.java   | 51 ++++++-------------
 .../misslewars/commands/AcceptCommand.java    |  2 +
 .../misslewars/commands/DeclineCommand.java   |  2 +
 .../misslewars/commands/InviteCommand.java    |  2 +
 .../misslewars/commands/SpectateCommand.java  |  2 +
 .../misslewars/countdowns/EndCountdown.java   |  2 +
 .../misslewars/countdowns/ItemCountdown.java  |  2 +
 .../countdowns/WaitingCountdown.java          |  2 +
 .../misslewars/listener/ArenaListener.java    |  2 +
 .../misslewars/listener/BreakListener.java    |  2 +
 .../misslewars/listener/ChatListener.java     |  2 +
 .../listener/ConnectionListener.java          |  2 +
 .../misslewars/listener/DeathListener.java    |  2 +
 .../misslewars/listener/EndListener.java      |  2 +
 .../misslewars/listener/FightListener.java    |  2 +
 .../misslewars/listener/ItemListener.java     |  2 +
 .../misslewars/listener/JoinListener.java     |  2 +
 .../listener/PortalDestructListener.java      |  2 +
 .../misslewars/listener/WaitingListener.java  |  2 +
 .../listener/special/BarrierListener.java     |  2 +
 .../listener/special/SpaceListener.java       |  2 +
 23 files changed, 60 insertions(+), 35 deletions(-)

diff --git a/MissileWars/build.gradle.kts b/MissileWars/build.gradle.kts
index f393ea31..36470f84 100644
--- a/MissileWars/build.gradle.kts
+++ b/MissileWars/build.gradle.kts
@@ -27,6 +27,8 @@ java {
 }
 
 dependencies {
+    compileOnly(libs.classindex)
+    annotationProcessor(libs.classindex)
     compileOnly(project(":SpigotCore", "default"))
 
     compileOnly(libs.spigotapi)
diff --git a/MissileWars/src/de/steamwar/misslewars/FightScoreboard.java b/MissileWars/src/de/steamwar/misslewars/FightScoreboard.java
index ca217fe2..b8fe1aaa 100644
--- a/MissileWars/src/de/steamwar/misslewars/FightScoreboard.java
+++ b/MissileWars/src/de/steamwar/misslewars/FightScoreboard.java
@@ -19,6 +19,7 @@
 
 package de.steamwar.misslewars;
 
+import de.steamwar.linkage.Linked;
 import de.steamwar.scoreboard.SWScoreboard;
 import de.steamwar.scoreboard.ScoreboardCallback;
 import org.bukkit.Bukkit;
@@ -37,6 +38,7 @@ import java.util.Objects;
 /**
  * Modified Version of the Fight-System Scoreboard
  */
+@Linked
 class FightScoreboard implements Listener {
 
     public FightScoreboard() {
diff --git a/MissileWars/src/de/steamwar/misslewars/MissileWars.java b/MissileWars/src/de/steamwar/misslewars/MissileWars.java
index 2dab0597..c36dfbb3 100644
--- a/MissileWars/src/de/steamwar/misslewars/MissileWars.java
+++ b/MissileWars/src/de/steamwar/misslewars/MissileWars.java
@@ -19,18 +19,10 @@
 
 package de.steamwar.misslewars;
 
-import de.steamwar.misslewars.commands.AcceptCommand;
-import de.steamwar.misslewars.commands.DeclineCommand;
-import de.steamwar.misslewars.commands.InviteCommand;
-import de.steamwar.misslewars.commands.SpectateCommand;
-import de.steamwar.misslewars.countdowns.EndCountdown;
-import de.steamwar.misslewars.countdowns.ItemCountdown;
-import de.steamwar.misslewars.countdowns.WaitingCountdown;
+import de.steamwar.linkage.AbstractLinker;
+import de.steamwar.linkage.SpigotLinker;
 import de.steamwar.misslewars.items.CustomItem;
 import de.steamwar.misslewars.items.Missile;
-import de.steamwar.misslewars.listener.*;
-import de.steamwar.misslewars.listener.special.BarrierListener;
-import de.steamwar.misslewars.listener.special.SpaceListener;
 import de.steamwar.misslewars.slowmo.SlowMoRunner;
 import de.steamwar.network.NetworkSender;
 import de.steamwar.network.packets.common.FightEndsPacket;
@@ -63,37 +55,26 @@ public class MissileWars extends JavaPlugin {
 	public void onEnable() {
 		redTeam = new MWTeam(Config.TeamRedColor, Config.RedSpawn, Config.TeamRedName, Config.RedPortalZ);
 		blueTeam = new MWTeam(Config.TeamBlueColor, Config.BlueSpawn, Config.TeamBlueName, Config.BluePortalZ);
-		new BreakListener();
-		new DeathListener();
-		new ItemListener();
-		new ArenaListener();
-		new ConnectionListener();
-		new JoinListener();
-		new EndListener();
-		new PortalDestructListener();
-		new WaitingListener();
-		new FightListener();
-		new ChatListener();
-		new SpectateCommand();
 
-		// Invitation Commands
-		new InviteCommand();
-		new AcceptCommand();
-		new DeclineCommand();
+        SpigotLinker spigotLinker = new SpigotLinker(this, null) {
+            @Override
+            protected void linkObject(Object any) {
+                // No Init needed for MissileWars!
+            }
+        };
+        try {
+            spigotLinker.link();
+        } catch (AbstractLinker.LinkException e) {
+            e.printStackTrace();
+            Bukkit.shutdown();
+            return;
+        }
 
-		new WaitingCountdown();
-		new ItemCountdown();
-		new EndCountdown();
-
-		new FightScoreboard();
-		Missile.init();
+        Missile.init();
 		CustomItem.init();
 
 		StateDependent.setupState(fightState);
 
-		new BarrierListener();
-		new SpaceListener();
-
 		Bukkit.getScheduler().runTaskTimer(this, new FightInfoPacketSender(), 20, 20);
 
 		Bukkit.getWorlds().forEach(world -> {
diff --git a/MissileWars/src/de/steamwar/misslewars/commands/AcceptCommand.java b/MissileWars/src/de/steamwar/misslewars/commands/AcceptCommand.java
index 60b4b056..f2cb1069 100644
--- a/MissileWars/src/de/steamwar/misslewars/commands/AcceptCommand.java
+++ b/MissileWars/src/de/steamwar/misslewars/commands/AcceptCommand.java
@@ -22,12 +22,14 @@ package de.steamwar.misslewars.commands;
 
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeValidator;
+import de.steamwar.linkage.Linked;
 import de.steamwar.misslewars.Config;
 import de.steamwar.misslewars.MWTeam;
 import de.steamwar.misslewars.MissileWars;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+@Linked
 public class AcceptCommand extends SWCommand {
 
     public AcceptCommand() {
diff --git a/MissileWars/src/de/steamwar/misslewars/commands/DeclineCommand.java b/MissileWars/src/de/steamwar/misslewars/commands/DeclineCommand.java
index f0df4aa9..0e0742a2 100644
--- a/MissileWars/src/de/steamwar/misslewars/commands/DeclineCommand.java
+++ b/MissileWars/src/de/steamwar/misslewars/commands/DeclineCommand.java
@@ -22,12 +22,14 @@ package de.steamwar.misslewars.commands;
 
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeValidator;
+import de.steamwar.linkage.Linked;
 import de.steamwar.misslewars.Config;
 import de.steamwar.misslewars.MWTeam;
 import de.steamwar.misslewars.MissileWars;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+@Linked
 public class DeclineCommand extends SWCommand {
 
     public DeclineCommand() {
diff --git a/MissileWars/src/de/steamwar/misslewars/commands/InviteCommand.java b/MissileWars/src/de/steamwar/misslewars/commands/InviteCommand.java
index b0925723..954a1a34 100644
--- a/MissileWars/src/de/steamwar/misslewars/commands/InviteCommand.java
+++ b/MissileWars/src/de/steamwar/misslewars/commands/InviteCommand.java
@@ -24,6 +24,7 @@ import de.steamwar.command.PreviousArguments;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeMapper;
 import de.steamwar.command.TypeValidator;
+import de.steamwar.linkage.Linked;
 import de.steamwar.misslewars.Config;
 import de.steamwar.misslewars.MWTeam;
 import de.steamwar.misslewars.MissileWars;
@@ -34,6 +35,7 @@ import org.bukkit.entity.Player;
 import java.util.Collection;
 import java.util.stream.Collectors;
 
+@Linked
 public class InviteCommand extends SWCommand {
 
     public InviteCommand() {
diff --git a/MissileWars/src/de/steamwar/misslewars/commands/SpectateCommand.java b/MissileWars/src/de/steamwar/misslewars/commands/SpectateCommand.java
index f70fb063..19c51172 100644
--- a/MissileWars/src/de/steamwar/misslewars/commands/SpectateCommand.java
+++ b/MissileWars/src/de/steamwar/misslewars/commands/SpectateCommand.java
@@ -22,6 +22,7 @@ package de.steamwar.misslewars.commands;
 
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeValidator;
+import de.steamwar.linkage.Linked;
 import de.steamwar.misslewars.Config;
 import de.steamwar.misslewars.MWTeam;
 import de.steamwar.misslewars.MissileWars;
@@ -29,6 +30,7 @@ import org.bukkit.GameMode;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+@Linked
 public class SpectateCommand extends SWCommand {
 
     public SpectateCommand() {
diff --git a/MissileWars/src/de/steamwar/misslewars/countdowns/EndCountdown.java b/MissileWars/src/de/steamwar/misslewars/countdowns/EndCountdown.java
index f2d3183b..5a1dc8d1 100644
--- a/MissileWars/src/de/steamwar/misslewars/countdowns/EndCountdown.java
+++ b/MissileWars/src/de/steamwar/misslewars/countdowns/EndCountdown.java
@@ -19,6 +19,7 @@
 
 package de.steamwar.misslewars.countdowns;
 
+import de.steamwar.linkage.Linked;
 import de.steamwar.misslewars.*;
 import de.steamwar.misslewars.listener.JoinListener;
 import org.bukkit.Bukkit;
@@ -26,6 +27,7 @@ import org.bukkit.scheduler.BukkitTask;
 
 import java.util.EnumSet;
 
+@Linked
 public class EndCountdown extends StateDependent {
 
     private BukkitTask task;
diff --git a/MissileWars/src/de/steamwar/misslewars/countdowns/ItemCountdown.java b/MissileWars/src/de/steamwar/misslewars/countdowns/ItemCountdown.java
index 5270934d..ef66b733 100644
--- a/MissileWars/src/de/steamwar/misslewars/countdowns/ItemCountdown.java
+++ b/MissileWars/src/de/steamwar/misslewars/countdowns/ItemCountdown.java
@@ -19,6 +19,7 @@
 
 package de.steamwar.misslewars.countdowns;
 
+import de.steamwar.linkage.Linked;
 import de.steamwar.misslewars.Config;
 import de.steamwar.misslewars.FightState;
 import de.steamwar.misslewars.MissileWars;
@@ -30,6 +31,7 @@ import org.bukkit.scheduler.BukkitTask;
 
 import java.util.EnumSet;
 
+@Linked
 public class ItemCountdown extends StateDependent {
 
 	private BukkitTask task;
diff --git a/MissileWars/src/de/steamwar/misslewars/countdowns/WaitingCountdown.java b/MissileWars/src/de/steamwar/misslewars/countdowns/WaitingCountdown.java
index 57c85f77..3c4b8ddc 100644
--- a/MissileWars/src/de/steamwar/misslewars/countdowns/WaitingCountdown.java
+++ b/MissileWars/src/de/steamwar/misslewars/countdowns/WaitingCountdown.java
@@ -19,6 +19,7 @@
 
 package de.steamwar.misslewars.countdowns;
 
+import de.steamwar.linkage.Linked;
 import de.steamwar.misslewars.Config;
 import de.steamwar.misslewars.FightState;
 import de.steamwar.misslewars.MissileWars;
@@ -28,6 +29,7 @@ import org.bukkit.scheduler.BukkitTask;
 
 import java.util.EnumSet;
 
+@Linked
 public class WaitingCountdown extends StateDependent {
 
 	private BukkitTask task;
diff --git a/MissileWars/src/de/steamwar/misslewars/listener/ArenaListener.java b/MissileWars/src/de/steamwar/misslewars/listener/ArenaListener.java
index 4d7a7ecc..4efff8e4 100644
--- a/MissileWars/src/de/steamwar/misslewars/listener/ArenaListener.java
+++ b/MissileWars/src/de/steamwar/misslewars/listener/ArenaListener.java
@@ -19,6 +19,7 @@
 
 package de.steamwar.misslewars.listener;
 
+import de.steamwar.linkage.Linked;
 import de.steamwar.misslewars.Config;
 import de.steamwar.misslewars.FightState;
 import de.steamwar.misslewars.MWTeam;
@@ -40,6 +41,7 @@ import java.util.EnumSet;
 import java.util.Map;
 import java.util.Objects;
 
+@Linked
 public class ArenaListener extends BasicListener {
 
 	public ArenaListener() {
diff --git a/MissileWars/src/de/steamwar/misslewars/listener/BreakListener.java b/MissileWars/src/de/steamwar/misslewars/listener/BreakListener.java
index bbaf1a65..fae3c8c3 100644
--- a/MissileWars/src/de/steamwar/misslewars/listener/BreakListener.java
+++ b/MissileWars/src/de/steamwar/misslewars/listener/BreakListener.java
@@ -21,12 +21,14 @@
 
 package de.steamwar.misslewars.listener;
 
+import de.steamwar.linkage.Linked;
 import de.steamwar.misslewars.FightState;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.block.BlockBreakEvent;
 
 import java.util.EnumSet;
 
+@Linked
 public class BreakListener extends BasicListener {
 
     public BreakListener() {
diff --git a/MissileWars/src/de/steamwar/misslewars/listener/ChatListener.java b/MissileWars/src/de/steamwar/misslewars/listener/ChatListener.java
index 3e039b7b..f2077032 100644
--- a/MissileWars/src/de/steamwar/misslewars/listener/ChatListener.java
+++ b/MissileWars/src/de/steamwar/misslewars/listener/ChatListener.java
@@ -19,6 +19,7 @@
 
 package de.steamwar.misslewars.listener;
 
+import de.steamwar.linkage.Linked;
 import de.steamwar.misslewars.FightState;
 import de.steamwar.misslewars.MWTeam;
 import de.steamwar.misslewars.MissileWars;
@@ -29,6 +30,7 @@ import org.bukkit.event.player.AsyncPlayerChatEvent;
 
 import java.util.EnumSet;
 
+@Linked
 public class ChatListener extends BasicListener {
 
 	public ChatListener() {
diff --git a/MissileWars/src/de/steamwar/misslewars/listener/ConnectionListener.java b/MissileWars/src/de/steamwar/misslewars/listener/ConnectionListener.java
index dab36fa4..9663dbbe 100644
--- a/MissileWars/src/de/steamwar/misslewars/listener/ConnectionListener.java
+++ b/MissileWars/src/de/steamwar/misslewars/listener/ConnectionListener.java
@@ -19,6 +19,7 @@
 
 package de.steamwar.misslewars.listener;
 
+import de.steamwar.linkage.Linked;
 import de.steamwar.misslewars.Config;
 import de.steamwar.misslewars.FightState;
 import de.steamwar.misslewars.MWTeam;
@@ -32,6 +33,7 @@ import org.bukkit.event.player.PlayerQuitEvent;
 
 import java.util.EnumSet;
 
+@Linked
 public class ConnectionListener extends BasicListener{
 
 	public ConnectionListener(){
diff --git a/MissileWars/src/de/steamwar/misslewars/listener/DeathListener.java b/MissileWars/src/de/steamwar/misslewars/listener/DeathListener.java
index 5e77523a..1f3008e9 100644
--- a/MissileWars/src/de/steamwar/misslewars/listener/DeathListener.java
+++ b/MissileWars/src/de/steamwar/misslewars/listener/DeathListener.java
@@ -19,6 +19,7 @@
 
 package de.steamwar.misslewars.listener;
 
+import de.steamwar.linkage.Linked;
 import de.steamwar.misslewars.FightState;
 import de.steamwar.misslewars.MWTeam;
 import de.steamwar.misslewars.MissileWars;
@@ -38,6 +39,7 @@ import java.util.EnumSet;
 import java.util.HashSet;
 import java.util.Set;
 
+@Linked
 public class DeathListener extends BasicListener {
 
 	private static final Vector ZERO = new Vector(0, 0, 0);
diff --git a/MissileWars/src/de/steamwar/misslewars/listener/EndListener.java b/MissileWars/src/de/steamwar/misslewars/listener/EndListener.java
index 14833544..36121665 100644
--- a/MissileWars/src/de/steamwar/misslewars/listener/EndListener.java
+++ b/MissileWars/src/de/steamwar/misslewars/listener/EndListener.java
@@ -19,6 +19,7 @@
 
 package de.steamwar.misslewars.listener;
 
+import de.steamwar.linkage.Linked;
 import de.steamwar.misslewars.FightState;
 import org.bukkit.GameMode;
 import org.bukkit.event.EventHandler;
@@ -26,6 +27,7 @@ import org.bukkit.event.player.PlayerJoinEvent;
 
 import java.util.EnumSet;
 
+@Linked
 public class EndListener extends BasicListener {
 
 	public EndListener(){
diff --git a/MissileWars/src/de/steamwar/misslewars/listener/FightListener.java b/MissileWars/src/de/steamwar/misslewars/listener/FightListener.java
index 7ed369f8..6ce9aaca 100644
--- a/MissileWars/src/de/steamwar/misslewars/listener/FightListener.java
+++ b/MissileWars/src/de/steamwar/misslewars/listener/FightListener.java
@@ -19,6 +19,7 @@
 
 package de.steamwar.misslewars.listener;
 
+import de.steamwar.linkage.Linked;
 import de.steamwar.misslewars.FightState;
 import de.steamwar.misslewars.MissileWars;
 import org.bukkit.entity.Player;
@@ -27,6 +28,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent;
 
 import java.util.EnumSet;
 
+@Linked
 public class FightListener extends BasicListener {
 
 	public FightListener() {
diff --git a/MissileWars/src/de/steamwar/misslewars/listener/ItemListener.java b/MissileWars/src/de/steamwar/misslewars/listener/ItemListener.java
index 4856dc17..4af2411c 100644
--- a/MissileWars/src/de/steamwar/misslewars/listener/ItemListener.java
+++ b/MissileWars/src/de/steamwar/misslewars/listener/ItemListener.java
@@ -19,6 +19,7 @@
 
 package de.steamwar.misslewars.listener;
 
+import de.steamwar.linkage.Linked;
 import de.steamwar.misslewars.FightState;
 import de.steamwar.misslewars.MWTeam;
 import de.steamwar.misslewars.MissileWars;
@@ -39,6 +40,7 @@ import java.util.EnumSet;
 import java.util.HashSet;
 import java.util.Set;
 
+@Linked
 public class ItemListener extends BasicListener {
 
 	private Set<Integer> RED_ITEMS = new HashSet<>();
diff --git a/MissileWars/src/de/steamwar/misslewars/listener/JoinListener.java b/MissileWars/src/de/steamwar/misslewars/listener/JoinListener.java
index 5947da8f..4f56cacb 100644
--- a/MissileWars/src/de/steamwar/misslewars/listener/JoinListener.java
+++ b/MissileWars/src/de/steamwar/misslewars/listener/JoinListener.java
@@ -19,6 +19,7 @@
 
 package de.steamwar.misslewars.listener;
 
+import de.steamwar.linkage.Linked;
 import de.steamwar.misslewars.Config;
 import de.steamwar.misslewars.FightState;
 import de.steamwar.misslewars.MissileWars;
@@ -30,6 +31,7 @@ import org.bukkit.event.player.PlayerJoinEvent;
 
 import java.util.EnumSet;
 
+@Linked
 public class JoinListener extends BasicListener {
 
 	public JoinListener(){
diff --git a/MissileWars/src/de/steamwar/misslewars/listener/PortalDestructListener.java b/MissileWars/src/de/steamwar/misslewars/listener/PortalDestructListener.java
index c235ff35..056b7259 100644
--- a/MissileWars/src/de/steamwar/misslewars/listener/PortalDestructListener.java
+++ b/MissileWars/src/de/steamwar/misslewars/listener/PortalDestructListener.java
@@ -19,6 +19,7 @@
 
 package de.steamwar.misslewars.listener;
 
+import de.steamwar.linkage.Linked;
 import de.steamwar.misslewars.Config;
 import de.steamwar.misslewars.FightState;
 import de.steamwar.misslewars.MissileWars;
@@ -31,6 +32,7 @@ import org.bukkit.event.entity.EntityExplodeEvent;
 
 import java.util.EnumSet;
 
+@Linked
 public class PortalDestructListener extends BasicListener {
 
 	public PortalDestructListener(){
diff --git a/MissileWars/src/de/steamwar/misslewars/listener/WaitingListener.java b/MissileWars/src/de/steamwar/misslewars/listener/WaitingListener.java
index 1180edc3..1d9688b3 100644
--- a/MissileWars/src/de/steamwar/misslewars/listener/WaitingListener.java
+++ b/MissileWars/src/de/steamwar/misslewars/listener/WaitingListener.java
@@ -19,6 +19,7 @@
 
 package de.steamwar.misslewars.listener;
 
+import de.steamwar.linkage.Linked;
 import de.steamwar.misslewars.FightState;
 import org.bukkit.Bukkit;
 import org.bukkit.event.EventHandler;
@@ -27,6 +28,7 @@ import org.bukkit.event.player.PlayerQuitEvent;
 
 import java.util.EnumSet;
 
+@Linked
 public class WaitingListener extends BasicListener {
 	public WaitingListener() {
 		super(EnumSet.of(FightState.WAITING));
diff --git a/MissileWars/src/de/steamwar/misslewars/listener/special/BarrierListener.java b/MissileWars/src/de/steamwar/misslewars/listener/special/BarrierListener.java
index 5220778c..e4ab3cf4 100644
--- a/MissileWars/src/de/steamwar/misslewars/listener/special/BarrierListener.java
+++ b/MissileWars/src/de/steamwar/misslewars/listener/special/BarrierListener.java
@@ -21,6 +21,7 @@
 
 package de.steamwar.misslewars.listener.special;
 
+import de.steamwar.linkage.Linked;
 import de.steamwar.misslewars.Config;
 import de.steamwar.misslewars.FightState;
 import de.steamwar.misslewars.listener.BasicListener;
@@ -31,6 +32,7 @@ import org.bukkit.event.block.BlockPhysicsEvent;
 
 import java.util.EnumSet;
 
+@Linked
 public class BarrierListener extends BasicListener {
 
     public BarrierListener() {
diff --git a/MissileWars/src/de/steamwar/misslewars/listener/special/SpaceListener.java b/MissileWars/src/de/steamwar/misslewars/listener/special/SpaceListener.java
index 654811ab..d6c06104 100644
--- a/MissileWars/src/de/steamwar/misslewars/listener/special/SpaceListener.java
+++ b/MissileWars/src/de/steamwar/misslewars/listener/special/SpaceListener.java
@@ -21,6 +21,7 @@
 
 package de.steamwar.misslewars.listener.special;
 
+import de.steamwar.linkage.Linked;
 import de.steamwar.misslewars.Config;
 import de.steamwar.misslewars.FightState;
 import de.steamwar.misslewars.MissileWars;
@@ -38,6 +39,7 @@ import org.bukkit.util.Vector;
 
 import java.util.EnumSet;
 
+@Linked
 public class SpaceListener extends BasicListener {
 
     public SpaceListener() {

From c7284dc7abd0c126f0107c70da429409bee8c41e Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Fri, 3 Oct 2025 13:33:31 +0200
Subject: [PATCH 148/214] Implement Linkage for SchematicSystem

---
 .../SchematicSystem_Core/build.gradle.kts     |  2 ++
 .../schematicsystem/SchematicSystem.java      | 17 ++++-----
 .../commands/DownloadCommand.java             |  2 ++
 .../schematiccommand/SchematicCommand.java    |  2 ++
 .../SchematicCommandInitializer.java          | 36 -------------------
 .../schematiccommand/parts/CheckPart.java     |  2 ++
 .../schematiccommand/parts/MemberPart.java    |  2 ++
 .../schematiccommand/parts/ModifyPart.java    |  2 ++
 .../schematiccommand/parts/SavePart.java      |  2 ++
 .../schematiccommand/parts/SearchPart.java    |  2 ++
 .../schematiccommand/parts/ViewPart.java      |  6 ++--
 .../listener/PlayerEventListener.java         |  2 ++
 12 files changed, 30 insertions(+), 47 deletions(-)
 delete mode 100644 SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommandInitializer.java

diff --git a/SchematicSystem/SchematicSystem_Core/build.gradle.kts b/SchematicSystem/SchematicSystem_Core/build.gradle.kts
index df9415f2..36a0e019 100644
--- a/SchematicSystem/SchematicSystem_Core/build.gradle.kts
+++ b/SchematicSystem/SchematicSystem_Core/build.gradle.kts
@@ -22,6 +22,8 @@ plugins {
 }
 
 dependencies {
+    compileOnly(libs.classindex)
+    annotationProcessor(libs.classindex)
     compileOnly(project(":SpigotCore", "default"))
 
     compileOnly(libs.spigotapi)
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/SchematicSystem.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/SchematicSystem.java
index d6b94807..96267f9f 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/SchematicSystem.java
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/SchematicSystem.java
@@ -19,11 +19,9 @@
 
 package de.steamwar.schematicsystem;
 
+import de.steamwar.linkage.AbstractLinker;
+import de.steamwar.linkage.SpigotLinker;
 import de.steamwar.message.Message;
-import de.steamwar.schematicsystem.commands.DownloadCommand;
-import de.steamwar.schematicsystem.commands.schematiccommand.SchematicCommand;
-import de.steamwar.schematicsystem.commands.schematiccommand.SchematicCommandInitializer;
-import de.steamwar.schematicsystem.listener.PlayerEventListener;
 import org.bukkit.Bukkit;
 import org.bukkit.plugin.java.JavaPlugin;
 
@@ -36,10 +34,13 @@ public class SchematicSystem extends JavaPlugin {
     public void onEnable() {
         instance = this;
 
-        SchematicCommandInitializer.init();
-        new DownloadCommand();
-
-        Bukkit.getPluginManager().registerEvents(new PlayerEventListener(), this);
+        SpigotLinker spigotLinker = new SpigotLinker(this, MESSAGE);
+        try {
+            spigotLinker.link();
+        } catch (AbstractLinker.LinkException e) {
+            e.printStackTrace();
+            Bukkit.shutdown();
+        }
     }
 
     public static SchematicSystem getInstance() {
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/DownloadCommand.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/DownloadCommand.java
index 3e2f009d..f4fd1c29 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/DownloadCommand.java
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/DownloadCommand.java
@@ -20,6 +20,7 @@
 package de.steamwar.schematicsystem.commands;
 
 import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
 import de.steamwar.schematicsystem.SchematicSystem;
 import de.steamwar.schematicsystem.commands.schematiccommand.SchematicCommandUtils;
 import de.steamwar.sql.*;
@@ -27,6 +28,7 @@ import org.bukkit.entity.Player;
 
 import java.io.IOException;
 
+@Linked
 public class DownloadCommand extends SWCommand {
     public DownloadCommand() {
         super("download", "/download");
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommand.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommand.java
index b3ecf374..caccd1a5 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommand.java
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommand.java
@@ -23,6 +23,7 @@ import com.sk89q.worldedit.*;
 import com.sk89q.worldedit.extent.clipboard.Clipboard;
 import de.steamwar.command.*;
 import de.steamwar.core.VersionDependent;
+import de.steamwar.linkage.Linked;
 import de.steamwar.schematicsystem.CheckSchemType;
 import de.steamwar.schematicsystem.SchematicSystem;
 import de.steamwar.schematicsystem.autocheck.AutoCheckerResult;
@@ -34,6 +35,7 @@ import static de.steamwar.schematicsystem.commands.schematiccommand.SchematicCom
 import static de.steamwar.schematicsystem.commands.schematiccommand.SchematicCommandUtils.*;
 
 @SuppressWarnings("unused")
+@Linked
 public class SchematicCommand extends SWCommand {
 
     public SchematicCommand() {
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommandInitializer.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommandInitializer.java
deleted file mode 100644
index 7245ead6..00000000
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommandInitializer.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-   This file is a part of the SteamWar software.
-
-   Copyright (C) 2023  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.schematicsystem.commands.schematiccommand;
-
-import de.steamwar.schematicsystem.SchematicSystem;
-import de.steamwar.schematicsystem.commands.schematiccommand.parts.*;
-
-public class SchematicCommandInitializer {
-
-    public static void init() {
-        new SchematicCommand().setMessage(SchematicSystem.MESSAGE);
-        new CheckPart().setMessage(SchematicSystem.MESSAGE);
-        new MemberPart().setMessage(SchematicSystem.MESSAGE);
-        new ModifyPart().setMessage(SchematicSystem.MESSAGE);
-        new SavePart().setMessage(SchematicSystem.MESSAGE);
-        new SearchPart().setMessage(SchematicSystem.MESSAGE);
-        new ViewPart().setMessage(SchematicSystem.MESSAGE);
-    }
-}
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/CheckPart.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/CheckPart.java
index 9f23a795..246b990b 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/CheckPart.java
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/CheckPart.java
@@ -28,6 +28,7 @@ import com.sk89q.worldedit.session.ClipboardHolder;
 import de.steamwar.command.AbstractSWCommand;
 import de.steamwar.command.SWCommand;
 import de.steamwar.core.Core;
+import de.steamwar.linkage.Linked;
 import de.steamwar.schematicsystem.CheckSchemType;
 import de.steamwar.schematicsystem.SchematicSystem;
 import de.steamwar.schematicsystem.autocheck.AutoChecker;
@@ -44,6 +45,7 @@ import static de.steamwar.schematicsystem.commands.schematiccommand.SchematicCom
 import static de.steamwar.schematicsystem.commands.schematiccommand.SchematicCommand.impl;
 
 @AbstractSWCommand.PartOf(SchematicCommand.class)
+@Linked
 public class CheckPart extends SWCommand {
     public CheckPart() {
         super(null);
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/MemberPart.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/MemberPart.java
index f7f09ac3..6d42c97a 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/MemberPart.java
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/MemberPart.java
@@ -21,6 +21,7 @@ package de.steamwar.schematicsystem.commands.schematiccommand.parts;
 
 import de.steamwar.command.AbstractSWCommand;
 import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
 import de.steamwar.schematicsystem.SchematicSystem;
 import de.steamwar.schematicsystem.commands.schematiccommand.SchematicCommand;
 import de.steamwar.sql.*;
@@ -36,6 +37,7 @@ import static de.steamwar.schematicsystem.commands.schematiccommand.SchematicCom
 import static de.steamwar.schematicsystem.commands.schematiccommand.SchematicCommandUtils.mkdirs;
 
 @AbstractSWCommand.PartOf(SchematicCommand.class)
+@Linked
 public class MemberPart extends SWCommand {
     public MemberPart() {
         super(null);
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/ModifyPart.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/ModifyPart.java
index ab699d28..7fae8acd 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/ModifyPart.java
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/ModifyPart.java
@@ -22,6 +22,7 @@ package de.steamwar.schematicsystem.commands.schematiccommand.parts;
 import com.sk89q.worldedit.extent.clipboard.Clipboard;
 import de.steamwar.command.AbstractSWCommand;
 import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
 import de.steamwar.schematicsystem.CheckSchemType;
 import de.steamwar.schematicsystem.SafeSchematicNode;
 import de.steamwar.schematicsystem.SchematicSystem;
@@ -40,6 +41,7 @@ import java.io.IOException;
 import static de.steamwar.schematicsystem.commands.schematiccommand.SchematicCommandUtils.*;
 
 @AbstractSWCommand.PartOf(SchematicCommand.class)
+@Linked
 public class ModifyPart extends SWCommand {
     public ModifyPart() {
         super(null);
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/SavePart.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/SavePart.java
index d373f503..9b6f2cb6 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/SavePart.java
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/SavePart.java
@@ -23,6 +23,7 @@ import de.steamwar.command.AbstractSWCommand;
 import de.steamwar.command.SWCommand;
 import de.steamwar.inventory.SWAnvilInv;
 import de.steamwar.inventory.SchematicSelector;
+import de.steamwar.linkage.Linked;
 import de.steamwar.providers.BauServerInfo;
 import de.steamwar.schematicsystem.SchematicSystem;
 import de.steamwar.schematicsystem.commands.schematiccommand.SchematicCommand;
@@ -36,6 +37,7 @@ import java.util.logging.Level;
 import static de.steamwar.schematicsystem.commands.schematiccommand.SchematicCommandUtils.*;
 
 @AbstractSWCommand.PartOf(SchematicCommand.class)
+@Linked
 public class SavePart extends SWCommand {
 
     public SavePart() {
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/SearchPart.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/SearchPart.java
index 00dfd850..e3c698f2 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/SearchPart.java
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/SearchPart.java
@@ -20,6 +20,7 @@
 package de.steamwar.schematicsystem.commands.schematiccommand.parts;
 
 import de.steamwar.command.*;
+import de.steamwar.linkage.Linked;
 import de.steamwar.schematicsystem.SchematicSystem;
 import de.steamwar.schematicsystem.commands.schematiccommand.SchematicCommandUtils;
 import de.steamwar.schematicsystem.commands.schematiccommand.SchematicCommand;
@@ -40,6 +41,7 @@ import static de.steamwar.schematicsystem.commands.schematiccommand.SchematicCom
 import static de.steamwar.schematicsystem.commands.schematiccommand.SchematicCommandUtils.getUser;
 
 @AbstractSWCommand.PartOf(SchematicCommand.class)
+@Linked
 public class SearchPart extends SWCommand {
 
     private static final Map<String, AbstractTypeMapper<CommandSender, ?>> searchMapper = new HashMap<>();
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/ViewPart.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/ViewPart.java
index a22c1813..da51fdca 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/ViewPart.java
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/ViewPart.java
@@ -21,10 +21,11 @@ package de.steamwar.schematicsystem.commands.schematiccommand.parts;
 
 import de.steamwar.command.AbstractSWCommand;
 import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
 import de.steamwar.schematicsystem.SchematicSystem;
 import de.steamwar.schematicsystem.commands.schematiccommand.GUI;
-import de.steamwar.schematicsystem.commands.schematiccommand.SchematicCommandUtils;
 import de.steamwar.schematicsystem.commands.schematiccommand.SchematicCommand;
+import de.steamwar.schematicsystem.commands.schematiccommand.SchematicCommandUtils;
 import de.steamwar.sql.NodeData;
 import de.steamwar.sql.SchematicNode;
 import de.steamwar.sql.SteamwarUser;
@@ -34,13 +35,12 @@ import net.md_5.bungee.api.chat.HoverEvent;
 import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.entity.Player;
 
-import java.time.format.DateTimeFormatter;
-import java.time.format.FormatStyle;
 import java.util.List;
 
 import static de.steamwar.schematicsystem.commands.schematiccommand.SchematicCommandUtils.*;
 
 @AbstractSWCommand.PartOf(SchematicCommand.class)
+@Linked
 public class ViewPart extends SWCommand {
     public ViewPart() {
         super(null);
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/listener/PlayerEventListener.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/listener/PlayerEventListener.java
index 3afb8ddd..84913014 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/listener/PlayerEventListener.java
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/listener/PlayerEventListener.java
@@ -19,11 +19,13 @@
 
 package de.steamwar.schematicsystem.listener;
 
+import de.steamwar.linkage.Linked;
 import de.steamwar.schematicsystem.commands.schematiccommand.SchematicCommandUtils;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerQuitEvent;
 
+@Linked
 public class PlayerEventListener implements Listener {
 
     @EventHandler

From 383604ec9f8fb0c707913315f5c63bf92dfb76a3 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Fri, 3 Oct 2025 13:39:19 +0200
Subject: [PATCH 149/214] Implement Linkage for SpigotCore

---
 .../CaseInsensitiveCommandsListener.java      |  2 +
 .../src/de/steamwar/core/Core.java            | 37 ++++++++-----------
 .../de/steamwar/core/WorldEditRenderer.java   |  4 ++
 .../core/authlib/AuthlibInjector.java         | 11 ++++--
 .../de/steamwar/core/events/AntiNocom.java    |  6 +--
 .../steamwar/core/events/ChattingEvent.java   |  2 +
 .../core/events/PlayerJoinedEvent.java        |  3 +-
 .../steamwar/core/events/WorldLoadEvent.java  |  2 +
 .../network/handlers/ServerDataHandler.java   |  4 ++
 .../src/de/steamwar/persistent/Subserver.java |  1 +
 10 files changed, 44 insertions(+), 28 deletions(-)

diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/command/CaseInsensitiveCommandsListener.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/command/CaseInsensitiveCommandsListener.java
index 05eafdbb..d12e8418 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/command/CaseInsensitiveCommandsListener.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/command/CaseInsensitiveCommandsListener.java
@@ -20,6 +20,7 @@
 package de.steamwar.command;
 
 import de.steamwar.core.Core;
+import de.steamwar.linkage.Linked;
 import de.steamwar.providers.BauServerInfo;
 import de.steamwar.sql.AuditLog;
 import de.steamwar.sql.SteamwarUser;
@@ -28,6 +29,7 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
 
+@Linked
 public class CaseInsensitiveCommandsListener implements Listener {
 
     @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/Core.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/Core.java
index 91c05851..703d67e9 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/Core.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/Core.java
@@ -21,15 +21,14 @@ package de.steamwar.core;
 
 import com.comphenix.tinyprotocol.TinyProtocol;
 import de.steamwar.Reflection;
-import de.steamwar.command.*;
-import de.steamwar.core.authlib.AuthlibInjector;
-import de.steamwar.core.events.AntiNocom;
-import de.steamwar.core.events.ChattingEvent;
-import de.steamwar.core.events.PlayerJoinedEvent;
-import de.steamwar.core.events.WorldLoadEvent;
+import de.steamwar.command.SWCommandUtils;
+import de.steamwar.command.SWTypeMapperCreator;
+import de.steamwar.command.TabCompletionCache;
+import de.steamwar.command.TypeMapper;
+import de.steamwar.linkage.AbstractLinker;
+import de.steamwar.linkage.SpigotLinker;
 import de.steamwar.message.Message;
 import de.steamwar.network.NetworkReceiver;
-import de.steamwar.network.handlers.ServerDataHandler;
 import de.steamwar.sql.SchematicNode;
 import de.steamwar.sql.SteamwarUser;
 import de.steamwar.sql.internal.Statement;
@@ -37,7 +36,6 @@ import lombok.Getter;
 import lombok.Setter;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
-import org.bukkit.event.Listener;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import java.io.BufferedReader;
@@ -95,9 +93,16 @@ public class Core extends JavaPlugin {
 			}
 		});
 
-		for(Listener listener : new Listener[]{new CaseInsensitiveCommandsListener(), new PlayerJoinedEvent(), new ChattingEvent(), new WorldLoadEvent(), RecipeDiscoverWrapper.impl}) {
-			getServer().getPluginManager().registerEvents(listener, this);
-		}
+        SpigotLinker spigotLinker = new SpigotLinker(this, MESSAGE);
+        try {
+            spigotLinker.link();
+        } catch (AbstractLinker.LinkException e) {
+            e.printStackTrace();
+            Bukkit.shutdown();
+            return;
+        }
+
+        Bukkit.getServer().getPluginManager().registerEvents(RecipeDiscoverWrapper.impl, this);
 		if(!Statement.productionDatabase()) {
 			getServer().getPluginManager().registerEvents(LocaleChangeWrapper.impl, this);
 		}
@@ -105,18 +110,8 @@ public class Core extends JavaPlugin {
 		getServer().getMessenger().registerIncomingPluginChannel(this, "sw:bridge", new NetworkReceiver());
 		getServer().getMessenger().registerOutgoingPluginChannel(this, "sw:bridge");
 
-		if(Core.getVersion() < 19)
-			AuthlibInjector.inject();
-
 		TinyProtocol.init();
 		CheckpointUtils.signalHandler();
-		new AntiNocom();
-
-		if(Core.getVersion() >= 19)
-			new ServerDataHandler();
-
- 		if(Bukkit.getPluginManager().getPlugin("WorldEdit") != null)
-			new WorldEditRenderer();
 
 		Bukkit.getScheduler().runTaskTimer(this, TabCompletionCache::invalidateOldEntries, 20, 20);
 		Bukkit.getScheduler().runTaskTimer(Core.getInstance(), SteamwarUser::clear, 72000, 72000);
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/WorldEditRenderer.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/WorldEditRenderer.java
index 79c54986..27f76cda 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/WorldEditRenderer.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/WorldEditRenderer.java
@@ -28,6 +28,8 @@ import com.sk89q.worldedit.math.transform.Transform;
 import com.sk89q.worldedit.regions.Region;
 import com.sk89q.worldedit.regions.RegionSelector;
 import com.sk89q.worldedit.world.World;
+import de.steamwar.linkage.Linked;
+import de.steamwar.linkage.PluginCheck;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -37,6 +39,8 @@ import org.bukkit.event.block.BlockBreakEvent;
 import org.bukkit.event.player.*;
 import org.bukkit.util.Vector;
 
+@Linked
+@PluginCheck("WorldEdit")
 public class WorldEditRenderer implements Listener {
 
     private static WorldEditRenderer INSTANCE;
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/authlib/AuthlibInjector.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/authlib/AuthlibInjector.java
index b9c4011a..06fd942c 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/authlib/AuthlibInjector.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/authlib/AuthlibInjector.java
@@ -22,11 +22,16 @@ package de.steamwar.core.authlib;
 import de.steamwar.Reflection;
 import com.mojang.authlib.GameProfileRepository;
 import com.mojang.authlib.yggdrasil.YggdrasilGameProfileRepository;
+import de.steamwar.linkage.Linked;
+import de.steamwar.linkage.MaxVersion;
+import de.steamwar.linkage.api.Enable;
 
-public class AuthlibInjector {
-    private AuthlibInjector() {}
+@Linked
+@MaxVersion(18)
+public class AuthlibInjector implements Enable {
 
-    public static void inject() {
+    @Override
+    public void enable() {
         Class<?> minecraftServerClass = Reflection.getClass("net.minecraft.server.MinecraftServer");
         Reflection.Field<GameProfileRepository> gameProfile = Reflection.getField(minecraftServerClass, GameProfileRepository.class, 0);
         Object minecraftServer = Reflection.getTypedMethod(minecraftServerClass, "getServer", minecraftServerClass).invoke(null);
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/AntiNocom.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/AntiNocom.java
index 14f8badc..d3e5ea34 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/AntiNocom.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/AntiNocom.java
@@ -19,9 +19,10 @@
 
 package de.steamwar.core.events;
 
-import de.steamwar.Reflection;
 import com.comphenix.tinyprotocol.TinyProtocol;
+import de.steamwar.Reflection;
 import de.steamwar.core.Core;
+import de.steamwar.linkage.Linked;
 import de.steamwar.sql.SWException;
 import de.steamwar.techhider.ProtocolUtils;
 import de.steamwar.techhider.TechHider;
@@ -35,14 +36,13 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
 
+@Linked
 public class AntiNocom implements Listener {
 
     private final Map<Player, Integer> flags = new ConcurrentHashMap<>();
 
     public AntiNocom() {
-        Bukkit.getServer().getPluginManager().registerEvents(this, Core.getInstance());
         TinyProtocol.instance.addFilter(blockDig, this::onDig);
-
         if(Core.getVersion() > 8) {
             registerUseItem();
         }
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/ChattingEvent.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/ChattingEvent.java
index 1de582f2..40b7412f 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/ChattingEvent.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/ChattingEvent.java
@@ -20,11 +20,13 @@
 package de.steamwar.core.events;
 
 import de.steamwar.core.Core;
+import de.steamwar.linkage.Linked;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.AsyncPlayerChatEvent;
 
+@Linked
 public class ChattingEvent implements Listener {
 
 	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/PlayerJoinedEvent.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/PlayerJoinedEvent.java
index d3fd33a0..fc64cb27 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/PlayerJoinedEvent.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/PlayerJoinedEvent.java
@@ -20,6 +20,7 @@
 package de.steamwar.core.events;
 
 import de.steamwar.core.Core;
+import de.steamwar.linkage.Linked;
 import de.steamwar.providers.BauServerInfo;
 import de.steamwar.sql.AuditLog;
 import de.steamwar.sql.SteamwarUser;
@@ -32,7 +33,7 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 
-
+@Linked
 public class PlayerJoinedEvent implements Listener{
 
 	@EventHandler(priority = EventPriority.LOWEST)
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/WorldLoadEvent.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/WorldLoadEvent.java
index c28f998e..f7aba879 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/WorldLoadEvent.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/WorldLoadEvent.java
@@ -19,10 +19,12 @@
 
 package de.steamwar.core.events;
 
+import de.steamwar.linkage.Linked;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.world.WorldInitEvent;
 
+@Linked
 public class WorldLoadEvent implements Listener {
 
     @EventHandler
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/network/handlers/ServerDataHandler.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/network/handlers/ServerDataHandler.java
index 8941432b..a758892d 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/network/handlers/ServerDataHandler.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/network/handlers/ServerDataHandler.java
@@ -21,7 +21,11 @@ package de.steamwar.network.handlers;
 
 import de.steamwar.Reflection;
 import com.comphenix.tinyprotocol.TinyProtocol;
+import de.steamwar.linkage.Linked;
+import de.steamwar.linkage.MinVersion;
 
+@Linked
+@MinVersion(19)
 public class ServerDataHandler {
 
     public ServerDataHandler() {
diff --git a/VelocityCore/Persistent/src/de/steamwar/persistent/Subserver.java b/VelocityCore/Persistent/src/de/steamwar/persistent/Subserver.java
index 7351e83a..e63b2806 100644
--- a/VelocityCore/Persistent/src/de/steamwar/persistent/Subserver.java
+++ b/VelocityCore/Persistent/src/de/steamwar/persistent/Subserver.java
@@ -223,6 +223,7 @@ public class Subserver {
                 start(process.getInputStream(), line -> line.contains("Checkpoint restored"));
                 Thread.sleep(100);
             } else {
+                sendProgress(0);
                 start(process.getInputStream(), line -> {
                     if (line.contains("Loading libraries, please wait"))
                         sendProgress(2);

From d75c82dca54d604a6ca62517815a2ced738ce6c5 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Fri, 3 Oct 2025 13:46:39 +0200
Subject: [PATCH 150/214] Implement Linkage for Teamserver

---
 SpigotCore/SpigotCore_Main/build.gradle.kts   |  2 ++
 Teamserver/build.gradle.kts                   |  2 ++
 .../src/de/steamwar/teamserver/Builder.java   | 32 ++++++-------------
 .../command/ArenaconfigCommand.java           |  2 ++
 .../teamserver/command/FreezeCommand.java     |  2 ++
 .../teamserver/command/GamemodeCommand.java   |  2 ++
 .../teamserver/command/MaterialCommand.java   |  2 ++
 .../teamserver/command/SpeedCommand.java      |  2 ++
 .../listener/AxiomHandshakeListener.java      |  4 +++
 .../teamserver/listener/FreezeListener.java   |  2 ++
 .../teamserver/listener/PlayerChange.java     |  2 ++
 .../teamserver/listener/SelectAdjacent.java   |  4 +++
 12 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/SpigotCore/SpigotCore_Main/build.gradle.kts b/SpigotCore/SpigotCore_Main/build.gradle.kts
index cc941d8c..bc0ff779 100644
--- a/SpigotCore/SpigotCore_Main/build.gradle.kts
+++ b/SpigotCore/SpigotCore_Main/build.gradle.kts
@@ -26,6 +26,8 @@ tasks.compileJava {
 }
 
 dependencies {
+    compileOnly(libs.classindex)
+    annotationProcessor(libs.classindex)
     compileOnly(project(":CommonCore", "default"))
     compileOnly(project(":CommandFramework", "default"))
     compileOnly(project(":SpigotCore:CRIUDummy", "default"))
diff --git a/Teamserver/build.gradle.kts b/Teamserver/build.gradle.kts
index 44d3e49d..c0e5c933 100644
--- a/Teamserver/build.gradle.kts
+++ b/Teamserver/build.gradle.kts
@@ -22,6 +22,8 @@ plugins {
 }
 
 dependencies {
+    compileOnly(libs.classindex)
+    annotationProcessor(libs.classindex)
     compileOnly(project(":SpigotCore", "default"))
 
     compileOnly(libs.spigotapi)
diff --git a/Teamserver/src/de/steamwar/teamserver/Builder.java b/Teamserver/src/de/steamwar/teamserver/Builder.java
index 94dadf8a..3400ff98 100644
--- a/Teamserver/src/de/steamwar/teamserver/Builder.java
+++ b/Teamserver/src/de/steamwar/teamserver/Builder.java
@@ -19,14 +19,10 @@
 
 package de.steamwar.teamserver;
 
-import de.steamwar.core.Core;
 import de.steamwar.core.WorldEditRendererCUIEditor;
+import de.steamwar.linkage.AbstractLinker;
+import de.steamwar.linkage.SpigotLinker;
 import de.steamwar.message.Message;
-import de.steamwar.teamserver.command.*;
-import de.steamwar.teamserver.listener.AxiomHandshakeListener;
-import de.steamwar.teamserver.listener.FreezeListener;
-import de.steamwar.teamserver.listener.PlayerChange;
-import de.steamwar.teamserver.listener.SelectAdjacent;
 import org.bukkit.Bukkit;
 import org.bukkit.GameRule;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -45,27 +41,17 @@ public final class Builder extends JavaPlugin {
 
         MESSAGE = new Message("de.steamwar.teamserver.Teamserver", getClassLoader());
 
-        new GamemodeCommand();
-        new SpeedCommand();
-        new FreezeCommand();
-        new ArenaconfigCommand();
-
-        if (Bukkit.getPluginManager().getPlugin("AxiomPaper") != null) {
-            Bukkit.getPluginManager().registerEvents(new AxiomHandshakeListener(), this);
+        SpigotLinker spigotLinker = new SpigotLinker(this, MESSAGE);
+        try {
+            spigotLinker.link();
+        } catch (AbstractLinker.LinkException e) {
+            e.printStackTrace();
+            Bukkit.shutdown();
+            return;
         }
 
-        Bukkit.getPluginManager().registerEvents(new PlayerChange(), this);
-        Bukkit.getPluginManager().registerEvents(new FreezeListener(), this);
-
-        MaterialCommand materialCommand = new MaterialCommand();
-        Bukkit.getPluginManager().registerEvents(materialCommand, this);
-
         Bukkit.getWorlds().get(0).setGameRule(GameRule.REDUCED_DEBUG_INFO, false);
         new WorldEditRendererCUIEditor();
-
-        if (Core.getVersion() >= 20) {
-            Bukkit.getPluginManager().registerEvents(new SelectAdjacent(), this);
-        }
     }
 
     @Override
diff --git a/Teamserver/src/de/steamwar/teamserver/command/ArenaconfigCommand.java b/Teamserver/src/de/steamwar/teamserver/command/ArenaconfigCommand.java
index 6851610c..23d7fa4e 100644
--- a/Teamserver/src/de/steamwar/teamserver/command/ArenaconfigCommand.java
+++ b/Teamserver/src/de/steamwar/teamserver/command/ArenaconfigCommand.java
@@ -26,6 +26,7 @@ import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.regions.CuboidRegion;
 import com.sk89q.worldedit.regions.RegionSelector;
 import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
 import de.steamwar.teamserver.Builder;
 import org.bukkit.Bukkit;
 import org.bukkit.configuration.file.YamlConfiguration;
@@ -34,6 +35,7 @@ import org.bukkit.entity.Player;
 import java.io.File;
 import java.io.IOException;
 
+@Linked
 public class ArenaconfigCommand extends SWCommand {
 
     public ArenaconfigCommand() {
diff --git a/Teamserver/src/de/steamwar/teamserver/command/FreezeCommand.java b/Teamserver/src/de/steamwar/teamserver/command/FreezeCommand.java
index 814069c4..91692877 100644
--- a/Teamserver/src/de/steamwar/teamserver/command/FreezeCommand.java
+++ b/Teamserver/src/de/steamwar/teamserver/command/FreezeCommand.java
@@ -20,12 +20,14 @@
 package de.steamwar.teamserver.command;
 
 import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
 import de.steamwar.teamserver.Builder;
 import de.steamwar.teamserver.listener.FreezeListener;
 import net.md_5.bungee.api.ChatMessageType;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
+@Linked
 public class FreezeCommand extends SWCommand {
 
     public FreezeCommand() {
diff --git a/Teamserver/src/de/steamwar/teamserver/command/GamemodeCommand.java b/Teamserver/src/de/steamwar/teamserver/command/GamemodeCommand.java
index ed4fc4ff..93b35455 100644
--- a/Teamserver/src/de/steamwar/teamserver/command/GamemodeCommand.java
+++ b/Teamserver/src/de/steamwar/teamserver/command/GamemodeCommand.java
@@ -20,9 +20,11 @@
 package de.steamwar.teamserver.command;
 
 import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
 import org.bukkit.GameMode;
 import org.bukkit.entity.Player;
 
+@Linked
 public class GamemodeCommand extends SWCommand {
 
 	public GamemodeCommand()  {
diff --git a/Teamserver/src/de/steamwar/teamserver/command/MaterialCommand.java b/Teamserver/src/de/steamwar/teamserver/command/MaterialCommand.java
index 808a5469..13c26699 100644
--- a/Teamserver/src/de/steamwar/teamserver/command/MaterialCommand.java
+++ b/Teamserver/src/de/steamwar/teamserver/command/MaterialCommand.java
@@ -25,6 +25,7 @@ import de.steamwar.inventory.SWAnvilInv;
 import de.steamwar.inventory.SWInventory;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.inventory.SWListInv;
+import de.steamwar.linkage.Linked;
 import de.steamwar.teamserver.Builder;
 import org.bukkit.Material;
 import org.bukkit.block.data.BlockData;
@@ -41,6 +42,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.regex.Pattern;
 
+@Linked
 public class MaterialCommand extends SWCommand implements Listener {
 
     public MaterialCommand() {
diff --git a/Teamserver/src/de/steamwar/teamserver/command/SpeedCommand.java b/Teamserver/src/de/steamwar/teamserver/command/SpeedCommand.java
index 412886fd..2b22626f 100644
--- a/Teamserver/src/de/steamwar/teamserver/command/SpeedCommand.java
+++ b/Teamserver/src/de/steamwar/teamserver/command/SpeedCommand.java
@@ -20,8 +20,10 @@
 package de.steamwar.teamserver.command;
 
 import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 
+@Linked
 public class SpeedCommand extends SWCommand {
 
     public SpeedCommand() {
diff --git a/Teamserver/src/de/steamwar/teamserver/listener/AxiomHandshakeListener.java b/Teamserver/src/de/steamwar/teamserver/listener/AxiomHandshakeListener.java
index b68e6fcf..21fae69f 100644
--- a/Teamserver/src/de/steamwar/teamserver/listener/AxiomHandshakeListener.java
+++ b/Teamserver/src/de/steamwar/teamserver/listener/AxiomHandshakeListener.java
@@ -20,9 +20,13 @@
 package de.steamwar.teamserver.listener;
 
 import com.moulberry.axiom.event.AxiomHandshakeEvent;
+import de.steamwar.linkage.Linked;
+import de.steamwar.linkage.PluginCheck;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 
+@Linked
+@PluginCheck("AxiomPaper")
 public class AxiomHandshakeListener implements Listener {
 
     @EventHandler
diff --git a/Teamserver/src/de/steamwar/teamserver/listener/FreezeListener.java b/Teamserver/src/de/steamwar/teamserver/listener/FreezeListener.java
index 7d576d2f..575cb513 100644
--- a/Teamserver/src/de/steamwar/teamserver/listener/FreezeListener.java
+++ b/Teamserver/src/de/steamwar/teamserver/listener/FreezeListener.java
@@ -21,6 +21,7 @@ package de.steamwar.teamserver.listener;
 
 import de.steamwar.core.Core;
 import de.steamwar.core.TrickyTrialsWrapper;
+import de.steamwar.linkage.Linked;
 import de.steamwar.teamserver.Builder;
 import net.md_5.bungee.api.ChatMessageType;
 import net.md_5.bungee.api.chat.BaseComponent;
@@ -39,6 +40,7 @@ import org.bukkit.event.entity.EntitySpawnEvent;
 import org.bukkit.event.inventory.InventoryMoveItemEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
 
+@Linked
 public class FreezeListener implements Listener {
 
     public static boolean freeze = true;
diff --git a/Teamserver/src/de/steamwar/teamserver/listener/PlayerChange.java b/Teamserver/src/de/steamwar/teamserver/listener/PlayerChange.java
index 63016c00..71493f64 100644
--- a/Teamserver/src/de/steamwar/teamserver/listener/PlayerChange.java
+++ b/Teamserver/src/de/steamwar/teamserver/listener/PlayerChange.java
@@ -19,12 +19,14 @@
 
 package de.steamwar.teamserver.listener;
 
+import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 
+@Linked
 public class PlayerChange implements Listener {
 
     @EventHandler
diff --git a/Teamserver/src/de/steamwar/teamserver/listener/SelectAdjacent.java b/Teamserver/src/de/steamwar/teamserver/listener/SelectAdjacent.java
index 2fbebbf3..6a94f635 100644
--- a/Teamserver/src/de/steamwar/teamserver/listener/SelectAdjacent.java
+++ b/Teamserver/src/de/steamwar/teamserver/listener/SelectAdjacent.java
@@ -25,6 +25,8 @@ 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;
@@ -43,6 +45,8 @@ import org.bukkit.util.Vector;
 import java.util.*;
 import java.util.function.Predicate;
 
+@Linked
+@MinVersion(20)
 public class SelectAdjacent implements Listener {
 
     private Vector[] FACES = {

From 9dabcfc9180d660acb0098408802eff2e033013e Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Fri, 3 Oct 2025 13:51:38 +0200
Subject: [PATCH 151/214] Implement Linkage for TowerRun

---
 .../de/steamwar/linkage/AbstractLinker.java   |  8 +++--
 TowerRun/build.gradle.kts                     |  2 ++
 .../src/de/steamwar/towerrun/TowerRun.java    | 36 ++++++++++---------
 .../towerrun/commands/StartCommand.java       |  7 ++--
 .../towerrun/countdowns/EndCountdown.java     |  9 +++--
 .../towerrun/countdowns/GameCountdown.java    |  2 ++
 .../towerrun/countdowns/LobbyCountdown.java   |  2 ++
 .../towerrun/listener/GlobalListener.java     |  2 ++
 .../towerrun/listener/IngameListener.java     |  2 ++
 .../towerrun/listener/LobbyListener.java      |  2 ++
 .../towerrun/listener/NotLobbyListener.java   |  2 ++
 11 files changed, 50 insertions(+), 24 deletions(-)

diff --git a/CommonCore/Linkage/src/de/steamwar/linkage/AbstractLinker.java b/CommonCore/Linkage/src/de/steamwar/linkage/AbstractLinker.java
index 18e931ce..4d663920 100644
--- a/CommonCore/Linkage/src/de/steamwar/linkage/AbstractLinker.java
+++ b/CommonCore/Linkage/src/de/steamwar/linkage/AbstractLinker.java
@@ -27,6 +27,7 @@ import lombok.experimental.StandardException;
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -100,9 +101,12 @@ public abstract class AbstractLinker<T> {
             instances.forEach((clazz, o) -> {
                 for (Field field : clazz.getFields()) {
                     if (field.getAnnotation(LinkedInstance.class) != null) {
-                        System.out.println("Setting " + field.getName() + " to " + instances.get(field.getType()));
                         try {
-                            field.set(o, instances.get(field.getType()));
+                            if (Modifier.isStatic(field.getModifiers())) {
+                                field.set(null, instances.get(field.getType()));
+                            } else {
+                                field.set(o, instances.get(field.getType()));
+                            }
                         } catch (IllegalAccessException e) {
                             throw new SecurityException(e.getMessage(), e);
                         }
diff --git a/TowerRun/build.gradle.kts b/TowerRun/build.gradle.kts
index 8eacd66e..e3a6cf74 100644
--- a/TowerRun/build.gradle.kts
+++ b/TowerRun/build.gradle.kts
@@ -29,6 +29,8 @@ java {
 dependencies {
     annotationProcessor(libs.spigotannotations)
     compileOnly(libs.spigotannotations)
+    compileOnly(libs.classindex)
+    annotationProcessor(libs.classindex)
 
     compileOnly(project(":SpigotCore", "default"))
 
diff --git a/TowerRun/src/de/steamwar/towerrun/TowerRun.java b/TowerRun/src/de/steamwar/towerrun/TowerRun.java
index 4503c5da..440b156c 100644
--- a/TowerRun/src/de/steamwar/towerrun/TowerRun.java
+++ b/TowerRun/src/de/steamwar/towerrun/TowerRun.java
@@ -19,18 +19,14 @@
 
 package de.steamwar.towerrun;
 
+import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.AbstractLinker;
+import de.steamwar.linkage.LinkedInstance;
+import de.steamwar.linkage.SpigotLinker;
 import de.steamwar.message.Message;
-import de.steamwar.towerrun.commands.StartCommand;
 import de.steamwar.towerrun.config.WorldConfig;
-import de.steamwar.towerrun.countdowns.EndCountdown;
 import de.steamwar.towerrun.countdowns.GameCountdown;
-import de.steamwar.towerrun.countdowns.LobbyCountdown;
-import de.steamwar.towerrun.game.TowerRunGame;
 import de.steamwar.towerrun.generator.TowerGenerator;
-import de.steamwar.towerrun.listener.GlobalListener;
-import de.steamwar.towerrun.listener.IngameListener;
-import de.steamwar.towerrun.listener.LobbyListener;
-import de.steamwar.towerrun.listener.NotLobbyListener;
 import lombok.Getter;
 import org.bukkit.Bukkit;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -58,6 +54,7 @@ public class TowerRun extends JavaPlugin {
     private static TowerGenerator towerGenerator = null;
 
     @Getter
+    @LinkedInstance
     private static GameCountdown gameCountdown;
 
 
@@ -70,14 +67,21 @@ public class TowerRun extends JavaPlugin {
             towerGenerator = new TowerGenerator(WorldConfig.TOWER_GENERATOR_CONFIG);
         }
 
-        new LobbyListener();
-        new IngameListener();
-        new GlobalListener();
-        new NotLobbyListener();
-        final LobbyCountdown lobbyCountdown = new LobbyCountdown();
-        new EndCountdown(lobbyCountdown);
-        new StartCommand(lobbyCountdown);
-        gameCountdown = new GameCountdown();
+        SpigotLinker spigotLinker = new SpigotLinker(this, message) {
+            @Override
+            protected void linkObject(Object any) {
+                if (any instanceof SWCommand) {
+                    ((SWCommand) any).setMessage(message);
+                }
+            }
+        };
+        try {
+            spigotLinker.link();
+        } catch (AbstractLinker.LinkException e) {
+            e.printStackTrace();
+            Bukkit.shutdown();
+            return;
+        }
 
         Bukkit.getScheduler().runTaskTimer(this, new FightInfoPacketSender(), 20, 20);
     }
diff --git a/TowerRun/src/de/steamwar/towerrun/commands/StartCommand.java b/TowerRun/src/de/steamwar/towerrun/commands/StartCommand.java
index 262ffff6..dddb2954 100644
--- a/TowerRun/src/de/steamwar/towerrun/commands/StartCommand.java
+++ b/TowerRun/src/de/steamwar/towerrun/commands/StartCommand.java
@@ -21,18 +21,19 @@ package de.steamwar.towerrun.commands;
 
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeValidator;
+import de.steamwar.linkage.Linked;
 import de.steamwar.sql.SteamwarUser;
 import de.steamwar.sql.UserPerm;
 import de.steamwar.towerrun.TowerRun;
 import de.steamwar.towerrun.countdowns.LobbyCountdown;
 import org.bukkit.entity.Player;
 
+@Linked
 public class StartCommand extends SWCommand {
-    private final LobbyCountdown countdown;
+    private LobbyCountdown countdown;
 
-    public StartCommand(LobbyCountdown countdown) {
+    public StartCommand() {
         super("start", "skip");
-        this.countdown = countdown;
     }
 
     @Register
diff --git a/TowerRun/src/de/steamwar/towerrun/countdowns/EndCountdown.java b/TowerRun/src/de/steamwar/towerrun/countdowns/EndCountdown.java
index 6d631e02..3eb32c7d 100644
--- a/TowerRun/src/de/steamwar/towerrun/countdowns/EndCountdown.java
+++ b/TowerRun/src/de/steamwar/towerrun/countdowns/EndCountdown.java
@@ -19,6 +19,8 @@
 
 package de.steamwar.towerrun.countdowns;
 
+import de.steamwar.linkage.Linked;
+import de.steamwar.linkage.LinkedInstance;
 import de.steamwar.towerrun.TowerRun;
 import de.steamwar.towerrun.config.Config;
 import de.steamwar.towerrun.game.TowerRunGame;
@@ -29,15 +31,16 @@ import org.bukkit.Sound;
 import java.util.EnumSet;
 import java.util.Objects;
 
+@Linked
 public class EndCountdown extends Countdown {
 
-    private final LobbyCountdown lobbyCountdown;
+    @LinkedInstance
+    private LobbyCountdown lobbyCountdown;
 
     private static final boolean RESETS = Objects.requireNonNull(Bukkit.getWorlds().get(0).getWorldFolder().list((dir, name) -> name.equals("backup"))).length > 0;
 
-    public EndCountdown(LobbyCountdown lobbyCountdown) {
+    public EndCountdown() {
         super(EnumSet.of(GameStates.END));
-        this.lobbyCountdown = lobbyCountdown;
     }
 
     @Override
diff --git a/TowerRun/src/de/steamwar/towerrun/countdowns/GameCountdown.java b/TowerRun/src/de/steamwar/towerrun/countdowns/GameCountdown.java
index b1d25110..26b69ed7 100644
--- a/TowerRun/src/de/steamwar/towerrun/countdowns/GameCountdown.java
+++ b/TowerRun/src/de/steamwar/towerrun/countdowns/GameCountdown.java
@@ -19,6 +19,7 @@
 
 package de.steamwar.towerrun.countdowns;
 
+import de.steamwar.linkage.Linked;
 import de.steamwar.towerrun.TowerRun;
 import de.steamwar.towerrun.config.Config;
 import de.steamwar.towerrun.game.TowerRunGame;
@@ -26,6 +27,7 @@ import de.steamwar.towerrun.state.GameStates;
 
 import java.util.EnumSet;
 
+@Linked
 public class GameCountdown extends Countdown {
 
     private long startTime = 0;
diff --git a/TowerRun/src/de/steamwar/towerrun/countdowns/LobbyCountdown.java b/TowerRun/src/de/steamwar/towerrun/countdowns/LobbyCountdown.java
index a655c4c3..4377a141 100644
--- a/TowerRun/src/de/steamwar/towerrun/countdowns/LobbyCountdown.java
+++ b/TowerRun/src/de/steamwar/towerrun/countdowns/LobbyCountdown.java
@@ -19,6 +19,7 @@
 
 package de.steamwar.towerrun.countdowns;
 
+import de.steamwar.linkage.Linked;
 import de.steamwar.towerrun.TowerRun;
 import de.steamwar.towerrun.config.Config;
 import de.steamwar.towerrun.game.TowerRunGame;
@@ -31,6 +32,7 @@ import org.bukkit.Sound;
 import java.util.EnumSet;
 
 @Getter
+@Linked
 public class LobbyCountdown extends Countdown {
 
     @Setter
diff --git a/TowerRun/src/de/steamwar/towerrun/listener/GlobalListener.java b/TowerRun/src/de/steamwar/towerrun/listener/GlobalListener.java
index c20dd391..343bb97a 100644
--- a/TowerRun/src/de/steamwar/towerrun/listener/GlobalListener.java
+++ b/TowerRun/src/de/steamwar/towerrun/listener/GlobalListener.java
@@ -19,6 +19,7 @@
 
 package de.steamwar.towerrun.listener;
 
+import de.steamwar.linkage.Linked;
 import de.steamwar.towerrun.TowerRun;
 import de.steamwar.towerrun.config.WorldConfig;
 import de.steamwar.towerrun.game.TowerRunGame;
@@ -36,6 +37,7 @@ import org.bukkit.event.player.*;
 
 import java.util.EnumSet;
 
+@Linked
 public class GlobalListener extends GameStateBukkitListener implements Listener {
     public GlobalListener() {
         super(EnumSet.allOf(GameStates.class));
diff --git a/TowerRun/src/de/steamwar/towerrun/listener/IngameListener.java b/TowerRun/src/de/steamwar/towerrun/listener/IngameListener.java
index bc74e57f..abb5d9db 100644
--- a/TowerRun/src/de/steamwar/towerrun/listener/IngameListener.java
+++ b/TowerRun/src/de/steamwar/towerrun/listener/IngameListener.java
@@ -20,6 +20,7 @@
 package de.steamwar.towerrun.listener;
 
 import de.steamwar.inventory.SWItem;
+import de.steamwar.linkage.Linked;
 import de.steamwar.towerrun.TowerRun;
 import de.steamwar.towerrun.config.Config;
 import de.steamwar.towerrun.config.WorldConfig;
@@ -47,6 +48,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+@Linked
 public class IngameListener extends GameStateBukkitListener {
 
     private int time = 0;
diff --git a/TowerRun/src/de/steamwar/towerrun/listener/LobbyListener.java b/TowerRun/src/de/steamwar/towerrun/listener/LobbyListener.java
index 0a4e4358..2b89a81c 100644
--- a/TowerRun/src/de/steamwar/towerrun/listener/LobbyListener.java
+++ b/TowerRun/src/de/steamwar/towerrun/listener/LobbyListener.java
@@ -19,6 +19,7 @@
 
 package de.steamwar.towerrun.listener;
 
+import de.steamwar.linkage.Linked;
 import de.steamwar.sql.SteamwarUser;
 import de.steamwar.towerrun.TowerRun;
 import de.steamwar.towerrun.config.Config;
@@ -40,6 +41,7 @@ import org.bukkit.event.player.PlayerMoveEvent;
 import java.util.EnumSet;
 import java.util.HashMap;
 
+@Linked
 public class LobbyListener extends GameStateBukkitListener {
     public LobbyListener() {
         super(EnumSet.of(GameStates.WAITING));
diff --git a/TowerRun/src/de/steamwar/towerrun/listener/NotLobbyListener.java b/TowerRun/src/de/steamwar/towerrun/listener/NotLobbyListener.java
index 6bfb1623..752ed521 100644
--- a/TowerRun/src/de/steamwar/towerrun/listener/NotLobbyListener.java
+++ b/TowerRun/src/de/steamwar/towerrun/listener/NotLobbyListener.java
@@ -19,6 +19,7 @@
 
 package de.steamwar.towerrun.listener;
 
+import de.steamwar.linkage.Linked;
 import de.steamwar.towerrun.TowerRun;
 import de.steamwar.towerrun.config.WorldConfig;
 import de.steamwar.towerrun.state.GameStateBukkitListener;
@@ -29,6 +30,7 @@ import org.bukkit.event.player.PlayerJoinEvent;
 
 import java.util.EnumSet;
 
+@Linked
 public class NotLobbyListener extends GameStateBukkitListener {
     public NotLobbyListener() {
         super(EnumSet.complementOf(EnumSet.of(GameStates.WAITING)));

From b55c3d332efd6220f841d44bb8d833f689447742 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Thu, 23 Oct 2025 17:27:10 +0200
Subject: [PATCH 152/214] Fix build problems

---
 .../de/steamwar/lobby/particle/ParticleListener.java   |  4 ++--
 .../lobby/special/easter/EggClickListener.java         |  9 +++++++--
 .../steamwar/lobby/special/easter/EggHuntListener.java | 10 ++++++++--
 LobbySystem/src/de/steamwar/lobby/team/TeamPlayer.java |  4 ++--
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/LobbySystem/src/de/steamwar/lobby/particle/ParticleListener.java b/LobbySystem/src/de/steamwar/lobby/particle/ParticleListener.java
index 932b7ef9..1879d215 100644
--- a/LobbySystem/src/de/steamwar/lobby/particle/ParticleListener.java
+++ b/LobbySystem/src/de/steamwar/lobby/particle/ParticleListener.java
@@ -22,7 +22,6 @@ package de.steamwar.lobby.particle;
 import de.steamwar.linkage.Linked;
 import de.steamwar.lobby.LobbySystem;
 import de.steamwar.lobby.jumpandrun.JumpAndRun;
-import de.steamwar.lobby.listener.BasicListener;
 import de.steamwar.lobby.listener.PlayerSpawn;
 import de.steamwar.lobby.util.LobbyPlayer;
 import de.steamwar.sql.SteamwarUser;
@@ -31,6 +30,7 @@ import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerInteractEntityEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerMoveEvent;
@@ -40,7 +40,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 @Linked
-public class ParticleListener extends BasicListener {
+public class ParticleListener implements Listener {
 
     private static final int PLAYER_MAX_SIZE = 20;
     private static final int SERVER_TEAM_MAX_SIZE = 40;
diff --git a/LobbySystem/src/de/steamwar/lobby/special/easter/EggClickListener.java b/LobbySystem/src/de/steamwar/lobby/special/easter/EggClickListener.java
index 5b25c44e..8d324146 100644
--- a/LobbySystem/src/de/steamwar/lobby/special/easter/EggClickListener.java
+++ b/LobbySystem/src/de/steamwar/lobby/special/easter/EggClickListener.java
@@ -1,18 +1,23 @@
 package de.steamwar.lobby.special.easter;
 
 import de.steamwar.lobby.LobbySystem;
-import de.steamwar.lobby.listener.BasicListener;
 import de.steamwar.sql.UserConfig;
+import org.bukkit.Bukkit;
 import org.bukkit.Particle;
 import org.bukkit.Sound;
 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.util.Vector;
 
-public class EggClickListener extends BasicListener {
+public class EggClickListener implements Listener {
+
+    public EggClickListener() {
+        Bukkit.getPluginManager().registerEvents(this, LobbySystem.getInstance());
+    }
 
     @EventHandler
     public void onPlayerInteract(PlayerInteractEvent event) {
diff --git a/LobbySystem/src/de/steamwar/lobby/special/easter/EggHuntListener.java b/LobbySystem/src/de/steamwar/lobby/special/easter/EggHuntListener.java
index 92c903cf..00cb6ca1 100644
--- a/LobbySystem/src/de/steamwar/lobby/special/easter/EggHuntListener.java
+++ b/LobbySystem/src/de/steamwar/lobby/special/easter/EggHuntListener.java
@@ -1,15 +1,21 @@
 package de.steamwar.lobby.special.easter;
 
-import de.steamwar.lobby.listener.BasicListener;
+import de.steamwar.lobby.LobbySystem;
 import de.steamwar.lobby.util.ItemBuilder;
+import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.inventory.ItemStack;
 
-public class EggHuntListener extends BasicListener {
+public class EggHuntListener implements Listener {
+
+    public EggHuntListener() {
+        Bukkit.getPluginManager().registerEvents(this, LobbySystem.getInstance());
+    }
 
     public static final int EASTER_EGG_SLOT = 8;
     public static final ItemStack EASTER_HUNT = new ItemBuilder(Material.DRAGON_EGG, 1).setDisplayName("§fEaster Hunt").build();
diff --git a/LobbySystem/src/de/steamwar/lobby/team/TeamPlayer.java b/LobbySystem/src/de/steamwar/lobby/team/TeamPlayer.java
index eb51d1cf..db55aacb 100644
--- a/LobbySystem/src/de/steamwar/lobby/team/TeamPlayer.java
+++ b/LobbySystem/src/de/steamwar/lobby/team/TeamPlayer.java
@@ -22,7 +22,6 @@ package de.steamwar.lobby.team;
 import de.steamwar.linkage.Linked;
 import de.steamwar.lobby.LobbySystem;
 import de.steamwar.lobby.display.NPC;
-import de.steamwar.lobby.listener.BasicListener;
 import de.steamwar.sql.SteamwarUser;
 import lombok.AllArgsConstructor;
 import org.bukkit.Bukkit;
@@ -33,6 +32,7 @@ import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Villager;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.event.entity.EntityInteractEvent;
 import org.bukkit.event.player.PlayerInteractEntityEvent;
@@ -46,7 +46,7 @@ import java.util.logging.Level;
 import java.util.stream.Collectors;
 
 @Linked
-public class TeamPlayer extends BasicListener {
+public class TeamPlayer implements Listener {
 
     private static final List<Cuboid> cuboids = new ArrayList<>();
 

From 010f36dc86bec75c237889e1188c4dc4cb623ef2 Mon Sep 17 00:00:00 2001
From: Chaoscaot <chaos@chaoscaot.de>
Date: Thu, 23 Oct 2025 17:38:54 +0200
Subject: [PATCH 153/214] Update `.gitignore` and configure IntelliJ IDEA
 copyright settings

---
 .gitignore                            |  1 -
 .idea/.gitignore                      | 32 +++++++++++++++++++++++++++
 .idea/copyright/profiles_settings.xml |  7 ++++++
 .idea/copyright/sw.xml                |  6 +++++
 4 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 .idea/.gitignore
 create mode 100644 .idea/copyright/profiles_settings.xml
 create mode 100644 .idea/copyright/sw.xml

diff --git a/.gitignore b/.gitignore
index b0a7fe1b..3ef53412 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,6 @@
 steamwar.properties
 
 # IntelliJ IDEA
-.idea
 *.iml
 
 # VSCode
diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 00000000..3d911365
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,32 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
+/AndroidProjectSystem.xml
+/checkstyle-idea.xml
+/compiler.xml
+/copilot.data.migration.agent.xml
+/copilot.data.migration.ask.xml
+/copilot.data.migration.ask2agent.xml
+/copilot.data.migration.edit.xml
+/dataSources.xml
+/encodings.xml
+/git_toolbox_blame.xml
+/git_toolbox_prj.xml
+/gradle.xml
+/jarRepositories.xml
+/jpa.xml
+/kotlinc.xml
+/misc.xml
+/modules.xml
+/scala_compiler.xml
+/swagger-settings.xml
+/uiDesigner.xml
+/vcs.xml
+/codeStyles/
+/inspectionProfiles/
+/modules/
\ No newline at end of file
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
new file mode 100644
index 00000000..2d0d7aa3
--- /dev/null
+++ b/.idea/copyright/profiles_settings.xml
@@ -0,0 +1,7 @@
+<component name="CopyrightManager">
+  <settings default="sw">
+    <module2copyright>
+      <element module="All" copyright="sw" />
+    </module2copyright>
+  </settings>
+</component>
\ No newline at end of file
diff --git a/.idea/copyright/sw.xml b/.idea/copyright/sw.xml
new file mode 100644
index 00000000..bd001ca2
--- /dev/null
+++ b/.idea/copyright/sw.xml
@@ -0,0 +1,6 @@
+<component name="CopyrightManager">
+  <copyright>
+    <option name="notice" value="  This file is a part of the SteamWar software.&#10;  &#10;  Copyright (C) &amp;#36;today.year SteamWar.de-Serverteam&#10;  &#10;  This program is free software: you can redistribute it and/or modify&#10;  it under the terms of the GNU Affero General Public License as published by&#10;  the Free Software Foundation, either version 3 of the License, or&#10;  (at your option) any later version.&#10;  &#10;  This program is distributed in the hope that it will be useful,&#10;  but WITHOUT ANY WARRANTY; without even the implied warranty of&#10;  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the&#10;  GNU Affero General Public License for more details.&#10;  &#10;  You should have received a copy of the GNU Affero General Public License&#10;  along with this program.  If not, see &lt;https://www.gnu.org/licenses/&gt;." />
+    <option name="myName" value="sw" />
+  </copyright>
+</component>
\ No newline at end of file

From a03a3f45e8dd5b5a17831d89c1d2f351ae769e9a Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Thu, 23 Oct 2025 17:56:43 +0200
Subject: [PATCH 154/214] Update copyright notices

---
 BauSystem/BauSystem_15/build.gradle.kts       |  2 +-
 .../bausystem/utils/FlatteningWrapper15.java  | 24 ++---
 .../bausystem/utils/NMSWrapper15.java         | 24 ++---
 .../bausystem/utils/PlaceItemWrapper15.java   |  2 +-
 .../utils/PlayerMovementWrapper15.java        | 24 ++---
 .../bausystem/utils/TickListener15.java       |  2 +-
 .../bausystem/utils/TickManager15.java        | 24 ++---
 .../bausystem/utils/tps/PacketCache.java      | 24 ++---
 .../bausystem/utils/tps/TPSFreezeUtils.java   | 24 ++---
 .../bausystem/utils/tps/TPSLimitUtils.java    | 24 ++---
 BauSystem/BauSystem_18/build.gradle.kts       |  2 +-
 .../bausystem/utils/NMSWrapper18.java         | 24 ++---
 .../utils/PlayerMovementWrapper18.java        | 24 ++---
 BauSystem/BauSystem_19/build.gradle.kts       |  2 +-
 .../bausystem/utils/NMSWrapper19.java         | 24 ++---
 .../utils/PlayerMovementWrapper19.java        | 24 ++---
 .../bausystem/utils/TickListener19.java       |  2 +-
 BauSystem/BauSystem_20/build.gradle.kts       |  2 +-
 .../bausystem/utils/NMSWrapper20.java         | 24 ++---
 .../bausystem/utils/PlaceItemWrapper20.java   |  2 +-
 .../utils/PlayerMovementWrapper20.java        | 24 ++---
 BauSystem/BauSystem_21/build.gradle.kts       | 19 ++++
 .../bausystem/utils/NMSWrapper21.java         |  2 +-
 BauSystem/BauSystem_Main/build.gradle.kts     |  2 +-
 .../BauSystem_Main/src/BauSystem.properties   | 24 ++---
 .../src/BauSystem_de.properties               | 24 ++---
 .../src/de/steamwar/bausystem/BauSystem.java  | 24 ++---
 .../src/de/steamwar/bausystem/Permission.java | 24 ++---
 .../src/de/steamwar/bausystem/SWUtils.java    | 24 ++---
 .../steamwar/bausystem/config/BauServer.java  | 24 ++---
 .../bausystem/configplayer/Config.java        | 24 ++---
 .../configplayer/ConfigConverter.java         | 19 ++++
 .../bausystem/configplayer/ConfigCreator.java | 24 ++---
 .../ConfigurationSerializableSerializer.java  | 24 ++---
 .../AttributeRemoveCommand.java               | 24 ++---
 .../attributescopy/AttributeUtils.java        | 24 ++---
 .../attributescopy/AttributesCopyCommand.java | 24 ++---
 .../AttributesPlaceListener.java              | 24 ++---
 .../features/autostart/AutoStartCommand.java  | 24 ++---
 .../features/autostart/AutoStartGuiItem.java  | 24 ++---
 .../features/autostart/AutostartListener.java | 24 ++---
 .../features/backup/BackupCommand.java        | 24 ++---
 .../features/bau/BauInfoBauGuiItem.java       | 24 ++---
 .../features/bau/ForceSpectatorCommand.java   |  2 +-
 .../bausystem/features/bau/InfoCommand.java   | 19 ++++
 .../features/cannon/CannonDetector.java       |  2 +-
 .../bausystem/features/cannon/CannonKey.java  |  2 +-
 .../features/cannon/depth/Depth.java          |  2 +-
 .../features/cannon/depth/DepthCommand.java   | 24 ++---
 .../features/cannon/depth/DepthManager.java   |  2 +-
 .../features/countingwand/Countingwand.java   | 24 ++---
 .../countingwand/CountingwandCommand.java     | 24 ++---
 .../countingwand/CountingwandGuiItem.java     | 24 ++---
 .../countingwand/CountingwandListener.java    | 24 ++---
 .../design/endstone/DesignEndStone.java       | 24 ++---
 .../endstone/DesignEndStoneCommand.java       | 24 ++---
 .../features/detonator/Detoblock.java         | 24 ++---
 .../features/detonator/Detonator.java         | 24 ++---
 .../detonator/DetonatorBauGuiItem.java        | 24 ++---
 .../features/detonator/DetonatorCommand.java  | 24 ++---
 .../features/detonator/DetonatorListener.java | 24 ++---
 .../detonator/storage/DetonatorStorage.java   | 24 ++---
 .../detonator/storage/ItemStorage.java        | 24 ++---
 .../bausystem/features/gui/BauGUI.java        | 24 ++---
 .../bausystem/features/gui/BauGUICommand.java | 24 ++---
 .../features/gui/BauGuiBauGuiItem.java        | 24 ++---
 .../features/gui/BauGuiListener.java          | 24 ++---
 .../features/gui/editor/BauGuiEditor.java     | 24 ++---
 .../gui/editor/BauGuiEditorGuiItem.java       | 24 ++---
 .../features/gui/editor/BauGuiMapping.java    | 24 ++---
 .../features/hotbar/DefaultHotbar.java        | 24 ++---
 .../features/hotbar/HotbarCommand.java        | 24 ++---
 .../features/hotbar/HotbarListener.java       | 24 ++---
 .../InventoryFillBauGuiItem.java              | 19 ++++
 .../inventoryfiller/InventoryFiller.java      | 24 ++---
 .../InventoryFillerCommand.java               | 19 ++++
 .../features/killchecker/Cuboid.java          | 24 ++---
 .../killchecker/KillcheckerCommand.java       | 24 ++---
 .../killchecker/KillcheckerVisualizer.java    | 24 ++---
 .../bausystem/features/loader/Loader.java     | 24 ++---
 .../features/loader/LoaderCommand.java        | 24 ++---
 .../features/loader/LoaderRecorder.java       | 24 ++---
 .../loader/LoaderScoreboardElement.java       | 24 ++---
 .../loader/elements/LoaderElement.java        | 24 ++---
 .../elements/LoaderInteractionElement.java    | 24 ++---
 .../loader/elements/LoaderSettingsEnum.java   |  2 +-
 .../elements/impl/LoaderComparator.java       | 24 ++---
 .../elements/impl/LoaderDaylightDetector.java | 24 ++---
 .../loader/elements/impl/LoaderLectern.java   | 24 ++---
 .../loader/elements/impl/LoaderLever.java     | 24 ++---
 .../loader/elements/impl/LoaderMovement.java  | 24 ++---
 .../loader/elements/impl/LoaderNoteBlock.java | 24 ++---
 .../loader/elements/impl/LoaderOpenable.java  | 24 ++---
 .../loader/elements/impl/LoaderRepeater.java  | 24 ++---
 .../loader/elements/impl/LoaderTNT.java       | 24 ++---
 .../loader/elements/impl/LoaderTicks.java     | 24 ++---
 .../loader/elements/impl/LoaderWait.java      | 24 ++---
 .../features/loadtimer/Loadtimer.java         | 24 ++---
 .../features/loadtimer/LoadtimerCommand.java  | 24 ++---
 .../features/loadtimer/LoadtimerGuiItem.java  | 24 ++---
 .../features/loadtimer/LoadtimerListener.java | 24 ++---
 .../features/observer/ObserverTracer.java     | 24 ++---
 .../observer/ObserverTracerCommand.java       | 24 ++---
 .../observer/ObserverTracerListener.java      | 24 ++---
 .../rayvisualizer/RayVisualizerCommand.java   | 24 ++---
 .../features/region/ColorCommand.java         | 24 ++---
 .../features/region/FireCommand.java          | 24 ++---
 .../features/region/FireListener.java         | 19 ++++
 .../features/region/FreezeCommand.java        | 24 ++---
 .../features/region/FreezeListener.java       | 19 ++++
 .../features/region/ItemsCommand.java         | 24 ++---
 .../features/region/ItemsListener.java        | 24 ++---
 .../features/region/NoGravityCommand.java     |  2 +-
 .../features/region/NoGravityListener.java    |  2 +-
 .../features/region/ProtectCommand.java       | 24 ++---
 .../features/region/ProtectListener.java      | 19 ++++
 .../features/region/RegionCommand.java        | 24 ++---
 .../features/region/RegionListener.java       | 24 ++---
 .../region/RegionScoreboardElement.java       | 24 ++---
 .../features/region/ResetCommand.java         | 24 ++---
 .../bausystem/features/region/TNTCommand.java | 24 ++---
 .../features/region/TNTListener.java          | 24 ++---
 .../features/region/TestblockCommand.java     | 24 ++---
 .../region/items/ColorBauGuiItem.java         | 24 ++---
 .../features/region/items/FireBauGuiItem.java | 24 ++---
 .../region/items/FreezeBauGuiItem.java        | 24 ++---
 .../region/items/ProtectBauGuiItem.java       | 24 ++---
 .../region/items/ResetBauGuiItem.java         | 24 ++---
 .../region/items/TestblockBauGuiItem.java     | 24 ++---
 .../features/region/items/TntBauGuiItem.java  | 24 ++---
 .../bausystem/features/script/Hotkey.java     |  2 +-
 .../features/script/ScriptCommand.java        |  2 +-
 .../bausystem/features/script/ScriptGUI.java  |  2 +-
 .../features/script/ScriptHelper.java         |  2 +-
 .../features/script/ScriptListener.java       |  2 +-
 .../features/script/ScriptRunner.java         |  2 +-
 .../features/script/UnsignCommand.java        |  2 +-
 .../script/event/CommandListener.java         |  2 +-
 .../features/script/event/EventListener.java  |  2 +-
 .../features/script/event/HotkeyListener.java |  2 +-
 .../features/script/lua/CommandRegister.java  |  2 +-
 .../script/lua/SteamWarGlobalLuaPlugin.java   |  2 +-
 .../script/lua/SteamWarLuaPlugin.java         |  2 +-
 .../features/script/lua/SteamWarPlatform.java |  2 +-
 .../features/script/lua/libs/BossbarLib.java  |  2 +-
 .../script/lua/libs/InventoryLib.java         |  2 +-
 .../features/script/lua/libs/LuaLib.java      |  2 +-
 .../features/script/lua/libs/PlayerLib.java   |  2 +-
 .../features/script/lua/libs/RandomLib.java   |  2 +-
 .../features/script/lua/libs/RegionLib.java   |  2 +-
 .../script/lua/libs/ScoreboardLib.java        |  2 +-
 .../features/script/lua/libs/ServerLib.java   |  2 +-
 .../features/script/lua/libs/StorageLib.java  |  2 +-
 .../features/script/lua/libs/TpsLib.java      |  2 +-
 .../features/script/lua/libs/TracerLib.java   |  2 +-
 .../script/lua/libs/WorldEditLib.java         |  2 +-
 .../BlockDataConfiguration.java               |  2 +-
 .../shieldprinting/ShieldPrinting.java        | 24 ++---
 .../shieldprinting/ShieldPrintingCommand.java | 24 ++---
 .../shieldprinting/ShieldPrintingState.java   | 24 ++---
 .../impl/FenceConfiguration.java              |  2 +-
 .../impl/OpenableConfiguration.java           |  2 +-
 .../impl/PistonConfiguration.java             |  2 +-
 .../impl/PowerableConfiguration.java          |  2 +-
 .../impl/WallConfiguration.java               |  2 +-
 .../simulator/SimulatorBauGuiItem.java        |  2 +-
 .../features/simulator/SimulatorCommand.java  |  2 +-
 .../features/simulator/SimulatorCursor.java   |  2 +-
 .../features/simulator/SimulatorStorage.java  |  2 +-
 .../features/simulator/SimulatorWatcher.java  |  2 +-
 .../features/simulator/data/Simulator.java    |  2 +-
 .../data/SimulatorBlockAlignedElement.java    |  2 +-
 .../simulator/data/SimulatorElement.java      |  2 +-
 .../simulator/data/SimulatorGroup.java        |  2 +-
 .../simulator/data/SimulatorPhase.java        |  2 +-
 .../data/observer/ObserverElement.java        |  2 +-
 .../data/observer/ObserverPhase.java          |  2 +-
 .../data/redstone/RedstoneElement.java        |  2 +-
 .../data/redstone/RedstonePhase.java          |  2 +-
 .../simulator/data/tnt/TNTElement.java        |  2 +-
 .../features/simulator/data/tnt/TNTPhase.java |  2 +-
 .../features/simulator/execute/Direction.java | 24 ++---
 .../simulator/execute/SimulatorAction.java    |  2 +-
 .../simulator/execute/SimulatorExecutor.java  |  2 +-
 .../execute/SimulatorStabGenerator.java       | 24 ++---
 .../features/simulator/execute/StabData.java  | 24 ++---
 .../simulator/execute/StabDirection.java      | 24 ++---
 .../simulator/execute/StabFinalizer.java      | 24 ++---
 .../simulator/execute/StabGenerator.java      | 24 ++---
 .../features/simulator/execute/StabSetup.java | 24 ++---
 .../features/simulator/execute/StabStep.java  | 24 ++---
 .../gui/SimulatorCursorSwitcherGui.java       | 24 ++---
 .../gui/SimulatorGroupChooserGui.java         |  2 +-
 .../simulator/gui/SimulatorGroupGui.java      |  2 +-
 .../gui/SimulatorGroupSettingsGui.java        |  2 +-
 .../features/simulator/gui/SimulatorGui.java  |  2 +-
 .../simulator/gui/SimulatorMaterialGui.java   |  2 +-
 .../simulator/gui/SimulatorObserverGui.java   |  2 +-
 .../SimulatorObserverPhaseSettingsGui.java    |  2 +-
 .../gui/SimulatorObserverSettingsGui.java     |  2 +-
 .../simulator/gui/SimulatorRedstoneGui.java   |  2 +-
 .../SimulatorRedstonePhaseSettingsGui.java    |  2 +-
 .../gui/SimulatorRedstoneSettingsGui.java     |  2 +-
 .../simulator/gui/SimulatorSettingsGui.java   |  2 +-
 .../simulator/gui/SimulatorTNTGui.java        |  2 +-
 .../gui/SimulatorTNTPhaseSettingsGui.java     |  2 +-
 .../gui/SimulatorTNTSettingsGui.java          |  2 +-
 .../simulator/gui/base/SimulatorAnvilGui.java |  2 +-
 .../simulator/gui/base/SimulatorBaseGui.java  |  2 +-
 .../simulator/gui/base/SimulatorPageGui.java  |  2 +-
 .../gui/base/SimulatorScrollGui.java          |  2 +-
 .../storage/SimFormatSimulatorLoader.java     |  2 +-
 .../SimulatorFormatSimulatorLoader.java       |  2 +-
 .../simulator/storage/SimulatorLoader.java    |  2 +-
 .../simulator/storage/SimulatorSaver.java     |  2 +-
 .../storage/YAPIONFormatSimulatorLoader.java  |  2 +-
 .../slaves/laufbau/BlockBoundingBox.java      | 24 ++---
 .../slaves/laufbau/BoundingBoxLoader.java     | 24 ++---
 .../features/slaves/laufbau/Cuboid.java       | 24 ++---
 .../features/slaves/laufbau/Laufbau.java      | 24 ++---
 .../slaves/laufbau/LaufbauCommand.java        | 24 ++---
 .../slaves/laufbau/LaufbauSettings.java       | 24 ++---
 .../features/slaves/laufbau/LaufbauUtils.java | 24 ++---
 .../boundingboxes/AmethystBoundingBox.java    | 24 ++---
 .../boundingboxes/AzaleaBoundingBox.java      | 24 ++---
 .../boundingboxes/BellBoundingBox.java        | 24 ++---
 .../BrewingStandBoundingBox.java              | 24 ++---
 .../boundingboxes/CandleBoundingBox.java      | 24 ++---
 .../boundingboxes/ChainBoundingBox.java       | 24 ++---
 .../boundingboxes/ChorusPlantBoundingBox.java | 24 ++---
 .../boundingboxes/DragonEggBoundingBox.java   | 24 ++---
 .../boundingboxes/DripLeafBoundingBox.java    | 24 ++---
 .../boundingboxes/FencesBoundingBox.java      | 24 ++---
 .../boundingboxes/GrindstoneBoundingBox.java  | 24 ++---
 .../boundingboxes/HopperBoundingBox.java      | 24 ++---
 .../boundingboxes/IronBarBoundingBox.java     | 24 ++---
 .../boundingboxes/LanternBoundingBox.java     | 24 ++---
 .../boundingboxes/LecternBoundingBox.java     | 24 ++---
 .../boundingboxes/StairBoundingBox.java       | 24 ++---
 .../boundingboxes/WallBoundingBox.java        | 24 ++---
 .../laufbau/states/CreatingLaufState.java     | 24 ++---
 .../slaves/laufbau/states/LaufbauState.java   | 24 ++---
 .../laufbau/states/ProcessingTracesState.java |  2 +-
 .../features/slaves/panzern/Panzern.java      | 24 ++---
 .../slaves/panzern/PanzernAlgorithm.java      | 24 ++---
 .../slaves/panzern/PanzernCommand.java        | 24 ++---
 .../slaves/panzern/PanzernResult.java         | 24 ++---
 .../panzern/algorithms/AdjacentHoney.java     | 24 ++---
 .../panzern/algorithms/AdjacentSlime.java     | 24 ++---
 .../panzern/algorithms/CarpetWalkWay.java     | 24 ++---
 .../panzern/algorithms/LadderWalkWay.java     | 24 ++---
 .../slaves/panzern/algorithms/PistonLine.java | 24 ++---
 .../algorithms/PowerableActivation.java       | 24 ++---
 .../panzern/algorithms/SlabOnRedstone.java    | 24 ++---
 .../panzern/algorithms/SlabOnTorch.java       | 24 ++---
 .../panzern/algorithms/StairWalkWay.java      | 24 ++---
 .../smartplace/SmartPlaceCommand.java         | 24 ++---
 .../smartplace/SmartPlaceListener.java        |  2 +-
 .../team/boundary/BoundaryViewer.java         | 24 ++---
 .../features/techhider/TechHiderCommand.java  | 24 ++---
 .../testblock/blockcounter/BlockCount.java    | 24 ++---
 .../testblock/blockcounter/BlockCounter.java  | 24 ++---
 .../blockcounter/BlockCounterCommand.java     | 24 ++---
 .../blockcounter/BlockCounterListener.java    | 24 ++---
 .../features/tpslimit/TPSCommand.java         | 24 ++---
 .../features/tpslimit/TPSSystem.java          |  2 +-
 .../bausystem/features/tpslimit/TPSUtils.java | 24 ++---
 .../bausystem/features/tracer/TNTPoint.java   |  2 +-
 .../bausystem/features/tracer/Trace.java      |  2 +-
 .../features/tracer/TraceCommand.java         |  2 +-
 .../features/tracer/TraceManager.java         |  2 +-
 .../features/tracer/TraceRecorder.java        |  2 +-
 .../tracer/TraceRecordingWrapper.java         |  2 +-
 .../features/tracer/TraceRepository.java      | 19 ++++
 .../tracer/TraceScoreboardElement.java        |  2 +-
 .../tracer/rendering/BundleFilter.java        |  2 +-
 .../tracer/rendering/PlayerTraceShowData.java |  2 +-
 .../tracer/rendering/TraceEntity.java         |  2 +-
 .../features/tracer/rendering/ViewFlag.java   |  2 +-
 .../tracer/rendering/dynamicflags/AtFlag.java |  2 +-
 .../rendering/dynamicflags/IsolateFlag.java   |  2 +-
 .../bausystem/features/util/BindCommand.java  | 19 ++++
 .../features/util/BookReplaceCommand.java     | 19 ++++
 .../bausystem/features/util/ClearCommand.java | 24 ++---
 .../features/util/DebugStickCommand.java      | 24 ++---
 .../features/util/DeclutterCommand.java       | 24 ++---
 .../features/util/DragonEggCommand.java       | 24 ++---
 .../features/util/GamemodeCommand.java        | 24 ++---
 .../features/util/KillAllCommand.java         | 24 ++---
 .../features/util/MaterialCommand.java        | 24 ++---
 .../features/util/MaterialLazyInit.java       | 24 ++---
 .../features/util/NightVisionCommand.java     | 24 ++---
 .../features/util/NoClipCommand.java          | 24 ++---
 .../features/util/PistonCalculator.java       | 24 ++---
 .../util/PistonCalculatorCommand.java         | 24 ++---
 .../features/util/RegionSelectionType.java    | 19 ++++
 .../features/util/SelectCommand.java          | 19 ++++
 .../bausystem/features/util/SkullCommand.java | 24 ++---
 .../bausystem/features/util/SlotCommand.java  | 24 ++---
 .../bausystem/features/util/SpeedCommand.java | 24 ++---
 .../features/util/StructureVoidCommand.java   | 24 ++---
 .../features/util/TNTClickListener.java       | 24 ++---
 .../features/util/TeleportCommand.java        | 24 ++---
 .../bausystem/features/util/TimeCommand.java  | 24 ++---
 .../features/util/items/ClearBauGuiItem.java  | 24 ++---
 .../util/items/DebugstickBauGuiItem.java      | 24 ++---
 .../util/items/DeclutterBauGuiItem.java       | 24 ++---
 .../util/items/GamemodeBauGuiItem.java        | 24 ++---
 .../util/items/KillAllBauGuiItem.java         | 24 ++---
 .../util/items/NavWandBauGuiItem.java         | 24 ++---
 .../util/items/NightVisionBauGuiItem.java     | 24 ++---
 .../features/util/items/SchemBauGuiItem.java  | 19 ++++
 .../features/util/items/SelectBauGuiItem.java | 24 ++---
 .../features/util/items/SkullBauGuiItem.java  | 24 ++---
 .../features/util/items/SpeedBauGuiItem.java  | 24 ++---
 .../util/items/TeleportBauGuiItem.java        | 24 ++---
 .../util/items/WorldEditBauGuiItem.java       | 24 ++---
 .../bausystem/features/warp/Warp.java         | 24 ++---
 .../bausystem/features/warp/WarpCommand.java  | 24 ++---
 .../bausystem/features/warp/WarpGui.java      | 24 ++---
 .../bausystem/features/warp/WarpListener.java | 24 ++---
 .../features/world/AFKStopperListener.java    | 24 ++---
 .../features/world/AntiBauAddMemberFix.java   |  2 +-
 .../features/world/AntiCursorReCentering.java |  2 +-
 .../features/world/ArceonCommand.java         |  2 +-
 .../features/world/AxiomPermissionCheck.java  |  2 +-
 .../world/BauLockStateScoreboard.java         |  2 +-
 .../features/world/BauMemberUpdate.java       |  2 +-
 .../features/world/BauScoreboard.java         | 19 ++++
 .../features/world/ClipboardListener.java     | 24 ++---
 .../features/world/InventoryListener.java     | 24 ++---
 .../features/world/ItemFrameListener.java     | 24 ++---
 .../features/world/KickallCommand.java        | 24 ++---
 .../features/world/NoCreativeKnockback.java   | 24 ++---
 .../features/world/OtherTNTListener.java      | 24 ++---
 .../features/world/ReducedDebugInfo.java      | 24 ++---
 .../features/world/RestartCommand.java        | 24 ++---
 .../features/world/SignEditFrom20.java        |  2 +-
 .../features/world/SignEditUntil19.java       | 24 ++---
 .../features/world/SignListener.java          | 24 ++---
 .../features/world/SpectatorListener.java     |  2 +-
 .../bausystem/features/world/StopCommand.java | 24 ++---
 .../features/world/WorldEditListener.java     | 24 ++---
 .../world/WorldEditSelectionSaver.java        |  2 +-
 .../worldedit/ColorReplaceCommand.java        | 24 ++---
 .../features/worldedit/SelectAdjacent.java    | 24 ++---
 .../worldedit/TypeReplaceCommand.java         | 24 ++---
 .../worldedit/mask/above/AboveMask.java       | 24 ++---
 .../mask/above/FAWEAboveMaskParser.java       | 24 ++---
 .../worldedit/mask/below/BelowMask.java       | 24 ++---
 .../mask/below/FAWEBelowMaskParser.java       | 24 ++---
 .../checkerboard3d/Checkerboard3DMask.java    | 24 ++---
 .../FAWECheckerboard3DMaskParser.java         | 24 ++---
 .../FAWECheckerboardMaskParser.java           | 24 ++---
 .../mask/grid/FAWEGridMaskParser.java         | 24 ++---
 .../worldedit/mask/grid/GridMask.java         | 24 ++---
 .../gradient/FAWEGradientPatternParser.java   | 24 ++---
 .../pattern/gradient/GradientPattern.java     | 24 ++---
 .../worldedit/utils/FAWEMaskParser.java       | 24 ++---
 .../worldedit/utils/FAWEPatternParser.java    | 24 ++---
 .../worldedit/utils/SpecialReplace.java       | 24 ++---
 .../bausystem/features/xray/XrayCommand.java  | 24 ++---
 .../linkage/specific/BauGuiItem.java          | 24 ++---
 .../bausystem/linkage/specific/GuiItem.java   | 24 ++---
 .../bausystem/region/BackupScheduler.java     | 19 ++++
 .../bausystem/region/FlagOptional.java        | 24 ++---
 .../bausystem/region/FlagStorage.java         |  2 +-
 .../bausystem/region/GameModeConfig.java      | 24 ++---
 .../de/steamwar/bausystem/region/Point.java   |  2 +-
 .../de/steamwar/bausystem/region/Region.java  |  2 +-
 .../bausystem/region/RegionBackups.java       | 24 ++---
 .../steamwar/bausystem/region/RegionData.java | 24 ++---
 .../bausystem/region/RegionFlagPolicy.java    |  2 +-
 .../bausystem/region/RegionHistory.java       | 24 ++---
 .../bausystem/region/RegionSystem.java        |  2 +-
 .../steamwar/bausystem/region/RegionType.java |  2 +-
 .../bausystem/region/RegionUtils.java         | 19 ++++
 .../bausystem/region/flags/ChangedMode.java   |  2 +-
 .../bausystem/region/flags/ColorMode.java     |  2 +-
 .../bausystem/region/flags/FireMode.java      |  2 +-
 .../steamwar/bausystem/region/flags/Flag.java |  2 +-
 .../bausystem/region/flags/FreezeMode.java    |  2 +-
 .../bausystem/region/flags/ItemMode.java      |  2 +-
 .../bausystem/region/flags/NoGravityMode.java |  2 +-
 .../bausystem/region/flags/ProtectMode.java   |  2 +-
 .../bausystem/region/flags/TNTMode.java       |  2 +-
 .../bausystem/region/flags/TestblockMode.java |  2 +-
 .../region/utils/RegionExtensionType.java     | 19 ++++
 .../bausystem/region/utils/RegionType.java    | 19 ++++
 .../bausystem/shared/EnumDisplay.java         | 19 ++++
 .../de/steamwar/bausystem/shared/Pair.java    | 24 ++---
 .../steamwar/bausystem/shared/Position.java   | 24 ++---
 .../bausystem/shared/ReferenceCounter.java    | 24 ++---
 .../bausystem/shared/RoundedPosition.java     | 24 ++---
 .../steamwar/bausystem/shared/ShowMode.java   | 24 ++---
 .../steamwar/bausystem/shared/SizedStack.java | 24 ++---
 .../bausystem/utils/BauMemberUpdateEvent.java |  2 +-
 .../bausystem/utils/FlatteningWrapper.java    | 24 ++---
 .../steamwar/bausystem/utils/ItemUtils.java   | 24 ++---
 .../bausystem/utils/ListChatView.java         | 24 ++---
 .../steamwar/bausystem/utils/NMSWrapper.java  | 24 ++---
 .../bausystem/utils/PasteBuilder.java         |  2 +-
 .../bausystem/utils/PlaceItemUtils.java       |  2 +-
 .../bausystem/utils/PlaceItemWrapper.java     |  2 +-
 .../utils/PlayerMovementWrapper.java          | 24 ++---
 .../bausystem/utils/RayTraceUtils.java        | 24 ++---
 .../bausystem/utils/ScoreboardElement.java    | 24 ++---
 .../bausystem/utils/TickEndEvent.java         |  2 +-
 .../bausystem/utils/TickListener.java         |  2 +-
 .../bausystem/utils/TickStartEvent.java       |  2 +-
 .../utils/TimeScoreboardElement.java          | 24 ++---
 .../bausystem/utils/WorldEditUtils.java       | 24 ++---
 .../utils/bossbar/BauSystemBossbar.java       | 24 ++---
 .../utils/bossbar/BossBarService.java         | 24 ++---
 .../utils/bossbar/GlobalBossbar.java          | 24 ++---
 .../utils/bossbar/RegionedBossbar.java        | 24 ++---
 .../bausystem/worlddata/SimulatorData.java    | 24 ++---
 .../bausystem/worlddata/WorldData.java        | 24 ++---
 .../BauSystem_RegionFixed/build.gradle.kts    |  2 +-
 .../bausystem/region/FixedRegionSystem.java   |  2 +-
 .../region/fixed/FixedFlagStorage.java        | 24 ++---
 .../region/fixed/FixedGlobalFlagStorage.java  | 24 ++---
 .../region/fixed/FixedGlobalRegion.java       | 24 ++---
 .../bausystem/region/fixed/FixedRegion.java   | 24 ++---
 .../bausystem/region/fixed/Prototype.java     | 24 ++---
 .../region/fixed/loader/PrototypeLoader.java  | 24 ++---
 .../region/fixed/loader/RegionLoader.java     | 24 ++---
 BauSystem/build.gradle.kts                    |  2 +-
 CommandFramework/build.gradle.kts             | 24 ++---
 .../steamwar/command/AbstractSWCommand.java   | 24 ++---
 .../steamwar/command/AbstractTypeMapper.java  | 24 ++---
 .../steamwar/command/AbstractValidator.java   | 24 ++---
 .../command/CommandFrameworkException.java    | 24 ++---
 .../de/steamwar/command/CommandMetaData.java  | 24 ++---
 .../command/CommandParseException.java        | 24 ++---
 .../src/de/steamwar/command/CommandPart.java  | 24 ++---
 .../steamwar/command/PreviousArguments.java   | 24 ++---
 .../de/steamwar/command/SWCommandUtils.java   | 24 ++---
 .../steamwar/command/SWTypeMapperCreator.java | 24 ++---
 .../src/de/steamwar/command/SubCommand.java   | 24 ++---
 .../steamwar/command/TabCompletionCache.java  | 24 ++---
 .../testsrc/de/steamwar/AssertionUtils.java   | 24 ++---
 .../de/steamwar/command/ArgumentCommand.java  | 24 ++---
 .../steamwar/command/ArgumentCommandTest.java | 24 ++---
 .../command/BetterExceptionCommand.java       | 24 ++---
 .../command/BetterExceptionCommandTest.java   | 24 ++---
 .../de/steamwar/command/CacheCommand.java     | 24 ++---
 .../de/steamwar/command/CacheCommandTest.java | 24 ++---
 .../steamwar/command/NullMapperCommand.java   | 24 ++---
 .../command/NullMapperCommandTest.java        | 24 ++---
 .../command/NumberValidatorCommand.java       | 24 ++---
 .../command/NumberValidatorCommandTest.java   | 24 ++---
 .../de/steamwar/command/PartOfCommand.java    | 24 ++---
 .../steamwar/command/PartOfCommandTest.java   | 24 ++---
 .../command/PreviousArgumentCommand.java      | 24 ++---
 .../command/PreviousArgumentCommandTest.java  | 24 ++---
 .../de/steamwar/command/SimpleCommand.java    | 24 ++---
 .../steamwar/command/SimpleCommandTest.java   | 24 ++---
 .../steamwar/command/StaticValueCommand.java  | 24 ++---
 .../command/StaticValueCommandTest.java       | 24 ++---
 .../command/SubCMDSortingCommand.java         | 24 ++---
 .../command/SubCMDSortingCommandTest.java     | 24 ++---
 .../steamwar/command/TypeMapperCommand.java   | 24 ++---
 .../command/TypeMapperCommandTest.java        | 24 ++---
 .../de/steamwar/command/ValidatorCommand.java | 24 ++---
 .../command/ValidatorCommandTest.java         | 24 ++---
 .../command/ValidatorInvertCommand.java       | 24 ++---
 .../command/dto/ExecutionIdentifier.java      | 24 ++---
 .../steamwar/command/dto/TestSWCommand.java   | 24 ++---
 .../steamwar/command/dto/TestTypeMapper.java  | 24 ++---
 .../steamwar/command/dto/TestValidator.java   | 24 ++---
 CommonCore/Data/build.gradle.kts              |  2 +-
 .../Data/src/de/steamwar/data/CMDs.java       | 24 ++---
 CommonCore/Linkage/build.gradle.kts           |  2 +-
 .../de/steamwar/linkage/AbstractLinker.java   | 24 ++---
 .../src/de/steamwar/linkage/EventMode.java    | 24 ++---
 .../src/de/steamwar/linkage/Linked.java       | 24 ++---
 .../de/steamwar/linkage/LinkedInstance.java   | 24 ++---
 .../src/de/steamwar/linkage/MaxVersion.java   | 24 ++---
 .../src/de/steamwar/linkage/MinVersion.java   | 24 ++---
 .../src/de/steamwar/linkage/PluginCheck.java  | 24 ++---
 .../src/de/steamwar/linkage/api/Disable.java  |  2 +-
 .../src/de/steamwar/linkage/api/Enable.java   |  2 +-
 CommonCore/Network/build.gradle.kts           |  2 +-
 .../steamwar/network/packets/MetaInfos.java   | 24 ++---
 .../network/packets/NetworkPacket.java        | 24 ++---
 .../network/packets/PacketHandler.java        | 24 ++---
 .../packets/client/ExecuteCommandPacket.java  | 24 ++---
 .../packets/client/ImALobbyPacket.java        | 24 ++---
 .../client/InventoryCallbackPacket.java       | 24 ++---
 .../packets/client/PrepareSchemPacket.java    | 24 ++---
 .../client/RequestSchematicSearchPacket.java  | 24 ++---
 .../packets/common/FightEndsPacket.java       | 24 ++---
 .../packets/common/FightInfoPacket.java       | 24 ++---
 .../common/PlayerSkinRequestPacket.java       | 24 ++---
 .../common/PlayerSkinResponsePacket.java      | 24 ++---
 .../packets/server/BaumemberUpdatePacket.java | 24 ++---
 .../packets/server/ClientVersionPacket.java   | 24 ++---
 .../packets/server/CloseInventoryPacket.java  | 24 ++---
 .../packets/server/InventoryPacket.java       | 24 ++---
 .../server/LocaleInvalidationPacket.java      | 24 ++---
 .../network/packets/server/PingPacket.java    | 24 ++---
 .../packets/server/StartingServerPacket.java  | 24 ++---
 .../testsrc/de/steamwar/RandomGenerator.java  | 24 ++---
 .../de/steamwar/network/AllPackets.java       | 24 ++---
 .../steamwar/network/PacketHandlerTest.java   | 24 ++---
 .../de/steamwar/network/PacketTest.java       | 24 ++---
 .../de/steamwar/network/TestPacket.java       | 24 ++---
 .../steamwar/network/TestPacketHandler.java   | 24 ++---
 CommonCore/SQL/build.gradle.kts               |  2 +-
 .../de/steamwar/ImplementationProvider.java   | 24 ++---
 .../SQL/src/de/steamwar/sql/AuditLog.java     | 24 ++---
 .../src/de/steamwar/sql/BannedUserIPs.java    | 24 ++---
 .../src/de/steamwar/sql/BauweltMember.java    | 36 +++----
 .../src/de/steamwar/sql/CheckedSchematic.java | 34 +++----
 CommonCore/SQL/src/de/steamwar/sql/Event.java | 36 +++----
 .../SQL/src/de/steamwar/sql/EventFight.java   | 36 +++----
 CommonCore/SQL/src/de/steamwar/sql/Fight.java | 36 +++----
 .../SQL/src/de/steamwar/sql/FightPlayer.java  | 36 +++----
 .../SQL/src/de/steamwar/sql/IgnoreSystem.java | 24 ++---
 CommonCore/SQL/src/de/steamwar/sql/Mod.java   |  2 +-
 .../de/steamwar/sql/NoClipboardException.java | 36 +++----
 .../SQL/src/de/steamwar/sql/NodeData.java     | 24 ++---
 .../SQL/src/de/steamwar/sql/NodeDownload.java | 24 ++---
 .../SQL/src/de/steamwar/sql/NodeMember.java   | 24 ++---
 .../SQL/src/de/steamwar/sql/PollAnswer.java   | 24 ++---
 .../SQL/src/de/steamwar/sql/Punishment.java   |  2 +-
 .../SQL/src/de/steamwar/sql/Referee.java      |  2 +-
 .../SQL/src/de/steamwar/sql/SQLWrapper.java   | 24 ++---
 .../SQL/src/de/steamwar/sql/SWException.java  | 24 ++---
 .../SQL/src/de/steamwar/sql/SchemElo.java     | 24 ++---
 .../src/de/steamwar/sql/SchematicNode.java    | 24 ++---
 .../src/de/steamwar/sql/SchematicType.java    | 36 +++----
 .../SQL/src/de/steamwar/sql/Script.java       | 24 ++---
 .../SQL/src/de/steamwar/sql/Season.java       | 24 ++---
 .../SQL/src/de/steamwar/sql/Session.java      | 24 ++---
 .../SQL/src/de/steamwar/sql/SteamwarUser.java | 24 ++---
 CommonCore/SQL/src/de/steamwar/sql/Team.java  | 36 +++----
 .../src/de/steamwar/sql/TeamTeilnahme.java    | 24 ++---
 CommonCore/SQL/src/de/steamwar/sql/Token.java |  2 +-
 .../SQL/src/de/steamwar/sql/UserConfig.java   | 24 ++---
 .../SQL/src/de/steamwar/sql/UserElo.java      | 24 ++---
 .../SQL/src/de/steamwar/sql/UserPerm.java     |  2 +-
 .../src/de/steamwar/sql/internal/Field.java   | 24 ++---
 .../de/steamwar/sql/internal/SQLConfig.java   | 24 ++---
 .../sql/internal/SelectStatement.java         | 24 ++---
 .../steamwar/sql/internal/SqlTypeMapper.java  | 24 ++---
 .../de/steamwar/sql/internal/Statement.java   | 24 ++---
 .../src/de/steamwar/sql/internal/Table.java   | 24 ++---
 CommonCore/build.gradle.kts                   | 24 ++---
 FightSystem/FightSystem_10/build.gradle.kts   |  2 +-
 .../utils/CraftbukkitWrapper10.java           | 32 +++----
 FightSystem/FightSystem_12/build.gradle.kts   |  2 +-
 .../utils/CraftbukkitWrapper12.java           | 32 +++----
 .../utils/WorldOfColorWrapper12.java          | 32 +++----
 .../fightsystem/utils/WorldeditWrapper12.java | 32 +++----
 FightSystem/FightSystem_14/build.gradle.kts   |  2 +-
 .../fightsystem/utils/BlockIdWrapper14.java   | 32 +++----
 .../utils/CraftbukkitWrapper14.java           | 32 +++----
 .../utils/FlatteningWrapper14.java            | 32 +++----
 .../steamwar/fightsystem/utils/SWSound14.java | 32 +++----
 .../fightsystem/utils/WorldeditWrapper14.java | 32 +++----
 FightSystem/FightSystem_15/build.gradle.kts   |  2 +-
 .../utils/CraftbukkitWrapper15.java           | 32 +++----
 FightSystem/FightSystem_18/build.gradle.kts   |  2 +-
 .../fightsystem/utils/BlockIdWrapper18.java   | 24 ++---
 .../utils/CraftbukkitWrapper18.java           | 32 +++----
 .../fightsystem/utils/HullHiderWrapper18.java |  2 +-
 FightSystem/FightSystem_19/build.gradle.kts   |  2 +-
 .../utils/CraftbukkitWrapper19.java           | 32 +++----
 FightSystem/FightSystem_20/build.gradle.kts   |  2 +-
 .../utils/CraftbukkitWrapper20.java           | 32 +++----
 .../fightsystem/utils/HullHiderWrapper20.java |  2 +-
 FightSystem/FightSystem_21/build.gradle.kts   |  2 +-
 .../utils/CraftbukkitWrapper21.java           |  2 +-
 FightSystem/FightSystem_8/build.gradle.kts    |  2 +-
 .../fightsystem/utils/BlockIdWrapper8.java    | 32 +++----
 .../fightsystem/utils/BountifulWrapper8.java  | 32 +++----
 .../utils/CraftbukkitWrapper8.java            | 32 +++----
 .../fightsystem/utils/FlatteningWrapper8.java | 32 +++----
 .../fightsystem/utils/HullHiderWrapper8.java  |  2 +-
 .../steamwar/fightsystem/utils/SWSound8.java  | 32 +++----
 .../utils/WorldOfColorWrapper8.java           | 32 +++----
 .../fightsystem/utils/WorldeditWrapper8.java  | 32 +++----
 FightSystem/FightSystem_9/build.gradle.kts    |  2 +-
 .../fightsystem/utils/BountifulWrapper9.java  | 32 +++----
 .../utils/CraftbukkitWrapper9.java            | 32 +++----
 .../steamwar/fightsystem/utils/SWSound9.java  | 32 +++----
 FightSystem/FightSystem_Core/build.gradle.kts |  2 +-
 .../de/steamwar/fightsystem/ArenaMode.java    | 32 +++----
 .../src/de/steamwar/fightsystem/Config.java   | 32 +++----
 .../de/steamwar/fightsystem/FightSystem.java  | 36 +++----
 .../fightsystem/FightSystem.properties        | 24 ++---
 .../fightsystem/FightSystem_de.properties     | 24 ++---
 .../src/de/steamwar/fightsystem/ai/AI.java    |  2 +-
 .../de/steamwar/fightsystem/ai/AIManager.java |  2 +-
 .../de/steamwar/fightsystem/ai/DummyAI.java   |  2 +-
 .../fightsystem/commands/AkCommand.java       | 36 +++----
 .../fightsystem/commands/Commands.java        | 36 +++----
 .../de/steamwar/fightsystem/commands/GUI.java | 36 +++----
 .../fightsystem/commands/GamemodeCommand.java | 36 +++----
 .../fightsystem/commands/InfoCommand.java     |  2 +-
 .../fightsystem/commands/KitCommand.java      | 36 +++----
 .../fightsystem/commands/LeaveCommand.java    | 36 +++----
 .../commands/LockschemCommand.java            | 36 +++----
 .../fightsystem/commands/ReadyCommand.java    | 36 +++----
 .../fightsystem/commands/RemoveCommand.java   | 36 +++----
 .../fightsystem/commands/RequestsCommand.java | 36 +++----
 .../fightsystem/commands/SkipCommand.java     | 34 +++----
 .../fightsystem/commands/StateCommand.java    | 34 +++----
 .../fightsystem/commands/TBCommand.java       | 24 ++---
 .../fightsystem/commands/TPSWarpCommand.java  |  2 +-
 .../commands/TechhiderbugCommand.java         | 24 ++---
 .../fightsystem/commands/UnrankCommand.java   | 32 +++----
 .../fightsystem/commands/WGCommand.java       | 24 ++---
 .../fightsystem/commands/WinCommand.java      | 19 ++++
 .../fightsystem/countdown/Countdown.java      | 36 +++----
 .../countdown/EnternCountdown.java            | 36 +++----
 .../countdown/EventSpectateCountdown.java     | 36 +++----
 .../countdown/NoPlayersOnlineCountdown.java   | 36 +++----
 .../countdown/PostSchemCountdown.java         | 36 +++----
 .../countdown/PreRunningCountdown.java        | 36 +++----
 .../countdown/PreSchemCountdown.java          | 36 +++----
 .../countdown/SpectateOverCountdown.java      | 36 +++----
 .../countdown/TimeOverCountdown.java          | 36 +++----
 .../fightsystem/event/HellsBells.java         | 34 +++----
 .../de/steamwar/fightsystem/event/Meteor.java | 34 +++----
 .../steamwar/fightsystem/event/NoGravity.java | 24 ++---
 .../fightsystem/event/PersistentDamage.java   |  2 +-
 .../de/steamwar/fightsystem/event/Point.java  | 24 ++---
 .../fightsystem/event/TNTDistributor.java     |  2 +-
 .../fightsystem/events/BoardingEvent.java     |  2 +-
 .../fightsystem/events/TeamDeathEvent.java    |  2 +-
 .../fightsystem/events/TeamLeaveEvent.java    |  2 +-
 .../fightsystem/events/TeamSpawnEvent.java    |  2 +-
 .../de/steamwar/fightsystem/fight/Fight.java  | 36 +++----
 .../fightsystem/fight/FightPlayer.java        | 36 +++----
 .../fightsystem/fight/FightSchematic.java     | 34 +++----
 .../steamwar/fightsystem/fight/FightTeam.java | 36 +++----
 .../fightsystem/fight/FightWorld.java         | 34 +++----
 .../fightsystem/fight/FreezeWorld.java        | 34 +++----
 .../steamwar/fightsystem/fight/HotbarKit.java | 32 +++----
 .../fightsystem/fight/HotbarKitListener.java  | 24 ++---
 .../fightsystem/fight/JoinRequest.java        | 32 +++----
 .../de/steamwar/fightsystem/fight/Kit.java    | 36 +++----
 .../fightsystem/listener/ArenaBorder.java     | 36 +++----
 .../fightsystem/listener/ArrowStopper.java    | 32 +++----
 .../listener/BlockFadeListener.java           | 19 ++++
 .../listener/BlockPlaceCollision.java         | 32 +++----
 .../steamwar/fightsystem/listener/Border.java |  2 +-
 .../steamwar/fightsystem/listener/Chat.java   | 36 +++----
 .../steamwar/fightsystem/listener/Check.java  | 36 +++----
 .../fightsystem/listener/ClickAnalyzer.java   | 32 +++----
 .../listener/DenyInventoryMovement.java       | 32 +++----
 .../listener/DenyWorldInteraction.java        | 36 +++----
 .../fightsystem/listener/EntityDamage.java    | 36 +++----
 .../fightsystem/listener/EventJoin.java       | 36 +++----
 .../fightsystem/listener/FightScoreboard.java | 36 +++----
 .../fightsystem/listener/InFightDamage.java   | 36 +++----
 .../listener/InFightInventory.java            | 36 +++----
 .../fightsystem/listener/IngameDeath.java     | 36 +++----
 .../listener/JoinRequestListener.java         | 32 +++----
 .../fightsystem/listener/LeaveableArena.java  | 32 +++----
 .../fightsystem/listener/NormalJoin.java      | 36 +++----
 .../fightsystem/listener/Permanent.java       | 36 +++----
 .../listener/PersonalKitCreator.java          | 36 +++----
 .../fightsystem/listener/PistonListener.java  | 36 +++----
 .../fightsystem/listener/PrepareSchem.java    | 34 +++----
 .../fightsystem/listener/Recording.java       | 34 +++----
 .../listener/RunningWorldInteraction.java     | 32 +++----
 .../fightsystem/listener/SetupQuit.java       | 34 +++----
 .../fightsystem/listener/Shutdown.java        | 34 +++----
 .../fightsystem/listener/Spectator.java       | 24 ++---
 .../fightsystem/listener/TeamArea.java        | 34 +++----
 .../fightsystem/listener/TestJoin.java        | 36 +++----
 .../fightsystem/listener/WaterRemover.java    | 36 +++----
 .../fightsystem/record/FileRecorder.java      | 34 +++----
 .../fightsystem/record/FileSource.java        | 34 +++----
 .../fightsystem/record/GlobalRecorder.java    | 34 +++----
 .../fightsystem/record/LiveRecorder.java      | 34 +++----
 .../fightsystem/record/LiveServer.java        | 34 +++----
 .../fightsystem/record/LiveSource.java        | 34 +++----
 .../fightsystem/record/PacketProcessor.java   | 34 +++----
 .../fightsystem/record/PacketSource.java      | 34 +++----
 .../steamwar/fightsystem/record/Recorder.java | 34 +++----
 .../fightsystem/states/FightState.java        | 36 +++----
 .../fightsystem/states/IStateDependent.java   | 36 +++----
 .../states/OneShotStateDependent.java         | 34 +++----
 .../fightsystem/states/StateDependent.java    | 34 +++----
 .../states/StateDependentCommand.java         | 34 +++----
 .../states/StateDependentCountdown.java       | 34 +++----
 .../states/StateDependentListener.java        | 34 +++----
 .../states/StateDependentTask.java            | 34 +++----
 .../fightsystem/utils/BlockIdWrapper.java     | 32 +++----
 .../fightsystem/utils/BountifulWrapper.java   | 32 +++----
 .../fightsystem/utils/BungeeFightInfo.java    | 32 +++----
 .../fightsystem/utils/ColorConverter.java     | 36 +++----
 .../fightsystem/utils/CraftbukkitWrapper.java | 32 +++----
 .../fightsystem/utils/EnterHandler.java       | 36 +++----
 .../fightsystem/utils/FightStatistics.java    | 36 +++----
 .../steamwar/fightsystem/utils/FightUI.java   | 32 +++----
 .../fightsystem/utils/FlatteningWrapper.java  | 32 +++----
 .../de/steamwar/fightsystem/utils/Hull.java   |  2 +-
 .../steamwar/fightsystem/utils/HullHider.java | 32 +++----
 .../fightsystem/utils/HullHiderWrapper.java   |  2 +-
 .../fightsystem/utils/ItemBuilder.java        | 36 +++----
 .../steamwar/fightsystem/utils/Message.java   | 32 +++----
 .../de/steamwar/fightsystem/utils/Region.java | 32 +++----
 .../steamwar/fightsystem/utils/SWSound.java   | 32 +++----
 .../fightsystem/utils/TechHiderWrapper.java   | 32 +++----
 .../utils/WorldOfColorWrapper.java            | 32 +++----
 .../fightsystem/utils/WorldeditWrapper.java   | 32 +++----
 .../EventTeamOffWincondition.java             | 36 +++----
 .../winconditions/PrintableWincondition.java  | 34 +++----
 .../winconditions/Wincondition.java           | 36 +++----
 .../winconditions/WinconditionAllDead.java    | 36 +++----
 .../winconditions/WinconditionAmongUs.java    | 24 ++---
 .../WinconditionBasePercent.java              | 34 +++----
 .../winconditions/WinconditionBlocks.java     | 36 +++----
 .../WinconditionCaptainDead.java              | 36 +++----
 .../WinconditionComparisonTimeout.java        | 34 +++----
 .../WinconditionHearthRatioTimeout.java       | 24 ++---
 .../winconditions/WinconditionPercent.java    | 24 ++---
 .../WinconditionPercentTimeout.java           | 24 ++---
 .../winconditions/WinconditionPoints.java     | 36 +++----
 .../WinconditionPointsAirShip.java            | 24 ++---
 .../WinconditionPumkinTechKO.java             | 24 ++---
 .../winconditions/WinconditionTimeTechKO.java | 36 +++----
 .../WinconditionTimedDamageTechKO.java        | 24 ++---
 .../winconditions/WinconditionTimeout.java    | 36 +++----
 .../WinconditionWaterTechKO.java              | 24 ++---
 .../winconditions/Winconditions.java          | 32 +++----
 .../FightSystem_Standalone/build.gradle.kts   |  2 +-
 FightSystem/build.gradle.kts                  |  2 +-
 KotlinCore/build.gradle.kts                   |  2 +-
 .../src/de/steamwar/kotlin/KotlinCore.kt      |  2 +-
 .../src/de/steamwar/kotlin/util/Area.kt       |  2 +-
 LegacyBauSystem/build.gradle.kts              |  2 +-
 .../src/de/steamwar/bausystem/BauSystem.java  | 36 +++----
 .../bausystem/CraftbukkitWrapper.java         | 24 ++---
 .../bausystem/CraftbukkitWrapper12.java       | 24 ++---
 .../steamwar/bausystem/FlatteningWrapper.java | 24 ++---
 .../bausystem/FlatteningWrapper12.java        | 24 ++---
 .../src/de/steamwar/bausystem/Mapper.java     | 24 ++---
 .../src/de/steamwar/bausystem/Permission.java | 36 +++----
 .../src/de/steamwar/bausystem/RamUsage.java   | 24 ++---
 .../src/de/steamwar/bausystem/SWUtils.java    | 24 ++---
 .../de/steamwar/bausystem/TraceEntity12.java  | 24 ++---
 .../steamwar/bausystem/WorldeditWrapper.java  | 24 ++---
 .../bausystem/WorldeditWrapper12.java         | 24 ++---
 .../bausystem/commands/CommandClear.java      | 24 ++---
 .../bausystem/commands/CommandColor.java      | 19 ++++
 .../bausystem/commands/CommandDebugStick.java | 24 ++---
 .../bausystem/commands/CommandDetonator.java  | 24 ++---
 .../bausystem/commands/CommandFire.java       | 36 +++----
 .../bausystem/commands/CommandFreeze.java     | 34 +++----
 .../bausystem/commands/CommandGUI.java        | 24 ++---
 .../bausystem/commands/CommandGamemode.java   | 24 ++---
 .../bausystem/commands/CommandGills.java      | 36 +++----
 .../bausystem/commands/CommandInfo.java       | 36 +++----
 .../bausystem/commands/CommandKillAll.java    | 24 ++---
 .../bausystem/commands/CommandLoader.java     | 36 +++----
 .../bausystem/commands/CommandLockschem.java  | 36 +++----
 .../bausystem/commands/CommandNV.java         | 36 +++----
 .../bausystem/commands/CommandProtect.java    | 36 +++----
 .../commands/CommandRedstoneTester.java       | 24 ++---
 .../bausystem/commands/CommandRegion.java     | 19 ++++
 .../bausystem/commands/CommandReset.java      | 36 +++----
 .../bausystem/commands/CommandScript.java     | 26 +++--
 .../bausystem/commands/CommandScriptVars.java | 24 ++---
 .../bausystem/commands/CommandSelect.java     | 19 ++++
 .../bausystem/commands/CommandSkull.java      | 36 +++----
 .../bausystem/commands/CommandSpeed.java      | 36 +++----
 .../bausystem/commands/CommandTNT.java        | 36 +++----
 .../bausystem/commands/CommandTPSLimiter.java | 34 +++----
 .../bausystem/commands/CommandTeleport.java   | 24 ++---
 .../bausystem/commands/CommandTestblock.java  | 36 +++----
 .../bausystem/commands/CommandTime.java       | 24 ++---
 .../bausystem/commands/CommandTrace.java      | 36 +++----
 .../bausystem/commands/CommandWorldSpawn.java | 24 ++---
 .../bausystem/commands/RegionUtils.java       | 24 ++---
 .../steamwar/bausystem/gui/GuiTraceShow.java  | 26 +++--
 .../bausystem/tracer/AbstractTraceEntity.java | 34 +++----
 .../bausystem/tracer/RoundedTNTPosition.java  | 26 +++--
 .../bausystem/tracer/TNTPosition.java         | 34 +++----
 .../tracer/record/RecordStateMachine.java     | 34 +++----
 .../bausystem/tracer/record/RecordStatus.java | 34 +++----
 .../bausystem/tracer/record/Recorder.java     | 34 +++----
 .../tracer/record/TraceAutoHandler.java       | 34 +++----
 .../bausystem/tracer/show/Record.java         | 34 +++----
 .../bausystem/tracer/show/ShowMode.java       | 34 +++----
 .../tracer/show/ShowModeParameter.java        | 26 +++--
 .../tracer/show/ShowModeParameterType.java    | 24 ++---
 .../bausystem/tracer/show/StoredRecords.java  | 34 +++----
 .../tracer/show/TraceShowManager.java         | 19 ++++
 .../tracer/show/mode/EntityShowMode.java      | 26 +++--
 .../steamwar/bausystem/world/AFKStopper.java  | 36 +++----
 .../bausystem/world/AbstractAutoLoader.java   | 36 +++----
 .../steamwar/bausystem/world/AutoLoader.java  | 36 +++----
 .../bausystem/world/BauScoreboard.java        | 36 +++----
 .../bausystem/world/ClipboardListener.java    | 34 +++----
 .../de/steamwar/bausystem/world/Color.java    | 24 ++---
 .../steamwar/bausystem/world/Detoloader.java  | 34 +++----
 .../steamwar/bausystem/world/Detonator.java   | 34 +++----
 .../bausystem/world/DetonatorListener.java    | 19 ++++
 .../bausystem/world/ItemFrameListener.java    | 24 ++---
 .../bausystem/world/PredefinedBook.java       | 19 ++++
 .../bausystem/world/RegionListener.java       | 36 +++----
 .../bausystem/world/ScriptListener.java       | 34 +++----
 .../steamwar/bausystem/world/SizedStack.java  | 19 ++++
 .../de/steamwar/bausystem/world/TPSUtils.java | 25 +++--
 .../src/de/steamwar/bausystem/world/Welt.java | 36 +++----
 .../bausystem/world/regions/GlobalRegion.java | 24 ++---
 .../bausystem/world/regions/PasteOptions.java | 24 ++---
 .../bausystem/world/regions/Point.java        | 24 ++---
 .../bausystem/world/regions/Prototype.java    | 24 ++---
 .../bausystem/world/regions/Region.java       | 24 ++---
 .../world/regions/RegionExtensionType.java    | 24 ++---
 .../world/regions/RegionSelectionType.java    | 24 ++---
 .../bausystem/world/regions/RegionType.java   | 24 ++---
 LobbySystem/build.gradle.kts                  |  2 +-
 LobbySystem/src/de/steamwar/lobby/Config.java | 24 ++---
 .../src/de/steamwar/lobby/Fightserver.java    | 24 ++---
 .../de/steamwar/lobby/LobbyPacketHandler.java | 24 ++---
 .../src/de/steamwar/lobby/LobbySystem.java    | 24 ++---
 .../de/steamwar/lobby/LobbySystem.properties  | 19 ++++
 .../steamwar/lobby/LobbySystem_de.properties  | 19 ++++
 .../de/steamwar/lobby/boatrace/BoatRace.java  | 19 ++++
 .../lobby/boatrace/BoatRacePositions.java     | 19 ++++
 .../de/steamwar/lobby/command/FlyCommand.java | 24 ++---
 .../lobby/command/HologramCommand.java        | 24 ++---
 .../steamwar/lobby/command/ModifyCommand.java | 24 ++---
 .../steamwar/lobby/command/PortalCommand.java | 19 ++++
 .../de/steamwar/lobby/display/Hologram.java   | 24 ++---
 .../src/de/steamwar/lobby/display/NPC.java    | 24 ++---
 .../steamwar/lobby/jumpandrun/JumpAndRun.java | 19 ++++
 .../lobby/jumpandrun/JumpAndRunCommand.java   | 19 ++++
 .../de/steamwar/lobby/listener/AlphaWall.java | 24 ++---
 .../lobby/listener/DoubleJumpListener.java    | 24 ++---
 .../lobby/listener/InventoryInteraction.java  | 24 ++---
 .../lobby/listener/MapsRotateListener.java    | 24 ++---
 .../lobby/listener/PlayerSeatListener.java    | 24 ++---
 .../steamwar/lobby/listener/PlayerSpawn.java  | 24 ++---
 .../de/steamwar/lobby/listener/Portals.java   | 24 ++---
 .../lobby/listener/TeleporterListener.java    | 24 ++---
 .../lobby/listener/WorldInteraction.java      | 24 ++---
 .../src/de/steamwar/lobby/map/ColorInit.java  | 19 ++++
 .../src/de/steamwar/lobby/map/CustomMap.java  |  2 +-
 .../de/steamwar/lobby/particle/Gradient.java  | 24 ++---
 .../steamwar/lobby/particle/ParticleData.java | 19 ++++
 .../lobby/particle/ParticleElement.java       | 19 ++++
 .../steamwar/lobby/particle/ParticleEnum.java | 19 ++++
 .../lobby/particle/ParticleInventory.java     | 19 ++++
 .../lobby/particle/ParticleListener.java      | 24 ++---
 .../lobby/particle/ParticleRequirement.java   | 19 ++++
 .../lobby/particle/ParticleTickData.java      | 19 ++++
 .../lobby/particle/ParticleTickType.java      | 19 ++++
 .../steamwar/lobby/particle/WingDesign.java   | 19 ++++
 .../lobby/particle/elements/Always.java       | 19 ++++
 .../lobby/particle/elements/Circle.java       | 19 ++++
 .../lobby/particle/elements/Cloud.java        | 19 ++++
 .../lobby/particle/elements/Delayed.java      | 19 ++++
 .../elements/DelegatingParticleElement.java   | 19 ++++
 .../lobby/particle/elements/DoubleCircle.java | 19 ++++
 .../lobby/particle/elements/DustParticle.java | 19 ++++
 .../lobby/particle/elements/Floor.java        | 19 ++++
 .../lobby/particle/elements/Flying.java       | 19 ++++
 .../lobby/particle/elements/Group.java        | 19 ++++
 .../particle/elements/LocationMutator.java    | 19 ++++
 .../lobby/particle/elements/NonFloor.java     | 19 ++++
 .../lobby/particle/elements/NonFlying.java    | 19 ++++
 .../lobby/particle/elements/None.java         | 24 ++---
 .../lobby/particle/elements/OnlyOthers.java   | 19 ++++
 .../lobby/particle/elements/OnlySelf.java     | 19 ++++
 .../particle/elements/RandomParticle.java     | 19 ++++
 .../lobby/particle/elements/Separator.java    | 19 ++++
 .../particle/elements/SimpleParticle.java     | 19 ++++
 .../lobby/particle/elements/Sneaking.java     | 19 ++++
 .../particle/elements/TrippleCircle.java      | 19 ++++
 .../lobby/particle/elements/Wing.java         | 19 ++++
 .../particle/elements/custom/HearthBeat.java  | 19 ++++
 .../particle/elements/custom/NonMoving.java   | 19 ++++
 .../elements/custom/PulseShimmer.java         | 19 ++++
 .../particle/elements/custom/YOffset.java     | 19 ++++
 .../particle/particles/EasterParticle.java    | 19 ++++
 .../particle/particles/EventParticle.java     | 19 ++++
 .../particles/EventParticleParticipation.java | 19 ++++
 .../particles/EventParticlePlacement.java     | 19 ++++
 .../particle/particles/PlayerParticle.java    | 19 ++++
 .../particle/particles/RainCloudParticle.java | 19 ++++
 .../particles/ServerTeamParticle.java         | 19 ++++
 .../particle/particles/TeamParticle.java      | 19 ++++
 .../custom/CustomEasterParticle.java          | 19 ++++
 .../custom/CustomPlayerParticle.java          | 19 ++++
 .../particles/custom/CustomTeamParticle.java  | 19 ++++
 .../steamwar/lobby/portal/CommandPortal.java  | 24 ++---
 .../de/steamwar/lobby/portal/DummyPortal.java | 24 ++---
 .../lobby/portal/FightserverPortal.java       | 24 ++---
 .../src/de/steamwar/lobby/portal/Portal.java  | 24 ++---
 .../steamwar/lobby/portal/PortalHandler.java  | 24 ++---
 .../de/steamwar/lobby/portal/PortalType.java  | 24 ++---
 .../de/steamwar/lobby/portal/StackPortal.java | 24 ++---
 .../steamwar/lobby/portal/TeleportPortal.java | 24 ++---
 .../lobby/special/advent/AdventCommand.java   |  2 +-
 .../lobby/special/advent/AdventListener.java  |  2 +-
 .../lobby/special/advent/AdventsCalendar.java |  2 +-
 .../lobby/special/advent/Present.java         |  2 +-
 .../special/advent/PresentClickListener.java  |  2 +-
 .../de/steamwar/lobby/special/easter/Egg.java | 19 ++++
 .../special/easter/EggClickListener.java      | 19 ++++
 .../lobby/special/easter/EggDifficulty.java   | 19 ++++
 .../lobby/special/easter/EggHunt.java         | 19 ++++
 .../lobby/special/easter/EggHuntCommand.java  | 19 ++++
 .../lobby/special/easter/EggHuntListener.java | 19 ++++
 .../de/steamwar/lobby/team/TeamPlayer.java    | 24 ++---
 .../de/steamwar/lobby/util/ItemBuilder.java   | 24 ++---
 .../de/steamwar/lobby/util/Leaderboard.java   | 19 ++++
 .../de/steamwar/lobby/util/LobbyPlayer.java   | 24 ++---
 MissileWars/build.gradle.kts                  |  2 +-
 .../src/de/steamwar/misslewars/Config.java    | 36 +++----
 .../misslewars/FightInfoPacketSender.java     | 26 +++--
 .../steamwar/misslewars/FightScoreboard.java  | 36 +++----
 .../de/steamwar/misslewars/FightState.java    | 36 +++----
 .../de/steamwar/misslewars/FightWorld.java    | 26 +++--
 .../src/de/steamwar/misslewars/MWTeam.java    | 36 +++----
 .../de/steamwar/misslewars/MissileWars.java   | 36 +++----
 .../misslewars/SpawnPlatformCreator.java      | 36 +++----
 .../steamwar/misslewars/StateDependent.java   | 36 +++----
 .../de/steamwar/misslewars/WinReasons.java    | 36 +++----
 .../misslewars/commands/AcceptCommand.java    | 25 +++--
 .../misslewars/commands/DeclineCommand.java   | 25 +++--
 .../misslewars/commands/InviteCommand.java    | 25 +++--
 .../misslewars/commands/SpectateCommand.java  | 25 +++--
 .../misslewars/countdowns/EndCountdown.java   | 36 +++----
 .../misslewars/countdowns/ItemCountdown.java  | 36 +++----
 .../countdowns/WaitingCountdown.java          | 36 +++----
 .../steamwar/misslewars/items/CustomItem.java | 34 +++----
 .../de/steamwar/misslewars/items/Missile.java | 36 +++----
 .../misslewars/items/SpecialItem.java         | 36 +++----
 .../misslewars/listener/ArenaListener.java    | 36 +++----
 .../misslewars/listener/BasicListener.java    | 36 +++----
 .../misslewars/listener/BreakListener.java    | 26 +++--
 .../misslewars/listener/ChatListener.java     | 36 +++----
 .../listener/ConnectionListener.java          | 36 +++----
 .../misslewars/listener/DeathListener.java    | 36 +++----
 .../misslewars/listener/EndListener.java      | 36 +++----
 .../misslewars/listener/FightListener.java    | 36 +++----
 .../misslewars/listener/ItemListener.java     | 36 +++----
 .../misslewars/listener/JoinListener.java     | 36 +++----
 .../listener/PortalDestructListener.java      | 36 +++----
 .../misslewars/listener/WaitingListener.java  | 36 +++----
 .../listener/special/BarrierListener.java     | 26 +++--
 .../listener/special/SpaceListener.java       | 26 +++--
 .../misslewars/scripts/RunnableScript.java    | 34 +++----
 .../scripts/RunnableScriptEvent.java          | 34 +++----
 .../steamwar/misslewars/scripts/Script.java   | 34 +++----
 .../misslewars/scripts/ScriptedItem.java      | 34 +++----
 .../scripts/implemented/CooldownScript.java   | 19 ++++
 .../scripts/implemented/DelayScript.java      | 34 +++----
 .../scripts/implemented/FilterScript.java     | 34 +++----
 .../scripts/implemented/LaunchScript.java     | 34 +++----
 .../scripts/implemented/LocationScript.java   | 34 +++----
 .../scripts/implemented/PasteScript.java      | 34 +++----
 .../scripts/implemented/PotionScript.java     | 34 +++----
 .../implemented/RandomPlayerScript.java       | 26 +++--
 .../scripts/implemented/RemoveScript.java     | 34 +++----
 .../scripts/implemented/SlowMoScript.java     | 26 +++--
 .../scripts/implemented/SoundScript.java      | 34 +++----
 .../scripts/implemented/SummonScript.java     | 34 +++----
 .../misslewars/scripts/utils/EntityUtils.java | 34 +++----
 .../misslewars/scripts/utils/JsonUtils.java   | 19 ++++
 .../misslewars/slowmo/SlowMoRunner.java       | 26 +++--
 .../misslewars/slowmo/SlowMoUtils.java        | 26 +++--
 Realtime/build.gradle.kts                     |  2 +-
 Realtime/src/de/steamwar/realtime/Config.java | 36 +++----
 .../src/de/steamwar/realtime/Realtime.java    | 36 +++----
 .../SchematicSystem_15/build.gradle.kts       |  2 +-
 .../autocheck/AutoChecker15.java              | 32 +++----
 .../autocheck/AutoCheckerItems15.java         | 24 ++---
 .../schematiccommand/SchematicCommand15.java  | 32 +++----
 .../SchematicSystem_19/build.gradle.kts       |  2 +-
 .../autocheck/AutoCheckerItems19.java         | 24 ++---
 .../SchematicSystem_8/build.gradle.kts        |  2 +-
 .../autocheck/AutoChecker8.java               | 32 +++----
 .../schematiccommand/SchematicCommand8.java   | 32 +++----
 .../SchematicSystem_Core/build.gradle.kts     |  2 +-
 .../src/SchematicSystem.properties            |  2 +-
 .../src/SchematicSystem_de.properties         |  2 +-
 .../schematicsystem/CheckSchemType.java       | 36 +++----
 .../schematicsystem/SafeSchematicNode.java    | 32 +++----
 .../schematicsystem/SchematicSystem.java      | 32 +++----
 .../autocheck/AutoChecker.java                | 32 +++----
 .../autocheck/AutoCheckerItems.java           | 24 ++---
 .../autocheck/AutoCheckerResult.java          | 32 +++----
 .../schematicsystem/autocheck/BlockPos.java   | 34 +++----
 .../commands/DownloadCommand.java             | 32 +++----
 .../commands/schematiccommand/GUI.java        | 32 +++----
 .../schematiccommand/SchematicCommand.java    | 32 +++----
 .../SchematicCommandHelp.java                 | 32 +++----
 .../SchematicCommandUtils.java                | 32 +++----
 .../schematiccommand/SchematicMapper.java     | 32 +++----
 .../schematiccommand/SchematicValidator.java  | 32 +++----
 .../schematiccommand/parts/CheckPart.java     | 32 +++----
 .../schematiccommand/parts/MemberPart.java    | 32 +++----
 .../schematiccommand/parts/ModifyPart.java    | 32 +++----
 .../schematiccommand/parts/SavePart.java      | 32 +++----
 .../schematiccommand/parts/SearchPart.java    | 32 +++----
 .../schematiccommand/parts/ViewPart.java      | 32 +++----
 .../listener/PlayerEventListener.java         | 32 +++----
 SchematicSystem/build.gradle.kts              |  2 +-
 SpigotCore/CRIUDummy/build.gradle.kts         |  2 +-
 .../org/eclipse/openj9/criu/CRIUSupport.java  |  2 +-
 .../eclipse/openj9/criu/JVMCRIUException.java |  2 +-
 SpigotCore/SpigotCore_10/build.gradle.kts     |  2 +-
 SpigotCore/SpigotCore_12/build.gradle.kts     |  2 +-
 .../steamwar/core/LocaleChangeWrapper12.java  | 24 ++---
 SpigotCore/SpigotCore_14/build.gradle.kts     |  2 +-
 .../de/steamwar/core/FlatteningWrapper14.java | 34 +++----
 .../core/RecipeDiscoverWrapper14.java         | 24 ++---
 .../steamwar/core/TrickyTrialsWrapper14.java  |  2 +-
 .../de/steamwar/core/WorldEditWrapper14.java  |  2 +-
 .../src/de/steamwar/techhider/BlockIds14.java | 32 +++----
 .../de/steamwar/techhider/ChunkHider14.java   | 32 +++----
 .../steamwar/techhider/ProtocolWrapper14.java | 32 +++----
 SpigotCore/SpigotCore_15/build.gradle.kts     |  2 +-
 SpigotCore/SpigotCore_18/build.gradle.kts     |  2 +-
 .../steamwar/core/CraftbukkitWrapper18.java   | 34 +++----
 .../de/steamwar/core/ProtocolWrapper18.java   | 24 ++---
 .../de/steamwar/core/WorldEditWrapper18.java  | 24 ++---
 .../de/steamwar/techhider/ChunkHider18.java   | 32 +++----
 .../steamwar/techhider/ProtocolWrapper18.java | 32 +++----
 SpigotCore/SpigotCore_19/build.gradle.kts     |  2 +-
 .../src/de/steamwar/core/ChatWrapper19.java   | 24 ++---
 .../de/steamwar/core/ProtocolWrapper19.java   | 24 ++---
 .../steamwar/techhider/ProtocolWrapper19.java | 32 +++----
 SpigotCore/SpigotCore_20/build.gradle.kts     |  2 +-
 .../steamwar/core/CraftbukkitWrapper20.java   | 34 +++----
 .../core/WorldEditRendererWrapper20.java      | 24 ++---
 SpigotCore/SpigotCore_21/build.gradle.kts     |  2 +-
 .../de/steamwar/core/BountifulWrapper21.java  |  2 +-
 .../src/de/steamwar/core/ChatWrapper21.java   |  2 +-
 .../steamwar/core/CraftbukkitWrapper21.java   |  2 +-
 .../de/steamwar/core/ProtocolWrapper21.java   | 24 ++---
 .../core/TrickyParticleWrapper21.java         |  2 +-
 .../steamwar/core/TrickyTrialsWrapper21.java  |  2 +-
 .../de/steamwar/core/WorldEditWrapper21.java  |  2 +-
 .../steamwar/scoreboard/SWScoreboard21.java   |  2 +-
 SpigotCore/SpigotCore_8/build.gradle.kts      |  2 +-
 .../de/steamwar/core/BountifulWrapper8.java   | 32 +++----
 .../src/de/steamwar/core/ChatWrapper8.java    | 24 ++---
 .../de/steamwar/core/CraftbukkitWrapper8.java | 34 +++----
 .../de/steamwar/core/FlatteningWrapper8.java  | 34 +++----
 .../src/de/steamwar/core/IDConverter8.java    | 36 +++----
 .../steamwar/core/LocaleChangeWrapper8.java   | 24 ++---
 .../de/steamwar/core/ProtocolWrapper8.java    | 24 ++---
 .../steamwar/core/RecipeDiscoverWrapper8.java | 24 ++---
 .../steamwar/core/TrickyTrialsWrapper8.java   |  2 +-
 .../core/WorldEditRendererWrapper8.java       | 24 ++---
 .../de/steamwar/core/WorldEditWrapper8.java   |  2 +-
 .../de/steamwar/scoreboard/SWScoreboard8.java |  2 +-
 .../src/de/steamwar/techhider/BlockIds8.java  | 32 +++----
 .../de/steamwar/techhider/ChunkHider8.java    | 32 +++----
 .../steamwar/techhider/ProtocolWrapper8.java  | 32 +++----
 SpigotCore/SpigotCore_9/build.gradle.kts      |  2 +-
 .../de/steamwar/core/BountifulWrapper9.java   | 32 +++----
 .../de/steamwar/core/CraftbukkitWrapper9.java | 34 +++----
 .../steamwar/core/TrickyParticleWrapper9.java |  2 +-
 .../core/WorldEditRendererWrapper9.java       | 24 ++---
 .../de/steamwar/techhider/ChunkHider9.java    | 32 +++----
 SpigotCore/SpigotCore_Main/build.gradle.kts   |  2 +-
 .../SpigotCore_Main/src/SpigotCore.properties |  2 +-
 .../src/SpigotCore_de.properties              |  2 +-
 .../comphenix/tinyprotocol/TinyProtocol.java  |  2 +-
 .../src/de/steamwar/Reflection.java           | 24 ++---
 .../CaseInsensitiveCommandsListener.java      | 24 ++---
 .../steamwar/command/CommandRegistering.java  | 24 ++---
 .../src/de/steamwar/command/SWCommand.java    | 24 ++---
 .../src/de/steamwar/command/TypeMapper.java   | 24 ++---
 .../src/de/steamwar/command/TypeUtils.java    | 24 ++---
 .../de/steamwar/command/TypeValidator.java    | 24 ++---
 .../de/steamwar/core/BountifulWrapper.java    | 34 +++----
 .../src/de/steamwar/core/CRIUSleepEvent.java  |  2 +-
 .../src/de/steamwar/core/CRIUWakeupEvent.java |  2 +-
 .../src/de/steamwar/core/ChatWrapper.java     | 24 ++---
 .../src/de/steamwar/core/CheckpointUtils.java |  2 +-
 .../de/steamwar/core/CheckpointUtilsJ9.java   | 24 ++---
 .../src/de/steamwar/core/CommandRemover.java  | 36 +++----
 .../src/de/steamwar/core/Core.java            | 36 +++----
 .../de/steamwar/core/CraftbukkitWrapper.java  | 34 +++----
 .../src/de/steamwar/core/CrashDetector.java   | 24 ++---
 .../src/de/steamwar/core/ErrorHandler.java    | 36 +++----
 .../de/steamwar/core/FlatteningWrapper.java   | 34 +++----
 .../de/steamwar/core/LocaleChangeWrapper.java | 24 ++---
 .../src/de/steamwar/core/PlayerVersion.java   | 24 ++---
 .../src/de/steamwar/core/ProtocolWrapper.java | 32 +++----
 .../steamwar/core/RecipeDiscoverWrapper.java  | 24 ++---
 .../src/de/steamwar/core/TPSWarpUtils.java    |  2 +-
 .../src/de/steamwar/core/TPSWatcher.java      | 34 +++----
 .../steamwar/core/TrickyParticleWrapper.java  |  2 +-
 .../de/steamwar/core/TrickyTrialsWrapper.java |  2 +-
 .../de/steamwar/core/VersionDependent.java    | 34 +++----
 .../de/steamwar/core/WorldEditRenderer.java   | 24 ++---
 .../core/WorldEditRendererCUIEditor.java      | 24 ++---
 .../core/WorldEditRendererWrapper.java        | 24 ++---
 .../de/steamwar/core/WorldEditWrapper.java    |  2 +-
 .../core/authlib/AuthlibInjector.java         | 24 ++---
 .../SteamwarGameProfileRepository.java        | 24 ++---
 .../de/steamwar/core/events/AntiNocom.java    | 24 ++---
 .../steamwar/core/events/ChattingEvent.java   | 36 +++----
 .../core/events/PlayerJoinedEvent.java        | 36 +++----
 .../steamwar/core/events/WorldLoadEvent.java  | 36 +++----
 .../de/steamwar/entity/CCubedTextDisplay.java | 24 ++---
 .../src/de/steamwar/entity/CEntity.java       | 24 ++---
 .../src/de/steamwar/entity/CLine.java         | 24 ++---
 .../src/de/steamwar/entity/CRay.java          | 24 ++---
 .../src/de/steamwar/entity/CWireframe.java    | 24 ++---
 .../src/de/steamwar/entity/RArmorStand.java   | 24 ++---
 .../src/de/steamwar/entity/RBlockDisplay.java |  2 +-
 .../src/de/steamwar/entity/RDisplay.java      |  2 +-
 .../src/de/steamwar/entity/REntity.java       | 34 +++----
 .../src/de/steamwar/entity/REntityServer.java | 24 ++---
 .../steamwar/entity/RFallingBlockEntity.java  | 24 ++---
 .../src/de/steamwar/entity/RItemDisplay.java  |  2 +-
 .../src/de/steamwar/entity/RPlayer.java       | 24 ++---
 .../src/de/steamwar/entity/RTextDisplay.java  |  2 +-
 .../de/steamwar/inventory/InvCallback.java    | 36 +++----
 .../src/de/steamwar/inventory/SWAnvilInv.java | 34 +++----
 .../de/steamwar/inventory/SWInventory.java    | 36 +++----
 .../src/de/steamwar/inventory/SWItem.java     | 36 +++----
 .../src/de/steamwar/inventory/SWListInv.java  | 36 +++----
 .../steamwar/inventory/SchematicSelector.java | 24 ++---
 .../SchematicSelectorInjectable.java          | 24 ++---
 .../src/de/steamwar/inventory/UtilGui.java    | 24 ++---
 .../src/de/steamwar/linkage/SpigotLinker.java | 24 ++---
 .../src/de/steamwar/message/Message.java      | 36 +++----
 .../src/de/steamwar/message/SubMessage.java   |  2 +-
 .../steamwar/network/CoreNetworkHandler.java  | 24 ++---
 .../de/steamwar/network/NetworkReceiver.java  | 24 ++---
 .../de/steamwar/network/NetworkSender.java    | 24 ++---
 .../network/handlers/InventoryHandler.java    | 24 ++---
 .../network/handlers/ServerDataHandler.java   |  2 +-
 .../de/steamwar/providers/BauServerInfo.java  | 34 +++----
 .../de/steamwar/scoreboard/SWScoreboard.java  | 36 +++----
 .../scoreboard/ScoreboardCallback.java        | 36 +++----
 .../src/de/steamwar/sql/PersonalKit.java      | 36 +++----
 .../src/de/steamwar/sql/SQLConfigImpl.java    | 24 ++---
 .../src/de/steamwar/sql/SQLWrapperImpl.java   | 24 ++---
 .../src/de/steamwar/sql/SchematicData.java    | 24 ++---
 .../src/de/steamwar/techhider/BlockIds.java   | 32 +++----
 .../src/de/steamwar/techhider/ChunkHider.java | 32 +++----
 .../de/steamwar/techhider/ProtocolUtils.java  | 32 +++----
 .../steamwar/techhider/ProtocolWrapper.java   | 32 +++----
 .../src/de/steamwar/techhider/TechHider.java  | 32 +++----
 SpigotCore/build.gradle.kts                   |  2 +-
 TNTLeague/build.gradle.kts                    |  2 +-
 .../src/de/steamwar/tntleague/TNTLeague.kt    |  2 +-
 .../steamwar/tntleague/TNTLeague.properties   |  2 +-
 .../tntleague/TNTLeague_de.properties         |  2 +-
 .../tntleague/command/AcceptCommand.kt        |  2 +-
 .../tntleague/command/InviteCommand.kt        |  2 +-
 .../tntleague/command/LeaveCommand.kt         |  2 +-
 .../tntleague/command/RemoveCommand.kt        |  2 +-
 .../tntleague/config/TNTLeagueConfig.kt       |  2 +-
 .../tntleague/config/TNTLeagueWorldConfig.kt  |  2 +-
 .../tntleague/events/DummyListener.kt         |  2 +-
 .../tntleague/events/GlobalListener.kt        |  2 +-
 .../tntleague/events/IngameListener.kt        |  2 +-
 .../tntleague/events/LobbyListener.kt         |  2 +-
 .../steamwar/tntleague/game/TNTLeagueGame.kt  |  2 +-
 .../steamwar/tntleague/game/TNTLeagueTeam.kt  |  2 +-
 .../tntleague/inventory/CategoryInventory.kt  |  2 +-
 .../tntleague/inventory/DealerInventory.kt    |  2 +-
 .../tntleague/util/TNTLeagueScoreboard.kt     |  2 +-
 Teamserver/build.gradle.kts                   |  2 +-
 .../src/de/steamwar/teamserver/Builder.java   | 24 ++---
 .../steamwar/teamserver/Teamserver.properties | 94 +++++++++----------
 .../teamserver/Teamserver_en.properties       | 19 ++++
 .../command/ArenaconfigCommand.java           |  2 +-
 .../teamserver/command/FreezeCommand.java     | 24 ++---
 .../teamserver/command/GamemodeCommand.java   | 24 ++---
 .../teamserver/command/MaterialCommand.java   | 24 ++---
 .../teamserver/command/SpeedCommand.java      | 24 ++---
 .../listener/AxiomHandshakeListener.java      |  2 +-
 .../teamserver/listener/FreezeListener.java   | 24 ++---
 .../teamserver/listener/PlayerChange.java     | 24 ++---
 .../teamserver/listener/SelectAdjacent.java   | 24 ++---
 TowerRun/build.gradle.kts                     |  2 +-
 TowerRun/src/TowerRun.properties              |  2 +-
 TowerRun/src/TowerRun_de.properties           |  2 +-
 .../towerrun/FightInfoPacketSender.java       | 26 +++--
 .../src/de/steamwar/towerrun/TowerRun.java    |  2 +-
 .../towerrun/commands/StartCommand.java       |  2 +-
 .../de/steamwar/towerrun/config/Config.java   |  2 +-
 .../steamwar/towerrun/config/WorldConfig.java |  2 +-
 .../towerrun/countdowns/Countdown.java        |  2 +-
 .../towerrun/countdowns/EndCountdown.java     |  2 +-
 .../towerrun/countdowns/GameCountdown.java    |  2 +-
 .../towerrun/countdowns/LobbyCountdown.java   |  2 +-
 .../steamwar/towerrun/game/TowerRunGame.java  |  2 +-
 .../towerrun/game/TowerRunPlayer.java         |  2 +-
 .../towerrun/generator/TowerGenerator.java    | 19 ++++
 .../towerrun/listener/GlobalListener.java     |  2 +-
 .../towerrun/listener/IngameListener.java     |  2 +-
 .../towerrun/listener/LobbyListener.java      |  2 +-
 .../towerrun/listener/NotLobbyListener.java   |  2 +-
 .../de/steamwar/towerrun/state/GameState.java |  2 +-
 .../state/GameStateBukkitListener.java        |  2 +-
 .../towerrun/state/GameStateListener.java     |  2 +-
 .../state/GameStateToggleListener.java        |  2 +-
 .../steamwar/towerrun/state/GameStates.java   |  2 +-
 .../FirstOutsideWincondition.java             |  2 +-
 .../LastOutsideWincondition.java              |  2 +-
 .../LastRemainingWincondition.java            |  2 +-
 .../winconditions/OutsideWincondition.java    |  2 +-
 .../towerrun/winconditions/WinCondition.java  |  2 +-
 VelocityCore/Dependencies/build.gradle.kts    |  2 +-
 .../src/de/steamwar/discord/Dependencies.java | 24 ++---
 VelocityCore/Persistent/build.gradle.kts      |  2 +-
 .../de/steamwar/persistent/Arenaserver.java   |  2 +-
 .../src/de/steamwar/persistent/Bauserver.java |  2 +-
 .../de/steamwar/persistent/Builderserver.java |  2 +-
 .../de/steamwar/persistent/Persistent.java    |  2 +-
 .../de/steamwar/persistent/Reflection.java    |  2 +-
 .../steamwar/persistent/ReloadablePlugin.java |  2 +-
 .../src/de/steamwar/persistent/Storage.java   |  2 +-
 .../src/de/steamwar/persistent/Subserver.java |  2 +-
 VelocityCore/build.gradle.kts                 |  2 +-
 .../src/de/steamwar/command/SWCommand.java    | 24 ++---
 .../src/de/steamwar/command/TypeMapper.java   | 24 ++---
 .../src/de/steamwar/command/TypeUtils.java    | 24 ++---
 .../de/steamwar/command/TypeValidator.java    | 24 ++---
 .../steamwar/messages/BungeeCore.properties   |  2 +-
 .../messages/BungeeCore_de.properties         |  2 +-
 .../src/de/steamwar/messages/Chatter.java     | 34 +++----
 .../de/steamwar/messages/ChatterGroup.java    |  2 +-
 .../src/de/steamwar/messages/Message.java     |  2 +-
 .../de/steamwar/messages/PlayerChatter.java   |  2 +-
 .../messages/SteamwarResourceBundle.java      | 34 +++----
 .../src/de/steamwar/sql/SQLConfigImpl.java    | 24 ++---
 .../src/de/steamwar/sql/SQLWrapperImpl.java   | 24 ++---
 .../de/steamwar/velocitycore/ArenaMode.java   | 36 +++----
 .../de/steamwar/velocitycore/Broadcaster.java | 36 +++----
 .../src/de/steamwar/velocitycore/Config.java  |  2 +-
 .../de/steamwar/velocitycore/ErrorLogger.java | 36 +++----
 .../steamwar/velocitycore/EventStarter.java   | 36 +++----
 .../steamwar/velocitycore/GameModeConfig.java |  2 +-
 .../src/de/steamwar/velocitycore/Node.java    | 34 +++----
 .../steamwar/velocitycore/ServerStarter.java  |  2 +-
 .../steamwar/velocitycore/ServerVersion.java  |  2 +-
 .../velocitycore/SubserverSystem.java         | 36 +++----
 .../steamwar/velocitycore/VelocityCore.java   | 36 +++----
 .../velocitycore/commands/AlertCommand.java   | 36 +++----
 .../velocitycore/commands/ArenaCommand.java   | 34 +++----
 .../velocitycore/commands/BauCommand.java     | 36 +++----
 .../velocitycore/commands/BugCommand.java     | 36 +++----
 .../commands/BuilderCloudCommand.java         |  2 +-
 .../commands/ChallengeCommand.java            | 36 +++----
 .../velocitycore/commands/CheckCommand.java   | 36 +++----
 .../velocitycore/commands/DevCommand.java     | 24 ++---
 .../velocitycore/commands/EventCommand.java   | 36 +++----
 .../commands/EventRescheduleCommand.java      | 36 +++----
 .../commands/EventreloadCommand.java          | 36 +++----
 .../velocitycore/commands/FightCommand.java   | 36 +++----
 .../velocitycore/commands/GDPRQuery.java      |  2 +-
 .../velocitycore/commands/HelpCommand.java    | 36 +++----
 .../commands/HistoricCommand.java             | 36 +++----
 .../velocitycore/commands/IgnoreCommand.java  | 36 +++----
 .../velocitycore/commands/JoinmeCommand.java  | 36 +++----
 .../velocitycore/commands/KickCommand.java    | 36 +++----
 .../velocitycore/commands/ListCommand.java    | 24 ++---
 .../velocitycore/commands/LocalCommand.java   | 34 +++----
 .../velocitycore/commands/ModCommand.java     | 34 +++----
 .../velocitycore/commands/MsgCommand.java     | 36 +++----
 .../velocitycore/commands/PingCommand.java    | 36 +++----
 .../commands/PlaytimeCommand.java             | 34 +++----
 .../velocitycore/commands/PollCommand.java    | 36 +++----
 .../commands/PollresultCommand.java           | 32 +++----
 .../commands/PunishmentCommand.java           | 24 ++---
 .../velocitycore/commands/RCommand.java       | 36 +++----
 .../velocitycore/commands/RankCommand.java    | 24 ++---
 .../velocitycore/commands/ReplayCommand.java  | 24 ++---
 .../velocitycore/commands/RulesCommand.java   | 36 +++----
 .../velocitycore/commands/SendCommand.java    |  2 +-
 .../commands/ServerSwitchCommand.java         | 36 +++----
 .../commands/ServerTeamchatCommand.java       | 36 +++----
 .../commands/SetLocaleCommand.java            | 24 ++---
 .../velocitycore/commands/StatCommand.java    | 34 +++----
 .../commands/StreamingCommand.java            | 24 ++---
 .../velocitycore/commands/TeamCommand.java    | 36 +++----
 .../commands/TeamchatCommand.java             | 36 +++----
 .../velocitycore/commands/TpCommand.java      | 36 +++----
 .../velocitycore/commands/TypeMappers.java    | 24 ++---
 .../commands/UnIgnoreCommand.java             | 36 +++----
 .../velocitycore/commands/VerifyCommand.java  | 32 +++----
 .../commands/WebpasswordCommand.java          | 36 +++----
 .../velocitycore/commands/WhoisCommand.java   | 36 +++----
 .../velocitycore/discord/DiscordBot.java      | 32 +++----
 .../velocitycore/discord/DiscordConfig.java   |  2 +-
 .../discord/DiscordTicketType.java            |  2 +-
 .../velocitycore/discord/VacationCommand.java | 24 ++---
 .../discord/channels/ChecklistChannel.java    | 24 ++---
 .../discord/channels/CouncilChannel.java      | 24 ++---
 .../discord/channels/DiscordChannel.java      |  2 +-
 .../discord/channels/DiscordChatRoom.java     |  2 +-
 .../discord/channels/EventChannel.java        | 24 ++---
 .../discord/channels/InteractionReply.java    |  2 +-
 .../channels/StaticMessageChannel.java        |  2 +-
 .../discord/listeners/ChannelListener.java    | 31 +++---
 .../discord/listeners/DiscordSchemUpload.java |  2 +-
 .../discord/listeners/DiscordTeamEvent.java   | 32 +++----
 .../listeners/DiscordTicketHandler.java       | 32 +++----
 .../discord/util/AuthManager.java             |  2 +-
 .../discord/util/DiscordAlert.java            | 32 +++----
 .../discord/util/DiscordRanks.java            | 24 ++---
 .../velocitycore/inventory/InvCallback.java   | 34 +++----
 .../velocitycore/inventory/SWInventory.java   | 34 +++----
 .../velocitycore/inventory/SWItem.java        | 34 +++----
 .../velocitycore/inventory/SWListInv.java     | 34 +++----
 .../velocitycore/inventory/SWStreamInv.java   |  2 +-
 .../velocitycore/listeners/BanListener.java   | 36 +++----
 .../velocitycore/listeners/BasicListener.java | 36 +++----
 .../velocitycore/listeners/ChatListener.java  | 36 +++----
 .../velocitycore/listeners/CheckListener.java | 36 +++----
 .../listeners/ConnectionListener.java         | 36 +++----
 .../listeners/EventModeListener.java          |  2 +-
 .../velocitycore/listeners/IPSanitizer.java   | 24 ++---
 .../velocitycore/listeners/PluginMessage.java |  2 +-
 .../velocitycore/listeners/PollSystem.java    | 36 +++----
 .../listeners/SessionManager.java             | 36 +++----
 .../listeners/SettingsChangedListener.java    | 24 ++---
 .../listeners/TexturePackSystem.java          | 24 ++---
 .../listeners/VersionAnnouncer.java           | 24 ++---
 .../de/steamwar/velocitycore/mods/Alpine.java |  2 +-
 .../steamwar/velocitycore/mods/Badlion.java   |  2 +-
 .../velocitycore/mods/Controlify.java         |  2 +-
 .../de/steamwar/velocitycore/mods/FML.java    |  2 +-
 .../de/steamwar/velocitycore/mods/FML2.java   |  2 +-
 .../velocitycore/mods/FabricModSender.java    |  2 +-
 .../steamwar/velocitycore/mods/Feather.java   |  2 +-
 .../steamwar/velocitycore/mods/Hostname.java  |  2 +-
 .../steamwar/velocitycore/mods/LabyMod.java   |  2 +-
 .../de/steamwar/velocitycore/mods/Lunar.java  |  2 +-
 .../steamwar/velocitycore/mods/ModUtils.java  |  2 +-
 .../steamwar/velocitycore/mods/ReplayMod.java |  2 +-
 .../velocitycore/mods/Schematica.java         |  2 +-
 .../velocitycore/mods/WorldDownloader.java    |  2 +-
 .../velocitycore/network/NetworkSender.java   | 24 ++---
 .../velocitycore/network/ServerMetaInfo.java  | 24 ++---
 .../network/handlers/EloPlayerHandler.java    | 24 ++---
 .../network/handlers/EloSchemHandler.java     | 24 ++---
 .../handlers/ExecuteCommandHandler.java       | 34 +++----
 .../network/handlers/FightInfoHandler.java    | 34 +++----
 .../network/handlers/ImALobbyHandler.java     | 34 +++----
 .../handlers/InventoryCallbackHandler.java    | 34 +++----
 .../network/handlers/PlayerSkinHandler.java   | 24 ++---
 .../network/handlers/PrepareSchemHandler.java | 34 +++----
 .../velocitycore/tablist/Tablist.java         | 24 ++---
 .../velocitycore/tablist/TablistBuild.java    | 24 ++---
 .../velocitycore/tablist/TablistGroup.java    | 24 ++---
 .../velocitycore/tablist/TablistManager.java  | 24 ++---
 .../velocitycore/tablist/TablistPart.java     | 24 ++---
 .../velocitycore/tablist/TablistServer.java   | 24 ++---
 .../tablist/UpdateTeamsPacket21.java          | 24 ++---
 .../steamwar/velocitycore/util/BauLock.java   | 24 ++---
 .../velocitycore/util/BauLockState.java       | 24 ++---
 WebsiteBackend/build.gradle.kts               |  2 +-
 WebsiteBackend/src/de/steamwar/Application.kt |  2 +-
 WebsiteBackend/src/de/steamwar/data/Paths.kt  |  2 +-
 .../src/de/steamwar/data/SkinCache.kt         |  2 +-
 .../src/de/steamwar/plugins/Auth.kt           |  2 +-
 .../src/de/steamwar/plugins/Plugins.kt        |  2 +-
 .../src/de/steamwar/plugins/SteamWar.kt       |  2 +-
 WebsiteBackend/src/de/steamwar/routes/Data.kt |  2 +-
 .../src/de/steamwar/routes/EventFights.kt     |  2 +-
 .../src/de/steamwar/routes/Events.kt          |  2 +-
 WebsiteBackend/src/de/steamwar/routes/Page.kt |  2 +-
 .../src/de/steamwar/routes/Routes.kt          |  2 +-
 .../src/de/steamwar/routes/Schematic.kt       |  2 +-
 .../src/de/steamwar/routes/Stats.kt           |  2 +-
 .../src/de/steamwar/routes/UserPerms.kt       |  2 +-
 .../src/de/steamwar/sql/SQLConfigImpl.kt      |  2 +-
 .../src/de/steamwar/sql/SQLWrapperImpl.kt     |  2 +-
 WebsiteBackend/src/de/steamwar/sql/Stats.kt   |  2 +-
 .../src/de/steamwar/util/ServerPing.kt        |  2 +-
 WebsiteBackend/src/logback.xml                |  2 +-
 buildSrc/src/steamwar.devserver.gradle        | 38 ++++----
 gradle.properties                             | 24 ++---
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 settings.gradle.kts                           | 24 ++---
 1389 files changed, 15157 insertions(+), 13441 deletions(-)

diff --git a/BauSystem/BauSystem_15/build.gradle.kts b/BauSystem/BauSystem_15/build.gradle.kts
index 2cbe19e6..054e4ab9 100644
--- a/BauSystem/BauSystem_15/build.gradle.kts
+++ b/BauSystem/BauSystem_15/build.gradle.kts
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_15/src/de/steamwar/bausystem/utils/FlatteningWrapper15.java b/BauSystem/BauSystem_15/src/de/steamwar/bausystem/utils/FlatteningWrapper15.java
index 266326e0..13b3932d 100644
--- a/BauSystem/BauSystem_15/src/de/steamwar/bausystem/utils/FlatteningWrapper15.java
+++ b/BauSystem/BauSystem_15/src/de/steamwar/bausystem/utils/FlatteningWrapper15.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.utils;
diff --git a/BauSystem/BauSystem_15/src/de/steamwar/bausystem/utils/NMSWrapper15.java b/BauSystem/BauSystem_15/src/de/steamwar/bausystem/utils/NMSWrapper15.java
index b479e5d3..3faea278 100644
--- a/BauSystem/BauSystem_15/src/de/steamwar/bausystem/utils/NMSWrapper15.java
+++ b/BauSystem/BauSystem_15/src/de/steamwar/bausystem/utils/NMSWrapper15.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.utils;
diff --git a/BauSystem/BauSystem_15/src/de/steamwar/bausystem/utils/PlaceItemWrapper15.java b/BauSystem/BauSystem_15/src/de/steamwar/bausystem/utils/PlaceItemWrapper15.java
index cbb65fd3..05164673 100644
--- a/BauSystem/BauSystem_15/src/de/steamwar/bausystem/utils/PlaceItemWrapper15.java
+++ b/BauSystem/BauSystem_15/src/de/steamwar/bausystem/utils/PlaceItemWrapper15.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_15/src/de/steamwar/bausystem/utils/PlayerMovementWrapper15.java b/BauSystem/BauSystem_15/src/de/steamwar/bausystem/utils/PlayerMovementWrapper15.java
index f290f7dd..17f67550 100644
--- a/BauSystem/BauSystem_15/src/de/steamwar/bausystem/utils/PlayerMovementWrapper15.java
+++ b/BauSystem/BauSystem_15/src/de/steamwar/bausystem/utils/PlayerMovementWrapper15.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.utils;
diff --git a/BauSystem/BauSystem_15/src/de/steamwar/bausystem/utils/TickListener15.java b/BauSystem/BauSystem_15/src/de/steamwar/bausystem/utils/TickListener15.java
index f2b604ac..57b14b19 100644
--- a/BauSystem/BauSystem_15/src/de/steamwar/bausystem/utils/TickListener15.java
+++ b/BauSystem/BauSystem_15/src/de/steamwar/bausystem/utils/TickListener15.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_15/src/de/steamwar/bausystem/utils/TickManager15.java b/BauSystem/BauSystem_15/src/de/steamwar/bausystem/utils/TickManager15.java
index ab279d45..808e63cc 100644
--- a/BauSystem/BauSystem_15/src/de/steamwar/bausystem/utils/TickManager15.java
+++ b/BauSystem/BauSystem_15/src/de/steamwar/bausystem/utils/TickManager15.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.utils;
diff --git a/BauSystem/BauSystem_15/src/de/steamwar/bausystem/utils/tps/PacketCache.java b/BauSystem/BauSystem_15/src/de/steamwar/bausystem/utils/tps/PacketCache.java
index 63308284..7cabdab6 100644
--- a/BauSystem/BauSystem_15/src/de/steamwar/bausystem/utils/tps/PacketCache.java
+++ b/BauSystem/BauSystem_15/src/de/steamwar/bausystem/utils/tps/PacketCache.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.utils.tps;
diff --git a/BauSystem/BauSystem_15/src/de/steamwar/bausystem/utils/tps/TPSFreezeUtils.java b/BauSystem/BauSystem_15/src/de/steamwar/bausystem/utils/tps/TPSFreezeUtils.java
index bed7f7e6..3dc04cc7 100644
--- a/BauSystem/BauSystem_15/src/de/steamwar/bausystem/utils/tps/TPSFreezeUtils.java
+++ b/BauSystem/BauSystem_15/src/de/steamwar/bausystem/utils/tps/TPSFreezeUtils.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.utils.tps;
diff --git a/BauSystem/BauSystem_15/src/de/steamwar/bausystem/utils/tps/TPSLimitUtils.java b/BauSystem/BauSystem_15/src/de/steamwar/bausystem/utils/tps/TPSLimitUtils.java
index 8b58b00a..31943d87 100644
--- a/BauSystem/BauSystem_15/src/de/steamwar/bausystem/utils/tps/TPSLimitUtils.java
+++ b/BauSystem/BauSystem_15/src/de/steamwar/bausystem/utils/tps/TPSLimitUtils.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.utils.tps;
diff --git a/BauSystem/BauSystem_18/build.gradle.kts b/BauSystem/BauSystem_18/build.gradle.kts
index d3ad4f8e..8dcf6852 100644
--- a/BauSystem/BauSystem_18/build.gradle.kts
+++ b/BauSystem/BauSystem_18/build.gradle.kts
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_18/src/de/steamwar/bausystem/utils/NMSWrapper18.java b/BauSystem/BauSystem_18/src/de/steamwar/bausystem/utils/NMSWrapper18.java
index 9763858e..5d03b8fe 100644
--- a/BauSystem/BauSystem_18/src/de/steamwar/bausystem/utils/NMSWrapper18.java
+++ b/BauSystem/BauSystem_18/src/de/steamwar/bausystem/utils/NMSWrapper18.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.utils;
diff --git a/BauSystem/BauSystem_18/src/de/steamwar/bausystem/utils/PlayerMovementWrapper18.java b/BauSystem/BauSystem_18/src/de/steamwar/bausystem/utils/PlayerMovementWrapper18.java
index 0f1ba669..512da797 100644
--- a/BauSystem/BauSystem_18/src/de/steamwar/bausystem/utils/PlayerMovementWrapper18.java
+++ b/BauSystem/BauSystem_18/src/de/steamwar/bausystem/utils/PlayerMovementWrapper18.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.utils;
diff --git a/BauSystem/BauSystem_19/build.gradle.kts b/BauSystem/BauSystem_19/build.gradle.kts
index b72cbf08..e6dcaf4f 100644
--- a/BauSystem/BauSystem_19/build.gradle.kts
+++ b/BauSystem/BauSystem_19/build.gradle.kts
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_19/src/de/steamwar/bausystem/utils/NMSWrapper19.java b/BauSystem/BauSystem_19/src/de/steamwar/bausystem/utils/NMSWrapper19.java
index 748cf86d..cf4c3fc2 100644
--- a/BauSystem/BauSystem_19/src/de/steamwar/bausystem/utils/NMSWrapper19.java
+++ b/BauSystem/BauSystem_19/src/de/steamwar/bausystem/utils/NMSWrapper19.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.utils;
diff --git a/BauSystem/BauSystem_19/src/de/steamwar/bausystem/utils/PlayerMovementWrapper19.java b/BauSystem/BauSystem_19/src/de/steamwar/bausystem/utils/PlayerMovementWrapper19.java
index af152ea5..89912e3c 100644
--- a/BauSystem/BauSystem_19/src/de/steamwar/bausystem/utils/PlayerMovementWrapper19.java
+++ b/BauSystem/BauSystem_19/src/de/steamwar/bausystem/utils/PlayerMovementWrapper19.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.utils;
diff --git a/BauSystem/BauSystem_19/src/de/steamwar/bausystem/utils/TickListener19.java b/BauSystem/BauSystem_19/src/de/steamwar/bausystem/utils/TickListener19.java
index 211c004b..ca3d478c 100644
--- a/BauSystem/BauSystem_19/src/de/steamwar/bausystem/utils/TickListener19.java
+++ b/BauSystem/BauSystem_19/src/de/steamwar/bausystem/utils/TickListener19.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_20/build.gradle.kts b/BauSystem/BauSystem_20/build.gradle.kts
index b1756244..3032f6ba 100644
--- a/BauSystem/BauSystem_20/build.gradle.kts
+++ b/BauSystem/BauSystem_20/build.gradle.kts
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_20/src/de/steamwar/bausystem/utils/NMSWrapper20.java b/BauSystem/BauSystem_20/src/de/steamwar/bausystem/utils/NMSWrapper20.java
index 1cc09e56..c7a1b363 100644
--- a/BauSystem/BauSystem_20/src/de/steamwar/bausystem/utils/NMSWrapper20.java
+++ b/BauSystem/BauSystem_20/src/de/steamwar/bausystem/utils/NMSWrapper20.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.utils;
diff --git a/BauSystem/BauSystem_20/src/de/steamwar/bausystem/utils/PlaceItemWrapper20.java b/BauSystem/BauSystem_20/src/de/steamwar/bausystem/utils/PlaceItemWrapper20.java
index e9fc1b0d..407a7207 100644
--- a/BauSystem/BauSystem_20/src/de/steamwar/bausystem/utils/PlaceItemWrapper20.java
+++ b/BauSystem/BauSystem_20/src/de/steamwar/bausystem/utils/PlaceItemWrapper20.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_20/src/de/steamwar/bausystem/utils/PlayerMovementWrapper20.java b/BauSystem/BauSystem_20/src/de/steamwar/bausystem/utils/PlayerMovementWrapper20.java
index f7866a4a..feec5e59 100644
--- a/BauSystem/BauSystem_20/src/de/steamwar/bausystem/utils/PlayerMovementWrapper20.java
+++ b/BauSystem/BauSystem_20/src/de/steamwar/bausystem/utils/PlayerMovementWrapper20.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.utils;
diff --git a/BauSystem/BauSystem_21/build.gradle.kts b/BauSystem/BauSystem_21/build.gradle.kts
index 0c9e97d4..8b40ae2d 100644
--- a/BauSystem/BauSystem_21/build.gradle.kts
+++ b/BauSystem/BauSystem_21/build.gradle.kts
@@ -1,3 +1,22 @@
+/*
+ *   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/>.
+ */
+
 plugins {
     steamwar.java
 }
diff --git a/BauSystem/BauSystem_21/src/de/steamwar/bausystem/utils/NMSWrapper21.java b/BauSystem/BauSystem_21/src/de/steamwar/bausystem/utils/NMSWrapper21.java
index 88a08002..54651656 100644
--- a/BauSystem/BauSystem_21/src/de/steamwar/bausystem/utils/NMSWrapper21.java
+++ b/BauSystem/BauSystem_21/src/de/steamwar/bausystem/utils/NMSWrapper21.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/build.gradle.kts b/BauSystem/BauSystem_Main/build.gradle.kts
index 5b8f0a89..45aff756 100644
--- a/BauSystem/BauSystem_Main/build.gradle.kts
+++ b/BauSystem/BauSystem_Main/build.gradle.kts
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/BauSystem.properties b/BauSystem/BauSystem_Main/src/BauSystem.properties
index eabd9de6..aea72646 100644
--- a/BauSystem/BauSystem_Main/src/BauSystem.properties
+++ b/BauSystem/BauSystem_Main/src/BauSystem.properties
@@ -1,20 +1,20 @@
 #
-# This file is a part of the SteamWar software.
+#   This file is a part of the SteamWar software.
 #
-# Copyright (C) 2021  SteamWar.de-Serverteam
+#   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 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.
+#   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/>.
+#   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/>.
 #
 PREFIX=§eBau§8System§8»
 TIME=HH:mm:ss
diff --git a/BauSystem/BauSystem_Main/src/BauSystem_de.properties b/BauSystem/BauSystem_Main/src/BauSystem_de.properties
index 042d1388..e96c9316 100644
--- a/BauSystem/BauSystem_Main/src/BauSystem_de.properties
+++ b/BauSystem/BauSystem_Main/src/BauSystem_de.properties
@@ -1,20 +1,20 @@
 #
-# This file is a part of the SteamWar software.
+#   This file is a part of the SteamWar software.
 #
-# Copyright (C) 2021  SteamWar.de-Serverteam
+#   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 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.
+#   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/>.
+#   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/>.
 #
 PREFIX=§eBau§8System§8»
 TIME=HH:mm:ss
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java
index 4d473261..6036eb48 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/Permission.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/Permission.java
index a4cefb9a..65fbdd51 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/Permission.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/Permission.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/SWUtils.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/SWUtils.java
index c7c9183f..97d12dcb 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/SWUtils.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/SWUtils.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/config/BauServer.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/config/BauServer.java
index ee7d48e8..fea634a2 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/config/BauServer.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/config/BauServer.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.config;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/configplayer/Config.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/configplayer/Config.java
index edce8c58..77b8b706 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/configplayer/Config.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/configplayer/Config.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.configplayer;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/configplayer/ConfigConverter.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/configplayer/ConfigConverter.java
index bf9f1fdf..46119887 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/configplayer/ConfigConverter.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/configplayer/ConfigConverter.java
@@ -1,3 +1,22 @@
+/*
+ *   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.configplayer;
 
 import yapion.hierarchy.types.YAPIONObject;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/configplayer/ConfigCreator.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/configplayer/ConfigCreator.java
index f2d8a4a8..9a887208 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/configplayer/ConfigCreator.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/configplayer/ConfigCreator.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.configplayer;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/configplayer/serializer/ConfigurationSerializableSerializer.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/configplayer/serializer/ConfigurationSerializableSerializer.java
index eecd1ef1..2d054c3d 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/configplayer/serializer/ConfigurationSerializableSerializer.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/configplayer/serializer/ConfigurationSerializableSerializer.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.configplayer.serializer;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/attributescopy/AttributeRemoveCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/attributescopy/AttributeRemoveCommand.java
index eb621256..eb45a73f 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/attributescopy/AttributeRemoveCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/attributescopy/AttributeRemoveCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.attributescopy;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/attributescopy/AttributeUtils.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/attributescopy/AttributeUtils.java
index 246e4ab9..740893dc 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/attributescopy/AttributeUtils.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/attributescopy/AttributeUtils.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.attributescopy;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/attributescopy/AttributesCopyCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/attributescopy/AttributesCopyCommand.java
index 808ca339..61873303 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/attributescopy/AttributesCopyCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/attributescopy/AttributesCopyCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.attributescopy;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/attributescopy/AttributesPlaceListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/attributescopy/AttributesPlaceListener.java
index 965d8bad..79cf7821 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/attributescopy/AttributesPlaceListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/attributescopy/AttributesPlaceListener.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.attributescopy;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/autostart/AutoStartCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/autostart/AutoStartCommand.java
index 3401267e..72c89d0e 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/autostart/AutoStartCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/autostart/AutoStartCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.autostart;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/autostart/AutoStartGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/autostart/AutoStartGuiItem.java
index f622d70b..70440719 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/autostart/AutoStartGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/autostart/AutoStartGuiItem.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.autostart;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/autostart/AutostartListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/autostart/AutostartListener.java
index fbc6430f..5aaf3ed6 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/autostart/AutostartListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/autostart/AutostartListener.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.autostart;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/backup/BackupCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/backup/BackupCommand.java
index 6c08eb1a..c934fa24 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/backup/BackupCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/backup/BackupCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.backup;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/bau/BauInfoBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/bau/BauInfoBauGuiItem.java
index 6553f44a..73014d3d 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/bau/BauInfoBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/bau/BauInfoBauGuiItem.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.bau;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/bau/ForceSpectatorCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/bau/ForceSpectatorCommand.java
index a192fec5..a4e79c2f 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/bau/ForceSpectatorCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/bau/ForceSpectatorCommand.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/bau/InfoCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/bau/InfoCommand.java
index 6b3a1d85..adeb4c45 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/bau/InfoCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/bau/InfoCommand.java
@@ -1,3 +1,22 @@
+/*
+ *   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.bau;
 
 import de.steamwar.bausystem.BauSystem;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/cannon/CannonDetector.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/cannon/CannonDetector.java
index 7c73888d..b7347cd5 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/cannon/CannonDetector.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/cannon/CannonDetector.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/cannon/CannonKey.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/cannon/CannonKey.java
index 08912f6f..d042554a 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/cannon/CannonKey.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/cannon/CannonKey.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/cannon/depth/Depth.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/cannon/depth/Depth.java
index 4cfacb98..89f0daa2 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/cannon/depth/Depth.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/cannon/depth/Depth.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/cannon/depth/DepthCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/cannon/depth/DepthCommand.java
index b7426fd7..b9f71398 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/cannon/depth/DepthCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/cannon/depth/DepthCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.cannon.depth;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/cannon/depth/DepthManager.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/cannon/depth/DepthManager.java
index 21789d7b..fe9f45bc 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/cannon/depth/DepthManager.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/cannon/depth/DepthManager.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/countingwand/Countingwand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/countingwand/Countingwand.java
index fb9316b9..bcd13a7f 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/countingwand/Countingwand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/countingwand/Countingwand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.countingwand;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/countingwand/CountingwandCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/countingwand/CountingwandCommand.java
index c7d9b270..f35420fe 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/countingwand/CountingwandCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/countingwand/CountingwandCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.countingwand;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/countingwand/CountingwandGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/countingwand/CountingwandGuiItem.java
index dbeae70d..c247f4b8 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/countingwand/CountingwandGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/countingwand/CountingwandGuiItem.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.countingwand;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/countingwand/CountingwandListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/countingwand/CountingwandListener.java
index 7233670a..127bb964 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/countingwand/CountingwandListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/countingwand/CountingwandListener.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.countingwand;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/design/endstone/DesignEndStone.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/design/endstone/DesignEndStone.java
index 129ebe71..0b2bde85 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/design/endstone/DesignEndStone.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/design/endstone/DesignEndStone.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.design.endstone;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/design/endstone/DesignEndStoneCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/design/endstone/DesignEndStoneCommand.java
index 6d10d479..d049d2f1 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/design/endstone/DesignEndStoneCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/design/endstone/DesignEndStoneCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.design.endstone;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/detonator/Detoblock.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/detonator/Detoblock.java
index 85facc7a..c27aeb33 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/detonator/Detoblock.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/detonator/Detoblock.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.detonator;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/detonator/Detonator.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/detonator/Detonator.java
index 80d5b33b..5ba2bca8 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/detonator/Detonator.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/detonator/Detonator.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.detonator;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/detonator/DetonatorBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/detonator/DetonatorBauGuiItem.java
index 3f633663..d372fe9f 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/detonator/DetonatorBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/detonator/DetonatorBauGuiItem.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.detonator;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/detonator/DetonatorCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/detonator/DetonatorCommand.java
index c8d493bd..5c936c49 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/detonator/DetonatorCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/detonator/DetonatorCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.detonator;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/detonator/DetonatorListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/detonator/DetonatorListener.java
index cabe00c6..9d70d11a 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/detonator/DetonatorListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/detonator/DetonatorListener.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.detonator;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/detonator/storage/DetonatorStorage.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/detonator/storage/DetonatorStorage.java
index 104abf29..3ec07c66 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/detonator/storage/DetonatorStorage.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/detonator/storage/DetonatorStorage.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.detonator.storage;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/detonator/storage/ItemStorage.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/detonator/storage/ItemStorage.java
index 71b6edb4..f95c590a 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/detonator/storage/ItemStorage.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/detonator/storage/ItemStorage.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.detonator.storage;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/gui/BauGUI.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/gui/BauGUI.java
index 4c71acf4..4ec96af0 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/gui/BauGUI.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/gui/BauGUI.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.gui;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/gui/BauGUICommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/gui/BauGUICommand.java
index f6810ef7..fb47155d 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/gui/BauGUICommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/gui/BauGUICommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.gui;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/gui/BauGuiBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/gui/BauGuiBauGuiItem.java
index c03b458a..c68d4177 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/gui/BauGuiBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/gui/BauGuiBauGuiItem.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.gui;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/gui/BauGuiListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/gui/BauGuiListener.java
index 5895019f..283f582a 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/gui/BauGuiListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/gui/BauGuiListener.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.gui;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/gui/editor/BauGuiEditor.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/gui/editor/BauGuiEditor.java
index b548b60e..a8028acc 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/gui/editor/BauGuiEditor.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/gui/editor/BauGuiEditor.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.gui.editor;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/gui/editor/BauGuiEditorGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/gui/editor/BauGuiEditorGuiItem.java
index b1a76041..6df8dfd7 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/gui/editor/BauGuiEditorGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/gui/editor/BauGuiEditorGuiItem.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.gui.editor;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/gui/editor/BauGuiMapping.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/gui/editor/BauGuiMapping.java
index 90cc1fb4..edea652e 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/gui/editor/BauGuiMapping.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/gui/editor/BauGuiMapping.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.gui.editor;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/hotbar/DefaultHotbar.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/hotbar/DefaultHotbar.java
index 9e374ee4..602f1817 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/hotbar/DefaultHotbar.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/hotbar/DefaultHotbar.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.hotbar;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/hotbar/HotbarCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/hotbar/HotbarCommand.java
index 77a13716..53c6d805 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/hotbar/HotbarCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/hotbar/HotbarCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.hotbar;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/hotbar/HotbarListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/hotbar/HotbarListener.java
index 8a4c78de..11d5481d 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/hotbar/HotbarListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/hotbar/HotbarListener.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.hotbar;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/inventoryfiller/InventoryFillBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/inventoryfiller/InventoryFillBauGuiItem.java
index 7e94710a..46319ec6 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/inventoryfiller/InventoryFillBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/inventoryfiller/InventoryFillBauGuiItem.java
@@ -1,3 +1,22 @@
+/*
+ *   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.inventoryfiller;
 
 import de.steamwar.bausystem.BauSystem;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/inventoryfiller/InventoryFiller.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/inventoryfiller/InventoryFiller.java
index d69e3410..a64904ce 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/inventoryfiller/InventoryFiller.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/inventoryfiller/InventoryFiller.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.inventoryfiller;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/inventoryfiller/InventoryFillerCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/inventoryfiller/InventoryFillerCommand.java
index e467e3eb..0e9887ab 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/inventoryfiller/InventoryFillerCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/inventoryfiller/InventoryFillerCommand.java
@@ -1,3 +1,22 @@
+/*
+ *   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.inventoryfiller;
 
 import de.steamwar.bausystem.BauSystem;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/killchecker/Cuboid.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/killchecker/Cuboid.java
index 08632a9c..7b4f8279 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/killchecker/Cuboid.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/killchecker/Cuboid.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.killchecker;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/killchecker/KillcheckerCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/killchecker/KillcheckerCommand.java
index 1c6a3b41..6ae13f47 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/killchecker/KillcheckerCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/killchecker/KillcheckerCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.killchecker;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/killchecker/KillcheckerVisualizer.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/killchecker/KillcheckerVisualizer.java
index 52eae2b6..f303380d 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/killchecker/KillcheckerVisualizer.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/killchecker/KillcheckerVisualizer.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.killchecker;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/Loader.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/Loader.java
index 1c023ae8..491f45aa 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/Loader.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/Loader.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.loader;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/LoaderCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/LoaderCommand.java
index 021ad330..ffb8e185 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/LoaderCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/LoaderCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.loader;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/LoaderRecorder.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/LoaderRecorder.java
index d3e2fcfb..f9f56a37 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/LoaderRecorder.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/LoaderRecorder.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.loader;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/LoaderScoreboardElement.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/LoaderScoreboardElement.java
index fdcda57a..a51417d4 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/LoaderScoreboardElement.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/LoaderScoreboardElement.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.loader;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/LoaderElement.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/LoaderElement.java
index 658a9f8d..61ece4d3 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/LoaderElement.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/LoaderElement.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.loader.elements;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/LoaderInteractionElement.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/LoaderInteractionElement.java
index 2caacbc4..29c2be7c 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/LoaderInteractionElement.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/LoaderInteractionElement.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.loader.elements;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/LoaderSettingsEnum.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/LoaderSettingsEnum.java
index f1e628d0..9fae7e20 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/LoaderSettingsEnum.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/LoaderSettingsEnum.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/impl/LoaderComparator.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/impl/LoaderComparator.java
index fa7a032e..51a5e7f3 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/impl/LoaderComparator.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/impl/LoaderComparator.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.loader.elements.impl;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/impl/LoaderDaylightDetector.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/impl/LoaderDaylightDetector.java
index caacd6b0..7fbb9142 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/impl/LoaderDaylightDetector.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/impl/LoaderDaylightDetector.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.loader.elements.impl;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/impl/LoaderLectern.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/impl/LoaderLectern.java
index 8282cf69..11c3fa35 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/impl/LoaderLectern.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/impl/LoaderLectern.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.loader.elements.impl;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/impl/LoaderLever.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/impl/LoaderLever.java
index c77d914d..11509fdd 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/impl/LoaderLever.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/impl/LoaderLever.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.loader.elements.impl;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/impl/LoaderMovement.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/impl/LoaderMovement.java
index 3fc89e5d..c3108b7c 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/impl/LoaderMovement.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/impl/LoaderMovement.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.loader.elements.impl;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/impl/LoaderNoteBlock.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/impl/LoaderNoteBlock.java
index 042243e0..524ea714 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/impl/LoaderNoteBlock.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/impl/LoaderNoteBlock.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.loader.elements.impl;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/impl/LoaderOpenable.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/impl/LoaderOpenable.java
index 46197b00..ccfda8d9 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/impl/LoaderOpenable.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/impl/LoaderOpenable.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.loader.elements.impl;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/impl/LoaderRepeater.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/impl/LoaderRepeater.java
index d40e4211..f8ce4295 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/impl/LoaderRepeater.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/impl/LoaderRepeater.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.loader.elements.impl;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/impl/LoaderTNT.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/impl/LoaderTNT.java
index f0ee034e..7dc597a3 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/impl/LoaderTNT.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/impl/LoaderTNT.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.loader.elements.impl;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/impl/LoaderTicks.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/impl/LoaderTicks.java
index 32e65f61..0afa23cf 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/impl/LoaderTicks.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/impl/LoaderTicks.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.loader.elements.impl;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/impl/LoaderWait.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/impl/LoaderWait.java
index 618be768..2ab40d9d 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/impl/LoaderWait.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/elements/impl/LoaderWait.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.loader.elements.impl;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loadtimer/Loadtimer.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loadtimer/Loadtimer.java
index 12a4d867..f1a42e1a 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loadtimer/Loadtimer.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loadtimer/Loadtimer.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.loadtimer;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loadtimer/LoadtimerCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loadtimer/LoadtimerCommand.java
index b0dcba38..a73e6d45 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loadtimer/LoadtimerCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loadtimer/LoadtimerCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.loadtimer;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loadtimer/LoadtimerGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loadtimer/LoadtimerGuiItem.java
index 1df6c898..a4ac5803 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loadtimer/LoadtimerGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loadtimer/LoadtimerGuiItem.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.loadtimer;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loadtimer/LoadtimerListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loadtimer/LoadtimerListener.java
index d9cf2118..bfc2736a 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loadtimer/LoadtimerListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loadtimer/LoadtimerListener.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.loadtimer;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/observer/ObserverTracer.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/observer/ObserverTracer.java
index c1e08fcf..ad0bca1b 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/observer/ObserverTracer.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/observer/ObserverTracer.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.observer;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/observer/ObserverTracerCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/observer/ObserverTracerCommand.java
index c09d3c18..7cfadf2c 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/observer/ObserverTracerCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/observer/ObserverTracerCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.observer;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/observer/ObserverTracerListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/observer/ObserverTracerListener.java
index a2d9c991..9ef56909 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/observer/ObserverTracerListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/observer/ObserverTracerListener.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.observer;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/rayvisualizer/RayVisualizerCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/rayvisualizer/RayVisualizerCommand.java
index 908f8daa..2346bcd3 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/rayvisualizer/RayVisualizerCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/rayvisualizer/RayVisualizerCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.rayvisualizer;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ColorCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ColorCommand.java
index 4b03cf8a..68d84be3 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ColorCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ColorCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FireCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FireCommand.java
index e694f19a..af660b25 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FireCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FireCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FireListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FireListener.java
index 7c65f00d..8f862e9d 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FireListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FireListener.java
@@ -1,3 +1,22 @@
+/*
+ *   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;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FreezeCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FreezeCommand.java
index ceba317d..928db20e 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FreezeCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FreezeCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FreezeListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FreezeListener.java
index c83b1561..03d81b62 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FreezeListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FreezeListener.java
@@ -1,3 +1,22 @@
+/*
+ *   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;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ItemsCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ItemsCommand.java
index 7a8c108a..819c8f62 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ItemsCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ItemsCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ItemsListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ItemsListener.java
index 47fd27c8..42c1d776 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ItemsListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ItemsListener.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/NoGravityCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/NoGravityCommand.java
index 6ef0b428..df874d69 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/NoGravityCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/NoGravityCommand.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/NoGravityListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/NoGravityListener.java
index f874fb41..4dbd109f 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/NoGravityListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/NoGravityListener.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ProtectCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ProtectCommand.java
index a390bddd..ad79d91a 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ProtectCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ProtectCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ProtectListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ProtectListener.java
index 2abe5569..f0b7ef16 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ProtectListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ProtectListener.java
@@ -1,3 +1,22 @@
+/*
+ *   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;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionCommand.java
index 8418cbba..2d0b58b9 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionListener.java
index e08e2ebf..0b25e5df 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionListener.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionScoreboardElement.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionScoreboardElement.java
index 9164040f..e4c900fc 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionScoreboardElement.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionScoreboardElement.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ResetCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ResetCommand.java
index 097ec569..430ee534 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ResetCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ResetCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TNTCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TNTCommand.java
index 97abf0bc..074cd3c5 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TNTCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TNTCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TNTListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TNTListener.java
index 285b2a7f..a8676ae2 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TNTListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TNTListener.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java
index c00b8b3d..d09c06a0 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/ColorBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/ColorBauGuiItem.java
index ae633edd..43e46667 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/ColorBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/ColorBauGuiItem.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.items;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/FireBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/FireBauGuiItem.java
index e41be46b..8b51d59c 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/FireBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/FireBauGuiItem.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.items;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/FreezeBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/FreezeBauGuiItem.java
index 13f1f9eb..01174d41 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/FreezeBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/FreezeBauGuiItem.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.items;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/ProtectBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/ProtectBauGuiItem.java
index 75bf4eb0..9118e5f0 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/ProtectBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/ProtectBauGuiItem.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.items;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/ResetBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/ResetBauGuiItem.java
index e5295b2e..33319753 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/ResetBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/ResetBauGuiItem.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.items;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/TestblockBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/TestblockBauGuiItem.java
index 355b5209..8752a49f 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/TestblockBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/TestblockBauGuiItem.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.items;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/TntBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/TntBauGuiItem.java
index 2205cf10..7100e51e 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/TntBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/TntBauGuiItem.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.items;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/Hotkey.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/Hotkey.java
index d149eedd..4cdb6201 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/Hotkey.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/Hotkey.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/ScriptCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/ScriptCommand.java
index 0194514f..54836375 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/ScriptCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/ScriptCommand.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/ScriptGUI.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/ScriptGUI.java
index fd6fd3f2..5558412e 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/ScriptGUI.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/ScriptGUI.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/ScriptHelper.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/ScriptHelper.java
index 8f99b390..fd4bc826 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/ScriptHelper.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/ScriptHelper.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/ScriptListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/ScriptListener.java
index 14f8d983..0eadc3ed 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/ScriptListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/ScriptListener.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/ScriptRunner.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/ScriptRunner.java
index 7ee93eb3..2a506e12 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/ScriptRunner.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/ScriptRunner.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/UnsignCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/UnsignCommand.java
index c1a048cc..2b9cb37a 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/UnsignCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/UnsignCommand.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/event/CommandListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/event/CommandListener.java
index 7cf88d1e..d52e4d9b 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/event/CommandListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/event/CommandListener.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/event/EventListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/event/EventListener.java
index 33946536..8aade642 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/event/EventListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/event/EventListener.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/event/HotkeyListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/event/HotkeyListener.java
index 466f1e60..9c9de260 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/event/HotkeyListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/event/HotkeyListener.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/CommandRegister.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/CommandRegister.java
index 3c3332a0..50cc1919 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/CommandRegister.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/CommandRegister.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/SteamWarGlobalLuaPlugin.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/SteamWarGlobalLuaPlugin.java
index 0bec9864..95619085 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/SteamWarGlobalLuaPlugin.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/SteamWarGlobalLuaPlugin.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/SteamWarLuaPlugin.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/SteamWarLuaPlugin.java
index a17943a9..df6fc706 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/SteamWarLuaPlugin.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/SteamWarLuaPlugin.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/SteamWarPlatform.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/SteamWarPlatform.java
index a35ede6e..4153582d 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/SteamWarPlatform.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/SteamWarPlatform.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/BossbarLib.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/BossbarLib.java
index adbb334e..498f83d8 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/BossbarLib.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/BossbarLib.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/InventoryLib.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/InventoryLib.java
index 1d14b305..9e0b6064 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/InventoryLib.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/InventoryLib.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/LuaLib.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/LuaLib.java
index a4af0d3a..5e879802 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/LuaLib.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/LuaLib.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/PlayerLib.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/PlayerLib.java
index d8576f81..6d23bd0c 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/PlayerLib.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/PlayerLib.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/RandomLib.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/RandomLib.java
index 87a4dddc..663168b6 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/RandomLib.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/RandomLib.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/RegionLib.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/RegionLib.java
index d6e7b402..87ee8687 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/RegionLib.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/RegionLib.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/ScoreboardLib.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/ScoreboardLib.java
index ff09ac9a..bf9e64bd 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/ScoreboardLib.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/ScoreboardLib.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/ServerLib.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/ServerLib.java
index 039b849f..7a4ce0a6 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/ServerLib.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/ServerLib.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/StorageLib.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/StorageLib.java
index 37454427..c1646d41 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/StorageLib.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/StorageLib.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/TpsLib.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/TpsLib.java
index 44d9a378..416e2438 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/TpsLib.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/TpsLib.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/TracerLib.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/TracerLib.java
index 5178bdf9..5052dde8 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/TracerLib.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/TracerLib.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/WorldEditLib.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/WorldEditLib.java
index 87d1f9fb..0d03ff4c 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/WorldEditLib.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/WorldEditLib.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/shieldprinting/BlockDataConfiguration.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/shieldprinting/BlockDataConfiguration.java
index e4b6d102..48079fcf 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/shieldprinting/BlockDataConfiguration.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/shieldprinting/BlockDataConfiguration.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/shieldprinting/ShieldPrinting.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/shieldprinting/ShieldPrinting.java
index e3b60f1e..85a94b45 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/shieldprinting/ShieldPrinting.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/shieldprinting/ShieldPrinting.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.shieldprinting;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/shieldprinting/ShieldPrintingCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/shieldprinting/ShieldPrintingCommand.java
index b09259fb..15448409 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/shieldprinting/ShieldPrintingCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/shieldprinting/ShieldPrintingCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.shieldprinting;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/shieldprinting/ShieldPrintingState.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/shieldprinting/ShieldPrintingState.java
index 0f782f67..8c4d75af 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/shieldprinting/ShieldPrintingState.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/shieldprinting/ShieldPrintingState.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.shieldprinting;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/shieldprinting/impl/FenceConfiguration.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/shieldprinting/impl/FenceConfiguration.java
index c45ede3a..78d702e7 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/shieldprinting/impl/FenceConfiguration.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/shieldprinting/impl/FenceConfiguration.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/shieldprinting/impl/OpenableConfiguration.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/shieldprinting/impl/OpenableConfiguration.java
index 2b444883..7234fa73 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/shieldprinting/impl/OpenableConfiguration.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/shieldprinting/impl/OpenableConfiguration.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/shieldprinting/impl/PistonConfiguration.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/shieldprinting/impl/PistonConfiguration.java
index c3efb459..622065b8 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/shieldprinting/impl/PistonConfiguration.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/shieldprinting/impl/PistonConfiguration.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/shieldprinting/impl/PowerableConfiguration.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/shieldprinting/impl/PowerableConfiguration.java
index 3fa84f18..3a679ed0 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/shieldprinting/impl/PowerableConfiguration.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/shieldprinting/impl/PowerableConfiguration.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/shieldprinting/impl/WallConfiguration.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/shieldprinting/impl/WallConfiguration.java
index 00b57f92..4eaca8f1 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/shieldprinting/impl/WallConfiguration.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/shieldprinting/impl/WallConfiguration.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorBauGuiItem.java
index d03dc55c..98c0023d 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorBauGuiItem.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorCommand.java
index 646d22a9..7f07ab50 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorCommand.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorCursor.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorCursor.java
index 568b20b2..7a1ba7e6 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorCursor.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorCursor.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorStorage.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorStorage.java
index 434e112d..76ddcd21 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorStorage.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorStorage.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorWatcher.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorWatcher.java
index d5f98986..f79ad581 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorWatcher.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorWatcher.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/Simulator.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/Simulator.java
index 5cb4de3c..9fb3d841 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/Simulator.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/Simulator.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/SimulatorBlockAlignedElement.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/SimulatorBlockAlignedElement.java
index de0d2b69..c18179b9 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/SimulatorBlockAlignedElement.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/SimulatorBlockAlignedElement.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/SimulatorElement.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/SimulatorElement.java
index 88aaaa96..2d31b7b3 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/SimulatorElement.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/SimulatorElement.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/SimulatorGroup.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/SimulatorGroup.java
index 8031dd1c..1f009c0c 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/SimulatorGroup.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/SimulatorGroup.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/SimulatorPhase.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/SimulatorPhase.java
index f69977a6..5d40b985 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/SimulatorPhase.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/SimulatorPhase.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/observer/ObserverElement.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/observer/ObserverElement.java
index 7fdff328..47b1cc62 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/observer/ObserverElement.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/observer/ObserverElement.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/observer/ObserverPhase.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/observer/ObserverPhase.java
index e3707c3e..f69ff797 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/observer/ObserverPhase.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/observer/ObserverPhase.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/redstone/RedstoneElement.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/redstone/RedstoneElement.java
index 3b949609..fdbf9fd0 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/redstone/RedstoneElement.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/redstone/RedstoneElement.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/redstone/RedstonePhase.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/redstone/RedstonePhase.java
index 614be659..2a5a64fd 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/redstone/RedstonePhase.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/redstone/RedstonePhase.java
@@ -2,7 +2,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/tnt/TNTElement.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/tnt/TNTElement.java
index 4fbede7e..735ca292 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/tnt/TNTElement.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/tnt/TNTElement.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/tnt/TNTPhase.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/tnt/TNTPhase.java
index 39fedbb5..a4c95d6c 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/tnt/TNTPhase.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/tnt/TNTPhase.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/Direction.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/Direction.java
index 31737266..d6125212 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/Direction.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/Direction.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.simulator.execute;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/SimulatorAction.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/SimulatorAction.java
index c6c9f1da..b0014d84 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/SimulatorAction.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/SimulatorAction.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/SimulatorExecutor.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/SimulatorExecutor.java
index 5192fde8..108827e3 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/SimulatorExecutor.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/SimulatorExecutor.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/SimulatorStabGenerator.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/SimulatorStabGenerator.java
index 37ca8bf3..82f4d0fc 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/SimulatorStabGenerator.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/SimulatorStabGenerator.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.simulator.execute;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabData.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabData.java
index dc1a6e0e..00c80eeb 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabData.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabData.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.simulator.execute;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabDirection.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabDirection.java
index 9adeaaaf..05ccd451 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabDirection.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabDirection.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.simulator.execute;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabFinalizer.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabFinalizer.java
index daa8876a..a69b2ee8 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabFinalizer.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabFinalizer.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.simulator.execute;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabGenerator.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabGenerator.java
index 3a598c1e..809358b6 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabGenerator.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabGenerator.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.simulator.execute;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabSetup.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabSetup.java
index 78f89d8a..16a54b40 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabSetup.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabSetup.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.simulator.execute;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabStep.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabStep.java
index 6a0e1a2f..8f9e6122 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabStep.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabStep.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.simulator.execute;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorCursorSwitcherGui.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorCursorSwitcherGui.java
index 734fe597..0344014e 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorCursorSwitcherGui.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorCursorSwitcherGui.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.simulator.gui;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorGroupChooserGui.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorGroupChooserGui.java
index 10396677..3c4a5478 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorGroupChooserGui.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorGroupChooserGui.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorGroupGui.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorGroupGui.java
index e18ef66e..9c3bef3a 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorGroupGui.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorGroupGui.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorGroupSettingsGui.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorGroupSettingsGui.java
index acb80f2f..ce6085b7 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorGroupSettingsGui.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorGroupSettingsGui.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorGui.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorGui.java
index 22e6d39c..533078cf 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorGui.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorGui.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorMaterialGui.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorMaterialGui.java
index 5d509a99..121b21d8 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorMaterialGui.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorMaterialGui.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorObserverGui.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorObserverGui.java
index ef41229f..adfec3a5 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorObserverGui.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorObserverGui.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorObserverPhaseSettingsGui.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorObserverPhaseSettingsGui.java
index 503d5957..d7d54981 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorObserverPhaseSettingsGui.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorObserverPhaseSettingsGui.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorObserverSettingsGui.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorObserverSettingsGui.java
index 1abfc090..c31687f5 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorObserverSettingsGui.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorObserverSettingsGui.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorRedstoneGui.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorRedstoneGui.java
index 29589b8e..847ba882 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorRedstoneGui.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorRedstoneGui.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorRedstonePhaseSettingsGui.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorRedstonePhaseSettingsGui.java
index 6994d4e8..37825397 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorRedstonePhaseSettingsGui.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorRedstonePhaseSettingsGui.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorRedstoneSettingsGui.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorRedstoneSettingsGui.java
index 629e2aa5..23206e27 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorRedstoneSettingsGui.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorRedstoneSettingsGui.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorSettingsGui.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorSettingsGui.java
index b69ca41b..839a1fad 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorSettingsGui.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorSettingsGui.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorTNTGui.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorTNTGui.java
index 471270c9..a089f806 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorTNTGui.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorTNTGui.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorTNTPhaseSettingsGui.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorTNTPhaseSettingsGui.java
index 5b4775d3..d1850fc9 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorTNTPhaseSettingsGui.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorTNTPhaseSettingsGui.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorTNTSettingsGui.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorTNTSettingsGui.java
index 04a3334e..e835ba43 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorTNTSettingsGui.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorTNTSettingsGui.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/base/SimulatorAnvilGui.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/base/SimulatorAnvilGui.java
index e22c807a..87d4ed86 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/base/SimulatorAnvilGui.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/base/SimulatorAnvilGui.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/base/SimulatorBaseGui.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/base/SimulatorBaseGui.java
index aeb4da13..90b88f6c 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/base/SimulatorBaseGui.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/base/SimulatorBaseGui.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/base/SimulatorPageGui.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/base/SimulatorPageGui.java
index a6ff9f15..6270fd1b 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/base/SimulatorPageGui.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/base/SimulatorPageGui.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/base/SimulatorScrollGui.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/base/SimulatorScrollGui.java
index 974f64ed..57258f82 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/base/SimulatorScrollGui.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/base/SimulatorScrollGui.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/storage/SimFormatSimulatorLoader.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/storage/SimFormatSimulatorLoader.java
index f213227e..5257ce12 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/storage/SimFormatSimulatorLoader.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/storage/SimFormatSimulatorLoader.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/storage/SimulatorFormatSimulatorLoader.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/storage/SimulatorFormatSimulatorLoader.java
index a386f86d..65815440 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/storage/SimulatorFormatSimulatorLoader.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/storage/SimulatorFormatSimulatorLoader.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/storage/SimulatorLoader.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/storage/SimulatorLoader.java
index 4c9e3f92..e20de3a7 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/storage/SimulatorLoader.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/storage/SimulatorLoader.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/storage/SimulatorSaver.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/storage/SimulatorSaver.java
index 9a5f5285..1f3345e4 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/storage/SimulatorSaver.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/storage/SimulatorSaver.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/storage/YAPIONFormatSimulatorLoader.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/storage/YAPIONFormatSimulatorLoader.java
index 0c715443..c138ecb1 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/storage/YAPIONFormatSimulatorLoader.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/storage/YAPIONFormatSimulatorLoader.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/BlockBoundingBox.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/BlockBoundingBox.java
index f10811f8..223cdfe6 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/BlockBoundingBox.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/BlockBoundingBox.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.slaves.laufbau;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/BoundingBoxLoader.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/BoundingBoxLoader.java
index 7c2846b2..899c951c 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/BoundingBoxLoader.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/BoundingBoxLoader.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.slaves.laufbau;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/Cuboid.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/Cuboid.java
index c31653a5..ec959a69 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/Cuboid.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/Cuboid.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.slaves.laufbau;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/Laufbau.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/Laufbau.java
index f33f6af3..9a82f3a5 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/Laufbau.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/Laufbau.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.slaves.laufbau;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/LaufbauCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/LaufbauCommand.java
index 34beeee7..9c568a56 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/LaufbauCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/LaufbauCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.slaves.laufbau;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/LaufbauSettings.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/LaufbauSettings.java
index 17de9c68..857b1908 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/LaufbauSettings.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/LaufbauSettings.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.slaves.laufbau;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/LaufbauUtils.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/LaufbauUtils.java
index 9a9fb24a..4eb6c382 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/LaufbauUtils.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/LaufbauUtils.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.slaves.laufbau;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/AmethystBoundingBox.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/AmethystBoundingBox.java
index 5eec07ca..0972df97 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/AmethystBoundingBox.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/AmethystBoundingBox.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.slaves.laufbau.boundingboxes;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/AzaleaBoundingBox.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/AzaleaBoundingBox.java
index 8c0409da..6ee19b36 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/AzaleaBoundingBox.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/AzaleaBoundingBox.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.slaves.laufbau.boundingboxes;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/BellBoundingBox.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/BellBoundingBox.java
index b5fcbb41..eb202645 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/BellBoundingBox.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/BellBoundingBox.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.slaves.laufbau.boundingboxes;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/BrewingStandBoundingBox.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/BrewingStandBoundingBox.java
index 765bea3d..8e42712a 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/BrewingStandBoundingBox.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/BrewingStandBoundingBox.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.slaves.laufbau.boundingboxes;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/CandleBoundingBox.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/CandleBoundingBox.java
index 4efaee96..77cf6c9a 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/CandleBoundingBox.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/CandleBoundingBox.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.slaves.laufbau.boundingboxes;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/ChainBoundingBox.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/ChainBoundingBox.java
index 6dd79442..bd480390 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/ChainBoundingBox.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/ChainBoundingBox.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.slaves.laufbau.boundingboxes;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/ChorusPlantBoundingBox.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/ChorusPlantBoundingBox.java
index b169a455..e1ace28e 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/ChorusPlantBoundingBox.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/ChorusPlantBoundingBox.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.slaves.laufbau.boundingboxes;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/DragonEggBoundingBox.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/DragonEggBoundingBox.java
index 2bd6a6bb..1fea5fd8 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/DragonEggBoundingBox.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/DragonEggBoundingBox.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.slaves.laufbau.boundingboxes;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/DripLeafBoundingBox.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/DripLeafBoundingBox.java
index 30198624..f5b4e67f 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/DripLeafBoundingBox.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/DripLeafBoundingBox.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.slaves.laufbau.boundingboxes;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/FencesBoundingBox.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/FencesBoundingBox.java
index 213a2345..e19a72b5 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/FencesBoundingBox.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/FencesBoundingBox.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.slaves.laufbau.boundingboxes;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/GrindstoneBoundingBox.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/GrindstoneBoundingBox.java
index 52fa3557..59d6310d 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/GrindstoneBoundingBox.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/GrindstoneBoundingBox.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.slaves.laufbau.boundingboxes;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/HopperBoundingBox.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/HopperBoundingBox.java
index 19a095b3..655ad055 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/HopperBoundingBox.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/HopperBoundingBox.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.slaves.laufbau.boundingboxes;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/IronBarBoundingBox.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/IronBarBoundingBox.java
index e275b7b1..e75afb93 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/IronBarBoundingBox.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/IronBarBoundingBox.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.slaves.laufbau.boundingboxes;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/LanternBoundingBox.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/LanternBoundingBox.java
index 3bf275b4..2320fbcc 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/LanternBoundingBox.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/LanternBoundingBox.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.slaves.laufbau.boundingboxes;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/LecternBoundingBox.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/LecternBoundingBox.java
index 563b9bc6..ab49f3ab 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/LecternBoundingBox.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/LecternBoundingBox.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.slaves.laufbau.boundingboxes;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/StairBoundingBox.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/StairBoundingBox.java
index 23807176..ff14d1b8 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/StairBoundingBox.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/StairBoundingBox.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.slaves.laufbau.boundingboxes;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/WallBoundingBox.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/WallBoundingBox.java
index 855fe9b8..f5ccb209 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/WallBoundingBox.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/boundingboxes/WallBoundingBox.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.slaves.laufbau.boundingboxes;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/states/CreatingLaufState.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/states/CreatingLaufState.java
index e4ed312b..82b0f5f7 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/states/CreatingLaufState.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/states/CreatingLaufState.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.slaves.laufbau.states;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/states/LaufbauState.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/states/LaufbauState.java
index 6843db9e..e5769ebc 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/states/LaufbauState.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/states/LaufbauState.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.slaves.laufbau.states;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/states/ProcessingTracesState.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/states/ProcessingTracesState.java
index 94eb6549..0e21d51e 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/states/ProcessingTracesState.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/states/ProcessingTracesState.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/Panzern.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/Panzern.java
index 2823beb0..f6ce114c 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/Panzern.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/Panzern.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.slaves.panzern;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/PanzernAlgorithm.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/PanzernAlgorithm.java
index f77be675..bd1e0c9b 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/PanzernAlgorithm.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/PanzernAlgorithm.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.slaves.panzern;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/PanzernCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/PanzernCommand.java
index 6c983358..b2535d24 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/PanzernCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/PanzernCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.slaves.panzern;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/PanzernResult.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/PanzernResult.java
index 06db1e54..dfc4c41c 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/PanzernResult.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/PanzernResult.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.slaves.panzern;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/algorithms/AdjacentHoney.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/algorithms/AdjacentHoney.java
index 7dd8accd..2e4eaa9d 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/algorithms/AdjacentHoney.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/algorithms/AdjacentHoney.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.slaves.panzern.algorithms;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/algorithms/AdjacentSlime.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/algorithms/AdjacentSlime.java
index f25c55e4..cc45eda8 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/algorithms/AdjacentSlime.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/algorithms/AdjacentSlime.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.slaves.panzern.algorithms;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/algorithms/CarpetWalkWay.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/algorithms/CarpetWalkWay.java
index 58529f2c..722b17a0 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/algorithms/CarpetWalkWay.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/algorithms/CarpetWalkWay.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.slaves.panzern.algorithms;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/algorithms/LadderWalkWay.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/algorithms/LadderWalkWay.java
index 2a32bd7a..6f354c48 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/algorithms/LadderWalkWay.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/algorithms/LadderWalkWay.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.slaves.panzern.algorithms;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/algorithms/PistonLine.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/algorithms/PistonLine.java
index 3fabd420..59fd2e02 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/algorithms/PistonLine.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/algorithms/PistonLine.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.slaves.panzern.algorithms;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/algorithms/PowerableActivation.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/algorithms/PowerableActivation.java
index 41b7f69d..9466de5d 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/algorithms/PowerableActivation.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/algorithms/PowerableActivation.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.slaves.panzern.algorithms;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/algorithms/SlabOnRedstone.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/algorithms/SlabOnRedstone.java
index 207f1d57..27af48a4 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/algorithms/SlabOnRedstone.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/algorithms/SlabOnRedstone.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.slaves.panzern.algorithms;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/algorithms/SlabOnTorch.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/algorithms/SlabOnTorch.java
index beebb532..b7fbf516 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/algorithms/SlabOnTorch.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/algorithms/SlabOnTorch.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.slaves.panzern.algorithms;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/algorithms/StairWalkWay.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/algorithms/StairWalkWay.java
index 1f631afe..a2facd2a 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/algorithms/StairWalkWay.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/algorithms/StairWalkWay.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.slaves.panzern.algorithms;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/smartplace/SmartPlaceCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/smartplace/SmartPlaceCommand.java
index 526e59e6..4eac9b8f 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/smartplace/SmartPlaceCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/smartplace/SmartPlaceCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.smartplace;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/smartplace/SmartPlaceListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/smartplace/SmartPlaceListener.java
index d2c8e683..bc3d2bb0 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/smartplace/SmartPlaceListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/smartplace/SmartPlaceListener.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/team/boundary/BoundaryViewer.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/team/boundary/BoundaryViewer.java
index 3994eee8..2c0d81b9 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/team/boundary/BoundaryViewer.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/team/boundary/BoundaryViewer.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.team.boundary;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/techhider/TechHiderCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/techhider/TechHiderCommand.java
index 91a3d3a0..fe7b8a4b 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/techhider/TechHiderCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/techhider/TechHiderCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.techhider;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/testblock/blockcounter/BlockCount.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/testblock/blockcounter/BlockCount.java
index e0e79f77..06234b99 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/testblock/blockcounter/BlockCount.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/testblock/blockcounter/BlockCount.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.testblock.blockcounter;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/testblock/blockcounter/BlockCounter.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/testblock/blockcounter/BlockCounter.java
index 8b0796b8..8cb56745 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/testblock/blockcounter/BlockCounter.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/testblock/blockcounter/BlockCounter.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.testblock.blockcounter;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/testblock/blockcounter/BlockCounterCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/testblock/blockcounter/BlockCounterCommand.java
index a31cba2b..90b99526 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/testblock/blockcounter/BlockCounterCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/testblock/blockcounter/BlockCounterCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.testblock.blockcounter;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/testblock/blockcounter/BlockCounterListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/testblock/blockcounter/BlockCounterListener.java
index a891b76f..c4f711d8 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/testblock/blockcounter/BlockCounterListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/testblock/blockcounter/BlockCounterListener.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.testblock.blockcounter;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tpslimit/TPSCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tpslimit/TPSCommand.java
index f3f4cc62..265b6800 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tpslimit/TPSCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tpslimit/TPSCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.tpslimit;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tpslimit/TPSSystem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tpslimit/TPSSystem.java
index bb03ae0a..9091feed 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tpslimit/TPSSystem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tpslimit/TPSSystem.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tpslimit/TPSUtils.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tpslimit/TPSUtils.java
index d920b5fa..1d972064 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tpslimit/TPSUtils.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tpslimit/TPSUtils.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.tpslimit;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TNTPoint.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TNTPoint.java
index 73315d9a..53ac62fb 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TNTPoint.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TNTPoint.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/Trace.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/Trace.java
index 2c7cf22c..15b19470 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/Trace.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/Trace.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceCommand.java
index 9fe03e06..cfe50f55 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceCommand.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceManager.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceManager.java
index a61ed1f6..b0891a69 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceManager.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceManager.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceRecorder.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceRecorder.java
index aef9f12c..c976fa14 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceRecorder.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceRecorder.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceRecordingWrapper.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceRecordingWrapper.java
index 38cde80d..0f416915 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceRecordingWrapper.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceRecordingWrapper.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceRepository.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceRepository.java
index f64bb9a9..f0efe32a 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceRepository.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceRepository.java
@@ -1,3 +1,22 @@
+/*
+ *   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.tracer;
 
 import de.steamwar.bausystem.region.Region;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceScoreboardElement.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceScoreboardElement.java
index f7b20f8c..44fb4d63 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceScoreboardElement.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceScoreboardElement.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/rendering/BundleFilter.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/rendering/BundleFilter.java
index 9380b3f8..1337f0b4 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/rendering/BundleFilter.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/rendering/BundleFilter.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/rendering/PlayerTraceShowData.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/rendering/PlayerTraceShowData.java
index 4029f2e2..40bbb238 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/rendering/PlayerTraceShowData.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/rendering/PlayerTraceShowData.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/rendering/TraceEntity.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/rendering/TraceEntity.java
index 75b893ab..6eea719d 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/rendering/TraceEntity.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/rendering/TraceEntity.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/rendering/ViewFlag.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/rendering/ViewFlag.java
index 9aa83f13..3e1dff3e 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/rendering/ViewFlag.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/rendering/ViewFlag.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/rendering/dynamicflags/AtFlag.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/rendering/dynamicflags/AtFlag.java
index 776eead4..2826ceec 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/rendering/dynamicflags/AtFlag.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/rendering/dynamicflags/AtFlag.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/rendering/dynamicflags/IsolateFlag.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/rendering/dynamicflags/IsolateFlag.java
index 4ee99408..8c86fcaf 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/rendering/dynamicflags/IsolateFlag.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/rendering/dynamicflags/IsolateFlag.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/BindCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/BindCommand.java
index c71c8400..23443d88 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/BindCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/BindCommand.java
@@ -1,3 +1,22 @@
+/*
+ *   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.util;
 
 import com.sk89q.worldedit.EditSession;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/BookReplaceCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/BookReplaceCommand.java
index c534e38d..b5cde0e3 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/BookReplaceCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/BookReplaceCommand.java
@@ -1,3 +1,22 @@
+/*
+ *   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.util;
 
 import de.steamwar.command.SWCommand;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/ClearCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/ClearCommand.java
index f1e64ce5..af16422a 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/ClearCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/ClearCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.util;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/DebugStickCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/DebugStickCommand.java
index 5b87464c..7b64f743 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/DebugStickCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/DebugStickCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.util;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/DeclutterCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/DeclutterCommand.java
index 7d3f5938..8a613cb3 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/DeclutterCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/DeclutterCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.util;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/DragonEggCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/DragonEggCommand.java
index b9cc7442..c6bde626 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/DragonEggCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/DragonEggCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.util;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/GamemodeCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/GamemodeCommand.java
index 876586a2..9e3da950 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/GamemodeCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/GamemodeCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.util;
 
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/KillAllCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/KillAllCommand.java
index d82448a0..0f84246f 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/KillAllCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/KillAllCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.util;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/MaterialCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/MaterialCommand.java
index 5993eeec..69b53897 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/MaterialCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/MaterialCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.util;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/MaterialLazyInit.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/MaterialLazyInit.java
index 8beb38b1..f05e0de9 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/MaterialLazyInit.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/MaterialLazyInit.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.util;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/NightVisionCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/NightVisionCommand.java
index 0308846d..2f884047 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/NightVisionCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/NightVisionCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.util;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/NoClipCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/NoClipCommand.java
index 03055780..ad97dac0 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/NoClipCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/NoClipCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.util;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/PistonCalculator.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/PistonCalculator.java
index 71fbdb8a..7ca9b730 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/PistonCalculator.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/PistonCalculator.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.util;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/PistonCalculatorCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/PistonCalculatorCommand.java
index 207c3fbd..cd8c6ff6 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/PistonCalculatorCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/PistonCalculatorCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.util;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/RegionSelectionType.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/RegionSelectionType.java
index 4103dd42..93d4f089 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/RegionSelectionType.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/RegionSelectionType.java
@@ -1,3 +1,22 @@
+/*
+ *   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.util;
 
 public enum RegionSelectionType {
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/SelectCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/SelectCommand.java
index 73739e40..c4437aca 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/SelectCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/SelectCommand.java
@@ -1,3 +1,22 @@
+/*
+ *   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.util;
 
 import de.steamwar.bausystem.BauSystem;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/SkullCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/SkullCommand.java
index e7da48d1..49686d87 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/SkullCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/SkullCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.util;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/SlotCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/SlotCommand.java
index 37ff3b89..13799bcf 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/SlotCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/SlotCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.util;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/SpeedCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/SpeedCommand.java
index c8a6d2de..f756197a 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/SpeedCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/SpeedCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.util;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/StructureVoidCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/StructureVoidCommand.java
index 44bae130..ffa9a90a 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/StructureVoidCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/StructureVoidCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.util;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/TNTClickListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/TNTClickListener.java
index f412b8ad..801646d2 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/TNTClickListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/TNTClickListener.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.util;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/TeleportCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/TeleportCommand.java
index e778ba78..7d78cae6 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/TeleportCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/TeleportCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.util;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/TimeCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/TimeCommand.java
index ea38d446..94c25a92 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/TimeCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/TimeCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.util;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/ClearBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/ClearBauGuiItem.java
index 607b7398..0d748273 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/ClearBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/ClearBauGuiItem.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.util.items;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/DebugstickBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/DebugstickBauGuiItem.java
index c6341818..2dc31ca0 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/DebugstickBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/DebugstickBauGuiItem.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.util.items;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/DeclutterBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/DeclutterBauGuiItem.java
index 55bd6a02..fca8ce73 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/DeclutterBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/DeclutterBauGuiItem.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.util.items;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/GamemodeBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/GamemodeBauGuiItem.java
index 42900af8..954e3b57 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/GamemodeBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/GamemodeBauGuiItem.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.util.items;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/KillAllBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/KillAllBauGuiItem.java
index a4dd4882..510ff34d 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/KillAllBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/KillAllBauGuiItem.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.util.items;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/NavWandBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/NavWandBauGuiItem.java
index 6b9b6775..920652ff 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/NavWandBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/NavWandBauGuiItem.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.util.items;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/NightVisionBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/NightVisionBauGuiItem.java
index fb73dd8b..ca0da78c 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/NightVisionBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/NightVisionBauGuiItem.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.util.items;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/SchemBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/SchemBauGuiItem.java
index 027d6c9c..38324c33 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/SchemBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/SchemBauGuiItem.java
@@ -1,3 +1,22 @@
+/*
+ *   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.util.items;
 
 import de.steamwar.bausystem.BauSystem;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/SelectBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/SelectBauGuiItem.java
index b0feb305..387bf0ed 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/SelectBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/SelectBauGuiItem.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.util.items;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/SkullBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/SkullBauGuiItem.java
index c7e500db..71d59b0b 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/SkullBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/SkullBauGuiItem.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.util.items;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/SpeedBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/SpeedBauGuiItem.java
index d24eedf6..8a9c23bf 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/SpeedBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/SpeedBauGuiItem.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.util.items;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/TeleportBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/TeleportBauGuiItem.java
index 4569ae47..7346cd31 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/TeleportBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/TeleportBauGuiItem.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.util.items;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/WorldEditBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/WorldEditBauGuiItem.java
index 9ef2400f..9e077da1 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/WorldEditBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/WorldEditBauGuiItem.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.util.items;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/warp/Warp.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/warp/Warp.java
index 8b1b1ee7..696dac81 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/warp/Warp.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/warp/Warp.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.warp;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/warp/WarpCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/warp/WarpCommand.java
index 4b35cef7..e20a70b7 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/warp/WarpCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/warp/WarpCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.warp;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/warp/WarpGui.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/warp/WarpGui.java
index 30fd21e3..c57cc16c 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/warp/WarpGui.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/warp/WarpGui.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.warp;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/warp/WarpListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/warp/WarpListener.java
index 1d06c9e4..60121c90 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/warp/WarpListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/warp/WarpListener.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.warp;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/AFKStopperListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/AFKStopperListener.java
index 60a9651b..9af6e1a8 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/AFKStopperListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/AFKStopperListener.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.world;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/AntiBauAddMemberFix.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/AntiBauAddMemberFix.java
index 32888912..c8c40cba 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/AntiBauAddMemberFix.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/AntiBauAddMemberFix.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/AntiCursorReCentering.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/AntiCursorReCentering.java
index 46206a6c..c526d089 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/AntiCursorReCentering.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/AntiCursorReCentering.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/ArceonCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/ArceonCommand.java
index ddddaaa2..9c470cf4 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/ArceonCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/ArceonCommand.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/AxiomPermissionCheck.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/AxiomPermissionCheck.java
index 587c8d59..92c496bc 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/AxiomPermissionCheck.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/AxiomPermissionCheck.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/BauLockStateScoreboard.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/BauLockStateScoreboard.java
index 3e159311..abf90dc0 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/BauLockStateScoreboard.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/BauLockStateScoreboard.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/BauMemberUpdate.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/BauMemberUpdate.java
index 7077cd56..a60e2958 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/BauMemberUpdate.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/BauMemberUpdate.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/BauScoreboard.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/BauScoreboard.java
index b53f48c8..2993536b 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/BauScoreboard.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/BauScoreboard.java
@@ -1,3 +1,22 @@
+/*
+ *   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.world;
 
 import de.steamwar.bausystem.region.Region;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/ClipboardListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/ClipboardListener.java
index 2cb2cc7b..d3647e4e 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/ClipboardListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/ClipboardListener.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.world;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/InventoryListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/InventoryListener.java
index 6970eed7..edc9f9c2 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/InventoryListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/InventoryListener.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.world;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/ItemFrameListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/ItemFrameListener.java
index 535551ab..2f764dd2 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/ItemFrameListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/ItemFrameListener.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.world;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/KickallCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/KickallCommand.java
index 44bdb818..e9f21df5 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/KickallCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/KickallCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.world;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/NoCreativeKnockback.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/NoCreativeKnockback.java
index be950c60..602903eb 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/NoCreativeKnockback.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/NoCreativeKnockback.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.world;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/OtherTNTListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/OtherTNTListener.java
index 7cf94fc1..4deb1e5d 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/OtherTNTListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/OtherTNTListener.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.world;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/ReducedDebugInfo.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/ReducedDebugInfo.java
index c3def14b..0827a485 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/ReducedDebugInfo.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/ReducedDebugInfo.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.world;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/RestartCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/RestartCommand.java
index cf868a9d..f1a9a395 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/RestartCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/RestartCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.world;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/SignEditFrom20.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/SignEditFrom20.java
index df4164aa..6adb98f5 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/SignEditFrom20.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/SignEditFrom20.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/SignEditUntil19.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/SignEditUntil19.java
index 94b78f84..96ca0df8 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/SignEditUntil19.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/SignEditUntil19.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.world;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/SignListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/SignListener.java
index 40ad9a66..3a625870 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/SignListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/SignListener.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.world;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/SpectatorListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/SpectatorListener.java
index f1aed39f..9874c1fd 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/SpectatorListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/SpectatorListener.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/StopCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/StopCommand.java
index 68f618db..76a4253d 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/StopCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/StopCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.world;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/WorldEditListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/WorldEditListener.java
index a377db87..26943331 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/WorldEditListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/WorldEditListener.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.world;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/WorldEditSelectionSaver.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/WorldEditSelectionSaver.java
index 85351f06..e9da8ef6 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/WorldEditSelectionSaver.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/WorldEditSelectionSaver.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/ColorReplaceCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/ColorReplaceCommand.java
index f3efca4b..c338f984 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/ColorReplaceCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/ColorReplaceCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/SelectAdjacent.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/SelectAdjacent.java
index abc8064e..518ca00c 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/SelectAdjacent.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/SelectAdjacent.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/TypeReplaceCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/TypeReplaceCommand.java
index 8013c92b..ec8f4d5f 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/TypeReplaceCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/TypeReplaceCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/mask/above/AboveMask.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/mask/above/AboveMask.java
index 34a5a4c1..8ab2802e 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/mask/above/AboveMask.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/mask/above/AboveMask.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.mask.above;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/mask/above/FAWEAboveMaskParser.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/mask/above/FAWEAboveMaskParser.java
index 58130f47..f55afce8 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/mask/above/FAWEAboveMaskParser.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/mask/above/FAWEAboveMaskParser.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.mask.above;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/mask/below/BelowMask.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/mask/below/BelowMask.java
index 7407b51a..c5f699d4 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/mask/below/BelowMask.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/mask/below/BelowMask.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.mask.below;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/mask/below/FAWEBelowMaskParser.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/mask/below/FAWEBelowMaskParser.java
index 449db3bf..613e3e61 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/mask/below/FAWEBelowMaskParser.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/mask/below/FAWEBelowMaskParser.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.mask.below;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/mask/checkerboard3d/Checkerboard3DMask.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/mask/checkerboard3d/Checkerboard3DMask.java
index cc52b9cc..9846d448 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/mask/checkerboard3d/Checkerboard3DMask.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/mask/checkerboard3d/Checkerboard3DMask.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.mask.checkerboard3d;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/mask/checkerboard3d/FAWECheckerboard3DMaskParser.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/mask/checkerboard3d/FAWECheckerboard3DMaskParser.java
index 84cd46c6..6ae6958b 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/mask/checkerboard3d/FAWECheckerboard3DMaskParser.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/mask/checkerboard3d/FAWECheckerboard3DMaskParser.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.mask.checkerboard3d;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/mask/checkerboard3d/FAWECheckerboardMaskParser.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/mask/checkerboard3d/FAWECheckerboardMaskParser.java
index 3036ba8e..4b97b918 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/mask/checkerboard3d/FAWECheckerboardMaskParser.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/mask/checkerboard3d/FAWECheckerboardMaskParser.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.mask.checkerboard3d;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/mask/grid/FAWEGridMaskParser.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/mask/grid/FAWEGridMaskParser.java
index 85a01162..773dc5ab 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/mask/grid/FAWEGridMaskParser.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/mask/grid/FAWEGridMaskParser.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.mask.grid;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/mask/grid/GridMask.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/mask/grid/GridMask.java
index 4e6570ec..f172eecf 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/mask/grid/GridMask.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/mask/grid/GridMask.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.mask.grid;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/pattern/gradient/FAWEGradientPatternParser.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/pattern/gradient/FAWEGradientPatternParser.java
index d8065658..7794a2de 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/pattern/gradient/FAWEGradientPatternParser.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/pattern/gradient/FAWEGradientPatternParser.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.pattern.gradient;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/pattern/gradient/GradientPattern.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/pattern/gradient/GradientPattern.java
index c712cf38..553cd155 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/pattern/gradient/GradientPattern.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/pattern/gradient/GradientPattern.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.pattern.gradient;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/utils/FAWEMaskParser.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/utils/FAWEMaskParser.java
index 1a2f54ee..f6bf70c7 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/utils/FAWEMaskParser.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/utils/FAWEMaskParser.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.utils;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/utils/FAWEPatternParser.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/utils/FAWEPatternParser.java
index 9894933c..7851ceaa 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/utils/FAWEPatternParser.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/utils/FAWEPatternParser.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.utils;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/utils/SpecialReplace.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/utils/SpecialReplace.java
index e665d1af..489ccbfe 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/utils/SpecialReplace.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/utils/SpecialReplace.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.utils;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/xray/XrayCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/xray/XrayCommand.java
index 19f0a390..29c83ec8 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/xray/XrayCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/xray/XrayCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.xray;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/linkage/specific/BauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/linkage/specific/BauGuiItem.java
index b14327b7..85e218ee 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/linkage/specific/BauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/linkage/specific/BauGuiItem.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.linkage.specific;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/linkage/specific/GuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/linkage/specific/GuiItem.java
index 804db252..713bc75f 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/linkage/specific/GuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/linkage/specific/GuiItem.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.linkage.specific;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/BackupScheduler.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/BackupScheduler.java
index 2f42e205..00b666e1 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/BackupScheduler.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/BackupScheduler.java
@@ -1,3 +1,22 @@
+/*
+ *   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;
 
 import de.steamwar.bausystem.BauSystem;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/FlagOptional.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/FlagOptional.java
index e3e725fc..9b91066d 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/FlagOptional.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/FlagOptional.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/FlagStorage.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/FlagStorage.java
index 3b2cdde3..5a706392 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/FlagStorage.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/FlagStorage.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/GameModeConfig.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/GameModeConfig.java
index 82d59036..ee4089ab 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/GameModeConfig.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/GameModeConfig.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Point.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Point.java
index da8b68c5..8d8bb212 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Point.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Point.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
index 4b91f9fe..4b99d523 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionBackups.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionBackups.java
index b49e949a..14c3e4a3 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionBackups.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionBackups.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionData.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionData.java
index 615da706..e2f9d1a1 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionData.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionData.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionFlagPolicy.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionFlagPolicy.java
index ecc3d136..3c48505c 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionFlagPolicy.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionFlagPolicy.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionHistory.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionHistory.java
index ef597cd2..839c0a4f 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionHistory.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionHistory.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionSystem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionSystem.java
index 5d967f1a..0a657a84 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionSystem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionSystem.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionType.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionType.java
index dda01029..fd16e54d 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionType.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionType.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionUtils.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionUtils.java
index be9b0887..55203dc8 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionUtils.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionUtils.java
@@ -1,3 +1,22 @@
+/*
+ *   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;
 
 import de.steamwar.bausystem.BauSystem;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ChangedMode.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ChangedMode.java
index 07b054b7..4aa63c6e 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ChangedMode.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ChangedMode.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ColorMode.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ColorMode.java
index 60d8abfa..461cee0c 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ColorMode.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ColorMode.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/FireMode.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/FireMode.java
index 1c48b649..5baab3ef 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/FireMode.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/FireMode.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/Flag.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/Flag.java
index 19a5082f..f2213470 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/Flag.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/Flag.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2025  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/FreezeMode.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/FreezeMode.java
index ad3f0d09..65a9e661 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/FreezeMode.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/FreezeMode.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ItemMode.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ItemMode.java
index 60235e4f..d80492f2 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ItemMode.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ItemMode.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/NoGravityMode.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/NoGravityMode.java
index 98bd0b5f..f000ab12 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/NoGravityMode.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/NoGravityMode.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ProtectMode.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ProtectMode.java
index 7805d49b..422a6b43 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ProtectMode.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ProtectMode.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/TNTMode.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/TNTMode.java
index 8c7d61f5..a934f3d9 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/TNTMode.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/TNTMode.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/TestblockMode.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/TestblockMode.java
index e89ab19f..3f3a953e 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/TestblockMode.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/TestblockMode.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/utils/RegionExtensionType.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/utils/RegionExtensionType.java
index b28031f5..29b6a140 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/utils/RegionExtensionType.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/utils/RegionExtensionType.java
@@ -1,3 +1,22 @@
+/*
+ *   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.utils;
 
 import lombok.Getter;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/utils/RegionType.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/utils/RegionType.java
index 27412cec..e2dcd0e9 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/utils/RegionType.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/utils/RegionType.java
@@ -1,3 +1,22 @@
+/*
+ *   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.utils;
 
 import de.steamwar.bausystem.region.Point;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/shared/EnumDisplay.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/shared/EnumDisplay.java
index b9cf839c..c1e3c2b8 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/shared/EnumDisplay.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/shared/EnumDisplay.java
@@ -1,3 +1,22 @@
+/*
+ *   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.shared;
 
 public interface EnumDisplay {
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/shared/Pair.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/shared/Pair.java
index 9d808fbb..cffb9683 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/shared/Pair.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/shared/Pair.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.shared;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/shared/Position.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/shared/Position.java
index a0ae2560..ea653830 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/shared/Position.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/shared/Position.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.shared;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/shared/ReferenceCounter.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/shared/ReferenceCounter.java
index 0ccbe672..55237743 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/shared/ReferenceCounter.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/shared/ReferenceCounter.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.shared;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/shared/RoundedPosition.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/shared/RoundedPosition.java
index 23aed77f..2a017271 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/shared/RoundedPosition.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/shared/RoundedPosition.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.shared;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/shared/ShowMode.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/shared/ShowMode.java
index a37daa40..449764f8 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/shared/ShowMode.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/shared/ShowMode.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.shared;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/shared/SizedStack.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/shared/SizedStack.java
index 6aa7b619..751adec3 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/shared/SizedStack.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/shared/SizedStack.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.shared;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/BauMemberUpdateEvent.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/BauMemberUpdateEvent.java
index 77f2ba3e..833d88ab 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/BauMemberUpdateEvent.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/BauMemberUpdateEvent.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/FlatteningWrapper.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/FlatteningWrapper.java
index 3cd96295..412e505c 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/FlatteningWrapper.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/FlatteningWrapper.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.utils;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/ItemUtils.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/ItemUtils.java
index 9c71993c..64bd9197 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/ItemUtils.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/ItemUtils.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.utils;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/ListChatView.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/ListChatView.java
index 09791378..bfc1101f 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/ListChatView.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/ListChatView.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.utils;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/NMSWrapper.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/NMSWrapper.java
index 2c6424c5..2e69eb49 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/NMSWrapper.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/NMSWrapper.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.utils;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/PasteBuilder.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/PasteBuilder.java
index 0622bb11..f6b05414 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/PasteBuilder.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/PasteBuilder.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/PlaceItemUtils.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/PlaceItemUtils.java
index 6ada6d86..4e7c8f12 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/PlaceItemUtils.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/PlaceItemUtils.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/PlaceItemWrapper.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/PlaceItemWrapper.java
index d518adbc..a913cd15 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/PlaceItemWrapper.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/PlaceItemWrapper.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/PlayerMovementWrapper.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/PlayerMovementWrapper.java
index b0cebfdd..79c52f0c 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/PlayerMovementWrapper.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/PlayerMovementWrapper.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.utils;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/RayTraceUtils.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/RayTraceUtils.java
index 013aff47..72ae2750 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/RayTraceUtils.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/RayTraceUtils.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.utils;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/ScoreboardElement.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/ScoreboardElement.java
index 5f573322..6867bc92 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/ScoreboardElement.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/ScoreboardElement.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.utils;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/TickEndEvent.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/TickEndEvent.java
index 11b90f80..ad145dbe 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/TickEndEvent.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/TickEndEvent.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/TickListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/TickListener.java
index 029a2e5c..a300b0ca 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/TickListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/TickListener.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/TickStartEvent.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/TickStartEvent.java
index 1134a832..fbb02f22 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/TickStartEvent.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/TickStartEvent.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/TimeScoreboardElement.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/TimeScoreboardElement.java
index d3ca0fea..f1f7cbdf 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/TimeScoreboardElement.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/TimeScoreboardElement.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.utils;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/WorldEditUtils.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/WorldEditUtils.java
index 3fef4e48..078a32fd 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/WorldEditUtils.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/WorldEditUtils.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.utils;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/bossbar/BauSystemBossbar.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/bossbar/BauSystemBossbar.java
index e72e0b53..35b5bbf8 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/bossbar/BauSystemBossbar.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/bossbar/BauSystemBossbar.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.utils.bossbar;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/bossbar/BossBarService.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/bossbar/BossBarService.java
index 7bb57c78..1b610ecf 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/bossbar/BossBarService.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/bossbar/BossBarService.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.utils.bossbar;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/bossbar/GlobalBossbar.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/bossbar/GlobalBossbar.java
index 47f57907..dee1e030 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/bossbar/GlobalBossbar.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/bossbar/GlobalBossbar.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.utils.bossbar;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/bossbar/RegionedBossbar.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/bossbar/RegionedBossbar.java
index 0df1ca4c..fa23de99 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/bossbar/RegionedBossbar.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/bossbar/RegionedBossbar.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.utils.bossbar;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/worlddata/SimulatorData.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/worlddata/SimulatorData.java
index 7b3687b8..1b8a4f9b 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/worlddata/SimulatorData.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/worlddata/SimulatorData.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.worlddata;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/worlddata/WorldData.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/worlddata/WorldData.java
index bfbca11e..bd661172 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/worlddata/WorldData.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/worlddata/WorldData.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.worlddata;
diff --git a/BauSystem/BauSystem_RegionFixed/build.gradle.kts b/BauSystem/BauSystem_RegionFixed/build.gradle.kts
index b33f5f0a..beb90143 100644
--- a/BauSystem/BauSystem_RegionFixed/build.gradle.kts
+++ b/BauSystem/BauSystem_RegionFixed/build.gradle.kts
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedRegionSystem.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedRegionSystem.java
index df41ac6f..7b363d53 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedRegionSystem.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedRegionSystem.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedFlagStorage.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedFlagStorage.java
index 1b6f358b..293e0121 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedFlagStorage.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedFlagStorage.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.fixed;
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalFlagStorage.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalFlagStorage.java
index d699eb08..1fc4be27 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalFlagStorage.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalFlagStorage.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.fixed;
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalRegion.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalRegion.java
index 0eaaf87c..66f7c44a 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalRegion.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalRegion.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.fixed;
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java
index c04a3ef7..d6278424 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.fixed;
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/Prototype.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/Prototype.java
index 3e4a7248..948ab301 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/Prototype.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/Prototype.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.fixed;
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/loader/PrototypeLoader.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/loader/PrototypeLoader.java
index 3bcdefff..21d3da17 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/loader/PrototypeLoader.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/loader/PrototypeLoader.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.fixed.loader;
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/loader/RegionLoader.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/loader/RegionLoader.java
index e88c24e6..98967789 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/loader/RegionLoader.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/loader/RegionLoader.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.fixed.loader;
diff --git a/BauSystem/build.gradle.kts b/BauSystem/build.gradle.kts
index 5c1f2608..aeade561 100644
--- a/BauSystem/build.gradle.kts
+++ b/BauSystem/build.gradle.kts
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/CommandFramework/build.gradle.kts b/CommandFramework/build.gradle.kts
index 7fcb7845..8513c822 100644
--- a/CommandFramework/build.gradle.kts
+++ b/CommandFramework/build.gradle.kts
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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/>.
  */
 
 plugins {
diff --git a/CommandFramework/src/de/steamwar/command/AbstractSWCommand.java b/CommandFramework/src/de/steamwar/command/AbstractSWCommand.java
index 65f6643c..22acbe6b 100644
--- a/CommandFramework/src/de/steamwar/command/AbstractSWCommand.java
+++ b/CommandFramework/src/de/steamwar/command/AbstractSWCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.command;
diff --git a/CommandFramework/src/de/steamwar/command/AbstractTypeMapper.java b/CommandFramework/src/de/steamwar/command/AbstractTypeMapper.java
index 040f3031..1753c3a1 100644
--- a/CommandFramework/src/de/steamwar/command/AbstractTypeMapper.java
+++ b/CommandFramework/src/de/steamwar/command/AbstractTypeMapper.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.command;
diff --git a/CommandFramework/src/de/steamwar/command/AbstractValidator.java b/CommandFramework/src/de/steamwar/command/AbstractValidator.java
index 7dc0b72f..a45cef19 100644
--- a/CommandFramework/src/de/steamwar/command/AbstractValidator.java
+++ b/CommandFramework/src/de/steamwar/command/AbstractValidator.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.command;
diff --git a/CommandFramework/src/de/steamwar/command/CommandFrameworkException.java b/CommandFramework/src/de/steamwar/command/CommandFrameworkException.java
index ea3d8356..6d32fd9b 100644
--- a/CommandFramework/src/de/steamwar/command/CommandFrameworkException.java
+++ b/CommandFramework/src/de/steamwar/command/CommandFrameworkException.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.command;
diff --git a/CommandFramework/src/de/steamwar/command/CommandMetaData.java b/CommandFramework/src/de/steamwar/command/CommandMetaData.java
index 33909ac7..914b5e9f 100644
--- a/CommandFramework/src/de/steamwar/command/CommandMetaData.java
+++ b/CommandFramework/src/de/steamwar/command/CommandMetaData.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.command;
diff --git a/CommandFramework/src/de/steamwar/command/CommandParseException.java b/CommandFramework/src/de/steamwar/command/CommandParseException.java
index 3d81ea69..5f60e1f1 100644
--- a/CommandFramework/src/de/steamwar/command/CommandParseException.java
+++ b/CommandFramework/src/de/steamwar/command/CommandParseException.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.command;
diff --git a/CommandFramework/src/de/steamwar/command/CommandPart.java b/CommandFramework/src/de/steamwar/command/CommandPart.java
index 02991b40..3a903bea 100644
--- a/CommandFramework/src/de/steamwar/command/CommandPart.java
+++ b/CommandFramework/src/de/steamwar/command/CommandPart.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.command;
diff --git a/CommandFramework/src/de/steamwar/command/PreviousArguments.java b/CommandFramework/src/de/steamwar/command/PreviousArguments.java
index e9851c07..d3603999 100644
--- a/CommandFramework/src/de/steamwar/command/PreviousArguments.java
+++ b/CommandFramework/src/de/steamwar/command/PreviousArguments.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.command;
diff --git a/CommandFramework/src/de/steamwar/command/SWCommandUtils.java b/CommandFramework/src/de/steamwar/command/SWCommandUtils.java
index ed16eab8..193b7c90 100644
--- a/CommandFramework/src/de/steamwar/command/SWCommandUtils.java
+++ b/CommandFramework/src/de/steamwar/command/SWCommandUtils.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.command;
diff --git a/CommandFramework/src/de/steamwar/command/SWTypeMapperCreator.java b/CommandFramework/src/de/steamwar/command/SWTypeMapperCreator.java
index f21b0a82..352af610 100644
--- a/CommandFramework/src/de/steamwar/command/SWTypeMapperCreator.java
+++ b/CommandFramework/src/de/steamwar/command/SWTypeMapperCreator.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.command;
diff --git a/CommandFramework/src/de/steamwar/command/SubCommand.java b/CommandFramework/src/de/steamwar/command/SubCommand.java
index 368a8178..d3ac8482 100644
--- a/CommandFramework/src/de/steamwar/command/SubCommand.java
+++ b/CommandFramework/src/de/steamwar/command/SubCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.command;
diff --git a/CommandFramework/src/de/steamwar/command/TabCompletionCache.java b/CommandFramework/src/de/steamwar/command/TabCompletionCache.java
index 551ce19f..a9a27bb3 100644
--- a/CommandFramework/src/de/steamwar/command/TabCompletionCache.java
+++ b/CommandFramework/src/de/steamwar/command/TabCompletionCache.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.command;
diff --git a/CommandFramework/testsrc/de/steamwar/AssertionUtils.java b/CommandFramework/testsrc/de/steamwar/AssertionUtils.java
index ed8c8ca0..a815e7b1 100644
--- a/CommandFramework/testsrc/de/steamwar/AssertionUtils.java
+++ b/CommandFramework/testsrc/de/steamwar/AssertionUtils.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/CommandFramework/testsrc/de/steamwar/command/ArgumentCommand.java b/CommandFramework/testsrc/de/steamwar/command/ArgumentCommand.java
index 41f59c75..920f0f77 100644
--- a/CommandFramework/testsrc/de/steamwar/command/ArgumentCommand.java
+++ b/CommandFramework/testsrc/de/steamwar/command/ArgumentCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.command;
diff --git a/CommandFramework/testsrc/de/steamwar/command/ArgumentCommandTest.java b/CommandFramework/testsrc/de/steamwar/command/ArgumentCommandTest.java
index b46c1844..6bae3c72 100644
--- a/CommandFramework/testsrc/de/steamwar/command/ArgumentCommandTest.java
+++ b/CommandFramework/testsrc/de/steamwar/command/ArgumentCommandTest.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.command;
diff --git a/CommandFramework/testsrc/de/steamwar/command/BetterExceptionCommand.java b/CommandFramework/testsrc/de/steamwar/command/BetterExceptionCommand.java
index feb47fc6..10a0f618 100644
--- a/CommandFramework/testsrc/de/steamwar/command/BetterExceptionCommand.java
+++ b/CommandFramework/testsrc/de/steamwar/command/BetterExceptionCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.command;
diff --git a/CommandFramework/testsrc/de/steamwar/command/BetterExceptionCommandTest.java b/CommandFramework/testsrc/de/steamwar/command/BetterExceptionCommandTest.java
index 170ad60b..9961d778 100644
--- a/CommandFramework/testsrc/de/steamwar/command/BetterExceptionCommandTest.java
+++ b/CommandFramework/testsrc/de/steamwar/command/BetterExceptionCommandTest.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.command;
diff --git a/CommandFramework/testsrc/de/steamwar/command/CacheCommand.java b/CommandFramework/testsrc/de/steamwar/command/CacheCommand.java
index 7cfdb726..5d469c87 100644
--- a/CommandFramework/testsrc/de/steamwar/command/CacheCommand.java
+++ b/CommandFramework/testsrc/de/steamwar/command/CacheCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.command;
diff --git a/CommandFramework/testsrc/de/steamwar/command/CacheCommandTest.java b/CommandFramework/testsrc/de/steamwar/command/CacheCommandTest.java
index 4a6e183f..5791f1f2 100644
--- a/CommandFramework/testsrc/de/steamwar/command/CacheCommandTest.java
+++ b/CommandFramework/testsrc/de/steamwar/command/CacheCommandTest.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.command;
diff --git a/CommandFramework/testsrc/de/steamwar/command/NullMapperCommand.java b/CommandFramework/testsrc/de/steamwar/command/NullMapperCommand.java
index 30f4061a..8bc92d9b 100644
--- a/CommandFramework/testsrc/de/steamwar/command/NullMapperCommand.java
+++ b/CommandFramework/testsrc/de/steamwar/command/NullMapperCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.command;
diff --git a/CommandFramework/testsrc/de/steamwar/command/NullMapperCommandTest.java b/CommandFramework/testsrc/de/steamwar/command/NullMapperCommandTest.java
index 1e19d133..abedf780 100644
--- a/CommandFramework/testsrc/de/steamwar/command/NullMapperCommandTest.java
+++ b/CommandFramework/testsrc/de/steamwar/command/NullMapperCommandTest.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.command;
diff --git a/CommandFramework/testsrc/de/steamwar/command/NumberValidatorCommand.java b/CommandFramework/testsrc/de/steamwar/command/NumberValidatorCommand.java
index 9ba53a64..89a2c660 100644
--- a/CommandFramework/testsrc/de/steamwar/command/NumberValidatorCommand.java
+++ b/CommandFramework/testsrc/de/steamwar/command/NumberValidatorCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.command;
diff --git a/CommandFramework/testsrc/de/steamwar/command/NumberValidatorCommandTest.java b/CommandFramework/testsrc/de/steamwar/command/NumberValidatorCommandTest.java
index c45b4a86..b54bc06c 100644
--- a/CommandFramework/testsrc/de/steamwar/command/NumberValidatorCommandTest.java
+++ b/CommandFramework/testsrc/de/steamwar/command/NumberValidatorCommandTest.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.command;
diff --git a/CommandFramework/testsrc/de/steamwar/command/PartOfCommand.java b/CommandFramework/testsrc/de/steamwar/command/PartOfCommand.java
index 9c66a4b6..f5e1b8b4 100644
--- a/CommandFramework/testsrc/de/steamwar/command/PartOfCommand.java
+++ b/CommandFramework/testsrc/de/steamwar/command/PartOfCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.command;
diff --git a/CommandFramework/testsrc/de/steamwar/command/PartOfCommandTest.java b/CommandFramework/testsrc/de/steamwar/command/PartOfCommandTest.java
index 726384e1..7da73f1b 100644
--- a/CommandFramework/testsrc/de/steamwar/command/PartOfCommandTest.java
+++ b/CommandFramework/testsrc/de/steamwar/command/PartOfCommandTest.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.command;
diff --git a/CommandFramework/testsrc/de/steamwar/command/PreviousArgumentCommand.java b/CommandFramework/testsrc/de/steamwar/command/PreviousArgumentCommand.java
index 454283c9..ca984851 100644
--- a/CommandFramework/testsrc/de/steamwar/command/PreviousArgumentCommand.java
+++ b/CommandFramework/testsrc/de/steamwar/command/PreviousArgumentCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.command;
diff --git a/CommandFramework/testsrc/de/steamwar/command/PreviousArgumentCommandTest.java b/CommandFramework/testsrc/de/steamwar/command/PreviousArgumentCommandTest.java
index 941b1c3e..7ef460f9 100644
--- a/CommandFramework/testsrc/de/steamwar/command/PreviousArgumentCommandTest.java
+++ b/CommandFramework/testsrc/de/steamwar/command/PreviousArgumentCommandTest.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.command;
diff --git a/CommandFramework/testsrc/de/steamwar/command/SimpleCommand.java b/CommandFramework/testsrc/de/steamwar/command/SimpleCommand.java
index 7388633c..3cdb683f 100644
--- a/CommandFramework/testsrc/de/steamwar/command/SimpleCommand.java
+++ b/CommandFramework/testsrc/de/steamwar/command/SimpleCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.command;
diff --git a/CommandFramework/testsrc/de/steamwar/command/SimpleCommandTest.java b/CommandFramework/testsrc/de/steamwar/command/SimpleCommandTest.java
index aebd904f..7670215a 100644
--- a/CommandFramework/testsrc/de/steamwar/command/SimpleCommandTest.java
+++ b/CommandFramework/testsrc/de/steamwar/command/SimpleCommandTest.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.command;
diff --git a/CommandFramework/testsrc/de/steamwar/command/StaticValueCommand.java b/CommandFramework/testsrc/de/steamwar/command/StaticValueCommand.java
index 0eca60da..55f96d42 100644
--- a/CommandFramework/testsrc/de/steamwar/command/StaticValueCommand.java
+++ b/CommandFramework/testsrc/de/steamwar/command/StaticValueCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.command;
diff --git a/CommandFramework/testsrc/de/steamwar/command/StaticValueCommandTest.java b/CommandFramework/testsrc/de/steamwar/command/StaticValueCommandTest.java
index 75a7dfd6..926b9234 100644
--- a/CommandFramework/testsrc/de/steamwar/command/StaticValueCommandTest.java
+++ b/CommandFramework/testsrc/de/steamwar/command/StaticValueCommandTest.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.command;
diff --git a/CommandFramework/testsrc/de/steamwar/command/SubCMDSortingCommand.java b/CommandFramework/testsrc/de/steamwar/command/SubCMDSortingCommand.java
index 8b287608..de9a85a7 100644
--- a/CommandFramework/testsrc/de/steamwar/command/SubCMDSortingCommand.java
+++ b/CommandFramework/testsrc/de/steamwar/command/SubCMDSortingCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.command;
diff --git a/CommandFramework/testsrc/de/steamwar/command/SubCMDSortingCommandTest.java b/CommandFramework/testsrc/de/steamwar/command/SubCMDSortingCommandTest.java
index 1f3203c6..8b8f6a87 100644
--- a/CommandFramework/testsrc/de/steamwar/command/SubCMDSortingCommandTest.java
+++ b/CommandFramework/testsrc/de/steamwar/command/SubCMDSortingCommandTest.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.command;
diff --git a/CommandFramework/testsrc/de/steamwar/command/TypeMapperCommand.java b/CommandFramework/testsrc/de/steamwar/command/TypeMapperCommand.java
index a81500f5..ed76578c 100644
--- a/CommandFramework/testsrc/de/steamwar/command/TypeMapperCommand.java
+++ b/CommandFramework/testsrc/de/steamwar/command/TypeMapperCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.command;
diff --git a/CommandFramework/testsrc/de/steamwar/command/TypeMapperCommandTest.java b/CommandFramework/testsrc/de/steamwar/command/TypeMapperCommandTest.java
index 32b5b47e..14420f48 100644
--- a/CommandFramework/testsrc/de/steamwar/command/TypeMapperCommandTest.java
+++ b/CommandFramework/testsrc/de/steamwar/command/TypeMapperCommandTest.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.command;
diff --git a/CommandFramework/testsrc/de/steamwar/command/ValidatorCommand.java b/CommandFramework/testsrc/de/steamwar/command/ValidatorCommand.java
index b0e4a363..67846917 100644
--- a/CommandFramework/testsrc/de/steamwar/command/ValidatorCommand.java
+++ b/CommandFramework/testsrc/de/steamwar/command/ValidatorCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.command;
diff --git a/CommandFramework/testsrc/de/steamwar/command/ValidatorCommandTest.java b/CommandFramework/testsrc/de/steamwar/command/ValidatorCommandTest.java
index 142d518e..94e4487b 100644
--- a/CommandFramework/testsrc/de/steamwar/command/ValidatorCommandTest.java
+++ b/CommandFramework/testsrc/de/steamwar/command/ValidatorCommandTest.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.command;
diff --git a/CommandFramework/testsrc/de/steamwar/command/ValidatorInvertCommand.java b/CommandFramework/testsrc/de/steamwar/command/ValidatorInvertCommand.java
index 90076973..d75f26f0 100644
--- a/CommandFramework/testsrc/de/steamwar/command/ValidatorInvertCommand.java
+++ b/CommandFramework/testsrc/de/steamwar/command/ValidatorInvertCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.command;
diff --git a/CommandFramework/testsrc/de/steamwar/command/dto/ExecutionIdentifier.java b/CommandFramework/testsrc/de/steamwar/command/dto/ExecutionIdentifier.java
index d03b78f7..76c54245 100644
--- a/CommandFramework/testsrc/de/steamwar/command/dto/ExecutionIdentifier.java
+++ b/CommandFramework/testsrc/de/steamwar/command/dto/ExecutionIdentifier.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.command.dto;
diff --git a/CommandFramework/testsrc/de/steamwar/command/dto/TestSWCommand.java b/CommandFramework/testsrc/de/steamwar/command/dto/TestSWCommand.java
index e0ac34b0..4a4ec8ed 100644
--- a/CommandFramework/testsrc/de/steamwar/command/dto/TestSWCommand.java
+++ b/CommandFramework/testsrc/de/steamwar/command/dto/TestSWCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.command.dto;
diff --git a/CommandFramework/testsrc/de/steamwar/command/dto/TestTypeMapper.java b/CommandFramework/testsrc/de/steamwar/command/dto/TestTypeMapper.java
index 96c4c6c2..ac1219d5 100644
--- a/CommandFramework/testsrc/de/steamwar/command/dto/TestTypeMapper.java
+++ b/CommandFramework/testsrc/de/steamwar/command/dto/TestTypeMapper.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.command.dto;
diff --git a/CommandFramework/testsrc/de/steamwar/command/dto/TestValidator.java b/CommandFramework/testsrc/de/steamwar/command/dto/TestValidator.java
index 8cf0495c..c0225e73 100644
--- a/CommandFramework/testsrc/de/steamwar/command/dto/TestValidator.java
+++ b/CommandFramework/testsrc/de/steamwar/command/dto/TestValidator.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.command.dto;
diff --git a/CommonCore/Data/build.gradle.kts b/CommonCore/Data/build.gradle.kts
index da326bfe..a8ffa845 100644
--- a/CommonCore/Data/build.gradle.kts
+++ b/CommonCore/Data/build.gradle.kts
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/CommonCore/Data/src/de/steamwar/data/CMDs.java b/CommonCore/Data/src/de/steamwar/data/CMDs.java
index 996df130..855c764c 100644
--- a/CommonCore/Data/src/de/steamwar/data/CMDs.java
+++ b/CommonCore/Data/src/de/steamwar/data/CMDs.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.data;
diff --git a/CommonCore/Linkage/build.gradle.kts b/CommonCore/Linkage/build.gradle.kts
index dd139c6b..fdc8d762 100644
--- a/CommonCore/Linkage/build.gradle.kts
+++ b/CommonCore/Linkage/build.gradle.kts
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/CommonCore/Linkage/src/de/steamwar/linkage/AbstractLinker.java b/CommonCore/Linkage/src/de/steamwar/linkage/AbstractLinker.java
index 4d663920..b11cf0b8 100644
--- a/CommonCore/Linkage/src/de/steamwar/linkage/AbstractLinker.java
+++ b/CommonCore/Linkage/src/de/steamwar/linkage/AbstractLinker.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.linkage;
diff --git a/CommonCore/Linkage/src/de/steamwar/linkage/EventMode.java b/CommonCore/Linkage/src/de/steamwar/linkage/EventMode.java
index 513982aa..02acc961 100644
--- a/CommonCore/Linkage/src/de/steamwar/linkage/EventMode.java
+++ b/CommonCore/Linkage/src/de/steamwar/linkage/EventMode.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.linkage;
diff --git a/CommonCore/Linkage/src/de/steamwar/linkage/Linked.java b/CommonCore/Linkage/src/de/steamwar/linkage/Linked.java
index f3e7ca0d..465600b1 100644
--- a/CommonCore/Linkage/src/de/steamwar/linkage/Linked.java
+++ b/CommonCore/Linkage/src/de/steamwar/linkage/Linked.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.linkage;
diff --git a/CommonCore/Linkage/src/de/steamwar/linkage/LinkedInstance.java b/CommonCore/Linkage/src/de/steamwar/linkage/LinkedInstance.java
index 8fdbc9be..cd80fb21 100644
--- a/CommonCore/Linkage/src/de/steamwar/linkage/LinkedInstance.java
+++ b/CommonCore/Linkage/src/de/steamwar/linkage/LinkedInstance.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.linkage;
diff --git a/CommonCore/Linkage/src/de/steamwar/linkage/MaxVersion.java b/CommonCore/Linkage/src/de/steamwar/linkage/MaxVersion.java
index 79dbfe94..eba760d4 100644
--- a/CommonCore/Linkage/src/de/steamwar/linkage/MaxVersion.java
+++ b/CommonCore/Linkage/src/de/steamwar/linkage/MaxVersion.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.linkage;
diff --git a/CommonCore/Linkage/src/de/steamwar/linkage/MinVersion.java b/CommonCore/Linkage/src/de/steamwar/linkage/MinVersion.java
index efabd281..e87bd05b 100644
--- a/CommonCore/Linkage/src/de/steamwar/linkage/MinVersion.java
+++ b/CommonCore/Linkage/src/de/steamwar/linkage/MinVersion.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.linkage;
diff --git a/CommonCore/Linkage/src/de/steamwar/linkage/PluginCheck.java b/CommonCore/Linkage/src/de/steamwar/linkage/PluginCheck.java
index 332e2b4f..93a7b542 100644
--- a/CommonCore/Linkage/src/de/steamwar/linkage/PluginCheck.java
+++ b/CommonCore/Linkage/src/de/steamwar/linkage/PluginCheck.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.linkage;
diff --git a/CommonCore/Linkage/src/de/steamwar/linkage/api/Disable.java b/CommonCore/Linkage/src/de/steamwar/linkage/api/Disable.java
index 2ce273d9..c4314204 100644
--- a/CommonCore/Linkage/src/de/steamwar/linkage/api/Disable.java
+++ b/CommonCore/Linkage/src/de/steamwar/linkage/api/Disable.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/CommonCore/Linkage/src/de/steamwar/linkage/api/Enable.java b/CommonCore/Linkage/src/de/steamwar/linkage/api/Enable.java
index df52baca..c82f0799 100644
--- a/CommonCore/Linkage/src/de/steamwar/linkage/api/Enable.java
+++ b/CommonCore/Linkage/src/de/steamwar/linkage/api/Enable.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/CommonCore/Network/build.gradle.kts b/CommonCore/Network/build.gradle.kts
index b633ca63..8513c822 100644
--- a/CommonCore/Network/build.gradle.kts
+++ b/CommonCore/Network/build.gradle.kts
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/CommonCore/Network/src/de/steamwar/network/packets/MetaInfos.java b/CommonCore/Network/src/de/steamwar/network/packets/MetaInfos.java
index 61632d7c..7522ba1a 100644
--- a/CommonCore/Network/src/de/steamwar/network/packets/MetaInfos.java
+++ b/CommonCore/Network/src/de/steamwar/network/packets/MetaInfos.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.network.packets;
diff --git a/CommonCore/Network/src/de/steamwar/network/packets/NetworkPacket.java b/CommonCore/Network/src/de/steamwar/network/packets/NetworkPacket.java
index 987e1ef1..e0be6fcc 100644
--- a/CommonCore/Network/src/de/steamwar/network/packets/NetworkPacket.java
+++ b/CommonCore/Network/src/de/steamwar/network/packets/NetworkPacket.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.network.packets;
diff --git a/CommonCore/Network/src/de/steamwar/network/packets/PacketHandler.java b/CommonCore/Network/src/de/steamwar/network/packets/PacketHandler.java
index 671eb469..4c540940 100644
--- a/CommonCore/Network/src/de/steamwar/network/packets/PacketHandler.java
+++ b/CommonCore/Network/src/de/steamwar/network/packets/PacketHandler.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.network.packets;
diff --git a/CommonCore/Network/src/de/steamwar/network/packets/client/ExecuteCommandPacket.java b/CommonCore/Network/src/de/steamwar/network/packets/client/ExecuteCommandPacket.java
index 9f7d000f..5cabd91a 100644
--- a/CommonCore/Network/src/de/steamwar/network/packets/client/ExecuteCommandPacket.java
+++ b/CommonCore/Network/src/de/steamwar/network/packets/client/ExecuteCommandPacket.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.network.packets.client;
diff --git a/CommonCore/Network/src/de/steamwar/network/packets/client/ImALobbyPacket.java b/CommonCore/Network/src/de/steamwar/network/packets/client/ImALobbyPacket.java
index dcd07ddf..c7c6671c 100644
--- a/CommonCore/Network/src/de/steamwar/network/packets/client/ImALobbyPacket.java
+++ b/CommonCore/Network/src/de/steamwar/network/packets/client/ImALobbyPacket.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.network.packets.client;
diff --git a/CommonCore/Network/src/de/steamwar/network/packets/client/InventoryCallbackPacket.java b/CommonCore/Network/src/de/steamwar/network/packets/client/InventoryCallbackPacket.java
index cfe9fbc6..8f77dca9 100644
--- a/CommonCore/Network/src/de/steamwar/network/packets/client/InventoryCallbackPacket.java
+++ b/CommonCore/Network/src/de/steamwar/network/packets/client/InventoryCallbackPacket.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.network.packets.client;
diff --git a/CommonCore/Network/src/de/steamwar/network/packets/client/PrepareSchemPacket.java b/CommonCore/Network/src/de/steamwar/network/packets/client/PrepareSchemPacket.java
index 8f607faf..dfe01cba 100644
--- a/CommonCore/Network/src/de/steamwar/network/packets/client/PrepareSchemPacket.java
+++ b/CommonCore/Network/src/de/steamwar/network/packets/client/PrepareSchemPacket.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.network.packets.client;
diff --git a/CommonCore/Network/src/de/steamwar/network/packets/client/RequestSchematicSearchPacket.java b/CommonCore/Network/src/de/steamwar/network/packets/client/RequestSchematicSearchPacket.java
index ea8420ca..df64bc37 100644
--- a/CommonCore/Network/src/de/steamwar/network/packets/client/RequestSchematicSearchPacket.java
+++ b/CommonCore/Network/src/de/steamwar/network/packets/client/RequestSchematicSearchPacket.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.network.packets.client;
diff --git a/CommonCore/Network/src/de/steamwar/network/packets/common/FightEndsPacket.java b/CommonCore/Network/src/de/steamwar/network/packets/common/FightEndsPacket.java
index c1d86bb6..835716d0 100644
--- a/CommonCore/Network/src/de/steamwar/network/packets/common/FightEndsPacket.java
+++ b/CommonCore/Network/src/de/steamwar/network/packets/common/FightEndsPacket.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.network.packets.common;
diff --git a/CommonCore/Network/src/de/steamwar/network/packets/common/FightInfoPacket.java b/CommonCore/Network/src/de/steamwar/network/packets/common/FightInfoPacket.java
index bbca8b09..d50b6184 100644
--- a/CommonCore/Network/src/de/steamwar/network/packets/common/FightInfoPacket.java
+++ b/CommonCore/Network/src/de/steamwar/network/packets/common/FightInfoPacket.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.network.packets.common;
diff --git a/CommonCore/Network/src/de/steamwar/network/packets/common/PlayerSkinRequestPacket.java b/CommonCore/Network/src/de/steamwar/network/packets/common/PlayerSkinRequestPacket.java
index 4916e0f1..8a779896 100644
--- a/CommonCore/Network/src/de/steamwar/network/packets/common/PlayerSkinRequestPacket.java
+++ b/CommonCore/Network/src/de/steamwar/network/packets/common/PlayerSkinRequestPacket.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.network.packets.common;
diff --git a/CommonCore/Network/src/de/steamwar/network/packets/common/PlayerSkinResponsePacket.java b/CommonCore/Network/src/de/steamwar/network/packets/common/PlayerSkinResponsePacket.java
index 5c3767ca..9517acb8 100644
--- a/CommonCore/Network/src/de/steamwar/network/packets/common/PlayerSkinResponsePacket.java
+++ b/CommonCore/Network/src/de/steamwar/network/packets/common/PlayerSkinResponsePacket.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.network.packets.common;
diff --git a/CommonCore/Network/src/de/steamwar/network/packets/server/BaumemberUpdatePacket.java b/CommonCore/Network/src/de/steamwar/network/packets/server/BaumemberUpdatePacket.java
index 5351473a..59f68f51 100644
--- a/CommonCore/Network/src/de/steamwar/network/packets/server/BaumemberUpdatePacket.java
+++ b/CommonCore/Network/src/de/steamwar/network/packets/server/BaumemberUpdatePacket.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.network.packets.server;
diff --git a/CommonCore/Network/src/de/steamwar/network/packets/server/ClientVersionPacket.java b/CommonCore/Network/src/de/steamwar/network/packets/server/ClientVersionPacket.java
index c8f43446..e5d43881 100644
--- a/CommonCore/Network/src/de/steamwar/network/packets/server/ClientVersionPacket.java
+++ b/CommonCore/Network/src/de/steamwar/network/packets/server/ClientVersionPacket.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.network.packets.server;
diff --git a/CommonCore/Network/src/de/steamwar/network/packets/server/CloseInventoryPacket.java b/CommonCore/Network/src/de/steamwar/network/packets/server/CloseInventoryPacket.java
index e30d927f..60e6d1b7 100644
--- a/CommonCore/Network/src/de/steamwar/network/packets/server/CloseInventoryPacket.java
+++ b/CommonCore/Network/src/de/steamwar/network/packets/server/CloseInventoryPacket.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.network.packets.server;
diff --git a/CommonCore/Network/src/de/steamwar/network/packets/server/InventoryPacket.java b/CommonCore/Network/src/de/steamwar/network/packets/server/InventoryPacket.java
index 8e7f7b37..589c670b 100644
--- a/CommonCore/Network/src/de/steamwar/network/packets/server/InventoryPacket.java
+++ b/CommonCore/Network/src/de/steamwar/network/packets/server/InventoryPacket.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.network.packets.server;
diff --git a/CommonCore/Network/src/de/steamwar/network/packets/server/LocaleInvalidationPacket.java b/CommonCore/Network/src/de/steamwar/network/packets/server/LocaleInvalidationPacket.java
index 1e24547d..d71fba82 100644
--- a/CommonCore/Network/src/de/steamwar/network/packets/server/LocaleInvalidationPacket.java
+++ b/CommonCore/Network/src/de/steamwar/network/packets/server/LocaleInvalidationPacket.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.network.packets.server;
diff --git a/CommonCore/Network/src/de/steamwar/network/packets/server/PingPacket.java b/CommonCore/Network/src/de/steamwar/network/packets/server/PingPacket.java
index 88ac32a8..3d6e6c75 100644
--- a/CommonCore/Network/src/de/steamwar/network/packets/server/PingPacket.java
+++ b/CommonCore/Network/src/de/steamwar/network/packets/server/PingPacket.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.network.packets.server;
diff --git a/CommonCore/Network/src/de/steamwar/network/packets/server/StartingServerPacket.java b/CommonCore/Network/src/de/steamwar/network/packets/server/StartingServerPacket.java
index f536d8fe..1e70ae93 100644
--- a/CommonCore/Network/src/de/steamwar/network/packets/server/StartingServerPacket.java
+++ b/CommonCore/Network/src/de/steamwar/network/packets/server/StartingServerPacket.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.network.packets.server;
diff --git a/CommonCore/Network/testsrc/de/steamwar/RandomGenerator.java b/CommonCore/Network/testsrc/de/steamwar/RandomGenerator.java
index b9ea1a27..22c534f2 100644
--- a/CommonCore/Network/testsrc/de/steamwar/RandomGenerator.java
+++ b/CommonCore/Network/testsrc/de/steamwar/RandomGenerator.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/CommonCore/Network/testsrc/de/steamwar/network/AllPackets.java b/CommonCore/Network/testsrc/de/steamwar/network/AllPackets.java
index f4f566b3..7f87a4fa 100644
--- a/CommonCore/Network/testsrc/de/steamwar/network/AllPackets.java
+++ b/CommonCore/Network/testsrc/de/steamwar/network/AllPackets.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.network;
diff --git a/CommonCore/Network/testsrc/de/steamwar/network/PacketHandlerTest.java b/CommonCore/Network/testsrc/de/steamwar/network/PacketHandlerTest.java
index ac2299c0..016639db 100644
--- a/CommonCore/Network/testsrc/de/steamwar/network/PacketHandlerTest.java
+++ b/CommonCore/Network/testsrc/de/steamwar/network/PacketHandlerTest.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.network;
diff --git a/CommonCore/Network/testsrc/de/steamwar/network/PacketTest.java b/CommonCore/Network/testsrc/de/steamwar/network/PacketTest.java
index 316ea6ff..5e60351b 100644
--- a/CommonCore/Network/testsrc/de/steamwar/network/PacketTest.java
+++ b/CommonCore/Network/testsrc/de/steamwar/network/PacketTest.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.network;
diff --git a/CommonCore/Network/testsrc/de/steamwar/network/TestPacket.java b/CommonCore/Network/testsrc/de/steamwar/network/TestPacket.java
index 7f95f030..e99c55a6 100644
--- a/CommonCore/Network/testsrc/de/steamwar/network/TestPacket.java
+++ b/CommonCore/Network/testsrc/de/steamwar/network/TestPacket.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.network;
diff --git a/CommonCore/Network/testsrc/de/steamwar/network/TestPacketHandler.java b/CommonCore/Network/testsrc/de/steamwar/network/TestPacketHandler.java
index 2d525be5..fff5edce 100644
--- a/CommonCore/Network/testsrc/de/steamwar/network/TestPacketHandler.java
+++ b/CommonCore/Network/testsrc/de/steamwar/network/TestPacketHandler.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.network;
diff --git a/CommonCore/SQL/build.gradle.kts b/CommonCore/SQL/build.gradle.kts
index 567bd92f..cbb8141a 100644
--- a/CommonCore/SQL/build.gradle.kts
+++ b/CommonCore/SQL/build.gradle.kts
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/CommonCore/SQL/src/de/steamwar/ImplementationProvider.java b/CommonCore/SQL/src/de/steamwar/ImplementationProvider.java
index e5b795e4..4b83a168 100644
--- a/CommonCore/SQL/src/de/steamwar/ImplementationProvider.java
+++ b/CommonCore/SQL/src/de/steamwar/ImplementationProvider.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/CommonCore/SQL/src/de/steamwar/sql/AuditLog.java b/CommonCore/SQL/src/de/steamwar/sql/AuditLog.java
index ffe093a0..04f87d9d 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/AuditLog.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/AuditLog.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/CommonCore/SQL/src/de/steamwar/sql/BannedUserIPs.java b/CommonCore/SQL/src/de/steamwar/sql/BannedUserIPs.java
index f5828177..f16e0343 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/BannedUserIPs.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/BannedUserIPs.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/CommonCore/SQL/src/de/steamwar/sql/BauweltMember.java b/CommonCore/SQL/src/de/steamwar/sql/BauweltMember.java
index 4efd9c38..71fa3a46 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/BauweltMember.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/BauweltMember.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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;
 
diff --git a/CommonCore/SQL/src/de/steamwar/sql/CheckedSchematic.java b/CommonCore/SQL/src/de/steamwar/sql/CheckedSchematic.java
index aa1e0986..5a0e553c 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/CheckedSchematic.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/CheckedSchematic.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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;
 
diff --git a/CommonCore/SQL/src/de/steamwar/sql/Event.java b/CommonCore/SQL/src/de/steamwar/sql/Event.java
index 5a4477bf..e65a1533 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/Event.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/Event.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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;
 
diff --git a/CommonCore/SQL/src/de/steamwar/sql/EventFight.java b/CommonCore/SQL/src/de/steamwar/sql/EventFight.java
index e26e641c..a1472918 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/EventFight.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/EventFight.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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;
 
diff --git a/CommonCore/SQL/src/de/steamwar/sql/Fight.java b/CommonCore/SQL/src/de/steamwar/sql/Fight.java
index ddc0772b..b1f122b2 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/Fight.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/Fight.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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;
 
diff --git a/CommonCore/SQL/src/de/steamwar/sql/FightPlayer.java b/CommonCore/SQL/src/de/steamwar/sql/FightPlayer.java
index 57b977c6..c45ec806 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/FightPlayer.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/FightPlayer.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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;
 
diff --git a/CommonCore/SQL/src/de/steamwar/sql/IgnoreSystem.java b/CommonCore/SQL/src/de/steamwar/sql/IgnoreSystem.java
index d6ce26aa..c0c38cc8 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/IgnoreSystem.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/IgnoreSystem.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/CommonCore/SQL/src/de/steamwar/sql/Mod.java b/CommonCore/SQL/src/de/steamwar/sql/Mod.java
index d6ccc063..4d8fcd9d 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/Mod.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/Mod.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/CommonCore/SQL/src/de/steamwar/sql/NoClipboardException.java b/CommonCore/SQL/src/de/steamwar/sql/NoClipboardException.java
index 97433485..864eb8b3 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/NoClipboardException.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/NoClipboardException.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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;
 
diff --git a/CommonCore/SQL/src/de/steamwar/sql/NodeData.java b/CommonCore/SQL/src/de/steamwar/sql/NodeData.java
index 0332193c..be0bbc95 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/NodeData.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/NodeData.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/CommonCore/SQL/src/de/steamwar/sql/NodeDownload.java b/CommonCore/SQL/src/de/steamwar/sql/NodeDownload.java
index b56a5994..6580b589 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/NodeDownload.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/NodeDownload.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2025  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/CommonCore/SQL/src/de/steamwar/sql/NodeMember.java b/CommonCore/SQL/src/de/steamwar/sql/NodeMember.java
index 64844e94..8b40b8be 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/NodeMember.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/NodeMember.java
@@ -1,20 +1,20 @@
 /*
- *    This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- *    Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/CommonCore/SQL/src/de/steamwar/sql/PollAnswer.java b/CommonCore/SQL/src/de/steamwar/sql/PollAnswer.java
index 933f2536..9376ed18 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/PollAnswer.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/PollAnswer.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/CommonCore/SQL/src/de/steamwar/sql/Punishment.java b/CommonCore/SQL/src/de/steamwar/sql/Punishment.java
index 4e0c1665..f5813792 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/Punishment.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/Punishment.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/CommonCore/SQL/src/de/steamwar/sql/Referee.java b/CommonCore/SQL/src/de/steamwar/sql/Referee.java
index e22faf7e..3f909643 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/Referee.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/Referee.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/CommonCore/SQL/src/de/steamwar/sql/SQLWrapper.java b/CommonCore/SQL/src/de/steamwar/sql/SQLWrapper.java
index cff7dec9..2e0340ed 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/SQLWrapper.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/SQLWrapper.java
@@ -1,20 +1,20 @@
 /*
- *    This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- *    Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/CommonCore/SQL/src/de/steamwar/sql/SWException.java b/CommonCore/SQL/src/de/steamwar/sql/SWException.java
index 4656804a..945743f7 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/SWException.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/SWException.java
@@ -1,20 +1,20 @@
 /*
- *    This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- *    Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/CommonCore/SQL/src/de/steamwar/sql/SchemElo.java b/CommonCore/SQL/src/de/steamwar/sql/SchemElo.java
index 0e92cfd5..0a8641b0 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/SchemElo.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/SchemElo.java
@@ -1,20 +1,20 @@
 /*
- *    This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- *    Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/CommonCore/SQL/src/de/steamwar/sql/SchematicNode.java b/CommonCore/SQL/src/de/steamwar/sql/SchematicNode.java
index d2f0bf5c..bac7929f 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/SchematicNode.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/SchematicNode.java
@@ -1,20 +1,20 @@
 /*
- *    This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- *    Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/CommonCore/SQL/src/de/steamwar/sql/SchematicType.java b/CommonCore/SQL/src/de/steamwar/sql/SchematicType.java
index 62b047c8..10d96a92 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/SchematicType.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/SchematicType.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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;
 
diff --git a/CommonCore/SQL/src/de/steamwar/sql/Script.java b/CommonCore/SQL/src/de/steamwar/sql/Script.java
index 9691c439..1a5ccd25 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/Script.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/Script.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/CommonCore/SQL/src/de/steamwar/sql/Season.java b/CommonCore/SQL/src/de/steamwar/sql/Season.java
index a713fe22..f366cbdb 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/Season.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/Season.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/CommonCore/SQL/src/de/steamwar/sql/Session.java b/CommonCore/SQL/src/de/steamwar/sql/Session.java
index 18ad2c8c..21e2f8f7 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/Session.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/Session.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/CommonCore/SQL/src/de/steamwar/sql/SteamwarUser.java b/CommonCore/SQL/src/de/steamwar/sql/SteamwarUser.java
index 025e501c..719deb68 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/SteamwarUser.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/SteamwarUser.java
@@ -1,20 +1,20 @@
 /*
- *    This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- *    Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/CommonCore/SQL/src/de/steamwar/sql/Team.java b/CommonCore/SQL/src/de/steamwar/sql/Team.java
index b1a650ba..71921de6 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/Team.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/Team.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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;
 
diff --git a/CommonCore/SQL/src/de/steamwar/sql/TeamTeilnahme.java b/CommonCore/SQL/src/de/steamwar/sql/TeamTeilnahme.java
index f1484dac..499a1a66 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/TeamTeilnahme.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/TeamTeilnahme.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/CommonCore/SQL/src/de/steamwar/sql/Token.java b/CommonCore/SQL/src/de/steamwar/sql/Token.java
index 007a16e2..ca32c0fa 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/Token.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/Token.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/CommonCore/SQL/src/de/steamwar/sql/UserConfig.java b/CommonCore/SQL/src/de/steamwar/sql/UserConfig.java
index f705dfdd..c2525a57 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/UserConfig.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/UserConfig.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/CommonCore/SQL/src/de/steamwar/sql/UserElo.java b/CommonCore/SQL/src/de/steamwar/sql/UserElo.java
index d9876c4c..a02ba03a 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/UserElo.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/UserElo.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/CommonCore/SQL/src/de/steamwar/sql/UserPerm.java b/CommonCore/SQL/src/de/steamwar/sql/UserPerm.java
index 75a55854..7a575d82 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/UserPerm.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/UserPerm.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/CommonCore/SQL/src/de/steamwar/sql/internal/Field.java b/CommonCore/SQL/src/de/steamwar/sql/internal/Field.java
index 90bfa1d8..512484d8 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/internal/Field.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/internal/Field.java
@@ -1,20 +1,20 @@
 /*
- *    This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- *    Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.internal;
diff --git a/CommonCore/SQL/src/de/steamwar/sql/internal/SQLConfig.java b/CommonCore/SQL/src/de/steamwar/sql/internal/SQLConfig.java
index 3153ecbf..41e620ff 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/internal/SQLConfig.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/internal/SQLConfig.java
@@ -1,20 +1,20 @@
 /*
- *    This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- *    Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.internal;
diff --git a/CommonCore/SQL/src/de/steamwar/sql/internal/SelectStatement.java b/CommonCore/SQL/src/de/steamwar/sql/internal/SelectStatement.java
index e17dcb71..259989bd 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/internal/SelectStatement.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/internal/SelectStatement.java
@@ -1,20 +1,20 @@
 /*
- *    This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- *    Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.internal;
diff --git a/CommonCore/SQL/src/de/steamwar/sql/internal/SqlTypeMapper.java b/CommonCore/SQL/src/de/steamwar/sql/internal/SqlTypeMapper.java
index 53a2cc29..8ac8ba66 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/internal/SqlTypeMapper.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/internal/SqlTypeMapper.java
@@ -1,20 +1,20 @@
 /*
- *    This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- *    Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.internal;
diff --git a/CommonCore/SQL/src/de/steamwar/sql/internal/Statement.java b/CommonCore/SQL/src/de/steamwar/sql/internal/Statement.java
index 2621da6b..5bcd3fcf 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/internal/Statement.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/internal/Statement.java
@@ -1,20 +1,20 @@
 /*
- *    This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- *    Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.internal;
diff --git a/CommonCore/SQL/src/de/steamwar/sql/internal/Table.java b/CommonCore/SQL/src/de/steamwar/sql/internal/Table.java
index e052bf26..b0f156e4 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/internal/Table.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/internal/Table.java
@@ -1,20 +1,20 @@
 /*
- *    This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- *    Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.internal;
diff --git a/CommonCore/build.gradle.kts b/CommonCore/build.gradle.kts
index 7105676f..b63bd369 100644
--- a/CommonCore/build.gradle.kts
+++ b/CommonCore/build.gradle.kts
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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/>.
  */
 
 plugins {
diff --git a/FightSystem/FightSystem_10/build.gradle.kts b/FightSystem/FightSystem_10/build.gradle.kts
index d34e28f4..2ab25eda 100644
--- a/FightSystem/FightSystem_10/build.gradle.kts
+++ b/FightSystem/FightSystem_10/build.gradle.kts
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/FightSystem/FightSystem_10/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper10.java b/FightSystem/FightSystem_10/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper10.java
index d5f654ae..3b6c94f6 100644
--- a/FightSystem/FightSystem_10/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper10.java
+++ b/FightSystem/FightSystem_10/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper10.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2021  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/>.
+ *   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.utils;
diff --git a/FightSystem/FightSystem_12/build.gradle.kts b/FightSystem/FightSystem_12/build.gradle.kts
index 8ec0f834..0654681f 100644
--- a/FightSystem/FightSystem_12/build.gradle.kts
+++ b/FightSystem/FightSystem_12/build.gradle.kts
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/FightSystem/FightSystem_12/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper12.java b/FightSystem/FightSystem_12/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper12.java
index a134b9fe..cc6a1c50 100644
--- a/FightSystem/FightSystem_12/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper12.java
+++ b/FightSystem/FightSystem_12/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper12.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2021  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/>.
+ *   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.utils;
diff --git a/FightSystem/FightSystem_12/src/de/steamwar/fightsystem/utils/WorldOfColorWrapper12.java b/FightSystem/FightSystem_12/src/de/steamwar/fightsystem/utils/WorldOfColorWrapper12.java
index b4be805b..0c9614b3 100644
--- a/FightSystem/FightSystem_12/src/de/steamwar/fightsystem/utils/WorldOfColorWrapper12.java
+++ b/FightSystem/FightSystem_12/src/de/steamwar/fightsystem/utils/WorldOfColorWrapper12.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2021  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/>.
+ *   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.utils;
diff --git a/FightSystem/FightSystem_12/src/de/steamwar/fightsystem/utils/WorldeditWrapper12.java b/FightSystem/FightSystem_12/src/de/steamwar/fightsystem/utils/WorldeditWrapper12.java
index 7dd977b5..d5869543 100644
--- a/FightSystem/FightSystem_12/src/de/steamwar/fightsystem/utils/WorldeditWrapper12.java
+++ b/FightSystem/FightSystem_12/src/de/steamwar/fightsystem/utils/WorldeditWrapper12.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2021  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/>.
+ *   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.utils;
diff --git a/FightSystem/FightSystem_14/build.gradle.kts b/FightSystem/FightSystem_14/build.gradle.kts
index 4fc15121..dfa4eb5f 100644
--- a/FightSystem/FightSystem_14/build.gradle.kts
+++ b/FightSystem/FightSystem_14/build.gradle.kts
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/FightSystem/FightSystem_14/src/de/steamwar/fightsystem/utils/BlockIdWrapper14.java b/FightSystem/FightSystem_14/src/de/steamwar/fightsystem/utils/BlockIdWrapper14.java
index 93b4a811..665fab12 100644
--- a/FightSystem/FightSystem_14/src/de/steamwar/fightsystem/utils/BlockIdWrapper14.java
+++ b/FightSystem/FightSystem_14/src/de/steamwar/fightsystem/utils/BlockIdWrapper14.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2021  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/>.
+ *   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.utils;
diff --git a/FightSystem/FightSystem_14/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper14.java b/FightSystem/FightSystem_14/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper14.java
index 8e2f96ab..8945ca9d 100644
--- a/FightSystem/FightSystem_14/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper14.java
+++ b/FightSystem/FightSystem_14/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper14.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2021  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/>.
+ *   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.utils;
diff --git a/FightSystem/FightSystem_14/src/de/steamwar/fightsystem/utils/FlatteningWrapper14.java b/FightSystem/FightSystem_14/src/de/steamwar/fightsystem/utils/FlatteningWrapper14.java
index 2cce880d..c2e70dc9 100644
--- a/FightSystem/FightSystem_14/src/de/steamwar/fightsystem/utils/FlatteningWrapper14.java
+++ b/FightSystem/FightSystem_14/src/de/steamwar/fightsystem/utils/FlatteningWrapper14.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2021  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/>.
+ *   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.utils;
diff --git a/FightSystem/FightSystem_14/src/de/steamwar/fightsystem/utils/SWSound14.java b/FightSystem/FightSystem_14/src/de/steamwar/fightsystem/utils/SWSound14.java
index 77fde1dc..dcf5fd71 100644
--- a/FightSystem/FightSystem_14/src/de/steamwar/fightsystem/utils/SWSound14.java
+++ b/FightSystem/FightSystem_14/src/de/steamwar/fightsystem/utils/SWSound14.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2021  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/>.
+ *   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.utils;
diff --git a/FightSystem/FightSystem_14/src/de/steamwar/fightsystem/utils/WorldeditWrapper14.java b/FightSystem/FightSystem_14/src/de/steamwar/fightsystem/utils/WorldeditWrapper14.java
index 072afaff..c3206f86 100644
--- a/FightSystem/FightSystem_14/src/de/steamwar/fightsystem/utils/WorldeditWrapper14.java
+++ b/FightSystem/FightSystem_14/src/de/steamwar/fightsystem/utils/WorldeditWrapper14.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2021  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/>.
+ *   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.utils;
diff --git a/FightSystem/FightSystem_15/build.gradle.kts b/FightSystem/FightSystem_15/build.gradle.kts
index 4b16dc73..a90121b6 100644
--- a/FightSystem/FightSystem_15/build.gradle.kts
+++ b/FightSystem/FightSystem_15/build.gradle.kts
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/FightSystem/FightSystem_15/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper15.java b/FightSystem/FightSystem_15/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper15.java
index 64a0f9e1..617c8680 100644
--- a/FightSystem/FightSystem_15/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper15.java
+++ b/FightSystem/FightSystem_15/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper15.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2021  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/>.
+ *   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.utils;
diff --git a/FightSystem/FightSystem_18/build.gradle.kts b/FightSystem/FightSystem_18/build.gradle.kts
index b5d694ed..363d7a4e 100644
--- a/FightSystem/FightSystem_18/build.gradle.kts
+++ b/FightSystem/FightSystem_18/build.gradle.kts
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/FightSystem/FightSystem_18/src/de/steamwar/fightsystem/utils/BlockIdWrapper18.java b/FightSystem/FightSystem_18/src/de/steamwar/fightsystem/utils/BlockIdWrapper18.java
index 992dd451..b70a9d52 100644
--- a/FightSystem/FightSystem_18/src/de/steamwar/fightsystem/utils/BlockIdWrapper18.java
+++ b/FightSystem/FightSystem_18/src/de/steamwar/fightsystem/utils/BlockIdWrapper18.java
@@ -1,20 +1,20 @@
 /*
- *     This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- *     Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.utils;
diff --git a/FightSystem/FightSystem_18/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper18.java b/FightSystem/FightSystem_18/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper18.java
index aafd5c08..762e909e 100644
--- a/FightSystem/FightSystem_18/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper18.java
+++ b/FightSystem/FightSystem_18/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper18.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2021  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/>.
+ *   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.utils;
diff --git a/FightSystem/FightSystem_18/src/de/steamwar/fightsystem/utils/HullHiderWrapper18.java b/FightSystem/FightSystem_18/src/de/steamwar/fightsystem/utils/HullHiderWrapper18.java
index 9cee390f..ddc01fa9 100644
--- a/FightSystem/FightSystem_18/src/de/steamwar/fightsystem/utils/HullHiderWrapper18.java
+++ b/FightSystem/FightSystem_18/src/de/steamwar/fightsystem/utils/HullHiderWrapper18.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/FightSystem/FightSystem_19/build.gradle.kts b/FightSystem/FightSystem_19/build.gradle.kts
index 6ccb56c9..a8811e9d 100644
--- a/FightSystem/FightSystem_19/build.gradle.kts
+++ b/FightSystem/FightSystem_19/build.gradle.kts
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/FightSystem/FightSystem_19/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper19.java b/FightSystem/FightSystem_19/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper19.java
index 1a18a2a7..e00428a3 100644
--- a/FightSystem/FightSystem_19/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper19.java
+++ b/FightSystem/FightSystem_19/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper19.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2021  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/>.
+ *   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.utils;
diff --git a/FightSystem/FightSystem_20/build.gradle.kts b/FightSystem/FightSystem_20/build.gradle.kts
index 13eb77cf..71c024b1 100644
--- a/FightSystem/FightSystem_20/build.gradle.kts
+++ b/FightSystem/FightSystem_20/build.gradle.kts
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/FightSystem/FightSystem_20/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper20.java b/FightSystem/FightSystem_20/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper20.java
index e0dabe46..0bad44a2 100644
--- a/FightSystem/FightSystem_20/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper20.java
+++ b/FightSystem/FightSystem_20/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper20.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2021  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/>.
+ *   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.utils;
diff --git a/FightSystem/FightSystem_20/src/de/steamwar/fightsystem/utils/HullHiderWrapper20.java b/FightSystem/FightSystem_20/src/de/steamwar/fightsystem/utils/HullHiderWrapper20.java
index 48bf0ad5..56262ab0 100644
--- a/FightSystem/FightSystem_20/src/de/steamwar/fightsystem/utils/HullHiderWrapper20.java
+++ b/FightSystem/FightSystem_20/src/de/steamwar/fightsystem/utils/HullHiderWrapper20.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/FightSystem/FightSystem_21/build.gradle.kts b/FightSystem/FightSystem_21/build.gradle.kts
index 2da59fce..a8c67f6f 100644
--- a/FightSystem/FightSystem_21/build.gradle.kts
+++ b/FightSystem/FightSystem_21/build.gradle.kts
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/FightSystem/FightSystem_21/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper21.java b/FightSystem/FightSystem_21/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper21.java
index 312dce88..113f28c0 100644
--- a/FightSystem/FightSystem_21/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper21.java
+++ b/FightSystem/FightSystem_21/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper21.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/FightSystem/FightSystem_8/build.gradle.kts b/FightSystem/FightSystem_8/build.gradle.kts
index 7fb2f827..ff60010d 100644
--- a/FightSystem/FightSystem_8/build.gradle.kts
+++ b/FightSystem/FightSystem_8/build.gradle.kts
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/FightSystem/FightSystem_8/src/de/steamwar/fightsystem/utils/BlockIdWrapper8.java b/FightSystem/FightSystem_8/src/de/steamwar/fightsystem/utils/BlockIdWrapper8.java
index 5d06a7be..9f0687e7 100644
--- a/FightSystem/FightSystem_8/src/de/steamwar/fightsystem/utils/BlockIdWrapper8.java
+++ b/FightSystem/FightSystem_8/src/de/steamwar/fightsystem/utils/BlockIdWrapper8.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2021  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/>.
+ *   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.utils;
diff --git a/FightSystem/FightSystem_8/src/de/steamwar/fightsystem/utils/BountifulWrapper8.java b/FightSystem/FightSystem_8/src/de/steamwar/fightsystem/utils/BountifulWrapper8.java
index 3d124ff9..b4fa5886 100644
--- a/FightSystem/FightSystem_8/src/de/steamwar/fightsystem/utils/BountifulWrapper8.java
+++ b/FightSystem/FightSystem_8/src/de/steamwar/fightsystem/utils/BountifulWrapper8.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2021  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/>.
+ *   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.utils;
diff --git a/FightSystem/FightSystem_8/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper8.java b/FightSystem/FightSystem_8/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper8.java
index e7597dd7..f431d71d 100644
--- a/FightSystem/FightSystem_8/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper8.java
+++ b/FightSystem/FightSystem_8/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper8.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2021  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/>.
+ *   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.utils;
diff --git a/FightSystem/FightSystem_8/src/de/steamwar/fightsystem/utils/FlatteningWrapper8.java b/FightSystem/FightSystem_8/src/de/steamwar/fightsystem/utils/FlatteningWrapper8.java
index c788f060..0c6c7c9f 100644
--- a/FightSystem/FightSystem_8/src/de/steamwar/fightsystem/utils/FlatteningWrapper8.java
+++ b/FightSystem/FightSystem_8/src/de/steamwar/fightsystem/utils/FlatteningWrapper8.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2021  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/>.
+ *   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.utils;
diff --git a/FightSystem/FightSystem_8/src/de/steamwar/fightsystem/utils/HullHiderWrapper8.java b/FightSystem/FightSystem_8/src/de/steamwar/fightsystem/utils/HullHiderWrapper8.java
index 03647c5e..0c2716f3 100644
--- a/FightSystem/FightSystem_8/src/de/steamwar/fightsystem/utils/HullHiderWrapper8.java
+++ b/FightSystem/FightSystem_8/src/de/steamwar/fightsystem/utils/HullHiderWrapper8.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/FightSystem/FightSystem_8/src/de/steamwar/fightsystem/utils/SWSound8.java b/FightSystem/FightSystem_8/src/de/steamwar/fightsystem/utils/SWSound8.java
index d4a6e210..00fb6956 100644
--- a/FightSystem/FightSystem_8/src/de/steamwar/fightsystem/utils/SWSound8.java
+++ b/FightSystem/FightSystem_8/src/de/steamwar/fightsystem/utils/SWSound8.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2021  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/>.
+ *   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.utils;
diff --git a/FightSystem/FightSystem_8/src/de/steamwar/fightsystem/utils/WorldOfColorWrapper8.java b/FightSystem/FightSystem_8/src/de/steamwar/fightsystem/utils/WorldOfColorWrapper8.java
index 4ddc6844..549f5492 100644
--- a/FightSystem/FightSystem_8/src/de/steamwar/fightsystem/utils/WorldOfColorWrapper8.java
+++ b/FightSystem/FightSystem_8/src/de/steamwar/fightsystem/utils/WorldOfColorWrapper8.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2021  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/>.
+ *   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.utils;
diff --git a/FightSystem/FightSystem_8/src/de/steamwar/fightsystem/utils/WorldeditWrapper8.java b/FightSystem/FightSystem_8/src/de/steamwar/fightsystem/utils/WorldeditWrapper8.java
index 1fdd34b7..6581566c 100644
--- a/FightSystem/FightSystem_8/src/de/steamwar/fightsystem/utils/WorldeditWrapper8.java
+++ b/FightSystem/FightSystem_8/src/de/steamwar/fightsystem/utils/WorldeditWrapper8.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2021  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/>.
+ *   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.utils;
diff --git a/FightSystem/FightSystem_9/build.gradle.kts b/FightSystem/FightSystem_9/build.gradle.kts
index 5edfa1e3..ec63f4ae 100644
--- a/FightSystem/FightSystem_9/build.gradle.kts
+++ b/FightSystem/FightSystem_9/build.gradle.kts
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/FightSystem/FightSystem_9/src/de/steamwar/fightsystem/utils/BountifulWrapper9.java b/FightSystem/FightSystem_9/src/de/steamwar/fightsystem/utils/BountifulWrapper9.java
index 48017755..8d89a718 100644
--- a/FightSystem/FightSystem_9/src/de/steamwar/fightsystem/utils/BountifulWrapper9.java
+++ b/FightSystem/FightSystem_9/src/de/steamwar/fightsystem/utils/BountifulWrapper9.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2021  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/>.
+ *   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.utils;
diff --git a/FightSystem/FightSystem_9/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper9.java b/FightSystem/FightSystem_9/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper9.java
index c7f393b3..305f21ab 100644
--- a/FightSystem/FightSystem_9/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper9.java
+++ b/FightSystem/FightSystem_9/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper9.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2021  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/>.
+ *   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.utils;
diff --git a/FightSystem/FightSystem_9/src/de/steamwar/fightsystem/utils/SWSound9.java b/FightSystem/FightSystem_9/src/de/steamwar/fightsystem/utils/SWSound9.java
index 3589c09d..d1f7692d 100644
--- a/FightSystem/FightSystem_9/src/de/steamwar/fightsystem/utils/SWSound9.java
+++ b/FightSystem/FightSystem_9/src/de/steamwar/fightsystem/utils/SWSound9.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2021  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/>.
+ *   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.utils;
diff --git a/FightSystem/FightSystem_Core/build.gradle.kts b/FightSystem/FightSystem_Core/build.gradle.kts
index 140696b5..caa83e0d 100644
--- a/FightSystem/FightSystem_Core/build.gradle.kts
+++ b/FightSystem/FightSystem_Core/build.gradle.kts
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/ArenaMode.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/ArenaMode.java
index e96e0204..e65ce94c 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/ArenaMode.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/ArenaMode.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2021  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/>.
+ *   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;
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/Config.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/Config.java
index d7ce5f9e..289b76d3 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/Config.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/Config.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2021  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/>.
+ *   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;
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/FightSystem.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/FightSystem.java
index d3ad2147..15e2aeea 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/FightSystem.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/FightSystem.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/FightSystem.properties b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/FightSystem.properties
index 22babff0..49e001f1 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/FightSystem.properties
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/FightSystem.properties
@@ -1,20 +1,20 @@
 #
-#    This file is a part of the SteamWar software.
+#   This file is a part of the SteamWar software.
 #
-#    Copyright (C) 2022  SteamWar.de-Serverteam
+#   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 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.
+#   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/>.
+#   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/>.
 #
 
 PREFIX=§eArena§8»
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/FightSystem_de.properties b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/FightSystem_de.properties
index cd294425..6c3c3b19 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/FightSystem_de.properties
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/FightSystem_de.properties
@@ -1,20 +1,20 @@
 #
-#    This file is a part of the SteamWar software.
+#   This file is a part of the SteamWar software.
 #
-#    Copyright (C) 2022  SteamWar.de-Serverteam
+#   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 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.
+#   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/>.
+#   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/>.
 #
 
 # Commands
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/ai/AI.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/ai/AI.java
index 0b681fc2..7152f40e 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/ai/AI.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/ai/AI.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/ai/AIManager.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/ai/AIManager.java
index 3950a201..1ed59d98 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/ai/AIManager.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/ai/AIManager.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/ai/DummyAI.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/ai/DummyAI.java
index 90fcd3d0..eab9bfd3 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/ai/DummyAI.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/ai/DummyAI.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/AkCommand.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/AkCommand.java
index dcb40b9d..73988c99 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/AkCommand.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/AkCommand.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/Commands.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/Commands.java
index cff729df..c5fc83fb 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/Commands.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/Commands.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/GUI.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/GUI.java
index 237d860e..a365dc96 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/GUI.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/GUI.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/GamemodeCommand.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/GamemodeCommand.java
index 2c6b6d3a..02a142d0 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/GamemodeCommand.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/GamemodeCommand.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/InfoCommand.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/InfoCommand.java
index ca515dad..306a4fc5 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/InfoCommand.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/InfoCommand.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/KitCommand.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/KitCommand.java
index c80004dc..3a4250f6 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/KitCommand.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/KitCommand.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/LeaveCommand.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/LeaveCommand.java
index 61bbf816..9934adc9 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/LeaveCommand.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/LeaveCommand.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/LockschemCommand.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/LockschemCommand.java
index eb097998..3d7684b2 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/LockschemCommand.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/LockschemCommand.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/ReadyCommand.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/ReadyCommand.java
index 2da5d3c2..127e8611 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/ReadyCommand.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/ReadyCommand.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/RemoveCommand.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/RemoveCommand.java
index d1083ecf..728dc989 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/RemoveCommand.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/RemoveCommand.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/RequestsCommand.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/RequestsCommand.java
index f998384a..d5bc2692 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/RequestsCommand.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/RequestsCommand.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/SkipCommand.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/SkipCommand.java
index 5311eecc..2844443c 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/SkipCommand.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/SkipCommand.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/StateCommand.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/StateCommand.java
index 1fb3b424..bbbdb22a 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/StateCommand.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/StateCommand.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/TBCommand.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/TBCommand.java
index 9ed7a9fe..4c2acf8a 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/TBCommand.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/TBCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/TPSWarpCommand.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/TPSWarpCommand.java
index 4384f9ce..434f373e 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/TPSWarpCommand.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/TPSWarpCommand.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/TechhiderbugCommand.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/TechhiderbugCommand.java
index ed8ce14c..d97103ed 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/TechhiderbugCommand.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/TechhiderbugCommand.java
@@ -1,20 +1,20 @@
 /*
- *     This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- *     Copyright (C) 2025  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/UnrankCommand.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/UnrankCommand.java
index 7f1be4b1..5f9ff09d 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/UnrankCommand.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/UnrankCommand.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2022  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/>.
+ *   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;
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/WGCommand.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/WGCommand.java
index 30f0414e..c151eefd 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/WGCommand.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/WGCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/WinCommand.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/WinCommand.java
index c236442f..3da47d29 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/WinCommand.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/WinCommand.java
@@ -1,3 +1,22 @@
+/*
+ *   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;
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/Countdown.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/Countdown.java
index e96c6b16..c9739e24 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/Countdown.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/Countdown.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.countdown;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/EnternCountdown.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/EnternCountdown.java
index 55bcbe38..1a019c3a 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/EnternCountdown.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/EnternCountdown.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.countdown;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/EventSpectateCountdown.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/EventSpectateCountdown.java
index 0054def5..64b02810 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/EventSpectateCountdown.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/EventSpectateCountdown.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.countdown;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/NoPlayersOnlineCountdown.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/NoPlayersOnlineCountdown.java
index b479be63..0fefdae2 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/NoPlayersOnlineCountdown.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/NoPlayersOnlineCountdown.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.countdown;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/PostSchemCountdown.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/PostSchemCountdown.java
index 307eae03..262ee06d 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/PostSchemCountdown.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/PostSchemCountdown.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.countdown;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/PreRunningCountdown.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/PreRunningCountdown.java
index 8dd7e2b2..4e6e21de 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/PreRunningCountdown.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/PreRunningCountdown.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.countdown;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/PreSchemCountdown.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/PreSchemCountdown.java
index 0a2e0e6c..a023b005 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/PreSchemCountdown.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/PreSchemCountdown.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.countdown;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/SpectateOverCountdown.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/SpectateOverCountdown.java
index 74b81f93..fca8fa28 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/SpectateOverCountdown.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/SpectateOverCountdown.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.countdown;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/TimeOverCountdown.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/TimeOverCountdown.java
index 3e2dde85..600e9a4f 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/TimeOverCountdown.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/TimeOverCountdown.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.countdown;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/event/HellsBells.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/event/HellsBells.java
index 8c2cb3f6..9620e594 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/event/HellsBells.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/event/HellsBells.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.event;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/event/Meteor.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/event/Meteor.java
index 74b4cffe..226caee8 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/event/Meteor.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/event/Meteor.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.event;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/event/NoGravity.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/event/NoGravity.java
index 4e3125ea..3c64c911 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/event/NoGravity.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/event/NoGravity.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.event;
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/event/PersistentDamage.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/event/PersistentDamage.java
index 7b50a2c9..c8f0392f 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/event/PersistentDamage.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/event/PersistentDamage.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/event/Point.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/event/Point.java
index 13dc087f..1173fe0a 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/event/Point.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/event/Point.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.event;
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/event/TNTDistributor.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/event/TNTDistributor.java
index c19050ac..cb77334d 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/event/TNTDistributor.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/event/TNTDistributor.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/events/BoardingEvent.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/events/BoardingEvent.java
index 373d91b4..f55bbe73 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/events/BoardingEvent.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/events/BoardingEvent.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/events/TeamDeathEvent.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/events/TeamDeathEvent.java
index 6cbdd059..5228210f 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/events/TeamDeathEvent.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/events/TeamDeathEvent.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/events/TeamLeaveEvent.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/events/TeamLeaveEvent.java
index 36d96b0e..cafde226 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/events/TeamLeaveEvent.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/events/TeamLeaveEvent.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/events/TeamSpawnEvent.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/events/TeamSpawnEvent.java
index 7ca62be4..62d37a83 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/events/TeamSpawnEvent.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/events/TeamSpawnEvent.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/Fight.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/Fight.java
index 61f6a162..53bd6734 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/Fight.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/Fight.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.fight;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightPlayer.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightPlayer.java
index 763bd6fd..91a967e5 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightPlayer.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightPlayer.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.fight;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightSchematic.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightSchematic.java
index 7591d4bc..cfca90ac 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightSchematic.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightSchematic.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.fight;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightTeam.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightTeam.java
index 47f73649..7418518f 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightTeam.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightTeam.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.fight;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightWorld.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightWorld.java
index 0f6268b7..764de118 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightWorld.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightWorld.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.fight;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FreezeWorld.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FreezeWorld.java
index 7b58543f..b3aff331 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FreezeWorld.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FreezeWorld.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.fight;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/HotbarKit.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/HotbarKit.java
index d80dd1ad..17edca7e 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/HotbarKit.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/HotbarKit.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2022  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/>.
+ *   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.fight;
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/HotbarKitListener.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/HotbarKitListener.java
index a321a697..fa8e1dc3 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/HotbarKitListener.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/HotbarKitListener.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.fight;
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/JoinRequest.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/JoinRequest.java
index e4e349c7..0acf61f4 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/JoinRequest.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/JoinRequest.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2022  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/>.
+ *   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.fight;
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/Kit.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/Kit.java
index 48a18bde..8183d98c 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/Kit.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/Kit.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.fight;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/ArenaBorder.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/ArenaBorder.java
index b3f846b6..57d8ec6a 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/ArenaBorder.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/ArenaBorder.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.listener;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/ArrowStopper.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/ArrowStopper.java
index ff77d4ca..926ef27b 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/ArrowStopper.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/ArrowStopper.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2021  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/>.
+ *   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.listener;
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/BlockFadeListener.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/BlockFadeListener.java
index 750bbe44..4cf9a3d1 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/BlockFadeListener.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/BlockFadeListener.java
@@ -1,3 +1,22 @@
+/*
+ *   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.listener;
 
 import de.steamwar.fightsystem.Config;
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/BlockPlaceCollision.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/BlockPlaceCollision.java
index ac3c6fb5..c8636629 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/BlockPlaceCollision.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/BlockPlaceCollision.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2023  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/>.
+ *   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.listener;
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Border.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Border.java
index 602a8e11..a8dcb026 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Border.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Border.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Chat.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Chat.java
index 5e1a0114..610c5859 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Chat.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Chat.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.listener;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Check.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Check.java
index 8a413b4b..6fec0d80 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Check.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Check.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.listener;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/ClickAnalyzer.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/ClickAnalyzer.java
index 4cbe464a..0777bcc7 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/ClickAnalyzer.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/ClickAnalyzer.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2022  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/>.
+ *   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.listener;
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/DenyInventoryMovement.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/DenyInventoryMovement.java
index 746910e2..492cfcd6 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/DenyInventoryMovement.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/DenyInventoryMovement.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2021  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/>.
+ *   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.listener;
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/DenyWorldInteraction.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/DenyWorldInteraction.java
index 21a5a063..91c76db1 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/DenyWorldInteraction.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/DenyWorldInteraction.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.listener;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/EntityDamage.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/EntityDamage.java
index 226375f0..56c2be37 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/EntityDamage.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/EntityDamage.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.listener;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/EventJoin.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/EventJoin.java
index 3d7de932..2dd3332d 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/EventJoin.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/EventJoin.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.listener;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/FightScoreboard.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/FightScoreboard.java
index 7de1f306..1c7a463d 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/FightScoreboard.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/FightScoreboard.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.listener;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/InFightDamage.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/InFightDamage.java
index 7846d51e..5a2d2cfc 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/InFightDamage.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/InFightDamage.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.listener;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/InFightInventory.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/InFightInventory.java
index 33b4cf78..b043bb86 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/InFightInventory.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/InFightInventory.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.listener;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/IngameDeath.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/IngameDeath.java
index 14f020f7..5e15eb84 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/IngameDeath.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/IngameDeath.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.listener;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/JoinRequestListener.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/JoinRequestListener.java
index bf859d48..5a6d8d20 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/JoinRequestListener.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/JoinRequestListener.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2022  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/>.
+ *   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.listener;
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/LeaveableArena.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/LeaveableArena.java
index 73daed41..6daa719b 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/LeaveableArena.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/LeaveableArena.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2022  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/>.
+ *   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.listener;
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/NormalJoin.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/NormalJoin.java
index 33e91888..963b4502 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/NormalJoin.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/NormalJoin.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.listener;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Permanent.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Permanent.java
index c35eed95..444eb1a1 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Permanent.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Permanent.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.listener;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/PersonalKitCreator.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/PersonalKitCreator.java
index b003d84b..02fb7487 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/PersonalKitCreator.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/PersonalKitCreator.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.listener;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/PistonListener.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/PistonListener.java
index 26c2fb89..cb583a08 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/PistonListener.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/PistonListener.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.listener;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/PrepareSchem.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/PrepareSchem.java
index 76c25640..1da8cb58 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/PrepareSchem.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/PrepareSchem.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.listener;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Recording.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Recording.java
index 86b00816..15935410 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Recording.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Recording.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.listener;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/RunningWorldInteraction.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/RunningWorldInteraction.java
index e938b505..c31d6701 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/RunningWorldInteraction.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/RunningWorldInteraction.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2021  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/>.
+ *   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.listener;
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/SetupQuit.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/SetupQuit.java
index 99755f8a..c203c910 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/SetupQuit.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/SetupQuit.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.listener;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Shutdown.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Shutdown.java
index 08e60f43..5fc5e4b4 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Shutdown.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Shutdown.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.listener;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Spectator.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Spectator.java
index 3fcb820b..879e61f4 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Spectator.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Spectator.java
@@ -1,20 +1,20 @@
 /*
- *     This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- *     Copyright (C) 2025  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.listener;
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/TeamArea.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/TeamArea.java
index 2f888452..ab453eeb 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/TeamArea.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/TeamArea.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.listener;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/TestJoin.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/TestJoin.java
index 554d51cb..f14c2453 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/TestJoin.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/TestJoin.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.listener;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/WaterRemover.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/WaterRemover.java
index 7f04d6db..ac39a7fc 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/WaterRemover.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/WaterRemover.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.listener;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/FileRecorder.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/FileRecorder.java
index a80463e5..d91924d1 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/FileRecorder.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/FileRecorder.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.record;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/FileSource.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/FileSource.java
index 9e1a05ea..f26a3b2b 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/FileSource.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/FileSource.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.record;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/GlobalRecorder.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/GlobalRecorder.java
index b0e9824b..436d8fbc 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/GlobalRecorder.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/GlobalRecorder.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.record;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/LiveRecorder.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/LiveRecorder.java
index e17aa891..3a1525b0 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/LiveRecorder.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/LiveRecorder.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.record;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/LiveServer.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/LiveServer.java
index 5bb63084..58547b36 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/LiveServer.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/LiveServer.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.record;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/LiveSource.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/LiveSource.java
index 313ff85d..fe9c008a 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/LiveSource.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/LiveSource.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.record;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java
index f4906f42..ccb6d085 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.record;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketSource.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketSource.java
index e3d994cc..d36d40ef 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketSource.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketSource.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.record;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/Recorder.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/Recorder.java
index d0e1439c..f4267b49 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/Recorder.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/Recorder.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.record;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/FightState.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/FightState.java
index cadcec66..930b7490 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/FightState.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/FightState.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.states;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/IStateDependent.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/IStateDependent.java
index 1d9f170e..e699a519 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/IStateDependent.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/IStateDependent.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.states;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/OneShotStateDependent.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/OneShotStateDependent.java
index 610168f3..a09ea35c 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/OneShotStateDependent.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/OneShotStateDependent.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.states;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/StateDependent.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/StateDependent.java
index e20c4fbe..53fa852e 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/StateDependent.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/StateDependent.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.states;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/StateDependentCommand.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/StateDependentCommand.java
index 2d25b68d..53ea244a 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/StateDependentCommand.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/StateDependentCommand.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.states;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/StateDependentCountdown.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/StateDependentCountdown.java
index 4bdbc093..3ad3bc4c 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/StateDependentCountdown.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/StateDependentCountdown.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.states;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/StateDependentListener.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/StateDependentListener.java
index f5cfffc8..c3c3a7cb 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/StateDependentListener.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/StateDependentListener.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.states;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/StateDependentTask.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/StateDependentTask.java
index 950fbcb8..7753d477 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/StateDependentTask.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/StateDependentTask.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.states;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/BlockIdWrapper.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/BlockIdWrapper.java
index a8f5d226..1a496970 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/BlockIdWrapper.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/BlockIdWrapper.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2021  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/>.
+ *   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.utils;
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/BountifulWrapper.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/BountifulWrapper.java
index 3e96c85a..3600127e 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/BountifulWrapper.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/BountifulWrapper.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2021  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/>.
+ *   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.utils;
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/BungeeFightInfo.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/BungeeFightInfo.java
index dde1e3f2..f01d7865 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/BungeeFightInfo.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/BungeeFightInfo.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2021  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/>.
+ *   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.utils;
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/ColorConverter.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/ColorConverter.java
index 32f44510..ad8fd242 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/ColorConverter.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/ColorConverter.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.utils;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper.java
index e008a3bd..1100a272 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2021  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/>.
+ *   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.utils;
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/EnterHandler.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/EnterHandler.java
index 53c9ffb3..51d66677 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/EnterHandler.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/EnterHandler.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.utils;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/FightStatistics.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/FightStatistics.java
index 92ea3826..38931d74 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/FightStatistics.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/FightStatistics.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.utils;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/FightUI.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/FightUI.java
index d17e535e..14ea8137 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/FightUI.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/FightUI.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2021  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/>.
+ *   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.utils;
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/FlatteningWrapper.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/FlatteningWrapper.java
index aa2f10e8..14e4c941 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/FlatteningWrapper.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/FlatteningWrapper.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2021  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/>.
+ *   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.utils;
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/Hull.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/Hull.java
index caf39e79..5c793107 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/Hull.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/Hull.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/HullHider.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/HullHider.java
index 137e2082..074a9e4d 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/HullHider.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/HullHider.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2022  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/>.
+ *   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.utils;
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/HullHiderWrapper.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/HullHiderWrapper.java
index 17a5195b..ca33a517 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/HullHiderWrapper.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/HullHiderWrapper.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/ItemBuilder.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/ItemBuilder.java
index 728fb924..ddc92242 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/ItemBuilder.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/ItemBuilder.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.utils;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/Message.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/Message.java
index 9484b640..6cc2a23b 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/Message.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/Message.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2021  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/>.
+ *   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.utils;
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/Region.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/Region.java
index 2d881513..e525f9a7 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/Region.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/Region.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2021  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/>.
+ *   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.utils;
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/SWSound.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/SWSound.java
index 9ae178d9..1022445d 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/SWSound.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/SWSound.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2021  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/>.
+ *   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.utils;
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/TechHiderWrapper.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/TechHiderWrapper.java
index bf890168..935a3a9f 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/TechHiderWrapper.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/TechHiderWrapper.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2021  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/>.
+ *   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.utils;
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/WorldOfColorWrapper.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/WorldOfColorWrapper.java
index e69b4d29..32fef89a 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/WorldOfColorWrapper.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/WorldOfColorWrapper.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2021  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/>.
+ *   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.utils;
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/WorldeditWrapper.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/WorldeditWrapper.java
index 83c68803..dff1df66 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/WorldeditWrapper.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/WorldeditWrapper.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2021  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/>.
+ *   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.utils;
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/EventTeamOffWincondition.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/EventTeamOffWincondition.java
index 9f0252d2..2557a489 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/EventTeamOffWincondition.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/EventTeamOffWincondition.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.winconditions;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/PrintableWincondition.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/PrintableWincondition.java
index 6af28b0b..ea2dd83a 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/PrintableWincondition.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/PrintableWincondition.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.winconditions;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/Wincondition.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/Wincondition.java
index 627a62cf..091d1427 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/Wincondition.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/Wincondition.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.winconditions;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionAllDead.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionAllDead.java
index c1dc6469..36281398 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionAllDead.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionAllDead.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.winconditions;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionAmongUs.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionAmongUs.java
index 3e35177f..593f3676 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionAmongUs.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionAmongUs.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.winconditions;
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionBasePercent.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionBasePercent.java
index e9cd3858..afeca37d 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionBasePercent.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionBasePercent.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.winconditions;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionBlocks.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionBlocks.java
index 1d13d9bd..21fab040 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionBlocks.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionBlocks.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.winconditions;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionCaptainDead.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionCaptainDead.java
index ada04ad2..5265aff3 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionCaptainDead.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionCaptainDead.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.winconditions;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionComparisonTimeout.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionComparisonTimeout.java
index 6e576efd..ae9cc0b1 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionComparisonTimeout.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionComparisonTimeout.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.winconditions;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionHearthRatioTimeout.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionHearthRatioTimeout.java
index 2dcd6c1b..b8b99c9f 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionHearthRatioTimeout.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionHearthRatioTimeout.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.winconditions;
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPercent.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPercent.java
index b14f5bef..e74a88c3 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPercent.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPercent.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.winconditions;
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPercentTimeout.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPercentTimeout.java
index 6271dd92..f064aa99 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPercentTimeout.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPercentTimeout.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.winconditions;
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPoints.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPoints.java
index 7c96a924..a1e252df 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPoints.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPoints.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.winconditions;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPointsAirShip.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPointsAirShip.java
index 8ef84838..f4d885db 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPointsAirShip.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPointsAirShip.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.winconditions;
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPumkinTechKO.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPumkinTechKO.java
index 3d9a8b61..ee9ad4eb 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPumkinTechKO.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPumkinTechKO.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.winconditions;
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionTimeTechKO.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionTimeTechKO.java
index 5ca79609..a04dd2e2 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionTimeTechKO.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionTimeTechKO.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.winconditions;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionTimedDamageTechKO.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionTimedDamageTechKO.java
index 7daa923a..3f2f8204 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionTimedDamageTechKO.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionTimedDamageTechKO.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.winconditions;
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionTimeout.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionTimeout.java
index 9a56195f..4424b6f5 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionTimeout.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionTimeout.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.winconditions;
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionWaterTechKO.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionWaterTechKO.java
index 523fb06f..89b72b5e 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionWaterTechKO.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionWaterTechKO.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.winconditions;
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/Winconditions.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/Winconditions.java
index 4ba66cf3..2e4fb67d 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/Winconditions.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/Winconditions.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2021  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/>.
+ *   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.winconditions;
diff --git a/FightSystem/FightSystem_Standalone/build.gradle.kts b/FightSystem/FightSystem_Standalone/build.gradle.kts
index 97e19a53..c237d262 100644
--- a/FightSystem/FightSystem_Standalone/build.gradle.kts
+++ b/FightSystem/FightSystem_Standalone/build.gradle.kts
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/FightSystem/build.gradle.kts b/FightSystem/build.gradle.kts
index 6338609a..9224fa6b 100644
--- a/FightSystem/build.gradle.kts
+++ b/FightSystem/build.gradle.kts
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/KotlinCore/build.gradle.kts b/KotlinCore/build.gradle.kts
index c3bb85b5..c57d022e 100644
--- a/KotlinCore/build.gradle.kts
+++ b/KotlinCore/build.gradle.kts
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/KotlinCore/src/de/steamwar/kotlin/KotlinCore.kt b/KotlinCore/src/de/steamwar/kotlin/KotlinCore.kt
index 1c4bc406..9b81bf0e 100644
--- a/KotlinCore/src/de/steamwar/kotlin/KotlinCore.kt
+++ b/KotlinCore/src/de/steamwar/kotlin/KotlinCore.kt
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/KotlinCore/src/de/steamwar/kotlin/util/Area.kt b/KotlinCore/src/de/steamwar/kotlin/util/Area.kt
index 5b96519f..667fec81 100644
--- a/KotlinCore/src/de/steamwar/kotlin/util/Area.kt
+++ b/KotlinCore/src/de/steamwar/kotlin/util/Area.kt
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/LegacyBauSystem/build.gradle.kts b/LegacyBauSystem/build.gradle.kts
index a3f42811..8e3f88fc 100644
--- a/LegacyBauSystem/build.gradle.kts
+++ b/LegacyBauSystem/build.gradle.kts
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/BauSystem.java b/LegacyBauSystem/src/de/steamwar/bausystem/BauSystem.java
index 6712e45a..2b6f816b 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/BauSystem.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/BauSystem.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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;
 
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/CraftbukkitWrapper.java b/LegacyBauSystem/src/de/steamwar/bausystem/CraftbukkitWrapper.java
index 8dca9a27..580ca89c 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/CraftbukkitWrapper.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/CraftbukkitWrapper.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/CraftbukkitWrapper12.java b/LegacyBauSystem/src/de/steamwar/bausystem/CraftbukkitWrapper12.java
index 46c1dbcb..d2e6bc06 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/CraftbukkitWrapper12.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/CraftbukkitWrapper12.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/FlatteningWrapper.java b/LegacyBauSystem/src/de/steamwar/bausystem/FlatteningWrapper.java
index 2fbbcb64..55efd292 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/FlatteningWrapper.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/FlatteningWrapper.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/FlatteningWrapper12.java b/LegacyBauSystem/src/de/steamwar/bausystem/FlatteningWrapper12.java
index b6cf7359..bcad7aef 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/FlatteningWrapper12.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/FlatteningWrapper12.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/Mapper.java b/LegacyBauSystem/src/de/steamwar/bausystem/Mapper.java
index 591fdd08..9079cabe 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/Mapper.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/Mapper.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/Permission.java b/LegacyBauSystem/src/de/steamwar/bausystem/Permission.java
index f3e50856..472941e4 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/Permission.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/Permission.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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;
 
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/RamUsage.java b/LegacyBauSystem/src/de/steamwar/bausystem/RamUsage.java
index b3fc6fd4..2638b83f 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/RamUsage.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/RamUsage.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/SWUtils.java b/LegacyBauSystem/src/de/steamwar/bausystem/SWUtils.java
index 5f22d5be..cdc9a7a3 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/SWUtils.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/SWUtils.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/TraceEntity12.java b/LegacyBauSystem/src/de/steamwar/bausystem/TraceEntity12.java
index b30fc9eb..1e8d8c5a 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/TraceEntity12.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/TraceEntity12.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/WorldeditWrapper.java b/LegacyBauSystem/src/de/steamwar/bausystem/WorldeditWrapper.java
index 8ba9bcc7..c6ee9ce3 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/WorldeditWrapper.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/WorldeditWrapper.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/WorldeditWrapper12.java b/LegacyBauSystem/src/de/steamwar/bausystem/WorldeditWrapper12.java
index 8fdf94ac..1ee68074 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/WorldeditWrapper12.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/WorldeditWrapper12.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandClear.java b/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandClear.java
index 195d0f35..391dc3c8 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandClear.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandClear.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.commands;
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandColor.java b/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandColor.java
index ddd04fe9..2a7874dc 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandColor.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandColor.java
@@ -1,3 +1,22 @@
+/*
+ *   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.commands;
 
 import de.steamwar.bausystem.BauSystem;
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandDebugStick.java b/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandDebugStick.java
index 33c045a0..0c6aa4a5 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandDebugStick.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandDebugStick.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.commands;
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandDetonator.java b/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandDetonator.java
index ca2bb9c7..df5fa6d3 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandDetonator.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandDetonator.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.commands;
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandFire.java b/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandFire.java
index 56b48621..b35c2e25 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandFire.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandFire.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.commands;
 
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandFreeze.java b/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandFreeze.java
index a3460edd..114817e9 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandFreeze.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandFreeze.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.commands;
 
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandGUI.java b/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandGUI.java
index 076d7c9d..6c0658e0 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandGUI.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandGUI.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.commands;
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandGamemode.java b/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandGamemode.java
index 5ddbfa0d..0a717412 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandGamemode.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandGamemode.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.commands;
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandGills.java b/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandGills.java
index 051ea107..1330ded1 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandGills.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandGills.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.commands;
 
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandInfo.java b/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandInfo.java
index b1831409..0e2f5dcd 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandInfo.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandInfo.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.commands;
 
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandKillAll.java b/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandKillAll.java
index 389a191a..36b5b29e 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandKillAll.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandKillAll.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.commands;
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandLoader.java b/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandLoader.java
index 628db208..60504d69 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandLoader.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandLoader.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.commands;
 
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandLockschem.java b/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandLockschem.java
index c5f20eb3..b1a0a071 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandLockschem.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandLockschem.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.commands;
 
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandNV.java b/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandNV.java
index 7b232a22..b37d21ae 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandNV.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandNV.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.commands;
 
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandProtect.java b/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandProtect.java
index f97d18e8..93551f8e 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandProtect.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandProtect.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.commands;
 
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandRedstoneTester.java b/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandRedstoneTester.java
index 91a8626a..30972ff2 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandRedstoneTester.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandRedstoneTester.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.commands;
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandRegion.java b/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandRegion.java
index 2efb478e..d779c2a5 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandRegion.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandRegion.java
@@ -1,3 +1,22 @@
+/*
+ *   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.commands;
 
 import de.steamwar.bausystem.BauSystem;
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandReset.java b/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandReset.java
index 4ec404e5..3424b192 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandReset.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandReset.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.commands;
 
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandScript.java b/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandScript.java
index 8e071ea9..4563baa0 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandScript.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandScript.java
@@ -1,22 +1,20 @@
 /*
+ *   This file is a part of the SteamWar software.
  *
- *     This file is a part of the SteamWar software.
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
  *
- *     Copyright (C) 2020  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 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.
  *
- *     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/>.
- * /
+ *   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.commands;
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandScriptVars.java b/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandScriptVars.java
index f352fca8..961d909e 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandScriptVars.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandScriptVars.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.commands;
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandSelect.java b/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandSelect.java
index 96e6105e..e99cb8fb 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandSelect.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandSelect.java
@@ -1,3 +1,22 @@
+/*
+ *   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.commands;
 
 import de.steamwar.bausystem.BauSystem;
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandSkull.java b/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandSkull.java
index ca98a7ed..1fdc4164 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandSkull.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandSkull.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.commands;
 
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandSpeed.java b/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandSpeed.java
index 195cefcd..ed6943c8 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandSpeed.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandSpeed.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.commands;
 
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandTNT.java b/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandTNT.java
index a96daf31..d7dc91ff 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandTNT.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandTNT.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.commands;
 
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandTPSLimiter.java b/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandTPSLimiter.java
index fe73d863..53ec3832 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandTPSLimiter.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandTPSLimiter.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.commands;
 
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandTeleport.java b/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandTeleport.java
index 04fa8c72..cb7fbdc6 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandTeleport.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandTeleport.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.commands;
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandTestblock.java b/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandTestblock.java
index ec206fa9..cbc71be6 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandTestblock.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandTestblock.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.commands;
 
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandTime.java b/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandTime.java
index 8a231052..c209ae1d 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandTime.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandTime.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.commands;
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandTrace.java b/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandTrace.java
index d1c9e2f0..615b4387 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandTrace.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandTrace.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.commands;
 
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandWorldSpawn.java b/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandWorldSpawn.java
index 2f9c1340..90d3f5c5 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandWorldSpawn.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/commands/CommandWorldSpawn.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.commands;
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/commands/RegionUtils.java b/LegacyBauSystem/src/de/steamwar/bausystem/commands/RegionUtils.java
index 1c783030..21f610bc 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/commands/RegionUtils.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/commands/RegionUtils.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.commands;
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/gui/GuiTraceShow.java b/LegacyBauSystem/src/de/steamwar/bausystem/gui/GuiTraceShow.java
index caa03eb2..193bece5 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/gui/GuiTraceShow.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/gui/GuiTraceShow.java
@@ -1,22 +1,20 @@
 /*
+ *   This file is a part of the SteamWar software.
  *
- *     This file is a part of the SteamWar software.
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
  *
- *     Copyright (C) 2020  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 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.
  *
- *     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/>.
- * /
+ *   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.gui;
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/tracer/AbstractTraceEntity.java b/LegacyBauSystem/src/de/steamwar/bausystem/tracer/AbstractTraceEntity.java
index 1df4d96d..e04e2eb7 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/tracer/AbstractTraceEntity.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/tracer/AbstractTraceEntity.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.tracer;
 
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/tracer/RoundedTNTPosition.java b/LegacyBauSystem/src/de/steamwar/bausystem/tracer/RoundedTNTPosition.java
index 73960575..5b669944 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/tracer/RoundedTNTPosition.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/tracer/RoundedTNTPosition.java
@@ -1,22 +1,20 @@
 /*
+ *   This file is a part of the SteamWar software.
  *
- *     This file is a part of the SteamWar software.
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
  *
- *     Copyright (C) 2020  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 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.
  *
- *     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/>.
- * /
+ *   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.tracer;
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/tracer/TNTPosition.java b/LegacyBauSystem/src/de/steamwar/bausystem/tracer/TNTPosition.java
index d8deae6b..2d96cdac 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/tracer/TNTPosition.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/tracer/TNTPosition.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.tracer;
 
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/tracer/record/RecordStateMachine.java b/LegacyBauSystem/src/de/steamwar/bausystem/tracer/record/RecordStateMachine.java
index bd679386..32333d41 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/tracer/record/RecordStateMachine.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/tracer/record/RecordStateMachine.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.tracer.record;
 
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/tracer/record/RecordStatus.java b/LegacyBauSystem/src/de/steamwar/bausystem/tracer/record/RecordStatus.java
index b87e740c..38e45d2b 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/tracer/record/RecordStatus.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/tracer/record/RecordStatus.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.tracer.record;
 
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/tracer/record/Recorder.java b/LegacyBauSystem/src/de/steamwar/bausystem/tracer/record/Recorder.java
index 171afd01..e1f5fb91 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/tracer/record/Recorder.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/tracer/record/Recorder.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.tracer.record;
 
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/tracer/record/TraceAutoHandler.java b/LegacyBauSystem/src/de/steamwar/bausystem/tracer/record/TraceAutoHandler.java
index 58e52e41..4b0cdd44 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/tracer/record/TraceAutoHandler.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/tracer/record/TraceAutoHandler.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.tracer.record;
 
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/tracer/show/Record.java b/LegacyBauSystem/src/de/steamwar/bausystem/tracer/show/Record.java
index b6ac929c..598f4656 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/tracer/show/Record.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/tracer/show/Record.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.tracer.show;
 
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/tracer/show/ShowMode.java b/LegacyBauSystem/src/de/steamwar/bausystem/tracer/show/ShowMode.java
index d313189d..a86824b0 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/tracer/show/ShowMode.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/tracer/show/ShowMode.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.tracer.show;
 
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/tracer/show/ShowModeParameter.java b/LegacyBauSystem/src/de/steamwar/bausystem/tracer/show/ShowModeParameter.java
index ba67f716..18a39f7b 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/tracer/show/ShowModeParameter.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/tracer/show/ShowModeParameter.java
@@ -1,22 +1,20 @@
 /*
+ *   This file is a part of the SteamWar software.
  *
- *     This file is a part of the SteamWar software.
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
  *
- *     Copyright (C) 2020  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 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.
  *
- *     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/>.
- * /
+ *   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.tracer.show;
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/tracer/show/ShowModeParameterType.java b/LegacyBauSystem/src/de/steamwar/bausystem/tracer/show/ShowModeParameterType.java
index 5cb046cf..b85a0928 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/tracer/show/ShowModeParameterType.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/tracer/show/ShowModeParameterType.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.tracer.show;
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/tracer/show/StoredRecords.java b/LegacyBauSystem/src/de/steamwar/bausystem/tracer/show/StoredRecords.java
index b0a377ee..4ce637f7 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/tracer/show/StoredRecords.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/tracer/show/StoredRecords.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.tracer.show;
 
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/tracer/show/TraceShowManager.java b/LegacyBauSystem/src/de/steamwar/bausystem/tracer/show/TraceShowManager.java
index 0c4b88ee..2cce039e 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/tracer/show/TraceShowManager.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/tracer/show/TraceShowManager.java
@@ -1,3 +1,22 @@
+/*
+ *   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.tracer.show;
 
 import de.steamwar.bausystem.BauSystem;
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/tracer/show/mode/EntityShowMode.java b/LegacyBauSystem/src/de/steamwar/bausystem/tracer/show/mode/EntityShowMode.java
index 0e1a27ef..bbb6057c 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/tracer/show/mode/EntityShowMode.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/tracer/show/mode/EntityShowMode.java
@@ -1,22 +1,20 @@
 /*
+ *   This file is a part of the SteamWar software.
  *
- *     This file is a part of the SteamWar software.
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
  *
- *     Copyright (C) 2020  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 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.
  *
- *     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/>.
- * /
+ *   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.tracer.show.mode;
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/world/AFKStopper.java b/LegacyBauSystem/src/de/steamwar/bausystem/world/AFKStopper.java
index cf8e7bd2..74eb8f86 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/world/AFKStopper.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/world/AFKStopper.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.world;
 
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/world/AbstractAutoLoader.java b/LegacyBauSystem/src/de/steamwar/bausystem/world/AbstractAutoLoader.java
index d30fe2dc..70cf1487 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/world/AbstractAutoLoader.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/world/AbstractAutoLoader.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.world;
 
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/world/AutoLoader.java b/LegacyBauSystem/src/de/steamwar/bausystem/world/AutoLoader.java
index 92aa8bc1..5b3caec6 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/world/AutoLoader.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/world/AutoLoader.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.world;
 
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/world/BauScoreboard.java b/LegacyBauSystem/src/de/steamwar/bausystem/world/BauScoreboard.java
index 380bc715..0d1a5fdd 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/world/BauScoreboard.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/world/BauScoreboard.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.world;
 
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/world/ClipboardListener.java b/LegacyBauSystem/src/de/steamwar/bausystem/world/ClipboardListener.java
index 0ff91d44..bbf70596 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/world/ClipboardListener.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/world/ClipboardListener.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.world;
 
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/world/Color.java b/LegacyBauSystem/src/de/steamwar/bausystem/world/Color.java
index 2f068813..0b74a868 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/world/Color.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/world/Color.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.world;
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/world/Detoloader.java b/LegacyBauSystem/src/de/steamwar/bausystem/world/Detoloader.java
index 531fff59..0016d167 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/world/Detoloader.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/world/Detoloader.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.world;
 
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/world/Detonator.java b/LegacyBauSystem/src/de/steamwar/bausystem/world/Detonator.java
index 93c90c54..d29ba59d 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/world/Detonator.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/world/Detonator.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.world;
 
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/world/DetonatorListener.java b/LegacyBauSystem/src/de/steamwar/bausystem/world/DetonatorListener.java
index b616fb97..afdd6e9d 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/world/DetonatorListener.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/world/DetonatorListener.java
@@ -1,3 +1,22 @@
+/*
+ *   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.world;
 
 import de.steamwar.bausystem.BauSystem;
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/world/ItemFrameListener.java b/LegacyBauSystem/src/de/steamwar/bausystem/world/ItemFrameListener.java
index a8c9618f..f7058fe7 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/world/ItemFrameListener.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/world/ItemFrameListener.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.world;
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/world/PredefinedBook.java b/LegacyBauSystem/src/de/steamwar/bausystem/world/PredefinedBook.java
index 355fd3b8..21250c01 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/world/PredefinedBook.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/world/PredefinedBook.java
@@ -1,3 +1,22 @@
+/*
+ *   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.world;
 
 import de.steamwar.bausystem.BauSystem;
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/world/RegionListener.java b/LegacyBauSystem/src/de/steamwar/bausystem/world/RegionListener.java
index 19f18c02..4b835876 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/world/RegionListener.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/world/RegionListener.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.world;
 
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/world/ScriptListener.java b/LegacyBauSystem/src/de/steamwar/bausystem/world/ScriptListener.java
index b26055fe..23bbbb45 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/world/ScriptListener.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/world/ScriptListener.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.world;
 
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/world/SizedStack.java b/LegacyBauSystem/src/de/steamwar/bausystem/world/SizedStack.java
index d46b181d..ed62f6b1 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/world/SizedStack.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/world/SizedStack.java
@@ -1,3 +1,22 @@
+/*
+ *   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.world;
 
 @SuppressWarnings({"unused", "UnusedReturnValue"})
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/world/TPSUtils.java b/LegacyBauSystem/src/de/steamwar/bausystem/world/TPSUtils.java
index 4f16230b..cb253d9e 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/world/TPSUtils.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/world/TPSUtils.java
@@ -1,21 +1,20 @@
 /*
+ *   This file is a part of the SteamWar software.
  *
- *     This file is a part of the SteamWar software.
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
  *
- *     Copyright (C) 2020  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 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.
  *
- *     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/>.
+ *   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.world;
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/world/Welt.java b/LegacyBauSystem/src/de/steamwar/bausystem/world/Welt.java
index 74c87374..459f3f7f 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/world/Welt.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/world/Welt.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.world;
 
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/world/regions/GlobalRegion.java b/LegacyBauSystem/src/de/steamwar/bausystem/world/regions/GlobalRegion.java
index 363284c4..4846bc3d 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/world/regions/GlobalRegion.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/world/regions/GlobalRegion.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.world.regions;
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/world/regions/PasteOptions.java b/LegacyBauSystem/src/de/steamwar/bausystem/world/regions/PasteOptions.java
index 2dfbea07..fca143cc 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/world/regions/PasteOptions.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/world/regions/PasteOptions.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.world.regions;
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/world/regions/Point.java b/LegacyBauSystem/src/de/steamwar/bausystem/world/regions/Point.java
index b7bdf43f..c85a5f6f 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/world/regions/Point.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/world/regions/Point.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.world.regions;
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/world/regions/Prototype.java b/LegacyBauSystem/src/de/steamwar/bausystem/world/regions/Prototype.java
index f1ccca1c..49edd4e8 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/world/regions/Prototype.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/world/regions/Prototype.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.world.regions;
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/world/regions/Region.java b/LegacyBauSystem/src/de/steamwar/bausystem/world/regions/Region.java
index 591f8761..1d602b64 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/world/regions/Region.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/world/regions/Region.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.world.regions;
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/world/regions/RegionExtensionType.java b/LegacyBauSystem/src/de/steamwar/bausystem/world/regions/RegionExtensionType.java
index 28be3b69..b7f80a9a 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/world/regions/RegionExtensionType.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/world/regions/RegionExtensionType.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.world.regions;
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/world/regions/RegionSelectionType.java b/LegacyBauSystem/src/de/steamwar/bausystem/world/regions/RegionSelectionType.java
index 40cb2f23..58a32986 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/world/regions/RegionSelectionType.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/world/regions/RegionSelectionType.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.world.regions;
diff --git a/LegacyBauSystem/src/de/steamwar/bausystem/world/regions/RegionType.java b/LegacyBauSystem/src/de/steamwar/bausystem/world/regions/RegionType.java
index ac47eb9d..da4a071a 100644
--- a/LegacyBauSystem/src/de/steamwar/bausystem/world/regions/RegionType.java
+++ b/LegacyBauSystem/src/de/steamwar/bausystem/world/regions/RegionType.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.world.regions;
diff --git a/LobbySystem/build.gradle.kts b/LobbySystem/build.gradle.kts
index b36a4e79..f658af8f 100644
--- a/LobbySystem/build.gradle.kts
+++ b/LobbySystem/build.gradle.kts
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/LobbySystem/src/de/steamwar/lobby/Config.java b/LobbySystem/src/de/steamwar/lobby/Config.java
index 596b6051..41be1658 100644
--- a/LobbySystem/src/de/steamwar/lobby/Config.java
+++ b/LobbySystem/src/de/steamwar/lobby/Config.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.lobby;
diff --git a/LobbySystem/src/de/steamwar/lobby/Fightserver.java b/LobbySystem/src/de/steamwar/lobby/Fightserver.java
index a5b19995..ccf1fa9d 100644
--- a/LobbySystem/src/de/steamwar/lobby/Fightserver.java
+++ b/LobbySystem/src/de/steamwar/lobby/Fightserver.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.lobby;
diff --git a/LobbySystem/src/de/steamwar/lobby/LobbyPacketHandler.java b/LobbySystem/src/de/steamwar/lobby/LobbyPacketHandler.java
index 66638aae..37284085 100644
--- a/LobbySystem/src/de/steamwar/lobby/LobbyPacketHandler.java
+++ b/LobbySystem/src/de/steamwar/lobby/LobbyPacketHandler.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.lobby;
diff --git a/LobbySystem/src/de/steamwar/lobby/LobbySystem.java b/LobbySystem/src/de/steamwar/lobby/LobbySystem.java
index 29975e12..9dc76edc 100644
--- a/LobbySystem/src/de/steamwar/lobby/LobbySystem.java
+++ b/LobbySystem/src/de/steamwar/lobby/LobbySystem.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.lobby;
diff --git a/LobbySystem/src/de/steamwar/lobby/LobbySystem.properties b/LobbySystem/src/de/steamwar/lobby/LobbySystem.properties
index 55fff341..dc3de60f 100644
--- a/LobbySystem/src/de/steamwar/lobby/LobbySystem.properties
+++ b/LobbySystem/src/de/steamwar/lobby/LobbySystem.properties
@@ -1,3 +1,22 @@
+#
+#   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/>.
+#
+
 PREFIX = §eLobby§8System§8»§7
 TIME = HH:mm:ss
 DATE=........
diff --git a/LobbySystem/src/de/steamwar/lobby/LobbySystem_de.properties b/LobbySystem/src/de/steamwar/lobby/LobbySystem_de.properties
index efe41798..929164d4 100644
--- a/LobbySystem/src/de/steamwar/lobby/LobbySystem_de.properties
+++ b/LobbySystem/src/de/steamwar/lobby/LobbySystem_de.properties
@@ -1,3 +1,22 @@
+#
+#   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/>.
+#
+
 PREFIX = §eLobby§8System§8»
 TIME = HH:mm:ss
 DATE=........
diff --git a/LobbySystem/src/de/steamwar/lobby/boatrace/BoatRace.java b/LobbySystem/src/de/steamwar/lobby/boatrace/BoatRace.java
index 031d8989..55c6daf7 100644
--- a/LobbySystem/src/de/steamwar/lobby/boatrace/BoatRace.java
+++ b/LobbySystem/src/de/steamwar/lobby/boatrace/BoatRace.java
@@ -1,3 +1,22 @@
+/*
+ *   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.lobby.boatrace;
 
 import de.steamwar.entity.REntity;
diff --git a/LobbySystem/src/de/steamwar/lobby/boatrace/BoatRacePositions.java b/LobbySystem/src/de/steamwar/lobby/boatrace/BoatRacePositions.java
index 23b7a9e8..4171843a 100644
--- a/LobbySystem/src/de/steamwar/lobby/boatrace/BoatRacePositions.java
+++ b/LobbySystem/src/de/steamwar/lobby/boatrace/BoatRacePositions.java
@@ -1,3 +1,22 @@
+/*
+ *   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.lobby.boatrace;
 
 import org.bukkit.Bukkit;
diff --git a/LobbySystem/src/de/steamwar/lobby/command/FlyCommand.java b/LobbySystem/src/de/steamwar/lobby/command/FlyCommand.java
index 56863be7..c95c1e59 100644
--- a/LobbySystem/src/de/steamwar/lobby/command/FlyCommand.java
+++ b/LobbySystem/src/de/steamwar/lobby/command/FlyCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.lobby.command;
diff --git a/LobbySystem/src/de/steamwar/lobby/command/HologramCommand.java b/LobbySystem/src/de/steamwar/lobby/command/HologramCommand.java
index 9166ffaa..23c8466e 100644
--- a/LobbySystem/src/de/steamwar/lobby/command/HologramCommand.java
+++ b/LobbySystem/src/de/steamwar/lobby/command/HologramCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.lobby.command;
diff --git a/LobbySystem/src/de/steamwar/lobby/command/ModifyCommand.java b/LobbySystem/src/de/steamwar/lobby/command/ModifyCommand.java
index 0233b007..747ac825 100644
--- a/LobbySystem/src/de/steamwar/lobby/command/ModifyCommand.java
+++ b/LobbySystem/src/de/steamwar/lobby/command/ModifyCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.lobby.command;
diff --git a/LobbySystem/src/de/steamwar/lobby/command/PortalCommand.java b/LobbySystem/src/de/steamwar/lobby/command/PortalCommand.java
index 7eb1036f..6069a3c4 100644
--- a/LobbySystem/src/de/steamwar/lobby/command/PortalCommand.java
+++ b/LobbySystem/src/de/steamwar/lobby/command/PortalCommand.java
@@ -1,3 +1,22 @@
+/*
+ *   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.lobby.command;
 
 import com.sk89q.worldedit.IncompleteRegionException;
diff --git a/LobbySystem/src/de/steamwar/lobby/display/Hologram.java b/LobbySystem/src/de/steamwar/lobby/display/Hologram.java
index 556c7d0b..2024b7b3 100644
--- a/LobbySystem/src/de/steamwar/lobby/display/Hologram.java
+++ b/LobbySystem/src/de/steamwar/lobby/display/Hologram.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.lobby.display;
diff --git a/LobbySystem/src/de/steamwar/lobby/display/NPC.java b/LobbySystem/src/de/steamwar/lobby/display/NPC.java
index 3bbc5f2e..d82669f3 100644
--- a/LobbySystem/src/de/steamwar/lobby/display/NPC.java
+++ b/LobbySystem/src/de/steamwar/lobby/display/NPC.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.lobby.display;
diff --git a/LobbySystem/src/de/steamwar/lobby/jumpandrun/JumpAndRun.java b/LobbySystem/src/de/steamwar/lobby/jumpandrun/JumpAndRun.java
index 4094a5b2..adc63951 100644
--- a/LobbySystem/src/de/steamwar/lobby/jumpandrun/JumpAndRun.java
+++ b/LobbySystem/src/de/steamwar/lobby/jumpandrun/JumpAndRun.java
@@ -1,3 +1,22 @@
+/*
+ *   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.lobby.jumpandrun;
 
 import de.steamwar.linkage.Linked;
diff --git a/LobbySystem/src/de/steamwar/lobby/jumpandrun/JumpAndRunCommand.java b/LobbySystem/src/de/steamwar/lobby/jumpandrun/JumpAndRunCommand.java
index 4b18ef21..6d8211bb 100644
--- a/LobbySystem/src/de/steamwar/lobby/jumpandrun/JumpAndRunCommand.java
+++ b/LobbySystem/src/de/steamwar/lobby/jumpandrun/JumpAndRunCommand.java
@@ -1,3 +1,22 @@
+/*
+ *   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.lobby.jumpandrun;
 
 import de.steamwar.command.SWCommand;
diff --git a/LobbySystem/src/de/steamwar/lobby/listener/AlphaWall.java b/LobbySystem/src/de/steamwar/lobby/listener/AlphaWall.java
index 75ae1875..a4fabb16 100644
--- a/LobbySystem/src/de/steamwar/lobby/listener/AlphaWall.java
+++ b/LobbySystem/src/de/steamwar/lobby/listener/AlphaWall.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.lobby.listener;
diff --git a/LobbySystem/src/de/steamwar/lobby/listener/DoubleJumpListener.java b/LobbySystem/src/de/steamwar/lobby/listener/DoubleJumpListener.java
index 47438002..e97f3de6 100644
--- a/LobbySystem/src/de/steamwar/lobby/listener/DoubleJumpListener.java
+++ b/LobbySystem/src/de/steamwar/lobby/listener/DoubleJumpListener.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.lobby.listener;
diff --git a/LobbySystem/src/de/steamwar/lobby/listener/InventoryInteraction.java b/LobbySystem/src/de/steamwar/lobby/listener/InventoryInteraction.java
index c9086aba..d5d6920c 100644
--- a/LobbySystem/src/de/steamwar/lobby/listener/InventoryInteraction.java
+++ b/LobbySystem/src/de/steamwar/lobby/listener/InventoryInteraction.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.lobby.listener;
diff --git a/LobbySystem/src/de/steamwar/lobby/listener/MapsRotateListener.java b/LobbySystem/src/de/steamwar/lobby/listener/MapsRotateListener.java
index 31825344..20cd055d 100644
--- a/LobbySystem/src/de/steamwar/lobby/listener/MapsRotateListener.java
+++ b/LobbySystem/src/de/steamwar/lobby/listener/MapsRotateListener.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.lobby.listener;
diff --git a/LobbySystem/src/de/steamwar/lobby/listener/PlayerSeatListener.java b/LobbySystem/src/de/steamwar/lobby/listener/PlayerSeatListener.java
index cd6e7919..fae3e909 100644
--- a/LobbySystem/src/de/steamwar/lobby/listener/PlayerSeatListener.java
+++ b/LobbySystem/src/de/steamwar/lobby/listener/PlayerSeatListener.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.lobby.listener;
diff --git a/LobbySystem/src/de/steamwar/lobby/listener/PlayerSpawn.java b/LobbySystem/src/de/steamwar/lobby/listener/PlayerSpawn.java
index a1734233..cf2ed29c 100644
--- a/LobbySystem/src/de/steamwar/lobby/listener/PlayerSpawn.java
+++ b/LobbySystem/src/de/steamwar/lobby/listener/PlayerSpawn.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.lobby.listener;
diff --git a/LobbySystem/src/de/steamwar/lobby/listener/Portals.java b/LobbySystem/src/de/steamwar/lobby/listener/Portals.java
index 9a0e07b4..0c372d18 100644
--- a/LobbySystem/src/de/steamwar/lobby/listener/Portals.java
+++ b/LobbySystem/src/de/steamwar/lobby/listener/Portals.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.lobby.listener;
diff --git a/LobbySystem/src/de/steamwar/lobby/listener/TeleporterListener.java b/LobbySystem/src/de/steamwar/lobby/listener/TeleporterListener.java
index f6a56116..23b87658 100644
--- a/LobbySystem/src/de/steamwar/lobby/listener/TeleporterListener.java
+++ b/LobbySystem/src/de/steamwar/lobby/listener/TeleporterListener.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.lobby.listener;
diff --git a/LobbySystem/src/de/steamwar/lobby/listener/WorldInteraction.java b/LobbySystem/src/de/steamwar/lobby/listener/WorldInteraction.java
index 7a1f5108..1d378192 100644
--- a/LobbySystem/src/de/steamwar/lobby/listener/WorldInteraction.java
+++ b/LobbySystem/src/de/steamwar/lobby/listener/WorldInteraction.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.lobby.listener;
diff --git a/LobbySystem/src/de/steamwar/lobby/map/ColorInit.java b/LobbySystem/src/de/steamwar/lobby/map/ColorInit.java
index 7e3c6ba0..4de9d206 100644
--- a/LobbySystem/src/de/steamwar/lobby/map/ColorInit.java
+++ b/LobbySystem/src/de/steamwar/lobby/map/ColorInit.java
@@ -1,3 +1,22 @@
+/*
+ *   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.lobby.map;
 
 import org.bukkit.map.MapPalette;
diff --git a/LobbySystem/src/de/steamwar/lobby/map/CustomMap.java b/LobbySystem/src/de/steamwar/lobby/map/CustomMap.java
index 6587ad2a..5c140ae9 100644
--- a/LobbySystem/src/de/steamwar/lobby/map/CustomMap.java
+++ b/LobbySystem/src/de/steamwar/lobby/map/CustomMap.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/LobbySystem/src/de/steamwar/lobby/particle/Gradient.java b/LobbySystem/src/de/steamwar/lobby/particle/Gradient.java
index 35ffcd72..2509dd56 100644
--- a/LobbySystem/src/de/steamwar/lobby/particle/Gradient.java
+++ b/LobbySystem/src/de/steamwar/lobby/particle/Gradient.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.lobby.particle;
diff --git a/LobbySystem/src/de/steamwar/lobby/particle/ParticleData.java b/LobbySystem/src/de/steamwar/lobby/particle/ParticleData.java
index 0bf1b5b8..ad475e94 100644
--- a/LobbySystem/src/de/steamwar/lobby/particle/ParticleData.java
+++ b/LobbySystem/src/de/steamwar/lobby/particle/ParticleData.java
@@ -1,3 +1,22 @@
+/*
+ *   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.lobby.particle;
 
 import de.steamwar.inventory.SWItem;
diff --git a/LobbySystem/src/de/steamwar/lobby/particle/ParticleElement.java b/LobbySystem/src/de/steamwar/lobby/particle/ParticleElement.java
index 33b497f0..5b900192 100644
--- a/LobbySystem/src/de/steamwar/lobby/particle/ParticleElement.java
+++ b/LobbySystem/src/de/steamwar/lobby/particle/ParticleElement.java
@@ -1,3 +1,22 @@
+/*
+ *   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.lobby.particle;
 
 import org.bukkit.Bukkit;
diff --git a/LobbySystem/src/de/steamwar/lobby/particle/ParticleEnum.java b/LobbySystem/src/de/steamwar/lobby/particle/ParticleEnum.java
index 67214427..57830aa3 100644
--- a/LobbySystem/src/de/steamwar/lobby/particle/ParticleEnum.java
+++ b/LobbySystem/src/de/steamwar/lobby/particle/ParticleEnum.java
@@ -1,3 +1,22 @@
+/*
+ *   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.lobby.particle;
 
 public interface ParticleEnum {
diff --git a/LobbySystem/src/de/steamwar/lobby/particle/ParticleInventory.java b/LobbySystem/src/de/steamwar/lobby/particle/ParticleInventory.java
index e1764149..b7291e91 100644
--- a/LobbySystem/src/de/steamwar/lobby/particle/ParticleInventory.java
+++ b/LobbySystem/src/de/steamwar/lobby/particle/ParticleInventory.java
@@ -1,3 +1,22 @@
+/*
+ *   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.lobby.particle;
 
 import de.steamwar.inventory.SWItem;
diff --git a/LobbySystem/src/de/steamwar/lobby/particle/ParticleListener.java b/LobbySystem/src/de/steamwar/lobby/particle/ParticleListener.java
index 1879d215..52261647 100644
--- a/LobbySystem/src/de/steamwar/lobby/particle/ParticleListener.java
+++ b/LobbySystem/src/de/steamwar/lobby/particle/ParticleListener.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.lobby.particle;
diff --git a/LobbySystem/src/de/steamwar/lobby/particle/ParticleRequirement.java b/LobbySystem/src/de/steamwar/lobby/particle/ParticleRequirement.java
index 80e6099f..bc5ba669 100644
--- a/LobbySystem/src/de/steamwar/lobby/particle/ParticleRequirement.java
+++ b/LobbySystem/src/de/steamwar/lobby/particle/ParticleRequirement.java
@@ -1,3 +1,22 @@
+/*
+ *   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.lobby.particle;
 
 import de.steamwar.lobby.LobbySystem;
diff --git a/LobbySystem/src/de/steamwar/lobby/particle/ParticleTickData.java b/LobbySystem/src/de/steamwar/lobby/particle/ParticleTickData.java
index 30cac116..cfbea1bf 100644
--- a/LobbySystem/src/de/steamwar/lobby/particle/ParticleTickData.java
+++ b/LobbySystem/src/de/steamwar/lobby/particle/ParticleTickData.java
@@ -1,3 +1,22 @@
+/*
+ *   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.lobby.particle;
 
 import lombok.AllArgsConstructor;
diff --git a/LobbySystem/src/de/steamwar/lobby/particle/ParticleTickType.java b/LobbySystem/src/de/steamwar/lobby/particle/ParticleTickType.java
index adc25e40..e4874ff0 100644
--- a/LobbySystem/src/de/steamwar/lobby/particle/ParticleTickType.java
+++ b/LobbySystem/src/de/steamwar/lobby/particle/ParticleTickType.java
@@ -1,3 +1,22 @@
+/*
+ *   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.lobby.particle;
 
 public enum ParticleTickType {
diff --git a/LobbySystem/src/de/steamwar/lobby/particle/WingDesign.java b/LobbySystem/src/de/steamwar/lobby/particle/WingDesign.java
index 125aa170..043914b9 100644
--- a/LobbySystem/src/de/steamwar/lobby/particle/WingDesign.java
+++ b/LobbySystem/src/de/steamwar/lobby/particle/WingDesign.java
@@ -1,3 +1,22 @@
+/*
+ *   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.lobby.particle;
 
 import lombok.SneakyThrows;
diff --git a/LobbySystem/src/de/steamwar/lobby/particle/elements/Always.java b/LobbySystem/src/de/steamwar/lobby/particle/elements/Always.java
index 0eeb41ee..3c036e9d 100644
--- a/LobbySystem/src/de/steamwar/lobby/particle/elements/Always.java
+++ b/LobbySystem/src/de/steamwar/lobby/particle/elements/Always.java
@@ -1,3 +1,22 @@
+/*
+ *   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.lobby.particle.elements;
 
 import de.steamwar.lobby.particle.ParticleElement;
diff --git a/LobbySystem/src/de/steamwar/lobby/particle/elements/Circle.java b/LobbySystem/src/de/steamwar/lobby/particle/elements/Circle.java
index 272886b9..969bd247 100644
--- a/LobbySystem/src/de/steamwar/lobby/particle/elements/Circle.java
+++ b/LobbySystem/src/de/steamwar/lobby/particle/elements/Circle.java
@@ -1,3 +1,22 @@
+/*
+ *   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.lobby.particle.elements;
 
 import de.steamwar.lobby.particle.ParticleElement;
diff --git a/LobbySystem/src/de/steamwar/lobby/particle/elements/Cloud.java b/LobbySystem/src/de/steamwar/lobby/particle/elements/Cloud.java
index f7b91e79..d53ef969 100644
--- a/LobbySystem/src/de/steamwar/lobby/particle/elements/Cloud.java
+++ b/LobbySystem/src/de/steamwar/lobby/particle/elements/Cloud.java
@@ -1,3 +1,22 @@
+/*
+ *   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.lobby.particle.elements;
 
 import de.steamwar.lobby.particle.ParticleElement;
diff --git a/LobbySystem/src/de/steamwar/lobby/particle/elements/Delayed.java b/LobbySystem/src/de/steamwar/lobby/particle/elements/Delayed.java
index 862fb094..3a45f0e5 100644
--- a/LobbySystem/src/de/steamwar/lobby/particle/elements/Delayed.java
+++ b/LobbySystem/src/de/steamwar/lobby/particle/elements/Delayed.java
@@ -1,3 +1,22 @@
+/*
+ *   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.lobby.particle.elements;
 
 import de.steamwar.lobby.LobbySystem;
diff --git a/LobbySystem/src/de/steamwar/lobby/particle/elements/DelegatingParticleElement.java b/LobbySystem/src/de/steamwar/lobby/particle/elements/DelegatingParticleElement.java
index 55d6e10b..58c76500 100644
--- a/LobbySystem/src/de/steamwar/lobby/particle/elements/DelegatingParticleElement.java
+++ b/LobbySystem/src/de/steamwar/lobby/particle/elements/DelegatingParticleElement.java
@@ -1,3 +1,22 @@
+/*
+ *   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.lobby.particle.elements;
 
 import de.steamwar.lobby.particle.ParticleData;
diff --git a/LobbySystem/src/de/steamwar/lobby/particle/elements/DoubleCircle.java b/LobbySystem/src/de/steamwar/lobby/particle/elements/DoubleCircle.java
index 3d777c25..c7c090f1 100644
--- a/LobbySystem/src/de/steamwar/lobby/particle/elements/DoubleCircle.java
+++ b/LobbySystem/src/de/steamwar/lobby/particle/elements/DoubleCircle.java
@@ -1,3 +1,22 @@
+/*
+ *   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.lobby.particle.elements;
 
 import de.steamwar.lobby.particle.ParticleElement;
diff --git a/LobbySystem/src/de/steamwar/lobby/particle/elements/DustParticle.java b/LobbySystem/src/de/steamwar/lobby/particle/elements/DustParticle.java
index a7edb3f0..375e80d1 100644
--- a/LobbySystem/src/de/steamwar/lobby/particle/elements/DustParticle.java
+++ b/LobbySystem/src/de/steamwar/lobby/particle/elements/DustParticle.java
@@ -1,3 +1,22 @@
+/*
+ *   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.lobby.particle.elements;
 
 import de.steamwar.lobby.particle.Gradient;
diff --git a/LobbySystem/src/de/steamwar/lobby/particle/elements/Floor.java b/LobbySystem/src/de/steamwar/lobby/particle/elements/Floor.java
index 0b4ef7fd..d7c81e66 100644
--- a/LobbySystem/src/de/steamwar/lobby/particle/elements/Floor.java
+++ b/LobbySystem/src/de/steamwar/lobby/particle/elements/Floor.java
@@ -1,3 +1,22 @@
+/*
+ *   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.lobby.particle.elements;
 
 import de.steamwar.lobby.particle.ParticleElement;
diff --git a/LobbySystem/src/de/steamwar/lobby/particle/elements/Flying.java b/LobbySystem/src/de/steamwar/lobby/particle/elements/Flying.java
index ed160a54..6d010c4a 100644
--- a/LobbySystem/src/de/steamwar/lobby/particle/elements/Flying.java
+++ b/LobbySystem/src/de/steamwar/lobby/particle/elements/Flying.java
@@ -1,3 +1,22 @@
+/*
+ *   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.lobby.particle.elements;
 
 import de.steamwar.lobby.particle.ParticleElement;
diff --git a/LobbySystem/src/de/steamwar/lobby/particle/elements/Group.java b/LobbySystem/src/de/steamwar/lobby/particle/elements/Group.java
index 6e567a0c..ca027fed 100644
--- a/LobbySystem/src/de/steamwar/lobby/particle/elements/Group.java
+++ b/LobbySystem/src/de/steamwar/lobby/particle/elements/Group.java
@@ -1,3 +1,22 @@
+/*
+ *   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.lobby.particle.elements;
 
 import de.steamwar.lobby.particle.ParticleData;
diff --git a/LobbySystem/src/de/steamwar/lobby/particle/elements/LocationMutator.java b/LobbySystem/src/de/steamwar/lobby/particle/elements/LocationMutator.java
index 41fd3425..f38ef40c 100644
--- a/LobbySystem/src/de/steamwar/lobby/particle/elements/LocationMutator.java
+++ b/LobbySystem/src/de/steamwar/lobby/particle/elements/LocationMutator.java
@@ -1,3 +1,22 @@
+/*
+ *   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.lobby.particle.elements;
 
 import de.steamwar.lobby.particle.ParticleElement;
diff --git a/LobbySystem/src/de/steamwar/lobby/particle/elements/NonFloor.java b/LobbySystem/src/de/steamwar/lobby/particle/elements/NonFloor.java
index ebc01ebc..79fe9e3f 100644
--- a/LobbySystem/src/de/steamwar/lobby/particle/elements/NonFloor.java
+++ b/LobbySystem/src/de/steamwar/lobby/particle/elements/NonFloor.java
@@ -1,3 +1,22 @@
+/*
+ *   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.lobby.particle.elements;
 
 import de.steamwar.lobby.particle.ParticleElement;
diff --git a/LobbySystem/src/de/steamwar/lobby/particle/elements/NonFlying.java b/LobbySystem/src/de/steamwar/lobby/particle/elements/NonFlying.java
index 4579e21a..072319d3 100644
--- a/LobbySystem/src/de/steamwar/lobby/particle/elements/NonFlying.java
+++ b/LobbySystem/src/de/steamwar/lobby/particle/elements/NonFlying.java
@@ -1,3 +1,22 @@
+/*
+ *   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.lobby.particle.elements;
 
 import de.steamwar.lobby.particle.ParticleElement;
diff --git a/LobbySystem/src/de/steamwar/lobby/particle/elements/None.java b/LobbySystem/src/de/steamwar/lobby/particle/elements/None.java
index 42bb013d..158a2b21 100644
--- a/LobbySystem/src/de/steamwar/lobby/particle/elements/None.java
+++ b/LobbySystem/src/de/steamwar/lobby/particle/elements/None.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.lobby.particle.elements;
diff --git a/LobbySystem/src/de/steamwar/lobby/particle/elements/OnlyOthers.java b/LobbySystem/src/de/steamwar/lobby/particle/elements/OnlyOthers.java
index b9068a30..cb65f0a5 100644
--- a/LobbySystem/src/de/steamwar/lobby/particle/elements/OnlyOthers.java
+++ b/LobbySystem/src/de/steamwar/lobby/particle/elements/OnlyOthers.java
@@ -1,3 +1,22 @@
+/*
+ *   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.lobby.particle.elements;
 
 import de.steamwar.lobby.particle.ParticleElement;
diff --git a/LobbySystem/src/de/steamwar/lobby/particle/elements/OnlySelf.java b/LobbySystem/src/de/steamwar/lobby/particle/elements/OnlySelf.java
index feb96d06..a150b467 100644
--- a/LobbySystem/src/de/steamwar/lobby/particle/elements/OnlySelf.java
+++ b/LobbySystem/src/de/steamwar/lobby/particle/elements/OnlySelf.java
@@ -1,3 +1,22 @@
+/*
+ *   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.lobby.particle.elements;
 
 import de.steamwar.lobby.particle.ParticleElement;
diff --git a/LobbySystem/src/de/steamwar/lobby/particle/elements/RandomParticle.java b/LobbySystem/src/de/steamwar/lobby/particle/elements/RandomParticle.java
index 088ac457..3dc0b809 100644
--- a/LobbySystem/src/de/steamwar/lobby/particle/elements/RandomParticle.java
+++ b/LobbySystem/src/de/steamwar/lobby/particle/elements/RandomParticle.java
@@ -1,3 +1,22 @@
+/*
+ *   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.lobby.particle.elements;
 
 import de.steamwar.lobby.LobbySystem;
diff --git a/LobbySystem/src/de/steamwar/lobby/particle/elements/Separator.java b/LobbySystem/src/de/steamwar/lobby/particle/elements/Separator.java
index 6792b445..8d25da99 100644
--- a/LobbySystem/src/de/steamwar/lobby/particle/elements/Separator.java
+++ b/LobbySystem/src/de/steamwar/lobby/particle/elements/Separator.java
@@ -1,3 +1,22 @@
+/*
+ *   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.lobby.particle.elements;
 
 import de.steamwar.lobby.particle.ParticleData;
diff --git a/LobbySystem/src/de/steamwar/lobby/particle/elements/SimpleParticle.java b/LobbySystem/src/de/steamwar/lobby/particle/elements/SimpleParticle.java
index 760f4eb9..23b556cb 100644
--- a/LobbySystem/src/de/steamwar/lobby/particle/elements/SimpleParticle.java
+++ b/LobbySystem/src/de/steamwar/lobby/particle/elements/SimpleParticle.java
@@ -1,3 +1,22 @@
+/*
+ *   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.lobby.particle.elements;
 
 import de.steamwar.lobby.particle.ParticleElement;
diff --git a/LobbySystem/src/de/steamwar/lobby/particle/elements/Sneaking.java b/LobbySystem/src/de/steamwar/lobby/particle/elements/Sneaking.java
index 833e4c14..6cf86e40 100644
--- a/LobbySystem/src/de/steamwar/lobby/particle/elements/Sneaking.java
+++ b/LobbySystem/src/de/steamwar/lobby/particle/elements/Sneaking.java
@@ -1,3 +1,22 @@
+/*
+ *   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.lobby.particle.elements;
 
 import de.steamwar.lobby.particle.ParticleElement;
diff --git a/LobbySystem/src/de/steamwar/lobby/particle/elements/TrippleCircle.java b/LobbySystem/src/de/steamwar/lobby/particle/elements/TrippleCircle.java
index 20372aa1..f5ba8b66 100644
--- a/LobbySystem/src/de/steamwar/lobby/particle/elements/TrippleCircle.java
+++ b/LobbySystem/src/de/steamwar/lobby/particle/elements/TrippleCircle.java
@@ -1,3 +1,22 @@
+/*
+ *   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.lobby.particle.elements;
 
 import de.steamwar.lobby.particle.ParticleElement;
diff --git a/LobbySystem/src/de/steamwar/lobby/particle/elements/Wing.java b/LobbySystem/src/de/steamwar/lobby/particle/elements/Wing.java
index bb43da5a..147228d3 100644
--- a/LobbySystem/src/de/steamwar/lobby/particle/elements/Wing.java
+++ b/LobbySystem/src/de/steamwar/lobby/particle/elements/Wing.java
@@ -1,3 +1,22 @@
+/*
+ *   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.lobby.particle.elements;
 
 import de.steamwar.lobby.particle.ParticleElement;
diff --git a/LobbySystem/src/de/steamwar/lobby/particle/elements/custom/HearthBeat.java b/LobbySystem/src/de/steamwar/lobby/particle/elements/custom/HearthBeat.java
index 0e974e65..4f076c40 100644
--- a/LobbySystem/src/de/steamwar/lobby/particle/elements/custom/HearthBeat.java
+++ b/LobbySystem/src/de/steamwar/lobby/particle/elements/custom/HearthBeat.java
@@ -1,3 +1,22 @@
+/*
+ *   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.lobby.particle.elements.custom;
 
 import de.steamwar.lobby.particle.ParticleElement;
diff --git a/LobbySystem/src/de/steamwar/lobby/particle/elements/custom/NonMoving.java b/LobbySystem/src/de/steamwar/lobby/particle/elements/custom/NonMoving.java
index 64909584..c0f6cf6e 100644
--- a/LobbySystem/src/de/steamwar/lobby/particle/elements/custom/NonMoving.java
+++ b/LobbySystem/src/de/steamwar/lobby/particle/elements/custom/NonMoving.java
@@ -1,3 +1,22 @@
+/*
+ *   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.lobby.particle.elements.custom;
 
 import de.steamwar.lobby.particle.ParticleElement;
diff --git a/LobbySystem/src/de/steamwar/lobby/particle/elements/custom/PulseShimmer.java b/LobbySystem/src/de/steamwar/lobby/particle/elements/custom/PulseShimmer.java
index f286f14c..d48f5361 100644
--- a/LobbySystem/src/de/steamwar/lobby/particle/elements/custom/PulseShimmer.java
+++ b/LobbySystem/src/de/steamwar/lobby/particle/elements/custom/PulseShimmer.java
@@ -1,3 +1,22 @@
+/*
+ *   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.lobby.particle.elements.custom;
 
 import de.steamwar.lobby.particle.ParticleElement;
diff --git a/LobbySystem/src/de/steamwar/lobby/particle/elements/custom/YOffset.java b/LobbySystem/src/de/steamwar/lobby/particle/elements/custom/YOffset.java
index 0af32eac..f49e4219 100644
--- a/LobbySystem/src/de/steamwar/lobby/particle/elements/custom/YOffset.java
+++ b/LobbySystem/src/de/steamwar/lobby/particle/elements/custom/YOffset.java
@@ -1,3 +1,22 @@
+/*
+ *   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.lobby.particle.elements.custom;
 
 import de.steamwar.lobby.particle.ParticleElement;
diff --git a/LobbySystem/src/de/steamwar/lobby/particle/particles/EasterParticle.java b/LobbySystem/src/de/steamwar/lobby/particle/particles/EasterParticle.java
index 0d94f2ea..0833468b 100644
--- a/LobbySystem/src/de/steamwar/lobby/particle/particles/EasterParticle.java
+++ b/LobbySystem/src/de/steamwar/lobby/particle/particles/EasterParticle.java
@@ -1,3 +1,22 @@
+/*
+ *   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.lobby.particle.particles;
 
 import de.steamwar.lobby.particle.ParticleData;
diff --git a/LobbySystem/src/de/steamwar/lobby/particle/particles/EventParticle.java b/LobbySystem/src/de/steamwar/lobby/particle/particles/EventParticle.java
index a1d097fc..531e2051 100644
--- a/LobbySystem/src/de/steamwar/lobby/particle/particles/EventParticle.java
+++ b/LobbySystem/src/de/steamwar/lobby/particle/particles/EventParticle.java
@@ -1,3 +1,22 @@
+/*
+ *   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.lobby.particle.particles;
 
 import de.steamwar.lobby.particle.ParticleData;
diff --git a/LobbySystem/src/de/steamwar/lobby/particle/particles/EventParticleParticipation.java b/LobbySystem/src/de/steamwar/lobby/particle/particles/EventParticleParticipation.java
index 761aedaf..f599ac28 100644
--- a/LobbySystem/src/de/steamwar/lobby/particle/particles/EventParticleParticipation.java
+++ b/LobbySystem/src/de/steamwar/lobby/particle/particles/EventParticleParticipation.java
@@ -1,3 +1,22 @@
+/*
+ *   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.lobby.particle.particles;
 
 import de.steamwar.lobby.particle.ParticleData;
diff --git a/LobbySystem/src/de/steamwar/lobby/particle/particles/EventParticlePlacement.java b/LobbySystem/src/de/steamwar/lobby/particle/particles/EventParticlePlacement.java
index 678fe425..096d5d7b 100644
--- a/LobbySystem/src/de/steamwar/lobby/particle/particles/EventParticlePlacement.java
+++ b/LobbySystem/src/de/steamwar/lobby/particle/particles/EventParticlePlacement.java
@@ -1,3 +1,22 @@
+/*
+ *   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.lobby.particle.particles;
 
 import de.steamwar.lobby.particle.ParticleData;
diff --git a/LobbySystem/src/de/steamwar/lobby/particle/particles/PlayerParticle.java b/LobbySystem/src/de/steamwar/lobby/particle/particles/PlayerParticle.java
index bf421bea..21bd86ec 100644
--- a/LobbySystem/src/de/steamwar/lobby/particle/particles/PlayerParticle.java
+++ b/LobbySystem/src/de/steamwar/lobby/particle/particles/PlayerParticle.java
@@ -1,3 +1,22 @@
+/*
+ *   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.lobby.particle.particles;
 
 import de.steamwar.lobby.particle.ParticleData;
diff --git a/LobbySystem/src/de/steamwar/lobby/particle/particles/RainCloudParticle.java b/LobbySystem/src/de/steamwar/lobby/particle/particles/RainCloudParticle.java
index 85b495ff..a9da53e7 100644
--- a/LobbySystem/src/de/steamwar/lobby/particle/particles/RainCloudParticle.java
+++ b/LobbySystem/src/de/steamwar/lobby/particle/particles/RainCloudParticle.java
@@ -1,3 +1,22 @@
+/*
+ *   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.lobby.particle.particles;
 
 import de.steamwar.lobby.particle.ParticleData;
diff --git a/LobbySystem/src/de/steamwar/lobby/particle/particles/ServerTeamParticle.java b/LobbySystem/src/de/steamwar/lobby/particle/particles/ServerTeamParticle.java
index 0a7bc9d0..ec0d81da 100644
--- a/LobbySystem/src/de/steamwar/lobby/particle/particles/ServerTeamParticle.java
+++ b/LobbySystem/src/de/steamwar/lobby/particle/particles/ServerTeamParticle.java
@@ -1,3 +1,22 @@
+/*
+ *   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.lobby.particle.particles;
 
 import de.steamwar.lobby.particle.ParticleData;
diff --git a/LobbySystem/src/de/steamwar/lobby/particle/particles/TeamParticle.java b/LobbySystem/src/de/steamwar/lobby/particle/particles/TeamParticle.java
index ce20b77c..7cf3ef7d 100644
--- a/LobbySystem/src/de/steamwar/lobby/particle/particles/TeamParticle.java
+++ b/LobbySystem/src/de/steamwar/lobby/particle/particles/TeamParticle.java
@@ -1,3 +1,22 @@
+/*
+ *   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.lobby.particle.particles;
 
 import de.steamwar.lobby.particle.ParticleData;
diff --git a/LobbySystem/src/de/steamwar/lobby/particle/particles/custom/CustomEasterParticle.java b/LobbySystem/src/de/steamwar/lobby/particle/particles/custom/CustomEasterParticle.java
index da207081..3d8c704e 100644
--- a/LobbySystem/src/de/steamwar/lobby/particle/particles/custom/CustomEasterParticle.java
+++ b/LobbySystem/src/de/steamwar/lobby/particle/particles/custom/CustomEasterParticle.java
@@ -1,3 +1,22 @@
+/*
+ *   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.lobby.particle.particles.custom;
 
 import de.steamwar.lobby.particle.*;
diff --git a/LobbySystem/src/de/steamwar/lobby/particle/particles/custom/CustomPlayerParticle.java b/LobbySystem/src/de/steamwar/lobby/particle/particles/custom/CustomPlayerParticle.java
index 79c42b3b..f27da88c 100644
--- a/LobbySystem/src/de/steamwar/lobby/particle/particles/custom/CustomPlayerParticle.java
+++ b/LobbySystem/src/de/steamwar/lobby/particle/particles/custom/CustomPlayerParticle.java
@@ -1,3 +1,22 @@
+/*
+ *   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.lobby.particle.particles.custom;
 
 import de.steamwar.lobby.particle.ParticleData;
diff --git a/LobbySystem/src/de/steamwar/lobby/particle/particles/custom/CustomTeamParticle.java b/LobbySystem/src/de/steamwar/lobby/particle/particles/custom/CustomTeamParticle.java
index 14b78595..6159aacb 100644
--- a/LobbySystem/src/de/steamwar/lobby/particle/particles/custom/CustomTeamParticle.java
+++ b/LobbySystem/src/de/steamwar/lobby/particle/particles/custom/CustomTeamParticle.java
@@ -1,3 +1,22 @@
+/*
+ *   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.lobby.particle.particles.custom;
 
 import de.steamwar.lobby.particle.ParticleData;
diff --git a/LobbySystem/src/de/steamwar/lobby/portal/CommandPortal.java b/LobbySystem/src/de/steamwar/lobby/portal/CommandPortal.java
index f2a07f74..7fd48595 100644
--- a/LobbySystem/src/de/steamwar/lobby/portal/CommandPortal.java
+++ b/LobbySystem/src/de/steamwar/lobby/portal/CommandPortal.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.lobby.portal;
diff --git a/LobbySystem/src/de/steamwar/lobby/portal/DummyPortal.java b/LobbySystem/src/de/steamwar/lobby/portal/DummyPortal.java
index 9a761455..e586029f 100644
--- a/LobbySystem/src/de/steamwar/lobby/portal/DummyPortal.java
+++ b/LobbySystem/src/de/steamwar/lobby/portal/DummyPortal.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.lobby.portal;
diff --git a/LobbySystem/src/de/steamwar/lobby/portal/FightserverPortal.java b/LobbySystem/src/de/steamwar/lobby/portal/FightserverPortal.java
index 66031ec0..85fd0d1c 100644
--- a/LobbySystem/src/de/steamwar/lobby/portal/FightserverPortal.java
+++ b/LobbySystem/src/de/steamwar/lobby/portal/FightserverPortal.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.lobby.portal;
diff --git a/LobbySystem/src/de/steamwar/lobby/portal/Portal.java b/LobbySystem/src/de/steamwar/lobby/portal/Portal.java
index 3cd70320..9752d68d 100644
--- a/LobbySystem/src/de/steamwar/lobby/portal/Portal.java
+++ b/LobbySystem/src/de/steamwar/lobby/portal/Portal.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.lobby.portal;
diff --git a/LobbySystem/src/de/steamwar/lobby/portal/PortalHandler.java b/LobbySystem/src/de/steamwar/lobby/portal/PortalHandler.java
index 135fdd17..ecdca276 100644
--- a/LobbySystem/src/de/steamwar/lobby/portal/PortalHandler.java
+++ b/LobbySystem/src/de/steamwar/lobby/portal/PortalHandler.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.lobby.portal;
diff --git a/LobbySystem/src/de/steamwar/lobby/portal/PortalType.java b/LobbySystem/src/de/steamwar/lobby/portal/PortalType.java
index db56dbb1..626aa900 100644
--- a/LobbySystem/src/de/steamwar/lobby/portal/PortalType.java
+++ b/LobbySystem/src/de/steamwar/lobby/portal/PortalType.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.lobby.portal;
diff --git a/LobbySystem/src/de/steamwar/lobby/portal/StackPortal.java b/LobbySystem/src/de/steamwar/lobby/portal/StackPortal.java
index 500758af..3a1e13e1 100644
--- a/LobbySystem/src/de/steamwar/lobby/portal/StackPortal.java
+++ b/LobbySystem/src/de/steamwar/lobby/portal/StackPortal.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.lobby.portal;
diff --git a/LobbySystem/src/de/steamwar/lobby/portal/TeleportPortal.java b/LobbySystem/src/de/steamwar/lobby/portal/TeleportPortal.java
index e7038c47..fb28a15d 100644
--- a/LobbySystem/src/de/steamwar/lobby/portal/TeleportPortal.java
+++ b/LobbySystem/src/de/steamwar/lobby/portal/TeleportPortal.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.lobby.portal;
diff --git a/LobbySystem/src/de/steamwar/lobby/special/advent/AdventCommand.java b/LobbySystem/src/de/steamwar/lobby/special/advent/AdventCommand.java
index 18563195..e8d3c976 100644
--- a/LobbySystem/src/de/steamwar/lobby/special/advent/AdventCommand.java
+++ b/LobbySystem/src/de/steamwar/lobby/special/advent/AdventCommand.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/LobbySystem/src/de/steamwar/lobby/special/advent/AdventListener.java b/LobbySystem/src/de/steamwar/lobby/special/advent/AdventListener.java
index 7ac4970f..d616e50c 100644
--- a/LobbySystem/src/de/steamwar/lobby/special/advent/AdventListener.java
+++ b/LobbySystem/src/de/steamwar/lobby/special/advent/AdventListener.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/LobbySystem/src/de/steamwar/lobby/special/advent/AdventsCalendar.java b/LobbySystem/src/de/steamwar/lobby/special/advent/AdventsCalendar.java
index da730458..88c77a21 100644
--- a/LobbySystem/src/de/steamwar/lobby/special/advent/AdventsCalendar.java
+++ b/LobbySystem/src/de/steamwar/lobby/special/advent/AdventsCalendar.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/LobbySystem/src/de/steamwar/lobby/special/advent/Present.java b/LobbySystem/src/de/steamwar/lobby/special/advent/Present.java
index 780cfeec..69d83468 100644
--- a/LobbySystem/src/de/steamwar/lobby/special/advent/Present.java
+++ b/LobbySystem/src/de/steamwar/lobby/special/advent/Present.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/LobbySystem/src/de/steamwar/lobby/special/advent/PresentClickListener.java b/LobbySystem/src/de/steamwar/lobby/special/advent/PresentClickListener.java
index 79fa339f..927680e7 100644
--- a/LobbySystem/src/de/steamwar/lobby/special/advent/PresentClickListener.java
+++ b/LobbySystem/src/de/steamwar/lobby/special/advent/PresentClickListener.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/LobbySystem/src/de/steamwar/lobby/special/easter/Egg.java b/LobbySystem/src/de/steamwar/lobby/special/easter/Egg.java
index 206fd720..0d636541 100644
--- a/LobbySystem/src/de/steamwar/lobby/special/easter/Egg.java
+++ b/LobbySystem/src/de/steamwar/lobby/special/easter/Egg.java
@@ -1,3 +1,22 @@
+/*
+ *   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.lobby.special.easter;
 
 import de.steamwar.inventory.SWItem;
diff --git a/LobbySystem/src/de/steamwar/lobby/special/easter/EggClickListener.java b/LobbySystem/src/de/steamwar/lobby/special/easter/EggClickListener.java
index 8d324146..6295ae6d 100644
--- a/LobbySystem/src/de/steamwar/lobby/special/easter/EggClickListener.java
+++ b/LobbySystem/src/de/steamwar/lobby/special/easter/EggClickListener.java
@@ -1,3 +1,22 @@
+/*
+ *   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.lobby.special.easter;
 
 import de.steamwar.lobby.LobbySystem;
diff --git a/LobbySystem/src/de/steamwar/lobby/special/easter/EggDifficulty.java b/LobbySystem/src/de/steamwar/lobby/special/easter/EggDifficulty.java
index 6c86dcae..e0e066ce 100644
--- a/LobbySystem/src/de/steamwar/lobby/special/easter/EggDifficulty.java
+++ b/LobbySystem/src/de/steamwar/lobby/special/easter/EggDifficulty.java
@@ -1,3 +1,22 @@
+/*
+ *   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.lobby.special.easter;
 
 public enum EggDifficulty {
diff --git a/LobbySystem/src/de/steamwar/lobby/special/easter/EggHunt.java b/LobbySystem/src/de/steamwar/lobby/special/easter/EggHunt.java
index 87a4a2d6..db94ffee 100644
--- a/LobbySystem/src/de/steamwar/lobby/special/easter/EggHunt.java
+++ b/LobbySystem/src/de/steamwar/lobby/special/easter/EggHunt.java
@@ -1,3 +1,22 @@
+/*
+ *   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.lobby.special.easter;
 
 import de.steamwar.lobby.LobbySystem;
diff --git a/LobbySystem/src/de/steamwar/lobby/special/easter/EggHuntCommand.java b/LobbySystem/src/de/steamwar/lobby/special/easter/EggHuntCommand.java
index 93597bf5..64049821 100644
--- a/LobbySystem/src/de/steamwar/lobby/special/easter/EggHuntCommand.java
+++ b/LobbySystem/src/de/steamwar/lobby/special/easter/EggHuntCommand.java
@@ -1,3 +1,22 @@
+/*
+ *   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.lobby.special.easter;
 
 import de.steamwar.command.SWCommand;
diff --git a/LobbySystem/src/de/steamwar/lobby/special/easter/EggHuntListener.java b/LobbySystem/src/de/steamwar/lobby/special/easter/EggHuntListener.java
index 00cb6ca1..688bd414 100644
--- a/LobbySystem/src/de/steamwar/lobby/special/easter/EggHuntListener.java
+++ b/LobbySystem/src/de/steamwar/lobby/special/easter/EggHuntListener.java
@@ -1,3 +1,22 @@
+/*
+ *   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.lobby.special.easter;
 
 import de.steamwar.lobby.LobbySystem;
diff --git a/LobbySystem/src/de/steamwar/lobby/team/TeamPlayer.java b/LobbySystem/src/de/steamwar/lobby/team/TeamPlayer.java
index db55aacb..8a294914 100644
--- a/LobbySystem/src/de/steamwar/lobby/team/TeamPlayer.java
+++ b/LobbySystem/src/de/steamwar/lobby/team/TeamPlayer.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.lobby.team;
diff --git a/LobbySystem/src/de/steamwar/lobby/util/ItemBuilder.java b/LobbySystem/src/de/steamwar/lobby/util/ItemBuilder.java
index 06e1cd83..562154e6 100644
--- a/LobbySystem/src/de/steamwar/lobby/util/ItemBuilder.java
+++ b/LobbySystem/src/de/steamwar/lobby/util/ItemBuilder.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.lobby.util;
diff --git a/LobbySystem/src/de/steamwar/lobby/util/Leaderboard.java b/LobbySystem/src/de/steamwar/lobby/util/Leaderboard.java
index a8b84f07..68c9766a 100644
--- a/LobbySystem/src/de/steamwar/lobby/util/Leaderboard.java
+++ b/LobbySystem/src/de/steamwar/lobby/util/Leaderboard.java
@@ -1,3 +1,22 @@
+/*
+ *   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.lobby.util;
 
 import de.steamwar.entity.RArmorStand;
diff --git a/LobbySystem/src/de/steamwar/lobby/util/LobbyPlayer.java b/LobbySystem/src/de/steamwar/lobby/util/LobbyPlayer.java
index 2619af81..a98abfff 100644
--- a/LobbySystem/src/de/steamwar/lobby/util/LobbyPlayer.java
+++ b/LobbySystem/src/de/steamwar/lobby/util/LobbyPlayer.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.lobby.util;
diff --git a/MissileWars/build.gradle.kts b/MissileWars/build.gradle.kts
index 36470f84..d5dffa66 100644
--- a/MissileWars/build.gradle.kts
+++ b/MissileWars/build.gradle.kts
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/MissileWars/src/de/steamwar/misslewars/Config.java b/MissileWars/src/de/steamwar/misslewars/Config.java
index 1838126c..b9ebc688 100644
--- a/MissileWars/src/de/steamwar/misslewars/Config.java
+++ b/MissileWars/src/de/steamwar/misslewars/Config.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.misslewars;
 
diff --git a/MissileWars/src/de/steamwar/misslewars/FightInfoPacketSender.java b/MissileWars/src/de/steamwar/misslewars/FightInfoPacketSender.java
index ca58263f..a2bcd52e 100644
--- a/MissileWars/src/de/steamwar/misslewars/FightInfoPacketSender.java
+++ b/MissileWars/src/de/steamwar/misslewars/FightInfoPacketSender.java
@@ -1,22 +1,20 @@
 /*
+ *   This file is a part of the SteamWar software.
  *
- *     This file is a part of the SteamWar software.
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
  *
- *     Copyright (C) 2020  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 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.
  *
- *     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/>.
- * /
+ *   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.misslewars;
diff --git a/MissileWars/src/de/steamwar/misslewars/FightScoreboard.java b/MissileWars/src/de/steamwar/misslewars/FightScoreboard.java
index b8fe1aaa..5fdb96ee 100644
--- a/MissileWars/src/de/steamwar/misslewars/FightScoreboard.java
+++ b/MissileWars/src/de/steamwar/misslewars/FightScoreboard.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.misslewars;
 
diff --git a/MissileWars/src/de/steamwar/misslewars/FightState.java b/MissileWars/src/de/steamwar/misslewars/FightState.java
index d0210605..1ca74dc0 100644
--- a/MissileWars/src/de/steamwar/misslewars/FightState.java
+++ b/MissileWars/src/de/steamwar/misslewars/FightState.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.misslewars;
 
diff --git a/MissileWars/src/de/steamwar/misslewars/FightWorld.java b/MissileWars/src/de/steamwar/misslewars/FightWorld.java
index 38dfab08..1187d840 100644
--- a/MissileWars/src/de/steamwar/misslewars/FightWorld.java
+++ b/MissileWars/src/de/steamwar/misslewars/FightWorld.java
@@ -1,22 +1,20 @@
 /*
+ *   This file is a part of the SteamWar software.
  *
- *     This file is a part of the SteamWar software.
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
  *
- *     Copyright (C) 2020  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 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.
  *
- *     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/>.
- * /
+ *   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.misslewars;
diff --git a/MissileWars/src/de/steamwar/misslewars/MWTeam.java b/MissileWars/src/de/steamwar/misslewars/MWTeam.java
index b5ee7c51..88d9692d 100644
--- a/MissileWars/src/de/steamwar/misslewars/MWTeam.java
+++ b/MissileWars/src/de/steamwar/misslewars/MWTeam.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.misslewars;
 
diff --git a/MissileWars/src/de/steamwar/misslewars/MissileWars.java b/MissileWars/src/de/steamwar/misslewars/MissileWars.java
index c36dfbb3..3b9326e1 100644
--- a/MissileWars/src/de/steamwar/misslewars/MissileWars.java
+++ b/MissileWars/src/de/steamwar/misslewars/MissileWars.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2023  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/>.
-*/
+/*
+ *   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.misslewars;
 
diff --git a/MissileWars/src/de/steamwar/misslewars/SpawnPlatformCreator.java b/MissileWars/src/de/steamwar/misslewars/SpawnPlatformCreator.java
index b9c222a1..4a0e3e7e 100644
--- a/MissileWars/src/de/steamwar/misslewars/SpawnPlatformCreator.java
+++ b/MissileWars/src/de/steamwar/misslewars/SpawnPlatformCreator.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.misslewars;
 
diff --git a/MissileWars/src/de/steamwar/misslewars/StateDependent.java b/MissileWars/src/de/steamwar/misslewars/StateDependent.java
index 155d824d..d690756f 100644
--- a/MissileWars/src/de/steamwar/misslewars/StateDependent.java
+++ b/MissileWars/src/de/steamwar/misslewars/StateDependent.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.misslewars;
 
diff --git a/MissileWars/src/de/steamwar/misslewars/WinReasons.java b/MissileWars/src/de/steamwar/misslewars/WinReasons.java
index ef52a173..a73d0dc1 100644
--- a/MissileWars/src/de/steamwar/misslewars/WinReasons.java
+++ b/MissileWars/src/de/steamwar/misslewars/WinReasons.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.misslewars;
 
diff --git a/MissileWars/src/de/steamwar/misslewars/commands/AcceptCommand.java b/MissileWars/src/de/steamwar/misslewars/commands/AcceptCommand.java
index f2cb1069..835f7f21 100644
--- a/MissileWars/src/de/steamwar/misslewars/commands/AcceptCommand.java
+++ b/MissileWars/src/de/steamwar/misslewars/commands/AcceptCommand.java
@@ -1,21 +1,20 @@
 /*
+ *   This file is a part of the SteamWar software.
  *
- *     This file is a part of the SteamWar software.
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
  *
- *     Copyright (C) 2023  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 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.
  *
- *     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/>.
+ *   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.misslewars.commands;
diff --git a/MissileWars/src/de/steamwar/misslewars/commands/DeclineCommand.java b/MissileWars/src/de/steamwar/misslewars/commands/DeclineCommand.java
index 0e0742a2..cabc72db 100644
--- a/MissileWars/src/de/steamwar/misslewars/commands/DeclineCommand.java
+++ b/MissileWars/src/de/steamwar/misslewars/commands/DeclineCommand.java
@@ -1,21 +1,20 @@
 /*
+ *   This file is a part of the SteamWar software.
  *
- *     This file is a part of the SteamWar software.
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
  *
- *     Copyright (C) 2023  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 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.
  *
- *     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/>.
+ *   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.misslewars.commands;
diff --git a/MissileWars/src/de/steamwar/misslewars/commands/InviteCommand.java b/MissileWars/src/de/steamwar/misslewars/commands/InviteCommand.java
index 954a1a34..435b5ec3 100644
--- a/MissileWars/src/de/steamwar/misslewars/commands/InviteCommand.java
+++ b/MissileWars/src/de/steamwar/misslewars/commands/InviteCommand.java
@@ -1,21 +1,20 @@
 /*
+ *   This file is a part of the SteamWar software.
  *
- *     This file is a part of the SteamWar software.
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
  *
- *     Copyright (C) 2023  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 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.
  *
- *     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/>.
+ *   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.misslewars.commands;
diff --git a/MissileWars/src/de/steamwar/misslewars/commands/SpectateCommand.java b/MissileWars/src/de/steamwar/misslewars/commands/SpectateCommand.java
index 19c51172..ee2f0434 100644
--- a/MissileWars/src/de/steamwar/misslewars/commands/SpectateCommand.java
+++ b/MissileWars/src/de/steamwar/misslewars/commands/SpectateCommand.java
@@ -1,21 +1,20 @@
 /*
+ *   This file is a part of the SteamWar software.
  *
- *     This file is a part of the SteamWar software.
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
  *
- *     Copyright (C) 2023  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 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.
  *
- *     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/>.
+ *   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.misslewars.commands;
diff --git a/MissileWars/src/de/steamwar/misslewars/countdowns/EndCountdown.java b/MissileWars/src/de/steamwar/misslewars/countdowns/EndCountdown.java
index 5a1dc8d1..b83f7978 100644
--- a/MissileWars/src/de/steamwar/misslewars/countdowns/EndCountdown.java
+++ b/MissileWars/src/de/steamwar/misslewars/countdowns/EndCountdown.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.misslewars.countdowns;
 
diff --git a/MissileWars/src/de/steamwar/misslewars/countdowns/ItemCountdown.java b/MissileWars/src/de/steamwar/misslewars/countdowns/ItemCountdown.java
index ef66b733..df520900 100644
--- a/MissileWars/src/de/steamwar/misslewars/countdowns/ItemCountdown.java
+++ b/MissileWars/src/de/steamwar/misslewars/countdowns/ItemCountdown.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.misslewars.countdowns;
 
diff --git a/MissileWars/src/de/steamwar/misslewars/countdowns/WaitingCountdown.java b/MissileWars/src/de/steamwar/misslewars/countdowns/WaitingCountdown.java
index 3c4b8ddc..31610639 100644
--- a/MissileWars/src/de/steamwar/misslewars/countdowns/WaitingCountdown.java
+++ b/MissileWars/src/de/steamwar/misslewars/countdowns/WaitingCountdown.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.misslewars.countdowns;
 
diff --git a/MissileWars/src/de/steamwar/misslewars/items/CustomItem.java b/MissileWars/src/de/steamwar/misslewars/items/CustomItem.java
index 51c689b8..37d966c6 100644
--- a/MissileWars/src/de/steamwar/misslewars/items/CustomItem.java
+++ b/MissileWars/src/de/steamwar/misslewars/items/CustomItem.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.misslewars.items;
 
diff --git a/MissileWars/src/de/steamwar/misslewars/items/Missile.java b/MissileWars/src/de/steamwar/misslewars/items/Missile.java
index 6e648e49..d89448e0 100644
--- a/MissileWars/src/de/steamwar/misslewars/items/Missile.java
+++ b/MissileWars/src/de/steamwar/misslewars/items/Missile.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.misslewars.items;
 
diff --git a/MissileWars/src/de/steamwar/misslewars/items/SpecialItem.java b/MissileWars/src/de/steamwar/misslewars/items/SpecialItem.java
index a287958b..b2ba547e 100644
--- a/MissileWars/src/de/steamwar/misslewars/items/SpecialItem.java
+++ b/MissileWars/src/de/steamwar/misslewars/items/SpecialItem.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.misslewars.items;
 
diff --git a/MissileWars/src/de/steamwar/misslewars/listener/ArenaListener.java b/MissileWars/src/de/steamwar/misslewars/listener/ArenaListener.java
index 4efff8e4..407dd569 100644
--- a/MissileWars/src/de/steamwar/misslewars/listener/ArenaListener.java
+++ b/MissileWars/src/de/steamwar/misslewars/listener/ArenaListener.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.misslewars.listener;
 
diff --git a/MissileWars/src/de/steamwar/misslewars/listener/BasicListener.java b/MissileWars/src/de/steamwar/misslewars/listener/BasicListener.java
index b210216e..bb68fc0b 100644
--- a/MissileWars/src/de/steamwar/misslewars/listener/BasicListener.java
+++ b/MissileWars/src/de/steamwar/misslewars/listener/BasicListener.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.misslewars.listener;
 
diff --git a/MissileWars/src/de/steamwar/misslewars/listener/BreakListener.java b/MissileWars/src/de/steamwar/misslewars/listener/BreakListener.java
index fae3c8c3..dba70e8d 100644
--- a/MissileWars/src/de/steamwar/misslewars/listener/BreakListener.java
+++ b/MissileWars/src/de/steamwar/misslewars/listener/BreakListener.java
@@ -1,22 +1,20 @@
 /*
+ *   This file is a part of the SteamWar software.
  *
- *     This file is a part of the SteamWar software.
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
  *
- *     Copyright (C) 2020  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 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.
  *
- *     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/>.
- * /
+ *   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.misslewars.listener;
diff --git a/MissileWars/src/de/steamwar/misslewars/listener/ChatListener.java b/MissileWars/src/de/steamwar/misslewars/listener/ChatListener.java
index f2077032..28f8b8bc 100644
--- a/MissileWars/src/de/steamwar/misslewars/listener/ChatListener.java
+++ b/MissileWars/src/de/steamwar/misslewars/listener/ChatListener.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.misslewars.listener;
 
diff --git a/MissileWars/src/de/steamwar/misslewars/listener/ConnectionListener.java b/MissileWars/src/de/steamwar/misslewars/listener/ConnectionListener.java
index 9663dbbe..6bbec6a2 100644
--- a/MissileWars/src/de/steamwar/misslewars/listener/ConnectionListener.java
+++ b/MissileWars/src/de/steamwar/misslewars/listener/ConnectionListener.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.misslewars.listener;
 
diff --git a/MissileWars/src/de/steamwar/misslewars/listener/DeathListener.java b/MissileWars/src/de/steamwar/misslewars/listener/DeathListener.java
index 1f3008e9..191845f1 100644
--- a/MissileWars/src/de/steamwar/misslewars/listener/DeathListener.java
+++ b/MissileWars/src/de/steamwar/misslewars/listener/DeathListener.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.misslewars.listener;
 
diff --git a/MissileWars/src/de/steamwar/misslewars/listener/EndListener.java b/MissileWars/src/de/steamwar/misslewars/listener/EndListener.java
index 36121665..4dea27d4 100644
--- a/MissileWars/src/de/steamwar/misslewars/listener/EndListener.java
+++ b/MissileWars/src/de/steamwar/misslewars/listener/EndListener.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.misslewars.listener;
 
diff --git a/MissileWars/src/de/steamwar/misslewars/listener/FightListener.java b/MissileWars/src/de/steamwar/misslewars/listener/FightListener.java
index 6ce9aaca..552493d8 100644
--- a/MissileWars/src/de/steamwar/misslewars/listener/FightListener.java
+++ b/MissileWars/src/de/steamwar/misslewars/listener/FightListener.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.misslewars.listener;
 
diff --git a/MissileWars/src/de/steamwar/misslewars/listener/ItemListener.java b/MissileWars/src/de/steamwar/misslewars/listener/ItemListener.java
index 4af2411c..3c0bcbd1 100644
--- a/MissileWars/src/de/steamwar/misslewars/listener/ItemListener.java
+++ b/MissileWars/src/de/steamwar/misslewars/listener/ItemListener.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.misslewars.listener;
 
diff --git a/MissileWars/src/de/steamwar/misslewars/listener/JoinListener.java b/MissileWars/src/de/steamwar/misslewars/listener/JoinListener.java
index 4f56cacb..1cd327ea 100644
--- a/MissileWars/src/de/steamwar/misslewars/listener/JoinListener.java
+++ b/MissileWars/src/de/steamwar/misslewars/listener/JoinListener.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.misslewars.listener;
 
diff --git a/MissileWars/src/de/steamwar/misslewars/listener/PortalDestructListener.java b/MissileWars/src/de/steamwar/misslewars/listener/PortalDestructListener.java
index 056b7259..a66f0426 100644
--- a/MissileWars/src/de/steamwar/misslewars/listener/PortalDestructListener.java
+++ b/MissileWars/src/de/steamwar/misslewars/listener/PortalDestructListener.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.misslewars.listener;
 
diff --git a/MissileWars/src/de/steamwar/misslewars/listener/WaitingListener.java b/MissileWars/src/de/steamwar/misslewars/listener/WaitingListener.java
index 1d9688b3..e2395f28 100644
--- a/MissileWars/src/de/steamwar/misslewars/listener/WaitingListener.java
+++ b/MissileWars/src/de/steamwar/misslewars/listener/WaitingListener.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.misslewars.listener;
 
diff --git a/MissileWars/src/de/steamwar/misslewars/listener/special/BarrierListener.java b/MissileWars/src/de/steamwar/misslewars/listener/special/BarrierListener.java
index e4ab3cf4..63e07e3e 100644
--- a/MissileWars/src/de/steamwar/misslewars/listener/special/BarrierListener.java
+++ b/MissileWars/src/de/steamwar/misslewars/listener/special/BarrierListener.java
@@ -1,22 +1,20 @@
 /*
+ *   This file is a part of the SteamWar software.
  *
- *     This file is a part of the SteamWar software.
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
  *
- *     Copyright (C) 2020  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 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.
  *
- *     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/>.
- * /
+ *   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.misslewars.listener.special;
diff --git a/MissileWars/src/de/steamwar/misslewars/listener/special/SpaceListener.java b/MissileWars/src/de/steamwar/misslewars/listener/special/SpaceListener.java
index d6c06104..7d3ff5a9 100644
--- a/MissileWars/src/de/steamwar/misslewars/listener/special/SpaceListener.java
+++ b/MissileWars/src/de/steamwar/misslewars/listener/special/SpaceListener.java
@@ -1,22 +1,20 @@
 /*
+ *   This file is a part of the SteamWar software.
  *
- *     This file is a part of the SteamWar software.
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
  *
- *     Copyright (C) 2020  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 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.
  *
- *     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/>.
- * /
+ *   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.misslewars.listener.special;
diff --git a/MissileWars/src/de/steamwar/misslewars/scripts/RunnableScript.java b/MissileWars/src/de/steamwar/misslewars/scripts/RunnableScript.java
index 5328bc31..4688f895 100644
--- a/MissileWars/src/de/steamwar/misslewars/scripts/RunnableScript.java
+++ b/MissileWars/src/de/steamwar/misslewars/scripts/RunnableScript.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.misslewars.scripts;
 
diff --git a/MissileWars/src/de/steamwar/misslewars/scripts/RunnableScriptEvent.java b/MissileWars/src/de/steamwar/misslewars/scripts/RunnableScriptEvent.java
index 8459f559..56b2b944 100644
--- a/MissileWars/src/de/steamwar/misslewars/scripts/RunnableScriptEvent.java
+++ b/MissileWars/src/de/steamwar/misslewars/scripts/RunnableScriptEvent.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.misslewars.scripts;
 
diff --git a/MissileWars/src/de/steamwar/misslewars/scripts/Script.java b/MissileWars/src/de/steamwar/misslewars/scripts/Script.java
index 095dfaf3..fc7e844d 100644
--- a/MissileWars/src/de/steamwar/misslewars/scripts/Script.java
+++ b/MissileWars/src/de/steamwar/misslewars/scripts/Script.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.misslewars.scripts;
 
diff --git a/MissileWars/src/de/steamwar/misslewars/scripts/ScriptedItem.java b/MissileWars/src/de/steamwar/misslewars/scripts/ScriptedItem.java
index 4e1587d6..e1da0a8d 100644
--- a/MissileWars/src/de/steamwar/misslewars/scripts/ScriptedItem.java
+++ b/MissileWars/src/de/steamwar/misslewars/scripts/ScriptedItem.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.misslewars.scripts;
 
diff --git a/MissileWars/src/de/steamwar/misslewars/scripts/implemented/CooldownScript.java b/MissileWars/src/de/steamwar/misslewars/scripts/implemented/CooldownScript.java
index 9b6dfcf5..dbf2697c 100644
--- a/MissileWars/src/de/steamwar/misslewars/scripts/implemented/CooldownScript.java
+++ b/MissileWars/src/de/steamwar/misslewars/scripts/implemented/CooldownScript.java
@@ -1,3 +1,22 @@
+/*
+ *   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.misslewars.scripts.implemented;
 
 import com.google.gson.JsonObject;
diff --git a/MissileWars/src/de/steamwar/misslewars/scripts/implemented/DelayScript.java b/MissileWars/src/de/steamwar/misslewars/scripts/implemented/DelayScript.java
index f77b985a..5388f207 100644
--- a/MissileWars/src/de/steamwar/misslewars/scripts/implemented/DelayScript.java
+++ b/MissileWars/src/de/steamwar/misslewars/scripts/implemented/DelayScript.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.misslewars.scripts.implemented;
 
diff --git a/MissileWars/src/de/steamwar/misslewars/scripts/implemented/FilterScript.java b/MissileWars/src/de/steamwar/misslewars/scripts/implemented/FilterScript.java
index 4cf250c9..041f3e63 100644
--- a/MissileWars/src/de/steamwar/misslewars/scripts/implemented/FilterScript.java
+++ b/MissileWars/src/de/steamwar/misslewars/scripts/implemented/FilterScript.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.misslewars.scripts.implemented;
 
diff --git a/MissileWars/src/de/steamwar/misslewars/scripts/implemented/LaunchScript.java b/MissileWars/src/de/steamwar/misslewars/scripts/implemented/LaunchScript.java
index 83b44edf..e6aa41ca 100644
--- a/MissileWars/src/de/steamwar/misslewars/scripts/implemented/LaunchScript.java
+++ b/MissileWars/src/de/steamwar/misslewars/scripts/implemented/LaunchScript.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.misslewars.scripts.implemented;
 
diff --git a/MissileWars/src/de/steamwar/misslewars/scripts/implemented/LocationScript.java b/MissileWars/src/de/steamwar/misslewars/scripts/implemented/LocationScript.java
index 1fb272ed..2e3c72b0 100644
--- a/MissileWars/src/de/steamwar/misslewars/scripts/implemented/LocationScript.java
+++ b/MissileWars/src/de/steamwar/misslewars/scripts/implemented/LocationScript.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.misslewars.scripts.implemented;
 
diff --git a/MissileWars/src/de/steamwar/misslewars/scripts/implemented/PasteScript.java b/MissileWars/src/de/steamwar/misslewars/scripts/implemented/PasteScript.java
index db1b2cb4..79d9ef5e 100644
--- a/MissileWars/src/de/steamwar/misslewars/scripts/implemented/PasteScript.java
+++ b/MissileWars/src/de/steamwar/misslewars/scripts/implemented/PasteScript.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.misslewars.scripts.implemented;
 
diff --git a/MissileWars/src/de/steamwar/misslewars/scripts/implemented/PotionScript.java b/MissileWars/src/de/steamwar/misslewars/scripts/implemented/PotionScript.java
index 34777dce..890553ee 100644
--- a/MissileWars/src/de/steamwar/misslewars/scripts/implemented/PotionScript.java
+++ b/MissileWars/src/de/steamwar/misslewars/scripts/implemented/PotionScript.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.misslewars.scripts.implemented;
 
diff --git a/MissileWars/src/de/steamwar/misslewars/scripts/implemented/RandomPlayerScript.java b/MissileWars/src/de/steamwar/misslewars/scripts/implemented/RandomPlayerScript.java
index 240c5a24..bd0af11d 100644
--- a/MissileWars/src/de/steamwar/misslewars/scripts/implemented/RandomPlayerScript.java
+++ b/MissileWars/src/de/steamwar/misslewars/scripts/implemented/RandomPlayerScript.java
@@ -1,22 +1,20 @@
 /*
+ *   This file is a part of the SteamWar software.
  *
- *     This file is a part of the SteamWar software.
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
  *
- *     Copyright (C) 2020  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 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.
  *
- *     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/>.
- * /
+ *   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.misslewars.scripts.implemented;
diff --git a/MissileWars/src/de/steamwar/misslewars/scripts/implemented/RemoveScript.java b/MissileWars/src/de/steamwar/misslewars/scripts/implemented/RemoveScript.java
index ede587ed..ab13ef19 100644
--- a/MissileWars/src/de/steamwar/misslewars/scripts/implemented/RemoveScript.java
+++ b/MissileWars/src/de/steamwar/misslewars/scripts/implemented/RemoveScript.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.misslewars.scripts.implemented;
 
diff --git a/MissileWars/src/de/steamwar/misslewars/scripts/implemented/SlowMoScript.java b/MissileWars/src/de/steamwar/misslewars/scripts/implemented/SlowMoScript.java
index 54587fdf..5a657fb9 100644
--- a/MissileWars/src/de/steamwar/misslewars/scripts/implemented/SlowMoScript.java
+++ b/MissileWars/src/de/steamwar/misslewars/scripts/implemented/SlowMoScript.java
@@ -1,22 +1,20 @@
 /*
+ *   This file is a part of the SteamWar software.
  *
- *     This file is a part of the SteamWar software.
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
  *
- *     Copyright (C) 2020  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 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.
  *
- *     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/>.
- * /
+ *   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.misslewars.scripts.implemented;
diff --git a/MissileWars/src/de/steamwar/misslewars/scripts/implemented/SoundScript.java b/MissileWars/src/de/steamwar/misslewars/scripts/implemented/SoundScript.java
index 32e40bb3..98d376c6 100644
--- a/MissileWars/src/de/steamwar/misslewars/scripts/implemented/SoundScript.java
+++ b/MissileWars/src/de/steamwar/misslewars/scripts/implemented/SoundScript.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.misslewars.scripts.implemented;
 
diff --git a/MissileWars/src/de/steamwar/misslewars/scripts/implemented/SummonScript.java b/MissileWars/src/de/steamwar/misslewars/scripts/implemented/SummonScript.java
index a85ea3a6..8e1ac0c1 100644
--- a/MissileWars/src/de/steamwar/misslewars/scripts/implemented/SummonScript.java
+++ b/MissileWars/src/de/steamwar/misslewars/scripts/implemented/SummonScript.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.misslewars.scripts.implemented;
 
diff --git a/MissileWars/src/de/steamwar/misslewars/scripts/utils/EntityUtils.java b/MissileWars/src/de/steamwar/misslewars/scripts/utils/EntityUtils.java
index 823751ee..101dd08c 100644
--- a/MissileWars/src/de/steamwar/misslewars/scripts/utils/EntityUtils.java
+++ b/MissileWars/src/de/steamwar/misslewars/scripts/utils/EntityUtils.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.misslewars.scripts.utils;
 
diff --git a/MissileWars/src/de/steamwar/misslewars/scripts/utils/JsonUtils.java b/MissileWars/src/de/steamwar/misslewars/scripts/utils/JsonUtils.java
index f0a703ad..4fc888c8 100644
--- a/MissileWars/src/de/steamwar/misslewars/scripts/utils/JsonUtils.java
+++ b/MissileWars/src/de/steamwar/misslewars/scripts/utils/JsonUtils.java
@@ -1,3 +1,22 @@
+/*
+ *   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.misslewars.scripts.utils;
 
 import com.google.gson.JsonObject;
diff --git a/MissileWars/src/de/steamwar/misslewars/slowmo/SlowMoRunner.java b/MissileWars/src/de/steamwar/misslewars/slowmo/SlowMoRunner.java
index 7a637d5c..739a24d1 100644
--- a/MissileWars/src/de/steamwar/misslewars/slowmo/SlowMoRunner.java
+++ b/MissileWars/src/de/steamwar/misslewars/slowmo/SlowMoRunner.java
@@ -1,22 +1,20 @@
 /*
+ *   This file is a part of the SteamWar software.
  *
- *     This file is a part of the SteamWar software.
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
  *
- *     Copyright (C) 2020  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 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.
  *
- *     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/>.
- * /
+ *   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.misslewars.slowmo;
diff --git a/MissileWars/src/de/steamwar/misslewars/slowmo/SlowMoUtils.java b/MissileWars/src/de/steamwar/misslewars/slowmo/SlowMoUtils.java
index 01e55c37..4630784d 100644
--- a/MissileWars/src/de/steamwar/misslewars/slowmo/SlowMoUtils.java
+++ b/MissileWars/src/de/steamwar/misslewars/slowmo/SlowMoUtils.java
@@ -1,22 +1,20 @@
 /*
+ *   This file is a part of the SteamWar software.
  *
- *     This file is a part of the SteamWar software.
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
  *
- *     Copyright (C) 2020  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 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.
  *
- *     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/>.
- * /
+ *   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.misslewars.slowmo;
diff --git a/Realtime/build.gradle.kts b/Realtime/build.gradle.kts
index ebde1d0a..df761ff0 100644
--- a/Realtime/build.gradle.kts
+++ b/Realtime/build.gradle.kts
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/Realtime/src/de/steamwar/realtime/Config.java b/Realtime/src/de/steamwar/realtime/Config.java
index e39cef02..3d49ec88 100644
--- a/Realtime/src/de/steamwar/realtime/Config.java
+++ b/Realtime/src/de/steamwar/realtime/Config.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.realtime;
 
diff --git a/Realtime/src/de/steamwar/realtime/Realtime.java b/Realtime/src/de/steamwar/realtime/Realtime.java
index cb2492ef..7a92152d 100644
--- a/Realtime/src/de/steamwar/realtime/Realtime.java
+++ b/Realtime/src/de/steamwar/realtime/Realtime.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.realtime;
 
diff --git a/SchematicSystem/SchematicSystem_15/build.gradle.kts b/SchematicSystem/SchematicSystem_15/build.gradle.kts
index df407384..281e62fc 100644
--- a/SchematicSystem/SchematicSystem_15/build.gradle.kts
+++ b/SchematicSystem/SchematicSystem_15/build.gradle.kts
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/SchematicSystem/SchematicSystem_15/src/de/steamwar/schematicsystem/autocheck/AutoChecker15.java b/SchematicSystem/SchematicSystem_15/src/de/steamwar/schematicsystem/autocheck/AutoChecker15.java
index a97cb133..4d5d2d8c 100644
--- a/SchematicSystem/SchematicSystem_15/src/de/steamwar/schematicsystem/autocheck/AutoChecker15.java
+++ b/SchematicSystem/SchematicSystem_15/src/de/steamwar/schematicsystem/autocheck/AutoChecker15.java
@@ -1,20 +1,20 @@
 /*
-   This file is a part of the SteamWar software.
-
-   Copyright (C) 2023  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/>.
+ *   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.schematicsystem.autocheck;
diff --git a/SchematicSystem/SchematicSystem_15/src/de/steamwar/schematicsystem/autocheck/AutoCheckerItems15.java b/SchematicSystem/SchematicSystem_15/src/de/steamwar/schematicsystem/autocheck/AutoCheckerItems15.java
index ee3f2827..0a04e8b2 100644
--- a/SchematicSystem/SchematicSystem_15/src/de/steamwar/schematicsystem/autocheck/AutoCheckerItems15.java
+++ b/SchematicSystem/SchematicSystem_15/src/de/steamwar/schematicsystem/autocheck/AutoCheckerItems15.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.schematicsystem.autocheck;
diff --git a/SchematicSystem/SchematicSystem_15/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommand15.java b/SchematicSystem/SchematicSystem_15/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommand15.java
index 47f58a58..6c55ab0d 100644
--- a/SchematicSystem/SchematicSystem_15/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommand15.java
+++ b/SchematicSystem/SchematicSystem_15/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommand15.java
@@ -1,20 +1,20 @@
 /*
-   This file is a part of the SteamWar software.
-
-   Copyright (C) 2023  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/>.
+ *   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.schematicsystem.commands.schematiccommand;
diff --git a/SchematicSystem/SchematicSystem_19/build.gradle.kts b/SchematicSystem/SchematicSystem_19/build.gradle.kts
index 38fcd471..0536403a 100644
--- a/SchematicSystem/SchematicSystem_19/build.gradle.kts
+++ b/SchematicSystem/SchematicSystem_19/build.gradle.kts
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2025  SteamWar.de-Serverteam
+ *   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
diff --git a/SchematicSystem/SchematicSystem_19/src/de/steamwar/schematicsystem/autocheck/AutoCheckerItems19.java b/SchematicSystem/SchematicSystem_19/src/de/steamwar/schematicsystem/autocheck/AutoCheckerItems19.java
index 7aaa26b9..c23ad924 100644
--- a/SchematicSystem/SchematicSystem_19/src/de/steamwar/schematicsystem/autocheck/AutoCheckerItems19.java
+++ b/SchematicSystem/SchematicSystem_19/src/de/steamwar/schematicsystem/autocheck/AutoCheckerItems19.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.schematicsystem.autocheck;
diff --git a/SchematicSystem/SchematicSystem_8/build.gradle.kts b/SchematicSystem/SchematicSystem_8/build.gradle.kts
index 5f0f9c62..77bba6f4 100644
--- a/SchematicSystem/SchematicSystem_8/build.gradle.kts
+++ b/SchematicSystem/SchematicSystem_8/build.gradle.kts
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/SchematicSystem/SchematicSystem_8/src/de/steamwar/schematicsystem/autocheck/AutoChecker8.java b/SchematicSystem/SchematicSystem_8/src/de/steamwar/schematicsystem/autocheck/AutoChecker8.java
index 1dbc8e44..981acd46 100644
--- a/SchematicSystem/SchematicSystem_8/src/de/steamwar/schematicsystem/autocheck/AutoChecker8.java
+++ b/SchematicSystem/SchematicSystem_8/src/de/steamwar/schematicsystem/autocheck/AutoChecker8.java
@@ -1,20 +1,20 @@
 /*
-   This file is a part of the SteamWar software.
-
-   Copyright (C) 2023  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/>.
+ *   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.schematicsystem.autocheck;
diff --git a/SchematicSystem/SchematicSystem_8/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommand8.java b/SchematicSystem/SchematicSystem_8/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommand8.java
index ad38643a..8245fb51 100644
--- a/SchematicSystem/SchematicSystem_8/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommand8.java
+++ b/SchematicSystem/SchematicSystem_8/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommand8.java
@@ -1,20 +1,20 @@
 /*
-   This file is a part of the SteamWar software.
-
-   Copyright (C) 2023  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/>.
+ *   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.schematicsystem.commands.schematiccommand;
diff --git a/SchematicSystem/SchematicSystem_Core/build.gradle.kts b/SchematicSystem/SchematicSystem_Core/build.gradle.kts
index 36a0e019..c18b3964 100644
--- a/SchematicSystem/SchematicSystem_Core/build.gradle.kts
+++ b/SchematicSystem/SchematicSystem_Core/build.gradle.kts
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/SchematicSystem/SchematicSystem_Core/src/SchematicSystem.properties b/SchematicSystem/SchematicSystem_Core/src/SchematicSystem.properties
index 5b8aee8f..e72b0f08 100644
--- a/SchematicSystem/SchematicSystem_Core/src/SchematicSystem.properties
+++ b/SchematicSystem/SchematicSystem_Core/src/SchematicSystem.properties
@@ -1,7 +1,7 @@
 #
 #   This file is a part of the SteamWar software.
 #
-#   Copyright (C) 2023  SteamWar.de-Serverteam
+#   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
diff --git a/SchematicSystem/SchematicSystem_Core/src/SchematicSystem_de.properties b/SchematicSystem/SchematicSystem_Core/src/SchematicSystem_de.properties
index 20205eee..b019e685 100644
--- a/SchematicSystem/SchematicSystem_Core/src/SchematicSystem_de.properties
+++ b/SchematicSystem/SchematicSystem_Core/src/SchematicSystem_de.properties
@@ -1,7 +1,7 @@
 #
 #   This file is a part of the SteamWar software.
 #
-#   Copyright (C) 2023  SteamWar.de-Serverteam
+#   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
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/CheckSchemType.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/CheckSchemType.java
index fead2a47..dc8ca24b 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/CheckSchemType.java
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/CheckSchemType.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.schematicsystem;
 
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/SafeSchematicNode.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/SafeSchematicNode.java
index 449d59d8..f9a28523 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/SafeSchematicNode.java
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/SafeSchematicNode.java
@@ -1,20 +1,20 @@
 /*
-   This file is a part of the SteamWar software.
-
-   Copyright (C) 2023  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/>.
+ *   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.schematicsystem;
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/SchematicSystem.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/SchematicSystem.java
index 96267f9f..8245209b 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/SchematicSystem.java
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/SchematicSystem.java
@@ -1,20 +1,20 @@
 /*
-   This file is a part of the SteamWar software.
-
-   Copyright (C) 2023  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/>.
+ *   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.schematicsystem;
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/autocheck/AutoChecker.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/autocheck/AutoChecker.java
index ef4d9bea..0d2eb937 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/autocheck/AutoChecker.java
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/autocheck/AutoChecker.java
@@ -1,20 +1,20 @@
 /*
-   This file is a part of the SteamWar software.
-
-   Copyright (C) 2023  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/>.
+ *   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.schematicsystem.autocheck;
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/autocheck/AutoCheckerItems.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/autocheck/AutoCheckerItems.java
index fb103f67..c3d63c9b 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/autocheck/AutoCheckerItems.java
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/autocheck/AutoCheckerItems.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.schematicsystem.autocheck;
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/autocheck/AutoCheckerResult.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/autocheck/AutoCheckerResult.java
index a7d13f17..002ff8ab 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/autocheck/AutoCheckerResult.java
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/autocheck/AutoCheckerResult.java
@@ -1,20 +1,20 @@
 /*
-   This file is a part of the SteamWar software.
-
-   Copyright (C) 2023  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/>.
+ *   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.schematicsystem.autocheck;
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/autocheck/BlockPos.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/autocheck/BlockPos.java
index 7dff0dbe..255ae962 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/autocheck/BlockPos.java
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/autocheck/BlockPos.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2022  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/>.
-*/
+ *   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.schematicsystem.autocheck;
 
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/DownloadCommand.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/DownloadCommand.java
index f4fd1c29..ed275c07 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/DownloadCommand.java
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/DownloadCommand.java
@@ -1,20 +1,20 @@
 /*
-   This file is a part of the SteamWar software.
-
-   Copyright (C) 2023  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/>.
+ *   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.schematicsystem.commands;
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/GUI.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/GUI.java
index ec59b16d..a9c90380 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/GUI.java
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/GUI.java
@@ -1,20 +1,20 @@
 /*
-   This file is a part of the SteamWar software.
-
-   Copyright (C) 2023  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/>.
+ *   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.schematicsystem.commands.schematiccommand;
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommand.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommand.java
index caccd1a5..0b9f0c1d 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommand.java
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommand.java
@@ -1,20 +1,20 @@
 /*
-   This file is a part of the SteamWar software.
-
-   Copyright (C) 2023  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/>.
+ *   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.schematicsystem.commands.schematiccommand;
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommandHelp.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommandHelp.java
index 1cb0ebd8..07161973 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommandHelp.java
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommandHelp.java
@@ -1,20 +1,20 @@
 /*
-   This file is a part of the SteamWar software.
-
-   Copyright (C) 2023  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/>.
+ *   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.schematicsystem.commands.schematiccommand;
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommandUtils.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommandUtils.java
index ad1ced2e..b86b2c88 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommandUtils.java
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommandUtils.java
@@ -1,20 +1,20 @@
 /*
-   This file is a part of the SteamWar software.
-
-   Copyright (C) 2023  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/>.
+ *   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.schematicsystem.commands.schematiccommand;
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicMapper.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicMapper.java
index bcf60e63..80d02e90 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicMapper.java
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicMapper.java
@@ -1,20 +1,20 @@
 /*
-   This file is a part of the SteamWar software.
-
-   Copyright (C) 2023  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/>.
+ *   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.schematicsystem.commands.schematiccommand;
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicValidator.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicValidator.java
index e6bff1dd..8a798fc8 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicValidator.java
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicValidator.java
@@ -1,20 +1,20 @@
 /*
-   This file is a part of the SteamWar software.
-
-   Copyright (C) 2023  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/>.
+ *   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.schematicsystem.commands.schematiccommand;
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/CheckPart.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/CheckPart.java
index 246b990b..878b72b3 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/CheckPart.java
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/CheckPart.java
@@ -1,20 +1,20 @@
 /*
-   This file is a part of the SteamWar software.
-
-   Copyright (C) 2023  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/>.
+ *   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.schematicsystem.commands.schematiccommand.parts;
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/MemberPart.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/MemberPart.java
index 6d42c97a..8ffa543b 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/MemberPart.java
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/MemberPart.java
@@ -1,20 +1,20 @@
 /*
-   This file is a part of the SteamWar software.
-
-   Copyright (C) 2023  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/>.
+ *   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.schematicsystem.commands.schematiccommand.parts;
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/ModifyPart.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/ModifyPart.java
index 7fae8acd..3387e855 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/ModifyPart.java
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/ModifyPart.java
@@ -1,20 +1,20 @@
 /*
-   This file is a part of the SteamWar software.
-
-   Copyright (C) 2023  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/>.
+ *   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.schematicsystem.commands.schematiccommand.parts;
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/SavePart.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/SavePart.java
index 9b6f2cb6..7aa98ed0 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/SavePart.java
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/SavePart.java
@@ -1,20 +1,20 @@
 /*
-   This file is a part of the SteamWar software.
-
-   Copyright (C) 2023  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/>.
+ *   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.schematicsystem.commands.schematiccommand.parts;
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/SearchPart.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/SearchPart.java
index e3c698f2..81db6aba 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/SearchPart.java
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/SearchPart.java
@@ -1,20 +1,20 @@
 /*
-   This file is a part of the SteamWar software.
-
-   Copyright (C) 2023  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/>.
+ *   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.schematicsystem.commands.schematiccommand.parts;
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/ViewPart.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/ViewPart.java
index da51fdca..35544a4f 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/ViewPart.java
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/ViewPart.java
@@ -1,20 +1,20 @@
 /*
-   This file is a part of the SteamWar software.
-
-   Copyright (C) 2023  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/>.
+ *   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.schematicsystem.commands.schematiccommand.parts;
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/listener/PlayerEventListener.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/listener/PlayerEventListener.java
index 84913014..153e6f45 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/listener/PlayerEventListener.java
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/listener/PlayerEventListener.java
@@ -1,20 +1,20 @@
 /*
-   This file is a part of the SteamWar software.
-
-   Copyright (C) 2023  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/>.
+ *   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.schematicsystem.listener;
diff --git a/SchematicSystem/build.gradle.kts b/SchematicSystem/build.gradle.kts
index 813550b2..ee8e8960 100644
--- a/SchematicSystem/build.gradle.kts
+++ b/SchematicSystem/build.gradle.kts
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/SpigotCore/CRIUDummy/build.gradle.kts b/SpigotCore/CRIUDummy/build.gradle.kts
index d8a1521e..19554b1c 100644
--- a/SpigotCore/CRIUDummy/build.gradle.kts
+++ b/SpigotCore/CRIUDummy/build.gradle.kts
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/SpigotCore/CRIUDummy/src/org/eclipse/openj9/criu/CRIUSupport.java b/SpigotCore/CRIUDummy/src/org/eclipse/openj9/criu/CRIUSupport.java
index 8fc6686f..05d3655a 100644
--- a/SpigotCore/CRIUDummy/src/org/eclipse/openj9/criu/CRIUSupport.java
+++ b/SpigotCore/CRIUDummy/src/org/eclipse/openj9/criu/CRIUSupport.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/SpigotCore/CRIUDummy/src/org/eclipse/openj9/criu/JVMCRIUException.java b/SpigotCore/CRIUDummy/src/org/eclipse/openj9/criu/JVMCRIUException.java
index 415844e9..7ee7a172 100644
--- a/SpigotCore/CRIUDummy/src/org/eclipse/openj9/criu/JVMCRIUException.java
+++ b/SpigotCore/CRIUDummy/src/org/eclipse/openj9/criu/JVMCRIUException.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/SpigotCore/SpigotCore_10/build.gradle.kts b/SpigotCore/SpigotCore_10/build.gradle.kts
index 9606f5c6..cff91969 100644
--- a/SpigotCore/SpigotCore_10/build.gradle.kts
+++ b/SpigotCore/SpigotCore_10/build.gradle.kts
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/SpigotCore/SpigotCore_12/build.gradle.kts b/SpigotCore/SpigotCore_12/build.gradle.kts
index da6a46c9..79ec438a 100644
--- a/SpigotCore/SpigotCore_12/build.gradle.kts
+++ b/SpigotCore/SpigotCore_12/build.gradle.kts
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/SpigotCore/SpigotCore_12/src/de/steamwar/core/LocaleChangeWrapper12.java b/SpigotCore/SpigotCore_12/src/de/steamwar/core/LocaleChangeWrapper12.java
index 152751ce..718369d4 100644
--- a/SpigotCore/SpigotCore_12/src/de/steamwar/core/LocaleChangeWrapper12.java
+++ b/SpigotCore/SpigotCore_12/src/de/steamwar/core/LocaleChangeWrapper12.java
@@ -1,20 +1,20 @@
 /*
- *    This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- *    Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/SpigotCore/SpigotCore_14/build.gradle.kts b/SpigotCore/SpigotCore_14/build.gradle.kts
index 5ffc8c1c..e4746ba5 100644
--- a/SpigotCore/SpigotCore_14/build.gradle.kts
+++ b/SpigotCore/SpigotCore_14/build.gradle.kts
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/SpigotCore/SpigotCore_14/src/de/steamwar/core/FlatteningWrapper14.java b/SpigotCore/SpigotCore_14/src/de/steamwar/core/FlatteningWrapper14.java
index 2033fc09..82e1c879 100644
--- a/SpigotCore/SpigotCore_14/src/de/steamwar/core/FlatteningWrapper14.java
+++ b/SpigotCore/SpigotCore_14/src/de/steamwar/core/FlatteningWrapper14.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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;
 
diff --git a/SpigotCore/SpigotCore_14/src/de/steamwar/core/RecipeDiscoverWrapper14.java b/SpigotCore/SpigotCore_14/src/de/steamwar/core/RecipeDiscoverWrapper14.java
index 93e050d8..d9b4bf17 100644
--- a/SpigotCore/SpigotCore_14/src/de/steamwar/core/RecipeDiscoverWrapper14.java
+++ b/SpigotCore/SpigotCore_14/src/de/steamwar/core/RecipeDiscoverWrapper14.java
@@ -1,20 +1,20 @@
 /*
- *    This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- *    Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/SpigotCore/SpigotCore_14/src/de/steamwar/core/TrickyTrialsWrapper14.java b/SpigotCore/SpigotCore_14/src/de/steamwar/core/TrickyTrialsWrapper14.java
index aa30ea37..6b337111 100644
--- a/SpigotCore/SpigotCore_14/src/de/steamwar/core/TrickyTrialsWrapper14.java
+++ b/SpigotCore/SpigotCore_14/src/de/steamwar/core/TrickyTrialsWrapper14.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/SpigotCore/SpigotCore_14/src/de/steamwar/core/WorldEditWrapper14.java b/SpigotCore/SpigotCore_14/src/de/steamwar/core/WorldEditWrapper14.java
index b682dad3..60e4758d 100644
--- a/SpigotCore/SpigotCore_14/src/de/steamwar/core/WorldEditWrapper14.java
+++ b/SpigotCore/SpigotCore_14/src/de/steamwar/core/WorldEditWrapper14.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/SpigotCore/SpigotCore_14/src/de/steamwar/techhider/BlockIds14.java b/SpigotCore/SpigotCore_14/src/de/steamwar/techhider/BlockIds14.java
index 6e2c0397..5b1a7b4c 100644
--- a/SpigotCore/SpigotCore_14/src/de/steamwar/techhider/BlockIds14.java
+++ b/SpigotCore/SpigotCore_14/src/de/steamwar/techhider/BlockIds14.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2021  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/>.
+ *   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.techhider;
diff --git a/SpigotCore/SpigotCore_14/src/de/steamwar/techhider/ChunkHider14.java b/SpigotCore/SpigotCore_14/src/de/steamwar/techhider/ChunkHider14.java
index a9a37e1b..eade69b0 100644
--- a/SpigotCore/SpigotCore_14/src/de/steamwar/techhider/ChunkHider14.java
+++ b/SpigotCore/SpigotCore_14/src/de/steamwar/techhider/ChunkHider14.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2021  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/>.
+ *   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.techhider;
diff --git a/SpigotCore/SpigotCore_14/src/de/steamwar/techhider/ProtocolWrapper14.java b/SpigotCore/SpigotCore_14/src/de/steamwar/techhider/ProtocolWrapper14.java
index 7c658dbd..c68b6937 100644
--- a/SpigotCore/SpigotCore_14/src/de/steamwar/techhider/ProtocolWrapper14.java
+++ b/SpigotCore/SpigotCore_14/src/de/steamwar/techhider/ProtocolWrapper14.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2021  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/>.
+ *   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.techhider;
diff --git a/SpigotCore/SpigotCore_15/build.gradle.kts b/SpigotCore/SpigotCore_15/build.gradle.kts
index 1e49db83..d112f426 100644
--- a/SpigotCore/SpigotCore_15/build.gradle.kts
+++ b/SpigotCore/SpigotCore_15/build.gradle.kts
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/SpigotCore/SpigotCore_18/build.gradle.kts b/SpigotCore/SpigotCore_18/build.gradle.kts
index a3d4fb44..7c445409 100644
--- a/SpigotCore/SpigotCore_18/build.gradle.kts
+++ b/SpigotCore/SpigotCore_18/build.gradle.kts
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/SpigotCore/SpigotCore_18/src/de/steamwar/core/CraftbukkitWrapper18.java b/SpigotCore/SpigotCore_18/src/de/steamwar/core/CraftbukkitWrapper18.java
index 6cfaade4..9e7c1785 100644
--- a/SpigotCore/SpigotCore_18/src/de/steamwar/core/CraftbukkitWrapper18.java
+++ b/SpigotCore/SpigotCore_18/src/de/steamwar/core/CraftbukkitWrapper18.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2021  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/>.
-*/
+ *   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;
 
diff --git a/SpigotCore/SpigotCore_18/src/de/steamwar/core/ProtocolWrapper18.java b/SpigotCore/SpigotCore_18/src/de/steamwar/core/ProtocolWrapper18.java
index e5cdf160..544237ce 100644
--- a/SpigotCore/SpigotCore_18/src/de/steamwar/core/ProtocolWrapper18.java
+++ b/SpigotCore/SpigotCore_18/src/de/steamwar/core/ProtocolWrapper18.java
@@ -1,20 +1,20 @@
 /*
- *    This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- *    Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/SpigotCore/SpigotCore_18/src/de/steamwar/core/WorldEditWrapper18.java b/SpigotCore/SpigotCore_18/src/de/steamwar/core/WorldEditWrapper18.java
index 1c216a1a..111265cc 100644
--- a/SpigotCore/SpigotCore_18/src/de/steamwar/core/WorldEditWrapper18.java
+++ b/SpigotCore/SpigotCore_18/src/de/steamwar/core/WorldEditWrapper18.java
@@ -1,20 +1,20 @@
 /*
- *    This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- *    Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/SpigotCore/SpigotCore_18/src/de/steamwar/techhider/ChunkHider18.java b/SpigotCore/SpigotCore_18/src/de/steamwar/techhider/ChunkHider18.java
index ace24a54..3033feac 100644
--- a/SpigotCore/SpigotCore_18/src/de/steamwar/techhider/ChunkHider18.java
+++ b/SpigotCore/SpigotCore_18/src/de/steamwar/techhider/ChunkHider18.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2021  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/>.
+ *   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.techhider;
diff --git a/SpigotCore/SpigotCore_18/src/de/steamwar/techhider/ProtocolWrapper18.java b/SpigotCore/SpigotCore_18/src/de/steamwar/techhider/ProtocolWrapper18.java
index 1553806a..54f41d90 100644
--- a/SpigotCore/SpigotCore_18/src/de/steamwar/techhider/ProtocolWrapper18.java
+++ b/SpigotCore/SpigotCore_18/src/de/steamwar/techhider/ProtocolWrapper18.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2021  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/>.
+ *   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.techhider;
diff --git a/SpigotCore/SpigotCore_19/build.gradle.kts b/SpigotCore/SpigotCore_19/build.gradle.kts
index ce9922e4..1d696271 100644
--- a/SpigotCore/SpigotCore_19/build.gradle.kts
+++ b/SpigotCore/SpigotCore_19/build.gradle.kts
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/SpigotCore/SpigotCore_19/src/de/steamwar/core/ChatWrapper19.java b/SpigotCore/SpigotCore_19/src/de/steamwar/core/ChatWrapper19.java
index d8225ae6..79c98420 100644
--- a/SpigotCore/SpigotCore_19/src/de/steamwar/core/ChatWrapper19.java
+++ b/SpigotCore/SpigotCore_19/src/de/steamwar/core/ChatWrapper19.java
@@ -1,20 +1,20 @@
 /*
- *    This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- *    Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/SpigotCore/SpigotCore_19/src/de/steamwar/core/ProtocolWrapper19.java b/SpigotCore/SpigotCore_19/src/de/steamwar/core/ProtocolWrapper19.java
index f796dcdd..ac378188 100644
--- a/SpigotCore/SpigotCore_19/src/de/steamwar/core/ProtocolWrapper19.java
+++ b/SpigotCore/SpigotCore_19/src/de/steamwar/core/ProtocolWrapper19.java
@@ -1,20 +1,20 @@
 /*
- *    This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- *    Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/SpigotCore/SpigotCore_19/src/de/steamwar/techhider/ProtocolWrapper19.java b/SpigotCore/SpigotCore_19/src/de/steamwar/techhider/ProtocolWrapper19.java
index 7909b0fd..2aded961 100644
--- a/SpigotCore/SpigotCore_19/src/de/steamwar/techhider/ProtocolWrapper19.java
+++ b/SpigotCore/SpigotCore_19/src/de/steamwar/techhider/ProtocolWrapper19.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2021  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/>.
+ *   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.techhider;
diff --git a/SpigotCore/SpigotCore_20/build.gradle.kts b/SpigotCore/SpigotCore_20/build.gradle.kts
index 79f667e0..357feb75 100644
--- a/SpigotCore/SpigotCore_20/build.gradle.kts
+++ b/SpigotCore/SpigotCore_20/build.gradle.kts
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/SpigotCore/SpigotCore_20/src/de/steamwar/core/CraftbukkitWrapper20.java b/SpigotCore/SpigotCore_20/src/de/steamwar/core/CraftbukkitWrapper20.java
index 31faa3f0..ca2e059e 100644
--- a/SpigotCore/SpigotCore_20/src/de/steamwar/core/CraftbukkitWrapper20.java
+++ b/SpigotCore/SpigotCore_20/src/de/steamwar/core/CraftbukkitWrapper20.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2023  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/>.
-*/
+ *   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;
 
diff --git a/SpigotCore/SpigotCore_20/src/de/steamwar/core/WorldEditRendererWrapper20.java b/SpigotCore/SpigotCore_20/src/de/steamwar/core/WorldEditRendererWrapper20.java
index afdcd6d9..3403415a 100644
--- a/SpigotCore/SpigotCore_20/src/de/steamwar/core/WorldEditRendererWrapper20.java
+++ b/SpigotCore/SpigotCore_20/src/de/steamwar/core/WorldEditRendererWrapper20.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/SpigotCore/SpigotCore_21/build.gradle.kts b/SpigotCore/SpigotCore_21/build.gradle.kts
index 4b26ba16..e8440e00 100644
--- a/SpigotCore/SpigotCore_21/build.gradle.kts
+++ b/SpigotCore/SpigotCore_21/build.gradle.kts
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/SpigotCore/SpigotCore_21/src/de/steamwar/core/BountifulWrapper21.java b/SpigotCore/SpigotCore_21/src/de/steamwar/core/BountifulWrapper21.java
index be404e30..c8b4c8b0 100644
--- a/SpigotCore/SpigotCore_21/src/de/steamwar/core/BountifulWrapper21.java
+++ b/SpigotCore/SpigotCore_21/src/de/steamwar/core/BountifulWrapper21.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/SpigotCore/SpigotCore_21/src/de/steamwar/core/ChatWrapper21.java b/SpigotCore/SpigotCore_21/src/de/steamwar/core/ChatWrapper21.java
index 64757bbe..b3570146 100644
--- a/SpigotCore/SpigotCore_21/src/de/steamwar/core/ChatWrapper21.java
+++ b/SpigotCore/SpigotCore_21/src/de/steamwar/core/ChatWrapper21.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/SpigotCore/SpigotCore_21/src/de/steamwar/core/CraftbukkitWrapper21.java b/SpigotCore/SpigotCore_21/src/de/steamwar/core/CraftbukkitWrapper21.java
index a774c401..033ab273 100644
--- a/SpigotCore/SpigotCore_21/src/de/steamwar/core/CraftbukkitWrapper21.java
+++ b/SpigotCore/SpigotCore_21/src/de/steamwar/core/CraftbukkitWrapper21.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/SpigotCore/SpigotCore_21/src/de/steamwar/core/ProtocolWrapper21.java b/SpigotCore/SpigotCore_21/src/de/steamwar/core/ProtocolWrapper21.java
index 7018aa64..2186e32b 100644
--- a/SpigotCore/SpigotCore_21/src/de/steamwar/core/ProtocolWrapper21.java
+++ b/SpigotCore/SpigotCore_21/src/de/steamwar/core/ProtocolWrapper21.java
@@ -1,20 +1,20 @@
 /*
- *    This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- *    Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/SpigotCore/SpigotCore_21/src/de/steamwar/core/TrickyParticleWrapper21.java b/SpigotCore/SpigotCore_21/src/de/steamwar/core/TrickyParticleWrapper21.java
index 5575a45b..4f3ca8f0 100644
--- a/SpigotCore/SpigotCore_21/src/de/steamwar/core/TrickyParticleWrapper21.java
+++ b/SpigotCore/SpigotCore_21/src/de/steamwar/core/TrickyParticleWrapper21.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/SpigotCore/SpigotCore_21/src/de/steamwar/core/TrickyTrialsWrapper21.java b/SpigotCore/SpigotCore_21/src/de/steamwar/core/TrickyTrialsWrapper21.java
index fe3bc55f..a0800dac 100644
--- a/SpigotCore/SpigotCore_21/src/de/steamwar/core/TrickyTrialsWrapper21.java
+++ b/SpigotCore/SpigotCore_21/src/de/steamwar/core/TrickyTrialsWrapper21.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/SpigotCore/SpigotCore_21/src/de/steamwar/core/WorldEditWrapper21.java b/SpigotCore/SpigotCore_21/src/de/steamwar/core/WorldEditWrapper21.java
index 52947f3a..a7e90c41 100644
--- a/SpigotCore/SpigotCore_21/src/de/steamwar/core/WorldEditWrapper21.java
+++ b/SpigotCore/SpigotCore_21/src/de/steamwar/core/WorldEditWrapper21.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/SpigotCore/SpigotCore_21/src/de/steamwar/scoreboard/SWScoreboard21.java b/SpigotCore/SpigotCore_21/src/de/steamwar/scoreboard/SWScoreboard21.java
index 019e3898..cfb64049 100644
--- a/SpigotCore/SpigotCore_21/src/de/steamwar/scoreboard/SWScoreboard21.java
+++ b/SpigotCore/SpigotCore_21/src/de/steamwar/scoreboard/SWScoreboard21.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/SpigotCore/SpigotCore_8/build.gradle.kts b/SpigotCore/SpigotCore_8/build.gradle.kts
index f03254dd..cc99f61e 100644
--- a/SpigotCore/SpigotCore_8/build.gradle.kts
+++ b/SpigotCore/SpigotCore_8/build.gradle.kts
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/SpigotCore/SpigotCore_8/src/de/steamwar/core/BountifulWrapper8.java b/SpigotCore/SpigotCore_8/src/de/steamwar/core/BountifulWrapper8.java
index 9f0d8e1a..eb3c8bc1 100644
--- a/SpigotCore/SpigotCore_8/src/de/steamwar/core/BountifulWrapper8.java
+++ b/SpigotCore/SpigotCore_8/src/de/steamwar/core/BountifulWrapper8.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
+ *   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;
diff --git a/SpigotCore/SpigotCore_8/src/de/steamwar/core/ChatWrapper8.java b/SpigotCore/SpigotCore_8/src/de/steamwar/core/ChatWrapper8.java
index c41c1710..969e32ad 100644
--- a/SpigotCore/SpigotCore_8/src/de/steamwar/core/ChatWrapper8.java
+++ b/SpigotCore/SpigotCore_8/src/de/steamwar/core/ChatWrapper8.java
@@ -1,20 +1,20 @@
 /*
- *    This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- *    Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/SpigotCore/SpigotCore_8/src/de/steamwar/core/CraftbukkitWrapper8.java b/SpigotCore/SpigotCore_8/src/de/steamwar/core/CraftbukkitWrapper8.java
index 23be7911..9f04130f 100644
--- a/SpigotCore/SpigotCore_8/src/de/steamwar/core/CraftbukkitWrapper8.java
+++ b/SpigotCore/SpigotCore_8/src/de/steamwar/core/CraftbukkitWrapper8.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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;
 
diff --git a/SpigotCore/SpigotCore_8/src/de/steamwar/core/FlatteningWrapper8.java b/SpigotCore/SpigotCore_8/src/de/steamwar/core/FlatteningWrapper8.java
index b191a069..4c85eca0 100644
--- a/SpigotCore/SpigotCore_8/src/de/steamwar/core/FlatteningWrapper8.java
+++ b/SpigotCore/SpigotCore_8/src/de/steamwar/core/FlatteningWrapper8.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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;
 
diff --git a/SpigotCore/SpigotCore_8/src/de/steamwar/core/IDConverter8.java b/SpigotCore/SpigotCore_8/src/de/steamwar/core/IDConverter8.java
index 7026365b..e13ad74a 100644
--- a/SpigotCore/SpigotCore_8/src/de/steamwar/core/IDConverter8.java
+++ b/SpigotCore/SpigotCore_8/src/de/steamwar/core/IDConverter8.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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;
 
diff --git a/SpigotCore/SpigotCore_8/src/de/steamwar/core/LocaleChangeWrapper8.java b/SpigotCore/SpigotCore_8/src/de/steamwar/core/LocaleChangeWrapper8.java
index ddee9c6c..76c565df 100644
--- a/SpigotCore/SpigotCore_8/src/de/steamwar/core/LocaleChangeWrapper8.java
+++ b/SpigotCore/SpigotCore_8/src/de/steamwar/core/LocaleChangeWrapper8.java
@@ -1,20 +1,20 @@
 /*
- *    This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- *    Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/SpigotCore/SpigotCore_8/src/de/steamwar/core/ProtocolWrapper8.java b/SpigotCore/SpigotCore_8/src/de/steamwar/core/ProtocolWrapper8.java
index e30caa17..d897487b 100644
--- a/SpigotCore/SpigotCore_8/src/de/steamwar/core/ProtocolWrapper8.java
+++ b/SpigotCore/SpigotCore_8/src/de/steamwar/core/ProtocolWrapper8.java
@@ -1,20 +1,20 @@
 /*
- *    This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- *    Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/SpigotCore/SpigotCore_8/src/de/steamwar/core/RecipeDiscoverWrapper8.java b/SpigotCore/SpigotCore_8/src/de/steamwar/core/RecipeDiscoverWrapper8.java
index 59faa4cb..841719cd 100644
--- a/SpigotCore/SpigotCore_8/src/de/steamwar/core/RecipeDiscoverWrapper8.java
+++ b/SpigotCore/SpigotCore_8/src/de/steamwar/core/RecipeDiscoverWrapper8.java
@@ -1,20 +1,20 @@
 /*
- *    This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- *    Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/SpigotCore/SpigotCore_8/src/de/steamwar/core/TrickyTrialsWrapper8.java b/SpigotCore/SpigotCore_8/src/de/steamwar/core/TrickyTrialsWrapper8.java
index 5bb66d2d..9aff1020 100644
--- a/SpigotCore/SpigotCore_8/src/de/steamwar/core/TrickyTrialsWrapper8.java
+++ b/SpigotCore/SpigotCore_8/src/de/steamwar/core/TrickyTrialsWrapper8.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/SpigotCore/SpigotCore_8/src/de/steamwar/core/WorldEditRendererWrapper8.java b/SpigotCore/SpigotCore_8/src/de/steamwar/core/WorldEditRendererWrapper8.java
index 68f64c46..1994e42f 100644
--- a/SpigotCore/SpigotCore_8/src/de/steamwar/core/WorldEditRendererWrapper8.java
+++ b/SpigotCore/SpigotCore_8/src/de/steamwar/core/WorldEditRendererWrapper8.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/SpigotCore/SpigotCore_8/src/de/steamwar/core/WorldEditWrapper8.java b/SpigotCore/SpigotCore_8/src/de/steamwar/core/WorldEditWrapper8.java
index 75957933..cc021f19 100644
--- a/SpigotCore/SpigotCore_8/src/de/steamwar/core/WorldEditWrapper8.java
+++ b/SpigotCore/SpigotCore_8/src/de/steamwar/core/WorldEditWrapper8.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/SpigotCore/SpigotCore_8/src/de/steamwar/scoreboard/SWScoreboard8.java b/SpigotCore/SpigotCore_8/src/de/steamwar/scoreboard/SWScoreboard8.java
index a1648419..75b4da57 100644
--- a/SpigotCore/SpigotCore_8/src/de/steamwar/scoreboard/SWScoreboard8.java
+++ b/SpigotCore/SpigotCore_8/src/de/steamwar/scoreboard/SWScoreboard8.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/SpigotCore/SpigotCore_8/src/de/steamwar/techhider/BlockIds8.java b/SpigotCore/SpigotCore_8/src/de/steamwar/techhider/BlockIds8.java
index 64ac6c41..25535af8 100644
--- a/SpigotCore/SpigotCore_8/src/de/steamwar/techhider/BlockIds8.java
+++ b/SpigotCore/SpigotCore_8/src/de/steamwar/techhider/BlockIds8.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2021  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/>.
+ *   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.techhider;
diff --git a/SpigotCore/SpigotCore_8/src/de/steamwar/techhider/ChunkHider8.java b/SpigotCore/SpigotCore_8/src/de/steamwar/techhider/ChunkHider8.java
index 0aebc6e1..6b7441a4 100644
--- a/SpigotCore/SpigotCore_8/src/de/steamwar/techhider/ChunkHider8.java
+++ b/SpigotCore/SpigotCore_8/src/de/steamwar/techhider/ChunkHider8.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2021  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/>.
+ *   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.techhider;
diff --git a/SpigotCore/SpigotCore_8/src/de/steamwar/techhider/ProtocolWrapper8.java b/SpigotCore/SpigotCore_8/src/de/steamwar/techhider/ProtocolWrapper8.java
index 78633bc1..28d6b8f6 100644
--- a/SpigotCore/SpigotCore_8/src/de/steamwar/techhider/ProtocolWrapper8.java
+++ b/SpigotCore/SpigotCore_8/src/de/steamwar/techhider/ProtocolWrapper8.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2021  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/>.
+ *   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.techhider;
diff --git a/SpigotCore/SpigotCore_9/build.gradle.kts b/SpigotCore/SpigotCore_9/build.gradle.kts
index c149a3fd..1abca6d1 100644
--- a/SpigotCore/SpigotCore_9/build.gradle.kts
+++ b/SpigotCore/SpigotCore_9/build.gradle.kts
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/SpigotCore/SpigotCore_9/src/de/steamwar/core/BountifulWrapper9.java b/SpigotCore/SpigotCore_9/src/de/steamwar/core/BountifulWrapper9.java
index 156662a8..a77a0abe 100644
--- a/SpigotCore/SpigotCore_9/src/de/steamwar/core/BountifulWrapper9.java
+++ b/SpigotCore/SpigotCore_9/src/de/steamwar/core/BountifulWrapper9.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
+ *   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;
diff --git a/SpigotCore/SpigotCore_9/src/de/steamwar/core/CraftbukkitWrapper9.java b/SpigotCore/SpigotCore_9/src/de/steamwar/core/CraftbukkitWrapper9.java
index 608209dc..847036cc 100644
--- a/SpigotCore/SpigotCore_9/src/de/steamwar/core/CraftbukkitWrapper9.java
+++ b/SpigotCore/SpigotCore_9/src/de/steamwar/core/CraftbukkitWrapper9.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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;
 
diff --git a/SpigotCore/SpigotCore_9/src/de/steamwar/core/TrickyParticleWrapper9.java b/SpigotCore/SpigotCore_9/src/de/steamwar/core/TrickyParticleWrapper9.java
index 5c2c879b..2304ee3c 100644
--- a/SpigotCore/SpigotCore_9/src/de/steamwar/core/TrickyParticleWrapper9.java
+++ b/SpigotCore/SpigotCore_9/src/de/steamwar/core/TrickyParticleWrapper9.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/SpigotCore/SpigotCore_9/src/de/steamwar/core/WorldEditRendererWrapper9.java b/SpigotCore/SpigotCore_9/src/de/steamwar/core/WorldEditRendererWrapper9.java
index 5da6104a..7c39b7ff 100644
--- a/SpigotCore/SpigotCore_9/src/de/steamwar/core/WorldEditRendererWrapper9.java
+++ b/SpigotCore/SpigotCore_9/src/de/steamwar/core/WorldEditRendererWrapper9.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/SpigotCore/SpigotCore_9/src/de/steamwar/techhider/ChunkHider9.java b/SpigotCore/SpigotCore_9/src/de/steamwar/techhider/ChunkHider9.java
index 96060822..71b47743 100644
--- a/SpigotCore/SpigotCore_9/src/de/steamwar/techhider/ChunkHider9.java
+++ b/SpigotCore/SpigotCore_9/src/de/steamwar/techhider/ChunkHider9.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2021  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/>.
+ *   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.techhider;
diff --git a/SpigotCore/SpigotCore_Main/build.gradle.kts b/SpigotCore/SpigotCore_Main/build.gradle.kts
index bc0ff779..85ff16cc 100644
--- a/SpigotCore/SpigotCore_Main/build.gradle.kts
+++ b/SpigotCore/SpigotCore_Main/build.gradle.kts
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/SpigotCore/SpigotCore_Main/src/SpigotCore.properties b/SpigotCore/SpigotCore_Main/src/SpigotCore.properties
index 94e57d6c..98fde115 100644
--- a/SpigotCore/SpigotCore_Main/src/SpigotCore.properties
+++ b/SpigotCore/SpigotCore_Main/src/SpigotCore.properties
@@ -1,7 +1,7 @@
 #
 #   This file is a part of the SteamWar software.
 #
-#   Copyright (C) 2024  SteamWar.de-Serverteam
+#   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
diff --git a/SpigotCore/SpigotCore_Main/src/SpigotCore_de.properties b/SpigotCore/SpigotCore_Main/src/SpigotCore_de.properties
index 1f573eff..9b5eaccc 100644
--- a/SpigotCore/SpigotCore_Main/src/SpigotCore_de.properties
+++ b/SpigotCore/SpigotCore_Main/src/SpigotCore_de.properties
@@ -1,7 +1,7 @@
 #
 #   This file is a part of the SteamWar software.
 #
-#   Copyright (C) 2024  SteamWar.de-Serverteam
+#   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
diff --git a/SpigotCore/SpigotCore_Main/src/com/comphenix/tinyprotocol/TinyProtocol.java b/SpigotCore/SpigotCore_Main/src/com/comphenix/tinyprotocol/TinyProtocol.java
index 6f1dbf1a..cb4aca06 100644
--- a/SpigotCore/SpigotCore_Main/src/com/comphenix/tinyprotocol/TinyProtocol.java
+++ b/SpigotCore/SpigotCore_Main/src/com/comphenix/tinyprotocol/TinyProtocol.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/Reflection.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/Reflection.java
index ff298c1a..5b5d88d2 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/Reflection.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/Reflection.java
@@ -1,20 +1,20 @@
 /*
- *     This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- *     Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/command/CaseInsensitiveCommandsListener.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/command/CaseInsensitiveCommandsListener.java
index d12e8418..600a405b 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/command/CaseInsensitiveCommandsListener.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/command/CaseInsensitiveCommandsListener.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.command;
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/command/CommandRegistering.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/command/CommandRegistering.java
index 143ea2aa..4adffb58 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/command/CommandRegistering.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/command/CommandRegistering.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.command;
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/command/SWCommand.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/command/SWCommand.java
index 5094da45..01084241 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/command/SWCommand.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/command/SWCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.command;
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/command/TypeMapper.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/command/TypeMapper.java
index 08c99cd0..8beaa2f0 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/command/TypeMapper.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/command/TypeMapper.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.command;
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/command/TypeUtils.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/command/TypeUtils.java
index f4db4f9e..30deed6e 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/command/TypeUtils.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/command/TypeUtils.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.command;
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/command/TypeValidator.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/command/TypeValidator.java
index a07f11eb..89252aad 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/command/TypeValidator.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/command/TypeValidator.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.command;
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/BountifulWrapper.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/BountifulWrapper.java
index f1c86afe..4cf64ac7 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/BountifulWrapper.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/BountifulWrapper.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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;
 
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/CRIUSleepEvent.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/CRIUSleepEvent.java
index eb8faaf0..45e9bf4e 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/CRIUSleepEvent.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/CRIUSleepEvent.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/CRIUWakeupEvent.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/CRIUWakeupEvent.java
index 90a6ee32..6c644e0f 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/CRIUWakeupEvent.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/CRIUWakeupEvent.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/ChatWrapper.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/ChatWrapper.java
index 8c7d1868..668a47a7 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/ChatWrapper.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/ChatWrapper.java
@@ -1,20 +1,20 @@
 /*
- *    This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- *    Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/CheckpointUtils.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/CheckpointUtils.java
index 56e71994..7fe128ec 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/CheckpointUtils.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/CheckpointUtils.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/CheckpointUtilsJ9.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/CheckpointUtilsJ9.java
index 81f936de..8f34ae6a 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/CheckpointUtilsJ9.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/CheckpointUtilsJ9.java
@@ -1,20 +1,20 @@
 /*
- *     This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- *     Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/CommandRemover.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/CommandRemover.java
index 52787db6..8b6aa992 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/CommandRemover.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/CommandRemover.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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;
 
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/Core.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/Core.java
index 703d67e9..64c16174 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/Core.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/Core.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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;
 
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/CraftbukkitWrapper.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/CraftbukkitWrapper.java
index 13cd06a7..dfeed83c 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/CraftbukkitWrapper.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/CraftbukkitWrapper.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2021  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/>.
-*/
+ *   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;
 
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/CrashDetector.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/CrashDetector.java
index 543eccad..1963c8f9 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/CrashDetector.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/CrashDetector.java
@@ -1,20 +1,20 @@
 /*
- *    This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- *    Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/ErrorHandler.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/ErrorHandler.java
index 5a801f11..640d7ac0 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/ErrorHandler.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/ErrorHandler.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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;
 
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/FlatteningWrapper.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/FlatteningWrapper.java
index b4d954f8..2a6d6370 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/FlatteningWrapper.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/FlatteningWrapper.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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;
 
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/LocaleChangeWrapper.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/LocaleChangeWrapper.java
index 6db67b79..0726dfb2 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/LocaleChangeWrapper.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/LocaleChangeWrapper.java
@@ -1,20 +1,20 @@
 /*
- *    This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- *    Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/PlayerVersion.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/PlayerVersion.java
index 512df0d3..cf232f1d 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/PlayerVersion.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/PlayerVersion.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/ProtocolWrapper.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/ProtocolWrapper.java
index 9c226741..dcdb1791 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/ProtocolWrapper.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/ProtocolWrapper.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2021  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/>.
+ *   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;
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/RecipeDiscoverWrapper.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/RecipeDiscoverWrapper.java
index 0d6b9da4..53b27d65 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/RecipeDiscoverWrapper.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/RecipeDiscoverWrapper.java
@@ -1,20 +1,20 @@
 /*
- *    This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- *    Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/TPSWarpUtils.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/TPSWarpUtils.java
index 439864ed..c5979bcf 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/TPSWarpUtils.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/TPSWarpUtils.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/TPSWatcher.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/TPSWatcher.java
index f6714e0e..e88b1e82 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/TPSWatcher.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/TPSWatcher.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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;
 
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/TrickyParticleWrapper.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/TrickyParticleWrapper.java
index ae781100..7b86bacf 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/TrickyParticleWrapper.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/TrickyParticleWrapper.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/TrickyTrialsWrapper.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/TrickyTrialsWrapper.java
index 9a3d51dd..ab0aeb61 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/TrickyTrialsWrapper.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/TrickyTrialsWrapper.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/VersionDependent.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/VersionDependent.java
index 2fe94ce5..d31e9a24 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/VersionDependent.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/VersionDependent.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2021  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/>.
-*/
+ *   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;
 
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/WorldEditRenderer.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/WorldEditRenderer.java
index 27f76cda..3e84f30e 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/WorldEditRenderer.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/WorldEditRenderer.java
@@ -1,20 +1,20 @@
 /*
- *     This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- *     Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/WorldEditRendererCUIEditor.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/WorldEditRendererCUIEditor.java
index e50eac9d..da9646a4 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/WorldEditRendererCUIEditor.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/WorldEditRendererCUIEditor.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/WorldEditRendererWrapper.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/WorldEditRendererWrapper.java
index 2439d40d..4651cb06 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/WorldEditRendererWrapper.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/WorldEditRendererWrapper.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/WorldEditWrapper.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/WorldEditWrapper.java
index 9928b947..f3b0accc 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/WorldEditWrapper.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/WorldEditWrapper.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/authlib/AuthlibInjector.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/authlib/AuthlibInjector.java
index 06fd942c..95927bf3 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/authlib/AuthlibInjector.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/authlib/AuthlibInjector.java
@@ -1,20 +1,20 @@
 /*
- *    This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- *    Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/authlib/SteamwarGameProfileRepository.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/authlib/SteamwarGameProfileRepository.java
index 9045de17..c2f9412c 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/authlib/SteamwarGameProfileRepository.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/authlib/SteamwarGameProfileRepository.java
@@ -1,20 +1,20 @@
 /*
- *    This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- *    Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/AntiNocom.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/AntiNocom.java
index d3e5ea34..40cdb955 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/AntiNocom.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/AntiNocom.java
@@ -1,20 +1,20 @@
 /*
- *    This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- *    Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.events;
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/ChattingEvent.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/ChattingEvent.java
index 40b7412f..bf5c573f 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/ChattingEvent.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/ChattingEvent.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.events;
 
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/PlayerJoinedEvent.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/PlayerJoinedEvent.java
index fc64cb27..e8b7789e 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/PlayerJoinedEvent.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/PlayerJoinedEvent.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.events;
 
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/WorldLoadEvent.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/WorldLoadEvent.java
index f7aba879..4f150a51 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/WorldLoadEvent.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/WorldLoadEvent.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.events;
 
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/CCubedTextDisplay.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/CCubedTextDisplay.java
index 09b8f2f7..c5ebac51 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/CCubedTextDisplay.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/CCubedTextDisplay.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.entity;
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/CEntity.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/CEntity.java
index 373a2acf..63aa9010 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/CEntity.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/CEntity.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.entity;
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/CLine.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/CLine.java
index 2106b04e..7e9ae4cc 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/CLine.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/CLine.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.entity;
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/CRay.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/CRay.java
index f48badb0..0de13585 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/CRay.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/CRay.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.entity;
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/CWireframe.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/CWireframe.java
index c455f7a2..9f75c6e5 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/CWireframe.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/CWireframe.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.entity;
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/RArmorStand.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/RArmorStand.java
index 420c6f47..249d2cda 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/RArmorStand.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/RArmorStand.java
@@ -1,20 +1,20 @@
 /*
- *    This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- *    Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.entity;
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/RBlockDisplay.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/RBlockDisplay.java
index 3a00ae9c..0058617a 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/RBlockDisplay.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/RBlockDisplay.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/RDisplay.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/RDisplay.java
index d176054d..34c3a2eb 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/RDisplay.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/RDisplay.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/REntity.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/REntity.java
index a27e6f5e..840b413e 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/REntity.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/REntity.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.entity;
 
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/REntityServer.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/REntityServer.java
index cfa53943..3ba28d38 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/REntityServer.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/REntityServer.java
@@ -1,20 +1,20 @@
 /*
- *    This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- *    Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.entity;
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/RFallingBlockEntity.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/RFallingBlockEntity.java
index ae70775a..92d19f90 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/RFallingBlockEntity.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/RFallingBlockEntity.java
@@ -1,20 +1,20 @@
 /*
- *    This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- *    Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.entity;
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/RItemDisplay.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/RItemDisplay.java
index 45889637..894ba21c 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/RItemDisplay.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/RItemDisplay.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/RPlayer.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/RPlayer.java
index a64105b7..ce79a8cb 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/RPlayer.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/RPlayer.java
@@ -1,20 +1,20 @@
 /*
- *    This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- *    Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.entity;
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/RTextDisplay.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/RTextDisplay.java
index f221e351..29cb8a21 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/RTextDisplay.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/RTextDisplay.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/InvCallback.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/InvCallback.java
index 0ac23234..75e860ed 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/InvCallback.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/InvCallback.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.inventory;
 
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/SWAnvilInv.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/SWAnvilInv.java
index 3ff1aa1e..d552cfc9 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/SWAnvilInv.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/SWAnvilInv.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.inventory;
 
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/SWInventory.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/SWInventory.java
index 6b009004..b8e4900c 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/SWInventory.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/SWInventory.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.inventory;
 
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/SWItem.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/SWItem.java
index 7ca0829d..1b230121 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/SWItem.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/SWItem.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.inventory;
 
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/SWListInv.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/SWListInv.java
index 181d8414..5675e4f7 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/SWListInv.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/SWListInv.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.inventory;
 
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/SchematicSelector.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/SchematicSelector.java
index 6d7a6201..f5975063 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/SchematicSelector.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/SchematicSelector.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.inventory;
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/SchematicSelectorInjectable.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/SchematicSelectorInjectable.java
index 235dda4f..3a292997 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/SchematicSelectorInjectable.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/SchematicSelectorInjectable.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.inventory;
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/UtilGui.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/UtilGui.java
index 298d0c0f..0ae87212 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/UtilGui.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/UtilGui.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.inventory;
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/linkage/SpigotLinker.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/linkage/SpigotLinker.java
index 35abb954..c157aa85 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/linkage/SpigotLinker.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/linkage/SpigotLinker.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.linkage;
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/message/Message.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/message/Message.java
index b9ae84b7..f24b84e6 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/message/Message.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/message/Message.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.message;
 
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/message/SubMessage.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/message/SubMessage.java
index e40b74a5..705ee0c1 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/message/SubMessage.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/message/SubMessage.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/network/CoreNetworkHandler.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/network/CoreNetworkHandler.java
index 4c3d7e45..10adeac0 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/network/CoreNetworkHandler.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/network/CoreNetworkHandler.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.network;
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/network/NetworkReceiver.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/network/NetworkReceiver.java
index c93046cd..5ef8bf66 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/network/NetworkReceiver.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/network/NetworkReceiver.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.network;
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/network/NetworkSender.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/network/NetworkSender.java
index 197efd64..ba3b4ee0 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/network/NetworkSender.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/network/NetworkSender.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.network;
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/network/handlers/InventoryHandler.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/network/handlers/InventoryHandler.java
index cbf2b8f5..d2e8e73b 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/network/handlers/InventoryHandler.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/network/handlers/InventoryHandler.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.network.handlers;
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/network/handlers/ServerDataHandler.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/network/handlers/ServerDataHandler.java
index a758892d..eec211b2 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/network/handlers/ServerDataHandler.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/network/handlers/ServerDataHandler.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/providers/BauServerInfo.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/providers/BauServerInfo.java
index 309db835..8f937e3a 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/providers/BauServerInfo.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/providers/BauServerInfo.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.providers;
 
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/scoreboard/SWScoreboard.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/scoreboard/SWScoreboard.java
index 1d5c2d79..06ea4346 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/scoreboard/SWScoreboard.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/scoreboard/SWScoreboard.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.scoreboard;
 
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/scoreboard/ScoreboardCallback.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/scoreboard/ScoreboardCallback.java
index 11e403ba..b4071114 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/scoreboard/ScoreboardCallback.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/scoreboard/ScoreboardCallback.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.scoreboard;
 
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/sql/PersonalKit.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/sql/PersonalKit.java
index 36e31490..13b05f37 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/sql/PersonalKit.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/sql/PersonalKit.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020 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/>.
-*/
+/*
+ *   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;
 
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/sql/SQLConfigImpl.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/sql/SQLConfigImpl.java
index dd54f35d..52364529 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/sql/SQLConfigImpl.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/sql/SQLConfigImpl.java
@@ -1,20 +1,20 @@
 /*
- *    This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- *    Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/sql/SQLWrapperImpl.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/sql/SQLWrapperImpl.java
index 7428574e..fff456d3 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/sql/SQLWrapperImpl.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/sql/SQLWrapperImpl.java
@@ -1,20 +1,20 @@
 /*
- *    This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- *    Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/sql/SchematicData.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/sql/SchematicData.java
index 53cb261d..007c7a2c 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/sql/SchematicData.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/sql/SchematicData.java
@@ -1,20 +1,20 @@
 /*
- *    This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- *    Copyright (C) 2025 SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/BlockIds.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/BlockIds.java
index fa2f7f6e..168b87da 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/BlockIds.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/BlockIds.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2021  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/>.
+ *   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.techhider;
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/ChunkHider.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/ChunkHider.java
index e1d2b5e9..bdc8cdd3 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/ChunkHider.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/ChunkHider.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2022  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/>.
+ *   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.techhider;
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/ProtocolUtils.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/ProtocolUtils.java
index 3949d7ed..a9677407 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/ProtocolUtils.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/ProtocolUtils.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2022  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/>.
+ *   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.techhider;
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/ProtocolWrapper.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/ProtocolWrapper.java
index aab486c4..aec71941 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/ProtocolWrapper.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/ProtocolWrapper.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2021  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/>.
+ *   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.techhider;
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/TechHider.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/TechHider.java
index 021d2fe4..46e53bcf 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/TechHider.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/TechHider.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2021  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/>.
+ *   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.techhider;
diff --git a/SpigotCore/build.gradle.kts b/SpigotCore/build.gradle.kts
index d615cfc7..22e65b20 100644
--- a/SpigotCore/build.gradle.kts
+++ b/SpigotCore/build.gradle.kts
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/TNTLeague/build.gradle.kts b/TNTLeague/build.gradle.kts
index e8b8253a..8773671c 100644
--- a/TNTLeague/build.gradle.kts
+++ b/TNTLeague/build.gradle.kts
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/TNTLeague/src/de/steamwar/tntleague/TNTLeague.kt b/TNTLeague/src/de/steamwar/tntleague/TNTLeague.kt
index 21616214..5de65e15 100644
--- a/TNTLeague/src/de/steamwar/tntleague/TNTLeague.kt
+++ b/TNTLeague/src/de/steamwar/tntleague/TNTLeague.kt
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/TNTLeague/src/de/steamwar/tntleague/TNTLeague.properties b/TNTLeague/src/de/steamwar/tntleague/TNTLeague.properties
index 73e3b416..7d1b708c 100644
--- a/TNTLeague/src/de/steamwar/tntleague/TNTLeague.properties
+++ b/TNTLeague/src/de/steamwar/tntleague/TNTLeague.properties
@@ -1,7 +1,7 @@
 #
 #   This file is a part of the SteamWar software.
 #
-#   Copyright (C) 2024 SteamWar.de-Serverteam
+#   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
diff --git a/TNTLeague/src/de/steamwar/tntleague/TNTLeague_de.properties b/TNTLeague/src/de/steamwar/tntleague/TNTLeague_de.properties
index db81812b..eab7a8a9 100644
--- a/TNTLeague/src/de/steamwar/tntleague/TNTLeague_de.properties
+++ b/TNTLeague/src/de/steamwar/tntleague/TNTLeague_de.properties
@@ -1,7 +1,7 @@
 #
 #   This file is a part of the SteamWar software.
 #
-#   Copyright (C) 2024 SteamWar.de-Serverteam
+#   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
diff --git a/TNTLeague/src/de/steamwar/tntleague/command/AcceptCommand.kt b/TNTLeague/src/de/steamwar/tntleague/command/AcceptCommand.kt
index 3606bdbd..30ee5193 100644
--- a/TNTLeague/src/de/steamwar/tntleague/command/AcceptCommand.kt
+++ b/TNTLeague/src/de/steamwar/tntleague/command/AcceptCommand.kt
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/TNTLeague/src/de/steamwar/tntleague/command/InviteCommand.kt b/TNTLeague/src/de/steamwar/tntleague/command/InviteCommand.kt
index e89e3443..eed42b46 100644
--- a/TNTLeague/src/de/steamwar/tntleague/command/InviteCommand.kt
+++ b/TNTLeague/src/de/steamwar/tntleague/command/InviteCommand.kt
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/TNTLeague/src/de/steamwar/tntleague/command/LeaveCommand.kt b/TNTLeague/src/de/steamwar/tntleague/command/LeaveCommand.kt
index 196f4312..be3198cb 100644
--- a/TNTLeague/src/de/steamwar/tntleague/command/LeaveCommand.kt
+++ b/TNTLeague/src/de/steamwar/tntleague/command/LeaveCommand.kt
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/TNTLeague/src/de/steamwar/tntleague/command/RemoveCommand.kt b/TNTLeague/src/de/steamwar/tntleague/command/RemoveCommand.kt
index d889f31a..068470a4 100644
--- a/TNTLeague/src/de/steamwar/tntleague/command/RemoveCommand.kt
+++ b/TNTLeague/src/de/steamwar/tntleague/command/RemoveCommand.kt
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/TNTLeague/src/de/steamwar/tntleague/config/TNTLeagueConfig.kt b/TNTLeague/src/de/steamwar/tntleague/config/TNTLeagueConfig.kt
index 861eff6c..3f51d535 100644
--- a/TNTLeague/src/de/steamwar/tntleague/config/TNTLeagueConfig.kt
+++ b/TNTLeague/src/de/steamwar/tntleague/config/TNTLeagueConfig.kt
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/TNTLeague/src/de/steamwar/tntleague/config/TNTLeagueWorldConfig.kt b/TNTLeague/src/de/steamwar/tntleague/config/TNTLeagueWorldConfig.kt
index 01667abd..253f8c95 100644
--- a/TNTLeague/src/de/steamwar/tntleague/config/TNTLeagueWorldConfig.kt
+++ b/TNTLeague/src/de/steamwar/tntleague/config/TNTLeagueWorldConfig.kt
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/TNTLeague/src/de/steamwar/tntleague/events/DummyListener.kt b/TNTLeague/src/de/steamwar/tntleague/events/DummyListener.kt
index 917ba5be..a857337f 100644
--- a/TNTLeague/src/de/steamwar/tntleague/events/DummyListener.kt
+++ b/TNTLeague/src/de/steamwar/tntleague/events/DummyListener.kt
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/TNTLeague/src/de/steamwar/tntleague/events/GlobalListener.kt b/TNTLeague/src/de/steamwar/tntleague/events/GlobalListener.kt
index 60f921fc..af1389b9 100644
--- a/TNTLeague/src/de/steamwar/tntleague/events/GlobalListener.kt
+++ b/TNTLeague/src/de/steamwar/tntleague/events/GlobalListener.kt
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/TNTLeague/src/de/steamwar/tntleague/events/IngameListener.kt b/TNTLeague/src/de/steamwar/tntleague/events/IngameListener.kt
index 7ae0618f..31cc4de2 100644
--- a/TNTLeague/src/de/steamwar/tntleague/events/IngameListener.kt
+++ b/TNTLeague/src/de/steamwar/tntleague/events/IngameListener.kt
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/TNTLeague/src/de/steamwar/tntleague/events/LobbyListener.kt b/TNTLeague/src/de/steamwar/tntleague/events/LobbyListener.kt
index d160498f..1f8beb26 100644
--- a/TNTLeague/src/de/steamwar/tntleague/events/LobbyListener.kt
+++ b/TNTLeague/src/de/steamwar/tntleague/events/LobbyListener.kt
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/TNTLeague/src/de/steamwar/tntleague/game/TNTLeagueGame.kt b/TNTLeague/src/de/steamwar/tntleague/game/TNTLeagueGame.kt
index 440cfa37..3d4471af 100644
--- a/TNTLeague/src/de/steamwar/tntleague/game/TNTLeagueGame.kt
+++ b/TNTLeague/src/de/steamwar/tntleague/game/TNTLeagueGame.kt
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/TNTLeague/src/de/steamwar/tntleague/game/TNTLeagueTeam.kt b/TNTLeague/src/de/steamwar/tntleague/game/TNTLeagueTeam.kt
index 8b452fca..5378089e 100644
--- a/TNTLeague/src/de/steamwar/tntleague/game/TNTLeagueTeam.kt
+++ b/TNTLeague/src/de/steamwar/tntleague/game/TNTLeagueTeam.kt
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/TNTLeague/src/de/steamwar/tntleague/inventory/CategoryInventory.kt b/TNTLeague/src/de/steamwar/tntleague/inventory/CategoryInventory.kt
index 76200073..c8ff8d46 100644
--- a/TNTLeague/src/de/steamwar/tntleague/inventory/CategoryInventory.kt
+++ b/TNTLeague/src/de/steamwar/tntleague/inventory/CategoryInventory.kt
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/TNTLeague/src/de/steamwar/tntleague/inventory/DealerInventory.kt b/TNTLeague/src/de/steamwar/tntleague/inventory/DealerInventory.kt
index c9bbe635..10ee5014 100644
--- a/TNTLeague/src/de/steamwar/tntleague/inventory/DealerInventory.kt
+++ b/TNTLeague/src/de/steamwar/tntleague/inventory/DealerInventory.kt
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/TNTLeague/src/de/steamwar/tntleague/util/TNTLeagueScoreboard.kt b/TNTLeague/src/de/steamwar/tntleague/util/TNTLeagueScoreboard.kt
index 40fb4138..847949b8 100644
--- a/TNTLeague/src/de/steamwar/tntleague/util/TNTLeagueScoreboard.kt
+++ b/TNTLeague/src/de/steamwar/tntleague/util/TNTLeagueScoreboard.kt
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/Teamserver/build.gradle.kts b/Teamserver/build.gradle.kts
index c0e5c933..d4b47bbe 100644
--- a/Teamserver/build.gradle.kts
+++ b/Teamserver/build.gradle.kts
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/Teamserver/src/de/steamwar/teamserver/Builder.java b/Teamserver/src/de/steamwar/teamserver/Builder.java
index 3400ff98..7a625bd5 100644
--- a/Teamserver/src/de/steamwar/teamserver/Builder.java
+++ b/Teamserver/src/de/steamwar/teamserver/Builder.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/Teamserver/src/de/steamwar/teamserver/Teamserver.properties b/Teamserver/src/de/steamwar/teamserver/Teamserver.properties
index 29de325c..a9e48323 100644
--- a/Teamserver/src/de/steamwar/teamserver/Teamserver.properties
+++ b/Teamserver/src/de/steamwar/teamserver/Teamserver.properties
@@ -1,61 +1,61 @@
 
 #
-# This file is a part of the SteamWar software.
+#   This file is a part of the SteamWar software.
 #
-# Copyright (C) 2023  SteamWar.de-Serverteam
+#   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 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.
+#   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/>.
+#   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/>.
 #
 
-PREFIX = �eBuilder�8�
+PREFIX = �eBuilder�8�
 TIME = HH:mm:ss
 
 # Freeze
-REGION_FREEZE_HELP=�8/�efreeze �8- �7Toggle Freeze
-REGION_FREEZE_ENABLED=�cRegion eingefroren
-REGION_FREEZE_DISABLED=�aRegion aufgetaut
+REGION_FREEZE_HELP=�8/�efreeze �8- �7Toggle Freeze
+REGION_FREEZE_ENABLED=�cRegion eingefroren
+REGION_FREEZE_DISABLED=�aRegion aufgetaut
 
 # Material
-MATERIAL_INV_NAME=�eMaterial {0}/{1}
-MATERIAL_SEARCH=�eSuchen
-MATERIAL_BACK=�eZur�ck
-MATERIAL_SEARCH_NAME=�eName
-MATERIAL_SEARCH_TRANSPARENT=�eTransparent
-MATERIAL_SEARCH_SOLID=�eSolide
-MATERIAL_SEARCH_GRAVITY=�eFallend
-MATERIAL_SEARCH_OCCLUDING=�eOccluding
-MATERIAL_SEARCH_INTERACTEABLE=�eInterargierbar
-MATERIAL_SEARCH_FLAMMABLE=�eFlammbar
-MATERIAL_SEARCH_BURNABLE=�eBrennbar
-MATERIAL_SEARCH_WATERLOGGABLE=�eWasserspeicherbar
-MATERIAL_SEARCH_BLASTRESISTANCE=�eBlast Resistance
-MATERIAL_SEARCH_BLASTRESISTANCE_MIN=�eBlast Resistance mindestens
-MATERIAL_SEARCH_BLASTRESISTANCE_MAX=�eBlast Resistance maximal
-MATERIAL_SEARCH_BLASTRESISTANCE_EXACT=�eBlast Resistance
-MATERIAL_SEARCH_VALUE=�8: �e{0}
-MATERIAL_BLAST-RESISTANCE=�8- �eBlast Resistance�8: �7{0}
-MATERIAL_HARDNESS=�8- �eH�rte�8: �7{0}
-MATERIAL_TNT_BREAKABLE=�8- �eZerst�rbar durch TNT
-MATERIAL_TNT_UNBREAKABLE=�8- �eNicht Zerst�rbar durch TNT
-MATERIAL_TRANSPARENT=�8- �eTransparenter Block
-MATERIAL_SOLID=�8- �eSolider Block
-MATERIAL_GRAVITY=�8- �eFallender Block
-MATERIAL_OCCLUDING=�8- �eOccluding Block
-MATERIAL_INTERACT-ABLE=�8- �eInterargierbarer Block
-MATERIAL_FLAMMABLE=�8- �eFlammbarer Block
-MATERIAL_BURNABLE=�8- �eBrennbarer Block
-MATERIAL_WATERLOGGABLE=�8- �eWasserspeicherbarer Block
+MATERIAL_INV_NAME=�eMaterial {0}/{1}
+MATERIAL_SEARCH=�eSuchen
+MATERIAL_BACK=�eZur�ck
+MATERIAL_SEARCH_NAME=�eName
+MATERIAL_SEARCH_TRANSPARENT=�eTransparent
+MATERIAL_SEARCH_SOLID=�eSolide
+MATERIAL_SEARCH_GRAVITY=�eFallend
+MATERIAL_SEARCH_OCCLUDING=�eOccluding
+MATERIAL_SEARCH_INTERACTEABLE=�eInterargierbar
+MATERIAL_SEARCH_FLAMMABLE=�eFlammbar
+MATERIAL_SEARCH_BURNABLE=�eBrennbar
+MATERIAL_SEARCH_WATERLOGGABLE=�eWasserspeicherbar
+MATERIAL_SEARCH_BLASTRESISTANCE=�eBlast Resistance
+MATERIAL_SEARCH_BLASTRESISTANCE_MIN=�eBlast Resistance mindestens
+MATERIAL_SEARCH_BLASTRESISTANCE_MAX=�eBlast Resistance maximal
+MATERIAL_SEARCH_BLASTRESISTANCE_EXACT=�eBlast Resistance
+MATERIAL_SEARCH_VALUE=�8: �e{0}
+MATERIAL_BLAST-RESISTANCE=�8- �eBlast Resistance�8: �7{0}
+MATERIAL_HARDNESS=�8- �eH�rte�8: �7{0}
+MATERIAL_TNT_BREAKABLE=�8- �eZerst�rbar durch TNT
+MATERIAL_TNT_UNBREAKABLE=�8- �eNicht Zerst�rbar durch TNT
+MATERIAL_TRANSPARENT=�8- �eTransparenter Block
+MATERIAL_SOLID=�8- �eSolider Block
+MATERIAL_GRAVITY=�8- �eFallender Block
+MATERIAL_OCCLUDING=�8- �eOccluding Block
+MATERIAL_INTERACT-ABLE=�8- �eInterargierbarer Block
+MATERIAL_FLAMMABLE=�8- �eFlammbarer Block
+MATERIAL_BURNABLE=�8- �eBrennbarer Block
+MATERIAL_WATERLOGGABLE=�8- �eWasserspeicherbarer Block
 
-ARENACONFIG_HELP=�8/�7arenaconfig �8[�eUntere Spielergrenze�8] (WE-Pos1: Kleinste blaue Schemkoordinate, WE-Pos2: Kleinste Rote Schemkoordinate)
-ARENACONFIG_SELECTION=�cKeine WE-SAuswahl,
\ No newline at end of file
+ARENACONFIG_HELP=�8/�7arenaconfig �8[�eUntere Spielergrenze�8] (WE-Pos1: Kleinste blaue Schemkoordinate, WE-Pos2: Kleinste Rote Schemkoordinate)
+ARENACONFIG_SELECTION=�cKeine WE-SAuswahl,
\ No newline at end of file
diff --git a/Teamserver/src/de/steamwar/teamserver/Teamserver_en.properties b/Teamserver/src/de/steamwar/teamserver/Teamserver_en.properties
index e69de29b..5f2fa4f6 100644
--- a/Teamserver/src/de/steamwar/teamserver/Teamserver_en.properties
+++ b/Teamserver/src/de/steamwar/teamserver/Teamserver_en.properties
@@ -0,0 +1,19 @@
+#
+#   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/>.
+#
+
diff --git a/Teamserver/src/de/steamwar/teamserver/command/ArenaconfigCommand.java b/Teamserver/src/de/steamwar/teamserver/command/ArenaconfigCommand.java
index 23d7fa4e..df32735e 100644
--- a/Teamserver/src/de/steamwar/teamserver/command/ArenaconfigCommand.java
+++ b/Teamserver/src/de/steamwar/teamserver/command/ArenaconfigCommand.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/Teamserver/src/de/steamwar/teamserver/command/FreezeCommand.java b/Teamserver/src/de/steamwar/teamserver/command/FreezeCommand.java
index 91692877..4477f5e8 100644
--- a/Teamserver/src/de/steamwar/teamserver/command/FreezeCommand.java
+++ b/Teamserver/src/de/steamwar/teamserver/command/FreezeCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.command;
diff --git a/Teamserver/src/de/steamwar/teamserver/command/GamemodeCommand.java b/Teamserver/src/de/steamwar/teamserver/command/GamemodeCommand.java
index 93b35455..57cf6674 100644
--- a/Teamserver/src/de/steamwar/teamserver/command/GamemodeCommand.java
+++ b/Teamserver/src/de/steamwar/teamserver/command/GamemodeCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.command;
diff --git a/Teamserver/src/de/steamwar/teamserver/command/MaterialCommand.java b/Teamserver/src/de/steamwar/teamserver/command/MaterialCommand.java
index 13c26699..920267c6 100644
--- a/Teamserver/src/de/steamwar/teamserver/command/MaterialCommand.java
+++ b/Teamserver/src/de/steamwar/teamserver/command/MaterialCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.command;
diff --git a/Teamserver/src/de/steamwar/teamserver/command/SpeedCommand.java b/Teamserver/src/de/steamwar/teamserver/command/SpeedCommand.java
index 2b22626f..070a9d3b 100644
--- a/Teamserver/src/de/steamwar/teamserver/command/SpeedCommand.java
+++ b/Teamserver/src/de/steamwar/teamserver/command/SpeedCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.command;
diff --git a/Teamserver/src/de/steamwar/teamserver/listener/AxiomHandshakeListener.java b/Teamserver/src/de/steamwar/teamserver/listener/AxiomHandshakeListener.java
index 21fae69f..218d211a 100644
--- a/Teamserver/src/de/steamwar/teamserver/listener/AxiomHandshakeListener.java
+++ b/Teamserver/src/de/steamwar/teamserver/listener/AxiomHandshakeListener.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/Teamserver/src/de/steamwar/teamserver/listener/FreezeListener.java b/Teamserver/src/de/steamwar/teamserver/listener/FreezeListener.java
index 575cb513..d4d0f9f3 100644
--- a/Teamserver/src/de/steamwar/teamserver/listener/FreezeListener.java
+++ b/Teamserver/src/de/steamwar/teamserver/listener/FreezeListener.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/Teamserver/src/de/steamwar/teamserver/listener/PlayerChange.java b/Teamserver/src/de/steamwar/teamserver/listener/PlayerChange.java
index 71493f64..06996719 100644
--- a/Teamserver/src/de/steamwar/teamserver/listener/PlayerChange.java
+++ b/Teamserver/src/de/steamwar/teamserver/listener/PlayerChange.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2021  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/Teamserver/src/de/steamwar/teamserver/listener/SelectAdjacent.java b/Teamserver/src/de/steamwar/teamserver/listener/SelectAdjacent.java
index 6a94f635..4a9f4d0d 100644
--- a/Teamserver/src/de/steamwar/teamserver/listener/SelectAdjacent.java
+++ b/Teamserver/src/de/steamwar/teamserver/listener/SelectAdjacent.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/TowerRun/build.gradle.kts b/TowerRun/build.gradle.kts
index e3a6cf74..b8828ede 100644
--- a/TowerRun/build.gradle.kts
+++ b/TowerRun/build.gradle.kts
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/TowerRun/src/TowerRun.properties b/TowerRun/src/TowerRun.properties
index 0935bd83..f0da3fd0 100644
--- a/TowerRun/src/TowerRun.properties
+++ b/TowerRun/src/TowerRun.properties
@@ -1,7 +1,7 @@
 #
 #   This file is a part of the SteamWar software.
 #
-#   Copyright (C) 2023  SteamWar.de-Serverteam
+#   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
diff --git a/TowerRun/src/TowerRun_de.properties b/TowerRun/src/TowerRun_de.properties
index 82fd014b..14a87d82 100644
--- a/TowerRun/src/TowerRun_de.properties
+++ b/TowerRun/src/TowerRun_de.properties
@@ -1,7 +1,7 @@
 #
 #   This file is a part of the SteamWar software.
 #
-#   Copyright (C) 2023  SteamWar.de-Serverteam
+#   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
diff --git a/TowerRun/src/de/steamwar/towerrun/FightInfoPacketSender.java b/TowerRun/src/de/steamwar/towerrun/FightInfoPacketSender.java
index da8c913b..764e1eea 100644
--- a/TowerRun/src/de/steamwar/towerrun/FightInfoPacketSender.java
+++ b/TowerRun/src/de/steamwar/towerrun/FightInfoPacketSender.java
@@ -1,22 +1,20 @@
 /*
+ *   This file is a part of the SteamWar software.
  *
- *     This file is a part of the SteamWar software.
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
  *
- *     Copyright (C) 2024  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 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.
  *
- *     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/>.
- * /
+ *   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.towerrun;
diff --git a/TowerRun/src/de/steamwar/towerrun/TowerRun.java b/TowerRun/src/de/steamwar/towerrun/TowerRun.java
index 440b156c..357e8689 100644
--- a/TowerRun/src/de/steamwar/towerrun/TowerRun.java
+++ b/TowerRun/src/de/steamwar/towerrun/TowerRun.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/TowerRun/src/de/steamwar/towerrun/commands/StartCommand.java b/TowerRun/src/de/steamwar/towerrun/commands/StartCommand.java
index dddb2954..77884b37 100644
--- a/TowerRun/src/de/steamwar/towerrun/commands/StartCommand.java
+++ b/TowerRun/src/de/steamwar/towerrun/commands/StartCommand.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/TowerRun/src/de/steamwar/towerrun/config/Config.java b/TowerRun/src/de/steamwar/towerrun/config/Config.java
index fe6acd07..1d262066 100644
--- a/TowerRun/src/de/steamwar/towerrun/config/Config.java
+++ b/TowerRun/src/de/steamwar/towerrun/config/Config.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/TowerRun/src/de/steamwar/towerrun/config/WorldConfig.java b/TowerRun/src/de/steamwar/towerrun/config/WorldConfig.java
index 56e90034..e74be358 100644
--- a/TowerRun/src/de/steamwar/towerrun/config/WorldConfig.java
+++ b/TowerRun/src/de/steamwar/towerrun/config/WorldConfig.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/TowerRun/src/de/steamwar/towerrun/countdowns/Countdown.java b/TowerRun/src/de/steamwar/towerrun/countdowns/Countdown.java
index 727d19ea..3d1b4a06 100644
--- a/TowerRun/src/de/steamwar/towerrun/countdowns/Countdown.java
+++ b/TowerRun/src/de/steamwar/towerrun/countdowns/Countdown.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/TowerRun/src/de/steamwar/towerrun/countdowns/EndCountdown.java b/TowerRun/src/de/steamwar/towerrun/countdowns/EndCountdown.java
index 3eb32c7d..58af5a62 100644
--- a/TowerRun/src/de/steamwar/towerrun/countdowns/EndCountdown.java
+++ b/TowerRun/src/de/steamwar/towerrun/countdowns/EndCountdown.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/TowerRun/src/de/steamwar/towerrun/countdowns/GameCountdown.java b/TowerRun/src/de/steamwar/towerrun/countdowns/GameCountdown.java
index 26b69ed7..83877882 100644
--- a/TowerRun/src/de/steamwar/towerrun/countdowns/GameCountdown.java
+++ b/TowerRun/src/de/steamwar/towerrun/countdowns/GameCountdown.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/TowerRun/src/de/steamwar/towerrun/countdowns/LobbyCountdown.java b/TowerRun/src/de/steamwar/towerrun/countdowns/LobbyCountdown.java
index 4377a141..8b14b535 100644
--- a/TowerRun/src/de/steamwar/towerrun/countdowns/LobbyCountdown.java
+++ b/TowerRun/src/de/steamwar/towerrun/countdowns/LobbyCountdown.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/TowerRun/src/de/steamwar/towerrun/game/TowerRunGame.java b/TowerRun/src/de/steamwar/towerrun/game/TowerRunGame.java
index c1514db4..ba218ef0 100644
--- a/TowerRun/src/de/steamwar/towerrun/game/TowerRunGame.java
+++ b/TowerRun/src/de/steamwar/towerrun/game/TowerRunGame.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/TowerRun/src/de/steamwar/towerrun/game/TowerRunPlayer.java b/TowerRun/src/de/steamwar/towerrun/game/TowerRunPlayer.java
index e7b12973..bdcc2610 100644
--- a/TowerRun/src/de/steamwar/towerrun/game/TowerRunPlayer.java
+++ b/TowerRun/src/de/steamwar/towerrun/game/TowerRunPlayer.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/TowerRun/src/de/steamwar/towerrun/generator/TowerGenerator.java b/TowerRun/src/de/steamwar/towerrun/generator/TowerGenerator.java
index 63cd94ee..ce0a33b7 100644
--- a/TowerRun/src/de/steamwar/towerrun/generator/TowerGenerator.java
+++ b/TowerRun/src/de/steamwar/towerrun/generator/TowerGenerator.java
@@ -1,3 +1,22 @@
+/*
+ *   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.towerrun.generator;
 
 import com.sk89q.worldedit.EditSession;
diff --git a/TowerRun/src/de/steamwar/towerrun/listener/GlobalListener.java b/TowerRun/src/de/steamwar/towerrun/listener/GlobalListener.java
index 343bb97a..a47f0d97 100644
--- a/TowerRun/src/de/steamwar/towerrun/listener/GlobalListener.java
+++ b/TowerRun/src/de/steamwar/towerrun/listener/GlobalListener.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/TowerRun/src/de/steamwar/towerrun/listener/IngameListener.java b/TowerRun/src/de/steamwar/towerrun/listener/IngameListener.java
index abb5d9db..d85eafdf 100644
--- a/TowerRun/src/de/steamwar/towerrun/listener/IngameListener.java
+++ b/TowerRun/src/de/steamwar/towerrun/listener/IngameListener.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/TowerRun/src/de/steamwar/towerrun/listener/LobbyListener.java b/TowerRun/src/de/steamwar/towerrun/listener/LobbyListener.java
index 2b89a81c..22b78ba6 100644
--- a/TowerRun/src/de/steamwar/towerrun/listener/LobbyListener.java
+++ b/TowerRun/src/de/steamwar/towerrun/listener/LobbyListener.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/TowerRun/src/de/steamwar/towerrun/listener/NotLobbyListener.java b/TowerRun/src/de/steamwar/towerrun/listener/NotLobbyListener.java
index 752ed521..a604fa43 100644
--- a/TowerRun/src/de/steamwar/towerrun/listener/NotLobbyListener.java
+++ b/TowerRun/src/de/steamwar/towerrun/listener/NotLobbyListener.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/TowerRun/src/de/steamwar/towerrun/state/GameState.java b/TowerRun/src/de/steamwar/towerrun/state/GameState.java
index 46b7e93a..5f8097fe 100644
--- a/TowerRun/src/de/steamwar/towerrun/state/GameState.java
+++ b/TowerRun/src/de/steamwar/towerrun/state/GameState.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/TowerRun/src/de/steamwar/towerrun/state/GameStateBukkitListener.java b/TowerRun/src/de/steamwar/towerrun/state/GameStateBukkitListener.java
index bd259f63..fbd85243 100644
--- a/TowerRun/src/de/steamwar/towerrun/state/GameStateBukkitListener.java
+++ b/TowerRun/src/de/steamwar/towerrun/state/GameStateBukkitListener.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/TowerRun/src/de/steamwar/towerrun/state/GameStateListener.java b/TowerRun/src/de/steamwar/towerrun/state/GameStateListener.java
index d4dcd639..dbd9f70e 100644
--- a/TowerRun/src/de/steamwar/towerrun/state/GameStateListener.java
+++ b/TowerRun/src/de/steamwar/towerrun/state/GameStateListener.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/TowerRun/src/de/steamwar/towerrun/state/GameStateToggleListener.java b/TowerRun/src/de/steamwar/towerrun/state/GameStateToggleListener.java
index c8ba5534..baf983d6 100644
--- a/TowerRun/src/de/steamwar/towerrun/state/GameStateToggleListener.java
+++ b/TowerRun/src/de/steamwar/towerrun/state/GameStateToggleListener.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/TowerRun/src/de/steamwar/towerrun/state/GameStates.java b/TowerRun/src/de/steamwar/towerrun/state/GameStates.java
index 4fe32829..37d62fbc 100644
--- a/TowerRun/src/de/steamwar/towerrun/state/GameStates.java
+++ b/TowerRun/src/de/steamwar/towerrun/state/GameStates.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/TowerRun/src/de/steamwar/towerrun/winconditions/FirstOutsideWincondition.java b/TowerRun/src/de/steamwar/towerrun/winconditions/FirstOutsideWincondition.java
index f2d753fa..b62a99b8 100644
--- a/TowerRun/src/de/steamwar/towerrun/winconditions/FirstOutsideWincondition.java
+++ b/TowerRun/src/de/steamwar/towerrun/winconditions/FirstOutsideWincondition.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/TowerRun/src/de/steamwar/towerrun/winconditions/LastOutsideWincondition.java b/TowerRun/src/de/steamwar/towerrun/winconditions/LastOutsideWincondition.java
index 260ed0fb..d9e25f92 100644
--- a/TowerRun/src/de/steamwar/towerrun/winconditions/LastOutsideWincondition.java
+++ b/TowerRun/src/de/steamwar/towerrun/winconditions/LastOutsideWincondition.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/TowerRun/src/de/steamwar/towerrun/winconditions/LastRemainingWincondition.java b/TowerRun/src/de/steamwar/towerrun/winconditions/LastRemainingWincondition.java
index c66818d1..7cdbe3b4 100644
--- a/TowerRun/src/de/steamwar/towerrun/winconditions/LastRemainingWincondition.java
+++ b/TowerRun/src/de/steamwar/towerrun/winconditions/LastRemainingWincondition.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/TowerRun/src/de/steamwar/towerrun/winconditions/OutsideWincondition.java b/TowerRun/src/de/steamwar/towerrun/winconditions/OutsideWincondition.java
index 9419e7ee..8b241da5 100644
--- a/TowerRun/src/de/steamwar/towerrun/winconditions/OutsideWincondition.java
+++ b/TowerRun/src/de/steamwar/towerrun/winconditions/OutsideWincondition.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/TowerRun/src/de/steamwar/towerrun/winconditions/WinCondition.java b/TowerRun/src/de/steamwar/towerrun/winconditions/WinCondition.java
index 21e0e860..3b5c66cc 100644
--- a/TowerRun/src/de/steamwar/towerrun/winconditions/WinCondition.java
+++ b/TowerRun/src/de/steamwar/towerrun/winconditions/WinCondition.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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
diff --git a/VelocityCore/Dependencies/build.gradle.kts b/VelocityCore/Dependencies/build.gradle.kts
index fab7a7f0..58c068f0 100644
--- a/VelocityCore/Dependencies/build.gradle.kts
+++ b/VelocityCore/Dependencies/build.gradle.kts
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/VelocityCore/Dependencies/src/de/steamwar/discord/Dependencies.java b/VelocityCore/Dependencies/src/de/steamwar/discord/Dependencies.java
index f3b2a243..bb7bd2c3 100644
--- a/VelocityCore/Dependencies/src/de/steamwar/discord/Dependencies.java
+++ b/VelocityCore/Dependencies/src/de/steamwar/discord/Dependencies.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.discord;
diff --git a/VelocityCore/Persistent/build.gradle.kts b/VelocityCore/Persistent/build.gradle.kts
index a65d414a..462fccfd 100644
--- a/VelocityCore/Persistent/build.gradle.kts
+++ b/VelocityCore/Persistent/build.gradle.kts
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/VelocityCore/Persistent/src/de/steamwar/persistent/Arenaserver.java b/VelocityCore/Persistent/src/de/steamwar/persistent/Arenaserver.java
index 450d771a..8431bb9e 100644
--- a/VelocityCore/Persistent/src/de/steamwar/persistent/Arenaserver.java
+++ b/VelocityCore/Persistent/src/de/steamwar/persistent/Arenaserver.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/VelocityCore/Persistent/src/de/steamwar/persistent/Bauserver.java b/VelocityCore/Persistent/src/de/steamwar/persistent/Bauserver.java
index 85bf581a..ccc68e23 100644
--- a/VelocityCore/Persistent/src/de/steamwar/persistent/Bauserver.java
+++ b/VelocityCore/Persistent/src/de/steamwar/persistent/Bauserver.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/VelocityCore/Persistent/src/de/steamwar/persistent/Builderserver.java b/VelocityCore/Persistent/src/de/steamwar/persistent/Builderserver.java
index 4a01c7d4..021aed0e 100644
--- a/VelocityCore/Persistent/src/de/steamwar/persistent/Builderserver.java
+++ b/VelocityCore/Persistent/src/de/steamwar/persistent/Builderserver.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/VelocityCore/Persistent/src/de/steamwar/persistent/Persistent.java b/VelocityCore/Persistent/src/de/steamwar/persistent/Persistent.java
index 52f764f2..71139e8e 100644
--- a/VelocityCore/Persistent/src/de/steamwar/persistent/Persistent.java
+++ b/VelocityCore/Persistent/src/de/steamwar/persistent/Persistent.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/VelocityCore/Persistent/src/de/steamwar/persistent/Reflection.java b/VelocityCore/Persistent/src/de/steamwar/persistent/Reflection.java
index 416a3694..dcbac732 100644
--- a/VelocityCore/Persistent/src/de/steamwar/persistent/Reflection.java
+++ b/VelocityCore/Persistent/src/de/steamwar/persistent/Reflection.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/VelocityCore/Persistent/src/de/steamwar/persistent/ReloadablePlugin.java b/VelocityCore/Persistent/src/de/steamwar/persistent/ReloadablePlugin.java
index 95bfc4b9..9deeb653 100644
--- a/VelocityCore/Persistent/src/de/steamwar/persistent/ReloadablePlugin.java
+++ b/VelocityCore/Persistent/src/de/steamwar/persistent/ReloadablePlugin.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/VelocityCore/Persistent/src/de/steamwar/persistent/Storage.java b/VelocityCore/Persistent/src/de/steamwar/persistent/Storage.java
index 9128d5a5..1bc6bd5d 100644
--- a/VelocityCore/Persistent/src/de/steamwar/persistent/Storage.java
+++ b/VelocityCore/Persistent/src/de/steamwar/persistent/Storage.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/VelocityCore/Persistent/src/de/steamwar/persistent/Subserver.java b/VelocityCore/Persistent/src/de/steamwar/persistent/Subserver.java
index e63b2806..31944c77 100644
--- a/VelocityCore/Persistent/src/de/steamwar/persistent/Subserver.java
+++ b/VelocityCore/Persistent/src/de/steamwar/persistent/Subserver.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/VelocityCore/build.gradle.kts b/VelocityCore/build.gradle.kts
index fd6358f1..718b53f0 100644
--- a/VelocityCore/build.gradle.kts
+++ b/VelocityCore/build.gradle.kts
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/VelocityCore/src/de/steamwar/command/SWCommand.java b/VelocityCore/src/de/steamwar/command/SWCommand.java
index 52845d2e..dc1050d3 100644
--- a/VelocityCore/src/de/steamwar/command/SWCommand.java
+++ b/VelocityCore/src/de/steamwar/command/SWCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.command;
diff --git a/VelocityCore/src/de/steamwar/command/TypeMapper.java b/VelocityCore/src/de/steamwar/command/TypeMapper.java
index 5b592260..8cf5e371 100644
--- a/VelocityCore/src/de/steamwar/command/TypeMapper.java
+++ b/VelocityCore/src/de/steamwar/command/TypeMapper.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.command;
diff --git a/VelocityCore/src/de/steamwar/command/TypeUtils.java b/VelocityCore/src/de/steamwar/command/TypeUtils.java
index db22ec99..468d527d 100644
--- a/VelocityCore/src/de/steamwar/command/TypeUtils.java
+++ b/VelocityCore/src/de/steamwar/command/TypeUtils.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.command;
diff --git a/VelocityCore/src/de/steamwar/command/TypeValidator.java b/VelocityCore/src/de/steamwar/command/TypeValidator.java
index 2986b7da..41391f43 100644
--- a/VelocityCore/src/de/steamwar/command/TypeValidator.java
+++ b/VelocityCore/src/de/steamwar/command/TypeValidator.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.command;
diff --git a/VelocityCore/src/de/steamwar/messages/BungeeCore.properties b/VelocityCore/src/de/steamwar/messages/BungeeCore.properties
index 21a4025a..cdec29b8 100644
--- a/VelocityCore/src/de/steamwar/messages/BungeeCore.properties
+++ b/VelocityCore/src/de/steamwar/messages/BungeeCore.properties
@@ -1,7 +1,7 @@
 #
 #   This file is a part of the SteamWar software.
 #
-#   Copyright (C) 2024 SteamWar.de-Serverteam
+#   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
diff --git a/VelocityCore/src/de/steamwar/messages/BungeeCore_de.properties b/VelocityCore/src/de/steamwar/messages/BungeeCore_de.properties
index aa2475f5..ba79c219 100644
--- a/VelocityCore/src/de/steamwar/messages/BungeeCore_de.properties
+++ b/VelocityCore/src/de/steamwar/messages/BungeeCore_de.properties
@@ -1,7 +1,7 @@
 #
 #   This file is a part of the SteamWar software.
 #
-#   Copyright (C) 2024 SteamWar.de-Serverteam
+#   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
diff --git a/VelocityCore/src/de/steamwar/messages/Chatter.java b/VelocityCore/src/de/steamwar/messages/Chatter.java
index 514e9b0a..2494287a 100644
--- a/VelocityCore/src/de/steamwar/messages/Chatter.java
+++ b/VelocityCore/src/de/steamwar/messages/Chatter.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2022  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/>.
-*/
+ *   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.messages;
 
diff --git a/VelocityCore/src/de/steamwar/messages/ChatterGroup.java b/VelocityCore/src/de/steamwar/messages/ChatterGroup.java
index c94975d6..9ca011de 100644
--- a/VelocityCore/src/de/steamwar/messages/ChatterGroup.java
+++ b/VelocityCore/src/de/steamwar/messages/ChatterGroup.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/VelocityCore/src/de/steamwar/messages/Message.java b/VelocityCore/src/de/steamwar/messages/Message.java
index 3394c274..4c75d53f 100644
--- a/VelocityCore/src/de/steamwar/messages/Message.java
+++ b/VelocityCore/src/de/steamwar/messages/Message.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/VelocityCore/src/de/steamwar/messages/PlayerChatter.java b/VelocityCore/src/de/steamwar/messages/PlayerChatter.java
index 6febd74f..2790a925 100644
--- a/VelocityCore/src/de/steamwar/messages/PlayerChatter.java
+++ b/VelocityCore/src/de/steamwar/messages/PlayerChatter.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/VelocityCore/src/de/steamwar/messages/SteamwarResourceBundle.java b/VelocityCore/src/de/steamwar/messages/SteamwarResourceBundle.java
index ffb236f4..db81cf5f 100644
--- a/VelocityCore/src/de/steamwar/messages/SteamwarResourceBundle.java
+++ b/VelocityCore/src/de/steamwar/messages/SteamwarResourceBundle.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2022  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/>.
-*/
+ *   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.messages;
 
diff --git a/VelocityCore/src/de/steamwar/sql/SQLConfigImpl.java b/VelocityCore/src/de/steamwar/sql/SQLConfigImpl.java
index 199afe9f..dc01e0aa 100644
--- a/VelocityCore/src/de/steamwar/sql/SQLConfigImpl.java
+++ b/VelocityCore/src/de/steamwar/sql/SQLConfigImpl.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/VelocityCore/src/de/steamwar/sql/SQLWrapperImpl.java b/VelocityCore/src/de/steamwar/sql/SQLWrapperImpl.java
index 1ac26bd8..60212547 100644
--- a/VelocityCore/src/de/steamwar/sql/SQLWrapperImpl.java
+++ b/VelocityCore/src/de/steamwar/sql/SQLWrapperImpl.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/VelocityCore/src/de/steamwar/velocitycore/ArenaMode.java b/VelocityCore/src/de/steamwar/velocitycore/ArenaMode.java
index 4490c172..2db21ea9 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/ArenaMode.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/ArenaMode.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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;
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/Broadcaster.java b/VelocityCore/src/de/steamwar/velocitycore/Broadcaster.java
index 56030635..66ea6945 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/Broadcaster.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/Broadcaster.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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;
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/Config.java b/VelocityCore/src/de/steamwar/velocitycore/Config.java
index 40de2791..276c8310 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/Config.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/Config.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/VelocityCore/src/de/steamwar/velocitycore/ErrorLogger.java b/VelocityCore/src/de/steamwar/velocitycore/ErrorLogger.java
index f5b79af8..204e4917 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/ErrorLogger.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/ErrorLogger.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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;
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/EventStarter.java b/VelocityCore/src/de/steamwar/velocitycore/EventStarter.java
index 6401ec30..b3419a1c 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/EventStarter.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/EventStarter.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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;
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/GameModeConfig.java b/VelocityCore/src/de/steamwar/velocitycore/GameModeConfig.java
index 208f6df3..fdb7c6a2 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/GameModeConfig.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/GameModeConfig.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/VelocityCore/src/de/steamwar/velocitycore/Node.java b/VelocityCore/src/de/steamwar/velocitycore/Node.java
index 308d9938..37381235 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/Node.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/Node.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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;
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/ServerStarter.java b/VelocityCore/src/de/steamwar/velocitycore/ServerStarter.java
index db199b97..d48d2c2b 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/ServerStarter.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/ServerStarter.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/VelocityCore/src/de/steamwar/velocitycore/ServerVersion.java b/VelocityCore/src/de/steamwar/velocitycore/ServerVersion.java
index 42c02fe5..86068c5b 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/ServerVersion.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/ServerVersion.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/VelocityCore/src/de/steamwar/velocitycore/SubserverSystem.java b/VelocityCore/src/de/steamwar/velocitycore/SubserverSystem.java
index 68bee31d..8428a567 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/SubserverSystem.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/SubserverSystem.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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;
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/VelocityCore.java b/VelocityCore/src/de/steamwar/velocitycore/VelocityCore.java
index 86a11106..14571c26 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/VelocityCore.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/VelocityCore.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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;
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/AlertCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/AlertCommand.java
index b1fed2f1..087afe7c 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/AlertCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/AlertCommand.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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;
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/ArenaCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/ArenaCommand.java
index c7d19a39..c02b90e5 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/ArenaCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/ArenaCommand.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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;
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/BauCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/BauCommand.java
index 48192baa..183e5414 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/BauCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/BauCommand.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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;
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/BugCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/BugCommand.java
index 3a89640c..f7d51bc3 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/BugCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/BugCommand.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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;
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/BuilderCloudCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/BuilderCloudCommand.java
index 766268f5..6d7a916b 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/BuilderCloudCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/BuilderCloudCommand.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/ChallengeCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/ChallengeCommand.java
index 9e5fc81c..10e13c9c 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/ChallengeCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/ChallengeCommand.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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;
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/CheckCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/CheckCommand.java
index 864187f4..2effbdcf 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/CheckCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/CheckCommand.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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;
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/DevCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/DevCommand.java
index 077c663f..320b5064 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/DevCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/DevCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/EventCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/EventCommand.java
index 27d85a86..04755885 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/EventCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/EventCommand.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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;
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/EventRescheduleCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/EventRescheduleCommand.java
index 857a5060..4a737cfc 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/EventRescheduleCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/EventRescheduleCommand.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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;
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/EventreloadCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/EventreloadCommand.java
index 64e350b9..9aefc3a8 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/EventreloadCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/EventreloadCommand.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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;
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/FightCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/FightCommand.java
index 39d9beea..95be0879 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/FightCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/FightCommand.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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;
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/GDPRQuery.java b/VelocityCore/src/de/steamwar/velocitycore/commands/GDPRQuery.java
index 32c9b1ec..d5756890 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/GDPRQuery.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/GDPRQuery.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/HelpCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/HelpCommand.java
index bdcfa73f..00243eae 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/HelpCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/HelpCommand.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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;
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/HistoricCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/HistoricCommand.java
index dee2cb40..d45f80f3 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/HistoricCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/HistoricCommand.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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;
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/IgnoreCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/IgnoreCommand.java
index c6165cd0..7b11a08c 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/IgnoreCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/IgnoreCommand.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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;
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/JoinmeCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/JoinmeCommand.java
index 508b18f1..b0d70616 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/JoinmeCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/JoinmeCommand.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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;
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/KickCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/KickCommand.java
index b0d93bb0..3b6376a6 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/KickCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/KickCommand.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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;
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/ListCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/ListCommand.java
index f57df245..16505ee5 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/ListCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/ListCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/LocalCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/LocalCommand.java
index 4ede8e76..86a971aa 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/LocalCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/LocalCommand.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2022  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/>.
-*/
+ *   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;
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/ModCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/ModCommand.java
index 220bac58..3978370a 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/ModCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/ModCommand.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2023  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/>.
-*/
+ *   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;
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/MsgCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/MsgCommand.java
index 6491a27a..5e91d4fa 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/MsgCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/MsgCommand.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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;
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/PingCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/PingCommand.java
index e3c8c8e2..91ca39bf 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/PingCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/PingCommand.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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;
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/PlaytimeCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/PlaytimeCommand.java
index 8b13d44a..1448217e 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/PlaytimeCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/PlaytimeCommand.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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;
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/PollCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/PollCommand.java
index 7cd654b9..58b9c4ef 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/PollCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/PollCommand.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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;
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/PollresultCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/PollresultCommand.java
index c47d1e53..6e685ef3 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/PollresultCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/PollresultCommand.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
+ *   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;
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/PunishmentCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/PunishmentCommand.java
index 4932de02..c209c210 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/PunishmentCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/PunishmentCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/RCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/RCommand.java
index 5430b313..ae86f249 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/RCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/RCommand.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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;
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/RankCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/RankCommand.java
index 45123e18..fa072871 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/RankCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/RankCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/ReplayCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/ReplayCommand.java
index 6d825e2a..b817a0fe 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/ReplayCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/ReplayCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/RulesCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/RulesCommand.java
index 8128eaff..2a60ab18 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/RulesCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/RulesCommand.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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;
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/SendCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/SendCommand.java
index 78d27b4d..57fd836d 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/SendCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/SendCommand.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/ServerSwitchCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/ServerSwitchCommand.java
index 3586f150..6778c563 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/ServerSwitchCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/ServerSwitchCommand.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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;
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/ServerTeamchatCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/ServerTeamchatCommand.java
index 6dc9ea92..7dbede8b 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/ServerTeamchatCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/ServerTeamchatCommand.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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;
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/SetLocaleCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/SetLocaleCommand.java
index 61abeca1..34eefff7 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/SetLocaleCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/SetLocaleCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/StatCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/StatCommand.java
index af545358..8b8f4526 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/StatCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/StatCommand.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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;
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/StreamingCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/StreamingCommand.java
index 04ddd6e2..2e8f2078 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/StreamingCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/StreamingCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/TeamCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/TeamCommand.java
index d95ed3b5..59ba800d 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/TeamCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/TeamCommand.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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;
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/TeamchatCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/TeamchatCommand.java
index ee74d5d6..38f63ce2 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/TeamchatCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/TeamchatCommand.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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;
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/TpCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/TpCommand.java
index 9a270dde..ea42b271 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/TpCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/TpCommand.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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;
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/TypeMappers.java b/VelocityCore/src/de/steamwar/velocitycore/commands/TypeMappers.java
index e2c1176a..8c2d6c66 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/TypeMappers.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/TypeMappers.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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;
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/UnIgnoreCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/UnIgnoreCommand.java
index 30952834..02535d38 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/UnIgnoreCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/UnIgnoreCommand.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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;
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/VerifyCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/VerifyCommand.java
index cf8ba5bd..9624123b 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/VerifyCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/VerifyCommand.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
+ *   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;
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/WebpasswordCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/WebpasswordCommand.java
index 8b9632b8..f4c639a3 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/WebpasswordCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/WebpasswordCommand.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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;
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/WhoisCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/WhoisCommand.java
index a76c8ac7..24b7fd12 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/WhoisCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/WhoisCommand.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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;
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/discord/DiscordBot.java b/VelocityCore/src/de/steamwar/velocitycore/discord/DiscordBot.java
index ae9decbd..40dee4b1 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/discord/DiscordBot.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/discord/DiscordBot.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
+ *   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.discord;
diff --git a/VelocityCore/src/de/steamwar/velocitycore/discord/DiscordConfig.java b/VelocityCore/src/de/steamwar/velocitycore/discord/DiscordConfig.java
index 7f201abb..54397a20 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/discord/DiscordConfig.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/discord/DiscordConfig.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/VelocityCore/src/de/steamwar/velocitycore/discord/DiscordTicketType.java b/VelocityCore/src/de/steamwar/velocitycore/discord/DiscordTicketType.java
index f9838e34..6d3921dc 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/discord/DiscordTicketType.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/discord/DiscordTicketType.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/VelocityCore/src/de/steamwar/velocitycore/discord/VacationCommand.java b/VelocityCore/src/de/steamwar/velocitycore/discord/VacationCommand.java
index 754187df..3d1bd82c 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/discord/VacationCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/discord/VacationCommand.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.discord;
diff --git a/VelocityCore/src/de/steamwar/velocitycore/discord/channels/ChecklistChannel.java b/VelocityCore/src/de/steamwar/velocitycore/discord/channels/ChecklistChannel.java
index 18bbff4a..ead8845c 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/discord/channels/ChecklistChannel.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/discord/channels/ChecklistChannel.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.discord.channels;
diff --git a/VelocityCore/src/de/steamwar/velocitycore/discord/channels/CouncilChannel.java b/VelocityCore/src/de/steamwar/velocitycore/discord/channels/CouncilChannel.java
index e5129f24..cb46e718 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/discord/channels/CouncilChannel.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/discord/channels/CouncilChannel.java
@@ -1,20 +1,20 @@
 /*
- *     This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- *     Copyright (C) 2025  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.discord.channels;
diff --git a/VelocityCore/src/de/steamwar/velocitycore/discord/channels/DiscordChannel.java b/VelocityCore/src/de/steamwar/velocitycore/discord/channels/DiscordChannel.java
index 49b5d4f2..f5c25f2a 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/discord/channels/DiscordChannel.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/discord/channels/DiscordChannel.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/VelocityCore/src/de/steamwar/velocitycore/discord/channels/DiscordChatRoom.java b/VelocityCore/src/de/steamwar/velocitycore/discord/channels/DiscordChatRoom.java
index 2db981f1..5360cfe7 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/discord/channels/DiscordChatRoom.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/discord/channels/DiscordChatRoom.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/VelocityCore/src/de/steamwar/velocitycore/discord/channels/EventChannel.java b/VelocityCore/src/de/steamwar/velocitycore/discord/channels/EventChannel.java
index 5caf0446..a7f398b9 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/discord/channels/EventChannel.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/discord/channels/EventChannel.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.discord.channels;
diff --git a/VelocityCore/src/de/steamwar/velocitycore/discord/channels/InteractionReply.java b/VelocityCore/src/de/steamwar/velocitycore/discord/channels/InteractionReply.java
index 3d805f9b..b015ac5d 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/discord/channels/InteractionReply.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/discord/channels/InteractionReply.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/VelocityCore/src/de/steamwar/velocitycore/discord/channels/StaticMessageChannel.java b/VelocityCore/src/de/steamwar/velocitycore/discord/channels/StaticMessageChannel.java
index 9ab2920e..178acbcd 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/discord/channels/StaticMessageChannel.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/discord/channels/StaticMessageChannel.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/VelocityCore/src/de/steamwar/velocitycore/discord/listeners/ChannelListener.java b/VelocityCore/src/de/steamwar/velocitycore/discord/listeners/ChannelListener.java
index bfecf313..d2913ee9 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/discord/listeners/ChannelListener.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/discord/listeners/ChannelListener.java
@@ -1,19 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
- * <p>
- * Copyright (C) 2021  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.
- * <p>
- * 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.
- * <p>
- * 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/>.
+ *   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.discord.listeners;
diff --git a/VelocityCore/src/de/steamwar/velocitycore/discord/listeners/DiscordSchemUpload.java b/VelocityCore/src/de/steamwar/velocitycore/discord/listeners/DiscordSchemUpload.java
index f798d3ce..c3c621fb 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/discord/listeners/DiscordSchemUpload.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/discord/listeners/DiscordSchemUpload.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/VelocityCore/src/de/steamwar/velocitycore/discord/listeners/DiscordTeamEvent.java b/VelocityCore/src/de/steamwar/velocitycore/discord/listeners/DiscordTeamEvent.java
index 8fd644a3..146c06d0 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/discord/listeners/DiscordTeamEvent.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/discord/listeners/DiscordTeamEvent.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
+ *   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.discord.listeners;
diff --git a/VelocityCore/src/de/steamwar/velocitycore/discord/listeners/DiscordTicketHandler.java b/VelocityCore/src/de/steamwar/velocitycore/discord/listeners/DiscordTicketHandler.java
index 5c5e708b..1e2ce3aa 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/discord/listeners/DiscordTicketHandler.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/discord/listeners/DiscordTicketHandler.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
+ *   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.discord.listeners;
diff --git a/VelocityCore/src/de/steamwar/velocitycore/discord/util/AuthManager.java b/VelocityCore/src/de/steamwar/velocitycore/discord/util/AuthManager.java
index 3da3971e..afe88073 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/discord/util/AuthManager.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/discord/util/AuthManager.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/VelocityCore/src/de/steamwar/velocitycore/discord/util/DiscordAlert.java b/VelocityCore/src/de/steamwar/velocitycore/discord/util/DiscordAlert.java
index d5aafa5c..4025461a 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/discord/util/DiscordAlert.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/discord/util/DiscordAlert.java
@@ -1,20 +1,20 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
+ *   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.discord.util;
diff --git a/VelocityCore/src/de/steamwar/velocitycore/discord/util/DiscordRanks.java b/VelocityCore/src/de/steamwar/velocitycore/discord/util/DiscordRanks.java
index d96e9fe8..7ceec7b5 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/discord/util/DiscordRanks.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/discord/util/DiscordRanks.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.discord.util;
diff --git a/VelocityCore/src/de/steamwar/velocitycore/inventory/InvCallback.java b/VelocityCore/src/de/steamwar/velocitycore/inventory/InvCallback.java
index 1e034313..a99ab143 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/inventory/InvCallback.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/inventory/InvCallback.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.inventory;
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/inventory/SWInventory.java b/VelocityCore/src/de/steamwar/velocitycore/inventory/SWInventory.java
index 36034011..faf34d2f 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/inventory/SWInventory.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/inventory/SWInventory.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.inventory;
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/inventory/SWItem.java b/VelocityCore/src/de/steamwar/velocitycore/inventory/SWItem.java
index ec3b6f40..48e80e45 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/inventory/SWItem.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/inventory/SWItem.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.inventory;
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/inventory/SWListInv.java b/VelocityCore/src/de/steamwar/velocitycore/inventory/SWListInv.java
index 44f3deb6..23a305d5 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/inventory/SWListInv.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/inventory/SWListInv.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.inventory;
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/inventory/SWStreamInv.java b/VelocityCore/src/de/steamwar/velocitycore/inventory/SWStreamInv.java
index 2d82e352..546fddac 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/inventory/SWStreamInv.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/inventory/SWStreamInv.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/VelocityCore/src/de/steamwar/velocitycore/listeners/BanListener.java b/VelocityCore/src/de/steamwar/velocitycore/listeners/BanListener.java
index 0ac6423c..b1207a0f 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/listeners/BanListener.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/listeners/BanListener.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.listeners;
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/listeners/BasicListener.java b/VelocityCore/src/de/steamwar/velocitycore/listeners/BasicListener.java
index 34e2c766..a14c4c74 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/listeners/BasicListener.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/listeners/BasicListener.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.listeners;
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/listeners/ChatListener.java b/VelocityCore/src/de/steamwar/velocitycore/listeners/ChatListener.java
index 673733b9..407041f2 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/listeners/ChatListener.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/listeners/ChatListener.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2022  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/>.
-*/
+/*
+ *   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.listeners;
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/listeners/CheckListener.java b/VelocityCore/src/de/steamwar/velocitycore/listeners/CheckListener.java
index 0c3000c1..b32e6967 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/listeners/CheckListener.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/listeners/CheckListener.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.listeners;
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/listeners/ConnectionListener.java b/VelocityCore/src/de/steamwar/velocitycore/listeners/ConnectionListener.java
index 1cfd8a49..09a095e0 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/listeners/ConnectionListener.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/listeners/ConnectionListener.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.listeners;
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/listeners/EventModeListener.java b/VelocityCore/src/de/steamwar/velocitycore/listeners/EventModeListener.java
index ecc977ed..3ddbd94e 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/listeners/EventModeListener.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/listeners/EventModeListener.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/VelocityCore/src/de/steamwar/velocitycore/listeners/IPSanitizer.java b/VelocityCore/src/de/steamwar/velocitycore/listeners/IPSanitizer.java
index ca99fbed..65b3c04f 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/listeners/IPSanitizer.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/listeners/IPSanitizer.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.listeners;
diff --git a/VelocityCore/src/de/steamwar/velocitycore/listeners/PluginMessage.java b/VelocityCore/src/de/steamwar/velocitycore/listeners/PluginMessage.java
index 8b37cf8b..85dfa01e 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/listeners/PluginMessage.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/listeners/PluginMessage.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/VelocityCore/src/de/steamwar/velocitycore/listeners/PollSystem.java b/VelocityCore/src/de/steamwar/velocitycore/listeners/PollSystem.java
index c0278699..94910720 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/listeners/PollSystem.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/listeners/PollSystem.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.listeners;
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/listeners/SessionManager.java b/VelocityCore/src/de/steamwar/velocitycore/listeners/SessionManager.java
index 30895cea..c98bd62a 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/listeners/SessionManager.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/listeners/SessionManager.java
@@ -1,21 +1,21 @@
-/* 
-    This file is a part of the SteamWar software.
-    
-    Copyright (C) 2020  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/>.
-*/
+/*
+ *   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.listeners;
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/listeners/SettingsChangedListener.java b/VelocityCore/src/de/steamwar/velocitycore/listeners/SettingsChangedListener.java
index 3cd7ae77..49367da6 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/listeners/SettingsChangedListener.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/listeners/SettingsChangedListener.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.listeners;
diff --git a/VelocityCore/src/de/steamwar/velocitycore/listeners/TexturePackSystem.java b/VelocityCore/src/de/steamwar/velocitycore/listeners/TexturePackSystem.java
index 65a1a621..56b58bff 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/listeners/TexturePackSystem.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/listeners/TexturePackSystem.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.listeners;
diff --git a/VelocityCore/src/de/steamwar/velocitycore/listeners/VersionAnnouncer.java b/VelocityCore/src/de/steamwar/velocitycore/listeners/VersionAnnouncer.java
index 7393358c..9f5007ac 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/listeners/VersionAnnouncer.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/listeners/VersionAnnouncer.java
@@ -1,20 +1,20 @@
 /*
- *     This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- *     Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.listeners;
diff --git a/VelocityCore/src/de/steamwar/velocitycore/mods/Alpine.java b/VelocityCore/src/de/steamwar/velocitycore/mods/Alpine.java
index 82271dc9..c7b1f2d6 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/mods/Alpine.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/mods/Alpine.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/VelocityCore/src/de/steamwar/velocitycore/mods/Badlion.java b/VelocityCore/src/de/steamwar/velocitycore/mods/Badlion.java
index cb26c30b..0ce40a13 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/mods/Badlion.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/mods/Badlion.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/VelocityCore/src/de/steamwar/velocitycore/mods/Controlify.java b/VelocityCore/src/de/steamwar/velocitycore/mods/Controlify.java
index 56b7f224..d278ffee 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/mods/Controlify.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/mods/Controlify.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/VelocityCore/src/de/steamwar/velocitycore/mods/FML.java b/VelocityCore/src/de/steamwar/velocitycore/mods/FML.java
index 13d3497a..91d0065d 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/mods/FML.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/mods/FML.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/VelocityCore/src/de/steamwar/velocitycore/mods/FML2.java b/VelocityCore/src/de/steamwar/velocitycore/mods/FML2.java
index f2b4bc8c..954febbb 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/mods/FML2.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/mods/FML2.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/VelocityCore/src/de/steamwar/velocitycore/mods/FabricModSender.java b/VelocityCore/src/de/steamwar/velocitycore/mods/FabricModSender.java
index 209ad423..e8b3e212 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/mods/FabricModSender.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/mods/FabricModSender.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/VelocityCore/src/de/steamwar/velocitycore/mods/Feather.java b/VelocityCore/src/de/steamwar/velocitycore/mods/Feather.java
index 34fb7f92..7b110769 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/mods/Feather.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/mods/Feather.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/VelocityCore/src/de/steamwar/velocitycore/mods/Hostname.java b/VelocityCore/src/de/steamwar/velocitycore/mods/Hostname.java
index a7c00d9b..5fac27f0 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/mods/Hostname.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/mods/Hostname.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/VelocityCore/src/de/steamwar/velocitycore/mods/LabyMod.java b/VelocityCore/src/de/steamwar/velocitycore/mods/LabyMod.java
index 1db3c085..5e7d441d 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/mods/LabyMod.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/mods/LabyMod.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/VelocityCore/src/de/steamwar/velocitycore/mods/Lunar.java b/VelocityCore/src/de/steamwar/velocitycore/mods/Lunar.java
index ad823364..254354bc 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/mods/Lunar.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/mods/Lunar.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/VelocityCore/src/de/steamwar/velocitycore/mods/ModUtils.java b/VelocityCore/src/de/steamwar/velocitycore/mods/ModUtils.java
index c23434ec..38ab4f78 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/mods/ModUtils.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/mods/ModUtils.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/VelocityCore/src/de/steamwar/velocitycore/mods/ReplayMod.java b/VelocityCore/src/de/steamwar/velocitycore/mods/ReplayMod.java
index 4e08ac8b..5af60178 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/mods/ReplayMod.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/mods/ReplayMod.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/VelocityCore/src/de/steamwar/velocitycore/mods/Schematica.java b/VelocityCore/src/de/steamwar/velocitycore/mods/Schematica.java
index caac9a27..7cba949b 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/mods/Schematica.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/mods/Schematica.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/VelocityCore/src/de/steamwar/velocitycore/mods/WorldDownloader.java b/VelocityCore/src/de/steamwar/velocitycore/mods/WorldDownloader.java
index 32a90eac..5d5ea20f 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/mods/WorldDownloader.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/mods/WorldDownloader.java
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024  SteamWar.de-Serverteam
+ *   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
diff --git a/VelocityCore/src/de/steamwar/velocitycore/network/NetworkSender.java b/VelocityCore/src/de/steamwar/velocitycore/network/NetworkSender.java
index 8f0fd588..12e343b4 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/network/NetworkSender.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/network/NetworkSender.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.network;
diff --git a/VelocityCore/src/de/steamwar/velocitycore/network/ServerMetaInfo.java b/VelocityCore/src/de/steamwar/velocitycore/network/ServerMetaInfo.java
index 9b4aeeae..b68999d1 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/network/ServerMetaInfo.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/network/ServerMetaInfo.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.network;
diff --git a/VelocityCore/src/de/steamwar/velocitycore/network/handlers/EloPlayerHandler.java b/VelocityCore/src/de/steamwar/velocitycore/network/handlers/EloPlayerHandler.java
index 8915cb42..f3d4268e 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/network/handlers/EloPlayerHandler.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/network/handlers/EloPlayerHandler.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.network.handlers;
diff --git a/VelocityCore/src/de/steamwar/velocitycore/network/handlers/EloSchemHandler.java b/VelocityCore/src/de/steamwar/velocitycore/network/handlers/EloSchemHandler.java
index eec033e1..1c718c03 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/network/handlers/EloSchemHandler.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/network/handlers/EloSchemHandler.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.network.handlers;
diff --git a/VelocityCore/src/de/steamwar/velocitycore/network/handlers/ExecuteCommandHandler.java b/VelocityCore/src/de/steamwar/velocitycore/network/handlers/ExecuteCommandHandler.java
index 0f79d12e..254e2e23 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/network/handlers/ExecuteCommandHandler.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/network/handlers/ExecuteCommandHandler.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2021  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/>.
-*/
+ *   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.network.handlers;
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/network/handlers/FightInfoHandler.java b/VelocityCore/src/de/steamwar/velocitycore/network/handlers/FightInfoHandler.java
index 9d7a2067..784ba7bf 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/network/handlers/FightInfoHandler.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/network/handlers/FightInfoHandler.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.network.handlers;
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/network/handlers/ImALobbyHandler.java b/VelocityCore/src/de/steamwar/velocitycore/network/handlers/ImALobbyHandler.java
index b4eb48f1..504bb8b8 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/network/handlers/ImALobbyHandler.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/network/handlers/ImALobbyHandler.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.network.handlers;
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/network/handlers/InventoryCallbackHandler.java b/VelocityCore/src/de/steamwar/velocitycore/network/handlers/InventoryCallbackHandler.java
index e8f9894b..35454e28 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/network/handlers/InventoryCallbackHandler.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/network/handlers/InventoryCallbackHandler.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.network.handlers;
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/network/handlers/PlayerSkinHandler.java b/VelocityCore/src/de/steamwar/velocitycore/network/handlers/PlayerSkinHandler.java
index 0293545c..0808458c 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/network/handlers/PlayerSkinHandler.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/network/handlers/PlayerSkinHandler.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.network.handlers;
diff --git a/VelocityCore/src/de/steamwar/velocitycore/network/handlers/PrepareSchemHandler.java b/VelocityCore/src/de/steamwar/velocitycore/network/handlers/PrepareSchemHandler.java
index 4a90f5ca..790d691b 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/network/handlers/PrepareSchemHandler.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/network/handlers/PrepareSchemHandler.java
@@ -1,21 +1,21 @@
 /*
-    This file is a part of the SteamWar software.
-
-    Copyright (C) 2020  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/>.
-*/
+ *   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.network.handlers;
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/tablist/Tablist.java b/VelocityCore/src/de/steamwar/velocitycore/tablist/Tablist.java
index 6afb69c7..125e0388 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/tablist/Tablist.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/tablist/Tablist.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.tablist;
diff --git a/VelocityCore/src/de/steamwar/velocitycore/tablist/TablistBuild.java b/VelocityCore/src/de/steamwar/velocitycore/tablist/TablistBuild.java
index 6fdd8f4c..4aa435fa 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/tablist/TablistBuild.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/tablist/TablistBuild.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.tablist;
diff --git a/VelocityCore/src/de/steamwar/velocitycore/tablist/TablistGroup.java b/VelocityCore/src/de/steamwar/velocitycore/tablist/TablistGroup.java
index 2f39f023..5069bb0b 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/tablist/TablistGroup.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/tablist/TablistGroup.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.tablist;
diff --git a/VelocityCore/src/de/steamwar/velocitycore/tablist/TablistManager.java b/VelocityCore/src/de/steamwar/velocitycore/tablist/TablistManager.java
index 2a8c5367..61fdce55 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/tablist/TablistManager.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/tablist/TablistManager.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.tablist;
diff --git a/VelocityCore/src/de/steamwar/velocitycore/tablist/TablistPart.java b/VelocityCore/src/de/steamwar/velocitycore/tablist/TablistPart.java
index f00f663e..d7e32c1f 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/tablist/TablistPart.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/tablist/TablistPart.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.tablist;
diff --git a/VelocityCore/src/de/steamwar/velocitycore/tablist/TablistServer.java b/VelocityCore/src/de/steamwar/velocitycore/tablist/TablistServer.java
index 88ba9a86..ee6a0966 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/tablist/TablistServer.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/tablist/TablistServer.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2022  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.tablist;
diff --git a/VelocityCore/src/de/steamwar/velocitycore/tablist/UpdateTeamsPacket21.java b/VelocityCore/src/de/steamwar/velocitycore/tablist/UpdateTeamsPacket21.java
index 3feab317..89bc521c 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/tablist/UpdateTeamsPacket21.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/tablist/UpdateTeamsPacket21.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2020  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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.tablist;
diff --git a/VelocityCore/src/de/steamwar/velocitycore/util/BauLock.java b/VelocityCore/src/de/steamwar/velocitycore/util/BauLock.java
index 7f95599b..41828c81 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/util/BauLock.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/util/BauLock.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 package de.steamwar.velocitycore.util;
diff --git a/VelocityCore/src/de/steamwar/velocitycore/util/BauLockState.java b/VelocityCore/src/de/steamwar/velocitycore/util/BauLockState.java
index c6b8af4f..866c4de2 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/util/BauLockState.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/util/BauLockState.java
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2023  SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 package de.steamwar.velocitycore.util;
diff --git a/WebsiteBackend/build.gradle.kts b/WebsiteBackend/build.gradle.kts
index d58a5142..31db44c0 100644
--- a/WebsiteBackend/build.gradle.kts
+++ b/WebsiteBackend/build.gradle.kts
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/WebsiteBackend/src/de/steamwar/Application.kt b/WebsiteBackend/src/de/steamwar/Application.kt
index 08cb7dcb..adac9a6a 100644
--- a/WebsiteBackend/src/de/steamwar/Application.kt
+++ b/WebsiteBackend/src/de/steamwar/Application.kt
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/WebsiteBackend/src/de/steamwar/data/Paths.kt b/WebsiteBackend/src/de/steamwar/data/Paths.kt
index 145f958f..a8f25a38 100644
--- a/WebsiteBackend/src/de/steamwar/data/Paths.kt
+++ b/WebsiteBackend/src/de/steamwar/data/Paths.kt
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/WebsiteBackend/src/de/steamwar/data/SkinCache.kt b/WebsiteBackend/src/de/steamwar/data/SkinCache.kt
index a8b056eb..25474c0a 100644
--- a/WebsiteBackend/src/de/steamwar/data/SkinCache.kt
+++ b/WebsiteBackend/src/de/steamwar/data/SkinCache.kt
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/WebsiteBackend/src/de/steamwar/plugins/Auth.kt b/WebsiteBackend/src/de/steamwar/plugins/Auth.kt
index eeca85ee..593473b6 100644
--- a/WebsiteBackend/src/de/steamwar/plugins/Auth.kt
+++ b/WebsiteBackend/src/de/steamwar/plugins/Auth.kt
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/WebsiteBackend/src/de/steamwar/plugins/Plugins.kt b/WebsiteBackend/src/de/steamwar/plugins/Plugins.kt
index 95389abe..4001412f 100644
--- a/WebsiteBackend/src/de/steamwar/plugins/Plugins.kt
+++ b/WebsiteBackend/src/de/steamwar/plugins/Plugins.kt
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/WebsiteBackend/src/de/steamwar/plugins/SteamWar.kt b/WebsiteBackend/src/de/steamwar/plugins/SteamWar.kt
index db96a700..672ef329 100644
--- a/WebsiteBackend/src/de/steamwar/plugins/SteamWar.kt
+++ b/WebsiteBackend/src/de/steamwar/plugins/SteamWar.kt
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/WebsiteBackend/src/de/steamwar/routes/Data.kt b/WebsiteBackend/src/de/steamwar/routes/Data.kt
index a7672063..4770e250 100644
--- a/WebsiteBackend/src/de/steamwar/routes/Data.kt
+++ b/WebsiteBackend/src/de/steamwar/routes/Data.kt
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/WebsiteBackend/src/de/steamwar/routes/EventFights.kt b/WebsiteBackend/src/de/steamwar/routes/EventFights.kt
index 2f27b7e4..fc2ab7c0 100644
--- a/WebsiteBackend/src/de/steamwar/routes/EventFights.kt
+++ b/WebsiteBackend/src/de/steamwar/routes/EventFights.kt
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/WebsiteBackend/src/de/steamwar/routes/Events.kt b/WebsiteBackend/src/de/steamwar/routes/Events.kt
index 34e337ce..6b2ba25b 100644
--- a/WebsiteBackend/src/de/steamwar/routes/Events.kt
+++ b/WebsiteBackend/src/de/steamwar/routes/Events.kt
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/WebsiteBackend/src/de/steamwar/routes/Page.kt b/WebsiteBackend/src/de/steamwar/routes/Page.kt
index 2f8de4ee..8b88cf22 100644
--- a/WebsiteBackend/src/de/steamwar/routes/Page.kt
+++ b/WebsiteBackend/src/de/steamwar/routes/Page.kt
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/WebsiteBackend/src/de/steamwar/routes/Routes.kt b/WebsiteBackend/src/de/steamwar/routes/Routes.kt
index f4e883ee..6e07d343 100644
--- a/WebsiteBackend/src/de/steamwar/routes/Routes.kt
+++ b/WebsiteBackend/src/de/steamwar/routes/Routes.kt
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/WebsiteBackend/src/de/steamwar/routes/Schematic.kt b/WebsiteBackend/src/de/steamwar/routes/Schematic.kt
index 7024a657..212d9a26 100644
--- a/WebsiteBackend/src/de/steamwar/routes/Schematic.kt
+++ b/WebsiteBackend/src/de/steamwar/routes/Schematic.kt
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/WebsiteBackend/src/de/steamwar/routes/Stats.kt b/WebsiteBackend/src/de/steamwar/routes/Stats.kt
index 11aa8b97..cda9c4df 100644
--- a/WebsiteBackend/src/de/steamwar/routes/Stats.kt
+++ b/WebsiteBackend/src/de/steamwar/routes/Stats.kt
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/WebsiteBackend/src/de/steamwar/routes/UserPerms.kt b/WebsiteBackend/src/de/steamwar/routes/UserPerms.kt
index c1558787..6ed092a4 100644
--- a/WebsiteBackend/src/de/steamwar/routes/UserPerms.kt
+++ b/WebsiteBackend/src/de/steamwar/routes/UserPerms.kt
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/WebsiteBackend/src/de/steamwar/sql/SQLConfigImpl.kt b/WebsiteBackend/src/de/steamwar/sql/SQLConfigImpl.kt
index 551ed07e..5ad8d471 100644
--- a/WebsiteBackend/src/de/steamwar/sql/SQLConfigImpl.kt
+++ b/WebsiteBackend/src/de/steamwar/sql/SQLConfigImpl.kt
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/WebsiteBackend/src/de/steamwar/sql/SQLWrapperImpl.kt b/WebsiteBackend/src/de/steamwar/sql/SQLWrapperImpl.kt
index 4f2c90e3..1e1b8625 100644
--- a/WebsiteBackend/src/de/steamwar/sql/SQLWrapperImpl.kt
+++ b/WebsiteBackend/src/de/steamwar/sql/SQLWrapperImpl.kt
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/WebsiteBackend/src/de/steamwar/sql/Stats.kt b/WebsiteBackend/src/de/steamwar/sql/Stats.kt
index e248a0df..0080a58b 100644
--- a/WebsiteBackend/src/de/steamwar/sql/Stats.kt
+++ b/WebsiteBackend/src/de/steamwar/sql/Stats.kt
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/WebsiteBackend/src/de/steamwar/util/ServerPing.kt b/WebsiteBackend/src/de/steamwar/util/ServerPing.kt
index fb2b9a6d..cfb9ef1c 100644
--- a/WebsiteBackend/src/de/steamwar/util/ServerPing.kt
+++ b/WebsiteBackend/src/de/steamwar/util/ServerPing.kt
@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2024 SteamWar.de-Serverteam
+ *   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
diff --git a/WebsiteBackend/src/logback.xml b/WebsiteBackend/src/logback.xml
index 287d6348..b1c6292c 100644
--- a/WebsiteBackend/src/logback.xml
+++ b/WebsiteBackend/src/logback.xml
@@ -1,7 +1,7 @@
 <!--
   ~   This file is a part of the SteamWar software.
   ~
-  ~   Copyright (C) 2024 SteamWar.de-Serverteam
+  ~   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
diff --git a/buildSrc/src/steamwar.devserver.gradle b/buildSrc/src/steamwar.devserver.gradle
index 1ebf39a6..06c096f0 100644
--- a/buildSrc/src/steamwar.devserver.gradle
+++ b/buildSrc/src/steamwar.devserver.gradle
@@ -1,23 +1,25 @@
+/*
+ *   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/>.
+ */
+
 import java.security.MessageDigest
 
-/*
- * This file is a part of the SteamWar software.
- *
- * Copyright (C) 2020  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/>.
- */
+
 plugins {
 }
 
diff --git a/gradle.properties b/gradle.properties
index 91f3a83a..e61a399d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,20 +1,20 @@
 #
-# This file is a part of the SteamWar software.
+#   This file is a part of the SteamWar software.
 #
-# Copyright (C) 2025 SteamWar.de-Serverteam
+#   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 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.
+#   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/>.
+#   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/>.
 #
 
 org.gradle.daemon = true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a25691ea..60d97f7f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 #
 #   This file is a part of the SteamWar software.
 #
-#   Copyright (C) 2024 SteamWar.de-Serverteam
+#   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
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 7be8fc09..d2e71175 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,20 +1,20 @@
 /*
- * This file is a part of the SteamWar software.
+ *   This file is a part of the SteamWar software.
  *
- * Copyright (C) 2025 SteamWar.de-Serverteam
+ *   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 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.
+ *   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/>.
+ *   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/>.
  */
 
 import org.apache.tools.ant.taskdefs.condition.Os

From adbd8f7dd4dccac99b0fde908f40e3a472f86f41 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Thu, 23 Oct 2025 20:41:03 +0200
Subject: [PATCH 155/214] Fix FightScoreboard

---
 MissileWars/src/de/steamwar/misslewars/FightScoreboard.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MissileWars/src/de/steamwar/misslewars/FightScoreboard.java b/MissileWars/src/de/steamwar/misslewars/FightScoreboard.java
index 5fdb96ee..29ef61cf 100644
--- a/MissileWars/src/de/steamwar/misslewars/FightScoreboard.java
+++ b/MissileWars/src/de/steamwar/misslewars/FightScoreboard.java
@@ -39,7 +39,7 @@ import java.util.Objects;
  * Modified Version of the Fight-System Scoreboard
  */
 @Linked
-class FightScoreboard implements Listener {
+public class FightScoreboard implements Listener {
 
     public FightScoreboard() {
         Bukkit.getPluginManager().registerEvents(this, MissileWars.getPlugin());

From 55080d0011b0efa3649ead791225964ba2bf386c Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Fri, 24 Oct 2025 08:51:50 +0200
Subject: [PATCH 156/214] Add some of the axiom plugin channels

---
 .../de/steamwar/velocitycore/listeners/PluginMessage.java   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/VelocityCore/src/de/steamwar/velocitycore/listeners/PluginMessage.java b/VelocityCore/src/de/steamwar/velocitycore/listeners/PluginMessage.java
index 85dfa01e..5227ae7d 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/listeners/PluginMessage.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/listeners/PluginMessage.java
@@ -396,7 +396,8 @@ public class PluginMessage extends BasicListener {
                 "axiom:response_chunk_data", "axiom:register_world_properties", "axiom:set_world_property",
                 "axiom:ack_world_properties", "axiom:restrictions", "axiom:marker_data", "axiom:marker_nbt_response",
                 "axiom:custom_blocks", "axiom:editor_warning", "axiom:blueprint_manifest", "axiom:response_blueprint",
-                "axiom:annotation_update", "axiom:redo_handshake", "axiom:register_custom_items"
+                "axiom:annotation_update", "axiom:redo_handshake", "axiom:register_custom_items", "axiom:register_custom_block_v2",
+                "axiom:register_world"
         );
         registerBiDirPassthrough("axiom:handle_big_payload", "axiom:set_editor_views");
         for(String channel : Arrays.asList(
@@ -404,7 +405,8 @@ public class PluginMessage extends BasicListener {
                 "axiom:set_world_property", "axiom:set_block", "axiom:set_hotbar_slot", "axiom:switch_active_hotbar",
                 "axiom:teleport", "axiom:request_chunk_data", "axiom:spawn_entity", "axiom:response_entity_data",
                 "axiom:manipulate_entity", "axiom:delete_entity", "axiom:marker_nbt_request", "axiom:set_buffer",
-                "axiom:allowed_gamemodes", "axiom:ignore_display_entities", "axiom:add_server_heightmap", "axiom:set_no_physical_trigger"
+                "axiom:allowed_gamemodes", "axiom:ignore_display_entities", "axiom:add_server_heightmap", "axiom:set_no_physical_trigger",
+                "axiom:request_blueprint", "axiom:request_entity_data", "axiom:upload_blueprint"
         )) {
             channelRegisterHandlers.put(channel, player -> {});
             registerPassthroughToServer(channel);

From 7e012ade9e81ef1641186798a5459cedb30b9980 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Fri, 24 Oct 2025 08:57:57 +0200
Subject: [PATCH 157/214] Add 'xaeroworldmap:main' to disallow list

---
 .../src/de/steamwar/velocitycore/listeners/PluginMessage.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/VelocityCore/src/de/steamwar/velocitycore/listeners/PluginMessage.java b/VelocityCore/src/de/steamwar/velocitycore/listeners/PluginMessage.java
index 5227ae7d..2b123b8e 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/listeners/PluginMessage.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/listeners/PluginMessage.java
@@ -353,6 +353,7 @@ public class PluginMessage extends BasicListener {
         channelRegisterHandlers.put("openboatutils:settings", player -> send(player, "openboatutils:settings", new byte[] { 0, 0 })); //https://github.com/o7Moon/OpenBoatUtils/wiki/Packets (Reset packet)
         channelRegisterHandlers.put("itemswapper:disable", player -> send(player, "itemswapper:disable", new byte[]{ 0 })); //https://github.com/tr7zw/ItemSwapper/blob/main/src/main/java/dev/tr7zw/itemswapper/packets/DisableModPayload.java
         channelRegisterHandlers.put("xaerominimap:main", player -> player.sendMessage(Component.text("§n§o§m§i§n§i§m§a§p"))); //https://www.curseforge.com/minecraft/mc-mods/xaeros-minimap
+        channelRegisterHandlers.put("xaeroworldmap:main", player -> player.sendMessage(Component.text("§n§o§m§i§n§i§m§a§p"))); //https://www.curseforge.com/minecraft/mc-mods/xaeros-minimap
         channelRegisterHandlers.put("litemoretica:init_easy_place", player -> Chatter.disconnect(player).prefixless("MOD_YELLOW_SING", "litematica")); //https://github.com/Earthcomputer/litemoretica/tree/master
         channelRegisterHandlers.put("litemoretica:init_ea", player -> Chatter.disconnect(player).prefixless("MOD_YELLOW_SING", "litematica")); //https://github.com/Earthcomputer/litemoretica/tree/master
         channelRegisterHandlers.put("servux:litematics", player -> Chatter.disconnect(player).prefixless("MOD_YELLOW_SING", "litematica")); //https://github.com/maruohon/litematica/blob/pre-rewrite/fabric/1.21.1-masa/src/main/java/fi/dy/masa/litematica/network/ServuxLitematicaHandler.java

From 55a682d782b97a5463b07ca41a1e93eba4d42566 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Fri, 24 Oct 2025 09:03:51 +0200
Subject: [PATCH 158/214] Add hypixel mods to drop list

---
 .../src/de/steamwar/velocitycore/listeners/PluginMessage.java   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/VelocityCore/src/de/steamwar/velocitycore/listeners/PluginMessage.java b/VelocityCore/src/de/steamwar/velocitycore/listeners/PluginMessage.java
index 2b123b8e..6e3e9eec 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/listeners/PluginMessage.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/listeners/PluginMessage.java
@@ -426,6 +426,8 @@ public class PluginMessage extends BasicListener {
         }
 
         for(String channel : Arrays.asList(
+                "hyevent:location", "hyevent:register", // Hypixel mods (I could not find which sadly)
+                "hypixel:hello", "hypixel:party_info", "hypixel:ping", "hypixel:player_info", "hypixel:register", // Hypixel mods (I could not find which sadly)
                 "UNREGISTER", "minecraft:unregister", // used by carpet and servux
                 "WDL|REQUEST", "wdl:request",
                 "minecraft:intave",  //undocumented, byte stringlength, clientconfig, byte length, json {"legacySneakHeight":false,"legacyOldRange":false,"legacyOldSlowdown":false}

From 139f73402a2dde28a11d9db189c54c2c3a438e2e Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Fri, 24 Oct 2025 18:22:56 +0200
Subject: [PATCH 159/214] Fix AbstractLinker not accessing private fields

---
 CommonCore/Linkage/src/de/steamwar/linkage/AbstractLinker.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CommonCore/Linkage/src/de/steamwar/linkage/AbstractLinker.java b/CommonCore/Linkage/src/de/steamwar/linkage/AbstractLinker.java
index b11cf0b8..4f86602d 100644
--- a/CommonCore/Linkage/src/de/steamwar/linkage/AbstractLinker.java
+++ b/CommonCore/Linkage/src/de/steamwar/linkage/AbstractLinker.java
@@ -102,6 +102,7 @@ public abstract class AbstractLinker<T> {
                 for (Field field : clazz.getFields()) {
                     if (field.getAnnotation(LinkedInstance.class) != null) {
                         try {
+                            field.setAccessible(true);
                             if (Modifier.isStatic(field.getModifiers())) {
                                 field.set(null, instances.get(field.getType()));
                             } else {

From 4cf963e22a6a8555f10d6de88c230a6501bff952 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Fri, 24 Oct 2025 18:32:44 +0200
Subject: [PATCH 160/214] Improve steamwar.devserver.gradle

---
 buildSrc/src/steamwar.devserver.gradle | 40 ++++++++++++++++++++++----
 1 file changed, 35 insertions(+), 5 deletions(-)

diff --git a/buildSrc/src/steamwar.devserver.gradle b/buildSrc/src/steamwar.devserver.gradle
index 06c096f0..c9ca399a 100644
--- a/buildSrc/src/steamwar.devserver.gradle
+++ b/buildSrc/src/steamwar.devserver.gradle
@@ -18,6 +18,7 @@
  */
 
 import java.security.MessageDigest
+import java.util.stream.Collectors
 
 
 plugins {
@@ -87,7 +88,7 @@ class DevServer extends DefaultTask {
             }
         }
         doLast {
-            checkHasTemplate()
+            setupTemplate(template)
             uploadDependencies()
             startDevServer()
         }
@@ -117,12 +118,41 @@ class DevServer extends DefaultTask {
         }
     }
 
-    void checkHasTemplate() {
-        def process = new ProcessBuilder("ssh", host, "-T", "ls $template").start()
+    private Process run(String... args) {
+        List<String> arguments = new ArrayList<>();
+        arguments.add("ssh")
+        arguments.add(host)
+        arguments.add("-T")
+        arguments.addAll(Arrays.asList(args))
+        def process = new ProcessBuilder(arguments).start()
         process.waitFor()
-        if (new BufferedReader(new InputStreamReader(process.inputStream)).lines().count() < 4) {
-            throw new GradleException("Used template is not in your user.home directory of the given host $host")
+        return process
+    }
+
+    private boolean checkFileOnRemote(String path) {
+        def process = run("[ -e \"$path\" ] && echo \"true\"")
+        return new BufferedReader(new InputStreamReader(process.inputStream)).lines().count() > 0
+    }
+
+    void setupTemplate(String template) {
+        if (checkFileOnRemote("$template")) return
+        if (checkFileOnRemote("/configs/GameModes/${template}.yml")) {
+            println("GameMode Config exists")
+            def process = run("cat /configs/GameModes/${template}.yml | grep \"Folder: \"")
+            String serverTemplateName = new BufferedReader(new InputStreamReader(process.inputStream)).lines().collect(Collectors.joining("\n"))
+                    .trim()
+                    .substring("Folder: ".length())
+            setupTemplate(serverTemplateName)
+            run("ln -s $serverTemplateName $template")
+            return
         }
+        if (!checkFileOnRemote("/servers/$template")) {
+            throw new GradleException("Used template ($template) is not in /servers/ directory of the given host $host")
+        }
+        run("cp -r /servers/$template $template")
+        run("chmod u+w $template")
+        run("rm -r $template/plugins/*WorldEdit/")
+        run("rm $template/log4j2.xml")
     }
 
     void uploadDependencies() {

From aad287d11a5981ed176f90aab226dcd9c749d644 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Fri, 24 Oct 2025 20:57:37 +0200
Subject: [PATCH 161/214] Flatten package for linkage

---
 .../BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java    | 2 +-
 .../BauSystem_Main/src/de/steamwar/bausystem/Permission.java   | 3 ++-
 .../bausystem/features/autostart/AutoStartGuiItem.java         | 2 +-
 .../de/steamwar/bausystem/features/bau/BauInfoBauGuiItem.java  | 2 +-
 .../bausystem/features/countingwand/CountingwandGuiItem.java   | 2 +-
 .../bausystem/features/detonator/DetonatorBauGuiItem.java      | 2 +-
 .../src/de/steamwar/bausystem/features/gui/BauGUI.java         | 2 +-
 .../de/steamwar/bausystem/features/gui/BauGuiBauGuiItem.java   | 2 +-
 .../steamwar/bausystem/features/gui/editor/BauGuiEditor.java   | 2 +-
 .../bausystem/features/gui/editor/BauGuiEditorGuiItem.java     | 2 +-
 .../steamwar/bausystem/features/gui/editor/BauGuiMapping.java  | 2 +-
 .../features/inventoryfiller/InventoryFillBauGuiItem.java      | 2 +-
 .../bausystem/features/loadtimer/LoadtimerGuiItem.java         | 2 +-
 .../bausystem/features/region/items/ColorBauGuiItem.java       | 2 +-
 .../bausystem/features/region/items/FireBauGuiItem.java        | 2 +-
 .../bausystem/features/region/items/FreezeBauGuiItem.java      | 2 +-
 .../bausystem/features/region/items/ProtectBauGuiItem.java     | 2 +-
 .../bausystem/features/region/items/ResetBauGuiItem.java       | 2 +-
 .../bausystem/features/region/items/TestblockBauGuiItem.java   | 2 +-
 .../bausystem/features/region/items/TntBauGuiItem.java         | 2 +-
 .../bausystem/features/simulator/SimulatorBauGuiItem.java      | 2 +-
 .../src/de/steamwar/bausystem/features/tpslimit/TPSSystem.java | 2 +-
 .../bausystem/features/util/items/ClearBauGuiItem.java         | 2 +-
 .../bausystem/features/util/items/DebugstickBauGuiItem.java    | 2 +-
 .../bausystem/features/util/items/DeclutterBauGuiItem.java     | 2 +-
 .../bausystem/features/util/items/GamemodeBauGuiItem.java      | 2 +-
 .../bausystem/features/util/items/KillAllBauGuiItem.java       | 2 +-
 .../bausystem/features/util/items/NavWandBauGuiItem.java       | 2 +-
 .../bausystem/features/util/items/NightVisionBauGuiItem.java   | 2 +-
 .../bausystem/features/util/items/SchemBauGuiItem.java         | 2 +-
 .../bausystem/features/util/items/SelectBauGuiItem.java        | 2 +-
 .../bausystem/features/util/items/SkullBauGuiItem.java         | 2 +-
 .../bausystem/features/util/items/SpeedBauGuiItem.java         | 2 +-
 .../bausystem/features/util/items/TeleportBauGuiItem.java      | 2 +-
 .../bausystem/features/util/items/WorldEditBauGuiItem.java     | 2 +-
 .../steamwar/bausystem/linkage/{specific => }/BauGuiItem.java  | 2 +-
 .../de/steamwar/bausystem/linkage/{specific => }/GuiItem.java  | 2 +-
 37 files changed, 38 insertions(+), 37 deletions(-)
 rename BauSystem/BauSystem_Main/src/de/steamwar/bausystem/linkage/{specific => }/BauGuiItem.java (96%)
 rename BauSystem/BauSystem_Main/src/de/steamwar/bausystem/linkage/{specific => }/GuiItem.java (95%)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java
index 6036eb48..a854f082 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java
@@ -31,7 +31,7 @@ import de.steamwar.bausystem.features.slaves.panzern.PanzernAlgorithm;
 import de.steamwar.bausystem.features.tracer.TraceManager;
 import de.steamwar.bausystem.features.tracer.TraceRecorder;
 import de.steamwar.bausystem.features.world.BauScoreboard;
-import de.steamwar.bausystem.linkage.specific.BauGuiItem;
+import de.steamwar.bausystem.linkage.BauGuiItem;
 import de.steamwar.bausystem.region.RegionSystem;
 import de.steamwar.bausystem.utils.ScoreboardElement;
 import de.steamwar.bausystem.utils.TickListener;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/Permission.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/Permission.java
index 65fbdd51..ecc1df44 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/Permission.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/Permission.java
@@ -21,6 +21,7 @@ package de.steamwar.bausystem;
 
 import de.steamwar.bausystem.config.BauServer;
 import de.steamwar.bausystem.features.world.BauMemberUpdate;
+import de.steamwar.bausystem.linkage.GuiItem;
 import de.steamwar.sql.BauweltMember;
 import de.steamwar.sql.SteamwarUser;
 import lombok.AllArgsConstructor;
@@ -48,7 +49,7 @@ public enum Permission {
         return !bauweltMember.isBuild() && !bauweltMember.isSupervisor();
     }),
     /**
-     * Primarily used for {@link de.steamwar.bausystem.linkage.specific.GuiItem}
+     * Primarily used for {@link GuiItem}
      */
     MEMBER(bauweltMember -> {
         return true;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/autostart/AutoStartGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/autostart/AutoStartGuiItem.java
index 70440719..d21ec4cb 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/autostart/AutoStartGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/autostart/AutoStartGuiItem.java
@@ -20,7 +20,7 @@
 package de.steamwar.bausystem.features.autostart;
 
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.specific.BauGuiItem;
+import de.steamwar.bausystem.linkage.BauGuiItem;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/bau/BauInfoBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/bau/BauInfoBauGuiItem.java
index 73014d3d..12c0fa88 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/bau/BauInfoBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/bau/BauInfoBauGuiItem.java
@@ -22,7 +22,7 @@ package de.steamwar.bausystem.features.bau;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.config.BauServer;
-import de.steamwar.bausystem.linkage.specific.BauGuiItem;
+import de.steamwar.bausystem.linkage.BauGuiItem;
 import de.steamwar.bausystem.region.FlagOptional;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.flags.Flag;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/countingwand/CountingwandGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/countingwand/CountingwandGuiItem.java
index c247f4b8..86cb0332 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/countingwand/CountingwandGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/countingwand/CountingwandGuiItem.java
@@ -20,7 +20,7 @@
 package de.steamwar.bausystem.features.countingwand;
 
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.specific.BauGuiItem;
+import de.steamwar.bausystem.linkage.BauGuiItem;
 import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/detonator/DetonatorBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/detonator/DetonatorBauGuiItem.java
index d372fe9f..aa2767bf 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/detonator/DetonatorBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/detonator/DetonatorBauGuiItem.java
@@ -20,7 +20,7 @@
 package de.steamwar.bausystem.features.detonator;
 
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.specific.BauGuiItem;
+import de.steamwar.bausystem.linkage.BauGuiItem;
 import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/gui/BauGUI.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/gui/BauGUI.java
index 4ec96af0..4f9605a9 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/gui/BauGUI.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/gui/BauGUI.java
@@ -23,7 +23,7 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.SWUtils;
 import de.steamwar.bausystem.features.gui.editor.BauGuiMapping;
-import de.steamwar.bausystem.linkage.specific.BauGuiItem;
+import de.steamwar.bausystem.linkage.BauGuiItem;
 import de.steamwar.inventory.SWInventory;
 import lombok.Getter;
 import lombok.experimental.UtilityClass;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/gui/BauGuiBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/gui/BauGuiBauGuiItem.java
index c68d4177..bae48658 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/gui/BauGuiBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/gui/BauGuiBauGuiItem.java
@@ -21,7 +21,7 @@ package de.steamwar.bausystem.features.gui;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.specific.BauGuiItem;
+import de.steamwar.bausystem.linkage.BauGuiItem;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.linkage.Linked;
 import net.md_5.bungee.api.ChatColor;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/gui/editor/BauGuiEditor.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/gui/editor/BauGuiEditor.java
index a8028acc..092c95cf 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/gui/editor/BauGuiEditor.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/gui/editor/BauGuiEditor.java
@@ -21,7 +21,7 @@ package de.steamwar.bausystem.features.gui.editor;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.gui.BauGUI;
-import de.steamwar.bausystem.linkage.specific.BauGuiItem;
+import de.steamwar.bausystem.linkage.BauGuiItem;
 import de.steamwar.core.TrickyTrialsWrapper;
 import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWItem;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/gui/editor/BauGuiEditorGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/gui/editor/BauGuiEditorGuiItem.java
index 6df8dfd7..e20819a1 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/gui/editor/BauGuiEditorGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/gui/editor/BauGuiEditorGuiItem.java
@@ -21,7 +21,7 @@ package de.steamwar.bausystem.features.gui.editor;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.specific.BauGuiItem;
+import de.steamwar.bausystem.linkage.BauGuiItem;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/gui/editor/BauGuiMapping.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/gui/editor/BauGuiMapping.java
index edea652e..7dfed54d 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/gui/editor/BauGuiMapping.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/gui/editor/BauGuiMapping.java
@@ -22,7 +22,7 @@ package de.steamwar.bausystem.features.gui.editor;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.configplayer.Config;
 import de.steamwar.bausystem.features.gui.BauGUI;
-import de.steamwar.bausystem.linkage.specific.BauGuiItem;
+import de.steamwar.bausystem.linkage.BauGuiItem;
 import lombok.Getter;
 import lombok.Setter;
 import org.bukkit.Bukkit;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/inventoryfiller/InventoryFillBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/inventoryfiller/InventoryFillBauGuiItem.java
index 46319ec6..fe62c7e2 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/inventoryfiller/InventoryFillBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/inventoryfiller/InventoryFillBauGuiItem.java
@@ -22,7 +22,7 @@ package de.steamwar.bausystem.features.inventoryfiller;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.configplayer.Config;
-import de.steamwar.bausystem.linkage.specific.BauGuiItem;
+import de.steamwar.bausystem.linkage.BauGuiItem;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.linkage.Linked;
 import de.steamwar.linkage.LinkedInstance;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loadtimer/LoadtimerGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loadtimer/LoadtimerGuiItem.java
index a4ac5803..cdee3114 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loadtimer/LoadtimerGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loadtimer/LoadtimerGuiItem.java
@@ -21,7 +21,7 @@ package de.steamwar.bausystem.features.loadtimer;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.specific.BauGuiItem;
+import de.steamwar.bausystem.linkage.BauGuiItem;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.inventory.SWInventory;
 import de.steamwar.inventory.SWItem;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/ColorBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/ColorBauGuiItem.java
index 43e46667..41edc648 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/ColorBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/ColorBauGuiItem.java
@@ -21,7 +21,7 @@ package de.steamwar.bausystem.features.region.items;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.specific.BauGuiItem;
+import de.steamwar.bausystem.linkage.BauGuiItem;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.flags.ColorMode;
 import de.steamwar.bausystem.region.flags.Flag;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/FireBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/FireBauGuiItem.java
index 8b51d59c..f7694ae9 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/FireBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/FireBauGuiItem.java
@@ -21,7 +21,7 @@ package de.steamwar.bausystem.features.region.items;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.specific.BauGuiItem;
+import de.steamwar.bausystem.linkage.BauGuiItem;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.flags.FireMode;
 import de.steamwar.bausystem.region.flags.Flag;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/FreezeBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/FreezeBauGuiItem.java
index 01174d41..ba863785 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/FreezeBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/FreezeBauGuiItem.java
@@ -21,7 +21,7 @@ package de.steamwar.bausystem.features.region.items;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.specific.BauGuiItem;
+import de.steamwar.bausystem.linkage.BauGuiItem;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.flags.Flag;
 import de.steamwar.bausystem.region.flags.FreezeMode;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/ProtectBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/ProtectBauGuiItem.java
index 9118e5f0..dd7f74bd 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/ProtectBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/ProtectBauGuiItem.java
@@ -22,7 +22,7 @@ package de.steamwar.bausystem.features.region.items;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.SWUtils;
-import de.steamwar.bausystem.linkage.specific.BauGuiItem;
+import de.steamwar.bausystem.linkage.BauGuiItem;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.flags.Flag;
 import de.steamwar.bausystem.region.flags.ProtectMode;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/ResetBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/ResetBauGuiItem.java
index 33319753..2141a483 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/ResetBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/ResetBauGuiItem.java
@@ -23,7 +23,7 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.SWUtils;
 import de.steamwar.bausystem.features.region.ResetCommand;
-import de.steamwar.bausystem.linkage.specific.BauGuiItem;
+import de.steamwar.bausystem.linkage.BauGuiItem;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.inventory.SchematicSelector;
 import de.steamwar.linkage.Linked;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/TestblockBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/TestblockBauGuiItem.java
index 8752a49f..80c5bed8 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/TestblockBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/TestblockBauGuiItem.java
@@ -22,7 +22,7 @@ package de.steamwar.bausystem.features.region.items;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.features.region.TestblockCommand;
-import de.steamwar.bausystem.linkage.specific.BauGuiItem;
+import de.steamwar.bausystem.linkage.BauGuiItem;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.inventory.SchematicSelector;
 import de.steamwar.linkage.Linked;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/TntBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/TntBauGuiItem.java
index 7100e51e..d43f6895 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/TntBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/TntBauGuiItem.java
@@ -21,7 +21,7 @@ package de.steamwar.bausystem.features.region.items;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.specific.BauGuiItem;
+import de.steamwar.bausystem.linkage.BauGuiItem;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.flags.Flag;
 import de.steamwar.bausystem.region.flags.TNTMode;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorBauGuiItem.java
index 98c0023d..1e4860ad 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorBauGuiItem.java
@@ -21,7 +21,7 @@ package de.steamwar.bausystem.features.simulator;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.specific.BauGuiItem;
+import de.steamwar.bausystem.linkage.BauGuiItem;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tpslimit/TPSSystem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tpslimit/TPSSystem.java
index 9091feed..9eafc09b 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tpslimit/TPSSystem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tpslimit/TPSSystem.java
@@ -22,7 +22,7 @@ package de.steamwar.bausystem.features.tpslimit;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.SWUtils;
-import de.steamwar.bausystem.linkage.specific.BauGuiItem;
+import de.steamwar.bausystem.linkage.BauGuiItem;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.utils.ScoreboardElement;
 import de.steamwar.bausystem.utils.TickEndEvent;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/ClearBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/ClearBauGuiItem.java
index 0d748273..df863b57 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/ClearBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/ClearBauGuiItem.java
@@ -21,7 +21,7 @@ package de.steamwar.bausystem.features.util.items;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.specific.BauGuiItem;
+import de.steamwar.bausystem.linkage.BauGuiItem;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/DebugstickBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/DebugstickBauGuiItem.java
index 2dc31ca0..1d8d6d82 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/DebugstickBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/DebugstickBauGuiItem.java
@@ -21,7 +21,7 @@ package de.steamwar.bausystem.features.util.items;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.specific.BauGuiItem;
+import de.steamwar.bausystem.linkage.BauGuiItem;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/DeclutterBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/DeclutterBauGuiItem.java
index fca8ce73..52b0c19b 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/DeclutterBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/DeclutterBauGuiItem.java
@@ -22,7 +22,7 @@ package de.steamwar.bausystem.features.util.items;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.features.util.DeclutterCommand;
-import de.steamwar.bausystem.linkage.specific.BauGuiItem;
+import de.steamwar.bausystem.linkage.BauGuiItem;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.linkage.Linked;
 import de.steamwar.linkage.LinkedInstance;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/GamemodeBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/GamemodeBauGuiItem.java
index 954e3b57..bc5828cd 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/GamemodeBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/GamemodeBauGuiItem.java
@@ -21,7 +21,7 @@ package de.steamwar.bausystem.features.util.items;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.specific.BauGuiItem;
+import de.steamwar.bausystem.linkage.BauGuiItem;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.linkage.Linked;
 import org.bukkit.GameMode;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/KillAllBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/KillAllBauGuiItem.java
index 510ff34d..72e72713 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/KillAllBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/KillAllBauGuiItem.java
@@ -22,7 +22,7 @@ package de.steamwar.bausystem.features.util.items;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.features.util.KillAllCommand;
-import de.steamwar.bausystem.linkage.specific.BauGuiItem;
+import de.steamwar.bausystem.linkage.BauGuiItem;
 import de.steamwar.bausystem.features.util.RegionSelectionType;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.linkage.Linked;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/NavWandBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/NavWandBauGuiItem.java
index 920652ff..e81de542 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/NavWandBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/NavWandBauGuiItem.java
@@ -21,7 +21,7 @@ package de.steamwar.bausystem.features.util.items;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.specific.BauGuiItem;
+import de.steamwar.bausystem.linkage.BauGuiItem;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/NightVisionBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/NightVisionBauGuiItem.java
index ca0da78c..296c028f 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/NightVisionBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/NightVisionBauGuiItem.java
@@ -22,7 +22,7 @@ package de.steamwar.bausystem.features.util.items;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.SWUtils;
-import de.steamwar.bausystem.linkage.specific.BauGuiItem;
+import de.steamwar.bausystem.linkage.BauGuiItem;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/SchemBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/SchemBauGuiItem.java
index 38324c33..84b4537e 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/SchemBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/SchemBauGuiItem.java
@@ -21,7 +21,7 @@ package de.steamwar.bausystem.features.util.items;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.specific.BauGuiItem;
+import de.steamwar.bausystem.linkage.BauGuiItem;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/SelectBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/SelectBauGuiItem.java
index 387bf0ed..78669a8d 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/SelectBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/SelectBauGuiItem.java
@@ -21,7 +21,7 @@ package de.steamwar.bausystem.features.util.items;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.specific.BauGuiItem;
+import de.steamwar.bausystem.linkage.BauGuiItem;
 import de.steamwar.bausystem.region.utils.RegionExtensionType;
 import de.steamwar.bausystem.region.utils.RegionType;
 import de.steamwar.inventory.SWInventory;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/SkullBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/SkullBauGuiItem.java
index 71d59b0b..977c1003 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/SkullBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/SkullBauGuiItem.java
@@ -21,7 +21,7 @@ package de.steamwar.bausystem.features.util.items;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.specific.BauGuiItem;
+import de.steamwar.bausystem.linkage.BauGuiItem;
 import de.steamwar.inventory.SWAnvilInv;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.linkage.Linked;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/SpeedBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/SpeedBauGuiItem.java
index 8a9c23bf..9f563361 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/SpeedBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/SpeedBauGuiItem.java
@@ -21,7 +21,7 @@ package de.steamwar.bausystem.features.util.items;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.specific.BauGuiItem;
+import de.steamwar.bausystem.linkage.BauGuiItem;
 import de.steamwar.inventory.SWAnvilInv;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.linkage.Linked;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/TeleportBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/TeleportBauGuiItem.java
index 7346cd31..7a8cf38f 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/TeleportBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/TeleportBauGuiItem.java
@@ -21,7 +21,7 @@ package de.steamwar.bausystem.features.util.items;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.specific.BauGuiItem;
+import de.steamwar.bausystem.linkage.BauGuiItem;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.inventory.SWListInv;
 import de.steamwar.linkage.Linked;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/WorldEditBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/WorldEditBauGuiItem.java
index 9e077da1..ac2e73b6 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/WorldEditBauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/WorldEditBauGuiItem.java
@@ -21,7 +21,7 @@ package de.steamwar.bausystem.features.util.items;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
-import de.steamwar.bausystem.linkage.specific.BauGuiItem;
+import de.steamwar.bausystem.linkage.BauGuiItem;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/linkage/specific/BauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/linkage/BauGuiItem.java
similarity index 96%
rename from BauSystem/BauSystem_Main/src/de/steamwar/bausystem/linkage/specific/BauGuiItem.java
rename to BauSystem/BauSystem_Main/src/de/steamwar/bausystem/linkage/BauGuiItem.java
index 85e218ee..6038f20e 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/linkage/specific/BauGuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/linkage/BauGuiItem.java
@@ -17,7 +17,7 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bausystem.linkage.specific;
+package de.steamwar.bausystem.linkage;
 
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.features.gui.BauGUI;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/linkage/specific/GuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/linkage/GuiItem.java
similarity index 95%
rename from BauSystem/BauSystem_Main/src/de/steamwar/bausystem/linkage/specific/GuiItem.java
rename to BauSystem/BauSystem_Main/src/de/steamwar/bausystem/linkage/GuiItem.java
index 713bc75f..7bf38f3f 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/linkage/specific/GuiItem.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/linkage/GuiItem.java
@@ -17,7 +17,7 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bausystem.linkage.specific;
+package de.steamwar.bausystem.linkage;
 
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;

From 69bc9142f361b654c0071548fdae5fc89ab2708c Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sat, 25 Oct 2025 09:04:25 +0200
Subject: [PATCH 162/214] Add emi to channels

---
 .../src/de/steamwar/velocitycore/listeners/PluginMessage.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/VelocityCore/src/de/steamwar/velocitycore/listeners/PluginMessage.java b/VelocityCore/src/de/steamwar/velocitycore/listeners/PluginMessage.java
index 6e3e9eec..2952a8b6 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/listeners/PluginMessage.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/listeners/PluginMessage.java
@@ -428,6 +428,7 @@ public class PluginMessage extends BasicListener {
         for(String channel : Arrays.asList(
                 "hyevent:location", "hyevent:register", // Hypixel mods (I could not find which sadly)
                 "hypixel:hello", "hypixel:party_info", "hypixel:ping", "hypixel:player_info", "hypixel:register", // Hypixel mods (I could not find which sadly)
+                "emi_loot:archaeology", "emi_loot:block", "emi_loot:chest", "emi_loot:clear_loot", "emi_loot:gameplay", "emi_loot:mob", // https://github.com/emilyploszaj/emi
                 "UNREGISTER", "minecraft:unregister", // used by carpet and servux
                 "WDL|REQUEST", "wdl:request",
                 "minecraft:intave",  //undocumented, byte stringlength, clientconfig, byte length, json {"legacySneakHeight":false,"legacyOldRange":false,"legacyOldSlowdown":false}

From 20283e33e026e8498f5352db310d1403d86c4a1b Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sat, 25 Oct 2025 12:04:28 +0200
Subject: [PATCH 163/214] Add Disconnect for norisk client users

---
 .../velocitycore/listeners/PluginMessage.java       | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/VelocityCore/src/de/steamwar/velocitycore/listeners/PluginMessage.java b/VelocityCore/src/de/steamwar/velocitycore/listeners/PluginMessage.java
index 2952a8b6..869f37c6 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/listeners/PluginMessage.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/listeners/PluginMessage.java
@@ -137,6 +137,7 @@ public class PluginMessage extends BasicListener {
                 "plasmo:voice/v2/installed", "plasmo:voice/v2", //https://modrinth.com/plugin/plasmo-voice (Voice chat)
                 "inventorysorter:sync_blacklist_packet", //https://github.com/cpw/inventorysorter (needs server side component to work)
                 "emi:ping", "emi:command", "emi:chess", //https://github.com/emilyploszaj/emi/
+                "emi_loot:archaeology", "emi_loot:block", "emi_loot:chest", "emi_loot:clear_loot", "emi_loot:gameplay", "emi_loot:mob", // https://github.com/emilyploszaj/emi
                 "fancymenu:execute_command", "fancymenu:packet_bridge", "minecraft:fancymenu_packet_bridge", //https://github.com/Keksuccino/FancyMenu (Custom menus)
                 "itemswapper:enableshulker", "itemswapper:enablerefill", //https://github.com/tr7zw/ItemSwapper/tree/main (Easier inventory item swapping)
                 "jade:show_overlay", "jade:receive_data", "jade:server_ping", "jade:server_ping_v1", //https://github.com/Snownee/Jade (Information over block/entity under crosshair)
@@ -369,6 +370,11 @@ public class PluginMessage extends BasicListener {
         ))
             channelRegisterHandlers.put(channel, player -> Chatter.disconnect(player).prefixless("MOD_YELLOW_SING", "minimap"));
 
+        // Sending the restrictions currently does not work or the client ignores it
+        channelRegisterHandlers.put("norisk:main", player -> {
+            Chatter.disconnect(player).prefixless("MOD_YELLOW_SING", "norisk client");
+        });
+
         for(String channel : Arrays.asList(
                 "flashback:remote_food_data",
                 "flashback:remote_set_slot",
@@ -419,16 +425,15 @@ public class PluginMessage extends BasicListener {
                 "bclib:hello_server",
                 "vivecraft:data", //https://github.com/Vivecraft/VivecraftMod https://github.com/jrbudda/Vivecraft_Spigot_Extensions https://github.com/Techjar/Vivecraft_BungeeCord_Extensions (VR support)
                 "badpackets:channel_sync", //https://github.com/badasintended/badpackets (Forge fabric translation layer)
-                "hero-api:mouse-packet", "hero-api:mouse-scroll" //TODO https://github.com/NoRiskClient Mit Superhelden-Mod?
+                "hero-api:mouse-packet", "hero-api:mouse-scroll", //TODO https://github.com/NoRiskClient Mit Superhelden-Mod?
+                "hyevent:location", "hyevent:register", // Hypixel mods (I could not find which sadly)
+                "hypixel:hello", "hypixel:party_info", "hypixel:ping", "hypixel:player_info", "hypixel:register", "hypixel:party_info", "hypixel:player_info", "hypixel:ping" // Hypixel mods (I could not find which sadly)
         )) {
             channelRegisterHandlers.put(channel, player -> {});
             register(channel, false, directional(UNKNOWN, DROP));
         }
 
         for(String channel : Arrays.asList(
-                "hyevent:location", "hyevent:register", // Hypixel mods (I could not find which sadly)
-                "hypixel:hello", "hypixel:party_info", "hypixel:ping", "hypixel:player_info", "hypixel:register", // Hypixel mods (I could not find which sadly)
-                "emi_loot:archaeology", "emi_loot:block", "emi_loot:chest", "emi_loot:clear_loot", "emi_loot:gameplay", "emi_loot:mob", // https://github.com/emilyploszaj/emi
                 "UNREGISTER", "minecraft:unregister", // used by carpet and servux
                 "WDL|REQUEST", "wdl:request",
                 "minecraft:intave",  //undocumented, byte stringlength, clientconfig, byte length, json {"legacySneakHeight":false,"legacyOldRange":false,"legacyOldSlowdown":false}

From c560f669ca3d75a5e41e837e12c231eb659af648 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sat, 25 Oct 2025 12:07:23 +0200
Subject: [PATCH 164/214] Hotfix VersionAnnouncer

---
 .../src/de/steamwar/velocitycore/listeners/VersionAnnouncer.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/VelocityCore/src/de/steamwar/velocitycore/listeners/VersionAnnouncer.java b/VelocityCore/src/de/steamwar/velocitycore/listeners/VersionAnnouncer.java
index 9f5007ac..765c2ad7 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/listeners/VersionAnnouncer.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/listeners/VersionAnnouncer.java
@@ -50,6 +50,7 @@ public class VersionAnnouncer extends BasicListener {
         if (protocolVersion.isSupported()) {
             // PluginChannel 'vv:proxy_details' from ViaVersion apparently does not work any longer!
             VelocityCore.schedule(() -> {
+                if (player.getCurrentServer().isEmpty()) return;
                 String[] strings = protocolVersion.getVersionIntroducedIn().split("\\.");
                 NetworkSender.send(player, new ClientVersionPacket(player.getUniqueId(), Integer.parseInt(strings[1])));
             }).delay(Duration.of(100, ChronoUnit.MILLIS)).schedule();

From 0a6977e4334d866cac5f44dda7496dd0b00d7518 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sat, 25 Oct 2025 12:16:53 +0200
Subject: [PATCH 165/214] Fix Teamserver.properties

---
 .../steamwar/teamserver/Teamserver.properties | 70 +++++++++----------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/Teamserver/src/de/steamwar/teamserver/Teamserver.properties b/Teamserver/src/de/steamwar/teamserver/Teamserver.properties
index a9e48323..ef5fc763 100644
--- a/Teamserver/src/de/steamwar/teamserver/Teamserver.properties
+++ b/Teamserver/src/de/steamwar/teamserver/Teamserver.properties
@@ -18,44 +18,44 @@
 #   along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-PREFIX = �eBuilder�8�
+PREFIX = §eBuilder§8§
 TIME = HH:mm:ss
 
 # Freeze
-REGION_FREEZE_HELP=�8/�efreeze �8- �7Toggle Freeze
-REGION_FREEZE_ENABLED=�cRegion eingefroren
-REGION_FREEZE_DISABLED=�aRegion aufgetaut
+REGION_FREEZE_HELP=§8/§efreeze §8- §7Toggle Freeze
+REGION_FREEZE_ENABLED=§cRegion eingefroren
+REGION_FREEZE_DISABLED=§aRegion aufgetaut
 
 # Material
-MATERIAL_INV_NAME=�eMaterial {0}/{1}
-MATERIAL_SEARCH=�eSuchen
-MATERIAL_BACK=�eZur�ck
-MATERIAL_SEARCH_NAME=�eName
-MATERIAL_SEARCH_TRANSPARENT=�eTransparent
-MATERIAL_SEARCH_SOLID=�eSolide
-MATERIAL_SEARCH_GRAVITY=�eFallend
-MATERIAL_SEARCH_OCCLUDING=�eOccluding
-MATERIAL_SEARCH_INTERACTEABLE=�eInterargierbar
-MATERIAL_SEARCH_FLAMMABLE=�eFlammbar
-MATERIAL_SEARCH_BURNABLE=�eBrennbar
-MATERIAL_SEARCH_WATERLOGGABLE=�eWasserspeicherbar
-MATERIAL_SEARCH_BLASTRESISTANCE=�eBlast Resistance
-MATERIAL_SEARCH_BLASTRESISTANCE_MIN=�eBlast Resistance mindestens
-MATERIAL_SEARCH_BLASTRESISTANCE_MAX=�eBlast Resistance maximal
-MATERIAL_SEARCH_BLASTRESISTANCE_EXACT=�eBlast Resistance
-MATERIAL_SEARCH_VALUE=�8: �e{0}
-MATERIAL_BLAST-RESISTANCE=�8- �eBlast Resistance�8: �7{0}
-MATERIAL_HARDNESS=�8- �eH�rte�8: �7{0}
-MATERIAL_TNT_BREAKABLE=�8- �eZerst�rbar durch TNT
-MATERIAL_TNT_UNBREAKABLE=�8- �eNicht Zerst�rbar durch TNT
-MATERIAL_TRANSPARENT=�8- �eTransparenter Block
-MATERIAL_SOLID=�8- �eSolider Block
-MATERIAL_GRAVITY=�8- �eFallender Block
-MATERIAL_OCCLUDING=�8- �eOccluding Block
-MATERIAL_INTERACT-ABLE=�8- �eInterargierbarer Block
-MATERIAL_FLAMMABLE=�8- �eFlammbarer Block
-MATERIAL_BURNABLE=�8- �eBrennbarer Block
-MATERIAL_WATERLOGGABLE=�8- �eWasserspeicherbarer Block
+MATERIAL_INV_NAME=§eMaterial {0}/{1}
+MATERIAL_SEARCH=§eSuchen
+MATERIAL_BACK=§eZur§ck
+MATERIAL_SEARCH_NAME=§eName
+MATERIAL_SEARCH_TRANSPARENT=§eTransparent
+MATERIAL_SEARCH_SOLID=§eSolide
+MATERIAL_SEARCH_GRAVITY=§eFallend
+MATERIAL_SEARCH_OCCLUDING=§eOccluding
+MATERIAL_SEARCH_INTERACTEABLE=§eInterargierbar
+MATERIAL_SEARCH_FLAMMABLE=§eFlammbar
+MATERIAL_SEARCH_BURNABLE=§eBrennbar
+MATERIAL_SEARCH_WATERLOGGABLE=§eWasserspeicherbar
+MATERIAL_SEARCH_BLASTRESISTANCE=§eBlast Resistance
+MATERIAL_SEARCH_BLASTRESISTANCE_MIN=§eBlast Resistance mindestens
+MATERIAL_SEARCH_BLASTRESISTANCE_MAX=§eBlast Resistance maximal
+MATERIAL_SEARCH_BLASTRESISTANCE_EXACT=§eBlast Resistance
+MATERIAL_SEARCH_VALUE=§8: §e{0}
+MATERIAL_BLAST-RESISTANCE=§8- §eBlast Resistance§8: §7{0}
+MATERIAL_HARDNESS=§8- §eH§rte§8: §7{0}
+MATERIAL_TNT_BREAKABLE=§8- §eZerst§rbar durch TNT
+MATERIAL_TNT_UNBREAKABLE=§8- §eNicht Zerst§rbar durch TNT
+MATERIAL_TRANSPARENT=§8- §eTransparenter Block
+MATERIAL_SOLID=§8- §eSolider Block
+MATERIAL_GRAVITY=§8- §eFallender Block
+MATERIAL_OCCLUDING=§8- §eOccluding Block
+MATERIAL_INTERACT-ABLE=§8- §eInterargierbarer Block
+MATERIAL_FLAMMABLE=§8- §eFlammbarer Block
+MATERIAL_BURNABLE=§8- §eBrennbarer Block
+MATERIAL_WATERLOGGABLE=§8- §eWasserspeicherbarer Block
 
-ARENACONFIG_HELP=�8/�7arenaconfig �8[�eUntere Spielergrenze�8] (WE-Pos1: Kleinste blaue Schemkoordinate, WE-Pos2: Kleinste Rote Schemkoordinate)
-ARENACONFIG_SELECTION=�cKeine WE-SAuswahl,
\ No newline at end of file
+ARENACONFIG_HELP=§8/§7arenaconfig §8[§eUntere Spielergrenze§8] (WE-Pos1: Kleinste blaue Schemkoordinate, WE-Pos2: Kleinste Rote Schemkoordinate)
+ARENACONFIG_SELECTION=§cKeine WE-SAuswahl,
\ No newline at end of file

From 87a4836fa10cd72824903e6293d7747a38cefca8 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sat, 25 Oct 2025 21:45:44 +0200
Subject: [PATCH 166/214] Add Unified GameModeConfig

---
 .../features/autostart/AutostartListener.java |   2 +-
 .../design/endstone/DesignEndStone.java       |  12 +-
 .../endstone/DesignEndStoneCommand.java       |   2 +-
 .../region/RegionScoreboardElement.java       |   4 +-
 .../features/script/lua/libs/RegionLib.java   |   2 +-
 .../features/techhider/TechHiderCommand.java  |   4 +-
 .../bausystem/features/xray/XrayCommand.java  |   4 +-
 .../bausystem/region/GameModeConfig.java      | 128 ---
 .../de/steamwar/bausystem/region/Region.java  |   5 +-
 .../region/fixed/FixedGlobalRegion.java       |   6 +-
 .../bausystem/region/fixed/FixedRegion.java   |   7 +-
 CommonCore/Data/build.gradle.kts              |   1 +
 .../src/de/steamwar/data/GameModeConfig.java  | 821 ++++++++++++++++++
 .../Data/src/de/steamwar/data/YMLWrapper.java |  98 +++
 .../src/de/steamwar/sql/SchematicType.java    |   5 +
 FightSystem/FightSystem_Core/src/config.yml   |  23 +-
 .../src/de/steamwar/fightsystem/Config.java   | 195 +----
 .../de/steamwar/fightsystem/ai/DummyAI.java   |   2 +-
 .../fightsystem/commands/Commands.java        |   4 +-
 .../de/steamwar/fightsystem/commands/GUI.java |  22 +-
 .../countdown/EnternCountdown.java            |   4 +-
 .../countdown/EventSpectateCountdown.java     |   2 +-
 .../countdown/NoPlayersOnlineCountdown.java   |   4 +-
 .../countdown/PostSchemCountdown.java         |   4 +-
 .../countdown/PreRunningCountdown.java        |   2 +-
 .../countdown/PreSchemCountdown.java          |   2 +-
 .../countdown/SpectateOverCountdown.java      |   2 +-
 .../countdown/TimeOverCountdown.java          |   2 +-
 .../de/steamwar/fightsystem/fight/Fight.java  |   2 +-
 .../fightsystem/fight/FightPlayer.java        |   8 +-
 .../fightsystem/fight/FightSchematic.java     |  18 +-
 .../steamwar/fightsystem/fight/FightTeam.java |  12 +-
 .../fightsystem/fight/FightWorld.java         |   2 +-
 .../steamwar/fightsystem/fight/HotbarKit.java |   2 +-
 .../de/steamwar/fightsystem/fight/Kit.java    |  16 +-
 .../fightsystem/listener/ArenaBorder.java     |   4 +-
 .../fightsystem/listener/ArrowStopper.java    |   4 +-
 .../listener/BlockFadeListener.java           |   2 +-
 .../steamwar/fightsystem/listener/Chat.java   |   2 +-
 .../listener/DenyWorldInteraction.java        |   4 +-
 .../fightsystem/listener/InFightDamage.java   |   2 +-
 .../listener/JoinRequestListener.java         |   2 +-
 .../fightsystem/listener/LeaveableArena.java  |   2 +-
 .../fightsystem/listener/Permanent.java       |  12 +-
 .../listener/PersonalKitCreator.java          |   2 +-
 .../fightsystem/listener/PistonListener.java  |   4 +-
 .../fightsystem/listener/PrepareSchem.java    |   2 +-
 .../fightsystem/listener/Shutdown.java        |   2 +-
 .../fightsystem/listener/WaterRemover.java    |   2 +-
 .../fightsystem/record/PacketProcessor.java   |   4 +-
 .../states/OneShotStateDependent.java         |   2 +-
 .../fightsystem/states/StateDependent.java    |   2 +-
 .../states/StateDependentCountdown.java       |   2 +-
 .../states/StateDependentListener.java        |   2 +-
 .../states/StateDependentTask.java            |   2 +-
 .../fightsystem/utils/BungeeFightInfo.java    |   2 +-
 .../fightsystem/utils/FightStatistics.java    |   2 +-
 .../de/steamwar/fightsystem/utils/Hull.java   |   2 +-
 .../fightsystem/utils/TechHiderWrapper.java   |   4 +-
 .../WinconditionBasePercent.java              |  12 +-
 .../winconditions/WinconditionBlocks.java     |   2 +-
 .../WinconditionComparisonTimeout.java        |   2 +-
 .../winconditions/WinconditionPoints.java     |   2 +-
 .../winconditions/WinconditionTimeTechKO.java |   2 +-
 .../WinconditionTimedDamageTechKO.java        |   2 +-
 .../winconditions/WinconditionTimeout.java    |   2 +-
 .../autocheck/AutoChecker15.java              |   7 +-
 .../schematiccommand/SchematicCommand15.java  |  15 +-
 .../autocheck/AutoChecker8.java               |   7 +-
 .../schematiccommand/SchematicCommand8.java   |   7 +-
 .../schematicsystem/CheckSchemType.java       | 113 ---
 .../CheckSchemTypeManager.java                |  56 ++
 .../autocheck/AutoChecker.java                |  11 +-
 .../autocheck/AutoCheckerResult.java          |  48 +-
 .../commands/schematiccommand/GUI.java        |   4 +-
 .../schematiccommand/SchematicCommand.java    |  21 +-
 .../SchematicCommandUtils.java                |  10 +-
 .../schematiccommand/SchematicMapper.java     |  14 +-
 .../schematiccommand/SchematicValidator.java  |   1 -
 .../schematiccommand/parts/CheckPart.java     |  14 +-
 .../schematiccommand/parts/ModifyPart.java    |   4 +-
 .../schematiccommand/parts/SearchPart.java    |   2 +-
 .../src/de/steamwar/data/YMLWrapperImpl.java  | 154 ++++
 .../src/de/steamwar/sql/SQLWrapperImpl.java   |  52 +-
 .../src/de/steamwar/data/YMLWrapperImpl.java  | 159 ++++
 .../src/de/steamwar/sql/SQLWrapperImpl.java   |  46 +-
 .../de/steamwar/velocitycore/ArenaMode.java   | 105 +--
 .../steamwar/velocitycore/GameModeConfig.java |  98 ---
 .../steamwar/velocitycore/ServerStarter.java  |  17 +-
 .../steamwar/velocitycore/ServerVersion.java  |  12 +
 .../velocitycore/commands/BauCommand.java     |   4 +-
 .../commands/BuilderCloudCommand.java         |   6 +-
 .../commands/ChallengeCommand.java            |  10 +-
 .../velocitycore/commands/CheckCommand.java   |   5 +-
 .../velocitycore/commands/FightCommand.java   |  20 +-
 .../commands/HistoricCommand.java             |   6 +-
 .../velocitycore/commands/RankCommand.java    |   6 +-
 .../velocitycore/commands/ReplayCommand.java  |  11 +-
 .../velocitycore/commands/TypeMappers.java    |  16 +-
 .../velocitycore/listeners/ChatListener.java  |   3 +-
 .../network/handlers/EloPlayerHandler.java    |   6 +-
 .../network/handlers/EloSchemHandler.java     |   5 +-
 .../network/handlers/PrepareSchemHandler.java |   9 +-
 103 files changed, 1731 insertions(+), 876 deletions(-)
 delete mode 100644 BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/GameModeConfig.java
 create mode 100644 CommonCore/Data/src/de/steamwar/data/GameModeConfig.java
 create mode 100644 CommonCore/Data/src/de/steamwar/data/YMLWrapper.java
 delete mode 100644 SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/CheckSchemType.java
 create mode 100644 SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/CheckSchemTypeManager.java
 create mode 100644 SpigotCore/SpigotCore_Main/src/de/steamwar/data/YMLWrapperImpl.java
 create mode 100644 VelocityCore/src/de/steamwar/data/YMLWrapperImpl.java
 delete mode 100644 VelocityCore/src/de/steamwar/velocitycore/GameModeConfig.java

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/autostart/AutostartListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/autostart/AutostartListener.java
index 5aaf3ed6..d45a7029 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/autostart/AutostartListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/autostart/AutostartListener.java
@@ -129,7 +129,7 @@ public class AutostartListener implements Listener {
             if (!regionStartTime.containsKey(region)) return;
             if (!region.getTestblockArea().inRegion(block.getLocation(), true)) return;
             long tickDiff = TPSUtils.currentRealTick.get() - regionStartTime.remove(region);
-            long preFightDurationInSeconds = region.getGameModeConfig().getTimes().getPreFightDuration();
+            long preFightDurationInSeconds = region.getGameModeConfig().Times.PreFightDuration;
             RegionUtils.message(region, "AUTOSTART_MESSAGE_RESULT1", tickDiff);
             RegionUtils.message(region, "AUTOSTART_MESSAGE_RESULT2", preFightDurationInSeconds, ((preFightDurationInSeconds * 20) - tickDiff));
             RegionUtils.message(region, "AUTOSTART_MESSAGE_RESULT3");
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/design/endstone/DesignEndStone.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/design/endstone/DesignEndStone.java
index 0b2bde85..fe529864 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/design/endstone/DesignEndStone.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/design/endstone/DesignEndStone.java
@@ -29,10 +29,12 @@ import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.World;
-import org.bukkit.configuration.file.YamlConfiguration;
 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 {
@@ -54,15 +56,13 @@ public class DesignEndStone {
         this.maxY = region.getBuildArea().getMaxPoint(false).getY();
         this.maxZ = region.getBuildArea().getMaxPoint(false).getZ();
 
-        limited = region.getGameModeConfig()
-                .getSchematic()
-                .getLimited()
+        limited = region.getGameModeConfig().Schematic.Limited
                 .entrySet()
                 .stream()
                 .filter(entry -> entry.getValue() == 0)
                 .flatMap(entry -> entry.getKey().stream())
                 .collect(Collectors.toSet());
-        calculateFromBottom = region.getGameModeConfig().getArena().isNoFloor();
+        calculateFromBottom = region.getGameModeConfig().Arena.NoFloor;
 
         entityServer.setCallback((player, rEntity, entityAction) -> {
             if (entityAction != REntityServer.EntityAction.ATTACK) return;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/design/endstone/DesignEndStoneCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/design/endstone/DesignEndStoneCommand.java
index d049d2f1..79d0d408 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/design/endstone/DesignEndStoneCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/design/endstone/DesignEndStoneCommand.java
@@ -52,7 +52,7 @@ public class DesignEndStoneCommand extends SWCommand implements Listener {
             BauSystem.MESSAGE.send("DESIGN_ENDSTONE_REGION_ERROR", player);
             return;
         }
-        if (!region.getGameModeConfig().isLoaded()) {
+        if (!region.getGameModeConfig().loaded) {
             BauSystem.MESSAGE.send("DESIGN_ENDSTONE_REGION_ERROR", player);
             return;
         }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionScoreboardElement.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionScoreboardElement.java
index e4c900fc..7d6db5db 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionScoreboardElement.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionScoreboardElement.java
@@ -43,8 +43,8 @@ public class RegionScoreboardElement implements ScoreboardElement {
     @Override
     public String get(Region region, Player p) {
         if (region.getType().isGlobal()) return null;
-        if (!region.getGameModeConfig().isLoaded()) return null;
-        List<String> names = region.getGameModeConfig().getServer().getChatNames();
+        if (!region.getGameModeConfig().loaded) return null;
+        List<String> names = region.getGameModeConfig().Server.ChatNames;
         if (names.isEmpty()) return null;
         return "§e" + BauSystem.MESSAGE.parse("SCOREBOARD_REGION", p) + "§8: §7" + names.get(0);
     }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/RegionLib.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/RegionLib.java
index 87ee8687..265d7a45 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/RegionLib.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/RegionLib.java
@@ -51,7 +51,7 @@ public class RegionLib implements LuaLib {
             if (rg.getType().isGlobal()) {
                 return "global";
             }
-            List<String> chatNames = rg.getGameModeConfig().getServer().getChatNames();
+            List<String> chatNames = rg.getGameModeConfig().Server.ChatNames;
             if (chatNames.isEmpty()) {
                 return "unknown";
             }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/techhider/TechHiderCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/techhider/TechHiderCommand.java
index fe7b8a4b..7cb18b50 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/techhider/TechHiderCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/techhider/TechHiderCommand.java
@@ -65,7 +65,7 @@ public class TechHiderCommand extends SWCommand implements Listener, ScoreboardE
         }
 
         Optional<TechHider> techHider = techHiders.computeIfAbsent(region, rg -> {
-            if (!region.getGameModeConfig().getTechhider().isActive()) {
+            if (!region.getGameModeConfig().Techhider.Active) {
                 return Optional.empty();
             }
 
@@ -74,7 +74,7 @@ public class TechHiderCommand extends SWCommand implements Listener, ScoreboardE
             TechHider current = new TechHider((p, cX, cY) -> {
                 if (rg.getBuildArea().isChunkOutside(cX, cY)) return true;
                 return !hidden.get(rg).contains(p);
-            }, region.getGameModeConfig().getTechhider().getObfuscateWith(), region.getGameModeConfig().getTechhider().getHiddenBlocks(), region.getGameModeConfig().getTechhider().getHiddenBlockEntities());
+            }, region.getGameModeConfig().Techhider.ObfuscateWith, region.getGameModeConfig().Techhider.HiddenBlocks, region.getGameModeConfig().Techhider.HiddenBlockEntities);
             current.enable();
 
             return Optional.of(current);
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/xray/XrayCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/xray/XrayCommand.java
index 29c83ec8..babd0d88 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/xray/XrayCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/xray/XrayCommand.java
@@ -67,13 +67,13 @@ public class XrayCommand extends SWCommand implements Listener, ScoreboardElemen
         }
 
         Optional<TechHider> techHider = techHiders.computeIfAbsent(region, rg -> {
-            if (!region.getGameModeConfig().getTechhider().isActive()) {
+            if (!region.getGameModeConfig().Techhider.Active) {
                 return Optional.empty();
             }
 
             hidden.put(rg, new HashSet<>());
 
-            Set<Material> blocks = new HashSet<>(Arrays.asList(region.getGameModeConfig().getTechhider().getObfuscateWith()));
+            Set<Material> blocks = new HashSet<>(Arrays.asList(region.getGameModeConfig().Techhider.ObfuscateWith));
             if (blocks.contains(Material.END_STONE)) blocks.add(Material.END_STONE_BRICKS);
             xrayedBlocks.put(region, blocks);
             return Optional.of(createXray(rg, blocks));
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/GameModeConfig.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/GameModeConfig.java
deleted file mode 100644
index ee4089ab..00000000
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/GameModeConfig.java
+++ /dev/null
@@ -1,128 +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;
-
-import de.steamwar.core.FlatteningWrapper;
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import org.bukkit.Material;
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.configuration.file.FileConfiguration;
-import org.bukkit.configuration.file.YamlConfiguration;
-
-import java.io.File;
-import java.util.*;
-import java.util.stream.Collectors;
-
-@Getter
-public class GameModeConfig {
-
-    private final boolean loaded;
-
-    /**
-     * See gamemode config Times key
-     */
-    private Times Times = new Times();
-    private Schematic Schematic = new Schematic();
-    private Arena Arena = new Arena();
-    private Server Server = new Server();
-    private Techhider Techhider = new Techhider();
-
-    public GameModeConfig(File file) {
-        if (file == null || !file.exists()) {
-            loaded = false;
-            return;
-        }
-        loaded = true;
-
-        FileConfiguration config = YamlConfiguration.loadConfiguration(file);
-
-        Times.load(config.getConfigurationSection("Times"));
-        Schematic.load(config.getConfigurationSection("Schematic"));
-        Arena.load(config.getConfigurationSection("Arena"));
-        Server.load(config.getConfigurationSection("Server"));
-        Techhider.load(config.getConfigurationSection("Techhider"));
-    }
-
-    @NoArgsConstructor(access = AccessLevel.PRIVATE)
-    @Getter
-    public static class Times {
-        private int PreFightDuration = 30;
-
-        private void load(ConfigurationSection section) {
-            PreFightDuration = section.getInt("PreFightDuration", 30);
-        }
-    }
-
-    @NoArgsConstructor(access = AccessLevel.PRIVATE)
-    @Getter
-    public static class Schematic {
-        private Map<Set<Material>, Integer> Limited = new HashMap<>();
-
-        private void load(ConfigurationSection section) {
-            for(Map<?, ?> entry : section.getMapList("Limited")) {
-                int amount = (Integer) entry.get("Amount");
-                Set<String> materials = new HashSet<>((List<String>) entry.get("Materials"));
-                if (amount == 0) {
-                    materials.forEach(material -> Limited.put(Collections.singleton(Material.getMaterial(material)), 0));
-                } else {
-                    Limited.put(materials.stream().map(Material::getMaterial).collect(Collectors.toSet()), amount);
-                }
-            }
-        }
-    }
-
-    @NoArgsConstructor(access = AccessLevel.PRIVATE)
-    @Getter
-    public static class Arena {
-        private boolean NoFloor = false;
-
-        private void load(ConfigurationSection section) {
-            NoFloor = section.getBoolean("NoFloor", false);
-        }
-    }
-
-    @NoArgsConstructor(access = AccessLevel.PRIVATE)
-    @Getter
-    public static class Server {
-        private List<String> ChatNames;
-
-        private void load(ConfigurationSection section) {
-            ChatNames = section.getStringList("ChatNames");
-        }
-    }
-
-    @NoArgsConstructor(access = AccessLevel.PRIVATE)
-    @Getter
-    public static class Techhider {
-        private boolean Active = false;
-        private Material ObfuscateWith = Material.END_STONE;
-        private Set<Material> HiddenBlocks = new HashSet<>();
-        private Set<String> HiddenBlockEntities = new HashSet<>();
-
-        private void load(ConfigurationSection section) {
-            Active = section.getBoolean("Active", false);
-            ObfuscateWith = Material.getMaterial(section.getString("ObfuscateWith", "END_STONE"));
-            HiddenBlocks = section.getStringList("HiddenBlocks").stream().map(String::toUpperCase).map(FlatteningWrapper.impl::getMaterial).filter(Objects::nonNull).collect(Collectors.toUnmodifiableSet());
-            HiddenBlockEntities = Collections.unmodifiableSet(new HashSet<>(section.getStringList("HiddenBlockEntities")));
-        }
-    }
-}
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
index 4b99d523..4b98caf1 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
@@ -22,8 +22,11 @@ package de.steamwar.bausystem.region;
 import com.sk89q.worldedit.extent.clipboard.Clipboard;
 import de.steamwar.bausystem.utils.FlatteningWrapper;
 import de.steamwar.bausystem.utils.PasteBuilder;
+import de.steamwar.data.GameModeConfig;
+import de.steamwar.sql.SchematicType;
 import lombok.NonNull;
 import org.bukkit.Location;
+import org.bukkit.Material;
 
 import javax.annotation.Nullable;
 import java.io.File;
@@ -64,7 +67,7 @@ public interface Region {
     Area getTestblockArea();
 
     @NonNull
-    GameModeConfig getGameModeConfig();
+    GameModeConfig<Material, SchematicType, String> getGameModeConfig();
 
     @NonNull
     RegionHistory getHistory();
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalRegion.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalRegion.java
index 66f7c44a..1edc4787 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalRegion.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalRegion.java
@@ -22,9 +22,13 @@ package de.steamwar.bausystem.region.fixed;
 import com.sk89q.worldedit.extent.clipboard.Clipboard;
 import de.steamwar.bausystem.region.*;
 import de.steamwar.bausystem.utils.PasteBuilder;
+import de.steamwar.data.GameModeConfig;
+import de.steamwar.data.YMLWrapperImpl;
+import de.steamwar.sql.SchematicType;
 import lombok.NonNull;
 import lombok.Setter;
 import org.bukkit.Location;
+import org.bukkit.Material;
 
 import javax.annotation.Nullable;
 import java.io.File;
@@ -90,7 +94,7 @@ public final class FixedGlobalRegion implements Region {
         }
     };
 
-    private static final GameModeConfig GLOBAL_CONFIG = new GameModeConfig(null);
+    private static final GameModeConfig<Material, SchematicType, String> GLOBAL_CONFIG = new GameModeConfig<>(YMLWrapperImpl.ofTyped(null));
 
     private FixedGlobalRegion() {
     }
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java
index d6278424..69d7b9d0 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java
@@ -28,9 +28,12 @@ import de.steamwar.bausystem.utils.FlatteningWrapper;
 import de.steamwar.bausystem.utils.PasteBuilder;
 import de.steamwar.bausystem.worlddata.WorldData;
 import de.steamwar.core.Core;
+import de.steamwar.data.GameModeConfig;
+import de.steamwar.data.YMLWrapperImpl;
 import de.steamwar.sql.SchematicType;
 import lombok.NonNull;
 import org.bukkit.Bukkit;
+import org.bukkit.Material;
 import yapion.hierarchy.types.YAPIONObject;
 
 import javax.annotation.Nullable;
@@ -57,7 +60,7 @@ public class FixedRegion implements Region {
     private final Area testblock;
     private final int floorLevel;
     private final int waterLevel;
-    private final GameModeConfig gameModeConfig;
+    private final GameModeConfig<Material, SchematicType, String> gameModeConfig;
     private final RegionData regionData;
     private final RegionHistory regionHistory = new RegionHistory.Impl(20);
 
@@ -336,7 +339,7 @@ public class FixedRegion implements Region {
                 break;
             }
         }
-        this.gameModeConfig = new GameModeConfig(found);
+        this.gameModeConfig = new GameModeConfig<>(YMLWrapperImpl.ofTyped(found));
         this.regionData = new RegionData.RegionDataImpl(regionData, WorldData::write);
     }
 
diff --git a/CommonCore/Data/build.gradle.kts b/CommonCore/Data/build.gradle.kts
index a8ffa845..b458588b 100644
--- a/CommonCore/Data/build.gradle.kts
+++ b/CommonCore/Data/build.gradle.kts
@@ -22,4 +22,5 @@ plugins {
 }
 
 dependencies {
+    api(project(":CommonCore:SQL"))
 }
\ No newline at end of file
diff --git a/CommonCore/Data/src/de/steamwar/data/GameModeConfig.java b/CommonCore/Data/src/de/steamwar/data/GameModeConfig.java
new file mode 100644
index 00000000..d68fddcd
--- /dev/null
+++ b/CommonCore/Data/src/de/steamwar/data/GameModeConfig.java
@@ -0,0 +1,821 @@
+/*
+ *   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.data;
+
+import de.steamwar.sql.SchematicType;
+import lombok.ToString;
+
+import java.io.File;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@ToString
+public final class GameModeConfig<M, ST, W> {
+
+    private static final Random random = new Random();
+    public static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("dd.MM.yyyy HH:mm");
+
+    public final boolean loaded;
+    public final File configFile;
+
+    public final Server Server;
+
+    /**
+     * Submission deadline for schematics in 'dd.MM.yyyy HH:mm' format
+     * @implSpec {@code null} by default
+     */
+    public final Date Deadline;
+
+    /**
+     * The questions that have to be answered to accept the schematic
+     *
+     * @implSpec Disables check schem type if missing
+     */
+    public final List<String> CheckQuestions;
+    public final Times Times;
+    public final Arena Arena;
+    public final Schematic<M, ST> Schematic;
+
+    /**
+     * The name of the game mode presented to the players
+     *
+     * @implSpec {@code YMLWrapper.getDefaultGameName()} by default
+     */
+    public final String GameName;
+
+    /**
+     * The months this game mode should be active and playable<br/>
+     * The empty List means all of them
+     *
+     * @implNote 1 is January - 12 is December
+     */
+    public final List<Integer> ActiveMonths;
+
+    /**
+     * The prefix used for team chats
+     *
+     * @implSpec {@code +} by default
+     */
+    public final String TeamChatPrefix;
+    public final Blue Blue;
+    public final Red Red;
+
+    /**
+     * The list of active win conditions
+     */
+    public final List<W> WinConditions;
+    public final WinConditionParams<M> WinConditionParams;
+    public final Kits<M> Kits;
+
+    /**
+     * A list of integers containing the waiting time of this enter stage in the fight
+     */
+    public final List<Integer> EnterStages;
+    public final Techhider<M> Techhider;
+
+    public GameModeConfig(YMLWrapper<M, ST, W> loader) {
+        configFile = loader.getFile();
+        loaded = loader.canLoad();
+        Server = new Server(loader.with("Server"));
+
+        String deadlineString = loader.getString("Deadline", null);
+        if (deadlineString != null) {
+            Date Deadline = null;
+            try {
+                Deadline = DATE_FORMAT.parse(deadlineString);
+            } catch (ParseException e) {
+                Deadline = null;
+            }
+            this.Deadline = Deadline;
+        } else {
+            Deadline = null;
+        }
+
+        CheckQuestions = loader.getStringList("CheckQuestions");
+        Times = new Times(loader.with("Times"));
+        // Arena would be here to be in config order but needs Schematic.Size and EnterStages loaded afterwards
+        Schematic = new Schematic<>(loader.with("Schematic"));
+        GameName = loader.getString("GameName", loader.getDefaultGameName());
+        ActiveMonths = loader.getIntList("ActiveMonths");
+        TeamChatPrefix = loader.getString("TeamChatPrefix", "+");
+        Blue = new Blue(loader.with("Blue"));
+        Red = new Red(loader.with("Red"));
+        WinConditions = Collections.unmodifiableList(loader.getStringList("WinConditions").stream().map(loader.winconditionMapper).collect(Collectors.toList()));
+        WinConditionParams = new WinConditionParams<>(loader.with("WinConditionParams"));
+        Kits = new Kits<>(loader.with("Kits"));
+        EnterStages = loader.getIntList("EnterStages");
+        Techhider = new Techhider<>(loader.with("Techhider"));
+
+        Arena = new Arena(loader.with("Arena"), Schematic.Size, EnterStages);
+    }
+
+    @ToString
+    public static final class Server {
+
+        public final boolean loaded;
+
+        /**
+         * Base server folder
+         */
+        public final String Folder;
+
+        /**
+         * Server java archive
+         */
+        public final String ServerJar;
+
+        /**
+         * Available arenas
+         */
+        public final List<String> Maps;
+
+        /**
+         * Names to address the game mode in the chat interface
+         */
+        public final List<String> ChatNames;
+
+        /**
+         * If the Server is a Spigot server
+         *
+         * @implSpec {@code false} by default
+         */
+        public final boolean Spigot;
+
+        /**
+         * If the game mode should be marked as a historic game mode
+         *
+         * @implSpec {@code false} by default
+         */
+        public final boolean Historic;
+
+        /**
+         * If ranked matches should be available for the game mode
+         *
+         * @implSpec {@code false} by default
+         */
+        public final boolean Ranked;
+
+        private Server(YMLWrapper loader) {
+            loaded = loader.canLoad();
+            Folder = loader.getString("Folder", null);
+            ServerJar = loader.getString("ServerJar", null);
+            Maps = loader.getStringList("Maps");
+            ChatNames = loader.getStringList("ChatNames");
+            Spigot = loader.getBoolean("Spigot", false);
+            Historic = loader.getBoolean("Historic", false);
+            Ranked = loader.getBoolean("Ranked", false);
+        }
+    }
+
+    @ToString
+    public static final class Times {
+        public final boolean loaded;
+
+        /**
+         * Time in seconds the server stops after starting if nobody joins
+         *
+         * @implSpec {@code 300} by default
+         */
+        public final int NoPlayersOnlineDuration;
+
+        /**
+         * Time in seconds the team leaders have to choose their schematic
+         *
+         * @implSpec {@code 120} by default
+         */
+        public final int PreSchemPasteDuration;
+
+        /**
+         * Time in seconds for preparing
+         *
+         * @implSpec {@code 300} by default
+         */
+        public final int SetupDuration;
+
+        /**
+         * Time in seconds the final countdown is long
+         *
+         * @implSpec {@code 30} by default
+         */
+        public final int PreFightDuration;
+
+        /**
+         * Time in seconds to spectate the arena after the fight
+         *
+         * @implSpec {@code 30} by default
+         */
+        public final int SpectatorDuration;
+
+        private Times(YMLWrapper loader) {
+            loaded = loader.canLoad();
+            NoPlayersOnlineDuration = loader.getInt("NoPlayersOnlineDuration", 300);
+            PreSchemPasteDuration = loader.getInt("PreSchemPasteDuration", 120);
+            SetupDuration = loader.getInt("SetupDuration", 300);
+            PreFightDuration = loader.getInt("PreFightDuration", 30);
+            SpectatorDuration = loader.getInt("SpectatorDuration", 60);
+        }
+    }
+
+    @ToString
+    public static final class Arena {
+
+        public final boolean loaded;
+
+        /**
+         * The amount of blocks the schematics should be pasted under the surface
+         *
+         * @implSpec {@code 0} by default
+         */
+        public final int WaterDepth;
+
+        /**
+         * The outer border of the arena, measured in blocks around the schematic areas
+         */
+        public final Schem2Border Schem2Border;
+
+        /**
+         * The offset the teams spawn relative to the center of their area
+         */
+        public final SpawnOffset SpawnOffset;
+
+        /**
+         * The size of the team areas are expanded around the schematics
+         *
+         * @implSpec {@code 12} by default
+         */
+        public final int BorderFromSchematic;
+
+        /**
+         * If ground walkable, teams can walk below the lower arena border during setup
+         *
+         * @implSpec {@code true} by default
+         */
+        public final boolean GroundWalkable;
+
+        /**
+         * Disable snow and ice melting
+         *
+         * @implSpec {@code false} by default
+         */
+        public final boolean DisableSnowMelt;
+
+        /**
+         * Allow leaving the arena area as spectator
+         *
+         * @implSpec {@code false} by default
+         */
+        public final boolean Leaveable;
+
+        /**
+         * Allow missiles to fly to the enemy and not stop at the schem border.
+         *
+         * @implSpec {@code !EnterStages.isEmpty()} by default
+         */
+        public final boolean AllowMissiles;
+
+        /**
+         * Denotes that there is no floor for this GameMode
+         *
+         * @implSpec {@code false} by default
+         */
+        public final boolean NoFloor;
+
+        private Arena(YMLWrapper loader, Schematic.Size Size, List<Integer> EnterStages) {
+            loaded = loader.canLoad();
+            WaterDepth = loader.getInt("WaterDepth", 0);
+            Schem2Border = new Schem2Border(loader.with("Schem2Border"));
+            SpawnOffset = new SpawnOffset(loader.with("SpawnOffset"), Size);
+            BorderFromSchematic = loader.getInt("BorderFromSchematic", 21);
+            GroundWalkable = loader.getBoolean("GroundWalkable", true);
+            DisableSnowMelt = loader.getBoolean("DisableSnowMelt", false);
+            Leaveable = loader.getBoolean("Leaveable", false);
+            AllowMissiles = loader.getBoolean("AllowMissiles", !EnterStages.isEmpty());
+            NoFloor = loader.getBoolean("NoFloor", false);
+        }
+
+        @ToString
+        public static final class Schem2Border {
+
+            public final boolean loaded;
+
+            /**
+             * @implSpec {@code 24} by default
+             */
+            public final int x;
+
+            /**
+             * @implSpec {@code 24} by default
+             */
+            public final int z;
+
+            private Schem2Border(YMLWrapper loader) {
+                loaded = loader.canLoad();
+                x = loader.getInt("x", 24);
+                z = loader.getInt("z", 24);
+            }
+        }
+
+        @ToString
+        public static final class SpawnOffset {
+
+            public final boolean loaded;
+
+            /**
+             * @implSpec {@code 0} by default
+             */
+            public final double x;
+
+            /**
+             * @implSpec {@code Schematic.Size.y} by default
+             */
+            public final double y;
+
+            /**
+             * @implSpec {@code 0} by default
+             */
+            public final double z;
+
+            private SpawnOffset(YMLWrapper loader, Schematic.Size Size) {
+                loaded = loader.canLoad();
+                x = loader.getDouble("x", 0);
+                y = loader.getDouble("y", Size.y);
+                z = loader.getDouble("z", 0);
+            }
+        }
+    }
+
+    @ToString
+    public static final class Schematic<M, ST> {
+
+        public final boolean loaded;
+
+        /**
+         * The size of the schematics
+         */
+        public final Size Size;
+
+        /**
+         * Used for GameModes with a technic area
+         */
+        public final Inset Inset;
+
+        /**
+         * The schematic type that can be chosen in this arena
+         *
+         * @implSpec {@code Normal} by default
+         */
+        public final ST Type;
+
+        /**
+         * The schematic types that are also allowed to be chosen in this arena
+         */
+        public final List<ST> SubTypes;
+
+        /**
+         * Shortcut of the schematic type
+         *
+         * @implSpec {@code ""} by default
+         */
+        public final String Shortcut;
+
+        /**
+         * Spigot (1.8) material for GUIs
+         *
+         * @implSpec {@code STONE_BUTTON} by default
+         */
+        public final M Material;
+
+        /**
+         * Manual check of schematic necessary
+         *
+         * @implSpec {@code true} by default
+         */
+        public final boolean ManualCheck;
+
+        /**
+         * If the schematics should be rotated during pasting
+         *
+         * @implSpec {@code true} by default
+         */
+        public final boolean Rotate;
+
+        /**
+         * If the schematics should be pasted aligned to the borders instead of centered
+         *
+         * @implSpec {@code false} by default
+         */
+        public final boolean PasteAligned;
+
+        /**
+         * If only public schematics are allowed
+         *
+         * @implSpec {@code false} by default
+         */
+        public final boolean OnlyPublicSchematics;
+
+        /**
+         * If the public only force should be completely disabled
+         *
+         * @implSpec {@code false} by default
+         */
+        public final boolean IgnorePublicOnly;
+
+        /**
+         * If obsidian and bedrock should be replaced during PRE_RUNNING
+         *
+         * @implSpec {@code false} by default
+         */
+        public final boolean ReplaceObsidianBedrock;
+
+        /**
+         * If the replacement should happen with block updates
+         *
+         * @implSpec {@code false} by default
+         */
+        public final boolean ReplaceWithBlockupdates;
+
+        /**
+         * If the schematic perparation arena mode is time limited
+         *
+         * @implSpec {@code false} by default
+         */
+        public final boolean UnlimitedPrepare;
+
+        /**
+         * Maximal amount of blocks allowed in the schematic
+         *
+         * @implSpec {@code 0} by default
+         */
+        public final int MaxBlocks;
+
+        /**
+         * Maximal amount of items per dispenser
+         *
+         * @implSpec {@code 128} by default
+         */
+        public final int MaxDispenserItems;
+
+        /**
+         * Maximal blast resistance for the design blocks
+         *
+         * @implSpec {@code Double.MAX_VALUE} by default
+         */
+        public final double MaxDesignBlastResistance;
+
+        /**
+         * List of limited material (combinations)<br/>
+         * List contains tags Amount (integer) and Materials (List of material names in Spigot 1.12 AND Spigot 1.15 format)
+         */
+        public final Map<Set<M>, Integer> Limited;
+
+        private Schematic(YMLWrapper<M, ST, ?> loader) {
+            loaded = loader.canLoad();
+            Size = new Size(loader.with("Size"));
+            Inset = new Inset(loader.with("Inset"));
+            Type = loader.getSchematicType("Type", "Normal");
+            SubTypes = loader.getSchematicTypeList("SubTypes");
+            Shortcut = loader.getString("Shortcut", "");
+            Material = loader.getMaterial("Material", "STONE_BUTTON");
+            ManualCheck = loader.getBoolean("ManualCheck", true);
+            Rotate = loader.getBoolean("Rotate", true);
+            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);
+            MaxDesignBlastResistance = loader.getDouble("MaxDesignBlastResistance", Double.MAX_VALUE);
+
+            Map<Set<M>, Integer> Limited = new HashMap<>();
+            for (Map<?, ?> entry : loader.getMapList("Limited")) {
+                int amount = (Integer) entry.get("Amount");
+                Set<String> materials = new HashSet<>((List<String>) entry.get("Materials"));
+                if (amount == 0) {
+                    materials.forEach(material -> {
+                        Limited.put(Collections.singleton(loader.materialMapper.apply(material.toUpperCase())), 0);
+                    });
+                } else {
+                    Limited.put(Collections.unmodifiableSet(materials.stream().map(String::toUpperCase).map(loader.materialMapper).collect(Collectors.toSet())), amount);
+                }
+            }
+            this.Limited = Collections.unmodifiableMap(Limited);
+        }
+
+        @ToString
+        public static final class Size {
+
+            public final boolean loaded;
+
+            /**
+             * @implSpec {@code 0} by default
+             */
+            public final int x;
+
+            /**
+             * @implSpec {@code 0} by default
+             */
+            public final int y;
+
+            /**
+             * @implSpec {@code 0} by default
+             */
+            public final int z;
+
+            private Size(YMLWrapper loader) {
+                loaded = loader.canLoad();
+                x = loader.getInt("x", 0);
+                y = loader.getInt("y", 0);
+                z = loader.getInt("z", 0);
+            }
+        }
+
+        @ToString
+        public static final class Inset {
+
+            public final boolean loaded;
+
+            /**
+             * @implSpec {@code 0} by default
+             */
+            public final int x;
+
+            /**
+             * @implSpec {@code 0} by default
+             */
+            public final int z;
+
+            /**
+             * @implSpec {@code 0} by default
+             */
+            public final int top;
+
+            /**
+             * @implSpec {@code 0} by default
+             */
+            public final int bottom;
+
+            private Inset(YMLWrapper loader) {
+                loaded = loader.canLoad();
+                x = loader.getInt("x", 0);
+                z = loader.getInt("z", 0);
+                top = loader.getInt("top", 0);
+                bottom = loader.getInt("bottom", 0);
+            }
+        }
+    }
+
+    @ToString
+    public static final class Blue {
+
+        public final boolean loaded;
+
+        /**
+         * @implSpec {@code Blau} by default
+         */
+        public final String Name;
+
+        /**
+         * @implSpec {@code §3} by default
+         */
+        public final String Prefix;
+
+        private Blue(YMLWrapper loader) {
+            loaded = loader.canLoad();
+            Name = loader.getString("Name", "Blau");
+            Prefix = loader.getString("Prefix", "§3");
+        }
+    }
+
+    @ToString
+    public static final class Red {
+
+        public final boolean loaded;
+
+        /**
+         * @implSpec {@code Rot} by default
+         */
+        public final String Name;
+
+        /**
+         * @implSpec {@code §c} by default
+         */
+        public final String Prefix;
+
+        private Red(YMLWrapper loader) {
+            loaded = loader.canLoad();
+            Name = loader.getString("Name", "Rot");
+            Prefix = loader.getString("Prefix", "§c");
+        }
+    }
+
+    @ToString
+    public static final class WinConditionParams<M> {
+
+        public final boolean loaded;
+
+        /**
+         * The time of any of the timeout win conditions in seconds
+         *
+         * @implSpec {@code 1200} by default
+         */
+        public final int TimeoutTime;
+
+        /**
+         * The percentage when any of the percent win conditions limits or triggers a win
+         *
+         * @implSpec {@code 7.0} by default
+         */
+        public final double PercentWin;
+
+        /**
+         * Does the percentage still change after the start of the enter phase
+         *
+         * @implSpec {@code true} by default
+         */
+        public final boolean PercentEntern;
+
+        /**
+         * Is Blocks a whitelist (true) or blacklist (false)
+         *
+         * @implSpec {@code false} by default
+         */
+        public final boolean BlocksWhitelist;
+
+        /**
+         * Special Blocks (Valid spigot material values) used by the percent win conditions
+         */
+        public final List<M> Blocks;
+
+        /**
+         * Time for being declared TechKo without a shot given.
+         *
+         * @implSpec {@code 90} by default
+         */
+        public final int TechKoTime;
+
+        private WinConditionParams(YMLWrapper<M, ?, ?> loader) {
+            loaded = loader.canLoad();
+            TimeoutTime = loader.getInt("TimeoutTime", 1200);
+            PercentWin = loader.getDouble("PercentWin", 7.0);
+            PercentEntern = loader.getBoolean("PercentEntern", true);
+            BlocksWhitelist = loader.getBoolean("BlocksWhitelist", false);
+            Blocks = loader.getMaterialList("Blocks");
+            TechKoTime = loader.getInt("TechKoTime", 90);
+        }
+    }
+
+    @ToString
+    public static final class Kits<M> {
+
+        public final boolean loaded;
+
+        /**
+         * The kit file for this configuration
+         *
+         * @implSpec {@code kits.yml} by default
+         */
+        public final String File;
+
+        /**
+         * The default kit for team members
+         *
+         * @implSpec {@code default} by default
+         */
+        public final String MemberDefault;
+
+        /**
+         * The default kit for team leaders
+         *
+         * @implSpec {@code default} by default
+         */
+        public final String LeaderDefault;
+
+        /**
+         * If the personal kit system is active
+         *
+         * @implSpec {@code false} by default
+         */
+        public final boolean PersonalKits;
+
+        /**
+         * Items (Valid spigot material values) that are not allowed in the personal kit
+         */
+        public final List<M> ForbiddenItems;
+
+        private Kits(YMLWrapper<M, ?, ?> loader) {
+            loaded = loader.canLoad();
+            File = loader.getString("File", "kits.yml");
+            MemberDefault = loader.getString("MemberDefault", "default");
+            LeaderDefault = loader.getString("LeaderDefault", "default");
+            PersonalKits = loader.getBoolean("PersonalKits", false);
+            ForbiddenItems = loader.getMaterialList("ForbiddenItems");
+        }
+    }
+
+    @ToString
+    public static final class Techhider<M> {
+
+        public final boolean loaded;
+
+        /**
+         * Activates the tech hider
+         *
+         * @implSpec {@code false} by default
+         */
+        public final boolean Active;
+
+        /**
+         * Which block the tech hider replaces to.
+         *
+         * @implSpec {@code end_stone} by default
+         */
+        public final M ObfuscateWith;
+
+        /**
+         * A list of all hidden blocks. "water" results in the hiding of all waterlogged blocks as well.
+         */
+        public final Set<M> HiddenBlocks;
+
+        /**
+         * The block entity contents that are hidden (here with minecraft:nametag)
+         */
+        public final Set<String> HiddenBlockEntities;
+
+        private Techhider(YMLWrapper<M, ?, ?> loader) {
+            loaded = loader.canLoad();
+            Active = loader.getBoolean("Active", false);
+            ObfuscateWith = loader.getMaterial("ObfuscateWith", "end_stone");
+            HiddenBlocks = Collections.unmodifiableSet(new HashSet<>(loader.getMaterialList("HiddenBlocks")));
+            HiddenBlockEntities = Collections.unmodifiableSet(new HashSet<>(loader.getStringList("HiddenBlockEntities")));
+        }
+    }
+
+    public boolean isAfterDeadline() {
+        return Deadline != null && Deadline.before(Date.from(Instant.now()));
+    }
+
+    public String hasMap(String map) {
+        for (String m : Server.Maps) {
+            if (m.equalsIgnoreCase(map))
+                return m;
+        }
+        return null;
+    }
+
+    public String getRandomMap() {
+        return Server.Maps.get(random.nextInt(Server.Maps.size()));
+    }
+
+    public String convertToRealMapName(String map) {
+        for (String m : Server.Maps) {
+            if (m.equalsIgnoreCase(map))
+                return m;
+        }
+        return null;
+    }
+
+    public String getChatName() {
+        return Server.ChatNames.get(0);
+    }
+
+    public boolean isActive() {
+        if (Server.ChatNames.isEmpty()) return false;
+        if (ActiveMonths.isEmpty()) return true;
+        return ActiveMonths.contains(LocalDateTime.now().getMonth().getValue());
+    }
+
+    public String getSchemTypeOrInternalName() {
+        if (Schematic.loaded) {
+            ST type = Schematic.Type;
+            if (type instanceof SchematicType) {
+                return ((SchematicType) type).toDB();
+            } else if (type instanceof String) {
+                return (String) type;
+            }
+        }
+        return configFile.getName().replace(".yml", "");
+    }
+}
diff --git a/CommonCore/Data/src/de/steamwar/data/YMLWrapper.java b/CommonCore/Data/src/de/steamwar/data/YMLWrapper.java
new file mode 100644
index 00000000..7e9df6b4
--- /dev/null
+++ b/CommonCore/Data/src/de/steamwar/data/YMLWrapper.java
@@ -0,0 +1,98 @@
+/*
+ *   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.data;
+
+import de.steamwar.sql.SchematicType;
+
+import java.io.File;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+public abstract class YMLWrapper<M, ST, W> {
+
+    public static final Function<String, String> ToString = Function.identity();
+    public static final Function<String, SchematicType> ToSchematicType = SchematicType::fromDB;
+
+    protected final File file;
+    public final Function<String, M> materialMapper;
+    public final Function<String, ST> schematicTypeMapper;
+    public final Function<String, W> winconditionMapper;
+
+    protected YMLWrapper(File file, Function<String, M> materialMapper, Function<String, ST> schematicTypeMapper, Function<String, W> winconditionMapper) {
+        this.file = file;
+        this.materialMapper = materialMapper;
+        this.schematicTypeMapper = schematicTypeMapper;
+        this.winconditionMapper = winconditionMapper;
+    }
+
+    public final File getFile() {
+        return file;
+    }
+
+    public abstract boolean canLoad();
+
+    public abstract YMLWrapper<M, ST, W> with(String path);
+
+    public abstract String getDefaultGameName();
+
+    public abstract String getString(String path, String defaultValue);
+
+    public abstract int getInt(String path, int defaultValue);
+
+    public abstract double getDouble(String path, double defaultValue);
+
+    public abstract boolean getBoolean(String path, boolean defaultValue);
+
+    public final ST getSchematicType(String path, String defaultValue) {
+        String schematicType = getString(path, defaultValue);
+        return schematicTypeMapper.apply(schematicType);
+    }
+
+    public final M getMaterial(String path, String defaultValue) {
+        return materialMapper.apply(getString(path, defaultValue).toUpperCase());
+    }
+
+    public abstract List<String> getStringList(String path);
+
+    public abstract List<Integer> getIntList(String path);
+
+    public final List<ST> getSchematicTypeList(String path) {
+        List<String> list = getStringList(path);
+        if (list.isEmpty()) {
+            return Collections.emptyList();
+        } else {
+            return Collections.unmodifiableList(list.stream().map(schematicTypeMapper).collect(Collectors.toList()));
+        }
+    }
+
+    public final List<M> getMaterialList(String path) {
+        List<String> list = getStringList(path);
+        if (list.isEmpty()) {
+            return Collections.emptyList();
+        } else {
+            return Collections.unmodifiableList(list.stream().map(String::toUpperCase).map(materialMapper).collect(Collectors.toList()));
+        }
+    }
+
+    public abstract List<Map<?, ?>> getMapList(String path);
+}
diff --git a/CommonCore/SQL/src/de/steamwar/sql/SchematicType.java b/CommonCore/SQL/src/de/steamwar/sql/SchematicType.java
index 10d96a92..53c75eff 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/SchematicType.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/SchematicType.java
@@ -21,9 +21,11 @@ package de.steamwar.sql;
 
 import de.steamwar.sql.internal.SqlTypeMapper;
 import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
 
 import java.util.*;
 
+@Slf4j
 public class SchematicType {
 
 	public static final SchematicType Normal = new SchematicType("Normal", "", Type.NORMAL, null, "STONE_BUTTON", false);
@@ -38,7 +40,10 @@ public class SchematicType {
 		tmpTypes.add(Normal);
 		tmpFromDB.put(Normal.name().toLowerCase(), Normal);
 
+        long time = System.currentTimeMillis();
 		SQLWrapper.impl.loadSchemTypes(tmpTypes, tmpFromDB);
+        time = System.currentTimeMillis() - time;
+        log.info("Loaded {} Schematic Types in {}ms", tmpTypes.size(), time);
 
 		fromDB = Collections.unmodifiableMap(tmpFromDB);
 		types = Collections.unmodifiableList(tmpTypes);
diff --git a/FightSystem/FightSystem_Core/src/config.yml b/FightSystem/FightSystem_Core/src/config.yml
index ca3645d6..3356e254 100644
--- a/FightSystem/FightSystem_Core/src/config.yml
+++ b/FightSystem/FightSystem_Core/src/config.yml
@@ -12,11 +12,11 @@ Server:
   # If ranked matches should be available for the game mode
   Ranked: false # defaults to false if missing
 
-# The questions that have to be answered to accept the schematic
-CheckQuestions: [] # Disables check schem type if missing  
+# Submission deadline for schematics in 'dd.MM.yyyy HH:mm' format
+Deadline: null # defaults to null if missing
 
-# The available schematic ranks
-Ranks: [] # Disables ranks for this schematic type if missing
+# The questions that have to be answered to accept the schematic
+CheckQuestions: [] # Disables check schem type if missing
 
 Times:
   # Time in seconds the server stops after starting if nobody joins
@@ -52,6 +52,8 @@ Arena:
   Leaveable: false # defaults to false if missing
   # Allow missiles to fly to the enemy and not stop at the schem border.
   AllowMissiles: false # defaults to true if EnterStages are present otherwise 'false'
+  # Denotes that there is no floor for this GameMode
+  NoFloor: false # defaults to false if missing
 
 Schematic:
   # The size of the schematics
@@ -59,6 +61,12 @@ Schematic:
     x: 0
     y: 0
     z: 0
+  # Used for GameModes with a technic area
+  Inset:
+    x: 0
+    z: 0
+    top: 0
+    bottom: 0
   # The schematic type that can be chosen in this arena
   Type: Normal # defaults to Normal if missing
   # The schematic types that are also allowed to be chosen in this arena
@@ -87,6 +95,8 @@ Schematic:
   MaxBlocks: 0 # defaults to 0 (ignored) if missing
   # Maximal amount of items per dispenser
   MaxDispenserItems: 128 # defaults to 128 if missing
+  # Maximal blast resistance for the design blocks
+  MaxDesignBlastResistance: 100000000 # defaults to Double.MAX_VALUE if missing
   # List of limited material (combinations)
   # List contains tags Amount (integer) and Materials (List of material names in Spigot 1.12 AND Spigot 1.15 format)
   Limited:
@@ -95,6 +105,9 @@ Schematic:
 
 # The name of the game mode presented to the players
 GameName: WarGear # defaults to WarGear if missing
+# The months this game mode should be active and playable
+# The empty List means all of them
+ActiveMonths: [] # defaults to none if missing
 # The prefix used for team chats
 TeamChatPrefix: + # defaults to + if missing
 Blue:
@@ -137,6 +150,8 @@ WinConditionParams:
   BlocksWhitelist: false # defaults to false if missing
   # Special Blocks (Valid spigot material values) used by the percent win conditions
   Blocks: [] # defaults to none if missing
+  # Time for being declared TechKo without a shot given.
+  TechKoTime: 90 # defaults to 90 if missing
 
 Kits:
   # The kit file for this configuration
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/Config.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/Config.java
index 289b76d3..57c556ed 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/Config.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/Config.java
@@ -19,6 +19,8 @@
 
 package de.steamwar.fightsystem;
 
+import de.steamwar.data.GameModeConfig;
+import de.steamwar.data.YMLWrapperImpl;
 import de.steamwar.fightsystem.utils.Region;
 import de.steamwar.fightsystem.winconditions.Winconditions;
 import de.steamwar.sql.*;
@@ -32,9 +34,10 @@ import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;
 
 import java.io.File;
-import java.util.*;
+import java.util.Collections;
+import java.util.Set;
+import java.util.UUID;
 import java.util.logging.Level;
-import java.util.stream.Collectors;
 
 public class Config {
 
@@ -42,15 +45,7 @@ public class Config {
 
     public static final World world = Bukkit.getWorlds().get(0);
 
-    //Fight sequence
-    public static final int NoPlayerOnlineDuration;
-    public static final int PreSchemPasteDuration;
-    public static final int SetupDuration;
-    public static final int PreFightDuration;
-    public static final int SpectatorDuration;
-
-    // entern parameter
-    public static final List<Integer> EnterStages;
+    public static final GameModeConfig<Material, SchematicType, Winconditions> GameModeConfig;
 
     //arena parameter
     public static final Region BluePasteRegion;
@@ -69,60 +64,20 @@ public class Config {
     private static final int BlueToRedY;
     public static final int BlueToRedZ;
 
-    public static final int PreperationArea;
-    public static final int WaterDepth;
-    public static final boolean GroundWalkable;
-    public static final boolean DisableSnowMelt;
-    public static final boolean ArenaLeaveable;
-    public static final boolean AllowMissiles;
-
     //schematic parameter
-    public static final boolean RanksEnabled;
     public static final boolean OnlyPublicSchematics;
-    public static final boolean IgnorePublicOnly;
-    public static final de.steamwar.sql.SchematicType SchematicType;
-    public static final List<de.steamwar.sql.SchematicType> SubTypes;
+
     public static final boolean RedRotate;
     public static final boolean BlueRotate;
-    public static final boolean PasteAligned;
-    public static final boolean ReplaceObsidianBedrock;
-    public static final boolean ReplaceWithBlockupdates;
-    public static final boolean UnlimitedPrepare;
 
     //team parameter
     public static final String TeamRedName;
     public static final String TeamBlueName;
     public static final String TeamRedColor;
     public static final String TeamBlueColor;
-    public static final String GameName;
-    public static final String TeamChatDetection;
     public static final UUID BlueLeader;
     public static final UUID RedLeader;
 
-    //Active win conditions
-    public static final Set<Winconditions> ActiveWinconditions;
-
-    //win condition parameters
-    public static final int TimeoutTime;
-    public static final double PercentWin;
-    public static final boolean PercentEntern;
-    public static final boolean PercentBlocksWhitelist;
-    public static final Set<Material> PercentBlocks;
-    public static final int TechKoTime;
-
-    //default kits
-    public static final String MemberDefault;
-    public static final String LeaderDefault;
-    public static final boolean PersonalKits;
-    public static final Set<Material> ForbiddenItems;
-    public static final String KitFile;
-
-    //tech hider parameter
-    public static final boolean TechhiderActive;
-    public static final Set<Material> HiddenBlocks;
-    public static final Set<String> HiddenBlockEntities;
-    public static final Material ObfuscateWith;
-
     //event parameter
     public static final EventFight EventKampf;
     private static final Set<Integer> Referees;
@@ -154,7 +109,7 @@ public class Config {
             Bukkit.getLogger().log(Level.SEVERE, "Arenaconfig fehlt!");
             Bukkit.shutdown();
         }
-        FileConfiguration config = YamlConfiguration.loadConfiguration(new File(FightSystem.getPlugin().getDataFolder(), configFile));
+        GameModeConfig = new GameModeConfig<>(YMLWrapperImpl.ofTyped(new File(FightSystem.getPlugin().getDataFolder(), configFile), Winconditions::valueOf));
 
         File worldConfigFile = new File(world.getWorldFolder(), "config.yml");
         if(!worldConfigFile.exists()) {
@@ -163,111 +118,37 @@ public class Config {
         }
         FileConfiguration worldconfig = YamlConfiguration.loadConfiguration(worldConfigFile);
 
-        NoPlayerOnlineDuration = config.getInt("Times.NoPlayersOnlineDuration", 300);
-        PreSchemPasteDuration = config.getInt("Times.PreSchemPasteDuration", 120);
-        SetupDuration = config.getInt("Times.SetupDuration", 300);
-        PreFightDuration = config.getInt("Times.PreFightDuration", 30);
-        SpectatorDuration = config.getInt("Times.SpectatorDuration", 30);
-
         int blueCornerX = worldconfig.getInt("BlueCorner.x");
         int blueCornerY = worldconfig.getInt("BlueCorner.y");
         int blueCornerZ = worldconfig.getInt("BlueCorner.z");
         int underBorder = worldconfig.getInt("UnderBorder", blueCornerY);
 
-        WaterDepth = config.getInt("Arena.WaterDepth", 0);
-        int schem2BorderX = config.getInt("Arena.Schem2Border.x", 24);
-        int schem2BorderZ = config.getInt("Arena.Schem2Border.z", 24);
-        PreperationArea = config.getInt("Arena.BorderFromSchematic", 12);
-        GroundWalkable = config.getBoolean("Arena.GroundWalkable", true);
-        DisableSnowMelt = config.getBoolean("Arena.DisableSnowMelt", false);
-        ArenaLeaveable = config.getBoolean("Arena.Leaveable", false);
-
-        int schemsizeX = config.getInt("Schematic.Size.x");
-        int schemsizeY = config.getInt("Schematic.Size.y");
-        int schemsizeZ = config.getInt("Schematic.Size.z");
-        RanksEnabled = !config.getStringList("Ranks").isEmpty();
-        SchematicType = de.steamwar.sql.SchematicType.fromDB(Objects.requireNonNull(config.getString("Schematic.Type", "normal")));
-        SubTypes = config.getStringList("Schematic.SubTypes").stream().map(de.steamwar.sql.SchematicType::fromDB).collect(Collectors.toList());
-        IgnorePublicOnly = config.getBoolean("Schematic.IgnorePublicOnly", false);
-        boolean rotate = config.getBoolean("Schematic.Rotate", true);
-        PasteAligned = config.getBoolean("Schematic.PasteAligned", false);
-        ReplaceObsidianBedrock = config.getBoolean("Schematic.ReplaceObsidianBedrock", false);
-        ReplaceWithBlockupdates = config.getBoolean("Schematic.ReplaceWithBlockupdates", false);
-        UnlimitedPrepare = config.getBoolean("Schematic.UnlimitedPrepare", false);
-
-        int schemInsetX = config.getInt("Schematic.Inset.x", 0);
-        int schemInsetZ = config.getInt("Schematic.Inset.z", 0);
-        int schemInsetBottom = config.getInt("Schematic.Inset.bottom", 0);
-        int schemInsetTop = config.getInt("Schematic.Inset.top", 0);
-
-        GameName = config.getString("GameName", "WarGear");
-        TeamChatDetection = config.getString("TeamChatPrefix", "+");
-
-        ActiveWinconditions = Collections.unmodifiableSet(config.getStringList("WinConditions").stream().map(Winconditions::valueOf).collect(Collectors.toSet()));
-
-        TimeoutTime = config.getInt("WinConditionParams.TimeoutTime", 1200);
-        PercentWin = config.getDouble("WinConditionParams.PercentWin", 7.0);
-        PercentEntern = config.getBoolean("WinConditionParams.PercentEntern", true);
-        PercentBlocksWhitelist = config.getBoolean("WinConditionParams.BlocksWhitelist", false);
-        PercentBlocks = Collections.unmodifiableSet(config.getStringList("WinConditionParams.Blocks").stream().map(Material::valueOf).collect(Collectors.toSet()));
-        TechKoTime = config.getInt("WinConditionParams.TechKoTime", 90);
-
-        EnterStages = Collections.unmodifiableList(config.getIntegerList("EnterStages"));
-        AllowMissiles = config.getBoolean("Arena.AllowMissiles", !EnterStages.isEmpty());
-
-        KitFile = config.getString("Kits.File", "kits.yml");
-        MemberDefault = config.getString("Kits.MemberDefault", "default");
-        LeaderDefault = config.getString("Kits.LeaderDefault", "default");
-        PersonalKits = config.getBoolean("Kits.PersonalKits", false);
-        ForbiddenItems = Collections.unmodifiableSet(config.getStringList("Kits.ForbiddenItems").stream().map(Material::valueOf).collect(Collectors.toSet()));
-
-        TechhiderActive = config.getBoolean("Techhider.Active", false);
-        ObfuscateWith = Material.getMaterial(config.getString("Techhider.ObfuscateWith", "end_stone").toUpperCase());
-        HiddenBlocks = config.getStringList("Techhider.HiddenBlocks").stream().map(String::toUpperCase).map(Material::getMaterial).collect(Collectors.toSet());
-        HiddenBlockEntities = Collections.unmodifiableSet(new HashSet<>(config.getStringList("Techhider.HiddenBlockEntities")));
-
-        if(schemsizeX < 0){
-            schemsizeX = -schemsizeX;
-            blueCornerX = blueCornerX - schemsizeX;
-        }
-        if(schemsizeY < 0){
-            schemsizeY = -schemsizeY;
-            blueCornerY = blueCornerY - schemsizeY;
-        }
-        if(schemsizeZ < 0){
-            schemsizeZ = -schemsizeZ;
-            blueCornerZ = blueCornerZ - schemsizeZ;
-        }
-
         BlueToRedX = worldconfig.getInt("BlueToRed.x", 0);
         BlueToRedY = worldconfig.getInt("BlueToRed.y", 0);
-        BlueToRedZ = worldconfig.getInt("BlueToRed.z", schemsizeZ + 50);
-        double teamBlueSpawnOffsetX = config.getDouble("Arena.SpawnOffset.x", 0);
-        double teamBlueSpawnOffsetY = config.getDouble("Arena.SpawnOffset.y", schemsizeY);
-        double teamBlueSpawnOffsetZ = config.getDouble("Arena.SpawnOffset.z", 0);
+        BlueToRedZ = worldconfig.getInt("BlueToRed.z", GameModeConfig.Schematic.Size.z + 50);
 
         int teamRedCornerX = BlueToRedX + blueCornerX;
         int teamRedCornerY = BlueToRedY + blueCornerY;
         int teamRedCornerZ = BlueToRedZ + blueCornerZ;
 
-        int teamBluePasteX = blueCornerX + schemsizeX / 2;
-        int teamBluePasteZ = blueCornerZ + schemsizeZ / 2;
+        int teamBluePasteX = blueCornerX + GameModeConfig.Schematic.Size.x / 2;
+        int teamBluePasteZ = blueCornerZ + GameModeConfig.Schematic.Size.z / 2;
         int teamRedPasteX = teamBluePasteX + BlueToRedX;
         int teamRedPasteZ = teamBluePasteZ + BlueToRedZ;
 
         TeamBlueSpawn = new Location(world,
-                teamBluePasteX + 0.5 + teamBlueSpawnOffsetX,
-                blueCornerY + 0.5 + teamBlueSpawnOffsetY,
-                teamBluePasteZ + 0.5 + teamBlueSpawnOffsetZ);
+                teamBluePasteX + 0.5 + GameModeConfig.Arena.SpawnOffset.x,
+                blueCornerY + 0.5 + GameModeConfig.Arena.SpawnOffset.y,
+                teamBluePasteZ + 0.5 + GameModeConfig.Arena.SpawnOffset.z);
 
         TeamRedSpawn = new Location(world,
-                teamRedPasteX + 0.5 - teamBlueSpawnOffsetX,
-                teamRedCornerY + 0.5 + teamBlueSpawnOffsetY,
-                teamRedPasteZ + 0.5 - teamBlueSpawnOffsetZ);
+                teamRedPasteX + 0.5 - GameModeConfig.Arena.SpawnOffset.x,
+                teamRedCornerY + 0.5 + GameModeConfig.Arena.SpawnOffset.y,
+                teamRedPasteZ + 0.5 - GameModeConfig.Arena.SpawnOffset.z);
 
         SpecSpawn = new Location(world,
                 teamBluePasteX + BlueToRedX /2.0,
-                blueCornerY + BlueToRedY /2.0 + schemsizeY/2.0,
+                blueCornerY + BlueToRedY /2.0 + GameModeConfig.Schematic.Size.y/2.0,
                 teamBluePasteZ + BlueToRedZ /2.0);
 
         Vector v1 = TeamBlueSpawn.toVector().subtract(TeamRedSpawn.toVector());
@@ -288,45 +169,45 @@ public class Config {
         int arenaMinZ;
         int arenaMaxZ;
         if(BlueToRedX > 0){
-            arenaMinX = blueCornerX - schem2BorderX;
-            arenaMaxX = teamRedCornerX + schemsizeX + schem2BorderX;
+            arenaMinX = blueCornerX - GameModeConfig.Arena.Schem2Border.x;
+            arenaMaxX = teamRedCornerX + GameModeConfig.Schematic.Size.x + GameModeConfig.Arena.Schem2Border.x;
             teamRedRotate = true;
             teamBlueRotate = false;
         }else{
-            arenaMinX = teamRedCornerX - schem2BorderX;
-            arenaMaxX = blueCornerX + schemsizeX + schem2BorderX;
+            arenaMinX = teamRedCornerX - GameModeConfig.Arena.Schem2Border.x;
+            arenaMaxX = blueCornerX + GameModeConfig.Schematic.Size.x + GameModeConfig.Arena.Schem2Border.x;
             teamRedRotate = false;
             teamBlueRotate = true;
         }
         if(BlueToRedZ > 0){
-            arenaMinZ = blueCornerZ - schem2BorderZ;
-            arenaMaxZ = teamRedCornerZ + schemsizeZ + schem2BorderZ;
+            arenaMinZ = blueCornerZ - GameModeConfig.Arena.Schem2Border.z;
+            arenaMaxZ = teamRedCornerZ + GameModeConfig.Schematic.Size.z + GameModeConfig.Arena.Schem2Border.z;
             teamRedRotate = true;
             teamBlueRotate = false;
         }else{
-            arenaMinZ = teamRedCornerZ - schem2BorderZ;
-            arenaMaxZ = blueCornerZ + schemsizeZ + schem2BorderZ;
+            arenaMinZ = teamRedCornerZ - GameModeConfig.Arena.Schem2Border.z;
+            arenaMaxZ = blueCornerZ + GameModeConfig.Schematic.Size.z + GameModeConfig.Arena.Schem2Border.z;
             if(BlueToRedZ != 0){
                 teamRedRotate = false;
                 teamBlueRotate = true;
             }
         }
-        if(!rotate){
+        if(!GameModeConfig.Schematic.Rotate){
             teamRedRotate = false;
             teamBlueRotate = false;
         }
         RedRotate = teamRedRotate;
         BlueRotate = teamBlueRotate;
 
-        RedPasteRegion = Region.fromSize(teamRedCornerX, teamRedCornerY, teamRedCornerZ, schemsizeX, schemsizeY, schemsizeZ);
-        BluePasteRegion = Region.fromSize(blueCornerX, blueCornerY, blueCornerZ, schemsizeX, schemsizeY, schemsizeZ);
+        RedPasteRegion = Region.fromSize(teamRedCornerX, teamRedCornerY, teamRedCornerZ, GameModeConfig.Schematic.Size.x, GameModeConfig.Schematic.Size.y, GameModeConfig.Schematic.Size.z);
+        BluePasteRegion = Region.fromSize(blueCornerX, blueCornerY, blueCornerZ, GameModeConfig.Schematic.Size.x, GameModeConfig.Schematic.Size.y, GameModeConfig.Schematic.Size.z);
 
-        RedExtendRegion = Region.withExtension(teamRedCornerX, teamRedCornerY, teamRedCornerZ, schemsizeX, schemsizeY, schemsizeZ, PreperationArea, PreperationArea, PreperationArea);
-        BlueExtendRegion = Region.withExtension(blueCornerX, blueCornerY, blueCornerZ, schemsizeX, schemsizeY, schemsizeZ, PreperationArea, PreperationArea, PreperationArea);
-        ArenaRegion = Region.withExtension(arenaMinX, blueCornerY, arenaMinZ, arenaMaxX - arenaMinX, schemsizeY, arenaMaxZ - arenaMinZ, 0, PreperationArea, 0);
+        RedExtendRegion = Region.withExtension(teamRedCornerX, teamRedCornerY, teamRedCornerZ, GameModeConfig.Schematic.Size.x, GameModeConfig.Schematic.Size.y, GameModeConfig.Schematic.Size.z, GameModeConfig.Arena.BorderFromSchematic, GameModeConfig.Arena.BorderFromSchematic, GameModeConfig.Arena.BorderFromSchematic);
+        BlueExtendRegion = Region.withExtension(blueCornerX, blueCornerY, blueCornerZ, GameModeConfig.Schematic.Size.x, GameModeConfig.Schematic.Size.y, GameModeConfig.Schematic.Size.z, GameModeConfig.Arena.BorderFromSchematic, GameModeConfig.Arena.BorderFromSchematic, GameModeConfig.Arena.BorderFromSchematic);
+        ArenaRegion = Region.withExtension(arenaMinX, blueCornerY, arenaMinZ, arenaMaxX - arenaMinX, GameModeConfig.Schematic.Size.y, arenaMaxZ - arenaMinZ, 0, GameModeConfig.Arena.BorderFromSchematic, 0);
         PlayerRegion = new Region(arenaMinX, underBorder, arenaMinZ, arenaMaxX, world.getMaxHeight(), arenaMaxZ);
 
-        BlueInsetRegion = new Region(BluePasteRegion.getMinX() + schemInsetX, BluePasteRegion.getMinY() + schemInsetBottom, BluePasteRegion.getMinZ() + schemInsetZ, BluePasteRegion.getMaxX() - schemInsetX, BluePasteRegion.getMaxY() - schemInsetTop, BluePasteRegion.getMaxZ() - schemInsetZ);
+        BlueInsetRegion = new Region(BluePasteRegion.getMinX() + GameModeConfig.Schematic.Inset.x, BluePasteRegion.getMinY() + GameModeConfig.Schematic.Inset.bottom, BluePasteRegion.getMinZ() + GameModeConfig.Schematic.Inset.z, BluePasteRegion.getMaxX() - GameModeConfig.Schematic.Inset.x, BluePasteRegion.getMaxY() - GameModeConfig.Schematic.Inset.top, BluePasteRegion.getMaxZ() - GameModeConfig.Schematic.Inset.z);
 
         int eventKampfID = Integer.parseInt(System.getProperty("fightID", "0"));
         if(eventKampfID >= 1){
@@ -368,11 +249,11 @@ public class Config {
             }
         }else{
             //No event
-            TeamRedColor = config.getString("Red.Prefix", "§c");
-            TeamBlueColor = config.getString("Blue.Prefix", "§9");
-            TeamRedName = config.getString("Red.Name", "Rot");
-            TeamBlueName = config.getString("Blue.Name", "Blau");
-            OnlyPublicSchematics = config.getBoolean("Schematic.OnlyPublicSchematics", false);
+            TeamRedColor = GameModeConfig.Red.Prefix;
+            TeamBlueColor = GameModeConfig.Blue.Prefix;
+            TeamRedName = GameModeConfig.Red.Name;
+            TeamBlueName = GameModeConfig.Blue.Name;
+            OnlyPublicSchematics = GameModeConfig.Schematic.OnlyPublicSchematics;
             EventTeamBlueID = 0;
             EventTeamRedID = 0;
             EventKampf = null;
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/ai/DummyAI.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/ai/DummyAI.java
index eab9bfd3..fd7e108c 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/ai/DummyAI.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/ai/DummyAI.java
@@ -43,7 +43,7 @@ public class DummyAI extends AI {
 
     @Override
     public SchematicNode chooseSchematic() {
-        List<SchematicNode> publics = SchematicNode.getAllSchematicsOfType(0, Config.SchematicType.toDB());
+        List<SchematicNode> publics = SchematicNode.getAllSchematicsOfType(0, Config.GameModeConfig.Schematic.Type.toDB());
         return publics.get(random.nextInt(publics.size()));
     }
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/Commands.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/Commands.java
index c5fc83fb..7119173e 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/Commands.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/Commands.java
@@ -149,8 +149,8 @@ public class Commands {
             return;
 
         Kit k = null;
-        if(Config.PersonalKits){
-            PersonalKit kit = PersonalKit.get(SteamwarUser.get(p.getUniqueId()).getId(), Config.SchematicType.toDB(), kitName);
+        if(Config.GameModeConfig.Kits.PersonalKits){
+            PersonalKit kit = PersonalKit.get(SteamwarUser.get(p.getUniqueId()).getId(), Config.GameModeConfig.Schematic.Type.toDB(), kitName);
             if(kit != null){
                 kit.setInUse();
                 k = new Kit(kit);
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/GUI.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/GUI.java
index a365dc96..729ce0b6 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/GUI.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/GUI.java
@@ -152,8 +152,8 @@ public class GUI {
 
         List<SWListInv.SWListEntry<Kit>> entries = new ArrayList<>();
 
-        if(Config.PersonalKits){
-            List<PersonalKit> kits = PersonalKit.get(SteamwarUser.get(p.getUniqueId()).getId(), Config.SchematicType.toDB());
+        if(Config.GameModeConfig.Kits.PersonalKits){
+            List<PersonalKit> kits = PersonalKit.get(SteamwarUser.get(p.getUniqueId()).getId(), Config.GameModeConfig.Schematic.Type.toDB());
             kits.forEach(kit -> entries.add(new SWListInv.SWListEntry<>(new SWItem(Material.LEATHER_CHESTPLATE, "§e" + kit.getName(), new ArrayList<>(), kit.isInUse(), clickType -> {}), new Kit(kit))));
         }else{
             List<Kit> kitList = Kit.getAvailableKits(fightPlayer.isLeader());
@@ -169,19 +169,19 @@ public class GUI {
         if(entries.isEmpty()) {
             inv.setItem(22, new SWItem(Material.BARRIER, msg.parse("KIT_NO_KITS", p)));
         }
-        if(Config.PersonalKits){
+        if(Config.GameModeConfig.Kits.PersonalKits){
             inv.setItem(48, Material.NETHER_STAR, msg.parse("KIT_CREATE", p), clickType -> {
                 SWAnvilInv anvilInv = new SWAnvilInv(p, msg.parse("KITNAME_TITLE", p));
                 anvilInv.setItem(Material.LEATHER_CHESTPLATE);
                 anvilInv.setCallback(s -> {
                     SteamwarUser user = SteamwarUser.get(p.getUniqueId());
-                    if(PersonalKit.get(user.getId(), Config.SchematicType.toDB(), s) != null) {
+                    if(PersonalKit.get(user.getId(), Config.GameModeConfig.Schematic.Type.toDB(), s) != null) {
                         msg.sendPrefixless("KITNAME_IN_USE", p, ChatMessageType.ACTION_BAR);
                         p.closeInventory();
                         return;
                     }
                     Kit prototype = Kit.getAvailableKits(Fight.getFightPlayer(p).isLeader()).get(0);
-                    PersonalKit kit = PersonalKit.create(user.getId(), Config.SchematicType.toDB(), s, prototype.getInventory(), prototype.getArmor());
+                    PersonalKit kit = PersonalKit.create(user.getId(), Config.GameModeConfig.Schematic.Type.toDB(), s, prototype.getInventory(), prototype.getArmor());
                     PersonalKitCreator.openKitCreator(p, kit);
                 });
                 anvilInv.open();
@@ -202,14 +202,14 @@ public class GUI {
             return;
         }
 
-        int invSize = (Config.SubTypes.size() + 1) * 9;
-        SWInventory inv = new SWInventory(p, invSize, msg.parse("SCHEM_TITLE", p, Config.GameName));
-        setupSchemTypeRow(p, inv, Config.SchematicType, 0);
-        for (int i = 0; i < Config.SubTypes.size(); i++) {
-            setupSchemTypeRow(p, inv, Config.SubTypes.get(i), i + 1);
+        int invSize = (Config.GameModeConfig.Schematic.SubTypes.size() + 1) * 9;
+        SWInventory inv = new SWInventory(p, invSize, msg.parse("SCHEM_TITLE", p, Config.GameModeConfig.GameName));
+        setupSchemTypeRow(p, inv, Config.GameModeConfig.Schematic.Type, 0);
+        for (int i = 0; i < Config.GameModeConfig.Schematic.SubTypes.size(); i++) {
+            setupSchemTypeRow(p, inv, Config.GameModeConfig.Schematic.SubTypes.get(i), i + 1);
         }
         if (!Config.test() && SteamwarUser.get(p.getUniqueId()).hasPerm(UserPerm.TEAM)) {
-            SchematicNode node = SchematicNode.getSchematicNode(-1, Config.GameName, (Integer) null);
+            SchematicNode node = SchematicNode.getSchematicNode(-1, Config.GameModeConfig.GameName, (Integer) null);
             if (node != null) {
                 inv.setItem(2, new SWItem(SWItem.getMaterial(node.getItem()), msg.parse("SCHEM_DIRT", p), click -> {
                     schemSelect(p, node);
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/EnternCountdown.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/EnternCountdown.java
index 1a019c3a..80d41fd0 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/EnternCountdown.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/EnternCountdown.java
@@ -36,10 +36,10 @@ import java.util.List;
 public class EnternCountdown extends Countdown {
 
     private static int calcTime(FightPlayer fp, Countdown countdown) {
-        int time = Config.EnterStages.get(fp.getKit().getEnterStage());
+        int time = Config.GameModeConfig.EnterStages.get(fp.getKit().getEnterStage());
 
         if(countdown != null) {
-            time -= Config.TimeoutTime - countdown.getTimeLeft();
+            time -= Config.GameModeConfig.WinConditionParams.TimeoutTime - countdown.getTimeLeft();
 
             if(time < 0)
                 time = 0;
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/EventSpectateCountdown.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/EventSpectateCountdown.java
index 64b02810..9f8d2503 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/EventSpectateCountdown.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/EventSpectateCountdown.java
@@ -32,7 +32,7 @@ import de.steamwar.linkage.Linked;
 public class EventSpectateCountdown extends Countdown {
 
     public EventSpectateCountdown() {
-        super(Config.SpectatorDuration, new Message("SHUTDOWN_COUNTDOWN"), SWSound.BLOCK_NOTE_PLING, false);
+        super(Config.GameModeConfig.Times.SpectatorDuration, new Message("SHUTDOWN_COUNTDOWN"), SWSound.BLOCK_NOTE_PLING, false);
         new StateDependentCountdown(ArenaMode.NotRestartable.contains(Config.mode) && !Config.replayserver(), FightState.Spectate, this);
     }
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/NoPlayersOnlineCountdown.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/NoPlayersOnlineCountdown.java
index 0fefdae2..467854e0 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/NoPlayersOnlineCountdown.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/NoPlayersOnlineCountdown.java
@@ -31,9 +31,9 @@ import org.bukkit.Bukkit;
 public class NoPlayersOnlineCountdown extends Countdown {
 
     public NoPlayersOnlineCountdown() {
-        super(Config.NoPlayerOnlineDuration, new Message("SHUTDOWN_COUNTDOWN"), null, false);
+        super(Config.GameModeConfig.Times.NoPlayersOnlineDuration, new Message("SHUTDOWN_COUNTDOWN"), null, false);
 
-        if (!Config.ArenaLeaveable)
+        if (!Config.GameModeConfig.Arena.Leaveable)
             new StateDependentCountdown(ArenaMode.AntiReplay, FightState.PreLeaderSetup, this);
     }
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/PostSchemCountdown.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/PostSchemCountdown.java
index 262ee06d..4c15fa07 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/PostSchemCountdown.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/PostSchemCountdown.java
@@ -30,8 +30,8 @@ import de.steamwar.linkage.Linked;
 public class PostSchemCountdown extends Countdown {
 
     public PostSchemCountdown() {
-        super(Config.SetupDuration, new Message("POST_SCHEM_COUNTDOWN"), null, false);
-        if(Config.mode == ArenaMode.PREPARE && Config.UnlimitedPrepare)
+        super(Config.GameModeConfig.Times.SetupDuration, new Message("POST_SCHEM_COUNTDOWN"), null, false);
+        if(Config.mode == ArenaMode.PREPARE && Config.GameModeConfig.Schematic.UnlimitedPrepare)
             return;
 
         new StateDependentCountdown(ArenaMode.SeriousFight, FightState.PostSchemSetup, this);
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/PreRunningCountdown.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/PreRunningCountdown.java
index 4e6e21de..45b8202e 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/PreRunningCountdown.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/PreRunningCountdown.java
@@ -31,7 +31,7 @@ import de.steamwar.linkage.Linked;
 public class PreRunningCountdown extends Countdown {
 
     public PreRunningCountdown() {
-        super(Config.PreFightDuration, new Message("PRE_RUNNING_COUNTDOWN"), SWSound.BLOCK_NOTE_PLING, true);
+        super(Config.GameModeConfig.Times.PreFightDuration, new Message("PRE_RUNNING_COUNTDOWN"), SWSound.BLOCK_NOTE_PLING, true);
         new StateDependentCountdown(ArenaMode.AntiReplay, FightState.PreRunning, this);
     }
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/PreSchemCountdown.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/PreSchemCountdown.java
index a023b005..45a44296 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/PreSchemCountdown.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/PreSchemCountdown.java
@@ -31,7 +31,7 @@ import de.steamwar.linkage.Linked;
 public class PreSchemCountdown extends Countdown {
 
     public PreSchemCountdown() {
-        super(Config.PreSchemPasteDuration, new Message("PRE_SCHEM_COUNTDOWN"), SWSound.BLOCK_NOTE_PLING, false);
+        super(Config.GameModeConfig.Times.PreSchemPasteDuration, new Message("PRE_SCHEM_COUNTDOWN"), SWSound.BLOCK_NOTE_PLING, false);
         new StateDependentCountdown(ArenaMode.AntiReplay, FightState.PreSchemSetup, this);
     }
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/SpectateOverCountdown.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/SpectateOverCountdown.java
index fca8fa28..4844536a 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/SpectateOverCountdown.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/SpectateOverCountdown.java
@@ -31,7 +31,7 @@ import de.steamwar.linkage.Linked;
 public class SpectateOverCountdown extends Countdown {
 
     public SpectateOverCountdown() {
-        super(Config.test() ? 3600 : Config.SpectatorDuration, new Message("SPECTATE_COUNTDOWN"), SWSound.BLOCK_NOTE_PLING, false);
+        super(Config.test() ? 3600 : Config.GameModeConfig.Times.SpectatorDuration, new Message("SPECTATE_COUNTDOWN"), SWSound.BLOCK_NOTE_PLING, false);
         new StateDependentCountdown(ArenaMode.Restartable.contains(Config.mode) || Config.replayserver(), FightState.Spectate, this);
     }
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/TimeOverCountdown.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/TimeOverCountdown.java
index 600e9a4f..ed90d5e9 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/TimeOverCountdown.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/countdown/TimeOverCountdown.java
@@ -28,7 +28,7 @@ public class TimeOverCountdown extends Countdown {
     private final Runnable timeOver;
 
     public TimeOverCountdown(Runnable timeOver) {
-        super(Config.TimeoutTime, new Message("RUNNING_COUNTDOWN"), SWSound.BLOCK_NOTE_BASS, false);
+        super(Config.GameModeConfig.WinConditionParams.TimeoutTime, new Message("RUNNING_COUNTDOWN"), SWSound.BLOCK_NOTE_BASS, false);
         this.timeOver = timeOver;
     }
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/Fight.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/Fight.java
index 53bd6734..8d983b56 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/Fight.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/Fight.java
@@ -102,7 +102,7 @@ public class Fight {
         if (Config.OnlyPublicSchematics) {
             return true;
         }
-        if (Config.IgnorePublicOnly || ArenaMode.RankedEvent.contains(Config.mode)) {
+        if (Config.GameModeConfig.Schematic.IgnorePublicOnly || ArenaMode.RankedEvent.contains(Config.mode)) {
             return false;
         }
         if (redTeam.getLeader() == null || blueTeam.getLeader() == null) {
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightPlayer.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightPlayer.java
index 91a967e5..a5d605aa 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightPlayer.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightPlayer.java
@@ -53,9 +53,9 @@ public class FightPlayer {
         this.entity = entity;
         this.team = team;
         this.isOut = false;
-        kit = Kit.getKitByName(Config.MemberDefault);
-        if(Config.PersonalKits){
-            PersonalKit personalKit = PersonalKit.getKitInUse(user.getId(), Config.SchematicType.toDB());
+        kit = Kit.getKitByName(Config.GameModeConfig.Kits.MemberDefault);
+        if(Config.GameModeConfig.Kits.PersonalKits){
+            PersonalKit personalKit = PersonalKit.getKitInUse(user.getId(), Config.GameModeConfig.Schematic.Type.toDB());
             if(personalKit != null){
                 kit = new Kit(personalKit);
             }
@@ -75,7 +75,7 @@ public class FightPlayer {
     }
 
     public void startEnternCountdown(Countdown countdown) {
-        if(Config.EnterStages.size() > kit.getEnterStage() && kit.getEnterStage() >= 0)
+        if(Config.GameModeConfig.EnterStages.size() > kit.getEnterStage() && kit.getEnterStage() >= 0)
             enternCountdown = new EnternCountdown(this, countdown);
     }
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightSchematic.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightSchematic.java
index cfca90ac..a9f38555 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightSchematic.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightSchematic.java
@@ -115,9 +115,9 @@ public class FightSchematic extends StateDependent {
             return;
 
         if(clipboard == null){
-            List<SchematicNode> publics = SchematicNode.getAllSchematicsOfType(0, Config.SchematicType.toDB());
+            List<SchematicNode> publics = SchematicNode.getAllSchematicsOfType(0, Config.GameModeConfig.Schematic.Type.toDB());
             if(publics.isEmpty()) {
-                for (SchematicType type : Config.SubTypes) {
+                for (SchematicType type : Config.GameModeConfig.Schematic.SubTypes) {
                     publics = SchematicNode.getAllSchematicsOfType(0, type.toDB());
                     if (!publics.isEmpty()) {
                         break;
@@ -133,7 +133,7 @@ public class FightSchematic extends StateDependent {
 
         if(ArenaMode.AntiReplay.contains(Config.mode)) {
             boolean changeRotation = false;
-            if (Config.ActiveWinconditions.contains(Winconditions.RANDOM_ROTATE)) {
+            if (Config.GameModeConfig.WinConditions.contains(Winconditions.RANDOM_ROTATE)) {
                 changeRotation = new Random().nextBoolean();
                 usedRotate = rotate ^ changeRotation;
             }
@@ -163,9 +163,9 @@ public class FightSchematic extends StateDependent {
                 clipboard,
                 new Location(Config.world, region.centerX(), region.getMinY(), region.centerZ()),
                 new Vector(
-                        Config.PasteAligned && Config.BlueToRedX != 0 ? region.getSizeX()/2.0 - dims.getBlockX() : -dims.getBlockX()/2.0,
-                        Config.WaterDepth != 0 ? Config.WaterDepth - WorldeditWrapper.impl.getWaterDepth(clipboard) : 0,
-                        Config.PasteAligned && Config.BlueToRedZ != 0 ? region.getSizeZ()/2.0 - dims.getBlockZ() : -dims.getBlockZ()/2.0
+                        Config.GameModeConfig.Schematic.PasteAligned && Config.BlueToRedX != 0 ? region.getSizeX()/2.0 - dims.getBlockX() : -dims.getBlockX()/2.0,
+                        Config.GameModeConfig.Arena.WaterDepth != 0 ? Config.GameModeConfig.Arena.WaterDepth - WorldeditWrapper.impl.getWaterDepth(clipboard) : 0,
+                        Config.GameModeConfig.Schematic.PasteAligned && Config.BlueToRedZ != 0 ? region.getSizeZ()/2.0 - dims.getBlockZ() : -dims.getBlockZ()/2.0
                 ).add(new Vector(usedRotate ? 1 : 0, 0, usedRotate ? 1 : 0)),
                 new AffineTransform().rotateY(usedRotate ? 180 : 0)
         );
@@ -179,17 +179,17 @@ public class FightSchematic extends StateDependent {
 
     @Override
     public void disable() {
-        if(!Config.ReplaceObsidianBedrock || Config.mode == ArenaMode.PREPARE)
+        if(!Config.GameModeConfig.Schematic.ReplaceObsidianBedrock || Config.mode == ArenaMode.PREPARE)
             return;
 
         FreezeWorld freezer = null;
-        if(!Config.ReplaceWithBlockupdates)
+        if(!Config.GameModeConfig.Schematic.ReplaceWithBlockupdates)
             freezer = new FreezeWorld();
 
         replaceSync(Material.OBSIDIAN, Material.TNT);
         replaceSync(Material.BEDROCK, Material.SLIME_BLOCK);
 
-        if(!Config.ReplaceWithBlockupdates)
+        if(!Config.GameModeConfig.Schematic.ReplaceWithBlockupdates)
             freezer.disable();
     }
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightTeam.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightTeam.java
index 7418518f..768a2851 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightTeam.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightTeam.java
@@ -56,7 +56,7 @@ import java.util.function.Consumer;
 public class FightTeam {
 
     private static void setKitButton(HotbarKit kit, boolean leader) {
-        if (Kit.getAvailableKits(leader).size() > 1 || Config.PersonalKits)
+        if (Kit.getAvailableKits(leader).size() > 1 || Config.GameModeConfig.Kits.PersonalKits)
             kit.setItem(1, "CHOOSE_KIT", new ItemBuilder(Material.LEATHER_CHESTPLATE).enchant().build(), player -> GUI.kitSelection(player, ""));
         else
             kit.setItem(1, null, null, null);
@@ -144,7 +144,7 @@ public class FightTeam {
         WorldOfColorWrapper.impl.setTeamColor(team, color);
         BountifulWrapper.impl.setNametagVisibility(team);
         team.setNameTagVisibility(NameTagVisibility.HIDE_FOR_OTHER_TEAMS);
-        if (!Config.ActiveWinconditions.contains(Winconditions.AMONG_US)) {
+        if (!Config.GameModeConfig.WinConditions.contains(Winconditions.AMONG_US)) {
             team.setAllowFriendlyFire(false);
         }
 
@@ -357,10 +357,10 @@ public class FightTeam {
         if(!silent)
             FightUI.addSubtitle("UI_LEADER_JOINS", prefix, leader.getEntity().getName());
 
-        publicsOnly = SchematicNode.getAllAccessibleSchematicsOfType(leader.getUser().getId(), Config.SchematicType.toDB()).isEmpty();
+        publicsOnly = SchematicNode.getAllAccessibleSchematicsOfType(leader.getUser().getId(), Config.GameModeConfig.Schematic.Type.toDB()).isEmpty();
 
-        if(!Config.PersonalKits)
-            leader.setKit(Kit.getKitByName(Config.LeaderDefault));
+        if(!Config.GameModeConfig.Kits.PersonalKits)
+            leader.setKit(Kit.getKitByName(Config.GameModeConfig.Kits.LeaderDefault));
 
         leader.ifPlayer(player -> {
             if(FightState.getFightState() != FightState.POST_SCHEM_SETUP)
@@ -417,7 +417,7 @@ public class FightTeam {
 
     public void setSchem(SchematicNode schematic, int revision){
         this.schematic.setSchematic(schematic, revision);
-        broadcast("SCHEMATIC_CHOSEN", Config.GameName, schematic.getName());
+        broadcast("SCHEMATIC_CHOSEN", Config.GameModeConfig.GameName, schematic.getName());
     }
 
     public void setReady(boolean ready) {
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightWorld.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightWorld.java
index 764de118..36a7c6fa 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightWorld.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightWorld.java
@@ -71,7 +71,7 @@ public class FightWorld extends StateDependent {
     public static void resetWorld(){
         List<Entity> entities = new ArrayList<>();
         Recording.iterateOverEntities(Objects::nonNull, entity -> {
-            if(entity.getType() != EntityType.PLAYER && (!Config.ArenaLeaveable || Config.ArenaRegion.inRegion(entity.getLocation())))
+            if(entity.getType() != EntityType.PLAYER && (!Config.GameModeConfig.Arena.Leaveable || Config.ArenaRegion.inRegion(entity.getLocation())))
                 entities.add(entity);
         });
         entities.forEach(Entity::remove);
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/HotbarKit.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/HotbarKit.java
index 17edca7e..01d20315 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/HotbarKit.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/HotbarKit.java
@@ -71,7 +71,7 @@ public class HotbarKit extends Kit {
         for(int i = 0; i < HOTBAR_SIZE; i++) {
             if(nameTags[i] != null) {
                 ItemMeta meta = Objects.requireNonNull(getInventory()[i].getItemMeta());
-                meta.setDisplayName(FightSystem.getMessage().parse(nameTags[i], player, Config.GameName));
+                meta.setDisplayName(FightSystem.getMessage().parse(nameTags[i], player, Config.GameModeConfig.GameName));
                 getInventory()[i].setItemMeta(meta);
             }
         }
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/Kit.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/Kit.java
index 8183d98c..0bba6ae5 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/Kit.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/Kit.java
@@ -49,7 +49,7 @@ import java.util.*;
 import java.util.logging.Level;
 
 public class Kit {
-    private static final File kits = new File(FightSystem.getPlugin().getDataFolder(), Config.KitFile);
+    private static final File kits = new File(FightSystem.getPlugin().getDataFolder(), Config.GameModeConfig.Kits.File);
     private static final ArrayList<Kit> loadedKits = new ArrayList<>();
 
     protected static final Map<Player, Kit> activeKits = new HashMap<>();
@@ -179,7 +179,7 @@ public class Kit {
     }
 
     public void removeBadItems(){
-        Kit normal = Kit.getKitByName(Config.MemberDefault);
+        Kit normal = Kit.getKitByName(Config.GameModeConfig.Kits.MemberDefault);
         assert normal != null;
 
         for(int i = 0; i < inventory.length; i++){
@@ -194,7 +194,7 @@ public class Kit {
             return false;
 
         //Check for forbidden item
-        if(Config.ForbiddenItems.contains(stack.getType()))
+        if(Config.GameModeConfig.Kits.ForbiddenItems.contains(stack.getType()))
             return true;
 
         //Check for attribute modifiers
@@ -211,7 +211,7 @@ public class Kit {
                 return true; //Blocks prefilled inventories
         }
 
-        Kit normal = Kit.getKitByName(Config.MemberDefault);
+        Kit normal = Kit.getKitByName(Config.GameModeConfig.Kits.MemberDefault);
         assert normal != null;
         return !normal.isEnchantmentInKit(stack) && !stack.getEnchantments().isEmpty();
     }
@@ -303,8 +303,8 @@ public class Kit {
         }
 
         inv.setCallback(-999, click -> player.closeInventory());
-        if(Config.PersonalKits){
-            inv.setItem(49, SWItem.getMaterial("WOOD_AXE"), FightSystem.getMessage().parse("KIT_PREVIEW_EDIT", player), clickType -> PersonalKitCreator.openKitCreator(player, PersonalKit.get(SteamwarUser.get(player.getUniqueId()).getId(), Config.SchematicType.toDB(), name)));
+        if(Config.GameModeConfig.Kits.PersonalKits){
+            inv.setItem(49, SWItem.getMaterial("WOOD_AXE"), FightSystem.getMessage().parse("KIT_PREVIEW_EDIT", player), clickType -> PersonalKitCreator.openKitCreator(player, PersonalKit.get(SteamwarUser.get(player.getUniqueId()).getId(), Config.GameModeConfig.Schematic.Type.toDB(), name)));
             inv.setItem(53, Material.BARRIER, FightSystem.getMessage().parse("KIT_PREVIEW_DELETE", player), clickType -> {
                 player.closeInventory();
                 SWInventory conf = new SWInventory(player, 9, FightSystem.getMessage().parse("KIT_DELETION_CONFIRMATION", player));
@@ -312,9 +312,9 @@ public class Kit {
                 conf.setItem(0, SWItem.getDye(10), FightSystem.getMessage().parse("KIT_DELETION_DELETE", player), click -> {
                     player.closeInventory();
                     SteamwarUser user = SteamwarUser.get(player.getUniqueId());
-                    PersonalKit kit = PersonalKit.get(user.getId(), Config.SchematicType.toDB(), name);
+                    PersonalKit kit = PersonalKit.get(user.getId(), Config.GameModeConfig.Schematic.Type.toDB(), name);
                     if(kit.isInUse()) {
-                        List<PersonalKit> kits = PersonalKit.get(user.getId(), Config.SchematicType.toDB());
+                        List<PersonalKit> kits = PersonalKit.get(user.getId(), Config.GameModeConfig.Schematic.Type.toDB());
                         if(!kits.isEmpty()){
                             PersonalKit kit1 = kits.get(0);
                             kit1.setInUse();
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/ArenaBorder.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/ArenaBorder.java
index 57d8ec6a..16c125c3 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/ArenaBorder.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/ArenaBorder.java
@@ -47,7 +47,7 @@ public class ArenaBorder implements Listener {
     public ArenaBorder() {
         new StateDependentListener(ArenaMode.All, FightState.All, this);
         new StateDependentTask(ArenaMode.All, FightState.Running, this::damage, 2, 2);
-        new StateDependentListener(!Config.GroundWalkable, FightState.AntiRunning, new Listener() {
+        new StateDependentListener(!Config.GameModeConfig.Arena.GroundWalkable, FightState.AntiRunning, new Listener() {
             @EventHandler
             public void onMove(PlayerMoveEvent e) {
                 Player player = e.getPlayer();
@@ -102,7 +102,7 @@ public class ArenaBorder implements Listener {
     }
 
     private void addToSpectator(Player player) {
-        if(Config.ArenaLeaveable || !player.isOnline() || playerBorder.contains(player))
+        if(Config.GameModeConfig.Arena.Leaveable || !player.isOnline() || playerBorder.contains(player))
             return;
 
         spectatorBorder.addPlayer(player);
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/ArrowStopper.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/ArrowStopper.java
index 926ef27b..19d2db5f 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/ArrowStopper.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/ArrowStopper.java
@@ -40,7 +40,7 @@ public class ArrowStopper {
     private static final BlockFace[] BLOCK_FACES = {BlockFace.UP, BlockFace.DOWN, BlockFace.EAST, BlockFace.WEST, BlockFace.NORTH, BlockFace.SOUTH};
 
     public ArrowStopper() {
-        new StateDependentTask(Config.TechhiderActive, FightState.Running, this::run, 1, 1);
+        new StateDependentTask(Config.GameModeConfig.Techhider.Active, FightState.Running, this::run, 1, 1);
     }
 
     private static final Class<?> entityArrow = Reflection.getClass("net.minecraft.world.entity.projectile.AbstractArrow");
@@ -87,7 +87,7 @@ public class ArrowStopper {
     }
 
     private boolean checkBlock(Block block) {
-        return Config.HiddenBlocks.contains(block.getType());
+        return Config.GameModeConfig.Techhider.HiddenBlocks.contains(block.getType());
     }
 
     private boolean invalidEntity(Projectile entity) {
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/BlockFadeListener.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/BlockFadeListener.java
index 4cf9a3d1..55179a5b 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/BlockFadeListener.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/BlockFadeListener.java
@@ -32,7 +32,7 @@ import org.bukkit.event.block.BlockFadeEvent;
 public class BlockFadeListener implements Listener {
 
     public BlockFadeListener() {
-        new StateDependentListener(Config.DisableSnowMelt, FightState.All, this);
+        new StateDependentListener(Config.GameModeConfig.Arena.DisableSnowMelt, FightState.All, this);
     }
 
     @EventHandler
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Chat.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Chat.java
index 610c5859..00a5c41e 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Chat.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Chat.java
@@ -51,7 +51,7 @@ public class Chat implements Listener {
         FightTeam fightTeam = Fight.getPlayerTeam(player);
         if(fightTeam != null) {
             String teamName = fightTeam.getColoredName();
-            if(message.startsWith(Config.TeamChatDetection)) {
+            if(message.startsWith(Config.GameModeConfig.TeamChatPrefix)) {
                 fightTeam.broadcastChat(player, message.substring(1));
             } else {
                 broadcastChat("PARTICIPANT_CHAT", teamName, player.getName(), message);
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/DenyWorldInteraction.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/DenyWorldInteraction.java
index 91c76db1..f21fb3d4 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/DenyWorldInteraction.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/DenyWorldInteraction.java
@@ -82,13 +82,13 @@ public class DenyWorldInteraction implements Listener {
 
     @EventHandler
     public void handleEntityExplode(EntityExplodeEvent event) {
-        if(!Config.ArenaLeaveable || Config.ArenaRegion.inRegion(event.getLocation()))
+        if(!Config.GameModeConfig.Arena.Leaveable || Config.ArenaRegion.inRegion(event.getLocation()))
             event.setCancelled(true);
     }
 
     @EventHandler
     public void handleBlockBurn(BlockIgniteEvent event) {
-        if(!Config.ArenaLeaveable || Config.ArenaRegion.inRegion(event.getBlock()))
+        if(!Config.GameModeConfig.Arena.Leaveable || Config.ArenaRegion.inRegion(event.getBlock()))
             event.setCancelled(true);
     }
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/InFightDamage.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/InFightDamage.java
index 5a2d2cfc..3fc94b27 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/InFightDamage.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/InFightDamage.java
@@ -39,7 +39,7 @@ import java.util.Objects;
 public class InFightDamage implements Listener {
 
     public InFightDamage() {
-        new StateDependentListener(!Config.ActiveWinconditions.contains(Winconditions.AMONG_US), FightState.Running, this);
+        new StateDependentListener(!Config.GameModeConfig.WinConditions.contains(Winconditions.AMONG_US), FightState.Running, this);
     }
 
     @EventHandler
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/JoinRequestListener.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/JoinRequestListener.java
index 5a6d8d20..267b32c2 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/JoinRequestListener.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/JoinRequestListener.java
@@ -54,7 +54,7 @@ public class JoinRequestListener implements Listener {
         Player player = event.getPlayer();
         FightPlayer fp = Fight.getFightPlayer(player);
 
-        if (!Config.ArenaLeaveable && (fp == null || !fp.isLiving())) {
+        if (!Config.GameModeConfig.Arena.Leaveable && (fp == null || !fp.isLiving())) {
             HotbarKit.SPECTATOR_KIT.loadToPlayer(player);
         }
     }
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/LeaveableArena.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/LeaveableArena.java
index 6daa719b..d08df0f2 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/LeaveableArena.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/LeaveableArena.java
@@ -42,7 +42,7 @@ public class LeaveableArena implements Listener {
     private final Map<Player, GameMode> spectatorsInArena = new HashMap<>();
 
     public LeaveableArena() {
-        new StateDependentListener(Config.ArenaLeaveable, FightState.All, this);
+        new StateDependentListener(Config.GameModeConfig.Arena.Leaveable, FightState.All, this);
     }
 
     @EventHandler(priority = EventPriority.MONITOR)
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Permanent.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Permanent.java
index 444eb1a1..f4489caf 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Permanent.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Permanent.java
@@ -99,7 +99,7 @@ public class Permanent implements Listener {
         Player player = event.getPlayer();
         FightPlayer fp = Fight.getFightPlayer(player);
 
-        if (!Config.ArenaLeaveable && fp == null) {
+        if (!Config.GameModeConfig.Arena.Leaveable && fp == null) {
             player.setGameMode(GameMode.SPECTATOR);
             spectatorTeam.addEntry(player.getName());
             player.teleport(Config.SpecSpawn);
@@ -111,13 +111,13 @@ public class Permanent implements Listener {
 
     @EventHandler(priority = EventPriority.MONITOR)
     public void handlePlayerDeath(PlayerDeathEvent event) {
-        if(!Config.ArenaLeaveable || Fight.fighting(event.getEntity()))
+        if(!Config.GameModeConfig.Arena.Leaveable || Fight.fighting(event.getEntity()))
             event.setDeathMessage(null);
     }
 
     @EventHandler(priority = EventPriority.MONITOR)
     public void handlePlayerLeave(PlayerQuitEvent event) {
-        if(!Config.ArenaLeaveable)
+        if(!Config.GameModeConfig.Arena.Leaveable)
             event.setQuitMessage(null);
     }
 
@@ -163,8 +163,8 @@ public class Permanent implements Listener {
         Player player = e.getPlayer();
 
         ItemStack stack = e.getItem().getItemStack();
-        if(Config.PersonalKits) {
-            if(Config.ForbiddenItems.contains(stack.getType())) {
+        if(Config.GameModeConfig.Kits.PersonalKits) {
+            if(Config.GameModeConfig.Kits.ForbiddenItems.contains(stack.getType())) {
                 e.setCancelled(true);
             }
         } else {
@@ -192,7 +192,7 @@ public class Permanent implements Listener {
 
     @EventHandler
     public void onWorldLoad(WorldLoadEvent e) {
-        if(!Config.ArenaLeaveable)
+        if(!Config.GameModeConfig.Arena.Leaveable)
             e.getWorld().setAutoSave(false);
     }
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/PersonalKitCreator.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/PersonalKitCreator.java
index 02fb7487..422e2a94 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/PersonalKitCreator.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/PersonalKitCreator.java
@@ -53,7 +53,7 @@ public class PersonalKitCreator implements Listener {
     private static final Map<HumanEntity, InventoryBackup> openKitCreators = new HashMap<>();
 
     public PersonalKitCreator(){
-        new StateDependentListener(Config.PersonalKits, FightState.Setup, this);
+        new StateDependentListener(Config.GameModeConfig.Kits.PersonalKits, FightState.Setup, this);
     }
 
     public static void openKitCreator(Player player, PersonalKit kit){
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/PistonListener.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/PistonListener.java
index cb583a08..a7dffacb 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/PistonListener.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/PistonListener.java
@@ -45,8 +45,8 @@ public class PistonListener implements Listener {
             return;
 
         //Wenn Entern aktiv ist, sollen Raketen etc. entern können
-        new StateDependentListener(!Config.AllowMissiles, FightState.All, this);
-        new StateDependentListener(Config.AllowMissiles, FightState.Setup, this);
+        new StateDependentListener(!Config.GameModeConfig.Arena.AllowMissiles, FightState.All, this);
+        new StateDependentListener(Config.GameModeConfig.Arena.AllowMissiles, FightState.Setup, this);
     }
 
     @EventHandler
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/PrepareSchem.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/PrepareSchem.java
index 1da8cb58..151a74ce 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/PrepareSchem.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/PrepareSchem.java
@@ -85,7 +85,7 @@ public class PrepareSchem implements Listener {
                     return;
                 }
 
-                schem.setSchemtype(Config.SchematicType.checkType());
+                schem.setSchemtype(Config.GameModeConfig.Schematic.Type.checkType());
                 schem.setPrepared(true);
 
                 try{
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Shutdown.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Shutdown.java
index 5fc5e4b4..c298ba7e 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Shutdown.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Shutdown.java
@@ -38,7 +38,7 @@ public class Shutdown implements Listener {
 
     @EventHandler
     public void handlePlayerQuit(PlayerQuitEvent event) {
-        if(Config.replayserver() || Config.ArenaLeaveable)
+        if(Config.replayserver() || Config.GameModeConfig.Arena.Leaveable)
             return;
 
         //Shutdown server if nobody online
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/WaterRemover.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/WaterRemover.java
index ac39a7fc..c8dda3cb 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/WaterRemover.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/WaterRemover.java
@@ -42,7 +42,7 @@ import java.util.Map;
 @Linked
 public class WaterRemover implements Listener {
 
-    private static final int MIN_Y = Config.BluePasteRegion.getMinY() + Config.WaterDepth;
+    private static final int MIN_Y = Config.BluePasteRegion.getMinY() + Config.GameModeConfig.Arena.WaterDepth;
 
     private final Map<Integer, FightTeam> tnt = new HashMap<>();
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java
index ccb6d085..8628d3fb 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java
@@ -90,8 +90,8 @@ public class PacketProcessor implements Listener {
     private final PacketSource source;
     private final BukkitTask task;
     private final LinkedList<Runnable> syncList = new LinkedList<>();
-    private final Set<Integer> hiddenBlockIds = Config.HiddenBlocks.stream().flatMap(m -> BlockIds.impl.materialToAllIds(m).stream()).collect(Collectors.toSet());
-    private final int obfuscateWith = BlockIds.impl.materialToId(Config.ObfuscateWith);
+    private final Set<Integer> hiddenBlockIds = Config.GameModeConfig.Techhider.HiddenBlocks.stream().flatMap(m -> BlockIds.impl.materialToAllIds(m).stream()).collect(Collectors.toSet());
+    private final int obfuscateWith = BlockIds.impl.materialToId(Config.GameModeConfig.Techhider.ObfuscateWith);
     private final FreezeWorld freezer = new FreezeWorld();
     private final REntityServer entityServer = new REntityServer();
     private final Map<Integer, REntity> entities = new HashMap<>();
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/OneShotStateDependent.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/OneShotStateDependent.java
index a09ea35c..afa992ca 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/OneShotStateDependent.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/OneShotStateDependent.java
@@ -36,7 +36,7 @@ public class OneShotStateDependent extends StateDependent{
     }
 
     public OneShotStateDependent(Winconditions wincondition, Set<FightState> states, Runnable runnable) {
-        super(Config.ActiveWinconditions.contains(wincondition), states);
+        super(Config.GameModeConfig.WinConditions.contains(wincondition), states);
         this.runnable = runnable;
         register();
     }
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/StateDependent.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/StateDependent.java
index 53fa852e..56bee0ec 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/StateDependent.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/StateDependent.java
@@ -31,7 +31,7 @@ public abstract class StateDependent implements IStateDependent {
     private final boolean register;
 
     protected StateDependent(Winconditions wincondition, Set<FightState> states){
-        this(Config.ActiveWinconditions.contains(wincondition), states);
+        this(Config.GameModeConfig.WinConditions.contains(wincondition), states);
     }
 
     protected StateDependent(Set<ArenaMode> mode, Set<FightState> states){
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/StateDependentCountdown.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/StateDependentCountdown.java
index 3ad3bc4c..df8a93d5 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/StateDependentCountdown.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/StateDependentCountdown.java
@@ -43,7 +43,7 @@ public class StateDependentCountdown extends StateDependent {
     }
 
     public StateDependentCountdown(Winconditions wincondition, Set<FightState> states, Countdown countdown) {
-        this(Config.ActiveWinconditions.contains(wincondition), states, countdown);
+        this(Config.GameModeConfig.WinConditions.contains(wincondition), states, countdown);
     }
 
     public StateDependentCountdown(boolean active, Set<FightState> states, Countdown countdown) {
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/StateDependentListener.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/StateDependentListener.java
index c3c3a7cb..ba5c64b5 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/StateDependentListener.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/StateDependentListener.java
@@ -34,7 +34,7 @@ public class StateDependentListener extends StateDependent{
     private final Listener listener;
 
     public StateDependentListener(Winconditions wincondition, Set<FightState> states, Listener listener){
-        super(Config.ActiveWinconditions.contains(wincondition), states);
+        super(Config.GameModeConfig.WinConditions.contains(wincondition), states);
         this.listener = listener;
         register();
     }
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/StateDependentTask.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/StateDependentTask.java
index 7753d477..87e65f49 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/StateDependentTask.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/StateDependentTask.java
@@ -37,7 +37,7 @@ public class StateDependentTask extends StateDependent {
     private BukkitTask task = null;
 
     public StateDependentTask(Winconditions wincondition, Set<FightState> states, Runnable runnable, long delay, long period){
-        this(Config.ActiveWinconditions.contains(wincondition), states, runnable, delay, period);
+        this(Config.GameModeConfig.WinConditions.contains(wincondition), states, runnable, delay, period);
     }
 
     public StateDependentTask(boolean enabled, Set<FightState> states, Runnable runnable, long delay, long period){
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/BungeeFightInfo.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/BungeeFightInfo.java
index f01d7865..7d3b31f8 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/BungeeFightInfo.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/BungeeFightInfo.java
@@ -43,7 +43,7 @@ public class BungeeFightInfo {
     private void send() {
         NetworkSender.send(new FightInfoPacket(
                 Config.world.getName(),
-                Config.SchematicType.toDB(),
+                Config.GameModeConfig.Schematic.Type.toDB(),
                 "",
                 Fight.getBlueTeam().getColoredName(),
                 Fight.getRedTeam().getColoredName(),
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/FightStatistics.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/FightStatistics.java
index 38931d74..f3cd3d5c 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/FightStatistics.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/FightStatistics.java
@@ -94,7 +94,7 @@ public class FightStatistics {
     private void disable() {
         FightTeam winner = FightSystem.getLastWinner();
         String windescription = FightSystem.getLastWinreason();
-        String gameMode = Config.SchematicType.toDB();
+        String gameMode = Config.GameModeConfig.Schematic.Type.toDB();
         Instant endTime = Instant.now();
 
         int blueLeader = getLeader(Fight.getBlueTeam());
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/Hull.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/Hull.java
index 5c793107..60fbd3ac 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/Hull.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/Hull.java
@@ -42,7 +42,7 @@ public class Hull {
     private static final IntVector[] NO_BRANCHES = new IntVector[0];
 
     private static boolean isOccluding(Material material) {
-        return material.isOccluding() || Config.HiddenBlocks.contains(material);
+        return material.isOccluding() || Config.GameModeConfig.Techhider.HiddenBlocks.contains(material);
     }
 
     @Getter
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/TechHiderWrapper.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/TechHiderWrapper.java
index 935a3a9f..d72e6949 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/TechHiderWrapper.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/TechHiderWrapper.java
@@ -50,7 +50,7 @@ import java.util.concurrent.ConcurrentHashMap;
 
 public class TechHiderWrapper extends StateDependent implements TechHider.LocationEvaluator, Listener {
 
-    public static final boolean ENABLED = !Config.OnlyPublicSchematics && !Config.test() && Config.TechhiderActive;
+    public static final boolean ENABLED = !Config.OnlyPublicSchematics && !Config.test() && Config.GameModeConfig.Techhider.Active;
 
     @Getter
     private final ConcurrentHashMap<Player, Region> hiddenRegion = new ConcurrentHashMap<>();
@@ -60,7 +60,7 @@ public class TechHiderWrapper extends StateDependent implements TechHider.Locati
 
     public TechHiderWrapper() {
         super(ENABLED, FightState.Schem);
-        techHider = new TechHider(this, Config.ObfuscateWith, Config.HiddenBlocks, Config.HiddenBlockEntities);
+        techHider = new TechHider(this, Config.GameModeConfig.Techhider.ObfuscateWith, Config.GameModeConfig.Techhider.HiddenBlocks, Config.GameModeConfig.Techhider.HiddenBlockEntities);
 
         try {
             key = new SecretKeySpec(Files.readAllBytes(new File(System.getProperty("user.home"), "hullhider.key").toPath()), "AES");
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionBasePercent.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionBasePercent.java
index afeca37d..73711f2b 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionBasePercent.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionBasePercent.java
@@ -40,7 +40,7 @@ public abstract class WinconditionBasePercent extends Wincondition implements Pr
     private final Map<FightTeam, TeamPercent> teamMap = new HashMap<>();
 
     protected Consumer<FightTeam> checkWin = team -> {
-        if (getPercent(team) >= Config.PercentWin) {
+        if (getPercent(team) >= Config.GameModeConfig.WinConditionParams.PercentWin) {
             win(Fight.getOpposite(team), "WIN_PERCENT", team.getColoredName());
         }
     };
@@ -49,7 +49,7 @@ public abstract class WinconditionBasePercent extends Wincondition implements Pr
     public WinconditionBasePercent(Winconditions wincondition, String windescription) {
         super(windescription);
 
-        if (Config.ActiveWinconditions.contains(wincondition)) {
+        if (Config.GameModeConfig.WinConditions.contains(wincondition)) {
             printableWinconditions.add(this);
             percentWincondition = this;
         }
@@ -58,7 +58,7 @@ public abstract class WinconditionBasePercent extends Wincondition implements Pr
     }
 
     public Message getDisplay(FightTeam team) {
-        return new Message("BAR_PERCENT", team.getPrefix() + (Math.round(10000.0 * (1.0 - getPercent(team) / Config.PercentWin)) / 100.0));
+        return new Message("BAR_PERCENT", team.getPrefix() + (Math.round(10000.0 * (1.0 - getPercent(team) / Config.GameModeConfig.WinConditionParams.PercentWin)) / 100.0));
     }
 
     public double getPercent(FightTeam team) {
@@ -93,13 +93,13 @@ public abstract class WinconditionBasePercent extends Wincondition implements Pr
             if (
                     event.getEntityType() == EntityType.FIREBALL ||
                     !team.getExtendRegion().inRegion(event.getEntity().getLocation()) ||
-                    (!Config.PercentEntern && !Config.EnterStages.isEmpty() && Config.EnterStages.get(0) >= Wincondition.getTimeOverCountdown().getTimeLeft())
+                    (!Config.GameModeConfig.WinConditionParams.PercentEntern && !Config.GameModeConfig.EnterStages.isEmpty() && Config.GameModeConfig.EnterStages.get(0) >= Wincondition.getTimeOverCountdown().getTimeLeft())
             ) {
                 return;
             }
 
             event.blockList().forEach(block -> {
-                if (countAnyBlock || Config.PercentBlocks.contains(block.getType()) == Config.PercentBlocksWhitelist) {
+                if (countAnyBlock || Config.GameModeConfig.WinConditionParams.Blocks.contains(block.getType()) == Config.GameModeConfig.WinConditionParams.BlocksWhitelist) {
                     currentBlocks--;
                 }
             });
@@ -111,7 +111,7 @@ public abstract class WinconditionBasePercent extends Wincondition implements Pr
             totalBlocks = 0;
             countAnyBlock = false;
             team.getSchemRegion().forEach((x, y, z) -> {
-                if (Config.PercentBlocks.contains(Config.world.getBlockAt(x, y, z).getType()) == Config.PercentBlocksWhitelist)
+                if (Config.GameModeConfig.WinConditionParams.Blocks.contains(Config.world.getBlockAt(x, y, z).getType()) == Config.GameModeConfig.WinConditionParams.BlocksWhitelist)
                     totalBlocks++;
             });
             // Edge Case for DirtBlock
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionBlocks.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionBlocks.java
index 21fab040..fce8f574 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionBlocks.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionBlocks.java
@@ -57,7 +57,7 @@ public abstract class WinconditionBlocks extends Wincondition implements Printab
             }
         };
 
-        if(Config.ActiveWinconditions.contains(wincondition))
+        if(Config.GameModeConfig.WinConditions.contains(wincondition))
             printableWinconditions.add(this);
     }
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionComparisonTimeout.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionComparisonTimeout.java
index ae9cc0b1..375e7ad5 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionComparisonTimeout.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionComparisonTimeout.java
@@ -31,7 +31,7 @@ public abstract class WinconditionComparisonTimeout extends Wincondition {
 
     public WinconditionComparisonTimeout(Winconditions wincondition, String windescription, String winMessage, ToDoubleFunction<FightTeam> evaluate) {
         super(windescription);
-        if(Config.ActiveWinconditions.contains(wincondition)) {
+        if(Config.GameModeConfig.WinConditions.contains(wincondition)) {
             timeOverCountdown = new StateDependentCountdown(wincondition, FightState.Running, new TimeOverCountdown(() -> comparisonWin(evaluate, winMessage, "WIN_TIME_OVER")));
         }
     }
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPoints.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPoints.java
index a1e252df..558a66be 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPoints.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPoints.java
@@ -52,7 +52,7 @@ public class WinconditionPoints extends WinconditionBasePercent implements Liste
 
         new StateDependentListener(Winconditions.POINTS, FightState.Ingame, this);
 
-        if(Config.ActiveWinconditions.contains(Winconditions.POINTS)){
+        if(Config.GameModeConfig.WinConditions.contains(Winconditions.POINTS)){
             timeOverCountdown = new StateDependentCountdown(Winconditions.POINTS, FightState.Running, new TimeOverCountdown(this::timeOver));
         }
     }
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionTimeTechKO.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionTimeTechKO.java
index a04dd2e2..9e9a92a9 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionTimeTechKO.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionTimeTechKO.java
@@ -43,7 +43,7 @@ import java.util.Map;
 @Linked
 public class WinconditionTimeTechKO extends Wincondition implements Listener {
 
-    private static final int TECH_KO_HALF_TIME = Config.TechKoTime/2;
+    private static final int TECH_KO_HALF_TIME = Config.GameModeConfig.WinConditionParams.TechKoTime/2;
 
     private final Map<Integer, FightTeam> spawnLocations = new HashMap<>();
     private final Map<FightTeam, TechKOCountdown> countdowns = new HashMap<>();
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionTimedDamageTechKO.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionTimedDamageTechKO.java
index 3f2f8204..f118a0eb 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionTimedDamageTechKO.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionTimedDamageTechKO.java
@@ -51,7 +51,7 @@ public class WinconditionTimedDamageTechKO extends Wincondition implements Print
             @Override
             public void enable() {
                 Fight.teams().forEach(team -> {
-                    TechKOCountdown countdown = new TechKOCountdown(team, Config.TechKoTime);
+                    TechKOCountdown countdown = new TechKOCountdown(team, Config.GameModeConfig.WinConditionParams.TechKoTime);
                     countdowns.put(team, countdown);
                     countdown.enable();
                 });
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionTimeout.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionTimeout.java
index 4424b6f5..56355722 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionTimeout.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionTimeout.java
@@ -30,7 +30,7 @@ public class WinconditionTimeout extends Wincondition {
 
     public WinconditionTimeout() {
         super("Timeout");
-        if(Config.ActiveWinconditions.contains(Winconditions.TIMEOUT)){
+        if(Config.GameModeConfig.WinConditions.contains(Winconditions.TIMEOUT)){
             timeOverCountdown = new StateDependentCountdown(Winconditions.TIMEOUT, FightState.Running, new TimeOverCountdown(this::timeOver));
         }
     }
diff --git a/SchematicSystem/SchematicSystem_15/src/de/steamwar/schematicsystem/autocheck/AutoChecker15.java b/SchematicSystem/SchematicSystem_15/src/de/steamwar/schematicsystem/autocheck/AutoChecker15.java
index 4d5d2d8c..d77f615c 100644
--- a/SchematicSystem/SchematicSystem_15/src/de/steamwar/schematicsystem/autocheck/AutoChecker15.java
+++ b/SchematicSystem/SchematicSystem_15/src/de/steamwar/schematicsystem/autocheck/AutoChecker15.java
@@ -24,7 +24,8 @@ import com.sk89q.worldedit.entity.Entity;
 import com.sk89q.worldedit.extent.clipboard.Clipboard;
 import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.world.block.BaseBlock;
-import de.steamwar.schematicsystem.CheckSchemType;
+import de.steamwar.data.GameModeConfig;
+import de.steamwar.sql.SchematicType;
 import org.bukkit.Material;
 
 import java.util.*;
@@ -118,7 +119,7 @@ public class AutoChecker15 implements AutoChecker.IAutoChecker {
     }
 
     @Override
-    public AutoCheckerResult check(Clipboard clipboard, CheckSchemType type) {
+    public AutoCheckerResult check(Clipboard clipboard, GameModeConfig<Material, SchematicType, String> type) {
         return AutoCheckerResult.builder()
                 .type(type)
                 .height(clipboard.getDimensions().getBlockY())
@@ -130,7 +131,7 @@ public class AutoChecker15 implements AutoChecker.IAutoChecker {
     }
 
     @Override
-    public AutoCheckerResult sizeCheck(Clipboard clipboard, CheckSchemType type) {
+    public AutoCheckerResult sizeCheck(Clipboard clipboard, GameModeConfig<Material, SchematicType, String> type) {
         return AutoCheckerResult.builder()
                 .type(type)
                 .height(clipboard.getDimensions().getBlockY())
diff --git a/SchematicSystem/SchematicSystem_15/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommand15.java b/SchematicSystem/SchematicSystem_15/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommand15.java
index 6c55ab0d..1a7f8a97 100644
--- a/SchematicSystem/SchematicSystem_15/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommand15.java
+++ b/SchematicSystem/SchematicSystem_15/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommand15.java
@@ -31,10 +31,10 @@ import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.world.block.BlockTypes;
-import de.steamwar.schematicsystem.CheckSchemType;
+import de.steamwar.data.GameModeConfig;
 import de.steamwar.schematicsystem.autocheck.AutoCheckerResult;
 import de.steamwar.schematicsystem.autocheck.BlockPos;
-import de.steamwar.schematicsystem.commands.schematiccommand.SchematicCommand;
+import de.steamwar.sql.SchematicType;
 import org.bukkit.Material;
 
 import java.util.*;
@@ -42,7 +42,7 @@ import java.util.stream.Collectors;
 
 public class SchematicCommand15 implements SchematicCommand.ISchematicCommand {
     @Override
-    public Clipboard fixClipboard(Clipboard clipboard, AutoCheckerResult result, CheckSchemType type) throws Exception {
+    public Clipboard fixClipboard(Clipboard clipboard, AutoCheckerResult result, GameModeConfig<Material, SchematicType, String> type) throws Exception {
         for (BlockPos blockPos : result.getBlockScanResult().getRecords()) {
             BlockVector3 vector = BlockVector3.at(blockPos.getX(), blockPos.getY(), blockPos.getZ());
             clipboard.setBlock(vector, clipboard.getFullBlock(vector).toBaseBlock(new CompoundTag(Collections.emptyMap())));
@@ -76,9 +76,9 @@ public class SchematicCommand15 implements SchematicCommand.ISchematicCommand {
             clipboard.setBlock(vector, block.toBaseBlock(builder.build()));
         }
 
-        if(type.getMaxDispenserItems() > 0 ) {
+        if(type.Schematic.MaxDispenserItems > 0 ) {
             for (Map.Entry<BlockPos, Integer> entry : result.getBlockScanResult().getDispenserItems().entrySet()) {
-                if(entry.getValue() <= type.getMaxDispenserItems()) {
+                if(entry.getValue() <= type.Schematic.MaxDispenserItems) {
                     continue;
                 }
 
@@ -90,7 +90,7 @@ public class SchematicCommand15 implements SchematicCommand.ISchematicCommand {
                 List<CompoundTag> items = tag.getList("Items", CompoundTag.class);
                 Collections.reverse(items); // To let the first item be in the Dispenser
                 List<CompoundTag> list = new ArrayList<>();
-                int diff = entry.getValue() - type.getMaxDispenserItems();
+                int diff = entry.getValue() - type.Schematic.MaxDispenserItems;
                 for (CompoundTag item : items) {
                     if(item == null) {
                         continue;
@@ -117,10 +117,9 @@ public class SchematicCommand15 implements SchematicCommand.ISchematicCommand {
         }
 
         if(!result.isLimitedBlocksOK()) {
-            Set<Material> toReplace = type.getLimits().entrySet().stream()
+            Set<Material> toReplace = type.Schematic.Limited.entrySet().stream()
                     .filter(setIntegerEntry -> setIntegerEntry.getValue() == 0)
                     .flatMap(setIntegerEntry -> setIntegerEntry.getKey().stream())
-                    .map(Material::matchMaterial)
                     .collect(Collectors.toSet());
             BlockState replaceType = Objects.requireNonNull(toReplace.contains(Material.END_STONE) ? BlockTypes.IRON_BLOCK : BlockTypes.END_STONE).getDefaultState();
             BlockVector3 min = clipboard.getMinimumPoint();
diff --git a/SchematicSystem/SchematicSystem_8/src/de/steamwar/schematicsystem/autocheck/AutoChecker8.java b/SchematicSystem/SchematicSystem_8/src/de/steamwar/schematicsystem/autocheck/AutoChecker8.java
index 981acd46..cf457f62 100644
--- a/SchematicSystem/SchematicSystem_8/src/de/steamwar/schematicsystem/autocheck/AutoChecker8.java
+++ b/SchematicSystem/SchematicSystem_8/src/de/steamwar/schematicsystem/autocheck/AutoChecker8.java
@@ -25,7 +25,8 @@ import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.entity.Entity;
 import com.sk89q.worldedit.extent.clipboard.Clipboard;
 import com.sk89q.worldedit.regions.Region;
-import de.steamwar.schematicsystem.CheckSchemType;
+import de.steamwar.data.GameModeConfig;
+import de.steamwar.sql.SchematicType;
 import org.bukkit.Material;
 
 import java.util.*;
@@ -148,7 +149,7 @@ public class AutoChecker8 implements AutoChecker.IAutoChecker {
     }
 
     @Override
-    public AutoCheckerResult check(Clipboard clipboard, CheckSchemType type) {
+    public AutoCheckerResult check(Clipboard clipboard, GameModeConfig<Material, SchematicType, String> type) {
         AutoChecker.BlockScanResult blockScanResult = new AutoChecker.BlockScanResult();
         scan(blockScanResult, clipboard);
 
@@ -163,7 +164,7 @@ public class AutoChecker8 implements AutoChecker.IAutoChecker {
     }
 
     @Override
-    public AutoCheckerResult sizeCheck(Clipboard clipboard, CheckSchemType type) {
+    public AutoCheckerResult sizeCheck(Clipboard clipboard, GameModeConfig<Material, SchematicType, String> type) {
         return AutoCheckerResult.builder()
                 .type(type)
                 .height(clipboard.getDimensions().getBlockY())
diff --git a/SchematicSystem/SchematicSystem_8/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommand8.java b/SchematicSystem/SchematicSystem_8/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommand8.java
index 8245fb51..58c334cd 100644
--- a/SchematicSystem/SchematicSystem_8/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommand8.java
+++ b/SchematicSystem/SchematicSystem_8/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommand8.java
@@ -24,14 +24,15 @@ import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.extent.clipboard.Clipboard;
 import com.sk89q.worldedit.function.operation.ForwardExtentCopy;
 import com.sk89q.worldedit.function.operation.Operations;
-import de.steamwar.schematicsystem.CheckSchemType;
+import de.steamwar.data.GameModeConfig;
 import de.steamwar.schematicsystem.autocheck.AutoCheckerResult;
-import de.steamwar.schematicsystem.commands.schematiccommand.SchematicCommand;
+import de.steamwar.sql.SchematicType;
+import org.bukkit.Material;
 
 public class SchematicCommand8 implements SchematicCommand.ISchematicCommand {
 
     @Override
-    public Clipboard fixClipboard(Clipboard clipboard, AutoCheckerResult result, CheckSchemType type) throws Exception {
+    public Clipboard fixClipboard(Clipboard clipboard, AutoCheckerResult result, GameModeConfig<Material, SchematicType, String> type) throws Exception {
         return null;
     }
 
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/CheckSchemType.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/CheckSchemType.java
deleted file mode 100644
index dc8ca24b..00000000
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/CheckSchemType.java
+++ /dev/null
@@ -1,113 +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.schematicsystem;
-
-import de.steamwar.sql.SchematicType;
-import lombok.Getter;
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.configuration.file.YamlConfiguration;
-
-import java.io.File;
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.time.Instant;
-import java.util.*;
-
-@Getter
-public class CheckSchemType {
-
-    private static final Map<SchematicType, CheckSchemType> types = new HashMap<>();
-
-    private final int width;
-    private final int height;
-    private final int depth;
-    private final int maxDispenserItems;
-
-    private final Map<Set<String>, Integer> limits;
-    private final int maxBlocks;
-
-    private final Date deadline;
-    private final float maxBlastResistance;
-
-    private CheckSchemType(ConfigurationSection section) {
-        String name = section.getString("Schematic.Type");
-        width = section.getInt("Schematic.Size.x");
-        height = section.getInt("Schematic.Size.y");
-        depth = section.getInt("Schematic.Size.z");
-
-        maxDispenserItems = section.getInt("Schematic.MaxDispenserItems", 128);
-        maxBlocks = section.getInt("Schematic.MaxBlocks", 0);
-
-        maxBlastResistance = (float) section.getDouble("Schematic.MaxDesignBlastResistance", Double.MAX_VALUE);
-
-        limits = new HashMap<>();
-        for(Map<?, ?> entry : section.getMapList("Schematic.Limited")) {
-            int amount = (Integer) entry.get("Amount");
-            Set<String> materials = new HashSet<>((List<String>) entry.get("Materials"));
-            if(amount == 0) {
-                materials.forEach(material -> limits.put(Collections.singleton(material), 0));
-            } else {
-                limits.put(materials, amount);
-            }
-        }
-
-        String deadlineString = section.getString("deadline", null);
-        if (deadlineString != null) {
-            try {
-                SimpleDateFormat dateFormat = new SimpleDateFormat("dd.MM.yyyy HH:mm");
-                deadline = dateFormat.parse(deadlineString);
-            } catch (ParseException e) {
-                throw new SecurityException(e.getMessage(), e);
-            }
-        } else {
-            deadline = null;
-        }
-
-        types.put(SchematicType.fromDB(name.toLowerCase()), this);
-        types.put(SchematicType.fromDB("c" + name.toLowerCase()), this);
-    }
-
-    static {
-        File folder = new File(SchematicSystem.getInstance().getDataFolder().getParentFile(), "FightSystem");
-
-        if(folder.exists()) {
-            for(File configFile : folder.listFiles((file, name) -> name.endsWith(".yml") && !name.endsWith(".kits.yml"))) {
-                YamlConfiguration config = YamlConfiguration.loadConfiguration(configFile);
-                if (!config.isList("CheckQuestions") && config.getBoolean("Schematic.ManualCheck", true))
-                    continue;
-
-                new CheckSchemType(config);
-            }
-        }
-    }
-
-    public static CheckSchemType get(SchematicType type){
-        return types.get(type);
-    }
-
-    public Map<Set<String>, Integer> getLimits() {
-        return new HashMap<>(limits);
-    }
-
-    public boolean isAfterDeadline() {
-        return deadline != null && deadline.before(Date.from(Instant.now()));
-    }
-}
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/CheckSchemTypeManager.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/CheckSchemTypeManager.java
new file mode 100644
index 00000000..2b0e8317
--- /dev/null
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/CheckSchemTypeManager.java
@@ -0,0 +1,56 @@
+/*
+ *   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.schematicsystem;
+
+import de.steamwar.data.GameModeConfig;
+import de.steamwar.data.YMLWrapperImpl;
+import de.steamwar.sql.SchematicType;
+import lombok.experimental.UtilityClass;
+import org.bukkit.Material;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+
+@UtilityClass
+public class CheckSchemTypeManager {
+
+    private static final Map<SchematicType, GameModeConfig<Material, SchematicType, String>> types = new HashMap<>();
+
+    static {
+        File folder = new File(SchematicSystem.getInstance().getDataFolder().getParentFile(), "FightSystem");
+
+        if(folder.exists()) {
+            for(File configFile : folder.listFiles((file, name) -> name.endsWith(".yml") && !name.endsWith(".kits.yml"))) {
+                GameModeConfig<Material, SchematicType, String> gameModeConfig = new GameModeConfig<>(YMLWrapperImpl.ofTyped(configFile));
+                if (gameModeConfig.CheckQuestions.isEmpty() && gameModeConfig.Schematic.ManualCheck)
+                    continue;
+                types.put(gameModeConfig.Schematic.Type, gameModeConfig);
+                if (gameModeConfig.Schematic.Type.checkType() != null) {
+                    types.put(gameModeConfig.Schematic.Type.checkType(), gameModeConfig);
+                }
+            }
+        }
+    }
+
+    public static GameModeConfig<Material, SchematicType, String> get(SchematicType type){
+        return types.get(type);
+    }
+}
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/autocheck/AutoChecker.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/autocheck/AutoChecker.java
index 0d2eb937..ac4220fe 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/autocheck/AutoChecker.java
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/autocheck/AutoChecker.java
@@ -21,8 +21,9 @@ package de.steamwar.schematicsystem.autocheck;
 
 import com.sk89q.worldedit.extent.clipboard.Clipboard;
 import de.steamwar.core.VersionDependent;
-import de.steamwar.schematicsystem.CheckSchemType;
+import de.steamwar.data.GameModeConfig;
 import de.steamwar.schematicsystem.SchematicSystem;
+import de.steamwar.sql.SchematicType;
 import lombok.Getter;
 import lombok.ToString;
 import org.bukkit.Material;
@@ -31,19 +32,19 @@ import java.util.*;
 
 public class AutoChecker {
 
-    public static AutoCheckerResult check(Clipboard clipboard, CheckSchemType type) {
+    public static AutoCheckerResult check(Clipboard clipboard, GameModeConfig<Material, SchematicType, String> type) {
         return impl.check(clipboard, type);
     }
 
-    public static AutoCheckerResult sizeCheck(Clipboard clipboard, CheckSchemType type) {
+    public static AutoCheckerResult sizeCheck(Clipboard clipboard, GameModeConfig<Material, SchematicType, String> type) {
         return impl.sizeCheck(clipboard, type);
     }
 
     private static final IAutoChecker impl = VersionDependent.getVersionImpl(SchematicSystem.getInstance());
 
     public interface IAutoChecker {
-        AutoCheckerResult check(Clipboard clipboard, CheckSchemType type);
-        AutoCheckerResult sizeCheck(Clipboard clipboard, CheckSchemType type);
+        AutoCheckerResult check(Clipboard clipboard, GameModeConfig<Material, SchematicType, String> type);
+        AutoCheckerResult sizeCheck(Clipboard clipboard, GameModeConfig<Material, SchematicType, String> type);
     }
 
     @Getter
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/autocheck/AutoCheckerResult.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/autocheck/AutoCheckerResult.java
index 002ff8ab..9aad0edb 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/autocheck/AutoCheckerResult.java
+++ b/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.CheckSchemType;
+import de.steamwar.data.GameModeConfig;
 import de.steamwar.schematicsystem.SchematicSystem;
+import de.steamwar.sql.SchematicType;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.ToString;
@@ -29,13 +30,15 @@ import net.md_5.bungee.api.chat.ClickEvent;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
 
 @Builder
 @Getter
 @ToString
 public class AutoCheckerResult {
-    private final CheckSchemType type;
+    private final GameModeConfig<Material, SchematicType, String> type;
     private final int width;
     private final int height;
     private final int depth;
@@ -61,7 +64,7 @@ public class AutoCheckerResult {
     }
 
     public boolean isDispenserItemsOK() {
-        return blockScanResult.getDispenserItems().values().stream().allMatch(i -> i <= type.getMaxDispenserItems());
+        return blockScanResult.getDispenserItems().values().stream().allMatch(i -> i <= type.Schematic.MaxDispenserItems);
     }
 
     public boolean hasWarnings() {
@@ -73,25 +76,25 @@ public class AutoCheckerResult {
     }
 
     public boolean isTooWide() {
-        return width > type.getWidth();
+        return width > type.Schematic.Size.x;
     }
 
     public boolean isTooHigh() {
-        return height > type.getHeight();
+        return height > type.Schematic.Size.y;
     }
 
     public boolean isTooDeep() {
-        return depth > type.getDepth();
+        return depth > type.Schematic.Size.z;
     }
 
     public boolean isBlockCountOk() {
-        return type.getMaxBlocks() == 0 || blockScanResult.getBlockCounts().entrySet().stream().filter(entry -> entry.getKey() != Material.AIR).map(Map.Entry::getValue).reduce(Integer::sum).map(i -> i <= type.getMaxBlocks()).orElse(false);
+        return type.Schematic.MaxBlocks == 0 || blockScanResult.getBlockCounts().entrySet().stream().filter(entry -> entry.getKey() != Material.AIR).map(Map.Entry::getValue).reduce(Integer::sum).map(i -> i <= type.Schematic.MaxBlocks).orElse(false);
     }
 
     public boolean isLimitedBlocksOK() {
         try {
-            return type.getLimits().entrySet().stream()
-                    .map(setIntegerEntry -> setIntegerEntry.getKey().stream().map(Material::getMaterial).map(blockScanResult.getBlockCounts()::get).map(i -> i == null || i <= setIntegerEntry.getValue()).reduce(Boolean::logicalAnd).orElse(false))
+            return type.Schematic.Limited.entrySet().stream()
+                    .map(setIntegerEntry -> setIntegerEntry.getKey().stream().map(blockScanResult.getBlockCounts()::get).map(i -> i == null || i <= setIntegerEntry.getValue()).reduce(Boolean::logicalAnd).orElse(false))
                     .reduce(Boolean::logicalAnd).orElse(true);
         } catch (NullPointerException e) {
             return false;
@@ -99,21 +102,20 @@ public class AutoCheckerResult {
     }
 
     public boolean isDesignBlastResistanceOK() {
-        return blockScanResult.getDesignBlocks().keySet().stream().map(Material::getBlastResistance).noneMatch(i -> i > type.getMaxBlastResistance());
+        return blockScanResult.getDesignBlocks().keySet().stream().map(Material::getBlastResistance).noneMatch(i -> i > type.Schematic.MaxDesignBlastResistance);
     }
 
     public void sendErrorMessage(Player p, String schemName) {
         SchematicSystem.MESSAGE.sendPrefixless("AUTO_CHECKER_RESULT_HEADER", p, schemName);
-        if(isTooWide()) SchematicSystem.MESSAGE.sendPrefixless("AUTO_CHECKER_RESULT_WIDTH", p, width, type.getWidth());
-        if(isTooHigh()) SchematicSystem.MESSAGE.sendPrefixless("AUTO_CHECKER_RESULT_HEIGHT", p, height, type.getHeight());
-        if(isTooDeep()) SchematicSystem.MESSAGE.sendPrefixless("AUTO_CHECKER_RESULT_LENGTH", p, depth, type.getDepth());
-        if(type.getMaxBlocks() != 0 && !isBlockCountOk()) {
-            SchematicSystem.MESSAGE.sendPrefixless("AUTO_CHECKER_RESULT_BLOCKS", p, blockScanResult.getBlockCounts().values().stream().reduce(Integer::sum).orElse(0), type.getMaxBlocks());
+        if(isTooWide()) SchematicSystem.MESSAGE.sendPrefixless("AUTO_CHECKER_RESULT_WIDTH", p, width, type.Schematic.Size.x);
+        if(isTooHigh()) SchematicSystem.MESSAGE.sendPrefixless("AUTO_CHECKER_RESULT_HEIGHT", p, height, type.Schematic.Size.y);
+        if(isTooDeep()) SchematicSystem.MESSAGE.sendPrefixless("AUTO_CHECKER_RESULT_LENGTH", p, depth, type.Schematic.Size.z);
+        if(type.Schematic.MaxBlocks != 0 && !isBlockCountOk()) {
+            SchematicSystem.MESSAGE.sendPrefixless("AUTO_CHECKER_RESULT_BLOCKS", p, blockScanResult.getBlockCounts().values().stream().reduce(Integer::sum).orElse(0), type.Schematic.MaxBlocks);
         }
         if(!isLimitedBlocksOK()) {
-            type.getLimits().forEach((strings, integer) -> {
-                for (String string : strings) {
-                    Material mat = Material.matchMaterial(string);
+            type.Schematic.Limited.forEach((materials, integer) -> {
+                for (Material mat : materials) {
                     if(mat != null && blockScanResult.getBlockCounts().getOrDefault(mat, 0) > integer) {
                         if(integer == 0) {
                             SchematicSystem.MESSAGE.sendPrefixless("AUTO_CHECKER_RESULT_FORBIDDEN_BLOCK", p, mat.name());
@@ -124,13 +126,13 @@ public class AutoCheckerResult {
                 }
             });
         }
-        blockScanResult.getDispenserItems().entrySet().stream().filter(blockVector3IntegerEntry -> blockVector3IntegerEntry.getValue() > type.getMaxDispenserItems()).forEach(blockVector3IntegerEntry -> {
+        blockScanResult.getDispenserItems().entrySet().stream().filter(blockVector3IntegerEntry -> blockVector3IntegerEntry.getValue() > type.Schematic.MaxDispenserItems).forEach(blockVector3IntegerEntry -> {
             SchematicSystem.MESSAGE.sendPrefixless("AUTO_CHECKER_RESULT_TOO_MANY_DISPENSER_ITEMS", p, SchematicSystem.MESSAGE.parse("AUTO_CHECKER_RESULT_TELEPORT_HERE", p), tpCommandTo(blockVector3IntegerEntry.getKey()),
                     blockVector3IntegerEntry.getKey().getBlockX(),
                     blockVector3IntegerEntry.getKey().getBlockY(),
                     blockVector3IntegerEntry.getKey().getBlockZ(),
                     blockVector3IntegerEntry.getValue(),
-                    type.getMaxDispenserItems());
+                    type.Schematic.MaxDispenserItems);
         });
         blockScanResult.getRecords().forEach(blockVector3 -> {
             SchematicSystem.MESSAGE.sendPrefixless("AUTO_CHECKER_RESULT_RECORD", p, SchematicSystem.MESSAGE.parse("AUTO_CHECKER_RESULT_TELEPORT_HERE", p), tpCommandTo(blockVector3), blockVector3.getBlockX(), blockVector3.getBlockY(), blockVector3.getBlockZ());
@@ -146,7 +148,7 @@ public class AutoCheckerResult {
         });
         if(Core.getVersion() > 12) {
             blockScanResult.getDesignBlocks().forEach((material, poss) -> {
-                if(material.getBlastResistance() > type.getMaxBlastResistance()) {
+                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());
                     });
@@ -157,7 +159,7 @@ public class AutoCheckerResult {
             SchematicSystem.MESSAGE.sendPrefixless("AUTO_CHECKER_RESULT_ENTITY", p, SchematicSystem.MESSAGE.parse("AUTO_CHECKER_RESULT_TELEPORT_HERE", p), tpCommandTo(blockPos), blockPos.getX(), blockPos.getY(), blockPos.getZ());
         });
         if(type.isAfterDeadline()) {
-            SchematicSystem.MESSAGE.sendPrefixless("AUTO_CHECKER_RESULT_AFTER_DEADLINE", p, type.getDeadline());
+            SchematicSystem.MESSAGE.sendPrefixless("AUTO_CHECKER_RESULT_AFTER_DEADLINE", p, type.Deadline);
         }
     }
 
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/GUI.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/GUI.java
index a9c90380..ece48694 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/GUI.java
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/GUI.java
@@ -23,7 +23,7 @@ import com.sk89q.worldedit.extent.clipboard.Clipboard;
 import de.steamwar.core.Core;
 import de.steamwar.data.CMDs;
 import de.steamwar.inventory.*;
-import de.steamwar.schematicsystem.CheckSchemType;
+import de.steamwar.schematicsystem.CheckSchemTypeManager;
 import de.steamwar.schematicsystem.SafeSchematicNode;
 import de.steamwar.schematicsystem.SchematicSystem;
 import de.steamwar.schematicsystem.autocheck.AutoChecker;
@@ -245,7 +245,7 @@ public class GUI {
         Clipboard finalClipboard = clipboard;
         List<SchematicType> types = SchematicType.values().parallelStream()
                 .filter(SchematicType::isAssignable)
-                .filter(type -> finalClipboard == null || CheckSchemType.get(type) == null || AutoChecker.sizeCheck(finalClipboard, CheckSchemType.get(type)).fastOk())
+                .filter(type -> finalClipboard == null || CheckSchemTypeManager.get(type) == null || AutoChecker.sizeCheck(finalClipboard, CheckSchemTypeManager.get(type)).fastOk())
                 .collect(Collectors.toList());
 
         List<SWListInv.SWListEntry<SchematicType>> items = types.stream()
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommand.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommand.java
index 0b9f0c1d..5b9add07 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommand.java
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommand.java
@@ -19,20 +19,25 @@
 
 package de.steamwar.schematicsystem.commands.schematiccommand;
 
-import com.sk89q.worldedit.*;
+import com.sk89q.worldedit.EditSession;
+import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.extent.clipboard.Clipboard;
-import de.steamwar.command.*;
+import de.steamwar.command.AbstractSWCommand;
+import de.steamwar.command.SWCommand;
+import de.steamwar.command.TypeMapper;
+import de.steamwar.command.TypeValidator;
 import de.steamwar.core.VersionDependent;
+import de.steamwar.data.GameModeConfig;
 import de.steamwar.linkage.Linked;
-import de.steamwar.schematicsystem.CheckSchemType;
 import de.steamwar.schematicsystem.SchematicSystem;
 import de.steamwar.schematicsystem.autocheck.AutoCheckerResult;
 import de.steamwar.sql.*;
+import org.bukkit.Material;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 import static de.steamwar.schematicsystem.commands.schematiccommand.SchematicCommandHelp.*;
-import static de.steamwar.schematicsystem.commands.schematiccommand.SchematicCommandUtils.*;
+import static de.steamwar.schematicsystem.commands.schematiccommand.SchematicCommandUtils.togglePublic;
 
 @SuppressWarnings("unused")
 @Linked
@@ -107,9 +112,9 @@ public class SchematicCommand extends SWCommand {
         return SchematicMapper.nodeTypeMapper();
     }
 
-    @ClassMapper(value = CheckSchemType.class, local = true)
-    public static TypeMapper<CheckSchemType> checkSchemTypeTypeMapper() {
-        return SchematicMapper.checkSchemTypeTypeMapper();
+    @ClassMapper(value = GameModeConfig.class, local = true)
+    public static TypeMapper<GameModeConfig<Material, SchematicType, String>> gameModeConfigTypeMapper() {
+        return SchematicMapper.gameModeConfigTypeMapper();
     }
 
     @Override
@@ -145,7 +150,7 @@ public class SchematicCommand extends SWCommand {
     public static final ISchematicCommand impl = VersionDependent.getVersionImpl(SchematicSystem.getInstance());
 
     public interface ISchematicCommand {
-        Clipboard fixClipboard(Clipboard clipboard, AutoCheckerResult result, CheckSchemType type) throws Exception;
+        Clipboard fixClipboard(Clipboard clipboard, AutoCheckerResult result, GameModeConfig<Material, SchematicType, String> type) throws Exception;
         void createCopy(EditSession editSession, Clipboard clipboard) throws WorldEditException;
     }
 }
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommandUtils.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommandUtils.java
index b86b2c88..9cccc0b6 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommandUtils.java
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommandUtils.java
@@ -20,12 +20,13 @@
 package de.steamwar.schematicsystem.commands.schematiccommand;
 
 import com.sk89q.worldedit.extent.clipboard.Clipboard;
+import de.steamwar.data.GameModeConfig;
 import de.steamwar.inventory.SWInventory;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.network.NetworkSender;
 import de.steamwar.network.packets.client.PrepareSchemPacket;
 import de.steamwar.providers.BauServerInfo;
-import de.steamwar.schematicsystem.CheckSchemType;
+import de.steamwar.schematicsystem.CheckSchemTypeManager;
 import de.steamwar.schematicsystem.SchematicSystem;
 import de.steamwar.schematicsystem.autocheck.AutoChecker;
 import de.steamwar.schematicsystem.autocheck.AutoCheckerResult;
@@ -40,6 +41,7 @@ import net.md_5.bungee.api.chat.ComponentBuilder;
 import net.md_5.bungee.api.chat.HoverEvent;
 import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.Bukkit;
+import org.bukkit.Material;
 import org.bukkit.entity.Player;
 
 import java.io.IOException;
@@ -311,7 +313,7 @@ public class SchematicCommandUtils {
         }
     }
 
-    public static void check(Player player, Clipboard clipboard, CheckSchemType type, String schemName, boolean gui) {
+    public static void check(Player player, Clipboard clipboard, GameModeConfig<Material, SchematicType, String> type, String schemName, boolean gui) {
         AutoCheckerResult result = AutoChecker.check(clipboard, type);
         if(!result.isOk()) {
             result.sendErrorMessage(player, schemName);
@@ -454,9 +456,9 @@ public class SchematicCommandUtils {
                 return;
             }
 
-            CheckSchemType checkSchemType = CheckSchemType.get(type);
+            GameModeConfig<Material, SchematicType, String> checkSchemType = CheckSchemTypeManager.get(type);
             if (checkSchemType.isAfterDeadline()) {
-                SchematicSystem.MESSAGE.send("UTIL_TYPE_AFTER_DEADLINE", player, checkSchemType.getDeadline());
+                SchematicSystem.MESSAGE.send("UTIL_TYPE_AFTER_DEADLINE", player, checkSchemType.Deadline);
                 return;
             }
 
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicMapper.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicMapper.java
index 80d02e90..b3f23092 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicMapper.java
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicMapper.java
@@ -20,11 +20,13 @@
 package de.steamwar.schematicsystem.commands.schematiccommand;
 
 import de.steamwar.command.TypeMapper;
-import de.steamwar.schematicsystem.CheckSchemType;
+import de.steamwar.data.GameModeConfig;
+import de.steamwar.schematicsystem.CheckSchemTypeManager;
 import de.steamwar.sql.NodeMember;
 import de.steamwar.sql.SchematicNode;
 import de.steamwar.sql.SchematicType;
 import de.steamwar.sql.SteamwarUser;
+import org.bukkit.Material;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
@@ -175,16 +177,16 @@ public class SchematicMapper {
         };
     }
 
-    public static TypeMapper<CheckSchemType> checkSchemTypeTypeMapper() {
-        return new TypeMapper<CheckSchemType>() {
+    public static TypeMapper<GameModeConfig<Material, SchematicType, String>> gameModeConfigTypeMapper() {
+        return new TypeMapper<GameModeConfig<Material, SchematicType, String>>() {
             @Override
             public Collection<String> tabCompletes(CommandSender commandSender, String[] strings, String s) {
-                return SchematicType.values().stream().filter(type -> CheckSchemType.get(type) != null).map(SchematicType::name).collect(Collectors.toList());
+                return SchematicType.values().stream().filter(type -> CheckSchemTypeManager.get(type) != null).map(SchematicType::name).collect(Collectors.toList());
             }
 
             @Override
-            public CheckSchemType map(CommandSender commandSender, String[] previousArguments, String s) {
-                return SchematicType.values().stream().filter(type -> type.name().equalsIgnoreCase(s)).map(CheckSchemType::get).findAny().orElse(null);
+            public GameModeConfig<Material, SchematicType, String> map(CommandSender commandSender, String[] previousArguments, String s) {
+                return SchematicType.values().stream().filter(type -> type.name().equalsIgnoreCase(s)).map(CheckSchemTypeManager::get).findAny().orElse(null);
             }
         };
     }
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicValidator.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicValidator.java
index 8a798fc8..bd02c3d2 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicValidator.java
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicValidator.java
@@ -19,7 +19,6 @@
 
 package de.steamwar.schematicsystem.commands.schematiccommand;
 
-import de.steamwar.command.AbstractSWCommand;
 import de.steamwar.command.AbstractValidator;
 import de.steamwar.command.TypeValidator;
 import de.steamwar.sql.SchematicNode;
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/CheckPart.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/CheckPart.java
index 878b72b3..bf0f0c8e 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/CheckPart.java
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/CheckPart.java
@@ -28,21 +28,23 @@ import com.sk89q.worldedit.session.ClipboardHolder;
 import de.steamwar.command.AbstractSWCommand;
 import de.steamwar.command.SWCommand;
 import de.steamwar.core.Core;
+import de.steamwar.data.GameModeConfig;
 import de.steamwar.linkage.Linked;
-import de.steamwar.schematicsystem.CheckSchemType;
 import de.steamwar.schematicsystem.SchematicSystem;
 import de.steamwar.schematicsystem.autocheck.AutoChecker;
 import de.steamwar.schematicsystem.autocheck.AutoCheckerResult;
 import de.steamwar.schematicsystem.commands.schematiccommand.SchematicCommand;
 import de.steamwar.sql.SchematicData;
 import de.steamwar.sql.SchematicNode;
+import de.steamwar.sql.SchematicType;
+import org.bukkit.Material;
 import org.bukkit.entity.Player;
 
 import java.io.IOException;
 import java.util.logging.Level;
 
-import static de.steamwar.schematicsystem.commands.schematiccommand.SchematicCommandUtils.check;
 import static de.steamwar.schematicsystem.commands.schematiccommand.SchematicCommand.impl;
+import static de.steamwar.schematicsystem.commands.schematiccommand.SchematicCommandUtils.check;
 
 @AbstractSWCommand.PartOf(SchematicCommand.class)
 @Linked
@@ -52,7 +54,7 @@ public class CheckPart extends SWCommand {
     }
 
     @Register("check")
-    public void checkCommand(Player player, @Validator("isOwnerSchematicValidator") SchematicNode node, CheckSchemType type) {
+    public void checkCommand(Player player, @Validator("isOwnerSchematicValidator") SchematicNode node, GameModeConfig<Material, SchematicType, String> type) {
         try {
             check(player, new SchematicData(node).load(), type, node.getName(), false);
         } catch (IOException e) {
@@ -61,7 +63,7 @@ public class CheckPart extends SWCommand {
     }
 
     @Register(value = {"check", "clipboard"})
-    public void checkClipboardCommand(Player player, @ErrorMessage("UTIL_CHECK_TYPE_NOT_FOUND") CheckSchemType type) {
+    public void checkClipboardCommand(Player player, @ErrorMessage("UTIL_CHECK_TYPE_NOT_FOUND") GameModeConfig<Material, SchematicType, String> type) {
         try {
             check(player, WorldEdit.getInstance().getSessionManager().findByName(player.getName()).getClipboard().getClipboard(), type, "clipboard", false);
         } catch (EmptyClipboardException e) {
@@ -70,7 +72,7 @@ public class CheckPart extends SWCommand {
     }
 
     @Register(value = {"check", "selection"})
-    public void checkSelectionCommand(Player player, @ErrorMessage("UTIL_CHECK_TYPE_NOT_FOUND") CheckSchemType type) {
+    public void checkSelectionCommand(Player player, @ErrorMessage("UTIL_CHECK_TYPE_NOT_FOUND") GameModeConfig<Material, SchematicType, String> type) {
         try {
             Clipboard clipboard = new BlockArrayClipboard(WorldEdit.getInstance().getSessionManager().findByName(player.getName()).getSelection(new BukkitWorld(player.getWorld())));
             EditSession editSession = WorldEdit.getInstance().getEditSessionFactory().getEditSession(new BukkitWorld(player.getWorld()), -1);
@@ -86,7 +88,7 @@ public class CheckPart extends SWCommand {
     }
 
     @Register("fix")
-    public void fixSchematicCommand(Player player, @ErrorMessage("UTIL_CHECK_TYPE_NOT_FOUND") CheckSchemType type) {
+    public void fixSchematicCommand(Player player, @ErrorMessage("UTIL_CHECK_TYPE_NOT_FOUND") GameModeConfig<Material, SchematicType, String> type) {
         if(Core.getVersion() < 15) {
             SchematicSystem.MESSAGE.send("COMMAND_FIX_WRONG_VERSION", player);
             return;
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/ModifyPart.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/ModifyPart.java
index 3387e855..58645331 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/ModifyPart.java
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/ModifyPart.java
@@ -23,7 +23,7 @@ import com.sk89q.worldedit.extent.clipboard.Clipboard;
 import de.steamwar.command.AbstractSWCommand;
 import de.steamwar.command.SWCommand;
 import de.steamwar.linkage.Linked;
-import de.steamwar.schematicsystem.CheckSchemType;
+import de.steamwar.schematicsystem.CheckSchemTypeManager;
 import de.steamwar.schematicsystem.SafeSchematicNode;
 import de.steamwar.schematicsystem.SchematicSystem;
 import de.steamwar.schematicsystem.autocheck.AutoChecker;
@@ -63,7 +63,7 @@ public class ModifyPart extends SWCommand {
 
         SchematicType.values().parallelStream()
                 .filter(SchematicType::isAssignable)
-                .filter(type -> finalClipboard == null || CheckSchemType.get(type) == null || AutoChecker.sizeCheck(finalClipboard, CheckSchemType.get(type)).fastOk())
+                .filter(type -> finalClipboard == null || CheckSchemTypeManager.get(type) == null || AutoChecker.sizeCheck(finalClipboard, CheckSchemTypeManager.get(type)).fastOk())
                 .forEach(type -> {
                     TextComponent component = new TextComponent(type.name() + " ");
                     component.setColor(ChatColor.GRAY);
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/SearchPart.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/SearchPart.java
index 81db6aba..d6834468 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/SearchPart.java
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/SearchPart.java
@@ -22,8 +22,8 @@ package de.steamwar.schematicsystem.commands.schematiccommand.parts;
 import de.steamwar.command.*;
 import de.steamwar.linkage.Linked;
 import de.steamwar.schematicsystem.SchematicSystem;
-import de.steamwar.schematicsystem.commands.schematiccommand.SchematicCommandUtils;
 import de.steamwar.schematicsystem.commands.schematiccommand.SchematicCommand;
+import de.steamwar.schematicsystem.commands.schematiccommand.SchematicCommandUtils;
 import de.steamwar.sql.SchematicNode;
 import de.steamwar.sql.SchematicType;
 import de.steamwar.sql.SteamwarUser;
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/data/YMLWrapperImpl.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/data/YMLWrapperImpl.java
new file mode 100644
index 00000000..78a050a6
--- /dev/null
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/data/YMLWrapperImpl.java
@@ -0,0 +1,154 @@
+/*
+ *   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.data;
+
+import de.steamwar.sql.SchematicType;
+import org.bukkit.Material;
+import org.bukkit.configuration.file.FileConfiguration;
+import org.bukkit.configuration.file.YamlConfiguration;
+
+import java.io.File;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+
+public class YMLWrapperImpl<M, ST, W> extends YMLWrapper<M, ST, W> {
+
+    public static YMLWrapperImpl<Material, SchematicType, String> ofTyped(File file) {
+        return new YMLWrapperImpl<>(file, ToMaterial, ToSchematicType, ToString);
+    }
+
+    public static <W> YMLWrapperImpl<Material, SchematicType, W> ofTyped(File file, Function<String, W> ToWincondtion) {
+        return new YMLWrapperImpl<>(file, ToMaterial, ToSchematicType, ToWincondtion);
+    }
+
+    public static YMLWrapperImpl<String, String, String> ofRaw(File file) {
+        return new YMLWrapperImpl<>(file, ToString, ToString, ToString);
+    }
+
+    public static final Function<String, Material> ToMaterial = material -> {
+        Material mat = Material.getMaterial(material);
+        if (mat == null) {
+            try {
+                mat = Material.valueOf(material);
+            } catch (IllegalArgumentException e) {
+                // Ignore
+            }
+        }
+        return mat;
+    };
+
+    private final FileConfiguration config;
+    private final String pathPrefix;
+
+    private YMLWrapperImpl(File file, Function<String, M> materialMapper, Function<String, ST> schematicTypeMapper, Function<String, W> winconditionMapper) {
+        super(file, materialMapper, schematicTypeMapper, winconditionMapper);
+        if (file == null || !file.exists()) {
+            config = null;
+            pathPrefix = "";
+        } else {
+            config = YamlConfiguration.loadConfiguration(file);
+            pathPrefix = "";
+        }
+    }
+
+    private YMLWrapperImpl(FileConfiguration config, String pathPrefix, Function<String, M> materialMapper, Function<String, ST> schematicTypeMapper, Function<String, W> winconditionMapper) {
+        super(null, materialMapper, schematicTypeMapper, winconditionMapper);
+        this.config = config;
+        this.pathPrefix = pathPrefix;
+    }
+
+    @Override
+    public boolean canLoad() {
+        return config != null;
+    }
+
+    @Override
+    public YMLWrapper<M, ST, W> with(String path) {
+        if (pathPrefix.isEmpty()) {
+            path = path + ".";
+        } else {
+            path = pathPrefix + path + ".";
+        }
+        if (config != null && config.isConfigurationSection(path)) {
+            return new YMLWrapperImpl<>(this.config, path, materialMapper, schematicTypeMapper, winconditionMapper);
+        } else {
+            return new YMLWrapperImpl<>(null, path, materialMapper, schematicTypeMapper, winconditionMapper);
+        }
+    }
+
+    @Override
+    public String getDefaultGameName() {
+        return "WarGear";
+    }
+
+    @Override
+    public String getString(String path, String defaultValue) {
+        if (config == null) return defaultValue;
+        return config.getString(pathPrefix + path, defaultValue);
+    }
+
+    @Override
+    public int getInt(String path, int defaultValue) {
+        if (config == null) return defaultValue;
+        return config.getInt(pathPrefix + path, defaultValue);
+    }
+
+    @Override
+    public double getDouble(String path, double defaultValue) {
+        if (config == null) return defaultValue;
+        return config.getDouble(pathPrefix + path, defaultValue);
+    }
+
+    @Override
+    public boolean getBoolean(String path, boolean defaultValue) {
+        if (config == null) return defaultValue;
+        return config.getBoolean(pathPrefix + path, defaultValue);
+    }
+
+    @Override
+    public List<String> getStringList(String path) {
+        if (config == null) return Collections.emptyList();
+        List<String> list = config.getStringList(pathPrefix + path);
+        if (list.isEmpty()) {
+            return Collections.emptyList();
+        } else {
+            return Collections.unmodifiableList(list);
+        }
+    }
+
+    @Override
+    public List<Integer> getIntList(String path) {
+        if (config == null) return Collections.emptyList();
+        List<Integer> list = config.getIntegerList(pathPrefix + path);
+        if (list.isEmpty()) {
+            return Collections.emptyList();
+        } else {
+            return Collections.unmodifiableList(list);
+        }
+    }
+
+    @Override
+    public List<Map<?, ?>> getMapList(String path) {
+        if (config == null) return Collections.emptyList();
+        return config.getMapList(pathPrefix + path);
+    }
+}
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/sql/SQLWrapperImpl.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/sql/SQLWrapperImpl.java
index fff456d3..2d11fdec 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/sql/SQLWrapperImpl.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/sql/SQLWrapperImpl.java
@@ -20,9 +20,10 @@
 package de.steamwar.sql;
 
 import de.steamwar.core.Core;
+import de.steamwar.data.GameModeConfig;
+import de.steamwar.data.YMLWrapperImpl;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
-import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
 
 import java.io.File;
@@ -36,33 +37,30 @@ public class SQLWrapperImpl implements SQLWrapper {
     @Override
     public void loadSchemTypes(List<SchematicType> tmpTypes, Map<String, SchematicType> tmpFromDB) {
         File folder = new File(Core.getInstance().getDataFolder().getParentFile(), "FightSystem");
-        if(folder.exists()) {
-            for(File configFile : Arrays.stream(folder.listFiles((file, name) -> name.endsWith(".yml") && !name.endsWith(".kits.yml"))).sorted().collect(Collectors.toList())) {
-                YamlConfiguration config = YamlConfiguration.loadConfiguration(configFile);
-                if(!config.isConfigurationSection("Schematic"))
-                    continue;
+        if (!folder.exists()) return;
+        for (File configFile : Arrays.stream(folder.listFiles((file, name) -> name.endsWith(".yml") && !name.endsWith(".kits.yml"))).sorted().collect(Collectors.toList())) {
+            GameModeConfig<String, String, String> gameModeConfig = new GameModeConfig<>(YMLWrapperImpl.ofRaw(configFile));
+            if (!gameModeConfig.Schematic.loaded) continue;
+            String type = gameModeConfig.Schematic.Type;
+            assert type != null;
+            String shortcut = gameModeConfig.Schematic.Shortcut;
+            if (tmpFromDB.containsKey(type.toLowerCase()))
+                continue;
 
-                String type = config.getString("Schematic.Type");
-                assert type != null;
-                String shortcut = config.getString("Schematic.Shortcut");
-                if(tmpFromDB.containsKey(type.toLowerCase()))
-                    continue;
+            SchematicType checktype = null;
+            String material = gameModeConfig.Schematic.Material;
 
-                SchematicType checktype = null;
-                String material = config.getString("Schematic.Material", "STONE_BUTTON");
-
-                if(!config.getStringList("CheckQuestions").isEmpty()) {
-                    checktype = new SchematicType("C" + type, "C" + shortcut, SchematicType.Type.CHECK_TYPE, null, material, true);
-                    tmpTypes.add(checktype);
-                    tmpFromDB.put(checktype.toDB(), checktype);
-                }
-
-                boolean manualCheck = config.getBoolean("Schematic.ManualCheck", true);
-
-                SchematicType current = new SchematicType(type, shortcut, config.isConfigurationSection("Server") ? SchematicType.Type.FIGHT_TYPE : SchematicType.Type.NORMAL, checktype, material, manualCheck);
-                tmpTypes.add(current);
-                tmpFromDB.put(type.toLowerCase(), current);
+            if (!gameModeConfig.CheckQuestions.isEmpty()) {
+                checktype = new SchematicType("C" + type, "C" + shortcut, SchematicType.Type.CHECK_TYPE, null, material, true);
+                tmpTypes.add(checktype);
+                tmpFromDB.put(checktype.toDB(), checktype);
             }
+
+            boolean manualCheck = gameModeConfig.Schematic.ManualCheck;
+
+            SchematicType current = new SchematicType(type, shortcut, gameModeConfig.Server.loaded ? SchematicType.Type.FIGHT_TYPE : SchematicType.Type.NORMAL, checktype, material, manualCheck);
+            tmpTypes.add(current);
+            tmpFromDB.put(type.toLowerCase(), current);
         }
     }
 
@@ -71,10 +69,10 @@ public class SQLWrapperImpl implements SQLWrapper {
     @Override
     public void additionalExceptionMetadata(StringBuilder builder) {
         builder.append("\nPlayers: ");
-        for(Player player : Bukkit.getOnlinePlayers())
+        for (Player player : Bukkit.getOnlinePlayers())
             builder.append(player.getName()).append(" ");
         builder.append("\nWorlds: ");
-        for(World world : Bukkit.getWorlds())
+        for (World world : Bukkit.getWorlds())
             builder.append(world.getName()).append(" ");
         builder.append("\nServer: ").append(SERVER_VERSION);
     }
diff --git a/VelocityCore/src/de/steamwar/data/YMLWrapperImpl.java b/VelocityCore/src/de/steamwar/data/YMLWrapperImpl.java
new file mode 100644
index 00000000..272b018d
--- /dev/null
+++ b/VelocityCore/src/de/steamwar/data/YMLWrapperImpl.java
@@ -0,0 +1,159 @@
+/*
+ *   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.data;
+
+import de.steamwar.sql.SchematicType;
+import org.yaml.snakeyaml.Yaml;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+
+public class YMLWrapperImpl<ST> extends YMLWrapper<String, ST, String> {
+
+    public static YMLWrapperImpl<SchematicType> ofTyped(File file) {
+        return new YMLWrapperImpl<>(file, ToSchematicType);
+    }
+
+    public static YMLWrapperImpl<String> ofRaw(File file) {
+        return new YMLWrapperImpl<>(file, ToString);
+    }
+
+    private final boolean canLoad;
+    private final Map<String, Object> document;
+
+    private YMLWrapperImpl(File file, Function<String, ST> schematicTypeMapper) {
+        super(file, ToString, schematicTypeMapper, ToString);
+        if (file == null || !file.exists()) {
+            canLoad = false;
+            document = new HashMap<>();
+        } else {
+            canLoad = true;
+            Yaml yaml = new Yaml();
+            try {
+                document = yaml.load(new FileInputStream(file));
+            } catch (IOException e) {
+                throw new SecurityException(e.getMessage(), e);
+            }
+        }
+    }
+
+    private YMLWrapperImpl(boolean canLoad, Map<String, Object> document, Function<String, ST> schematicTypeMapper) {
+        super(null, ToString, schematicTypeMapper, ToString);
+        this.canLoad = canLoad;
+        this.document = document;
+    }
+
+    @Override
+    public boolean canLoad() {
+        return canLoad;
+    }
+
+    @Override
+    public YMLWrapper<String, ST, String> with(String path) {
+        if (document.containsKey(path)) {
+            Object value = this.document.get(path);
+            if (value instanceof Map) {
+                return new YMLWrapperImpl(this.canLoad, (Map) value, schematicTypeMapper);
+            }
+        }
+        return new YMLWrapperImpl(false, Collections.emptyMap(), schematicTypeMapper);
+    }
+
+    @Override
+    public String getDefaultGameName() {
+        return file.getName().replace(".yml", "");
+    }
+
+    @Override
+    public String getString(String path, String defaultValue) {
+        Object value = this.document.get(path);
+        if (value instanceof String) {
+            return (String) value;
+        } else {
+            return defaultValue;
+        }
+    }
+
+    @Override
+    public int getInt(String path, int defaultValue) {
+        Object value = this.document.get(path);
+        if (value instanceof Integer) {
+            return (Integer) value;
+        } else {
+            return defaultValue;
+        }
+    }
+
+    @Override
+    public double getDouble(String path, double defaultValue) {
+        Object value = this.document.get(path);
+        if (value instanceof Double) {
+            return (Double) value;
+        } else {
+            return defaultValue;
+        }
+    }
+
+    @Override
+    public boolean getBoolean(String path, boolean defaultValue) {
+        Object value = this.document.get(path);
+        if (value instanceof Boolean) {
+            return (Boolean) value;
+        } else {
+            return defaultValue;
+        }
+    }
+
+    @Override
+    public List<String> getStringList(String path) {
+        Object value = this.document.get(path);
+        if (value instanceof List) {
+            return Collections.unmodifiableList((List<String>) value);
+        } else {
+            return Collections.emptyList();
+        }
+    }
+
+    @Override
+    public List<Integer> getIntList(String path) {
+        Object value = this.document.get(path);
+        if (value instanceof List) {
+            return Collections.unmodifiableList((List<Integer>) value);
+        } else {
+            return Collections.emptyList();
+        }
+    }
+
+    @Override
+    public List<Map<?, ?>> getMapList(String path) {
+        Object value = this.document.get(path);
+        if (value instanceof List) {
+            return Collections.unmodifiableList((List<Map<?, ?>>) value);
+        }  else {
+            return Collections.emptyList();
+        }
+    }
+}
diff --git a/VelocityCore/src/de/steamwar/sql/SQLWrapperImpl.java b/VelocityCore/src/de/steamwar/sql/SQLWrapperImpl.java
index 60212547..8f4328a1 100644
--- a/VelocityCore/src/de/steamwar/sql/SQLWrapperImpl.java
+++ b/VelocityCore/src/de/steamwar/sql/SQLWrapperImpl.java
@@ -21,52 +21,46 @@ package de.steamwar.sql;
 
 import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.server.RegisteredServer;
-import de.steamwar.velocitycore.GameModeConfig;
+import de.steamwar.data.GameModeConfig;
+import de.steamwar.data.YMLWrapperImpl;
 import de.steamwar.velocitycore.VelocityCore;
 import de.steamwar.velocitycore.commands.CheckCommand;
 
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.io.File;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
 public class SQLWrapperImpl implements SQLWrapper {
-    private static final SimpleDateFormat deadlineFormat = new SimpleDateFormat("dd.MM.yyyy HH:mm");
-    private static Date parseDeadline(String deadline) {
-        if(deadline == null)
-            return null;
-
-        try {
-            return deadlineFormat.parse(deadline);
-        } catch (ParseException e) {
-            throw new SecurityException(e.getMessage(), e);
-        }
-    }
 
     @Override
     public void loadSchemTypes(List<SchematicType> tmpTypes, Map<String, SchematicType> tmpFromDB) {
-        GameModeConfig.loadAll(GameModeConfig.class, (file, config) -> {
-            if(config.getSchematic() == null || tmpFromDB.containsKey(config.getSchemType().toLowerCase()))
-                return;
+        File folder = new File(VelocityCore.get().getDataDirectory().getParent().toFile(), "FightSystem");
+        if(!folder.exists())
+            return;
 
-            String shortcut = config.getSchematic().getShortcut();
-            String material = config.getSchematic().getMaterial();
+        for(File file : Arrays.stream(folder.listFiles((file, name) -> name.endsWith(".yml") && !name.endsWith(".kits.yml"))).sorted().toList()) {
+            GameModeConfig<String, String, String> gameModeConfig = new GameModeConfig<>(YMLWrapperImpl.ofRaw(file));
+            if (!gameModeConfig.Schematic.loaded) continue;
+            if (tmpFromDB.containsKey(gameModeConfig.Schematic.Type.toLowerCase())) continue;
+
+            String shortcut = gameModeConfig.Schematic.Shortcut;
+            String material = gameModeConfig.Schematic.Material;
 
             SchematicType checktype = null;
-            if(!config.getCheckQuestions().isEmpty()) {
-                checktype = new SchematicType("C" + config.getSchemType(), "C" + shortcut, SchematicType.Type.CHECK_TYPE, null, material, true);
+            if (!gameModeConfig.CheckQuestions.isEmpty()) {
+                checktype = new SchematicType("C" + gameModeConfig.Schematic.Type, "C" + shortcut, SchematicType.Type.CHECK_TYPE, null, material, true);
                 tmpTypes.add(checktype);
                 tmpFromDB.put(checktype.toDB(), checktype);
-                CheckCommand.setCheckQuestions(checktype, config.getCheckQuestions());
+                CheckCommand.setCheckQuestions(checktype, gameModeConfig.CheckQuestions);
             }
 
-            SchematicType current = new SchematicType(config.getSchemType(), shortcut, config.getServer() != null ? SchematicType.Type.FIGHT_TYPE : SchematicType.Type.NORMAL, checktype, material, parseDeadline(config.getDeadline()), config.getSchematic().isManualCheck());
+            SchematicType current = new SchematicType(gameModeConfig.Schematic.Type, shortcut, gameModeConfig.Server.loaded ? SchematicType.Type.FIGHT_TYPE : SchematicType.Type.NORMAL, checktype, material, gameModeConfig.Deadline, gameModeConfig.Schematic.ManualCheck);
             tmpTypes.add(current);
-            tmpFromDB.put(config.getSchemType().toLowerCase(), current);
+            tmpFromDB.put(gameModeConfig.Schematic.Type.toLowerCase(), current);
             if(checktype != null)
                 CheckCommand.addFightType(checktype, current);
-        });
+        }
     }
 
     @Override
diff --git a/VelocityCore/src/de/steamwar/velocitycore/ArenaMode.java b/VelocityCore/src/de/steamwar/velocitycore/ArenaMode.java
index 2db21ea9..7b94c584 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/ArenaMode.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/ArenaMode.java
@@ -19,21 +19,23 @@
 
 package de.steamwar.velocitycore;
 
+import de.steamwar.data.GameModeConfig;
+import de.steamwar.data.YMLWrapperImpl;
 import de.steamwar.sql.SchematicType;
 import lombok.Getter;
+import lombok.experimental.UtilityClass;
 
-import java.time.LocalDateTime;
+import java.io.File;
 import java.util.*;
 
-public class ArenaMode extends GameModeConfig {
+@UtilityClass
+public class ArenaMode {
 
-    private static final Random random = new Random();
-
-    private static final Map<String, ArenaMode> byChat = new HashMap<>();
-    private static final Map<String, ArenaMode> byInternal = new HashMap<>();
-    private static final Map<SchematicType, ArenaMode> bySchemType = new HashMap<>();
+    private static final Map<String, GameModeConfig<String, SchematicType, String>> byChat = new HashMap<>();
+    private static final Map<String, GameModeConfig<String, SchematicType, String>> byInternal = new HashMap<>();
+    private static final Map<SchematicType, GameModeConfig<String, SchematicType, String>> bySchemType = new HashMap<>();
     @Getter
-    private static final List<ArenaMode> allModes = new LinkedList<>();
+    private static final List<GameModeConfig<String, SchematicType, String>> allModes = new LinkedList<>();
 
     static {
         init();
@@ -45,90 +47,43 @@ public class ArenaMode extends GameModeConfig {
         bySchemType.clear();
         allModes.clear();
 
-        GameModeConfig.loadAll(ArenaMode.class, (file, mode) -> {
-            if(mode.getServer() == null)
-                return;
+        File folder = new File(VelocityCore.get().getDataDirectory().getParent().toFile(), "FightSystem");
+        if(!folder.exists())
+            return;
 
-            mode.config = file.getName();
-            mode.internalName = file.getName().replace(".yml", "");
-            mode.getMaps().forEach(map -> mode.lowerToRealMapNames.put(map.toLowerCase(), map));
-            if(mode.getGameName() == null)
-                mode.setGameName(mode.internalName);
+        for(File file : Arrays.stream(folder.listFiles((file, name) -> name.endsWith(".yml") && !name.endsWith(".kits.yml"))).sorted().toList()) {
+            de.steamwar.data.GameModeConfig<String, SchematicType, String> gameModeConfig = new de.steamwar.data.GameModeConfig<>(YMLWrapperImpl.ofTyped(file));
+            if (!gameModeConfig.Server.loaded) continue;
 
-            allModes.add(mode);
-            byInternal.put(mode.internalName, mode);
-            for(String name : mode.getServer().getChatNames()){
-                byChat.put(name.toLowerCase(), mode);
+            allModes.add(gameModeConfig);
+            byInternal.put(file.getName().replace(".yml", ""), gameModeConfig);
+            for (String name : gameModeConfig.Server.ChatNames) {
+                byChat.put(name.toLowerCase(), gameModeConfig);
             }
-
-            if(mode.getSchematic() != null && mode.getSchemType() != null)
-                bySchemType.put(SchematicType.fromDB(mode.getSchemType()), mode);
-        });
+            if (gameModeConfig.Schematic.loaded && gameModeConfig.Schematic.Type != SchematicType.Normal) {
+                bySchemType.put(gameModeConfig.Schematic.Type, gameModeConfig);
+            }
+        }
     }
 
-    public static ArenaMode getByChat(String name){
+    public static GameModeConfig<String, SchematicType, String> getByChat(String name){
         return byChat.get(name.toLowerCase());
     }
 
-    public static ArenaMode getByInternal(String name){
+    public static GameModeConfig<String, SchematicType, String> getByInternal(String name){
         return byInternal.get(name);
     }
 
     public static List<String> getAllChatNames(boolean historic) {
         List<String> chatNames = new LinkedList<>();
-        for(ArenaMode mode : byInternal.values()){
-            if(mode.isActive() && historic == mode.isHistoric())
-                chatNames.addAll(mode.getServer().getChatNames());
+        for(GameModeConfig<String, SchematicType, String> mode : byInternal.values()){
+            if(mode.isActive() && historic == mode.Server.Historic)
+                chatNames.addAll(mode.Server.ChatNames);
         }
         return chatNames;
     }
 
-    public static ArenaMode getBySchemType(SchematicType schemType){
+    public static GameModeConfig<String, SchematicType, String> getBySchemType(SchematicType schemType){
         return bySchemType.get(schemType);
     }
-
-
-    private final Map<String, String> lowerToRealMapNames = new HashMap<>();
-
-    @Getter
-    private String internalName;
-    @Getter
-    private String config;
-
-    @Getter
-    private List<Integer> ActiveMonths = Collections.emptyList();
-
-    public String hasMap(String map){
-        for(String m : getMaps()) {
-            if(m.equalsIgnoreCase(map))
-                return m;
-        }
-        return null;
-    }
-
-    public String getRandomMap(){
-        return getMaps().get(random.nextInt(getMaps().size()));
-    }
-
-    public String convertToRealMapName(String map){
-        return lowerToRealMapNames.get(map.toLowerCase());
-    }
-
-    public String getChatName(){
-        return getServer().getChatNames().get(0);
-    }
-
-    public boolean isActive() {
-        if (getServer().getChatNames().isEmpty()) return false;
-        if (ActiveMonths.isEmpty()) return true;
-        return ActiveMonths.contains(LocalDateTime.now().getMonth().getValue());
-    }
-
-    public String getSchemTypeOrInternalName() {
-        Schematic schematic = getSchematic();
-        if (schematic == null) {
-            return internalName;
-        }
-        return schematic.getType();
-    }
 }
diff --git a/VelocityCore/src/de/steamwar/velocitycore/GameModeConfig.java b/VelocityCore/src/de/steamwar/velocitycore/GameModeConfig.java
deleted file mode 100644
index fdb7c6a2..00000000
--- a/VelocityCore/src/de/steamwar/velocitycore/GameModeConfig.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.velocitycore;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.File;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.function.BiConsumer;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-@Getter
-public class GameModeConfig {
-
-    private static final Pattern terminatingNumber = Pattern.compile("(\\d+)$");
-
-    public static <T extends GameModeConfig> void loadAll(Class<T> config, BiConsumer<File, T> consumer) {
-        File folder = new File(VelocityCore.get().getDataDirectory().getParent().toFile(), "FightSystem");
-        if(!folder.exists())
-            return;
-
-        for(File file : Arrays.stream(folder.listFiles((file, name) -> name.endsWith(".yml") && !name.endsWith(".kits.yml"))).sorted().toList()) {
-            consumer.accept(file, Config.load(config, file, description -> {}));
-        }
-    }
-
-    private Server Server = null;
-    private List<String> CheckQuestions = Collections.emptyList();
-    private String deadline = null;
-    private Schematic Schematic = null;
-    @Setter
-    private String GameName;
-
-    @Getter
-    public static class Server {
-        private String Folder;
-        private List<String> ChatNames = Collections.emptyList();
-        private List<String> Maps;
-        private boolean Spigot = false;
-        private boolean Ranked = false;
-        private boolean Historic = false;
-    }
-
-    @Getter
-    public static class Schematic {
-        private String Type;
-        private String Shortcut;
-        private String Material;
-        private boolean ManualCheck = true;
-    }
-
-    public ServerVersion getVersion() {
-        Matcher matcher = terminatingNumber.matcher(getServer().getFolder());
-        matcher.find();
-        return ServerVersion.valueOf((getServer().isSpigot() ? "SPIGOT_" : "PAPER_") + matcher.group(1));
-    }
-
-    public String getFolder() {
-        return getServer().getFolder();
-    }
-
-    public List<String> getMaps() {
-        return getServer().getMaps();
-    }
-
-    public boolean isHistoric() {
-        return getServer().isHistoric();
-    }
-
-    public boolean isRanked() {
-        return getServer().isRanked();
-    }
-
-    public String getSchemType() {
-        return getSchematic().getType();
-    }
-}
diff --git a/VelocityCore/src/de/steamwar/velocitycore/ServerStarter.java b/VelocityCore/src/de/steamwar/velocitycore/ServerStarter.java
index d48d2c2b..31f73773 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/ServerStarter.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/ServerStarter.java
@@ -22,6 +22,7 @@ package de.steamwar.velocitycore;
 import com.velocitypowered.api.proxy.Player;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.velocity.platform.VelocityViaConfig;
+import de.steamwar.data.GameModeConfig;
 import de.steamwar.messages.Chatter;
 import de.steamwar.persistent.Arenaserver;
 import de.steamwar.persistent.Bauserver;
@@ -79,16 +80,16 @@ public class ServerStarter {
     private final Set<Player> playersToSend = new HashSet<>();
     private final Map<String, String> arguments = new HashMap<>();
 
-    public ServerStarter arena(ArenaMode mode, String map) {
+    public ServerStarter arena(GameModeConfig<String, SchematicType, String> mode, String map) {
         portrange = ARENA_PORTS;
-        serverNameProvider = port -> mode.getGameName() + (port - portrange.start);
-        version = mode.getVersion();
+        serverNameProvider = port -> mode.GameName + (port - portrange.start);
+        version = ServerVersion.from(mode);
         allowMerge = true;
         fightMap = map;
-        gameMode = mode.getInternalName();
-        directory = new File(SERVER_PATH, mode.getFolder());
-        arguments.put("config", mode.getConfig());
-        tempWorld(SERVER_PATH + mode.getFolder() + "/arenas/" + map);
+        gameMode = mode.configFile.getName().replace(".yml", "");
+        directory = new File(SERVER_PATH, mode.Server.Folder);
+        arguments.put("config", mode.configFile.getName());
+        tempWorld(SERVER_PATH + mode.Server.Folder + "/arenas/" + map);
         startCondition = () -> {
             if(playersToSend.stream().anyMatch(player -> Subserver.isArena(Subserver.getSubserver(player)))) {
                 playersToSend.forEach(player -> Chatter.of(player).system("FIGHT_IN_ARENA"));
@@ -115,7 +116,7 @@ public class ServerStarter {
         return this;
     }
 
-    public ServerStarter test(ArenaMode mode, String map, Player owner) {
+    public ServerStarter test(GameModeConfig<String, SchematicType, String> mode, String map, Player owner) {
         arena(mode, map);
         buildWithTemp(owner);
         portrange = BAU_PORTS;
diff --git a/VelocityCore/src/de/steamwar/velocitycore/ServerVersion.java b/VelocityCore/src/de/steamwar/velocitycore/ServerVersion.java
index 86068c5b..260bbec6 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/ServerVersion.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/ServerVersion.java
@@ -20,6 +20,8 @@
 package de.steamwar.velocitycore;
 
 import com.velocitypowered.api.network.ProtocolVersion;
+import de.steamwar.data.GameModeConfig;
+import de.steamwar.sql.SchematicType;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
@@ -27,6 +29,8 @@ import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 @Getter
 @AllArgsConstructor
@@ -108,4 +112,12 @@ public enum ServerVersion {
     public File getServerDirectory(String base) {
         return new File(ServerStarter.SERVER_PATH, base + versionSuffix);
     }
+
+    private static final Pattern terminatingNumber = Pattern.compile("(\\d+)$");
+
+    public static ServerVersion from(GameModeConfig<String, SchematicType, String> type) {
+        Matcher matcher = terminatingNumber.matcher(type.Server.Folder);
+        matcher.find();
+        return ServerVersion.valueOf((type.Server.Spigot ? "SPIGOT_" : "PAPER_") + matcher.group(1));
+    }
 }
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/BauCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/BauCommand.java
index 183e5414..48ab4d05 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/BauCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/BauCommand.java
@@ -23,6 +23,7 @@ import de.steamwar.command.PreviousArguments;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeMapper;
 import de.steamwar.command.TypeValidator;
+import de.steamwar.data.GameModeConfig;
 import de.steamwar.linkage.EventMode;
 import de.steamwar.linkage.Linked;
 import de.steamwar.linkage.LinkedInstance;
@@ -32,6 +33,7 @@ import de.steamwar.messages.PlayerChatter;
 import de.steamwar.network.packets.server.BaumemberUpdatePacket;
 import de.steamwar.persistent.Bauserver;
 import de.steamwar.sql.BauweltMember;
+import de.steamwar.sql.SchematicType;
 import de.steamwar.sql.SteamwarUser;
 import de.steamwar.velocitycore.*;
 import de.steamwar.velocitycore.inventory.SWInventory;
@@ -238,7 +240,7 @@ public class BauCommand extends SWCommand {
 
     @Register("test")
     @Register("testarena")
-    public void testarena(PlayerChatter sender, @Mapper("nonHistoricArenaMode") @OptionalValue("") @AllowNull ArenaMode arenaMode, @Mapper("arenaMap") @OptionalValue("") @AllowNull String map) {
+    public void testarena(PlayerChatter sender, @Mapper("nonHistoricArenaMode") @OptionalValue("") @AllowNull GameModeConfig<String, SchematicType, String> arenaMode, @Mapper("arenaMap") @OptionalValue("") @AllowNull String map) {
         FightCommand.createArena(sender, "/bau testarena ", false, arenaMode, map, false, (chatter, mode, m) ->
                 new ServerStarter().test(mode, m, sender.getPlayer()).start()
         );
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/BuilderCloudCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/BuilderCloudCommand.java
index 6d7a916b..6dc12264 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/BuilderCloudCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/BuilderCloudCommand.java
@@ -19,7 +19,9 @@
 
 package de.steamwar.velocitycore.commands;
 
+import de.steamwar.data.GameModeConfig;
 import de.steamwar.linkage.Linked;
+import de.steamwar.sql.SchematicType;
 import de.steamwar.velocitycore.ArenaMode;
 import de.steamwar.velocitycore.ServerStarter;
 import de.steamwar.velocitycore.ServerVersion;
@@ -85,14 +87,14 @@ public class BuilderCloudCommand extends SWCommand {
     }
 
     @Register(value = "deploy", description = "BUILDERCLOUD_DEPLOY_USAGE")
-    public void deploy(Chatter sender, @Mapper("nonHistoricArenaMode") ArenaMode arenaMode, @ErrorMessage("BUILDERCLOUD_VERSION") ServerVersion version, @Mapper("map") String map) {
+    public void deploy(Chatter sender, @Mapper("nonHistoricArenaMode") GameModeConfig<String, SchematicType, String> arenaMode, @ErrorMessage("BUILDERCLOUD_VERSION") ServerVersion version, @Mapper("map") String map) {
         if(!mapFile(version, map).exists()) {
             sender.system("BUILDERCLOUD_UNKNOWN_MAP");
             return;
         }
 
         VelocityCore.schedule(() -> {
-            VelocityCore.local.execute("deployarena.py", arenaMode.getConfig(), Integer.toString(version.getVersionSuffix()), map);
+            VelocityCore.local.execute("deployarena.py", arenaMode.configFile.getName(), Integer.toString(version.getVersionSuffix()), map);
             ArenaMode.init();
             sender.system("BUILDERCLOUD_DEPLOY_FINISHED");
         }).schedule();
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/ChallengeCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/ChallengeCommand.java
index 10e13c9c..024d4de4 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/ChallengeCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/ChallengeCommand.java
@@ -22,6 +22,7 @@ package de.steamwar.velocitycore.commands;
 import com.velocitypowered.api.proxy.Player;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeValidator;
+import de.steamwar.data.GameModeConfig;
 import de.steamwar.linkage.EventMode;
 import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
@@ -29,6 +30,7 @@ import de.steamwar.messages.Message;
 import de.steamwar.messages.PlayerChatter;
 import de.steamwar.persistent.Subserver;
 import de.steamwar.sql.IgnoreSystem;
+import de.steamwar.sql.SchematicType;
 import de.steamwar.velocitycore.ArenaMode;
 import de.steamwar.velocitycore.ServerStarter;
 import net.kyori.adventure.text.event.ClickEvent;
@@ -46,7 +48,7 @@ public class ChallengeCommand extends SWCommand {
     }
 
     @Register(description = "CHALLENGE_USAGE")
-    public void challenge(@Validator("arenaPlayer") PlayerChatter sender, @Validator("target") Player target, @Mapper("nonHistoricArenaMode") @OptionalValue("") @AllowNull ArenaMode arenaMode, @Mapper("arenaMap") @OptionalValue("") @AllowNull String map) {
+    public void challenge(@Validator("arenaPlayer") PlayerChatter sender, @Validator("target") Player target, @Mapper("nonHistoricArenaMode") @OptionalValue("") @AllowNull GameModeConfig<String, SchematicType, String> arenaMode, @Mapper("arenaMap") @OptionalValue("") @AllowNull String map) {
         FightCommand.createArena(sender, "/challenge " + target.getUsername() + " ", false, arenaMode, map, false, (chatter, mode, m) -> {
             Player p = sender.getPlayer();
             if(challenges.containsKey(target) && challenges.get(target).contains(p)){
@@ -54,7 +56,7 @@ public class ChallengeCommand extends SWCommand {
                 challenges.remove(p);
 
                 new ServerStarter().arena(mode, map).blueLeader(sender.getPlayer()).redLeader(target).callback(
-                        arena -> Chatter.broadcast().system("CHALLENGE_BROADCAST", new Message("CHALLENGE_BROADCAST_HOVER"), ClickEvent.runCommand("/arena " + arena.getServer().getName()), mode.getGameName(), p, target)
+                        arena -> Chatter.broadcast().system("CHALLENGE_BROADCAST", new Message("CHALLENGE_BROADCAST_HOVER"), ClickEvent.runCommand("/arena " + arena.getServer().getName()), mode.GameName, p, target)
                 ).start();
             }else{
                 if(!challenges.containsKey(p)){
@@ -63,8 +65,8 @@ public class ChallengeCommand extends SWCommand {
 
                 challenges.get(p).add(target);
 
-                sender.system("CHALLENGE_CHALLENGED", target, mode.getGameName());
-                Chatter.of(target).system("CHALLENGE_CHALLENGED_TARGET", p, mode.getGameName(), mode.getMaps().size() != 1 ? new Message("CHALLENGE_CHALLENGED_MAP", m) : "");
+                sender.system("CHALLENGE_CHALLENGED", target, mode.GameName);
+                Chatter.of(target).system("CHALLENGE_CHALLENGED_TARGET", p, mode.GameName, mode.Server.Maps.size() != 1 ? new Message("CHALLENGE_CHALLENGED_MAP", m) : "");
 
                 Chatter.of(target).system("CHALLENGE_ACCEPT", new Message("CHALLENGE_ACCEPT_HOVER"), ClickEvent.runCommand("/challenge " + p.getUsername() + " " + mode.getChatName() + " " + m));
             }
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/CheckCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/CheckCommand.java
index 2effbdcf..335e3201 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/CheckCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/CheckCommand.java
@@ -21,6 +21,7 @@ package de.steamwar.velocitycore.commands;
 
 import com.velocitypowered.api.proxy.Player;
 import de.steamwar.command.SWCommand;
+import de.steamwar.data.GameModeConfig;
 import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.Message;
@@ -39,8 +40,8 @@ import net.kyori.adventure.text.format.NamedTextColor;
 import java.awt.*;
 import java.sql.Timestamp;
 import java.time.Instant;
-import java.util.List;
 import java.util.*;
+import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.function.BooleanSupplier;
 import java.util.logging.Level;
@@ -220,7 +221,7 @@ public class CheckCommand extends SWCommand {
             this.startTime = Timestamp.from(Instant.now());
             this.checkList = checkQuestions.get(schematic.getSchemtype()).listIterator();
 
-            ArenaMode mode = ArenaMode.getBySchemType(fightTypes.get(schematic.getSchemtype()));
+            GameModeConfig<String, SchematicType, String> mode = ArenaMode.getBySchemType(fightTypes.get(schematic.getSchemtype()));
             new ServerStarter().test(mode, mode.getRandomMap(), checker.getPlayer()).check(schematic.getId()).callback(subserver -> {
                 currentCheckers.put(checker.user().getUUID(), this);
                 currentSchems.put(schematic.getId(), this);
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/FightCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/FightCommand.java
index 95be0879..86ff28cd 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/FightCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/FightCommand.java
@@ -21,6 +21,7 @@ package de.steamwar.velocitycore.commands;
 
 import com.velocitypowered.api.proxy.Player;
 import de.steamwar.command.SWCommand;
+import de.steamwar.data.GameModeConfig;
 import de.steamwar.linkage.EventMode;
 import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
@@ -28,6 +29,7 @@ import de.steamwar.messages.Message;
 import de.steamwar.messages.PlayerChatter;
 import de.steamwar.persistent.Arenaserver;
 import de.steamwar.persistent.Subserver;
+import de.steamwar.sql.SchematicType;
 import de.steamwar.velocitycore.ArenaMode;
 import de.steamwar.velocitycore.ServerStarter;
 import de.steamwar.velocitycore.inventory.SWInventory;
@@ -48,8 +50,8 @@ public class FightCommand extends SWCommand {
 
     private static void getModes(Chatter sender, String precommand, boolean historic){
         Component start = Component.empty();
-        for(ArenaMode mode : ArenaMode.getAllModes()){
-            if (!mode.isActive() || mode.isHistoric() != historic)
+        for(GameModeConfig<String, SchematicType, String> mode : ArenaMode.getAllModes()){
+            if (!mode.isActive() || mode.Server.Historic != historic)
                 continue;
 
             String command = precommand + mode.getChatName();
@@ -64,7 +66,7 @@ public class FightCommand extends SWCommand {
         sender.sendMessage(start);
     }
 
-    static void createArena(PlayerChatter sender, String precommand, boolean allowMerging, ArenaMode arenaMode, String map, boolean historic, FightCallback callback) {
+    static void createArena(PlayerChatter sender, String precommand, boolean allowMerging, GameModeConfig<String, SchematicType, String> arenaMode, String map, boolean historic, FightCallback callback) {
         if (arenaMode == null) {
             getModes(sender, precommand, historic);
             return;
@@ -80,12 +82,12 @@ public class FightCommand extends SWCommand {
         }
     }
 
-    private static void suggestMerging(PlayerChatter sender, ArenaMode mode, String map, FightCallback declineMerge) {
+    private static void suggestMerging(PlayerChatter sender, GameModeConfig<String, SchematicType, String> mode, String map, FightCallback declineMerge) {
         Arenaserver mergable = null;
         synchronized (Subserver.getServerList()) {
             for (Subserver subserver : Subserver.getServerList()) {
                 if(subserver instanceof Arenaserver arenaserver &&
-                        (mode.getInternalName().equals(arenaserver.getMode()) && arenaserver.isAllowMerge() && arenaserver.getRegisteredServer().getPlayersConnected().size() == 1)) {
+                        (mode.configFile.getName().replace(".yml", "").equals(arenaserver.getMode()) && arenaserver.isAllowMerge() && arenaserver.getRegisteredServer().getPlayersConnected().size() == 1)) {
                     mergable = arenaserver;
                     break;
                 }
@@ -103,7 +105,7 @@ public class FightCommand extends SWCommand {
             declineMerge.run(sender, mode, map);
         });
         Arenaserver finalMergable = mergable;
-        SWItem item = new SWItem(new Message("FIGHT_MERGE_INFO", mode.getGameName(), finalMergable.getMap()), 11);
+        SWItem item = new SWItem(new Message("FIGHT_MERGE_INFO", mode.GameName, finalMergable.getMap()), 11);
         item.addLore(new Message("FIGHT_MERGE_INFO_LORE_1", finalMergable.getRegisteredServer().getPlayersConnected().toArray(new Player[1])[0].getUsername()));
         inventory.addItem(4, item, click -> {});
         inventory.addItem(8, new SWItem(new Message("FIGHT_MERGE_ACCEPT"), 10), click -> {
@@ -118,15 +120,15 @@ public class FightCommand extends SWCommand {
     }
 
     @Register
-    public void fight(@Validator("arenaPlayer") PlayerChatter sender, @Mapper("nonHistoricArenaMode") @OptionalValue("") @AllowNull ArenaMode arenaMode, @Mapper("arenaMap") @OptionalValue("") @AllowNull String map) {
+    public void fight(@Validator("arenaPlayer") PlayerChatter sender, @Mapper("nonHistoricArenaMode") @OptionalValue("") @AllowNull GameModeConfig<String, SchematicType, String> arenaMode, @Mapper("arenaMap") @OptionalValue("") @AllowNull String map) {
         createArena(sender, "/fight ", true, arenaMode, map, false,
                 (p, mode, m) -> new ServerStarter().arena(mode, m).blueLeader(p.getPlayer()).callback(
-                        arena -> Chatter.broadcast().system("FIGHT_BROADCAST", new Message("FIGHT_BROADCAST_HOVER", p.getPlayer().getUsername()), ClickEvent.runCommand("/arena " + arena.getServer().getName()), mode.getGameName(), p.getPlayer().getUsername())
+                        arena -> Chatter.broadcast().system("FIGHT_BROADCAST", new Message("FIGHT_BROADCAST_HOVER", p.getPlayer().getUsername()), ClickEvent.runCommand("/arena " + arena.getServer().getName()), mode.GameName, p.getPlayer().getUsername())
                 ).start()
         );
     }
 
     public interface FightCallback {
-        void run(PlayerChatter player, ArenaMode mode, String map);
+        void run(PlayerChatter player, GameModeConfig<String, SchematicType, String> mode, String map);
     }
 }
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/HistoricCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/HistoricCommand.java
index d45f80f3..cfee955d 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/HistoricCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/HistoricCommand.java
@@ -20,11 +20,13 @@
 package de.steamwar.velocitycore.commands;
 
 import de.steamwar.command.SWCommand;
+import de.steamwar.data.GameModeConfig;
 import de.steamwar.linkage.EventMode;
 import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.Message;
 import de.steamwar.messages.PlayerChatter;
+import de.steamwar.sql.SchematicType;
 import de.steamwar.velocitycore.ArenaMode;
 import de.steamwar.velocitycore.ServerStarter;
 import net.kyori.adventure.text.event.ClickEvent;
@@ -37,9 +39,9 @@ public class HistoricCommand extends SWCommand {
     }
 
     @Register
-    public void historic(@Validator("arenaPlayer") PlayerChatter player, @Mapper("historicArenaMode") @OptionalValue("") @AllowNull ArenaMode arenaMode, @Mapper("arenaMap") @OptionalValue("") @AllowNull String map) {
+    public void historic(@Validator("arenaPlayer") PlayerChatter player, @Mapper("historicArenaMode") @OptionalValue("") @AllowNull GameModeConfig<String, SchematicType, String> arenaMode, @Mapper("arenaMap") @OptionalValue("") @AllowNull String map) {
         FightCommand.createArena(player, "/historic ", true, arenaMode, map, true, (p, mode, m) -> new ServerStarter().arena(mode, m).blueLeader(p.getPlayer()).callback(
-                arena -> Chatter.broadcast().system("HISTORIC_BROADCAST", new Message("HISTORIC_BROADCAST_HOVER", p), ClickEvent.runCommand("/arena " + arena.getServer().getName()), mode.getGameName(), p.getPlayer())
+                arena -> Chatter.broadcast().system("HISTORIC_BROADCAST", new Message("HISTORIC_BROADCAST_HOVER", p), ClickEvent.runCommand("/arena " + arena.getServer().getName()), mode.GameName, p.getPlayer())
         ).start());
     }
 }
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/RankCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/RankCommand.java
index fa072871..128cf5ea 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/RankCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/RankCommand.java
@@ -20,9 +20,11 @@
 package de.steamwar.velocitycore.commands;
 
 import de.steamwar.command.SWCommand;
+import de.steamwar.data.GameModeConfig;
 import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.Message;
+import de.steamwar.sql.SchematicType;
 import de.steamwar.sql.SteamwarUser;
 import de.steamwar.sql.UserElo;
 import de.steamwar.velocitycore.ArenaMode;
@@ -46,8 +48,8 @@ public class RankCommand extends SWCommand {
         if (!sender.user().equals(user))
             sender.prefixless("RANK_PLAYER_FOUND", user);
 
-        for(ArenaMode mode : ArenaMode.getAllModes()) {
-            if (!mode.isRanked())
+        for(GameModeConfig<String, SchematicType, String> mode : ArenaMode.getAllModes()) {
+            if (!mode.Server.Ranked)
                 continue;
 
             Optional<Integer> elo = UserElo.getElo(user.getId(), mode.getSchemTypeOrInternalName());
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/ReplayCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/ReplayCommand.java
index b817a0fe..72b12c4c 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/ReplayCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/ReplayCommand.java
@@ -19,17 +19,18 @@
 
 package de.steamwar.velocitycore.commands;
 
+import de.steamwar.command.SWCommand;
+import de.steamwar.data.GameModeConfig;
 import de.steamwar.linkage.EventMode;
 import de.steamwar.linkage.Linked;
-import de.steamwar.velocitycore.ArenaMode;
 import de.steamwar.messages.Message;
+import de.steamwar.messages.PlayerChatter;
+import de.steamwar.sql.*;
+import de.steamwar.velocitycore.ArenaMode;
 import de.steamwar.velocitycore.ServerStarter;
 import de.steamwar.velocitycore.inventory.SWItem;
 import de.steamwar.velocitycore.inventory.SWListInv;
 import de.steamwar.velocitycore.inventory.SWStreamInv;
-import de.steamwar.command.SWCommand;
-import de.steamwar.messages.PlayerChatter;
-import de.steamwar.sql.*;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -68,7 +69,7 @@ public class ReplayCommand extends SWCommand {
         if (PunishmentCommand.isPunishedWithMessage(sender, Punishment.PunishmentType.NoFightServer))
             return;
 
-        ArenaMode mode = ArenaMode.getBySchemType(fight.getSchemType());
+        GameModeConfig<String, SchematicType, String> mode = ArenaMode.getBySchemType(fight.getSchemType());
         ServerStarter starter = new ServerStarter().replay(fight.getFightID()).blueLeader(sender.getPlayer());
 
         String map = mode.getRandomMap();
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/TypeMappers.java b/VelocityCore/src/de/steamwar/velocitycore/commands/TypeMappers.java
index 8c2d6c66..001b2b61 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/TypeMappers.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/TypeMappers.java
@@ -19,14 +19,16 @@
 
 package de.steamwar.velocitycore.commands;
 
-import de.steamwar.velocitycore.ArenaMode;
 import de.steamwar.command.PreviousArguments;
 import de.steamwar.command.SWCommandUtils;
 import de.steamwar.command.TypeMapper;
 import de.steamwar.command.TypeValidator;
+import de.steamwar.data.GameModeConfig;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.PlayerChatter;
 import de.steamwar.sql.Punishment;
+import de.steamwar.sql.SchematicType;
+import de.steamwar.velocitycore.ArenaMode;
 import lombok.experimental.UtilityClass;
 
 import java.util.Collection;
@@ -45,13 +47,13 @@ public class TypeMappers {
         return (sender, player, messageSender) -> !PunishmentCommand.isPunishedWithMessage(player, Punishment.PunishmentType.NoFightServer);
     }
 
-    private static TypeMapper<ArenaMode> arenaModeTypeMapper(boolean historic) {
+    private static TypeMapper<GameModeConfig<String, SchematicType, String>> arenaModeTypeMapper(boolean historic) {
         return new TypeMapper<>() {
             @Override
-            public ArenaMode map(Chatter sender, PreviousArguments previousArguments, String s) {
-                ArenaMode arenaMode = ArenaMode.getByChat(s);
+            public GameModeConfig<String, SchematicType, String> map(Chatter sender, PreviousArguments previousArguments, String s) {
+                GameModeConfig<String, SchematicType, String> arenaMode = ArenaMode.getByChat(s);
                 if (arenaMode == null) return null;
-                if (arenaMode.isHistoric() != historic) return null;
+                if (arenaMode.Server.Historic != historic) return null;
                 if (!arenaMode.isActive()) return null;
                 return arenaMode;
             }
@@ -74,9 +76,9 @@ public class TypeMappers {
             @Override
             public Collection<String> tabCompletes(Chatter sender, PreviousArguments previousArguments, String s) {
                 if (previousArguments.userArgs.length == 0) return null;
-                ArenaMode arenaMode = ArenaMode.getByChat(previousArguments.userArgs[previousArguments.userArgs.length - 1]);
+                GameModeConfig<String, SchematicType, String> arenaMode = ArenaMode.getByChat(previousArguments.userArgs[previousArguments.userArgs.length - 1]);
                 if (arenaMode == null) return null;
-                return arenaMode.getMaps();
+                return arenaMode.Server.Maps;
             }
         };
     }
diff --git a/VelocityCore/src/de/steamwar/velocitycore/listeners/ChatListener.java b/VelocityCore/src/de/steamwar/velocitycore/listeners/ChatListener.java
index 407041f2..5b3ccff9 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/listeners/ChatListener.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/listeners/ChatListener.java
@@ -29,6 +29,7 @@ import com.velocitypowered.api.proxy.ConsoleCommandSource;
 import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.ServerConnection;
 import com.velocitypowered.api.proxy.server.ServerInfo;
+import de.steamwar.data.GameModeConfig;
 import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.ChatterGroup;
@@ -56,7 +57,7 @@ public class ChatListener extends BasicListener {
 
     private static final Logger cmdLogger = Logger.getLogger("Command logger");
 
-    private static final List<String> rankedModes = ArenaMode.getAllModes().stream().filter(ArenaMode::isRanked).map(ArenaMode::getSchemTypeOrInternalName).toList();
+    private static final List<String> rankedModes = ArenaMode.getAllModes().stream().filter(gameModeConfig -> gameModeConfig.Server.Ranked).map(GameModeConfig::getSchemTypeOrInternalName).toList();
 
     private static final Set<String> noLogCommands = Set.of("webpw", "webpassword", "web");
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/network/handlers/EloPlayerHandler.java b/VelocityCore/src/de/steamwar/velocitycore/network/handlers/EloPlayerHandler.java
index f3d4268e..69b13b22 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/network/handlers/EloPlayerHandler.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/network/handlers/EloPlayerHandler.java
@@ -20,7 +20,7 @@
 package de.steamwar.velocitycore.network.handlers;
 
 import com.velocitypowered.api.proxy.Player;
-import de.steamwar.linkage.EventMode;
+import de.steamwar.data.GameModeConfig;
 import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
 import de.steamwar.network.packets.PacketHandler;
@@ -56,14 +56,14 @@ public class EloPlayerHandler extends PacketHandler {
     @Handler
     public void handle(FightEndsPacket fightEndsPacket) {
         SchematicType schematicType = SchematicType.fromDB(fightEndsPacket.getGameMode());
-        ArenaMode arenaMode;
+        GameModeConfig<String, SchematicType, String> arenaMode;
         if (schematicType == null) {
             arenaMode = ArenaMode.getByInternal(fightEndsPacket.getGameMode());
         } else {
             arenaMode = ArenaMode.getBySchemType(schematicType);
         }
         if (arenaMode == null) return;
-        if (!arenaMode.isRanked()) return;
+        if (!arenaMode.Server.Ranked) return;
 
         if (EloSchemHandler.publicVsPrivate(fightEndsPacket))
             return;
diff --git a/VelocityCore/src/de/steamwar/velocitycore/network/handlers/EloSchemHandler.java b/VelocityCore/src/de/steamwar/velocitycore/network/handlers/EloSchemHandler.java
index 1c718c03..036a6b2d 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/network/handlers/EloSchemHandler.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/network/handlers/EloSchemHandler.java
@@ -19,6 +19,7 @@
 
 package de.steamwar.velocitycore.network.handlers;
 
+import de.steamwar.data.GameModeConfig;
 import de.steamwar.linkage.Linked;
 import de.steamwar.network.packets.PacketHandler;
 import de.steamwar.network.packets.common.FightEndsPacket;
@@ -45,8 +46,8 @@ public class EloSchemHandler extends PacketHandler {
     public void handle(FightEndsPacket fightEndsPacket) {
         SchematicType type = SchematicType.fromDB(fightEndsPacket.getGameMode());
         if (type == null) return;
-        ArenaMode arenaMode = ArenaMode.getBySchemType(type);
-        if (!arenaMode.isRanked()) return;
+        GameModeConfig<String, SchematicType, String> arenaMode = ArenaMode.getBySchemType(type);
+        if (!arenaMode.Server.Ranked) return;
 
         if (publicVsPrivate(fightEndsPacket))
             return;
diff --git a/VelocityCore/src/de/steamwar/velocitycore/network/handlers/PrepareSchemHandler.java b/VelocityCore/src/de/steamwar/velocitycore/network/handlers/PrepareSchemHandler.java
index 790d691b..da91ea50 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/network/handlers/PrepareSchemHandler.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/network/handlers/PrepareSchemHandler.java
@@ -20,14 +20,15 @@
 package de.steamwar.velocitycore.network.handlers;
 
 import com.velocitypowered.api.proxy.Player;
+import de.steamwar.data.GameModeConfig;
 import de.steamwar.linkage.Linked;
-import de.steamwar.velocitycore.ArenaMode;
-import de.steamwar.velocitycore.ServerStarter;
-import de.steamwar.velocitycore.VelocityCore;
 import de.steamwar.network.packets.PacketHandler;
 import de.steamwar.network.packets.client.PrepareSchemPacket;
 import de.steamwar.sql.SchematicType;
 import de.steamwar.sql.SteamwarUser;
+import de.steamwar.velocitycore.ArenaMode;
+import de.steamwar.velocitycore.ServerStarter;
+import de.steamwar.velocitycore.VelocityCore;
 
 @Linked
 public class PrepareSchemHandler extends PacketHandler {
@@ -36,7 +37,7 @@ public class PrepareSchemHandler extends PacketHandler {
     public void handle(PrepareSchemPacket packet) {
         Player player = VelocityCore.getProxy().getPlayer(SteamwarUser.get(packet.getPlayer()).getUUID()).orElse(null);
         int schematicID = packet.getSchem();
-        ArenaMode mode = ArenaMode.getBySchemType(SchematicType.fromDB(packet.getSchemType()));
+        GameModeConfig<String, SchematicType, String> mode = ArenaMode.getBySchemType(SchematicType.fromDB(packet.getSchemType()));
 
         new ServerStarter().test(mode, mode.getRandomMap(), player).prepare(schematicID).start();
     }

From e6dea7202434dcf751d56eed57190029516dd1bc Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sat, 25 Oct 2025 22:03:32 +0200
Subject: [PATCH 167/214] Improve YMLWrapper

---
 .../Data/src/de/steamwar/data/YMLWrapper.java | 19 +++++++--
 .../CheckSchemTypeManager.java                |  1 -
 .../src/de/steamwar/data/YMLWrapperImpl.java  | 26 +++----------
 .../src/de/steamwar/data/YMLWrapperImpl.java  | 39 +++----------------
 4 files changed, 26 insertions(+), 59 deletions(-)

diff --git a/CommonCore/Data/src/de/steamwar/data/YMLWrapper.java b/CommonCore/Data/src/de/steamwar/data/YMLWrapper.java
index 7e9df6b4..9ccf0700 100644
--- a/CommonCore/Data/src/de/steamwar/data/YMLWrapper.java
+++ b/CommonCore/Data/src/de/steamwar/data/YMLWrapper.java
@@ -25,6 +25,7 @@ import java.io.File;
 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;
 
@@ -55,13 +56,23 @@ public abstract class YMLWrapper<M, ST, W> {
 
     public abstract String getDefaultGameName();
 
-    public abstract String getString(String path, String defaultValue);
+    public abstract <T> T get(String path, T defaultValue, Function<Object, T> mapper);
 
-    public abstract int getInt(String path, int defaultValue);
+    public String getString(String path, String defaultValue) {
+        return get(path, defaultValue, Objects::toString);
+    }
 
-    public abstract double getDouble(String path, double defaultValue);
+    public int getInt(String path, int defaultValue) {
+        return get(path, defaultValue, Integer.class::cast);
+    }
 
-    public abstract boolean getBoolean(String path, boolean defaultValue);
+    public double getDouble(String path, double defaultValue) {
+        return get(path, defaultValue, Double.class::cast);
+    }
+
+    public boolean getBoolean(String path, boolean defaultValue) {
+        return get(path, defaultValue, Boolean.class::cast);
+    }
 
     public final ST getSchematicType(String path, String defaultValue) {
         String schematicType = getString(path, defaultValue);
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/CheckSchemTypeManager.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/CheckSchemTypeManager.java
index 2b0e8317..f881ce51 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/CheckSchemTypeManager.java
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/CheckSchemTypeManager.java
@@ -36,7 +36,6 @@ public class CheckSchemTypeManager {
 
     static {
         File folder = new File(SchematicSystem.getInstance().getDataFolder().getParentFile(), "FightSystem");
-
         if(folder.exists()) {
             for(File configFile : folder.listFiles((file, name) -> name.endsWith(".yml") && !name.endsWith(".kits.yml"))) {
                 GameModeConfig<Material, SchematicType, String> gameModeConfig = new GameModeConfig<>(YMLWrapperImpl.ofTyped(configFile));
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/data/YMLWrapperImpl.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/data/YMLWrapperImpl.java
index 78a050a6..2f07b6b2 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/data/YMLWrapperImpl.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/data/YMLWrapperImpl.java
@@ -101,27 +101,13 @@ public class YMLWrapperImpl<M, ST, W> extends YMLWrapper<M, ST, W> {
     }
 
     @Override
-    public String getString(String path, String defaultValue) {
+    public <T> T get(String path, T defaultValue, Function<Object, T> mapper) {
         if (config == null) return defaultValue;
-        return config.getString(pathPrefix + path, defaultValue);
-    }
-
-    @Override
-    public int getInt(String path, int defaultValue) {
-        if (config == null) return defaultValue;
-        return config.getInt(pathPrefix + path, defaultValue);
-    }
-
-    @Override
-    public double getDouble(String path, double defaultValue) {
-        if (config == null) return defaultValue;
-        return config.getDouble(pathPrefix + path, defaultValue);
-    }
-
-    @Override
-    public boolean getBoolean(String path, boolean defaultValue) {
-        if (config == null) return defaultValue;
-        return config.getBoolean(pathPrefix + path, defaultValue);
+        try {
+            return mapper.apply(config.get(path, defaultValue));
+        } catch (ClassCastException e) {
+            return defaultValue;
+        }
     }
 
     @Override
diff --git a/VelocityCore/src/de/steamwar/data/YMLWrapperImpl.java b/VelocityCore/src/de/steamwar/data/YMLWrapperImpl.java
index 272b018d..c58c4708 100644
--- a/VelocityCore/src/de/steamwar/data/YMLWrapperImpl.java
+++ b/VelocityCore/src/de/steamwar/data/YMLWrapperImpl.java
@@ -88,41 +88,12 @@ public class YMLWrapperImpl<ST> extends YMLWrapper<String, ST, String> {
     }
 
     @Override
-    public String getString(String path, String defaultValue) {
+    public <T> T get(String path, T defaultValue, Function<Object, T> mapper) {
         Object value = this.document.get(path);
-        if (value instanceof String) {
-            return (String) value;
-        } else {
-            return defaultValue;
-        }
-    }
-
-    @Override
-    public int getInt(String path, int defaultValue) {
-        Object value = this.document.get(path);
-        if (value instanceof Integer) {
-            return (Integer) value;
-        } else {
-            return defaultValue;
-        }
-    }
-
-    @Override
-    public double getDouble(String path, double defaultValue) {
-        Object value = this.document.get(path);
-        if (value instanceof Double) {
-            return (Double) value;
-        } else {
-            return defaultValue;
-        }
-    }
-
-    @Override
-    public boolean getBoolean(String path, boolean defaultValue) {
-        Object value = this.document.get(path);
-        if (value instanceof Boolean) {
-            return (Boolean) value;
-        } else {
+        if (value == null) return defaultValue;
+        try {
+            return mapper.apply(value);
+        } catch (ClassCastException e) {
             return defaultValue;
         }
     }

From 4405d9c25d5108ef3452f2d76eeba99cb67035b3 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sat, 25 Oct 2025 22:08:58 +0200
Subject: [PATCH 168/214] Improve YMLWrapper

---
 .../Data/src/de/steamwar/data/YMLWrapper.java | 10 ++++++++--
 .../src/de/steamwar/data/YMLWrapperImpl.java  | 20 ++++++-------------
 .../src/de/steamwar/data/YMLWrapperImpl.java  | 19 +++++-------------
 3 files changed, 19 insertions(+), 30 deletions(-)

diff --git a/CommonCore/Data/src/de/steamwar/data/YMLWrapper.java b/CommonCore/Data/src/de/steamwar/data/YMLWrapper.java
index 9ccf0700..c7813b12 100644
--- a/CommonCore/Data/src/de/steamwar/data/YMLWrapper.java
+++ b/CommonCore/Data/src/de/steamwar/data/YMLWrapper.java
@@ -83,9 +83,15 @@ public abstract class YMLWrapper<M, ST, W> {
         return materialMapper.apply(getString(path, defaultValue).toUpperCase());
     }
 
-    public abstract List<String> getStringList(String path);
+    public abstract <T> List<T> get(String path, Function<Object, List<T>> mapper);
 
-    public abstract List<Integer> getIntList(String path);
+    public List<String> getStringList(String path) {
+        return get(path, o -> (List<String>) o);
+    }
+
+    public List<Integer> getIntList(String path) {
+        return get(path, o -> (List<Integer>) o);
+    }
 
     public final List<ST> getSchematicTypeList(String path) {
         List<String> list = getStringList(path);
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/data/YMLWrapperImpl.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/data/YMLWrapperImpl.java
index 2f07b6b2..55b749bb 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/data/YMLWrapperImpl.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/data/YMLWrapperImpl.java
@@ -111,24 +111,16 @@ public class YMLWrapperImpl<M, ST, W> extends YMLWrapper<M, ST, W> {
     }
 
     @Override
-    public List<String> getStringList(String path) {
+    public <T> List<T> get(String path, Function<Object, List<T>> mapper) {
         if (config == null) return Collections.emptyList();
-        List<String> list = config.getStringList(pathPrefix + path);
-        if (list.isEmpty()) {
+        List<?> list = config.getList(pathPrefix + path);
+        if (list == null || list.isEmpty()) {
             return Collections.emptyList();
-        } else {
-            return Collections.unmodifiableList(list);
         }
-    }
-
-    @Override
-    public List<Integer> getIntList(String path) {
-        if (config == null) return Collections.emptyList();
-        List<Integer> list = config.getIntegerList(pathPrefix + path);
-        if (list.isEmpty()) {
+        try {
+            return Collections.unmodifiableList(mapper.apply(list));
+        } catch (ClassCastException e) {
             return Collections.emptyList();
-        } else {
-            return Collections.unmodifiableList(list);
         }
     }
 
diff --git a/VelocityCore/src/de/steamwar/data/YMLWrapperImpl.java b/VelocityCore/src/de/steamwar/data/YMLWrapperImpl.java
index c58c4708..b5dc7a60 100644
--- a/VelocityCore/src/de/steamwar/data/YMLWrapperImpl.java
+++ b/VelocityCore/src/de/steamwar/data/YMLWrapperImpl.java
@@ -99,21 +99,12 @@ public class YMLWrapperImpl<ST> extends YMLWrapper<String, ST, String> {
     }
 
     @Override
-    public List<String> getStringList(String path) {
+    public <T> List<T> get(String path, Function<Object, List<T>> mapper) {
         Object value = this.document.get(path);
-        if (value instanceof List) {
-            return Collections.unmodifiableList((List<String>) value);
-        } else {
-            return Collections.emptyList();
-        }
-    }
-
-    @Override
-    public List<Integer> getIntList(String path) {
-        Object value = this.document.get(path);
-        if (value instanceof List) {
-            return Collections.unmodifiableList((List<Integer>) value);
-        } else {
+        if (value == null) return Collections.emptyList();
+        try {
+            return Collections.unmodifiableList(mapper.apply(value));
+        } catch (ClassCastException e) {
             return Collections.emptyList();
         }
     }

From aec03e41a176ede4b9aa1b6d260e3e3b662b0817 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sun, 26 Oct 2025 09:14:34 +0100
Subject: [PATCH 169/214] Improve YMLWrapper

---
 .../region/fixed/FixedGlobalRegion.java       |   5 +-
 .../bausystem/region/fixed/FixedRegion.java   |   5 +-
 CommonCore/Data/build.gradle.kts              |   2 +
 .../src/de/steamwar/data/GameModeConfig.java  |   9 +-
 .../Data/src/de/steamwar/data/YMLWrapper.java |  97 ++++++++++---
 .../src/de/steamwar/fightsystem/Config.java   |   5 +-
 .../CheckSchemTypeManager.java                |   5 +-
 .../src/de/steamwar/data/YMLWrapperImpl.java  | 132 ------------------
 .../src/de/steamwar/data/YMLWrapperUtils.java |  41 ++++++
 .../src/de/steamwar/sql/SQLWrapperImpl.java   |   8 +-
 .../src/de/steamwar/data/YMLWrapperImpl.java  | 121 ----------------
 .../src/de/steamwar/sql/SQLWrapperImpl.java   |   4 +-
 .../de/steamwar/velocitycore/ArenaMode.java   |   4 +-
 .../src/de/steamwar/sql/SQLWrapperImpl.kt     |  39 +++---
 14 files changed, 163 insertions(+), 314 deletions(-)
 delete mode 100644 SpigotCore/SpigotCore_Main/src/de/steamwar/data/YMLWrapperImpl.java
 create mode 100644 SpigotCore/SpigotCore_Main/src/de/steamwar/data/YMLWrapperUtils.java
 delete mode 100644 VelocityCore/src/de/steamwar/data/YMLWrapperImpl.java

diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalRegion.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalRegion.java
index 1edc4787..af08c4ae 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalRegion.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalRegion.java
@@ -23,7 +23,8 @@ import com.sk89q.worldedit.extent.clipboard.Clipboard;
 import de.steamwar.bausystem.region.*;
 import de.steamwar.bausystem.utils.PasteBuilder;
 import de.steamwar.data.GameModeConfig;
-import de.steamwar.data.YMLWrapperImpl;
+import de.steamwar.data.YMLWrapper;
+import de.steamwar.data.YMLWrapperUtils;
 import de.steamwar.sql.SchematicType;
 import lombok.NonNull;
 import lombok.Setter;
@@ -94,7 +95,7 @@ public final class FixedGlobalRegion implements Region {
         }
     };
 
-    private static final GameModeConfig<Material, SchematicType, String> GLOBAL_CONFIG = new GameModeConfig<>(YMLWrapperImpl.ofTyped(null));
+    private static final GameModeConfig<Material, SchematicType, String> GLOBAL_CONFIG = new GameModeConfig<>(null, YMLWrapperUtils.ToMaterial, YMLWrapper.ToSchematicType, YMLWrapper.ToString, YMLWrapper.ToStaticWarGear);
 
     private FixedGlobalRegion() {
     }
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java
index 69d7b9d0..399c5aba 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java
@@ -29,7 +29,8 @@ import de.steamwar.bausystem.utils.PasteBuilder;
 import de.steamwar.bausystem.worlddata.WorldData;
 import de.steamwar.core.Core;
 import de.steamwar.data.GameModeConfig;
-import de.steamwar.data.YMLWrapperImpl;
+import de.steamwar.data.YMLWrapper;
+import de.steamwar.data.YMLWrapperUtils;
 import de.steamwar.sql.SchematicType;
 import lombok.NonNull;
 import org.bukkit.Bukkit;
@@ -339,7 +340,7 @@ public class FixedRegion implements Region {
                 break;
             }
         }
-        this.gameModeConfig = new GameModeConfig<>(YMLWrapperImpl.ofTyped(found));
+        this.gameModeConfig = new GameModeConfig<>(found, YMLWrapperUtils.ToMaterial, YMLWrapper.ToSchematicType, YMLWrapper.ToString, YMLWrapper.ToStaticWarGear);
         this.regionData = new RegionData.RegionDataImpl(regionData, WorldData::write);
     }
 
diff --git a/CommonCore/Data/build.gradle.kts b/CommonCore/Data/build.gradle.kts
index b458588b..75a22699 100644
--- a/CommonCore/Data/build.gradle.kts
+++ b/CommonCore/Data/build.gradle.kts
@@ -23,4 +23,6 @@ plugins {
 
 dependencies {
     api(project(":CommonCore:SQL"))
+
+    implementation("org.yaml:snakeyaml:2.2")
 }
\ No newline at end of file
diff --git a/CommonCore/Data/src/de/steamwar/data/GameModeConfig.java b/CommonCore/Data/src/de/steamwar/data/GameModeConfig.java
index d68fddcd..ed405522 100644
--- a/CommonCore/Data/src/de/steamwar/data/GameModeConfig.java
+++ b/CommonCore/Data/src/de/steamwar/data/GameModeConfig.java
@@ -28,6 +28,7 @@ import java.text.SimpleDateFormat;
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 @ToString
@@ -94,8 +95,10 @@ public final class GameModeConfig<M, ST, W> {
     public final List<Integer> EnterStages;
     public final Techhider<M> Techhider;
 
-    public GameModeConfig(YMLWrapper<M, ST, W> loader) {
-        configFile = loader.getFile();
+    public GameModeConfig(File file, Function<String, M> materialMapper, Function<String, ST> schematicTypeMapper, Function<String, W> winconditionMapper, Function<File, String> defaultGameName) {
+        YMLWrapper<M, ST, W> loader = new YMLWrapper<>(file, materialMapper, schematicTypeMapper, winconditionMapper);
+
+        configFile = file;
         loaded = loader.canLoad();
         Server = new Server(loader.with("Server"));
 
@@ -116,7 +119,7 @@ public final class GameModeConfig<M, ST, W> {
         Times = new Times(loader.with("Times"));
         // Arena would be here to be in config order but needs Schematic.Size and EnterStages loaded afterwards
         Schematic = new Schematic<>(loader.with("Schematic"));
-        GameName = loader.getString("GameName", loader.getDefaultGameName());
+        GameName = loader.getString("GameName", defaultGameName.apply(file));
         ActiveMonths = loader.getIntList("ActiveMonths");
         TeamChatPrefix = loader.getString("TeamChatPrefix", "+");
         Blue = new Blue(loader.with("Blue"));
diff --git a/CommonCore/Data/src/de/steamwar/data/YMLWrapper.java b/CommonCore/Data/src/de/steamwar/data/YMLWrapper.java
index c7813b12..644a8c13 100644
--- a/CommonCore/Data/src/de/steamwar/data/YMLWrapper.java
+++ b/CommonCore/Data/src/de/steamwar/data/YMLWrapper.java
@@ -20,8 +20,11 @@
 package de.steamwar.data;
 
 import de.steamwar.sql.SchematicType;
+import org.yaml.snakeyaml.Yaml;
 
 import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -29,34 +32,75 @@ import java.util.Objects;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-public abstract class YMLWrapper<M, ST, W> {
+public final class YMLWrapper<M, ST, W> {
 
     public static final Function<String, String> ToString = Function.identity();
     public static final Function<String, SchematicType> ToSchematicType = SchematicType::fromDB;
 
-    protected final File file;
-    public final Function<String, M> materialMapper;
-    public final Function<String, ST> schematicTypeMapper;
-    public final Function<String, W> winconditionMapper;
+    public static final Function<File, String> ToStaticWarGear = __ -> "WarGear";
+    public static final Function<File, String> ToInternalName = file -> file.getName().replace(".yml", "");
 
-    protected YMLWrapper(File file, Function<String, M> materialMapper, Function<String, ST> schematicTypeMapper, Function<String, W> winconditionMapper) {
+    private final File file;
+    final Function<String, M> materialMapper;
+    final Function<String, ST> schematicTypeMapper;
+    final Function<String, W> winconditionMapper;
+
+    private final boolean canLoad;
+    private final Map<String, Object> document;
+
+    public YMLWrapper(File file, Function<String, M> materialMapper, Function<String, ST> schematicTypeMapper, Function<String, W> winconditionMapper) {
         this.file = file;
         this.materialMapper = materialMapper;
         this.schematicTypeMapper = schematicTypeMapper;
         this.winconditionMapper = winconditionMapper;
+
+        Yaml yaml = new Yaml();
+        Map<String, Object> document = Collections.emptyMap();
+        boolean canLoad = false;
+        if (file != null && file.exists() && file.isFile()) {
+            try {
+                document = yaml.load(new FileReader(file));
+                canLoad = true;
+            } catch (IOException e) {
+                // Ignore
+            }
+        }
+        this.document = document;
+        this.canLoad = canLoad;
     }
 
-    public final File getFile() {
-        return file;
+    private YMLWrapper(boolean canLoad, Map<String, Object> document, Function<String, M> materialMapper, Function<String, ST> schematicTypeMapper, Function<String, W> winconditionMapper) {
+        this.file = null;
+        this.materialMapper = materialMapper;
+        this.schematicTypeMapper = schematicTypeMapper;
+        this.winconditionMapper = winconditionMapper;
+        this.canLoad = canLoad;
+        this.document = document;
     }
 
-    public abstract boolean canLoad();
+    public boolean canLoad() {
+        return canLoad;
+    }
 
-    public abstract YMLWrapper<M, ST, W> with(String path);
+    public YMLWrapper<M, ST, W> with(String path) {
+        if (document.containsKey(path)) {
+            Object value = document.get(path);
+            if (value instanceof Map) {
+                return new YMLWrapper<>(true, (Map) value, materialMapper, schematicTypeMapper, winconditionMapper);
+            }
+        }
+        return new YMLWrapper<>(false, Collections.emptyMap(), materialMapper, schematicTypeMapper, winconditionMapper);
+    }
 
-    public abstract String getDefaultGameName();
-
-    public abstract <T> T get(String path, T defaultValue, Function<Object, T> mapper);
+    public <T> T get(String path, T defaultValue, Function<Object, T> mapper) {
+        Object value = this.document.get(path);
+        if (value == null) return defaultValue;
+        try {
+            return mapper.apply(value);
+        } catch (ClassCastException e) {
+            return defaultValue;
+        }
+    }
 
     public String getString(String path, String defaultValue) {
         return get(path, defaultValue, Objects::toString);
@@ -74,16 +118,24 @@ public abstract class YMLWrapper<M, ST, W> {
         return get(path, defaultValue, Boolean.class::cast);
     }
 
-    public final ST getSchematicType(String path, String defaultValue) {
+    public ST getSchematicType(String path, String defaultValue) {
         String schematicType = getString(path, defaultValue);
         return schematicTypeMapper.apply(schematicType);
     }
 
-    public final M getMaterial(String path, String defaultValue) {
+    public M getMaterial(String path, String defaultValue) {
         return materialMapper.apply(getString(path, defaultValue).toUpperCase());
     }
 
-    public abstract <T> List<T> get(String path, Function<Object, List<T>> mapper);
+    public <T> List<T> get(String path, Function<Object, List<T>> mapper) {
+        Object value = this.document.get(path);
+        if (value == null) return Collections.emptyList();
+        try {
+            return Collections.unmodifiableList(mapper.apply(value));
+        } catch (ClassCastException e) {
+            return Collections.emptyList();
+        }
+    }
 
     public List<String> getStringList(String path) {
         return get(path, o -> (List<String>) o);
@@ -93,7 +145,7 @@ public abstract class YMLWrapper<M, ST, W> {
         return get(path, o -> (List<Integer>) o);
     }
 
-    public final List<ST> getSchematicTypeList(String path) {
+    public List<ST> getSchematicTypeList(String path) {
         List<String> list = getStringList(path);
         if (list.isEmpty()) {
             return Collections.emptyList();
@@ -102,7 +154,7 @@ public abstract class YMLWrapper<M, ST, W> {
         }
     }
 
-    public final List<M> getMaterialList(String path) {
+    public List<M> getMaterialList(String path) {
         List<String> list = getStringList(path);
         if (list.isEmpty()) {
             return Collections.emptyList();
@@ -111,5 +163,12 @@ public abstract class YMLWrapper<M, ST, W> {
         }
     }
 
-    public abstract List<Map<?, ?>> getMapList(String path);
+    public List<Map<?, ?>> getMapList(String path) {
+        Object value = this.document.get(path);
+        if (value instanceof List) {
+            return Collections.unmodifiableList((List<Map<?, ?>>) value);
+        } else {
+            return Collections.emptyList();
+        }
+    }
 }
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/Config.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/Config.java
index 57c556ed..f8e18d4f 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/Config.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/Config.java
@@ -20,7 +20,8 @@
 package de.steamwar.fightsystem;
 
 import de.steamwar.data.GameModeConfig;
-import de.steamwar.data.YMLWrapperImpl;
+import de.steamwar.data.YMLWrapper;
+import de.steamwar.data.YMLWrapperUtils;
 import de.steamwar.fightsystem.utils.Region;
 import de.steamwar.fightsystem.winconditions.Winconditions;
 import de.steamwar.sql.*;
@@ -109,7 +110,7 @@ public class Config {
             Bukkit.getLogger().log(Level.SEVERE, "Arenaconfig fehlt!");
             Bukkit.shutdown();
         }
-        GameModeConfig = new GameModeConfig<>(YMLWrapperImpl.ofTyped(new File(FightSystem.getPlugin().getDataFolder(), configFile), Winconditions::valueOf));
+        GameModeConfig = new GameModeConfig<>(new File(FightSystem.getPlugin().getDataFolder(), configFile), YMLWrapperUtils.ToMaterial, YMLWrapper.ToSchematicType, Winconditions::valueOf, YMLWrapper.ToStaticWarGear);
 
         File worldConfigFile = new File(world.getWorldFolder(), "config.yml");
         if(!worldConfigFile.exists()) {
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/CheckSchemTypeManager.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/CheckSchemTypeManager.java
index f881ce51..48bd8859 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/CheckSchemTypeManager.java
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/CheckSchemTypeManager.java
@@ -20,7 +20,8 @@
 package de.steamwar.schematicsystem;
 
 import de.steamwar.data.GameModeConfig;
-import de.steamwar.data.YMLWrapperImpl;
+import de.steamwar.data.YMLWrapper;
+import de.steamwar.data.YMLWrapperUtils;
 import de.steamwar.sql.SchematicType;
 import lombok.experimental.UtilityClass;
 import org.bukkit.Material;
@@ -38,7 +39,7 @@ public class CheckSchemTypeManager {
         File folder = new File(SchematicSystem.getInstance().getDataFolder().getParentFile(), "FightSystem");
         if(folder.exists()) {
             for(File configFile : folder.listFiles((file, name) -> name.endsWith(".yml") && !name.endsWith(".kits.yml"))) {
-                GameModeConfig<Material, SchematicType, String> gameModeConfig = new GameModeConfig<>(YMLWrapperImpl.ofTyped(configFile));
+                GameModeConfig<Material, SchematicType, String> gameModeConfig = new GameModeConfig<>(configFile, YMLWrapperUtils.ToMaterial, YMLWrapper.ToSchematicType, YMLWrapper.ToString, YMLWrapper.ToStaticWarGear);
                 if (gameModeConfig.CheckQuestions.isEmpty() && gameModeConfig.Schematic.ManualCheck)
                     continue;
                 types.put(gameModeConfig.Schematic.Type, gameModeConfig);
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/data/YMLWrapperImpl.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/data/YMLWrapperImpl.java
deleted file mode 100644
index 55b749bb..00000000
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/data/YMLWrapperImpl.java
+++ /dev/null
@@ -1,132 +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.data;
-
-import de.steamwar.sql.SchematicType;
-import org.bukkit.Material;
-import org.bukkit.configuration.file.FileConfiguration;
-import org.bukkit.configuration.file.YamlConfiguration;
-
-import java.io.File;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-
-public class YMLWrapperImpl<M, ST, W> extends YMLWrapper<M, ST, W> {
-
-    public static YMLWrapperImpl<Material, SchematicType, String> ofTyped(File file) {
-        return new YMLWrapperImpl<>(file, ToMaterial, ToSchematicType, ToString);
-    }
-
-    public static <W> YMLWrapperImpl<Material, SchematicType, W> ofTyped(File file, Function<String, W> ToWincondtion) {
-        return new YMLWrapperImpl<>(file, ToMaterial, ToSchematicType, ToWincondtion);
-    }
-
-    public static YMLWrapperImpl<String, String, String> ofRaw(File file) {
-        return new YMLWrapperImpl<>(file, ToString, ToString, ToString);
-    }
-
-    public static final Function<String, Material> ToMaterial = material -> {
-        Material mat = Material.getMaterial(material);
-        if (mat == null) {
-            try {
-                mat = Material.valueOf(material);
-            } catch (IllegalArgumentException e) {
-                // Ignore
-            }
-        }
-        return mat;
-    };
-
-    private final FileConfiguration config;
-    private final String pathPrefix;
-
-    private YMLWrapperImpl(File file, Function<String, M> materialMapper, Function<String, ST> schematicTypeMapper, Function<String, W> winconditionMapper) {
-        super(file, materialMapper, schematicTypeMapper, winconditionMapper);
-        if (file == null || !file.exists()) {
-            config = null;
-            pathPrefix = "";
-        } else {
-            config = YamlConfiguration.loadConfiguration(file);
-            pathPrefix = "";
-        }
-    }
-
-    private YMLWrapperImpl(FileConfiguration config, String pathPrefix, Function<String, M> materialMapper, Function<String, ST> schematicTypeMapper, Function<String, W> winconditionMapper) {
-        super(null, materialMapper, schematicTypeMapper, winconditionMapper);
-        this.config = config;
-        this.pathPrefix = pathPrefix;
-    }
-
-    @Override
-    public boolean canLoad() {
-        return config != null;
-    }
-
-    @Override
-    public YMLWrapper<M, ST, W> with(String path) {
-        if (pathPrefix.isEmpty()) {
-            path = path + ".";
-        } else {
-            path = pathPrefix + path + ".";
-        }
-        if (config != null && config.isConfigurationSection(path)) {
-            return new YMLWrapperImpl<>(this.config, path, materialMapper, schematicTypeMapper, winconditionMapper);
-        } else {
-            return new YMLWrapperImpl<>(null, path, materialMapper, schematicTypeMapper, winconditionMapper);
-        }
-    }
-
-    @Override
-    public String getDefaultGameName() {
-        return "WarGear";
-    }
-
-    @Override
-    public <T> T get(String path, T defaultValue, Function<Object, T> mapper) {
-        if (config == null) return defaultValue;
-        try {
-            return mapper.apply(config.get(path, defaultValue));
-        } catch (ClassCastException e) {
-            return defaultValue;
-        }
-    }
-
-    @Override
-    public <T> List<T> get(String path, Function<Object, List<T>> mapper) {
-        if (config == null) return Collections.emptyList();
-        List<?> list = config.getList(pathPrefix + path);
-        if (list == null || list.isEmpty()) {
-            return Collections.emptyList();
-        }
-        try {
-            return Collections.unmodifiableList(mapper.apply(list));
-        } catch (ClassCastException e) {
-            return Collections.emptyList();
-        }
-    }
-
-    @Override
-    public List<Map<?, ?>> getMapList(String path) {
-        if (config == null) return Collections.emptyList();
-        return config.getMapList(pathPrefix + path);
-    }
-}
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/data/YMLWrapperUtils.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/data/YMLWrapperUtils.java
new file mode 100644
index 00000000..15433cfc
--- /dev/null
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/data/YMLWrapperUtils.java
@@ -0,0 +1,41 @@
+/*
+ *   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.data;
+
+import lombok.experimental.UtilityClass;
+import org.bukkit.Material;
+
+import java.util.function.Function;
+
+@UtilityClass
+public class YMLWrapperUtils {
+
+    public static final Function<String, Material> ToMaterial = material -> {
+        Material mat = Material.getMaterial(material);
+        if (mat == null) {
+            try {
+                mat = Material.valueOf(material);
+            } catch (IllegalArgumentException e) {
+                // Ignore
+            }
+        }
+        return mat;
+    };
+}
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/sql/SQLWrapperImpl.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/sql/SQLWrapperImpl.java
index 2d11fdec..340daf47 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/sql/SQLWrapperImpl.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/sql/SQLWrapperImpl.java
@@ -21,7 +21,7 @@ package de.steamwar.sql;
 
 import de.steamwar.core.Core;
 import de.steamwar.data.GameModeConfig;
-import de.steamwar.data.YMLWrapperImpl;
+import de.steamwar.data.YMLWrapper;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
 import org.bukkit.entity.Player;
@@ -39,7 +39,7 @@ public class SQLWrapperImpl implements SQLWrapper {
         File folder = new File(Core.getInstance().getDataFolder().getParentFile(), "FightSystem");
         if (!folder.exists()) return;
         for (File configFile : Arrays.stream(folder.listFiles((file, name) -> name.endsWith(".yml") && !name.endsWith(".kits.yml"))).sorted().collect(Collectors.toList())) {
-            GameModeConfig<String, String, String> gameModeConfig = new GameModeConfig<>(YMLWrapperImpl.ofRaw(configFile));
+            GameModeConfig<String, String, String> gameModeConfig = new GameModeConfig<>(configFile, YMLWrapper.ToString, YMLWrapper.ToString, YMLWrapper.ToString, YMLWrapper.ToStaticWarGear);
             if (!gameModeConfig.Schematic.loaded) continue;
             String type = gameModeConfig.Schematic.Type;
             assert type != null;
@@ -56,9 +56,7 @@ public class SQLWrapperImpl implements SQLWrapper {
                 tmpFromDB.put(checktype.toDB(), checktype);
             }
 
-            boolean manualCheck = gameModeConfig.Schematic.ManualCheck;
-
-            SchematicType current = new SchematicType(type, shortcut, gameModeConfig.Server.loaded ? SchematicType.Type.FIGHT_TYPE : SchematicType.Type.NORMAL, checktype, material, manualCheck);
+            SchematicType current = new SchematicType(type, shortcut, gameModeConfig.Server.loaded ? SchematicType.Type.FIGHT_TYPE : SchematicType.Type.NORMAL, checktype, material, gameModeConfig.Deadline, gameModeConfig.Schematic.ManualCheck);
             tmpTypes.add(current);
             tmpFromDB.put(type.toLowerCase(), current);
         }
diff --git a/VelocityCore/src/de/steamwar/data/YMLWrapperImpl.java b/VelocityCore/src/de/steamwar/data/YMLWrapperImpl.java
deleted file mode 100644
index b5dc7a60..00000000
--- a/VelocityCore/src/de/steamwar/data/YMLWrapperImpl.java
+++ /dev/null
@@ -1,121 +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.data;
-
-import de.steamwar.sql.SchematicType;
-import org.yaml.snakeyaml.Yaml;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-
-public class YMLWrapperImpl<ST> extends YMLWrapper<String, ST, String> {
-
-    public static YMLWrapperImpl<SchematicType> ofTyped(File file) {
-        return new YMLWrapperImpl<>(file, ToSchematicType);
-    }
-
-    public static YMLWrapperImpl<String> ofRaw(File file) {
-        return new YMLWrapperImpl<>(file, ToString);
-    }
-
-    private final boolean canLoad;
-    private final Map<String, Object> document;
-
-    private YMLWrapperImpl(File file, Function<String, ST> schematicTypeMapper) {
-        super(file, ToString, schematicTypeMapper, ToString);
-        if (file == null || !file.exists()) {
-            canLoad = false;
-            document = new HashMap<>();
-        } else {
-            canLoad = true;
-            Yaml yaml = new Yaml();
-            try {
-                document = yaml.load(new FileInputStream(file));
-            } catch (IOException e) {
-                throw new SecurityException(e.getMessage(), e);
-            }
-        }
-    }
-
-    private YMLWrapperImpl(boolean canLoad, Map<String, Object> document, Function<String, ST> schematicTypeMapper) {
-        super(null, ToString, schematicTypeMapper, ToString);
-        this.canLoad = canLoad;
-        this.document = document;
-    }
-
-    @Override
-    public boolean canLoad() {
-        return canLoad;
-    }
-
-    @Override
-    public YMLWrapper<String, ST, String> with(String path) {
-        if (document.containsKey(path)) {
-            Object value = this.document.get(path);
-            if (value instanceof Map) {
-                return new YMLWrapperImpl(this.canLoad, (Map) value, schematicTypeMapper);
-            }
-        }
-        return new YMLWrapperImpl(false, Collections.emptyMap(), schematicTypeMapper);
-    }
-
-    @Override
-    public String getDefaultGameName() {
-        return file.getName().replace(".yml", "");
-    }
-
-    @Override
-    public <T> T get(String path, T defaultValue, Function<Object, T> mapper) {
-        Object value = this.document.get(path);
-        if (value == null) return defaultValue;
-        try {
-            return mapper.apply(value);
-        } catch (ClassCastException e) {
-            return defaultValue;
-        }
-    }
-
-    @Override
-    public <T> List<T> get(String path, Function<Object, List<T>> mapper) {
-        Object value = this.document.get(path);
-        if (value == null) return Collections.emptyList();
-        try {
-            return Collections.unmodifiableList(mapper.apply(value));
-        } catch (ClassCastException e) {
-            return Collections.emptyList();
-        }
-    }
-
-    @Override
-    public List<Map<?, ?>> getMapList(String path) {
-        Object value = this.document.get(path);
-        if (value instanceof List) {
-            return Collections.unmodifiableList((List<Map<?, ?>>) value);
-        }  else {
-            return Collections.emptyList();
-        }
-    }
-}
diff --git a/VelocityCore/src/de/steamwar/sql/SQLWrapperImpl.java b/VelocityCore/src/de/steamwar/sql/SQLWrapperImpl.java
index 8f4328a1..cde15d01 100644
--- a/VelocityCore/src/de/steamwar/sql/SQLWrapperImpl.java
+++ b/VelocityCore/src/de/steamwar/sql/SQLWrapperImpl.java
@@ -22,7 +22,7 @@ package de.steamwar.sql;
 import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.server.RegisteredServer;
 import de.steamwar.data.GameModeConfig;
-import de.steamwar.data.YMLWrapperImpl;
+import de.steamwar.data.YMLWrapper;
 import de.steamwar.velocitycore.VelocityCore;
 import de.steamwar.velocitycore.commands.CheckCommand;
 
@@ -40,7 +40,7 @@ public class SQLWrapperImpl implements SQLWrapper {
             return;
 
         for(File file : Arrays.stream(folder.listFiles((file, name) -> name.endsWith(".yml") && !name.endsWith(".kits.yml"))).sorted().toList()) {
-            GameModeConfig<String, String, String> gameModeConfig = new GameModeConfig<>(YMLWrapperImpl.ofRaw(file));
+            GameModeConfig<String, String, String> gameModeConfig = new GameModeConfig<>(file, YMLWrapper.ToString, YMLWrapper.ToString, YMLWrapper.ToString, YMLWrapper.ToInternalName);
             if (!gameModeConfig.Schematic.loaded) continue;
             if (tmpFromDB.containsKey(gameModeConfig.Schematic.Type.toLowerCase())) continue;
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/ArenaMode.java b/VelocityCore/src/de/steamwar/velocitycore/ArenaMode.java
index 7b94c584..53a2e0b0 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/ArenaMode.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/ArenaMode.java
@@ -20,7 +20,7 @@
 package de.steamwar.velocitycore;
 
 import de.steamwar.data.GameModeConfig;
-import de.steamwar.data.YMLWrapperImpl;
+import de.steamwar.data.YMLWrapper;
 import de.steamwar.sql.SchematicType;
 import lombok.Getter;
 import lombok.experimental.UtilityClass;
@@ -52,7 +52,7 @@ public class ArenaMode {
             return;
 
         for(File file : Arrays.stream(folder.listFiles((file, name) -> name.endsWith(".yml") && !name.endsWith(".kits.yml"))).sorted().toList()) {
-            de.steamwar.data.GameModeConfig<String, SchematicType, String> gameModeConfig = new de.steamwar.data.GameModeConfig<>(YMLWrapperImpl.ofTyped(file));
+            GameModeConfig<String, SchematicType, String> gameModeConfig = new GameModeConfig<>(file, YMLWrapper.ToString, YMLWrapper.ToSchematicType, YMLWrapper.ToString, YMLWrapper.ToInternalName);
             if (!gameModeConfig.Server.loaded) continue;
 
             allModes.add(gameModeConfig);
diff --git a/WebsiteBackend/src/de/steamwar/sql/SQLWrapperImpl.kt b/WebsiteBackend/src/de/steamwar/sql/SQLWrapperImpl.kt
index 1e1b8625..714e34d4 100644
--- a/WebsiteBackend/src/de/steamwar/sql/SQLWrapperImpl.kt
+++ b/WebsiteBackend/src/de/steamwar/sql/SQLWrapperImpl.kt
@@ -19,7 +19,8 @@
 
 package de.steamwar.sql
 
-import org.bspfsystems.yamlconfiguration.file.YamlConfiguration
+import de.steamwar.data.GameModeConfig
+import de.steamwar.data.YMLWrapper
 import java.io.File
 import java.util.*
 import java.util.stream.Collectors
@@ -29,32 +30,26 @@ fun loadSchematicTypes(tmpTypes: MutableList<SchematicType>?, tmpFromDB: Mutable
     if (folder.exists()) {
         for (configFile in Arrays.stream(folder.listFiles { _, name -> name.endsWith(".yml") && !name.endsWith(".kits.yml") })
             .sorted().collect(Collectors.toList())) {
-            val config: YamlConfiguration = YamlConfiguration.loadConfiguration(configFile)
-            if (!config.isConfigurationSection("Schematic")) continue
-            val type: String = config.getString("Schematic.Type")!!
-            val shortcut = config.getString("Schematic.Shortcut")
-            if (shortcut == null) {
-                println("No shortcut for $type")
-                continue
-            }
+            val gameModeConfig = GameModeConfig(configFile, YMLWrapper.ToString, YMLWrapper.ToString, YMLWrapper.ToString, YMLWrapper.ToStaticWarGear)
+
+            if (!gameModeConfig.Schematic.loaded) continue
+            val type = gameModeConfig.Schematic.Type
+            checkNotNull(type)
+            val shortcut = gameModeConfig.Schematic.Shortcut
             if (tmpFromDB!!.containsKey(type.lowercase(Locale.getDefault()))) continue
+
             var checktype: SchematicType? = null
-            val material: String = config.getString("Schematic.Material", "STONE_BUTTON")!!
-            if (!config.getStringList("CheckQuestions").isEmpty()) {
-                checktype = SchematicType("C$type", "C$shortcut", SchematicType.Type.CHECK_TYPE, null, material, false)
+            val material = gameModeConfig.Schematic.Material
+
+            if (!gameModeConfig.CheckQuestions.isEmpty()) {
+                checktype = SchematicType("C" + type, "C" + shortcut, SchematicType.Type.CHECK_TYPE, null, material, true)
                 tmpTypes!!.add(checktype)
-                tmpFromDB[checktype.toDB()] = checktype
+                tmpFromDB.put(checktype.toDB(), checktype)
             }
-            val current = SchematicType(
-                type,
-                shortcut,
-                if (config.isConfigurationSection("Server")) SchematicType.Type.FIGHT_TYPE else SchematicType.Type.NORMAL,
-                checktype,
-                material,
-                false
-            )
+
+            val current = SchematicType(type, shortcut, if (gameModeConfig.Server.loaded) SchematicType.Type.FIGHT_TYPE else SchematicType.Type.NORMAL, checktype, material, gameModeConfig.Deadline, gameModeConfig.Schematic.ManualCheck)
             tmpTypes!!.add(current)
-            tmpFromDB[type.lowercase(Locale.getDefault())] = current
+            tmpFromDB.put(type.lowercase(Locale.getDefault()), current)
         }
     }
 }

From d216aac2c4c0c00474f55bca8c4ce934b1848df9 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sun, 26 Oct 2025 09:22:48 +0100
Subject: [PATCH 170/214] Improve YMLWrapper

---
 .../bausystem/region/fixed/FixedGlobalRegion.java  |  5 ++---
 .../bausystem/region/fixed/FixedRegion.java        |  5 ++---
 .../Data/src/de/steamwar/data/GameModeConfig.java  |  6 +++++-
 .../Data/src/de/steamwar/data/YMLWrapper.java      | 14 ++------------
 .../src/de/steamwar/fightsystem/Config.java        |  5 ++---
 .../schematicsystem/CheckSchemTypeManager.java     |  5 ++---
 ...LWrapperUtils.java => GameModeConfigUtils.java} |  2 +-
 .../src/de/steamwar/sql/SQLWrapperImpl.java        |  3 +--
 .../src/de/steamwar/sql/SQLWrapperImpl.java        |  3 +--
 .../src/de/steamwar/velocitycore/ArenaMode.java    |  3 +--
 .../src/de/steamwar/sql/SQLWrapperImpl.kt          |  3 +--
 11 files changed, 20 insertions(+), 34 deletions(-)
 rename SpigotCore/SpigotCore_Main/src/de/steamwar/data/{YMLWrapperUtils.java => GameModeConfigUtils.java} (97%)

diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalRegion.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalRegion.java
index af08c4ae..1bf07d5a 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalRegion.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalRegion.java
@@ -23,8 +23,7 @@ import com.sk89q.worldedit.extent.clipboard.Clipboard;
 import de.steamwar.bausystem.region.*;
 import de.steamwar.bausystem.utils.PasteBuilder;
 import de.steamwar.data.GameModeConfig;
-import de.steamwar.data.YMLWrapper;
-import de.steamwar.data.YMLWrapperUtils;
+import de.steamwar.data.GameModeConfigUtils;
 import de.steamwar.sql.SchematicType;
 import lombok.NonNull;
 import lombok.Setter;
@@ -95,7 +94,7 @@ public final class FixedGlobalRegion implements Region {
         }
     };
 
-    private static final GameModeConfig<Material, SchematicType, String> GLOBAL_CONFIG = new GameModeConfig<>(null, YMLWrapperUtils.ToMaterial, YMLWrapper.ToSchematicType, YMLWrapper.ToString, YMLWrapper.ToStaticWarGear);
+    private static final GameModeConfig<Material, SchematicType, String> GLOBAL_CONFIG = new GameModeConfig<>(null, GameModeConfigUtils.ToMaterial, GameModeConfig.ToSchematicType, GameModeConfig.ToString, GameModeConfig.ToStaticWarGear);
 
     private FixedGlobalRegion() {
     }
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java
index 399c5aba..1eb0ab62 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java
@@ -29,8 +29,7 @@ import de.steamwar.bausystem.utils.PasteBuilder;
 import de.steamwar.bausystem.worlddata.WorldData;
 import de.steamwar.core.Core;
 import de.steamwar.data.GameModeConfig;
-import de.steamwar.data.YMLWrapper;
-import de.steamwar.data.YMLWrapperUtils;
+import de.steamwar.data.GameModeConfigUtils;
 import de.steamwar.sql.SchematicType;
 import lombok.NonNull;
 import org.bukkit.Bukkit;
@@ -340,7 +339,7 @@ public class FixedRegion implements Region {
                 break;
             }
         }
-        this.gameModeConfig = new GameModeConfig<>(found, YMLWrapperUtils.ToMaterial, YMLWrapper.ToSchematicType, YMLWrapper.ToString, YMLWrapper.ToStaticWarGear);
+        this.gameModeConfig = new GameModeConfig<>(found, GameModeConfigUtils.ToMaterial, GameModeConfig.ToSchematicType, GameModeConfig.ToString, GameModeConfig.ToStaticWarGear);
         this.regionData = new RegionData.RegionDataImpl(regionData, WorldData::write);
     }
 
diff --git a/CommonCore/Data/src/de/steamwar/data/GameModeConfig.java b/CommonCore/Data/src/de/steamwar/data/GameModeConfig.java
index ed405522..b9c8919b 100644
--- a/CommonCore/Data/src/de/steamwar/data/GameModeConfig.java
+++ b/CommonCore/Data/src/de/steamwar/data/GameModeConfig.java
@@ -34,8 +34,12 @@ import java.util.stream.Collectors;
 @ToString
 public final class GameModeConfig<M, ST, W> {
 
-    private static final Random random = new Random();
+    public static final Function<String, String> ToString = Function.identity();
+    public static final Function<String, SchematicType> ToSchematicType = SchematicType::fromDB;
+    public static final Function<File, String> ToStaticWarGear = __ -> "WarGear";
+    public static final Function<File, String> ToInternalName = file -> file.getName().replace(".yml", "");
     public static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("dd.MM.yyyy HH:mm");
+    private static final Random random = new Random();
 
     public final boolean loaded;
     public final File configFile;
diff --git a/CommonCore/Data/src/de/steamwar/data/YMLWrapper.java b/CommonCore/Data/src/de/steamwar/data/YMLWrapper.java
index 644a8c13..30d6d9ae 100644
--- a/CommonCore/Data/src/de/steamwar/data/YMLWrapper.java
+++ b/CommonCore/Data/src/de/steamwar/data/YMLWrapper.java
@@ -19,7 +19,6 @@
 
 package de.steamwar.data;
 
-import de.steamwar.sql.SchematicType;
 import org.yaml.snakeyaml.Yaml;
 
 import java.io.File;
@@ -32,15 +31,8 @@ import java.util.Objects;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-public final class YMLWrapper<M, ST, W> {
+final class YMLWrapper<M, ST, W> {
 
-    public static final Function<String, String> ToString = Function.identity();
-    public static final Function<String, SchematicType> ToSchematicType = SchematicType::fromDB;
-
-    public static final Function<File, String> ToStaticWarGear = __ -> "WarGear";
-    public static final Function<File, String> ToInternalName = file -> file.getName().replace(".yml", "");
-
-    private final File file;
     final Function<String, M> materialMapper;
     final Function<String, ST> schematicTypeMapper;
     final Function<String, W> winconditionMapper;
@@ -48,8 +40,7 @@ public final class YMLWrapper<M, ST, W> {
     private final boolean canLoad;
     private final Map<String, Object> document;
 
-    public YMLWrapper(File file, Function<String, M> materialMapper, Function<String, ST> schematicTypeMapper, Function<String, W> winconditionMapper) {
-        this.file = file;
+    YMLWrapper(File file, Function<String, M> materialMapper, Function<String, ST> schematicTypeMapper, Function<String, W> winconditionMapper) {
         this.materialMapper = materialMapper;
         this.schematicTypeMapper = schematicTypeMapper;
         this.winconditionMapper = winconditionMapper;
@@ -70,7 +61,6 @@ public final class YMLWrapper<M, ST, W> {
     }
 
     private YMLWrapper(boolean canLoad, Map<String, Object> document, Function<String, M> materialMapper, Function<String, ST> schematicTypeMapper, Function<String, W> winconditionMapper) {
-        this.file = null;
         this.materialMapper = materialMapper;
         this.schematicTypeMapper = schematicTypeMapper;
         this.winconditionMapper = winconditionMapper;
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/Config.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/Config.java
index f8e18d4f..93f263bb 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/Config.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/Config.java
@@ -20,8 +20,7 @@
 package de.steamwar.fightsystem;
 
 import de.steamwar.data.GameModeConfig;
-import de.steamwar.data.YMLWrapper;
-import de.steamwar.data.YMLWrapperUtils;
+import de.steamwar.data.GameModeConfigUtils;
 import de.steamwar.fightsystem.utils.Region;
 import de.steamwar.fightsystem.winconditions.Winconditions;
 import de.steamwar.sql.*;
@@ -110,7 +109,7 @@ public class Config {
             Bukkit.getLogger().log(Level.SEVERE, "Arenaconfig fehlt!");
             Bukkit.shutdown();
         }
-        GameModeConfig = new GameModeConfig<>(new File(FightSystem.getPlugin().getDataFolder(), configFile), YMLWrapperUtils.ToMaterial, YMLWrapper.ToSchematicType, Winconditions::valueOf, YMLWrapper.ToStaticWarGear);
+        GameModeConfig = new GameModeConfig<>(new File(FightSystem.getPlugin().getDataFolder(), configFile), GameModeConfigUtils.ToMaterial, de.steamwar.data.GameModeConfig.ToSchematicType, Winconditions::valueOf, de.steamwar.data.GameModeConfig.ToStaticWarGear);
 
         File worldConfigFile = new File(world.getWorldFolder(), "config.yml");
         if(!worldConfigFile.exists()) {
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/CheckSchemTypeManager.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/CheckSchemTypeManager.java
index 48bd8859..dc9c4ae4 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/CheckSchemTypeManager.java
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/CheckSchemTypeManager.java
@@ -20,8 +20,7 @@
 package de.steamwar.schematicsystem;
 
 import de.steamwar.data.GameModeConfig;
-import de.steamwar.data.YMLWrapper;
-import de.steamwar.data.YMLWrapperUtils;
+import de.steamwar.data.GameModeConfigUtils;
 import de.steamwar.sql.SchematicType;
 import lombok.experimental.UtilityClass;
 import org.bukkit.Material;
@@ -39,7 +38,7 @@ public class CheckSchemTypeManager {
         File folder = new File(SchematicSystem.getInstance().getDataFolder().getParentFile(), "FightSystem");
         if(folder.exists()) {
             for(File configFile : folder.listFiles((file, name) -> name.endsWith(".yml") && !name.endsWith(".kits.yml"))) {
-                GameModeConfig<Material, SchematicType, String> gameModeConfig = new GameModeConfig<>(configFile, YMLWrapperUtils.ToMaterial, YMLWrapper.ToSchematicType, YMLWrapper.ToString, YMLWrapper.ToStaticWarGear);
+                GameModeConfig<Material, SchematicType, String> gameModeConfig = new GameModeConfig<>(configFile, GameModeConfigUtils.ToMaterial, GameModeConfig.ToSchematicType, GameModeConfig.ToString, GameModeConfig.ToStaticWarGear);
                 if (gameModeConfig.CheckQuestions.isEmpty() && gameModeConfig.Schematic.ManualCheck)
                     continue;
                 types.put(gameModeConfig.Schematic.Type, gameModeConfig);
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/data/YMLWrapperUtils.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/data/GameModeConfigUtils.java
similarity index 97%
rename from SpigotCore/SpigotCore_Main/src/de/steamwar/data/YMLWrapperUtils.java
rename to SpigotCore/SpigotCore_Main/src/de/steamwar/data/GameModeConfigUtils.java
index 15433cfc..a14aa31e 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/data/YMLWrapperUtils.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/data/GameModeConfigUtils.java
@@ -25,7 +25,7 @@ import org.bukkit.Material;
 import java.util.function.Function;
 
 @UtilityClass
-public class YMLWrapperUtils {
+public class GameModeConfigUtils {
 
     public static final Function<String, Material> ToMaterial = material -> {
         Material mat = Material.getMaterial(material);
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/sql/SQLWrapperImpl.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/sql/SQLWrapperImpl.java
index 340daf47..e25e4bb6 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/sql/SQLWrapperImpl.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/sql/SQLWrapperImpl.java
@@ -21,7 +21,6 @@ package de.steamwar.sql;
 
 import de.steamwar.core.Core;
 import de.steamwar.data.GameModeConfig;
-import de.steamwar.data.YMLWrapper;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
 import org.bukkit.entity.Player;
@@ -39,7 +38,7 @@ public class SQLWrapperImpl implements SQLWrapper {
         File folder = new File(Core.getInstance().getDataFolder().getParentFile(), "FightSystem");
         if (!folder.exists()) return;
         for (File configFile : Arrays.stream(folder.listFiles((file, name) -> name.endsWith(".yml") && !name.endsWith(".kits.yml"))).sorted().collect(Collectors.toList())) {
-            GameModeConfig<String, String, String> gameModeConfig = new GameModeConfig<>(configFile, YMLWrapper.ToString, YMLWrapper.ToString, YMLWrapper.ToString, YMLWrapper.ToStaticWarGear);
+            GameModeConfig<String, String, String> gameModeConfig = new GameModeConfig<>(configFile, GameModeConfig.ToString, GameModeConfig.ToString, GameModeConfig.ToString, GameModeConfig.ToStaticWarGear);
             if (!gameModeConfig.Schematic.loaded) continue;
             String type = gameModeConfig.Schematic.Type;
             assert type != null;
diff --git a/VelocityCore/src/de/steamwar/sql/SQLWrapperImpl.java b/VelocityCore/src/de/steamwar/sql/SQLWrapperImpl.java
index cde15d01..156c45e9 100644
--- a/VelocityCore/src/de/steamwar/sql/SQLWrapperImpl.java
+++ b/VelocityCore/src/de/steamwar/sql/SQLWrapperImpl.java
@@ -22,7 +22,6 @@ package de.steamwar.sql;
 import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.server.RegisteredServer;
 import de.steamwar.data.GameModeConfig;
-import de.steamwar.data.YMLWrapper;
 import de.steamwar.velocitycore.VelocityCore;
 import de.steamwar.velocitycore.commands.CheckCommand;
 
@@ -40,7 +39,7 @@ public class SQLWrapperImpl implements SQLWrapper {
             return;
 
         for(File file : Arrays.stream(folder.listFiles((file, name) -> name.endsWith(".yml") && !name.endsWith(".kits.yml"))).sorted().toList()) {
-            GameModeConfig<String, String, String> gameModeConfig = new GameModeConfig<>(file, YMLWrapper.ToString, YMLWrapper.ToString, YMLWrapper.ToString, YMLWrapper.ToInternalName);
+            GameModeConfig<String, String, String> gameModeConfig = new GameModeConfig<>(file, GameModeConfig.ToString, GameModeConfig.ToString, GameModeConfig.ToString, GameModeConfig.ToInternalName);
             if (!gameModeConfig.Schematic.loaded) continue;
             if (tmpFromDB.containsKey(gameModeConfig.Schematic.Type.toLowerCase())) continue;
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/ArenaMode.java b/VelocityCore/src/de/steamwar/velocitycore/ArenaMode.java
index 53a2e0b0..63c0187e 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/ArenaMode.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/ArenaMode.java
@@ -20,7 +20,6 @@
 package de.steamwar.velocitycore;
 
 import de.steamwar.data.GameModeConfig;
-import de.steamwar.data.YMLWrapper;
 import de.steamwar.sql.SchematicType;
 import lombok.Getter;
 import lombok.experimental.UtilityClass;
@@ -52,7 +51,7 @@ public class ArenaMode {
             return;
 
         for(File file : Arrays.stream(folder.listFiles((file, name) -> name.endsWith(".yml") && !name.endsWith(".kits.yml"))).sorted().toList()) {
-            GameModeConfig<String, SchematicType, String> gameModeConfig = new GameModeConfig<>(file, YMLWrapper.ToString, YMLWrapper.ToSchematicType, YMLWrapper.ToString, YMLWrapper.ToInternalName);
+            GameModeConfig<String, SchematicType, String> gameModeConfig = new GameModeConfig<>(file, GameModeConfig.ToString, GameModeConfig.ToSchematicType, GameModeConfig.ToString, GameModeConfig.ToInternalName);
             if (!gameModeConfig.Server.loaded) continue;
 
             allModes.add(gameModeConfig);
diff --git a/WebsiteBackend/src/de/steamwar/sql/SQLWrapperImpl.kt b/WebsiteBackend/src/de/steamwar/sql/SQLWrapperImpl.kt
index 714e34d4..f00c4dbd 100644
--- a/WebsiteBackend/src/de/steamwar/sql/SQLWrapperImpl.kt
+++ b/WebsiteBackend/src/de/steamwar/sql/SQLWrapperImpl.kt
@@ -20,7 +20,6 @@
 package de.steamwar.sql
 
 import de.steamwar.data.GameModeConfig
-import de.steamwar.data.YMLWrapper
 import java.io.File
 import java.util.*
 import java.util.stream.Collectors
@@ -30,7 +29,7 @@ fun loadSchematicTypes(tmpTypes: MutableList<SchematicType>?, tmpFromDB: Mutable
     if (folder.exists()) {
         for (configFile in Arrays.stream(folder.listFiles { _, name -> name.endsWith(".yml") && !name.endsWith(".kits.yml") })
             .sorted().collect(Collectors.toList())) {
-            val gameModeConfig = GameModeConfig(configFile, YMLWrapper.ToString, YMLWrapper.ToString, YMLWrapper.ToString, YMLWrapper.ToStaticWarGear)
+            val gameModeConfig = GameModeConfig(configFile, GameModeConfig.ToString, GameModeConfig.ToString, GameModeConfig.ToString, GameModeConfig.ToStaticWarGear)
 
             if (!gameModeConfig.Schematic.loaded) continue
             val type = gameModeConfig.Schematic.Type

From ef81626e02ee368b9df7f9e903892db6d386729d Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sun, 26 Oct 2025 09:28:24 +0100
Subject: [PATCH 171/214] Remove CheckSchemTypeManager

---
 .../CheckSchemTypeManager.java                | 55 -------------------
 .../schematicsystem/SchematicSystem.java      | 27 +++++++++
 .../commands/schematiccommand/GUI.java        |  3 +-
 .../SchematicCommandUtils.java                |  3 +-
 .../schematiccommand/SchematicMapper.java     |  6 +-
 .../schematiccommand/parts/ModifyPart.java    |  3 +-
 6 files changed, 33 insertions(+), 64 deletions(-)
 delete mode 100644 SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/CheckSchemTypeManager.java

diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/CheckSchemTypeManager.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/CheckSchemTypeManager.java
deleted file mode 100644
index dc9c4ae4..00000000
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/CheckSchemTypeManager.java
+++ /dev/null
@@ -1,55 +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.schematicsystem;
-
-import de.steamwar.data.GameModeConfig;
-import de.steamwar.data.GameModeConfigUtils;
-import de.steamwar.sql.SchematicType;
-import lombok.experimental.UtilityClass;
-import org.bukkit.Material;
-
-import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
-
-@UtilityClass
-public class CheckSchemTypeManager {
-
-    private static final Map<SchematicType, GameModeConfig<Material, SchematicType, String>> types = new HashMap<>();
-
-    static {
-        File folder = new File(SchematicSystem.getInstance().getDataFolder().getParentFile(), "FightSystem");
-        if(folder.exists()) {
-            for(File configFile : folder.listFiles((file, name) -> name.endsWith(".yml") && !name.endsWith(".kits.yml"))) {
-                GameModeConfig<Material, SchematicType, String> gameModeConfig = new GameModeConfig<>(configFile, GameModeConfigUtils.ToMaterial, GameModeConfig.ToSchematicType, GameModeConfig.ToString, GameModeConfig.ToStaticWarGear);
-                if (gameModeConfig.CheckQuestions.isEmpty() && gameModeConfig.Schematic.ManualCheck)
-                    continue;
-                types.put(gameModeConfig.Schematic.Type, gameModeConfig);
-                if (gameModeConfig.Schematic.Type.checkType() != null) {
-                    types.put(gameModeConfig.Schematic.Type.checkType(), gameModeConfig);
-                }
-            }
-        }
-    }
-
-    public static GameModeConfig<Material, SchematicType, String> get(SchematicType type){
-        return types.get(type);
-    }
-}
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/SchematicSystem.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/SchematicSystem.java
index 8245209b..a5826c70 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/SchematicSystem.java
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/SchematicSystem.java
@@ -19,21 +19,48 @@
 
 package de.steamwar.schematicsystem;
 
+import de.steamwar.data.GameModeConfig;
+import de.steamwar.data.GameModeConfigUtils;
 import de.steamwar.linkage.AbstractLinker;
 import de.steamwar.linkage.SpigotLinker;
 import de.steamwar.message.Message;
+import de.steamwar.sql.SchematicType;
 import org.bukkit.Bukkit;
+import org.bukkit.Material;
 import org.bukkit.plugin.java.JavaPlugin;
 
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+
 public class SchematicSystem extends JavaPlugin {
     public static final Message MESSAGE = new Message("SchematicSystem", SchematicSystem.class.getClassLoader());
 
     private static SchematicSystem instance;
 
+    private static final Map<SchematicType, GameModeConfig<Material, SchematicType, String>> types = new HashMap<>();
+
+    public static GameModeConfig<Material, SchematicType, String> getGameModeConfig(SchematicType type){
+        return types.get(type);
+    }
+
     @Override
     public void onEnable() {
         instance = this;
 
+        File folder = new File(this.getDataFolder().getParentFile(), "FightSystem");
+        if(folder.exists()) {
+            for(File configFile : folder.listFiles((file, name) -> name.endsWith(".yml") && !name.endsWith(".kits.yml"))) {
+                GameModeConfig<Material, SchematicType, String> gameModeConfig = new GameModeConfig<>(configFile, GameModeConfigUtils.ToMaterial, GameModeConfig.ToSchematicType, GameModeConfig.ToString, GameModeConfig.ToStaticWarGear);
+                if (gameModeConfig.CheckQuestions.isEmpty() && gameModeConfig.Schematic.ManualCheck)
+                    continue;
+                types.put(gameModeConfig.Schematic.Type, gameModeConfig);
+                if (gameModeConfig.Schematic.Type.checkType() != null) {
+                    types.put(gameModeConfig.Schematic.Type.checkType(), gameModeConfig);
+                }
+            }
+        }
+
         SpigotLinker spigotLinker = new SpigotLinker(this, MESSAGE);
         try {
             spigotLinker.link();
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/GUI.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/GUI.java
index ece48694..d5428118 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/GUI.java
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/GUI.java
@@ -23,7 +23,6 @@ import com.sk89q.worldedit.extent.clipboard.Clipboard;
 import de.steamwar.core.Core;
 import de.steamwar.data.CMDs;
 import de.steamwar.inventory.*;
-import de.steamwar.schematicsystem.CheckSchemTypeManager;
 import de.steamwar.schematicsystem.SafeSchematicNode;
 import de.steamwar.schematicsystem.SchematicSystem;
 import de.steamwar.schematicsystem.autocheck.AutoChecker;
@@ -245,7 +244,7 @@ public class GUI {
         Clipboard finalClipboard = clipboard;
         List<SchematicType> types = SchematicType.values().parallelStream()
                 .filter(SchematicType::isAssignable)
-                .filter(type -> finalClipboard == null || CheckSchemTypeManager.get(type) == null || AutoChecker.sizeCheck(finalClipboard, CheckSchemTypeManager.get(type)).fastOk())
+                .filter(type -> finalClipboard == null || SchematicSystem.getGameModeConfig(type) == null || AutoChecker.sizeCheck(finalClipboard, SchematicSystem.getGameModeConfig(type)).fastOk())
                 .collect(Collectors.toList());
 
         List<SWListInv.SWListEntry<SchematicType>> items = types.stream()
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommandUtils.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommandUtils.java
index 9cccc0b6..03f2f328 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommandUtils.java
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommandUtils.java
@@ -26,7 +26,6 @@ import de.steamwar.inventory.SWItem;
 import de.steamwar.network.NetworkSender;
 import de.steamwar.network.packets.client.PrepareSchemPacket;
 import de.steamwar.providers.BauServerInfo;
-import de.steamwar.schematicsystem.CheckSchemTypeManager;
 import de.steamwar.schematicsystem.SchematicSystem;
 import de.steamwar.schematicsystem.autocheck.AutoChecker;
 import de.steamwar.schematicsystem.autocheck.AutoCheckerResult;
@@ -456,7 +455,7 @@ public class SchematicCommandUtils {
                 return;
             }
 
-            GameModeConfig<Material, SchematicType, String> checkSchemType = CheckSchemTypeManager.get(type);
+            GameModeConfig<Material, SchematicType, String> checkSchemType = SchematicSystem.getGameModeConfig(type);
             if (checkSchemType.isAfterDeadline()) {
                 SchematicSystem.MESSAGE.send("UTIL_TYPE_AFTER_DEADLINE", player, checkSchemType.Deadline);
                 return;
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicMapper.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicMapper.java
index b3f23092..a7f50dd7 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicMapper.java
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicMapper.java
@@ -21,7 +21,7 @@ package de.steamwar.schematicsystem.commands.schematiccommand;
 
 import de.steamwar.command.TypeMapper;
 import de.steamwar.data.GameModeConfig;
-import de.steamwar.schematicsystem.CheckSchemTypeManager;
+import de.steamwar.schematicsystem.SchematicSystem;
 import de.steamwar.sql.NodeMember;
 import de.steamwar.sql.SchematicNode;
 import de.steamwar.sql.SchematicType;
@@ -181,12 +181,12 @@ public class SchematicMapper {
         return new TypeMapper<GameModeConfig<Material, SchematicType, String>>() {
             @Override
             public Collection<String> tabCompletes(CommandSender commandSender, String[] strings, String s) {
-                return SchematicType.values().stream().filter(type -> CheckSchemTypeManager.get(type) != null).map(SchematicType::name).collect(Collectors.toList());
+                return SchematicType.values().stream().filter(type -> SchematicSystem.getGameModeConfig(type) != null).map(SchematicType::name).collect(Collectors.toList());
             }
 
             @Override
             public GameModeConfig<Material, SchematicType, String> map(CommandSender commandSender, String[] previousArguments, String s) {
-                return SchematicType.values().stream().filter(type -> type.name().equalsIgnoreCase(s)).map(CheckSchemTypeManager::get).findAny().orElse(null);
+                return SchematicType.values().stream().filter(type -> type.name().equalsIgnoreCase(s)).map(SchematicSystem::getGameModeConfig).findAny().orElse(null);
             }
         };
     }
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/ModifyPart.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/ModifyPart.java
index 58645331..99006559 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/ModifyPart.java
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/ModifyPart.java
@@ -23,7 +23,6 @@ import com.sk89q.worldedit.extent.clipboard.Clipboard;
 import de.steamwar.command.AbstractSWCommand;
 import de.steamwar.command.SWCommand;
 import de.steamwar.linkage.Linked;
-import de.steamwar.schematicsystem.CheckSchemTypeManager;
 import de.steamwar.schematicsystem.SafeSchematicNode;
 import de.steamwar.schematicsystem.SchematicSystem;
 import de.steamwar.schematicsystem.autocheck.AutoChecker;
@@ -63,7 +62,7 @@ public class ModifyPart extends SWCommand {
 
         SchematicType.values().parallelStream()
                 .filter(SchematicType::isAssignable)
-                .filter(type -> finalClipboard == null || CheckSchemTypeManager.get(type) == null || AutoChecker.sizeCheck(finalClipboard, CheckSchemTypeManager.get(type)).fastOk())
+                .filter(type -> finalClipboard == null || SchematicSystem.getGameModeConfig(type) == null || AutoChecker.sizeCheck(finalClipboard, SchematicSystem.getGameModeConfig(type)).fastOk())
                 .forEach(type -> {
                     TextComponent component = new TextComponent(type.name() + " ");
                     component.setColor(ChatColor.GRAY);

From 167a6b6dc4803c51ef2e921335688ed91595de3a Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sun, 26 Oct 2025 09:36:44 +0100
Subject: [PATCH 172/214] Unify SchematicType loading

---
 CommonCore/Data/build.gradle.kts              |  3 --
 CommonCore/SQL/build.gradle.kts               |  2 +
 .../src/de/steamwar/data/GameModeConfig.java  |  0
 .../src/de/steamwar/data/YMLWrapper.java      |  0
 .../SQL/src/de/steamwar/sql/SQLWrapper.java   |  9 +++--
 .../src/de/steamwar/sql/SchematicType.java    | 31 ++++++++++++++-
 .../src/de/steamwar/sql/SQLWrapperImpl.java   | 32 +---------------
 .../src/de/steamwar/sql/SQLWrapperImpl.java   | 38 +++++--------------
 .../src/de/steamwar/sql/SQLWrapperImpl.kt     | 36 ++----------------
 9 files changed, 53 insertions(+), 98 deletions(-)
 rename CommonCore/{Data => SQL}/src/de/steamwar/data/GameModeConfig.java (100%)
 rename CommonCore/{Data => SQL}/src/de/steamwar/data/YMLWrapper.java (100%)

diff --git a/CommonCore/Data/build.gradle.kts b/CommonCore/Data/build.gradle.kts
index 75a22699..a8ffa845 100644
--- a/CommonCore/Data/build.gradle.kts
+++ b/CommonCore/Data/build.gradle.kts
@@ -22,7 +22,4 @@ plugins {
 }
 
 dependencies {
-    api(project(":CommonCore:SQL"))
-
-    implementation("org.yaml:snakeyaml:2.2")
 }
\ No newline at end of file
diff --git a/CommonCore/SQL/build.gradle.kts b/CommonCore/SQL/build.gradle.kts
index cbb8141a..dc171dde 100644
--- a/CommonCore/SQL/build.gradle.kts
+++ b/CommonCore/SQL/build.gradle.kts
@@ -23,4 +23,6 @@ plugins {
 
 dependencies {
     compileOnly(libs.sqlite)
+
+    implementation("org.yaml:snakeyaml:2.2")
 }
\ No newline at end of file
diff --git a/CommonCore/Data/src/de/steamwar/data/GameModeConfig.java b/CommonCore/SQL/src/de/steamwar/data/GameModeConfig.java
similarity index 100%
rename from CommonCore/Data/src/de/steamwar/data/GameModeConfig.java
rename to CommonCore/SQL/src/de/steamwar/data/GameModeConfig.java
diff --git a/CommonCore/Data/src/de/steamwar/data/YMLWrapper.java b/CommonCore/SQL/src/de/steamwar/data/YMLWrapper.java
similarity index 100%
rename from CommonCore/Data/src/de/steamwar/data/YMLWrapper.java
rename to CommonCore/SQL/src/de/steamwar/data/YMLWrapper.java
diff --git a/CommonCore/SQL/src/de/steamwar/sql/SQLWrapper.java b/CommonCore/SQL/src/de/steamwar/sql/SQLWrapper.java
index 2e0340ed..ac1424f0 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/SQLWrapper.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/SQLWrapper.java
@@ -20,14 +20,17 @@
 package de.steamwar.sql;
 
 import de.steamwar.ImplementationProvider;
+import de.steamwar.data.GameModeConfig;
 
-import java.util.List;
-import java.util.Map;
+import java.io.File;
 
 public interface SQLWrapper {
     SQLWrapper impl = ImplementationProvider.getImpl("de.steamwar.sql.SQLWrapperImpl");
 
-    void loadSchemTypes(List<SchematicType> tmpTypes, Map<String, SchematicType> tmpFromDB);
+    File getSchemTypesFolder();
+
+    default void processSchematicType(GameModeConfig<String, String, String> gameModeConfig, SchematicType type) {
+    }
 
     void additionalExceptionMetadata(StringBuilder builder);
 }
diff --git a/CommonCore/SQL/src/de/steamwar/sql/SchematicType.java b/CommonCore/SQL/src/de/steamwar/sql/SchematicType.java
index 53c75eff..3cab7f0a 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/SchematicType.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/SchematicType.java
@@ -19,11 +19,14 @@
 
 package de.steamwar.sql;
 
+import de.steamwar.data.GameModeConfig;
 import de.steamwar.sql.internal.SqlTypeMapper;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 
+import java.io.File;
 import java.util.*;
+import java.util.stream.Collectors;
 
 @Slf4j
 public class SchematicType {
@@ -41,7 +44,33 @@ public class SchematicType {
 		tmpFromDB.put(Normal.name().toLowerCase(), Normal);
 
         long time = System.currentTimeMillis();
-		SQLWrapper.impl.loadSchemTypes(tmpTypes, tmpFromDB);
+        File folder = SQLWrapper.impl.getSchemTypesFolder();
+        if (folder.exists()) {
+            for (File configFile : Arrays.stream(folder.listFiles((file, name) -> name.endsWith(".yml") && !name.endsWith(".kits.yml"))).sorted().collect(Collectors.toList())) {
+                GameModeConfig<String, String, String> gameModeConfig = new GameModeConfig<>(configFile, GameModeConfig.ToString, GameModeConfig.ToString, GameModeConfig.ToString, GameModeConfig.ToStaticWarGear);
+                if (!gameModeConfig.Schematic.loaded) continue;
+                String type = gameModeConfig.Schematic.Type;
+                assert type != null;
+                String shortcut = gameModeConfig.Schematic.Shortcut;
+                if (tmpFromDB.containsKey(type.toLowerCase()))
+                    continue;
+
+                SchematicType checktype = null;
+                String material = gameModeConfig.Schematic.Material;
+
+                if (!gameModeConfig.CheckQuestions.isEmpty()) {
+                    checktype = new SchematicType("C" + type, "C" + shortcut, SchematicType.Type.CHECK_TYPE, null, material, true);
+                    tmpTypes.add(checktype);
+                    tmpFromDB.put(checktype.toDB(), checktype);
+                }
+
+                SchematicType current = new SchematicType(type, shortcut, gameModeConfig.Server.loaded ? SchematicType.Type.FIGHT_TYPE : SchematicType.Type.NORMAL, checktype, material, gameModeConfig.Deadline, gameModeConfig.Schematic.ManualCheck);
+                tmpTypes.add(current);
+                tmpFromDB.put(type.toLowerCase(), current);
+
+                SQLWrapper.impl.processSchematicType(gameModeConfig, current);
+            }
+        }
         time = System.currentTimeMillis() - time;
         log.info("Loaded {} Schematic Types in {}ms", tmpTypes.size(), time);
 
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/sql/SQLWrapperImpl.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/sql/SQLWrapperImpl.java
index e25e4bb6..daf33a15 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/sql/SQLWrapperImpl.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/sql/SQLWrapperImpl.java
@@ -20,45 +20,17 @@
 package de.steamwar.sql;
 
 import de.steamwar.core.Core;
-import de.steamwar.data.GameModeConfig;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
 import org.bukkit.entity.Player;
 
 import java.io.File;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 
 public class SQLWrapperImpl implements SQLWrapper {
 
     @Override
-    public void loadSchemTypes(List<SchematicType> tmpTypes, Map<String, SchematicType> tmpFromDB) {
-        File folder = new File(Core.getInstance().getDataFolder().getParentFile(), "FightSystem");
-        if (!folder.exists()) return;
-        for (File configFile : Arrays.stream(folder.listFiles((file, name) -> name.endsWith(".yml") && !name.endsWith(".kits.yml"))).sorted().collect(Collectors.toList())) {
-            GameModeConfig<String, String, String> gameModeConfig = new GameModeConfig<>(configFile, GameModeConfig.ToString, GameModeConfig.ToString, GameModeConfig.ToString, GameModeConfig.ToStaticWarGear);
-            if (!gameModeConfig.Schematic.loaded) continue;
-            String type = gameModeConfig.Schematic.Type;
-            assert type != null;
-            String shortcut = gameModeConfig.Schematic.Shortcut;
-            if (tmpFromDB.containsKey(type.toLowerCase()))
-                continue;
-
-            SchematicType checktype = null;
-            String material = gameModeConfig.Schematic.Material;
-
-            if (!gameModeConfig.CheckQuestions.isEmpty()) {
-                checktype = new SchematicType("C" + type, "C" + shortcut, SchematicType.Type.CHECK_TYPE, null, material, true);
-                tmpTypes.add(checktype);
-                tmpFromDB.put(checktype.toDB(), checktype);
-            }
-
-            SchematicType current = new SchematicType(type, shortcut, gameModeConfig.Server.loaded ? SchematicType.Type.FIGHT_TYPE : SchematicType.Type.NORMAL, checktype, material, gameModeConfig.Deadline, gameModeConfig.Schematic.ManualCheck);
-            tmpTypes.add(current);
-            tmpFromDB.put(type.toLowerCase(), current);
-        }
+    public File getSchemTypesFolder() {
+        return new File(Core.getInstance().getDataFolder().getParentFile(), "FightSystem");
     }
 
     private static final String SERVER_VERSION = Bukkit.getServer().getVersion();
diff --git a/VelocityCore/src/de/steamwar/sql/SQLWrapperImpl.java b/VelocityCore/src/de/steamwar/sql/SQLWrapperImpl.java
index 156c45e9..73a1d393 100644
--- a/VelocityCore/src/de/steamwar/sql/SQLWrapperImpl.java
+++ b/VelocityCore/src/de/steamwar/sql/SQLWrapperImpl.java
@@ -26,39 +26,21 @@ import de.steamwar.velocitycore.VelocityCore;
 import de.steamwar.velocitycore.commands.CheckCommand;
 
 import java.io.File;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
 
 public class SQLWrapperImpl implements SQLWrapper {
 
     @Override
-    public void loadSchemTypes(List<SchematicType> tmpTypes, Map<String, SchematicType> tmpFromDB) {
-        File folder = new File(VelocityCore.get().getDataDirectory().getParent().toFile(), "FightSystem");
-        if(!folder.exists())
-            return;
+    public File getSchemTypesFolder() {
+        return new File(VelocityCore.get().getDataDirectory().getParent().toFile(), "FightSystem");
+    }
 
-        for(File file : Arrays.stream(folder.listFiles((file, name) -> name.endsWith(".yml") && !name.endsWith(".kits.yml"))).sorted().toList()) {
-            GameModeConfig<String, String, String> gameModeConfig = new GameModeConfig<>(file, GameModeConfig.ToString, GameModeConfig.ToString, GameModeConfig.ToString, GameModeConfig.ToInternalName);
-            if (!gameModeConfig.Schematic.loaded) continue;
-            if (tmpFromDB.containsKey(gameModeConfig.Schematic.Type.toLowerCase())) continue;
-
-            String shortcut = gameModeConfig.Schematic.Shortcut;
-            String material = gameModeConfig.Schematic.Material;
-
-            SchematicType checktype = null;
-            if (!gameModeConfig.CheckQuestions.isEmpty()) {
-                checktype = new SchematicType("C" + gameModeConfig.Schematic.Type, "C" + shortcut, SchematicType.Type.CHECK_TYPE, null, material, true);
-                tmpTypes.add(checktype);
-                tmpFromDB.put(checktype.toDB(), checktype);
-                CheckCommand.setCheckQuestions(checktype, gameModeConfig.CheckQuestions);
-            }
-
-            SchematicType current = new SchematicType(gameModeConfig.Schematic.Type, shortcut, gameModeConfig.Server.loaded ? SchematicType.Type.FIGHT_TYPE : SchematicType.Type.NORMAL, checktype, material, gameModeConfig.Deadline, gameModeConfig.Schematic.ManualCheck);
-            tmpTypes.add(current);
-            tmpFromDB.put(gameModeConfig.Schematic.Type.toLowerCase(), current);
-            if(checktype != null)
-                CheckCommand.addFightType(checktype, current);
+    @Override
+    public void processSchematicType(GameModeConfig<String, String, String> gameModeConfig, SchematicType type) {
+        if (!gameModeConfig.CheckQuestions.isEmpty()) {
+            CheckCommand.setCheckQuestions(type.checkType(), gameModeConfig.CheckQuestions);
+        }
+        if (type.checkType() != null) {
+            CheckCommand.addFightType(type.checkType(), type);
         }
     }
 
diff --git a/WebsiteBackend/src/de/steamwar/sql/SQLWrapperImpl.kt b/WebsiteBackend/src/de/steamwar/sql/SQLWrapperImpl.kt
index f00c4dbd..be7ef20b 100644
--- a/WebsiteBackend/src/de/steamwar/sql/SQLWrapperImpl.kt
+++ b/WebsiteBackend/src/de/steamwar/sql/SQLWrapperImpl.kt
@@ -19,42 +19,12 @@
 
 package de.steamwar.sql
 
-import de.steamwar.data.GameModeConfig
 import java.io.File
-import java.util.*
-import java.util.stream.Collectors
-
-fun loadSchematicTypes(tmpTypes: MutableList<SchematicType>?, tmpFromDB: MutableMap<String, SchematicType>?) {
-    val folder = File("/configs/GameModes")
-    if (folder.exists()) {
-        for (configFile in Arrays.stream(folder.listFiles { _, name -> name.endsWith(".yml") && !name.endsWith(".kits.yml") })
-            .sorted().collect(Collectors.toList())) {
-            val gameModeConfig = GameModeConfig(configFile, GameModeConfig.ToString, GameModeConfig.ToString, GameModeConfig.ToString, GameModeConfig.ToStaticWarGear)
-
-            if (!gameModeConfig.Schematic.loaded) continue
-            val type = gameModeConfig.Schematic.Type
-            checkNotNull(type)
-            val shortcut = gameModeConfig.Schematic.Shortcut
-            if (tmpFromDB!!.containsKey(type.lowercase(Locale.getDefault()))) continue
-
-            var checktype: SchematicType? = null
-            val material = gameModeConfig.Schematic.Material
-
-            if (!gameModeConfig.CheckQuestions.isEmpty()) {
-                checktype = SchematicType("C" + type, "C" + shortcut, SchematicType.Type.CHECK_TYPE, null, material, true)
-                tmpTypes!!.add(checktype)
-                tmpFromDB.put(checktype.toDB(), checktype)
-            }
-
-            val current = SchematicType(type, shortcut, if (gameModeConfig.Server.loaded) SchematicType.Type.FIGHT_TYPE else SchematicType.Type.NORMAL, checktype, material, gameModeConfig.Deadline, gameModeConfig.Schematic.ManualCheck)
-            tmpTypes!!.add(current)
-            tmpFromDB.put(type.lowercase(Locale.getDefault()), current)
-        }
-    }
-}
 
 class SQLWrapperImpl: SQLWrapper {
-    override fun loadSchemTypes(tmpTypes: MutableList<SchematicType>?, tmpFromDB: MutableMap<String, SchematicType>?) = loadSchematicTypes(tmpTypes, tmpFromDB)
+    override fun getSchemTypesFolder(): File? {
+        return File("/configs/GameModes")
+    }
 
     override fun additionalExceptionMetadata(builder: StringBuilder) {
         builder.append("\n\nWebsiteApi")

From 184bd12cb1db98e6bef4c7c8212afb2280672943 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sun, 26 Oct 2025 09:39:17 +0100
Subject: [PATCH 173/214] Improve SQLWrapperImpl

---
 VelocityCore/src/de/steamwar/sql/SQLWrapperImpl.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/VelocityCore/src/de/steamwar/sql/SQLWrapperImpl.java b/VelocityCore/src/de/steamwar/sql/SQLWrapperImpl.java
index 73a1d393..0c2aa004 100644
--- a/VelocityCore/src/de/steamwar/sql/SQLWrapperImpl.java
+++ b/VelocityCore/src/de/steamwar/sql/SQLWrapperImpl.java
@@ -36,10 +36,8 @@ public class SQLWrapperImpl implements SQLWrapper {
 
     @Override
     public void processSchematicType(GameModeConfig<String, String, String> gameModeConfig, SchematicType type) {
-        if (!gameModeConfig.CheckQuestions.isEmpty()) {
-            CheckCommand.setCheckQuestions(type.checkType(), gameModeConfig.CheckQuestions);
-        }
         if (type.checkType() != null) {
+            CheckCommand.setCheckQuestions(type.checkType(), gameModeConfig.CheckQuestions);
             CheckCommand.addFightType(type.checkType(), type);
         }
     }

From 3e918d031d719610f3181e4c9b7f7a816e6f3cf9 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sun, 26 Oct 2025 09:42:55 +0100
Subject: [PATCH 174/214] Fix compilation

---
 WebsiteBackend/src/de/steamwar/routes/Data.kt | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/WebsiteBackend/src/de/steamwar/routes/Data.kt b/WebsiteBackend/src/de/steamwar/routes/Data.kt
index 4770e250..669737fa 100644
--- a/WebsiteBackend/src/de/steamwar/routes/Data.kt
+++ b/WebsiteBackend/src/de/steamwar/routes/Data.kt
@@ -27,7 +27,6 @@ import de.steamwar.sql.SchematicType
 import de.steamwar.sql.SteamwarUser
 import de.steamwar.sql.Team
 import de.steamwar.sql.UserPerm
-import de.steamwar.sql.loadSchematicTypes
 import de.steamwar.util.fetchData
 import io.ktor.http.*
 import io.ktor.server.application.*
@@ -38,7 +37,7 @@ import kotlinx.serialization.Serializable
 import org.bspfsystems.yamlconfiguration.file.YamlConfiguration
 import java.io.File
 import java.net.InetSocketAddress
-import java.util.UUID
+import java.util.*
 
 @Serializable
 data class ResponseSchematicType(val name: String, val db: String)
@@ -82,9 +81,7 @@ fun Route.configureDataRoutes() {
                 call.respond(Team.getAll().map { ResponseTeam(it) })
             }
             get("/schematicTypes") {
-                val types = mutableListOf<SchematicType>()
-                loadSchematicTypes(types, mutableMapOf())
-                call.respond(types.filter { !it.check() }.map { ResponseSchematicType(it.name(), it.toDB()) })
+                call.respond(SchematicType.values().filter { !it.check() }.map { ResponseSchematicType(it.name(), it.toDB()) })
             }
             get("/gamemodes") {
                 call.respond(

From b4791ddf42c8df814dd7073feafa1e530b2382bf Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sun, 26 Oct 2025 11:34:43 +0100
Subject: [PATCH 175/214] Fix VelocityCore

---
 .../src/de/steamwar/velocitycore/VelocityCore.java        | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/VelocityCore/src/de/steamwar/velocitycore/VelocityCore.java b/VelocityCore/src/de/steamwar/velocitycore/VelocityCore.java
index 14571c26..17e559ac 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/VelocityCore.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/VelocityCore.java
@@ -33,6 +33,7 @@ import de.steamwar.linkage.AbstractLinker;
 import de.steamwar.linkage.EventMode;
 import de.steamwar.linkage.LinkedInstance;
 import de.steamwar.messages.Chatter;
+import de.steamwar.network.packets.PacketHandler;
 import de.steamwar.persistent.ReloadablePlugin;
 import de.steamwar.sql.Punishment;
 import de.steamwar.sql.SteamwarUser;
@@ -163,6 +164,13 @@ public class VelocityCore implements ReloadablePlugin {
             protected boolean eventModeCheck(@NonNull Class<?> clazz, EventMode eventMode) {
                 return eventMode == null || eventMode.value() == config.isEventmode();
             }
+
+            @Override
+            protected void linkObject(Object any) {
+                if (any instanceof PacketHandler) {
+                    ((PacketHandler) any).register();
+                }
+            }
         };
         try {
             linker.link();

From 35117fdd304be0afece98f20351fef81c5e47218 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sun, 26 Oct 2025 11:39:00 +0100
Subject: [PATCH 176/214] Fix AuthManager.connectAuth

---
 .../src/de/steamwar/velocitycore/discord/util/AuthManager.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VelocityCore/src/de/steamwar/velocitycore/discord/util/AuthManager.java b/VelocityCore/src/de/steamwar/velocitycore/discord/util/AuthManager.java
index afe88073..91766b26 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/discord/util/AuthManager.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/discord/util/AuthManager.java
@@ -64,7 +64,7 @@ public class AuthManager {
 
         DiscordChannel channel = new DiscordChannel(dcUser);
         channel.send(new MessageCreateBuilder()
-                .setContent(channel.parseToPlain("DC_AUTH_SUCCESS", user))
+                .setContent(channel.parseToPlain("DC_AUTH_SUCCESS", user, user.getUserName()))
                 .setComponents(ActionRow.of(Button.success("tada", Emoji.fromUnicode("U+1F389")))));
 
         return dcUser;

From c6dbece55056b21672327524fd1b753413a48d65 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sun, 26 Oct 2025 12:34:16 +0100
Subject: [PATCH 177/214] Improve GameModeConfig

---
 .../de/steamwar/bausystem/region/Region.java  |   4 +-
 .../region/fixed/FixedGlobalRegion.java       |   5 +-
 .../bausystem/region/fixed/FixedRegion.java   |   6 +-
 .../{data => sql}/GameModeConfig.java         | 157 ++++++++++--------
 .../SQL/src/de/steamwar/sql/SQLWrapper.java   |   3 +-
 .../src/de/steamwar/sql/SchematicType.java    |  30 ++--
 .../de/steamwar/{data => sql}/YMLWrapper.java |  31 ++--
 .../src/de/steamwar/fightsystem/Config.java   |   6 +-
 .../autocheck/AutoChecker15.java              |   6 +-
 .../schematiccommand/SchematicCommand15.java  |   4 +-
 .../autocheck/AutoChecker8.java               |   6 +-
 .../schematiccommand/SchematicCommand8.java   |   4 +-
 .../schematicsystem/SchematicSystem.java      |   8 +-
 .../autocheck/AutoChecker.java                |  10 +-
 .../autocheck/AutoCheckerResult.java          |   4 +-
 .../schematiccommand/SchematicCommand.java    |   6 +-
 .../SchematicCommandUtils.java                |   6 +-
 .../schematiccommand/SchematicMapper.java     |   8 +-
 .../schematiccommand/parts/CheckPart.java     |  10 +-
 .../src/de/steamwar/sql/SQLWrapperImpl.java   |   4 +-
 .../de/steamwar/velocitycore/ArenaMode.java   |  20 +--
 .../steamwar/velocitycore/ServerStarter.java  |   6 +-
 .../steamwar/velocitycore/ServerVersion.java  |   4 +-
 .../velocitycore/commands/BauCommand.java     |   4 +-
 .../commands/BuilderCloudCommand.java         |   4 +-
 .../commands/ChallengeCommand.java            |   5 +-
 .../velocitycore/commands/CheckCommand.java   |   4 +-
 .../velocitycore/commands/FightCommand.java   |  12 +-
 .../commands/HistoricCommand.java             |   5 +-
 .../velocitycore/commands/RankCommand.java    |   4 +-
 .../velocitycore/commands/ReplayCommand.java  |   4 +-
 .../velocitycore/commands/TypeMappers.java    |  10 +-
 .../velocitycore/listeners/ChatListener.java  |   2 +-
 .../network/handlers/EloPlayerHandler.java    |   4 +-
 .../network/handlers/EloSchemHandler.java     |   4 +-
 .../network/handlers/PrepareSchemHandler.java |   4 +-
 36 files changed, 212 insertions(+), 202 deletions(-)
 rename CommonCore/SQL/src/de/steamwar/{data => sql}/GameModeConfig.java (82%)
 rename CommonCore/SQL/src/de/steamwar/{data => sql}/YMLWrapper.java (84%)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
index 4b98caf1..0a022cfe 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
@@ -22,7 +22,7 @@ package de.steamwar.bausystem.region;
 import com.sk89q.worldedit.extent.clipboard.Clipboard;
 import de.steamwar.bausystem.utils.FlatteningWrapper;
 import de.steamwar.bausystem.utils.PasteBuilder;
-import de.steamwar.data.GameModeConfig;
+import de.steamwar.sql.GameModeConfig;
 import de.steamwar.sql.SchematicType;
 import lombok.NonNull;
 import org.bukkit.Location;
@@ -67,7 +67,7 @@ public interface Region {
     Area getTestblockArea();
 
     @NonNull
-    GameModeConfig<Material, SchematicType, String> getGameModeConfig();
+    GameModeConfig<Material, String> getGameModeConfig();
 
     @NonNull
     RegionHistory getHistory();
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalRegion.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalRegion.java
index 1bf07d5a..cac519e0 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalRegion.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalRegion.java
@@ -22,9 +22,8 @@ package de.steamwar.bausystem.region.fixed;
 import com.sk89q.worldedit.extent.clipboard.Clipboard;
 import de.steamwar.bausystem.region.*;
 import de.steamwar.bausystem.utils.PasteBuilder;
-import de.steamwar.data.GameModeConfig;
 import de.steamwar.data.GameModeConfigUtils;
-import de.steamwar.sql.SchematicType;
+import de.steamwar.sql.GameModeConfig;
 import lombok.NonNull;
 import lombok.Setter;
 import org.bukkit.Location;
@@ -94,7 +93,7 @@ public final class FixedGlobalRegion implements Region {
         }
     };
 
-    private static final GameModeConfig<Material, SchematicType, String> GLOBAL_CONFIG = new GameModeConfig<>(null, GameModeConfigUtils.ToMaterial, GameModeConfig.ToSchematicType, GameModeConfig.ToString, GameModeConfig.ToStaticWarGear);
+    private static final GameModeConfig<Material, String> GLOBAL_CONFIG = new GameModeConfig<>(null, GameModeConfigUtils.ToMaterial, GameModeConfig.ToString, GameModeConfig.ToStaticWarGear);
 
     private FixedGlobalRegion() {
     }
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java
index 1eb0ab62..ce48b5b6 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java
@@ -28,8 +28,8 @@ import de.steamwar.bausystem.utils.FlatteningWrapper;
 import de.steamwar.bausystem.utils.PasteBuilder;
 import de.steamwar.bausystem.worlddata.WorldData;
 import de.steamwar.core.Core;
-import de.steamwar.data.GameModeConfig;
 import de.steamwar.data.GameModeConfigUtils;
+import de.steamwar.sql.GameModeConfig;
 import de.steamwar.sql.SchematicType;
 import lombok.NonNull;
 import org.bukkit.Bukkit;
@@ -60,7 +60,7 @@ public class FixedRegion implements Region {
     private final Area testblock;
     private final int floorLevel;
     private final int waterLevel;
-    private final GameModeConfig<Material, SchematicType, String> gameModeConfig;
+    private final GameModeConfig<Material, String> gameModeConfig;
     private final RegionData regionData;
     private final RegionHistory regionHistory = new RegionHistory.Impl(20);
 
@@ -339,7 +339,7 @@ public class FixedRegion implements Region {
                 break;
             }
         }
-        this.gameModeConfig = new GameModeConfig<>(found, GameModeConfigUtils.ToMaterial, GameModeConfig.ToSchematicType, GameModeConfig.ToString, GameModeConfig.ToStaticWarGear);
+        this.gameModeConfig = new GameModeConfig<>(found, GameModeConfigUtils.ToMaterial, GameModeConfig.ToString, GameModeConfig.ToStaticWarGear);
         this.regionData = new RegionData.RegionDataImpl(regionData, WorldData::write);
     }
 
diff --git a/CommonCore/SQL/src/de/steamwar/data/GameModeConfig.java b/CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java
similarity index 82%
rename from CommonCore/SQL/src/de/steamwar/data/GameModeConfig.java
rename to CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java
index b9c8919b..942df6d1 100644
--- a/CommonCore/SQL/src/de/steamwar/data/GameModeConfig.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java
@@ -17,12 +17,12 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.data;
+package de.steamwar.sql;
 
-import de.steamwar.sql.SchematicType;
 import lombok.ToString;
 
 import java.io.File;
+import java.lang.reflect.Field;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.Instant;
@@ -32,10 +32,9 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 
 @ToString
-public final class GameModeConfig<M, ST, W> {
+public final class GameModeConfig<M, W> {
 
     public static final Function<String, String> ToString = Function.identity();
-    public static final Function<String, SchematicType> ToSchematicType = SchematicType::fromDB;
     public static final Function<File, String> ToStaticWarGear = __ -> "WarGear";
     public static final Function<File, String> ToInternalName = file -> file.getName().replace(".yml", "");
     public static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("dd.MM.yyyy HH:mm");
@@ -44,10 +43,11 @@ public final class GameModeConfig<M, ST, W> {
     public final boolean loaded;
     public final File configFile;
 
-    public final Server Server;
+    public final ServerConfig Server;
 
     /**
      * Submission deadline for schematics in 'dd.MM.yyyy HH:mm' format
+     *
      * @implSpec {@code null} by default
      */
     public final Date Deadline;
@@ -58,9 +58,9 @@ public final class GameModeConfig<M, ST, W> {
      * @implSpec Disables check schem type if missing
      */
     public final List<String> CheckQuestions;
-    public final Times Times;
-    public final Arena Arena;
-    public final Schematic<M, ST> Schematic;
+    public final TimesConfig Times;
+    public final ArenaConfig Arena;
+    public final SchematicConfig<M> Schematic;
 
     /**
      * The name of the game mode presented to the players
@@ -83,28 +83,39 @@ public final class GameModeConfig<M, ST, W> {
      * @implSpec {@code +} by default
      */
     public final String TeamChatPrefix;
-    public final Blue Blue;
-    public final Red Red;
+    public final BlueConfig Blue;
+    public final RedConfig Red;
 
     /**
      * The list of active win conditions
      */
     public final List<W> WinConditions;
-    public final WinConditionParams<M> WinConditionParams;
-    public final Kits<M> Kits;
+    public final WinConditionParamsConfig<M> WinConditionParams;
+    public final KitsConfig<M> Kits;
 
     /**
      * A list of integers containing the waiting time of this enter stage in the fight
      */
     public final List<Integer> EnterStages;
-    public final Techhider<M> Techhider;
+    public final TechhiderConfig<M> Techhider;
 
-    public GameModeConfig(File file, Function<String, M> materialMapper, Function<String, ST> schematicTypeMapper, Function<String, W> winconditionMapper, Function<File, String> defaultGameName) {
-        YMLWrapper<M, ST, W> loader = new YMLWrapper<>(file, materialMapper, schematicTypeMapper, winconditionMapper);
+    private static final Field Schematic_TypeField;
+
+    static {
+        try {
+            Schematic_TypeField = SchematicConfig.class.getDeclaredField("Type");
+            Schematic_TypeField.setAccessible(true);
+        } catch (NoSuchFieldException e) {
+            throw new SecurityException(e.getMessage(), e);
+        }
+    }
+
+    public GameModeConfig(File file, Function<String, M> materialMapper, Function<String, W> winconditionMapper, Function<File, String> defaultGameName) {
+        YMLWrapper<M, W> loader = new YMLWrapper<>(file, materialMapper, winconditionMapper);
 
         configFile = file;
         loaded = loader.canLoad();
-        Server = new Server(loader.with("Server"));
+        Server = new ServerConfig(loader.with("Server"));
 
         String deadlineString = loader.getString("Deadline", null);
         if (deadlineString != null) {
@@ -120,25 +131,44 @@ public final class GameModeConfig<M, ST, W> {
         }
 
         CheckQuestions = loader.getStringList("CheckQuestions");
-        Times = new Times(loader.with("Times"));
+        Times = new TimesConfig(loader.with("Times"));
         // Arena would be here to be in config order but needs Schematic.Size and EnterStages loaded afterwards
-        Schematic = new Schematic<>(loader.with("Schematic"));
+        Schematic = new SchematicConfig<>(loader.with("Schematic"));
         GameName = loader.getString("GameName", defaultGameName.apply(file));
         ActiveMonths = loader.getIntList("ActiveMonths");
         TeamChatPrefix = loader.getString("TeamChatPrefix", "+");
-        Blue = new Blue(loader.with("Blue"));
-        Red = new Red(loader.with("Red"));
+        Blue = new BlueConfig(loader.with("Blue"));
+        Red = new RedConfig(loader.with("Red"));
         WinConditions = Collections.unmodifiableList(loader.getStringList("WinConditions").stream().map(loader.winconditionMapper).collect(Collectors.toList()));
-        WinConditionParams = new WinConditionParams<>(loader.with("WinConditionParams"));
-        Kits = new Kits<>(loader.with("Kits"));
+        WinConditionParams = new WinConditionParamsConfig<>(loader.with("WinConditionParams"));
+        Kits = new KitsConfig<>(loader.with("Kits"));
         EnterStages = loader.getIntList("EnterStages");
-        Techhider = new Techhider<>(loader.with("Techhider"));
+        Techhider = new TechhiderConfig<>(loader.with("Techhider"));
 
-        Arena = new Arena(loader.with("Arena"), Schematic.Size, EnterStages);
+        Arena = new ArenaConfig(loader.with("Arena"), Schematic.Size, EnterStages);
+
+        if (Schematic.Type != null) return;
+        if (!Schematic.loaded) return;
+        String Schematic_Type = loader.with("Schematic").getString("Type", "Normal");
+        if (Schematic_Type.equals("Normal")) return;
+        String Schematic_Shortcut = Schematic.Shortcut;
+
+        SchematicType checktype = null;
+        String material = loader.with("Schematic").getString("Material", "STONE_BUTTON");
+
+        if (!CheckQuestions.isEmpty()) {
+            checktype = new SchematicType("C" + Schematic_Type, "C" + Schematic_Shortcut, SchematicType.Type.CHECK_TYPE, null, material, true);
+        }
+        SchematicType current = new SchematicType(Schematic_Type, Schematic_Shortcut, Server.loaded ? SchematicType.Type.FIGHT_TYPE : SchematicType.Type.NORMAL, checktype, material, Deadline, Schematic.ManualCheck);
+        try {
+            Schematic_TypeField.set(Schematic, current);
+        } catch (IllegalAccessException e) {
+            throw new SecurityException(e.getMessage(), e);
+        }
     }
 
     @ToString
-    public static final class Server {
+    public static final class ServerConfig {
 
         public final boolean loaded;
 
@@ -183,7 +213,7 @@ public final class GameModeConfig<M, ST, W> {
          */
         public final boolean Ranked;
 
-        private Server(YMLWrapper loader) {
+        private ServerConfig(YMLWrapper loader) {
             loaded = loader.canLoad();
             Folder = loader.getString("Folder", null);
             ServerJar = loader.getString("ServerJar", null);
@@ -196,7 +226,7 @@ public final class GameModeConfig<M, ST, W> {
     }
 
     @ToString
-    public static final class Times {
+    public static final class TimesConfig {
         public final boolean loaded;
 
         /**
@@ -234,7 +264,7 @@ public final class GameModeConfig<M, ST, W> {
          */
         public final int SpectatorDuration;
 
-        private Times(YMLWrapper loader) {
+        private TimesConfig(YMLWrapper loader) {
             loaded = loader.canLoad();
             NoPlayersOnlineDuration = loader.getInt("NoPlayersOnlineDuration", 300);
             PreSchemPasteDuration = loader.getInt("PreSchemPasteDuration", 120);
@@ -245,7 +275,7 @@ public final class GameModeConfig<M, ST, W> {
     }
 
     @ToString
-    public static final class Arena {
+    public static final class ArenaConfig {
 
         public final boolean loaded;
 
@@ -259,12 +289,12 @@ public final class GameModeConfig<M, ST, W> {
         /**
          * The outer border of the arena, measured in blocks around the schematic areas
          */
-        public final Schem2Border Schem2Border;
+        public final Schem2BorderConfig Schem2Border;
 
         /**
          * The offset the teams spawn relative to the center of their area
          */
-        public final SpawnOffset SpawnOffset;
+        public final SpawnOffsetConfig SpawnOffset;
 
         /**
          * The size of the team areas are expanded around the schematics
@@ -308,11 +338,11 @@ public final class GameModeConfig<M, ST, W> {
          */
         public final boolean NoFloor;
 
-        private Arena(YMLWrapper loader, Schematic.Size Size, List<Integer> EnterStages) {
+        private ArenaConfig(YMLWrapper loader, SchematicConfig.SizeConfig Size, List<Integer> EnterStages) {
             loaded = loader.canLoad();
             WaterDepth = loader.getInt("WaterDepth", 0);
-            Schem2Border = new Schem2Border(loader.with("Schem2Border"));
-            SpawnOffset = new SpawnOffset(loader.with("SpawnOffset"), Size);
+            Schem2Border = new Schem2BorderConfig(loader.with("Schem2Border"));
+            SpawnOffset = new SpawnOffsetConfig(loader.with("SpawnOffset"), Size);
             BorderFromSchematic = loader.getInt("BorderFromSchematic", 21);
             GroundWalkable = loader.getBoolean("GroundWalkable", true);
             DisableSnowMelt = loader.getBoolean("DisableSnowMelt", false);
@@ -322,7 +352,7 @@ public final class GameModeConfig<M, ST, W> {
         }
 
         @ToString
-        public static final class Schem2Border {
+        public static final class Schem2BorderConfig {
 
             public final boolean loaded;
 
@@ -336,7 +366,7 @@ public final class GameModeConfig<M, ST, W> {
              */
             public final int z;
 
-            private Schem2Border(YMLWrapper loader) {
+            private Schem2BorderConfig(YMLWrapper loader) {
                 loaded = loader.canLoad();
                 x = loader.getInt("x", 24);
                 z = loader.getInt("z", 24);
@@ -344,7 +374,7 @@ public final class GameModeConfig<M, ST, W> {
         }
 
         @ToString
-        public static final class SpawnOffset {
+        public static final class SpawnOffsetConfig {
 
             public final boolean loaded;
 
@@ -363,7 +393,7 @@ public final class GameModeConfig<M, ST, W> {
              */
             public final double z;
 
-            private SpawnOffset(YMLWrapper loader, Schematic.Size Size) {
+            private SpawnOffsetConfig(YMLWrapper loader, SchematicConfig.SizeConfig Size) {
                 loaded = loader.canLoad();
                 x = loader.getDouble("x", 0);
                 y = loader.getDouble("y", Size.y);
@@ -373,31 +403,31 @@ public final class GameModeConfig<M, ST, W> {
     }
 
     @ToString
-    public static final class Schematic<M, ST> {
+    public static final class SchematicConfig<M> {
 
         public final boolean loaded;
 
         /**
          * The size of the schematics
          */
-        public final Size Size;
+        public final SizeConfig Size;
 
         /**
          * Used for GameModes with a technic area
          */
-        public final Inset Inset;
+        public final InsetConfig Inset;
 
         /**
          * The schematic type that can be chosen in this arena
          *
          * @implSpec {@code Normal} by default
          */
-        public final ST Type;
+        public final SchematicType Type;
 
         /**
          * The schematic types that are also allowed to be chosen in this arena
          */
-        public final List<ST> SubTypes;
+        public final List<SchematicType> SubTypes;
 
         /**
          * Shortcut of the schematic type
@@ -496,10 +526,10 @@ public final class GameModeConfig<M, ST, W> {
          */
         public final Map<Set<M>, Integer> Limited;
 
-        private Schematic(YMLWrapper<M, ST, ?> loader) {
+        private SchematicConfig(YMLWrapper<M, ?> loader) {
             loaded = loader.canLoad();
-            Size = new Size(loader.with("Size"));
-            Inset = new Inset(loader.with("Inset"));
+            Size = new SizeConfig(loader.with("Size"));
+            Inset = new InsetConfig(loader.with("Inset"));
             Type = loader.getSchematicType("Type", "Normal");
             SubTypes = loader.getSchematicTypeList("SubTypes");
             Shortcut = loader.getString("Shortcut", "");
@@ -532,7 +562,7 @@ public final class GameModeConfig<M, ST, W> {
         }
 
         @ToString
-        public static final class Size {
+        public static final class SizeConfig {
 
             public final boolean loaded;
 
@@ -551,7 +581,7 @@ public final class GameModeConfig<M, ST, W> {
              */
             public final int z;
 
-            private Size(YMLWrapper loader) {
+            private SizeConfig(YMLWrapper loader) {
                 loaded = loader.canLoad();
                 x = loader.getInt("x", 0);
                 y = loader.getInt("y", 0);
@@ -560,7 +590,7 @@ public final class GameModeConfig<M, ST, W> {
         }
 
         @ToString
-        public static final class Inset {
+        public static final class InsetConfig {
 
             public final boolean loaded;
 
@@ -584,7 +614,7 @@ public final class GameModeConfig<M, ST, W> {
              */
             public final int bottom;
 
-            private Inset(YMLWrapper loader) {
+            private InsetConfig(YMLWrapper loader) {
                 loaded = loader.canLoad();
                 x = loader.getInt("x", 0);
                 z = loader.getInt("z", 0);
@@ -595,7 +625,7 @@ public final class GameModeConfig<M, ST, W> {
     }
 
     @ToString
-    public static final class Blue {
+    public static final class BlueConfig {
 
         public final boolean loaded;
 
@@ -609,7 +639,7 @@ public final class GameModeConfig<M, ST, W> {
          */
         public final String Prefix;
 
-        private Blue(YMLWrapper loader) {
+        private BlueConfig(YMLWrapper loader) {
             loaded = loader.canLoad();
             Name = loader.getString("Name", "Blau");
             Prefix = loader.getString("Prefix", "§3");
@@ -617,7 +647,7 @@ public final class GameModeConfig<M, ST, W> {
     }
 
     @ToString
-    public static final class Red {
+    public static final class RedConfig {
 
         public final boolean loaded;
 
@@ -631,7 +661,7 @@ public final class GameModeConfig<M, ST, W> {
          */
         public final String Prefix;
 
-        private Red(YMLWrapper loader) {
+        private RedConfig(YMLWrapper loader) {
             loaded = loader.canLoad();
             Name = loader.getString("Name", "Rot");
             Prefix = loader.getString("Prefix", "§c");
@@ -639,7 +669,7 @@ public final class GameModeConfig<M, ST, W> {
     }
 
     @ToString
-    public static final class WinConditionParams<M> {
+    public static final class WinConditionParamsConfig<M> {
 
         public final boolean loaded;
 
@@ -683,7 +713,7 @@ public final class GameModeConfig<M, ST, W> {
          */
         public final int TechKoTime;
 
-        private WinConditionParams(YMLWrapper<M, ?, ?> loader) {
+        private WinConditionParamsConfig(YMLWrapper<M, ?> loader) {
             loaded = loader.canLoad();
             TimeoutTime = loader.getInt("TimeoutTime", 1200);
             PercentWin = loader.getDouble("PercentWin", 7.0);
@@ -695,7 +725,7 @@ public final class GameModeConfig<M, ST, W> {
     }
 
     @ToString
-    public static final class Kits<M> {
+    public static final class KitsConfig<M> {
 
         public final boolean loaded;
 
@@ -732,7 +762,7 @@ public final class GameModeConfig<M, ST, W> {
          */
         public final List<M> ForbiddenItems;
 
-        private Kits(YMLWrapper<M, ?, ?> loader) {
+        private KitsConfig(YMLWrapper<M, ?> loader) {
             loaded = loader.canLoad();
             File = loader.getString("File", "kits.yml");
             MemberDefault = loader.getString("MemberDefault", "default");
@@ -743,7 +773,7 @@ public final class GameModeConfig<M, ST, W> {
     }
 
     @ToString
-    public static final class Techhider<M> {
+    public static final class TechhiderConfig<M> {
 
         public final boolean loaded;
 
@@ -771,7 +801,7 @@ public final class GameModeConfig<M, ST, W> {
          */
         public final Set<String> HiddenBlockEntities;
 
-        private Techhider(YMLWrapper<M, ?, ?> loader) {
+        private TechhiderConfig(YMLWrapper<M, ?> loader) {
             loaded = loader.canLoad();
             Active = loader.getBoolean("Active", false);
             ObfuscateWith = loader.getMaterial("ObfuscateWith", "end_stone");
@@ -816,12 +846,7 @@ public final class GameModeConfig<M, ST, W> {
 
     public String getSchemTypeOrInternalName() {
         if (Schematic.loaded) {
-            ST type = Schematic.Type;
-            if (type instanceof SchematicType) {
-                return ((SchematicType) type).toDB();
-            } else if (type instanceof String) {
-                return (String) type;
-            }
+            return Schematic.Type.toDB();
         }
         return configFile.getName().replace(".yml", "");
     }
diff --git a/CommonCore/SQL/src/de/steamwar/sql/SQLWrapper.java b/CommonCore/SQL/src/de/steamwar/sql/SQLWrapper.java
index ac1424f0..0dbdde69 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/SQLWrapper.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/SQLWrapper.java
@@ -20,7 +20,6 @@
 package de.steamwar.sql;
 
 import de.steamwar.ImplementationProvider;
-import de.steamwar.data.GameModeConfig;
 
 import java.io.File;
 
@@ -29,7 +28,7 @@ public interface SQLWrapper {
 
     File getSchemTypesFolder();
 
-    default void processSchematicType(GameModeConfig<String, String, String> gameModeConfig, SchematicType type) {
+    default void processSchematicType(GameModeConfig<String, String> gameModeConfig) {
     }
 
     void additionalExceptionMetadata(StringBuilder builder);
diff --git a/CommonCore/SQL/src/de/steamwar/sql/SchematicType.java b/CommonCore/SQL/src/de/steamwar/sql/SchematicType.java
index 3cab7f0a..04af18ef 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/SchematicType.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/SchematicType.java
@@ -19,7 +19,6 @@
 
 package de.steamwar.sql;
 
-import de.steamwar.data.GameModeConfig;
 import de.steamwar.sql.internal.SqlTypeMapper;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
@@ -47,28 +46,18 @@ public class SchematicType {
         File folder = SQLWrapper.impl.getSchemTypesFolder();
         if (folder.exists()) {
             for (File configFile : Arrays.stream(folder.listFiles((file, name) -> name.endsWith(".yml") && !name.endsWith(".kits.yml"))).sorted().collect(Collectors.toList())) {
-                GameModeConfig<String, String, String> gameModeConfig = new GameModeConfig<>(configFile, GameModeConfig.ToString, GameModeConfig.ToString, GameModeConfig.ToString, GameModeConfig.ToStaticWarGear);
-                if (!gameModeConfig.Schematic.loaded) continue;
-                String type = gameModeConfig.Schematic.Type;
-                assert type != null;
-                String shortcut = gameModeConfig.Schematic.Shortcut;
-                if (tmpFromDB.containsKey(type.toLowerCase()))
-                    continue;
-
-                SchematicType checktype = null;
-                String material = gameModeConfig.Schematic.Material;
-
+                GameModeConfig<String, String> gameModeConfig = new GameModeConfig<>(configFile, GameModeConfig.ToString, GameModeConfig.ToString, GameModeConfig.ToStaticWarGear);
+                if (gameModeConfig.Schematic.Type == null) continue;
+                if (tmpFromDB.containsKey(gameModeConfig.Schematic.Type.toDB())) continue;
+                SchematicType current = gameModeConfig.Schematic.Type;
                 if (!gameModeConfig.CheckQuestions.isEmpty()) {
-                    checktype = new SchematicType("C" + type, "C" + shortcut, SchematicType.Type.CHECK_TYPE, null, material, true);
-                    tmpTypes.add(checktype);
-                    tmpFromDB.put(checktype.toDB(), checktype);
+                    SchematicType checkType = current.checkType;
+                    tmpTypes.add(checkType);
+                    tmpFromDB.put(checkType.toDB(), checkType);
                 }
-
-                SchematicType current = new SchematicType(type, shortcut, gameModeConfig.Server.loaded ? SchematicType.Type.FIGHT_TYPE : SchematicType.Type.NORMAL, checktype, material, gameModeConfig.Deadline, gameModeConfig.Schematic.ManualCheck);
                 tmpTypes.add(current);
-                tmpFromDB.put(type.toLowerCase(), current);
-
-                SQLWrapper.impl.processSchematicType(gameModeConfig, current);
+                tmpFromDB.put(current.toDB(), current);
+                SQLWrapper.impl.processSchematicType(gameModeConfig);
             }
         }
         time = System.currentTimeMillis() - time;
@@ -143,6 +132,7 @@ public class SchematicType {
 	}
 
 	public static SchematicType fromDB(String input) {
+        if (fromDB == null) return null;
 		return fromDB.get(input.toLowerCase());
 	}
 
diff --git a/CommonCore/SQL/src/de/steamwar/data/YMLWrapper.java b/CommonCore/SQL/src/de/steamwar/sql/YMLWrapper.java
similarity index 84%
rename from CommonCore/SQL/src/de/steamwar/data/YMLWrapper.java
rename to CommonCore/SQL/src/de/steamwar/sql/YMLWrapper.java
index 30d6d9ae..d7afa5e6 100644
--- a/CommonCore/SQL/src/de/steamwar/data/YMLWrapper.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/YMLWrapper.java
@@ -17,7 +17,7 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.data;
+package de.steamwar.sql;
 
 import org.yaml.snakeyaml.Yaml;
 
@@ -31,18 +31,16 @@ import java.util.Objects;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-final class YMLWrapper<M, ST, W> {
+final class YMLWrapper<M, W> {
 
     final Function<String, M> materialMapper;
-    final Function<String, ST> schematicTypeMapper;
     final Function<String, W> winconditionMapper;
 
     private final boolean canLoad;
     private final Map<String, Object> document;
 
-    YMLWrapper(File file, Function<String, M> materialMapper, Function<String, ST> schematicTypeMapper, Function<String, W> winconditionMapper) {
+    YMLWrapper(File file, Function<String, M> materialMapper, Function<String, W> winconditionMapper) {
         this.materialMapper = materialMapper;
-        this.schematicTypeMapper = schematicTypeMapper;
         this.winconditionMapper = winconditionMapper;
 
         Yaml yaml = new Yaml();
@@ -60,9 +58,8 @@ final class YMLWrapper<M, ST, W> {
         this.canLoad = canLoad;
     }
 
-    private YMLWrapper(boolean canLoad, Map<String, Object> document, Function<String, M> materialMapper, Function<String, ST> schematicTypeMapper, Function<String, W> winconditionMapper) {
+    private YMLWrapper(boolean canLoad, Map<String, Object> document, Function<String, M> materialMapper, Function<String, W> winconditionMapper) {
         this.materialMapper = materialMapper;
-        this.schematicTypeMapper = schematicTypeMapper;
         this.winconditionMapper = winconditionMapper;
         this.canLoad = canLoad;
         this.document = document;
@@ -72,24 +69,26 @@ final class YMLWrapper<M, ST, W> {
         return canLoad;
     }
 
-    public YMLWrapper<M, ST, W> with(String path) {
+    public YMLWrapper<M, W> with(String path) {
         if (document.containsKey(path)) {
             Object value = document.get(path);
             if (value instanceof Map) {
-                return new YMLWrapper<>(true, (Map) value, materialMapper, schematicTypeMapper, winconditionMapper);
+                return new YMLWrapper<>(true, (Map) value, materialMapper, winconditionMapper);
             }
         }
-        return new YMLWrapper<>(false, Collections.emptyMap(), materialMapper, schematicTypeMapper, winconditionMapper);
+        return new YMLWrapper<>(false, Collections.emptyMap(), materialMapper, winconditionMapper);
     }
 
     public <T> T get(String path, T defaultValue, Function<Object, T> mapper) {
         Object value = this.document.get(path);
         if (value == null) return defaultValue;
         try {
-            return mapper.apply(value);
+            T mapped = mapper.apply(value);
+            if (mapped != null) return mapped;
         } catch (ClassCastException e) {
-            return defaultValue;
+            // Ignore exception
         }
+        return defaultValue;
     }
 
     public String getString(String path, String defaultValue) {
@@ -108,9 +107,9 @@ final class YMLWrapper<M, ST, W> {
         return get(path, defaultValue, Boolean.class::cast);
     }
 
-    public ST getSchematicType(String path, String defaultValue) {
+    public SchematicType getSchematicType(String path, String defaultValue) {
         String schematicType = getString(path, defaultValue);
-        return schematicTypeMapper.apply(schematicType);
+        return SchematicType.fromDB(schematicType);
     }
 
     public M getMaterial(String path, String defaultValue) {
@@ -135,12 +134,12 @@ final class YMLWrapper<M, ST, W> {
         return get(path, o -> (List<Integer>) o);
     }
 
-    public List<ST> getSchematicTypeList(String path) {
+    public List<SchematicType> getSchematicTypeList(String path) {
         List<String> list = getStringList(path);
         if (list.isEmpty()) {
             return Collections.emptyList();
         } else {
-            return Collections.unmodifiableList(list.stream().map(schematicTypeMapper).collect(Collectors.toList()));
+            return Collections.unmodifiableList(list.stream().map(SchematicType::fromDB).collect(Collectors.toList()));
         }
     }
 
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/Config.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/Config.java
index 93f263bb..3b8d2378 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/Config.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/Config.java
@@ -19,7 +19,7 @@
 
 package de.steamwar.fightsystem;
 
-import de.steamwar.data.GameModeConfig;
+import de.steamwar.sql.GameModeConfig;
 import de.steamwar.data.GameModeConfigUtils;
 import de.steamwar.fightsystem.utils.Region;
 import de.steamwar.fightsystem.winconditions.Winconditions;
@@ -45,7 +45,7 @@ public class Config {
 
     public static final World world = Bukkit.getWorlds().get(0);
 
-    public static final GameModeConfig<Material, SchematicType, Winconditions> GameModeConfig;
+    public static final GameModeConfig<Material, Winconditions> GameModeConfig;
 
     //arena parameter
     public static final Region BluePasteRegion;
@@ -109,7 +109,7 @@ public class Config {
             Bukkit.getLogger().log(Level.SEVERE, "Arenaconfig fehlt!");
             Bukkit.shutdown();
         }
-        GameModeConfig = new GameModeConfig<>(new File(FightSystem.getPlugin().getDataFolder(), configFile), GameModeConfigUtils.ToMaterial, de.steamwar.data.GameModeConfig.ToSchematicType, Winconditions::valueOf, de.steamwar.data.GameModeConfig.ToStaticWarGear);
+        GameModeConfig = new GameModeConfig<>(new File(FightSystem.getPlugin().getDataFolder(), configFile), GameModeConfigUtils.ToMaterial, Winconditions::valueOf, de.steamwar.sql.GameModeConfig.ToStaticWarGear);
 
         File worldConfigFile = new File(world.getWorldFolder(), "config.yml");
         if(!worldConfigFile.exists()) {
diff --git a/SchematicSystem/SchematicSystem_15/src/de/steamwar/schematicsystem/autocheck/AutoChecker15.java b/SchematicSystem/SchematicSystem_15/src/de/steamwar/schematicsystem/autocheck/AutoChecker15.java
index d77f615c..97cf6de3 100644
--- a/SchematicSystem/SchematicSystem_15/src/de/steamwar/schematicsystem/autocheck/AutoChecker15.java
+++ b/SchematicSystem/SchematicSystem_15/src/de/steamwar/schematicsystem/autocheck/AutoChecker15.java
@@ -24,7 +24,7 @@ import com.sk89q.worldedit.entity.Entity;
 import com.sk89q.worldedit.extent.clipboard.Clipboard;
 import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.world.block.BaseBlock;
-import de.steamwar.data.GameModeConfig;
+import de.steamwar.sql.GameModeConfig;
 import de.steamwar.sql.SchematicType;
 import org.bukkit.Material;
 
@@ -119,7 +119,7 @@ public class AutoChecker15 implements AutoChecker.IAutoChecker {
     }
 
     @Override
-    public AutoCheckerResult check(Clipboard clipboard, GameModeConfig<Material, SchematicType, String> type) {
+    public AutoCheckerResult check(Clipboard clipboard, GameModeConfig<Material, String> type) {
         return AutoCheckerResult.builder()
                 .type(type)
                 .height(clipboard.getDimensions().getBlockY())
@@ -131,7 +131,7 @@ public class AutoChecker15 implements AutoChecker.IAutoChecker {
     }
 
     @Override
-    public AutoCheckerResult sizeCheck(Clipboard clipboard, GameModeConfig<Material, SchematicType, String> type) {
+    public AutoCheckerResult sizeCheck(Clipboard clipboard, GameModeConfig<Material, String> type) {
         return AutoCheckerResult.builder()
                 .type(type)
                 .height(clipboard.getDimensions().getBlockY())
diff --git a/SchematicSystem/SchematicSystem_15/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommand15.java b/SchematicSystem/SchematicSystem_15/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommand15.java
index 1a7f8a97..62fa611e 100644
--- a/SchematicSystem/SchematicSystem_15/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommand15.java
+++ b/SchematicSystem/SchematicSystem_15/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommand15.java
@@ -31,7 +31,7 @@ import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.world.block.BlockTypes;
-import de.steamwar.data.GameModeConfig;
+import de.steamwar.sql.GameModeConfig;
 import de.steamwar.schematicsystem.autocheck.AutoCheckerResult;
 import de.steamwar.schematicsystem.autocheck.BlockPos;
 import de.steamwar.sql.SchematicType;
@@ -42,7 +42,7 @@ import java.util.stream.Collectors;
 
 public class SchematicCommand15 implements SchematicCommand.ISchematicCommand {
     @Override
-    public Clipboard fixClipboard(Clipboard clipboard, AutoCheckerResult result, GameModeConfig<Material, SchematicType, String> type) throws Exception {
+    public Clipboard fixClipboard(Clipboard clipboard, AutoCheckerResult result, GameModeConfig<Material, String> type) throws Exception {
         for (BlockPos blockPos : result.getBlockScanResult().getRecords()) {
             BlockVector3 vector = BlockVector3.at(blockPos.getX(), blockPos.getY(), blockPos.getZ());
             clipboard.setBlock(vector, clipboard.getFullBlock(vector).toBaseBlock(new CompoundTag(Collections.emptyMap())));
diff --git a/SchematicSystem/SchematicSystem_8/src/de/steamwar/schematicsystem/autocheck/AutoChecker8.java b/SchematicSystem/SchematicSystem_8/src/de/steamwar/schematicsystem/autocheck/AutoChecker8.java
index cf457f62..c98b136a 100644
--- a/SchematicSystem/SchematicSystem_8/src/de/steamwar/schematicsystem/autocheck/AutoChecker8.java
+++ b/SchematicSystem/SchematicSystem_8/src/de/steamwar/schematicsystem/autocheck/AutoChecker8.java
@@ -25,7 +25,7 @@ import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.entity.Entity;
 import com.sk89q.worldedit.extent.clipboard.Clipboard;
 import com.sk89q.worldedit.regions.Region;
-import de.steamwar.data.GameModeConfig;
+import de.steamwar.sql.GameModeConfig;
 import de.steamwar.sql.SchematicType;
 import org.bukkit.Material;
 
@@ -149,7 +149,7 @@ public class AutoChecker8 implements AutoChecker.IAutoChecker {
     }
 
     @Override
-    public AutoCheckerResult check(Clipboard clipboard, GameModeConfig<Material, SchematicType, String> type) {
+    public AutoCheckerResult check(Clipboard clipboard, GameModeConfig<Material, String> type) {
         AutoChecker.BlockScanResult blockScanResult = new AutoChecker.BlockScanResult();
         scan(blockScanResult, clipboard);
 
@@ -164,7 +164,7 @@ public class AutoChecker8 implements AutoChecker.IAutoChecker {
     }
 
     @Override
-    public AutoCheckerResult sizeCheck(Clipboard clipboard, GameModeConfig<Material, SchematicType, String> type) {
+    public AutoCheckerResult sizeCheck(Clipboard clipboard, GameModeConfig<Material, String> type) {
         return AutoCheckerResult.builder()
                 .type(type)
                 .height(clipboard.getDimensions().getBlockY())
diff --git a/SchematicSystem/SchematicSystem_8/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommand8.java b/SchematicSystem/SchematicSystem_8/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommand8.java
index 58c334cd..e873ea49 100644
--- a/SchematicSystem/SchematicSystem_8/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommand8.java
+++ b/SchematicSystem/SchematicSystem_8/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommand8.java
@@ -24,7 +24,7 @@ import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.extent.clipboard.Clipboard;
 import com.sk89q.worldedit.function.operation.ForwardExtentCopy;
 import com.sk89q.worldedit.function.operation.Operations;
-import de.steamwar.data.GameModeConfig;
+import de.steamwar.sql.GameModeConfig;
 import de.steamwar.schematicsystem.autocheck.AutoCheckerResult;
 import de.steamwar.sql.SchematicType;
 import org.bukkit.Material;
@@ -32,7 +32,7 @@ import org.bukkit.Material;
 public class SchematicCommand8 implements SchematicCommand.ISchematicCommand {
 
     @Override
-    public Clipboard fixClipboard(Clipboard clipboard, AutoCheckerResult result, GameModeConfig<Material, SchematicType, String> type) throws Exception {
+    public Clipboard fixClipboard(Clipboard clipboard, AutoCheckerResult result, GameModeConfig<Material, String> type) throws Exception {
         return null;
     }
 
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/SchematicSystem.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/SchematicSystem.java
index a5826c70..b75ddbdf 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/SchematicSystem.java
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/SchematicSystem.java
@@ -19,7 +19,7 @@
 
 package de.steamwar.schematicsystem;
 
-import de.steamwar.data.GameModeConfig;
+import de.steamwar.sql.GameModeConfig;
 import de.steamwar.data.GameModeConfigUtils;
 import de.steamwar.linkage.AbstractLinker;
 import de.steamwar.linkage.SpigotLinker;
@@ -38,9 +38,9 @@ public class SchematicSystem extends JavaPlugin {
 
     private static SchematicSystem instance;
 
-    private static final Map<SchematicType, GameModeConfig<Material, SchematicType, String>> types = new HashMap<>();
+    private static final Map<SchematicType, GameModeConfig<Material, String>> types = new HashMap<>();
 
-    public static GameModeConfig<Material, SchematicType, String> getGameModeConfig(SchematicType type){
+    public static GameModeConfig<Material, String> getGameModeConfig(SchematicType type){
         return types.get(type);
     }
 
@@ -51,7 +51,7 @@ public class SchematicSystem extends JavaPlugin {
         File folder = new File(this.getDataFolder().getParentFile(), "FightSystem");
         if(folder.exists()) {
             for(File configFile : folder.listFiles((file, name) -> name.endsWith(".yml") && !name.endsWith(".kits.yml"))) {
-                GameModeConfig<Material, SchematicType, String> gameModeConfig = new GameModeConfig<>(configFile, GameModeConfigUtils.ToMaterial, GameModeConfig.ToSchematicType, GameModeConfig.ToString, GameModeConfig.ToStaticWarGear);
+                GameModeConfig<Material, String> gameModeConfig = new GameModeConfig<>(configFile, GameModeConfigUtils.ToMaterial, GameModeConfig.ToString, GameModeConfig.ToStaticWarGear);
                 if (gameModeConfig.CheckQuestions.isEmpty() && gameModeConfig.Schematic.ManualCheck)
                     continue;
                 types.put(gameModeConfig.Schematic.Type, gameModeConfig);
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/autocheck/AutoChecker.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/autocheck/AutoChecker.java
index ac4220fe..eb464553 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/autocheck/AutoChecker.java
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/autocheck/AutoChecker.java
@@ -21,7 +21,7 @@ package de.steamwar.schematicsystem.autocheck;
 
 import com.sk89q.worldedit.extent.clipboard.Clipboard;
 import de.steamwar.core.VersionDependent;
-import de.steamwar.data.GameModeConfig;
+import de.steamwar.sql.GameModeConfig;
 import de.steamwar.schematicsystem.SchematicSystem;
 import de.steamwar.sql.SchematicType;
 import lombok.Getter;
@@ -32,19 +32,19 @@ import java.util.*;
 
 public class AutoChecker {
 
-    public static AutoCheckerResult check(Clipboard clipboard, GameModeConfig<Material, SchematicType, String> type) {
+    public static AutoCheckerResult check(Clipboard clipboard, GameModeConfig<Material, String> type) {
         return impl.check(clipboard, type);
     }
 
-    public static AutoCheckerResult sizeCheck(Clipboard clipboard, GameModeConfig<Material, SchematicType, String> type) {
+    public static AutoCheckerResult sizeCheck(Clipboard clipboard, GameModeConfig<Material, String> type) {
         return impl.sizeCheck(clipboard, type);
     }
 
     private static final IAutoChecker impl = VersionDependent.getVersionImpl(SchematicSystem.getInstance());
 
     public interface IAutoChecker {
-        AutoCheckerResult check(Clipboard clipboard, GameModeConfig<Material, SchematicType, String> type);
-        AutoCheckerResult sizeCheck(Clipboard clipboard, GameModeConfig<Material, SchematicType, String> type);
+        AutoCheckerResult check(Clipboard clipboard, GameModeConfig<Material, String> type);
+        AutoCheckerResult sizeCheck(Clipboard clipboard, GameModeConfig<Material, String> type);
     }
 
     @Getter
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/autocheck/AutoCheckerResult.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/autocheck/AutoCheckerResult.java
index 9aad0edb..60ab9070 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/autocheck/AutoCheckerResult.java
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/autocheck/AutoCheckerResult.java
@@ -20,7 +20,7 @@
 package de.steamwar.schematicsystem.autocheck;
 
 import de.steamwar.core.Core;
-import de.steamwar.data.GameModeConfig;
+import de.steamwar.sql.GameModeConfig;
 import de.steamwar.schematicsystem.SchematicSystem;
 import de.steamwar.sql.SchematicType;
 import lombok.Builder;
@@ -38,7 +38,7 @@ import java.util.Map;
 @Getter
 @ToString
 public class AutoCheckerResult {
-    private final GameModeConfig<Material, SchematicType, String> type;
+    private final GameModeConfig<Material, String> type;
     private final int width;
     private final int height;
     private final int depth;
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommand.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommand.java
index 5b9add07..90c6d3c7 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommand.java
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommand.java
@@ -27,7 +27,7 @@ import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeMapper;
 import de.steamwar.command.TypeValidator;
 import de.steamwar.core.VersionDependent;
-import de.steamwar.data.GameModeConfig;
+import de.steamwar.sql.GameModeConfig;
 import de.steamwar.linkage.Linked;
 import de.steamwar.schematicsystem.SchematicSystem;
 import de.steamwar.schematicsystem.autocheck.AutoCheckerResult;
@@ -113,7 +113,7 @@ public class SchematicCommand extends SWCommand {
     }
 
     @ClassMapper(value = GameModeConfig.class, local = true)
-    public static TypeMapper<GameModeConfig<Material, SchematicType, String>> gameModeConfigTypeMapper() {
+    public static TypeMapper<GameModeConfig<Material, String>> gameModeConfigTypeMapper() {
         return SchematicMapper.gameModeConfigTypeMapper();
     }
 
@@ -150,7 +150,7 @@ public class SchematicCommand extends SWCommand {
     public static final ISchematicCommand impl = VersionDependent.getVersionImpl(SchematicSystem.getInstance());
 
     public interface ISchematicCommand {
-        Clipboard fixClipboard(Clipboard clipboard, AutoCheckerResult result, GameModeConfig<Material, SchematicType, String> type) throws Exception;
+        Clipboard fixClipboard(Clipboard clipboard, AutoCheckerResult result, GameModeConfig<Material, String> type) throws Exception;
         void createCopy(EditSession editSession, Clipboard clipboard) throws WorldEditException;
     }
 }
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommandUtils.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommandUtils.java
index 03f2f328..cea1122c 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommandUtils.java
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommandUtils.java
@@ -20,7 +20,7 @@
 package de.steamwar.schematicsystem.commands.schematiccommand;
 
 import com.sk89q.worldedit.extent.clipboard.Clipboard;
-import de.steamwar.data.GameModeConfig;
+import de.steamwar.sql.GameModeConfig;
 import de.steamwar.inventory.SWInventory;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.network.NetworkSender;
@@ -312,7 +312,7 @@ public class SchematicCommandUtils {
         }
     }
 
-    public static void check(Player player, Clipboard clipboard, GameModeConfig<Material, SchematicType, String> type, String schemName, boolean gui) {
+    public static void check(Player player, Clipboard clipboard, GameModeConfig<Material, String> type, String schemName, boolean gui) {
         AutoCheckerResult result = AutoChecker.check(clipboard, type);
         if(!result.isOk()) {
             result.sendErrorMessage(player, schemName);
@@ -455,7 +455,7 @@ public class SchematicCommandUtils {
                 return;
             }
 
-            GameModeConfig<Material, SchematicType, String> checkSchemType = SchematicSystem.getGameModeConfig(type);
+            GameModeConfig<Material, String> checkSchemType = SchematicSystem.getGameModeConfig(type);
             if (checkSchemType.isAfterDeadline()) {
                 SchematicSystem.MESSAGE.send("UTIL_TYPE_AFTER_DEADLINE", player, checkSchemType.Deadline);
                 return;
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicMapper.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicMapper.java
index a7f50dd7..157e8d2d 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicMapper.java
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicMapper.java
@@ -20,7 +20,7 @@
 package de.steamwar.schematicsystem.commands.schematiccommand;
 
 import de.steamwar.command.TypeMapper;
-import de.steamwar.data.GameModeConfig;
+import de.steamwar.sql.GameModeConfig;
 import de.steamwar.schematicsystem.SchematicSystem;
 import de.steamwar.sql.NodeMember;
 import de.steamwar.sql.SchematicNode;
@@ -177,15 +177,15 @@ public class SchematicMapper {
         };
     }
 
-    public static TypeMapper<GameModeConfig<Material, SchematicType, String>> gameModeConfigTypeMapper() {
-        return new TypeMapper<GameModeConfig<Material, SchematicType, String>>() {
+    public static TypeMapper<GameModeConfig<Material, String>> gameModeConfigTypeMapper() {
+        return new TypeMapper<GameModeConfig<Material, String>>() {
             @Override
             public Collection<String> tabCompletes(CommandSender commandSender, String[] strings, String s) {
                 return SchematicType.values().stream().filter(type -> SchematicSystem.getGameModeConfig(type) != null).map(SchematicType::name).collect(Collectors.toList());
             }
 
             @Override
-            public GameModeConfig<Material, SchematicType, String> map(CommandSender commandSender, String[] previousArguments, String s) {
+            public GameModeConfig<Material, String> map(CommandSender commandSender, String[] previousArguments, String s) {
                 return SchematicType.values().stream().filter(type -> type.name().equalsIgnoreCase(s)).map(SchematicSystem::getGameModeConfig).findAny().orElse(null);
             }
         };
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/CheckPart.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/CheckPart.java
index bf0f0c8e..9e3be830 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/CheckPart.java
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/CheckPart.java
@@ -28,7 +28,7 @@ import com.sk89q.worldedit.session.ClipboardHolder;
 import de.steamwar.command.AbstractSWCommand;
 import de.steamwar.command.SWCommand;
 import de.steamwar.core.Core;
-import de.steamwar.data.GameModeConfig;
+import de.steamwar.sql.GameModeConfig;
 import de.steamwar.linkage.Linked;
 import de.steamwar.schematicsystem.SchematicSystem;
 import de.steamwar.schematicsystem.autocheck.AutoChecker;
@@ -54,7 +54,7 @@ public class CheckPart extends SWCommand {
     }
 
     @Register("check")
-    public void checkCommand(Player player, @Validator("isOwnerSchematicValidator") SchematicNode node, GameModeConfig<Material, SchematicType, String> type) {
+    public void checkCommand(Player player, @Validator("isOwnerSchematicValidator") SchematicNode node, GameModeConfig<Material, String> type) {
         try {
             check(player, new SchematicData(node).load(), type, node.getName(), false);
         } catch (IOException e) {
@@ -63,7 +63,7 @@ public class CheckPart extends SWCommand {
     }
 
     @Register(value = {"check", "clipboard"})
-    public void checkClipboardCommand(Player player, @ErrorMessage("UTIL_CHECK_TYPE_NOT_FOUND") GameModeConfig<Material, SchematicType, String> type) {
+    public void checkClipboardCommand(Player player, @ErrorMessage("UTIL_CHECK_TYPE_NOT_FOUND") GameModeConfig<Material, String> type) {
         try {
             check(player, WorldEdit.getInstance().getSessionManager().findByName(player.getName()).getClipboard().getClipboard(), type, "clipboard", false);
         } catch (EmptyClipboardException e) {
@@ -72,7 +72,7 @@ public class CheckPart extends SWCommand {
     }
 
     @Register(value = {"check", "selection"})
-    public void checkSelectionCommand(Player player, @ErrorMessage("UTIL_CHECK_TYPE_NOT_FOUND") GameModeConfig<Material, SchematicType, String> type) {
+    public void checkSelectionCommand(Player player, @ErrorMessage("UTIL_CHECK_TYPE_NOT_FOUND") GameModeConfig<Material, String> type) {
         try {
             Clipboard clipboard = new BlockArrayClipboard(WorldEdit.getInstance().getSessionManager().findByName(player.getName()).getSelection(new BukkitWorld(player.getWorld())));
             EditSession editSession = WorldEdit.getInstance().getEditSessionFactory().getEditSession(new BukkitWorld(player.getWorld()), -1);
@@ -88,7 +88,7 @@ public class CheckPart extends SWCommand {
     }
 
     @Register("fix")
-    public void fixSchematicCommand(Player player, @ErrorMessage("UTIL_CHECK_TYPE_NOT_FOUND") GameModeConfig<Material, SchematicType, String> type) {
+    public void fixSchematicCommand(Player player, @ErrorMessage("UTIL_CHECK_TYPE_NOT_FOUND") GameModeConfig<Material, String> type) {
         if(Core.getVersion() < 15) {
             SchematicSystem.MESSAGE.send("COMMAND_FIX_WRONG_VERSION", player);
             return;
diff --git a/VelocityCore/src/de/steamwar/sql/SQLWrapperImpl.java b/VelocityCore/src/de/steamwar/sql/SQLWrapperImpl.java
index 0c2aa004..1868fd9f 100644
--- a/VelocityCore/src/de/steamwar/sql/SQLWrapperImpl.java
+++ b/VelocityCore/src/de/steamwar/sql/SQLWrapperImpl.java
@@ -21,7 +21,6 @@ package de.steamwar.sql;
 
 import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.server.RegisteredServer;
-import de.steamwar.data.GameModeConfig;
 import de.steamwar.velocitycore.VelocityCore;
 import de.steamwar.velocitycore.commands.CheckCommand;
 
@@ -35,7 +34,8 @@ public class SQLWrapperImpl implements SQLWrapper {
     }
 
     @Override
-    public void processSchematicType(GameModeConfig<String, String, String> gameModeConfig, SchematicType type) {
+    public void processSchematicType(GameModeConfig<String, String> gameModeConfig) {
+        SchematicType type = gameModeConfig.Schematic.Type;
         if (type.checkType() != null) {
             CheckCommand.setCheckQuestions(type.checkType(), gameModeConfig.CheckQuestions);
             CheckCommand.addFightType(type.checkType(), type);
diff --git a/VelocityCore/src/de/steamwar/velocitycore/ArenaMode.java b/VelocityCore/src/de/steamwar/velocitycore/ArenaMode.java
index 63c0187e..9707bdd9 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/ArenaMode.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/ArenaMode.java
@@ -19,7 +19,7 @@
 
 package de.steamwar.velocitycore;
 
-import de.steamwar.data.GameModeConfig;
+import de.steamwar.sql.GameModeConfig;
 import de.steamwar.sql.SchematicType;
 import lombok.Getter;
 import lombok.experimental.UtilityClass;
@@ -30,11 +30,11 @@ import java.util.*;
 @UtilityClass
 public class ArenaMode {
 
-    private static final Map<String, GameModeConfig<String, SchematicType, String>> byChat = new HashMap<>();
-    private static final Map<String, GameModeConfig<String, SchematicType, String>> byInternal = new HashMap<>();
-    private static final Map<SchematicType, GameModeConfig<String, SchematicType, String>> bySchemType = new HashMap<>();
+    private static final Map<String, GameModeConfig<String, String>> byChat = new HashMap<>();
+    private static final Map<String, GameModeConfig<String, String>> byInternal = new HashMap<>();
+    private static final Map<SchematicType, GameModeConfig<String, String>> bySchemType = new HashMap<>();
     @Getter
-    private static final List<GameModeConfig<String, SchematicType, String>> allModes = new LinkedList<>();
+    private static final List<GameModeConfig<String, String>> allModes = new LinkedList<>();
 
     static {
         init();
@@ -51,7 +51,7 @@ public class ArenaMode {
             return;
 
         for(File file : Arrays.stream(folder.listFiles((file, name) -> name.endsWith(".yml") && !name.endsWith(".kits.yml"))).sorted().toList()) {
-            GameModeConfig<String, SchematicType, String> gameModeConfig = new GameModeConfig<>(file, GameModeConfig.ToString, GameModeConfig.ToSchematicType, GameModeConfig.ToString, GameModeConfig.ToInternalName);
+            GameModeConfig<String, String> gameModeConfig = new GameModeConfig<>(file, GameModeConfig.ToString, GameModeConfig.ToString, GameModeConfig.ToInternalName);
             if (!gameModeConfig.Server.loaded) continue;
 
             allModes.add(gameModeConfig);
@@ -65,24 +65,24 @@ public class ArenaMode {
         }
     }
 
-    public static GameModeConfig<String, SchematicType, String> getByChat(String name){
+    public static GameModeConfig<String, String> getByChat(String name){
         return byChat.get(name.toLowerCase());
     }
 
-    public static GameModeConfig<String, SchematicType, String> getByInternal(String name){
+    public static GameModeConfig<String, String> getByInternal(String name){
         return byInternal.get(name);
     }
 
     public static List<String> getAllChatNames(boolean historic) {
         List<String> chatNames = new LinkedList<>();
-        for(GameModeConfig<String, SchematicType, String> mode : byInternal.values()){
+        for(GameModeConfig<String, String> mode : byInternal.values()){
             if(mode.isActive() && historic == mode.Server.Historic)
                 chatNames.addAll(mode.Server.ChatNames);
         }
         return chatNames;
     }
 
-    public static GameModeConfig<String, SchematicType, String> getBySchemType(SchematicType schemType){
+    public static GameModeConfig<String, String> getBySchemType(SchematicType schemType){
         return bySchemType.get(schemType);
     }
 }
diff --git a/VelocityCore/src/de/steamwar/velocitycore/ServerStarter.java b/VelocityCore/src/de/steamwar/velocitycore/ServerStarter.java
index 31f73773..3b56256a 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/ServerStarter.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/ServerStarter.java
@@ -22,7 +22,7 @@ package de.steamwar.velocitycore;
 import com.velocitypowered.api.proxy.Player;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.velocity.platform.VelocityViaConfig;
-import de.steamwar.data.GameModeConfig;
+import de.steamwar.sql.GameModeConfig;
 import de.steamwar.messages.Chatter;
 import de.steamwar.persistent.Arenaserver;
 import de.steamwar.persistent.Bauserver;
@@ -80,7 +80,7 @@ public class ServerStarter {
     private final Set<Player> playersToSend = new HashSet<>();
     private final Map<String, String> arguments = new HashMap<>();
 
-    public ServerStarter arena(GameModeConfig<String, SchematicType, String> mode, String map) {
+    public ServerStarter arena(GameModeConfig<String, String> mode, String map) {
         portrange = ARENA_PORTS;
         serverNameProvider = port -> mode.GameName + (port - portrange.start);
         version = ServerVersion.from(mode);
@@ -116,7 +116,7 @@ public class ServerStarter {
         return this;
     }
 
-    public ServerStarter test(GameModeConfig<String, SchematicType, String> mode, String map, Player owner) {
+    public ServerStarter test(GameModeConfig<String, String> mode, String map, Player owner) {
         arena(mode, map);
         buildWithTemp(owner);
         portrange = BAU_PORTS;
diff --git a/VelocityCore/src/de/steamwar/velocitycore/ServerVersion.java b/VelocityCore/src/de/steamwar/velocitycore/ServerVersion.java
index 260bbec6..5d3689f9 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/ServerVersion.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/ServerVersion.java
@@ -20,7 +20,7 @@
 package de.steamwar.velocitycore;
 
 import com.velocitypowered.api.network.ProtocolVersion;
-import de.steamwar.data.GameModeConfig;
+import de.steamwar.sql.GameModeConfig;
 import de.steamwar.sql.SchematicType;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -115,7 +115,7 @@ public enum ServerVersion {
 
     private static final Pattern terminatingNumber = Pattern.compile("(\\d+)$");
 
-    public static ServerVersion from(GameModeConfig<String, SchematicType, String> type) {
+    public static ServerVersion from(GameModeConfig<String, String> type) {
         Matcher matcher = terminatingNumber.matcher(type.Server.Folder);
         matcher.find();
         return ServerVersion.valueOf((type.Server.Spigot ? "SPIGOT_" : "PAPER_") + matcher.group(1));
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/BauCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/BauCommand.java
index 48ab4d05..0d679ca9 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/BauCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/BauCommand.java
@@ -23,7 +23,7 @@ import de.steamwar.command.PreviousArguments;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeMapper;
 import de.steamwar.command.TypeValidator;
-import de.steamwar.data.GameModeConfig;
+import de.steamwar.sql.GameModeConfig;
 import de.steamwar.linkage.EventMode;
 import de.steamwar.linkage.Linked;
 import de.steamwar.linkage.LinkedInstance;
@@ -240,7 +240,7 @@ public class BauCommand extends SWCommand {
 
     @Register("test")
     @Register("testarena")
-    public void testarena(PlayerChatter sender, @Mapper("nonHistoricArenaMode") @OptionalValue("") @AllowNull GameModeConfig<String, SchematicType, String> arenaMode, @Mapper("arenaMap") @OptionalValue("") @AllowNull String map) {
+    public void testarena(PlayerChatter sender, @Mapper("nonHistoricArenaMode") @OptionalValue("") @AllowNull GameModeConfig<String, String> arenaMode, @Mapper("arenaMap") @OptionalValue("") @AllowNull String map) {
         FightCommand.createArena(sender, "/bau testarena ", false, arenaMode, map, false, (chatter, mode, m) ->
                 new ServerStarter().test(mode, m, sender.getPlayer()).start()
         );
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/BuilderCloudCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/BuilderCloudCommand.java
index 6dc12264..5ae01fe7 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/BuilderCloudCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/BuilderCloudCommand.java
@@ -19,7 +19,7 @@
 
 package de.steamwar.velocitycore.commands;
 
-import de.steamwar.data.GameModeConfig;
+import de.steamwar.sql.GameModeConfig;
 import de.steamwar.linkage.Linked;
 import de.steamwar.sql.SchematicType;
 import de.steamwar.velocitycore.ArenaMode;
@@ -87,7 +87,7 @@ public class BuilderCloudCommand extends SWCommand {
     }
 
     @Register(value = "deploy", description = "BUILDERCLOUD_DEPLOY_USAGE")
-    public void deploy(Chatter sender, @Mapper("nonHistoricArenaMode") GameModeConfig<String, SchematicType, String> arenaMode, @ErrorMessage("BUILDERCLOUD_VERSION") ServerVersion version, @Mapper("map") String map) {
+    public void deploy(Chatter sender, @Mapper("nonHistoricArenaMode") GameModeConfig<String, String> arenaMode, @ErrorMessage("BUILDERCLOUD_VERSION") ServerVersion version, @Mapper("map") String map) {
         if(!mapFile(version, map).exists()) {
             sender.system("BUILDERCLOUD_UNKNOWN_MAP");
             return;
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/ChallengeCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/ChallengeCommand.java
index 024d4de4..c9ab1f84 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/ChallengeCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/ChallengeCommand.java
@@ -22,7 +22,7 @@ package de.steamwar.velocitycore.commands;
 import com.velocitypowered.api.proxy.Player;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeValidator;
-import de.steamwar.data.GameModeConfig;
+import de.steamwar.sql.GameModeConfig;
 import de.steamwar.linkage.EventMode;
 import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
@@ -31,7 +31,6 @@ import de.steamwar.messages.PlayerChatter;
 import de.steamwar.persistent.Subserver;
 import de.steamwar.sql.IgnoreSystem;
 import de.steamwar.sql.SchematicType;
-import de.steamwar.velocitycore.ArenaMode;
 import de.steamwar.velocitycore.ServerStarter;
 import net.kyori.adventure.text.event.ClickEvent;
 
@@ -48,7 +47,7 @@ public class ChallengeCommand extends SWCommand {
     }
 
     @Register(description = "CHALLENGE_USAGE")
-    public void challenge(@Validator("arenaPlayer") PlayerChatter sender, @Validator("target") Player target, @Mapper("nonHistoricArenaMode") @OptionalValue("") @AllowNull GameModeConfig<String, SchematicType, String> arenaMode, @Mapper("arenaMap") @OptionalValue("") @AllowNull String map) {
+    public void challenge(@Validator("arenaPlayer") PlayerChatter sender, @Validator("target") Player target, @Mapper("nonHistoricArenaMode") @OptionalValue("") @AllowNull GameModeConfig<String, String> arenaMode, @Mapper("arenaMap") @OptionalValue("") @AllowNull String map) {
         FightCommand.createArena(sender, "/challenge " + target.getUsername() + " ", false, arenaMode, map, false, (chatter, mode, m) -> {
             Player p = sender.getPlayer();
             if(challenges.containsKey(target) && challenges.get(target).contains(p)){
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/CheckCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/CheckCommand.java
index 335e3201..218028bd 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/CheckCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/CheckCommand.java
@@ -21,7 +21,7 @@ package de.steamwar.velocitycore.commands;
 
 import com.velocitypowered.api.proxy.Player;
 import de.steamwar.command.SWCommand;
-import de.steamwar.data.GameModeConfig;
+import de.steamwar.sql.GameModeConfig;
 import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.Message;
@@ -221,7 +221,7 @@ public class CheckCommand extends SWCommand {
             this.startTime = Timestamp.from(Instant.now());
             this.checkList = checkQuestions.get(schematic.getSchemtype()).listIterator();
 
-            GameModeConfig<String, SchematicType, String> mode = ArenaMode.getBySchemType(fightTypes.get(schematic.getSchemtype()));
+            GameModeConfig<String, String> mode = ArenaMode.getBySchemType(fightTypes.get(schematic.getSchemtype()));
             new ServerStarter().test(mode, mode.getRandomMap(), checker.getPlayer()).check(schematic.getId()).callback(subserver -> {
                 currentCheckers.put(checker.user().getUUID(), this);
                 currentSchems.put(schematic.getId(), this);
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/FightCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/FightCommand.java
index 86ff28cd..1c1d8bd2 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/FightCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/FightCommand.java
@@ -21,7 +21,7 @@ package de.steamwar.velocitycore.commands;
 
 import com.velocitypowered.api.proxy.Player;
 import de.steamwar.command.SWCommand;
-import de.steamwar.data.GameModeConfig;
+import de.steamwar.sql.GameModeConfig;
 import de.steamwar.linkage.EventMode;
 import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
@@ -50,7 +50,7 @@ public class FightCommand extends SWCommand {
 
     private static void getModes(Chatter sender, String precommand, boolean historic){
         Component start = Component.empty();
-        for(GameModeConfig<String, SchematicType, String> mode : ArenaMode.getAllModes()){
+        for(GameModeConfig<String, String> mode : ArenaMode.getAllModes()){
             if (!mode.isActive() || mode.Server.Historic != historic)
                 continue;
 
@@ -66,7 +66,7 @@ public class FightCommand extends SWCommand {
         sender.sendMessage(start);
     }
 
-    static void createArena(PlayerChatter sender, String precommand, boolean allowMerging, GameModeConfig<String, SchematicType, String> arenaMode, String map, boolean historic, FightCallback callback) {
+    static void createArena(PlayerChatter sender, String precommand, boolean allowMerging, GameModeConfig<String, String> arenaMode, String map, boolean historic, FightCallback callback) {
         if (arenaMode == null) {
             getModes(sender, precommand, historic);
             return;
@@ -82,7 +82,7 @@ public class FightCommand extends SWCommand {
         }
     }
 
-    private static void suggestMerging(PlayerChatter sender, GameModeConfig<String, SchematicType, String> mode, String map, FightCallback declineMerge) {
+    private static void suggestMerging(PlayerChatter sender, GameModeConfig<String, String> mode, String map, FightCallback declineMerge) {
         Arenaserver mergable = null;
         synchronized (Subserver.getServerList()) {
             for (Subserver subserver : Subserver.getServerList()) {
@@ -120,7 +120,7 @@ public class FightCommand extends SWCommand {
     }
 
     @Register
-    public void fight(@Validator("arenaPlayer") PlayerChatter sender, @Mapper("nonHistoricArenaMode") @OptionalValue("") @AllowNull GameModeConfig<String, SchematicType, String> arenaMode, @Mapper("arenaMap") @OptionalValue("") @AllowNull String map) {
+    public void fight(@Validator("arenaPlayer") PlayerChatter sender, @Mapper("nonHistoricArenaMode") @OptionalValue("") @AllowNull GameModeConfig<String, String> arenaMode, @Mapper("arenaMap") @OptionalValue("") @AllowNull String map) {
         createArena(sender, "/fight ", true, arenaMode, map, false,
                 (p, mode, m) -> new ServerStarter().arena(mode, m).blueLeader(p.getPlayer()).callback(
                         arena -> Chatter.broadcast().system("FIGHT_BROADCAST", new Message("FIGHT_BROADCAST_HOVER", p.getPlayer().getUsername()), ClickEvent.runCommand("/arena " + arena.getServer().getName()), mode.GameName, p.getPlayer().getUsername())
@@ -129,6 +129,6 @@ public class FightCommand extends SWCommand {
     }
 
     public interface FightCallback {
-        void run(PlayerChatter player, GameModeConfig<String, SchematicType, String> mode, String map);
+        void run(PlayerChatter player, GameModeConfig<String, String> mode, String map);
     }
 }
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/HistoricCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/HistoricCommand.java
index cfee955d..639b25f5 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/HistoricCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/HistoricCommand.java
@@ -20,14 +20,13 @@
 package de.steamwar.velocitycore.commands;
 
 import de.steamwar.command.SWCommand;
-import de.steamwar.data.GameModeConfig;
+import de.steamwar.sql.GameModeConfig;
 import de.steamwar.linkage.EventMode;
 import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.Message;
 import de.steamwar.messages.PlayerChatter;
 import de.steamwar.sql.SchematicType;
-import de.steamwar.velocitycore.ArenaMode;
 import de.steamwar.velocitycore.ServerStarter;
 import net.kyori.adventure.text.event.ClickEvent;
 
@@ -39,7 +38,7 @@ public class HistoricCommand extends SWCommand {
     }
 
     @Register
-    public void historic(@Validator("arenaPlayer") PlayerChatter player, @Mapper("historicArenaMode") @OptionalValue("") @AllowNull GameModeConfig<String, SchematicType, String> arenaMode, @Mapper("arenaMap") @OptionalValue("") @AllowNull String map) {
+    public void historic(@Validator("arenaPlayer") PlayerChatter player, @Mapper("historicArenaMode") @OptionalValue("") @AllowNull GameModeConfig<String, String> arenaMode, @Mapper("arenaMap") @OptionalValue("") @AllowNull String map) {
         FightCommand.createArena(player, "/historic ", true, arenaMode, map, true, (p, mode, m) -> new ServerStarter().arena(mode, m).blueLeader(p.getPlayer()).callback(
                 arena -> Chatter.broadcast().system("HISTORIC_BROADCAST", new Message("HISTORIC_BROADCAST_HOVER", p), ClickEvent.runCommand("/arena " + arena.getServer().getName()), mode.GameName, p.getPlayer())
         ).start());
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/RankCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/RankCommand.java
index 128cf5ea..b0b3e944 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/RankCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/RankCommand.java
@@ -20,7 +20,7 @@
 package de.steamwar.velocitycore.commands;
 
 import de.steamwar.command.SWCommand;
-import de.steamwar.data.GameModeConfig;
+import de.steamwar.sql.GameModeConfig;
 import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.Message;
@@ -48,7 +48,7 @@ public class RankCommand extends SWCommand {
         if (!sender.user().equals(user))
             sender.prefixless("RANK_PLAYER_FOUND", user);
 
-        for(GameModeConfig<String, SchematicType, String> mode : ArenaMode.getAllModes()) {
+        for(GameModeConfig<String, String> mode : ArenaMode.getAllModes()) {
             if (!mode.Server.Ranked)
                 continue;
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/ReplayCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/ReplayCommand.java
index 72b12c4c..e4d8b3e0 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/ReplayCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/ReplayCommand.java
@@ -20,7 +20,7 @@
 package de.steamwar.velocitycore.commands;
 
 import de.steamwar.command.SWCommand;
-import de.steamwar.data.GameModeConfig;
+import de.steamwar.sql.GameModeConfig;
 import de.steamwar.linkage.EventMode;
 import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Message;
@@ -69,7 +69,7 @@ public class ReplayCommand extends SWCommand {
         if (PunishmentCommand.isPunishedWithMessage(sender, Punishment.PunishmentType.NoFightServer))
             return;
 
-        GameModeConfig<String, SchematicType, String> mode = ArenaMode.getBySchemType(fight.getSchemType());
+        GameModeConfig<String, String> mode = ArenaMode.getBySchemType(fight.getSchemType());
         ServerStarter starter = new ServerStarter().replay(fight.getFightID()).blueLeader(sender.getPlayer());
 
         String map = mode.getRandomMap();
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/TypeMappers.java b/VelocityCore/src/de/steamwar/velocitycore/commands/TypeMappers.java
index 001b2b61..94c7f085 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/TypeMappers.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/TypeMappers.java
@@ -23,7 +23,7 @@ import de.steamwar.command.PreviousArguments;
 import de.steamwar.command.SWCommandUtils;
 import de.steamwar.command.TypeMapper;
 import de.steamwar.command.TypeValidator;
-import de.steamwar.data.GameModeConfig;
+import de.steamwar.sql.GameModeConfig;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.PlayerChatter;
 import de.steamwar.sql.Punishment;
@@ -47,11 +47,11 @@ public class TypeMappers {
         return (sender, player, messageSender) -> !PunishmentCommand.isPunishedWithMessage(player, Punishment.PunishmentType.NoFightServer);
     }
 
-    private static TypeMapper<GameModeConfig<String, SchematicType, String>> arenaModeTypeMapper(boolean historic) {
+    private static TypeMapper<GameModeConfig<String, String>> arenaModeTypeMapper(boolean historic) {
         return new TypeMapper<>() {
             @Override
-            public GameModeConfig<String, SchematicType, String> map(Chatter sender, PreviousArguments previousArguments, String s) {
-                GameModeConfig<String, SchematicType, String> arenaMode = ArenaMode.getByChat(s);
+            public GameModeConfig<String, String> map(Chatter sender, PreviousArguments previousArguments, String s) {
+                GameModeConfig<String, String> arenaMode = ArenaMode.getByChat(s);
                 if (arenaMode == null) return null;
                 if (arenaMode.Server.Historic != historic) return null;
                 if (!arenaMode.isActive()) return null;
@@ -76,7 +76,7 @@ public class TypeMappers {
             @Override
             public Collection<String> tabCompletes(Chatter sender, PreviousArguments previousArguments, String s) {
                 if (previousArguments.userArgs.length == 0) return null;
-                GameModeConfig<String, SchematicType, String> arenaMode = ArenaMode.getByChat(previousArguments.userArgs[previousArguments.userArgs.length - 1]);
+                GameModeConfig<String, String> arenaMode = ArenaMode.getByChat(previousArguments.userArgs[previousArguments.userArgs.length - 1]);
                 if (arenaMode == null) return null;
                 return arenaMode.Server.Maps;
             }
diff --git a/VelocityCore/src/de/steamwar/velocitycore/listeners/ChatListener.java b/VelocityCore/src/de/steamwar/velocitycore/listeners/ChatListener.java
index 5b3ccff9..6b0c7059 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/listeners/ChatListener.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/listeners/ChatListener.java
@@ -29,7 +29,7 @@ import com.velocitypowered.api.proxy.ConsoleCommandSource;
 import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.ServerConnection;
 import com.velocitypowered.api.proxy.server.ServerInfo;
-import de.steamwar.data.GameModeConfig;
+import de.steamwar.sql.GameModeConfig;
 import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.ChatterGroup;
diff --git a/VelocityCore/src/de/steamwar/velocitycore/network/handlers/EloPlayerHandler.java b/VelocityCore/src/de/steamwar/velocitycore/network/handlers/EloPlayerHandler.java
index 69b13b22..df2bcca8 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/network/handlers/EloPlayerHandler.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/network/handlers/EloPlayerHandler.java
@@ -20,7 +20,7 @@
 package de.steamwar.velocitycore.network.handlers;
 
 import com.velocitypowered.api.proxy.Player;
-import de.steamwar.data.GameModeConfig;
+import de.steamwar.sql.GameModeConfig;
 import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
 import de.steamwar.network.packets.PacketHandler;
@@ -56,7 +56,7 @@ public class EloPlayerHandler extends PacketHandler {
     @Handler
     public void handle(FightEndsPacket fightEndsPacket) {
         SchematicType schematicType = SchematicType.fromDB(fightEndsPacket.getGameMode());
-        GameModeConfig<String, SchematicType, String> arenaMode;
+        GameModeConfig<String, String> arenaMode;
         if (schematicType == null) {
             arenaMode = ArenaMode.getByInternal(fightEndsPacket.getGameMode());
         } else {
diff --git a/VelocityCore/src/de/steamwar/velocitycore/network/handlers/EloSchemHandler.java b/VelocityCore/src/de/steamwar/velocitycore/network/handlers/EloSchemHandler.java
index 036a6b2d..cd291de7 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/network/handlers/EloSchemHandler.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/network/handlers/EloSchemHandler.java
@@ -19,7 +19,7 @@
 
 package de.steamwar.velocitycore.network.handlers;
 
-import de.steamwar.data.GameModeConfig;
+import de.steamwar.sql.GameModeConfig;
 import de.steamwar.linkage.Linked;
 import de.steamwar.network.packets.PacketHandler;
 import de.steamwar.network.packets.common.FightEndsPacket;
@@ -46,7 +46,7 @@ public class EloSchemHandler extends PacketHandler {
     public void handle(FightEndsPacket fightEndsPacket) {
         SchematicType type = SchematicType.fromDB(fightEndsPacket.getGameMode());
         if (type == null) return;
-        GameModeConfig<String, SchematicType, String> arenaMode = ArenaMode.getBySchemType(type);
+        GameModeConfig<String, String> arenaMode = ArenaMode.getBySchemType(type);
         if (!arenaMode.Server.Ranked) return;
 
         if (publicVsPrivate(fightEndsPacket))
diff --git a/VelocityCore/src/de/steamwar/velocitycore/network/handlers/PrepareSchemHandler.java b/VelocityCore/src/de/steamwar/velocitycore/network/handlers/PrepareSchemHandler.java
index da91ea50..e4c3c348 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/network/handlers/PrepareSchemHandler.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/network/handlers/PrepareSchemHandler.java
@@ -20,7 +20,7 @@
 package de.steamwar.velocitycore.network.handlers;
 
 import com.velocitypowered.api.proxy.Player;
-import de.steamwar.data.GameModeConfig;
+import de.steamwar.sql.GameModeConfig;
 import de.steamwar.linkage.Linked;
 import de.steamwar.network.packets.PacketHandler;
 import de.steamwar.network.packets.client.PrepareSchemPacket;
@@ -37,7 +37,7 @@ public class PrepareSchemHandler extends PacketHandler {
     public void handle(PrepareSchemPacket packet) {
         Player player = VelocityCore.getProxy().getPlayer(SteamwarUser.get(packet.getPlayer()).getUUID()).orElse(null);
         int schematicID = packet.getSchem();
-        GameModeConfig<String, SchematicType, String> mode = ArenaMode.getBySchemType(SchematicType.fromDB(packet.getSchemType()));
+        GameModeConfig<String, String> mode = ArenaMode.getBySchemType(SchematicType.fromDB(packet.getSchemType()));
 
         new ServerStarter().test(mode, mode.getRandomMap(), player).prepare(schematicID).start();
     }

From dfbeab7b90b53de061e983bff8bec4587627fc97 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sun, 26 Oct 2025 12:55:17 +0100
Subject: [PATCH 178/214] Add JavaDoc to GameModeConfig

---
 .../src/de/steamwar/sql/GameModeConfig.java   | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java b/CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java
index 942df6d1..071db180 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java
@@ -43,6 +43,9 @@ public final class GameModeConfig<M, W> {
     public final boolean loaded;
     public final File configFile;
 
+    /**
+     * Bundle for server specific configuration values
+     */
     public final ServerConfig Server;
 
     /**
@@ -58,8 +61,20 @@ public final class GameModeConfig<M, W> {
      * @implSpec Disables check schem type if missing
      */
     public final List<String> CheckQuestions;
+
+    /**
+     * Bundle for countdowns during the fight
+     */
     public final TimesConfig Times;
+
+    /**
+     * Bundle for arena specific configurations. Primarily used by the FightSystem
+     */
     public final ArenaConfig Arena;
+
+    /**
+     * Bundle for schematic configurations
+     */
     public final SchematicConfig<M> Schematic;
 
     /**
@@ -83,20 +98,40 @@ public final class GameModeConfig<M, W> {
      * @implSpec {@code +} by default
      */
     public final String TeamChatPrefix;
+
+    /**
+     * Bundle for configurations for the Blue team
+     */
     public final BlueConfig Blue;
+
+    /**
+     * Bundle for configurations for the Red team
+     */
     public final RedConfig Red;
 
     /**
      * The list of active win conditions
      */
     public final List<W> WinConditions;
+
+    /**
+     * Bundle for configurations used by the Winconditions in the FightSystem
+     */
     public final WinConditionParamsConfig<M> WinConditionParams;
+
+    /**
+     * Bundle for Kit specific configurations
+     */
     public final KitsConfig<M> Kits;
 
     /**
      * A list of integers containing the waiting time of this enter stage in the fight
      */
     public final List<Integer> EnterStages;
+
+    /**
+     * Bundle for Techhider configurations
+     */
     public final TechhiderConfig<M> Techhider;
 
     private static final Field Schematic_TypeField;

From 79ebdcea851f56a10124f512b187920af6a7e161 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sun, 26 Oct 2025 13:14:11 +0100
Subject: [PATCH 179/214] Make SchematicType static init type safe

---
 CommonCore/SQL/src/de/steamwar/sql/SQLWrapper.java       | 8 +++++---
 CommonCore/SQL/src/de/steamwar/sql/SchematicType.java    | 2 +-
 .../src/de/steamwar/sql/SQLWrapperImpl.java              | 9 ++++++++-
 VelocityCore/src/de/steamwar/sql/SQLWrapperImpl.java     | 9 +++++++--
 WebsiteBackend/src/de/steamwar/sql/SQLWrapperImpl.kt     | 8 ++++++--
 5 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/CommonCore/SQL/src/de/steamwar/sql/SQLWrapper.java b/CommonCore/SQL/src/de/steamwar/sql/SQLWrapper.java
index 0dbdde69..4fbe2541 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/SQLWrapper.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/SQLWrapper.java
@@ -23,12 +23,14 @@ import de.steamwar.ImplementationProvider;
 
 import java.io.File;
 
-public interface SQLWrapper {
-    SQLWrapper impl = ImplementationProvider.getImpl("de.steamwar.sql.SQLWrapperImpl");
+public interface SQLWrapper<M> {
+    SQLWrapper<?> impl = ImplementationProvider.getImpl("de.steamwar.sql.SQLWrapperImpl");
 
     File getSchemTypesFolder();
 
-    default void processSchematicType(GameModeConfig<String, String> gameModeConfig) {
+    GameModeConfig<M, String> loadGameModeConfig(File file);
+
+    default void processSchematicType(GameModeConfig<?, String> gameModeConfig) {
     }
 
     void additionalExceptionMetadata(StringBuilder builder);
diff --git a/CommonCore/SQL/src/de/steamwar/sql/SchematicType.java b/CommonCore/SQL/src/de/steamwar/sql/SchematicType.java
index 04af18ef..c0d61bb2 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/SchematicType.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/SchematicType.java
@@ -46,7 +46,7 @@ public class SchematicType {
         File folder = SQLWrapper.impl.getSchemTypesFolder();
         if (folder.exists()) {
             for (File configFile : Arrays.stream(folder.listFiles((file, name) -> name.endsWith(".yml") && !name.endsWith(".kits.yml"))).sorted().collect(Collectors.toList())) {
-                GameModeConfig<String, String> gameModeConfig = new GameModeConfig<>(configFile, GameModeConfig.ToString, GameModeConfig.ToString, GameModeConfig.ToStaticWarGear);
+                GameModeConfig<?, String> gameModeConfig = SQLWrapper.impl.loadGameModeConfig(configFile);
                 if (gameModeConfig.Schematic.Type == null) continue;
                 if (tmpFromDB.containsKey(gameModeConfig.Schematic.Type.toDB())) continue;
                 SchematicType current = gameModeConfig.Schematic.Type;
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/sql/SQLWrapperImpl.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/sql/SQLWrapperImpl.java
index daf33a15..1aa3f7f5 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/sql/SQLWrapperImpl.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/sql/SQLWrapperImpl.java
@@ -20,19 +20,26 @@
 package de.steamwar.sql;
 
 import de.steamwar.core.Core;
+import de.steamwar.data.GameModeConfigUtils;
 import org.bukkit.Bukkit;
+import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.entity.Player;
 
 import java.io.File;
 
-public class SQLWrapperImpl implements SQLWrapper {
+public class SQLWrapperImpl implements SQLWrapper<Material> {
 
     @Override
     public File getSchemTypesFolder() {
         return new File(Core.getInstance().getDataFolder().getParentFile(), "FightSystem");
     }
 
+    @Override
+    public GameModeConfig<Material, String> loadGameModeConfig(File file) {
+        return new GameModeConfig<>(file, GameModeConfigUtils.ToMaterial, GameModeConfig.ToString, GameModeConfig.ToStaticWarGear);
+    }
+
     private static final String SERVER_VERSION = Bukkit.getServer().getVersion();
 
     @Override
diff --git a/VelocityCore/src/de/steamwar/sql/SQLWrapperImpl.java b/VelocityCore/src/de/steamwar/sql/SQLWrapperImpl.java
index 1868fd9f..3ad15026 100644
--- a/VelocityCore/src/de/steamwar/sql/SQLWrapperImpl.java
+++ b/VelocityCore/src/de/steamwar/sql/SQLWrapperImpl.java
@@ -26,7 +26,7 @@ import de.steamwar.velocitycore.commands.CheckCommand;
 
 import java.io.File;
 
-public class SQLWrapperImpl implements SQLWrapper {
+public class SQLWrapperImpl implements SQLWrapper<String> {
 
     @Override
     public File getSchemTypesFolder() {
@@ -34,7 +34,12 @@ public class SQLWrapperImpl implements SQLWrapper {
     }
 
     @Override
-    public void processSchematicType(GameModeConfig<String, String> gameModeConfig) {
+    public GameModeConfig<String, String> loadGameModeConfig(File file) {
+        return new GameModeConfig<>(file, GameModeConfig.ToString, GameModeConfig.ToString, GameModeConfig.ToInternalName);
+    }
+
+    @Override
+    public void processSchematicType(GameModeConfig<?, String> gameModeConfig) {
         SchematicType type = gameModeConfig.Schematic.Type;
         if (type.checkType() != null) {
             CheckCommand.setCheckQuestions(type.checkType(), gameModeConfig.CheckQuestions);
diff --git a/WebsiteBackend/src/de/steamwar/sql/SQLWrapperImpl.kt b/WebsiteBackend/src/de/steamwar/sql/SQLWrapperImpl.kt
index be7ef20b..be41c8ab 100644
--- a/WebsiteBackend/src/de/steamwar/sql/SQLWrapperImpl.kt
+++ b/WebsiteBackend/src/de/steamwar/sql/SQLWrapperImpl.kt
@@ -21,11 +21,15 @@ package de.steamwar.sql
 
 import java.io.File
 
-class SQLWrapperImpl: SQLWrapper {
-    override fun getSchemTypesFolder(): File? {
+class SQLWrapperImpl: SQLWrapper<String> {
+    override fun getSchemTypesFolder(): File {
         return File("/configs/GameModes")
     }
 
+    override fun loadGameModeConfig(file: File): GameModeConfig<String, String> {
+        return GameModeConfig(file, GameModeConfig.ToString, GameModeConfig.ToString, GameModeConfig.ToStaticWarGear)
+    }
+
     override fun additionalExceptionMetadata(builder: StringBuilder) {
         builder.append("\n\nWebsiteApi")
     }

From 5ab04d051873747d3f8a1b4a7e9834e519567caf Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sun, 26 Oct 2025 13:34:25 +0100
Subject: [PATCH 180/214] Add cache for GameModeConfig

---
 .../region/fixed/FixedGlobalRegion.java       |  7 +--
 .../bausystem/region/fixed/FixedRegion.java   |  9 ++--
 .../src/de/steamwar/sql/GameModeConfig.java   | 46 ++++++++++++++++++-
 .../src/de/steamwar/fightsystem/Config.java   |  2 +-
 .../schematicsystem/SchematicSystem.java      | 26 ++---------
 .../src/de/steamwar/sql/SQLWrapperImpl.java   |  2 +-
 .../src/de/steamwar/sql/SQLWrapperImpl.java   |  2 +-
 .../de/steamwar/velocitycore/ArenaMode.java   |  2 +-
 .../src/de/steamwar/sql/SQLWrapperImpl.kt     |  2 +-
 9 files changed, 61 insertions(+), 37 deletions(-)

diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalRegion.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalRegion.java
index cac519e0..b5da64f5 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalRegion.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalRegion.java
@@ -22,7 +22,6 @@ package de.steamwar.bausystem.region.fixed;
 import com.sk89q.worldedit.extent.clipboard.Clipboard;
 import de.steamwar.bausystem.region.*;
 import de.steamwar.bausystem.utils.PasteBuilder;
-import de.steamwar.data.GameModeConfigUtils;
 import de.steamwar.sql.GameModeConfig;
 import lombok.NonNull;
 import lombok.Setter;
@@ -93,8 +92,6 @@ public final class FixedGlobalRegion implements Region {
         }
     };
 
-    private static final GameModeConfig<Material, String> GLOBAL_CONFIG = new GameModeConfig<>(null, GameModeConfigUtils.ToMaterial, GameModeConfig.ToString, GameModeConfig.ToStaticWarGear);
-
     private FixedGlobalRegion() {
     }
 
@@ -129,8 +126,8 @@ public final class FixedGlobalRegion implements Region {
     }
 
     @Override
-    public @NonNull GameModeConfig getGameModeConfig() {
-        return GLOBAL_CONFIG;
+    public @NonNull GameModeConfig<Material, String> getGameModeConfig() {
+        return GameModeConfig.getDefaults();
     }
 
     @Override
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java
index ce48b5b6..0d8c03f5 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java
@@ -28,7 +28,6 @@ import de.steamwar.bausystem.utils.FlatteningWrapper;
 import de.steamwar.bausystem.utils.PasteBuilder;
 import de.steamwar.bausystem.worlddata.WorldData;
 import de.steamwar.core.Core;
-import de.steamwar.data.GameModeConfigUtils;
 import de.steamwar.sql.GameModeConfig;
 import de.steamwar.sql.SchematicType;
 import lombok.NonNull;
@@ -339,7 +338,11 @@ public class FixedRegion implements Region {
                 break;
             }
         }
-        this.gameModeConfig = new GameModeConfig<>(found, GameModeConfigUtils.ToMaterial, GameModeConfig.ToString, GameModeConfig.ToStaticWarGear);
+        if (found == null) {
+            this.gameModeConfig = GameModeConfig.getDefaults();
+        } else {
+            this.gameModeConfig = GameModeConfig.getByFileName(found);
+        }
         this.regionData = new RegionData.RegionDataImpl(regionData, WorldData::write);
     }
 
@@ -374,7 +377,7 @@ public class FixedRegion implements Region {
     }
 
     @Override
-    public @NonNull GameModeConfig getGameModeConfig() {
+    public @NonNull GameModeConfig<Material, String> getGameModeConfig() {
         return gameModeConfig;
     }
 
diff --git a/CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java b/CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java
index 071db180..2bef6599 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java
@@ -34,6 +34,28 @@ import java.util.stream.Collectors;
 @ToString
 public final class GameModeConfig<M, W> {
 
+    private static final Map<String, GameModeConfig<?, String>> byFileName = new HashMap<>();
+    private static final Map<String, GameModeConfig<?, String>> byGameName = new HashMap<>();
+    private static final Map<SchematicType, GameModeConfig<?, String>> bySchematicType = new HashMap<>();
+
+    public static <M> GameModeConfig<M, String> getByFileName(File file) {
+        return (GameModeConfig<M, String>) byFileName.get(file.getName());
+    }
+
+    public static <M> GameModeConfig<M, String> getByGameName(String gameName) {
+        return (GameModeConfig<M, String>) byGameName.get(gameName);
+    }
+
+    public static <M> GameModeConfig<M, String> getBySchematicType(SchematicType schematicType) {
+        return (GameModeConfig<M, String>) bySchematicType.get(schematicType);
+    }
+
+    private static final GameModeConfig<?, String> DEFAULTS = SQLWrapper.impl.loadGameModeConfig(null);
+
+    public static <M> GameModeConfig<M, String> getDefaults() {
+        return (GameModeConfig<M, String>) DEFAULTS;
+    }
+
     public static final Function<String, String> ToString = Function.identity();
     public static final Function<File, String> ToStaticWarGear = __ -> "WarGear";
     public static final Function<File, String> ToInternalName = file -> file.getName().replace(".yml", "");
@@ -145,7 +167,7 @@ public final class GameModeConfig<M, W> {
         }
     }
 
-    public GameModeConfig(File file, Function<String, M> materialMapper, Function<String, W> winconditionMapper, Function<File, String> defaultGameName) {
+    public GameModeConfig(File file, Function<String, M> materialMapper, Function<String, W> winconditionMapper, Function<File, String> defaultGameName, boolean cacheInstance) {
         YMLWrapper<M, W> loader = new YMLWrapper<>(file, materialMapper, winconditionMapper);
 
         configFile = file;
@@ -182,7 +204,20 @@ public final class GameModeConfig<M, W> {
 
         Arena = new ArenaConfig(loader.with("Arena"), Schematic.Size, EnterStages);
 
-        if (Schematic.Type != null) return;
+        if (cacheInstance) {
+            byFileName.put(configFile.getName(), (GameModeConfig) this);
+            byGameName.put(GameName, (GameModeConfig) this);
+        }
+
+        if (Schematic.Type != null) {
+            if (cacheInstance) {
+                bySchematicType.put(Schematic.Type, (GameModeConfig) this);
+                if (Schematic.Type.checkType() != null) {
+                    bySchematicType.put(Schematic.Type.checkType(), (GameModeConfig) this);
+                }
+            }
+            return;
+        }
         if (!Schematic.loaded) return;
         String Schematic_Type = loader.with("Schematic").getString("Type", "Normal");
         if (Schematic_Type.equals("Normal")) return;
@@ -197,6 +232,13 @@ public final class GameModeConfig<M, W> {
         SchematicType current = new SchematicType(Schematic_Type, Schematic_Shortcut, Server.loaded ? SchematicType.Type.FIGHT_TYPE : SchematicType.Type.NORMAL, checktype, material, Deadline, Schematic.ManualCheck);
         try {
             Schematic_TypeField.set(Schematic, current);
+
+            if (cacheInstance) {
+                bySchematicType.put(Schematic.Type, (GameModeConfig) this);
+                if (Schematic.Type.checkType() != null) {
+                    bySchematicType.put(Schematic.Type.checkType(), (GameModeConfig) this);
+                }
+            }
         } catch (IllegalAccessException e) {
             throw new SecurityException(e.getMessage(), e);
         }
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/Config.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/Config.java
index 3b8d2378..a5c89bca 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/Config.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/Config.java
@@ -109,7 +109,7 @@ public class Config {
             Bukkit.getLogger().log(Level.SEVERE, "Arenaconfig fehlt!");
             Bukkit.shutdown();
         }
-        GameModeConfig = new GameModeConfig<>(new File(FightSystem.getPlugin().getDataFolder(), configFile), GameModeConfigUtils.ToMaterial, Winconditions::valueOf, de.steamwar.sql.GameModeConfig.ToStaticWarGear);
+        GameModeConfig = new GameModeConfig<>(new File(FightSystem.getPlugin().getDataFolder(), configFile), GameModeConfigUtils.ToMaterial, Winconditions::valueOf, de.steamwar.sql.GameModeConfig.ToStaticWarGear, false);
 
         File worldConfigFile = new File(world.getWorldFolder(), "config.yml");
         if(!worldConfigFile.exists()) {
diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/SchematicSystem.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/SchematicSystem.java
index b75ddbdf..3687a52b 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/SchematicSystem.java
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/SchematicSystem.java
@@ -19,48 +19,30 @@
 
 package de.steamwar.schematicsystem;
 
-import de.steamwar.sql.GameModeConfig;
-import de.steamwar.data.GameModeConfigUtils;
 import de.steamwar.linkage.AbstractLinker;
 import de.steamwar.linkage.SpigotLinker;
 import de.steamwar.message.Message;
+import de.steamwar.sql.GameModeConfig;
 import de.steamwar.sql.SchematicType;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.plugin.java.JavaPlugin;
 
-import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
-
 public class SchematicSystem extends JavaPlugin {
     public static final Message MESSAGE = new Message("SchematicSystem", SchematicSystem.class.getClassLoader());
 
     private static SchematicSystem instance;
 
-    private static final Map<SchematicType, GameModeConfig<Material, String>> types = new HashMap<>();
-
     public static GameModeConfig<Material, String> getGameModeConfig(SchematicType type){
-        return types.get(type);
+        GameModeConfig<Material, String> gameModeConfig = GameModeConfig.getBySchematicType(type);
+        if (gameModeConfig.CheckQuestions.isEmpty() && gameModeConfig.Schematic.ManualCheck) return null;
+        return gameModeConfig;
     }
 
     @Override
     public void onEnable() {
         instance = this;
 
-        File folder = new File(this.getDataFolder().getParentFile(), "FightSystem");
-        if(folder.exists()) {
-            for(File configFile : folder.listFiles((file, name) -> name.endsWith(".yml") && !name.endsWith(".kits.yml"))) {
-                GameModeConfig<Material, String> gameModeConfig = new GameModeConfig<>(configFile, GameModeConfigUtils.ToMaterial, GameModeConfig.ToString, GameModeConfig.ToStaticWarGear);
-                if (gameModeConfig.CheckQuestions.isEmpty() && gameModeConfig.Schematic.ManualCheck)
-                    continue;
-                types.put(gameModeConfig.Schematic.Type, gameModeConfig);
-                if (gameModeConfig.Schematic.Type.checkType() != null) {
-                    types.put(gameModeConfig.Schematic.Type.checkType(), gameModeConfig);
-                }
-            }
-        }
-
         SpigotLinker spigotLinker = new SpigotLinker(this, MESSAGE);
         try {
             spigotLinker.link();
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/sql/SQLWrapperImpl.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/sql/SQLWrapperImpl.java
index 1aa3f7f5..39e2cef6 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/sql/SQLWrapperImpl.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/sql/SQLWrapperImpl.java
@@ -37,7 +37,7 @@ public class SQLWrapperImpl implements SQLWrapper<Material> {
 
     @Override
     public GameModeConfig<Material, String> loadGameModeConfig(File file) {
-        return new GameModeConfig<>(file, GameModeConfigUtils.ToMaterial, GameModeConfig.ToString, GameModeConfig.ToStaticWarGear);
+        return new GameModeConfig<>(file, GameModeConfigUtils.ToMaterial, GameModeConfig.ToString, GameModeConfig.ToStaticWarGear, true);
     }
 
     private static final String SERVER_VERSION = Bukkit.getServer().getVersion();
diff --git a/VelocityCore/src/de/steamwar/sql/SQLWrapperImpl.java b/VelocityCore/src/de/steamwar/sql/SQLWrapperImpl.java
index 3ad15026..8e469d20 100644
--- a/VelocityCore/src/de/steamwar/sql/SQLWrapperImpl.java
+++ b/VelocityCore/src/de/steamwar/sql/SQLWrapperImpl.java
@@ -35,7 +35,7 @@ public class SQLWrapperImpl implements SQLWrapper<String> {
 
     @Override
     public GameModeConfig<String, String> loadGameModeConfig(File file) {
-        return new GameModeConfig<>(file, GameModeConfig.ToString, GameModeConfig.ToString, GameModeConfig.ToInternalName);
+        return new GameModeConfig<>(file, GameModeConfig.ToString, GameModeConfig.ToString, GameModeConfig.ToInternalName, true);
     }
 
     @Override
diff --git a/VelocityCore/src/de/steamwar/velocitycore/ArenaMode.java b/VelocityCore/src/de/steamwar/velocitycore/ArenaMode.java
index 9707bdd9..87e2bf92 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/ArenaMode.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/ArenaMode.java
@@ -51,7 +51,7 @@ public class ArenaMode {
             return;
 
         for(File file : Arrays.stream(folder.listFiles((file, name) -> name.endsWith(".yml") && !name.endsWith(".kits.yml"))).sorted().toList()) {
-            GameModeConfig<String, String> gameModeConfig = new GameModeConfig<>(file, GameModeConfig.ToString, GameModeConfig.ToString, GameModeConfig.ToInternalName);
+            GameModeConfig<String, String> gameModeConfig = new GameModeConfig<>(file, GameModeConfig.ToString, GameModeConfig.ToString, GameModeConfig.ToInternalName, false);
             if (!gameModeConfig.Server.loaded) continue;
 
             allModes.add(gameModeConfig);
diff --git a/WebsiteBackend/src/de/steamwar/sql/SQLWrapperImpl.kt b/WebsiteBackend/src/de/steamwar/sql/SQLWrapperImpl.kt
index be41c8ab..0e843c25 100644
--- a/WebsiteBackend/src/de/steamwar/sql/SQLWrapperImpl.kt
+++ b/WebsiteBackend/src/de/steamwar/sql/SQLWrapperImpl.kt
@@ -27,7 +27,7 @@ class SQLWrapperImpl: SQLWrapper<String> {
     }
 
     override fun loadGameModeConfig(file: File): GameModeConfig<String, String> {
-        return GameModeConfig(file, GameModeConfig.ToString, GameModeConfig.ToString, GameModeConfig.ToStaticWarGear)
+        return GameModeConfig(file, GameModeConfig.ToString, GameModeConfig.ToString, GameModeConfig.ToStaticWarGear, true)
     }
 
     override fun additionalExceptionMetadata(builder: StringBuilder) {

From dd711be30b87897e57d35227a383f2ed0f3ab624 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sun, 26 Oct 2025 13:40:17 +0100
Subject: [PATCH 181/214] Add cache for GameModeConfig

---
 .../src/de/steamwar/sql/GameModeConfig.java   | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java b/CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java
index 2bef6599..305edbaa 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java
@@ -34,6 +34,16 @@ import java.util.stream.Collectors;
 @ToString
 public final class GameModeConfig<M, W> {
 
+    public static final Function<String, String> ToString = Function.identity();
+    public static final Function<File, String> ToStaticWarGear = __ -> "WarGear";
+    public static final Function<File, String> ToInternalName = file -> file.getName().replace(".yml", "");
+    public static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("dd.MM.yyyy HH:mm");
+    private static final Random random = new Random();
+
+    static {
+        SchematicType.values();
+    }
+
     private static final Map<String, GameModeConfig<?, String>> byFileName = new HashMap<>();
     private static final Map<String, GameModeConfig<?, String>> byGameName = new HashMap<>();
     private static final Map<SchematicType, GameModeConfig<?, String>> bySchematicType = new HashMap<>();
@@ -56,12 +66,6 @@ public final class GameModeConfig<M, W> {
         return (GameModeConfig<M, String>) DEFAULTS;
     }
 
-    public static final Function<String, String> ToString = Function.identity();
-    public static final Function<File, String> ToStaticWarGear = __ -> "WarGear";
-    public static final Function<File, String> ToInternalName = file -> file.getName().replace(".yml", "");
-    public static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("dd.MM.yyyy HH:mm");
-    private static final Random random = new Random();
-
     public final boolean loaded;
     public final File configFile;
 
@@ -205,7 +209,9 @@ public final class GameModeConfig<M, W> {
         Arena = new ArenaConfig(loader.with("Arena"), Schematic.Size, EnterStages);
 
         if (cacheInstance) {
-            byFileName.put(configFile.getName(), (GameModeConfig) this);
+            if (configFile != null) {
+                byFileName.put(configFile.getName(), (GameModeConfig) this);
+            }
             byGameName.put(GameName, (GameModeConfig) this);
         }
 

From b3b7b5e601f90293d711915a2c6ecf468602a40e Mon Sep 17 00:00:00 2001
From: PhiRobot <psirobot@web.de>
Date: Sun, 26 Oct 2025 12:50:44 +0000
Subject: [PATCH 182/214] Add TLS Feature

---
 .../BauSystem_Main/src/BauSystem.properties   |   7 +-
 .../features/tntlistener/TLSCommand.java      |  39 +++++
 .../features/tntlistener/TLSListener.java     | 162 ++++++++++++++++++
 .../tntlistener/TLSScoreboardElement.java     |  46 +++++
 4 files changed, 253 insertions(+), 1 deletion(-)
 create mode 100644 BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tntlistener/TLSCommand.java
 create mode 100644 BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tntlistener/TLSListener.java
 create mode 100644 BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tntlistener/TLSScoreboardElement.java

diff --git a/BauSystem/BauSystem_Main/src/BauSystem.properties b/BauSystem/BauSystem_Main/src/BauSystem.properties
index aea72646..e8b74647 100644
--- a/BauSystem/BauSystem_Main/src/BauSystem.properties
+++ b/BauSystem/BauSystem_Main/src/BauSystem.properties
@@ -1027,4 +1027,9 @@ XRAY_OFF=§cXray deactivated
 COLORREPLACE_HELP=§8//§ecolorreplace §8[§7color§8] §8[§7color§8] §8- §7Replace all blocks of one color with another
 TYPEREPLACE_HELP=§8//§etypereplace §8[§7type§8] §8[§7type§8] §8- §7Replace all blocks of one type with another
 # Schematic
-SCHEMATIC_GUI_ITEM=§eSchematics
\ No newline at end of file
+SCHEMATIC_GUI_ITEM=§eSchematics
+# TNTListener
+TLS_MESSAGE_79=§7TLS§8> §7Tick §e{0}§8: §e{1} §7TNT
+TLS_MESSAGE_80=§7TLS§8> §7Tick §e{0}§8: §e{1} §7TNT §8(§e{2} §7with Fuse 80§8)
+TLS_START_HELP=§7Start the TNT Listener
+TLS_STOP_HELP=§7Stop the TNT Listener
\ No newline at end of file
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tntlistener/TLSCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tntlistener/TLSCommand.java
new file mode 100644
index 00000000..9336ea39
--- /dev/null
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tntlistener/TLSCommand.java
@@ -0,0 +1,39 @@
+/*
+ *   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.tntlistener;
+
+import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
+import org.bukkit.entity.Player;
+
+@Linked
+public class TLSCommand extends SWCommand {
+    public TLSCommand() { super("tntlistener", "tls"); }
+
+    @Register(value = "start", description = "TLS_START_HELP")
+    public void start(@Validator Player player) {
+        TLSListener.instance.startListening(player);
+    }
+
+    @Register(value = "stop", description = "TLS_STOP_HELP")
+    public void stop(@Validator Player player) {
+        TLSListener.instance.stopListening(player);
+    }
+}
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tntlistener/TLSListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tntlistener/TLSListener.java
new file mode 100644
index 00000000..806fec7f
--- /dev/null
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tntlistener/TLSListener.java
@@ -0,0 +1,162 @@
+/*
+ *   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.tntlistener;
+
+import de.steamwar.bausystem.features.tpslimit.TPSUtils;
+import de.steamwar.bausystem.BauSystem;
+import de.steamwar.bausystem.region.Region;
+import de.steamwar.linkage.Linked;
+import de.steamwar.linkage.LinkedInstance;
+import org.bukkit.entity.TNTPrimed;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.entity.EntitySpawnEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
+import org.bukkit.scheduler.BukkitRunnable;
+import org.bukkit.entity.Player;
+
+import java.util.*;
+
+@Linked
+public class TLSListener implements Listener {
+
+    @LinkedInstance
+    BauSystem bauSystem;
+
+    /**
+     * Expose an instance to the TLS Command so it can access it
+     */
+    @LinkedInstance
+    public static TLSListener instance;
+
+    private final Map<Region, List<TNTPrimed>> primedTNT = new HashMap<>();
+
+    private final Map<Region, Boolean> regionSheduled = new HashMap<>();
+
+    private final Map<Region, Long> regionReferenceTick = new HashMap<>();
+
+    private final List<Player> listeningPlayers = new ArrayList<>();
+
+    private boolean listening = false;
+
+    private final long maxDelay = 120;
+
+    @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
+    public void onTNTSpawn(EntitySpawnEvent event) {
+        if (!(event.getEntity() instanceof TNTPrimed tnt)) return;
+        if (!(listening)) return;
+
+        Region eventRegion = Region.getRegion(event.getLocation());
+
+        // Add tnt to the list
+        if (!primedTNT.containsKey(eventRegion)) {
+            primedTNT.put(eventRegion, new ArrayList<>());
+        }
+        primedTNT.get(eventRegion).add(tnt);
+
+        // Update the realtiveTick
+        long currentTick = TPSUtils.currentRealTick.get();
+
+        long referenceTick = regionReferenceTick.getOrDefault(eventRegion, 0L);
+        if (currentTick - referenceTick > maxDelay) {
+            referenceTick = currentTick;
+            regionReferenceTick.put(eventRegion, referenceTick);
+        }
+        long relativeTick = currentTick - referenceTick;
+
+        this.messageNextTick(eventRegion, relativeTick);
+    }
+
+    public void messageNextTick(Region region, long relativeTick) {
+        /*
+         * Some TNT can be spawned so late in the gt, that they do not get processed,
+         * essentially lengthening their fuse by 1gt. To detect this, shedule the
+         * message at the start of the next (server side) gt. If the tnt got processed it has a
+         * Fuse of 79, else 80.
+         */
+
+        if (regionSheduled.getOrDefault(region, false)) {
+            return;
+        }
+        regionSheduled.put(region, true);
+
+        new BukkitRunnable() {
+            @Override
+            public void run() {
+
+                regionSheduled.remove(region);
+
+                int primed80 = 0;
+                int primed79 = 0;
+                //tntFuse79.put(region, 0);
+                //tntFuse80.put(region, 0);
+                for (TNTPrimed tnt : primedTNT.get(region)) {
+                    if (tnt.getFuseTicks() == 80) {
+                        primed80++;
+                        //tntFuse80.put(region, tntFuse80.getOrDefault(region, 0) + 1);
+                    } else if (tnt.getFuseTicks() == 79) {
+                        primed79++;
+                        //tntFuse79.getOrDefault(region, tntFuse79.getOrDefault(region, 0) + 1);
+                    }
+                }
+                //primedTNT.get(region).removeIf(t -> t.getFuseTicks() <= 78 || t.isDead());
+                primedTNT.get(region).clear();
+
+                /*
+                 * Message the player, if there are tnt with Fuse 80 use special message
+                 */
+                for (Player p : listeningPlayers) {
+                    if (region.getArea().inRegion(p.getLocation(), false)) {
+                        if (primed80 > 0) {
+                            // Foreach throws IDE errors: variables in lambda expressions should be final
+                            //p.sendMessage(String.format("§7TLS§8> §7Tick §e%d§8: §e%d §7TNT §8(§e%d §7with Fuse 80§8)", relativeTick, primed79 + primed80, primed80));
+                            BauSystem.MESSAGE.sendPrefixless("TLS_MESSAGE_80", p, relativeTick, primed79 + primed80, primed80);
+                        } else {
+                            BauSystem.MESSAGE.sendPrefixless("TLS_MESSAGE_79", p, relativeTick, primed79);
+                            //p.sendMessage(String.format("§7TLS§8> §7Tick §e%d§8: §e%d §7TNT", relativeTick, primed79));
+                        }
+                    }
+                }
+            }
+        }.runTaskLater(bauSystem.getInstance(), 1);
+    }
+
+    @EventHandler
+    public void onPlayerQuit(PlayerQuitEvent event) {
+        listeningPlayers.remove(event.getPlayer());
+    }
+
+    public void startListening(Player player) {
+        this.listening = true;
+        listeningPlayers.add(player);
+    }
+
+    public void stopListening(Player player) {
+        listeningPlayers.remove(player);
+        if (listeningPlayers.toArray().length == 0) {
+            this.listening = false;
+        }
+    }
+
+    public boolean isActiveFor(Player player) {
+        return listeningPlayers.contains(player);
+    }
+}
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tntlistener/TLSScoreboardElement.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tntlistener/TLSScoreboardElement.java
new file mode 100644
index 00000000..61f842e5
--- /dev/null
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tntlistener/TLSScoreboardElement.java
@@ -0,0 +1,46 @@
+/*
+ *   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.tntlistener;
+
+import de.steamwar.linkage.Linked;
+import de.steamwar.bausystem.Permission;
+import de.steamwar.bausystem.region.Region;
+import de.steamwar.bausystem.utils.ScoreboardElement;
+import org.bukkit.entity.Player;
+
+@Linked
+public class TLSScoreboardElement implements ScoreboardElement {
+
+    @Override
+    public ScoreboardGroup getGroup() { return ScoreboardGroup.OTHER; }
+
+    @Override
+    public int order() { return 2; }
+
+    @Override
+    public String get(Region region, Player p) {
+        if (!Permission.BUILD.hasPermission(p)) return null;
+        if (TLSListener.instance.isActiveFor(p)) {
+            return "§e" + "TLS" + "§8: " + "§aon";
+        } else {
+            return null;
+        }
+    }
+}

From 3b87a18a5f574be37316f2008c1e2665d7e05325 Mon Sep 17 00:00:00 2001
From: PhiRobot <psirobot@web.de>
Date: Sun, 26 Oct 2025 13:03:00 +0000
Subject: [PATCH 183/214] Modified Format of the TLS Message

---
 BauSystem/BauSystem_Main/src/BauSystem.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/BauSystem/BauSystem_Main/src/BauSystem.properties b/BauSystem/BauSystem_Main/src/BauSystem.properties
index e8b74647..e258d2e6 100644
--- a/BauSystem/BauSystem_Main/src/BauSystem.properties
+++ b/BauSystem/BauSystem_Main/src/BauSystem.properties
@@ -1029,7 +1029,7 @@ TYPEREPLACE_HELP=§8//§etypereplace §8[§7type§8] §8[§7type§8] §8- §7Rep
 # Schematic
 SCHEMATIC_GUI_ITEM=§eSchematics
 # TNTListener
-TLS_MESSAGE_79=§7TLS§8> §7Tick §e{0}§8: §e{1} §7TNT
-TLS_MESSAGE_80=§7TLS§8> §7Tick §e{0}§8: §e{1} §7TNT §8(§e{2} §7with Fuse 80§8)
+TLS_MESSAGE_79=§7TLS§8> §7Tick §e{0} §8- §7TNT §e{1}
+TLS_MESSAGE_80=§7TLS§8> §7Tick §e{0} §8- §7TNT §e{1} §8(§e{2} §7with Fuse 80§8)
 TLS_START_HELP=§7Start the TNT Listener
 TLS_STOP_HELP=§7Stop the TNT Listener
\ No newline at end of file

From 442ef71a17d5cbd78f3c045697cbb712304ff1ff Mon Sep 17 00:00:00 2001
From: PhiRobot <psirobot@web.de>
Date: Sun, 26 Oct 2025 14:22:20 +0000
Subject: [PATCH 184/214] Fix PR Comments

---
 .../BauSystem_Main/src/BauSystem.properties   |  5 +-
 .../src/BauSystem_de.properties               |  7 +-
 .../features/tntlistener/TLSCommand.java      | 13 ++-
 .../features/tntlistener/TLSListener.java     | 86 +++++++++++--------
 .../tntlistener/TLSScoreboardElement.java     | 21 +++--
 .../de/steamwar/linkage/AbstractLinker.java   |  2 +-
 6 files changed, 84 insertions(+), 50 deletions(-)

diff --git a/BauSystem/BauSystem_Main/src/BauSystem.properties b/BauSystem/BauSystem_Main/src/BauSystem.properties
index e258d2e6..432ac00a 100644
--- a/BauSystem/BauSystem_Main/src/BauSystem.properties
+++ b/BauSystem/BauSystem_Main/src/BauSystem.properties
@@ -1031,5 +1031,6 @@ SCHEMATIC_GUI_ITEM=§eSchematics
 # TNTListener
 TLS_MESSAGE_79=§7TLS§8> §7Tick §e{0} §8- §7TNT §e{1}
 TLS_MESSAGE_80=§7TLS§8> §7Tick §e{0} §8- §7TNT §e{1} §8(§e{2} §7with Fuse 80§8)
-TLS_START_HELP=§7Start the TNT Listener
-TLS_STOP_HELP=§7Stop the TNT Listener
\ No newline at end of file
+TLS_START_HELP=§8/§etls start §8: §7Start the TNT Listener
+TLS_STOP_HELP=§8/§etls stop §8: §7Stop the TNT Listener
+TLS_SCOREBOARD_ELEMENT=§eTLS§8: §aon
\ No newline at end of file
diff --git a/BauSystem/BauSystem_Main/src/BauSystem_de.properties b/BauSystem/BauSystem_Main/src/BauSystem_de.properties
index e96c9316..8e88f01f 100644
--- a/BauSystem/BauSystem_Main/src/BauSystem_de.properties
+++ b/BauSystem/BauSystem_Main/src/BauSystem_de.properties
@@ -959,4 +959,9 @@ XRAY_OFF=§cXray deaktiviert
 COLORREPLACE_HELP=§8//§ecolorreplace §8[§7color§8] §8[§7color§8] §8- §7Ersetzt eine Farbe mit einer anderen
 TYPEREPLACE_HELP=§8//§etyreplace §8[§7type§8] §8[§7type§8] §8- §7Ersetzt einen Blockgruppe mit einer anderen
 # Schematics
-SCHEMATIC_GUI_ITEM=§eSchematics
\ No newline at end of file
+SCHEMATIC_GUI_ITEM=§eSchematics
+TLS_MESSAGE_79=§7TLS§8> §7Tick §e{0} §8- §7TNT §e{1}
+TLS_MESSAGE_80=§7TLS§8> §7Tick §e{0} §8- §7TNT §e{1} §8(§e{2} §7mit Fuse 80§8)
+TLS_START_HELP=§8/§etls start §8: §7Starte den TNT Listener
+TLS_STOP_HELP=§8/§etls stop §8: §7Stope den TNT Listener
+TLS_SCOREBOARD_ELEMENT=§eTLS§8: §aan
\ No newline at end of file
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tntlistener/TLSCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tntlistener/TLSCommand.java
index 9336ea39..355803dc 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tntlistener/TLSCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tntlistener/TLSCommand.java
@@ -21,19 +21,26 @@ package de.steamwar.bausystem.features.tntlistener;
 
 import de.steamwar.command.SWCommand;
 import de.steamwar.linkage.Linked;
+import de.steamwar.linkage.LinkedInstance;
 import org.bukkit.entity.Player;
 
 @Linked
 public class TLSCommand extends SWCommand {
-    public TLSCommand() { super("tntlistener", "tls"); }
+
+    @LinkedInstance
+    private TLSListener listener;
+
+    public TLSCommand() {
+        super("tntlistener", "tls");
+    }
 
     @Register(value = "start", description = "TLS_START_HELP")
     public void start(@Validator Player player) {
-        TLSListener.instance.startListening(player);
+        listener.startListening(player);
     }
 
     @Register(value = "stop", description = "TLS_STOP_HELP")
     public void stop(@Validator Player player) {
-        TLSListener.instance.stopListening(player);
+        listener.stopListening(player);
     }
 }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tntlistener/TLSListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tntlistener/TLSListener.java
index 806fec7f..17952e1d 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tntlistener/TLSListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tntlistener/TLSListener.java
@@ -19,19 +19,18 @@
 
 package de.steamwar.bausystem.features.tntlistener;
 
-import de.steamwar.bausystem.features.tpslimit.TPSUtils;
 import de.steamwar.bausystem.BauSystem;
+import de.steamwar.bausystem.features.tpslimit.TPSUtils;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.linkage.Linked;
 import de.steamwar.linkage.LinkedInstance;
+import org.bukkit.Bukkit;
+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;
 import org.bukkit.event.entity.EntitySpawnEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
-import org.bukkit.scheduler.BukkitRunnable;
-import org.bukkit.entity.Player;
 
 import java.util.*;
 
@@ -39,38 +38,30 @@ import java.util.*;
 public class TLSListener implements Listener {
 
     @LinkedInstance
-    BauSystem bauSystem;
-
-    /**
-     * Expose an instance to the TLS Command so it can access it
-     */
-    @LinkedInstance
-    public static TLSListener instance;
+    private BauSystem bauSystem;
 
     private final Map<Region, List<TNTPrimed>> primedTNT = new HashMap<>();
 
-    private final Map<Region, Boolean> regionSheduled = new HashMap<>();
+    private final Set<Region> regionSheduled = new HashSet<>();
 
     private final Map<Region, Long> regionReferenceTick = new HashMap<>();
 
-    private final List<Player> listeningPlayers = new ArrayList<>();
+    private final Set<Player> listeningPlayers = new HashSet<>();
 
     private boolean listening = false;
 
+    //TODO: Make adjustable per region
     private final long maxDelay = 120;
 
-    @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
+    @EventHandler(ignoreCancelled = true)
     public void onTNTSpawn(EntitySpawnEvent event) {
         if (!(event.getEntity() instanceof TNTPrimed tnt)) return;
-        if (!(listening)) return;
+        if (!listening) return;
 
         Region eventRegion = Region.getRegion(event.getLocation());
 
         // Add tnt to the list
-        if (!primedTNT.containsKey(eventRegion)) {
-            primedTNT.put(eventRegion, new ArrayList<>());
-        }
-        primedTNT.get(eventRegion).add(tnt);
+        primedTNT.computeIfAbsent(eventRegion, rg -> new ArrayList<>()).add(tnt);
 
         // Update the realtiveTick
         long currentTick = TPSUtils.currentRealTick.get();
@@ -93,11 +84,13 @@ public class TLSListener implements Listener {
          * Fuse of 79, else 80.
          */
 
-        if (regionSheduled.getOrDefault(region, false)) {
+        if (!regionSheduled.add(region)) {
             return;
         }
-        regionSheduled.put(region, true);
 
+        Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> messagePlayer(region, relativeTick), 1);
+
+        /*
         new BukkitRunnable() {
             @Override
             public void run() {
@@ -106,52 +99,71 @@ public class TLSListener implements Listener {
 
                 int primed80 = 0;
                 int primed79 = 0;
-                //tntFuse79.put(region, 0);
-                //tntFuse80.put(region, 0);
-                for (TNTPrimed tnt : primedTNT.get(region)) {
+                for (TNTPrimed tnt : primedTNT.getOrDefault(region, Collections.emptyList())) {
                     if (tnt.getFuseTicks() == 80) {
                         primed80++;
-                        //tntFuse80.put(region, tntFuse80.getOrDefault(region, 0) + 1);
                     } else if (tnt.getFuseTicks() == 79) {
                         primed79++;
-                        //tntFuse79.getOrDefault(region, tntFuse79.getOrDefault(region, 0) + 1);
                     }
                 }
-                //primedTNT.get(region).removeIf(t -> t.getFuseTicks() <= 78 || t.isDead());
-                primedTNT.get(region).clear();
+                primedTNT.remove(region);
 
-                /*
                  * Message the player, if there are tnt with Fuse 80 use special message
-                 */
                 for (Player p : listeningPlayers) {
                     if (region.getArea().inRegion(p.getLocation(), false)) {
                         if (primed80 > 0) {
-                            // Foreach throws IDE errors: variables in lambda expressions should be final
-                            //p.sendMessage(String.format("§7TLS§8> §7Tick §e%d§8: §e%d §7TNT §8(§e%d §7with Fuse 80§8)", relativeTick, primed79 + primed80, primed80));
                             BauSystem.MESSAGE.sendPrefixless("TLS_MESSAGE_80", p, relativeTick, primed79 + primed80, primed80);
                         } else {
                             BauSystem.MESSAGE.sendPrefixless("TLS_MESSAGE_79", p, relativeTick, primed79);
-                            //p.sendMessage(String.format("§7TLS§8> §7Tick §e%d§8: §e%d §7TNT", relativeTick, primed79));
                         }
                     }
                 }
             }
-        }.runTaskLater(bauSystem.getInstance(), 1);
+        }.runTaskLater(bauSystem.getInstance(), 1);*/
+    }
+
+    private void messagePlayer(Region region, long relativeTick) {
+
+        regionSheduled.remove(region);
+
+        int primed80 = 0;
+        int primed79 = 0;
+        for (TNTPrimed tnt : primedTNT.getOrDefault(region, Collections.emptyList())) {
+            if (tnt.getFuseTicks() == 80) {
+                primed80++;
+            } else if (tnt.getFuseTicks() == 79) {
+                primed79++;
+            }
+        }
+        primedTNT.remove(region);
+
+        /*
+         * Message the player, if there are tnt with Fuse 80 use special message
+         */
+        for (Player p : listeningPlayers) {
+            if (region.getArea().inRegion(p.getLocation(), false)) {
+                if (primed80 > 0) {
+                    BauSystem.MESSAGE.sendPrefixless("TLS_MESSAGE_80", p, relativeTick, primed79 + primed80, primed80);
+                } else {
+                    BauSystem.MESSAGE.sendPrefixless("TLS_MESSAGE_79", p, relativeTick, primed79);
+                }
+            }
+        }
     }
 
     @EventHandler
     public void onPlayerQuit(PlayerQuitEvent event) {
-        listeningPlayers.remove(event.getPlayer());
+        stopListening(event.getPlayer());
     }
 
     public void startListening(Player player) {
-        this.listening = true;
         listeningPlayers.add(player);
+        this.listening = true;
     }
 
     public void stopListening(Player player) {
         listeningPlayers.remove(player);
-        if (listeningPlayers.toArray().length == 0) {
+        if (listeningPlayers.isEmpty()) {
             this.listening = false;
         }
     }
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tntlistener/TLSScoreboardElement.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tntlistener/TLSScoreboardElement.java
index 61f842e5..0dec6609 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tntlistener/TLSScoreboardElement.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tntlistener/TLSScoreboardElement.java
@@ -19,26 +19,35 @@
 
 package de.steamwar.bausystem.features.tntlistener;
 
-import de.steamwar.linkage.Linked;
+import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.utils.ScoreboardElement;
+import de.steamwar.linkage.Linked;
+import de.steamwar.linkage.LinkedInstance;
 import org.bukkit.entity.Player;
 
 @Linked
 public class TLSScoreboardElement implements ScoreboardElement {
 
-    @Override
-    public ScoreboardGroup getGroup() { return ScoreboardGroup.OTHER; }
+    @LinkedInstance
+    private TLSListener listener;
 
     @Override
-    public int order() { return 2; }
+    public ScoreboardGroup getGroup() {
+        return ScoreboardGroup.OTHER;
+    }
+
+    @Override
+    public int order() {
+        return 2;
+    }
 
     @Override
     public String get(Region region, Player p) {
         if (!Permission.BUILD.hasPermission(p)) return null;
-        if (TLSListener.instance.isActiveFor(p)) {
-            return "§e" + "TLS" + "§8: " + "§aon";
+        if (listener.isActiveFor(p)) {
+            return BauSystem.MESSAGE.parse("TLS_SCOREBOARD_ELEMENT", p);
         } else {
             return null;
         }
diff --git a/CommonCore/Linkage/src/de/steamwar/linkage/AbstractLinker.java b/CommonCore/Linkage/src/de/steamwar/linkage/AbstractLinker.java
index 4f86602d..cf88d488 100644
--- a/CommonCore/Linkage/src/de/steamwar/linkage/AbstractLinker.java
+++ b/CommonCore/Linkage/src/de/steamwar/linkage/AbstractLinker.java
@@ -99,7 +99,7 @@ public abstract class AbstractLinker<T> {
 
         try {
             instances.forEach((clazz, o) -> {
-                for (Field field : clazz.getFields()) {
+                for (Field field : clazz.getDeclaredFields()) {
                     if (field.getAnnotation(LinkedInstance.class) != null) {
                         try {
                             field.setAccessible(true);

From ef75c35809a3a4481392da641b923b905a5f21c5 Mon Sep 17 00:00:00 2001
From: PhiRobot <psirobot@web.de>
Date: Sun, 26 Oct 2025 14:24:29 +0000
Subject: [PATCH 185/214] Remove unnecessary translation

---
 BauSystem/BauSystem_Main/src/BauSystem_de.properties | 1 -
 1 file changed, 1 deletion(-)

diff --git a/BauSystem/BauSystem_Main/src/BauSystem_de.properties b/BauSystem/BauSystem_Main/src/BauSystem_de.properties
index 8e88f01f..453b4079 100644
--- a/BauSystem/BauSystem_Main/src/BauSystem_de.properties
+++ b/BauSystem/BauSystem_Main/src/BauSystem_de.properties
@@ -960,7 +960,6 @@ COLORREPLACE_HELP=§8//§ecolorreplace §8[§7color§8] §8[§7color§8] §8- §
 TYPEREPLACE_HELP=§8//§etyreplace §8[§7type§8] §8[§7type§8] §8- §7Ersetzt einen Blockgruppe mit einer anderen
 # Schematics
 SCHEMATIC_GUI_ITEM=§eSchematics
-TLS_MESSAGE_79=§7TLS§8> §7Tick §e{0} §8- §7TNT §e{1}
 TLS_MESSAGE_80=§7TLS§8> §7Tick §e{0} §8- §7TNT §e{1} §8(§e{2} §7mit Fuse 80§8)
 TLS_START_HELP=§8/§etls start §8: §7Starte den TNT Listener
 TLS_STOP_HELP=§8/§etls stop §8: §7Stope den TNT Listener

From 57c8e3319a93f5a74bea0ec2110431593a954901 Mon Sep 17 00:00:00 2001
From: PhiRobot <psirobot@web.de>
Date: Sun, 26 Oct 2025 14:29:48 +0000
Subject: [PATCH 186/214] Remove dead code

---
 .../features/tntlistener/TLSListener.java     | 33 +------------------
 1 file changed, 1 insertion(+), 32 deletions(-)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tntlistener/TLSListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tntlistener/TLSListener.java
index 17952e1d..9b587d8f 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tntlistener/TLSListener.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tntlistener/TLSListener.java
@@ -63,7 +63,7 @@ public class TLSListener implements Listener {
         // Add tnt to the list
         primedTNT.computeIfAbsent(eventRegion, rg -> new ArrayList<>()).add(tnt);
 
-        // Update the realtiveTick
+        // Update the relativeTick
         long currentTick = TPSUtils.currentRealTick.get();
 
         long referenceTick = regionReferenceTick.getOrDefault(eventRegion, 0L);
@@ -89,37 +89,6 @@ public class TLSListener implements Listener {
         }
 
         Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> messagePlayer(region, relativeTick), 1);
-
-        /*
-        new BukkitRunnable() {
-            @Override
-            public void run() {
-
-                regionSheduled.remove(region);
-
-                int primed80 = 0;
-                int primed79 = 0;
-                for (TNTPrimed tnt : primedTNT.getOrDefault(region, Collections.emptyList())) {
-                    if (tnt.getFuseTicks() == 80) {
-                        primed80++;
-                    } else if (tnt.getFuseTicks() == 79) {
-                        primed79++;
-                    }
-                }
-                primedTNT.remove(region);
-
-                 * Message the player, if there are tnt with Fuse 80 use special message
-                for (Player p : listeningPlayers) {
-                    if (region.getArea().inRegion(p.getLocation(), false)) {
-                        if (primed80 > 0) {
-                            BauSystem.MESSAGE.sendPrefixless("TLS_MESSAGE_80", p, relativeTick, primed79 + primed80, primed80);
-                        } else {
-                            BauSystem.MESSAGE.sendPrefixless("TLS_MESSAGE_79", p, relativeTick, primed79);
-                        }
-                    }
-                }
-            }
-        }.runTaskLater(bauSystem.getInstance(), 1);*/
     }
 
     private void messagePlayer(Region region, long relativeTick) {

From 7a232d5d51d04c767a9853afd4387781a9af9c15 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sun, 26 Oct 2025 16:41:21 +0100
Subject: [PATCH 187/214] Add ignore for SteamWar team

---
 .../src/de/steamwar/velocitycore/commands/CheckCommand.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/CheckCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/CheckCommand.java
index 2effbdcf..b9c3092e 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/CheckCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/CheckCommand.java
@@ -133,7 +133,8 @@ public class CheckCommand extends SWCommand {
         }
 
         int playerTeam = sender.user().hasPerm(UserPerm.MODERATION) ? 0 : sender.user().getTeam();
-        if (playerTeam != 0 && SteamwarUser.get(schem.getOwner()).getTeam() == playerTeam) {
+        // Ignore 795 SteamWar Team
+        if (playerTeam != 0 && playerTeam != 795 && SteamwarUser.get(schem.getOwner()).getTeam() == playerTeam) {
             sender.system("CHECK_SCHEMATIC_OWN_TEAM");
             return;
         }

From 11eb506f05c63b827492ec6b5b4bcd9364b6e4eb Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sun, 26 Oct 2025 17:35:19 +0100
Subject: [PATCH 188/214] Use log of SchematicType

---
 CommonCore/SQL/src/de/steamwar/sql/SchematicType.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CommonCore/SQL/src/de/steamwar/sql/SchematicType.java b/CommonCore/SQL/src/de/steamwar/sql/SchematicType.java
index c0d61bb2..138b5eb7 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/SchematicType.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/SchematicType.java
@@ -19,15 +19,15 @@
 
 package de.steamwar.sql;
 
+import de.steamwar.sql.internal.SQLConfig;
 import de.steamwar.sql.internal.SqlTypeMapper;
 import lombok.Getter;
-import lombok.extern.slf4j.Slf4j;
 
 import java.io.File;
 import java.util.*;
+import java.util.logging.Level;
 import java.util.stream.Collectors;
 
-@Slf4j
 public class SchematicType {
 
 	public static final SchematicType Normal = new SchematicType("Normal", "", Type.NORMAL, null, "STONE_BUTTON", false);
@@ -61,7 +61,7 @@ public class SchematicType {
             }
         }
         time = System.currentTimeMillis() - time;
-        log.info("Loaded {} Schematic Types in {}ms", tmpTypes.size(), time);
+        SQLConfig.impl.getLogger().log(Level.INFO, "Loaded {} Schematic Types in {}ms", new Object[]{tmpTypes.size(), time});
 
 		fromDB = Collections.unmodifiableMap(tmpFromDB);
 		types = Collections.unmodifiableList(tmpTypes);

From 63069b7caa58524f0f1135e91d8b47a976f701d6 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sun, 26 Oct 2025 17:36:48 +0100
Subject: [PATCH 189/214] Remove log in SchematicType

---
 CommonCore/SQL/src/de/steamwar/sql/SchematicType.java | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/CommonCore/SQL/src/de/steamwar/sql/SchematicType.java b/CommonCore/SQL/src/de/steamwar/sql/SchematicType.java
index 138b5eb7..6abaffca 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/SchematicType.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/SchematicType.java
@@ -19,13 +19,11 @@
 
 package de.steamwar.sql;
 
-import de.steamwar.sql.internal.SQLConfig;
 import de.steamwar.sql.internal.SqlTypeMapper;
 import lombok.Getter;
 
 import java.io.File;
 import java.util.*;
-import java.util.logging.Level;
 import java.util.stream.Collectors;
 
 public class SchematicType {
@@ -42,7 +40,6 @@ public class SchematicType {
 		tmpTypes.add(Normal);
 		tmpFromDB.put(Normal.name().toLowerCase(), Normal);
 
-        long time = System.currentTimeMillis();
         File folder = SQLWrapper.impl.getSchemTypesFolder();
         if (folder.exists()) {
             for (File configFile : Arrays.stream(folder.listFiles((file, name) -> name.endsWith(".yml") && !name.endsWith(".kits.yml"))).sorted().collect(Collectors.toList())) {
@@ -60,8 +57,6 @@ public class SchematicType {
                 SQLWrapper.impl.processSchematicType(gameModeConfig);
             }
         }
-        time = System.currentTimeMillis() - time;
-        SQLConfig.impl.getLogger().log(Level.INFO, "Loaded {} Schematic Types in {}ms", new Object[]{tmpTypes.size(), time});
 
 		fromDB = Collections.unmodifiableMap(tmpFromDB);
 		types = Collections.unmodifiableList(tmpTypes);

From f99f9b15642fd675298b893293769bf5f24163c8 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sun, 26 Oct 2025 17:53:37 +0100
Subject: [PATCH 190/214] Trigger rebuild

---
 WebsiteBackend/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WebsiteBackend/build.gradle.kts b/WebsiteBackend/build.gradle.kts
index 31db44c0..da07d597 100644
--- a/WebsiteBackend/build.gradle.kts
+++ b/WebsiteBackend/build.gradle.kts
@@ -54,4 +54,4 @@ dependencies {
     implementation(libs.kotlinxSerializationCbor)
     implementation(libs.ktorRateLimit)
     implementation(libs.nbt)
-}
\ No newline at end of file
+}

From b3f6312288605e9b10fe253599667a569c09eefa Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sun, 26 Oct 2025 18:07:25 +0100
Subject: [PATCH 191/214] Hotfix static initialisation of GameModeConfig

---
 CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java b/CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java
index 305edbaa..2c12a202 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java
@@ -40,10 +40,6 @@ public final class GameModeConfig<M, W> {
     public static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("dd.MM.yyyy HH:mm");
     private static final Random random = new Random();
 
-    static {
-        SchematicType.values();
-    }
-
     private static final Map<String, GameModeConfig<?, String>> byFileName = new HashMap<>();
     private static final Map<String, GameModeConfig<?, String>> byGameName = new HashMap<>();
     private static final Map<SchematicType, GameModeConfig<?, String>> bySchematicType = new HashMap<>();
@@ -60,6 +56,10 @@ public final class GameModeConfig<M, W> {
         return (GameModeConfig<M, String>) bySchematicType.get(schematicType);
     }
 
+    static {
+        SchematicType.values();
+    }
+
     private static final GameModeConfig<?, String> DEFAULTS = SQLWrapper.impl.loadGameModeConfig(null);
 
     public static <M> GameModeConfig<M, String> getDefaults() {

From d7fb7c2a61777f85ed441a099f0490af6e95a482 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sun, 26 Oct 2025 18:14:52 +0100
Subject: [PATCH 192/214] Hotfix static initialisation of GameModeConfig

---
 .../src/de/steamwar/sql/GameModeConfig.java   | 30 ++++++++++---------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java b/CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java
index 2c12a202..09e23d17 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java
@@ -40,9 +40,9 @@ public final class GameModeConfig<M, W> {
     public static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("dd.MM.yyyy HH:mm");
     private static final Random random = new Random();
 
-    private static final Map<String, GameModeConfig<?, String>> byFileName = new HashMap<>();
-    private static final Map<String, GameModeConfig<?, String>> byGameName = new HashMap<>();
-    private static final Map<SchematicType, GameModeConfig<?, String>> bySchematicType = new HashMap<>();
+    private static final Map<String, GameModeConfig<?, String>> byFileName;
+    private static final Map<String, GameModeConfig<?, String>> byGameName;
+    private static final Map<SchematicType, GameModeConfig<?, String>> bySchematicType;
 
     public static <M> GameModeConfig<M, String> getByFileName(File file) {
         return (GameModeConfig<M, String>) byFileName.get(file.getName());
@@ -56,16 +56,20 @@ public final class GameModeConfig<M, W> {
         return (GameModeConfig<M, String>) bySchematicType.get(schematicType);
     }
 
-    static {
-        SchematicType.values();
-    }
-
-    private static final GameModeConfig<?, String> DEFAULTS = SQLWrapper.impl.loadGameModeConfig(null);
+    private static final GameModeConfig<?, String> DEFAULTS;
 
     public static <M> GameModeConfig<M, String> getDefaults() {
         return (GameModeConfig<M, String>) DEFAULTS;
     }
 
+    static {
+        byFileName = new HashMap<>();
+        byGameName = new HashMap<>();
+        bySchematicType = new HashMap<>();
+        SchematicType.values();
+        DEFAULTS = SQLWrapper.impl.loadGameModeConfig(null);
+    }
+
     public final boolean loaded;
     public final File configFile;
 
@@ -208,15 +212,13 @@ public final class GameModeConfig<M, W> {
 
         Arena = new ArenaConfig(loader.with("Arena"), Schematic.Size, EnterStages);
 
-        if (cacheInstance) {
-            if (configFile != null) {
-                byFileName.put(configFile.getName(), (GameModeConfig) this);
-            }
+        if (cacheInstance && file != null) {
+            byFileName.put(configFile.getName(), (GameModeConfig) this);
             byGameName.put(GameName, (GameModeConfig) this);
         }
 
         if (Schematic.Type != null) {
-            if (cacheInstance) {
+            if (cacheInstance && file != null) {
                 bySchematicType.put(Schematic.Type, (GameModeConfig) this);
                 if (Schematic.Type.checkType() != null) {
                     bySchematicType.put(Schematic.Type.checkType(), (GameModeConfig) this);
@@ -239,7 +241,7 @@ public final class GameModeConfig<M, W> {
         try {
             Schematic_TypeField.set(Schematic, current);
 
-            if (cacheInstance) {
+            if (cacheInstance && file != null) {
                 bySchematicType.put(Schematic.Type, (GameModeConfig) this);
                 if (Schematic.Type.checkType() != null) {
                     bySchematicType.put(Schematic.Type.checkType(), (GameModeConfig) this);

From 986536428dc9fabebe9d6f834b79f4656897b523 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sun, 26 Oct 2025 18:17:40 +0100
Subject: [PATCH 193/214] Hotfix static initialisation of GameModeConfig

---
 .../src/de/steamwar/sql/GameModeConfig.java   | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java b/CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java
index 09e23d17..92cd116b 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java
@@ -62,7 +62,16 @@ public final class GameModeConfig<M, W> {
         return (GameModeConfig<M, String>) DEFAULTS;
     }
 
+    private static final Field Schematic_TypeField;
+
     static {
+        try {
+            Schematic_TypeField = SchematicConfig.class.getDeclaredField("Type");
+            Schematic_TypeField.setAccessible(true);
+        } catch (NoSuchFieldException e) {
+            throw new SecurityException(e.getMessage(), e);
+        }
+
         byFileName = new HashMap<>();
         byGameName = new HashMap<>();
         bySchematicType = new HashMap<>();
@@ -164,17 +173,6 @@ public final class GameModeConfig<M, W> {
      */
     public final TechhiderConfig<M> Techhider;
 
-    private static final Field Schematic_TypeField;
-
-    static {
-        try {
-            Schematic_TypeField = SchematicConfig.class.getDeclaredField("Type");
-            Schematic_TypeField.setAccessible(true);
-        } catch (NoSuchFieldException e) {
-            throw new SecurityException(e.getMessage(), e);
-        }
-    }
-
     public GameModeConfig(File file, Function<String, M> materialMapper, Function<String, W> winconditionMapper, Function<File, String> defaultGameName, boolean cacheInstance) {
         YMLWrapper<M, W> loader = new YMLWrapper<>(file, materialMapper, winconditionMapper);
 

From 90563b066dea753f44a7c172fc25b530462b4042 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Sun, 26 Oct 2025 18:28:27 +0100
Subject: [PATCH 194/214] Fix Prefix color of Blue team

---
 CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java b/CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java
index 92cd116b..18941b19 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java
@@ -718,14 +718,14 @@ public final class GameModeConfig<M, W> {
         public final String Name;
 
         /**
-         * @implSpec {@code §3} by default
+         * @implSpec {@code §9} by default
          */
         public final String Prefix;
 
         private BlueConfig(YMLWrapper loader) {
             loaded = loader.canLoad();
             Name = loader.getString("Name", "Blau");
-            Prefix = loader.getString("Prefix", "§3");
+            Prefix = loader.getString("Prefix", "§9");
         }
     }
 

From 129f339ce37544939fd08902ebd04f944d32b738 Mon Sep 17 00:00:00 2001
From: Chaoscaot <chaos@chaoscaot.de>
Date: Sun, 26 Oct 2025 20:01:12 +0100
Subject: [PATCH 195/214] Update Gradle wrapper to version 8.14

---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 60d97f7f..130ca532 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -20,6 +20,6 @@
 #Sun Aug 04 18:22:15 CEST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 89519e05bbe926a2f370b0d014b12bb9db7f9a6b Mon Sep 17 00:00:00 2001
From: Chaoscaot <chaos@chaoscaot.de>
Date: Sun, 26 Oct 2025 20:04:49 +0100
Subject: [PATCH 196/214] Trigger CI

---
 LegacyBauSystem/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LegacyBauSystem/build.gradle.kts b/LegacyBauSystem/build.gradle.kts
index 8e3f88fc..139fec4d 100644
--- a/LegacyBauSystem/build.gradle.kts
+++ b/LegacyBauSystem/build.gradle.kts
@@ -26,4 +26,4 @@ dependencies {
 
     compileOnly(libs.nms12)
     compileOnly(libs.worldedit12)
-}
+}
\ No newline at end of file

From e21105129490fc8c24c0bdf01c67a08ced754f61 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Mon, 27 Oct 2025 22:04:17 +0100
Subject: [PATCH 197/214] Hotfix GameModeConfig

---
 CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java b/CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java
index 18941b19..b1e62b8b 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java
@@ -36,7 +36,7 @@ public final class GameModeConfig<M, W> {
 
     public static final Function<String, String> ToString = Function.identity();
     public static final Function<File, String> ToStaticWarGear = __ -> "WarGear";
-    public static final Function<File, String> ToInternalName = file -> file.getName().replace(".yml", "");
+    public static final Function<File, String> ToInternalName = file -> file != null ? file.getName().replace(".yml", "") : "WarGear";
     public static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("dd.MM.yyyy HH:mm");
     private static final Random random = new Random();
 

From 2410ea3979c2a80078778a30b6752a397e978841 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Tue, 28 Oct 2025 17:03:48 +0100
Subject: [PATCH 198/214] Fix PunishmentCommand ban localhost for /ban

---
 .../steamwar/velocitycore/commands/PunishmentCommand.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/PunishmentCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/PunishmentCommand.java
index c209c210..5a617c5b 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/PunishmentCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/PunishmentCommand.java
@@ -21,8 +21,6 @@ package de.steamwar.velocitycore.commands;
 
 import com.google.gson.JsonParser;
 import com.velocitypowered.api.proxy.Player;
-import de.steamwar.velocitycore.VelocityCore;
-import de.steamwar.velocitycore.listeners.IPSanitizer;
 import de.steamwar.command.PreviousArguments;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeMapper;
@@ -32,6 +30,8 @@ import de.steamwar.sql.BannedUserIPs;
 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;
 
 import java.io.IOException;
 import java.net.URL;
@@ -97,7 +97,9 @@ public class PunishmentCommand {
                     bannedUser.punish(Punishment.PunishmentType.Ban, time, banReason, punisher.getId(), perma);
                 }
             }
-            BannedUserIPs.banIP(user.getId(), ip);
+            if (!player.getUsername().startsWith(".")) {
+                BannedUserIPs.banIP(user.getId(), ip);
+            }
         }
     }
 

From 4c730bcc48e1852d6e58ad09cf59b33142edbbc1 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Tue, 28 Oct 2025 17:07:50 +0100
Subject: [PATCH 199/214] Improve PunishmentCommand Permissions

---
 .../SQL/src/de/steamwar/sql/Punishment.java   | 20 +++++++++----------
 .../commands/PunishmentCommand.java           |  9 +++++----
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/CommonCore/SQL/src/de/steamwar/sql/Punishment.java b/CommonCore/SQL/src/de/steamwar/sql/Punishment.java
index f5813792..1cd61078 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/Punishment.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/Punishment.java
@@ -119,17 +119,17 @@ public class Punishment {
     @RequiredArgsConstructor
     @Getter
     public enum PunishmentType {
-        Ban(false, "BAN_TEAM", "BAN_PERMA", "BAN_UNTIL", "UNBAN_ERROR", "UNBAN"),
-        Mute( false, "MUTE_TEAM", "MUTE_PERMA", "MUTE_UNTIL", "UNMUTE_ERROR", "UNMUTE"),
-        NoSchemReceiving(true, "NOSCHEMRECEIVING_TEAM", "NOSCHEMRECEIVING_PERMA", "NOSCHEMRECEIVING_UNTIL", "UNNOSCHEMRECEIVING_ERROR", "UNNOSCHEMRECEIVING"),
-        NoSchemSharing(true, "NOSCHEMSHARING_TEAM", "NOSCHEMSHARING_PERMA", "NOSCHEMSHARING_UNTIL", "UNNOSCHEMSHARING_ERROR", "UNNOSCHEMSHARING"),
-        NoSchemSubmitting(false, "NOSCHEMSUBMITTING_TEAM", "NOSCHEMSUBMITTING_PERMA", "NOSCHEMSUBMITTING_UNTIL", "UNNOSCHEMSUBMITTING_ERROR", "UNNOSCHEMSUBMITTING"),
-        NoDevServer(true, "NODEVSERVER_TEAM", "NODEVSERVER_PERMA", "NODEVSERVER_UNTIL", "UNNODEVSERVER_ERROR", "UNNODEVSERVER"),
-        NoFightServer(true, "NOFIGHTSERVER_TEAM", "NOFIGHTSERVER_PERMA", "NOFIGHTSERVER_UNTIL", "UNNOFIGHTSERVER_ERROR", "UNNOFIGHTSERVER"),
-        NoTeamServer(true, "NOTEAMSERVER_TEAM", "NOTEAMSERVER_PERMA", "NOTEAMSERVER_UNTIL", "UNNOTEAMSERVER_ERROR", "UNNOTEAMSERVER"),
-        Note(false, "NOTE_TEAM", null, null, null, null, true);
+        Ban(UserPerm.TEAM, "BAN_TEAM", "BAN_PERMA", "BAN_UNTIL", "UNBAN_ERROR", "UNBAN"),
+        Mute( UserPerm.TEAM, "MUTE_TEAM", "MUTE_PERMA", "MUTE_UNTIL", "UNMUTE_ERROR", "UNMUTE"),
+        NoSchemReceiving(UserPerm.MODERATION, "NOSCHEMRECEIVING_TEAM", "NOSCHEMRECEIVING_PERMA", "NOSCHEMRECEIVING_UNTIL", "UNNOSCHEMRECEIVING_ERROR", "UNNOSCHEMRECEIVING"),
+        NoSchemSharing(UserPerm.MODERATION, "NOSCHEMSHARING_TEAM", "NOSCHEMSHARING_PERMA", "NOSCHEMSHARING_UNTIL", "UNNOSCHEMSHARING_ERROR", "UNNOSCHEMSHARING"),
+        NoSchemSubmitting(UserPerm.TEAM, "NOSCHEMSUBMITTING_TEAM", "NOSCHEMSUBMITTING_PERMA", "NOSCHEMSUBMITTING_UNTIL", "UNNOSCHEMSUBMITTING_ERROR", "UNNOSCHEMSUBMITTING"),
+        NoDevServer(UserPerm.PREFIX_DEVELOPER, "NODEVSERVER_TEAM", "NODEVSERVER_PERMA", "NODEVSERVER_UNTIL", "UNNODEVSERVER_ERROR", "UNNODEVSERVER"),
+        NoFightServer(UserPerm.MODERATION, "NOFIGHTSERVER_TEAM", "NOFIGHTSERVER_PERMA", "NOFIGHTSERVER_UNTIL", "UNNOFIGHTSERVER_ERROR", "UNNOFIGHTSERVER"),
+        NoTeamServer(UserPerm.MODERATION, "NOTEAMSERVER_TEAM", "NOTEAMSERVER_PERMA", "NOTEAMSERVER_UNTIL", "UNNOTEAMSERVER_ERROR", "UNNOTEAMSERVER"),
+        Note(UserPerm.TEAM, "NOTE_TEAM", null, null, null, null, true);
 
-        private final boolean needsAdmin;
+        private final UserPerm userPerm;
         private final String teamMessage;
         private final String playerMessagePerma;
         private final String playerMessageUntil;
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/PunishmentCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/PunishmentCommand.java
index 5a617c5b..24abde90 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/PunishmentCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/PunishmentCommand.java
@@ -181,7 +181,7 @@ public class PunishmentCommand {
         private final Punishment.PunishmentType punishmentType;
 
         private PunishCommand(String command, Punishment.PunishmentType punishmentType) {
-            super(command, UserPerm.TEAM);
+            super(command, punishmentType.getUserPerm());
             this.command = command;
             this.punishmentType = punishmentType;
         }
@@ -196,7 +196,7 @@ public class PunishmentCommand {
         @Register
         public void genericCommand(Chatter sender, @Mapper("toPunish") String toPunish, String date, @ErrorMessage(allowEAs = false, value = "PUNISHMENT_USAGE_REASON") String... message) {
             SteamwarUser punisher = sender.user();
-            if (punishmentType.isNeedsAdmin() && !punisher.hasPerm(UserPerm.MODERATION))
+            if (!punisher.hasPerm(punishmentType.getUserPerm()))
                 return;
 
             SteamwarUser target = unsafeUser(sender, toPunish);
@@ -246,14 +246,15 @@ public class PunishmentCommand {
         private final Punishment.PunishmentType punishmentType;
 
         private UnpunishCommand(String command, Punishment.PunishmentType punishmentType) {
-            super(command, UserPerm.TEAM);
+            super(command, punishmentType.getUserPerm());
             this.command = command;
             this.punishmentType = punishmentType;
         }
 
         @Register
         public void genericCommand(Chatter sender, @ErrorMessage("UNKNOWN_PLAYER") SteamwarUser target) {
-            if (punishmentType.isNeedsAdmin() && !sender.user().hasPerm(UserPerm.MODERATION))
+            SteamwarUser punisher = sender.user();
+            if (!punisher.hasPerm(punishmentType.getUserPerm()))
                 return;
 
             if (!target.isPunished(punishmentType)) {

From 52602045a905dc2da69a2107fbc6c9f959e04e53 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Tue, 28 Oct 2025 17:36:16 +0100
Subject: [PATCH 200/214] Add GameModeConfig.Checkers

---
 .../src/de/steamwar/sql/GameModeConfig.java   |  9 +++++++++
 .../steamwar/messages/BungeeCore.properties   |  1 +
 .../messages/BungeeCore_de.properties         |  1 +
 .../velocitycore/commands/CheckCommand.java   | 20 ++++++++++++++++---
 4 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java b/CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java
index b1e62b8b..c7e9ecf8 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java
@@ -101,6 +101,14 @@ public final class GameModeConfig<M, W> {
      */
     public final List<String> CheckQuestions;
 
+    /**
+     * The allowed checkers to check this schematic type denoted by a list of SteamWar ids.
+     * The people need the {@link UserPerm#CHECK} to be able to check though.
+     *
+     * @implSpec {@code []} by default -> denoting every person with {@link UserPerm#CHECK} can check it
+     */
+    public final List<Integer> Checkers;
+
     /**
      * Bundle for countdowns during the fight
      */
@@ -194,6 +202,7 @@ public final class GameModeConfig<M, W> {
         }
 
         CheckQuestions = loader.getStringList("CheckQuestions");
+        Checkers = loader.getIntList("Checkers");
         Times = new TimesConfig(loader.with("Times"));
         // Arena would be here to be in config order but needs Schematic.Size and EnterStages loaded afterwards
         Schematic = new SchematicConfig<>(loader.with("Schematic"));
diff --git a/VelocityCore/src/de/steamwar/messages/BungeeCore.properties b/VelocityCore/src/de/steamwar/messages/BungeeCore.properties
index cdec29b8..42605662 100644
--- a/VelocityCore/src/de/steamwar/messages/BungeeCore.properties
+++ b/VelocityCore/src/de/steamwar/messages/BungeeCore.properties
@@ -319,6 +319,7 @@ CHECK_LIST_CHECKING_HOVER=§eTo the reviewer
 CHECK_SCHEMATIC_ALREADY_CHECKING=§cYou are already reviewing a schematic!
 CHECK_SCHEMATIC_OWN=§cYou cannot review your own schematics.
 CHECK_SCHEMATIC_OWN_TEAM=§cYou cannot review your team schematics.
+CHECK_SCHEMATIC_EVENT=§cYou cannot check the schematic for the event.
 CHECK_SCHEMATIC_PREVIOUS=§7{0} from {1}§8: §e{2}
 CHECK_INVALID_RANK=§cUnknown schematic rank.
 CHECK_ABORT=§aThe test operation was canceled!
diff --git a/VelocityCore/src/de/steamwar/messages/BungeeCore_de.properties b/VelocityCore/src/de/steamwar/messages/BungeeCore_de.properties
index ba79c219..a79cfdf7 100644
--- a/VelocityCore/src/de/steamwar/messages/BungeeCore_de.properties
+++ b/VelocityCore/src/de/steamwar/messages/BungeeCore_de.properties
@@ -301,6 +301,7 @@ CHECK_LIST_CHECKING_HOVER=§eZum Prüfer
 CHECK_SCHEMATIC_ALREADY_CHECKING=§cDu prüfst schon eine Schematic!
 CHECK_SCHEMATIC_OWN=§cDu kannst nicht deine eigenen Schematics prüfen.
 CHECK_SCHEMATIC_OWN_TEAM=§cDu kannst nicht Schematics deines Teams prüfen.
+CHECK_SCHEMATIC_EVENT=§cDu kannst die schematic für das Event nicht prüfen.
 CHECK_SCHEMATIC_PREVIOUS=§7{0} von {1}§8: §e{2}
 CHECK_INVALID_RANK=§cUnbekannter Schematicrang.
 CHECK_ABORT=§aDer Prüfvorgang wurde abgebrochen!
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/CheckCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/CheckCommand.java
index 722a1193..43c4feb6 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/CheckCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/CheckCommand.java
@@ -21,7 +21,6 @@ package de.steamwar.velocitycore.commands;
 
 import com.velocitypowered.api.proxy.Player;
 import de.steamwar.command.SWCommand;
-import de.steamwar.sql.GameModeConfig;
 import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.Message;
@@ -100,17 +99,27 @@ public class CheckCommand extends SWCommand {
         sender.system("CHECK_LIST_HEADER", schematicList.size());
 
         for (SchematicNode schematic : schematicList) {
+            GameModeConfig<String, String> gameModeConfig = ArenaMode.getBySchemType(schematic.getSchemtype());
             CheckSession current = currentSchems.get(schematic.getId());
+            ClickEvent clickEvent = null;
+            if (gameModeConfig.Checkers.isEmpty() || gameModeConfig.Checkers.contains(sender.user().getId())) {
+                if (current == null) {
+                    clickEvent = ClickEvent.runCommand("/check schematic " + schematic.getId());
+                } else {
+                    clickEvent = ClickEvent.runCommand("/join " + current.checker.user().getUserName());
+                }
+            }
+
             if (current == null) {
                 sender.prefixless("CHECK_LIST_TO_CHECK",
                         new Message("CHECK_LIST_TO_CHECK_HOVER"),
-                        ClickEvent.runCommand("/check schematic " + schematic.getId()),
+                        clickEvent,
                         getWaitTime(schematic),
                         schematic.getSchemtype().getKuerzel(), SteamwarUser.get(schematic.getOwner()).getUserName(), schematic.getName());
             } else {
                 sender.prefixless("CHECK_LIST_CHECKING",
                         new Message("CHECK_LIST_CHECKING_HOVER"),
-                        ClickEvent.runCommand("/join " + current.checker.user().getUserName()),
+                        clickEvent,
                         getWaitTime(schematic),
                         schematic.getSchemtype().getKuerzel(), SteamwarUser.get(schematic.getOwner()).getUserName(), schematic.getName(), current.checker.user().getUserName());
             }
@@ -125,6 +134,11 @@ public class CheckCommand extends SWCommand {
         }
 
         SchematicNode schem = SchematicNode.getSchematicNode(Integer.parseInt(schemID));
+        GameModeConfig<String, String> gameModeConfig = ArenaMode.getBySchemType(schem.getSchemtype());
+        if (!gameModeConfig.Checkers.isEmpty() && !gameModeConfig.Checkers.contains(sender.user().getId())) {
+            sender.system("CHECK_SCHEMATIC_EVENT");
+            return;
+        }
         if(!schem.getSchemtype().check()){
             VelocityCore.getLogger().log(Level.SEVERE, () -> sender.user().getUserName() + " tried to check an uncheckable schematic!");
             return;

From 33bb1394aa5cdf2e4941049df0e135bedd9a6839 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Tue, 28 Oct 2025 17:37:05 +0100
Subject: [PATCH 201/214] Add GameModeConfig.Checkers

---
 .../de/steamwar/velocitycore/commands/CheckCommand.java    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/CheckCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/CheckCommand.java
index 43c4feb6..2d9f4df8 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/CheckCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/CheckCommand.java
@@ -102,23 +102,26 @@ public class CheckCommand extends SWCommand {
             GameModeConfig<String, String> gameModeConfig = ArenaMode.getBySchemType(schematic.getSchemtype());
             CheckSession current = currentSchems.get(schematic.getId());
             ClickEvent clickEvent = null;
+            Message hoverMessage = null;
             if (gameModeConfig.Checkers.isEmpty() || gameModeConfig.Checkers.contains(sender.user().getId())) {
                 if (current == null) {
                     clickEvent = ClickEvent.runCommand("/check schematic " + schematic.getId());
+                    hoverMessage = new Message("CHECK_LIST_TO_CHECK_HOVER");
                 } else {
                     clickEvent = ClickEvent.runCommand("/join " + current.checker.user().getUserName());
+                    hoverMessage = new Message("CHECK_LIST_CHECKING_HOVER");
                 }
             }
 
             if (current == null) {
                 sender.prefixless("CHECK_LIST_TO_CHECK",
-                        new Message("CHECK_LIST_TO_CHECK_HOVER"),
+                        hoverMessage,
                         clickEvent,
                         getWaitTime(schematic),
                         schematic.getSchemtype().getKuerzel(), SteamwarUser.get(schematic.getOwner()).getUserName(), schematic.getName());
             } else {
                 sender.prefixless("CHECK_LIST_CHECKING",
-                        new Message("CHECK_LIST_CHECKING_HOVER"),
+                        hoverMessage,
                         clickEvent,
                         getWaitTime(schematic),
                         schematic.getSchemtype().getKuerzel(), SteamwarUser.get(schematic.getOwner()).getUserName(), schematic.getName(), current.checker.user().getUserName());

From 2654735bba107aa419f5e13b49331b90e111d367 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Tue, 28 Oct 2025 17:58:01 +0100
Subject: [PATCH 202/214] Hotfix SchematicSystem.getGameModeConfig

---
 .../src/de/steamwar/schematicsystem/SchematicSystem.java         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/SchematicSystem.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/SchematicSystem.java
index 3687a52b..a4e04c43 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/SchematicSystem.java
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/SchematicSystem.java
@@ -35,6 +35,7 @@ public class SchematicSystem extends JavaPlugin {
 
     public static GameModeConfig<Material, String> getGameModeConfig(SchematicType type){
         GameModeConfig<Material, String> gameModeConfig = GameModeConfig.getBySchematicType(type);
+        if (gameModeConfig == null) return null;
         if (gameModeConfig.CheckQuestions.isEmpty() && gameModeConfig.Schematic.ManualCheck) return null;
         return gameModeConfig;
     }

From 0c371fb403b258420178377458d36d14b8e162f8 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Tue, 28 Oct 2025 18:20:39 +0100
Subject: [PATCH 203/214] Fix ModifyPart.changeType

---
 .../commands/schematiccommand/parts/ModifyPart.java             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/ModifyPart.java b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/ModifyPart.java
index 99006559..eb7a8c10 100644
--- a/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/ModifyPart.java
+++ b/SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/ModifyPart.java
@@ -62,7 +62,7 @@ public class ModifyPart extends SWCommand {
 
         SchematicType.values().parallelStream()
                 .filter(SchematicType::isAssignable)
-                .filter(type -> finalClipboard == null || SchematicSystem.getGameModeConfig(type) == null || AutoChecker.sizeCheck(finalClipboard, SchematicSystem.getGameModeConfig(type)).fastOk())
+                .filter(type -> finalClipboard != null && SchematicSystem.getGameModeConfig(type) != null && AutoChecker.sizeCheck(finalClipboard, SchematicSystem.getGameModeConfig(type)).fastOk())
                 .forEach(type -> {
                     TextComponent component = new TextComponent(type.name() + " ");
                     component.setColor(ChatColor.GRAY);

From 022276e05a7f99ddc7cfed25672eb19dea06fe51 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Tue, 28 Oct 2025 18:30:49 +0100
Subject: [PATCH 204/214] Improve SWCommand message visibility

---
 .../SpigotCore_Main/src/de/steamwar/command/SWCommand.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/command/SWCommand.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/command/SWCommand.java
index 01084241..9bc8fea8 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/command/SWCommand.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/command/SWCommand.java
@@ -44,7 +44,7 @@ public class SWCommand extends AbstractSWCommand<CommandSender> {
     private Command command;
 
     @Setter
-    private Message message = null;
+    protected Message message = null;
     private List<String> defaultHelpMessages = new ArrayList<>();
 
     protected SWCommand(String command) {

From f53a31348fa0a4b451379fd71cf7f983ad496b9d Mon Sep 17 00:00:00 2001
From: Chaoscaot <max@maxsp.de>
Date: Tue, 28 Oct 2025 22:27:06 +0100
Subject: [PATCH 205/214] Hotfix: Kotlin ist schwer, ne Yoyo?

Signed-off-by: Chaoscaot <max@maxsp.de>
---
 WebsiteBackend/src/de/steamwar/sql/SQLWrapperImpl.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WebsiteBackend/src/de/steamwar/sql/SQLWrapperImpl.kt b/WebsiteBackend/src/de/steamwar/sql/SQLWrapperImpl.kt
index 0e843c25..7a850cfb 100644
--- a/WebsiteBackend/src/de/steamwar/sql/SQLWrapperImpl.kt
+++ b/WebsiteBackend/src/de/steamwar/sql/SQLWrapperImpl.kt
@@ -26,7 +26,7 @@ class SQLWrapperImpl: SQLWrapper<String> {
         return File("/configs/GameModes")
     }
 
-    override fun loadGameModeConfig(file: File): GameModeConfig<String, String> {
+    override fun loadGameModeConfig(file: File?): GameModeConfig<String, String> {
         return GameModeConfig(file, GameModeConfig.ToString, GameModeConfig.ToString, GameModeConfig.ToStaticWarGear, true)
     }
 

From 5243cf850e709e5b00c7cefbe19f5a2695dc874e Mon Sep 17 00:00:00 2001
From: Chaoscaot <max@maxsp.de>
Date: Tue, 28 Oct 2025 23:46:42 +0100
Subject: [PATCH 206/214] =?UTF-8?q?Hotfix:=201.21=20Autopr=C3=BCfer?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Chaoscaot <max@maxsp.de>
---
 .../autocheck/AutoChecker15.java                |  3 ++-
 .../schematiccommand/SchematicCommand15.java    | 17 +++++++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/SchematicSystem/SchematicSystem_15/src/de/steamwar/schematicsystem/autocheck/AutoChecker15.java b/SchematicSystem/SchematicSystem_15/src/de/steamwar/schematicsystem/autocheck/AutoChecker15.java
index 97cf6de3..d6189931 100644
--- a/SchematicSystem/SchematicSystem_15/src/de/steamwar/schematicsystem/autocheck/AutoChecker15.java
+++ b/SchematicSystem/SchematicSystem_15/src/de/steamwar/schematicsystem/autocheck/AutoChecker15.java
@@ -24,6 +24,7 @@ import com.sk89q.worldedit.entity.Entity;
 import com.sk89q.worldedit.extent.clipboard.Clipboard;
 import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.world.block.BaseBlock;
+import de.steamwar.core.Core;
 import de.steamwar.sql.GameModeConfig;
 import de.steamwar.sql.SchematicType;
 import org.bukkit.Material;
@@ -109,7 +110,7 @@ public class AutoChecker15 implements AutoChecker.IAutoChecker {
             if (!itemsInInv.getOrDefault(itemType, EnumSet.noneOf(Material.class)).contains(material)) {
                 result.getForbiddenItems().computeIfAbsent(pos, blockVector3 -> new HashSet<>()).add(itemType);
             } else if(material == Material.DISPENSER && (itemType == Material.ARROW || itemType == Material.FIRE_CHARGE)) {
-                counter += item.getByte("Count");
+                counter += Core.getVersion() >= 21 ? item.getInt("count") : item.getByte("Count");
             }
             if (item.containsKey("tag")) {
                 result.getForbiddenNbt().computeIfAbsent(pos, blockVector3 -> new HashSet<>()).add(itemType);
diff --git a/SchematicSystem/SchematicSystem_15/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommand15.java b/SchematicSystem/SchematicSystem_15/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommand15.java
index 62fa611e..05036a9a 100644
--- a/SchematicSystem/SchematicSystem_15/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommand15.java
+++ b/SchematicSystem/SchematicSystem_15/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommand15.java
@@ -31,6 +31,7 @@ import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.world.block.BlockTypes;
+import de.steamwar.core.Core;
 import de.steamwar.sql.GameModeConfig;
 import de.steamwar.schematicsystem.autocheck.AutoCheckerResult;
 import de.steamwar.schematicsystem.autocheck.BlockPos;
@@ -38,9 +39,17 @@ import de.steamwar.sql.SchematicType;
 import org.bukkit.Material;
 
 import java.util.*;
+import java.util.function.BiConsumer;
+import java.util.function.BiFunction;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 public class SchematicCommand15 implements SchematicCommand.ISchematicCommand {
+    private static final Function<CompoundTag, Integer> getCount = item -> Core.getVersion() >= 21 ? item.getInt("count") : item.getByte("Count");
+    private static final BiFunction<CompoundTag, Integer, CompoundTag> setCount = (item, count) -> Core.getVersion() >= 21 ?
+            item.createBuilder().putInt("count", count).build() :
+            item.createBuilder().putByte("Count", count.byteValue()).build();
+
     @Override
     public Clipboard fixClipboard(Clipboard clipboard, AutoCheckerResult result, GameModeConfig<Material, String> type) throws Exception {
         for (BlockPos blockPos : result.getBlockScanResult().getRecords()) {
@@ -87,7 +96,7 @@ public class SchematicCommand15 implements SchematicCommand.ISchematicCommand {
                 BaseBlock block = clipboard.getFullBlock(vector);
                 CompoundTag tag = block.getNbtData();
                 CompoundTagBuilder builder = tag.createBuilder();
-                List<CompoundTag> items = tag.getList("Items", CompoundTag.class);
+                List<CompoundTag> items = new ArrayList<>(tag.getList("Items", CompoundTag.class));
                 Collections.reverse(items); // To let the first item be in the Dispenser
                 List<CompoundTag> list = new ArrayList<>();
                 int diff = entry.getValue() - type.Schematic.MaxDispenserItems;
@@ -101,12 +110,12 @@ public class SchematicCommand15 implements SchematicCommand.ISchematicCommand {
                         continue;
                     }
 
-                    if(diff > item.getByte("Count")) {
-                        diff -= item.getByte("Count");
+                    if(diff > getCount.apply(item)) {
+                        diff -= getCount.apply(item);
                         continue;
                     }
 
-                    item = item.createBuilder().putByte("Count", (byte) (item.getByte("Count") - diff)).build();
+                    item = setCount.apply(item, getCount.apply(item) - diff);
                     diff = 0;
                     list.add(item);
                 }

From f216ed0f0b745e95698166a7a10a458bead4bdb5 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Thu, 30 Oct 2025 15:18:09 +0100
Subject: [PATCH 207/214] Hotfix CheckCommand

---
 VelocityCore/src/de/steamwar/velocitycore/ArenaMode.java        | 2 ++
 .../src/de/steamwar/velocitycore/commands/CheckCommand.java     | 1 +
 2 files changed, 3 insertions(+)

diff --git a/VelocityCore/src/de/steamwar/velocitycore/ArenaMode.java b/VelocityCore/src/de/steamwar/velocitycore/ArenaMode.java
index 87e2bf92..48a40870 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/ArenaMode.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/ArenaMode.java
@@ -61,6 +61,8 @@ public class ArenaMode {
             }
             if (gameModeConfig.Schematic.loaded && gameModeConfig.Schematic.Type != SchematicType.Normal) {
                 bySchemType.put(gameModeConfig.Schematic.Type, gameModeConfig);
+                SchematicType checkType = gameModeConfig.Schematic.Type.checkType();
+                if (checkType != null) bySchemType.put(checkType, gameModeConfig);
             }
         }
     }
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/CheckCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/CheckCommand.java
index 2d9f4df8..589fa0c5 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/CheckCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/CheckCommand.java
@@ -100,6 +100,7 @@ public class CheckCommand extends SWCommand {
 
         for (SchematicNode schematic : schematicList) {
             GameModeConfig<String, String> gameModeConfig = ArenaMode.getBySchemType(schematic.getSchemtype());
+            if (gameModeConfig == null) gameModeConfig = GameModeConfig.getDefaults();
             CheckSession current = currentSchems.get(schematic.getId());
             ClickEvent clickEvent = null;
             Message hoverMessage = null;

From 6d8c7654833bbef1dac44f846d5a09628ad0a09f Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Thu, 30 Oct 2025 15:23:40 +0100
Subject: [PATCH 208/214] Hotfix dual checking of Schematics

---
 .../steamwar/velocitycore/commands/CheckCommand.java   | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/CheckCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/CheckCommand.java
index 589fa0c5..9be08fda 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/CheckCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/CheckCommand.java
@@ -20,6 +20,7 @@
 package de.steamwar.velocitycore.commands;
 
 import com.velocitypowered.api.proxy.Player;
+import com.velocitypowered.api.proxy.ServerConnection;
 import de.steamwar.command.SWCommand;
 import de.steamwar.linkage.Linked;
 import de.steamwar.messages.Chatter;
@@ -157,6 +158,15 @@ public class CheckCommand extends SWCommand {
             sender.system("CHECK_SCHEMATIC_OWN_TEAM");
             return;
         }
+
+        CheckSession checkSession = currentSchems.get(schem.getId());
+        if (checkSession != null) {
+            Optional<ServerConnection> serverConnection = checkSession.checker.getPlayer().getCurrentServer();
+            if (serverConnection.isPresent()) {
+                sender.getPlayer().createConnectionRequest(serverConnection.get().getServer()).fireAndForget();
+                return;
+            }
+        }
         new CheckSession(sender, schem);
     }
 

From 62c41cdda875b0423fd925eb4cb69704f8958747 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Thu, 30 Oct 2025 16:29:57 +0100
Subject: [PATCH 209/214] Improve softreload

---
 .../src/de/steamwar/persistent/Persistent.java        |  8 ++++++++
 .../src/de/steamwar/velocitycore/VelocityCore.java    | 11 +++++++++++
 2 files changed, 19 insertions(+)

diff --git a/VelocityCore/Persistent/src/de/steamwar/persistent/Persistent.java b/VelocityCore/Persistent/src/de/steamwar/persistent/Persistent.java
index 71139e8e..d5fac548 100644
--- a/VelocityCore/Persistent/src/de/steamwar/persistent/Persistent.java
+++ b/VelocityCore/Persistent/src/de/steamwar/persistent/Persistent.java
@@ -122,6 +122,7 @@ public class Persistent {
             container = proxy.getPluginManager().getPlugin("velocitycore").orElseThrow();
             plugin = (ReloadablePlugin) container.getInstance().orElseThrow();
         } catch (NoSuchElementException e) {
+            e.printStackTrace();
             logger.log(Level.WARNING, "Could not find loaded VelocityCore, continuing without unloading.");
         }
 
@@ -129,6 +130,7 @@ public class Persistent {
         try {
             newContainer = prepareLoad();
         } catch (Exception e) {
+            e.printStackTrace();
             logger.log(Level.SEVERE, "Could not instantiate new VelocityCore, aborting softreload.", e);
             return Command.SINGLE_SUCCESS;
         }
@@ -136,13 +138,19 @@ public class Persistent {
         broadcast("§eNetwork update is starting§8.");
         try {
             if(container != null && plugin != null) {
+                System.out.println("Proxy Shutdown Event");
                 plugin.onProxyShutdown(new ProxyShutdownEvent());
+                System.out.println("Unloading of Container");
                 unload(container, plugin);
             }
 
+            System.out.println("Loading of new Container");
             registerPlugin.invoke((VelocityPluginManager) proxy.getPluginManager(), newContainer);
+            System.out.println("Proxy Initialization Event");
             ((ReloadablePlugin) newContainer.getInstance().orElseThrow()).onProxyInitialization(new ProxyInitializeEvent());
+            System.out.println("Proxy Initialization Event finished");
         } catch (Throwable t) {
+            t.printStackTrace();
             logger.log(Level.SEVERE, "Error during softreload", t);
             broadcast("§cNetwork update failed§8, §cexpect network restart soon§8.");
             return Command.SINGLE_SUCCESS;
diff --git a/VelocityCore/src/de/steamwar/velocitycore/VelocityCore.java b/VelocityCore/src/de/steamwar/velocitycore/VelocityCore.java
index 17e559ac..c8150a1b 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/VelocityCore.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/VelocityCore.java
@@ -45,6 +45,7 @@ import de.steamwar.velocitycore.commands.ServerSwitchCommand;
 import de.steamwar.velocitycore.commands.TeamCommand;
 import de.steamwar.velocitycore.discord.DiscordBot;
 import de.steamwar.velocitycore.discord.DiscordConfig;
+import de.steamwar.velocitycore.listeners.BasicListener;
 import de.steamwar.velocitycore.listeners.PollSystem;
 import lombok.Getter;
 import lombok.NonNull;
@@ -171,6 +172,16 @@ public class VelocityCore implements ReloadablePlugin {
                     ((PacketHandler) any).register();
                 }
             }
+
+            @Override
+            protected void unlinkObject(Object any) {
+                if (any instanceof PacketHandler) {
+                    ((PacketHandler) any).unregister();
+                }
+                if (any instanceof BasicListener) {
+                    VelocityCore.getProxy().getEventManager().unregisterListener(instance, any);
+                }
+            }
         };
         try {
             linker.link();

From e97fb674a2eeed3a6610073cf3fb78a4b65547ab Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Tue, 4 Nov 2025 16:15:36 +0100
Subject: [PATCH 210/214] Fix FlatteningWrapper21

---
 .../de/steamwar/core/FlatteningWrapper21.java | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 SpigotCore/SpigotCore_21/src/de/steamwar/core/FlatteningWrapper21.java

diff --git a/SpigotCore/SpigotCore_21/src/de/steamwar/core/FlatteningWrapper21.java b/SpigotCore/SpigotCore_21/src/de/steamwar/core/FlatteningWrapper21.java
new file mode 100644
index 00000000..25ada9a8
--- /dev/null
+++ b/SpigotCore/SpigotCore_21/src/de/steamwar/core/FlatteningWrapper21.java
@@ -0,0 +1,42 @@
+/*
+ *   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.destroystokyo.paper.profile.PlayerProfile;
+import org.bukkit.Bukkit;
+import org.bukkit.Material;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.SkullMeta;
+
+public class FlatteningWrapper21 extends FlatteningWrapper14 implements FlatteningWrapper.IFlatteningWrapper {
+
+    @Override
+    public ItemStack setSkullOwner(String player) {
+        ItemStack head = new ItemStack(Material.PLAYER_HEAD, 1);
+        head.editMeta(SkullMeta.class, skullMeta -> {
+            OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(player.startsWith(".") ? player.substring(1) : player);
+            PlayerProfile playerProfile = offlinePlayer.getPlayerProfile();
+            if (!playerProfile.isComplete()) playerProfile.complete();
+            skullMeta.setPlayerProfile(playerProfile);
+        });
+        return head;
+    }
+}

From 73b3d21749e8bc3b0d0103d84677e3ffa98f5e9d Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Tue, 4 Nov 2025 16:38:16 +0100
Subject: [PATCH 211/214] Remove unused stuff

---
 BauSystem/BauSystem_Main/src/BauSystem.properties             | 1 -
 .../src/de/steamwar/bausystem/features/region/TNTCommand.java | 4 ----
 2 files changed, 5 deletions(-)

diff --git a/BauSystem/BauSystem_Main/src/BauSystem.properties b/BauSystem/BauSystem_Main/src/BauSystem.properties
index 432ac00a..b90933b6 100644
--- a/BauSystem/BauSystem_Main/src/BauSystem.properties
+++ b/BauSystem/BauSystem_Main/src/BauSystem.properties
@@ -818,7 +818,6 @@ REGION_TNT_HELP_MODE=§8/§etnt §8[§7Mode§8] §8- §7Set TNT behaviour to a g
 REGION_TNT_ON=§aTNT-Damage activated
 REGION_TNT_OFF=§cTNT-Damage deactivated
 REGION_TNT_TB=§aTNT-Damage activated outside the building area
-REGION_TNT_BUILD=§aTNT-Damage activated outside the testblok area
 REGION_TNT_BUILD_DESTROY=§cAn explosion would have destroyed blocks in the building area
 REGION_TNT_TB_DESTROY=§cAn explosion would have destroyed blocks in the testblock area
 AFK_KICK_MESSAGE=§cNothing happened on this server for 15 minutes.
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TNTCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TNTCommand.java
index 074cd3c5..ad6f86a4 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TNTCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TNTCommand.java
@@ -123,10 +123,6 @@ public class TNTCommand extends SWCommand {
         return "REGION_TNT_TB";
     }
 
-    private String getBuildEnableMessage() {
-        return "REGION_TNT_BUILD";
-    }
-
     private void tntToggle(Region region, TNTMode requestedMode, String requestedMessage) {
         if (requestedMode != null && region.getFlags().get(Flag.TESTBLOCK).isNotWithDefault(TestblockMode.NO_VALUE)) {
             region.getFlags().set(Flag.TNT, requestedMode);

From 0f0c8b763e73d1ffce39f51fa35f60c4c8b88707 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Wed, 5 Nov 2025 17:09:53 +0100
Subject: [PATCH 212/214] Remove some strain on the Database

---
 .../world/BauLockStateScoreboard.java         | 35 ++++++------
 .../src/de/steamwar/data}/BauLockState.java   |  2 +-
 .../packets/server/BaulockUpdatePacket.java   | 29 ++++++++++
 .../core/WorldEditRendererCUIEditor.java      | 53 +++++++++++++------
 .../velocitycore/commands/BauCommand.java     |  3 +-
 .../steamwar/velocitycore/util/BauLock.java   |  8 +++
 6 files changed, 95 insertions(+), 35 deletions(-)
 rename {VelocityCore/src/de/steamwar/velocitycore/util => CommonCore/Data/src/de/steamwar/data}/BauLockState.java (97%)
 create mode 100644 CommonCore/Network/src/de/steamwar/network/packets/server/BaulockUpdatePacket.java

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/BauLockStateScoreboard.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/BauLockStateScoreboard.java
index abf90dc0..827a6143 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/BauLockStateScoreboard.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/BauLockStateScoreboard.java
@@ -23,15 +23,32 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.config.BauServer;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.utils.ScoreboardElement;
+import de.steamwar.data.BauLockState;
 import de.steamwar.linkage.Linked;
+import de.steamwar.network.packets.PacketHandler;
+import de.steamwar.network.packets.server.BaulockUpdatePacket;
 import de.steamwar.sql.UserConfig;
+import lombok.Getter;
 import org.bukkit.entity.Player;
 
 @Linked
-public class BauLockStateScoreboard implements ScoreboardElement {
+public class BauLockStateScoreboard extends PacketHandler implements ScoreboardElement {
 
     private static final String BAU_LOCK_CONFIG_NAME = "baulockstate";
 
+    @Getter
+    private BauLockState lockState = loadLockState();
+
+    private BauLockState loadLockState() {
+        String state = UserConfig.getConfig(BauServer.getInstance().getOwner(), BAU_LOCK_CONFIG_NAME);
+        return state == null ? BauLockState.OPEN : BauLockState.valueOf(state);
+    }
+
+    @Handler
+    public void handleBaulockUpdatePacket(BaulockUpdatePacket packet) {
+        lockState = loadLockState();
+    }
+
     @Override
     public ScoreboardGroup getGroup() {
         return ScoreboardGroup.FOOTER;
@@ -47,23 +64,11 @@ public class BauLockStateScoreboard implements ScoreboardElement {
         if (!BauServer.getInstance().getOwner().equals(p.getUniqueId())) {
             return null;
         }
-        String state = UserConfig.getConfig(p.getUniqueId(), BAU_LOCK_CONFIG_NAME);
-        switch (state == null ? BauLockState.OPEN : BauLockState.valueOf(state)) {
+        switch (lockState) {
             case OPEN:
                 return null;
             default:
-                return "§e" + BauSystem.MESSAGE.parse("SCOREBOARD_LOCK_" + state.toUpperCase(), p);
+                return "§e" + BauSystem.MESSAGE.parse("SCOREBOARD_LOCK_" + lockState.name(), p);
         }
     }
-
-    public enum BauLockState {
-
-        NOBODY,
-        SUPERVISOR,
-        SERVERTEAM,
-        TEAM_AND_SERVERTEAM,
-        TEAM,
-        OPEN
-    }
-
 }
diff --git a/VelocityCore/src/de/steamwar/velocitycore/util/BauLockState.java b/CommonCore/Data/src/de/steamwar/data/BauLockState.java
similarity index 97%
rename from VelocityCore/src/de/steamwar/velocitycore/util/BauLockState.java
rename to CommonCore/Data/src/de/steamwar/data/BauLockState.java
index 866c4de2..0c558190 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/util/BauLockState.java
+++ b/CommonCore/Data/src/de/steamwar/data/BauLockState.java
@@ -17,7 +17,7 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.velocitycore.util;
+package de.steamwar.data;
 
 public enum BauLockState {
 
diff --git a/CommonCore/Network/src/de/steamwar/network/packets/server/BaulockUpdatePacket.java b/CommonCore/Network/src/de/steamwar/network/packets/server/BaulockUpdatePacket.java
new file mode 100644
index 00000000..55b23b23
--- /dev/null
+++ b/CommonCore/Network/src/de/steamwar/network/packets/server/BaulockUpdatePacket.java
@@ -0,0 +1,29 @@
+/*
+ *   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.network.packets.server;
+
+import de.steamwar.network.packets.NetworkPacket;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+public class BaulockUpdatePacket extends NetworkPacket {
+    private static final long serialVersionUID = 6863118892424244051L;
+
+}
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/WorldEditRendererCUIEditor.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/WorldEditRendererCUIEditor.java
index da9646a4..f2b11fde 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/WorldEditRendererCUIEditor.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/WorldEditRendererCUIEditor.java
@@ -24,18 +24,27 @@ import de.steamwar.inventory.SWInventory;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.sql.UserConfig;
 import lombok.AllArgsConstructor;
+import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.block.data.type.Light;
 import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.inventory.meta.BlockDataMeta;
 import org.bukkit.inventory.meta.ItemMeta;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
 
-public class WorldEditRendererCUIEditor {
+public class WorldEditRendererCUIEditor implements Listener {
+
+    @EventHandler
+    public void onPlayerQuit(PlayerQuitEvent event) {
+        for (Type type : Type.values()) {
+            type.materialCache.remove(event.getPlayer());
+            type.widthCache.remove(event.getPlayer());
+        }
+    }
 
     @AllArgsConstructor
     public enum Type {
@@ -43,34 +52,43 @@ public class WorldEditRendererCUIEditor {
         CLIPBOARD("cui_clipboard_material", "cui_clipboard_width", Material.LIME_CONCRETE, Width.SLIM),
         ;
 
+        private final Map<Player, Material> materialCache = new HashMap<>();
+        private final Map<Player, Width> widthCache = new HashMap<>();
+
         private final String configMaterial;
         private final String configWidth;
         private final Material defaultMaterial;
         private final Width defaultWidth;
 
         public Material getMaterial(Player player) {
-            String material = UserConfig.getConfig(player.getUniqueId(), configMaterial);
-            if (material == null) {
-                return defaultMaterial;
-            } else {
-                return Material.valueOf(material);
-            }
+            return materialCache.computeIfAbsent(player, p -> {
+                String material = UserConfig.getConfig(p.getUniqueId(), configMaterial);
+                if (material == null) {
+                    return defaultMaterial;
+                } else {
+                    return Material.valueOf(material);
+                }
+            });
         }
 
         public void setMaterial(Player player, Material material) {
+            materialCache.put(player, material);
             UserConfig.updatePlayerConfig(player.getUniqueId(), configMaterial, material.name());
         }
 
         public Width getWidth(Player player) {
-            String width = UserConfig.getConfig(player.getUniqueId(), configWidth);
-            if (width == null) {
-                return defaultWidth;
-            } else {
-                return Width.valueOf(width);
-            }
+            return widthCache.computeIfAbsent(player, p -> {
+                String width = UserConfig.getConfig(p.getUniqueId(), configWidth);
+                if (width == null) {
+                    return defaultWidth;
+                } else {
+                    return Width.valueOf(width);
+                }
+            });
         }
 
         public void setWidth(Player player, Width width) {
+            widthCache.put(player, width);
             UserConfig.updatePlayerConfig(player.getUniqueId(), configWidth, width.name());
         }
     }
@@ -90,6 +108,7 @@ public class WorldEditRendererCUIEditor {
     public WorldEditRendererCUIEditor() {
         if (Core.getVersion() >= 20) {
             new Command();
+            Bukkit.getPluginManager().registerEvents(this, Core.getInstance());
         }
     }
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/BauCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/BauCommand.java
index 0d679ca9..cd23a910 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/BauCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/BauCommand.java
@@ -33,14 +33,13 @@ import de.steamwar.messages.PlayerChatter;
 import de.steamwar.network.packets.server.BaumemberUpdatePacket;
 import de.steamwar.persistent.Bauserver;
 import de.steamwar.sql.BauweltMember;
-import de.steamwar.sql.SchematicType;
 import de.steamwar.sql.SteamwarUser;
 import de.steamwar.velocitycore.*;
 import de.steamwar.velocitycore.inventory.SWInventory;
 import de.steamwar.velocitycore.inventory.SWItem;
 import de.steamwar.velocitycore.network.NetworkSender;
 import de.steamwar.velocitycore.util.BauLock;
-import de.steamwar.velocitycore.util.BauLockState;
+import de.steamwar.data.BauLockState;
 
 import java.util.Collection;
 import java.util.function.Consumer;
diff --git a/VelocityCore/src/de/steamwar/velocitycore/util/BauLock.java b/VelocityCore/src/de/steamwar/velocitycore/util/BauLock.java
index 41828c81..ee8d7e71 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/util/BauLock.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/util/BauLock.java
@@ -19,11 +19,15 @@
 
 package de.steamwar.velocitycore.util;
 
+import de.steamwar.data.BauLockState;
 import de.steamwar.messages.Chatter;
+import de.steamwar.network.packets.server.BaulockUpdatePacket;
+import de.steamwar.persistent.Bauserver;
 import de.steamwar.sql.BauweltMember;
 import de.steamwar.sql.SteamwarUser;
 import de.steamwar.sql.UserConfig;
 import de.steamwar.sql.UserPerm;
+import de.steamwar.velocitycore.network.NetworkSender;
 import lombok.experimental.UtilityClass;
 
 @UtilityClass
@@ -33,6 +37,10 @@ public class BauLock {
     public static void setLocked(Chatter owner, BauLockState state) {
         UserConfig.updatePlayerConfig(owner.user().getId(), BAU_LOCK_CONFIG_NAME, state == BauLockState.OPEN ? null : state.name());
         owner.system("BAU_LOCKED_" + state.name());
+
+        Bauserver bauserver = Bauserver.get(owner.user().getUUID());
+        if(bauserver != null)
+            bauserver.getRegisteredServer().getPlayersConnected().stream().findAny().ifPresent(player -> NetworkSender.send(player, new BaulockUpdatePacket()));
     }
 
     public static boolean isLocked(SteamwarUser owner, SteamwarUser target) {

From 2534451e26976472a6c993fbe154319465c8630b Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Wed, 5 Nov 2025 17:13:54 +0100
Subject: [PATCH 213/214] Fix caching problems

---
 .../src/de/steamwar/core/WorldEditRendererCUIEditor.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/WorldEditRendererCUIEditor.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/WorldEditRendererCUIEditor.java
index f2b11fde..193e8a98 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/WorldEditRendererCUIEditor.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/WorldEditRendererCUIEditor.java
@@ -106,9 +106,9 @@ public class WorldEditRendererCUIEditor implements Listener {
     }
 
     public WorldEditRendererCUIEditor() {
+        Bukkit.getPluginManager().registerEvents(this, Core.getInstance());
         if (Core.getVersion() >= 20) {
             new Command();
-            Bukkit.getPluginManager().registerEvents(this, Core.getInstance());
         }
     }
 

From a3273f68140cf5fcc56dcc2941bc4714acf9a33c Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Wed, 5 Nov 2025 17:15:20 +0100
Subject: [PATCH 214/214] Fix some stuff related to CRIU

---
 .../features/world/BauLockStateScoreboard.java         | 10 +++++++++-
 .../de/steamwar/core/WorldEditRendererCUIEditor.java   |  9 +++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/BauLockStateScoreboard.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/BauLockStateScoreboard.java
index 827a6143..147c3c85 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/BauLockStateScoreboard.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/BauLockStateScoreboard.java
@@ -23,6 +23,7 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.config.BauServer;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.utils.ScoreboardElement;
+import de.steamwar.core.CRIUWakeupEvent;
 import de.steamwar.data.BauLockState;
 import de.steamwar.linkage.Linked;
 import de.steamwar.network.packets.PacketHandler;
@@ -30,9 +31,11 @@ import de.steamwar.network.packets.server.BaulockUpdatePacket;
 import de.steamwar.sql.UserConfig;
 import lombok.Getter;
 import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
 
 @Linked
-public class BauLockStateScoreboard extends PacketHandler implements ScoreboardElement {
+public class BauLockStateScoreboard extends PacketHandler implements ScoreboardElement, Listener {
 
     private static final String BAU_LOCK_CONFIG_NAME = "baulockstate";
 
@@ -49,6 +52,11 @@ public class BauLockStateScoreboard extends PacketHandler implements ScoreboardE
         lockState = loadLockState();
     }
 
+    @EventHandler
+    public void onCRIUWakeup(CRIUWakeupEvent event) {
+        lockState = loadLockState();
+    }
+
     @Override
     public ScoreboardGroup getGroup() {
         return ScoreboardGroup.FOOTER;
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/WorldEditRendererCUIEditor.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/WorldEditRendererCUIEditor.java
index 193e8a98..0060d29a 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/WorldEditRendererCUIEditor.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/WorldEditRendererCUIEditor.java
@@ -46,6 +46,15 @@ public class WorldEditRendererCUIEditor implements Listener {
         }
     }
 
+    @EventHandler
+    public void onCRIUSleep(CRIUSleepEvent event) {
+        for (Type type : Type.values()) {
+            type.materialCache.clear();
+            type.widthCache.clear();
+        }
+    }
+
+
     @AllArgsConstructor
     public enum Type {
         SELECTION("cui_selection_material", "cui_selection_width", Material.PURPLE_CONCRETE, Width.MEDIUM),