icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 1.17

Browse Source
This commit is contained in:
gnembon committed 2021-05-25 07:45:58 -03:00
2 parents c720c2c935 5d00709b1f
commit d6bde212e2
1 file changed
+1 -1
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/carpet/script/argument/FileArgument.java
+1 -1
View File
@@ -147,7 +147,7 @@ public class FileArgument
for (int i =0; i < pathElements.length; i++ ) for (int i =0; i < pathElements.length; i++ )
{ {
String token = pathElements[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 (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); if (isZip) token = token.substring(0, token.length()-4);
token = (type==Type.ANY && i == pathElements.length-1)? // sloppy really, but should work token = (type==Type.ANY && i == pathElements.length-1)? // sloppy really, but should work