Merge remote-tracking branch 'upstream/main' into luan/compact-hooks

* upstream/main: (28 commits)
  ci: enable merge_group in key builds for merge-queue (#2063)
  ci: disable sonar in draft prs and main branch (#2062)
  fix: check player nullptr and connection timeout (#2060)
  feat: namelocks (#2005)
  improve: connection management (#2040)
  fix: adventurer stone (#2048)
  fix: max limit of character name (#2035)
  fix: add missing 'alchemist container' monster (#2036)
  fix: players healing when attacked (#2026)
  fix: speed change issues (#2032)
  feat: the monster fight mechanics (#2001)
  fix: oberon arguments (#2021)
  fix: paladin speed on sharpshooter and swift foot (#2030)
  fix: skill food from hireling (#2028)
  improve: more reliable quickloot/autoloot (#1997)
  feat: configurable number of players per account (#2000)
  fix: potions conditions for group ids above senior tutors (#2019)
  fix: missing spell effect and file (#2020)
  fix: do not award bosstiary/bestiary points for summons (#2017)
  fix: correct spread value assignment from 1 to 0 (#2018)
  ...

.github/workflows/analysis-reviewdog-cppcheck.yml

@@ -4,21 +4,20 @@ name: Analysis - Review Dog
 on:
   pull_request:
     paths:
-      - 'src/**'
+      - "src/**"
   push:
     paths:
-      - 'src/**'
+      - "src/**"
 
 jobs:
-
   cppcheck:
     runs-on: ubuntu-latest
     steps:
       - name: Cancel Previous Runs
         if: github.ref != 'refs/heads/main'
         uses: fkirc/skip-duplicate-actions@master
         with:
-          concurrent_skipping: 'same_content'
+          concurrent_skipping: "same_content"
           cancel_others: true
 
       - name: Check out code.

.github/workflows/analysis-reviewdog.yml

@@ -12,7 +12,7 @@ jobs:
         if: github.ref != 'refs/heads/main'
         uses: fkirc/skip-duplicate-actions@master
         with:
-          concurrent_skipping: 'same_content'
+          concurrent_skipping: "same_content"
           cancel_others: true
 
       - name: Check out code.
@@ -32,11 +32,9 @@ jobs:
           luac -v
           reviewdog -reporter=github-pr-check -runners=luac
 
-
   luacheck:
     runs-on: ubuntu-latest
     steps:
-
       - name: Check out code.
         uses: actions/checkout@main
 
@@ -54,11 +52,9 @@ jobs:
           cd "$GITHUB_WORKSPACE"
           reviewdog -reporter=github-pr-check -runners=luacheck
 
-
   shellcheck:
     runs-on: ubuntu-latest
     steps:
-
       - name: Check out code.
         uses: actions/checkout@main
 
@@ -67,14 +63,12 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           reporter: github-pr-check
-          pattern: '*.sh'
-          exclude: './.git/*'
-
+          pattern: "*.sh"
+          exclude: "./.git/*"
 
   xmllint:
     runs-on: ubuntu-latest
     steps:
-
       - name: Check out code.
         uses: actions/checkout@main
 
@@ -92,11 +86,9 @@ jobs:
           xmllint --version
           reviewdog -reporter=github-pr-check -runners=xmllint
 
-
   yamllint:
     runs-on: ubuntu-latest
     steps:
-
       - name: Check out code.
         uses: actions/checkout@main
 
@@ -106,11 +98,9 @@ jobs:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           reporter: github-pr-check
 
-
   hadolint:
     runs-on: ubuntu-latest
     steps:
-
       - name: Check out code
         uses: actions/checkout@main
 
@@ -122,7 +112,6 @@ jobs:
   actionlint:
     runs-on: ubuntu-latest
     steps:
-
       - name: Check out code
         uses: actions/checkout@main
 

.github/workflows/analysis-sonarcloud.yml

@@ -3,19 +3,14 @@ name: Analysis - SonarCloud
 
 on:
   pull_request_target:
-    types: [opened, synchronize, reopened]
+    types: [opened, synchronize, reopened, ready_for_review]
     paths:
-      - 'src/**'
-  push:
-    paths:
-      - 'src/**'
-    branches:
-      - main
+      - "src/**"
 
 env:
   VCPKG_BUILD_TYPE: debug
   CMAKE_BUILD_PARALLEL_LEVEL: 2
-  MAKEFLAGS: '-j 2'
+  MAKEFLAGS: "-j 2"
   VCPKG_BINARY_SOURCES: clear;default,readwrite
 
 jobs:

.github/workflows/build-docker.yml

@@ -6,10 +6,11 @@ on:
   pull_request:
     types: [opened, synchronize, reopened, ready_for_review]
     paths:
-      - 'src/**'
+      - "src/**"
+  merge_group:
   push:
     paths:
-      - 'src/**'
+      - "src/**"
     branches:
       - main
 
@@ -18,10 +19,10 @@ jobs:
     if: github.event_name == 'pull_request'
     runs-on: ubuntu-latest
     steps:
-    - name: Cancel Previous Runs
-      uses: styfle/[email protected]
-      with:
-        access_token: ${{ github.token }}
+      - name: Cancel Previous Runs
+        uses: styfle/[email protected]
+        with:
+          access_token: ${{ github.token }}
 
   build_docker_x86:
     if: ${{ github.event_name == 'push' || !github.event.pull_request.draft }}
@@ -35,7 +36,7 @@ jobs:
       - name: Install GitVersion
         uses: gittools/actions/gitversion/[email protected]
         with:
-          versionSpec: '5.x'
+          versionSpec: "5.x"
 
       - name: Determine Version
         id: gitversion
@@ -93,7 +94,7 @@ jobs:
         if: github.ref != 'refs/heads/main'
         uses: fkirc/skip-duplicate-actions@master
         with:
-          concurrent_skipping: 'same_content'
+          concurrent_skipping: "same_content"
           cancel_others: true
 
       - name: Checkout
@@ -104,7 +105,7 @@ jobs:
       - name: Install GitVersion
         uses: gittools/actions/gitversion/[email protected]
         with:
-          versionSpec: '5.x'
+          versionSpec: "5.x"
 
       - name: Determine Version
         id: gitversion

.github/workflows/build-ubuntu.yml

@@ -6,26 +6,27 @@ on:
   pull_request:
     types: [opened, synchronize, reopened, ready_for_review]
     paths:
-      - 'src/**'
+      - "src/**"
+  merge_group:
   push:
     paths:
-      - 'src/**'
+      - "src/**"
     branches:
       - main
 
 env:
   CMAKE_BUILD_PARALLEL_LEVEL: 2
-  MAKEFLAGS: '-j 2'
+  MAKEFLAGS: "-j 2"
 
 jobs:
   cancel-runs:
     if: github.event_name == 'pull_request'
     runs-on: ubuntu-latest
     steps:
-    - name: Cancel Previous Runs
-      uses: styfle/[email protected]
-      with:
-        access_token: ${{ github.token }}
+      - name: Cancel Previous Runs
+        uses: styfle/[email protected]
+        with:
+          access_token: ${{ github.token }}
 
   job:
     if: ${{ github.event_name == 'push' || !github.event.pull_request.draft }}

.github/workflows/build-windows-cmake.yml

@@ -5,24 +5,25 @@ on:
   pull_request:
     types: [opened, synchronize, reopened, ready_for_review]
     paths:
-      - 'src/**'
+      - "src/**"
+  merge_group:
   push:
     paths:
-      - 'src/**'
+      - "src/**"
     branches:
       - main
 env:
   CMAKE_BUILD_PARALLEL_LEVEL: 2
-  MAKEFLAGS: '-j 2'
+  MAKEFLAGS: "-j 2"
 jobs:
   cancel-runs:
     if: github.event_name == 'pull_request'
     runs-on: ubuntu-latest
     steps:
-    - name: Cancel Previous Runs
-      uses: styfle/[email protected]
-      with:
-        access_token: ${{ github.token }}
+      - name: Cancel Previous Runs
+        uses: styfle/[email protected]
+        with:
+          access_token: ${{ github.token }}
 
   job:
     if: ${{ github.event_name == 'push' || !github.event.pull_request.draft }}

.github/workflows/build-windows-solution.yml

@@ -6,26 +6,27 @@ on:
   pull_request:
     types: [opened, synchronize, reopened, ready_for_review]
     paths:
-      - 'src/**'
+      - "src/**"
+  merge_group:
   push:
     paths:
-      - 'src/**'
+      - "src/**"
     branches:
       - main
 
 env:
   CMAKE_BUILD_PARALLEL_LEVEL: 2
-  MAKEFLAGS: '-j 2'
+  MAKEFLAGS: "-j 2"
 
 jobs:
   cancel-runs:
     if: github.event_name == 'pull_request'
     runs-on: ubuntu-latest
     steps:
-    - name: Cancel Previous Runs
-      uses: styfle/[email protected]
-      with:
-        access_token: ${{ github.token }}
+      - name: Cancel Previous Runs
+        uses: styfle/[email protected]
+        with:
+          access_token: ${{ github.token }}
 
   job:
     if: ${{ github.event_name == 'push' || !github.event.pull_request.draft }}

.github/workflows/clang-lint.yml

@@ -3,19 +3,20 @@ name: Clang-format
 on:
   pull_request:
     paths:
-      - 'src/**'
+      - "src/**"
+  merge_group:
   push:
     paths:
-      - 'src/**'
+      - "src/**"
 jobs:
   cancel-runs:
     if: github.event_name == 'pull_request'
     runs-on: ubuntu-latest
     steps:
-    - name: Cancel Previous Runs
-      uses: styfle/[email protected]
-      with:
-        access_token: ${{ github.token }}
+      - name: Cancel Previous Runs
+        uses: styfle/[email protected]
+        with:
+          access_token: ${{ github.token }}
 
   build:
     runs-on: ubuntu-latest

.github/workflows/cron-stale.yml

@@ -1,27 +1,27 @@
 ---
-name: 'Cron - Stale issues and PRs'
+name: "Cron - Stale issues and PRs"
 on:
   schedule:
-    - cron: '30 1 * * *'
+    - cron: "30 1 * * *"
 
 jobs:
   cancel-runs:
     if: github.event_name == 'pull_request'
     runs-on: ubuntu-latest
     steps:
-    - name: Cancel Previous Runs
-      uses: styfle/[email protected]
-      with:
-        access_token: ${{ github.token }}
+      - name: Cancel Previous Runs
+        uses: styfle/[email protected]
+        with:
+          access_token: ${{ github.token }}
 
   stale:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/stale@v6
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
-          stale-issue-message: 'This issue is stale because it has been open 120 days with no activity.'
-          stale-pr-message: 'This PR is stale because it has been open 45 days with no activity.'
+          stale-issue-message: "This issue is stale because it has been open 120 days with no activity."
+          stale-pr-message: "This PR is stale because it has been open 45 days with no activity."
           days-before-issue-stale: 90
           days-before-pr-stale: 30
           days-before-issue-close: -1

.github/workflows/lua-format.yml

@@ -3,10 +3,11 @@ name: Lua-format
 on:
   pull_request:
     paths:
-      - 'data*/**'
+      - "data*/**"
+  merge_group:
   push:
     paths:
-      - 'data*/**'
+      - "data*/**"
 jobs:
   lua-formatter:
     runs-on: ubuntu-latest

.github/workflows/pr-labeler.yml

@@ -1,5 +1,5 @@
 ---
-name: 'PR - Labeler'
+name: "PR - Labeler"
 on:
   - pull_request_target
 
@@ -9,4 +9,4 @@ jobs:
     steps:
       - uses: actions/labeler@main
         with:
-          repo-token: '${{ secrets.GITHUB_TOKEN }}'
+          repo-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/tests-lua.yml

@@ -3,6 +3,7 @@ name: Tests - Lua
 
 on:
   pull_request:
+  merge_group:
   push:
     branches:
       - main