From 5d00709b1f33eb1578e27590cd38c44dbb0f8702 Mon Sep 17 00:00:00 2001 From: gnembon Date: Tue, 25 May 2021 07:31:22 -0300 Subject: [PATCH] fix for downloadable zip folders --- src/main/java/carpet/script/argument/FileArgument.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/carpet/script/argument/FileArgument.java b/src/main/java/carpet/script/argument/FileArgument.java index 0e0d332d..485d642e 100644 --- a/src/main/java/carpet/script/argument/FileArgument.java +++ b/src/main/java/carpet/script/argument/FileArgument.java @@ -147,7 +147,7 @@ public class FileArgument for (int i =0; i < pathElements.length; i++ ) { String token = pathElements[i]; - boolean isZip = token.endsWith(".zip"); + boolean isZip = token.endsWith(".zip") && (isFolder || (i < pathElements.length-1)); if (zipPath != null && isZip) throw new InternalExpressionException(token+" indicates zip access in an already zipped location "+zipPath); if (isZip) token = token.substring(0, token.length()-4); token = (type==Type.ANY && i == pathElements.length-1)? // sloppy really, but should work