Merge branch 'dev/patch' into feature/brush-level

Author: sovdeeth

.github/workflows/archive-docs.yml

@@ -2,43 +2,43 @@ name: Archive documentation
 
 on:
   release:
-    types: [published]
+    types: [ published ]
   workflow_dispatch:
 
 jobs:
   archive-docs:
-      if: "! contains(toJSON(github.event.commits.*.message), '[ci skip]')"
-      runs-on: ubuntu-latest
-      steps:
-          - name: Configure workflow
-            id: configuration
-            run: |
-              echo "BRANCH_NAME=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT
-              echo "DOCS_OUTPUT_DIR=${GITHUB_WORKSPACE}/skript-docs/docs/archives/${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
-              echo "DOCS_REPO_DIR=${GITHUB_WORKSPACE}/skript-docs" >> $GITHUB_OUTPUT
-              echo "SKRIPT_REPO_DIR=${GITHUB_WORKSPACE}/skript" >> $GITHUB_OUTPUT
-          - name: Checkout Skript
-            uses: actions/checkout@v6
-            with:
-                submodules: recursive
-                path: skript
-          - name: Setup documentation environment
-            uses: ./skript/.github/workflows/docs/setup-docs
-            with:
-                docs_deploy_key: ${{ secrets.DOCS_DEPLOY_KEY }}
-                docs_output_dir: ${{ steps.configuration.outputs.DOCS_OUTPUT_DIR }}
-          - name: Generate documentation
-            uses: ./skript/.github/workflows/docs/generate-docs
-            with:
-                docs_output_dir: ${{ steps.configuration.outputs.DOCS_OUTPUT_DIR }}
-                docs_repo_dir: ${{ steps.configuration.outputs.DOCS_REPO_DIR }}
-                skript_repo_dir: ${{ steps.configuration.outputs.SKRIPT_REPO_DIR }}
-                is_release: true
-                generate_javadocs: true
-          - name: Push archive documentation
-            uses: ./skript/.github/workflows/docs/push-docs
-            with:
-                docs_repo_dir: ${{ steps.configuration.outputs.DOCS_REPO_DIR }}
-                git_name: Archive Docs Bot
-                git_email: archivedocs@skriptlang.org
-                git_commit_message: "Update ${{ steps.configuration.outputs.BRANCH_NAME }} archive docs"
+    if: "! contains(toJSON(github.event.commits.*.message), '[ci skip]')"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Configure workflow
+        id: configuration
+        run: |
+          echo "BRANCH_NAME=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT
+          echo "DOCS_OUTPUT_DIR=${GITHUB_WORKSPACE}/skript-docs/docs/archives/${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
+          echo "DOCS_REPO_DIR=${GITHUB_WORKSPACE}/skript-docs" >> $GITHUB_OUTPUT
+          echo "SKRIPT_REPO_DIR=${GITHUB_WORKSPACE}/skript" >> $GITHUB_OUTPUT
+      - name: Checkout Skript
+        uses: actions/checkout@v6
+        with:
+          submodules: recursive
+          path: skript
+      - name: Setup documentation environment
+        uses: ./skript/.github/workflows/docs/setup-docs
+        with:
+          docs_repo: "SkriptLang/skript-docs"
+          docs_token: ${{ secrets.DOCS_TOKEN }}
+      - name: Generate documentation
+        uses: ./skript/.github/workflows/docs/generate-docs
+        with:
+          docs_output_dir: ${{ steps.configuration.outputs.DOCS_OUTPUT_DIR }}
+          docs_repo_dir: ${{ steps.configuration.outputs.DOCS_REPO_DIR }}
+          skript_repo_dir: ${{ steps.configuration.outputs.SKRIPT_REPO_DIR }}
+          is_release: true
+          generate_javadocs: true
+      - name: Push archive documentation
+        uses: ./skript/.github/workflows/docs/push-docs
+        with:
+          docs_repo_dir: ${{ steps.configuration.outputs.DOCS_REPO_DIR }}
+          git_name: Archive Docs Bot
+          git_email: archivedocs@skriptlang.org
+          git_commit_message: "Update ${{ steps.configuration.outputs.BRANCH_NAME }} archive docs"

.github/workflows/cleanup-docs.yml

@@ -17,14 +17,14 @@ jobs:
       - name: Checkout Skript
         uses: actions/checkout@v6
         with:
-            ref: ${{ github.event.repository.default_branch }}
-            submodules: recursive
-            path: skript
+          ref: ${{ github.event.repository.default_branch }}
+          submodules: recursive
+          path: skript
       - name: Setup documentation environment
         uses: ./skript/.github/workflows/docs/setup-docs
         with:
-            docs_deploy_key: ${{ secrets.DOCS_DEPLOY_KEY }}
-            docs_output_dir: ${{ steps.configuration.outputs.DOCS_OUTPUT_DIR }}
+          docs_repo: "SkriptLang/skript-docs"
+          docs_token: ${{ secrets.DOCS_TOKEN }}
       - name: Cleanup nightly documentation
         env:
           DOCS_OUTPUT_DIR: ${{ steps.configuration.outputs.DOCS_OUTPUT_DIR }}
@@ -33,7 +33,7 @@ jobs:
       - name: Push nightly documentation cleanup
         uses: ./skript/.github/workflows/docs/push-docs
         with:
-            docs_repo_dir: ${{ steps.configuration.outputs.DOCS_REPO_DIR }}
-            git_name: Nightly Docs Bot
-            git_email: nightlydocs@skriptlang.org
-            git_commit_message: "Delete ${{ steps.configuration.outputs.BRANCH_NAME }} branch nightly docs"
+          docs_repo_dir: ${{ steps.configuration.outputs.DOCS_REPO_DIR }}
+          git_name: Nightly Docs Bot
+          git_email: nightlydocs@skriptlang.org
+          git_commit_message: "Delete ${{ steps.configuration.outputs.BRANCH_NAME }} branch nightly docs"

gradle.properties

@@ -5,7 +5,7 @@ org.gradle.parallel=true
 
 groupid=ch.njol
 name=skript
-version=2.14.1
+version=2.14.3
 jarName=Skript.jar
 testEnv=java21/paper-1.21.11
 testEnvJavaVersion=21

gradlew.bat

@@ -1064,15 +1064,34 @@ public static ArrayList<TriggerItem> loadItems(SectionNode node) {
 
 					if (item != null)
 						break find_section;
-					Collection<LogEntry> errors = handler.getErrors();
 
 					// restore the failure log if:
 					// 1. there are no errors from the statement parse
 					// 2. the error message is the default one from the statement parse
 					// 3. the backup log contains a message about the section being claimed
-					if (errors.isEmpty()
-						|| errors.iterator().next().getMessage().contains("Can't understand this condition/effect:")
-						|| backup.getErrors().iterator().next().getMessage().contains("tried to claim the current section, but it was already claimed by")
+					// 4. the backup log contains an explicit error and the current error message is about no syntax managing the section
+					if (!handler.hasErrors()) {
+						handler.restore(backup);
+						continue;
+					}
+
+					LogEntry errorEntry = handler.getFirstError();
+					assert errorEntry != null;
+					String error = errorEntry.getMessage();
+
+					if (error.contains("Can't understand this condition/effect:")) {
+						handler.restore(backup);
+						continue;
+					}
+
+					LogEntry backupErrorEntry = backup.getFirstError();
+					if (backupErrorEntry == null)
+						continue;
+					String backupError = backupErrorEntry.getMessage();
+
+					if (backupError.contains("tried to claim the current section, but it was already claimed by")
+						|| (!backupError.contains("Can't understand this section: ")
+						&& error.contains("is a valid statement but cannot function as a section (:) because there is no syntax in the line to manage it."))
 					) {
 						handler.restore(backup);
 					}