Continue

Remove uneeded stuff in SQLWrapper

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());

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()
@@ -440,6 +460,13 @@ public final class GameModeConfig<M, W> {
          */
         public final boolean DisableSnowMelt;
 
+        /**
+         * Disable ice forming
+         *
+         * @implSpec {@code false} by default
+         */
+        public final boolean DisableIceForm;
+
         /**
          * Allow leaving the arena area as spectator
          *
@@ -470,6 +497,7 @@ public final class GameModeConfig<M, W> {
             BorderFromSchematic = loader.getInt("BorderFromSchematic", 21);
             GroundWalkable = loader.getBoolean("GroundWalkable", true);
             DisableSnowMelt = loader.getBoolean("DisableSnowMelt", false);
+            DisableIceForm = loader.getBoolean("DisableIceForm", false);
             Leaveable = loader.getBoolean("Leaveable", false);
             AllowMissiles = loader.getBoolean("AllowMissiles", !EnterStages.isEmpty());
             NoFloor = loader.getBoolean("NoFloor", false);
@@ -659,13 +687,16 @@ public final class GameModeConfig<M, W> {
          */
         public final Map<Set<M>, Integer> Limited;
 
+        /** */
+        public final List<AllowedItemsConfig<M>> AllowedItems;
+
         private SchematicConfig(YMLWrapper<M, ?> loader) {
             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);
@@ -678,6 +709,7 @@ public final class GameModeConfig<M, W> {
             MaxDispenserItems = loader.getInt("MaxDispenserItems", 128);
             MaxBlastResistance = loader.getDouble("MaxBlastResistance", Double.MAX_VALUE);
             MaxDesignBlastResistance = loader.getDouble("MaxDesignBlastResistance", MaxBlastResistance);
+            AllowedItems = loader.withEvery("AllowedItems").stream().map(AllowedItemsConfig::new).collect(Collectors.toList());
 
             Map<Set<M>, Integer> Limited = new HashMap<>();
             for (Map<?, ?> entry : loader.getMapList("Limited")) {
@@ -762,6 +794,32 @@ public final class GameModeConfig<M, W> {
                 bottom = loader.getInt("bottom", 0);
             }
         }
+    
+        public static final class AllowedItemsConfig<M>  {
+            /**
+             * The materials of the items that may be included in inventories
+             */
+            public final List<M> AllowedMaterials;
+            /**
+             * The materials of inventory blocks that may contain the listed items
+             */
+            public final List<M> AllowedIn;
+            /**
+             * The maximum amount of items of the listed items contained per inventory
+             */
+            public final Integer MaxPerInventory;
+            /**
+             * The maximum amount of items of the listed items contained in total within all inventories
+             */
+            public final Integer TotalMax;
+
+            private AllowedItemsConfig(YMLWrapper<M, ?> loader) {
+                AllowedMaterials = loader.getMaterialList("AllowedMaterials");
+                AllowedIn = loader.getMaterialList("AllowedIn");
+                MaxPerInventory = loader.getInt("MaxPerInventory", Integer.MAX_VALUE);
+                TotalMax = loader.getInt("TotalMax", Integer.MAX_VALUE);
+            }
+        }
     }
 
     @ToString

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 fromDB: Map<String, SchematicType>?
+        private val types: MutableList<SchematicType> = mutableListOf()
+        private val fromDB: MutableMap<String, SchematicType> = mutableMapOf()
 
         init {
-            val tmpTypes = mutableListOf<SchematicType>()
-            val tmpFromDB = mutableMapOf<String, SchematicType>()
-
-            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()
+            GameModeConfig.init()
+            init()
         }
 
         @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 toDB() = name.lowercase()
+    fun name() =
+        name
 
-    fun check() = type == Type.CHECK_TYPE
-    fun fightType() = type == Type.FIGHT_TYPE
-    fun writeable() = type == Type.NORMAL
+    fun toDB() =
+        name.lowercase()
 
-    fun checkType() = if (manualCheck) checkType else this
-    fun isAssignable() = type == Type.NORMAL || (type == Type.FIGHT_TYPE && checkType != null) || !manualCheck
+    fun check() =
+        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,

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

@@ -76,6 +76,20 @@ final class YMLWrapper<M, W> {
         return new YMLWrapper<>(false, Collections.emptyMap(), materialMapper, winconditionMapper);
     }
 
+    public List<YMLWrapper<M, W>> withEvery(String path) {
+        if (document.containsKey(path)) {
+            Object value = document.get(path);
+            if(value instanceof List<?>) {
+                List<Object> list = (List<Object>) value;
+                return list.stream().map(o -> new YMLWrapper<>(true, Collections.singletonMap("value", o), materialMapper, winconditionMapper)).collect(Collectors.toList());
+            }
+        }
+
+        return Collections.emptyList();
+    }
+
+
+
     public <T> T get(String path, T defaultValue, Function<Object, T> mapper) {
         Object value = this.document.get(path);
         if (value == null) return defaultValue;

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

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/FightSystem.java

@@ -33,9 +33,6 @@ import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.OneShotStateDependent;
 import de.steamwar.fightsystem.states.StateDependentListener;
 import de.steamwar.fightsystem.utils.*;
-import de.steamwar.fightsystem.winconditions.Wincondition;
-import de.steamwar.fightsystem.winconditions.WinconditionComparisonTimeout;
-import de.steamwar.fightsystem.winconditions.Winconditions;
 import de.steamwar.linkage.AbstractLinker;
 import de.steamwar.linkage.SpigotLinker;
 import de.steamwar.message.Message;
@@ -43,6 +40,7 @@ import de.steamwar.sql.NodeData;
 import de.steamwar.sql.SchematicNode;
 import lombok.Getter;
 import org.bukkit.Bukkit;
+import org.bukkit.GameRule;
 import org.bukkit.plugin.java.JavaPlugin;
 
 public class FightSystem extends JavaPlugin {
@@ -100,6 +98,11 @@ public class FightSystem extends JavaPlugin {
         new StateDependentListener(ArenaMode.All, FightState.All, BountifulWrapper.impl.newDenyArrowPickupListener());
         new OneShotStateDependent(ArenaMode.All, FightState.PreSchemSetup, () -> Fight.playSound(SWSound.BLOCK_NOTE_PLING.getSound(), 100.0f, 2.0f));
         new OneShotStateDependent(ArenaMode.Test, FightState.All, WorldEditRendererCUIEditor::new);
+        try {
+            Bukkit.getWorlds().get(0).setGameRule(GameRule.REDUCED_DEBUG_INFO, ArenaMode.AntiTest.contains(Config.mode));
+        } catch (Exception e) {
+            // Ignore if failed!
+        }
 
         techHider = new TechHiderWrapper();
         hullHider = new HullHider();

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

@@ -0,0 +1,44 @@
+/*
+ *   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.listener;
+
+import de.steamwar.fightsystem.Config;
+import de.steamwar.fightsystem.states.FightState;
+import de.steamwar.fightsystem.states.StateDependentListener;
+import de.steamwar.linkage.Linked;
+import org.bukkit.Material;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.block.BlockFormEvent;
+
+@Linked
+public class BlockFormListener implements Listener {
+
+    public BlockFormListener() {
+        new StateDependentListener(Config.GameModeConfig.Arena.DisableIceForm, FightState.All, this);
+    }
+
+    @EventHandler
+    public void onBlockForm(BlockFormEvent event) {
+        if (Config.ArenaRegion.inRegion(event.getBlock()) && event.getNewState().getType() == Material.ICE) {
+            event.setCancelled(true);
+        }
+    }
+}

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

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

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

@@ -25,6 +25,7 @@ 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.schematicsystem.autocheck.AutoChecker.InventoryScanResult;
 import de.steamwar.sql.GameModeConfig;
 import de.steamwar.sql.SchematicType;
 import org.bukkit.Material;
@@ -50,7 +51,8 @@ public class AutoChecker15 implements AutoChecker.IAutoChecker {
                     result.getBlockCounts().merge(material, 1, Integer::sum);
 
                     if(AutoCheckerItems.impl.getInventoryMaterials().contains(material)) {
-                        checkInventory(result, block, material, new BlockPos(x, y, z));
+                       InventoryScanResult inventoryResult = checkInventory(result, block, material, new BlockPos(x, y, z));
+                       result.getInventoryScans().put(new BlockPos(x, y, z), inventoryResult);
                     }
 
                     if(x == min.getBlockX() || x == max.getBlockX() || y == max.getBlockY() || z == min.getBlockZ() || z == max.getBlockZ()) {
@@ -62,41 +64,24 @@ public class AutoChecker15 implements AutoChecker.IAutoChecker {
         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) {
+    private InventoryScanResult checkInventory(AutoChecker.BlockScanResult result, BaseBlock block, Material material, BlockPos pos) {
         CompoundTag nbt = block.getNbtData();
         if(nbt == null) {
             result.getDefunctNbt().add(pos);
-            return;
+            return null;
         }
 
 
         if(material == Material.JUKEBOX && nbt.getValue().containsKey("RecordItem")){
             result.getRecords().add(pos);
-            return;
+            return null;
         }
 
         List<CompoundTag> items = nbt.getList("Items", CompoundTag.class);
         if(items.isEmpty())
-            return; //Leeres Inventar
+            return null; //Leeres Inventar
 
-        int counter = 0;
+        Map<Material, Integer> inventoryItemCounts = new HashMap<>();
         for(CompoundTag item : items){
             if(!item.containsKey("id")){
                 result.getDefunctNbt().add(pos);
@@ -107,16 +92,18 @@ public class AutoChecker15 implements AutoChecker.IAutoChecker {
             if(itemType == null) //Leere Slots
                 continue;
 
-            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);
             }
+            else {
+                int count = Core.getVersion() >= 21 ? item.getInt("count") : item.getByte("Count");
+                inventoryItemCounts.merge(itemType, count, Integer::sum);
+            }
         }
-        result.getDispenserItems().put(pos, counter);
+        return new InventoryScanResult(material, inventoryItemCounts);
     }
 
     @Override

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

@@ -24,11 +24,13 @@ import de.steamwar.core.VersionDependent;
 import de.steamwar.sql.GameModeConfig;
 import de.steamwar.schematicsystem.SchematicSystem;
 import de.steamwar.sql.SchematicType;
+import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.ToString;
 import org.bukkit.Material;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 public class AutoChecker {
 
@@ -47,6 +49,14 @@ public class AutoChecker {
         AutoCheckerResult sizeCheck(Clipboard clipboard, GameModeConfig<Material, String> type);
     }
 
+    @AllArgsConstructor
+    @Getter
+    @ToString
+    public static class InventoryScanResult {
+        private final Material inventoryMaterial;
+        private final Map<Material, Integer> itemCounts;
+    }
+
     @Getter
     @ToString
     public static class BlockScanResult {
@@ -54,8 +64,13 @@ public class AutoChecker {
         private final List<BlockPos> defunctNbt = new ArrayList<>();
         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, Set<Material>> forbiddenItems = new HashMap<>();
+        private final Map<BlockPos, InventoryScanResult> inventoryScans = new HashMap<>();
         private final Map<BlockPos, Set<Material>> forbiddenNbt = new HashMap<>();
+
+        public Map<Material, Integer> getItemCounts() {
+            return inventoryScans.values().stream()
+                    .flatMap(i -> i.getItemCounts().entrySet().stream())
+                    .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, Integer::sum));
+        }
     }
 }

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

@@ -62,10 +62,12 @@ public class AutoCheckerResult {
                 !type.isAfterDeadline();
     }
 
-    public boolean isDispenserItemsOK() {
-        return blockScanResult.getDispenserItems().values().stream().allMatch(i -> i <= type.Schematic.MaxDispenserItems);
+
+    public boolean doInventoriesOnlyContainAllowedItems() {
     }
 
+
+
     public boolean hasWarnings() {
         return blockScanResult.getDefunctNbt().isEmpty();
     }

TowerRun/src/de/steamwar/towerrun/commands/StartCommand.java

@@ -22,6 +22,7 @@ package de.steamwar.towerrun.commands;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeValidator;
 import de.steamwar.linkage.Linked;
+import de.steamwar.linkage.LinkedInstance;
 import de.steamwar.sql.SteamwarUser;
 import de.steamwar.sql.UserPerm;
 import de.steamwar.towerrun.TowerRun;
@@ -30,6 +31,8 @@ import org.bukkit.entity.Player;
 
 @Linked
 public class StartCommand extends SWCommand {
+
+    @LinkedInstance
     private LobbyCountdown countdown;
 
     public StartCommand() {

TowerRun/src/de/steamwar/towerrun/generator/TowerGenerator.java

@@ -159,8 +159,8 @@ public class TowerGenerator {
                     noKeyFloors--;
                     if (!chestBlocks.isEmpty() && noKeyFloors < 0 && random.nextDouble() < config.keyChance) {
                         noKeyFloors = random.nextInt(config.maxNoKeyFloors - config.minNoKeyFloors) + config.minNoKeyFloors;
-                        for (int i = 0; i < 2; i++) {
-                            Container container = chestBlocks.get(random.nextInt(chestBlocks.size()));
+                        for (int i = 0; i < 2 && !chestBlocks.isEmpty(); i++) {
+                            Container container = chestBlocks.remove(random.nextInt(chestBlocks.size()));
                             keys.add(container.getLocation());
                         }
 

TowerRun/src/de/steamwar/towerrun/listener/IngameListener.java

@@ -42,6 +42,7 @@ import org.bukkit.event.entity.EntityRegainHealthEvent;
 import org.bukkit.event.entity.ItemSpawnEvent;
 import org.bukkit.event.entity.PlayerDeathEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.inventory.ItemStack;
 import org.bukkit.scheduler.BukkitRunnable;
 
 import java.util.*;
@@ -158,10 +159,16 @@ public class IngameListener extends GameStateBukkitListener {
     public void onKeyUse(PlayerInteractEvent event) {
         if (!event.hasItem()) return;
         if (event.getItem().getType() != Material.LEVER) return;
-        event.setCancelled(true);
         if (!event.hasBlock()) return;
         if (event.getClickedBlock().getType() != Material.IRON_DOOR) return;
-        event.getPlayer().getInventory().setItemInMainHand(null);
+        if (event.getHand() == null) return;
+        event.setCancelled(true);
+        ItemStack itemStack = event.getItem();
+        itemStack.setAmount(event.getItem().getAmount() - 1);
+        switch (event.getHand()) {
+            case OFF_HAND -> event.getPlayer().getInventory().setItemInOffHand(itemStack);
+            case HAND -> event.getPlayer().getInventory().setItemInMainHand(itemStack);
+        }
         event.getClickedBlock().breakNaturally();
     }
 
@@ -223,6 +230,8 @@ public class IngameListener extends GameStateBukkitListener {
         shouldMelt(block.getRelative(0, 0, -1));
     }
 
+    private static final Random RANDOM = new Random();
+
     private void shouldMelt(Block block) {
         if (block.getType().isBurnable()) return;
         if (block.getType().isAir()) return;
@@ -269,7 +278,9 @@ public class IngameListener extends GameStateBukkitListener {
                 break;
         }
         Pos pos = new Pos(block.getLocation().getBlockX(), block.getLocation().getBlockY(), block.getLocation().getBlockZ());
-        blocksToMelt.putIfAbsent(pos, time + meltingTime + 1);
+        int delay = meltingTime + 1 + RANDOM.nextInt(30*20)-30*10;
+        if (delay < 0) delay = meltingTime + 1;
+        blocksToMelt.putIfAbsent(pos, time + delay);
     }
 
     @EventHandler

TowerRun/src/de/steamwar/towerrun/winconditions/OutsideWincondition.java

@@ -42,6 +42,10 @@ public abstract class OutsideWincondition extends WinCondition {
     @EventHandler
     public void onPlayerMove(PlayerMoveEvent event) {
         if (event.getTo().getY() > WorldConfig.ESCAPE_HEIGHT) {
+            if (event.getTo().getY() > WorldConfig.ESCAPE_HEIGHT + 10 && Arrays.stream(WorldConfig.REGIONS).noneMatch(region -> region.contains(event.getTo().toVector()))) {
+                TowerRunPlayer tPlayer = TowerRunPlayer.get(event.getPlayer());
+                tPlayer.player().damage(Integer.MAX_VALUE);
+            }
             return;
         }
 

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<String, String> gameModeConfig = new GameModeConfig<>(file, GameModeConfig.ToString, GameModeConfig.ToString, GameModeConfig.ToInternalName, false);
+        GameModeConfig.init();
+        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/listeners/BanListener.java

@@ -46,7 +46,9 @@ public class BanListener extends BasicListener {
         SteamwarUser user = SteamwarUser.get(player.getUniqueId());
         String ip = IPSanitizer.getTrueAddress(player).getHostAddress();
         if (user.isPunished(Punishment.PunishmentType.Ban)) {
-            BannedUserIPs.banIP(user.getId(), ip);
+            if (!player.getUsername().startsWith(".")) {
+                BannedUserIPs.banIP(user.getId(), ip);
+            }
             Chatter.of(event).system(PunishmentCommand.punishmentMessage(user, Punishment.PunishmentType.Ban));
             return;
         }

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);