[bausystem]: Remove unused key

Reviewed-on: SteamWar/SteamWar#322
Reviewed-by: Chaoscaot <max@chaoscaot.de>

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/dev/CreateKitCommand.java

@@ -0,0 +1,63 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2026 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.bausystem.features.dev;
+
+import de.steamwar.bausystem.BauSystem;
+import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.entity.Player;
+
+import java.io.File;
+import java.io.IOException;
+
+@Linked
+public class CreateKitCommand extends SWCommand {
+
+    public CreateKitCommand() {
+        super("createkit");
+        if (!BauSystem.DEV_SERVER) unregister();
+    }
+
+    @Register
+    public void onCommand(Player player, String name) {
+        YamlConfiguration yaml = new YamlConfiguration();
+
+        yaml.set("Items", player.getInventory().getContents());
+        yaml.set("Armor", player.getInventory().getArmorContents());
+        yaml.set("Effects", player.getActivePotionEffects());
+        yaml.set("LeaderAllowed", true);
+        yaml.set("MemberAllowed", true);
+        yaml.set("EnterStage", 0);
+        yaml.set("TNT", true);
+
+        YamlConfiguration kits = new YamlConfiguration();
+
+        kits.set("Kits." + name, yaml);
+
+        try {
+            kits.save(new File("new.kits.yaml"));
+
+            player.sendMessage("Kit created!");
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/rendering/ViewFlag.java

@@ -135,7 +135,7 @@ public abstract class ViewFlag {
                 }
 
                 Location secoundLocation;
-                if (previousVelocity.getX() >= previousVelocity.getZ()) {
+                if (Math.abs(previousVelocity.getX()) >= Math.abs(previousVelocity.getZ())) {
                     secoundLocation = previous.getLocation().clone().add(delta.getX(), delta.getY(), 0);
                 } else {
                     secoundLocation = previous.getLocation().clone().add(0, delta.getY(), delta.getZ());
@@ -198,6 +198,16 @@ public abstract class ViewFlag {
         }
     };
 
+    public static ViewFlag HIGHLIGHT = new ViewFlag(true, false, "highlight", "h") {
+        @Override
+        public void modify(REntityServer server, List<TraceEntity> entities) {
+            for (TraceEntity entity : entities) {
+                entity.setGlowing(true);
+            }
+        }
+
+    };
+
     /**
      * Name of the flag
      */

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

@@ -90,7 +90,7 @@ class EventGroup(id: EntityID<Int>) : IntEntity(id) {
         set(value) {
             groupPointsPerDraw = value
         }
-    val dependents by lazy { EventRelation.getGroupRelations(this).toList() }
+    val dependents by lazy { EventRelation.getGroupRelations(this) }
     val lastFight by lazy { Optional.ofNullable(fights.maxByOrNull { it.startTime }) }
 
     fun getId() = id.value

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

@@ -51,11 +51,11 @@ class EventRelation(id: EntityID<Int>) : IntEntity(id) {
 
         @JvmStatic
         fun getFightRelations(fight: EventFight) =
-            useDb { find { (EventRelationTable.fromId eq fight.id.value) and (EventRelationTable.fromType eq FromType.FIGHT) } }
+            useDb { find { (EventRelationTable.fromId eq fight.id.value) and (EventRelationTable.fromType eq FromType.FIGHT) }.toList() }
 
         @JvmStatic
         fun getGroupRelations(group: EventGroup) =
-            useDb { find { (EventRelationTable.fromId eq group.id.value) and (EventRelationTable.fromType eq FromType.GROUP) } }
+            useDb { find { (EventRelationTable.fromId eq group.id.value) and (EventRelationTable.fromType eq FromType.GROUP) }.toList() }
 
         @JvmStatic
         fun create(fight: EventFight, fightTeam: FightTeam, fromType: FromType, fromId: Int, fromPlace: Int) = useDb {

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

@@ -52,6 +52,10 @@ public final class GameModeConfig<M, W> {
     private static final Map<String, GameModeConfig<?, String>> byGameName;
     private static final Map<SchematicType, GameModeConfig<?, String>> bySchematicType;
 
+    public static <M> Collection<GameModeConfig<M, String>> getAll() {
+        return (Collection) byFileName.values();
+    }
+
     public static <M> GameModeConfig<M, String> getByFileName(File file) {
         return (GameModeConfig<M, String>) byFileName.get(file.getName());
     }
@@ -87,8 +91,24 @@ public final class GameModeConfig<M, W> {
         byFileName = new HashMap<>();
         byGameName = new HashMap<>();
         bySchematicType = new HashMap<>();
-        SchematicType.values();
         DEFAULTS = SQLWrapper.impl.loadGameModeConfig(null);
+        init();
+    }
+
+    public static void init() {
+        byFileName.clear();
+        byGameName.clear();
+        bySchematicType.clear();
+
+        File folder = SQLWrapper.impl.getSchemTypesFolder();
+        if (!folder.exists()) return;
+        if (!folder.isDirectory()) return;
+
+        for (File file : Objects.requireNonNull(folder.listFiles())) {
+            if (!file.getName().endsWith(".yml")) continue;
+            if (file.getName().endsWith(".kits.yml")) continue;
+            SQLWrapper.impl.loadGameModeConfig(file);
+        }
 
         byFileName.values().forEach(gameModeConfig -> {
             List<SchematicType> subTypes = Collections.unmodifiableList(gameModeConfig.Schematic.SubTypesStrings.stream()
@@ -671,9 +691,9 @@ public final class GameModeConfig<M, W> {
             loaded = loader.canLoad();
             Size = new SizeConfig(loader.with("Size"));
             Inset = new InsetConfig(loader.with("Inset"));
-            Type = loader.getSchematicType("Type", "Normal");
+            Type = null;
             SubTypesStrings = loader.getStringList("SubTypes");
-            SubTypes = loader.getSchematicTypeList("SubTypes");
+            SubTypes = new ArrayList<>();
             Shortcut = loader.getString("Shortcut", "");
             Material = loader.getMaterial("Material", "STONE_BUTTON");
             ManualCheck = loader.getBoolean("ManualCheck", true);

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

@@ -94,7 +94,7 @@ class NodeMember(id: EntityID<CompositeID>) : CompositeEntity(id) {
         { Optional.ofNullable(it?.value) })
         private set
 
-    fun setParentId(id: Int?) {
+    fun setParentId(id: Int?) = useDb {
         parent = Optional.ofNullable(id)
     }
 

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

@@ -36,8 +36,5 @@ public interface SQLWrapper<M> {
         return Collections.emptyList();
     }
 
-    default void processSchematicType(GameModeConfig<?, String> gameModeConfig) {
-    }
-
     void additionalExceptionMetadata(StringBuilder builder);
 }

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

@@ -19,11 +19,7 @@
 
 package de.steamwar.sql
 
-import java.io.File
 import java.util.*
-import java.util.Locale
-import java.util.Locale.getDefault
-import java.util.stream.Collectors
 
 data class SchematicType(
     val name: String,
@@ -47,58 +43,65 @@ data class SchematicType(
         @JvmField
         val Normal = SchematicType("Normal", "", Type.NORMAL, null, "STONE_BUTTON", false)
 
-        private val types: List<SchematicType>
+        private val types: MutableList<SchematicType> = mutableListOf()
-        private val fromDB: Map<String, SchematicType>?
+        private val fromDB: MutableMap<String, SchematicType> = mutableMapOf()
 
         init {
-            val tmpTypes = mutableListOf<SchematicType>()
+            GameModeConfig.init()
-            val tmpFromDB = mutableMapOf<String, SchematicType>()
+            init()
-
-            tmpTypes.add(Normal)
-            tmpFromDB[Normal.toDB()] = Normal
-
-            val folder = SQLWrapper.impl.schemTypesFolder
-            if (folder.exists()) {
-                for (configFile in Arrays.stream<File?>(folder.listFiles { _, name ->
-                    name.endsWith(
-                        ".yml"
-                    ) && !name.endsWith(".kits.yml")
-                }).sorted().collect(Collectors.toList())) {
-                    val gameModeConfig = SQLWrapper.impl.loadGameModeConfig(configFile)
-                    if (gameModeConfig.Schematic.Type == null) continue
-                    if (tmpFromDB.containsKey(gameModeConfig.Schematic.Type.toDB())) continue
-                    val current = gameModeConfig.Schematic.Type
-                    if (gameModeConfig.CheckQuestions.isNotEmpty()) {
-                        val checkType = current.checkType
-                        tmpTypes.add(checkType!!)
-                        tmpFromDB[checkType.toDB()] = checkType
-                    }
-                    tmpTypes.add(current)
-                    tmpFromDB[current.toDB()] = current
-                    SQLWrapper.impl.processSchematicType(gameModeConfig)
-                }
-            }
-
-            types = tmpTypes.toList()
-            fromDB = tmpFromDB.toMap()
         }
 
         @JvmStatic
-        fun values() = types
+        fun init() {
+            types.clear()
+            fromDB.clear()
+
+            types.add(Normal)
+            fromDB[Normal.toDB()] = Normal
+
+            for (gameModeConfig in GameModeConfig.getAll<Any>()) {
+                val type = gameModeConfig.Schematic.Type
+                    ?: continue
+                if (fromDB.containsKey(type.toDB())) continue
+
+                types.add(type)
+                fromDB[type.toDB()] = type
+                if (gameModeConfig.CheckQuestions.isNotEmpty() && type.checkType != null) {
+                    types.add(type.checkType)
+                    fromDB[type.checkType.toDB()] = type.checkType
+                }
+            }
+        }
 
         @JvmStatic
-        fun fromDB(value: String) = fromDB?.let { it[value.lowercase()] }
+        fun values() =
+            types
+
+        @JvmStatic
+        fun fromDB(value: String) =
+            fromDB[value.lowercase()]
     }
 
-    fun name() = name
+    fun name() =
-    fun toDB() = name.lowercase()
+        name
 
-    fun check() = type == Type.CHECK_TYPE
+    fun toDB() =
-    fun fightType() = type == Type.FIGHT_TYPE
+        name.lowercase()
-    fun writeable() = type == Type.NORMAL
 
-    fun checkType() = if (manualCheck) checkType else this
+    fun check() =
-    fun isAssignable() = type == Type.NORMAL || (type == Type.FIGHT_TYPE && checkType != null) || !manualCheck
+        type == Type.CHECK_TYPE
+
+    fun fightType() =
+        type == Type.FIGHT_TYPE
+
+    fun writeable() =
+        type == Type.NORMAL
+
+    fun checkType() =
+        if (manualCheck) checkType else this
+
+    fun isAssignable() =
+        type == Type.NORMAL || (type == Type.FIGHT_TYPE && checkType != null) || !manualCheck
 
     enum class Type {
         NORMAL,

FightSystem/FightSystem_21/build.gradle.kts

@@ -42,4 +42,5 @@ dependencies {
 
     compileOnly(libs.fastutil)
     compileOnly(libs.authlib)
+    compileOnly(project(":FightSystem:FightSystem_14"))
 }

FightSystem/FightSystem_21/src/de/steamwar/fightsystem/listener/WindchargeStopper21.java

@@ -0,0 +1,51 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.fightsystem.listener;
+
+import de.steamwar.fightsystem.Config;
+import de.steamwar.fightsystem.states.FightState;
+import de.steamwar.fightsystem.states.StateDependentTask;
+import net.minecraft.world.entity.projectile.windcharge.WindCharge;
+import org.bukkit.Location;
+
+public class WindchargeStopper21 implements WindchargeStopper.IWindchargeStopper {
+
+    public WindchargeStopper21() {
+        new StateDependentTask(true, FightState.Running, this::run, 1, 1);
+    }
+
+    private static final int middleLine = Config.SpecSpawn.getBlockZ();
+
+    private static final Class<?> windChargeClass = WindCharge.class;
+
+    private void run() {
+        Recording.iterateOverEntities(windChargeClass::isInstance, entity -> {
+            Location location = entity.getLocation();
+            Location prevLocation = location.clone().subtract(entity.getVelocity());
+
+            boolean passedMiddle = location.getBlockZ() > middleLine && prevLocation.getBlockZ() > middleLine ||
+                    location.getBlockZ() < middleLine && prevLocation.getBlockZ() < middleLine;
+
+            if(!passedMiddle) {
+                entity.remove();
+            }
+        });
+    }
+}

FightSystem/FightSystem_21/src/de/steamwar/fightsystem/utils/FlatteningWrapper21.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.fightsystem.utils;
+
+import org.bukkit.inventory.ItemStack;
+
+public class FlatteningWrapper21 extends FlatteningWrapper14 {
+    @Override
+    public boolean hasAttributeModifier(ItemStack stack) {
+        return stack.hasItemMeta() && stack.getItemMeta() != null && stack.getItemMeta().hasAttributeModifiers();
+    }
+}

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

@@ -38,6 +38,27 @@ public class ReflectionWrapper21 implements ReflectionWrapper {
         FORBIDDEN_TYPES.add(DataComponentTypes.BLOCKS_ATTACKS);
         FORBIDDEN_TYPES.add(DataComponentTypes.BUNDLE_CONTENTS);
         FORBIDDEN_TYPES.add(DataComponentTypes.CUSTOM_MODEL_DATA);
+
+        FORBIDDEN_TYPES.add(DataComponentTypes.ATTRIBUTE_MODIFIERS);
+        FORBIDDEN_TYPES.add(DataComponentTypes.TOOL);
+        FORBIDDEN_TYPES.add(DataComponentTypes.WEAPON);
+        FORBIDDEN_TYPES.add(DataComponentTypes.FOOD);
+        FORBIDDEN_TYPES.add(DataComponentTypes.CONSUMABLE);
+        FORBIDDEN_TYPES.add(DataComponentTypes.POTION_CONTENTS);
+        FORBIDDEN_TYPES.add(DataComponentTypes.STORED_ENCHANTMENTS);
+        FORBIDDEN_TYPES.add(DataComponentTypes.CAN_BREAK);
+        FORBIDDEN_TYPES.add(DataComponentTypes.CAN_PLACE_ON);
+        FORBIDDEN_TYPES.add(DataComponentTypes.MAX_DAMAGE);
+        FORBIDDEN_TYPES.add(DataComponentTypes.USE_REMAINDER);
+        FORBIDDEN_TYPES.add(DataComponentTypes.USE_COOLDOWN);
+        FORBIDDEN_TYPES.add(DataComponentTypes.SUSPICIOUS_STEW_EFFECTS);
+        FORBIDDEN_TYPES.add(DataComponentTypes.CHARGED_PROJECTILES);
+        FORBIDDEN_TYPES.add(DataComponentTypes.INTANGIBLE_PROJECTILE);
+        FORBIDDEN_TYPES.add(DataComponentTypes.FIREWORKS);
+        FORBIDDEN_TYPES.add(DataComponentTypes.FIREWORK_EXPLOSION);
+        FORBIDDEN_TYPES.add(DataComponentTypes.EQUIPPABLE);
+        FORBIDDEN_TYPES.add(DataComponentTypes.REPAIR_COST);
+        FORBIDDEN_TYPES.add(DataComponentTypes.ENCHANTABLE);
     }
 
     @Override

FightSystem/FightSystem_8/src/de/steamwar/fightsystem/listener/WindchargeStopper8.java

@@ -0,0 +1,23 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received 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;
+
+public class WindchargeStopper8 implements WindchargeStopper.IWindchargeStopper {
+}

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

@@ -23,12 +23,14 @@ import com.sk89q.worldedit.extent.clipboard.Clipboard;
 import de.steamwar.fightsystem.ArenaMode;
 import de.steamwar.fightsystem.Config;
 import de.steamwar.fightsystem.FightSystem;
+import de.steamwar.fightsystem.fight.Fight;
 import de.steamwar.fightsystem.fight.FightTeam;
 import de.steamwar.fightsystem.fight.JoinRequest;
 import de.steamwar.fightsystem.listener.Chat;
 import de.steamwar.fightsystem.record.GlobalRecorder;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.OneShotStateDependent;
+import de.steamwar.fightsystem.utils.Region;
 import de.steamwar.sql.SchematicNode;
 import de.steamwar.sql.SteamwarUser;
 import lombok.Getter;
@@ -52,6 +54,7 @@ import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Villager;
 import org.bukkit.event.player.PlayerTeleportEvent;
 import org.bukkit.scheduler.BukkitTask;
+import org.bukkit.util.Vector;
 
 import java.util.*;
 import java.util.logging.Level;
@@ -84,8 +87,6 @@ public abstract class AI {
     private final BukkitTask task;
     private final Queue<Action> queue = new ArrayDeque<>();
 
-    protected final NavMesh navMesh;
-
     protected AI(FightTeam team, SteamwarUser user) {
         this.team = team;
 
@@ -97,8 +98,6 @@ public abstract class AI {
         ais.put(entity.getUniqueId(), this);
         team.addMember(entity, user);
 
-        navMesh = new NavMesh(team);
-
         if(FightState.Schem.contains(FightState.getFightState()))
             Bukkit.getScheduler().runTask(FightSystem.getPlugin(), () -> schematic(team.getClipboard()));
     }
@@ -135,61 +134,58 @@ public abstract class AI {
         Chat.broadcastChat("PARTICIPANT_CHAT", team.getColoredName(), entity.getName(), message);
     }
 
-    public LocalCoordinate getPosition() {
+    public Vector getPosition() {
-        return WorldCoordinate.from(entity.getLocation()).toLocal(team);
+        Location location = entity.getLocation();
+        Region extend = team.getExtendRegion();
+        if(Fight.getUnrotated() == team)
+            return new Vector(
+                    location.getX() - extend.getMinX(),
+                    location.getY() - team.getSchemRegion().getMinY(),
+                    location.getZ() - extend.getMinZ()
+            );
+        else
+            return new Vector(
+                    extend.getMaxX() - location.getX(),
+                    location.getY() - team.getSchemRegion().getMinY(),
+                    extend.getMaxZ() - location.getZ()
+            );
     }
 
-    public Material getBlock(WorldCoordinate pos) {
+    public Material getBlock(Vector pos) {
-        return getBlock(pos.toLocal(team));
-    }
-
-    public Material getBlock(LocalCoordinate pos) {
         queue.add(new Action(1));
-        return pos.toWorld(team).toLocation(Config.world).getBlock().getType();
+        return translate(pos).getBlock().getType();
     }
 
-    public BlockData getBlockData(WorldCoordinate pos) {
+    public BlockData getBlockData(Vector pos) {
-        return getBlockData(pos.toLocal(team));
-    }
-
-    public BlockData getBlockData(LocalCoordinate pos) {
         queue.add(new Action(1));
-        return pos.toWorld(team).toLocation(Config.world).getBlock().getBlockData();
+        return translate(pos).getBlock().getBlockData();
     }
 
-    public void setTNT(WorldCoordinate pos) {
+    public void setTNT(Vector pos) {
-        setTNT(pos.toLocal(team));
-    }
-
-    public void setTNT(LocalCoordinate pos) {
         queue.add(new Action(1) {
             @Override
             public void run() {
                 if(FightState.getFightState() != FightState.RUNNING)
                     return;
 
-                Location location = pos.toWorld(team).toLocation(Config.world);
+                Location location = translate(pos);
                 if(interactionDistanceViolation(location)) {
                     chat("InteractionDistanceViolation: setTNT");
                     return;
                 }
 
                 Block block = location.getBlock();
-                if(block.getType() == Material.AIR || block.getType() == Material.WATER || block.getType() == Material.LAVA || block.getType() == Material.TNT)
+                if(block.getType() == Material.AIR)
                     block.setType(Material.TNT);
             }
         });
     }
 
-    public void interact(WorldCoordinate pos) {
+    public void interact(Vector pos) {
-        interact(pos.toLocal(team));
-    }
-
-    public void interact(LocalCoordinate pos) {
         queue.add(new Action(1) {
             @Override
             public void run() {
-                Location location = pos.toWorld(team).toLocation(Config.world);
+                Location location = translate(pos);
                 if(interactionDistanceViolation(location)) {
                     chat("InteractionDistanceViolation: interact");
                     return;
@@ -200,15 +196,11 @@ public abstract class AI {
         });
     }
 
-    public void interact(WorldCoordinate pos, int n) {
+    public void interact(Vector pos, int n) {
-        interact(pos.toLocal(team), n);
-    }
-
-    public void interact(LocalCoordinate pos, int n) {
         queue.add(new Action(1) {
            @Override
            public void run() {
-               Location location = pos.toWorld(team).toLocation(Config.world);
+               Location location = translate(pos);
                if (interactionDistanceViolation(location))
                    return;
                Block block = location.getBlock();
@@ -225,75 +217,39 @@ public abstract class AI {
         });
     }
 
-    public MoveResult checkMove(WorldCoordinate target) {
+    public void move(Vector pos) {
-        Location location = entity.getLocation();
-        if(!entity.isOnGround() && location.getBlock().getType() != Material.LADDER) {
-            return MoveResult.FALLING;
-        }
-
-        if(Math.abs(location.getX() - target.getX()) > 1.5 || Math.abs(location.getY() - target.getY()) > 1.5 || Math.abs(location.getZ() - target.getZ()) > 1.5) {
-            return MoveResult.OVERDISTANCE;
-        }
-
-        if(!team.getFightPlayer(entity).canEntern() && !team.getExtendRegion().inRegion(target.toLocation(null)))
-            return MoveResult.OUT_OF_BORDER;
-        return MoveResult.OK;
-    }
-
-    public enum MoveResult {
-        FALLING,
-        OVERDISTANCE,
-        OUT_OF_BORDER,
-        OK,
-    }
-
-    public void move(WorldCoordinate pos) {
         queue.add(new Action(MOVEMENT_DELAY) {
             @Override
             public void run() {
-                MoveResult moveResult = checkMove(pos);
+                Location location = entity.getLocation();
-                switch (moveResult) {
+                if(!entity.isOnGround() && location.getBlock().getType() != Material.LADDER) {
-                    case FALLING:
+                    FightSystem.getPlugin().getLogger().log(Level.INFO, "Entity falling");
-                        FightSystem.getPlugin().getLogger().log(Level.INFO, "Entity falling");
+                    return;
-                        return;
-                    case OVERDISTANCE:
-                        FightSystem.getPlugin().getLogger().log(Level.INFO, () -> entity.getName() + ": Overdistance movement " + entity.getLocation().toVector() + " " + pos);
-                        return;
-                    case OUT_OF_BORDER:
-                        return;
-                    default:
-                        break;
                 }
 
-                Location currentLocation = entity.getLocation();
+                Location target = translate(pos);
-                Location target = pos.toLocation(Config.world);
+                if(Math.abs(location.getX() - target.getX()) > 1.0 || Math.abs(location.getY() - target.getY()) > 1.5 || Math.abs(location.getZ() - target.getZ()) > 1.0) {
-                if (currentLocation.getBlockX() != target.getBlockX() || currentLocation.getBlockY() != target.getBlockY() || currentLocation.getBlockZ() != target.getBlockZ()) {
+                    FightSystem.getPlugin().getLogger().log(Level.INFO, () -> entity.getName() + ": Overdistance movement " + location.toVector() + " " + target.toVector());
-                    target.setDirection(target.toVector().subtract(currentLocation.toVector()));
+                    return;
-                }
-                if (currentLocation.getBlockX() == target.getBlockX() && currentLocation.getBlockZ() == target.getBlockZ()) {
-                    target.setYaw(currentLocation.getYaw());
                 }
 
+                if(!team.getFightPlayer(entity).canEntern() && !team.getExtendRegion().inRegion(target))
+                    return;
+
                 if(!entity.teleport(target, PlayerTeleportEvent.TeleportCause.PLUGIN))
                     FightSystem.getPlugin().getLogger().log(Level.INFO, "Entity not teleported: " + entity.isValid());
 
                 GlobalRecorder.getInstance().entityMoves(entity);
-                navMesh.update(getPosition().toWorld(team));
             }
         });
     }
 
-    public void move(LocalCoordinate pos) {
-        move(pos.toWorld(team));
-    }
-
     private boolean interactionDistanceViolation(Location location) {
         return location.distance(entity.getEyeLocation()) > INTERACTION_RANGE;
     }
 
     private void interact(Block block) {
         BlockData data = block.getBlockData(); //TODO only 1.14+ compatible at the moment
-        System.out.println(block + " " + data);
         if (data instanceof NoteBlock) {
             NoteBlock noteBlock = (NoteBlock) data;
             Note note = noteBlock.getNote();
@@ -324,7 +280,6 @@ public abstract class AI {
             }
 
             powerable.setPowered(!isPowered);
-            System.out.println(powerable);
         }
         block.setBlockData(data);
         if(data instanceof Switch) {
@@ -364,6 +319,24 @@ public abstract class AI {
             queue.poll().run();
     }
 
+    public Location translate(Vector pos) {
+        Region extend = team.getExtendRegion();
+        if(Fight.getUnrotated() == team)
+            return new Location(
+                    Config.world,
+                    pos.getX() + extend.getMinX(),
+                    pos.getY() + team.getSchemRegion().getMinY(),
+                    pos.getZ() + extend.getMinZ()
+            );
+        else
+            return new Location(
+                    Config.world,
+                    extend.getMaxX() - pos.getX(),
+                    pos.getY() + team.getSchemRegion().getMinY(),
+                    extend.getMaxZ() - pos.getZ()
+            );
+    }
+
     private static class Action {
         private int delay;
         public Action(int delay) {

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

@@ -20,10 +20,8 @@
 package de.steamwar.fightsystem.ai;
 
 import de.steamwar.Reflection;
-import de.steamwar.core.Core;
 import de.steamwar.fightsystem.ArenaMode;
 import de.steamwar.fightsystem.Config;
-import de.steamwar.fightsystem.ai.yoyonow.YoyoNowAI;
 import de.steamwar.fightsystem.fight.FightTeam;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -37,8 +35,7 @@ import java.util.stream.Collectors;
 @AllArgsConstructor
 public class AIManager {
     private static final List<AIManager> AIs = Arrays.asList(
-            new AIManager(DummyAI.class, Material.STONE, () -> ArenaMode.Test.contains(Config.mode)),
+            new AIManager(DummyAI.class, Material.STONE, () -> ArenaMode.Test.contains(Config.mode))
-            new AIManager(YoyoNowAI.class, Material.SLIME_BLOCK, () -> Config.GameModeConfig.Schematic.Type.toDB().equals("miniwargear") && Core.getVersion() >= 14)
     );
 
     public static List<AIManager> availableAIs() {

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

@@ -1,180 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2026 SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.fightsystem.ai;
-
-import de.steamwar.fightsystem.ai.schematic.Cannon;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public interface Action {
-
-    Result step(AI ai);
-
-    enum Result {
-        ONGOING,
-        FINISHED,
-        FAILED,
-        ;
-    }
-
-    class MultiAction implements Action {
-
-        protected final List<Action> actions = new ArrayList<>();
-
-        @Override
-        public Result step(AI ai) {
-            if (!actions.isEmpty()) {
-                Action.Result result = actions.get(0).step(ai);
-                if (result == Action.Result.FAILED) {
-                    ai.chat(this + " + " + actions.get(0) + " failed");
-                    actions.clear();
-                    return Result.FAILED;
-                }
-                if (result == Action.Result.FINISHED) {
-                    ai.chat(this + " + " + actions.get(0) + " finished");
-                    actions.remove(0);
-                }
-            }
-            return actions.isEmpty() ? Result.FINISHED : Result.ONGOING;
-        }
-    }
-
-    class WaitAction implements Action {
-
-        private int delay;
-
-        public WaitAction(int delay) {
-            this.delay = delay;
-        }
-
-        @Override
-        public Result step(AI ai) {
-            if (--delay > 0) {
-                return Result.ONGOING;
-            } else {
-                return Result.FINISHED;
-            }
-        }
-    }
-
-    class MoveAction implements Action {
-
-        private final WorldCoordinate destination;
-        private List<WorldCoordinate> path;
-        private int overDistanceCounter = 0;
-
-        public MoveAction(AI ai, LocalCoordinate destination) {
-            this(ai, destination.toWorld(ai.team));
-        }
-
-        public MoveAction(AI ai, WorldCoordinate destination) {
-            this.destination = destination;
-            this.path = ai.navMesh.pathToNearest(ai.getPosition().toWorld(ai.team), destination);
-        }
-
-        @Override
-        public Result step(AI ai) {
-            if (this.path.isEmpty()) return Result.FAILED;
-            WorldCoordinate coordinate = path.get(0);
-
-            if (!ai.navMesh.isWalkable(coordinate)) {
-                path = ai.navMesh.pathToNearest(ai.getPosition().toWorld(ai.team), destination);
-                if (path.isEmpty()) return Result.FAILED;
-                coordinate = path.get(0);
-            }
-
-            AI.MoveResult moveResult = ai.checkMove(coordinate);
-            if (moveResult == AI.MoveResult.OVERDISTANCE) {
-                if (overDistanceCounter == 5) {
-                    path = ai.navMesh.pathToNearest(ai.getPosition().toWorld(ai.team), destination);
-                    return path.isEmpty() ? Result.FAILED : Result.ONGOING;
-                }
-                if (overDistanceCounter++ > 5) {
-                    return Result.FAILED;
-                }
-                return Result.ONGOING;
-            }
-            overDistanceCounter = 0;
-
-            if (moveResult == AI.MoveResult.FALLING) {
-                return Result.ONGOING;
-            }
-
-            if (moveResult == AI.MoveResult.OK) {
-                path.remove(0);
-                ai.move(coordinate);
-            }
-            return path.isEmpty() ? Result.FINISHED : Result.ONGOING;
-        }
-    }
-
-    class InteractAction implements Action {
-        private final LocalCoordinate destination;
-
-        public InteractAction(LocalCoordinate destination) {
-            this.destination = destination;
-        }
-
-        @Override
-        public Result step(AI ai) {
-            ai.interact(destination);
-            return Result.FINISHED;
-        }
-    }
-
-    class ReadyAction implements Action {
-
-        @Override
-        public Result step(AI ai) {
-            ai.setReady();
-            return Result.FINISHED;
-        }
-    }
-
-    class PlaceTNTAction implements Action {
-
-        private final LocalCoordinate destination;
-
-        public PlaceTNTAction(LocalCoordinate destination) {
-            this.destination = destination;
-        }
-
-        @Override
-        public Result step(AI ai) {
-            ai.setTNT(destination);
-            return Result.FINISHED;
-        }
-    }
-
-    class LoadCannon extends MultiAction {
-
-        public LoadCannon(AI ai, Cannon cannon) {
-            for (LocalCoordinate tntPosition : cannon.getTntPositions()) {
-                actions.add(new MoveAction(ai, tntPosition.toWorld(ai.team)));
-                actions.add(new PlaceTNTAction(tntPosition));
-            }
-
-            LocalCoordinate trigger = cannon.getTriggerPositions().iterator().next();
-            actions.add(new MoveAction(ai, trigger.toWorld(ai.team)));
-            actions.add(new InteractAction(trigger));
-        }
-    }
-}

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

@@ -1,90 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2026 SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.fightsystem.ai;
-
-import de.steamwar.fightsystem.fight.Fight;
-import de.steamwar.fightsystem.fight.FightTeam;
-import de.steamwar.fightsystem.utils.Region;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import org.bukkit.util.NumberConversions;
-
-@Getter
-@AllArgsConstructor
-public class LocalCoordinate {
-    private double x;
-    private double y;
-    private double z;
-
-    public int getBlockX() {
-        return NumberConversions.floor(x);
-    }
-
-    public int getBlockY() {
-        return NumberConversions.floor(y);
-    }
-
-    public int getBlockZ() {
-        return NumberConversions.floor(z);
-    }
-
-    public double distanceSquared(LocalCoordinate coordinate) {
-        return NumberConversions.square(x - coordinate.x) + NumberConversions.square(y - coordinate.y) + NumberConversions.square(z - coordinate.z);
-    }
-
-    public WorldCoordinate toWorld(FightTeam team) {
-        // TODO: Fix the of by one blue/red
-        // Team Red is not correct!
-        // NightTown is team blue unrotated!
-        Region extend = team.getExtendRegion();
-        if(Fight.getUnrotated() == team) {
-            return new WorldCoordinate(
-                    x + extend.getMinX(),
-                    y + team.getSchemRegion().getMinY(),
-                    z + extend.getMinZ()
-            );
-        } else {
-            return new WorldCoordinate(
-                    extend.getMaxX() - x - 1,
-                    y + team.getSchemRegion().getMinY(),
-                    extend.getMaxZ() - z - 1
-            );
-        }
-    }
-
-    public LocalCoordinate add(LocalCoordinate localCoordinate) {
-        this.x += localCoordinate.x;
-        this.y += localCoordinate.y;
-        this.z += localCoordinate.z;
-        return this;
-    }
-
-    public LocalCoordinate add(double x, double y, double z) {
-        this.x += x;
-        this.y += y;
-        this.z += z;
-        return this;
-    }
-
-    @Override
-    public String toString() {
-        return "Local{" + x + "," + y + "," + z + "}";
-    }
-}

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

@@ -1,402 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2026 SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.fightsystem.ai;
-
-import de.steamwar.entity.RBlockDisplay;
-import de.steamwar.entity.REntity;
-import de.steamwar.entity.REntityServer;
-import de.steamwar.fightsystem.ArenaMode;
-import de.steamwar.fightsystem.Config;
-import de.steamwar.fightsystem.FightSystem;
-import de.steamwar.fightsystem.fight.FightTeam;
-import de.steamwar.fightsystem.states.FightState;
-import de.steamwar.fightsystem.states.OneShotStateDependent;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import org.bukkit.Bukkit;
-import org.bukkit.Material;
-import org.bukkit.block.Block;
-import org.bukkit.block.data.BlockData;
-import org.bukkit.util.BoundingBox;
-import org.bukkit.util.NumberConversions;
-import org.bukkit.util.Transformation;
-import org.bukkit.util.VoxelShape;
-import org.joml.AxisAngle4f;
-import org.joml.Vector3f;
-
-import java.util.*;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-public class NavMesh {
-
-    private static final double PLAYER_FALL_DISTANCE = 3;
-    private static final double PLAYER_JUMP_HEIGHT = 1.25;
-    private static final double PLAYER_HEIGHT = 1.8;
-    private static final Cuboid PLAYER_SHADOW = new Cuboid(0.2, 0, 0.2, 0.6, 1, 0.6);
-
-    private static final Set<Pos> RELATIVE_BLOCKS = new HashSet<>();
-    protected static final BlockData PATH_BLOCK = Material.LIME_STAINED_GLASS.createBlockData();
-
-    static {
-        for (int y = (int) -Math.ceil(PLAYER_FALL_DISTANCE); y <= Math.ceil(PLAYER_JUMP_HEIGHT); y++) {
-            RELATIVE_BLOCKS.add(new Pos(-1, y, 0));
-            RELATIVE_BLOCKS.add(new Pos(1, y, 0));
-            RELATIVE_BLOCKS.add(new Pos(0, y, -1));
-            RELATIVE_BLOCKS.add(new Pos(0, y, 1));
-        }
-        RELATIVE_BLOCKS.add(new Pos(0, 1, 0));
-        RELATIVE_BLOCKS.add(new Pos(0, -1, 0));
-    }
-
-    private FightTeam fightTeam;
-    private REntityServer server = new REntityServer();
-
-    private Map<Pos, Pos> walkable = new HashMap<>();
-    private Map<Pos, Set<Pos>> connections = new HashMap<>(); // Reverse connections!
-
-    @Getter
-    private boolean ready = false;
-
-    public NavMesh(FightTeam fightTeam) {
-        this.fightTeam = fightTeam;
-
-        new OneShotStateDependent(ArenaMode.All, FightState.PostSchemSetup, () -> {
-            Bukkit.getOnlinePlayers().forEach(server::addPlayer);
-
-            Bukkit.getScheduler().runTaskLater(FightSystem.getPlugin(), () -> {
-                long time = System.currentTimeMillis();
-
-                fightTeam.getExtendRegion().forEach((x, y, z) -> {
-                    if (y < fightTeam.getSchemRegion().getMinY()) return;
-                    calculatePosition(new Pos(x, y, z), walkable);
-                });
-
-                walkable.values().forEach(this::checkNeighbouring);
-
-                System.out.println("NavMesh initialized in " + (System.currentTimeMillis() - time) + " ms");
-                ready = true;
-            }, 20);
-        });
-        new OneShotStateDependent(ArenaMode.All, FightState.Spectate, () -> {
-            ready = false;
-        });
-    }
-
-    private void calculatePosition(Pos pos, Map<Pos, Pos> walkable) {
-        Block block = Config.world.getBlockAt(pos.x, pos.y, pos.z);
-        // Air is not walkable
-        if (block.isPassable()) return;
-
-        // Ignore Ladders from floor calculation!
-        if (block.getType() != Material.LADDER) {
-            // Floor Position
-            pos.floor = playerCollisionMax(block.getCollisionShape());
-            // If no walkable block remove
-            if (pos.floor == 0) return;
-        } else {
-            pos.floor = 0.5;
-        }
-
-        // Ceiling Position
-        pos.ceiling = fightTeam.getExtendRegion().getMaxY() - pos.y;
-        for (int y = pos.y + 1; y <= fightTeam.getExtendRegion().getMaxY() + 3; y++) {
-            block = Config.world.getBlockAt(pos.x, y, pos.z);
-            if (block.isPassable()) continue;
-            double min = playerCollisionMin(block.getCollisionShape());
-            if (min >= 1.0) continue;
-            pos.ceiling = y + min - pos.y;
-            break;
-        }
-        // If player cannot fit remove
-        if (pos.ceiling - pos.floor < PLAYER_HEIGHT) return;
-
-        walkable.put(pos, pos);
-    }
-
-    @RequiredArgsConstructor
-    private static class Pos {
-        private final int x;
-        private final int y;
-        private final int z;
-        private double floor = 0;
-        private double ceiling = 0;
-
-        @Override
-        public String toString() {
-            return x + "," + y + "(" + floor + ".." + ceiling + ")" + "," + z;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) return true;
-            if (!(o instanceof Pos)) return false;
-            Pos pos = (Pos) o;
-            return x == pos.x && y == pos.y && z == pos.z;
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(x, y, z);
-        }
-
-        public Pos add(Pos pos) {
-            return new Pos(x + pos.x, y + pos.y, z + pos.z);
-        }
-
-        public WorldCoordinate toWorld() {
-            return new WorldCoordinate(x, y + floor, z);
-        }
-
-        public double floorPosition() {
-            return y + floor;
-        }
-
-        public double ceilingPosition() {
-            return y + ceiling;
-        }
-    }
-
-    private double playerCollisionMax(VoxelShape voxelShape) {
-        List<Double> yList = voxelShape.getBoundingBoxes().stream()
-                .flatMap(boundingBox -> Stream.of(boundingBox.getMinY(), boundingBox.getMaxY()))
-                .sorted()
-                .collect(Collectors.toList());
-
-        double collisionY = 0;
-        for (double y : yList) {
-            if (voxelShape.getBoundingBoxes()
-                    .stream()
-                    .noneMatch(boundingBox -> collides(y, boundingBox))) {
-                collisionY = y;
-                break;
-            }
-        }
-
-        return collisionY;
-    }
-
-    private double playerCollisionMin(VoxelShape voxelShape) {
-        List<Double> yList = voxelShape.getBoundingBoxes().stream()
-                .flatMap(boundingBox -> Stream.of(boundingBox.getMinY(), boundingBox.getMaxY()))
-                .sorted(Comparator.reverseOrder())
-                .collect(Collectors.toList());
-
-        double collisionY = 1.5;
-        for (double y : yList) {
-            if (voxelShape.getBoundingBoxes()
-                    .stream()
-                    .noneMatch(boundingBox -> collides(y - 1, boundingBox))) {
-                collisionY = y;
-                break;
-            }
-        }
-
-        return collisionY;
-    }
-
-    private boolean collides(double y, BoundingBox boundingBox) {
-        Cuboid second = new Cuboid(boundingBox.getMinX(), boundingBox.getMinY(), boundingBox.getMinZ(), boundingBox.getWidthX(), boundingBox.getHeight(), boundingBox.getWidthZ());
-        return PLAYER_SHADOW.setY(y).intersects(second);
-    }
-
-    @AllArgsConstructor
-    private static class Cuboid {
-        private double x;
-        private double y;
-        private double z;
-        private double dx;
-        private double dy;
-        private double dz;
-
-        public boolean intersects(Cuboid cuboid) {
-            double minx = x - cuboid.dx;
-            double miny = y - cuboid.dy;
-            double minz = z - cuboid.dz;
-            double maxx = minx + dx + cuboid.dx;
-            double maxy = miny + dy + cuboid.dy;
-            double maxz = minz + dz + cuboid.dz;
-            return maxx > cuboid.x && maxy > cuboid.y && maxz > cuboid.z && minx < cuboid.x && miny < cuboid.y && minz < cuboid.z;
-        }
-
-        public Cuboid setY(double y) {
-            return new Cuboid(x, y, z, dx, dy, dz);
-        }
-    }
-
-    public void update(WorldCoordinate coordinate) {
-        final int px = coordinate.getBlockX();
-        final int py = coordinate.getBlockY();
-        final int pz = coordinate.getBlockZ();
-
-        for (int x = -2; x <= 2; x++) {
-            for (int z = -2; z <= 2; z++) {
-                for (int y = fightTeam.getSchemRegion().getMinY(); y <= py + 2; y++) {
-                    Pos current = new Pos(px + x, y, pz + z);
-                    walkable.remove(current);
-                    calculatePosition(current, walkable);
-                }
-            }
-        }
-
-        walkable.values().forEach(this::checkNeighbouring);
-    }
-
-    private void checkNeighbouring(Pos pos) {
-        for (Set<Pos> value : connections.values()) {
-            value.remove(pos);
-        }
-
-        for (Pos relative : RELATIVE_BLOCKS) {
-            Pos other = walkable.get(pos.add(relative));
-            if (other == null) continue;
-
-            Block thisBlock = Config.world.getBlockAt(pos.x, pos.y, pos.z);
-            Block otherBlock = Config.world.getBlockAt(other.x, other.y, other.z);
-
-            if (thisBlock.getType() != Material.LADDER && otherBlock.getType() == Material.LADDER) {
-                if ((relative.x != 0 || relative.z != 0) && pos.y != other.y) continue;
-            } else {
-                // Check if jumpable vertical distance
-                if (other.floorPosition() - pos.floorPosition() > PLAYER_JUMP_HEIGHT) continue;
-                // Check if Ceiling is high enough for player walking down!
-                if (other.ceilingPosition() < pos.floorPosition() + PLAYER_HEIGHT) continue;
-            }
-
-            connections.computeIfAbsent(other, __ -> new LinkedHashSet<>()).add(pos);
-        }
-    }
-
-    private Pos toPos(WorldCoordinate coordinate) {
-        Pos pos = new Pos(coordinate.getBlockX(), coordinate.getBlockY(), coordinate.getBlockZ());
-        if (walkable.containsKey(pos)) return walkable.get(pos);
-        pos = new Pos(pos.x, pos.y - 1, pos.z);
-        if (walkable.containsKey(pos)) return walkable.get(pos);
-        return null;
-    }
-
-    public boolean isWalkable(WorldCoordinate coordinate) {
-        Pos pos = new Pos(coordinate.getBlockX(), NumberConversions.floor(coordinate.getY() - 0.0625), coordinate.getBlockZ());
-        return walkable.containsKey(pos);
-    }
-
-    public List<WorldCoordinate> walkable() {
-        return walkable.values().stream().map(Pos::toWorld).collect(Collectors.toList());
-    }
-
-    public List<WorldCoordinate> pathToNearest(WorldCoordinate fromCoordinate, WorldCoordinate toCoordinate) {
-        Pos to = toPos(toCoordinate);
-        if (walkable.containsKey(to)) return path(toPos(fromCoordinate), to);
-
-        Pos closestTo = walkable.values()
-                .stream()
-                .filter(pos -> {
-                    double distance = pos.toWorld().distanceSquared(toCoordinate);
-                    return distance < AI.INTERACTION_RANGE * AI.INTERACTION_RANGE && distance > 1.5 * 1.5;
-                })
-                .min(Comparator.comparing(pos -> pos.toWorld().distanceSquared(toCoordinate)))
-                .orElse(null);
-
-        if (closestTo == null) {
-            return Collections.emptyList();
-        }
-        return path(toPos(fromCoordinate), closestTo);
-    }
-
-    public List<WorldCoordinate> path(WorldCoordinate fromCoordinate, WorldCoordinate toCoordinate) {
-        Pos from = toPos(fromCoordinate);
-        Pos to = toPos(toCoordinate);
-        return path(from, to);
-    }
-
-    private List<WorldCoordinate> path(Pos from, Pos to) {
-        server.getEntities().forEach(REntity::die);
-
-        if (from == null || to == null) {
-            return Collections.emptyList();
-        }
-        if (from.equals(to)) {
-            return Collections.emptyList();
-        }
-
-        List<Pos> checking = new ArrayList<>(Arrays.asList(to));
-        Map<Pos, Pos> route = new HashMap<>();
-        while (!checking.isEmpty()) {
-            Set<Pos> toCheck = new HashSet<>();
-            for (Pos pos : checking) {
-                boolean foundFrom = false;
-                Set<Pos> successors = connections.get(pos);
-                if (successors == null) {
-                    return Collections.emptyList();
-                }
-                for (Pos p : successors) {
-                    if (route.containsKey(p)) continue;
-                    route.put(p, pos);
-                    toCheck.add(p);
-                    foundFrom = p.equals(from);
-                    if (foundFrom) break;
-                }
-
-                if (foundFrom) {
-                    List<Pos> path = new ArrayList<>();
-                    path.add(from);
-
-                    while (path.get(path.size() - 1) != to) {
-                        path.add(route.get(path.get(path.size() - 1)));
-                    }
-
-                    for (int i = 0; i < path.size(); i++) {
-                        path.set(i, walkable.get(path.get(i)));
-                    }
-
-                    int i = 0;
-                    while (i < path.size() - 1) {
-                        Pos current = path.get(i);
-                        Pos next = path.get(i + 1);
-
-                        if (current.floorPosition() > next.floorPosition() + 1) {
-                            Pos between = new Pos(next.x, current.y, next.z);
-                            between.floor = current.floor;
-                            path.add(i + 1, between);
-                            i++;
-                        }
-                        i++;
-                    }
-
-                    List<WorldCoordinate> coordinates = path.stream().skip(1).map(Pos::toWorld).collect(Collectors.toList());
-                    coordinates.forEach(coordinate -> {
-                        RBlockDisplay block = new RBlockDisplay(server, coordinate.toLocation(Config.world));
-                        block.setBlock(PATH_BLOCK);
-                        block.setTransform(new Transformation(new Vector3f(0, 0, 0), new AxisAngle4f(0, 0, 0, 0), new Vector3f(1, 0.001F, 1), new AxisAngle4f(0, 0, 0, 0)));
-                    });
-
-                    coordinates.forEach(vector -> vector.add(0.5, 0, 0.5));
-                    return coordinates;
-                }
-            }
-
-            checking.clear();
-            checking.addAll(toCheck);
-        }
-
-        return Collections.emptyList();
-    }
-}

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

@@ -1,107 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2026 SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.fightsystem.ai;
-
-import de.steamwar.fightsystem.fight.Fight;
-import de.steamwar.fightsystem.fight.FightTeam;
-import de.steamwar.fightsystem.utils.Region;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import org.bukkit.Location;
-import org.bukkit.World;
-import org.bukkit.util.NumberConversions;
-import org.bukkit.util.Vector;
-
-@Getter
-@AllArgsConstructor
-public class WorldCoordinate {
-    private double x;
-    private double y;
-    private double z;
-
-    public static WorldCoordinate from(Location location) {
-        return new WorldCoordinate(location.getX(), location.getY(), location.getZ());
-    }
-
-    public static WorldCoordinate from(Vector vector) {
-        return new WorldCoordinate(vector.getX(), vector.getY(), vector.getZ());
-    }
-
-    public int getBlockX() {
-        return NumberConversions.floor(x);
-    }
-
-    public int getBlockY() {
-        return NumberConversions.floor(y);
-    }
-
-    public int getBlockZ() {
-        return NumberConversions.floor(z);
-    }
-
-    public double distanceSquared(WorldCoordinate coordinate) {
-        return NumberConversions.square(x - coordinate.x) + NumberConversions.square(y - coordinate.y) + NumberConversions.square(z - coordinate.z);
-    }
-
-    public LocalCoordinate toLocal(FightTeam team) {
-        // TODO: Fix the of by one blue/red
-        Region extend = team.getExtendRegion();
-        if (Fight.getUnrotated() == team) {
-            return new LocalCoordinate(
-                    x - extend.getMinX(),
-                    y - team.getSchemRegion().getMinY(),
-                    z - extend.getMinZ()
-            );
-        } else {
-            return new LocalCoordinate(
-                    extend.getMaxX() - x + 1,
-                    y - team.getSchemRegion().getMinY(),
-                    extend.getMaxZ() - z + 1
-            );
-        }
-    }
-
-    public WorldCoordinate add(WorldCoordinate worldCoordinate) {
-        this.x += worldCoordinate.x;
-        this.y += worldCoordinate.y;
-        this.z += worldCoordinate.z;
-        return this;
-    }
-
-    public WorldCoordinate add(double x, double y, double z) {
-        this.x += x;
-        this.y += y;
-        this.z += z;
-        return this;
-    }
-
-    public Vector toVector() {
-        return new Vector(x, y, z);
-    }
-
-    public Location toLocation(World world) {
-        return new Location(world, x, y, z);
-    }
-
-    @Override
-    public String toString() {
-        return "World{" + x + "," + y + "," + z + "}";
-    }
-}

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/ai/schematic/Bridge.java

@@ -1,45 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2026 SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.fightsystem.ai.schematic;
-
-import de.steamwar.fightsystem.ai.LocalCoordinate;
-import lombok.Getter;
-
-import java.util.HashSet;
-import java.util.Set;
-
-@Getter
-public class Bridge {
-
-    private final Set<LocalCoordinate> shieldActivators = new HashSet<>();
-    private LocalCoordinate automaticActivator = null;
-    private int automaticActivatorTime = 0;
-
-    public Bridge addShieldActivator(LocalCoordinate shieldActivator) {
-        this.shieldActivators.add(shieldActivator);
-        return this;
-    }
-
-    public Bridge addAutomaticActivator(LocalCoordinate automaticActivator, int automaticActivatorTime) {
-        this.automaticActivator = automaticActivator;
-        this.automaticActivatorTime = automaticActivatorTime;
-        return this;
-    }
-}

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/ai/schematic/WarMachine.java

@@ -1,63 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2026 SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.fightsystem.ai.schematic;
-
-import de.steamwar.fightsystem.ai.LocalCoordinate;
-import lombok.Getter;
-import org.bukkit.util.Consumer;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Getter
-public class WarMachine {
-
-    private int schematicId = 0;
-    private Bridge bridge = new Bridge();
-    private List<Cannon> cannons = new ArrayList<>();
-    private List<LocalCoordinate> tntChests = new ArrayList<>();
-
-    public WarMachine setSchematicId(int schematicId) {
-        this.schematicId = schematicId;
-        return this;
-    }
-
-    public WarMachine editBridge(Consumer<Bridge> initializer) {
-        initializer.accept(bridge);
-        return this;
-    }
-
-    public WarMachine addCannon(Consumer<Cannon> initializer) {
-        Cannon cannon = new Cannon();
-        initializer.accept(cannon);
-        cannons.add(cannon);
-        return this;
-    }
-
-    public WarMachine addTnTChest(LocalCoordinate chest) {
-        tntChests.add(chest);
-        return this;
-    }
-
-    public WarMachine finish(List<WarMachine> list) {
-        list.add(this);
-        return this;
-    }
-}

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/ai/schematic/impl/MiniWarGear20.java

@@ -1,71 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2026 SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.fightsystem.ai.schematic.impl;
-
-import de.steamwar.fightsystem.ai.LocalCoordinate;
-import de.steamwar.fightsystem.ai.schematic.WarMachine;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
-
-public class MiniWarGear20 {
-
-    private static final Random RANDOM = new Random();
-    private static final List<WarMachine> MiniWarGear20 = new ArrayList<>();
-
-    public static WarMachine select() {
-        return MiniWarGear20.get(RANDOM.nextInt(MiniWarGear20.size()));
-    }
-
-    public static WarMachine select(int schematicId) {
-        return MiniWarGear20.stream()
-                .filter(warMachine -> warMachine.getSchematicId() == schematicId)
-                .findFirst()
-                .orElse(null);
-    }
-
-    public static final WarMachine DPR_PV1_Reaper = new WarMachine()
-            .setSchematicId(135745)
-            .editBridge(bridge -> {
-                bridge.addShieldActivator(new LocalCoordinate(22, 15, 18));
-                bridge.addShieldActivator(new LocalCoordinate(31, 3, 12));
-                bridge.addShieldActivator(new LocalCoordinate(19, 3, 12));
-            })
-            .addCannon(cannon -> {
-                cannon.addTnt(new LocalCoordinate(29, 1, 21));
-                cannon.addTnt(new LocalCoordinate(29, 1, 22));
-                cannon.addTnt(new LocalCoordinate(29, 1, 23));
-                cannon.addTnt(new LocalCoordinate(30, 1, 22));
-                cannon.addTnt(new LocalCoordinate(30, 1, 23));
-                cannon.addTnt(new LocalCoordinate(29, 2, 24));
-                cannon.addTnt(new LocalCoordinate(30, 2, 24));
-                cannon.addTnt(new LocalCoordinate(29, 2, 25));
-                cannon.addTnt(new LocalCoordinate(30, 2, 25));
-                cannon.addTnt(new LocalCoordinate(29, 3, 24));
-                cannon.addTnt(new LocalCoordinate(30, 3, 24));
-                cannon.addTnt(new LocalCoordinate(29, 3, 25));
-                cannon.addTnt(new LocalCoordinate(30, 3, 25));
-                cannon.addTrigger(new LocalCoordinate(30, 3, 19));
-                cannon.addTrigger(new LocalCoordinate(31, 3, 18));
-                cannon.addTrigger(new LocalCoordinate(31, 3, 20));
-            })
-            .finish(MiniWarGear20);
-}

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/ai/yoyonow/YoyoNowAI.java

@@ -1,98 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2026 SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.fightsystem.ai.yoyonow;
-
-import com.sk89q.worldedit.extent.clipboard.Clipboard;
-import de.steamwar.fightsystem.ai.AI;
-import de.steamwar.fightsystem.ai.Action;
-import de.steamwar.fightsystem.ai.schematic.Cannon;
-import de.steamwar.fightsystem.ai.schematic.WarMachine;
-import de.steamwar.fightsystem.ai.schematic.impl.MiniWarGear20;
-import de.steamwar.fightsystem.fight.FightTeam;
-import de.steamwar.fightsystem.states.FightState;
-import de.steamwar.sql.SchematicNode;
-import de.steamwar.sql.SteamwarUser;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
-
-public class YoyoNowAI extends AI {
-
-    private WarMachine selectedSchematic;
-
-    protected YoyoNowAI(FightTeam team) {
-        super(team, SteamwarUser.get("YoyoNow.AI"));
-        getEntity().setGlowing(true);
-    }
-
-    @Override
-    public SchematicNode chooseSchematic() {
-        selectedSchematic = MiniWarGear20.select();
-        return SchematicNode.getSchematicNode(selectedSchematic.getSchematicId());
-    }
-
-    @Override
-    public void schematic(Clipboard clipboard) {
-        selectedSchematic = MiniWarGear20.select(team.getSchematic());
-        if (selectedSchematic == null) stop();
-    }
-
-    private final Random random = new Random();
-
-    private List<Action> actions = new ArrayList<>();
-
-    private boolean setupDone = false;
-
-    @Override
-    protected void plan() {
-        if (!navMesh.isReady()) return;
-
-        if (!actions.isEmpty()) {
-            Action.Result result = actions.get(0).step(this);
-            if (result == Action.Result.FAILED) {
-                chat(actions.get(0) + " failed");
-                actions.clear();
-                return;
-            }
-            if (result == Action.Result.FINISHED) {
-                chat(actions.get(0) + " finished");
-                actions.remove(0);
-            }
-            return;
-        }
-
-        if (!setupDone && FightState.getFightState() == FightState.POST_SCHEM_SETUP) {
-            chat("Setup actions to perform!");
-            selectedSchematic.getBridge().getShieldActivators().forEach(localCoordinate -> {
-                actions.add(new Action.MoveAction(this, localCoordinate.toWorld(getTeam())));
-                actions.add(new Action.InteractAction(localCoordinate));
-            });
-            actions.add(new Action.ReadyAction());
-            chat("Actions: " + actions.size());
-            setupDone = true;
-        }
-
-        if (FightState.getFightState() == FightState.RUNNING) {
-            Cannon cannon = selectedSchematic.getCannons().get(random.nextInt(selectedSchematic.getCannons().size()));
-            actions.add(new Action.LoadCannon(this, cannon));
-        }
-    }
-}

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

@@ -35,10 +35,7 @@ import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
-import org.bukkit.event.inventory.InventoryAction;
+import org.bukkit.event.inventory.*;
-import org.bukkit.event.inventory.InventoryClickEvent;
-import org.bukkit.event.inventory.InventoryCloseEvent;
-import org.bukkit.event.inventory.InventoryOpenEvent;
 import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.inventory.ItemStack;
@@ -81,25 +78,8 @@ public class PersonalKitCreator implements Listener {
         if(!openKitCreators.containsKey(e.getWhoClicked()))
             return;
 
-        Player player = (Player) e.getWhoClicked();
-        //Deny bad items
         if(Kit.isBadItem(e.getCursor()))
             e.setCancelled(true);
-
-        /* Should the inventory reset? */
-        if(e.getAction() != InventoryAction.PLACE_ALL)
-            return;
-
-        ItemStack[] items = e.getWhoClicked().getInventory().getContents();
-        for(int i = 0; i < items.length; i++){
-            ItemStack stack = items[i];
-            if(stack != null && i != e.getSlot())
-                return;
-        }
-
-        FightPlayer fightPlayer = Fight.getFightPlayer(player);
-        assert fightPlayer != null;
-        Bukkit.getScheduler().runTaskLater(FightSystem.getPlugin(), () -> fightPlayer.getKit().loadToPlayer(player), 1);
     }
 
     @EventHandler
@@ -117,7 +97,10 @@ public class PersonalKitCreator implements Listener {
         if(backup == null)
             return;
 
-        backup.close();
+        InventoryType type = e.getInventory().getType();
+        if(type != InventoryType.PLAYER && type != InventoryType.CREATIVE) {
+            backup.close();
+        }
     }
 
     @EventHandler
@@ -126,7 +109,7 @@ public class PersonalKitCreator implements Listener {
         if(backup == null)
             return;
 
-        backup.close();
+        Bukkit.getScheduler().runTaskLater(FightSystem.getPlugin(), backup::close, 1);
     }
 
     @EventHandler
@@ -151,9 +134,11 @@ public class PersonalKitCreator implements Listener {
         }
 
         private void close(){
-            openKitCreators.remove(player);
             Kit kit1 = new Kit(kit.getName(), player);
             kit1.removeBadItems();
+
+
+            openKitCreators.remove(player);
             kit1.toPersonalKit(kit);
             backup.loadToPlayer(player);
             player.setGameMode(GameMode.SURVIVAL);

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

@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2026 SteamWar.de-Serverteam
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
  *
  *   This program 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,29 +17,19 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.fightsystem.ai.schematic;
+package de.steamwar.fightsystem.listener;
 
-import de.steamwar.fightsystem.ai.LocalCoordinate;
+import de.steamwar.core.VersionDependent;
-import lombok.Getter;
+import de.steamwar.fightsystem.FightSystem;
+import de.steamwar.linkage.Linked;
 
-import java.util.ArrayList;
+@Linked
-import java.util.HashSet;
+public class WindchargeStopper {
-import java.util.List;
-import java.util.Set;
 
-@Getter
+    static {
-public class Cannon {
+        VersionDependent.getVersionImpl(FightSystem.getPlugin());
-
-    private final List<LocalCoordinate> tntPositions = new ArrayList<>();
-    private final Set<LocalCoordinate> triggerPositions = new HashSet<>();
-
-    public Cannon addTnt(LocalCoordinate tnt) {
-        tntPositions.add(tnt);
-        return this;
     }
 
-    public Cannon addTrigger(LocalCoordinate trigger) {
+    public interface IWindchargeStopper {
-        triggerPositions.add(trigger);
-        return this;
     }
 }

FightSystem/build.gradle.kts

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

SchematicSystem/SchematicSystem_21/build.gradle.kts

@@ -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/>.
+ */
+
+plugins {
+    steamwar.java
+}
+
+dependencies {
+    compileOnly(project(":SpigotCore", "default"))
+    compileOnly(project(":SchematicSystem:SchematicSystem_Core", "default"))
+
+    compileOnly(libs.paperapi21) {
+        attributes {
+            // Very Hacky, but it works
+            attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, 21)
+        }
+    }
+
+    compileOnly(libs.nms21)
+    compileOnly(libs.fawe21)
+}

SchematicSystem/SchematicSystem_21/src/de/steamwar/schematicsystem/autocheck/AutoChecker21.java

@@ -0,0 +1,137 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2026 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.schematicsystem.autocheck;
+
+import com.sk89q.jnbt.CompoundTag;
+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 org.bukkit.Material;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+public class AutoChecker21 implements AutoChecker.IAutoChecker {
+
+    public AutoChecker.BlockScanResult scan(Clipboard clipboard, GameModeConfig<Material, String> type) {
+        AutoChecker.BlockScanResult result = new AutoChecker.BlockScanResult();
+        BlockVector3 min = clipboard.getMinimumPoint();
+        BlockVector3 max = clipboard.getMaximumPoint();
+        for (int x = min.getBlockX(); x <= max.getBlockX(); x++) {
+            for (int y = min.getBlockY(); y <= max.getBlockY(); y++) {
+                for (int z = min.getBlockZ(); z <= max.getBlockZ(); z++) {
+                    final BaseBlock block = clipboard.getFullBlock(BlockVector3.at(x, y, z));
+                    final Material material = Material.matchMaterial(block.getBlockType().getId());
+                    if (material == null) {
+                        continue;
+                    }
+
+                    result.getBlockCounts().merge(material, 1, Integer::sum);
+
+                    if (AutoCheckerItems.impl.getInventoryMaterials().contains(material)) {
+                        checkInventory(result, block, material, new BlockPos(x, y, z), type);
+                    }
+
+                    if (x == min.getBlockX() || x == max.getBlockX() || y == max.getBlockY() || z == min.getBlockZ() || z == max.getBlockZ()) {
+                        result.getDesignBlocks().computeIfAbsent(material, m -> new ArrayList<>()).add(new BlockPos(x, y, z));
+                    }
+                }
+            }
+        }
+        return result;
+    }
+
+    private static final Map<Material, Set<Material>> itemsInInv = new EnumMap<>(Material.class);
+
+    static {
+        itemsInInv.put(Material.BUCKET, EnumSet.of(Material.DISPENSER));
+        itemsInInv.put(Material.TNT, EnumSet.of(Material.CHEST, Material.BARREL, Material.SHULKER_BOX, Material.BLACK_SHULKER_BOX, Material.BLUE_SHULKER_BOX,
+                Material.BROWN_SHULKER_BOX, Material.CYAN_SHULKER_BOX, Material.GRAY_SHULKER_BOX, Material.GREEN_SHULKER_BOX, Material.LIGHT_BLUE_SHULKER_BOX,
+                Material.LIGHT_GRAY_SHULKER_BOX, Material.LIME_SHULKER_BOX, Material.MAGENTA_SHULKER_BOX, Material.ORANGE_SHULKER_BOX,
+                Material.PINK_SHULKER_BOX, Material.PURPLE_SHULKER_BOX, Material.RED_SHULKER_BOX, Material.WHITE_SHULKER_BOX, Material.YELLOW_SHULKER_BOX));
+        itemsInInv.put(Material.FIRE_CHARGE, EnumSet.of(Material.DISPENSER));
+        itemsInInv.put(Material.ARROW, EnumSet.of(Material.DISPENSER));
+        AutoCheckerItems.impl.getAllowedMaterialsInInventory().forEach(material -> itemsInInv.put(material, AutoCheckerItems.impl.getInventoryMaterials()));
+    }
+
+    private void checkInventory(AutoChecker.BlockScanResult result, BaseBlock block, Material material, BlockPos pos, GameModeConfig<Material, String> type) {
+        CompoundTag nbt = block.getNbtData();
+        if (nbt == null) {
+            result.getDefunctNbt().add(pos);
+            return;
+        }
+
+
+        if (material == Material.JUKEBOX && nbt.getValue().containsKey("RecordItem")) {
+            result.getRecords().add(pos);
+            return;
+        }
+
+        List<CompoundTag> items = nbt.getList("Items", CompoundTag.class);
+        if (items.isEmpty())
+            return; // Leeres Inventar
+
+        int counter = 0;
+        int windChargeCount = 0;
+        for (CompoundTag item : items) {
+            if (!item.containsKey("id")) {
+                result.getDefunctNbt().add(pos);
+                continue;
+            }
+
+            Material itemType = Material.matchMaterial(item.getString("id"));
+            if (itemType == null) // Leere Slots
+                continue;
+
+            if(type.Schematic.Type.getName().equals("wargearseason26") && material == Material.DISPENSER && itemType == Material.WIND_CHARGE) {
+                windChargeCount += item.getInt("count");
+            }
+            else 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 += Core.getVersion() >= 21 ? item.getInt("count") : item.getByte("Count");
+            }
+            if (item.containsKey("tag")) {
+                result.getForbiddenNbt().computeIfAbsent(pos, blockVector3 -> new HashSet<>()).add(itemType);
+            }
+        }
+        result.getDispenserItems().put(pos, counter);
+        result.getWindChargeCount().put(pos, windChargeCount);
+    }
+
+    @Override
+    public AutoCheckerResult check(Clipboard clipboard, GameModeConfig<Material, String> type) {
+        return AutoCheckerResult.builder().type(type).height(clipboard.getDimensions().getBlockY()).width(clipboard.getDimensions().getBlockX())
+                .depth(clipboard.getDimensions().getBlockZ()).blockScanResult(scan(clipboard, type))
+                .entities(clipboard.getEntities().stream().map(Entity::getLocation)
+                        .map(blockVector3 -> new BlockPos(blockVector3.getBlockX(), blockVector3.getBlockY(), blockVector3.getBlockZ()))
+                        .collect(Collectors.toList()))
+                .build();
+    }
+
+    @Override
+    public AutoCheckerResult sizeCheck(Clipboard clipboard, GameModeConfig<Material, String> type) {
+        return AutoCheckerResult.builder().type(type).height(clipboard.getDimensions().getBlockY()).width(clipboard.getDimensions().getBlockX())
+                .depth(clipboard.getDimensions().getBlockZ()).build();
+    }
+}

SchematicSystem/SchematicSystem_21/src/de/steamwar/schematicsystem/autocheck/AutoCheckerItems21.java

@@ -0,0 +1,49 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ * This program is free software: you can redistribute it and/or modify it under the terms of the
+ * GNU Affero General Public License as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Affero General Public License for more details.
+ *
+ * You should have received 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;
+
+import org.bukkit.Material;
+
+import java.util.EnumSet;
+import java.util.Set;
+
+public class AutoCheckerItems21 implements AutoCheckerItems {
+
+    private static final Set<Material> INVENTORY = EnumSet.of(Material.BARREL, Material.BLAST_FURNACE, Material.BREWING_STAND, Material.CAMPFIRE,
+            Material.CHEST, Material.DISPENSER, Material.DROPPER, Material.FURNACE, Material.HOPPER, Material.JUKEBOX, Material.SHULKER_BOX,
+            Material.WHITE_SHULKER_BOX, Material.ORANGE_SHULKER_BOX, Material.MAGENTA_SHULKER_BOX, Material.LIGHT_BLUE_SHULKER_BOX, Material.YELLOW_SHULKER_BOX,
+            Material.LIME_SHULKER_BOX, Material.PINK_SHULKER_BOX, Material.GRAY_SHULKER_BOX, Material.LIGHT_GRAY_SHULKER_BOX, Material.CYAN_SHULKER_BOX,
+            Material.PURPLE_SHULKER_BOX, Material.BLUE_SHULKER_BOX, Material.BROWN_SHULKER_BOX, Material.GREEN_SHULKER_BOX, Material.RED_SHULKER_BOX,
+            Material.BLACK_SHULKER_BOX, Material.SMOKER, Material.TRAPPED_CHEST);
+
+    private static final Set<Material> FLOWERS = EnumSet.of(Material.CORNFLOWER, Material.POPPY, Material.FERN, Material.DANDELION, Material.BLUE_ORCHID,
+            Material.ALLIUM, Material.AZURE_BLUET, Material.RED_TULIP, Material.ORANGE_TULIP, Material.WHITE_TULIP, Material.PINK_TULIP, Material.OXEYE_DAISY,
+            Material.LILY_OF_THE_VALLEY, Material.WITHER_ROSE, Material.SUNFLOWER, Material.DIAMOND_HORSE_ARMOR, Material.IRON_HORSE_ARMOR,
+            Material.GOLDEN_HORSE_ARMOR, Material.LEATHER_HORSE_ARMOR, Material.HONEY_BOTTLE, Material.LILAC, Material.ROSE_BUSH, Material.PEONY,
+            Material.TALL_GRASS, Material.LARGE_FERN);
+
+    @Override
+    public Set<Material> getInventoryMaterials() {
+        return INVENTORY;
+    }
+
+    @Override
+    public Set<Material> getAllowedMaterialsInInventory() {
+        return FLOWERS;
+    }
+}

SchematicSystem/SchematicSystem_Core/src/SchematicSystem.properties

@@ -210,7 +210,6 @@ GUI_INFO_TYPE=§e{0}
 GUI_INFO_DOWNLOAD=§eDownload
 GUI_INFO_COLOR=Color translation
 GUI_INFO_REPLAY=Replay playback
-GUI_INFO_REPLAY_OFF=§7§lTurn off
 GUI_INFO_REPLAY_TITLE=Lock playback permanently
 GUI_INFO_MEMBER=§eMembers
 GUI_INFO_MOVE=§eMove
@@ -262,6 +261,8 @@ AUTO_CHECKER_RESULT_BLOCKS=§7Blocks: §c{0}§7, Max: §e{1}
 AUTO_CHECKER_RESULT_UNKNOWN_MATERIAL=§7Unknown block: §c{0}
 AUTO_CHECKER_RESULT_TOO_MANY_BLOCK=§7{0}: §c{1}§7, Max: §e{2}
 AUTO_CHECKER_RESULT_FORBIDDEN_BLOCK=§7Forbidden block: §c{0}
+AUTO_CHECKER_RESULT_WIND_CHARGES=§7Windcharges: §c{0}§7, Max: §e2048
+AUTO_CHECKER_RESULT_WIND_CHARGES_DISPENSER=§7Dispenser: §c[{0}, {1}, {2}]§7, Windcharges: §c{3}§7
 AUTO_CHECKER_RESULT_FORBIDDEN_ITEM=§7Forbidden Item: [{0}, {1}, {2}] -> §c{3}
 AUTO_CHECKER_RESULT_DEFUNCT_NBT=§7Defunct NBT: §7[{0}, {1}, {2}]
 AUTO_CHECKER_RESULT_DESIGN_BLOCK=§7{0} in Design: [{1}, {2}, {3}]

SchematicSystem/SchematicSystem_Core/src/SchematicSystem_de.properties

@@ -191,7 +191,6 @@ GUI_INFO_BACK=§eZurück
 GUI_INFO_STATUS=§eStatus {0}
 GUI_INFO_COLOR=Farbersetzung
 GUI_INFO_REPLAY=Replay Wiedergabe
-GUI_INFO_REPLAY_OFF=§7Zum §lAusschalten
 GUI_INFO_REPLAY_TITLE=Wiedergabe dauerhaft sperren
 GUI_INFO_MEMBER=§eMitglieder
 GUI_INFO_MOVE=§eVerschieben
@@ -242,6 +241,8 @@ AUTO_CHECKER_RESULT_BLOCKS=§7Blöcke: §c{0}§7, Max: §e{1}
 AUTO_CHECKER_RESULT_UNKNOWN_MATERIAL=§7Unbekannter Block: §c{0}
 AUTO_CHECKER_RESULT_TOO_MANY_BLOCK=§7{0}: §c{1}§7, Max: §e{2}
 AUTO_CHECKER_RESULT_FORBIDDEN_BLOCK=§7Verbotener Block: §c{0}
+AUTO_CHECKER_RESULT_WIND_CHARGES=§7Windcharges: §c{0}§7, Max: §e2048
+AUTO_CHECKER_RESULT_WIND_CHARGES_DISPENSER=§7Werfer: §c[{0}, {1}, {2}]§7, Windcharges: §c{3}§7
 AUTO_CHECKER_RESULT_FORBIDDEN_ITEM=§7Verbotener gegenstand: [{0}, {1}, {2}] -> §c{3}
 AUTO_CHECKER_RESULT_DEFUNCT_NBT=§7Keine NBT-Daten: §c[{0}, {1}, {2}]
 AUTO_CHECKER_RESULT_DESIGN_BLOCK=§7{0} im Design: [{1}, {2}, {3}]

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

@@ -55,6 +55,7 @@ public class AutoChecker {
         private final List<BlockPos> records = new ArrayList<>();
         private final Map<Material, List<BlockPos>> designBlocks = new EnumMap<>(Material.class);
         private final Map<BlockPos, Integer> dispenserItems = new HashMap<>();
+        private final Map<BlockPos, Integer> windChargeCount = new HashMap<>();
         private final Map<BlockPos, Set<Material>> forbiddenItems = new HashMap<>();
         private final Map<BlockPos, Set<Material>> forbiddenNbt = new HashMap<>();
     }

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

@@ -52,6 +52,7 @@ public class AutoCheckerResult {
                 isBlockCountOk() &&
                 isLimitedBlocksOK() &&
                 isDispenserItemsOK() &&
+                isWindchargeCountOK() &&
                 !type.isAfterDeadline() &&
                 entities.isEmpty() &&
                 isDesignBlastResistanceOK();
@@ -62,6 +63,16 @@ public class AutoCheckerResult {
                 !type.isAfterDeadline();
     }
 
+    public boolean isWindchargeCountOK() {
+        if( type.Schematic.Type.getName().equals("wargearseason26")) {
+            int windChargesCount = blockScanResult.getWindChargeCount().values().stream().reduce(Integer::sum).orElse(0);
+            return windChargesCount <= 2048;  
+        }
+        else {
+            return true;
+        }
+    }
+
     public boolean isDispenserItemsOK() {
         return blockScanResult.getDispenserItems().values().stream().allMatch(i -> i <= type.Schematic.MaxDispenserItems);  
     }
@@ -127,6 +138,19 @@ public class AutoCheckerResult {
                 }
             });
         }
+
+        if(!isWindchargeCountOK()) {
+            int windChargesCount = blockScanResult.getWindChargeCount().values().stream().reduce(Integer::sum).orElse(0);
+            SchematicSystem.MESSAGE.sendPrefixless("AUTO_CHECKER_RESULT_WIND_CHARGES", p, windChargesCount, 2048);
+            blockScanResult.getWindChargeCount().entrySet().stream().filter(blockVector3IntegerEntry -> blockVector3IntegerEntry.getValue() > 0).forEach(blockVector3IntegerEntry -> {
+                SchematicSystem.MESSAGE.sendPrefixless("AUTO_CHECKER_RESULT_WIND_CHARGES_DISPENSER", p, SchematicSystem.MESSAGE.parse("AUTO_CHECKER_RESULT_TELEPORT_HERE", p), tpCommandTo(blockVector3IntegerEntry.getKey()),
+                        blockVector3IntegerEntry.getKey().getBlockX(),
+                        blockVector3IntegerEntry.getKey().getBlockY(),
+                        blockVector3IntegerEntry.getKey().getBlockZ(),
+                        blockVector3IntegerEntry.getValue());
+            });
+        }
+
         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(),
@@ -135,6 +159,7 @@ public class AutoCheckerResult {
                     blockVector3IntegerEntry.getValue(),
                     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());
         });

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

@@ -151,7 +151,7 @@ public class GUI {
                         node.setReplaceColor(!node.replaceColor());
                         info(player, node, back);
                     });
-                    inv.setItem(13, SWItem.getMaterial(node.allowReplay() ? "EYE_OF_ENDER" : "ENDER_PEARL"), SchematicSystem.MESSAGE.parse("GUI_INFO_REPLAY", player), Arrays.asList(SchematicSystem.MESSAGE.parse("CURRENT", player, SchematicSystem.MESSAGE.parse(node.allowReplay()?"ON":"OFF", player)), SchematicSystem.MESSAGE.parse("GUI_INFO_REPLAY_OFF", player), SchematicSystem.MESSAGE.parse("CLICK", player)), false, clickType -> {
+                    inv.setItem(13, SWItem.getMaterial(node.allowReplay() ? "EYE_OF_ENDER" : "ENDER_PEARL"), SchematicSystem.MESSAGE.parse("GUI_INFO_REPLAY", player), Arrays.asList(SchematicSystem.MESSAGE.parse("CURRENT", player, SchematicSystem.MESSAGE.parse(node.allowReplay()?"ON":"OFF", player)), SchematicSystem.MESSAGE.parse("CHANGE", player), SchematicSystem.MESSAGE.parse("CLICK", player)), false, clickType -> {
                         if(node.allowReplay()) {
                             SWInventory confInv = new SWInventory(player, 9, SchematicSystem.MESSAGE.parse("GUI_INFO_REPLAY_TITLE", player));
                             confInv.setItem(0, SWItem.getDye(10), (byte) 10, SchematicSystem.MESSAGE.parse("CONFIRM", player), type -> {
@@ -162,6 +162,9 @@ public class GUI {
                                 info(player, node, back);
                             });
                             confInv.open();
+                        } else {
+                            node.setAllowReplay(true);
+                            info(player, node, back);
                         }
                     });
                 }

SchematicSystem/build.gradle.kts

@@ -32,4 +32,5 @@ dependencies {
     implementation(project(":SchematicSystem:SchematicSystem_15"))
     implementation(project(":SchematicSystem:SchematicSystem_19"))
     implementation(project(":SchematicSystem:SchematicSystem_20"))
+    implementation(project(":SchematicSystem:SchematicSystem_21"))
 }

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.velocitycore.VelocityCore;
-import de.steamwar.velocitycore.commands.CheckCommand;
 
 import java.io.File;
 
@@ -38,15 +37,6 @@ public class SQLWrapperImpl implements SQLWrapper<String> {
         return new GameModeConfig<>(file, GameModeConfig.ToString, GameModeConfig.ToString, GameModeConfig.ToInternalName, true);
     }
 
-    @Override
-    public void processSchematicType(GameModeConfig<?, String> gameModeConfig) {
-        SchematicType type = gameModeConfig.Schematic.Type;
-        if (type.checkType() != null) {
-            CheckCommand.setCheckQuestions(type.checkType(), gameModeConfig.CheckQuestions);
-            CheckCommand.addFightType(type.checkType(), type);
-        }
-    }
-
     @Override
     public void additionalExceptionMetadata(StringBuilder builder) {
         builder.append("\nServers: ");

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

@@ -25,7 +25,10 @@ import lombok.Getter;
 import lombok.experimental.UtilityClass;
 
 import java.io.File;
-import java.util.*;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
 
 @UtilityClass
 public class ArenaMode {
@@ -50,12 +53,12 @@ public class ArenaMode {
         if(!folder.exists())
             return;
 
-        for(File file : Arrays.stream(folder.listFiles((file, name) -> name.endsWith(".yml") && !name.endsWith(".kits.yml") && !name.equals("config.yml"))).sorted().toList()) {
+        GameModeConfig.init();
-            GameModeConfig<String, String> gameModeConfig = new GameModeConfig<>(file, GameModeConfig.ToString, GameModeConfig.ToString, GameModeConfig.ToInternalName, false);
+        SchematicType.init();
+        for (GameModeConfig<String, String> gameModeConfig : GameModeConfig.<String>getAll()) {
             if (!gameModeConfig.Server.loaded) continue;
-
             allModes.add(gameModeConfig);
-            byInternal.put(file.getName().replace(".yml", ""), gameModeConfig);
+            byInternal.put(gameModeConfig.configFile.getName().replace(".yml", ""), gameModeConfig);
             for (String name : gameModeConfig.Server.ChatNames) {
                 byChat.put(name.toLowerCase(), gameModeConfig);
             }

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

@@ -40,6 +40,7 @@ import net.kyori.adventure.text.format.NamedTextColor;
 import java.awt.*;
 import java.sql.Timestamp;
 import java.time.Instant;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -48,20 +49,9 @@ 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<>();
-
     private static final Map<UUID, CheckSession> currentCheckers = new HashMap<>();
     private static final Map<Integer, CheckSession> currentSchems = new HashMap<>();
 
-    public static void setCheckQuestions(SchematicType checkType, List<String> checkQuestions) {
-        CheckCommand.checkQuestions.put(checkType, checkQuestions);
-    }
-
-    public static void addFightType(SchematicType checkType, SchematicType fightType) {
-        fightTypes.put(checkType, fightType);
-    }
-
     public static boolean isChecking(Player player){
         return currentCheckers.containsKey(player.getUniqueId());
     }
@@ -147,7 +137,7 @@ public class CheckCommand extends SWCommand {
         if(!schem.getSchemtype().check()){
             VelocityCore.getLogger().log(Level.SEVERE, () -> sender.user().getUserName() + " tried to check an uncheckable schematic!");
             return;
-        }else if(schem.getOwner() == sender.user().getId()) {
+        }else if(schem.getOwner() == sender.user().getId() && !sender.user().hasPerm(UserPerm.ADMINISTRATION)) {
             sender.system("CHECK_SCHEMATIC_OWN");
             return;
         }
@@ -248,9 +238,9 @@ public class CheckCommand extends SWCommand {
             this.checker = checker;
             this.schematic = schematic;
             this.startTime = Timestamp.from(Instant.now());
-            this.checkList = checkQuestions.get(schematic.getSchemtype()).listIterator();
+            this.checkList = GameModeConfig.getBySchematicType(schematic.getSchemtype()).CheckQuestions.listIterator();
 
-            GameModeConfig<String, String> mode = ArenaMode.getBySchemType(fightTypes.get(schematic.getSchemtype()));
+            GameModeConfig<String, String> mode = GameModeConfig.getBySchematicType(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);
@@ -304,7 +294,50 @@ public class CheckCommand extends SWCommand {
         }
 
         private void accept(){
-            concludeCheckSession("freigegeben", fightTypes.get(schematic.getSchemtype()), () -> {
+            // TODO: This Code is only for the WGS and because YoyoNow is not available this can be removed or changed after the WGS!
+            if (schematic.getSchemtype().toDB().equals("cwargearseason26")) {
+                int userId = schematic.getOwner();
+                SteamwarUser user = SteamwarUser.byId(userId);
+                int teamId = user.getTeam();
+
+                SchematicNode teamFolder = SchematicNode.getSchematicNodeInNode(172325)
+                        .stream()
+                        .filter(schematicNode -> schematicNode.getName().startsWith(teamId + "_"))
+                        .findFirst()
+                        .orElse(null);
+                if (teamFolder == null) {
+                    internalAccept();
+                    return;
+                }
+
+                // Copy Schem into team folder of -1 user
+                String name = DateTimeFormatter.ofPattern("yyyy.MM.dd_HH:mm:ss").format(schematic.getLastUpdate().toLocalDateTime());
+                NodeData data = NodeData.getLatest(schematic);
+                SchematicNode node = SchematicNode.createSchematic(-1, name, teamFolder.getNodeId());
+                NodeData.saveFromStream(node, data.schemData(false), data.getNodeFormat());
+
+                // Accept the team folder schematic and set other to Normal
+                node.setSchemtype(GameModeConfig.getBySchematicType(schematic.getSchemtype()).Schematic.Type);
+
+                // Conclude by setting send in schematic to normal and broadcast
+                concludeCheckSession("freigegeben", SchematicType.Normal, () -> {
+                    Chatter owner = Chatter.of(SteamwarUser.byId(schematic.getOwner()).getUUID());
+                    owner.withPlayerOrOffline(
+                            player -> owner.system("CHECK_ACCEPTED", schematic.getSchemtype().name(), schematic.getName()),
+                            () -> DiscordAlert.send(owner, Color.GREEN, new Message("DC_TITLE_SCHEMINFO"), new Message("DC_SCHEM_ACCEPT", schematic.getName()), true)
+                    );
+                    notifyTeam(new Message("CHECK_ACCEPTED_TEAM", schematic.getName(), owner.user().getUserName()));
+
+                    return owner.getPlayer() != null;
+                });
+                return;
+            }
+
+            internalAccept();
+        }
+
+        private void internalAccept() {
+            concludeCheckSession("freigegeben", GameModeConfig.getBySchematicType(schematic.getSchemtype()).Schematic.Type, () -> {
                 Chatter owner = Chatter.of(SteamwarUser.byId(schematic.getOwner()).getUUID());
                 owner.withPlayerOrOffline(
                         player -> owner.system("CHECK_ACCEPTED", schematic.getSchemtype().name(), schematic.getName()),

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

@@ -158,7 +158,6 @@ public class Tablist extends ChannelInboundHandlerAdapter {
 
     public void disable() {
         sendTabPacket(new ArrayList<>(directTabItems.values()), null);
-        directTabItems.clear();
         sendTabPacket(current, null);
         current.clear();
 

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

@@ -55,7 +55,7 @@ public class BauLock {
                 break;
             case SUPERVISOR:
                 BauweltMember member = BauweltMember.getBauMember(owner.getId(), target.getId());
-                locked = !member.isSupervisor();
+                locked = member == null || !member.isSupervisor();
                 break;
             case SERVERTEAM:
                 locked = !target.hasPerm(UserPerm.TEAM);

settings.gradle.kts

@@ -101,6 +101,7 @@ dependencyResolutionManagement {
             library("hamcrest", "org.hamcrest:hamcrest:2.2")
             library("classindex", "org.atteo.classindex:classindex:3.13")
 
+
             library("spigotapi", "org.spigotmc:spigot-api:1.20-R0.1-SNAPSHOT")
             library("spigotannotations", "org.spigotmc:plugin-annotations:1.2.3-SNAPSHOT")
             library("paperapi", "io.papermc.paper:paper-api:1.19.2-R0.1-SNAPSHOT")
@@ -222,6 +223,7 @@ include(
     "SchematicSystem:SchematicSystem_15",
     "SchematicSystem:SchematicSystem_19",
     "SchematicSystem:SchematicSystem_20",
+    "SchematicSystem:SchematicSystem_21",
     "SchematicSystem:SchematicSystem_Core"
 )