From d61d92cede8e94b1632924632f2520632f795e19 Mon Sep 17 00:00:00 2001 From: Martin Petricek Date: Sun, 21 Oct 2018 10:35:58 +0200 Subject: [PATCH] Follow symlinks when loading decks (#1618) --- src/magic/utility/DeckUtils.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/magic/utility/DeckUtils.java b/src/magic/utility/DeckUtils.java index 7a7f108ac9..ee55430e06 100644 --- a/src/magic/utility/DeckUtils.java +++ b/src/magic/utility/DeckUtils.java @@ -12,6 +12,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; +import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Map; @@ -33,6 +34,7 @@ import magic.model.MagicRandom; import magic.utility.MagicFileSystem.DataPath; import org.apache.commons.io.FilenameUtils; import static java.nio.charset.StandardCharsets.UTF_8; +import static java.nio.file.FileVisitOption.FOLLOW_LINKS; public class DeckUtils { @@ -269,7 +271,8 @@ public class DeckUtils { public static List getDeckFiles() { try { DeckFileVisitor dfv = new DeckFileVisitor(); - Files.walkFileTree(MagicFileSystem.getDataPath(DataPath.DECKS), dfv); + Files.walkFileTree(MagicFileSystem.getDataPath(DataPath.DECKS), Collections.singleton(FOLLOW_LINKS), + Integer.MAX_VALUE, dfv); return dfv.getFiles(); } catch (IOException ex) { throw new RuntimeException(ex);