keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Fix datapack walking not working for mod datapacks. Closes #5334 (#5335)

Browse source
This commit is contained in:
Vincent Lee 2019-01-09 22:59:40 -06:00 committed by LexManos
parent 4e196a445a
commit 985a48f02e
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/net/minecraftforge/fml/packs/ModFileResourcePack.java
View file

@ -79,7 +79,8 @@ public class ModFileResourcePack extends AbstractResourcePack
try try
{ {
Path root = modFile.getLocator().findPath(modFile, type.getDirectoryName()).toAbsolutePath(); Path root = modFile.getLocator().findPath(modFile, type.getDirectoryName()).toAbsolutePath();
Path inputPath = root.resolve(pathIn); Path inputPath = root.getFileSystem().getPath(pathIn);
return Files.walk(root). return Files.walk(root).
map(path -> root.relativize(path.toAbsolutePath())). map(path -> root.relativize(path.toAbsolutePath())).
filter(path -> path.getNameCount() > 1 && path.getNameCount() - 1 <= maxDepth). // Make sure the depth is within bounds, ignoring domain filter(path -> path.getNameCount() > 1 && path.getNameCount() - 1 <= maxDepth). // Make sure the depth is within bounds, ignoring domain