From 6b9866a4c49b3d01aba41518bee3327850acd7a9 Mon Sep 17 00:00:00 2001 From: Thijs Wiefferink Date: Tue, 29 May 2018 22:58:15 +0200 Subject: [PATCH] Ignore hidden files in the /regions directory (like .DS_Store) --- .../main/java/me/wiefferink/areashop/commands/ImportJob.java | 2 +- .../main/java/me/wiefferink/areashop/managers/FileManager.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/AreaShop/src/main/java/me/wiefferink/areashop/commands/ImportJob.java b/AreaShop/src/main/java/me/wiefferink/areashop/commands/ImportJob.java index f598aea..e226abe 100644 --- a/AreaShop/src/main/java/me/wiefferink/areashop/commands/ImportJob.java +++ b/AreaShop/src/main/java/me/wiefferink/areashop/commands/ImportJob.java @@ -112,7 +112,7 @@ public class ImportJob { // Import regions from each world for(File worldFolder : worldFolders) { // Skip files - if(!worldFolder.isDirectory()) { + if(!worldFolder.isDirectory() || worldFolder.isHidden()) { continue; } diff --git a/AreaShop/src/main/java/me/wiefferink/areashop/managers/FileManager.java b/AreaShop/src/main/java/me/wiefferink/areashop/managers/FileManager.java index ba53ea7..240a663 100644 --- a/AreaShop/src/main/java/me/wiefferink/areashop/managers/FileManager.java +++ b/AreaShop/src/main/java/me/wiefferink/areashop/managers/FileManager.java @@ -955,7 +955,7 @@ public class FileManager extends Manager { List noRegion = new ArrayList<>(); List incorrectDuration = new ArrayList<>(); for(File regionFile : regionFiles) { - if(regionFile.exists() && regionFile.isFile()) { + if(regionFile.exists() && regionFile.isFile() && !regionFile.isHidden()) { // Load the region file from disk in UTF8 mode YamlConfiguration config;