Improve schematic filename exception handling

Author: me4502

worldedit-core/src/main/java/com/sk89q/worldedit/internal/util/RecursiveDirectoryWatcher.java

@@ -122,8 +122,13 @@ private void triggerInitialEvents(Path root) throws IOException, FilenameExcepti
                 if (Files.isDirectory(path)) {
                     triggerInitialEvents(path);
                 } else {
-                    path = WorldEdit.getInstance().getSafeOpenFile(null, schematicRoot.toFile(), schematicRoot.relativize(path).toString(), null).toPath();
-                    eventConsumer.accept(new FileCreatedEvent(path));
+                    try {
+                        path = WorldEdit.getInstance().getSafeOpenFile(null, schematicRoot.toFile(), schematicRoot.relativize(path).toString(), null).toPath();
+                        eventConsumer.accept(new FileCreatedEvent(path));
+                    } catch (FilenameException e) {
+                        // Invalid filename, warn but don't fail.
+                        LOGGER.warn("Illegal file detected", e);
+                    }
                 }
             }
         }
@@ -182,17 +187,22 @@ public void start(Consumer<DirEntryChangeEvent> eventConsumer) {
                         path = parentPath.resolve(path);
 
                         if (kind.equals(StandardWatchEventKinds.ENTRY_CREATE)) {
-                            path = WorldEdit.getInstance().getSafeOpenFile(null, schematicRoot.toFile(), schematicRoot.relativize(path).toString(), null).toPath();
-
-                            if (Files.isDirectory(path)) { // new subfolder created, create watch for it
-                                try {
-                                    registerFolderWatcher(path);
-                                    triggerInitialEvents(path);
-                                } catch (IOException | FilenameException e) {
-                                    LOGGER.error(e);
+                            try {
+                                path = WorldEdit.getInstance().getSafeOpenFile(null, schematicRoot.toFile(), schematicRoot.relativize(path).toString(), null).toPath();
+
+                                if (Files.isDirectory(path)) { // new subfolder created, create watch for it
+                                    try {
+                                        registerFolderWatcher(path);
+                                        triggerInitialEvents(path);
+                                    } catch (IOException | FilenameException e) {
+                                        LOGGER.error(e);
+                                    }
+                                } else { // new file created
+                                    eventConsumer.accept(new FileCreatedEvent(path));
                                 }
-                            } else { // new file created
-                                eventConsumer.accept(new FileCreatedEvent(path));
+                            } catch (FilenameException e) {
+                                // Invalid filename, warn but don't fail.
+                                LOGGER.warn("Illegal file detected", e);
                             }
                         } else if (kind.equals(StandardWatchEventKinds.ENTRY_DELETE)) {
                             // When we are notified about a deleted entry, we can't simply ask the filesystem
@@ -218,7 +228,7 @@ public void start(Consumer<DirEntryChangeEvent> eventConsumer) {
                         }
                     }
                 }
-            } catch (ClosedWatchServiceException | FilenameException ignored) {
+            } catch (ClosedWatchServiceException ignored) {
                 // Watch service closed, exit
             }
             LOGGER.debug("RecursiveDirectoryWatcher::EventConsumer exited");