Backport CommonCore changes from #430

VelocityCore /check command
Merge branch 'main' into version/legacy
2026-06-17 19:18:03 +00:00 · 2026-05-15 16:02:51 +02:00 · 2026-05-15 15:51:06 +02:00 · 2026-05-15 15:51:01 +02:00 · 2026-05-15 15:44:27 +02:00 · 2026-05-15 15:39:04 +02:00
187 changed files with 3284 additions and 1860 deletions
@@ -0,0 +1,60 @@
+name: Bug Report
+about: Du hast einen Fehler gefunden? Melde ihn hier!
+labels: [ "typ/bug" ]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        ACHTUNG: Sollte es bei dem Bug ein Sicherheitsrisiko geben, melde es bitte auf unserem Discord Server
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: |
+        Beschreibe deinen Bug in kurzer Form.
+  - type: input
+    id: mc-ver
+    attributes:
+      label: Minecraft Version
+      description: Minecraft Version des Clients
+    validations:
+      required: true
+  - type: input
+    id: mc-ver-ser
+    attributes:
+      label: Minecraft Version Server
+      description: Minecraft Version des Servers, nur bei Bau oder Arenen Servern
+  - type: dropdown
+    id: can-reproduce
+    attributes:
+      label: Kannst du den Fehler wiederholen?
+      description: |
+        Wenn du den Fehler wiederholen kannst, können wir dieses Problem schneller beheben.
+        Solltest du den Fehler nicht wiederholen können, melde dich bitte auf unserem Discord Server.
+      options:
+        - "Yes"
+        - "No"
+    validations:
+      required: true
+  - type: textarea
+    id: reproduce-steps
+    attributes:
+      label: Wie kannst du den Fehler wiederholen?
+      description: Welche Schritte musst du ausführen, um den Fehler wiederholen zu können?
+    validations:
+      required: true
+  - type: textarea
+    id: expected-result
+    attributes:
+      label: Was sollte passieren?
+      description: Was sollte hier deiner Erwartung nach passieren?
+  - type: input
+    id: logs
+    attributes:
+      label: Auf welchem Server ist der Fehler aufgetreten?
+      description: Gebe bitte den Namen des Servers an, auf dem der Fehler aufgetreten ist. z.B. "Lobby", "Lixfels Bauserver" etc.
+  - type: textarea
+    id: screenshots
+    attributes:
+      label: Screenshots
+      description: Sollte es ein Visuelles Problem geben, kannst du hier Screenshots hinzufügen.
@@ -0,0 +1 @@
+blank_issues_enabled: true
@@ -0,0 +1,17 @@
+name: Feature Idee
+about: Du hast eine Idee für ein neues Feature, welches SteamWar nicht hat? Stelle sie hier vor.
+labels: ["typ/idee"]
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: Feature Beschreibung
+      placeholder: |
+        Ich glaube, dass ...
+    validations:
+      required: true
+  - type: textarea
+    id: screenshots
+    attributes:
+      label: Screenshots
+      description: Wenn es sich um etwas grafisches handelt, kannst du hier Screenshots hinzufügen.
@@ -0,0 +1,193 @@
+name: Backport CommonCore
+
+on:
+  pull_request:
+    types:
+      - closed
+    branches:
+      - main
+
+permissions:
+  contents: write
+  pull-requests: write
+
+env:
+  BACKPORT_PATH: CommonCore
+  BACKPORT_BRANCH_PREFIX: backport/commoncore
+  DISABLE_BACKPORT_LABEL: no-backport
+
+jobs:
+  backport:
+    name: Create CommonCore backport PRs
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+
+      - name: Check backport eligibility
+        id: eligibility
+        shell: bash
+        env:
+          GITHUB_TOKEN: ${{ secrets.CI_BOT_TOKEN }}
+        run: |
+          set -euo pipefail
+
+          api_url="${GITHUB_API_URL:-${GITHUB_SERVER_URL}/api/v1}"
+
+          echo "Backport debug: event=${GITHUB_EVENT_NAME:-unknown}"
+          echo "Backport debug: server=${GITHUB_SERVER_URL}"
+          echo "Backport debug: api=${api_url}"
+          echo "Backport debug: repository=${GITHUB_REPOSITORY}"
+          echo "Backport debug: action=$(jq -r '.action // ""' "$GITHUB_EVENT_PATH")"
+
+          merged="$(jq -r '.pull_request.merged // (.pull_request.merged_at != null)' "$GITHUB_EVENT_PATH")"
+          base_branch="$(jq -r '.pull_request.base.ref' "$GITHUB_EVENT_PATH")"
+          has_disable_label="$(jq -r --arg disable_backport_label "$DISABLE_BACKPORT_LABEL" 'any(.pull_request.labels[]?; .name == $disable_backport_label)' "$GITHUB_EVENT_PATH")"
+          echo "Backport debug: pr=$(jq -r '.pull_request.number // ""' "$GITHUB_EVENT_PATH") base=${base_branch} merged=${merged}"
+          echo "Backport debug: disable label present=${has_disable_label}"
+
+          {
+            echo "should_backport=$([[ "$merged" == "true" && "$base_branch" == "main" && "$has_disable_label" != "true" ]] && echo true || echo false)"
+            echo "pr_number=$(jq -r '.pull_request.number' "$GITHUB_EVENT_PATH")"
+            echo "pr_title<<EOF"
+            jq -r '.pull_request.title' "$GITHUB_EVENT_PATH"
+            echo "EOF"
+          } >> "$GITHUB_OUTPUT"
+
+          labels="$(curl -fsS \
+            -H "Accept: application/json" \
+            -H "Authorization: token ${GITHUB_TOKEN}" \
+            "${api_url}/repos/${GITHUB_REPOSITORY}/labels")"
+
+          if ! jq -e --arg disable_backport_label "$DISABLE_BACKPORT_LABEL" 'any(.[]; .name == $disable_backport_label)' <<< "$labels" >/dev/null; then
+            curl -fsS -X POST \
+              -H "Accept: application/json" \
+              -H "Authorization: token ${GITHUB_TOKEN}" \
+              -H "Content-Type: application/json" \
+              -d "$(jq -n --arg name "$DISABLE_BACKPORT_LABEL" --arg color "ededed" --arg description "Disable automatic CommonCore backporting for this pull request." '{name: $name, color: $color, description: $description}')" \
+              "${api_url}/repos/${GITHUB_REPOSITORY}/labels"
+          fi
+
+      - name: Create backport pull requests
+        if: steps.eligibility.outputs.should_backport == 'true'
+        shell: bash
+        env:
+          GITHUB_TOKEN: ${{ secrets.CI_BOT_TOKEN }}
+          PR_NUMBER: ${{ steps.eligibility.outputs.pr_number }}
+          PR_TITLE: ${{ steps.eligibility.outputs.pr_title }}
+        run: |
+          set -euo pipefail
+
+          api_url="${GITHUB_API_URL:-${GITHUB_SERVER_URL}/api/v1}"
+          repo_api_path="/repos/${GITHUB_REPOSITORY}"
+
+          api_request() {
+            local method="$1"
+            local path="$2"
+            local output="$3"
+            local data_file="${4:-}"
+            local status
+            local args=(-sS -X "$method" -H "Accept: application/json" -H "Authorization: token ${GITHUB_TOKEN}" -w "%{http_code}" -o "$output")
+
+            if [[ -n "$data_file" ]]; then
+              args+=(-H "Content-Type: application/json" --data-binary "@${data_file}")
+            fi
+
+            echo "Backport debug: ${method} ${path}"
+            if ! status="$(curl "${args[@]}" "${api_url}${path}")"; then
+              echo "Backport debug: ${method} ${path} failed before HTTP status was captured."
+              if [[ -s "$output" ]]; then
+                echo "Backport debug: response body:"
+                cat "$output"
+              fi
+              return 1
+            fi
+
+            echo "Backport debug: ${method} ${path} -> HTTP ${status}"
+            if [[ ! "$status" =~ ^2 ]]; then
+              echo "Backport debug: response body:"
+              cat "$output"
+              return 1
+            fi
+          }
+
+          echo "Backport debug: event=${GITHUB_EVENT_NAME:-unknown}"
+          echo "Backport debug: server=${GITHUB_SERVER_URL}"
+          echo "Backport debug: api=${api_url}"
+          echo "Backport debug: repository=${GITHUB_REPOSITORY}"
+          echo "Backport debug: pr=${PR_NUMBER}"
+          echo "Backport debug: actor=${GITHUB_ACTOR:-unknown}"
+
+          git config user.name "SteamWar Backport Bot"
+          git config user.email "actions@steamwar.de"
+
+          if [[ "${GITHUB_SERVER_URL}" == https://* ]]; then
+            auth_host="${GITHUB_SERVER_URL#https://}"
+            git remote set-url origin "https://oauth2:${GITHUB_TOKEN}@${auth_host}/${GITHUB_REPOSITORY}.git"
+          fi
+
+          git fetch --prune origin '+refs/heads/version/*:refs/remotes/origin/version/*'
+
+          api_request GET "${repo_api_path}" repo-debug.json
+          jq -r '"Backport debug: repo permissions admin=\(.permissions.admin // "unknown") push=\(.permissions.push // "unknown") pull=\(.permissions.pull // "unknown")"' repo-debug.json || true
+
+          echo "Backport debug: GET ${repo_api_path}/pulls/${PR_NUMBER}.diff"
+          curl -fsSL -w "Backport debug: GET ${repo_api_path}/pulls/${PR_NUMBER}.diff -> HTTP %{http_code}\n" \
+            -H "Accept: text/plain" \
+            -H "Authorization: token ${GITHUB_TOKEN}" \
+            "${api_url}${repo_api_path}/pulls/${PR_NUMBER}.diff" \
+            -o pull-request.diff
+
+          if ! grep -Eq "^diff --git a/${BACKPORT_PATH}/" pull-request.diff; then
+            echo "Pull request #${PR_NUMBER} has no ${BACKPORT_PATH} changes to backport."
+            exit 0
+          fi
+
+          mapfile -t target_branches < <(git for-each-ref --format='%(refname:strip=3)' refs/remotes/origin/version)
+          if [[ "${#target_branches[@]}" -eq 0 ]]; then
+            echo "No version/* branches found."
+            exit 0
+          fi
+
+          for target_branch in "${target_branches[@]}"; do
+            safe_target="${target_branch//\//-}"
+            backport_branch="${BACKPORT_BRANCH_PREFIX}/pr-${PR_NUMBER}-to-${safe_target}"
+
+            git checkout -B "${backport_branch}" "origin/${target_branch}"
+            git reset --hard "origin/${target_branch}"
+
+            if ! git apply --3way --index --include="${BACKPORT_PATH}/**" pull-request.diff; then
+              echo "Failed to apply CommonCore backport for ${target_branch}."
+              exit 1
+            fi
+
+            if git diff --cached --quiet; then
+              echo "CommonCore changes from #${PR_NUMBER} are already present in ${target_branch}."
+              continue
+            fi
+
+            git commit -m "Backport CommonCore changes from #${PR_NUMBER}" -m "${PR_TITLE}"
+            git push --force-with-lease origin "${backport_branch}"
+
+            api_request GET "${repo_api_path}/pulls?state=open" open-pulls.json
+            open_pr_number="$(jq -r --arg base "$target_branch" --arg head "$backport_branch" '[.[] | select(.base.ref == $base and .head.ref == $head) | (.number // .index)][0] // empty' open-pulls.json)"
+
+            if [[ -n "$open_pr_number" ]]; then
+              echo "Backport PR #${open_pr_number} already exists for ${target_branch}."
+              continue
+            fi
+
+            pr_body="$(printf 'Automatic CommonCore backport of #%s.\n\nOriginal PR title: %s\n\nOnly files below `CommonCore/` are included.' "$PR_NUMBER" "$PR_TITLE")"
+
+            jq -n \
+              --arg base "$target_branch" \
+              --arg head "$backport_branch" \
+              --arg title "Backport CommonCore changes from #${PR_NUMBER} to ${target_branch}" \
+              --arg body "$pr_body" \
+              '{base: $base, head: $head, title: $title, body: $body}' > create-pull.json
+
+            echo "Backport debug: create PR base=${target_branch} head=${backport_branch}"
+            api_request POST "${repo_api_path}/pulls" create-pull-response.json create-pull.json
+          done
@@ -0,0 +1,145 @@
+name: Deploy
+
+on:
+  push:
+    branches:
+      - main
+      - version/*
+
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v6
+      - name: Setup Java 8
+        uses: actions/setup-java@v5
+        with:
+          distribution: 'temurin'
+          java-version: 8
+      - name: Setup Java 11
+        uses: actions/setup-java@v5
+        with:
+          distribution: 'temurin'
+          java-version: 11
+      - name: Setup Java 17
+        uses: actions/setup-java@v5
+        with:
+          distribution: 'temurin'
+          java-version: 17
+      - name: Setup Java
+        uses: actions/setup-java@v5
+        with:
+          distribution: 'temurin'
+          java-version: 21
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v6
+      - name: Setup Maven Repository
+        env:
+          SW_MAVEN_CREDENTIALS: ${{ secrets.SW_MAVEN_CREDENTIALS }}
+        run: |
+          echo "$SW_MAVEN_CREDENTIALS" > steamwar.properties
+      - name: Build with Gradle
+        run: ./gradlew build --no-daemon
+
+      - name: Stage deploy artifacts
+        shell: bash
+        run: |
+          set -euo pipefail
+
+          rm -rf deploy
+          mkdir -p deploy
+
+          cp "BauSystem/build/libs/BauSystem-all.jar" "deploy/BauSystem.jar"
+          cp "LegacyBauSystem/build/libs/LegacyBauSystem.jar" "deploy/BauSystem-1.12.jar"
+          cp "FightSystem/build/libs/FightSystem-all.jar" "deploy/FightSystem.jar"
+          cp "KotlinCore/build/libs/KotlinCore-all.jar" "deploy/KotlinCore.jar"
+          cp "TNTLeague/build/libs/TNTLeague.jar" "deploy/TNTLeague.jar"
+          cp "LobbySystem/build/libs/LobbySystem.jar" "deploy/LobbySystem.jar"
+          cp "MissileWars/build/libs/MissileWars.jar" "deploy/MissileWars.jar"
+          cp "Realtime/build/libs/Realtime.jar" "deploy/RealTime.jar"
+          cp "SchematicSystem/build/libs/SchematicSystem-all.jar" "deploy/SchematicSystem.jar"
+          cp "SpigotCore/build/libs/SpigotCore-all.jar" "deploy/SpigotCore.jar"
+          cp "Teamserver/build/libs/Teamserver.jar" "deploy/Builder.jar"
+          cp "TowerRun/build/libs/TowerRun.jar" "deploy/TowerRun.jar"
+          cp "VelocityCore/Persistent/build/libs/Persistent.jar" "deploy/PersistentVelocityCore.jar"
+          cp "VelocityCore/Dependencies/build/libs/Dependencies-all.jar" "deploy/DependenciesVelocityCore.jar"
+          cp "VelocityCore/build/libs/VelocityCore-all.jar" "deploy/VelocityCore.jar"
+          cp "WebsiteBackend/build/libs/WebsiteBackend-all.jar" "deploy/website-api.jar"
+          cp "CLI/build/distributions/sw.zip" "deploy/sw.zip"
+
+      - name: Upload deploy artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: steamwar-jars
+          path: deploy/
+
+  deploy:
+    name: Deploy
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Download deploy artifacts
+        uses: actions/download-artifact@v3
+        with:
+          name: steamwar-jars
+          path: deploy
+
+      - name: Resolve deploy target
+        id: target
+        shell: bash
+        run: |
+          set -euo pipefail
+
+          if [[ "${GITHUB_REF_NAME}" == "main" ]]; then
+            echo "path=/jars/current" >> "$GITHUB_OUTPUT"
+          elif [[ "${GITHUB_REF_NAME}" == version/* ]]; then
+            version="${GITHUB_REF_NAME#version/}"
+            if [[ ! "$version" =~ ^[A-Za-z0-9._-]+$ ]]; then
+              echo "Unsupported version branch name: ${GITHUB_REF_NAME}" >&2
+              exit 1
+            fi
+            echo "path=/jars/${version}" >> "$GITHUB_OUTPUT"
+          else
+            echo "Unsupported deployment branch: ${GITHUB_REF_NAME}" >&2
+            exit 1
+          fi
+
+      - name: Upload jars with scp
+        shell: bash
+        env:
+          DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }}
+          DEPLOY_USER: ${{ secrets.DEPLOY_USER }}
+          DEPLOY_PORT: ${{ secrets.DEPLOY_PORT }}
+          DEPLOY_SSH_KEY: ${{ secrets.DEPLOY_SSH_KEY }}
+          DEPLOY_PATH: ${{ steps.target.outputs.path }}
+        run: |
+          set -euo pipefail
+
+          : "${DEPLOY_HOST:?Missing DEPLOY_HOST secret}"
+          : "${DEPLOY_USER:?Missing DEPLOY_USER secret}"
+          : "${DEPLOY_SSH_KEY:?Missing DEPLOY_SSH_KEY secret}"
+
+          port="${DEPLOY_PORT:-22}"
+
+          mkdir -p ~/.ssh
+          chmod 700 ~/.ssh
+          echo "$DEPLOY_SSH_KEY" > ~/.ssh/deploy_key
+          chmod 600 ~/.ssh/deploy_key
+          ssh-keyscan -p "$port" "$DEPLOY_HOST" >> ~/.ssh/known_hosts
+
+          ssh -i ~/.ssh/deploy_key -p "$port" "${DEPLOY_USER}@${DEPLOY_HOST}" "mkdir -p '$DEPLOY_PATH'"
+          scp -i ~/.ssh/deploy_key -P "$port" deploy/* "${DEPLOY_USER}@${DEPLOY_HOST}:$DEPLOY_PATH/"
+      - name: Restart Services
+        shell: bash
+        env:
+          DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }}
+          DEPLOY_USER: ${{ secrets.DEPLOY_USER }}
+          DEPLOY_PORT: ${{ secrets.DEPLOY_PORT }}
+          DEPLOY_SSH_KEY: ${{ secrets.DEPLOY_SSH_KEY }}
+        run: |
+          set -euo pipefail
+          
+          ssh -i ~/.ssh/deploy_key -p "$DEPLOY_PORT" "${DEPLOY_USER}@${DEPLOY_HOST}" "sudo systemctl restart api.service"
+          ssh -i ~/.ssh/deploy_key -p "$DEPLOY_PORT" "${DEPLOY_USER}@${DEPLOY_HOST}" "unzip -o /jars/current/sw.zip -d /jars"
@@ -0,0 +1,76 @@
+name: Pull Request Build
+
+on:
+  pull_request:
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v6
+      - name: Setup Java 8
+        uses: actions/setup-java@v5
+        with:
+          distribution: 'temurin'
+          java-version: 8
+      - name: Setup Java 11
+        uses: actions/setup-java@v5
+        with:
+          distribution: 'temurin'
+          java-version: 11
+      - name: Setup Java 17
+        uses: actions/setup-java@v5
+        with:
+          distribution: 'temurin'
+          java-version: 17
+      - name: Setup Java
+        uses: actions/setup-java@v5
+        with:
+          distribution: 'temurin'
+          java-version: 21
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v6
+      - name: Setup Maven Repository
+        env:
+          SW_MAVEN_CREDENTIALS: ${{ secrets.SW_MAVEN_CREDENTIALS }}
+        run: |
+          echo "$SW_MAVEN_CREDENTIALS" > steamwar.properties
+      - name: Build with Gradle
+        run: ./gradlew build --no-daemon
+
+      - name: Merge successful backport PR
+        shell: bash
+        env:
+          GITHUB_TOKEN: ${{ secrets.CI_BOT_TOKEN }}
+          BACKPORT_BRANCH_PREFIX: backport/commoncore
+        run: |
+          set -euo pipefail
+
+          head_branch="$(jq -r '.pull_request.head.ref // ""' "$GITHUB_EVENT_PATH")"
+          base_branch="$(jq -r '.pull_request.base.ref // ""' "$GITHUB_EVENT_PATH")"
+          pr_number="$(jq -r '.pull_request.number' "$GITHUB_EVENT_PATH")"
+
+          if [[ "${head_branch}" != "${BACKPORT_BRANCH_PREFIX}/"* ]]; then
+            echo "Not a CommonCore backport PR."
+            exit 0
+          fi
+
+          if [[ "${base_branch}" != version/* ]]; then
+            echo "Backport PR target is not a version/* branch."
+            exit 0
+          fi
+
+          api_url="${GITHUB_API_URL:-${GITHUB_SERVER_URL}/api/v1}"
+
+          curl -fsS -X POST \
+            -H "Accept: application/json" \
+            -H "Authorization: token ${GITHUB_TOKEN}" \
+            -H "Content-Type: application/json" \
+            -d '{"Do":"merge","delete_branch_after_merge":true}' \
+            "${api_url}/repos/${GITHUB_REPOSITORY}/pulls/${pr_number}/merge"
@@ -20,4 +20,5 @@ lib
 /WebsiteBackend/data
 /WebsiteBackend/logs
 /WebsiteBackend/skins
-/WebsiteBackend/config.json
+/WebsiteBackend/config.json
+/WebsiteBackend/sessions
@@ -100,7 +100,6 @@ public class TickManager21 implements TickManager {
            manager.setFrozen(true);
            bukkitTask.cancel();
        }, 1, 1);
-        manager.tick();
    }

    @Override
@@ -52,6 +52,9 @@ FLAG_ITEMS=Items
 FLAG_NO_GRAVITY = No Gravity
 FLAG_TESTBLOCK=Testblock
 FLAG_CHANGED=Changed
+FLAG_WATER_DESTROY=Water Destroy
+FLAG_WATER_DESTROY_ALLOW=§coff
+FLAG_WATER_DESTROY_DENY=§aon
 FLAG_FIRE_ALLOW=§con
 FLAG_FIRE_DENY=§aoff
 FLAG_FREEZE_ACTIVE=§aon
@@ -140,6 +143,7 @@ BAU_INFO_ITEM_LORE_ITEMS=§7Items§8: §e{0}
 BAU_INFO_ITEM_LORE_NO_GRAVITY = §7NoGravity§8: §e{0}
 BAU_INFO_ITEM_LORE_TESTBLOCK=§7Testblock§8: §e{0}
 BAU_INFO_ITEM_LORE_CHANGED=§7Changed§8: §e{0}
+BAU_INFO_ITEM_LORE_WATER_DESTROY=§7Water Destroy§8: §e{0}
 BAU_INFO_COMMAND_HELP=§8/§ebauinfo §8- §7Information regarding this build server
 BAU_INFO_COMMAND_OWNER=§7Owner§8: §e{0}
 BAU_INFO_COMMAND_MEMBER=§7{0} §8[§7{1}§8]§8: §e{2}
@@ -756,6 +760,9 @@ REGION_FIRE_DISABLED=§aFire damage activated in this region
 REGION_FREEZE_HELP=§8/§efreeze §8- §7Toggle Freeze
 REGION_FREEZE_ENABLED=§cRegion frozen
 REGION_FREEZE_DISABLED=§aRegion thawed
+REGION_WATER_HELP=§8/§ewaterdestroy §8- §7Toggle water damage
+REGION_WATER_ENABLED=§aWater damage deactivated in this region
+REGION_WATER_DISABLED=§cWater damage activated in this region
 REGION_ITEMS_HELP=§8/§eitems §8- §7Toggle Items
 REGION_ITEMS_ENABLED=§aItems enabled in this region
 REGION_ITEMS_DISABLED=§cItems disabled in this region
@@ -54,6 +54,9 @@ FLAG_FREEZE_ACTIVE=§aan
 FLAG_FREEZE_INACTIVE=§caus
 FLAG_PROTECT_ACTIVE=§aan
 FLAG_PROTECT_INACTIVE=§caus
+FLAG_WATER_DESTROY=Wasserschaden
+FLAG_WATER_DESTROY_ALLOW=§cerlaubt
+FLAG_WATER_DESTROY_DENY=§aaus
 FLAG_TNT_ALLOW=§aan
 FLAG_TNT_DENY=§caus
 FLAG_TNT_ONLY_TB=§7Kein §eBaurahmen
@@ -122,6 +125,7 @@ BAU_INFO_ITEM_NAME=§eBau-Management
 BAU_INFO_ITEM_LORE_FIRE=§7Feuer§8: §e{0}
 BAU_INFO_ITEM_LORE_COLOR=§7Farbe§8: §e{0}
 BAU_INFO_ITEM_LORE_CHANGED=§7Verändert§8: §e{0}
+BAU_INFO_ITEM_LORE_WATER_DESTROY=§7Wasserschaden§8: §e{0}
 BAU_INFO_COMMAND_HELP=§8/§ebauinfo §8- §7Gibt Informationen über den Bau
 BAU_INFO_COMMAND_OWNER=§7Besitzer§8: §e{0}
 BAU_INFO_COMMAND_MEMBER=§7{0} §8[§7{1}§8]§8: §e{2}
@@ -704,6 +708,9 @@ REGION_PROTECT_FALSE_REGION=§cDu befindest dich derzeit in keiner (M)WG-Region
 REGION_NO_GRAVITY_HELP = §8/§enogravity §8- §7Toggle NoGravity
 REGION_NO_GRAVITY_ENABLED = §aNoGravity aktiviert in dieser Region
 REGION_NO_GRAVITY_DISABLED = §cNoGravity deaktiviert in dieser Region
+REGION_WATER_HELP=§8/§ewaterblock §8- §7Wasserschaden umschalten
+REGION_WATER_ENABLED=§aWasserschaden deaktiviert
+REGION_WATER_DISABLED=§cWasserschaden aktiviert
 REGION_REGION_HELP_UNDO=§8/§eregion undo §8- §7Mache die letzten 20 /testblock oder /reset rückgängig
 REGION_REGION_HELP_REDO=§8/§eregion redo §8- §7Wiederhole die letzten 20 §8/§7rg undo
 REGION_REGION_HELP_RESTORE=§8/§eregion restore §8- §7Setzte die Region zurück, ohne das Gebaute zu löschen
@@ -40,10 +40,13 @@ import de.steamwar.bausystem.worlddata.WorldData;
 import de.steamwar.command.AbstractValidator;
 import de.steamwar.command.SWCommandUtils;
 import de.steamwar.core.CRIUSleepEvent;
+import de.steamwar.core.Core;
 import de.steamwar.core.WorldEditRendererCUIEditor;
+import de.steamwar.core.WorldIdentifier;
 import de.steamwar.linkage.AbstractLinker;
 import de.steamwar.linkage.SpigotLinker;
 import de.steamwar.message.Message;
+import de.steamwar.providers.BauServerInfo;
 import lombok.Getter;
 import org.bukkit.Bukkit;
 import org.bukkit.GameRule;
@@ -121,6 +124,7 @@ public class BauSystem extends JavaPlugin implements Listener {
        } catch (AbstractLinker.LinkException e) {
            getLogger().log(Level.SEVERE, "Could not link a class.", e);
            Bukkit.shutdown();
+            return;
        }

        TickListener.impl.init();
@@ -131,6 +135,9 @@ public class BauSystem extends JavaPlugin implements Listener {
        new WorldEditRendererCUIEditor();

        Bukkit.getWorlds().get(0).setGameRule(GameRule.SEND_COMMAND_FEEDBACK, false);
+
+        String identifier = BauServerInfo.getOwnerUser().getUUID().toString().replace("-", "");
+        WorldIdentifier.set("bau/" + Core.getVersion() + "/" + identifier);
    }

    @EventHandler
@@ -31,10 +31,7 @@ import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.entity.Player;

-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;

 public class DesignEndStone {
@@ -56,11 +53,10 @@ public class DesignEndStone {
        this.maxY = region.getBuildArea().getMaxPoint(false).getY();
        this.maxZ = region.getBuildArea().getMaxPoint(false).getZ();

-        limited = region.getGameModeConfig().Schematic.Limited
-                .entrySet()
-                .stream()
-                .filter(entry -> entry.getValue() == 0)
-                .flatMap(entry -> entry.getKey().stream())
+        limited = Arrays.stream(Material.values())
+                .filter(Material::isBlock)
+                .filter(material -> !material.isLegacy())
+                .filter(material -> material.getBlastResistance() > region.getGameModeConfig().Schematic.MaxDesignBlastResistance)
                .collect(Collectors.toSet());
        calculateFromBottom = region.getGameModeConfig().Arena.NoFloor;

@@ -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);
+        }
+    }
+}
@@ -46,8 +46,8 @@ public class ObserverTracerListener implements Listener {
    public ObserverTracerListener() {
        Bukkit.getScheduler().runTaskTimer(BauSystem.getInstance(), () -> {
            SWPlayer.allWithSingleComponent(ObserverTracer.class).forEach(pair -> {
-                if (pair.getKey().getGameMode() != GameMode.SPECTATOR) return;
-                pair.getValue().show();
+                if (pair.getPlayer().getGameMode() != GameMode.SPECTATOR) return;
+                pair.getComponent().show();
            });
        }, 15L, 15L);
    }
@@ -64,7 +64,7 @@ public class ObserverTracerListener implements Listener {
                    createNew(event);
                }
                SWPlayer.allWithSingleComponent(ObserverTracer.class).forEach(pair -> {
-                    pair.getValue().trace();
+                    pair.getComponent().trace();
                });
            }, 1L);
        } else {
@@ -46,6 +46,16 @@ import org.bukkit.event.player.PlayerInteractEvent;
@Linked
 public class FreezeListener implements Listener, ScoreboardElement {

+    @EventHandler
+    public void onBlockExplode(BlockExplodeEvent e) {
+        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.INACTIVE)) return;
+        e.setCancelled(true);
+        BlockState state = e.getBlock().getState();
+        Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
+            state.update(true, false);
+        }, 1L);
+    }
+
    @EventHandler
    public void onEntitySpawn(EntitySpawnEvent e) {
        if (Region.getRegion(e.getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.INACTIVE)) return;
@@ -67,11 +67,7 @@ public class TNTListener implements Listener, ScoreboardElement {

    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
    public void onExplode(EntityExplodeEvent event) {
-        if (!(event.getEntity() instanceof TNTPrimed)) {
-            event.blockList().clear();
-            return;
-        }
-        explode(event.blockList(), true);
+        explode(event.blockList(), event.getEntity() instanceof TNTPrimed);
    }

    @Override
@@ -0,0 +1,64 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.bausystem.features.region;
+
+import de.steamwar.bausystem.region.Region;
+import de.steamwar.bausystem.region.RegionUtils;
+import de.steamwar.bausystem.region.flags.Flag;
+import de.steamwar.bausystem.region.flags.WaterDestroyMode;
+import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
+import org.bukkit.entity.Player;
+
+@Linked
+public class WaterDestroyCommand extends SWCommand {
+    public WaterDestroyCommand() {
+        super("waterdestroy");
+    }
+
+    private String getEnableMessage(){
+        return "REGION_WATER_ENABLED";
+    }
+
+    private String getDisableMessage(){
+        return "REGION_WATER_DISABLED";
+    }
+
+    @Register(description = "REGION_WATER_HELP")
+    public void toggleCommand(@Validator Player p) {
+        Region region = Region.getRegion(p.getLocation());
+
+        if (toggle(region)) {
+            RegionUtils.actionBar(region, getEnableMessage());
+        } else {
+            RegionUtils.actionBar(region, getDisableMessage());
+        }
+    }
+
+    private boolean toggle(Region region) {
+        if (region.getRegionData().get(Flag.WATER_DESTROY).isWithDefault(WaterDestroyMode.DENY)) {
+            region.getRegionData().set(Flag.WATER_DESTROY, WaterDestroyMode.ALLOW);
+            return false;
+        } else {
+            region.getRegionData().set(Flag.WATER_DESTROY, WaterDestroyMode.DENY);
+            return true;
+        }
+    }
+}
@@ -0,0 +1,57 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.bausystem.features.region;
+
+import de.steamwar.bausystem.BauSystem;
+import de.steamwar.bausystem.region.Region;
+import de.steamwar.bausystem.region.flags.Flag;
+import de.steamwar.bausystem.region.flags.WaterDestroyMode;
+import de.steamwar.bausystem.utils.ScoreboardElement;
+import de.steamwar.linkage.Linked;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.block.BlockFromToEvent;
+
+@Linked
+public class WaterDestroyListener implements Listener, ScoreboardElement {
+
+    @EventHandler
+    public void onBlockFromTo(BlockFromToEvent event) {
+        if (event.getBlock().getType() == Material.WATER && event.getToBlock().getType() != Material.AIR && Region.getRegion(event.getBlock().getLocation()).getRegionData().get(Flag.WATER_DESTROY).isWithDefault(WaterDestroyMode.DENY)) event.setCancelled(true);
+    }
+
+    @Override
+    public ScoreboardGroup getGroup() {
+        return ScoreboardGroup.REGION;
+    }
+
+    @Override
+    public int order() {
+        return 5;
+    }
+
+    @Override
+    public String get(Region region, Player p) {
+        if (region.getRegionData().get(Flag.WATER_DESTROY).isWithDefault(WaterDestroyMode.ALLOW)) return null;
+        return "§e" + BauSystem.MESSAGE.parse(Flag.WATER_DESTROY.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getRegionData().get(Flag.WATER_DESTROY).getWithDefault().getChatValue(), p);
+    }
+}
@@ -51,8 +51,8 @@ public class EventListener implements Listener {
        Bukkit.getScheduler().runTaskTimer(BauSystem.getInstance(), () -> {
            long millis = System.currentTimeMillis();
            SWPlayer.allWithSingleComponent(ScriptRunner.ScriptData.class)
-                    .filter(pair -> millis - pair.getValue().getLastF() > 200)
-                    .forEach(pair -> pair.getValue().setLastF(Long.MAX_VALUE));
+                    .filter(pair -> millis - pair.getComponent().getLastF() > 200)
+                    .forEach(pair -> pair.getComponent().setLastF(Long.MAX_VALUE));
        }, 1, 1);
    }

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

 import java.util.Arrays;

@@ -97,6 +98,7 @@ public class SimulatorObserverPhaseSettingsGui extends SimulatorBaseGui {
        //Tick Offset
        int offset = observer.getTickOffset();
        inventory.setItem(10, new SWItem(SWItem.getDye(offset < max ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
            observer.setTickOffset(Math.min(max, offset + (clickType.isShiftClick() ? 5 : 1)));
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -113,6 +115,7 @@ public class SimulatorObserverPhaseSettingsGui extends SimulatorBaseGui {
        inventory.setItem(19, offsetItem);

        inventory.setItem(28, new SWItem(SWItem.getDye(offset > min ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
            observer.setTickOffset(Math.max(min, offset - (clickType.isShiftClick() ? 5 : 1)));
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
@@ -120,6 +123,7 @@ public class SimulatorObserverPhaseSettingsGui extends SimulatorBaseGui {
        //Order
        int order = observer.getOrder();
        inventory.setItem(13, new SWItem(SWItem.getDye(order < SimulatorPhase.ORDER_LIMIT ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
            observer.setOrder(Math.min(SimulatorPhase.ORDER_LIMIT, order + (clickType.isShiftClick() ? 5 : 1)));
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -138,6 +142,7 @@ public class SimulatorObserverPhaseSettingsGui extends SimulatorBaseGui {
        inventory.setItem(22, orderItem);

        inventory.setItem(31, new SWItem(SWItem.getDye(order > -SimulatorPhase.ORDER_LIMIT ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
            observer.setOrder(Math.max(-SimulatorPhase.ORDER_LIMIT, order - (clickType.isShiftClick() ? 5 : 1)));
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
@@ -28,6 +28,7 @@ import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWItem;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;

 import java.util.Arrays;

@@ -67,6 +68,7 @@ public class SimulatorObserverSettingsGui extends SimulatorBaseGui {
        // Base Tick
        int baseTicks = observer.getBaseTick();
        inventory.setItem(9, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
            observer.changeBaseTicks(clickType.isShiftClick() ? 5 : 1);
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -81,6 +83,7 @@ public class SimulatorObserverSettingsGui extends SimulatorBaseGui {
        baseTick.getItemStack().setAmount(Math.max(1, Math.min(baseTicks, 64)));
        inventory.setItem(18, baseTick);
        inventory.setItem(27, new SWItem(SWItem.getDye(baseTicks > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
            if (baseTicks - (clickType.isShiftClick() ? 5 : 1) < 0) {
                observer.changeBaseTicks(-baseTicks);
            } else {
@@ -91,6 +94,7 @@ public class SimulatorObserverSettingsGui extends SimulatorBaseGui {

        //Pos X
        inventory.setItem(15,  new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
            observer.move(clickType.isShiftClick() ? 5 : 1, 0, 0);
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -102,12 +106,14 @@ public class SimulatorObserverSettingsGui extends SimulatorBaseGui {
            }, this).open();
        }));
        inventory.setItem(33, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
            observer.move(clickType.isShiftClick() ? -5 : -1, 0, 0);
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));

        //Pos Y
        inventory.setItem(16, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
            observer.move(0, clickType.isShiftClick() ? 5 : 1, 0);
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.ENABLED_OR_DISABLED));
@@ -119,12 +125,14 @@ public class SimulatorObserverSettingsGui extends SimulatorBaseGui {
            }, this).open();
        }));
        inventory.setItem(34, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
            observer.move(0, clickType.isShiftClick() ? -5 : -1, 0);
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));

        //Pos Z
        inventory.setItem(17, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
            observer.move(0, 0, clickType.isShiftClick() ? 5 : 1);
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.ENABLED_OR_DISABLED));
@@ -136,6 +144,7 @@ public class SimulatorObserverSettingsGui extends SimulatorBaseGui {
            }, this).open();
        }));
        inventory.setItem(35, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
            observer.move(0, 0, clickType.isShiftClick() ? -5 : -1);
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
@@ -165,11 +165,13 @@ public class SimulatorRedstoneGui extends SimulatorScrollGui<SimulatorRedstoneGu
        Consumer<Integer> setter = redstoneSubPhase.place ? redstoneSubPhase.phase::setTickOffset : redstoneSubPhase.phase::setLifetime;
        return new SWItem[] {
                new SWItem(SWItem.getDye(getter.get() < max ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8:§e +5"), false, clickType -> {
+                    if (clickType == ClickType.DOUBLE_CLICK) return;
                    setter.accept(Math.min(max, getter.get() + (clickType.isShiftClick() ? 5 : 1)));
                    SimulatorWatcher.update(simulator);
                }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED),
                redstone,
                new SWItem(SWItem.getDye(getter.get() > min ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8:§e -5"), false, clickType -> {
+                    if (clickType == ClickType.DOUBLE_CLICK) return;
                    setter.accept(Math.max(min, getter.get() - (clickType.isShiftClick() ? 5 : 1)));
                    SimulatorWatcher.update(simulator);
                }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED),
@@ -31,6 +31,7 @@ import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWItem;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;

 import java.util.Arrays;

@@ -98,6 +99,7 @@ public class SimulatorRedstonePhaseSettingsGui extends SimulatorBaseGui {
        //Tick Offset
        int offset = redstone.getTickOffset();
        inventory.setItem(10, new SWItem(SWItem.getDye(offset < maxOffset ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
            redstone.setTickOffset(Math.min(maxOffset, offset + (clickType.isShiftClick() ? 5 : 1)));
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -114,6 +116,7 @@ public class SimulatorRedstonePhaseSettingsGui extends SimulatorBaseGui {
        inventory.setItem(19, offsetItem);

        inventory.setItem(28, new SWItem(SWItem.getDye(offset > min ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
            redstone.setTickOffset(Math.max(min, offset - (clickType.isShiftClick() ? 5 : 1)));
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
@@ -121,6 +124,7 @@ public class SimulatorRedstonePhaseSettingsGui extends SimulatorBaseGui {
        //Lifetime
        int lifetime = redstone.getLifetime();
        inventory.setItem(11, new SWItem(SWItem.getDye(lifetime < maxLifetime ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
            redstone.setLifetime(Math.min(maxLifetime, lifetime + (clickType.isShiftClick() ? 5 : 1)));
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -137,6 +141,7 @@ public class SimulatorRedstonePhaseSettingsGui extends SimulatorBaseGui {
        inventory.setItem(20, lifetimeItem);

        inventory.setItem(29, new SWItem(SWItem.getDye(lifetime > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
            redstone.setLifetime(Math.max(0, lifetime - (clickType.isShiftClick() ? 5 : 1)));
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
@@ -144,6 +149,7 @@ public class SimulatorRedstonePhaseSettingsGui extends SimulatorBaseGui {
        //Order
        int order = redstone.getOrder();
        inventory.setItem(13, new SWItem(SWItem.getDye(order < SimulatorPhase.ORDER_LIMIT ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
            redstone.setOrder(Math.min(SimulatorPhase.ORDER_LIMIT, order + (clickType.isShiftClick() ? 5 : 1)));
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -162,6 +168,7 @@ public class SimulatorRedstonePhaseSettingsGui extends SimulatorBaseGui {
        inventory.setItem(22, orderItem);

        inventory.setItem(31, new SWItem(SWItem.getDye(order > -SimulatorPhase.ORDER_LIMIT ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
            redstone.setOrder(Math.max(-SimulatorPhase.ORDER_LIMIT, order - (clickType.isShiftClick() ? 5 : 1)));
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
@@ -28,6 +28,7 @@ import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWItem;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;

 import java.util.Arrays;

@@ -66,6 +67,7 @@ public class SimulatorRedstoneSettingsGui extends SimulatorBaseGui {
        // Base Tick
        int baseTicks = redstone.getBaseTick();
        inventory.setItem(9, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
            redstone.changeBaseTicks(clickType.isShiftClick() ? 5 : 1);
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -80,6 +82,7 @@ public class SimulatorRedstoneSettingsGui extends SimulatorBaseGui {
        baseTick.getItemStack().setAmount(Math.max(1, Math.min(baseTicks, 64)));
        inventory.setItem(18, baseTick);
        inventory.setItem(27, new SWItem(SWItem.getDye(baseTicks > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
            if (baseTicks - (clickType.isShiftClick() ? 5 : 1) < 0) {
                redstone.changeBaseTicks(-baseTicks);
            } else {
@@ -90,6 +93,7 @@ public class SimulatorRedstoneSettingsGui extends SimulatorBaseGui {

        //Pos X
        inventory.setItem(15, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
            redstone.move(clickType.isShiftClick() ? 5 : 1, 0, 0);
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -101,12 +105,14 @@ public class SimulatorRedstoneSettingsGui extends SimulatorBaseGui {
            }, this).open();
        }));
        inventory.setItem(33, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
            redstone.move(clickType.isShiftClick() ? -5 : -1, 0, 0);
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));

        //Pos Y
        inventory.setItem(16, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
            redstone.move(0, clickType.isShiftClick() ? 5 : 1, 0);
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -118,12 +124,14 @@ public class SimulatorRedstoneSettingsGui extends SimulatorBaseGui {
            }, this).open();
        }));
        inventory.setItem(34, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
            redstone.move(0, clickType.isShiftClick() ? -5 : -1, 0);
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));

        //Pos Z
        inventory.setItem(17, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
            redstone.move(0, 0, clickType.isShiftClick() ? 5 : 1);
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -135,6 +143,7 @@ public class SimulatorRedstoneSettingsGui extends SimulatorBaseGui {
            }, this).open();
        }));
        inventory.setItem(35, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
            redstone.move(0, 0, clickType.isShiftClick() ? -5 : -1);
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
@@ -138,11 +138,13 @@ public class SimulatorTNTGui extends SimulatorScrollGui<TNTPhase> {

        return new SWItem[]{
                new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8:§e +5"), false, clickType -> {
+                    if (clickType == ClickType.DOUBLE_CLICK) return;
                    tntSetting.setCount(tntSetting.getCount() + (clickType.isShiftClick() ? 5 : 1));
                    SimulatorWatcher.update(simulator);
                }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED),
                tnt,
                new SWItem(SWItem.getDye(tntSetting.getCount() > 1 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8:§e -5"), false, clickType -> {
+                    if (clickType == ClickType.DOUBLE_CLICK) return;
                    tntSetting.setCount(Math.max(1, tntSetting.getCount() - (clickType.isShiftClick() ? 5 : 1)));
                    SimulatorWatcher.update(simulator);
                }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED),
@@ -31,6 +31,7 @@ import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWItem;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;

 import java.util.Arrays;

@@ -78,6 +79,7 @@ public class SimulatorTNTPhaseSettingsGui extends SimulatorBaseGui {
        //Count
        int count = tnt.getCount();
        inventory.setItem(9, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
            tnt.setCount(count + (clickType.isShiftClick() ? 5 : 1));
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -94,6 +96,7 @@ public class SimulatorTNTPhaseSettingsGui extends SimulatorBaseGui {
        inventory.setItem(18, countItem);

        inventory.setItem(27, new SWItem(SWItem.getDye(count > 1 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
            tnt.setCount(Math.max(1, count - (clickType.isShiftClick() ? 5 : 1)));
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
@@ -101,6 +104,7 @@ public class SimulatorTNTPhaseSettingsGui extends SimulatorBaseGui {
        //Tick Offset
        int offset = tnt.getTickOffset();
        inventory.setItem(10, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
            tnt.setTickOffset(offset + (clickType.isShiftClick() ? 5 : 1));
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -117,6 +121,7 @@ public class SimulatorTNTPhaseSettingsGui extends SimulatorBaseGui {
        inventory.setItem(19, offsetItem);

        inventory.setItem(28, new SWItem(SWItem.getDye(offset > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
            tnt.setTickOffset(Math.max(0, offset - (clickType.isShiftClick() ? 5 : 1)));
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
@@ -124,6 +129,7 @@ public class SimulatorTNTPhaseSettingsGui extends SimulatorBaseGui {
        //Lifetime
        int lifetime = tnt.getLifetime();
        inventory.setItem(11, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
            tnt.setLifetime(lifetime + (clickType.isShiftClick() ? 5 : 1));
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -140,6 +146,7 @@ public class SimulatorTNTPhaseSettingsGui extends SimulatorBaseGui {
        inventory.setItem(20, lifetimeItem);

        inventory.setItem(29, new SWItem(SWItem.getDye(lifetime > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
            tnt.setLifetime(Math.max(1, lifetime - (clickType.isShiftClick() ? 5 : 1)));
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
@@ -147,6 +154,7 @@ public class SimulatorTNTPhaseSettingsGui extends SimulatorBaseGui {
        //Order
        int order = tnt.getOrder();
        inventory.setItem(13, new SWItem(SWItem.getDye(order < SimulatorPhase.ORDER_LIMIT ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
            tnt.setOrder(Math.min(SimulatorPhase.ORDER_LIMIT, order + (clickType.isShiftClick() ? 5 : 1)));
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -165,30 +173,35 @@ public class SimulatorTNTPhaseSettingsGui extends SimulatorBaseGui {
        inventory.setItem(22, orderItem);

        inventory.setItem(31, new SWItem(SWItem.getDye(order > -SimulatorPhase.ORDER_LIMIT ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
            tnt.setOrder(Math.max(-SimulatorPhase.ORDER_LIMIT, order - (clickType.isShiftClick() ? 5 : 1)));
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));

        //Jump
        SWItem jumpX = new SWItem(tnt.isXJump() ? Material.LIME_WOOL : Material.RED_WOOL, "§7TNT §eJump X§8: " + (tnt.isZJump() ? "§aon" : "§coff"), clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
            tnt.setXJump(!tnt.isXJump());
            SimulatorWatcher.update(simulator);
        });
        inventory.setItem(33, jumpX);

        SWItem jumpY = new SWItem(tnt.isYJump() ? Material.LIME_WOOL : Material.RED_WOOL, "§7TNT §eJump Y§8: " + (tnt.isYJump() ? "§aon" : "§coff"), clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
            tnt.setYJump(!tnt.isYJump());
            SimulatorWatcher.update(simulator);
        });
        inventory.setItem(16, jumpY);

        SWItem jumpZ = new SWItem(tnt.isZJump() ? Material.LIME_WOOL : Material.RED_WOOL, "§7TNT §eJump Z§8: " + (tnt.isZJump() ? "§aon" : "§coff"), clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
            tnt.setZJump(!tnt.isZJump());
            SimulatorWatcher.update(simulator);
        });
        inventory.setItem(35, jumpZ);

        SWItem jumpAll = new SWItem(Material.TNT, "§7TNT §eJump §8: " + (tnt.hasJump() ? "§aon" : "§coff"), clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
            tnt.setJump(!tnt.hasJump());
            SimulatorWatcher.update(simulator);
        });
@@ -28,6 +28,7 @@ import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWItem;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;

 import java.util.ArrayList;
 import java.util.Arrays;
@@ -75,6 +76,7 @@ public class SimulatorTNTSettingsGui extends SimulatorBaseGui {
        // Base Tick
        int baseTicks = tnt.getBaseTick();
        inventory.setItem(9, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
            tnt.changeBaseTicks(clickType.isShiftClick() ? 5 : 1);
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -89,6 +91,7 @@ public class SimulatorTNTSettingsGui extends SimulatorBaseGui {
        baseTick.getItemStack().setAmount(Math.max(1, Math.min(baseTicks, 64)));
        inventory.setItem(18, baseTick);
        inventory.setItem(27, new SWItem(SWItem.getDye(baseTicks > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
            if (baseTicks - (clickType.isShiftClick() ? 5 : 1) < 0) {
                tnt.changeBaseTicks(-baseTicks);
            } else {
@@ -136,6 +139,7 @@ public class SimulatorTNTSettingsGui extends SimulatorBaseGui {

        // Pos X
        inventory.setItem(15, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+0.0625"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
            tnt.move(clickType.isShiftClick() ? 0.0625 : 1, 0, 0);
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -147,12 +151,14 @@ public class SimulatorTNTSettingsGui extends SimulatorBaseGui {
            }, this).open();
        }));
        inventory.setItem(33, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-0.0625"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
            tnt.move(clickType.isShiftClick() ? -0.0625 : -1, 0, 0);
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));

        // Pos Y
        inventory.setItem(16, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+0.0625"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
            tnt.move(0, clickType.isShiftClick() ? 0.0625 : 1, 0);
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -164,12 +170,14 @@ public class SimulatorTNTSettingsGui extends SimulatorBaseGui {
            }, this).open();
        }));
        inventory.setItem(34, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-0.0625"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
            tnt.move(0, clickType.isShiftClick() ? -0.0625 : -1, 0);
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));

        // Pos Z
        inventory.setItem(17, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+0.0625"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
            tnt.move(0, 0, clickType.isShiftClick() ? 0.0625 : 1);
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -181,6 +189,7 @@ public class SimulatorTNTSettingsGui extends SimulatorBaseGui {
            }, this).open();
        }));
        inventory.setItem(35, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-0.0625"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
            tnt.move(0, 0, clickType.isShiftClick() ? -0.0625 : -1);
            SimulatorWatcher.update(simulator);
        }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
@@ -101,7 +101,7 @@ public class BlockBoundingBox {
        addPixel(Material.END_STONE.createBlockData(), 0, 0, 0, 16, 16, 16, null);

        addPixel(NMSWrapper.impl.pathMaterial().createBlockData(), 0, 0, 0, 16, 15, 16, createItem("LAUFBAU_BLOCK_GRASS_PATH", NMSWrapper.impl.pathMaterial()));
-        addPixel(Material.SOUL_SAND.createBlockData(), 0, 0, 0, 16, 14, 16, createItem("LAUFBAU_BLOCK_SOUL_SAND", Material.SOUL_SAND));
+        addPixel(Material.MUD.createBlockData(), 0, 0, 0, 16, 14, 16, createItem("LAUFBAU_BLOCK_SOUL_SAND", Material.SOUL_SAND));

        Cocoa cocoaNorth = (Cocoa) Material.COCOA.createBlockData();
        cocoaNorth.setAge(2);
@@ -25,12 +25,14 @@ import de.steamwar.bausystem.shared.Pair;
 import de.steamwar.bausystem.utils.WorldEditUtils;
 import de.steamwar.command.SWCommand;
 import de.steamwar.linkage.Linked;
+import de.steamwar.linkage.MinVersion;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;

@Linked
+@MinVersion(19)
 public class LaufbauCommand extends SWCommand {

    public LaufbauCommand() {
@@ -45,8 +45,6 @@ public class TraceManager implements Listener {
        instance = this;
    }

-
-
    public void init() {
        if (!tracesFolder.exists())
            tracesFolder.mkdir();
@@ -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
     */
@@ -1,189 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.bausystem.features.worldedit;
-
-import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.region.Point;
-import de.steamwar.bausystem.region.Region;
-import de.steamwar.bausystem.utils.FlatteningWrapper;
-import de.steamwar.core.SWPlayer;
-import de.steamwar.core.WorldEditRenderer;
-import de.steamwar.linkage.Linked;
-import de.steamwar.linkage.MinVersion;
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.block.Block;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.block.Action;
-import org.bukkit.event.player.PlayerInteractEvent;
-import org.bukkit.scheduler.BukkitTask;
-import org.bukkit.util.Vector;
-
-import java.util.HashSet;
-import java.util.Set;
-import java.util.function.Predicate;
-
-@Linked
-@MinVersion(20)
-public class SelectAdjacent implements Listener {
-
-    private Vector[] FACES = {
-            new Vector(1, 0, 0),
-            new Vector(-1, 0, 0),
-            new Vector(0, 1, 0),
-            new Vector(0, -1, 0),
-            new Vector(0, 0, 1),
-            new Vector(0, 0, -1),
-
-            new Vector(1, 1, 0),
-            new Vector(1, -1, 0),
-            new Vector(1, 0, 1),
-            new Vector(1, 0, -1),
-            new Vector(-1, 1, 0),
-            new Vector(-1, -1, 0),
-            new Vector(-1, 0, 1),
-            new Vector(-1, 0, -1),
-            new Vector(0, 1, 1),
-            new Vector(0, 1, -1),
-            new Vector(0, -1, 1),
-            new Vector(0, -1, -1),
-    };
-
-    @EventHandler
-    public void onPlayerInteract(PlayerInteractEvent event) {
-        if (!event.hasItem()) return;
-        if (event.getItem().getType() != Material.WOODEN_AXE) return;
-        if (!event.getPlayer().isSneaking()) return;
-        if (event.getAction() != Action.LEFT_CLICK_BLOCK) return;
-        Material material = event.getPlayer().getInventory().getItemInOffHand().getType();
-        Selector selector;
-        if (material.isAir()) {
-            selector = new Selector(event.getClickedBlock(), event.getPlayer(), __ -> true);
-        } else {
-            selector = new Selector(event.getClickedBlock(), event.getPlayer(), type -> type == material);
-        }
-        SWPlayer.of(event.getPlayer()).setComponent(selector);
-    }
-
-    private class Selector implements SWPlayer.Component {
-
-        private static final int MAX_BLOCKS = 500_000;
-
-        private int minX;
-        private int minY;
-        private int minZ;
-        private int maxX;
-        private int maxY;
-        private int maxZ;
-
-        private BukkitTask bukkitTask;
-        private Predicate<Material> predicate;
-        private Set<Location> seen = new HashSet<>();
-        private Set<Location> toCalc = new HashSet<>();
-
-        private Region.Area area;
-
-        public Selector(Block block, Player player, Predicate<Material> predicate) {
-            this.predicate = predicate;
-            toCalc.add(block.getLocation());
-            minX = block.getX();
-            minY = block.getY();
-            minZ = block.getZ();
-            maxX = block.getX();
-            maxY = block.getY();
-            maxZ = block.getZ();
-
-            Region region = Region.getRegion(block.getLocation());
-            area = Region.Area.EMPTY;
-            if (region.getBuildArea().inRegion(block.getLocation(), true)) {
-                area = region.getBuildArea();
-            } else if (region.getTestblockArea().inRegion(block.getLocation(), true)) {
-                area = region.getTestblockArea();
-            } else if (region.getArea().inRegion(block.getLocation(), true)) {
-                area = region.getArea();
-            }
-
-            bukkitTask = Bukkit.getScheduler().runTaskTimer(BauSystem.getInstance(), () -> {
-                run();
-
-                long volume = (long)(maxX - minX + 1) * (long)(maxY - minY + 1) * (long)(maxZ - minZ + 1);
-                player.sendTitle("", "§e" + volume + " §7Blocks", 0, 5, 0);
-
-                Point minPoint = new Point(minX, minY, minZ);
-                Point maxPoint = new Point(maxX, maxY, maxZ);
-
-                FlatteningWrapper.impl.setSelection(player, minPoint, maxPoint);
-                WorldEditRenderer.renderPlayer(player);
-
-                // boolean finished = toCalc.stream().allMatch(location -> {
-                //     return location.getBlockX() >= minX && location.getBlockY() >= minY && location.getBlockZ() >= minZ &&
-                //             location.getBlockX() <= maxX && location.getBlockY() <= maxY && location.getBlockZ() <= maxZ;
-                // });
-
-                if (toCalc.isEmpty() || seen.size() > MAX_BLOCKS) {
-                    bukkitTask.cancel();
-                    player.sendTitle("§aDone", "§e" + volume + " §7Blocks", 0, 20, 5);
-                    SWPlayer.of(player).removeComponent(Selector.class);
-                }
-            }, 1, 1);
-        }
-
-        private void cancel() {
-            bukkitTask.cancel();
-        }
-
-        private void run() {
-            Set<Location> current = toCalc;
-            toCalc = new HashSet<>();
-
-            for (Location location : current) {
-                Block block = location.getBlock();
-                if (block.isEmpty() || block.isLiquid()) continue;
-                if (!predicate.test(block.getType())) continue;
-                seen.add(location);
-                if (!area.inRegion(block.getLocation(), true)) continue;
-
-                minX = Math.min(minX, location.getBlockX());
-                maxX = Math.max(maxX, location.getBlockX());
-                minY = Math.min(minY, location.getBlockY());
-                maxY = Math.max(maxY, location.getBlockY());
-                minZ = Math.min(minZ, location.getBlockZ());
-                maxZ = Math.max(maxZ, location.getBlockZ());
-
-                for (Vector face : FACES) {
-                    Block next = block.getRelative(face.getBlockX(), face.getBlockY(), face.getBlockZ());
-                    if (next.isEmpty() || next.isLiquid()) continue;
-                    if (!predicate.test(next.getType())) continue;
-                    Location loc = next.getLocation();
-                    if (seen.contains(loc)) continue;
-                    toCalc.add(loc);
-                }
-            }
-        }
-
-        @Override
-        public void onUnmount(SWPlayer player) {
-            cancel();
-        }
-    }
-}
@@ -26,6 +26,7 @@ import com.sk89q.worldedit.extension.input.ParserContext;
 import com.sk89q.worldedit.function.mask.Mask;
 import de.steamwar.bausystem.features.worldedit.utils.FAWEMaskParser;
 import de.steamwar.linkage.Linked;
+import de.steamwar.linkage.MinVersion;
 import de.steamwar.linkage.PluginCheck;

 import javax.annotation.Nonnull;
@@ -33,6 +34,7 @@ import java.util.stream.Stream;

@Linked
@PluginCheck("FastAsyncWorldEdit")
+@MinVersion(19)
 public class FAWEAboveMaskParser extends FAWEMaskParser {

    public FAWEAboveMaskParser() {
@@ -26,6 +26,7 @@ import com.sk89q.worldedit.extension.input.ParserContext;
 import com.sk89q.worldedit.function.mask.Mask;
 import de.steamwar.bausystem.features.worldedit.utils.FAWEMaskParser;
 import de.steamwar.linkage.Linked;
+import de.steamwar.linkage.MinVersion;
 import de.steamwar.linkage.PluginCheck;

 import javax.annotation.Nonnull;
@@ -33,6 +34,7 @@ import java.util.stream.Stream;

@Linked
@PluginCheck("FastAsyncWorldEdit")
+@MinVersion(19)
 public class FAWEBelowMaskParser extends FAWEMaskParser {

    public FAWEBelowMaskParser() {
@@ -25,6 +25,7 @@ import com.sk89q.worldedit.extension.input.ParserContext;
 import com.sk89q.worldedit.function.mask.Mask;
 import de.steamwar.bausystem.features.worldedit.utils.FAWEMaskParser;
 import de.steamwar.linkage.Linked;
+import de.steamwar.linkage.MinVersion;
 import de.steamwar.linkage.PluginCheck;

 import javax.annotation.Nonnull;
@@ -32,6 +33,7 @@ import java.util.stream.Stream;

@Linked
@PluginCheck("FastAsyncWorldEdit")
+@MinVersion(19)
 public class FAWECheckerboard3DMaskParser extends FAWEMaskParser {

    public FAWECheckerboard3DMaskParser() {
@@ -25,6 +25,7 @@ import com.sk89q.worldedit.extension.input.ParserContext;
 import com.sk89q.worldedit.function.mask.Mask;
 import de.steamwar.bausystem.features.worldedit.utils.FAWEMaskParser;
 import de.steamwar.linkage.Linked;
+import de.steamwar.linkage.MinVersion;
 import de.steamwar.linkage.PluginCheck;

 import javax.annotation.Nonnull;
@@ -32,6 +33,7 @@ import java.util.stream.Stream;

@Linked
@PluginCheck("FastAsyncWorldEdit")
+@MinVersion(19)
 public class FAWECheckerboardMaskParser extends FAWEMaskParser {

    public FAWECheckerboardMaskParser() {
@@ -25,6 +25,7 @@ import com.sk89q.worldedit.extension.input.ParserContext;
 import com.sk89q.worldedit.function.mask.Mask;
 import de.steamwar.bausystem.features.worldedit.utils.FAWEMaskParser;
 import de.steamwar.linkage.Linked;
+import de.steamwar.linkage.MinVersion;
 import de.steamwar.linkage.PluginCheck;

 import javax.annotation.Nonnull;
@@ -32,6 +33,7 @@ import java.util.stream.Stream;

@Linked
@PluginCheck("FastAsyncWorldEdit")
+@MinVersion(19)
 public class FAWEGridMaskParser extends FAWEMaskParser {

    public FAWEGridMaskParser() {
@@ -27,6 +27,7 @@ import com.sk89q.worldedit.regions.Region;
 import de.steamwar.bausystem.features.worldedit.utils.FAWEPatternParser;
 import de.steamwar.bausystem.utils.WorldEditUtils;
 import de.steamwar.linkage.Linked;
+import de.steamwar.linkage.MinVersion;
 import de.steamwar.linkage.PluginCheck;
 import org.bukkit.Axis;

@@ -35,6 +36,7 @@ import java.util.stream.Stream;

@Linked
@PluginCheck("FastAsyncWorldEdit")
+@MinVersion(19)
 public class FAWEGradientPatternParser extends FAWEPatternParser {

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

    private String name;
    private int ordinal;
@@ -0,0 +1,56 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.bausystem.region.flags;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum WaterDestroyMode implements Flag.Value<WaterDestroyMode> {
+
+    ALLOW("FLAG_WATER_DESTROY_ALLOW"),
+    DENY("FLAG_WATER_DESTROY_DENY");
+
+    private static WaterDestroyMode[] values;
+    private final String chatValue;
+
+    @Override
+    public WaterDestroyMode[] getValues() {
+        if (WaterDestroyMode.values == null) {
+            WaterDestroyMode.values = WaterDestroyMode.values();
+        }
+        return WaterDestroyMode.values;
+    }
+
+    @Override
+    public WaterDestroyMode getValue() {
+        return this;
+    }
+
+    @Override
+    public WaterDestroyMode getValueOf(final String name) {
+        try {
+            return WaterDestroyMode.valueOf(name.toUpperCase());
+        } catch (IllegalArgumentException e) {
+            return ALLOW;
+        }
+    }
+}
@@ -34,7 +34,7 @@ public class FixedRegionData extends RegionData {

    @Override
    public @NonNull <T extends Enum<T> & Flag.Value<T>> RegionFlagPolicy has(@NonNull Flag<T> flag) {
-        if (flag.oneOf(Flag.COLOR, Flag.TNT, Flag.FIRE, Flag.FREEZE, Flag.PROTECT, Flag.NO_GRAVITY, Flag.CHANGED)) {
+        if (flag.oneOf(Flag.COLOR, Flag.TNT, Flag.FIRE, Flag.FREEZE, Flag.PROTECT, Flag.NO_GRAVITY, Flag.CHANGED, Flag.WATER_DESTROY)) {
            return RegionFlagPolicy.WRITABLE;
        }
        if (flag.oneOf(Flag.ITEMS) && Core.getVersion() >= 20) {
@@ -0,0 +1,32 @@
+plugins {
+    steamwar.kotlin
+    application
+}
+
+kotlin {
+    jvmToolchain(21)
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
+}
+
+application {
+    mainClass.set("de.steamwar.MainKt")
+    applicationName = "sw"
+}
+
+dependencies {
+    implementation(project(":CommonCore:SQL"))
+
+    implementation("com.github.ajalt.clikt:clikt:5.0.3")
+    implementation("com.github.ajalt.mordant:mordant:3.0.2")
+    implementation(libs.logback)
+    implementation("org.mariadb.jdbc:mariadb-java-client:3.3.1")
+
+    implementation(libs.exposedCore)
+    implementation(libs.exposedDao)
+    implementation(libs.exposedJdbc)
+    implementation(libs.exposedTime)
+}
@@ -0,0 +1,22 @@
+package de.steamwar
+
+import com.github.ajalt.clikt.core.main
+import com.github.ajalt.clikt.core.subcommands
+import de.steamwar.commands.SteamWar
+import de.steamwar.commands.database.DatabaseCommand
+import de.steamwar.commands.database.InfoCommand
+import de.steamwar.commands.database.ResetCommand
+import de.steamwar.commands.dev.DevCommand
+import de.steamwar.commands.profiler.ProfilerCommand
+import de.steamwar.commands.user.UserCommand
+import de.steamwar.commands.user.UserInfoCommand
+import de.steamwar.commands.user.UserSearchCommand
+
+fun main(args: Array<String>) = SteamWar()
+    .subcommands(
+        DatabaseCommand().subcommands(InfoCommand(), ResetCommand()),
+        UserCommand().subcommands(UserInfoCommand(), UserSearchCommand()),
+        DevCommand(),
+        ProfilerCommand()
+    )
+    .main(args)
@@ -0,0 +1,10 @@
+package de.steamwar.commands
+
+import com.github.ajalt.clikt.core.CliktCommand
+import com.github.ajalt.mordant.rendering.TextStyles
+
+class SteamWar: CliktCommand(name = "sw") {
+    override fun run() {
+        echo(TextStyles.bold("SteamWar-CLI"))
+    }
+}
@@ -0,0 +1,22 @@
+package de.steamwar.commands.database
+
+import com.github.ajalt.clikt.core.CliktCommand
+import com.github.ajalt.clikt.core.CliktError
+import com.github.ajalt.clikt.core.Context
+import com.github.ajalt.clikt.core.findOrSetObject
+import com.github.ajalt.clikt.parameters.options.flag
+import com.github.ajalt.clikt.parameters.options.option
+import de.steamwar.db.Database
+
+class DatabaseCommand: CliktCommand(name = "db") {
+    val useProduction by option().flag()
+    val db by findOrSetObject { Database }
+
+    override fun help(context: Context): String = "Run database commands"
+
+    override fun run() {
+        if (!useProduction && db.database == "production") {
+            throw CliktError("You should not use the production database!")
+        }
+    }
+}
@@ -0,0 +1,25 @@
+package de.steamwar.commands.database
+
+import com.github.ajalt.clikt.core.CliktCommand
+import com.github.ajalt.clikt.core.requireObject
+import com.github.ajalt.mordant.table.table
+import de.steamwar.db.Database
+import de.steamwar.db.execute
+import de.steamwar.db.useDb
+
+class InfoCommand: CliktCommand() {
+    val db by requireObject<Database>()
+
+    override fun run() = useDb {
+        val tables = execute("SHOW TABLES") { it.getString(1) }
+
+        echo(
+            table {
+                header { row("Name") }
+                body {
+                    tables.map { row(it) }
+                }
+            }
+        )
+    }
+}
@@ -0,0 +1,33 @@
+package de.steamwar.commands.database
+
+import com.github.ajalt.clikt.core.CliktCommand
+import com.github.ajalt.clikt.core.CliktError
+import com.github.ajalt.clikt.core.requireObject
+import com.github.ajalt.mordant.rendering.TextColors
+import com.github.ajalt.mordant.rendering.TextStyles
+import de.steamwar.db.Database
+import de.steamwar.db.execute
+import de.steamwar.db.useDb
+import java.io.File
+
+class ResetCommand: CliktCommand() {
+    val db by requireObject<Database>()
+
+    override fun run() = useDb {
+        val schemaFile = File("/var/Schema.sql")
+        if (!schemaFile.exists()) {
+            throw CliktError("Schema file not found!")
+        }
+
+        val schema = schemaFile.readText()
+
+        val tables = execute("SHOW TABLES;") { it.getString(1) }
+        for (table in tables) {
+            execute("DROP TABLE IF EXISTS $table;") { }
+        }
+
+        execute(schema) { }
+
+        echo(TextColors.brightGreen(TextStyles.bold("Database reset!")))
+    }
+}
@@ -0,0 +1,179 @@
+package de.steamwar.commands.dev
+
+import com.github.ajalt.clikt.core.CliktCommand
+import com.github.ajalt.clikt.core.CliktError
+import com.github.ajalt.clikt.core.Context
+import com.github.ajalt.clikt.parameters.arguments.argument
+import com.github.ajalt.clikt.parameters.arguments.help
+import com.github.ajalt.clikt.parameters.arguments.multiple
+import com.github.ajalt.clikt.parameters.options.default
+import com.github.ajalt.clikt.parameters.options.defaultLazy
+import com.github.ajalt.clikt.parameters.options.flag
+import com.github.ajalt.clikt.parameters.options.help
+import com.github.ajalt.clikt.parameters.options.option
+import com.github.ajalt.clikt.parameters.types.file
+import com.github.ajalt.clikt.parameters.types.long
+import com.github.ajalt.clikt.parameters.types.path
+import com.sun.security.auth.module.UnixSystem
+import java.io.File
+import kotlin.io.path.absolute
+import kotlin.io.path.absolutePathString
+
+const val LOG4J_CONFIG = """<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="WARN" packages="com.mojang.util">
+    <Appenders>
+        <Console name="WINDOWS_COMPAT" target="SYSTEM_OUT"></Console>
+        <Queue name="TerminalConsole">
+            <PatternLayout pattern="[%d{HH:mm:ss} %level]: %msg{nolookups}%n" />
+        </Queue>
+        <RollingRandomAccessFile name="File" fileName="$\{'sys:logPath'}/latest.log" filePattern="$\{'sys:logPath'}/%d{yyyy.MM.dd}.log.gz">
+            <PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level]: %msg{nolookups}%n" />
+            <Policies>
+                <TimeBasedTriggeringPolicy />
+            </Policies>
+            <DefaultRolloverStrategy max="7"/>
+        </RollingRandomAccessFile>
+    </Appenders>
+    <Loggers>
+        <Root level="info">
+            <filters>
+                <MarkerFilter marker="NETWORK_PACKETS" onMatch="DENY" onMismatch="NEUTRAL" />
+            </filters>
+            <AppenderRef ref="WINDOWS_COMPAT" level="info"/>
+            <AppenderRef ref="File"/>
+            <AppenderRef ref="TerminalConsole" level="info"/>
+        </Root>
+    </Loggers>
+</Configuration>"""
+
+class DevCommand : CliktCommand("dev") {
+    override fun help(context: Context): String = "Start a dev Server"
+
+    override val treatUnknownOptionsAsArgs = true
+
+    val server by argument().help("Server Template")
+    val port by option("--port").long().defaultLazy { UnixSystem().uid + 1010 }.help("Port for Server")
+    val world by option("--world", "-w").path(canBeFile = false).help("User World")
+    val plugins by option("--plugins", "-p").path(true, canBeFile = false).help("Plugin Dir")
+    val profile by option().flag().help("Add Profiling Arguments")
+    val forceUpgrade by option().flag().help("Force Upgrade")
+    val jar by option().file(true, canBeDir = false).help("Jar File")
+    val jvm by option().file(true, canBeDir = false).help("Java Executable")
+    val jvmArgs by argument().multiple()
+
+    override val printHelpOnEmptyArgs = true
+
+    val workingDir = File("").absoluteFile
+    val log4jConfig = File(workingDir, "log4j2.xml")
+
+    override fun run() {
+        val args = mutableListOf<String>()
+
+        val serverDirectory = File(workingDir, server)
+        val serverDir =
+            if (serverDirectory.exists() && serverDirectory.isDirectory) serverDirectory else File(workingDir, server)
+
+        if (isVelocity(server)) {
+            runServer(args, jvmArgs, listOf(jar?.absolutePath ?: File("/jar/Velocity.jar").absolutePath), serverDir)
+        } else {
+            setLogConfig(args)
+            val version = findVersion(server) ?: throw CliktError("Unknown Server Version")
+            val worldFile = world?.absolute()?.toFile() ?: File(serverDir, "devtempworld")
+            val jarFile = jar?.absolutePath ?: additionalVersions[server]?.let { supportedVersionJars[it] } ?: supportedVersionJars[version]
+            ?: throw CliktError("Unknown Server Version")
+
+            if (!worldFile.exists()) {
+                val templateFile = File(serverDir, "Bauwelt")
+                if (!templateFile.exists()) {
+                    throw CliktError("World Template not found!")
+                }
+                templateFile.copyRecursively(worldFile)
+            }
+
+            val devFile = File("/configs/DevServer/${System.getProperty("user.name")}.$port.$version")
+            if (System.getProperty("user.name") != "minecraft") {
+                devFile.createNewFile()
+            }
+
+            runServer(
+                args, jvmArgs, listOf(
+                    jarFile,
+                    *(if (forceUpgrade) arrayOf("-forceUpgrade") else arrayOf()),
+                    "--port", port.toString(),
+                    "--level-name", worldFile.name,
+                    "--world-dir", workingDir.absolutePath,
+                    "--nogui",
+                    *(if (plugins != null) arrayOf("--plugins", plugins!!.absolutePathString()) else arrayOf())
+                ), serverDir
+            )
+
+            try {
+                devFile.delete()
+            } catch (_: Exception) { /* ignored */ }
+        }
+    }
+
+    val jvmDefaultParams = arrayOf(
+        "-Xmx1G",
+        "-Xgc:excessiveGCratio=80",
+        "-Xsyslog:none",
+        "-Xtrace:none",
+        "-Xnoclassgc",
+        "-Xdisableexplicitgc",
+        "-XX:+AlwaysPreTouch",
+        "-XX:+CompactStrings",
+        "-XX:-HeapDumpOnOutOfMemory",
+        "-XX:+ExitOnOutOfMemoryError"
+    )
+
+    val jvmArgOverrides = arrayOf("--add-opens", "java.base/jdk.internal.misc=ALL-UNNAMED")
+
+    val supportedVersionJars = mapOf(
+        8 to "/jars/paper-1.8.8.jar",
+        9 to "/jars/spigot-1.9.4.jar",
+        10 to "/jars/paper-1.10.2.jar",
+        12 to "/jars/spigot-1.12.2.jar",
+        14 to "/jars/spigot-1.14.4.jar",
+        15 to "/jars/spigot-1.15.2.jar",
+        18 to "/jars/paper-1.18.2.jar",
+        19 to "/jars/paper-1.19.3.jar",
+        20 to "/jars/paper-1.20.1.jar",
+        21 to "/jars/paper-1.21.6.jar"
+    )
+
+    val additionalVersions = mapOf(
+        "Tutorial" to 15,
+        "Lobby" to 20
+    )
+
+    fun findVersion(server: String): Int? = server.dropWhile { !it.isDigit() }.toIntOrNull()
+
+    fun isJava8(server: String): Boolean = findVersion(server)?.let { it <= 10 } ?: false
+
+    fun isVelocity(server: String): Boolean = server.endsWith("Velocity")
+
+    fun setLogConfig(args: MutableList<String>) {
+        args += "-DlogPath=${workingDir.absolutePath}/logs"
+        args += "-Dlog4j.configurationFile=${log4jConfig.absolutePath}"
+
+        if (!log4jConfig.exists()) {
+            log4jConfig.writeText(LOG4J_CONFIG)
+        }
+    }
+
+    fun runServer(args: List<String>, jvmArgs: List<String>, cmd: List<String>, serverDir: File) {
+        val process = ProcessBuilder(
+            jvm?.absolutePath ?: if (isJava8(server)) "/usr/lib/jvm/openj9-8/bin/java" else "java",
+            *jvmArgs.toTypedArray(),
+            *args.toTypedArray(),
+            *jvmDefaultParams,
+            *(if (isJava8(server)) arrayOf() else jvmArgOverrides),
+            *(if (profile) arrayOf("-javaagent:/jars/LixfelsProfiler.jar=start") else arrayOf()),
+            "-Xshareclasses:nonfatal,name=$server",
+            "-jar",
+            *cmd.toTypedArray()
+        ).directory(serverDir).inheritIO().start()
+        Runtime.getRuntime().addShutdownHook(Thread { if (process.isAlive) process.destroyForcibly() })
+        process.waitFor()
+    }
+}
@@ -0,0 +1,42 @@
+package de.steamwar.commands.profiler
+
+import com.github.ajalt.clikt.core.CliktCommand
+import com.github.ajalt.clikt.core.Context
+import com.github.ajalt.clikt.parameters.arguments.argument
+import com.github.ajalt.clikt.parameters.arguments.help
+import com.github.ajalt.clikt.parameters.arguments.optional
+import com.github.ajalt.clikt.parameters.options.default
+import com.github.ajalt.clikt.parameters.options.option
+import com.github.ajalt.clikt.parameters.types.int
+
+const val SPARK = "/jars/spark.jar"
+
+class ProfilerCommand: CliktCommand("profiler") {
+    val pid by argument().help("Process id").int().optional()
+    val port by option("--port", "-p").int().default(8543)
+
+    override fun run() {
+        if (pid != null) {
+            ProcessBuilder()
+                .command("java", "-jar", SPARK, pid.toString(), "port=$port")
+                .start()
+                .waitFor()
+
+            Thread.sleep(1000)
+
+            ProcessBuilder()
+                .command("ssh", "-o", "StrictHostKeyChecking=no", "-o", "UserKnownHostsFile=/dev/null", "-p", port.toString(), "spark@localhost")
+                .inheritIO()
+                .start()
+                .waitFor()
+        } else {
+            ProcessBuilder()
+                .command("java", "-jar", SPARK)
+                .inheritIO()
+                .start()
+                .waitFor()
+        }
+    }
+
+    override fun help(context: Context): String = "Start a profiler"
+}
@@ -0,0 +1,9 @@
+package de.steamwar.commands.user
+
+import com.github.ajalt.clikt.core.CliktCommand
+import com.github.ajalt.clikt.core.Context
+
+class UserCommand: CliktCommand("user") {
+    override fun run() = Unit
+    override fun help(context: Context): String = "User related commands"
+}
@@ -0,0 +1,65 @@
+package de.steamwar.commands.user
+
+import com.github.ajalt.clikt.core.CliktCommand
+import com.github.ajalt.clikt.core.CliktError
+import com.github.ajalt.clikt.parameters.arguments.argument
+import com.github.ajalt.clikt.parameters.arguments.help
+import com.github.ajalt.mordant.table.table
+import de.steamwar.db.findUser
+import de.steamwar.db.useDb
+import de.steamwar.sql.Punishment
+import de.steamwar.sql.SessionTable
+import de.steamwar.sql.SteamwarUser
+import de.steamwar.sql.Team
+import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.v1.jdbc.selectAll
+import java.time.Duration
+
+class UserInfoCommand : CliktCommand("info") {
+    val userId by argument().help("Id, Name, UUID or DiscordId")
+    val user by lazy { findUser(userId) ?: throw CliktError("User not found") }
+
+    override val printHelpOnEmptyArgs = true
+
+    override fun run() = useDb {
+        val sessions =
+            SessionTable.selectAll().where { SessionTable.userId eq user.id.value }
+                .map { it[SessionTable.startTime] to it[SessionTable.endTime] }
+
+        val totalPlayed = sessions.sumOf { Duration.between(it.first, it.second).toMinutes() } / 60.0
+        val firstJoin = sessions.minByOrNull { it.first }?.first
+        val lastJoin = sessions.maxByOrNull { it.second }?.second
+
+        val punishments = Punishment.getAllPunishmentsOfPlayer(user.id.value)
+
+        echo(
+            table {
+                body {
+                    row("Name", user.userName)
+                    row("UUID", user.uuid)
+                    row("Team", Team.byId(user.team).teamName)
+                    row("Leader", user.leader)
+                    row("Locale", user.locale)
+                    row("Beigetreten am", firstJoin)
+                    row("Zuletzt gesehen am", lastJoin)
+                    row("Spielzeit", totalPlayed.toString() + "h")
+                    row("Punishments", if (punishments.isEmpty()) "Keine" else table {
+                        header { row("Typ", "Ersteller", "Von", "Bis", "Grund") }
+                        body {
+                            punishments.map {
+                                row(
+                                    it.type,
+                                    SteamwarUser.byId(it.punisher)?.userName ?: it.punisher,
+                                    it.startTime.toString(),
+                                    if (it.perma) "Perma" else it.endTime.toString(),
+                                    it.reason
+                                )
+                            }
+                        }
+                    })
+                }
+            }
+        )
+
+    }
+}
@@ -0,0 +1,42 @@
+package de.steamwar.commands.user
+
+import com.github.ajalt.clikt.core.CliktCommand
+import com.github.ajalt.clikt.core.Context
+import com.github.ajalt.clikt.parameters.arguments.argument
+import com.github.ajalt.clikt.parameters.arguments.help
+import com.github.ajalt.mordant.table.table
+import de.steamwar.db.joinedOr
+import de.steamwar.db.useDb
+import de.steamwar.sql.SteamwarUser
+import de.steamwar.sql.SteamwarUserTable
+import de.steamwar.sql.Team
+import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.v1.core.like
+
+class UserSearchCommand : CliktCommand("search") {
+    val query by argument().help("Name, Id, UUID or DiscordId")
+
+    override val printHelpOnEmptyArgs = true
+
+    override fun help(context: Context): String = "Search for users"
+
+    override fun run() = useDb {
+        val users = SteamwarUser.find {
+            joinedOr(
+                SteamwarUserTable.username like "%$query%",
+                SteamwarUserTable.uuid like "%$query%",
+                query.toLongOrNull()?.let { SteamwarUserTable.discordId eq it },
+                query.toIntOrNull()?.let { SteamwarUserTable.id eq it }
+            )
+        }
+
+        val teams = mutableMapOf<Int, Team>()
+
+        echo(table {
+            header { row("Id", "Username", "UUID", "Team", "DiscordId") }
+            body {
+                users.map { row(it.id.value, it.userName, it.uuid, teams.computeIfAbsent(it.team) { teamId -> Team.byId(teamId) }.teamName, it.discordId) }
+            }
+        })
+    }
+}
@@ -0,0 +1,84 @@
+package de.steamwar.db
+
+import com.github.ajalt.clikt.core.BaseCliktCommand
+import com.github.ajalt.clikt.core.CliktError
+import de.steamwar.sql.SteamwarUser
+import de.steamwar.sql.SteamwarUserTable
+import org.jetbrains.exposed.v1.core.Expression
+import org.jetbrains.exposed.v1.core.Op
+import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.v1.core.or
+import org.jetbrains.exposed.v1.jdbc.Database
+import org.jetbrains.exposed.v1.jdbc.JdbcTransaction
+import org.jetbrains.exposed.v1.jdbc.transactions.transaction
+import java.io.File
+import java.sql.ResultSet
+import java.util.Properties
+
+object Database {
+    lateinit var host: String
+    lateinit var port: String
+    lateinit var database: String
+    lateinit var db: Database
+
+    fun ensureConnected() {
+        if (::db.isInitialized) {
+            return
+        }
+        val config = File(System.getProperty("user.home"), "mysql.properties")
+
+        if (!config.exists()) {
+            throw CliktError("Config file not found!")
+        }
+
+        val props = Properties();
+
+        props.load(config.inputStream())
+
+        host = props.getProperty("host")
+        port = props.getProperty("port")
+        database = props.getProperty("database")
+
+        val username = props.getProperty("user")
+        val password = props.getProperty("password")
+
+        val url = "jdbc:mariadb://$host:$port/$database"
+
+        db = Database.connect(url, driver = "org.mariadb.jdbc.Driver", user = username, password = password)
+        return
+    }
+}
+
+fun <T: BaseCliktCommand<T>> BaseCliktCommand<T>.findUser(query: String): SteamwarUser? = transaction {
+    SteamwarUser.find { joinedOr(query.toIntOrNull()?.let { SteamwarUserTable.id eq it }, (SteamwarUserTable.username eq query), SteamwarUserTable.uuid eq query, query.toLongOrNull()?.let { SteamwarUserTable.discordId eq it }) }
+        .firstOrNull()
+        ?.let { return@transaction it }
+}
+
+fun joinedOr(vararg expressions: Expression<Boolean>?): Op<Boolean> =
+    expressions.filterNotNull().reduce { acc, expression -> acc or expression } as Op<Boolean>
+
+
+fun <T> JdbcTransaction.execute(sql: String, transform: (ResultSet) -> T): List<T> {
+    val result = mutableListOf<T>()
+    exec(sql) { rs ->
+        while (rs.next()) {
+            result += transform(rs)
+        }
+    }
+    return result
+}
+
+fun <T> JdbcTransaction.executeSingle(sql: String, transform: (ResultSet) -> T): T? {
+    return execute(sql) { rs ->
+        if (!rs.next()) {
+            return@execute null
+        }
+        transform(rs)
+    }.single()
+}
+
+fun useDb(statement: JdbcTransaction.() -> Unit) {
+    de.steamwar.db.Database.ensureConnected()
+    transaction(de.steamwar.db.Database.db, statement)
+}
@@ -0,0 +1,11 @@
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="WARN">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
@@ -56,7 +56,9 @@ public abstract class AbstractLinker<T> {
                    .map(s -> {
                        try {
                            return Class.forName(s, false, plugin.getClass().getClassLoader());
-                        } catch (ClassNotFoundException | NoClassDefFoundError e) {
+                        } catch (NoClassDefFoundError error) {
+                            return null;
+                        } catch (ClassNotFoundException e) {
                            throw new SecurityException(e.getMessage(), e);
                        }
                    })
@@ -1,7 +1,7 @@
 /*
 *   This file is a part of the SteamWar software.
 *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *   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
@@ -1,7 +1,7 @@
 /*
 *   This file is a part of the SteamWar software.
 *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *   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
@@ -28,11 +28,11 @@ import org.jetbrains.exposed.v1.javatime.timestamp
 import java.time.Instant

 object AuditLogTable: IntIdTable("AuditLog", "AuditLogId") {
-    val time = timestamp("Time")
-    val server = varchar("ServerName", 255)
-    val serverOwner = reference("ServerOwner", SteamwarUserTable).nullable()
-    val actor = reference("Actor", SteamwarUserTable)
-    val action = enumerationByName("ActionType", 255, AuditLog.Type::class)
+    val time = timestamp("Time").index()
+    val server = varchar("ServerName", 255).index()
+    val serverOwner = reference("ServerOwner", SteamwarUserTable).nullable().index()
+    val actor = reference("Actor", SteamwarUserTable).index()
+    val action = enumerationByName("ActionType", 255, AuditLog.Type::class).index()
    val actionText = text("ActionText")
 }

@@ -1,7 +1,7 @@
 /*
 *   This file is a part of the SteamWar software.
 *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *   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
@@ -33,9 +33,13 @@ import java.sql.Timestamp
 import java.time.Instant

 object BannedUserIPsTable: CompositeIdTable("BannedUserIPs") {
-    val userId = reference("UserID", SteamwarUserTable)
-    val timestamp = timestamp("Timestamp")
-    val ip = varchar("IP", 45)
+    val userId = reference("UserID", SteamwarUserTable).index()
+    val timestamp = timestamp("Timestamp").index()
+    val ip = varchar("IP", 45).entityId()
+
+    init {
+        addIdColumn(userId)
+    }

    override val primaryKey = PrimaryKey(userId, ip)
 }
@@ -1,7 +1,7 @@
 /*
 *   This file is a part of the SteamWar software.
 *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *   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
@@ -32,8 +32,8 @@ import org.jetbrains.exposed.v1.jdbc.insertIgnore
 import java.util.*

 object BauweltMemberTable: CompositeIdTable("BauweltMember") {
-    val bauweltId = reference("BauweltID", SteamwarUserTable)
-    val memberId = reference("MemberID", SteamwarUserTable)
+    val bauweltId = reference("BauweltID", SteamwarUserTable).index()
+    val memberId = reference("MemberID", SteamwarUserTable).index()
    val build = bool("Build")
    val worldEdit = bool("WorldEdit")
    val world = bool("World")
@@ -1,7 +1,7 @@
 /*
 *   This file is a part of the SteamWar software.
 *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *   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
@@ -20,6 +20,7 @@
 package de.steamwar.sql

 import de.steamwar.sql.internal.useDb
+import org.jetbrains.exposed.v1.core.ReferenceOption
 import org.jetbrains.exposed.v1.core.SortOrder
 import org.jetbrains.exposed.v1.core.and
 import org.jetbrains.exposed.v1.core.dao.id.CompositeID
@@ -34,19 +35,23 @@ import org.jetbrains.exposed.v1.jdbc.insertIgnore
 import java.sql.Timestamp

 object CheckedSchematicTable: CompositeIdTable("CheckedSchematic") {
-    val nodeId = optReference("NodeId", SchematicNodeTable)
-    val nodeOwner = reference("NodeOwner", SteamwarUserTable)
-    val nodeName = varchar("NodeName", 64).entityId()
-    val validator = reference("Validator", SteamwarUserTable)
-    val startTime = timestamp("StartTime").entityId()
+    val nodeId = optReference("NodeId", SchematicNodeTable, onDelete = ReferenceOption.SET_NULL, onUpdate = ReferenceOption.SET_NULL).index()
+    val nodeOwner = reference("NodeOwner", SteamwarUserTable).index()
+    val nodeName = varchar("NodeName", 64).entityId().index()
+    val validator = reference("Validator", SteamwarUserTable).index()
+    val startTime = timestamp("StartTime").entityId().index()
    val endTime = timestamp("EndTime")
    val declineReason = text("DeclineReason")
-    val seen = bool("Seen")
+    val seen = bool("Seen").index()
    val nodeType = varchar("NodeType", 16)

    init {
        addIdColumn(nodeOwner)
        addIdColumn(nodeName)
+
+        index(false, nodeOwner, endTime)
+        index(false, startTime, endTime, nodeName)
+        index(false, seen, nodeOwner, startTime)
    }
 }

@@ -1,7 +1,7 @@
 /*
 *   This file is a part of the SteamWar software.
 *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *   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
@@ -36,8 +36,8 @@ import java.time.Instant
 object EventTable : IntIdTable("Event", "EventId") {
    val name = varchar("EventName", 100).uniqueIndex()
    val deadline = timestamp("Deadline")
-    val start = timestamp("Start")
-    val end = timestamp("End")
+    val start = timestamp("Start").index()
+    val end = timestamp("End").index()
    val maxPlayers = integer("MaximumTeamMembers")
    val schemType = varchar("SchemType", 16).nullable()
    val publicsOnly = bool("PublicSchemsOnly")
@@ -1,7 +1,7 @@
 /*
 *   This file is a part of the SteamWar software.
 *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *   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
@@ -33,17 +33,17 @@ import java.time.Instant
 import java.util.*

 object EventFightTable : IntIdTable("EventFight", "FightID") {
-    val eventId = reference("EventID", EventTable)
-    val startTime = timestamp("StartTime")
+    val eventId = reference("EventID", EventTable).index()
+    val startTime = timestamp("StartTime").index()
    val gamemode = text("Spielmodus")
    val map = text("Map")
-    val groupId = optReference("GroupId", EventGroupTable)
-    val teamBlue = reference("TeamBlue", TeamTable)
-    val teamRed = reference("TeamRed", TeamTable)
+    val groupId = optReference("GroupId", EventGroupTable).index()
+    val teamBlue = reference("TeamBlue", TeamTable).index()
+    val teamRed = reference("TeamRed", TeamTable).index()
    val spectatePort = integer("SpectatePort").nullable()
    val bestOf = integer("BestOf")
    val ergebnis = integer("Ergebnis")
-    val fight = optReference("Fight", FightTable)
+    val fight = optReference("Fight", FightTable).index()
 }

 class EventFight(id: EntityID<Int>) : IntEntity(id), Comparable<EventFight> {
@@ -34,6 +34,10 @@ object EventGroupTable : IntIdTable("EventGroup", "Id") {
    val pointsPerWin = integer("PointsPerWin").default(3)
    val pointsPerLoss = integer("PointsPerLoss").default(0)
    val pointsPerDraw = integer("PointsPerDraw").default(1)
+
+    init {
+        uniqueIndex(event, name)
+    }
 }

 class EventGroup(id: EntityID<Int>) : IntEntity(id) {
@@ -90,7 +94,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
@@ -29,7 +29,7 @@ import org.jetbrains.exposed.v1.dao.IntEntityClass
 import org.jetbrains.exposed.v1.jdbc.select

 object EventRelationTable : IntIdTable("EventRelation") {
-    val fightId = reference("FightId", EventFightTable)
+    val fightId = reference("FightId", EventFightTable).index()
    val fightTeam = enumeration("FightTeam", EventRelation.FightTeam::class)
    val fromType = enumeration("FromType", EventRelation.FromType::class)
    val fromId = integer("FromId")
@@ -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 {
@@ -34,14 +34,14 @@ import org.jetbrains.exposed.v1.jdbc.update
 import java.sql.Timestamp

 object FightTable : IntIdTable("Fight", "FightId") {
-    val gamemode = varchar("Gamemode", 30)
+    val gamemode = varchar("Gamemode", 30).index()
    val server = text("Server")
    val startTime = timestamp("StartTime")
    val duration = integer("Duration")
-    val blueLeader = reference("BlueLeader", SteamwarUserTable)
-    val redLeader = reference("RedLeader", SteamwarUserTable)
-    val blueSchem = optReference("BlueSchem", SchematicNodeTable, onDelete = ReferenceOption.SET_NULL)
-    val redSchem = optReference("RedSchem", SchematicNodeTable, onDelete = ReferenceOption.SET_NULL)
+    val blueLeader = reference("BlueLeader", SteamwarUserTable).index()
+    val redLeader = reference("RedLeader", SteamwarUserTable).index()
+    val blueSchem = optReference("BlueSchem", SchematicNodeTable, onDelete = ReferenceOption.SET_NULL).index()
+    val redSchem = optReference("RedSchem", SchematicNodeTable, onDelete = ReferenceOption.SET_NULL).index()
    val win = enumeration("Win", Fight.WinningTeam::class)
    val winCondition = varchar("WinCondition", 100)
    val replayAvailable = bool("ReplayAvailable")
@@ -30,7 +30,7 @@ import org.jetbrains.exposed.v1.jdbc.insertIgnore

 object FightPlayerTable : CompositeIdTable("FightPlayer") {
    val fightId = reference("FightId", FightTable)
-    val userId = reference("UserId", SteamwarUserTable)
+    val userId = reference("UserId", SteamwarUserTable).index()
    val team = integer("Team")
    val kit = varchar("Kit", 64)
    val kills = integer("Kills")
@@ -1,7 +1,7 @@
 /*
 *   This file is a part of the SteamWar software.
 *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *   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
@@ -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()
@@ -126,12 +146,12 @@ public final class GameModeConfig<M, W> {
    public final List<String> CheckQuestions;

    /**
-     * The allowed checkers to check this schematic type denoted by a list of SteamWar ids.
+     * The allowed checkers to check this schematic type denoted by a list of SteamwarUser ids.
     * The people need the {@link UserPerm#CHECK} to be able to check though.
     *
     * @implSpec {@code []} by default -> denoting every person with {@link UserPerm#CHECK} can check it
     */
-    public final List<Integer> Checkers;
+    public final Set<Integer> Checkers;

    /**
     * Bundle for countdowns during the fight
@@ -226,7 +246,7 @@ public final class GameModeConfig<M, W> {
        }

        CheckQuestions = loader.getStringList("CheckQuestions");
-        Checkers = loader.getIntList("Checkers");
+        Checkers = loader.getIntSet("Checkers");
        Times = new TimesConfig(loader.with("Times"));
        // Arena would be here to be in config order but needs Schematic.Size and EnterStages loaded afterwards
        Schematic = new SchematicConfig<>(loader.with("Schematic"));
@@ -402,6 +422,13 @@ public final class GameModeConfig<M, W> {
         */
        public final int WaterDepth;

+        /**
+         * If TNT should break blocks even underwater
+         *
+         * @implSpec {@code true} by default
+         */
+        public final boolean WaterDamage;
+
        /**
         * The outer border of the arena, measured in blocks around the schematic areas
         */
@@ -433,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
         *
@@ -457,11 +491,13 @@ public final class GameModeConfig<M, W> {
        private ArenaConfig(YMLWrapper loader, SchematicConfig.SizeConfig Size, List<Integer> EnterStages) {
            loaded = loader.canLoad();
            WaterDepth = loader.getInt("WaterDepth", 0);
+            WaterDamage = loader.getBoolean("WaterDamage", true);
            Schem2Border = new Schem2BorderConfig(loader.with("Schem2Border"));
            SpawnOffset = new SpawnOffsetConfig(loader.with("SpawnOffset"), Size);
            BorderFromSchematic = loader.getInt("BorderFromSchematic", 21);
            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);
@@ -597,18 +633,18 @@ public final class GameModeConfig<M, W> {
        public final boolean IgnorePublicOnly;

        /**
-         * If obsidian and bedrock should be replaced during PRE_RUNNING
+         * Replacements that should be done during PRE_RUNNING with no block updates
         *
-         * @implSpec {@code false} by default
+         * @implSpec {@code {}} by default
         */
-        public final boolean ReplaceObsidianBedrock;
+        public final Map<M, M> ReplacementsWithoutBlockUpdates;

        /**
-         * If the replacement should happen with block updates
+         * Replacements that should be done during PRE_RUNNING with block updates
         *
-         * @implSpec {@code false} by default
+         * @implSpec {@code {}} by default
         */
-        public final boolean ReplaceWithBlockupdates;
+        public final Map<M, M> ReplacementsWithBlockUpdates;

        /**
         * If the schematic perparation arena mode is time limited
@@ -641,7 +677,7 @@ public final class GameModeConfig<M, W> {
        /**
         * Maximal blast resistance for the design blocks
         *
-         * @implSpec {@code Double.MAX_VALUE} by default
+         * @implSpec {@link SchematicConfig#MaxBlastResistance} by default
         */
        public final double MaxDesignBlastResistance;

@@ -655,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);
@@ -665,13 +701,11 @@ public final class GameModeConfig<M, W> {
            PasteAligned = loader.getBoolean("PasteAligned", false);
            OnlyPublicSchematics = loader.getBoolean("OnlyPublicSchematics", false);
            IgnorePublicOnly = loader.getBoolean("IgnorePublicOnly", false);
-            ReplaceObsidianBedrock = loader.getBoolean("ReplaceObsidianBedrock", false);
-            ReplaceWithBlockupdates = loader.getBoolean("ReplaceWithBlockupdates", false);
            UnlimitedPrepare = loader.getBoolean("UnlimitedPrepare", false);
            MaxBlocks = loader.getInt("MaxBlocks", 0);
            MaxDispenserItems = loader.getInt("MaxDispenserItems", 128);
            MaxBlastResistance = loader.getDouble("MaxBlastResistance", Double.MAX_VALUE);
-            MaxDesignBlastResistance = loader.getDouble("MaxDesignBlastResistance", Double.MAX_VALUE);
+            MaxDesignBlastResistance = loader.getDouble("MaxDesignBlastResistance", MaxBlastResistance);

            Map<Set<M>, Integer> Limited = new HashMap<>();
            for (Map<?, ?> entry : loader.getMapList("Limited")) {
@@ -690,6 +724,9 @@ public final class GameModeConfig<M, W> {
                Limited.put(Collections.singleton((M) material), 0);
            });
            this.Limited = Collections.unmodifiableMap(Limited);
+
+            this.ReplacementsWithoutBlockUpdates = loader.getMap("ReplacementsWithoutBlockUpdates", loader.materialMapper, loader.materialMapper);
+            this.ReplacementsWithBlockUpdates = loader.getMap("ReplacementsWithBlockUpdates", loader.materialMapper, loader.materialMapper);
        }

        @ToString
@@ -30,8 +30,8 @@ import org.jetbrains.exposed.v1.dao.CompositeEntityClass
 import java.util.*

 object IgnoreSystemTable: CompositeIdTable("IgnoredPlayers") {
-    val ignorer = reference("Ignorer", SteamwarUserTable)
-    val ignored = reference("Ignored", SteamwarUserTable)
+    val ignorer = reference("Ignorer", SteamwarUserTable).index()
+    val ignored = reference("Ignored", SteamwarUserTable).index()

    override val primaryKey = PrimaryKey(ignorer, ignored)

@@ -1,7 +1,7 @@
 /*
 *   This file is a part of the SteamWar software.
 *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *   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
@@ -1,7 +1,7 @@
 /*
 *   This file is a part of the SteamWar software.
 *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *   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
@@ -35,7 +35,7 @@ import java.io.InputStream
 import java.util.zip.GZIPInputStream

 object NodeDataTable: CompositeIdTable("NodeData") {
-    val nodeId = reference("NodeId", SchematicNodeTable)
+    val nodeId = reference("NodeId", SchematicNodeTable).index()
    val createdAt = timestamp("CreatedAt").defaultExpression(CurrentTimestamp).entityId()
    val nodeFormat = enumeration("NodeFormat", NodeData.SchematicFormat::class)
    val schemData = blob("SchemData")
@@ -88,8 +88,6 @@ class NodeData(id: EntityID<CompositeID>): CompositeEntity(id) {
        schemData.inputStream.let { if(decompress) GZIPInputStream(it) else it }
    }

-    fun schemData() = schemData(true)
-
    override fun delete() = useDb { super.delete() }

    enum class SchematicFormat(val fileEnding: String) {
@@ -20,6 +20,7 @@
 package de.steamwar.sql

 import de.steamwar.sql.internal.useDb
+import org.jetbrains.exposed.v1.core.ReferenceOption
 import org.jetbrains.exposed.v1.core.dao.id.EntityID
 import org.jetbrains.exposed.v1.core.dao.id.IdTable
 import org.jetbrains.exposed.v1.core.eq
@@ -32,8 +33,8 @@ import java.sql.Timestamp
 import java.time.Instant

 object NodeDownloadTable: IdTable<Int>("NodeDownload") {
-    override val id = reference("NodeId", SchematicNodeTable).uniqueIndex()
-    val link = varchar("Link", 255)
+    override val id = reference("NodeId", SchematicNodeTable, onDelete = ReferenceOption.CASCADE).uniqueIndex()
+    val link = varchar("Link", 255).uniqueIndex()
    val timestamp = timestamp("Timestamp").defaultExpression(CurrentTimestamp)
 }

@@ -1,7 +1,7 @@
 /*
 *   This file is a part of the SteamWar software.
 *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *   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
@@ -20,6 +20,7 @@
 package de.steamwar.sql

 import de.steamwar.sql.internal.useDb
+import org.jetbrains.exposed.v1.core.ReferenceOption
 import org.jetbrains.exposed.v1.core.and
 import org.jetbrains.exposed.v1.core.dao.id.CompositeID
 import org.jetbrains.exposed.v1.core.dao.id.CompositeIdTable
@@ -32,9 +33,9 @@ import java.util.*
 import kotlin.jvm.optionals.getOrNull

 object NodeMemberTable : CompositeIdTable("NodeMember") {
-    val node = reference("NodeId", SchematicNodeTable)
-    val userId = reference("UserId", SteamwarUserTable)
-    val parentNode = optReference("ParentId", SchematicNodeTable)
+    val node = reference("NodeId", SchematicNodeTable, onDelete = ReferenceOption.CASCADE, onUpdate = ReferenceOption.CASCADE).index()
+    val userId = reference("UserId", SteamwarUserTable).index()
+    val parentNode = optReference("ParentId", SchematicNodeTable).index()

    override val primaryKey = PrimaryKey(node, userId)

@@ -94,7 +95,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)
    }

@@ -33,14 +33,15 @@ object PersonalKitTable: CompositeIdTable("PersonalKit") {
    val userId = reference("UserId", SteamwarUserTable)
    val gamemode = varchar("Gamemode", 64).entityId()
    val kitName = varchar("Name", 64).entityId()
-    val inventory = text("Inventory")
-    val armor = text("Armor")
+    val inventory = text("Inventory", eagerLoading = true)
+    val armor = text("Armor", eagerLoading = true)
    val inUse = bool("InUse")

    override val primaryKey = PrimaryKey(userId, gamemode, kitName)

    init {
        addIdColumn(userId)
+        index(false, userId, gamemode)
    }
 }

@@ -48,14 +49,17 @@ class InternalKit(id: EntityID<CompositeID>): CompositeEntity(id) {
    companion object: CompositeEntityClass<InternalKit>(PersonalKitTable) {
        @JvmStatic
        fun get(userId: Int, gamemode: String) = useDb {
-            find { PersonalKitTable.userId eq userId and (PersonalKitTable.gamemode eq gamemode) and (PersonalKitTable.inUse eq true) }
+            find { PersonalKitTable.userId eq userId and (PersonalKitTable.gamemode eq gamemode) }
                .toList()
        }

        @JvmStatic
        fun get(userId: Int, gamemode: String, kitName: String) = useDb {
-            find { PersonalKitTable.userId eq userId and (PersonalKitTable.gamemode eq gamemode) and (PersonalKitTable.kitName eq kitName) and (PersonalKitTable.inUse eq true) }
-                .firstOrNull()
+            findById(CompositeID {
+                it[PersonalKitTable.userId] = EntityID(userId, SteamwarUserTable)
+                it[PersonalKitTable.gamemode] = gamemode
+                it[PersonalKitTable.kitName] = kitName
+            })
        }

        @JvmStatic
@@ -67,10 +71,10 @@ class InternalKit(id: EntityID<CompositeID>): CompositeEntity(id) {
                    it[PersonalKitTable.kitName] = kitName
                }
            ) {
-                this.inventory = rawInventory
-                this.armor = rawArmor
-                this.inUse = true
-            }
+                this.rawInventory = rawInventory
+                this.rawArmor = rawArmor
+                this.inUse = false
+            }.also { it.setDefault() }
        }

        @JvmStatic
@@ -107,6 +111,7 @@ class InternalKit(id: EntityID<CompositeID>): CompositeEntity(id) {

    fun setDefault() = useDb {
        find { PersonalKitTable.userId eq userID and (PersonalKitTable.gamemode eq gameMode) and (PersonalKitTable.inUse eq true) }
+            .filter { it.id.value != this@InternalKit.id.value }
            .forEach { it.inUse = false }
        inUse = true
    }
@@ -34,12 +34,16 @@ import java.util.function.Consumer

 object PunishmentTable : IntIdTable("Punishments", "PunishmentId") {
    val userId = reference("UserId", SteamwarUserTable)
-    val punisher = reference("Punisher", SteamwarUserTable)
+    val punisher = reference("Punisher", SteamwarUserTable).index()
    val type = enumerationByName("Type", 32, Punishment.PunishmentType::class)
    val startTime = timestamp("StartTime")
    val endTime = timestamp("EndTime")
    val perma = bool("Perma")
    val reason = text("Reason")
+
+    init {
+        index(false, userId, type)
+    }
 }

 class Punishment(id: EntityID<Int>) : IntEntity(id) {
@@ -1,7 +1,7 @@
 /*
 *   This file is a part of the SteamWar software.
 *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *   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
@@ -30,7 +30,7 @@ import org.jetbrains.exposed.v1.dao.CompositeEntityClass

 object RefereeTable: CompositeIdTable("Referee") {
    val eventId = reference("EventId", EventTable)
-    val userId = reference("UserId", SteamwarUserTable)
+    val userId = reference("UserId", SteamwarUserTable).index()

    override val primaryKey = PrimaryKey(eventId, userId)

@@ -36,8 +36,5 @@ public interface SQLWrapper<M> {
        return Collections.emptyList();
    }

-    default void processSchematicType(GameModeConfig<?, String> gameModeConfig) {
-    }
-
    void additionalExceptionMetadata(StringBuilder builder);
 }
@@ -1,74 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.sql
-
-import de.steamwar.sql.internal.useDb
-import org.jetbrains.exposed.v1.core.and
-import org.jetbrains.exposed.v1.core.dao.id.CompositeID
-import org.jetbrains.exposed.v1.core.dao.id.CompositeIdTable
-import org.jetbrains.exposed.v1.core.dao.id.EntityID
-import org.jetbrains.exposed.v1.core.eq
-import org.jetbrains.exposed.v1.dao.CompositeEntity
-import org.jetbrains.exposed.v1.dao.CompositeEntityClass
-import org.jetbrains.exposed.v1.jdbc.insertIgnore
-
-object SchemEloTable: CompositeIdTable("SchemElo") {
-    val schemId = reference("SchemId", SchematicNodeTable)
-    val season = integer("Season").entityId()
-    val elo = integer("Elo")
-
-    override val primaryKey = PrimaryKey(schemId, season)
-
-    init {
-        addIdColumn(schemId)
-    }
-}
-
-class SchemElo(id: EntityID<CompositeID>): CompositeEntity(id) {
-    companion object: CompositeEntityClass<SchemElo>(SchemEloTable) {
-        @JvmStatic
-        fun getElo(node: SchematicNode, season: Int, defaultElo: Int = 0) = useDb {
-            find { (SchemEloTable.schemId eq node.id) and (SchemEloTable.season eq season) }.firstOrNull()?.elo ?: defaultElo
-        }
-
-        @JvmStatic
-        fun getCurrentElo(schemId: Int) = getElo(SchematicNode.byId(schemId)!!, Season.getSeason())
-
-        @JvmStatic
-        fun setElo(node: Int, elo: Int) = useDb {
-            findByIdAndUpdate(CompositeID {
-                it[SchemEloTable.schemId] = node
-                it[SchemEloTable.season] = Season.getSeason()
-            }) {
-                it.elo = elo
-            } ?: SchemEloTable.insertIgnore {
-                it[SchemEloTable.schemId] = node
-                it[SchemEloTable.season] = Season.getSeason()
-                it[SchemEloTable.elo] = elo
-            }
-
-            return@useDb
-        }
-    }
-
-    var node by SchemEloTable.schemId
-    var season by SchemEloTable.season
-    var elo by SchemEloTable.elo
-}
@@ -1,7 +1,7 @@
 /*
 *   This file is a part of the SteamWar software.
 *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *   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
@@ -34,13 +34,17 @@ import java.util.*
 import java.util.function.Consumer

 object SchematicNodeTable : IntIdTable("SchematicNode", "NodeId") {
-    val owner = reference("NodeOwner", SteamwarUserTable)
+    val owner = reference("NodeOwner", SteamwarUserTable).index()
    val name = varchar("NodeName", 64)
-    val parent = optReference("ParentNode", SchematicNodeTable)
+    val parent = optReference("ParentNode", SchematicNodeTable).index()
    val lastUpdate = timestamp("LastUpdate").defaultExpression(CurrentTimestamp)
    val item = text("NodeItem")
-    val type = varchar("NodeType", 16).nullable()
+    val type = varchar("NodeType", 16).nullable().index()
    val config = integer("Config")
+
+    init {
+        uniqueIndex(parent, owner, name)
+    }
 }

 class SchematicNode(id: EntityID<Int>) : IntEntity(id) {
@@ -116,7 +120,7 @@ class SchematicNode(id: EntityID<Int>) : IntEntity(id) {

        @JvmStatic
        fun schematicAccessibleForUser(user: SteamwarUser, schematicId: Int?) = fromSql(
-            "WITH RECURSIVE Nodes AS (SELECT NodeId, ParentId as ParentNode FROM NodeMember WHERE UserId = ? UNION SELECT NodeId, ParentNode FROM SchematicNode WHERE NodeOwner = ?), RSN AS ( SELECT NodeId, ParentNode FROM Nodes UNION SELECT SN.NodeId, SN.ParentNode FROM SchematicNode SN, RSN WHERE SN.ParentNode = RSN.NodeId ) SELECT SN.*, ? AS EffectiveOwner FROM RSN INNER JOIN SchematicNode SN ON RSN.NodeId = SN.NodeId WHERE NodeId = ?",
+            "WITH RECURSIVE Nodes AS (SELECT NodeId, ParentId as ParentNode FROM NodeMember WHERE UserId = ? UNION SELECT NodeId, ParentNode FROM SchematicNode WHERE NodeOwner = ?), RSN AS ( SELECT NodeId, ParentNode FROM Nodes UNION SELECT SN.NodeId, SN.ParentNode FROM SchematicNode SN, RSN WHERE SN.ParentNode = RSN.NodeId ) SELECT SN.*, ? AS EffectiveOwner FROM RSN INNER JOIN SchematicNode SN ON RSN.NodeId = SN.NodeId WHERE SN.NodeId = ?",
            listOf(
                IntegerColumnType() to user.getId(),
                IntegerColumnType() to user.getId(),
@@ -146,7 +150,91 @@ class SchematicNode(id: EntityID<Int>) : IntEntity(id) {

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

-    fun getElo(season: Int) = SchemElo.getElo(this, season)
-
    override fun delete() = useDb {
        super.delete()
    }
@@ -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,
@@ -1,7 +1,7 @@
 /*
 *   This file is a part of the SteamWar software.
 *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *   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
@@ -28,9 +28,13 @@ import org.jetbrains.exposed.v1.dao.IntEntity
 import org.jetbrains.exposed.v1.dao.IntEntityClass

 object ScriptTable: IntIdTable("Script") {
-    val userId = reference("UserId", SteamwarUserTable)
+    val userId = reference("UserId", SteamwarUserTable).index()
    val name = varchar("Name", 64)
    val code = text("Code")
+
+    init {
+        uniqueIndex(userId, name)
+    }
 }

 class Script(id: EntityID<Int>) : IntEntity(id) {
@@ -1,61 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.sql;
-
-import java.util.Calendar;
-
-public class Season {
-    private Season() {}
-
-    public static int getSeason() {
-        Calendar calendar = Calendar.getInstance();
-        int yearIndex = calendar.get(Calendar.MONTH) / 4;
-        return (calendar.get(Calendar.YEAR) * 3 + yearIndex);
-    }
-
-    public static String getSeasonStart() {
-        Calendar calendar = Calendar.getInstance();
-        int month = calendar.get(Calendar.MONTH);
-        if (month <= 3) {
-            return calendar.get(Calendar.YEAR) + "-1-1";
-        } else if (month <= 7) {
-            return calendar.get(Calendar.YEAR) + "-5-1";
-        } else {
-            return calendar.get(Calendar.YEAR) + "-9-1";
-        }
-    }
-
-    public static String convertSeasonToString(int season){
-        if (season == -1) return "";
-        int yearSeason = season % 3;
-        int year = (season - yearSeason) / 3;
-        return String.format("%d-%d", year, yearSeason + 1);
-    }
-
-    public static int convertSeasonToNumber(String season){
-        if (season.isEmpty()) return -1;
-        String[] split = season.split("-");
-        try {
-            return Integer.parseInt(split[0]) * 3 + Integer.parseInt(split[1]) - 1;
-        } catch (NumberFormatException e) {
-            return -1;
-        }
-    }
-}
@@ -28,7 +28,7 @@ import org.jetbrains.exposed.v1.jdbc.insert
 import java.sql.Timestamp

 object SessionTable: Table("Session") {
-    val userId = reference("UserId", SteamwarUserTable)
+    val userId = reference("UserId", SteamwarUserTable).index()
    val startTime = timestamp("StartTime")
    val endTime = timestamp("EndTime").defaultExpression(CurrentTimestamp)
 }
@@ -37,15 +37,15 @@ import javax.crypto.SecretKeyFactory
 import javax.crypto.spec.PBEKeySpec

 object SteamwarUserTable : IntIdTable("UserData", "id") {
-    val uuid = varchar("UUID", 36)
-    val username = varchar("UserName", 32)
-    val team = reference("Team", TeamTable)
+    val uuid = varchar("UUID", 36).uniqueIndex()
+    val username = varchar("UserName", 32).index()
+    val team = reference("Team", TeamTable).index()
    val leader = bool("Leader")
    val locale = varchar("Locale", 16).nullable()
    val manualLocale = bool("ManualLocale")
    val bedrock = bool("Bedrock")
    val password = text("Password").nullable()
-    val discordId = long("DiscordId").nullable()
+    val discordId = long("DiscordId").nullable().uniqueIndex()
 }

 class SteamwarUser(id: EntityID<Int>): IntEntity(id) {
@@ -170,7 +170,7 @@ class SteamwarUser(id: EntityID<Int>): IntEntity(id) {
    fun isLeader() = leader

    var locale: Locale by SteamwarUserTable.locale
-        .transform({ it.toLanguageTag() }, { it?.let { Locale.forLanguageTag(it) } ?: Locale.getDefault()})
+        .transform({ it.toLanguageTag() }, { it?.let { Locale.forLanguageTag(it) } ?: Locale.ENGLISH })
    var manualLocale by SteamwarUserTable.manualLocale
    var bedrock by SteamwarUserTable.bedrock
    private var passwordInternal by SteamwarUserTable.password
@@ -186,10 +186,10 @@ class SteamwarUser(id: EntityID<Int>): IntEntity(id) {

            val salt = ByteArray(16)
            random.nextBytes(salt)
-            val saltString = Base64.getEncoder().encode(salt)
+            val saltString = Base64.getEncoder().encodeToString(salt)

            val hash = generateHash(value, salt)
-            val hashString = Base64.getEncoder().encode(hash)
+            val hashString = Base64.getEncoder().encodeToString(hash)

            useDb {
                passwordInternal = "$hashString:$saltString"
@@ -28,12 +28,10 @@ import org.jetbrains.exposed.v1.dao.IntEntityClass
 import org.jetbrains.exposed.v1.jdbc.select

 object TeamTable : IntIdTable("Team", "TeamID") {
-    val kuerzel = varchar("TeamKuerzel", 10)
+    val kuerzel = varchar("TeamKuerzel", 10).index()
    val color = char("TeamColor", 1).default("8")
-    val name = varchar("TeamName", 16)
+    val name = varchar("TeamName", 16).index()
    val deleted = bool("TeamDeleted").default(false)
-    val address = text("Address").nullable()
-    val port = ushort("Port").default(25565u)
 }

 class Team(id: EntityID<Int>) : IntEntity(id) {
@@ -41,10 +39,10 @@ class Team(id: EntityID<Int>) : IntEntity(id) {
        private val teamCache = mutableMapOf<Int, Team>()

        @JvmStatic
-        fun clear() = teamCache.clear()
+        fun clear() = synchronized(teamCache) { teamCache.clear() }

        @JvmStatic
-        fun byId(id: Int) = teamCache.computeIfAbsent(id) { useDb { Team[id] } }
+        fun byId(id: Int) = synchronized(teamCache) { teamCache.computeIfAbsent(id) { useDb { Team[id] } } }

        @JvmStatic
        fun get(name: String) = useDb { find { (TeamTable.name.lowerCase() eq name.lowercase() or (TeamTable.kuerzel.lowerCase() eq name.lowercase())) and not(TeamTable.deleted) }.firstOrNull() }
@@ -67,8 +65,6 @@ class Team(id: EntityID<Int>) : IntEntity(id) {
    private var name by TeamTable.name
    var deleted by TeamTable.deleted
        private set
-    private var teamAddress by TeamTable.address
-    private var teamPort by TeamTable.port
    val members by lazy { useDb { SteamwarUserTable.select(SteamwarUserTable.id).where { SteamwarUserTable.team eq teamId }.map { it[SteamwarUserTable.id].value } } }

    fun size() = useDb { SteamwarUser.find { SteamwarUserTable.team eq teamId }.count().toInt() }
@@ -96,16 +92,4 @@ class Team(id: EntityID<Int>) : IntEntity(id) {
        set(value) = useDb {
            name = value
        }
-
-    var address: String?
-        get() = teamAddress
-        set(value) = useDb {
-            teamAddress = value
-        }
-
-    var port: Int
-        get() = teamPort.toInt()
-        set(value) = useDb {
-            teamPort = value.toUShort()
-        }
 }
@@ -32,8 +32,8 @@ import org.jetbrains.exposed.v1.jdbc.deleteWhere
 import org.jetbrains.exposed.v1.jdbc.insertIgnore

 object TeamTeilnahmeTable : CompositeIdTable("TeamTeilnahme") {
-    val teamId = reference("teamId", TeamTable)
-    val eventId = reference("eventId", EventTable)
+    val teamId = reference("teamId", TeamTable).index()
+    val eventId = reference("eventId", EventTable).index()
    val placement = integer("Placement").nullable()

    override val primaryKey = PrimaryKey(teamId, eventId)
@@ -33,10 +33,10 @@ import java.sql.Timestamp
 import java.util.*

 object TokenTable: IntIdTable("Token") {
-    val name = varchar("Name", 64)
-    val owner = reference("Owner", SteamwarUserTable)
+    val name = varchar("Name", 64).uniqueIndex()
+    val owner = reference("Owner", SteamwarUserTable).index()
    val created = timestamp("Created").defaultExpression(CurrentTimestamp)
-    val hash = varchar("Hash", 88)
+    val hash = varchar("Hash", 88).uniqueIndex()
 }

 class Token(id: EntityID<Int>): IntEntity(id) {
@@ -1,170 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.sql
-
-import de.steamwar.sql.internal.useDb
-import org.jetbrains.exposed.v1.core.*
-import org.jetbrains.exposed.v1.core.dao.id.CompositeID
-import org.jetbrains.exposed.v1.core.dao.id.CompositeIdTable
-import org.jetbrains.exposed.v1.core.dao.id.EntityID
-import org.jetbrains.exposed.v1.dao.CompositeEntity
-import org.jetbrains.exposed.v1.dao.CompositeEntityClass
-import org.jetbrains.exposed.v1.jdbc.insertIgnore
-import org.jetbrains.exposed.v1.jdbc.select
-import java.util.concurrent.ConcurrentHashMap
-
-object UserEloTable : CompositeIdTable("UserElo") {
-    val season = integer("Season").entityId()
-    val gameMode = varchar("GameMode", 16).entityId()
-    val userId = reference("UserID", SteamwarUserTable)
-    val elo = integer("Elo")
-
-    override val primaryKey = PrimaryKey(season, gameMode, userId)
-
-    init {
-        addIdColumn(season)
-        addIdColumn(gameMode)
-    }
-}
-
-class UserElo(id: EntityID<CompositeID>) : CompositeEntity(id) {
-    companion object : CompositeEntityClass<UserElo>(UserEloTable) {
-        private const val ELO_DEFAULT = 0
-
-        private val gameModeUserEloCache: MutableMap<String, MutableMap<Int, Int?>> = ConcurrentHashMap()
-        private val emblemCache: MutableMap<Int, String> = ConcurrentHashMap()
-
-        @JvmStatic
-        fun clear() {
-            gameModeUserEloCache.clear()
-            emblemCache.clear()
-        }
-
-        @JvmStatic
-        fun getEloOrDefault(userId: Int, gameMode: String) =
-            getElo(userId, gameMode) ?: ELO_DEFAULT
-
-        @JvmStatic
-        fun getElo(userId: Int, gameMode: String) =
-            gameModeUserEloCache.getOrPut(gameMode) { mutableMapOf() }
-                .getOrPut(userId) { getEloFromDb(userId, gameMode)?.elo }
-
-        private fun getEloFromDb(userId: Int, gameMode: String) = useDb {
-            find { (UserEloTable.userId eq userId) and (UserEloTable.gameMode eq gameMode) and (UserEloTable.season eq Season.getSeason()) }.firstOrNull()
-        }
-
-        @JvmStatic
-        fun getFightsOfSeason(userId: Int, gamemode: String) = useDb {
-            exec(
-                "SELECT COUNT(*) AS Fights FROM FightPlayer INNER JOIN Fight F on FightPlayer.FightID = F.FightID WHERE UserID = ? AND GameMode = ? AND UNIX_TIMESTAMP(StartTime) + Duration >= UNIX_TIMESTAMP(?)",
-                args = listOf(
-                    IntegerColumnType() to userId,
-                    VarCharColumnType() to gamemode,
-                    VarCharColumnType() to Season.getSeasonStart()
-                )
-            ) {
-                return@exec if (it.next()) {
-                    it.getInt("Fights")
-                } else {
-                    0
-                }
-            } ?: 0
-        }
-
-        @JvmStatic
-        fun setElo(userId: Int, gameMode: String, elo: Int) {
-            emblemCache.remove(userId)
-            gameModeUserEloCache.getOrDefault(gameMode, mutableMapOf()).remove(userId)
-            useDb {
-                findByIdAndUpdate(CompositeID {
-                    it[UserEloTable.userId] = userId
-                    it[UserEloTable.gameMode] = gameMode
-                    it[UserEloTable.season] = Season.getSeason()
-                }) {
-                    it.elo = elo
-                } ?: UserEloTable.insertIgnore {
-                    it[UserEloTable.userId] = userId
-                    it[UserEloTable.gameMode] = gameMode
-                    it[UserEloTable.season] = Season.getSeason()
-                    it[UserEloTable.elo] = elo
-                }
-            }
-        }
-
-        @JvmStatic
-        fun getPlacement(elo: Int, gamemode: String) = useDb {
-            UserEloTable.select(UserEloTable.userId.count()).where {
-                (UserEloTable.gameMode eq gamemode) and (UserEloTable.elo greater elo) and (UserEloTable.season eq Season.getSeason())
-            }.firstOrNull()?.get(UserEloTable.userId.count())?.let { it + 1 }?.toInt() ?: -1
-        }
-
-        @JvmStatic
-        fun getEmblem(user: SteamwarUser, rankedModes: List<String>) =
-            emblemCache.getOrPut(user.id.value) {
-                var emblemProgression = -1
-                for (mode in rankedModes) {
-                    if (getFightsOfSeason(user.id.value, mode) == 0) continue
-                    val progression = getProgression(user.id.value, mode)
-                    if (progression > emblemProgression) {
-                        emblemProgression = progression
-                    }
-                }
-                return toEmblem(emblemProgression)
-            }
-
-        @JvmStatic
-        fun getEmblemProgression(gameMode: String, userId: Int): String =
-            when (getProgression(userId, gameMode)) {
-                -1 -> "§8❱❱❱❱ ❂"
-                0 -> "§e❱§8❱❱❱ ❂"
-                1 -> "§e❱❱§8❱❱ ❂"
-                2 -> "§e❱❱❱§8❱ ❂"
-                3 -> "§e❱❱❱❱§8 ❂"
-                4 -> "§8❱❱❱❱ §5❂"
-                else -> throw SecurityException("Progression is not in range")
-            }
-
-
-        @JvmStatic
-        fun getProgression(userId: Int, gameMode: String) = useDb { getElo(userId, gameMode) ?: -1 }.let {
-            when {
-                it < 0 -> -1
-                it < 150 -> 0
-                it < 350 -> 1
-                it < 600 -> 2
-                it < 900 -> 3
-                else -> 4
-            }
-        }
-
-        @JvmStatic
-        fun toEmblem(progression: Int) = when (progression) {
-            -1 -> ""
-            0 -> "§e❱ "
-            1 -> "§e❱❱ "
-            2 -> "§e❱❱❱ "
-            3 -> "§e❱❱❱❱ "
-            4 -> "§5❂ "
-            else -> throw SecurityException("Progression out of range")
-        }
-    }
-
-    var elo by UserEloTable.elo
-}
@@ -28,7 +28,7 @@ import org.jetbrains.exposed.v1.jdbc.insert
 import org.jetbrains.exposed.v1.jdbc.selectAll

 object UserPermTable: Table("UserPerm") {
-    val user = reference("User", SteamwarUserTable.id)
+    val user = reference("User", SteamwarUserTable.id).index()
    val perm = enumerationByName("Perm", 32, UserPerm::class)

    override val primaryKey = PrimaryKey(user, perm)
@@ -60,7 +60,7 @@ enum class UserPerm {
        @JvmField
        val prefixes = mapOf(
            PREFIX_NONE to emptyPrefix,
-            PREFIX_YOUTUBER to Prefix("§7", "YT"),
+            PREFIX_YOUTUBER to Prefix("§x§8§A§2§B§E§5", "CC"), // 8A2BE5
            PREFIX_GUIDE to Prefix("§x§e§7§6§2§e§d", "Guide"), // E762ED
            PREFIX_SUPPORTER to Prefix("§x§6§0§9§5§F§B", "Sup"), // 6095FB
            PREFIX_MODERATOR to Prefix("§x§F§F§A§2§5§C", "Mod"), // FFA25C
@@ -24,10 +24,7 @@ import org.yaml.snakeyaml.Yaml;
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;

@@ -142,6 +139,12 @@ final class YMLWrapper<M, W> {
        return get(path, o -> (List<Integer>) o);
    }

+    public Set<Integer> getIntSet(String path) {
+        List<Integer> list = get(path, o -> (List<Integer>) o);
+        if (list.isEmpty()) return Collections.emptySet();
+        return Collections.unmodifiableSet(new HashSet<>(list));
+    }
+
    public List<SchematicType> getSchematicTypeList(String path) {
        List<String> list = getStringList(path);
        if (list.isEmpty()) {
@@ -160,6 +163,22 @@ final class YMLWrapper<M, W> {
        }
    }

+    public <K, V> Map<K, V> getMap(String path, Function<String, K> keyFunction, Function<String, V> valueFunction) {
+        Object data = this.document.get(path);
+        if (data instanceof Map) {
+            Map<K, V> result = new HashMap<>();
+            ((Map<String, String>) data).forEach((keyString, valueString) -> {
+                K key = keyFunction.apply(keyString.toUpperCase());
+                V value = valueFunction.apply(valueString.toUpperCase());
+                if (key == null || value == null) return;
+                result.put(key, value);
+            });
+            return Collections.unmodifiableMap(result);
+        } else {
+            return Collections.emptyMap();
+        }
+    }
+
    public List<Map<?, ?>> getMapList(String path) {
        Object value = this.document.get(path);
        if (value instanceof List) {
@@ -23,6 +23,7 @@ import org.intellij.lang.annotations.Language
 import org.jetbrains.exposed.v1.core.ColumnType
 import org.jetbrains.exposed.v1.core.Expression
 import org.jetbrains.exposed.v1.core.ResultRow
+import org.jetbrains.exposed.v1.core.StdOutSqlLogger
 import org.jetbrains.exposed.v1.core.statements.StatementType
 import org.jetbrains.exposed.v1.dao.IntEntity
 import org.jetbrains.exposed.v1.dao.IntEntityClass
@@ -66,7 +67,7 @@ object KotlinDatabase {
    }
 }

-fun <T: Any?> useDb(statement: JdbcTransaction.() -> T): T {
+fun <T> useDb(statement: JdbcTransaction.() -> T): T {
    KotlinDatabase.ensureConnected()
    return TransactionManager.currentOrNull()?.statement() ?: transaction(KotlinDatabase.db) {
        statement()
@@ -42,4 +42,5 @@ dependencies {

    compileOnly(libs.fastutil)
    compileOnly(libs.authlib)
+    compileOnly(project(":FightSystem:FightSystem_14"))
 }
@@ -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();
+            }
+        });
+    }
+}
@@ -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();
+    }
+}
@@ -19,11 +19,48 @@

 package de.steamwar.fightsystem.utils;

+import io.papermc.paper.datacomponent.DataComponentType;
 import io.papermc.paper.datacomponent.DataComponentTypes;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;

+import java.util.HashSet;
+import java.util.Set;
+
 public class ReflectionWrapper21 implements ReflectionWrapper {
+    private static final Set<DataComponentType> FORBIDDEN_TYPES = new HashSet<>();
+
+    static {
+        FORBIDDEN_TYPES.add(DataComponentTypes.CUSTOM_NAME);
+        FORBIDDEN_TYPES.add(DataComponentTypes.PROFILE);
+        FORBIDDEN_TYPES.add(DataComponentTypes.UNBREAKABLE);
+        FORBIDDEN_TYPES.add(DataComponentTypes.BLOCK_DATA);
+        FORBIDDEN_TYPES.add(DataComponentTypes.BLOCKS_ATTACKS);
+        FORBIDDEN_TYPES.add(DataComponentTypes.BUNDLE_CONTENTS);
+        FORBIDDEN_TYPES.add(DataComponentTypes.CUSTOM_MODEL_DATA);
+
+        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
    public Object explosionHider(Player player, Object packet, PacketHiderFunction packetHiderFunction) {
        return packet;
@@ -31,6 +68,7 @@ public class ReflectionWrapper21 implements ReflectionWrapper {

    @Override
    public boolean hasItems(ItemStack stack) {
-        return stack.getDataTypes().stream().anyMatch(dataComponentType -> dataComponentType != DataComponentTypes.ENCHANTMENTS || dataComponentType != DataComponentTypes.DAMAGE);
+        FORBIDDEN_TYPES.forEach(stack::resetData);
+        return false;
    }
 }
@@ -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 {
+}
@@ -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,13 @@ 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);
+        if (Core.getVersion() >= 19) {
+            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();
@@ -44,7 +44,6 @@ REMOVE_HELP=§8/§eremove §8[§eplayer§8]
 NOT_FIGHTLEADER=§cYou are not the fight leader
 WIN_HELP=§8/§7win §8[§eteam §8or §etie§8]

-INFO_RANKED=§7Ranked§8: §e{0}
 INFO_LEADER=§7Leader {0}§8: {1}
 INFO_SCHEMATIC=§7Schematic {0}§8: §e{1} §7from {2}, Rank: {3}

@@ -167,7 +166,6 @@ TPS_WARNING=§c{0} §7TPS
 UI_PRE_RUNNING=§7Kits distributed
 UI_RUNNING=§aFight started
 UI_SKIP=§7Skipping to next event
-UI_UNRANKED=§7Unranked match
 UI_PLAYER_JOINS=§a§l» {0}{1}
 UI_PLAYER_LEAVES=§c§l« {0}{1}
 UI_LEADER_JOINS=§a§l» {0}Leader {1}
@@ -154,7 +154,6 @@ COMMAND_CURRENTLY_UNAVAILABLE=§cDieser Befehl ist zu diesem Kampfzeitpunkt nich
 UI_PRE_RUNNING=§7Kits verteilt
 UI_RUNNING=§aArena freigegeben
 UI_SKIP=§7Sprung zum nächsten Ereignis
-UI_UNRANKED=§7Ungewerteter Kampf
 UI_LEADER_JOINS=§a§l» {0}Leader {1}
 UI_PLAYER_DEATH={0}{1} §7ist gestorben
 UI_PLAYER_LEAVE={0}{1} §7hat den Kampf verlassen
--- a/Show More
+++ b/Show More