Merge branch 'SkriptLang:master' into feature/abstact_class_error

SkriptLang · Jan 21, 2024 · 488d21c · 488d21c
2 parents fe0a5f9 + b9f89c1
commit 488d21c
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/.github/workflows/release-docs.yml b/.github/workflows/release-docs.yml
@@ -37,7 +37,6 @@ jobs:
         - name: Push release documentation
           uses: ./skript/.github/workflows/docs/push-docs
           with:
-              docs_output_dir: ${{ steps.configuration.outputs.DOCS_OUTPUT_DIR }}
               docs_repo_dir: ${{ steps.configuration.outputs.DOCS_REPO_DIR }}
               git_name: Release Docs Bot
               git_email: releasedocs@skriptlang.org
@@ -69,6 +68,7 @@ jobs:
             uses: ./skript/.github/workflows/docs/generate-docs
             with:
                 docs_repo_dir: ${{ steps.configuration.outputs.DOCS_REPO_DIR }}
+                docs_output_dir: ${{ steps.configuration.outputs.DOCS_OUTPUT_DIR }}
                 skript_repo_dir: ${{ steps.configuration.outputs.SKRIPT_REPO_DIR }}
                 is_release: true
           - name: Push archive documentation

diff --git a/gradle.properties b/gradle.properties
@@ -5,7 +5,7 @@ org.gradle.parallel=true
 
 groupid=ch.njol
 name=skript
-version=2.8.0-pre2
+version=2.8.0
 jarName=Skript.jar
 testEnv=java17/paper-1.20.4
 testEnvJavaVersion=17
diff --git a/skript-aliases b/skript-aliases
diff --git a/src/main/java/ch/njol/skript/expressions/ExprInventory.java b/src/main/java/ch/njol/skript/expressions/ExprInventory.java
@@ -18,7 +18,6 @@
  */
 package ch.njol.skript.expressions;
 
-import ch.njol.skript.aliases.ItemData;
 import ch.njol.skript.aliases.ItemType;
 import ch.njol.skript.config.Node;
 import ch.njol.skript.expressions.base.PropertyExpression;
@@ -33,17 +32,14 @@
 import org.bukkit.event.Event;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
-import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.BlockStateMeta;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.eclipse.jdt.annotation.Nullable;
 
-import ch.njol.skript.Skript;
 import ch.njol.skript.doc.Description;
 import ch.njol.skript.doc.Examples;
 import ch.njol.skript.doc.Name;
 import ch.njol.skript.doc.Since;
-import ch.njol.skript.expressions.base.SimplePropertyExpression;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
@@ -73,6 +69,9 @@ public class ExprInventory extends SimpleExpression<Object> {
 	@Override
 	@SuppressWarnings("unchecked")
 	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, SkriptParser.ParseResult parseResult) {
+		// prevent conflict with ExprItemsIn (https://github.com/SkriptLang/Skript/issues/6290)
+		if (exprs[0].getSource() instanceof ExprItemsIn)
+			return false;
 		// if we're dealing with a loop of just this expression
 		Node n = SkriptLogger.getNode();
 		inLoop = n != null && ("loop " + parseResult.expr).equals(n.getKey());

diff --git a/src/test/skript/tests/regressions/6290-item-inventory-conflict.sk b/src/test/skript/tests/regressions/6290-item-inventory-conflict.sk
@@ -0,0 +1,6 @@
+test "item inventory conflict":
+  parse:
+    loop all players:
+      loop all items in the loop-player's inventory:
+        set {_item} to loop-item
+  assert parse logs are not set with "failed to parse loop"